tidy up startup/init routines

ok oga@

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