diff options
| -rw-r--r-- | calmwm.c | 12 | ||||
| -rw-r--r-- | calmwm.h | 5 | ||||
| -rw-r--r-- | client.c | 4 | ||||
| -rw-r--r-- | screen.c | 8 |
4 files changed, 18 insertions, 11 deletions
@@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: calmwm.c,v 1.40 2009/06/20 00:22:39 okan Exp $ + * $Id: calmwm.c,v 1.41 2009/06/23 21:52:38 okan Exp $ */ #include "headers.h" @@ -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 @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: calmwm.h,v 1.92 2009/06/20 00:22:39 okan Exp $ + * $Id: calmwm.h,v 1.93 2009/06/23 21:52:38 okan Exp $ */ #ifndef _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); @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: client.c,v 1.55 2009/06/20 00:55:41 okan Exp $ + * $Id: client.c,v 1.56 2009/06/23 21:52:38 okan Exp $ */ #include "headers.h" @@ -27,7 +27,7 @@ static char emptystring[] = ""; struct client_ctx *_curcc = NULL; void -client_setup(void) +client_init(void) { TAILQ_INIT(&Clientq); } @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: screen.c,v 1.14 2009/01/15 00:32:35 okan Exp $ + * $Id: screen.c,v 1.15 2009/06/23 21:52:38 okan Exp $ */ #include "headers.h" @@ -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) { |