em/dwm
1
0
Fork 0
Code Releases Activity

searching for a better way to discard enter notifies

Browse Source
This commit is contained in:
Anselm R. Garbe 2006-07-14 13:03:53 +02:00
parent c2cf829ef9
commit a1d0f81966
4 changed files with 12 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
client.c
View File

@ -28,17 +28,19 @@ next(Client *c)
void void
zoom(Arg *arg) zoom(Arg *arg)
{ {
Client **l, *old; Client **l;
if(!(old = sel)) if(!sel)
return; return;
if(sel == next(clients))
sel = next(sel->next);
for(l = &clients; *l && *l != sel; l = &(*l)->next); for(l = &clients; *l && *l != sel; l = &(*l)->next);
*l = sel->next; *l = sel->next;
old->next = clients; /* pop */ sel->next = clients; /* pop */
clients = old; clients = sel;
sel = old;
arrange(NULL); arrange(NULL);
focus(sel); focus(sel);
} }
@ -54,7 +56,6 @@ max(Arg *arg)
sel->h = sh - 2 * sel->border - bh; sel->h = sh - 2 * sel->border - bh;
craise(sel); craise(sel);
resize(sel, False); resize(sel, False);
discard_events(EnterWindowMask);
} }
void void
@ -65,9 +66,6 @@ view(Arg *arg)
tsel = arg->i; tsel = arg->i;
arrange(NULL); arrange(NULL);
if((c = next(clients)))
focus(c);
for(c = clients; c; c = next(c->next)) for(c = clients; c; c = next(c->next))
draw_client(c); draw_client(c);
draw_bar(); draw_bar();
@ -120,7 +118,6 @@ floating(Arg *arg)
focus(sel); focus(sel);
} }
} }
discard_events(EnterWindowMask);
} }
void void
@ -171,13 +168,12 @@ tiling(Arg *arg)
else else
ban_client(c); ban_client(c);
} }
if(sel && !sel->tags[tsel]) { if(!sel || (sel && !sel->tags[tsel])) {
if((sel = next(clients))) { if((sel = next(clients))) {
craise(sel); craise(sel);
focus(sel); focus(sel);
} }
} }
discard_events(EnterWindowMask);
} }
void void
@ -323,14 +319,16 @@ void
focus(Client *c) focus(Client *c)
{ {
Client *old = sel; Client *old = sel;
XEvent ev;
XFlush(dpy);
sel = c; sel = c;
if(old && old != c) if(old && old != c)
draw_client(old); draw_client(old);
draw_client(c); draw_client(c);
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
XFlush(dpy); XFlush(dpy);
discard_events(EnterWindowMask); while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
} }
static void static void

6
dwm.h
View File

@ -137,9 +137,6 @@ extern unsigned int textnw(char *text, unsigned int len);
extern unsigned int textw(char *text); extern unsigned int textw(char *text);
extern unsigned int texth(void); extern unsigned int texth(void);
/* event.c */
extern void discard_events(long even_mask);
/* dev.c */ /* dev.c */
extern void update_keys(void); extern void update_keys(void);
extern void keypress(XEvent *e); extern void keypress(XEvent *e);
@ -155,8 +152,5 @@ extern void quit(Arg *arg);
/* util.c */ /* util.c */
extern void error(const char *errstr, ...); extern void error(const char *errstr, ...);
extern void *emallocz(unsigned int size); extern void *emallocz(unsigned int size);
extern void *emalloc(unsigned int size);
extern void *erealloc(void *ptr, unsigned int size);
extern char *estrdup(const char *str);
extern void spawn(Arg *arg); extern void spawn(Arg *arg);
extern void swap(void **p1, void **p2); extern void swap(void **p1, void **p2);

8
event.c
View File

@ -4,6 +4,7 @@
*/ */
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <X11/keysym.h> #include <X11/keysym.h>
@ -37,13 +38,6 @@ void (*handler[LASTEvent]) (XEvent *) = {
[UnmapNotify] = unmapnotify [UnmapNotify] = unmapnotify
}; };
void
discard_events(long even_mask)
{
XEvent ev;
while(XCheckMaskEvent(dpy, even_mask, &ev));
}
static void static void
buttonpress(XEvent *e) buttonpress(XEvent *e)
{ {

28
util.c
View File

@ -6,7 +6,6 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
@ -39,33 +38,6 @@ emallocz(unsigned int size)
return res; return res;
} }
void *
emalloc(unsigned int size)
{
void *res = malloc(size);
if(!res)
bad_malloc(size);
return res;
}
void *
erealloc(void *ptr, unsigned int size)
{
void *res = realloc(ptr, size);
if(!res)
bad_malloc(size);
return res;
}
char *
estrdup(const char *str)
{
char *res = strdup(str);
if(!res)
bad_malloc(strlen(str));
return res;
}
void void
swap(void **p1, void **p2) swap(void **p1, void **p2)
{ {