Send SurfaceInterface::enter events after clients bind to outputs

The following order of events are legal:

Typically order is:
 - server announces a new output
 - client binds to a new output
 - server updates the surface to be on new output

But we can have events occur in the following order:

 - server announces a new output
 - server updates the surface to be on new output
 - client binds to a new output

At which point when we update the surface there is no ID to tell the
client which output the surface is on.

This patch watches for clients binding to output and updates
appropriately.

src/wayland/output_interface.cpp

@@ -337,6 +337,8 @@ void OutputInterface::Private::bind(wl_client *client, uint32_t version, uint32_
 
     sendDone(r);
     c->flush();
+
+    emit q->bound(display->getConnection(client), r.resource);
 }
 
 void OutputInterface::Private::unbind(wl_resource *resource)

src/wayland/output_interface.h

@@ -148,6 +148,12 @@ Q_SIGNALS:
      **/
     void dpmsModeRequested(KWaylandServer::OutputInterface::DpmsMode mode);
 
+    /**
+     * Emitted when a client binds to a given output
+     * @internal
+     */
+    void bound(ClientConnection *client,  wl_resource *boundResource);
+
 private:
     class Private;
     Private *d_func() const;

src/wayland/surface_interface.cpp

@@ -832,6 +832,7 @@ void SurfaceInterface::setOutputs(const QVector<OutputInterface *> &outputs)
             d->send_leave(outputResource);
         }
         disconnect(d->outputDestroyedConnections.take(*it));
+        disconnect(d->outputBoundConnections.take(*it));
     }
     QVector<OutputInterface *> addedOutputsOutputs = outputs;
     for (auto it = d->outputs.constBegin(), end = d->outputs.constEnd(); it != end; ++it) {
@@ -849,8 +850,15 @@ void SurfaceInterface::setOutputs(const QVector<OutputInterface *> &outputs)
             if (outputs.removeOne(o)) {
                 setOutputs(outputs);
             }});
+
+        Q_ASSERT(!d->outputBoundConnections.contains(o));
+        d->outputBoundConnections[o] = connect(o, &OutputInterface::bound, this, [this](ClientConnection *c, wl_resource *outputResource) {
+            if (c != client()) {
+                return;
+            }
+            d->send_enter(outputResource);
+        });
     }
-    // TODO: send enter when the client binds the OutputInterface another time
 
     d->outputs = outputs;
     for (auto child : d->current.children) {

src/wayland/surface_interface_p.h

@@ -117,6 +117,8 @@ public:
     LockedPointerV1Interface *lockedPointer = nullptr;
     ConfinedPointerV1Interface *confinedPointer = nullptr;
     QHash<OutputInterface*, QMetaObject::Connection> outputDestroyedConnections;
+    QHash<OutputInterface*, QMetaObject::Connection> outputBoundConnections;
+
     QVector<IdleInhibitorV1Interface*> idleInhibitors;
     ViewportInterface *viewportExtension = nullptr;
     SurfaceInterface *dataProxy = nullptr;