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

remove uicb_reload functions, cannot work for now

This commit is contained in:
Julien Danjou 2007-09-12 17:20:03 +02:00
parent aa3967717d
commit 8fb0e0e73e
3 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
awesomerc
View File

@ -83,7 +83,6 @@ awesome:
(("Mod4", "Control"), "space", "togglefloating"), (("Mod4", "Control"), "space", "togglefloating"),
(("Mod4", "Shift"), "c", "killclient"), (("Mod4", "Shift"), "c", "killclient"),
(("Mod4", "Shift"), "q", "quit"), (("Mod4", "Shift"), "q", "quit"),
(("Mod4", "Shift"), "r", "reload"),
(("Mod4"), "0", "view"), (("Mod4"), "0", "view"),
(("Mod4"), "1", "view", "1"), (("Mod4"), "1", "view", "1"),
(("Mod4"), "2", "view", "2"), (("Mod4"), "2", "view", "2"),

35
config.c
View File

@ -93,8 +93,6 @@ static const NameFuncLink KeyfuncList[] = {
{"killclient", uicb_killclient}, {"killclient", uicb_killclient},
{"moveresize", uicb_moveresize}, {"moveresize", uicb_moveresize},
{"settrans", uicb_settrans}, {"settrans", uicb_settrans},
/* config.c */
{"reload", uicb_reload},
/* tag.c */ /* tag.c */
{"tag", uicb_tag}, {"tag", uicb_tag},
{"togglefloating", uicb_togglefloating}, {"togglefloating", uicb_togglefloating},
@ -155,27 +153,6 @@ name_func_lookup(const char *funcname, const NameFuncLink * list)
return NULL; return NULL;
} }
/** \todo remove dc */
extern DC dc;
/** Reload configuration file
* \param disp Display ref
* \param arg unused
* \ingroup ui_callback
* \todo not really working nor safe I guess
*/
void
uicb_reload(Display *disp, awesome_config *awesomeconf, const char *arg __attribute__ ((unused)))
{
config_destroy(&awesomelibconf);
p_delete(&awesomeconf->rules);
p_delete(&awesomeconf->tags);
p_delete(&awesomeconf->selected_tags);
p_delete(&awesomeconf->layouts);
p_delete(&awesomeconf->tag_layouts);
parse_config(disp, DefaultScreen(disp), &dc, awesomeconf);
}
/** Set default configuration /** Set default configuration
* \param awesomeconf awesome config ref * \param awesomeconf awesome config ref
*/ */
@ -374,22 +351,22 @@ parse_config(Display * disp, int scr, DC * drawcontext, awesome_config *awesomec
/* colors */ /* colors */
tmp = config_lookup_string(&awesomelibconf, "awesome.normal_border_color"); tmp = config_lookup_string(&awesomelibconf, "awesome.normal_border_color");
dc.norm[ColBorder] = initcolor(tmp ? tmp : "#dddddd", disp, scr); drawcontext->norm[ColBorder] = initcolor(tmp ? tmp : "#dddddd", disp, scr);
tmp = config_lookup_string(&awesomelibconf, "awesome.normal_bg_color"); tmp = config_lookup_string(&awesomelibconf, "awesome.normal_bg_color");
dc.norm[ColBG] = initcolor(tmp ? tmp : "#000000", disp, scr); drawcontext->norm[ColBG] = initcolor(tmp ? tmp : "#000000", disp, scr);
tmp = config_lookup_string(&awesomelibconf, "awesome.normal_fg_color"); tmp = config_lookup_string(&awesomelibconf, "awesome.normal_fg_color");
dc.norm[ColFG] = initcolor(tmp ? tmp : "#ffffff", disp, scr); drawcontext->norm[ColFG] = initcolor(tmp ? tmp : "#ffffff", disp, scr);
tmp = config_lookup_string(&awesomelibconf, "awesome.focus_border_color"); tmp = config_lookup_string(&awesomelibconf, "awesome.focus_border_color");
dc.sel[ColBorder] = initcolor(tmp ? tmp : "#008b8b", disp, scr); drawcontext->sel[ColBorder] = initcolor(tmp ? tmp : "#008b8b", disp, scr);
tmp = config_lookup_string(&awesomelibconf, "awesome.focus_bg_color"); tmp = config_lookup_string(&awesomelibconf, "awesome.focus_bg_color");
dc.sel[ColBG] = initcolor(tmp ? tmp : "#008b8b", disp, scr); drawcontext->sel[ColBG] = initcolor(tmp ? tmp : "#008b8b", disp, scr);
tmp = config_lookup_string(&awesomelibconf, "awesome.focus_fg_color"); tmp = config_lookup_string(&awesomelibconf, "awesome.focus_fg_color");
dc.sel[ColFG] = initcolor(tmp ? tmp : "#ffffff", disp, scr); drawcontext->sel[ColFG] = initcolor(tmp ? tmp : "#ffffff", disp, scr);
p_delete(&confpath); p_delete(&confpath);
} }

1
config.h
View File

@ -138,6 +138,5 @@ struct awesome_config
}; };
void parse_config(Display *, int, DC *, awesome_config *); /* parse configuration file */ void parse_config(Display *, int, DC *, awesome_config *); /* parse configuration file */
void uicb_reload(Display *, awesome_config *, const char *); /* reload configuration file */
#endif #endif