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

store configpath in awesomeconf

This commit is contained in:
Nikos Ntarmos 2007-11-08 11:22:25 +01:00 committed by Julien Danjou
parent f140ee9970
commit be61dcdddf
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
awesome.c
View File

@ -79,6 +79,7 @@ cleanup_screen(awesome_config *awesomeconf)
p_delete(&awesomeconf->layouts); p_delete(&awesomeconf->layouts);
p_delete(&awesomeconf->rules); p_delete(&awesomeconf->rules);
p_delete(&awesomeconf->keys); p_delete(&awesomeconf->keys);
p_delete(&awesomeconf->configpath);
} }
/** Cleanup everything on quit /** Cleanup everything on quit

6
config.c
View File

@ -259,6 +259,8 @@ parse_config(const char *confpatharg, awesome_config *awesomeconf)
a_strcat(confpath, confpath_len, AWESOME_CONFIG_FILE); a_strcat(confpath, confpath_len, AWESOME_CONFIG_FILE);
} }
awesomeconf->configpath = a_strdup(confpath);
a_strcpy(awesomeconf->statustext, sizeof(awesomeconf->statustext), "awesome-" VERSION " (" RELEASE ")"); a_strcpy(awesomeconf->statustext, sizeof(awesomeconf->statustext), "awesome-" VERSION " (" RELEASE ")");
awesomeconf->phys_screen = get_phys_screen(awesomeconf->display, awesomeconf->screen); awesomeconf->phys_screen = get_phys_screen(awesomeconf->display, awesomeconf->screen);
@ -444,6 +446,7 @@ uicb_reloadconfig(awesome_config *awesomeconf,
int *old_ntags, old_c_ntags, new_c_ntags, **mapping; int *old_ntags, old_c_ntags, new_c_ntags, **mapping;
char ***savetagnames; char ***savetagnames;
Client ***savetagclientsel; Client ***savetagclientsel;
char *configpath = a_strdup(awesomeconf_first->configpath);
Bool *old_c_tags; Bool *old_c_tags;
Client *c, *clients; Client *c, *clients;
@ -470,7 +473,7 @@ uicb_reloadconfig(awesome_config *awesomeconf,
{ {
/* Cleanup screens and reload their config. */ /* Cleanup screens and reload their config. */
cleanup_screen(&awesomeconf_first[screen]); cleanup_screen(&awesomeconf_first[screen]);
setup_screen(&awesomeconf_first[screen], awesomeconf_first->configpath); setup_screen(&awesomeconf_first[screen], configpath);
/* Compute a mapping of tags between the old and new config, based on /* Compute a mapping of tags between the old and new config, based on
* tag names. */ * tag names. */
@ -531,6 +534,7 @@ uicb_reloadconfig(awesome_config *awesomeconf,
p_delete(&savetagnames); p_delete(&savetagnames);
p_delete(&old_ntags); p_delete(&old_ntags);
p_delete(&savetagclientsel); p_delete(&savetagclientsel);
p_delete(&configpath);
for (screen = 0; screen < screen_count; screen ++) for (screen = 0; screen < screen_count; screen ++)
arrange(&awesomeconf_first[screen]); arrange(&awesomeconf_first[screen]);
} }