truncate long window labels, maximized windows have no visible border, fix makefile

This commit is contained in:
Iris Lightshard 2019-12-04 20:17:43 -05:00
parent d3eba6a99b
commit a008886973
Signed by: Iris Lightshard
GPG key ID: 3B7FBC22144E6398
3 changed files with 17 additions and 16 deletions

4
key.c
View file

@ -106,7 +106,7 @@ keypress(XKeyEvent *e)
int rightcode = XKeysymToKeycode(dpy, NEXTVIRT_KEY); int rightcode = XKeysymToKeycode(dpy, NEXTVIRT_KEY);
int leftcode = XKeysymToKeycode(dpy, PREVVIRT_KEY); int leftcode = XKeysymToKeycode(dpy, PREVVIRT_KEY);
XWindowAttributes ra; static XWindowAttributes ra;
XGetWindowAttributes(dpy, DefaultRootWindow(dpy), &ra); XGetWindowAttributes(dpy, DefaultRootWindow(dpy), &ra);
/* alt tab */ /* alt tab */
@ -123,7 +123,7 @@ keypress(XKeyEvent *e)
if (e->keycode == rcode && (e->state&SHORTCUTMOD) == (MODBITS)) if (e->keycode == rcode && (e->state&SHORTCUTMOD) == (MODBITS))
reshape(current, Button3, sweep, 0); reshape(current, Button3, sweep, 0);
if (e->keycode == mcode && (e->state&SHORTCUTMOD) == (MODBITS)) 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 */ /* half snap */
if (e->keycode == hcode && (e->state&SHORTCUTMOD) == (MODBITS)) if (e->keycode == hcode && (e->state&SHORTCUTMOD) == (MODBITS))

View file

@ -341,7 +341,8 @@ getcmaps(Client *c)
void void
setlabel(Client *c) setlabel(Client *c)
{ {
char *label, *p; char *label, *p, *lc;
int i;
if(c->iconname != 0) if(c->iconname != 0)
label = c->iconname; label = c->iconname;
@ -355,6 +356,13 @@ setlabel(Client *c)
label = "no label"; label = "no label";
if((p = index(label, ':')) != 0) if((p = index(label, ':')) != 0)
*p = '\0'; *p = '\0';
for (i = 0, lc = label; *lc != '\0'; lc++, i++){
if (i >= 23){
label[22] = '~';
label[23] = '\0';
}
}
c->label = label; c->label = label;
} }

View file

@ -1,8 +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 cat $PLAN9/src/mkmany