summaryrefslogtreecommitdiff
path: root/app/cwm/calmwm.c
diff options
context:
space:
mode:
Diffstat (limited to 'app/cwm/calmwm.c')
-rw-r--r--app/cwm/calmwm.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/app/cwm/calmwm.c b/app/cwm/calmwm.c
index 63486df94..234b28461 100644
--- a/app/cwm/calmwm.c
+++ b/app/cwm/calmwm.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.
*
- * $Id: calmwm.c,v 1.47 2009/12/10 17:16:51 oga Exp $
+ * $Id: calmwm.c,v 1.48 2009/12/10 23:14:58 oga Exp $
*/
#include "headers.h"
@@ -143,12 +143,12 @@ x_setupscreen(struct screen_ctx *sc, u_int which)
XWindowAttributes winattr;
XSetWindowAttributes rootattr;
int fake;
- u_int ndesks = CALMWM_NGROUPS, nwins, i;
-
+ u_int nwins, i;
sc->which = which;
sc->rootwin = RootWindow(X_Dpy, sc->which);
- sc->xmax = DisplayWidth(X_Dpy, sc->which);
- sc->ymax = DisplayHeight(X_Dpy, sc->which);
+
+ screen_update_geometry(sc, DisplayWidth(X_Dpy, sc->which),
+ DisplayHeight(X_Dpy, sc->which));
conf_color(&Conf, sc);
@@ -161,13 +161,6 @@ x_setupscreen(struct screen_ctx *sc, u_int which)
/* Initialize menu window. */
menu_init(sc);
- /*
- * XXX this probably should be somewhere else, but since it's a
- * static value for now it does ok.
- */
- XChangeProperty(X_Dpy, sc->rootwin, _NET_NUMBER_OF_DESKTOPS,
- XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&ndesks, 1);
-
xu_setwmname(sc);
/* Deal with existing clients. */