update

Refresh keyboard mapping uppon MappingNotify event

Makefile

@@ -4,13 +4,13 @@ PREFIX ?= /usr
 BINDIR ?= $(PREFIX)/bin
 CC     ?= gcc
 
-all: config.h sowm
+all: sowm
 
 config.h:
 	cp config.def.h config.h
 
-sowm:
+sowm: sowm.c sowm.h config.h Makefile
-	$(CC) -O3 $(CFLAGS) -lX11 $(LDFLAGS) -o sowm sowm.c
+	$(CC) -O3 $(CFLAGS) -o $@ $< -lX11 $(LDFLAGS)
 
 install: all
 	install -Dm755 sowm $(DESTDIR)$(BINDIR)/sowm
@@ -20,3 +20,5 @@ uninstall:
 
 clean:
 	rm -f sowm *.o
+
+.PHONY: all install uninstall clean

README.md

@@ -1,8 +1,8 @@
-# sowm (*Simple Opinionated Window Manager*)
+# sowm (*~~Simple~~ Shitty Opinionated Window Manager*)
 
 <a href="https://user-images.githubusercontent.com/6799467/66687576-9747c200-ec72-11e9-947d-5b96753eab03.jpg"><img src="https://user-images.githubusercontent.com/6799467/66687576-9747c200-ec72-11e9-947d-5b96753eab03.jpg" width="43%" align="right"></a>
 
-An itsy bitsy floating window manager (*220~ sloc / 24kb compiled!*).
+An itsy bitsy floating window manager (*220~ sloc!*).
 
 - Floating only.
 - Fullscreen toggle.
@@ -38,8 +38,8 @@ Patches available here: https://github.com/dylanaraps/sowm/pulls
 | `MOD4` + `f`               | maximize toggle        |
 | `MOD4` + `c`               | center window          |
 | `MOD4` + `q`               | kill window            |
-| `MOD4` + `1-9`             | desktop swap           |
+| `MOD4` + `1-6`             | desktop swap           |
-| `MOD4` + `Shift` +`1-9`    | send window to desktop |
+| `MOD4` + `Shift` +`1-6`    | send window to desktop |
 | `MOD1` + `TAB` (*alt-tab*) | focus cycle            |
 
 **Programs**
@@ -71,17 +71,28 @@ Patches available here: https://github.com/dylanaraps/sowm/pulls
 4) (Optional) Apply patch with `git apply patches/patch-name`
     - In case of applying multiple patches, it has to be done **manually**.
 
+If you are using GDM, save the following to `/usr/share/xsessions/sowm.desktop`. It is still recommended to start `sowm` from `.xinitrc` or through
+[your own xinit implementation](https://github.com/dylanaraps/bin/blob/dfd9a9ff4555efb1cc966f8473339f37d13698ba/x).
+
+```
+[Desktop Entry]
+Name=sowm
+Comment=This session runs sowm as desktop manager
+Exec=sowm
+Type=Application
+```
+
 
 ## Thanks
 
-- 2bwm
+- [2bwm](https://github.com/venam/2bwm)
-- SmallWM
+- [SmallWM](https://github.com/adamnew123456/SmallWM)
-- berry
+- [berry](https://github.com/JLErvin/berry)
-- catwm
+- [catwm](https://github.com/pyknite/catwm)
-- dminiwm
+- [dminiwm](https://github.com/moetunes/dminiwm)
-- dwm
+- [dwm](https://dwm.suckless.org)
-- monsterwm
+- [monsterwm](https://github.com/c00kiemon5ter/monsterwm)
-- openbox
+- [openbox](https://github.com/danakj/openbox)
-- possumwm
+- [possum-wm](https://github.com/duckinator/possum-wm)
-- swm
+- [swm](https://github.com/dcat/swm)
-- tinywm
+- [tinywm](http://incise.org/tinywm.html)

config.def.h

@@ -2,8 +2,6 @@
 #define CONFIG_H
 
 #define MOD Mod4Mask
-#define TH  90
-#define TC  255 + (255<<8) + (255<<16)
 
 const char* menu[]    = {"dmenu_run",      0};
 const char* term[]    = {"st",             0};

sowm.c

@@ -1,14 +1,12 @@
 // sowm - An itsy bitsy floating window manager.
 
 #include <X11/Xlib.h>
-#include <X11/Xutil.h>
 #include <X11/XF86keysym.h>
 #include <X11/keysym.h>
 #include <X11/XKBlib.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <unistd.h>
-#include <string.h>
 
 #include "sowm.h"
 
@@ -26,6 +24,7 @@ static void (*events[LASTEvent])(XEvent *e) = {
     [ConfigureRequest] = configure_request,
     [KeyPress]         = key_press,
     [MapRequest]       = map_request,
+    [MappingNotify]    = mapping_notify,
     [DestroyNotify]    = notify_destroy,
     [EnterNotify]      = notify_enter,
     [MotionNotify]     = notify_motion
@@ -33,27 +32,6 @@ static void (*events[LASTEvent])(XEvent *e) = {
 
 #include "config.h"
 
-void title_add(client *c) {
-    if (c->t) return;
-
-    XClassHint cl;
-    XGetClassHint(d, c->w, &cl);
-
-    if (!strcmp(cl.res_name, "no-title")) return;
-
-    win_size(c->w, &wx, &wy, &ww, &wh);
-    c->t = XCreateSimpleWindow(d, root, wx, wy - TH, ww, TH, 0, TC, TC);
-    XMapWindow(d, c->t);
-}
-
-void title_del(client *c) {
-    if (!c->t) return;
-
-    XUnmapWindow(d, c->t);
-    XDestroyWindow(d, c->t);
-    c->t = 0;
-}
-
 void win_focus(client *c) {
     cur = c;
     XSetInputFocus(d, cur->w, RevertToParent, CurrentTime);
@@ -74,11 +52,6 @@ void notify_enter(XEvent *e) {
 void notify_motion(XEvent *e) {
     if (!mouse.subwindow || cur->f) return;
 
-    if (mouse.subwindow == cur->t) {
-        mouse.subwindow = cur->w;
-        win_size(cur->w, &wx, &wy, &ww, &wh);
-    }
-
     while(XCheckTypedEvent(d, MotionNotify, e));
 
     int xd = e->xbutton.x_root - mouse.x_root;
@@ -89,11 +62,6 @@ void notify_motion(XEvent *e) {
         wy + (mouse.button == 1 ? yd : 0),
         MAX(1, ww + (mouse.button == 3 ? xd : 0)),
         MAX(1, wh + (mouse.button == 3 ? yd : 0)));
-
-    if (cur->t) XMoveResizeWindow(d, cur->t,
-        wx + (mouse.button == 1 ? xd : 0),
-        wy + (mouse.button == 1 ? yd : 0) - TH,
-        MAX(1, ww + (mouse.button == 3 ? xd : 0)), TH);
 }
 
 void key_press(XEvent *e) {
@@ -150,7 +118,6 @@ void win_del(Window w) {
     if (x->next)      x->next->prev = x->prev;
     if (x->prev)      x->prev->next = x->next;
 
-    title_del(x);
     free(x);
     ws_save(ws);
 }
@@ -164,8 +131,6 @@ void win_center(const Arg arg) {
 
     win_size(cur->w, &(int){0}, &(int){0}, &ww, &wh);
     XMoveWindow(d, cur->w, (sw - ww) / 2, (sh - wh) / 2);
-
-    if (cur->t) XMoveWindow(d, cur->t, (sw - ww) / 2, (sh - wh - TH * 2) / 2);
 }
 
 void win_fs(const Arg arg) {
@@ -174,12 +139,9 @@ void win_fs(const Arg arg) {
     if ((cur->f = cur->f ? 0 : 1)) {
         win_size(cur->w, &cur->wx, &cur->wy, &cur->ww, &cur->wh);
         XMoveResizeWindow(d, cur->w, 0, 0, sw, sh);
-        XRaiseWindow(d, cur->w);
-        title_del(cur);
 
     } else {
         XMoveResizeWindow(d, cur->w, cur->wx, cur->wy, cur->ww, cur->wh);
-        title_add(cur);
     }
 }
 
@@ -195,7 +157,6 @@ void win_to_ws(const Arg arg) {
     ws_sel(tmp);
     win_del(cur->w);
     XUnmapWindow(d, cur->w);
-    title_del(cur);
     ws_save(tmp);
 
     if (list) win_focus(list);
@@ -205,10 +166,6 @@ void win_prev(const Arg arg) {
     if (!cur) return;
 
     XRaiseWindow(d, cur->prev->w);
-
-    if (cur->prev->t)
-        XRaiseWindow(d, cur->prev->t);
-
     win_focus(cur->prev);
 }
 
@@ -216,10 +173,6 @@ void win_next(const Arg arg) {
     if (!cur) return;
 
     XRaiseWindow(d, cur->next->w);
-
-    if (cur->next->t)
-        XRaiseWindow(d, cur->next->t);
-
     win_focus(cur->next);
 }
 
@@ -231,17 +184,11 @@ void ws_go(const Arg arg) {
     ws_save(ws);
     ws_sel(arg.i);
 
-    for win {
+    for win XMapWindow(d, c->w);
-        XMapWindow(d, c->w);
-        title_add(c);
-    }
 
     ws_sel(tmp);
 
-    for win {
+    for win XUnmapWindow(d, c->w);
-        XUnmapWindow(d, c->w);
-        title_del(c);
-    }
 
     ws_sel(arg.i);
 
@@ -273,7 +220,15 @@ void map_request(XEvent *e) {
 
     XMapWindow(d, w);
     win_focus(list->prev);
-    title_add(cur);
+}
+
+void mapping_notify(XEvent *e) {
+    XMappingEvent *ev = &e->xmapping;
+
+    if (ev->request == MappingKeyboard || ev->request == MappingModifier) {
+        XRefreshKeyboardMapping(ev);
+        input_grab(root);
+    }
 }
 
 void run(const Arg arg) {
@@ -295,6 +250,8 @@ void input_grab(Window root) {
                 == XKeysymToKeycode(d, 0xff7f))
                 numlock = (1 << i);
 
+    XUngrabKey(d, AnyKey, AnyModifier, root);
+
     for (i = 0; i < sizeof(keys)/sizeof(*keys); i++)
         if ((code = XKeysymToKeycode(d, keys[i].keysym)))
             for (j = 0; j < sizeof(modifiers)/sizeof(*modifiers); j++)
@@ -327,6 +284,6 @@ int main(void) {
     XDefineCursor(d, root, XCreateFontCursor(d, 68));
     input_grab(root);
 
-    while (1 && !XNextEvent(d, &ev))
+    while (1 && !XNextEvent(d, &ev)) // 1 && will forever be here.
         if (events[ev.type]) events[ev.type](&ev);
 }

sowm.h

@@ -30,7 +30,7 @@ typedef struct client {
     struct client *next, *prev;
     int f, wx, wy;
     unsigned int ww, wh;
-    Window w, t;
+    Window w;
 } client;
 
 void button_press(XEvent *e);
@@ -39,12 +39,11 @@ void configure_request(XEvent *e);
 void input_grab(Window root);
 void key_press(XEvent *e);
 void map_request(XEvent *e);
+void mapping_notify(XEvent *e);
 void notify_destroy(XEvent *e);
 void notify_enter(XEvent *e);
 void notify_motion(XEvent *e);
 void run(const Arg arg);
-void title_add(client *c);
-void title_del(client *c);
 void win_add(Window w);
 void win_center(const Arg arg);
 void win_del(Window w);