X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/1076f2b6b3d3751d5d5db6fcb9ac8c247e04e893..6db5ffb6c9a9c0db5c425c64a96a3896a682c95e:/wm.c?ds=sidebyside
diff --git a/wm.c b/wm.c
index de5324c..02b9a68 100644
--- a/wm.c
+++ b/wm.c
@@ -3,31 +3,45 @@
* See LICENSE file for license details.
*/
+#include <errno.h>
+
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/time.h>
+
#include <X11/cursorfont.h>
#include <X11/Xatom.h>
#include <X11/Xproto.h>
#include "wm.h"
+/* X structs */
Display *dpy;
-Window root;
-XRectangle rect;
-int screen, sel_screen;
-Atom wm_atom[WMLast];
-Atom net_atom[NetLast];
+Window root, barwin;
+Atom wm_atom[WMLast], net_atom[NetLast];
Cursor cursor[CurLast];
-unsigned int kmask, numlock_mask;
-Pixmap pmap;
+Bool running = True;
+Bool sel_screen;
+
+char statustext[1024], tag[256];
+int screen, sx, sy, sw, sh, bx, by, bw, bh;
-enum { WM_PROTOCOL_DELWIN = 1 };
+Brush brush = {0};
+Client *clients = NULL;
+Client *stack = NULL;
static Bool other_wm_running;
+static const char version[] = "gridwm - " VERSION ", (C)opyright MMVI Anselm R. Garbe\n";
static int (*x_error_handler) (Display *, XErrorEvent *);
-static char version[] = "gridwm - " VERSION ", (C)opyright MMVI Anselm R. Garbe\n";
+
+static const char *status[] = {
+ "sh", "-c", "echo -n `date '+%Y-%m-%d %H:%M'`"
+ " `uptime | sed 's/.*://; s/,//g'`"
+ " `acpi | awk '{print $4}' | sed 's/,//'`", 0
+};
static void
usage()
@@ -36,15 +50,6 @@ usage()
exit(1);
}
-void
-error(char *errstr, ...) {
- va_list ap;
- va_start(ap, errstr);
- vfprintf(stderr, errstr, ap);
- va_end(ap);
- exit(1);
-}
-
static void
scan_wins()
{
@@ -60,7 +65,7 @@ scan_wins()
if(wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
continue;
if(wa.map_state == IsViewable)
- /*manage*/;
+ manage(wins[i], &wa);
}
}
if(wins)
@@ -108,13 +113,28 @@ win_proto(Window w)
return protos;
}
+void
+send_message(Window w, Atom a, long value)
+{
+ XEvent e;
+
+ e.type = ClientMessage;
+ e.xclient.window = w;
+ e.xclient.message_type = a;
+ e.xclient.format = 32;
+ e.xclient.data.l[0] = value;
+ e.xclient.data.l[1] = CurrentTime;
+ XSendEvent(dpy, w, False, NoEventMask, &e);
+ XFlush(dpy);
+}
+
/*
* There's no way to check accesses to destroyed windows, thus
* those cases are ignored (especially on UnmapNotify's).
* Other types of errors call Xlib's default error handler, which
* calls exit().
*/
-static int
+int
error_handler(Display *dpy, XErrorEvent *error)
{
if(error->error_code == BadWindow
@@ -148,40 +168,23 @@ startup_error_handler(Display *dpy, XErrorEvent *error)
}
static void
-init_lock_keys()
+cleanup()
{
- 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);
+ while(clients)
+ unmanage(clients);
+ XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
+}
- kmask = 255 & ~(numlock_mask | LockMask);
+void
+run(void *aux)
+{
+ spawn(dpy, aux);
}
-static void
-cleanup()
+void
+quit(void *aux)
{
- /*
- Client *c;
- for(c=client; c; c=c->next)
- reparent_client(c, root, c->sel->rect.x, c->sel->rect.y);
- XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
- */
+ running = False;
}
int
@@ -191,6 +194,12 @@ main(int argc, char *argv[])
XSetWindowAttributes wa;
unsigned int mask;
Window w;
+ XEvent ev;
+ fd_set fds;
+ struct timeval t, timeout = {
+ .tv_usec = 0,
+ .tv_sec = STATUSDELAY,
+ };
/* command line args */
for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) {
@@ -217,21 +226,20 @@ main(int argc, char *argv[])
XSetErrorHandler(startup_error_handler);
/* this causes an error if some other WM is running */
XSelectInput(dpy, root, SubstructureRedirectMask);
- XSync(dpy, False);
+ XFlush(dpy);
if(other_wm_running)
error("gridwm: another window manager is already running\n");
- rect.x = rect.y = 0;
- rect.width = DisplayWidth(dpy, screen);
- rect.height = DisplayHeight(dpy, screen);
+ sx = sy = 0;
+ sw = DisplayWidth(dpy, screen);
+ sh = DisplayHeight(dpy, screen);
sel_screen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
XSetErrorHandler(0);
x_error_handler = XSetErrorHandler(error_handler);
/* init atoms */
- wm_atom[WMState] = XInternAtom(dpy, "WM_STATE", False);
wm_atom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
wm_atom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
net_atom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
@@ -246,17 +254,56 @@ main(int argc, char *argv[])
cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
- init_lock_keys();
+ update_keys();
+
+ /* style */
+ loadcolors(dpy, screen, &brush, BGCOLOR, FGCOLOR, BORDERCOLOR);
+ loadfont(dpy, &brush.font, FONT);
+
+ wa.override_redirect = 1;
+ wa.background_pixmap = ParentRelative;
+ wa.event_mask = ExposureMask;
+
+ bx = by = 0;
+ bw = sw;
+ bh = texth(&brush.font);
+ barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
+ CopyFromParent, DefaultVisual(dpy, screen),
+ CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
+ XDefineCursor(dpy, barwin, cursor[CurNormal]);
+ XMapRaised(dpy, barwin);
+
+ brush.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
+ brush.gc = XCreateGC(dpy, root, 0, 0);
- pmap = XCreatePixmap(dpy, root, rect.width, rect.height,
- DefaultDepth(dpy, screen));
+ pipe_spawn(statustext, sizeof(statustext), dpy, (char **)status);
+ draw_bar();
- wa.event_mask = SubstructureRedirectMask | EnterWindowMask | LeaveWindowMask;
+ wa.event_mask = SubstructureRedirectMask | EnterWindowMask \
+ | LeaveWindowMask;
wa.cursor = cursor[CurNormal];
XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
scan_wins();
+ while(running) {
+ if(XPending(dpy) > 0) {
+ XNextEvent(dpy, &ev);
+ if(handler[ev.type])
+ (handler[ev.type]) (&ev); /* call handler */
+ continue;
+ }
+ FD_ZERO(&fds);
+ FD_SET(ConnectionNumber(dpy), &fds);
+ t = timeout;
+ if(select(ConnectionNumber(dpy) + 1, &fds, NULL, NULL, &t) > 0)
+ continue;
+ else if(errno != EINTR) {
+ pipe_spawn(statustext, sizeof(statustext), dpy, (char **)status);
+ draw_bar();
+ }
+ }
+
cleanup();
XCloseDisplay(dpy);