truncate long window labels, maximized windows have no visible border, fix makefile
Iris Lightshard nilix@nilfm.cc
PGP Signature
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEkFh6dA+k/6CXFXU4O3+8IhROY5gFAl3oWrcACgkQO3+8IhRO Y5i9QQ//dO/Yx4oVUcbwou59Zb1KaCPItj8qUzR1pS1ZWpHcOcnja2wy+p6kL9rE LEuumIVJ1+PxXpCVNom4uMDEdPjZe7ruFjAapqZwntAN9JGEosZra9tpfrv9xDuI jD37mQHqSmx/4C+tcQ2R9DpqbkqNtEyVr8S2tA7iUdzLJuNKNg2XjoqgnuV97QLu 60pMjJOTBTGppZ8Fm4QrkF+t236a8LVyPbCaxC/IB7wU618mV8HD+qcJrNOtCO4E YA+ZcygEIHIdbXuenqVXFjWlMJVFssEiSyZ+UlbQWSkA6JP0wvEBtUAPLIcRWlNc GqPrmpOIhrlZM87NE+kYabVC3G2XLJOFovJrPDmfUv3JC5LHL/+qrt+ItTcqt8Nq WoKSoMRZ7bi2OQSFvOCDQfBUV9FIbaOZIQEln3m6ZLzbHw8jelMmM0bkyvKAZI2h R60Cwk3iRiK9CmNW7V+b6A/oQKSQ3QsquEldZIIXbdNcBoAeTg1A43Vx15p8fkVS KklKaceLoI44c5cyGMAYo8w+dYBeTQZNdFFu1gZkeCdYvKP0tMCxChj+DXW8HCyr +lMsncDIaG/AxdhO++ciJ9A7FwbPdOgqUcHsuhpRiljRYFp1zIXOdv3vMtWM90sb sVMz7MgDYjaa/PRe6dhSJ5lGJymd7nX4vUYQfcx903vrj6F1tGE= =mVSG -----END PGP SIGNATURE-----
3 files changed,
17 insertions(+),
16 deletions(-)
M
key.c
→
key.c
@@ -106,7 +106,7 @@ int ccode = XKeysymToKeycode(dpy, SNAPCENTER_KEY);
int rightcode = XKeysymToKeycode(dpy, NEXTVIRT_KEY); int leftcode = XKeysymToKeycode(dpy, PREVVIRT_KEY); - XWindowAttributes ra; + static XWindowAttributes ra; XGetWindowAttributes(dpy, DefaultRootWindow(dpy), &ra); /* alt tab */@@ -123,7 +123,7 @@ move(current, Button3);
if (e->keycode == rcode && (e->state&SHORTCUTMOD) == (MODBITS)) reshape(current, Button3, sweep, 0); if (e->keycode == mcode && (e->state&SHORTCUTMOD) == (MODBITS)) - quickreshape(current, 0, 0, ra.width, ra.height); + quickreshape(current, -BORDER, -BORDER, ra.width + 2*BORDER, ra.height + 2*BORDER); /* half snap */ if (e->keycode == hcode && (e->state&SHORTCUTMOD) == (MODBITS))@@ -173,12 +173,12 @@ }
} /* switch virts */ - if (e->keycode == rightcode && (e->state&SHORTCUTMOD) == (MODBITS)) - if (numvirtuals > 1 && virt < numvirtuals - 1) - switch_to(virt + 1); - if (e->keycode == leftcode && (e->state&SHORTCUTMOD) == (MODBITS)) - if (numvirtuals >1 && virt > 0) - switch_to(virt - 1); + if (e->keycode == rightcode && (e->state&SHORTCUTMOD) == (MODBITS)) + if (numvirtuals > 1 && virt < numvirtuals - 1) + switch_to(virt + 1); + if (e->keycode == leftcode && (e->state&SHORTCUTMOD) == (MODBITS)) + if (numvirtuals >1 && virt > 0) + switch_to(virt - 1); XAllowEvents(dpy, SyncKeyboard, e->time); }
M
manage.c
→
manage.c
@@ -341,7 +341,8 @@
void setlabel(Client *c) { - char *label, *p; + char *label, *p, *lc; + int i; if(c->iconname != 0) label = c->iconname;@@ -355,6 +356,13 @@ else
label = "no label"; if((p = index(label, ':')) != 0) *p = '\0'; + for (i = 0, lc = label; *lc != '\0'; lc++, i++){ + if (i >= 23){ + label[22] = '~'; + label[23] = '\0'; + } + } + c->label = label; }
M
mkriorules.sh
→
mkriorules.sh
@@ -1,8 +1,1 @@
-if [ "x$WSYSTYPE" != xx11 ]; then - echo 'default:V: all' - echo - echo 'all install clean nuke:' - echo ' # WSYSTYPE is not x11, and ryudo is only for x11' - exit 0 -fi cat $PLAN9/src/mkmany