-/* $scrotwm$ */
/*
* Copyright (c) 2009 Marco Peereboom <marco@peereboom.us>
* Copyright (c) 2009 Ryan McBride <mcbride@countersiege.com>
static Window root = None;
static int xterm = 0;
-static Display *dpy = NULL;
+static Display *display = NULL;
+
+void set_property(Display *, Window, char *, char *);
/* Find our root window */
static Window
{
Atom atom = 0;
char prop[SWM_PROPLEN];
-
- static XIA *xia = NULL;
- static XCP *xcp = NULL;
+ static XIA *xia = NULL;
+ static XCP *xcp = NULL;
/* find the real Xlib and the real X function */
if (!lib_xlib)
/* Try to update the window's workspace property */
atom = (*xia)(dpy, name, False);
- if (atom)
+ if (atom)
if (snprintf(prop, SWM_PROPLEN, "%s", val) < SWM_PROPLEN)
(*xcp)(dpy, id, atom, XA_STRING,
- 8, PropModeReplace, prop, SWM_PROPLEN);
+ 8, PropModeReplace, (unsigned char *)prop,
+ strlen((char *)prop));
}
typedef Window(CWF) (Display * _display, Window _parent, int _x,
/* XCreateWindow intercept hack */
Window
-XCreateWindow(Display * display, Window parent, int x, int y,
+XCreateWindow(Display *dpy, Window parent, int x, int y,
unsigned int width, unsigned int height,
unsigned int border_width,
int depth, unsigned int clss, Visual * visual,
lib_xlib = dlopen("libX11.so", RTLD_GLOBAL | RTLD_LAZY);
if (!func) {
func = (CWF *) dlsym(lib_xlib, "XCreateWindow");
- dpy = display;
+ display = dpy;
}
- if (parent == DefaultRootWindow(display))
- parent = MyRoot(display);
+ if (parent == DefaultRootWindow(dpy))
+ parent = MyRoot(dpy);
- id = (*func) (display, parent, x, y, width, height, border_width,
+ id = (*func) (dpy, parent, x, y, width, height, border_width,
depth, clss, visual, valuemask, attributes);
if (id) {
if ((env = getenv("_SWM_WS")) != NULL)
- set_property(display, id, "_SWM_WS", env);
+ set_property(dpy, id, "_SWM_WS", env);
if ((env = getenv("_SWM_PID")) != NULL)
- set_property(display, id, "_SWM_PID", env);
+ set_property(dpy, id, "_SWM_PID", env);
if ((env = getenv("_SWM_XTERM_FONTADJ")) != NULL) {
unsetenv("_SWM_XTERM_FONTADJ");
xterm = 1;
/* XCreateSimpleWindow intercept hack */
Window
-XCreateSimpleWindow(Display * display, Window parent, int x, int y,
+XCreateSimpleWindow(Display *dpy, Window parent, int x, int y,
unsigned int width, unsigned int height,
unsigned int border_width,
unsigned long border, unsigned long background)
if (!func)
func = (CSWF *) dlsym(lib_xlib, "XCreateSimpleWindow");
- if (parent == DefaultRootWindow(display))
- parent = MyRoot(display);
+ if (parent == DefaultRootWindow(dpy))
+ parent = MyRoot(dpy);
- id = (*func) (display, parent, x, y, width, height,
+ id = (*func) (dpy, parent, x, y, width, height,
border_width, border, background);
if (id) {
if ((env = getenv("_SWM_WS")) != NULL)
- set_property(display, id, "_SWM_WS", env);
+ set_property(dpy, id, "_SWM_WS", env);
if ((env = getenv("_SWM_PID")) != NULL)
- set_property(display, id, "_SWM_PID", env);
+ set_property(dpy, id, "_SWM_PID", env);
if ((env = getenv("_SWM_XTERM_FONTADJ")) != NULL) {
unsetenv("_SWM_XTERM_FONTADJ");
xterm = 1;
/* XReparentWindow intercept hack */
int
-XReparentWindow(Display * display, Window window, Window parent, int x, int y)
+XReparentWindow(Display *dpy, Window window, Window parent, int x, int y)
{
static RWF *func = NULL;
if (!func)
func = (RWF *) dlsym(lib_xlib, "XReparentWindow");
- if (parent == DefaultRootWindow(display))
- parent = MyRoot(display);
+ if (parent == DefaultRootWindow(dpy))
+ parent = MyRoot(dpy);
- return (*func) (display, window, parent, x, y);
+ return (*func) (dpy, window, parent, x, y);
}
typedef void (ANEF) (XtAppContext app_context, XEvent *event_return);
XtAppNextEvent(XtAppContext app_context, XEvent *event_return)
{
static ANEF *func = NULL;
- static int kp_add = 0, kp_subtract = 0;
+ static KeyCode 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);
+ if (display != NULL) {
+ kp_add = XKeysymToKeycode(display, XK_KP_Add);
+ kp_subtract = XKeysymToKeycode(display, XK_KP_Subtract);
}
}