mfwm

A tiling fork of dylanaraps sowm.
git clone git://depsterr.com/git/mfwm
Log | Files | Refs | README | LICENSE

commit 02b10e85852a5f349e0af9bc8041dc3e19c977df
parent 8917b6ddb25cb5b6e241858b6126bed5473e3393
Author: Dylan Araps <dylan.araps@gmail.com>
Date:   Fri, 18 Oct 2019 12:43:09 +0300

sowm: track current client to simplify linked list implementation.

Diffstat:
Mconfig.def.h | 2+-
Msowm.c | 66++++++++++++++++++++++++++++++------------------------------------
2 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/config.def.h b/config.def.h @@ -15,7 +15,7 @@ const char* colors[] = {"bud", "/home/goldie/Pictures/Wallpapers", 0}; static struct key keys[] = { {MOD, XK_q, win_kill, {0}}, - {MOD, XK_c, win_center, {.w = 0}}, + {MOD, XK_c, win_center, {0}}, {MOD, XK_f, win_fs, {0}}, {Mod1Mask, XK_Tab, win_next, {0}}, diff --git a/sowm.c b/sowm.c @@ -36,7 +36,7 @@ static void notify_enter(XEvent *e); static void notify_motion(XEvent *e); static void run(const Arg arg); static void win_add(Window w); -static void win_center(const Arg arg); +static void win_center(); static void win_del(Window w); static void win_fs(); static void win_kill(); @@ -45,12 +45,12 @@ static void win_to_ws(const Arg arg); static void ws_go(const Arg arg); static int xerror() { return 0;} -static client *list = {0}, *ws_list[10] = {0}; +static client *list = {0}, *ws_list[10] = {0}, *cur = {0}; static int ws = 1, sw, sh, wx, wy; static unsigned int ww, wh; static Display *d; -static Window root, cur; +static Window root; static XButtonEvent mouse; static void (*events[LASTEvent])(XEvent *e) = { @@ -67,7 +67,6 @@ static void (*events[LASTEvent])(XEvent *e) = { #include "config.h" #define win (client *c=list;c;c=c->next) -#define win_focus(W) XSetInputFocus(d, W, RevertToParent, CurrentTime) #define ws_save(W) ws_list[W] = list #define ws_sel(W) list = ws_list[ws = W] @@ -75,15 +74,16 @@ static void (*events[LASTEvent])(XEvent *e) = { XGetGeometry(d, W, &(Window){0}, gx, gy, gw, gh, \ &(unsigned int){0}, &(unsigned int){0}) -Window win_current() { - XGetInputFocus(d, &cur, &(int){1}); - return cur; +void win_focus(Window w) { + XSetInputFocus(d, w, RevertToParent, CurrentTime); + + for win if (c->w == w) cur = c; } void notify_destroy(XEvent *e) { win_del(e->xdestroywindow.window); - if (list) win_focus(win_current() == root ? list->w : cur); + if (list) win_focus(list->w); } void notify_enter(XEvent *e) { @@ -180,58 +180,51 @@ void win_del(Window w) { } void win_kill() { - if (win_current() ^ root) XKillClient(d, cur); + if (cur) XKillClient(d, cur->w); } -void win_center(const Arg arg) { - Window w = arg.w ? arg.w : win_current(); - - win_size(w, &(int){0}, &(int){0}, &ww, &wh); +void win_center() { + if (!cur) return; - XMoveWindow(d, w, (sw - ww) / 2, (sh - wh) / 2); + win_size(cur->w, &(int){0}, &(int){0}, &ww, &wh); + XMoveWindow(d, cur->w, (sw - ww) / 2, (sh - wh) / 2); } void win_fs() { - win_current(); + if (!cur) return; - for win if (c->w == cur) { - if ((c->f = c->f == 0 ? 1 : 0)) { - win_size(cur, &c->wx, &c->wy, &c->ww, &c->wh); - XMoveResizeWindow(d, cur, 0, 0, sw, sh); + if ((cur->f = cur->f == 0 ? 1 : 0)) { + win_size(cur->w, &cur->wx, &cur->wy, &cur->ww, &cur->wh); + XMoveResizeWindow(d, cur->w, 0, 0, sw, sh); - } else - XMoveResizeWindow(d, cur, c->wx, c->wy, c->ww, c->wh); - } + } else + XMoveResizeWindow(d, cur->w, cur->wx, cur->wy, cur->ww, cur->wh); } void win_to_ws(const Arg arg) { int tmp = ws; - win_current(); if (arg.i == tmp) return; ws_sel(arg.i); - win_add(cur); + win_add(cur->w); ws_save(arg.i); ws_sel(tmp); - win_del(cur); - XUnmapWindow(d, cur); + win_del(cur->w); + XUnmapWindow(d, cur->w); ws_save(tmp); if (list) win_focus(list->w); } void win_next() { - win_current(); + if (!list) return; - for win if (c->w == cur) { - c = c->next ? c->next : list; + client *c = cur->next ? cur->next : list; - win_focus(c->w); - XRaiseWindow(d, c->w); - return; - } + win_focus(c->w); + XRaiseWindow(d, c->w); } void ws_go(const Arg arg) { @@ -272,11 +265,12 @@ void map_request(XEvent *e) { XSelectInput(d, w, StructureNotifyMask|EnterWindowMask); win_size(w, &wx, &wy, &ww, &wh); - if (wx == 0 && wy == 0) win_center((Arg){.i = w}); + win_add(w); + win_focus(w); + + if (wx == 0 && wy == 0) win_center(); XMapWindow(d, w); - win_focus(w); - win_add(w); } void run(const Arg arg) {