karx/tabbed
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed crash when window height was less or equal to bar height

Browse source 
When resizing, the embedded client is being resized to (height = wh - bh),
which is (<= 0) if (wh <= bh). This generates a BadValue Error leading to a
crash.  This patch fixes that by hiding the tab bar if the window height is too
small, and also sets a min_height WM hint to prevent that situation from
happening in the first place.
This commit is contained in:
mikau 2020-05-12 17:09:01 +02:00 committed by Hiltjo Posthuma
parent b5f9ec647a
commit dabf6a25ab
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tabbed.c
View file

@ -152,7 +152,7 @@ static void (*handler[LASTEvent]) (const XEvent *) = {
[MapRequest] = maprequest, [MapRequest] = maprequest,
[PropertyNotify] = propertynotify, [PropertyNotify] = propertynotify,
}; };
static int bh, wx, wy, ww, wh; static int bh, obh, wx, wy, ww, wh;
static unsigned int numlockmask; static unsigned int numlockmask;
static Bool running = True, nextfocus, doinitspawn = True, static Bool running = True, nextfocus, doinitspawn = True,
fillagain = False, closelastclient = False, fillagain = False, closelastclient = False,
@ -256,6 +256,15 @@ configurenotify(const XEvent *e)
XFreePixmap(dpy, dc.drawable); XFreePixmap(dpy, dc.drawable);
dc.drawable = XCreatePixmap(dpy, root, ww, wh, dc.drawable = XCreatePixmap(dpy, root, ww, wh,
DefaultDepth(dpy, screen)); DefaultDepth(dpy, screen));
if (!obh && (wh <= bh)) {
obh = bh;
bh = 0;
} else if (!bh && (wh > obh)) {
bh = obh;
obh = 0;
}
if (sel > -1) if (sel > -1)
resize(sel, ww, wh - bh); resize(sel, ww, wh - bh);
XSync(dpy, False); XSync(dpy, False);
@ -872,7 +881,7 @@ resize(int c, int w, int h)
XWindowChanges wc; XWindowChanges wc;
ce.x = 0; ce.x = 0;
ce.y = bh; ce.y = wc.y = bh;
ce.width = wc.width = w; ce.width = wc.width = w;
ce.height = wc.height = h; ce.height = wc.height = h;
ce.type = ConfigureNotify; ce.type = ConfigureNotify;
@ -883,7 +892,7 @@ resize(int c, int w, int h)
ce.override_redirect = False; ce.override_redirect = False;
ce.border_width = 0; ce.border_width = 0;
XConfigureWindow(dpy, clients[c]->win, CWWidth | CWHeight, &wc); XConfigureWindow(dpy, clients[c]->win, CWY | CWWidth | CWHeight, &wc);
XSendEvent(dpy, clients[c]->win, False, StructureNotifyMask, XSendEvent(dpy, clients[c]->win, False, StructureNotifyMask,
(XEvent *)&ce); (XEvent *)&ce);
} }
@ -1046,9 +1055,10 @@ setup(void)
size_hint = XAllocSizeHints(); size_hint = XAllocSizeHints();
if (!isfixed) { if (!isfixed) {
size_hint->flags = PSize; size_hint->flags = PSize | PMinSize;
size_hint->height = wh; size_hint->height = wh;
size_hint->width = ww; size_hint->width = ww;
size_hint->min_height = bh + 1;
} else { } else {
size_hint->flags = PMaxSize | PMinSize; size_hint->flags = PMaxSize | PMinSize;
size_hint->min_width = size_hint->max_width = ww; size_hint->min_width = size_hint->max_width = ww;