searching for a better way to discard enter notifies
This commit is contained in:
parent
c2cf829ef9
commit
a1d0f81966
24
client.c
24
client.c
@ -28,17 +28,19 @@ next(Client *c)
|
||||
void
|
||||
zoom(Arg *arg)
|
||||
{
|
||||
Client **l, *old;
|
||||
Client **l;
|
||||
|
||||
if(!(old = sel))
|
||||
if(!sel)
|
||||
return;
|
||||
|
||||
if(sel == next(clients))
|
||||
sel = next(sel->next);
|
||||
|
||||
for(l = &clients; *l && *l != sel; l = &(*l)->next);
|
||||
*l = sel->next;
|
||||
|
||||
old->next = clients; /* pop */
|
||||
clients = old;
|
||||
sel = old;
|
||||
sel->next = clients; /* pop */
|
||||
clients = sel;
|
||||
arrange(NULL);
|
||||
focus(sel);
|
||||
}
|
||||
@ -54,7 +56,6 @@ max(Arg *arg)
|
||||
sel->h = sh - 2 * sel->border - bh;
|
||||
craise(sel);
|
||||
resize(sel, False);
|
||||
discard_events(EnterWindowMask);
|
||||
}
|
||||
|
||||
void
|
||||
@ -65,9 +66,6 @@ view(Arg *arg)
|
||||
tsel = arg->i;
|
||||
arrange(NULL);
|
||||
|
||||
if((c = next(clients)))
|
||||
focus(c);
|
||||
|
||||
for(c = clients; c; c = next(c->next))
|
||||
draw_client(c);
|
||||
draw_bar();
|
||||
@ -120,7 +118,6 @@ floating(Arg *arg)
|
||||
focus(sel);
|
||||
}
|
||||
}
|
||||
discard_events(EnterWindowMask);
|
||||
}
|
||||
|
||||
void
|
||||
@ -171,13 +168,12 @@ tiling(Arg *arg)
|
||||
else
|
||||
ban_client(c);
|
||||
}
|
||||
if(sel && !sel->tags[tsel]) {
|
||||
if(!sel || (sel && !sel->tags[tsel])) {
|
||||
if((sel = next(clients))) {
|
||||
craise(sel);
|
||||
focus(sel);
|
||||
}
|
||||
}
|
||||
discard_events(EnterWindowMask);
|
||||
}
|
||||
|
||||
void
|
||||
@ -323,14 +319,16 @@ void
|
||||
focus(Client *c)
|
||||
{
|
||||
Client *old = sel;
|
||||
XEvent ev;
|
||||
|
||||
XFlush(dpy);
|
||||
sel = c;
|
||||
if(old && old != c)
|
||||
draw_client(old);
|
||||
draw_client(c);
|
||||
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
|
||||
XFlush(dpy);
|
||||
discard_events(EnterWindowMask);
|
||||
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
|
||||
}
|
||||
|
||||
static void
|
||||
|
6
dwm.h
6
dwm.h
@ -137,9 +137,6 @@ extern unsigned int textnw(char *text, unsigned int len);
|
||||
extern unsigned int textw(char *text);
|
||||
extern unsigned int texth(void);
|
||||
|
||||
/* event.c */
|
||||
extern void discard_events(long even_mask);
|
||||
|
||||
/* dev.c */
|
||||
extern void update_keys(void);
|
||||
extern void keypress(XEvent *e);
|
||||
@ -155,8 +152,5 @@ extern void quit(Arg *arg);
|
||||
/* util.c */
|
||||
extern void error(const char *errstr, ...);
|
||||
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 swap(void **p1, void **p2);
|
||||
|
8
event.c
8
event.c
@ -4,6 +4,7 @@
|
||||
*/
|
||||
|
||||
#include <fcntl.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <X11/keysym.h>
|
||||
@ -37,13 +38,6 @@ void (*handler[LASTEvent]) (XEvent *) = {
|
||||
[UnmapNotify] = unmapnotify
|
||||
};
|
||||
|
||||
void
|
||||
discard_events(long even_mask)
|
||||
{
|
||||
XEvent ev;
|
||||
while(XCheckMaskEvent(dpy, even_mask, &ev));
|
||||
}
|
||||
|
||||
static void
|
||||
buttonpress(XEvent *e)
|
||||
{
|
||||
|
28
util.c
28
util.c
@ -6,7 +6,6 @@
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
#include <unistd.h>
|
||||
@ -39,33 +38,6 @@ emallocz(unsigned int size)
|
||||
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
|
||||
swap(void **p1, void **p2)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user