diff options
Diffstat (limited to 'calmwm.c')
| -rw-r--r-- | calmwm.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/calmwm.c b/calmwm.c index 75bb675..9e76d34 100644 --- a/calmwm.c +++ b/calmwm.c @@ -47,10 +47,12 @@ struct client_ctx_q Clientq = TAILQ_HEAD_INITIALIZER(Clientq); int HasRandr, Randr_ev; struct conf Conf; const char *homedir; +volatile sig_atomic_t cwm_status; static void sigchld_cb(int); static int x_errorhandler(Display *, XErrorEvent *); static void x_init(const char *); +static void x_restart(void); static void x_teardown(void); static int x_wmerrorhandler(Display *, XErrorEvent *); @@ -111,8 +113,12 @@ main(int argc, char **argv) free(conf_path); x_init(display_name); - xev_loop(); + cwm_status = CWM_RUNNING; + while (cwm_status == CWM_RUNNING) + xev_process(); x_teardown(); + if (cwm_status == CWM_RESTART) + x_restart(); return (0); } @@ -141,6 +147,13 @@ x_init(const char *dpyname) } static void +x_restart(void) +{ + (void)setsid(); + (void)execvp(cwm_argv[0], cwm_argv); +} + +static void x_teardown(void) { XCloseDisplay(X_Dpy); |