diff options
| -rw-r--r-- | calmwm.c | 34 | ||||
| -rw-r--r-- | calmwm.h | 5 |
2 files changed, 3 insertions, 36 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.34 2009/01/22 15:26:33 oga Exp $ + * $Id: calmwm.c,v 1.35 2009/01/27 02:16:20 okan Exp $ */ #include "headers.h" @@ -31,7 +31,6 @@ Cursor Cursor_question; struct screen_ctx_q Screenq; struct screen_ctx *Curscreen; -u_int Nscreens; struct client_ctx_q Clientq; @@ -124,8 +123,7 @@ x_setup(void) struct keybinding *kb; int i; - Nscreens = ScreenCount(X_Dpy); - for (i = 0; i < (int)Nscreens; i++) { + for (i = 0; i < ScreenCount(X_Dpy); i++) { XCALLOC(sc, struct screen_ctx); x_setupscreen(sc, i); TAILQ_INSERT_TAIL(&Screenq, sc, entry); @@ -138,7 +136,6 @@ x_setup(void) TAILQ_FOREACH(kb, &Conf.keybindingq, entry) conf_grab(&Conf, kb); - Cursor_move = XCreateFontCursor(X_Dpy, XC_fleur); Cursor_resize = XCreateFontCursor(X_Dpy, XC_bottom_right_corner); Cursor_select = XCreateFontCursor(X_Dpy, XC_hand1); @@ -159,7 +156,6 @@ x_setupscreen(struct screen_ctx *sc, u_int which) Curscreen = sc; - sc->display = x_screenname(which); sc->which = which; sc->rootwin = RootWindow(X_Dpy, which); @@ -242,32 +238,6 @@ x_setupscreen(struct screen_ctx *sc, u_int which) return; } -char * -x_screenname(int which) -{ - char *cp, *dstr, *sn; - size_t snlen; - - if (which > 9) - errx(1, "Can't handle more than 9 screens. If you need it, " - "tell <marius@monkey.org>. It's a trivial fix."); - - dstr = xstrdup(DisplayString(X_Dpy)); - - if ((cp = strrchr(dstr, ':')) == NULL) - return (NULL); - - if ((cp = strchr(cp, '.')) != NULL) - *cp = '\0'; - - snlen = strlen(dstr) + 3; /* string, dot, number, null */ - sn = (char *)xmalloc(snlen); - snprintf(sn, snlen, "%s.%d", dstr, which); - free(dstr); - - return (sn); -} - int x_errorhandler(Display *dpy, XErrorEvent *e) { @@ -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.81 2009/01/27 00:42:53 oga Exp $ + * $Id: calmwm.h,v 1.82 2009/01/27 02:16:20 okan Exp $ */ #ifndef _CALMWM_H_ @@ -47,7 +47,6 @@ struct screen_ctx { Colormap colormap; XColor bgcolor, fgcolor, fccolor, redcolor, graycolor, whitecolor, blackcolor; - char *display; unsigned long blackpixl, whitepixl, redpixl, bluepixl, graypixl; GC gc; @@ -310,7 +309,6 @@ int input_keycodetrans(KeyCode, u_int, enum ctltype *, int x_errorhandler(Display *, XErrorEvent *); void x_setup(void); -char *x_screenname(int); void x_setupscreen(struct screen_ctx *, u_int); __dead void usage(void); @@ -512,7 +510,6 @@ extern Cursor Cursor_question; extern struct screen_ctx_q Screenq; extern struct screen_ctx *curscreen; -extern u_int Nscreens; extern struct client_ctx_q Clientq; |