X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=lib%2Fswm_hack.c;h=34550d81a8215001aed91db57a2c977402a679d2;hb=623ccee72222f16ed35512484589d92232685815;hp=459d8800cffb28f304b43c01a5b9dfaaf76eab0c;hpb=6d08df47448f7f544d1814df558057cc45e845bd;p=spectrwm.git

diff --git a/lib/swm_hack.c b/lib/swm_hack.c
index 459d880..34550d8 100644
--- a/lib/swm_hack.c
+++ b/lib/swm_hack.c
@@ -48,11 +48,15 @@
 #include <X11/Xlib.h>
 #include <X11/X.h>
 #include <X11/Xatom.h>
+#include <X11/Intrinsic.h>
 
-/* dlopened xlib so we can find the symbols in the real xlib to call them */
-static void        *lib_xlib = NULL;
+/* dlopened libs so we can find the symbols in the real one to call them */
+static void		*lib_xlib = NULL;
+static void		*lib_xtlib = NULL;
 
-static Window       root = None;
+static Window		root = None;
+static int		xterm = 0;
+static Display		*dpy = NULL;
 
 /* Find our root window */
 static              Window
@@ -73,6 +77,14 @@ MyRoot(Display * dpy)
 	return root;
 }
 
+
+typedef Atom	(XIA) (Display *display, char *atom_name, Bool
+		    only_if_exists);
+
+typedef int	(XCP) (Display *display, Window w, Atom property,
+		    Atom type, int format, int mode, unsigned char *data,
+		    int nelements);
+
 #define SWM_PROPLEN	(16)
 void
 set_property(Display *dpy, Window id, char *name, char *val)
@@ -80,11 +92,22 @@ set_property(Display *dpy, Window id, char *name, char *val)
 	Atom			atom = 0;
 	char			prop[SWM_PROPLEN];
 
+	static XIA         	*xia = NULL;
+	static XCP         	*xcp = NULL;
+
+	/* find the real Xlib and the real X function */
+	if (!lib_xlib)
+		lib_xlib = dlopen("libX11.so", RTLD_GLOBAL | RTLD_LAZY);
+	if (!xia)
+		xia = (XIA *) dlsym(lib_xlib, "XInternAtom");
+	if (!xcp)
+		xcp = (XCP *) dlsym(lib_xlib, "XChangeProperty");
+
 	/* Try to update the window's workspace property */
-	atom = XInternAtom(dpy, name, False);
+	atom = (*xia)(dpy, name, False);
 	if (atom) 
 		if (snprintf(prop, SWM_PROPLEN, "%s", val) < SWM_PROPLEN)
-			XChangeProperty(dpy, id, atom, XA_STRING,
+			(*xcp)(dpy, id, atom, XA_STRING,
 			    8, PropModeReplace, prop, SWM_PROPLEN);
 }
 
@@ -111,8 +134,10 @@ XCreateWindow(Display * display, Window parent, int x, int y,
 	/* find the real Xlib and the real X function */
 	if (!lib_xlib)
 		lib_xlib = dlopen("libX11.so", RTLD_GLOBAL | RTLD_LAZY);
-	if (!func)
+	if (!func) {
 		func = (CWF *) dlsym(lib_xlib, "XCreateWindow");
+		dpy = display;
+	}
 
 	if (parent == DefaultRootWindow(display))
 		parent = MyRoot(display);
@@ -125,6 +150,10 @@ XCreateWindow(Display * display, Window parent, int x, int y,
 			set_property(display, id, "_SWM_WS", env);
 		if ((env = getenv("_SWM_PID")) != NULL)
 			set_property(display, id, "_SWM_PID", env);
+		if ((env = getenv("_SWM_XTERM_FONTADJ")) != NULL) {
+			unsetenv("_SWM_XTERM_FONTADJ");
+			xterm = 1;
+		}
 	}
 	return (id);
 }
@@ -164,6 +193,10 @@ XCreateSimpleWindow(Display * display, Window parent, int x, int y,
 			set_property(display, id, "_SWM_WS", env);
 		if ((env = getenv("_SWM_PID")) != NULL)
 			set_property(display, id, "_SWM_PID", env);
+		if ((env = getenv("_SWM_XTERM_FONTADJ")) != NULL) {
+			unsetenv("_SWM_XTERM_FONTADJ");
+			xterm = 1;
+		}
 	}
 	return (id);
 }
@@ -188,3 +221,44 @@ XReparentWindow(Display * display, Window window, Window parent, int x, int y)
 
 	return (*func) (display, window, parent, x, y);
 }
+
+typedef		void (ANEF) (XtAppContext app_context, XEvent *event_return);
+int		evcount = 0;
+
+/*
+ * XtAppNextEvent Intercept Hack
+ * Normally xterm rejects "synthetic" (XSendEvent) events to prevent spoofing.
+ * We don't want to disable this completely, it's insecure. But hook here
+ * and allow these mostly harmless ones that we use to adjust fonts.
+ */
+void
+XtAppNextEvent(XtAppContext app_context, XEvent *event_return)
+{
+	static ANEF	*func = NULL;
+	static int	kp_add = 0, kp_subtract = 0;
+
+	/* find the real Xlib and the real X function */
+	if (!lib_xtlib)
+		lib_xtlib = dlopen("libXt.so", RTLD_GLOBAL | RTLD_LAZY);
+	if (!func) {
+		func = (ANEF *) dlsym(lib_xtlib, "XtAppNextEvent");
+		if (dpy != NULL) {
+			kp_add = XKeysymToKeycode(dpy, XK_KP_Add);
+			kp_subtract = XKeysymToKeycode(dpy, XK_KP_Subtract);
+		}
+	}
+
+	(*func) (app_context, event_return);
+
+	/* Return here if it's not an Xterm. */
+	if (!xterm)
+		return;
+	
+	/* Allow spoofing of font change keystrokes. */
+	if ((event_return->type == KeyPress ||  
+	   event_return->type == KeyRelease) &&
+	   event_return->xkey.state == ShiftMask &&
+	   (event_return->xkey.keycode == kp_add ||
+	   event_return->xkey.keycode == kp_subtract))
+		event_return->xkey.send_event = 0;
+}