From 2de58a7ff354d14a18e5259c7325bdf3e5e497ba Mon Sep 17 00:00:00 2001 From: seanpringle Date: Sat, 22 Sep 2012 17:53:02 +1000 Subject: [PATCH 1/4] clean up --- xoat.c | 207 +++++++++++++++++++++------------------------------------ 1 file changed, 75 insertions(+), 132 deletions(-) diff --git a/xoat.c b/xoat.c index 064f3ba..62ff604 100644 --- a/xoat.c +++ b/xoat.c @@ -85,7 +85,7 @@ Atom atoms[ATOMS]; #define MIN(a, b) ((a) < (b) ? (a) : (b)) #define OVERLAP(a,b,c,d) (((a)==(c) && (b)==(d)) || MIN((a)+(b), (c)+(d)) - MAX((a), (c)) > 0) #define INTERSECT(x,y,w,h,x1,y1,w1,h1) (OVERLAP((x),(w),(x1),(w1)) && OVERLAP((y),(h),(y1),(h1))) -#define execsh(cmd) execlp("/bin/sh", "sh", "-c", (cmd), NULL) +#define EXECSH(cmd) execlp("/bin/sh", "sh", "-c", (cmd), NULL) #define MAX_STRUT 150 #define MAX_MONITORS 3 @@ -111,10 +111,13 @@ typedef struct { XWindowAttributes attr; Window transient, leader; Atom type, states[MAX_ATOMLIST+1]; - short monitor, spot, visible, manage, input, urgent; + short monitor, visible, manage, input, urgent, full, above; + unsigned long spot; char *class; } client; +void client_free(client*); + typedef struct { long left, right, top, bottom, ly1, ly2, ry1, ry3, @@ -127,6 +130,9 @@ typedef struct { Window windows[STACK]; } stack; +#define STACK_INIT(n) stack (n); memset(&(n), 0, sizeof(stack)) +#define STACK_FREE(s) while ((s)->depth) client_free((s)->clients[--(s)->depth]) + typedef struct { unsigned int mod; KeySym key; @@ -190,7 +196,7 @@ void exec_cmd(char *cmd) if (fork()) return; setsid(); - execsh(cmd); + EXECSH(cmd); exit(EXIT_FAILURE); } @@ -207,12 +213,6 @@ int oops(Display *d, XErrorEvent *ee) return xerror(display, ee); } -unsigned int color_name_to_pixel(const char *name) -{ - XColor color; Colormap map = DefaultColormap(display, DefaultScreen(display)); - return XAllocNamedColor(display, map, name, &color, &color) ? color.pixel: None; -} - int window_get_prop(Window w, Atom prop, Atom *type, int *items, void *buffer, int bytes) { memset(buffer, 0, bytes); @@ -229,53 +229,29 @@ int window_get_prop(Window w, Atom prop, Atom *type, int *items, void *buffer, i return 0; } -int window_get_atom_prop(Window w, Atom atom, Atom *list, int count) -{ - Atom type; int items; - return window_get_prop(w, atom, &type, &items, list, count*sizeof(Atom)) && type == XA_ATOM ? items:0; -} +Atom wgp_type; int wgp_items; -void window_set_atom_prop(Window w, Atom prop, Atom *atoms, int count) -{ - XChangeProperty(display, w, prop, XA_ATOM, 32, PropModeReplace, (unsigned char*)atoms, count); -} +#define GETPROP_ATOM(w, a, l, c) (window_get_prop((w), (a), &wgp_type, &wgp_items, (l), (c)*sizeof(Atom)) && wgp_type == XA_ATOM ? wgp_items:0) +#define GETPROP_LONG(w, a, l, c) (window_get_prop((w), (a), &wgp_type, &wgp_items, (l), (c)*sizeof(unsigned long)) && wgp_type == XA_CARDINAL ? wgp_items:0) +#define GETPROP_WIND(w, a, l, c) (window_get_prop((w), (a), &wgp_type, &wgp_items, (l), (c)*sizeof(Window)) && wgp_type == XA_WINDOW ? wgp_items:0) -int window_get_cardinal_prop(Window w, Atom atom, unsigned long *list, int count) -{ - Atom type; int items; - return window_get_prop(w, atom, &type, &items, list, count*sizeof(unsigned long)) && type == XA_CARDINAL ? items:0; -} - -void window_set_cardinal_prop(Window w, Atom prop, unsigned long *values, int count) -{ - XChangeProperty(display, w, prop, XA_CARDINAL, 32, PropModeReplace, (unsigned char*)values, count); -} - -int window_get_window_prop(Window w, Atom atom, Window *list, int count) -{ - Atom type; int items; - return window_get_prop(w, atom, &type, &items, list, count*sizeof(Window)) && type == XA_WINDOW ? items:0; -} - -void window_set_window_prop(Window w, Atom prop, Window *values, int count) -{ - XChangeProperty(display, w, prop, XA_WINDOW, 32, PropModeReplace, (unsigned char*)values, count); -} +#define SETPROP_ATOM(w, p, a, c) XChangeProperty(display, (w), (p), XA_ATOM, 32, PropModeReplace, (unsigned char*)(a), (c)) +#define SETPROP_LONG(w, p, a, c) XChangeProperty(display, (w), (p), XA_CARDINAL, 32, PropModeReplace, (unsigned char*)(a), (c)) +#define SETPROP_WIND(w, p, a, c) XChangeProperty(display, (w), (p), XA_WINDOW, 32, PropModeReplace, (unsigned char*)(a), (c)) int client_has_state(client *c, Atom state) { - int i; - for (i = 0; i < MAX_ATOMLIST && c->states[i]; i++) + for (int i = 0; i < MAX_ATOMLIST && c->states[i]; i++) if (c->states[i] == state) return 1; return 0; } void client_update_border(client *c) { - XSetWindowBorder(display, c->window, - color_name_to_pixel(c->window == current ? BORDER_FOCUS: (c->urgent ? BORDER_URGENT: - (client_has_state(c, atoms[_NET_WM_STATE_ABOVE]) ? BORDER_ABOVE: BORDER_BLUR)))); - XSetWindowBorderWidth(display, c->window, client_has_state(c, atoms[_NET_WM_STATE_FULLSCREEN]) ? 0: BORDER); + XColor color; Colormap map = DefaultColormap(display, DefaultScreen(display)); + char *colorname = c->window == current ? BORDER_FOCUS: (c->urgent ? BORDER_URGENT: (c->above ? BORDER_ABOVE: BORDER_BLUR)); + XSetWindowBorder(display, c->window, XAllocNamedColor(display, map, colorname, &color, &color) ? color.pixel: None); + XSetWindowBorderWidth(display, c->window, c->full ? 0: BORDER); } int client_toggle_state(client *c, Atom state) @@ -291,7 +267,10 @@ int client_toggle_state(client *c, Atom state) c->states[j++] = state; rc = 1; } - window_set_atom_prop(c->window, atoms[_NET_WM_STATE], c->states, j); + SETPROP_ATOM(c->window, atoms[_NET_WM_STATE], c->states, j); + if (state == atoms[_NET_WM_STATE_FULLSCREEN]) c->full = rc; + if (state == atoms[_NET_WM_STATE_ABOVE]) c->above = rc; + if (state == atoms[_NET_WM_STATE_DEMANDS_ATTENTION]) c->urgent = rc; return rc; } @@ -307,8 +286,8 @@ client* window_build_client(Window win) { c->visible = c->attr.map_state == IsViewable ? 1:0; XGetTransientForHint(display, c->window, &c->transient); - window_get_atom_prop(win, atoms[_NET_WM_WINDOW_TYPE], &c->type, 1); - window_get_window_prop(win, atoms[WM_CLIENT_LEADER], &c->leader, 1); + GETPROP_ATOM(win, atoms[_NET_WM_WINDOW_TYPE], &c->type, 1); + GETPROP_WIND(win, atoms[WM_CLIENT_LEADER], &c->leader, 1); c->manage = !c->attr.override_redirect && c->type != atoms[_NET_WM_WINDOW_TYPE_DESKTOP] @@ -331,8 +310,10 @@ client* window_build_client(Window win) if (c->visible) { - window_get_atom_prop(c->window, atoms[_NET_WM_STATE], c->states, MAX_ATOMLIST); + GETPROP_ATOM(c->window, atoms[_NET_WM_STATE], c->states, MAX_ATOMLIST); c->urgent = client_has_state(c, atoms[_NET_WM_STATE_DEMANDS_ATTENTION]); + c->full = client_has_state(c, atoms[_NET_WM_STATE_FULLSCREEN]); + c->above = client_has_state(c, atoms[_NET_WM_STATE_ABOVE]); if ((hints = XGetWMHints(display, c->window))) { @@ -359,12 +340,6 @@ void client_free(client *c) free(c); } -void stack_free(stack *s) -{ - while (s->depth) - client_free(s->clients[--s->depth]); -} - // build windows cache void query_windows() { @@ -385,20 +360,17 @@ void query_windows() void ewmh_client_list() { - int i; client *c; stack wins; - memset(&wins, 0, sizeof(stack)); - + int i; client *c; STACK_INIT(wins); for_windows_rev(i, c) if (c->manage) wins.windows[wins.depth++] = c->window; - - window_set_window_prop(root, atoms[_NET_CLIENT_LIST_STACKING], wins.windows, wins.depth); + SETPROP_WIND(root, atoms[_NET_CLIENT_LIST_STACKING], wins.windows, wins.depth); // hack for now, since we dont track window mapping history - window_set_window_prop(root, atoms[_NET_CLIENT_LIST], wins.windows, wins.depth); + SETPROP_WIND(root, atoms[_NET_CLIENT_LIST], wins.windows, wins.depth); } int window_send_clientmessage(Window target, Window subject, Atom atom, unsigned long protocol, unsigned long mask) { - XEvent e; memset(&e, 0, sizeof(XEvent)); + XEvent e; e.xclient.type = ClientMessage; e.xclient.message_type = atom; e.xclient.window = subject; @@ -414,18 +386,12 @@ int window_send_clientmessage(Window target, Window subject, Atom atom, unsigned int client_send_wm_protocol(client *c, Atom protocol) { Atom protocols[MAX_ATOMLIST]; int i, n; - if ((n = window_get_atom_prop(c->window, atoms[WM_PROTOCOLS], protocols, MAX_ATOMLIST))) + if ((n = GETPROP_ATOM(c->window, atoms[WM_PROTOCOLS], protocols, MAX_ATOMLIST))) for (i = 0; i < n; i++) if (protocols[i] == protocol) return window_send_clientmessage(c->window, c->window, atoms[WM_PROTOCOLS], protocol, NoEventMask); return 0; } -void client_close(client *c) -{ - if (c && !client_send_wm_protocol(c, atoms[WM_DELETE_WINDOW])) - XKillClient(display, c->window); -} - void client_place_spot(client *c, int spot, int mon, int force) { if (!c) return; @@ -462,7 +428,7 @@ void client_place_spot(client *c, int spot, int mon, int force) h = c->attr.height + BORDER*2; } else - if (client_has_state(c, atoms[_NET_WM_STATE_FULLSCREEN])) + if (c->full) { XMoveResizeWindow(display, c->window, m->x, m->y, m->w, m->h); return; @@ -521,17 +487,14 @@ void client_stack_family(client *c, stack *raise) void client_raise_family(client *c) { if (!c) return; - int i; client *o; stack raise, family; - memset(&raise, 0, sizeof(stack)); - memset(&family, 0, sizeof(stack)); + int i; client *o; STACK_INIT(raise); STACK_INIT(family); for_windows(i, o) if (o->type == atoms[_NET_WM_WINDOW_TYPE_DOCK]) client_stack_family(o, &raise); // above only counts for fullscreen windows - if (client_has_state(c, atoms[_NET_WM_STATE_FULLSCREEN])) - for_windows(i, o) if (client_has_state(o, atoms[_NET_WM_STATE_ABOVE])) - client_stack_family(o, &raise); + if (c->full) for_windows(i, o) if (o->above) + client_stack_family(o, &raise); while (c->transient && (o = window_build_client(c->transient))) c = family.clients[family.depth++] = o; @@ -539,18 +502,18 @@ void client_raise_family(client *c) client_stack_family(c, &raise); XRaiseWindow(display, raise.windows[0]); XRestackWindows(display, raise.windows, raise.depth); - stack_free(&family); + STACK_FREE(&family); } void client_set_focus(client *c) { if (!c || !c->visible || c->window == current) return; - Window old = current; + client *o; Window old = current; + current = c->window; current_spot = c->spot; current_mon = c->monitor; - client *o; if (old && (o = window_build_client(old))) { client_update_border(o); @@ -558,7 +521,7 @@ void client_set_focus(client *c) } client_send_wm_protocol(c, atoms[WM_TAKE_FOCUS]); XSetInputFocus(display, c->input ? c->window: PointerRoot, RevertToPointerRoot, CurrentTime); - window_set_window_prop(root, atoms[_NET_ACTIVE_WINDOW], &c->window, 1); + SETPROP_WIND(root, atoms[_NET_ACTIVE_WINDOW], &c->window, 1); client_update_border(c); } @@ -601,16 +564,6 @@ int spot_choose_by_direction(int spot, int mon, int dir) return spot; } -void client_spot_cycle(client *c) -{ - if (!c) return; - spot_focus_top_window(c->spot, c->monitor, c->window); - stack lower; memset(&lower, 0, sizeof(stack)); - client_stack_family(c, &lower); - XLowerWindow(display, lower.windows[0]); - XRestackWindows(display, lower.windows, lower.depth); -} - void window_listen(Window win) { XSelectInput(display, win, EnterWindowMask | LeaveWindowMask | FocusChangeMask | PropertyChangeMask); @@ -644,12 +597,18 @@ void action_focus_direction(void *data, int num, client *cli) void action_close(void *data, int num, client *cli) { - if (cli) client_close(cli); + if (cli && !client_send_wm_protocol(cli, atoms[WM_DELETE_WINDOW])) + XKillClient(display, cli->window); } void action_cycle(void *data, int num, client *cli) { - if (cli) client_spot_cycle(cli); + if (!cli) return; + STACK_INIT(lower); + spot_focus_top_window(cli->spot, cli->monitor, cli->window); + client_stack_family(cli, &lower); + XLowerWindow(display, lower.windows[0]); + XRestackWindows(display, lower.windows, lower.depth); } void action_other(void *data, int num, client *cli) @@ -665,11 +624,9 @@ void action_command(void *data, int num, client *cli) void action_find_or_start(void *data, int num, client *cli) { int i; client *c; char *class = data; - for_windows(i, c) if (c->visible && c->manage && c->class && !strcasecmp(c->class, class)) { client_activate(c); return; } - exec_cmd(class); } @@ -692,18 +649,12 @@ void action_focus_monitor(void *data, int num, client *cli) void action_fullscreen(void *data, int num, client *cli) { if (!cli) return; - unsigned long spot = cli->spot; - client_raise_family(cli); - cli->spot = SPOT1; - - if (client_toggle_state(cli, atoms[_NET_WM_STATE_FULLSCREEN])) - window_set_cardinal_prop(cli->window, atoms[XOAT_SPOT], &spot, 1); - else - if (window_get_cardinal_prop(cli->window, atoms[XOAT_SPOT], &spot, 1)) - cli->spot = spot; - + if (cli->full) GETPROP_LONG(cli->window, atoms[XOAT_SPOT], &cli->spot, 1); + else SETPROP_LONG(cli->window, atoms[XOAT_SPOT], &cli->spot, 1); + client_toggle_state(cli, atoms[_NET_WM_STATE_FULLSCREEN]); + client_place_spot(cli, cli->full ? SPOT1: cli->spot, cli->monitor, 1); client_update_border(cli); - client_place_spot(cli, cli->spot, cli->monitor, 1); + client_raise_family(cli); } void action_above(void *data, int num, client *cli) @@ -717,13 +668,9 @@ void action_above(void *data, int num, client *cli) void action_snapshot(void *data, int num, client *cli) { int i; client *c; - stack_free(&snapshot); - - for_windows(i, c) if (c->manage) - { - snapshot.clients[snapshot.depth] = window_build_client(c->window); - snapshot.windows[snapshot.depth++] = c->window; - } + STACK_FREE(&snapshot); + for_windows(i, c) if (c->manage && c->class) + snapshot.clients[snapshot.depth++] = window_build_client(c->window); } void action_rollback(void *data, int num, client *cli) @@ -835,10 +782,9 @@ void map_notify(XEvent *e) void unmap_notify(XEvent *e) { - int i; // if this window was focused, find something else if (e->xunmap.window == current && !spot_focus_top_window(current_spot, current_mon, current)) - for_spots(i) if (spot_focus_top_window(i, current_mon, current)) break; + { int i; for_spots(i) if (spot_focus_top_window(i, current_mon, current)) break; } ewmh_client_list(); } @@ -849,8 +795,8 @@ void key_press(XEvent *ev) unsigned int state = e->state & ~(LockMask|NumlockMask); while (XCheckTypedEvent(display, KeyPress, ev)); - int i; binding *bind = NULL; - for (i = 0; i < sizeof(keys)/sizeof(binding) && !bind; i++) + binding *bind = NULL; + for (int i = 0; i < sizeof(keys)/sizeof(binding) && !bind; i++) if (keys[i].key == key && (keys[i].mod == AnyModifier || keys[i].mod == state)) bind = &keys[i]; @@ -883,13 +829,13 @@ void client_message(XEvent *ev) if (e->message_type == atoms[XOAT_RESTART]) { warnx("restart!"); - execsh(self); + EXECSH(self); } client *c = window_build_client(e->window); if (c && c->manage) { if (e->message_type == atoms[_NET_ACTIVE_WINDOW]) client_activate(c); - if (e->message_type == atoms[_NET_CLOSE_WINDOW]) client_close(c); + if (e->message_type == atoms[_NET_CLOSE_WINDOW]) action_close(NULL, 0, c); } client_free(c); } @@ -919,7 +865,7 @@ void (*handlers[LASTEvent])(XEvent*) = { int main(int argc, char *argv[]) { - int i, j; client *c; XEvent ev; + int i, j; client *c; XEvent ev; Atom msg = None; wm_strut struts; memset(&struts, 0, sizeof(wm_strut)); if (!(display = XOpenDisplay(0))) return 1; @@ -935,7 +881,6 @@ int main(int argc, char *argv[]) // check for restart/exit if (argc > 1) { - Atom msg = None; Window cli = XCreateSimpleWindow(display, root, 0, 0, 1, 1, 0, None, None); if (!strcmp(argv[1], "restart")) msg = atoms[XOAT_RESTART]; else if (!strcmp(argv[1], "exit")) msg = atoms[XOAT_EXIT]; @@ -956,9 +901,9 @@ int main(int argc, char *argv[]) for (i = 0; i < nmonitors; i++) { monitors[i].x = info[i].x_org; - monitors[i].y = info[i].y_org + struts.top; + monitors[i].y = info[i].y_org; monitors[i].w = info[i].width; - monitors[i].h = info[i].height - struts.top - struts.bottom; + monitors[i].h = info[i].height; } XFree(info); } @@ -967,8 +912,8 @@ int main(int argc, char *argv[]) for_windows(i, c) { wm_strut strut; memset(&strut, 0, sizeof(wm_strut)); - int v2 = window_get_cardinal_prop(c->window, atoms[_NET_WM_STRUT_PARTIAL], (unsigned long*)&strut, 12); - int v1 = v2 ? 0: window_get_cardinal_prop(c->window, atoms[_NET_WM_STRUT], (unsigned long*)&strut, 4); + int v2 = GETPROP_LONG(c->window, atoms[_NET_WM_STRUT_PARTIAL], (unsigned long*)&strut, 12); + int v1 = v2 ? 0: GETPROP_LONG(c->window, atoms[_NET_WM_STRUT], (unsigned long*)&strut, 4); if (!c->visible || (!v1 && !v2)) continue; for (j = 0; j < nmonitors; j++) @@ -1061,9 +1006,9 @@ int main(int argc, char *argv[]) unsigned long pid = getpid(); ewmh = XCreateSimpleWindow(display, root, 0, 0, 1, 1, 0, 0, 0); - window_set_atom_prop(root, atoms[_NET_SUPPORTED], atoms, ATOMS); - window_set_window_prop(root, atoms[_NET_SUPPORTING_WM_CHECK], &ewmh, 1); - window_set_cardinal_prop(ewmh, atoms[_NET_WM_PID], &pid, 1); + SETPROP_ATOM(root, atoms[_NET_SUPPORTED], atoms, ATOMS); + SETPROP_WIND(root, atoms[_NET_SUPPORTING_WM_CHECK], &ewmh, 1); + SETPROP_LONG(ewmh, atoms[_NET_WM_PID], &pid, 1); XChangeProperty(display, ewmh, atoms[_NET_WM_NAME], XA_STRING, 8, PropModeReplace, (const unsigned char*)"xoat", 4); @@ -1091,24 +1036,22 @@ int main(int argc, char *argv[]) XGrabButton(display, Button3, AnyModifier, root, True, ButtonPressMask, GrabModeSync, GrabModeSync, None, None); // setup existing managable windows - stack_free(&windows); + STACK_FREE(&windows); for_windows(i, c) if (c->manage) { window_listen(c->window); client_update_border(c); client_place_spot(c, c->spot, c->monitor, 0); - - // only activate first one if (!current) client_activate(c); } // main event loop for (;;) { - stack_free(&windows); + STACK_FREE(&windows); XNextEvent(display, &ev); if (handlers[ev.type]) handlers[ev.type](&ev); } return EXIT_SUCCESS; -} \ No newline at end of file +} From 96af3db76368b0f2f582261478d7e7db839a697b Mon Sep 17 00:00:00 2001 From: seanpringle Date: Sat, 22 Sep 2012 17:53:20 +1000 Subject: [PATCH 2/4] clean up --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 542d180..6fa9cf8 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -CFLAGS?=-Wall -Os +CFLAGS?=-Wall -Os -std=c99 LDADD?=`pkg-config --cflags --libs x11 xinerama` normal: @@ -12,4 +12,4 @@ docs: clean: rm -f xoat xoat-debug -all: docs normal \ No newline at end of file +all: docs normal From dc12d5a411ac6d3de6cf082da1152c2e207bd7da Mon Sep 17 00:00:00 2001 From: seanpringle Date: Tue, 25 Sep 2012 01:05:44 +1000 Subject: [PATCH 3/4] simple titlebars; split source up --- Makefile | 2 +- action.c | 156 +++++++++ atom.c | 63 ++++ client.c | 278 ++++++++++++++++ config.h | 19 +- event.c | 212 ++++++++++++ ewmh.c | 36 +++ setup.c | 210 ++++++++++++ spot.c | 114 +++++++ textbox.c | 374 ++++++++++++++++++++++ window.c | 115 +++++++ xoat.c | 938 ++++-------------------------------------------------- 12 files changed, 1636 insertions(+), 881 deletions(-) create mode 100644 action.c create mode 100644 atom.c create mode 100644 client.c create mode 100644 event.c create mode 100644 ewmh.c create mode 100644 setup.c create mode 100644 spot.c create mode 100644 textbox.c create mode 100644 window.c diff --git a/Makefile b/Makefile index 6fa9cf8..c4a575a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CFLAGS?=-Wall -Os -std=c99 -LDADD?=`pkg-config --cflags --libs x11 xinerama` +LDADD?=`pkg-config --cflags --libs x11 xinerama xft` normal: $(CC) -o xoat xoat.c $(CFLAGS) $(LDADD) $(LDFLAGS) diff --git a/action.c b/action.c new file mode 100644 index 0000000..c28a22c --- /dev/null +++ b/action.c @@ -0,0 +1,156 @@ +/* + +MIT/X11 License +Copyright (c) 2012 Sean Pringle + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +*/ + +void action_move(void *data, int num, client *cli) +{ + if (!cli) return; + client_raise_family(cli); + client_place_spot(cli, num, cli->monitor, 1); +} + +void action_move_direction(void *data, int num, client *cli) +{ + if (!cli) return; + client_raise_family(cli); + client_place_spot(cli, spot_choose_by_direction(cli->spot, cli->monitor, num), cli->monitor, 1); +} + +void action_focus(void *data, int num, client *cli) +{ + spot_focus_top_window(num, current_mon, None); +} + +void action_focus_direction(void *data, int num, client *cli) +{ + spot_focus_top_window(spot_choose_by_direction(current_spot, current_mon, num), current_mon, None); +} + +void action_close(void *data, int num, client *cli) +{ + if (cli && !client_send_wm_protocol(cli, atoms[WM_DELETE_WINDOW])) + XKillClient(display, cli->window); +} + +void action_cycle(void *data, int num, client *cli) +{ + if (!cli) return; + STACK_INIT(lower); + spot_focus_top_window(cli->spot, cli->monitor, cli->window); + client_stack_family(cli, &lower); + XLowerWindow(display, lower.windows[0]); + XRestackWindows(display, lower.windows, lower.depth); +} + +void action_raise_nth(void *data, int num, client *cli) +{ + if (!cli) return; + int i, n = 0; client *c; + for_windows(i, c) if (c->manage && c->spot == cli->spot && c->monitor == cli->monitor && num == n++) + { client_activate(c); break; } +} + +void action_command(void *data, int num, client *cli) +{ + exec_cmd(data); +} + +void action_find_or_start(void *data, int num, client *cli) +{ + int i; client *c; char *class = data; + for_windows(i, c) + if (c->visible && c->manage && c->class && !strcasecmp(c->class, class)) + { client_activate(c); return; } + exec_cmd(class); +} + +void action_move_monitor(void *data, int num, client *cli) +{ + if (!cli) return; + client_raise_family(cli); + cli->monitor = MAX(0, MIN(current_mon+num, nmonitors-1)); + client_place_spot(cli, cli->spot, cli->monitor, 1); + current_mon = cli->monitor; +} + +void action_focus_monitor(void *data, int num, client *cli) +{ + int i, mon = MAX(0, MIN(current_mon+num, nmonitors-1)); + if (spot_focus_top_window(current_spot, mon, None)) return; + for_spots(i) if (spot_focus_top_window(i, mon, None)) break; +} + +void action_fullscreen(void *data, int num, client *cli) +{ + if (!cli) return; + if (cli->full) GETPROP_LONG(cli->window, atoms[XOAT_SPOT], &cli->spot, 1); + else SETPROP_LONG(cli->window, atoms[XOAT_SPOT], &cli->spot, 1); + client_toggle_state(cli, atoms[_NET_WM_STATE_FULLSCREEN]); + client_place_spot(cli, cli->full ? SPOT1: cli->spot, cli->monitor, 1); + client_update_border(cli); + client_raise_family(cli); +} + +void action_above(void *data, int num, client *cli) +{ + if (!cli) return; + client_toggle_state(cli, atoms[_NET_WM_STATE_ABOVE]); + client_update_border(cli); + client_raise_family(cli); +} + +void action_snapshot(void *data, int num, client *cli) +{ + int i; client *c; + STACK_FREE(&snapshot); + for_windows(i, c) if (c->manage && c->class) + snapshot.clients[snapshot.depth++] = window_build_client(c->window); +} + +void action_rollback(void *data, int num, client *cli) +{ + int i; client *c = NULL, *s, *a = NULL; + for (i = snapshot.depth-1; i > -1; i--) + { + if ((s = snapshot.clients[i]) && (c = window_build_client(s->window)) + && c->class && !strcmp(s->class, c->class) && c->visible && c->manage) + { + client_place_spot(c, s->spot, s->monitor, 1); + client_raise_family(c); + if (s->spot == current_spot && s->monitor == current_mon) + { + client_free(a); + a = c; c = NULL; + } + } + client_free(c); + } + if (a) + { + client_set_focus(a); + client_free(a); + } +} + diff --git a/atom.c b/atom.c new file mode 100644 index 0000000..c1a0f20 --- /dev/null +++ b/atom.c @@ -0,0 +1,63 @@ +/* + +MIT/X11 License +Copyright (c) 2012 Sean Pringle + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +*/ + +#define ATOM_ENUM(x) x +#define ATOM_CHAR(x) #x + +#define GENERAL_ATOMS(X) \ + X(XOAT_SPOT),\ + X(XOAT_EXIT),\ + X(XOAT_RESTART),\ + X(_NET_SUPPORTED),\ + X(_NET_ACTIVE_WINDOW),\ + X(_NET_CLOSE_WINDOW),\ + X(_NET_CLIENT_LIST_STACKING),\ + X(_NET_CLIENT_LIST),\ + X(_NET_SUPPORTING_WM_CHECK),\ + X(_NET_WM_NAME),\ + X(_NET_WM_PID),\ + X(_NET_WM_STRUT),\ + X(_NET_WM_STRUT_PARTIAL),\ + X(_NET_WM_WINDOW_TYPE),\ + X(_NET_WM_WINDOW_TYPE_DESKTOP),\ + X(_NET_WM_WINDOW_TYPE_DOCK),\ + X(_NET_WM_WINDOW_TYPE_SPLASH),\ + X(_NET_WM_WINDOW_TYPE_NOTIFICATION),\ + X(_NET_WM_WINDOW_TYPE_DIALOG),\ + X(_NET_WM_STATE),\ + X(_NET_WM_STATE_FULLSCREEN),\ + X(_NET_WM_STATE_ABOVE),\ + X(_NET_WM_STATE_DEMANDS_ATTENTION),\ + X(WM_NAME),\ + X(WM_DELETE_WINDOW),\ + X(WM_CLIENT_LEADER),\ + X(WM_TAKE_FOCUS),\ + X(WM_PROTOCOLS) + +enum { GENERAL_ATOMS(ATOM_ENUM), ATOMS }; +const char *atom_names[] = { GENERAL_ATOMS(ATOM_CHAR) }; +Atom atoms[ATOMS]; + diff --git a/client.c b/client.c new file mode 100644 index 0000000..0c58b5a --- /dev/null +++ b/client.c @@ -0,0 +1,278 @@ +/* + +MIT/X11 License +Copyright (c) 2012 Sean Pringle + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +*/ + +int client_has_state(client *c, Atom state) +{ + for (int i = 0; i < ATOMLIST && c->states[i]; i++) + if (c->states[i] == state) return 1; + return 0; +} + +int client_toggle_state(client *c, Atom state) +{ + int i, j, rc = 0; + for (i = 0, j = 0; i < ATOMLIST && c->states[i]; i++, j++) + { + if (c->states[i] == state) i++; + c->states[j] = c->states[i]; + } + if (i == j && j < ATOMLIST) + { + c->states[j++] = state; + rc = 1; + } + SETPROP_ATOM(c->window, atoms[_NET_WM_STATE], c->states, j); + if (state == atoms[_NET_WM_STATE_FULLSCREEN]) c->full = rc; + if (state == atoms[_NET_WM_STATE_ABOVE]) c->above = rc; + if (state == atoms[_NET_WM_STATE_DEMANDS_ATTENTION]) c->urgent = rc; + return rc; +} + +client* window_build_client(Window win) +{ + int i, j; XClassHint chint; XWMHints *hints; monitor *m; + if (win == None) return NULL; + + client *c = calloc(1, sizeof(client)); + c->window = win; + + if (XGetWindowAttributes(display, c->window, &c->attr)) + { + c->visible = c->attr.map_state == IsViewable ? 1:0; + XGetTransientForHint(display, c->window, &c->transient); + GETPROP_ATOM(win, atoms[_NET_WM_WINDOW_TYPE], &c->type, 1); + GETPROP_WIND(win, atoms[WM_CLIENT_LEADER], &c->leader, 1); + + c->manage = !c->attr.override_redirect + && c->type != atoms[_NET_WM_WINDOW_TYPE_DESKTOP] + && c->type != atoms[_NET_WM_WINDOW_TYPE_NOTIFICATION] + && c->type != atoms[_NET_WM_WINDOW_TYPE_DOCK] + && c->type != atoms[_NET_WM_WINDOW_TYPE_SPLASH] + ? 1:0; + + c->spot = SPOT1; m = &monitors[0]; + + for_monitors(i, m) + if (INTERSECT(m->x, m->y, m->w, m->h, c->attr.x + c->attr.width/2, c->attr.y+c->attr.height/2, 1, 1)) + { c->monitor = i; break; } + + for_spots_rev(i) + if (INTERSECT(m->spots[i].x, m->spots[i].y, m->spots[i].w, m->spots[i].h, + c->attr.x + c->attr.width/2, c->attr.y+c->attr.height/2, 1, 1)) + { c->spot = i; break; } + + if (c->manage) + for_monitors(i, m) for_spots(j) + if (m->bars[j] && m->bars[j]->window == c->window) + c->manage = 0; + + if (c->visible) + { + GETPROP_ATOM(c->window, atoms[_NET_WM_STATE], c->states, ATOMLIST); + c->urgent = client_has_state(c, atoms[_NET_WM_STATE_DEMANDS_ATTENTION]); + c->full = client_has_state(c, atoms[_NET_WM_STATE_FULLSCREEN]); + c->above = client_has_state(c, atoms[_NET_WM_STATE_ABOVE]); + + if ((hints = XGetWMHints(display, c->window))) + { + c->input = hints->flags & InputHint && hints->input ? 1:0; + c->urgent = c->urgent || hints->flags & XUrgencyHint ? 1:0; + XFree(hints); + } + if (XGetClassHint(display, c->window, &chint)) + { + c->class = strdup(chint.res_class); + XFree(chint.res_class); XFree(chint.res_name); + } + } + return c; + } + free(c); + return NULL; +} + +void client_free(client *c) +{ + if (!c) return; + free(c->class); + free(c); +} + +void client_update_border(client *c) +{ + XColor color; Colormap map = DefaultColormap(display, DefaultScreen(display)); + char *colorname = c->window == current ? BORDER_FOCUS: (c->urgent ? BORDER_URGENT: (c->above ? BORDER_ABOVE: BORDER_BLUR)); + XSetWindowBorder(display, c->window, XAllocNamedColor(display, map, colorname, &color, &color) ? color.pixel: None); + XSetWindowBorderWidth(display, c->window, c->full ? 0: BORDER); +} + +int client_send_wm_protocol(client *c, Atom protocol) +{ + Atom protocols[ATOMLIST]; int i, n; + if ((n = GETPROP_ATOM(c->window, atoms[WM_PROTOCOLS], protocols, ATOMLIST))) + for (i = 0; i < n; i++) if (protocols[i] == protocol) + return window_send_clientmessage(c->window, c->window, atoms[WM_PROTOCOLS], protocol, NoEventMask); + return 0; +} + +void client_place_spot(client *c, int spot, int mon, int force) +{ + if (!c) return; + int i; client *t; + + // try to center over our transient parent + if (!force && c->transient && (t = window_build_client(c->transient))) + { + spot = t->spot; + mon = t->monitor; + client_free(t); + } + else + // try to center over top-most window in our group + if (!force && c->leader && c->type == atoms[_NET_WM_WINDOW_TYPE_DIALOG]) + { + for_windows(i, t) if (t->manage && t->window != c->window && t->leader == c->leader) + { + spot = t->spot; + mon = t->monitor; + break; + } + } + c->spot = spot; c->monitor = mon; + + monitor *m = &monitors[c->monitor]; + int x = m->spots[spot].x, y = m->spots[spot].y, w = m->spots[spot].w, h = m->spots[spot].h; + + if (c->type == atoms[_NET_WM_WINDOW_TYPE_DIALOG]) + { + x += (w - c->attr.width)/2; + y += (h - c->attr.height)/2; + w = c->attr.width + BORDER*2; + h = c->attr.height + BORDER*2; + } + else + if (c->full) + { + XMoveResizeWindow(display, c->window, m->x, m->y, m->w, m->h); + return; + } + w -= BORDER*2; h -= BORDER*2; + int sw = w, sh = h; long sr; XSizeHints size; + + if (XGetWMNormalHints(display, c->window, &size, &sr)) + { + w = MIN(MAX(w, size.flags & PMinSize ? size.min_width : 16), size.flags & PMaxSize ? size.max_width : m->w); + h = MIN(MAX(h, size.flags & PMinSize ? size.min_height: 16), size.flags & PMaxSize ? size.max_height: m->h); + + if (size.flags & PResizeInc) + { + w -= (w - (size.flags & PBaseSize ? size.base_width : 0)) % size.width_inc; + h -= (h - (size.flags & PBaseSize ? size.base_height: 0)) % size.height_inc; + } + if (size.flags & PAspect) + { + double ratio = (double) w / h; + double minr = (double) size.min_aspect.x / size.min_aspect.y; + double maxr = (double) size.max_aspect.x / size.max_aspect.y; + if (ratio < minr) h = (int)(w / minr); + else if (ratio > maxr) w = (int)(h * maxr); + } + } + // center if smaller than supplied size + if (w < sw) x += (sw-w)/2; + if (h < sh) y += (sh-h)/2; + + // bump onto screen + x = MAX(m->x, MIN(x, m->x + m->w - w - BORDER*2)); + y = MAX(m->y, MIN(y, m->y + m->h - h - BORDER*2)); + + XMoveResizeWindow(display, c->window, x, y, w, h); +} + +void client_stack_family(client *c, stack *raise) +{ + int i; client *o, *self = NULL; + for_windows(i, o) + { + if (o->manage && o->visible && o->transient == c->window) + client_stack_family(o, raise); + else + if (o->visible && o->window == c->window) + self = o; + } + if (self) + { + raise->clients[raise->depth] = self; + raise->windows[raise->depth++] = self->window; + } +} + +void client_raise_family(client *c) +{ + if (!c) return; + int i; client *o; STACK_INIT(raise); STACK_INIT(family); + + for_windows(i, o) if (o->type == atoms[_NET_WM_WINDOW_TYPE_DOCK]) + client_stack_family(o, &raise); + + // above only counts for fullscreen windows + if (c->full) for_windows(i, o) if (o->above) + client_stack_family(o, &raise); + + while (c->transient && (o = window_build_client(c->transient))) + c = family.clients[family.depth++] = o; + + client_stack_family(c, &raise); + XRaiseWindow(display, raise.windows[0]); + XRestackWindows(display, raise.windows, raise.depth); + STACK_FREE(&family); +} + +void client_set_focus(client *c) +{ + if (!c || !c->visible || c->window == current) return; + client *o; Window old = current; + + current = c->window; + current_spot = c->spot; + current_mon = c->monitor; + + if (old && (o = window_build_client(old))) + { + client_update_border(o); + client_free(o); + } + client_send_wm_protocol(c, atoms[WM_TAKE_FOCUS]); + XSetInputFocus(display, c->input ? c->window: PointerRoot, RevertToPointerRoot, CurrentTime); + SETPROP_WIND(root, atoms[_NET_ACTIVE_WINDOW], &c->window, 1); + client_update_border(c); +} + +void client_activate(client *c) +{ + client_raise_family(c); + client_set_focus(c); +} diff --git a/config.h b/config.h index 72bc136..1cd7b21 100644 --- a/config.h +++ b/config.h @@ -6,6 +6,12 @@ #define BORDER_URGENT "Red" #define BORDER_ABOVE "Dark Green" +// Title bar xft font +#define TITLE "sans-10" +#define TITLE_BLUR "Black" +#define TITLE_FOCUS "Black" +#define TITLE_ELLIPSIS 30 + // There are three static tiles called SPOT1, SPOT2, and SPOT3. // Want more tiles? Different layouts? Floating? Go away ;) // ------------------------------- @@ -90,11 +96,22 @@ binding keys[] = { { .mod = ShiftMask|Mod4Mask, .key = XK_Down, .act = action_move_direction, .num = DOWN }, // Flip between the top two windows in the current spot. - { .mod = Mod4Mask, .key = XK_Tab, .act = action_other }, + { .mod = Mod4Mask, .key = XK_Tab, .act = action_raise_nth, .num = 1 }, // Cycle through all windows in the current spot. { .mod = Mod4Mask, .key = XK_grave, .act = action_cycle }, + // Raise nth window in the current spot. + { .mod = Mod4Mask, .key = XK_1, .act = action_raise_nth, .num = 1 }, + { .mod = Mod4Mask, .key = XK_2, .act = action_raise_nth, .num = 2 }, + { .mod = Mod4Mask, .key = XK_3, .act = action_raise_nth, .num = 3 }, + { .mod = Mod4Mask, .key = XK_4, .act = action_raise_nth, .num = 4 }, + { .mod = Mod4Mask, .key = XK_5, .act = action_raise_nth, .num = 5 }, + { .mod = Mod4Mask, .key = XK_6, .act = action_raise_nth, .num = 6 }, + { .mod = Mod4Mask, .key = XK_7, .act = action_raise_nth, .num = 7 }, + { .mod = Mod4Mask, .key = XK_8, .act = action_raise_nth, .num = 8 }, + { .mod = Mod4Mask, .key = XK_9, .act = action_raise_nth, .num = 9 }, + // Gracefully close the current window. { .mod = Mod4Mask, .key = XK_Escape, .act = action_close }, diff --git a/event.c b/event.c new file mode 100644 index 0000000..889f39e --- /dev/null +++ b/event.c @@ -0,0 +1,212 @@ +/* + +MIT/X11 License +Copyright (c) 2012 Sean Pringle + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +*/ + +void create_notify(XEvent *e) +{ + client *c = window_build_client(e->xcreatewindow.window); + if (c && c->manage) + window_listen(c->window); + client_free(c); +} + +void configure_request(XEvent *ev) +{ + XConfigureRequestEvent *e = &ev->xconfigurerequest; + client *c = window_build_client(e->window); + if (c && c->manage && c->visible && !c->transient) + { + client_update_border(c); + client_place_spot(c, c->spot, c->monitor, 0); + } + else + if (c) + { + XWindowChanges wc; + if (e->value_mask & CWX) wc.x = e->x; + if (e->value_mask & CWY) wc.y = e->y; + if (e->value_mask & CWWidth) wc.width = e->width; + if (e->value_mask & CWHeight) wc.height = e->height; + if (e->value_mask & CWStackMode) wc.stack_mode = e->detail; + if (e->value_mask & CWBorderWidth) wc.border_width = BORDER; + XConfigureWindow(display, c->window, e->value_mask, &wc); + } + client_free(c); +} + +void configure_notify(XEvent *e) +{ + client *c = window_build_client(e->xconfigure.window); + if (c && c->manage) + { + while (XCheckTypedEvent(display, ConfigureNotify, e)); + ewmh_client_list(); + update_bars(); + } + client_free(c); +} + +void map_request(XEvent *e) +{ + client *c = window_build_client(e->xmaprequest.window); + if (c && c->manage) + { + c->monitor = MONITOR_START == MONITOR_CURRENT ? current_mon: MONITOR_START; + c->monitor = MIN(nmonitors-1, MAX(0, c->monitor)); + monitor *m = &monitors[c->monitor]; + + int i, spot = SPOT_START == SPOT_CURRENT ? current_spot: SPOT_START; + + if (SPOT_START == SPOT_SMART) // find spot of best fit + { + spot = SPOT1; for_spots_rev(i) + if (c->attr.width <= m->spots[i].w && c->attr.height <= m->spots[i].h) + { spot = i; break; } + } + client_place_spot(c, spot, c->monitor, 0); + client_update_border(c); + } + if (c) XMapWindow(display, c->window); + client_free(c); +} + +void map_notify(XEvent *e) +{ + client *a = NULL, *c = window_build_client(e->xmap.window); + if (c && c->manage) + { + client_raise_family(c); + client_update_border(c); + // if no current window, or new window has opened in the current spot, focus it + if (FOCUS_START == FOCUS_STEAL || !(a = window_build_client(current)) || (a && a->spot == c->spot)) + client_set_focus(c); + client_free(a); + ewmh_client_list(); + update_bars(); + } + client_free(c); +} + +void unmap_notify(XEvent *e) +{ + // if this window was focused, find something else + if (e->xunmap.window == current && !spot_focus_top_window(current_spot, current_mon, current)) + { int i; for_spots(i) if (spot_focus_top_window(i, current_mon, current)) break; } + ewmh_client_list(); + update_bars(); +} + +void key_press(XEvent *ev) +{ + XKeyEvent *e = &ev->xkey; latest = e->time; + KeySym key = XkbKeycodeToKeysym(display, e->keycode, 0, 0); + unsigned int state = e->state & ~(LockMask|NumlockMask); + while (XCheckTypedEvent(display, KeyPress, ev)); + + binding *bind = NULL; + for (int i = 0; i < sizeof(keys)/sizeof(binding) && !bind; i++) + if (keys[i].key == key && (keys[i].mod == AnyModifier || keys[i].mod == state)) + bind = &keys[i]; + + if (bind && bind->act) + { + client *cli = window_build_client(current); + bind->act(bind->data, bind->num, cli); + client_free(cli); + } +} + +void button_press(XEvent *ev) +{ + XButtonEvent *e = &ev->xbutton; latest = e->time; + client *c = window_build_client(e->subwindow); + if (c && c->manage) + client_activate(c); + else + { + int i, j; monitor *m; + for_monitors(i, m) for_spots(j) + if (m->bars[j]->window == e->subwindow) + spot_focus_top_window(j, i, None); + } + client_free(c); + XAllowEvents(display, ReplayPointer, CurrentTime); +} + +void client_message(XEvent *ev) +{ + XClientMessageEvent *e = &ev->xclient; + if (e->message_type == atoms[XOAT_EXIT]) + { + warnx("exit!"); + exit(EXIT_SUCCESS); + } + if (e->message_type == atoms[XOAT_RESTART]) + { + warnx("restart!"); + EXECSH(self); + } + client *c = window_build_client(e->window); + if (c && c->manage) + { + if (e->message_type == atoms[_NET_ACTIVE_WINDOW]) client_activate(c); + if (e->message_type == atoms[_NET_CLOSE_WINDOW]) action_close(NULL, 0, c); + } + client_free(c); +} + +void property_notify(XEvent *ev) +{ + XPropertyEvent *e = &ev->xproperty; + + client *c = window_build_client(e->window); + if (c && c->visible && c->manage) + client_update_border(c); + client_free(c); + + if (e->atom == atoms[WM_NAME] || e->atom == atoms[_NET_WM_NAME]) + update_bars(); + + // clients that rapidly update stuff (eg, title) can spam events. + // consume as many as possible of the same window, type, and atom... + Atom atom = e->atom; + while (XCheckTypedWindowEvent(display, ev->xproperty.window, PropertyNotify, ev)) + if (ev->xproperty.atom != atom) { XPutBackEvent(display, ev); break; } +} + +void expose(XEvent *e) +{ + while (XCheckTypedEvent(display, Expose, e)); + update_bars(); +} + +void any_event(XEvent *e) +{ + client *c = window_build_client(e->xany.window); + if (c && c->visible && c->manage) + client_update_border(c); + client_free(c); +} + diff --git a/ewmh.c b/ewmh.c new file mode 100644 index 0000000..db1aaf2 --- /dev/null +++ b/ewmh.c @@ -0,0 +1,36 @@ +/* + +MIT/X11 License +Copyright (c) 2012 Sean Pringle + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +*/ + +void ewmh_client_list() +{ + int i; client *c; STACK_INIT(wins); + for_windows_rev(i, c) if (c->manage) + wins.windows[wins.depth++] = c->window; + SETPROP_WIND(root, atoms[_NET_CLIENT_LIST_STACKING], wins.windows, wins.depth); + // hack for now, since we dont track window mapping history + SETPROP_WIND(root, atoms[_NET_CLIENT_LIST], wins.windows, wins.depth); +} + diff --git a/setup.c b/setup.c new file mode 100644 index 0000000..5c6957d --- /dev/null +++ b/setup.c @@ -0,0 +1,210 @@ +/* + +MIT/X11 License +Copyright (c) 2012 Sean Pringle + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +*/ + +typedef struct { + long left, right, top, bottom, + ly1, ly2, ry1, ry3, + tx1, tx2, bx1, bx2; +} wm_strut; + +void setup() +{ + int i, j; client *c; monitor *m; + wm_strut struts; memset(&struts, 0, sizeof(wm_strut)); + + int screen_w = WidthOfScreen(DefaultScreenOfDisplay(display)); + int screen_h = HeightOfScreen(DefaultScreenOfDisplay(display)); + + // default non-multi-head setup + monitors[0].w = screen_w; + monitors[0].h = screen_h; + + // support multi-head. + XineramaScreenInfo *info; + if (XineramaIsActive(display) && (info = XineramaQueryScreens(display, &nmonitors))) + { + nmonitors = MIN(nmonitors, MONITORS); + for_monitors(i, m) + { + m->x = info[i].x_org; + m->y = info[i].y_org; + m->w = info[i].width; + m->h = info[i].height; + } + XFree(info); + } + + // detect and adjust for panel struts + for_windows(i, c) + { + wm_strut strut; memset(&strut, 0, sizeof(wm_strut)); + int v2 = GETPROP_LONG(c->window, atoms[_NET_WM_STRUT_PARTIAL], (unsigned long*)&strut, 12); + int v1 = v2 ? 0: GETPROP_LONG(c->window, atoms[_NET_WM_STRUT], (unsigned long*)&strut, 4); + if (!c->visible || (!v1 && !v2)) continue; + + for_monitors(j, m) + { + if (v1) + { + strut.ly1 = m->y; strut.ly2 = m->y + m->h; + strut.ry1 = m->y; strut.ry3 = m->y + m->h; + strut.tx1 = m->x; strut.tx2 = m->x + m->w; + strut.bx1 = m->x; strut.bx2 = m->x + m->w; + } + if (strut.left > 0 && !m->x + && INTERSECT(0, strut.ly1, strut.left, strut.ly2 - strut.ly1, m->x, m->y, m->w, m->h)) + { + m->x += strut.left; + m->w -= strut.left; + } + if (strut.right > 0 && m->x + m->w == screen_w + && INTERSECT(screen_w - strut.right, strut.ry1, strut.right, strut.ry3 - strut.ry1, m->x, m->y, m->w, m->h)) + { + m->w -= strut.right; + } + if (strut.top > 0 && !m->y + && INTERSECT(strut.tx1, 0, strut.tx2 - strut.tx1, strut.top, m->x, m->y, m->w, m->h)) + { + m->y += strut.top; + m->h -= strut.top; + } + if (strut.bottom > 0 && m->y + m->h == screen_h + && INTERSECT(strut.bx1, screen_h - strut.bottom, strut.bx2 - strut.bx1, strut.bottom, m->x, m->y, m->w, m->h)) + { + m->h -= strut.bottom; + } + } + } + + // calculate spot boxes + for_monitors(i, m) + { + int x = m->x, y = m->y, w = m->w, h = m->h; + // monitor rotated? + if (m->w < m->h) + { + int height_spot1 = (double)h / 100 * MIN(90, MAX(10, SPOT1_WIDTH_PCT)); + int width_spot2 = (double)w / 100 * MIN(90, MAX(10, SPOT2_HEIGHT_PCT)); + for_spots(j) + { + m->spots[j].x = x; + m->spots[j].y = SPOT1_ALIGN == SPOT1_LEFT ? y: y + h - height_spot1; + m->spots[j].w = w; + m->spots[j].h = height_spot1; + if (j == SPOT1) continue; + + m->spots[j].y = SPOT1_ALIGN == SPOT1_LEFT ? y + height_spot1: y; + m->spots[j].h = h - height_spot1; + m->spots[j].w = w - width_spot2; + if (j == SPOT3) continue; + + m->spots[j].x = x + w - width_spot2; + m->spots[j].w = width_spot2; + } + continue; + } + int width_spot1 = (double)w / 100 * MIN(90, MAX(10, SPOT1_WIDTH_PCT)); + int height_spot2 = (double)h / 100 * MIN(90, MAX(10, SPOT2_HEIGHT_PCT)); + for_spots(j) + { + m->spots[j].x = SPOT1_ALIGN == SPOT1_LEFT ? x: x + w - width_spot1; + m->spots[j].y = y; + m->spots[j].w = width_spot1; + m->spots[j].h = h; + if (j == SPOT1) continue; + + m->spots[j].x = SPOT1_ALIGN == SPOT1_LEFT ? x + width_spot1: x; + m->spots[j].w = w - width_spot1; + m->spots[j].h = height_spot2; + if (j == SPOT2) continue; + + m->spots[j].y = y + height_spot2; + m->spots[j].h = h - height_spot2; + } + } + + // become the window manager + XSelectInput(display, root, StructureNotifyMask | SubstructureRedirectMask | SubstructureNotifyMask); + + // ewmh support + unsigned long pid = getpid(); + ewmh = XCreateSimpleWindow(display, root, 0, 0, 1, 1, 0, 0, 0); + + SETPROP_ATOM(root, atoms[_NET_SUPPORTED], atoms, ATOMS); + SETPROP_WIND(root, atoms[_NET_SUPPORTING_WM_CHECK], &ewmh, 1); + SETPROP_LONG(ewmh, atoms[_NET_WM_PID], &pid, 1); + + XChangeProperty(display, ewmh, atoms[_NET_WM_NAME], XA_STRING, 8, PropModeReplace, (const unsigned char*)"xoat", 4); + + // figure out NumlockMask + XModifierKeymap *modmap = XGetModifierMapping(display); + for (i = 0; i < 8; i++) + for (j = 0; j < (int)modmap->max_keypermod; j++) + if (modmap->modifiermap[i*modmap->max_keypermod+j] == XKeysymToKeycode(display, XK_Num_Lock)) + { NumlockMask = (1<bars[j] = textbox_create(root, TB_AUTOHEIGHT|TB_LEFT, m->spots[j].x, m->spots[j].y, m->spots[j].w, 0, + TITLE, TITLE_BLUR, BORDER_BLUR, NULL, NULL); + XSelectInput(display, m->bars[j]->window, ExposureMask); + + m->spots[j].y += m->bars[j]->h; + m->spots[j].h -= m->bars[j]->h; + spot_update_bar(j, i); + } + } + + // setup existing managable windows + STACK_FREE(&windows); + for_windows(i, c) if (c->manage) + { + window_listen(c->window); + client_update_border(c); + client_place_spot(c, c->spot, c->monitor, 0); + if (!current) client_activate(c); + } +} diff --git a/spot.c b/spot.c new file mode 100644 index 0000000..b452cff --- /dev/null +++ b/spot.c @@ -0,0 +1,114 @@ +/* + +MIT/X11 License +Copyright (c) 2012 Sean Pringle + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +*/ + +void spot_update_bar(int spot, int mon) +{ + int i, n = 0; client *o, *c = NULL; + monitor *m = &monitors[mon]; + + char *title = calloc(1024, sizeof(char)); + int len = 0, lim = 1024; + + for_windows(i, o) if (o->manage && o->spot == spot && o->monitor == mon) + { + if (!c) c = o; + char *name = NULL; + if (!(name = window_get_text_prop(o->window, atoms[_NET_WM_NAME]))) + { + char *tmp; + if (XFetchName(display, o->window, &tmp)) + { + name = strdup(tmp); + XFree(tmp); + } + } + if (name) + { + if (TITLE_ELLIPSIS && strlen(name) > TITLE_ELLIPSIS) + { + name = realloc(name, strlen(name)+4); + strcpy(name+TITLE_ELLIPSIS, "..."); + } + len += snprintf(title+len, MAX(0, lim-len), " [%d] %s ", n++, name); + free(name); + } + } + if (c && !c->full && title && m->bars[spot]) + { + int focus = c->window == current || (spot == current_spot && mon == current_mon); + char *color = focus && c->window == current ? TITLE_FOCUS : TITLE_BLUR; + char *border = focus && c->window == current ? BORDER_FOCUS: BORDER_BLUR; + textbox_font(m->bars[spot], TITLE, color, border); + textbox_text(m->bars[spot], title); + textbox_draw(m->bars[spot]); + textbox_show(m->bars[spot]); + } + else + if (m->bars[spot]) + textbox_hide(m->bars[spot]); + free(title); +} + +void update_bars() +{ + int i, j; monitor *m; + for_monitors(i, m) for_spots(j) + spot_update_bar(j, i); +} + +Window spot_focus_top_window(int spot, int mon, Window except) +{ + int i; client *c; + for_windows(i, c) + { + if (c->window != except && c->manage && c->spot == spot && c->monitor == mon) + { + client_raise_family(c); + client_set_focus(c); + return c->window; + } + } + return None; +} + +int spot_choose_by_direction(int spot, int mon, int dir) +{ + monitor *m = &monitors[mon]; + if (m->w < m->h) // rotated? + { + if (dir == LEFT) return SPOT3; + if (dir == RIGHT) return SPOT2; + if (dir == UP) return SPOT1_ALIGN == SPOT1_LEFT ? SPOT1: SPOT2; + if (dir == DOWN) return SPOT1_ALIGN == SPOT1_LEFT ? SPOT2: SPOT1; + return spot; + } + if (dir == UP) return SPOT2; + if (dir == DOWN) return SPOT3; + if (dir == LEFT) return SPOT1_ALIGN == SPOT1_LEFT ? SPOT1: SPOT2; + if (dir == RIGHT) return SPOT1_ALIGN == SPOT1_LEFT ? SPOT2: SPOT1; + return spot; +} + diff --git a/textbox.c b/textbox.c new file mode 100644 index 0000000..ff13cca --- /dev/null +++ b/textbox.c @@ -0,0 +1,374 @@ +/* + +MIT/X11 License +Copyright (c) 2012 Sean Pringle + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +*/ + +#define TB_AUTOHEIGHT 1<<0 +#define TB_AUTOWIDTH 1<<1 +#define TB_LEFT 1<<16 +#define TB_RIGHT 1<<17 +#define TB_CENTER 1<<18 +#define TB_EDITABLE 1<<19 + +typedef struct { + unsigned long flags; + Window window, parent; + short x, y, w, h; + short cursor; + XftFont *font; + XftColor color_fg, color_bg; + char *text, *prompt; + XIM xim; + XIC xic; + XGlyphInfo extents; +} textbox; + +void textbox_font(textbox *tb, char *font, char *fg, char *bg); +void textbox_text(textbox *tb, char *text); +void textbox_moveresize(textbox *tb, int x, int y, int w, int h); + +// Xft text box, optionally editable +textbox* textbox_create(Window parent, unsigned long flags, short x, short y, short w, short h, char *font, char *fg, char *bg, char *text, char *prompt) +{ + textbox *tb = calloc(1, sizeof(textbox)); + + tb->flags = flags; + tb->parent = parent; + + tb->x = x; tb->y = y; tb->w = MAX(1, w); tb->h = MAX(1, h); + + XColor color; Colormap map = DefaultColormap(display, DefaultScreen(display)); + unsigned int cp = XAllocNamedColor(display, map, bg, &color, &color) ? color.pixel: None; + + tb->window = XCreateSimpleWindow(display, tb->parent, tb->x, tb->y, tb->w, tb->h, 0, None, cp); + + // need to preload the font to calc line height + textbox_font(tb, font, fg, bg); + + tb->prompt = strdup(prompt ? prompt: ""); + textbox_text(tb, text ? text: ""); + + // auto height/width modes get handled here + textbox_moveresize(tb, tb->x, tb->y, tb->w, tb->h); + + // edit mode controls + if (tb->flags & TB_EDITABLE) + { + tb->xim = XOpenIM(display, NULL, NULL, NULL); + tb->xic = XCreateIC(tb->xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing, XNClientWindow, tb->window, XNFocusWindow, tb->window, NULL); + } + + return tb; +} + +// set an Xft font by name +void textbox_font(textbox *tb, char *font, char *fg, char *bg) +{ + if (tb->font) XftFontClose(display, tb->font); + tb->font = XftFontOpenName(display, DefaultScreen(display), font); + + XftColorAllocName(display, DefaultVisual(display, DefaultScreen(display)), DefaultColormap(display, DefaultScreen(display)), fg, &tb->color_fg); + XftColorAllocName(display, DefaultVisual(display, DefaultScreen(display)), DefaultColormap(display, DefaultScreen(display)), bg, &tb->color_bg); +} + +// outer code may need line height, width, etc +void textbox_extents(textbox *tb) +{ + int length = strlen(tb->text) + strlen(tb->prompt); + char *line = alloca(length + 1); + sprintf(line, "%s%s", tb->prompt, tb->text); + XftTextExtents8(display, tb->font, (unsigned char*)line, length, &tb->extents); +} + +// set the default text to display +void textbox_text(textbox *tb, char *text) +{ + if (tb->text) free(tb->text); + tb->text = strdup(text ? text: ""); + tb->cursor = MAX(0, MIN(strlen(tb->text), tb->cursor)); + textbox_extents(tb); +} + +// set an input prompt for edit mode +void textbox_prompt(textbox *tb, char *text) +{ + if (tb->prompt) free(tb->prompt); + tb->prompt = strdup(text); + textbox_extents(tb); +} + +// within the parent. handled auto width/height modes +void textbox_moveresize(textbox *tb, int x, int y, int w, int h) +{ + if (tb->flags & TB_AUTOHEIGHT) + h = tb->font->ascent + tb->font->descent; + + if (tb->flags & TB_AUTOWIDTH) + w = tb->extents.width; + + if (x != tb->x || y != tb->y || w != tb->w || h != tb->h) + { + tb->x = x; tb->y = y; tb->w = MAX(1, w); tb->h = MAX(1, h); + XMoveResizeWindow(display, tb->window, tb->x, tb->y, tb->w, tb->h); + } +} + +void textbox_show(textbox *tb) +{ + XMapWindow(display, tb->window); +} + +void textbox_hide(textbox *tb) +{ + XUnmapWindow(display, tb->window); +} + +// will also unmap the window if still displayed +void textbox_free(textbox *tb) +{ + if (tb->flags & TB_EDITABLE) + { + XDestroyIC(tb->xic); + XCloseIM(tb->xim); + } + + if (tb->text) free(tb->text); + if (tb->prompt) free(tb->prompt); + if (tb->font) XftFontClose(display, tb->font); + + XDestroyWindow(display, tb->window); + free(tb); +} + +void textbox_draw(textbox *tb) +{ + int i; + XGlyphInfo extents; + + GC context = XCreateGC(display, tb->window, 0, 0); + Pixmap canvas = XCreatePixmap(display, tb->window, tb->w, tb->h, DefaultDepth(display, DefaultScreen(display))); + XftDraw *draw = XftDrawCreate(display, canvas, DefaultVisual(display, DefaultScreen(display)), DefaultColormap(display, DefaultScreen(display))); + + // clear canvas + XftDrawRect(draw, &tb->color_bg, 0, 0, tb->w, tb->h); + + char *line = tb->text, + *text = tb->text ? tb->text: "", + *prompt = tb->prompt ? tb->prompt: ""; + + int text_len = strlen(text); + int length = text_len; + int line_height = tb->font->ascent + tb->font->descent; + int line_width = 0; + + int cursor_x = 0; + int cursor_offset = 0; + int cursor_width = MAX(2, line_height/10); + + if (tb->flags & TB_EDITABLE) + { + int prompt_len = strlen(prompt); + length = text_len + prompt_len; + cursor_offset = MIN(tb->cursor + prompt_len, length); + + line = alloca(length + 10); + sprintf(line, "%s%s", prompt, text); + + // replace spaces so XftTextExtents8 includes their width + for (i = 0; i < length; i++) if (isspace(line[i])) line[i] = '_'; + + // calc cursor position + XftTextExtents8(display, tb->font, (unsigned char*)line, cursor_offset, &extents); + cursor_x = extents.width; + + // restore correct text string with spaces + sprintf(line, "%s%s", prompt, text); + } + + // calc full input text width + XftTextExtents8(display, tb->font, (unsigned char*)line, length, &extents); + line_width = extents.width; + + int x = 0, y = tb->font->ascent; + if (tb->flags & TB_RIGHT) x = tb->w - line_width; + if (tb->flags & TB_CENTER) x = MAX(0, (tb->w - line_width) / 2); + + // draw the text, including any prompt in edit mode + XftDrawString8(draw, &tb->color_fg, tb->font, x, y, (unsigned char*)line, length); + + // draw the cursor + if (tb->flags & TB_EDITABLE) + XftDrawRect(draw, &tb->color_fg, cursor_x, 2, cursor_width, line_height-4); + + // flip canvas to window + XCopyArea(display, canvas, tb->window, context, 0, 0, tb->w, tb->h, 0, 0); + + XFreeGC(display, context); + XftDrawDestroy(draw); + XFreePixmap(display, canvas); +} + +// cursor handling for edit mode +void textbox_cursor(textbox *tb, int pos) +{ + tb->cursor = MAX(0, MIN(strlen(tb->text), pos)); +} + +// move right +void textbox_cursor_inc(textbox *tb) +{ + textbox_cursor(tb, tb->cursor+1); +} + +// move left +void textbox_cursor_dec(textbox *tb) +{ + textbox_cursor(tb, tb->cursor-1); +} + +// beginning of line +void textbox_cursor_home(textbox *tb) +{ + tb->cursor = 0; +} + +// end of line +void textbox_cursor_end(textbox *tb) +{ + tb->cursor = strlen(tb->text); +} + +// insert text +void textbox_insert(textbox *tb, int pos, char *str) +{ + int len = strlen(tb->text), slen = strlen(str); + pos = MAX(0, MIN(len, pos)); + // expand buffer + tb->text = realloc(tb->text, len + slen + 1); + // move everything after cursor upward + char *at = tb->text + pos; + memmove(at + slen, at, len - pos + 1); + // insert new str + memmove(at, str, slen); + textbox_extents(tb); +} + +// remove text +void textbox_delete(textbox *tb, int pos, int dlen) +{ + int len = strlen(tb->text); + pos = MAX(0, MIN(len, pos)); + // move everything after pos+dlen down + char *at = tb->text + pos; + memmove(at, at + dlen, len - pos); + textbox_extents(tb); +} + +// insert one character +void textbox_cursor_ins(textbox *tb, char c) +{ + char tmp[2] = { c, 0 }; + textbox_insert(tb, tb->cursor, tmp); + textbox_cursor_inc(tb); +} + +// delete on character +void textbox_cursor_del(textbox *tb) +{ + textbox_delete(tb, tb->cursor, 1); +} + +// back up and delete one character +void textbox_cursor_bkspc(textbox *tb) +{ + if (tb->cursor > 0) + { + textbox_cursor_dec(tb); + textbox_cursor_del(tb); + } +} + +// handle a keypress in edit mode +// 0 = unhandled +// 1 = handled +// -1 = handled and return pressed (finished) +int textbox_keypress(textbox *tb, XEvent *ev) +{ + KeySym key; Status stat; + char pad[32]; int len; + + if (!(tb->flags & TB_EDITABLE)) return 0; + + len = XmbLookupString(tb->xic, &ev->xkey, pad, sizeof(pad), &key, &stat); + pad[len] = 0; + + if (key == XK_Left) + { + textbox_cursor_dec(tb); + return 1; + } + else + if (key == XK_Right) + { + textbox_cursor_inc(tb); + return 1; + } + else + if (key == XK_Home) + { + textbox_cursor_home(tb); + return 1; + } + else + if (key == XK_End) + { + textbox_cursor_end(tb); + return 1; + } + else + if (key == XK_Delete) + { + textbox_cursor_del(tb); + return 1; + } + else + if (key == XK_BackSpace) + { + textbox_cursor_bkspc(tb); + return 1; + } + else + if (key == XK_Return) + { + return -1; + } + else + if (!iscntrl(*pad)) + { + textbox_insert(tb, tb->cursor, pad); + textbox_cursor_inc(tb); + return 1; + } + return 0; +} diff --git a/window.c b/window.c new file mode 100644 index 0000000..69e0c75 --- /dev/null +++ b/window.c @@ -0,0 +1,115 @@ +/* + +MIT/X11 License +Copyright (c) 2012 Sean Pringle + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +*/ + +int window_get_prop(Window w, Atom prop, Atom *type, int *items, void *buffer, int bytes) +{ + memset(buffer, 0, bytes); + int format; unsigned long nitems, nbytes; unsigned char *ret = NULL; + if (XGetWindowProperty(display, w, prop, 0, bytes/4, False, AnyPropertyType, type, + &format, &nitems, &nbytes, &ret) == Success && ret && *type != None && format) + { + if (format == 8) memmove(buffer, ret, MIN(bytes, nitems)); + if (format == 16) memmove(buffer, ret, MIN(bytes, nitems * sizeof(short))); + if (format == 32) memmove(buffer, ret, MIN(bytes, nitems * sizeof(long))); + *items = (int)nitems; XFree(ret); + return 1; + } + return 0; +} + +// retrieve a text property from a window +// technically we could use window_get_prop(), but this is better for character set support +char* window_get_text_prop(Window w, Atom atom) +{ + XTextProperty prop; char *res = NULL; + char **list = NULL; int count; + if (XGetTextProperty(display, w, &prop, atom) && prop.value && prop.nitems) + { + if (prop.encoding == XA_STRING) + { + res = malloc(strlen((char*)prop.value)+1); + strcpy(res, (char*)prop.value); + } + else + if (XmbTextPropertyToTextList(display, &prop, &list, &count) >= Success && count > 0 && *list) + { + res = malloc(strlen(*list)+1); + strcpy(res, *list); + XFreeStringList(list); + } + } + if (prop.value) XFree(prop.value); + return res; +} + +Atom wgp_type; int wgp_items; + +#define GETPROP_ATOM(w, a, l, c) (window_get_prop((w), (a), &wgp_type, &wgp_items, (l), (c)*sizeof(Atom)) && wgp_type == XA_ATOM ? wgp_items:0) +#define GETPROP_LONG(w, a, l, c) (window_get_prop((w), (a), &wgp_type, &wgp_items, (l), (c)*sizeof(unsigned long)) && wgp_type == XA_CARDINAL ? wgp_items:0) +#define GETPROP_WIND(w, a, l, c) (window_get_prop((w), (a), &wgp_type, &wgp_items, (l), (c)*sizeof(Window)) && wgp_type == XA_WINDOW ? wgp_items:0) + +#define SETPROP_ATOM(w, p, a, c) XChangeProperty(display, (w), (p), XA_ATOM, 32, PropModeReplace, (unsigned char*)(a), (c)) +#define SETPROP_LONG(w, p, a, c) XChangeProperty(display, (w), (p), XA_CARDINAL, 32, PropModeReplace, (unsigned char*)(a), (c)) +#define SETPROP_WIND(w, p, a, c) XChangeProperty(display, (w), (p), XA_WINDOW, 32, PropModeReplace, (unsigned char*)(a), (c)) + +int window_send_clientmessage(Window target, Window subject, Atom atom, unsigned long protocol, unsigned long mask) +{ + XEvent e; + e.xclient.type = ClientMessage; + e.xclient.message_type = atom; + e.xclient.window = subject; + e.xclient.data.l[0] = protocol; + e.xclient.data.l[1] = latest; + e.xclient.send_event = True; + e.xclient.format = 32; + int r = XSendEvent(display, target, False, mask, &e) ?1:0; + XFlush(display); + return r; +} + +void window_listen(Window win) +{ + XSelectInput(display, win, EnterWindowMask | LeaveWindowMask | FocusChangeMask | PropertyChangeMask); +} + +// build windows cache +void query_windows() +{ + unsigned int nwins; int i; Window w1, w2, *wins; client *c; + if (windows.depth || !(XQueryTree(display, root, &w1, &w2, &wins, &nwins) && wins)) + return; + for (i = nwins-1; i > -1 && windows.depth < STACK; i--) + { + if ((c = window_build_client(wins[i])) && c->visible) + { + windows.clients[windows.depth] = c; + windows.windows[windows.depth++] = wins[i]; + } + else client_free(c); + } + XFree(wins); +} + diff --git a/xoat.c b/xoat.c index 62ff604..5bf01fd 100644 --- a/xoat.c +++ b/xoat.c @@ -34,6 +34,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include +#include #include #include #include @@ -45,53 +46,17 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#define ATOM_ENUM(x) x -#define ATOM_CHAR(x) #x - -#define GENERAL_ATOMS(X) \ - X(XOAT_SPOT),\ - X(XOAT_EXIT),\ - X(XOAT_RESTART),\ - X(_NET_SUPPORTED),\ - X(_NET_ACTIVE_WINDOW),\ - X(_NET_CLOSE_WINDOW),\ - X(_NET_CLIENT_LIST_STACKING),\ - X(_NET_CLIENT_LIST),\ - X(_NET_SUPPORTING_WM_CHECK),\ - X(_NET_WM_NAME),\ - X(_NET_WM_PID),\ - X(_NET_WM_STRUT),\ - X(_NET_WM_STRUT_PARTIAL),\ - X(_NET_WM_WINDOW_TYPE),\ - X(_NET_WM_WINDOW_TYPE_DESKTOP),\ - X(_NET_WM_WINDOW_TYPE_DOCK),\ - X(_NET_WM_WINDOW_TYPE_SPLASH),\ - X(_NET_WM_WINDOW_TYPE_NOTIFICATION),\ - X(_NET_WM_WINDOW_TYPE_DIALOG),\ - X(_NET_WM_STATE),\ - X(_NET_WM_STATE_FULLSCREEN),\ - X(_NET_WM_STATE_ABOVE),\ - X(_NET_WM_STATE_DEMANDS_ATTENTION),\ - X(WM_DELETE_WINDOW),\ - X(WM_CLIENT_LEADER),\ - X(WM_TAKE_FOCUS),\ - X(WM_PROTOCOLS) - -enum { GENERAL_ATOMS(ATOM_ENUM), ATOMS }; -const char *atom_names[] = { GENERAL_ATOMS(ATOM_CHAR) }; -Atom atoms[ATOMS]; - #define MAX(a, b) ((a) > (b) ? (a) : (b)) #define MIN(a, b) ((a) < (b) ? (a) : (b)) -#define OVERLAP(a,b,c,d) (((a)==(c) && (b)==(d)) || MIN((a)+(b), (c)+(d)) - MAX((a), (c)) > 0) -#define INTERSECT(x,y,w,h,x1,y1,w1,h1) (OVERLAP((x),(w),(x1),(w1)) && OVERLAP((y),(h),(y1),(h1))) -#define EXECSH(cmd) execlp("/bin/sh", "sh", "-c", (cmd), NULL) -#define MAX_STRUT 150 -#define MAX_MONITORS 3 -#define MAX_ATOMLIST 10 +Display *display; + +#include "atom.c" +#include "textbox.c" + #define STACK 64 - +#define MONITORS 3 +#define ATOMLIST 10 enum { MONITOR_CURRENT=-1 }; enum { SPOT1=1, SPOT2, SPOT3, SPOT_CURRENT, SPOT_SMART, SPOT1_LEFT, SPOT1_RIGHT }; enum { FOCUS_IGNORE=1, FOCUS_STEAL, }; @@ -104,35 +69,25 @@ typedef struct { typedef struct { short x, y, w, h; box spots[SPOT3+1]; + textbox *bars[SPOT3+1]; } monitor; typedef struct { Window window; XWindowAttributes attr; Window transient, leader; - Atom type, states[MAX_ATOMLIST+1]; + Atom type, states[ATOMLIST+1]; short monitor, visible, manage, input, urgent, full, above; unsigned long spot; char *class; } client; -void client_free(client*); - -typedef struct { - long left, right, top, bottom, - ly1, ly2, ry1, ry3, - tx1, tx2, bx1, bx2; -} wm_strut; - typedef struct { short depth; client *clients[STACK]; Window windows[STACK]; } stack; -#define STACK_INIT(n) stack (n); memset(&(n), 0, sizeof(stack)) -#define STACK_FREE(s) while ((s)->depth) client_free((s)->clients[--(s)->depth]) - typedef struct { unsigned int mod; KeySym key; @@ -141,13 +96,15 @@ typedef struct { int num; } binding; +client* window_build_client(Window); +void client_free(client*); void action_move(void*, int, client*); void action_focus(void*, int, client*); void action_move_direction(void*, int, client*); void action_focus_direction(void*, int, client*); void action_close(void*, int, client*); void action_cycle(void*, int, client*); -void action_other(void*, int, client*); +void action_raise_nth(void*, int, client*); void action_command(void*, int, client*); void action_find_or_start(void*, int, client*); void action_move_monitor(void*, int, client*); @@ -159,16 +116,12 @@ void action_rollback(void*, int, client*); #include "config.h" -Display *display; -Time latest; -char *self; -unsigned int NumlockMask; -monitor monitors[MAX_MONITORS]; -int nmonitors = 1; -short current_spot, current_mon; -Window root, ewmh, current = None; -stack windows, snapshot; -static int (*xerror)(Display *, XErrorEvent *); +#define EXECSH(cmd) execlp("/bin/sh", "sh", "-c", (cmd), NULL) +#define OVERLAP(a,b,c,d) (((a)==(c) && (b)==(d)) || MIN((a)+(b), (c)+(d)) - MAX((a), (c)) > 0) +#define INTERSECT(x,y,w,h,x1,y1,w1,h1) (OVERLAP((x),(w),(x1),(w1)) && OVERLAP((y),(h),(y1),(h1))) + +#define STACK_INIT(n) stack (n); memset(&(n), 0, sizeof(stack)) +#define STACK_FREE(s) while ((s)->depth) client_free((s)->clients[--(s)->depth]) #define for_windows(i,c)\ for (query_windows(), (i) = 0; (i) < windows.depth; (i)++)\ @@ -184,6 +137,19 @@ static int (*xerror)(Display *, XErrorEvent *); #define for_spots_rev(i)\ for ((i) = SPOT3; (i) >= SPOT1; (i)--) +#define for_monitors(i, m)\ + for ((i) = 0; (i) < nmonitors && (m = &monitors[(i)]); (i)++) + +Time latest; +char *self; +unsigned int NumlockMask; +monitor monitors[MONITORS]; +int nmonitors = 1; +short current_spot, current_mon; +Window root, ewmh, current = None; +stack windows, snapshot; +static int (*xerror)(Display *, XErrorEvent *); + void catch_exit(int sig) { while (0 < waitpid(-1, NULL, WNOHANG)); @@ -191,16 +157,37 @@ void catch_exit(int sig) void exec_cmd(char *cmd) { - if (!cmd || !cmd[0]) return; signal(SIGCHLD, catch_exit); - if (fork()) return; - + if (!cmd || !cmd[0] || fork()) return; setsid(); EXECSH(cmd); exit(EXIT_FAILURE); } -// X error handler +#include "window.c" +#include "ewmh.c" +#include "client.c" +#include "spot.c" +#include "event.c" +#include "action.c" +#include "setup.c" + +void (*handlers[LASTEvent])(XEvent*) = { + [CreateNotify] = create_notify, + [ConfigureRequest] = configure_request, + [ConfigureNotify] = configure_notify, + [MapRequest] = map_request, + [MapNotify] = map_notify, + [UnmapNotify] = unmap_notify, + [KeyPress] = key_press, + [ButtonPress] = button_press, + [ClientMessage] = client_message, + [PropertyNotify] = property_notify, + [Expose] = expose, + [FocusIn] = any_event, + [FocusOut] = any_event, +}; + int oops(Display *d, XErrorEvent *ee) { if (ee->error_code == BadWindow @@ -213,668 +200,15 @@ int oops(Display *d, XErrorEvent *ee) return xerror(display, ee); } -int window_get_prop(Window w, Atom prop, Atom *type, int *items, void *buffer, int bytes) -{ - memset(buffer, 0, bytes); - int format; unsigned long nitems, nbytes; unsigned char *ret = NULL; - if (XGetWindowProperty(display, w, prop, 0, bytes/4, False, AnyPropertyType, type, - &format, &nitems, &nbytes, &ret) == Success && ret && *type != None && format) - { - if (format == 8) memmove(buffer, ret, MIN(bytes, nitems)); - if (format == 16) memmove(buffer, ret, MIN(bytes, nitems * sizeof(short))); - if (format == 32) memmove(buffer, ret, MIN(bytes, nitems * sizeof(long))); - *items = (int)nitems; XFree(ret); - return 1; - } - return 0; -} - -Atom wgp_type; int wgp_items; - -#define GETPROP_ATOM(w, a, l, c) (window_get_prop((w), (a), &wgp_type, &wgp_items, (l), (c)*sizeof(Atom)) && wgp_type == XA_ATOM ? wgp_items:0) -#define GETPROP_LONG(w, a, l, c) (window_get_prop((w), (a), &wgp_type, &wgp_items, (l), (c)*sizeof(unsigned long)) && wgp_type == XA_CARDINAL ? wgp_items:0) -#define GETPROP_WIND(w, a, l, c) (window_get_prop((w), (a), &wgp_type, &wgp_items, (l), (c)*sizeof(Window)) && wgp_type == XA_WINDOW ? wgp_items:0) - -#define SETPROP_ATOM(w, p, a, c) XChangeProperty(display, (w), (p), XA_ATOM, 32, PropModeReplace, (unsigned char*)(a), (c)) -#define SETPROP_LONG(w, p, a, c) XChangeProperty(display, (w), (p), XA_CARDINAL, 32, PropModeReplace, (unsigned char*)(a), (c)) -#define SETPROP_WIND(w, p, a, c) XChangeProperty(display, (w), (p), XA_WINDOW, 32, PropModeReplace, (unsigned char*)(a), (c)) - -int client_has_state(client *c, Atom state) -{ - for (int i = 0; i < MAX_ATOMLIST && c->states[i]; i++) - if (c->states[i] == state) return 1; - return 0; -} - -void client_update_border(client *c) -{ - XColor color; Colormap map = DefaultColormap(display, DefaultScreen(display)); - char *colorname = c->window == current ? BORDER_FOCUS: (c->urgent ? BORDER_URGENT: (c->above ? BORDER_ABOVE: BORDER_BLUR)); - XSetWindowBorder(display, c->window, XAllocNamedColor(display, map, colorname, &color, &color) ? color.pixel: None); - XSetWindowBorderWidth(display, c->window, c->full ? 0: BORDER); -} - -int client_toggle_state(client *c, Atom state) -{ - int i, j, rc = 0; - for (i = 0, j = 0; i < MAX_ATOMLIST && c->states[i]; i++, j++) - { - if (c->states[i] == state) i++; - c->states[j] = c->states[i]; - } - if (i == j && j < MAX_ATOMLIST) - { - c->states[j++] = state; - rc = 1; - } - SETPROP_ATOM(c->window, atoms[_NET_WM_STATE], c->states, j); - if (state == atoms[_NET_WM_STATE_FULLSCREEN]) c->full = rc; - if (state == atoms[_NET_WM_STATE_ABOVE]) c->above = rc; - if (state == atoms[_NET_WM_STATE_DEMANDS_ATTENTION]) c->urgent = rc; - return rc; -} - -client* window_build_client(Window win) -{ - int i; XClassHint chint; XWMHints *hints; - if (win == None) return NULL; - - client *c = calloc(1, sizeof(client)); - c->window = win; - - if (XGetWindowAttributes(display, c->window, &c->attr)) - { - c->visible = c->attr.map_state == IsViewable ? 1:0; - XGetTransientForHint(display, c->window, &c->transient); - GETPROP_ATOM(win, atoms[_NET_WM_WINDOW_TYPE], &c->type, 1); - GETPROP_WIND(win, atoms[WM_CLIENT_LEADER], &c->leader, 1); - - c->manage = !c->attr.override_redirect - && c->type != atoms[_NET_WM_WINDOW_TYPE_DESKTOP] - && c->type != atoms[_NET_WM_WINDOW_TYPE_NOTIFICATION] - && c->type != atoms[_NET_WM_WINDOW_TYPE_DOCK] - && c->type != atoms[_NET_WM_WINDOW_TYPE_SPLASH] - ? 1:0; - - for (i = 0; i < nmonitors; i++) - if (INTERSECT(monitors[i].x, monitors[i].y, monitors[i].w, monitors[i].h, - c->attr.x + c->attr.width/2, c->attr.y+c->attr.height/2, 1, 1)) - { c->monitor = i; break; } - - monitor *m = &monitors[c->monitor]; - - c->spot = SPOT1; for_spots_rev(i) - if (INTERSECT(m->spots[i].x, m->spots[i].y, m->spots[i].w, m->spots[i].h, - c->attr.x + c->attr.width/2, c->attr.y+c->attr.height/2, 1, 1)) - { c->spot = i; break; } - - if (c->visible) - { - GETPROP_ATOM(c->window, atoms[_NET_WM_STATE], c->states, MAX_ATOMLIST); - c->urgent = client_has_state(c, atoms[_NET_WM_STATE_DEMANDS_ATTENTION]); - c->full = client_has_state(c, atoms[_NET_WM_STATE_FULLSCREEN]); - c->above = client_has_state(c, atoms[_NET_WM_STATE_ABOVE]); - - if ((hints = XGetWMHints(display, c->window))) - { - c->input = hints->flags & InputHint && hints->input ? 1:0; - c->urgent = c->urgent || hints->flags & XUrgencyHint ? 1:0; - XFree(hints); - } - if (XGetClassHint(display, c->window, &chint)) - { - c->class = strdup(chint.res_class); - XFree(chint.res_class); XFree(chint.res_name); - } - } - return c; - } - free(c); - return NULL; -} - -void client_free(client *c) -{ - if (!c) return; - free(c->class); - free(c); -} - -// build windows cache -void query_windows() -{ - unsigned int nwins; int i; Window w1, w2, *wins; client *c; - if (windows.depth || !(XQueryTree(display, root, &w1, &w2, &wins, &nwins) && wins)) - return; - for (i = nwins-1; i > -1 && windows.depth < STACK; i--) - { - if ((c = window_build_client(wins[i])) && c->visible) - { - windows.clients[windows.depth] = c; - windows.windows[windows.depth++] = wins[i]; - } - else client_free(c); - } - XFree(wins); -} - -void ewmh_client_list() -{ - int i; client *c; STACK_INIT(wins); - for_windows_rev(i, c) if (c->manage) - wins.windows[wins.depth++] = c->window; - SETPROP_WIND(root, atoms[_NET_CLIENT_LIST_STACKING], wins.windows, wins.depth); - // hack for now, since we dont track window mapping history - SETPROP_WIND(root, atoms[_NET_CLIENT_LIST], wins.windows, wins.depth); -} - -int window_send_clientmessage(Window target, Window subject, Atom atom, unsigned long protocol, unsigned long mask) -{ - XEvent e; - e.xclient.type = ClientMessage; - e.xclient.message_type = atom; - e.xclient.window = subject; - e.xclient.data.l[0] = protocol; - e.xclient.data.l[1] = latest; - e.xclient.send_event = True; - e.xclient.format = 32; - int r = XSendEvent(display, target, False, mask, &e) ?1:0; - XFlush(display); - return r; -} - -int client_send_wm_protocol(client *c, Atom protocol) -{ - Atom protocols[MAX_ATOMLIST]; int i, n; - if ((n = GETPROP_ATOM(c->window, atoms[WM_PROTOCOLS], protocols, MAX_ATOMLIST))) - for (i = 0; i < n; i++) if (protocols[i] == protocol) - return window_send_clientmessage(c->window, c->window, atoms[WM_PROTOCOLS], protocol, NoEventMask); - return 0; -} - -void client_place_spot(client *c, int spot, int mon, int force) -{ - if (!c) return; - int i; client *t; - - // try to center over our transient parent - if (!force && c->transient && (t = window_build_client(c->transient))) - { - spot = t->spot; - mon = t->monitor; - client_free(t); - } - else - // try to center over top-most window in our group - if (!force && c->leader && c->type == atoms[_NET_WM_WINDOW_TYPE_DIALOG]) - { - for_windows(i, t) if (t->manage && t->window != c->window && t->leader == c->leader) - { - spot = t->spot; - mon = t->monitor; - break; - } - } - c->spot = spot; c->monitor = mon; - - monitor *m = &monitors[c->monitor]; - int x = m->spots[spot].x, y = m->spots[spot].y, w = m->spots[spot].w, h = m->spots[spot].h; - - if (c->type == atoms[_NET_WM_WINDOW_TYPE_DIALOG]) - { - x += (w - c->attr.width)/2; - y += (h - c->attr.height)/2; - w = c->attr.width + BORDER*2; - h = c->attr.height + BORDER*2; - } - else - if (c->full) - { - XMoveResizeWindow(display, c->window, m->x, m->y, m->w, m->h); - return; - } - w -= BORDER*2; h -= BORDER*2; - int sw = w, sh = h; long sr; XSizeHints size; - - if (XGetWMNormalHints(display, c->window, &size, &sr)) - { - w = MIN(MAX(w, size.flags & PMinSize ? size.min_width : 16), size.flags & PMaxSize ? size.max_width : m->w); - h = MIN(MAX(h, size.flags & PMinSize ? size.min_height: 16), size.flags & PMaxSize ? size.max_height: m->h); - - if (size.flags & PResizeInc) - { - w -= (w - (size.flags & PBaseSize ? size.base_width : 0)) % size.width_inc; - h -= (h - (size.flags & PBaseSize ? size.base_height: 0)) % size.height_inc; - } - if (size.flags & PAspect) - { - double ratio = (double) w / h; - double minr = (double) size.min_aspect.x / size.min_aspect.y; - double maxr = (double) size.max_aspect.x / size.max_aspect.y; - if (ratio < minr) h = (int)(w / minr); - else if (ratio > maxr) w = (int)(h * maxr); - } - } - // center if smaller than supplied size - if (w < sw) x += (sw-w)/2; - if (h < sh) y += (sh-h)/2; - - // bump onto screen - x = MAX(m->x, MIN(x, m->x + m->w - w - BORDER*2)); - y = MAX(m->y, MIN(y, m->y + m->h - h - BORDER*2)); - - XMoveResizeWindow(display, c->window, x, y, w, h); -} - -void client_stack_family(client *c, stack *raise) -{ - int i; client *o, *self = NULL; - for_windows(i, o) - { - if (o->manage && o->visible && o->transient == c->window) - client_stack_family(o, raise); - else - if (o->visible && o->window == c->window) - self = o; - } - if (self) - { - raise->clients[raise->depth] = self; - raise->windows[raise->depth++] = self->window; - } -} - -void client_raise_family(client *c) -{ - if (!c) return; - int i; client *o; STACK_INIT(raise); STACK_INIT(family); - - for_windows(i, o) if (o->type == atoms[_NET_WM_WINDOW_TYPE_DOCK]) - client_stack_family(o, &raise); - - // above only counts for fullscreen windows - if (c->full) for_windows(i, o) if (o->above) - client_stack_family(o, &raise); - - while (c->transient && (o = window_build_client(c->transient))) - c = family.clients[family.depth++] = o; - - client_stack_family(c, &raise); - XRaiseWindow(display, raise.windows[0]); - XRestackWindows(display, raise.windows, raise.depth); - STACK_FREE(&family); -} - -void client_set_focus(client *c) -{ - if (!c || !c->visible || c->window == current) return; - client *o; Window old = current; - - current = c->window; - current_spot = c->spot; - current_mon = c->monitor; - - if (old && (o = window_build_client(old))) - { - client_update_border(o); - client_free(o); - } - client_send_wm_protocol(c, atoms[WM_TAKE_FOCUS]); - XSetInputFocus(display, c->input ? c->window: PointerRoot, RevertToPointerRoot, CurrentTime); - SETPROP_WIND(root, atoms[_NET_ACTIVE_WINDOW], &c->window, 1); - client_update_border(c); -} - -void client_activate(client *c) -{ - client_raise_family(c); - client_set_focus(c); -} - -Window spot_focus_top_window(int spot, int mon, Window except) -{ - int i; client *c; - for_windows(i, c) - { - if (c->window != except && c->manage && c->spot == spot && c->monitor == mon) - { - client_raise_family(c); - client_set_focus(c); - return c->window; - } - } - return None; -} - -int spot_choose_by_direction(int spot, int mon, int dir) -{ - monitor *m = &monitors[mon]; - if (m->w < m->h) // rotated? - { - if (dir == LEFT) return SPOT3; - if (dir == RIGHT) return SPOT2; - if (dir == UP) return SPOT1_ALIGN == SPOT1_LEFT ? SPOT1: SPOT2; - if (dir == DOWN) return SPOT1_ALIGN == SPOT1_LEFT ? SPOT2: SPOT1; - return spot; - } - if (dir == UP) return SPOT2; - if (dir == DOWN) return SPOT3; - if (dir == LEFT) return SPOT1_ALIGN == SPOT1_LEFT ? SPOT1: SPOT2; - if (dir == RIGHT) return SPOT1_ALIGN == SPOT1_LEFT ? SPOT2: SPOT1; - return spot; -} - -void window_listen(Window win) -{ - XSelectInput(display, win, EnterWindowMask | LeaveWindowMask | FocusChangeMask | PropertyChangeMask); -} - -// ------- key actions ------- - -void action_move(void *data, int num, client *cli) -{ - if (!cli) return; - client_raise_family(cli); - client_place_spot(cli, num, cli->monitor, 1); -} - -void action_move_direction(void *data, int num, client *cli) -{ - if (!cli) return; - client_raise_family(cli); - client_place_spot(cli, spot_choose_by_direction(cli->spot, cli->monitor, num), cli->monitor, 1); -} - -void action_focus(void *data, int num, client *cli) -{ - spot_focus_top_window(num, current_mon, None); -} - -void action_focus_direction(void *data, int num, client *cli) -{ - spot_focus_top_window(spot_choose_by_direction(current_spot, current_mon, num), current_mon, None); -} - -void action_close(void *data, int num, client *cli) -{ - if (cli && !client_send_wm_protocol(cli, atoms[WM_DELETE_WINDOW])) - XKillClient(display, cli->window); -} - -void action_cycle(void *data, int num, client *cli) -{ - if (!cli) return; - STACK_INIT(lower); - spot_focus_top_window(cli->spot, cli->monitor, cli->window); - client_stack_family(cli, &lower); - XLowerWindow(display, lower.windows[0]); - XRestackWindows(display, lower.windows, lower.depth); -} - -void action_other(void *data, int num, client *cli) -{ - if (cli) spot_focus_top_window(cli->spot, cli->monitor, cli->window); -} - -void action_command(void *data, int num, client *cli) -{ - exec_cmd(data); -} - -void action_find_or_start(void *data, int num, client *cli) -{ - int i; client *c; char *class = data; - for_windows(i, c) - if (c->visible && c->manage && c->class && !strcasecmp(c->class, class)) - { client_activate(c); return; } - exec_cmd(class); -} - -void action_move_monitor(void *data, int num, client *cli) -{ - if (!cli) return; - client_raise_family(cli); - cli->monitor = MAX(0, MIN(current_mon+num, nmonitors-1)); - client_place_spot(cli, cli->spot, cli->monitor, 1); - current_mon = cli->monitor; -} - -void action_focus_monitor(void *data, int num, client *cli) -{ - int i, mon = MAX(0, MIN(current_mon+num, nmonitors-1)); - if (spot_focus_top_window(current_spot, mon, None)) return; - for_spots(i) if (spot_focus_top_window(i, mon, None)) break; -} - -void action_fullscreen(void *data, int num, client *cli) -{ - if (!cli) return; - if (cli->full) GETPROP_LONG(cli->window, atoms[XOAT_SPOT], &cli->spot, 1); - else SETPROP_LONG(cli->window, atoms[XOAT_SPOT], &cli->spot, 1); - client_toggle_state(cli, atoms[_NET_WM_STATE_FULLSCREEN]); - client_place_spot(cli, cli->full ? SPOT1: cli->spot, cli->monitor, 1); - client_update_border(cli); - client_raise_family(cli); -} - -void action_above(void *data, int num, client *cli) -{ - if (!cli) return; - client_toggle_state(cli, atoms[_NET_WM_STATE_ABOVE]); - client_update_border(cli); - client_raise_family(cli); -} - -void action_snapshot(void *data, int num, client *cli) -{ - int i; client *c; - STACK_FREE(&snapshot); - for_windows(i, c) if (c->manage && c->class) - snapshot.clients[snapshot.depth++] = window_build_client(c->window); -} - -void action_rollback(void *data, int num, client *cli) -{ - int i; client *c = NULL, *s, *a = NULL; - for (i = snapshot.depth-1; i > -1; i--) - { - if ((s = snapshot.clients[i]) && (c = window_build_client(s->window)) - && c->class && !strcmp(s->class, c->class) && c->visible && c->manage) - { - client_place_spot(c, s->spot, s->monitor, 1); - client_raise_family(c); - if (s->spot == current_spot && s->monitor == current_mon) - { - client_free(a); - a = c; c = NULL; - } - } - client_free(c); - } - if (a) - { - client_set_focus(a); - client_free(a); - } -} - -// ------- event handlers -------- - -void create_notify(XEvent *e) -{ - client *c = window_build_client(e->xcreatewindow.window); - if (c && c->manage) - window_listen(c->window); - client_free(c); -} - -void configure_request(XEvent *ev) -{ - XConfigureRequestEvent *e = &ev->xconfigurerequest; - client *c = window_build_client(e->window); - if (c && c->manage && c->visible && !c->transient) - { - client_update_border(c); - client_place_spot(c, c->spot, c->monitor, 0); - } - else - if (c) - { - XWindowChanges wc; - if (e->value_mask & CWX) wc.x = e->x; - if (e->value_mask & CWY) wc.y = e->y; - if (e->value_mask & CWWidth) wc.width = e->width; - if (e->value_mask & CWHeight) wc.height = e->height; - if (e->value_mask & CWStackMode) wc.stack_mode = e->detail; - if (e->value_mask & CWBorderWidth) wc.border_width = BORDER; - XConfigureWindow(display, c->window, e->value_mask, &wc); - } - client_free(c); -} - -void configure_notify(XEvent *e) -{ - client *c = window_build_client(e->xconfigure.window); - if (c && c->manage) - ewmh_client_list(); - client_free(c); -} - -void map_request(XEvent *e) -{ - client *c = window_build_client(e->xmaprequest.window); - if (c && c->manage) - { - c->monitor = MONITOR_START == MONITOR_CURRENT ? current_mon: MONITOR_START; - c->monitor = MIN(nmonitors-1, MAX(0, c->monitor)); - monitor *m = &monitors[c->monitor]; - - int i, spot = SPOT_START == SPOT_CURRENT ? current_spot: SPOT_START; - - if (SPOT_START == SPOT_SMART) // find spot of best fit - { - spot = SPOT1; for_spots_rev(i) - if (c->attr.width <= m->spots[i].w && c->attr.height <= m->spots[i].h) - { spot = i; break; } - } - client_place_spot(c, spot, c->monitor, 0); - client_update_border(c); - } - if (c) XMapWindow(display, c->window); - client_free(c); -} - -void map_notify(XEvent *e) -{ - client *a = NULL, *c = window_build_client(e->xmap.window); - if (c && c->manage) - { - client_raise_family(c); - client_update_border(c); - // if no current window, or new window has opened in the current spot, focus it - if (FOCUS_START == FOCUS_STEAL || !(a = window_build_client(current)) || (a && a->spot == c->spot)) - client_set_focus(c); - client_free(a); - ewmh_client_list(); - } - client_free(c); -} - -void unmap_notify(XEvent *e) -{ - // if this window was focused, find something else - if (e->xunmap.window == current && !spot_focus_top_window(current_spot, current_mon, current)) - { int i; for_spots(i) if (spot_focus_top_window(i, current_mon, current)) break; } - ewmh_client_list(); -} - -void key_press(XEvent *ev) -{ - XKeyEvent *e = &ev->xkey; latest = e->time; - KeySym key = XkbKeycodeToKeysym(display, e->keycode, 0, 0); - unsigned int state = e->state & ~(LockMask|NumlockMask); - while (XCheckTypedEvent(display, KeyPress, ev)); - - binding *bind = NULL; - for (int i = 0; i < sizeof(keys)/sizeof(binding) && !bind; i++) - if (keys[i].key == key && (keys[i].mod == AnyModifier || keys[i].mod == state)) - bind = &keys[i]; - - if (bind && bind->act) - { - client *cli = window_build_client(current); - bind->act(bind->data, bind->num, cli); - client_free(cli); - } -} - -void button_press(XEvent *ev) -{ - XButtonEvent *e = &ev->xbutton; latest = e->time; - client *c = window_build_client(e->subwindow); - if (c && c->manage) - client_activate(c); - client_free(c); - XAllowEvents(display, ReplayPointer, CurrentTime); -} - -void client_message(XEvent *ev) -{ - XClientMessageEvent *e = &ev->xclient; - if (e->message_type == atoms[XOAT_EXIT]) - { - warnx("exit!"); - exit(EXIT_SUCCESS); - } - if (e->message_type == atoms[XOAT_RESTART]) - { - warnx("restart!"); - EXECSH(self); - } - client *c = window_build_client(e->window); - if (c && c->manage) - { - if (e->message_type == atoms[_NET_ACTIVE_WINDOW]) client_activate(c); - if (e->message_type == atoms[_NET_CLOSE_WINDOW]) action_close(NULL, 0, c); - } - client_free(c); -} - -void any_event(XEvent *e) -{ - client *c = window_build_client(e->xany.window); - if (c && c->visible && c->manage) - client_update_border(c); - client_free(c); -} - -void (*handlers[LASTEvent])(XEvent*) = { - [CreateNotify] = create_notify, - [ConfigureRequest] = configure_request, - [ConfigureNotify] = configure_notify, - [MapRequest] = map_request, - [MapNotify] = map_notify, - [UnmapNotify] = unmap_notify, - [KeyPress] = key_press, - [ButtonPress] = button_press, - [ClientMessage] = client_message, - [FocusIn] = any_event, - [FocusOut] = any_event, - [PropertyNotify] = any_event, -}; - int main(int argc, char *argv[]) { - int i, j; client *c; XEvent ev; Atom msg = None; - wm_strut struts; memset(&struts, 0, sizeof(wm_strut)); + int i; XEvent ev; Atom msg = None; if (!(display = XOpenDisplay(0))) return 1; self = argv[0]; root = DefaultRootWindow(display); xerror = XSetErrorHandler(oops); - int screen_w = WidthOfScreen(DefaultScreenOfDisplay(display)); - int screen_h = HeightOfScreen(DefaultScreenOfDisplay(display)); for (i = 0; i < ATOMS; i++) atoms[i] = XInternAtom(display, atom_names[i], False); @@ -889,161 +223,7 @@ int main(int argc, char *argv[]) exit(EXIT_SUCCESS); } - // default non-multi-head setup - monitors[0].w = screen_w; - monitors[0].h = screen_h; - - // support multi-head. - XineramaScreenInfo *info; - if (XineramaIsActive(display) && (info = XineramaQueryScreens(display, &nmonitors))) - { - nmonitors = MIN(nmonitors, MAX_MONITORS); - for (i = 0; i < nmonitors; i++) - { - monitors[i].x = info[i].x_org; - monitors[i].y = info[i].y_org; - monitors[i].w = info[i].width; - monitors[i].h = info[i].height; - } - XFree(info); - } - - // detect and adjust for panel struts - for_windows(i, c) - { - wm_strut strut; memset(&strut, 0, sizeof(wm_strut)); - int v2 = GETPROP_LONG(c->window, atoms[_NET_WM_STRUT_PARTIAL], (unsigned long*)&strut, 12); - int v1 = v2 ? 0: GETPROP_LONG(c->window, atoms[_NET_WM_STRUT], (unsigned long*)&strut, 4); - if (!c->visible || (!v1 && !v2)) continue; - - for (j = 0; j < nmonitors; j++) - { - monitor *m = &monitors[j]; - if (v1) - { - strut.ly1 = m->y; strut.ly2 = m->y + m->h; - strut.ry1 = m->y; strut.ry3 = m->y + m->h; - strut.tx1 = m->x; strut.tx2 = m->x + m->w; - strut.bx1 = m->x; strut.bx2 = m->x + m->w; - } - if (strut.left > 0 && !m->x - && INTERSECT(0, strut.ly1, strut.left, strut.ly2 - strut.ly1, m->x, m->y, m->w, m->h)) - { - m->x += strut.left; - m->w -= strut.left; - } - if (strut.right > 0 && m->x + m->w == screen_w - && INTERSECT(screen_w - strut.right, strut.ry1, strut.right, strut.ry3 - strut.ry1, m->x, m->y, m->w, m->h)) - { - m->w -= strut.right; - } - if (strut.top > 0 && !m->y - && INTERSECT(strut.tx1, 0, strut.tx2 - strut.tx1, strut.top, m->x, m->y, m->w, m->h)) - { - m->y += strut.top; - m->h -= strut.top; - } - if (strut.bottom > 0 && m->y + m->h == screen_h - && INTERSECT(strut.bx1, screen_h - strut.bottom, strut.bx2 - strut.bx1, strut.bottom, m->x, m->y, m->w, m->h)) - { - m->h -= strut.bottom; - } - } - } - - // calculate spot boxes - for (i = 0; i < nmonitors; i++) - { - monitor *m = &monitors[i]; - int x = m->x, y = m->y, w = m->w, h = m->h; - // monitor rotated? - if (m->w < m->h) - { - int height_spot1 = (double)h / 100 * MIN(90, MAX(10, SPOT1_WIDTH_PCT)); - int width_spot2 = (double)w / 100 * MIN(90, MAX(10, SPOT2_HEIGHT_PCT)); - for_spots(j) - { - m->spots[j].x = x; - m->spots[j].y = SPOT1_ALIGN == SPOT1_LEFT ? y: y + h - height_spot1; - m->spots[j].w = w; - m->spots[j].h = height_spot1; - if (j == SPOT1) continue; - - m->spots[j].y = SPOT1_ALIGN == SPOT1_LEFT ? y + height_spot1: y; - m->spots[j].h = h - height_spot1; - m->spots[j].w = w - width_spot2; - if (j == SPOT3) continue; - - m->spots[j].x = x + w - width_spot2; - m->spots[j].w = width_spot2; - } - continue; - } - int width_spot1 = (double)w / 100 * MIN(90, MAX(10, SPOT1_WIDTH_PCT)); - int height_spot2 = (double)h / 100 * MIN(90, MAX(10, SPOT2_HEIGHT_PCT)); - for_spots(j) - { - m->spots[j].x = SPOT1_ALIGN == SPOT1_LEFT ? x: x + w - width_spot1; - m->spots[j].y = y; - m->spots[j].w = width_spot1; - m->spots[j].h = h; - if (j == SPOT1) continue; - - m->spots[j].x = SPOT1_ALIGN == SPOT1_LEFT ? x + width_spot1: x; - m->spots[j].w = w - width_spot1; - m->spots[j].h = height_spot2; - if (j == SPOT2) continue; - - m->spots[j].y = y + height_spot2; - m->spots[j].h = h - height_spot2; - } - } - - // become the window manager - XSelectInput(display, root, StructureNotifyMask | SubstructureRedirectMask | SubstructureNotifyMask); - - // ewmh support - unsigned long pid = getpid(); - ewmh = XCreateSimpleWindow(display, root, 0, 0, 1, 1, 0, 0, 0); - - SETPROP_ATOM(root, atoms[_NET_SUPPORTED], atoms, ATOMS); - SETPROP_WIND(root, atoms[_NET_SUPPORTING_WM_CHECK], &ewmh, 1); - SETPROP_LONG(ewmh, atoms[_NET_WM_PID], &pid, 1); - - XChangeProperty(display, ewmh, atoms[_NET_WM_NAME], XA_STRING, 8, PropModeReplace, (const unsigned char*)"xoat", 4); - - // figure out NumlockMask - XModifierKeymap *modmap = XGetModifierMapping(display); - for (i = 0; i < 8; i++) - for (j = 0; j < (int)modmap->max_keypermod; j++) - if (modmap->modifiermap[i*modmap->max_keypermod+j] == XKeysymToKeycode(display, XK_Num_Lock)) - { NumlockMask = (1<manage) - { - window_listen(c->window); - client_update_border(c); - client_place_spot(c, c->spot, c->monitor, 0); - if (!current) client_activate(c); - } + setup(); // main event loop for (;;) From 3f6c997bd481bf942cfa39788e3a604c319e1a07 Mon Sep 17 00:00:00 2001 From: seanpringle Date: Tue, 25 Sep 2012 01:07:13 +1000 Subject: [PATCH 4/4] less offensive title bars --- config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.h b/config.h index 1cd7b21..18daefa 100644 --- a/config.h +++ b/config.h @@ -2,14 +2,14 @@ #define BORDER 2 #define BORDER_BLUR "Dark Gray" -#define BORDER_FOCUS "Orange" +#define BORDER_FOCUS "Royal Blue" #define BORDER_URGENT "Red" #define BORDER_ABOVE "Dark Green" // Title bar xft font #define TITLE "sans-10" #define TITLE_BLUR "Black" -#define TITLE_FOCUS "Black" +#define TITLE_FOCUS "White" #define TITLE_ELLIPSIS 30 // There are three static tiles called SPOT1, SPOT2, and SPOT3.