X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=ab82ff1bb75ebb8bc20827827d3fdba9062cadb7;hb=f6733e1aa641ae84bb9b76267a7adde30a7f71bc;hp=7f1c9de3522e76eecb92dbf8158e8f28e17356cd;hpb=f4892b390f406ecef074333d6676b3f86227dc21;p=spectrwm.git

diff --git a/spectrwm.c b/spectrwm.c
index 7f1c9de..ab82ff1 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -89,20 +89,17 @@
 #include <util.h>
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
-#include <X11/Xatom.h>
-#include <X11/XKBlib.h>
-#include <X11/Xlib-xcb.h>
-#include <X11/Xproto.h>
-#include <X11/Xutil.h>
+#include <X11/Xlib.h>
 #include <X11/extensions/Xrandr.h>
 #include <X11/extensions/XTest.h>
-#include <xcb/randr.h>
+#include <xcb/xcb.h>
 #include <xcb/xcb_atom.h>
 #include <xcb/xcb_aux.h>
 #include <xcb/xcb_event.h>
 #include <xcb/xcb_icccm.h>
 #include <xcb/xcb_keysyms.h>
 #include <xcb/xtest.h>
+#include <xcb/randr.h>
 
 /* local includes */
 #include "version.h"
@@ -259,13 +256,11 @@ volatile sig_atomic_t   running = 1;
 volatile sig_atomic_t   restart_wm = 0;
 int			outputs = 0;
 /*int			last_focus_event = FocusOut;*/
-int			(*xerrorxlib)(Display *, XErrorEvent *);
 int			other_wm;
 int			ss_enabled = 0;
 int			xrandr_support;
 int			xrandr_eventbase;
 unsigned int		numlockmask = 0;
-Display			*display;
 xcb_connection_t	*conn;
 xcb_key_symbols_t	*syms;
 
@@ -361,12 +356,6 @@ XFontSetExtents		*bar_fs_extents;
 char			*bar_fonts;
 struct passwd		*pwd;
 
-#define SWM_MENU_FN	(2)
-#define SWM_MENU_NB	(4)
-#define SWM_MENU_NF	(6)
-#define SWM_MENU_SB	(8)
-#define SWM_MENU_SF	(10)
-
 /* layout manager data */
 struct swm_geometry {
 	int			x;
@@ -1283,12 +1272,12 @@ plain_stacker(struct workspace *ws)
 void
 custom_region(char *val)
 {
-	unsigned int			sidx, x, y, w, h;
-	int				num_screens;
+	unsigned int			x, y, w, h;
+	int				sidx, num_screens;
 	xcb_screen_t			*screen;
 
 	num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
-	if (sscanf(val, "screen[%u]:%ux%u+%u+%u", &sidx, &w, &h, &x, &y) != 5)
+	if (sscanf(val, "screen[%d]:%ux%u+%u+%u", &sidx, &w, &h, &x, &y) != 5)
 		errx(1, "invalid custom region, "
 		    "should be 'screen[<n>]:<n>x<n>+<n>+<n>");
 	if (sidx < 1 || sidx > num_screens)
@@ -2295,8 +2284,7 @@ spawn(int ws_idx, union arg *args, int close_fd)
 
 	DNPRINTF(SWM_D_MISC, "spawn: %s\n", args->argv[0]);
 
-	if (display)
-		close(xcb_get_file_descriptor(conn));
+	close(xcb_get_file_descriptor(conn));
 
 	setenv("LD_PRELOAD", SWM_LIB, 1);
 
@@ -5487,8 +5475,8 @@ updatenumlockmask(void)
 void
 grabkeys(void)
 {
-	int			num_screens;
-	unsigned int		j, k;
+	int			num_screens, k;
+	unsigned int		j;
 	xcb_keycode_t		*code;
 	unsigned int		modifiers[] =
 	    { 0, LockMask, numlockmask, numlockmask | LockMask };
@@ -6344,7 +6332,7 @@ manage_window(xcb_window_t id)
 	xcb_window_t		trans = XCB_WINDOW_NONE;
 	struct workspace	*ws;
 	struct ws_win		*win, *ww;
-	int			i, ws_idx, border_me = 0;
+	int			ws_idx, border_me = 0;
 	xcb_atom_t		ws_idx_atom = XCB_ATOM_NONE;
 	char			ws_idx_str[SWM_PROPLEN], *prop = NULL;
 	size_t			proplen;
@@ -6352,7 +6340,7 @@ manage_window(xcb_window_t id)
 	const char		*errstr;
 	struct pid_e		*p;
 	struct quirk		*qp;
-	uint32_t		event_mask;
+	uint32_t		event_mask, i;
 	xcb_atom_t		prot;
 	xcb_get_property_reply_t	*gpr;
 	xcb_icccm_get_wm_protocols_reply_t	wpr;
@@ -6749,7 +6737,8 @@ void
 buttonpress(xcb_button_press_event_t *e)
 {
 	struct ws_win		*win;
-	int			i, action;
+	int			i;
+	unsigned int		action;
 
 	DNPRINTF(SWM_D_EVENT, "buttonpress: window 0x%x, detail: %u\n",
 	    e->event, e->detail);
@@ -7118,20 +7107,6 @@ clientmessage(xcb_client_message_event_t *e)
 	xcb_flush(conn);
 }
 
-int
-xerror_start(Display *d, XErrorEvent *ee)
-{
-	other_wm = 1;
-	return (-1);
-}
-
-int
-xerror(Display *d, XErrorEvent *ee)
-{
-	/* warnx("error: %p %p", display, ee); */
-	return (-1);
-}
-
 void
 active_wm(void)
 {
@@ -7628,16 +7603,9 @@ main(int argc, char *argv[])
 
 	start_argv = argv;
 	warnx("Welcome to spectrwm V%s Build: %s", SPECTRWM_VERSION, buildstr);
-	if (!setlocale(LC_CTYPE, "") || !setlocale(LC_TIME, "") ||
-	    !XSupportsLocale())
+	if (!setlocale(LC_CTYPE, "") || !setlocale(LC_TIME, "")) 
 		warnx("no locale support");
 
-	if (!X_HAVE_UTF8_STRING)
-		warnx("no UTF-8 support");
-
-	if (!(display = XOpenDisplay(0)))
-		errx(1, "can not open display");
-
 	/* handle some signals */
 	bzero(&sact, sizeof(sact));
 	sigemptyset(&sact.sa_mask);
@@ -7652,10 +7620,11 @@ main(int argc, char *argv[])
 	sact.sa_flags = SA_NOCLDSTOP;
 	sigaction(SIGCHLD, &sact, NULL);
 
-	conn = XGetXCBConnection(display);
+	conn = xcb_connect(NULL, NULL);
 	if (xcb_connection_has_error(conn))
 		errx(1, "can not get XCB connection");
 
+	xcb_prefetch_extension_data(conn, &xcb_randr_id);
 	xfd = xcb_get_file_descriptor(conn);
 
 	/* look for local and global conf file */