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) -o sowm sowm.c -lX11 $(LDFLAGS)
+	$(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)

sowm.c

@@ -24,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
@@ -221,6 +222,15 @@ void map_request(XEvent *e) {
     win_focus(list->prev);
 }
 
+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) {
     if (fork()) return;
     if (d) close(ConnectionNumber(d));
@@ -240,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++)
@@ -272,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

@@ -39,6 +39,7 @@ 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);