godzil/wmfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tag: Remove useless stuff in tagtransfert (can segfault)

Browse Source
This commit is contained in:
Martin Duquesnoy 2008-10-18 22:59:08 +02:00
parent 17716ae54f
commit bc1d19a6bc
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bar.c
View File

@ -151,7 +151,7 @@ updatebutton(Bool c)
int y = 0, hi = 0;
/* Calcul the position of the first button with the layout image size */
j = taglen[conf.ntag] + textw(tags[seltag].layout.symbol) + PAD*1.5;
j = taglen[conf.ntag] + textw(tags[seltag].layout.symbol) + PAD/2;
if(!conf.bartop)
y = bary + 2;

19
src/client.c
View File

@ -304,6 +304,7 @@ client_moveresize(Client *c, XRectangle geo, bool r)
{
if(!c)
return;
/* Resize hints {{{ */
if(r)
{
@ -312,9 +313,11 @@ client_moveresize(Client *c, XRectangle geo, bool r)
geo.width = 1;
if (geo.height < 1)
geo.height = 1;
/* base */
geo.width -= c->basew;
geo.height -= c->baseh;
/* aspect */
if (c->minay > 0 && c->maxay > 0
&& c->minax > 0 && c->maxax > 0)
@ -324,11 +327,13 @@ client_moveresize(Client *c, XRectangle geo, bool r)
else if (geo.width * c->minay < geo.height * c->minax)
geo.height = geo.width * c->minay / c->minax;
}
/* incremental */
if(c->incw)
geo.width -= geo.width % c->incw;
if(c->inch)
geo.height -= geo.height % c->inch;
/* base dimension */
geo.width += c->basew;
geo.height += c->baseh;
@ -385,6 +390,7 @@ client_size_hints(Client *c)
}
else
c->basew = c->baseh = 0;
/* inc */
if(size.flags & PResizeInc)
{
@ -393,6 +399,7 @@ client_size_hints(Client *c)
}
else
c->incw = c->inch = 0;
/* max */
if(size.flags & PMaxSize)
{
@ -401,6 +408,7 @@ client_size_hints(Client *c)
}
else
c->maxw = c->maxh = 0;
/* min */
if(size.flags & PMinSize)
{
@ -409,10 +417,12 @@ client_size_hints(Client *c)
}
else if(size.flags & PBaseSize)
{
c->minw = size.base_width; c->minh = size.base_height;
c->minw = size.base_width;
c->minh = size.base_height;
}
else
c->minw = c->minh = 0;
/* aspect */
if(size.flags & PAspect)
{
@ -422,6 +432,7 @@ client_size_hints(Client *c)
c->maxay = size.max_aspect.y;
}
else
c->minax = c->maxax = c->minay = c->maxay = 0;
c->hint = (c->maxw && c->minw && c->maxh && c->minh
&& c->maxw == c->minw && c->maxh == c->minh);
@ -452,10 +463,8 @@ client_unhide(Client *c)
return;
XMoveWindow(dpy, c->win, c->geo.x, c->geo.y + conf.ttbarheight);
if(conf.ttbarheight)
bar_moveresize(c->tbar,
c->geo.x,
c->geo.y,
c->geo.width, conf.ttbarheight);
bar_moveresize(c->tbar, c->geo.x,
c->geo.y, c->geo.width, conf.ttbarheight);
setwinstate(c->win, NormalState);
c->hide = False;

3
src/tag.c
View File

@ -81,7 +81,6 @@ uicb_tag_prev(uicb_t cmd)
void
uicb_tagtransfert(uicb_t cmd)
{
Client *c;
int n = atoi(cmd);
if(!sel)
@ -92,8 +91,6 @@ uicb_tagtransfert(uicb_t cmd)
sel->tag = n;
selbytag[n] = sel;
c = (sel->next->tag == seltag) ? sel->next : NULL;
client_focus(((c) ? c : NULL));
arrange();