mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

Using xu_btn_ungrab() buttons during client_leave doesn't work (error

Browse Source 
BadValue) when the modifier is already AnyModifier .  Instead alter
xu_btn_ungrab() to ungrab AnyButton/AnyModifier and call it only when a
client is coming into focus in client_setactive(), instead of iterating
over ignore mods - matches how we handle key grabs.
This commit is contained in:
okan 2013-10-19 19:39:34 +00:00
parent 083a023f2c
commit a2013ee9dd
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calmwm.h
View File

@ -511,7 +511,7 @@ void conf_screen(struct screen_ctx *);
void xev_loop(void); void xev_loop(void);
void xu_btn_grab(Window, int, u_int); void xu_btn_grab(Window, int, u_int);
void xu_btn_ungrab(Window, int, u_int); void xu_btn_ungrab(Window);
int xu_getprop(Window, Atom, Atom, long, unsigned char **); int xu_getprop(Window, Atom, Atom, long, unsigned char **);
int xu_get_wm_state(Window, int *); int xu_get_wm_state(Window, int *);
int xu_getstrprop(Window, Atom, char **); int xu_getstrprop(Window, Atom, char **);

5
client.c
View File

@ -186,15 +186,10 @@ client_delete(struct client_ctx *cc)
void void
client_leave(struct client_ctx *cc) client_leave(struct client_ctx *cc)
{ {
struct screen_ctx *sc;
if (cc == NULL) if (cc == NULL)
cc = client_current(); cc = client_current();
if (cc == NULL) if (cc == NULL)
return; return;
sc = cc->sc;
xu_btn_ungrab(sc->rootwin, AnyModifier, Button1);
} }
void void

2
conf.c
View File

@ -649,6 +649,8 @@ conf_grab_mouse(Window win)
{ {
struct mousebinding *mb; struct mousebinding *mb;
xu_btn_ungrab(win);
TAILQ_FOREACH(mb, &Conf.mousebindingq, entry) { TAILQ_FOREACH(mb, &Conf.mousebindingq, entry) {
if (mb->flags != MOUSEBIND_CTX_WIN) if (mb->flags != MOUSEBIND_CTX_WIN)
continue; continue;

7
xutil.c
View File

@ -65,12 +65,9 @@ xu_btn_grab(Window win, int mask, u_int btn)
} }
void void
xu_btn_ungrab(Window win, int mask, u_int btn) xu_btn_ungrab(Window win)
{ {
u_int i; XUngrabButton(X_Dpy, AnyButton, AnyModifier, win);
for (i = 0; i < nitems(ign_mods); i++)
XUngrabButton(X_Dpy, btn, (mask | ign_mods[i]), win);
} }
void void