all repos — ryudo @ 548f2f7cbad8bb6aaf5b2522b3f8dff9511c7ae6

the floatiling window manager that flows; fork of rio from plan9port 

event: fix configure requests where a window in another desktop requests focus; client, cursor, event, grab, key, manage, menu: clang-format
Iris Lightshard nilix@nilfm.cc
PGP Signature 
-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEkFh6dA+k/6CXFXU4O3+8IhROY5gFAmCKOQEACgkQO3+8IhRO
Y5gNnw/9EtgNRVxiPKDv2XgyQLAIal1dGUOpPra9JYMi1e5Ru6pV9ZTo8CjnppQ1
v+nq/WRbcbZQm4FxBBaugmfPB9LwNfugskmuwX99GlisIE0d/AhJ+mmOYH9J/4b0
U3lUbYNcKdL9WuKdQaP8oJnNnGwpgrC7x+QKTQVcSbY8Qdwevt0+39GWv1RNvPId
l1zvIGiWgaNOEikIKNz0w/A7cEGMVr7D9fMotcsJbF2qS0KgfwzSaSf8hw58TXdR
20pu7W9jkRy2oYE8vBVOilbYsN4thrUz50GxoLlo0AsK88Np8YZ1qJzGCjlSDNuT
Gv7FlQ/pMJJlpLqU+BmGRAGIAULARbLhLAwCqlnKEjMVjaD6rTxB/lJLv2l1+aq/
lLl8JcJlYXPJdFDn7Vg2FxfCTQpXptF5k4gbiEg+8pjFOj2+0JLYPa6cXogfADEr
nyx7fvsqwGQrW+NEQHaI9PSsxan9YEHbVDQLKaIKKF/DTwGj5QkQOfdtO9rK1zw5
i7Lwej8nUMa7jcr48Vjd0Agf9ZmyjF55v0UlecCdrrp+aUcqhkCXOR8SFF3aT0uX
ClY/Gq/1q12KrqlByYujOq/b7mx307ECgwU4ovY4zJKLu4nu8NNxnWq/NskMWPQ5
YtuH/Xn7s9chqcp8uujqvZYZSZUJpeN1mqezxtIf1OJaa5DgmlQ=
=KCG/
-----END PGP SIGNATURE-----
commit

548f2f7cbad8bb6aaf5b2522b3f8dff9511c7ae6

parent

2a3fb338667360987d792f062448de079116a8a9

7 files changed, 36 insertions(+), 36 deletions(-)

jump to
M client.c → client.c 
@@ -303,9 +303,9 @@ active(c);
     if (zoom) {
       quickreshape(
         c,
-        -BORDER, 
-        -BORDER, 
-        ra.width + 2 * BORDER, 
+        -BORDER,
+        -BORDER,
+        ra.width + 2 * BORDER,
         ra.height + 2 * BORDER);
     }
   } else {
M cursor.c → cursor.c 
@@ -141,8 +141,7 @@ static char grey_bits[] = {0x01, 0x04};
 
 static XColor bl, wh;
 
-Cursor getcursor(Cursordata* c, ScreenInfo* s)
-{
+Cursor getcursor(Cursordata* c, ScreenInfo* s) {
   Pixmap f, m;
 
   f = XCreatePixmapFromBitmapData(

@@ -166,8 +165,7 @@ 1);
   return XCreatePixmapCursor(dpy, f, m, &bl, &wh, c->hot[0], c->hot[1]);
 }
 
-void initcurs(ScreenInfo* s)
-{
+void initcurs(ScreenInfo* s) {
   XColor dummy;
 
   XAllocNamedColor(dpy, DefaultColormap(dpy, s->num), "black", &bl, &dummy);
M event.c → event.c 
@@ -159,6 +159,8 @@ wc.stack_mode = e->detail;
       XConfigureWindow(dpy, c->parent, e->value_mask, &wc);
 
       if (e->value_mask & CWStackMode) {
+        if (c->virt > 0 && c->virt != virt)
+          switch_to(c->virt);
         top(c);
         active(c);
       }

@@ -292,14 +294,14 @@ 
 void destroy(Window w) {
   int i;
   Client* c;
-//  int v;
+  //  int v;
 
   curtime = CurrentTime;
   c = getclient(w, 0);
   if (c == 0)
     return;
 
-//  v = c->virt;
+  //  v = c->virt;
   if (numvirtuals > 1)
     for (i = 0; i < numvirtuals; i++)
       if (currents[i] == c)
M grab.c → grab.c 
@@ -581,7 +581,7 @@ if (bl != BorderUnknown || e0 == 0)
     getmouse(&cx, &cy, c->screen);
   else
     getmouse(&c->x, &c->y, c->screen);
-  //XGrabServer(dpy);
+  // XGrabServer(dpy);
   if (bl != BorderUnknown) {
     notmoved = recalc(c, cx, cy, bl, notmoved);
   }

@@ -593,10 +593,10 @@ getmouse(&rx, &ry, c->screen);
       if (rx != cx || ry != cy || ++idle > 300) {
         drawbound(c, 0);
         if (rx == cx && ry == cy) {
-          //XUngrabServer(dpy);
+          // XUngrabServer(dpy);
           XFlush(dpy);
-          //misleep(500);
-          //XGrabServer(dpy);
+          // misleep(500);
+          // XGrabServer(dpy);
           idle = 0;
         }
         if (e0 || bl != BorderUnknown)

@@ -617,7 +617,7 @@ case ButtonPress:
       case ButtonRelease:
         drawbound(c, 0);
         ungrab(e);
-        //XUngrabServer(dpy);
+        // XUngrabServer(dpy);
         if (e->button != but && c->init)
           goto bad;
         if (c->dx < 0) {
M key.c → key.c 
@@ -461,11 +461,11 @@ else if (e->keycode == zcode && (e->state & SHORTCUTMOD) == (MODBITS)) {
     zoom = !zoom;
     if (zoom) {
       quickreshape(
-            current,
-            -BORDER,
-            -BORDER,
-            ra.width + 2 * BORDER,
-            ra.height + 2 * BORDER);
+        current,
+        -BORDER,
+        -BORDER,
+        ra.width + 2 * BORDER,
+        ra.height + 2 * BORDER);
     }
   }
 #endif

@@ -508,7 +508,7 @@ ra.width - 2 * GAPSZ,
       ra.height / 2 - 1.5 * GAPSZ);
 #endif
 
-  /* quarter snap */
+    /* quarter snap */
 #ifdef SNAPTOPLEFT_KEY
   else if (e->keycode == qcode && (e->state & SHORTCUTMOD) == (MODBITS))
     quickreshape(

@@ -546,7 +546,7 @@ ra.width / 2 - 1.5 * GAPSZ,
       ra.height / 2 - 1.5 * GAPSZ);
 #endif
 
-  /* center snap */
+    /* center snap */
 #ifdef SNAPCENTER_KEY
   else if (e->keycode == ccode && (e->state & SHORTCUTMOD) == (MODBITS)) {
     if ((e->state & ShiftMask) == (1 << 0)) {

@@ -573,7 +573,7 @@ if (e->keycode == bcode && (e->state & SHORTCUTMOD) == (MODBITS))
     stickystack(0);
 #endif
 
-  /* launch */
+    /* launch */
 #ifdef LAUNCH_KEY
   else if (e->keycode == slcode && (e->state & SHORTCUTMOD) == (MODBITS)) {
     kbLaunch = 1;
M manage.c → manage.c 
@@ -224,9 +224,9 @@ /* If we are in zoom mode, spawn the window maximized */
   if (zoom) {
     quickreshape(
       c,
-      -BORDER, 
-      -BORDER, 
-      ra.width + 2 * BORDER, 
+      -BORDER,
+      -BORDER,
+      ra.width + 2 * BORDER,
       ra.height + 2 * BORDER);
   }
 

@@ -560,15 +560,15 @@ 
 #ifdef ALWAYSDRAW
 int shouldalwaysdraw(Client* c) {
   static char* alwaysdraw[] = ALWAYSDRAW;
-    char** a = alwaysdraw;
-  
-    while (*a) {
-      if (c && c->class && strstr(c->class, *a)) {
-        return 1;
-      }
-      ++a;
+  char** a = alwaysdraw;
+
+  while (*a) {
+    if (c && c->class && strstr(c->class, *a)) {
+      return 1;
     }
-    return 0;
+    ++a;
+  }
+  return 0;
 }
 #endif