yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

some fixes while trying to make it work ;/

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=503766
This commit is contained in:
Dirk Mueller 2006-01-30 09:50:16 +00:00
parent fbd0bea1fc
commit 25d812426b
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
kompmgr/kompmgr.c
View file

@ -2201,7 +2201,7 @@ expose_root (Display *dpy, Window root, XRectangle *rects, int nrects)
static int static int
ev_serial (XEvent *ev) ev_serial (XEvent *ev)
{ {
if (ev->type & 0x7f != KeymapNotify) if ((ev->type & 0x7f) != KeymapNotify)
return ev->xany.serial; return ev->xany.serial;
return NextRequest (ev->xany.display); return NextRequest (ev->xany.display);
} }
@ -2413,10 +2413,10 @@ loadConfig(char *filename){
if( filename == NULL ){ if( filename == NULL ){
const char *home = getenv("HOME"); const char *home = getenv("HOME");
const char *configfile = "/.xcompmgrrc"; const char *configfile = "/.xcompmgrrc";
wasNull = True; int n = strlen(home)+strlen(configfile)+1;
int n = strlen(home)+strlen(configfile)+1;
filename = (char*)malloc(n*sizeof(char)); filename = (char*)malloc(n*sizeof(char));
memset(filename,0,n); memset(filename,0,n);
wasNull = True;
strcat(filename, home); strcat(filename, home);
strcat(filename, configfile); strcat(filename, configfile);
@ -2710,7 +2710,7 @@ main (int argc, char **argv)
} }
XNextEvent (dpy, &ev); XNextEvent (dpy, &ev);
if (ev.type & 0x7f != KeymapNotify) if ((ev.type & 0x7f) != KeymapNotify)
discard_ignore (dpy, ev.xany.serial); discard_ignore (dpy, ev.xany.serial);
#if DEBUG_EVENTS #if DEBUG_EVENTS
printf ("event %10.10s serial 0x%08x window 0x%08x\n", printf ("event %10.10s serial 0x%08x window 0x%08x\n",