Alexander/nsxiv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'newdraw'

Browse Source
This commit is contained in:
Bert Münnich
2012-12-01 18:50:10 +01:00
parent 1ae06ffd09 22a8b66571
commit 0155223a1a
3 changed files with 48 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
main.c
View File

@ -420,7 +420,7 @@ void run(void) {
fd_set fds;
struct timeval timeout;
XEvent ev, nextev;
unsigned int qlen;
bool discard;
redraw();
@ -453,10 +453,20 @@ void run(void) {
do {
XNextEvent(win.env.dpy, &ev);
qlen = XEventsQueued(win.env.dpy, QueuedAlready);
if (qlen > 0)
discard = false;
if (XEventsQueued(win.env.dpy, QueuedAlready) > 0) {
XPeekEvent(win.env.dpy, &nextev);
} while (qlen > 0 && ev.type == nextev.type);
switch (ev.type) {
case ConfigureNotify:
discard = ev.type == nextev.type;
break;
case KeyPress:
discard = (nextev.type == KeyPress || nextev.type == KeyRelease)
&& ev.xkey.keycode == nextev.xkey.keycode;
break;
}
}
} while (discard);
switch (ev.type) {
/* handle events */
@ -482,9 +492,11 @@ void run(void) {
}
}
break;
case Expose:
win_expose(&win, &ev.xexpose);
break;
case KeyPress:
if (qlen == 0 || ev.xkey.keycode != nextev.xkey.keycode)
on_keypress(&ev.xkey);
on_keypress(&ev.xkey);
break;
case MotionNotify:
if (mode == MODE_IMAGE) {