From 8d71b8c2a861e459506c40f62564f71156f1926e Mon Sep 17 00:00:00 2001 From: Raphael Khaiat Date: Tue, 16 Nov 2010 23:18:18 +0100 Subject: [PATCH] Reload wmfs with exact same argument as it has been launched instead of just reloading the good wmfsrc (idea from ksh.) --- src/wmfs.c | 5 +++-- src/wmfs.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/wmfs.c b/src/wmfs.c index cdbb923..6373a9e 100644 --- a/src/wmfs.c +++ b/src/wmfs.c @@ -282,8 +282,7 @@ uicb_reload(uicb_t cmd) for(; argv_global[0] && argv_global[0] == ' '; ++argv_global); - // add -C to always load the same config file - execlp(argv_global, argv_global, "-C", conf.confpath, NULL); + execvp(argv_global, all_argv); return; } @@ -418,6 +417,8 @@ main(int argc, char **argv) char *ol = "csgVS"; argv_global = _strdup(argv[0]); + all_argv = argv; + sprintf(conf.confpath, "%s/"DEF_CONF, getenv("HOME")); while((i = getopt(argc, argv, "hviSc:s:g:C:V:")) != -1) diff --git a/src/wmfs.h b/src/wmfs.h index d6c88b9..6b0f4d3 100644 --- a/src/wmfs.h +++ b/src/wmfs.h @@ -440,6 +440,7 @@ XRectangle *sgeo; XRectangle *spgeo; Cursor cursor[CurLast]; char *argv_global; +char **all_argv; int xrandr_event; uint timing;