Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move titlebar initialization routine in titlebar.c

This commit is contained in:
Julien Danjou 2008-03-17 08:56:17 +01:00
parent 02298299b6
commit 7c79f94341
3 changed files with 63 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
client.c
View File

@ -289,7 +289,7 @@ client_manage(Window w, XWindowAttributes *wa, int screen)
Tag *tag;
Rule *rule;
area_t screen_geom;
int phys_screen = get_phys_screen(screen), titlebar_height;
int phys_screen = get_phys_screen(screen);
long flags;
c = p_new(Client, 1);
@ -368,58 +368,6 @@ client_manage(Window w, XWindowAttributes *wa, int screen)
move_client_to_screen(c, screen, True);
}
if(rule && rule->titlebar.position != Auto)
c->titlebar = rule->titlebar;
titlebar_height = 1.5 * MAX(globalconf.screens[c->screen].styles.normal.font->height,
MAX(globalconf.screens[c->screen].styles.focus.font->height,
globalconf.screens[c->screen].styles.urgent.font->height));
switch(c->titlebar.position)
{
case Top:
c->titlebar.sw = simplewindow_new(globalconf.display,
phys_screen,
c->geometry.x,
c->geometry.y - titlebar_height,
c->geometry.width + 2 * c->border,
titlebar_height,
0);
break;
case Bottom:
c->titlebar.sw = simplewindow_new(globalconf.display,
phys_screen,
c->geometry.x,
c->geometry.y + c->geometry.height + 2 * c->border,
c->geometry.width + 2 * c->border,
titlebar_height,
0);
break;
case Left:
c->titlebar.sw = simplewindow_new(globalconf.display,
phys_screen,
c->geometry.x - titlebar_height,
c->geometry.y,
titlebar_height,
c->geometry.width + 2 * c->border,
0);
break;
case Right:
c->titlebar.sw = simplewindow_new(globalconf.display,
phys_screen,
c->geometry.x + c->geometry.width + 2 * c->border,
c->geometry.y,
titlebar_height,
c->geometry.width + 2 * c->border,
0);
break;
case Off:
break;
default:
c->titlebar.position = Off;
break;
}
/* check for transient and set tags like its parent,
* XGetTransientForHint returns 1 on success
*/
@ -433,6 +381,12 @@ client_manage(Window w, XWindowAttributes *wa, int screen)
if(!c->isfloating)
client_setfloating(c, rettrans || c->isfixed);
/* titlebar init */
if(rule && rule->titlebar.position != Auto)
c->titlebar = rule->titlebar;
titlebar_init(c);
if(!(flags & (USPosition | PPosition)))
{
c->f_geometry = globalconf.screens[c->screen].floating_placement(c->f_geometry,

55
titlebar.c
View File

@ -22,9 +22,64 @@
#include <math.h>
#include "titlebar.h"
#include "screen.h"
extern AwesomeConf globalconf;
void
titlebar_init(Client *c)
{
int titlebar_height = 1.5 * MAX(globalconf.screens[c->screen].styles.normal.font->height,
MAX(globalconf.screens[c->screen].styles.focus.font->height,
globalconf.screens[c->screen].styles.urgent.font->height));
int phys_screen = get_phys_screen(c->screen);
switch(c->titlebar.position)
{
case Top:
c->titlebar.sw = simplewindow_new(globalconf.display,
phys_screen,
c->geometry.x,
c->geometry.y - titlebar_height,
c->geometry.width + 2 * c->border,
titlebar_height,
0);
break;
case Bottom:
c->titlebar.sw = simplewindow_new(globalconf.display,
phys_screen,
c->geometry.x,
c->geometry.y + c->geometry.height + 2 * c->border,
c->geometry.width + 2 * c->border,
titlebar_height,
0);
break;
case Left:
c->titlebar.sw = simplewindow_new(globalconf.display,
phys_screen,
c->geometry.x - titlebar_height,
c->geometry.y,
titlebar_height,
c->geometry.width + 2 * c->border,
0);
break;
case Right:
c->titlebar.sw = simplewindow_new(globalconf.display,
phys_screen,
c->geometry.x + c->geometry.width + 2 * c->border,
c->geometry.y,
titlebar_height,
c->geometry.width + 2 * c->border,
0);
break;
case Off:
break;
default:
c->titlebar.position = Off;
break;
}
}
void
titlebar_update(Client *c)
{

1
titlebar.h
View File

@ -24,6 +24,7 @@
#include "structs.h"
void titlebar_init(Client *);
void titlebar_update(Client *);
void titlebar_update_geometry_floating(Client *);
area_t titlebar_update_geometry(Client *, area_t);