awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove initlayout function

This commit is contained in:
Julien Danjou 2007-09-07 15:04:02 +02:00
parent 02bd4f8974
commit 2eaadb39e7
4 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config.c
View File

@ -17,6 +17,8 @@
#include "layouts/spiral.h" #include "layouts/spiral.h"
#include "layouts/floating.h" #include "layouts/floating.h"
int blw = 0;
/* static */ /* static */
static void initfont(const char *, Display *, DC *); static void initfont(const char *, Display *, DC *);
static unsigned long initcolor(const char *colstr, Display *, int); static unsigned long initcolor(const char *colstr, Display *, int);
@ -195,6 +197,9 @@ parse_config(Display * disp, int scr, DC * drawcontext, jdwm_config *jdwmconf)
eprint("error parsing configuration file at line %d: %s\n", eprint("error parsing configuration file at line %d: %s\n",
config_error_line(&jdwmlibconf), config_error_text(&jdwmlibconf)); config_error_line(&jdwmlibconf), config_error_text(&jdwmlibconf));
/* font */
initfont(config_lookup_string(&jdwmlibconf, "jdwm.font"), disp, drawcontext);
/* layouts */ /* layouts */
conflayouts = config_lookup(&jdwmlibconf, "jdwm.layouts"); conflayouts = config_lookup(&jdwmlibconf, "jdwm.layouts");
@ -210,6 +215,10 @@ parse_config(Display * disp, int scr, DC * drawcontext, jdwm_config *jdwmconf)
name_func_lookup(config_setting_get_string_elem(confsublayouts, 1), LayoutsList); name_func_lookup(config_setting_get_string_elem(confsublayouts, 1), LayoutsList);
if(!jdwmconf->layouts[i].arrange) if(!jdwmconf->layouts[i].arrange)
eprint("unknown layout in configuration file\n"); eprint("unknown layout in configuration file\n");
j = textw(jdwmconf->layouts[i].symbol);
if(j > blw)
blw = j;
} }
jdwmconf->layouts[i].symbol = NULL; jdwmconf->layouts[i].symbol = NULL;
@ -315,9 +324,6 @@ parse_config(Display * disp, int scr, DC * drawcontext, jdwm_config *jdwmconf)
/* mwfact */ /* mwfact */
jdwmconf->mwfact = config_lookup_float(&jdwmlibconf, "jdwm.mwfact"); jdwmconf->mwfact = config_lookup_float(&jdwmlibconf, "jdwm.mwfact");
/* font */
initfont(config_lookup_string(&jdwmlibconf, "jdwm.font"), disp, drawcontext);
/* colors */ /* colors */
dc.norm[ColBorder] = initcolor(config_lookup_string(&jdwmlibconf, "jdwm.normal_border_color"), dc.norm[ColBorder] = initcolor(config_lookup_string(&jdwmlibconf, "jdwm.normal_border_color"),
disp, scr); disp, scr);

1
jdwm.c
View File

@ -174,7 +174,6 @@ setup(Display *disp, jdwm_config *jdwmconf)
sx = sy = 0; sx = sy = 0;
sw = DisplayWidth(disp, screen); sw = DisplayWidth(disp, screen);
sh = DisplayHeight(disp, screen); sh = DisplayHeight(disp, screen);
initlayouts(jdwmconf);
/* bar */ /* bar */
dc.h = bh = dc.font.height + 2; dc.h = bh = dc.font.height + 2;
wa.override_redirect = 1; wa.override_redirect = 1;

15
layout.c
View File

@ -10,8 +10,6 @@
#include "layouts/floating.h" #include "layouts/floating.h"
#include "util.h" #include "util.h"
int blw = 0;
/* extern */ /* extern */
extern int wax, way, wah, waw; /* windowarea geometry */ extern int wax, way, wah, waw; /* windowarea geometry */
extern Window barwin; extern Window barwin;
@ -75,19 +73,6 @@ uicb_focusprev(Display *disp __attribute__ ((unused)),
} }
} }
void
initlayouts(jdwm_config * jdwmconf)
{
int w, i;
for(blw = i = 0; i < jdwmconf->nlayouts; i++)
{
w = textw(jdwmconf->layouts[i].symbol);
if(w > blw)
blw = w;
}
}
void void
loadjdwmprops(Display *disp, jdwm_config * jdwmconf) loadjdwmprops(Display *disp, jdwm_config * jdwmconf)
{ {

1
layout.h
View File

@ -9,7 +9,6 @@
#define IS_ARRANGE(layout) (layout == jdwmconf->current_layout->arrange) #define IS_ARRANGE(layout) (layout == jdwmconf->current_layout->arrange)
void arrange(Display *, jdwm_config *); /* arranges all windows depending on the layout in use */ void arrange(Display *, jdwm_config *); /* arranges all windows depending on the layout in use */
void initlayouts(jdwm_config *); /* initialize layout array */
void restack(Display *, jdwm_config *); /* restores z layers of all clients */ void restack(Display *, jdwm_config *); /* restores z layers of all clients */
void uicb_focusnext(Display *, jdwm_config *, const char *); /* focuses next visible client */ void uicb_focusnext(Display *, jdwm_config *, const char *); /* focuses next visible client */
void uicb_focusprev(Display *, jdwm_config *, const char *); /* focuses prev visible client */ void uicb_focusprev(Display *, jdwm_config *, const char *); /* focuses prev visible client */