From 78ba2fe9b62a735261d7e58824fb105da33add8d Mon Sep 17 00:00:00 2001
From: "Michael D. Lowis" <mike@mdlowis.com>
Date: Sun, 8 Mar 2020 22:13:44 -0400
Subject: [PATCH] mild refactoring

---
 .gitignore |   1 +
 disp.c     |  21 ++++++++++++++++++---
 lwm        | Bin 56428 -> 56428 bytes
 lwm.h      |  18 ++----------------
 manage.c   |  31 ++-----------------------------
 5 files changed, 23 insertions(+), 48 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4829287..e7d2224 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 tags
 lwm
+lwm.dSYM/
diff --git a/disp.c b/disp.c
index 44c9189..e9f2c87 100644
--- a/disp.c
+++ b/disp.c
@@ -273,8 +273,22 @@ unmap(XEvent *ev) {
         return;
     }
 
-    /* This is a plain unmap, so withdraw the window. */
-    withdraw(c);
+    if (c->parent != c->screen->root) {
+        XUnmapWindow(dpy, c->parent);
+        XReparentWindow(dpy, c->parent, c->screen->root, c->size.x, c->size.y);
+    }
+
+    XRemoveFromSaveSet(dpy, c->window);
+    Client_SetState(c, WithdrawnState);
+
+    /*
+     * Flush and ignore any errors. X11 sends us an UnmapNotify before it
+     * sends us a DestroyNotify. That means we can get here without knowing
+     * whether the relevant window still exists.
+     */
+    ignore_badwindow = 1;
+    XSync(dpy, False);
+    ignore_badwindow = 0;
 
     c->internal_state = INormal;
 }
@@ -514,7 +528,8 @@ property(XEvent * ev) {
         getWindowName(c);
         Client_SetActive(c, c == current, 0L);
     } else if (e->atom == XA_WM_TRANSIENT_FOR) {
-        getTransientFor(c);
+        c->trans = None;
+        XGetTransientForHint(dpy, c->window, &(c->trans));
     } else if (e->atom == XA_WM_NORMAL_HINTS) {
         getNormalHints(c);
     }
diff --git a/lwm b/lwm
index d0ecf68d598e589a12bc46b677fa1e993a4febb2..b02fcae26d1ba14a9ca9560cc344f0ac365e9f49 100755
GIT binary patch
delta 2070
zcmaE}gZa%4<_#IF0<TyXU%33jxV+WRt3}t?+JAEe>v|E!hRGUIbvz9W3=AIKp+8)@
zyE-;+lDf{QGl7ADfe|d~`oQCO14sb_lzY6Phk=2C1<qTrd8<qpqcB(re~SP_{D(*P
zj)u)aa?<RKJ)84XD;Yho$TKi7yf_sAvby%ei<=O}50B1vkW!CsSFjl%HAey%7&;Gv
zL^?Y<HtVaaa4_~v4$&`V?Ad%uzl4i%!e)Cb9VQ`=n;H09g&{8ZaJ*r{<XRhP#tEBe
z+T^h@_H5>GJ|@n%VDtGXQFg`&lb<H;<Of^S>3YGV+x10vN5|&1NtvvS3pR^q=&&<3
zY<9{2V{N#Zoq-_*<aH?C!_L5v#>~i2J3loJBm@d1Jw^rw1u;l~{heI6+MbbX^2XKn
zj53oyuC`~?oou+qp3z});Tn6!pvfE8*fYjW{<y}TF>A8nT6@OI$%Sj}8QUjsTx-ub
zWAewf_KeFW8?Liw+%mavojv2B$s5<%GhUwjah*Nm>&b@e?V0{_OfFh)$0$B|<9d5W
zmB}C1+cTO>Hr$|Z=*Y>ypa60a6#Js_!_fE{lP7M_H!S2t^<EVxcJDc;L%g?p^2ZJK
zjOQjBZq#SIJ2`QqzTrzW6Fxvqs6z{&08NMq`jZcCv}d%O%(%&((Q&flCVNKz$&H)r
z8Dl0N++@#~J(+Q{J!8dW$IbSPEt4BJ+cQp@d~mZp<IKs7TkIJZO?KR3&$w}N;}(0y
z-IEV)v1dFwnQ^N<<C)2hTkRR|O>W$(&-iWf#;y8>f4NZo#mWuw7rLtsctBj`I$3a=
zJ)_U$z-{`BQIi|D=^N&7qnc2R!-NlB5EC{{ez?t^aqncs?e>fpCMRyUXM8q!;dXn*
zKa(GBw`UZZthmFTQE_tO4tqx9$qRSr3wrUO##iX%hdcBQlXy^V&EUcAZig6%t;;4m
z?zCrIGr4i6J>$;F2X}(vhH)1tEF5=%l1$?+d&bX`5AL#O`p+|&X}2At&}7Hm`t@?W
zsFrJ@@eR@V)@XcBG=2aYKOT*rkIJuSC_xoqs6yj+pz$Z7@n@m&7o+jFpz#l(@Rb=D
z&Y}n~Fx*DtKb<^rkG|m-UexIL%ZoiaKBPmU!*24&J@$-llMVOUGlots+-uL6I(g$>
zd&aWKANSfbwoNwNXU{lga^XIE#(9%B?$Z}s&Bwr?#=*ewW->(ouE`(w=^LKpL$&oH
zA9h;>${@M~CkO7guUF=0VBlk9U`UXFh?+t97gQm9KPaC;3&IbB@+Uy~DNz0geTaM^
zls~})!f$}`H$eHlP=0|aSiYWNCRAX9Iaq*UIh1c;1L3cO@;5;F+o5~`TZsHID4)R*
z!oL9JUx4y&LHP|%5c!8tet<KGU(dks87jcw0uo?g;1+;{$b)DIUkS?p5C`GwL-`Yu
zA$)5n|3MLi?+xWA6hrutP`*Jagr5fDb1*P`n8?7u=)%CjPzn`bm;_PK2;~Pr`5jO`
zEV`#d`5&Oszie~hK^dXRd6%8pjML0g&5bs1zr2Hy%`!33(A;ct>D4?oLrY_mM5E0w
zuL>}-8Cs@Tq!>^Be=VKOBFQMtB5iWc^>=KRDXGcH=9?34Ok!k9O-nU4Gn@S5=2^Dn
RR5J?;qs^ypEo5Y5003@2wr&6b

delta 2070
zcmaE}gZa%4<_#IF0u0sVR~U0Gmo?9j>$Q-JIlQ@ob-f5<$7BtuI-U*&1_qDr&>t?{
zT@yBMlDf{Q)4;&Mzz7y~ec*At0i=Kd%01q&fPsO51<qTtd8<qpqcB(re~SP_{D(*P
zj*iVia?<RK3pVGeRx)~Ek!N6FcyTHKWOeO_7dIh{A0D0UAf+DNu3$4jYK{ajFmxUS
ziF9^M*sQOv!oj#;a)^E@<ATkn^h>xH8#dcp=`aa_+|0n=DhzSKhvN+mlWT3H85=gw
zw8>**T(FtL`ItE4lFjF%MA;b|CO=Kw$q%-u)AfQ!x9f}UjtQIBCS|fRF4-)ep~KGD
zvDqd6kG0_zb_RwNkk_GjFFON68Z#q<`|Q*>kPs-4^cWc!6vQ9__HT0GYI{cR$s1SO
zGs;f>xZ0jkZ?fSUdq&5}g=_2?gC}oXW6u~r`QsXU#_Y+4Ywa1UCKs-?XY81~ajiY$
z%*h|u+A}VnY`D&zaqHy5b@q&hCvRM5&v<3>$949MZzdbAw`XGDoLsctj!|Or#`X4$
zs*^viw`Vk+Y`8(+(20|QK>_3<DE33+hokW`Cr{j<Z&<{M>b+`C?A~)whj?$#<c}Nd
z8P88P+^ElZZ*t;BeZyC1CVa$ULVza31cS*3H`+5=O=jF=&*(JSag#k`z~shF_KdNU
z4{ow&%$dx%*`Bd-vg2lZ#@5M=o9!7VPd>QWo^jS>#x3@Yizhp7v1i;gxp9j<<DSU}
zx7afto6NY?p7HEt$F25^_a`@Q)o1)ZdE-`n!+%_;{$k_C?ymzL5LdZP7Tjjf=sP)Z
zn?7Uo<i>6KhPm9RCY0bX;e!{%gw2y5ZnJ0HH(7DJJ>$j6iQDZNpHE)6-JbF9<cHhs
z8HFb+?yzT6nw+@9p3!9T!X5g8-aM%B6*l?d4t>L99#mU1d9b_NAqHaW^2v@n?HSij
zZro|lxNGvkouIg3+yx2?$6cT#)40o?@yq0cyX=`5cqcRMwqq2Y?6_OMUY-}#axFBz
z5gOkHjqioV4@Bc9pz#Y(`SlE?r~(YtX#7qz{v<U1Y&8B7H2zjJ{$UipG6Tao6afZ?
zJ81l8lPB)cH~h+r8Xf<5u}8;;bVzjAPyV>ap3!}>;a+>ju*rpc?HSW1Z`^CoSU&mV
zUVFy&$%gyv8K+Jz+-J`?fAYqC`hsit7#P$z7#QA6hUnit`Qtu)!&7{ywqD}HZmU2U
zM3>Oy!2S01D*Ox#e2feX2@()db146UDunM3<uhnO_~B6g1Smfh%KxAbkuQSsCzwF^
zjZppuD8CQNFE9nm*E7t53T!Y33oxvJ@(pYt{Pj@&1}J|AlrLZlkv|UQGdM!{7oq$M
zQ2uQwzrhJ2{|L$ta0c<~85q7m1sGgF0t^g10+0}S5DnogL-`-#AbbNTe?l^ZZv*8&
zD1z{Pp!|el2tNwSHz<Yh(?NU=28It485kH{7#JAJpaKk&APSnG`~WDw6Uv80_Y5fi
z12p=VZw@>tBgAMlIrp+Nn?;(brJ=><ZI^d2vKb~Dn<X1hF1eb=W|VAbWMsPe#Z>`D
zHX}=e)YQbu|E{I8B^sNhrlwBLzW$EQ%p%RmJY{qIjY*7bhN&h=DQT0x-#p7^lwxR{
LnzH%St%ZyL8Thi-

diff --git a/lwm.h b/lwm.h
index 30de4e4..8bba70b 100644
--- a/lwm.h
+++ b/lwm.h
@@ -25,18 +25,7 @@
 
 /* --- End of administrator-configurable defaults. --- */
 
-/*
- * Window manager mode. wm is in one of five modes: it's either getting
- * user input to move/reshape a window, getting user input to make a
- * selection from the menu, waiting for user input to confirm a window close
- * (by releasing a mouse button after prssing it in a window's box),
- * waiting for user input to confirm a window hide (by releasing a mouse
- * button after prssing it in a window's frame),
- * or it's `idle' --- responding to events arriving
- * from the server, but not directly interacting with the user.
- * OK, so I lied: there's a sixth mode so that we can tell when wm's still
- * initialising.
- */
+/* Set of states the window manager can be in. */
 typedef enum {
     wm_initialising,
     wm_idle,
@@ -94,7 +83,6 @@ struct ScreenInfo {
     unsigned long black; /* Black pixel value. */
     unsigned long white; /* White pixel value. */
     unsigned long gray;  /* Gray pixel value. */
-
     Cursor root_cursor;
     Cursor box_cursor;
     Cursor cursor_map[E_LAST];
@@ -110,7 +98,7 @@ enum {
 };
 
 typedef struct Client {
-    strcut Client* next; /* Next window in client list. */
+    struct Client* next; /* Next window in client list. */
     Window window;       /* Client's window. */
     Window parent;       /* Window manager frame. */
     Window trans;        /* Window that client is a transient for. */
@@ -198,8 +186,6 @@ extern void panic(char*);
 extern void getWindowName(Client *);
 extern void getNormalHints(Client *);
 extern void manage(Client *, int);
-extern void withdraw(Client *);
-extern void getTransientFor(Client *);
 
 /*  mouse.c */
 extern void getMousePosition(int *, int *);
diff --git a/manage.c b/manage.c
index 26ba3b5..9558033 100644
--- a/manage.c
+++ b/manage.c
@@ -92,7 +92,8 @@ manage(Client * c, int mapped)
     }
 
     /* Get the WM_TRANSIENT_FOR property (see ICCCM section 4.1.2.6). */
-    getTransientFor(c);
+    c->trans = None;
+    XGetTransientForHint(dpy, c->window, &(c->trans));
 
     /* Work out details for the Client structure from the hints. */
     if (hints && (hints->flags & InputHint))
@@ -241,34 +242,6 @@ applyGravity(Client *c) {
     }
 }
 
-void
-getTransientFor(Client *c) {
-    Window  trans = None;
-
-    XGetTransientForHint(dpy, c->window, &trans);
-    c->trans = trans;
-}
-
-void
-withdraw(Client *c) {
-    if (c->parent != c->screen->root) {
-        XUnmapWindow(dpy, c->parent);
-        XReparentWindow(dpy, c->parent, c->screen->root, c->size.x, c->size.y);
-    }
-
-    XRemoveFromSaveSet(dpy, c->window);
-    Client_SetState(c, WithdrawnState);
-
-    /*
-     * Flush and ignore any errors. X11 sends us an UnmapNotify before it
-     * sends us a DestroyNotify. That means we can get here without knowing
-     * whether the relevant window still exists.
-     */
-    ignore_badwindow = 1;
-    XSync(dpy, False);
-    ignore_badwindow = 0;
-}
-
 static int
 getProperty(Window w, Atom a, Atom type, long len, unsigned char **p) {
     Atom    real_type;
-- 
2.54.0