diff options
| author | okan <okan> | 2009-06-23 21:52:38 +0000 |
|---|---|---|
| committer | okan <okan> | 2009-06-23 21:52:38 +0000 |
| commit | b13d592c572bde4a2b2039e7ef30e501ac97a21a (patch) | |
| tree | 29d0e3d04468f09ef4e5f836c878001a1c7a0937 /calmwm.c | |
| parent | bcc0f73bb68bab7bff0e0c969b81fe7547caa58a (diff) | |
| download | cwm-b13d592c572bde4a2b2039e7ef30e501ac97a21a.tar.gz cwm-b13d592c572bde4a2b2039e7ef30e501ac97a21a.tar.xz cwm-b13d592c572bde4a2b2039e7ef30e501ac97a21a.zip | |
tidy up startup/init routines
ok oga@
Diffstat (limited to 'calmwm.c')
| -rw-r--r-- | calmwm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/calmwm.c b/calmwm.c index f9647af..b87b1a6 100644 --- a/calmwm.c +++ b/calmwm.c @@ -69,13 +69,15 @@ main(int argc, char **argv) if (signal(SIGCHLD, sigchld_cb) == SIG_ERR) err(1, "signal"); - group_init(); - Starting = 1; dpy_init(display_name); + + screen_init(); + group_init(); + client_init(); + bzero(&Conf, sizeof(Conf)); conf_setup(&Conf, conf_file); - client_setup(); xu_getatoms(); x_setup(); Starting = 0; @@ -99,8 +101,6 @@ dpy_init(const char *dpyname) XSetErrorHandler(x_errorhandler); HasRandr = XRRQueryExtension(X_Dpy, &Randr_ev, &i); - - TAILQ_INIT(&Screenq); } void |