gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-02-02 14:15:46 +01:00
Code Issues Projects Releases Wiki Activity

- simpler and more straightforward event handling for timer, idle, input

Browse Source 
and X events (also fixed some problems the old handling logic had)
This commit is contained in:
dan
2001-03-21 01:29:22 +00:00
parent f5dcab0663
commit bc3b44acaa
7 changed files with 35 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
WINGs/wevent.c
View File

@@ -381,8 +381,13 @@ WMIsDoubleClick(XEvent *event)
}
Bool
W_WaitForEvent(Display *dpy, unsigned long xeventmask)
/*
* If waitForInput is False, it will just peek to see if input is available
* then return without processing input but the return value will show
* if input is available or not.
*/
static Bool
waitForEvent(Display *dpy, unsigned long xeventmask, Bool waitForInput)
{
XSync(dpy, False);
if (xeventmask==0) {
@@ -396,7 +401,7 @@ W_WaitForEvent(Display *dpy, unsigned long xeventmask)
}
}
return W_HandleInputEvents(True, ConnectionNumber(dpy));
return W_HandleInputEvents(waitForInput, ConnectionNumber(dpy));
}
@@ -407,9 +412,8 @@ WMNextEvent(Display *dpy, XEvent *event)
W_CheckTimerHandlers();
while (XPending(dpy) == 0) {
/* Do idle stuff */
/* Do idle and timer stuff while there are no timer or X events */
while (XPending(dpy) == 0 && W_CheckIdleHandlers()) {
while (!waitForEvent(dpy, 0, False) && W_CheckIdleHandlers()) {
/* dispatch timer events */
W_CheckTimerHandlers();
}
@@ -420,8 +424,8 @@ WMNextEvent(Display *dpy, XEvent *event)
* an event that already arrived.
*/
/* wait for something to happen or a timer to expire */
W_WaitForEvent(dpy, 0);
waitForEvent(dpy, 0, True);
/* Check any expired timers */
W_CheckTimerHandlers();
}
@@ -429,8 +433,9 @@ WMNextEvent(Display *dpy, XEvent *event)
XNextEvent(dpy, event);
}
/*
* Cant use this because XPending() will make W_WaitForEvent
* Cant use this because XPending() will make waitForEvent
* return even if the event in the queue is not what we want,
* and if we block until some new event arrives from the
* server, other events already in the queue (like Expose)
@@ -438,7 +443,7 @@ WMNextEvent(Display *dpy, XEvent *event)
*/
void
WMMaskEvent(Display *dpy, long mask, XEvent *event)
{
{
while (!XCheckMaskEvent(dpy, mask, event)) {
/* Do idle stuff while there are no timer or X events */
while (W_CheckIdleHandlers()) {
@@ -446,15 +451,16 @@ WMMaskEvent(Display *dpy, long mask, XEvent *event)
return;
}
/* Wait for input on the X connection socket */
W_WaitForEvent(dpy, mask);
/* Wait for input on the X connection socket or another input handler */
waitForEvent(dpy, mask, True);
/* Check any expired timers */
W_CheckTimerHandlers();
}
}
Bool
Bool
WMScreenPending(WMScreen *scr)
{
if (XPending(scr->display))