Cursor cursor[CurLast];
XRectangle rect, barrect;
Bool running = True;
+Client *client = NULL;
-char *bartext, *shell;
+char *bartext, tag[256];
int screen, sel_screen;
-unsigned int lock_mask, numlock_mask;
/* draw structs */
Brush brush = {0};
if(wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
continue;
if(wa.map_state == IsViewable)
- /*manage*/;
+ manage(create_client(wins[i], &wa));
}
}
if(wins)
status = XGetWindowProperty(dpy, w, a, 0L, l, False, t, &real, &format,
&res, &extra, prop);
- if(status != Success || *prop == 0) {
+ if(status != Success || *prop == NULL) {
return 0;
}
- if(res == 0) {
+ if(res == 0)
free((void *) *prop);
- }
return res;
}
}
static void
-init_lock_keys()
-{
- XModifierKeymap *modmap;
- KeyCode numlock;
- int i;
- static int masks[] = {
- ShiftMask, LockMask, ControlMask, Mod1Mask,
- Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
- };
-
- numlock_mask = 0;
- modmap = XGetModifierMapping(dpy);
- numlock = XKeysymToKeycode(dpy, XStringToKeysym("Num_Lock"));
-
- if(modmap && modmap->max_keypermod > 0) {
- int max = (sizeof(masks) / sizeof(int)) * modmap->max_keypermod;
- for(i = 0; i < max; i++)
- if(numlock && (modmap->modifiermap[i] == numlock))
- numlock_mask = masks[i / modmap->max_keypermod];
- }
- XFreeModifiermap(modmap);
-
- lock_mask = 255 & ~(numlock_mask | LockMask);
-}
-
-static void
cleanup()
{
/*
if(other_wm_running)
error("gridwm: another window manager is already running\n");
- if(!(shell = getenv("SHELL")))
- shell = "/bin/sh";
-
rect.x = rect.y = 0;
rect.width = DisplayWidth(dpy, screen);
rect.height = DisplayHeight(dpy, screen);
cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
- init_lock_keys();
+ update_keys();
brush.drawable = XCreatePixmap(dpy, root, rect.width, rect.height,
DefaultDepth(dpy, screen));
barrect.width, barrect.height, 0, DefaultDepth(dpy, screen),
CopyFromParent, DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
- bartext = 0;
+ bartext = NULL;
XDefineCursor(dpy, barwin, cursor[CurNormal]);
XMapRaised(dpy, barwin);
draw_bar();