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

- fixed the checkTimerHandlers() to flush the ASAP notification queue, even

Browse Source 
if there are no timer handlers.
- an array was too small in TexturePanel.c (4 instead of 5).
This commit is contained in:
dan
1999-11-20 22:29:58 +00:00
parent 9eb9198bad
commit 8b062b07c1
3 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
WINGs/wutil.c
View File

@@ -311,6 +311,11 @@ checkTimerHandlers()
TimerHandler *handler;
struct timeval now;
if (!timerHandler) {
W_FlushASAPNotificationQueue();
return;
}
rightNow(&now);
while (timerHandler && IS_AFTER(now, timerHandler->when)) {
@@ -333,7 +338,7 @@ delayUntilNextTimerEvent(struct timeval *delay)
if (!timerHandler) {
/* The return value of this function is only valid if there _are_
timers active. */
* active timers. */
delay->tv_sec = 0;
delay->tv_usec = 0;
return;
@@ -384,8 +389,10 @@ handleInputEvents(Bool waitForInput)
InputHandler *handler;
int count, timeout, nfds, k;
if (!inputHandler)
if (!inputHandler) {
W_FlushASAPNotificationQueue();
return False;
}
for (nfds = 0, handler = inputHandler;
handler != 0; handler = handler->next) nfds++;
@@ -470,8 +477,10 @@ handleInputEvents(Bool waitForInput)
int count;
InputHandler *handler = inputHandler;
if (!inputHandler)
if (!inputHandler) {
W_FlushASAPNotificationQueue();
return False;
}
FD_ZERO(&rset);
FD_ZERO(&wset);
@@ -556,9 +565,7 @@ void
WHandleEvents()
{
/* Check any expired timers */
if (timerPending()) {
checkTimerHandlers();
}
checkTimerHandlers();
/* We need to make sure that we have some input handler before calling
* checkIdleHandlers() in a while loop, because else the while loop
@@ -566,24 +573,22 @@ WHandleEvents()
*/
if (inputHandler) {
/* Do idle and timer stuff while there are no input events */
/* We check InputHandler again because some idle handler could have
* removed them */
while (checkIdleHandlers() && inputHandler && !handleInputEvents(False)) {
/* dispatch timer events */
if (timerPending())
checkTimerHandlers();
checkTimerHandlers();
}
} else {
checkIdleHandlers();
/* dispatch timer events */
if (timerPending())
checkTimerHandlers();
checkTimerHandlers();
}
handleInputEvents(True);
/* Check any expired timers */
if (timerPending()) {
checkTimerHandlers();
}
checkTimerHandlers();
}