main.c
changeset 616 f617c75a8405
parent 583 f4285a97e3e6
child 619 bda4880c462d
equal deleted inserted replaced
615:337b7f4a431e 616:f617c75a8405
    49 		XFreeFont(dpy, dc.font.xfont);
    49 		XFreeFont(dpy, dc.font.xfont);
    50 	XUngrabKey(dpy, AnyKey, AnyModifier, root);
    50 	XUngrabKey(dpy, AnyKey, AnyModifier, root);
    51 	XFreePixmap(dpy, dc.drawable);
    51 	XFreePixmap(dpy, dc.drawable);
    52 	XFreeGC(dpy, dc.gc);
    52 	XFreeGC(dpy, dc.gc);
    53 	XDestroyWindow(dpy, barwin);
    53 	XDestroyWindow(dpy, barwin);
       
    54 	XFreeCursor(dpy, cursor[CurNormal]);
       
    55 	XFreeCursor(dpy, cursor[CurResize]);
       
    56 	XFreeCursor(dpy, cursor[CurMove]);
    54 	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
    57 	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
    55 	XSync(dpy, False);
    58 	XSync(dpy, False);
    56 	free(seltag);
    59 	free(seltag);
    57 }
    60 }
    58 
    61 
   102 		for (j = 0; j < modmap->max_keypermod; j++) {
   105 		for (j = 0; j < modmap->max_keypermod; j++) {
   103 			if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
   106 			if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
   104 				numlockmask = (1 << i);
   107 				numlockmask = (1 << i);
   105 		}
   108 		}
   106 	}
   109 	}
   107 	XFree(modmap);
   110 	XFreeModifiermap(modmap);
   108 	/* select for events */
   111 	/* select for events */
   109 	wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
   112 	wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
   110 		| EnterWindowMask | LeaveWindowMask;
   113 		| EnterWindowMask | LeaveWindowMask;
   111 	wa.cursor = cursor[CurNormal];
   114 	wa.cursor = cursor[CurNormal];
   112 	XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
   115 	XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);