From 6832c0fd917556c52f56f8e82706a83942ed3dc1 Mon Sep 17 00:00:00 2001 From: Jeremy White Date: Sun, 3 Jun 2012 10:28:05 -0500 Subject: Actually process write watches in the wakeup handler My apologies for the churn; this is, I think, a slightly better patch than my previous patch, 'Process watches even when there is no X activity', in that it avoids doing an extra polling select when we're idle. --- src/spiceqxl_main_loop.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/spiceqxl_main_loop.c b/src/spiceqxl_main_loop.c index 1718861..e57fb91 100644 --- a/src/spiceqxl_main_loop.c +++ b/src/spiceqxl_main_loop.c @@ -315,9 +315,24 @@ static void select_and_check_watches(void) } } +static int no_write_watches(Ring *w) +{ + SpiceWatch *watch; + RingItem *link; + RingItem *next; + + RING_FOREACH_SAFE(link, next, w) { + watch = (SpiceWatch*)link; + if (!watch->remove && (watch->event_mask & SPICE_WATCH_EVENT_WRITE)) + return 0; + } + + return 1; +} + static void xspice_wakeup_handler(pointer data, int nfds, pointer readmask) { - if (!nfds) { + if (!nfds && no_write_watches(&watches)) { return; } select_and_check_watches(); -- cgit v1.2.3