aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorokan2014-01-27 15:13:09 +0000
committerokan2014-01-27 15:13:09 +0000
commitd1e09bda56224c5ad33e282277546046bab91318 (patch)
tree1c9086abe79dafe02c02c76253914f7160332309
parentf9023c5af1217939790956892487ebd8b484728a (diff)
downloadcwm-d1e09bda56224c5ad33e282277546046bab91318.tar.gz
move some init up and shed some blank lines
Diffstat (limited to '')
-rw-r--r--client.c3
-rw-r--r--screen.c10
2 files changed, 5 insertions, 8 deletions
diff --git a/client.c b/client.c
index eefa732..ec053c3 100644
--- a/client.c
+++ b/client.c
@@ -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.
*
- * $OpenBSD: client.c,v 1.168 2014/01/03 14:23:50 okan Exp $
+ * $OpenBSD: client.c,v 1.169 2014/01/27 15:13:09 okan Exp $
*/
#include <sys/param.h>
@@ -119,7 +119,6 @@ client_init(Window win, struct screen_ctx *sc, int mapped)
TAILQ_INSERT_TAIL(&Clientq, cc, entry);
xu_ewmh_net_client_list(sc);
-
xu_ewmh_restore_net_wm_state(cc);
if (mapped)
diff --git a/screen.c b/screen.c
index e8f7e24..ce65e3b 100644
--- a/screen.c
+++ b/screen.c
@@ -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.
*
- * $OpenBSD: screen.c,v 1.54 2014/01/03 15:29:06 okan Exp $
+ * $OpenBSD: screen.c,v 1.55 2014/01/27 15:13:09 okan Exp $
*/
#include <sys/param.h>
@@ -41,20 +41,18 @@ screen_init(int which)
sc = xcalloc(1, sizeof(*sc));
+ TAILQ_INIT(&sc->mruq);
+
sc->which = which;
sc->visual = DefaultVisual(X_Dpy, sc->which);
sc->colormap = DefaultColormap(X_Dpy, sc->which);
sc->rootwin = RootWindow(X_Dpy, sc->which);
+ conf_screen(sc);
xu_ewmh_net_supported(sc);
xu_ewmh_net_supported_wm_check(sc);
- conf_screen(sc);
-
screen_update_geometry(sc);
-
- TAILQ_INIT(&sc->mruq);
-
group_init(sc);
rootattr.cursor = Conf.cursor[CF_NORMAL];