diff --git a/awesomerc b/awesomerc index c91ab00ba..616a94fa3 100644 --- a/awesomerc +++ b/awesomerc @@ -83,7 +83,6 @@ awesome: (("Mod4", "Control"), "space", "togglefloating"), (("Mod4", "Shift"), "c", "killclient"), (("Mod4", "Shift"), "q", "quit"), - (("Mod4", "Shift"), "r", "reload"), (("Mod4"), "0", "view"), (("Mod4"), "1", "view", "1"), (("Mod4"), "2", "view", "2"), diff --git a/config.c b/config.c index 16f908aab..6b8829ad4 100644 --- a/config.c +++ b/config.c @@ -93,8 +93,6 @@ static const NameFuncLink KeyfuncList[] = { {"killclient", uicb_killclient}, {"moveresize", uicb_moveresize}, {"settrans", uicb_settrans}, - /* config.c */ - {"reload", uicb_reload}, /* tag.c */ {"tag", uicb_tag}, {"togglefloating", uicb_togglefloating}, @@ -155,27 +153,6 @@ name_func_lookup(const char *funcname, const NameFuncLink * list) 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 * \param awesomeconf awesome config ref */ @@ -374,22 +351,22 @@ parse_config(Display * disp, int scr, DC * drawcontext, awesome_config *awesomec /* colors */ 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"); - 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"); - 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"); - 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"); - 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"); - dc.sel[ColFG] = initcolor(tmp ? tmp : "#ffffff", disp, scr); + drawcontext->sel[ColFG] = initcolor(tmp ? tmp : "#ffffff", disp, scr); p_delete(&confpath); } diff --git a/config.h b/config.h index 137f857b2..d1e33edff 100644 --- a/config.h +++ b/config.h @@ -138,6 +138,5 @@ struct awesome_config }; void parse_config(Display *, int, DC *, awesome_config *); /* parse configuration file */ -void uicb_reload(Display *, awesome_config *, const char *); /* reload configuration file */ #endif