hiro/spectrwm
1
0
Fork 0
mirror of https://github.com/vale981/spectrwm synced 2025-03-05 09:51:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix

Browse source
This commit is contained in:
Reginald Kennedy 2017-12-10 02:39:17 +08:00
parent 714ff21236
commit c779e014ac
1 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lib/swm_hack.c
View file

@ -262,7 +262,7 @@ xcb_create_window_aux_checked(xcb_connection_t *c, uint8_t depth,
if (lib_xcb == NULL)
lib_xcb = DLOPEN("libxcb.so");
if (lib_xcb && xcwaf == NULL) {
xcwaf = (XCWAF *)dlsym(lib_xcb, "xcb_create_window_aux");
xcwaf = (XCWAF *)dlsym(lib_xcb, "xcb_create_window_aux_checked");
conn = c;
}
if (xcwaf == NULL) {
@ -323,7 +323,6 @@ set_property_xlib(Display *dpy, Window id, char *name, char *val)
(unsigned char *)prop, strlen((char *)prop));
}
/* XCreateWindow */
typedef Window (CWF)(Display *, Window, int, int, unsigned int, unsigned int,
unsigned int, int, unsigned int, Visual *, unsigned long,
@ -406,10 +405,7 @@ XCreateSimpleWindow(Display *dpy, Window parent, int x, int y,
}
/* XtAppNextEvent */
typedef void (ANEF)(XtAppContext, XEvent *);
/* XKeysymToKeycode */
typedef KeyCode (KTKF)(Display *, KeySym);
typedef void (ANEF)(XtAppContext, XEvent *);
/*
* Normally xterm rejects "synthetic" (XSendEvent) events to prevent spoofing.
@ -420,27 +416,22 @@ void
XtAppNextEvent(XtAppContext app_context, XEvent *event_return)
{
static ANEF *anef = NULL;
static KTKF *ktkf = NULL;
static KeyCode kp_add = 0, kp_subtract = 0;
if (lib_xlib == NULL)
lib_xlib = DLOPEN("libX11.so");
if (lib_xlib && ktkf == NULL)
ktkf = (KTKF *)dlsym(lib_xlib, "XKeysymToKeycode");
if (lib_xtlib == NULL)
lib_xtlib = DLOPEN("libXt.so");
if (lib_xtlib && anef == NULL)
if (lib_xtlib && anef == NULL) {
anef = (ANEF *)dlsym(lib_xtlib, "XtAppNextEvent");
if (anef == NULL || ktkf == NULL) {
if (display) {
kp_add = XKeysymToKeycode(display, XK_KP_Add);
kp_subtract = XKeysymToKeycode(display, XK_KP_Subtract);
}
}
if (anef == NULL) {
fprintf(stderr, "libswmhack.so: ERROR: %s\n", dlerror());
return;
}
if (display && (kp_add == 0 || kp_subtract == 0)) {
kp_add = (*ktkf)(display, XK_KP_Add);
kp_subtract = (*ktkf)(display, XK_KP_Subtract);
}
(*anef)(app_context, event_return);
/* Return here if it's not an Xterm. */