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 | |
| parent | bcc0f73bb68bab7bff0e0c969b81fe7547caa58a (diff) | |
| download | cwm-b13d592c572bde4a2b2039e7ef30e501ac97a21a.tar.gz cwm-b13d592c572bde4a2b2039e7ef30e501ac97a21a.tar.xz cwm-b13d592c572bde4a2b2039e7ef30e501ac97a21a.zip | |
tidy up startup/init routines
ok oga@
| -rw-r--r-- | calmwm.c | 10 | ||||
| -rw-r--r-- | calmwm.h | 3 | ||||
| -rw-r--r-- | client.c | 2 | ||||
| -rw-r--r-- | screen.c | 6 |
4 files changed, 14 insertions, 7 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 diff --git a/calmwm.h b/calmwm.h index 58ed382..11fdee0 100644 --- a/calmwm.h +++ b/calmwm.h @@ -328,7 +328,7 @@ int x_errorhandler(Display *, XErrorEvent *); __dead void usage(void); struct client_ctx *client_find(Window); -void client_setup(void); +void client_init(void); struct client_ctx *client_new(Window, struct screen_ctx *, int); int client_delete(struct client_ctx *); void client_setactive(struct client_ctx *, int); @@ -395,6 +395,7 @@ void *xmalloc(size_t); void *xcalloc(size_t, size_t); char *xstrdup(const char *); +void screen_init(void); struct screen_ctx *screen_fromroot(Window); struct screen_ctx *screen_current(void); void screen_updatestackingorder(void); diff --git a/client.c b/client.c index cc5914a..6de3758 100644 --- a/client.c +++ b/client.c @@ -27,7 +27,7 @@ static char emptystring[] = ""; struct client_ctx *_curcc = NULL; void -client_setup(void) +client_init(void) { TAILQ_INIT(&Clientq); } diff --git a/screen.c b/screen.c index e061149..fe9a61e 100644 --- a/screen.c +++ b/screen.c @@ -24,6 +24,12 @@ extern struct screen_ctx_q Screenq; extern struct screen_ctx *Curscreen; +void +screen_init(void) +{ + TAILQ_INIT(&Screenq); +} + struct screen_ctx * screen_fromroot(Window rootwin) { |