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

Merge master in dev branch

Browse Source
This commit is contained in:
Martin Duquesnoy 2011-07-21 22:14:57 +02:00
commit 5d83a4a664
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client.c
View File

@ -703,7 +703,7 @@ client_manage(Window w, XWindowAttributes *wa, bool ar)
screen_get_sel(); screen_get_sel();
c = zmalloc(sizeof(Client)); c = zcalloc(sizeof(Client));
c->win = w; c->win = w;
c->screen = selscreen; c->screen = selscreen;
c->flags = 0; c->flags = 0;

5
src/infobar.c
View File

@ -206,7 +206,7 @@ infobar_draw_selbar(InfoBar *i)
barwin_map(i->selbar); barwin_map(i->selbar);
/* Truncate string if too long */ /* Truncate string if too long */
if(conf.selbar.maxlength >= 0 && sel) if(conf.selbar.maxlength >= 0 && sel && sel->title)
{ {
str = xcalloc(conf.selbar.maxlength + 4, sizeof(char)); str = xcalloc(conf.selbar.maxlength + 4, sizeof(char));
strncpy(str, sel->title, conf.selbar.maxlength); strncpy(str, sel->title, conf.selbar.maxlength);
@ -424,8 +424,7 @@ uicb_infobar_toggledisplay(uicb_t cmd)
new_pos = (tags[selscreen][seltag[selscreen]].barpos new_pos = (tags[selscreen][seltag[selscreen]].barpos
? 0 : (tags[selscreen][seltag[selscreen]].prev_barpos ? 0 : (tags[selscreen][seltag[selscreen]].prev_barpos
? tags[selscreen][seltag[selscreen]].prev_barpos : 2 ? tags[selscreen][seltag[selscreen]].prev_barpos : 2));
));
tags[selscreen][seltag[selscreen]].prev_barpos = tags[selscreen][seltag[selscreen]].barpos; tags[selscreen][seltag[selscreen]].prev_barpos = tags[selscreen][seltag[selscreen]].barpos;
tags[selscreen][seltag[selscreen]].barpos = new_pos; tags[selscreen][seltag[selscreen]].barpos = new_pos;

2
src/structs.h
View File

@ -543,6 +543,8 @@ typedef struct
#endif /* HAVE_XFT */ #endif /* HAVE_XFT */
XFontSet fontset; XFontSet fontset;
} FontStruct; } FontStruct;
/* status.c util struct */
typedef struct typedef struct
{ {
int x, y, w, h; int x, y, w, h;

4
src/tag.c
View File

@ -502,15 +502,11 @@ tag_additional(int sc, int tag, int adtag)
|| adtag < 1 || adtag == seltag[sc]) || adtag < 1 || adtag == seltag[sc])
return; return;
if(tags[sc][tag].flags & SplitFlag)
tags[sc][tag].flags &= ~SplitFlag; tags[sc][tag].flags &= ~SplitFlag;
tags[sc][tag].tagad ^= TagFlag(adtag); tags[sc][tag].tagad ^= TagFlag(adtag);
tags[sc][adtag].flags |= RequestUpdateFlag; tags[sc][adtag].flags |= RequestUpdateFlag;
tags[sc][tag].flags |= CleanFactFlag; tags[sc][tag].flags |= CleanFactFlag;
tags[sc][adtag].flags |= CleanFactFlag; tags[sc][adtag].flags |= CleanFactFlag;
if(tags[sc][adtag].flags & SplitFlag)
tags[sc][adtag].flags &= ~SplitFlag; tags[sc][adtag].flags &= ~SplitFlag;
arrange(sc, True); arrange(sc, True);