Merge branch 'master' of git.wmfs.info:wmfs

This commit is contained in:
Martin Duquesnoy
2010-11-18 19:12:35 +01:00
26 changed files with 343 additions and 290 deletions

View File

@@ -236,7 +236,7 @@ clientmessageevent(XClientMessageEvent *ev)
/* Manage _NET_WM_DESKTOP */
if(mess_t == net_wm_desktop)
if((c = client_gb_win(ev->window)) && ev->data.l[0] != 0xFFFFFFFF)
if((c = client_gb_win(ev->window)) && ev->data.l[0] != (long)0xFFFFFFFF)
tag_transfert(c, ev->data.l[0]);
/* Manage _WMFS_STATUSTEXT_x */
@@ -445,7 +445,7 @@ focusin(XFocusChangeEvent *ev)
void
grabkeys(void)
{
uint i;
int i;
KeyCode code;
XUngrabKey(dpy, AnyKey, AnyModifier, ROOT);
@@ -467,7 +467,7 @@ grabkeys(void)
void
keypress(XKeyPressedEvent *ev)
{
uint i;
int i;
KeySym keysym;
keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
@@ -606,6 +606,7 @@ propertynotify(XPropertyEvent *ev)
void
reparentnotify(XReparentEvent *ev)
{
(void)ev;
return;
}