summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2016-07-19 13:35:36 +0100
committerKeith Packard <keithp@keithp.com>2016-07-19 08:10:03 -0700
commit60a91031d13e4d29c383087120e318f6b528b6e5 (patch)
treec0b2df69c797a53e0935e0e0da509b97efe9fbde
parent7f2d690725292e7b5a44c813c9456da426256873 (diff)
hw/xwin: Update for removal of AddEnabledDevice
Update for removal of AddEnabledDevice in be5a513f. Use SetNotifyFd instead. Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk> Reviewed-by: Keith Packard <keithp@keithp.com>
-rw-r--r--hw/xwin/InitInput.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/hw/xwin/InitInput.c b/hw/xwin/InitInput.c
index 6cd9e060a..ae837e8c5 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