Makefile

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

README.md

@@ -1,16 +1,15 @@
-# sowm (*~~Simple~~ Shitty Opinionated Window Manager*)
+# sowm (*Simple 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!*).
+An itsy bitsy floating window manager (*220~ sloc / 24kb compiled!*).
 
 - Floating only.
 - Fullscreen toggle.
 - Window centering.
 - Mix of mouse and keyboard workflow.
 - Focus with cursor.
-- Rounded corners (*[through patch](https://github.com/dylanaraps/sowm/pull/58)*)
-- Titlebars (*[through patch](https://github.com/dylanaraps/sowm/pull/57)*)
+- Rounded corners (*[through patch](https://github.com/dylanaraps/sowm-patches)*)
 
 <a href="https://user-images.githubusercontent.com/6799467/66687814-8cd9f800-ec73-11e9-97b8-6ae77876bd1b.jpg"><img src="https://user-images.githubusercontent.com/6799467/66687814-8cd9f800-ec73-11e9-97b8-6ae77876bd1b.jpg" width="43%" align="right"></a>
 
@@ -24,7 +23,7 @@ An itsy bitsy floating window manager (*220~ sloc!*).
 
 <br>
 
-Patches available here: https://github.com/dylanaraps/sowm/pulls
+Patches available here: https://github.com/dylanaraps/sowm-patches
 
 ## Default Keybindings
 
@@ -38,8 +37,8 @@ Patches available here: https://github.com/dylanaraps/sowm/pulls
 | `MOD4` + `f`               | maximize toggle        |
 | `MOD4` + `c`               | center window          |
 | `MOD4` + `q`               | kill window            |
-| `MOD4` + `1-6`             | desktop swap           |
-| `MOD4` + `Shift` +`1-6`    | send window to desktop |
+| `MOD4` + `1-9`             | desktop swap           |
+| `MOD4` + `Shift` +`1-9`    | send window to desktop |
 | `MOD1` + `TAB` (*alt-tab*) | focus cycle            |
 
 **Programs**
@@ -71,28 +70,17 @@ 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](https://github.com/venam/2bwm)
-- [SmallWM](https://github.com/adamnew123456/SmallWM)
-- [berry](https://github.com/JLErvin/berry)
-- [catwm](https://github.com/pyknite/catwm)
-- [dminiwm](https://github.com/moetunes/dminiwm)
-- [dwm](https://dwm.suckless.org)
-- [monsterwm](https://github.com/c00kiemon5ter/monsterwm)
-- [openbox](https://github.com/danakj/openbox)
-- [possum-wm](https://github.com/duckinator/possum-wm)
-- [swm](https://github.com/dcat/swm)
-- [tinywm](http://incise.org/tinywm.html)
+- 2bwm
+- SmallWM
+- berry
+- catwm
+- dminiwm
+- dwm
+- monsterwm
+- openbox
+- possumwm
+- swm
+- tinywm

sowm.c

@@ -16,7 +16,6 @@ static unsigned int ww, wh;
 
 static Display      *d;
 static XButtonEvent mouse;
-static Window       root;
 
 static void (*events[LASTEvent])(XEvent *e) = {
     [ButtonPress]      = button_press,
@@ -24,7 +23,6 @@ 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
@@ -60,8 +58,8 @@ void notify_motion(XEvent *e) {
     XMoveResizeWindow(d, mouse.subwindow,
         wx + (mouse.button == 1 ? xd : 0),
         wy + (mouse.button == 1 ? yd : 0),
-        MAX(1, ww + (mouse.button == 3 ? xd : 0)),
-        MAX(1, wh + (mouse.button == 3 ? yd : 0)));
+        ww + (mouse.button == 3 ? xd : 0),
+        wh + (mouse.button == 3 ? yd : 0));
 }
 
 void key_press(XEvent *e) {
@@ -140,9 +138,8 @@ void win_fs(const Arg arg) {
         win_size(cur->w, &cur->wx, &cur->wy, &cur->ww, &cur->wh);
         XMoveResizeWindow(d, cur->w, 0, 0, sw, sh);
 
-    } else {
+    } else
         XMoveResizeWindow(d, cur->w, cur->wx, cur->wy, cur->ww, cur->wh);
-    }
 }
 
 void win_to_ws(const Arg arg) {
@@ -222,15 +219,6 @@ 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));
@@ -250,8 +238,6 @@ 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++)
@@ -275,15 +261,15 @@ int main(void) {
     signal(SIGCHLD, SIG_IGN);
     XSetErrorHandler(xerror);
 
-    int s = DefaultScreen(d);
-    root  = RootWindow(d, s);
-    sw    = XDisplayWidth(d, s);
-    sh    = XDisplayHeight(d, s);
+    int s       = DefaultScreen(d);
+    Window root = RootWindow(d, s);
+    sw          = XDisplayWidth(d, s);
+    sh          = XDisplayHeight(d, s);
 
     XSelectInput(d,  root, SubstructureRedirectMask);
     XDefineCursor(d, root, XCreateFontCursor(d, 68));
     input_grab(root);
 
-    while (1 && !XNextEvent(d, &ev)) // 1 && will forever be here.
+    while (1 && !XNextEvent(d, &ev))
         if (events[ev.type]) events[ev.type](&ev);
 }

sowm.h

@@ -3,7 +3,6 @@
 #define win        (client *t=0, *c=list; c && t!=list->prev; t=c, c=c->next)
 #define ws_save(W) ws_list[W] = list
 #define ws_sel(W)  list = ws_list[ws = W]
-#define MAX(a, b)  ((a) > (b) ? (a) : (b))
 
 #define win_size(W, gx, gy, gw, gh) \
     XGetGeometry(d, W, &(Window){0}, gx, gy, gw, gh, \
@@ -13,7 +12,7 @@
 #define mod_clean(mask) (mask & ~(numlock|LockMask) & \
         (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
 
-typedef struct {
+typedef union {
     const char** com;
     const int i;
     const Window w;
@@ -39,7 +38,6 @@ 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);
@@ -54,5 +52,4 @@ void win_prev(const Arg arg);
 void win_next(const Arg arg);
 void win_to_ws(const Arg arg);
 void ws_go(const Arg arg);
-
-static int xerror() { return 0; }
+int  xerror() { return 0; }