xserver: Branch 'master' - 2 commits

[Keith Packard]

 hw/xwin/InitInput.c |   14 +++++++++++++-
 hw/xwin/win.h       |    3 +--
 hw/xwin/winblock.c  |    3 +--
 3 files changed, 15 insertions(+), 5 deletions(-)

New commits:
commit 2a79be9e4dd1b6ba00b69ff40bc5257ec84d34da
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Tue Jul 19 13:35:37 2016 +0100

    hw/xwin: Update BlockHandler function signature
    
    Update for removal of fdset from Block/Wakeup handler API in 9d15912a
    
    Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>
    Reviewed-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index 9fa697d..e89f730 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -717,8 +717,7 @@ void winSetAuthorization(void);
 
 void
 
-winBlockHandler(ScreenPtr pScreen,
-                void *pTimeout, void *pReadMask);
+winBlockHandler(ScreenPtr pScreen, void *pTimeout);
 
 #ifdef XWIN_CLIPBOARD
 /*
diff --git a/hw/xwin/winblock.c b/hw/xwin/winblock.c
index 8b84652..110740d 100644
--- a/hw/xwin/winblock.c
+++ b/hw/xwin/winblock.c
@@ -36,8 +36,7 @@
 
 /* See Porting Layer Definition - p. 6 */
 void
-winBlockHandler(ScreenPtr pScreen,
-                void *pTimeout, void *pReadMask)
+winBlockHandler(ScreenPtr pScreen, void *pTimeout)
 {
 #if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
     winScreenPriv(pScreen);
commit 60a91031d13e4d29c383087120e318f6b528b6e5
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Tue Jul 19 13:35:36 2016 +0100

    hw/xwin: Update for removal of AddEnabledDevice
    
    Update for removal of AddEnabledDevice in be5a513f. Use SetNotifyFd instead.
    
    Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>
    Reviewed-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xwin/InitInput.c b/hw/xwin/InitInput.c
index 6cd9e06..ae837e8 100644
--- a/hw/xwin/InitInput.c
+++ b/hw/xwin/InitInput.c
@@ -89,6 +89,18 @@ DDXRingBell(int volume, int pitch, int duration)
     return;
 }
 
+
+#ifdef HAS_DEVWINDOWS
+static void
+xwinDevWindowsHandlerNotify(int fd, int ready, void *data)
+{
+    /* This should process Windows messages, but instead all of that is delayed
+     * until the wakeup handler is called.
+     */
+    ;
+}
+#endif
+
 /* See Porting Layer Definition - p. 17 */
 void
 InitInput(int argc, char *argv[])
@@ -129,7 +141,7 @@ InitInput(int argc, char *argv[])
         }
 
         /* Add the message queue as a device to wait for in WaitForSomething */
-        AddEnabledDevice(g_fdMessageQueue);
+        SetNotifyFd(g_fdMessageQueue, xwinDevWindowsHandlerNotify, X_NOTIFY_READ, NULL);
     }
 #endif