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

Improve tabbing render, fix seg, gn8

Browse Source
This commit is contained in:
Martin Duquesnoy 2011-11-19 09:21:24 +01:00
parent 7c2f53a4b2
commit 8d459f7afd
2 changed files with 33 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/client.c
View File

@ -329,6 +329,9 @@ client_grabbuttons(struct client *c, bool focused)
void void
client_frame_update(struct client *c, struct colpair *cp) client_frame_update(struct client *c, struct colpair *cp)
{ {
if(c->flags & CLIENT_TABBED)
return;
XSetWindowBackground(W->dpy, c->frame, cp->bg); XSetWindowBackground(W->dpy, c->frame, cp->bg);
XClearWindow(W->dpy, c->frame); XClearWindow(W->dpy, c->frame);
@ -340,25 +343,26 @@ client_frame_update(struct client *c, struct colpair *cp)
c->titlebar->fg = cp->fg; c->titlebar->fg = cp->fg;
c->titlebar->bg = cp->bg; c->titlebar->bg = cp->bg;
SLIST_FOREACH(cc, &c->tag->clients, tnext) /* Get number of tabbed client if c is tabmaster */
if(cc->tabmaster == c) if(c->flags & CLIENT_TABMASTER)
++n; SLIST_FOREACH(cc, &c->tag->clients, tnext)
if(cc->tabmaster == c)
++n;
f = (c->geo.w - (c->border * (n - 1))) / n; f = (c->geo.w - (c->border * (n - 2))) / n;
y = TEXTY(c->theme, c->tbarw);
_XTEXT();
barwin_reparent(c->titlebar, c->frame); barwin_reparent(c->titlebar, c->frame);
barwin_move(c->titlebar, 0, 0); barwin_move(c->titlebar, 0, 0);
barwin_resize(c->titlebar, f, c->tbarw); barwin_resize(c->titlebar, f, c->tbarw);
barwin_refresh_color(c->titlebar); barwin_refresh_color(c->titlebar);
draw_text(c->titlebar->dr, c->theme, xt, y, cp->fg, c->title);
_XTEXT();
draw_text(c->titlebar->dr, c->theme, xt,
(y = TEXTY(c->theme, c->tbarw)), cp->fg, c->title);
barwin_refresh(c->titlebar); barwin_refresh(c->titlebar);
/* Tabbing case, multiple titlebar in frame */ /* Tabbing case, multiple titlebar in frame */
if(n > 1) if(c->flags & CLIENT_TABMASTER && n > 1)
{ {
int x = f; int x = f;
@ -376,8 +380,8 @@ client_frame_update(struct client *c, struct colpair *cp)
barwin_resize(cc->titlebar, f, c->tbarw); barwin_resize(cc->titlebar, f, c->tbarw);
barwin_refresh_color(cc->titlebar); barwin_refresh_color(cc->titlebar);
draw_text(cc->titlebar->dr, c->theme, xt, draw_text(cc->titlebar->dr, c->theme, xt, y,
y, c->ncol.fg, cc->title); c->ncol.fg, cc->title);
barwin_refresh(cc->titlebar); barwin_refresh(cc->titlebar);
@ -387,33 +391,6 @@ client_frame_update(struct client *c, struct colpair *cp)
} }
} }
void
_client_tab(struct client *c, struct client *cm)
{
/* Do not tab already tabed client */
if(c->flags & (CLIENT_TABBED | CLIENT_TABMASTER))
return;
layout_split_arrange_closed(c);
struct geo g = cm->geo;
/* Isolate tabbed client */
client_unmap(c);
g.x += W->xmaxw;
g.y += W->xmaxh;
c->geo = c->tgeo = g;
c->tabmaster = cm;
cm->tabmaster = NULL;
c->flags |= CLIENT_TABBED;
cm->flags |= CLIENT_TABMASTER;
client_focus(cm);
}
static void static void
client_tab_focus(struct client *c) client_tab_focus(struct client *c)
{ {
@ -447,6 +424,22 @@ client_tab_focus(struct client *c)
} }
} }
void
_client_tab(struct client *c, struct client *cm)
{
/* Do not tab already tabed client */
if(c->flags & (CLIENT_TABBED | CLIENT_TABMASTER))
return;
layout_split_arrange_closed(c);
cm->flags |= CLIENT_TABBED;
c->geo = cm->geo;
cm->tabmaster = c;
client_focus(cm);
}
static void static void
client_untab(struct client *c) client_untab(struct client *c)
{ {

2
src/client.h
View File

@ -91,7 +91,7 @@ client_prev(struct client *c)
static inline struct client* static inline struct client*
client_tab_next(struct client *c) client_tab_next(struct client *c)
{ {
return (c->flags & CLIENT_TABBED ? c->tabmaster : c); return (c && c->tabmaster ? c->tabmaster : c);
} }
static inline void static inline void