#ifdef X11
#include <X11/Xlib.h>
#include <X11/Xatom.h>
+#include <X11/Xmd.h>
#include <X11/Xutil.h>
#ifdef XFT
#include <X11/Xft/Xft.h>
#endif
-#include <stdio.h>
-
-#ifdef XDBE
+#ifdef HAVE_XDBE
int use_xdbe;
#endif
int use_xft = 0;
#endif
-#define WINDOW_NAME_FMT "%s - conky"
-
/* some basic X11 stuff */
Display *display;
int display_width;
/* local prototypes */
static void update_workarea();
-static Window find_desktop_window();
+static Window find_desktop_window(Window *p_root, Window *p_desktop);
static Window find_subwindow(Window win, int w, int h);
/* X11 initializer */
}
}
-static Window find_desktop_window()
+/* Find root window and desktop window. Return desktop window on success,
+ * and set root and desktop byref return values. Return 0 on failure. */
+static Window find_desktop_window(Window *p_root, Window *p_desktop)
{
Atom type;
int format, i;
Window troot, parent, *children;
unsigned char *buf = NULL;
+ if (!p_root || !p_desktop)
+ return(0);
+
/* some window managers set __SWM_VROOT to some child of root window */
XQueryTree(display, root, &troot, &parent, &children, &n);
fprintf(stderr,
"Conky: desktop window (%lx) found from __SWM_VROOT property\n", win);
fflush(stderr);
+ *p_root=win;
+ *p_desktop=win;
return win;
}
fprintf(stderr, "Conky: desktop window (%lx) is root window\n",win);
fflush(stderr);
+
+ *p_root=root;
+ *p_desktop=win;
+
return win;
}
//XClearWindow(display, win); not sure why this was here
}
-void init_window(int own_window, int w, int h, int set_trans, int back_colour, char * nodename,
- char **argv, int argc)
+void init_window(int own_window, int w, int h, int set_trans, int back_colour,
+ char **argv, int argc)
{
/* There seems to be some problems with setting transparent background (on
* fluxbox this time). It doesn't happen always and I don't know why it
set_transparent = set_trans;
background_colour = back_colour;
- nodename = (char *)nodename;
-
#ifdef OWN_WINDOW
if (own_window) {
- {
- /* Allow WM control of conky again. Shielding conky from the WM
- * via override redirect creates more problems than it's worth and
- * makes it impossible to use tools like devilspie to manage the
- * conky windows beyond the parametsrs we offer. Also, button
- * press events are now explicitly forwarded to the root window. */
+
+ if ( !find_desktop_window( &window.root, &window.desktop ) )
+ return;
+
+ if (window.type == TYPE_OVERRIDE) {
+
+ /*
+ An override_redirect True window. No WM hints or button processing needed.
+ */
XSetWindowAttributes attrs = {
ParentRelative,0L,0,0L,0,0,Always,0L,0L,False,
- StructureNotifyMask|ExposureMask|ButtonPressMask,
- 0L,False,0,0 };
+ StructureNotifyMask|ExposureMask,
+ 0L,
+ True,
+ 0,0 };
- XClassHint classHint;
- XWMHints wmHint;
- Atom xa;
- char window_title[256];
+ /* Parent is desktop window (which might be a child of root) */
+ window.window = XCreateWindow(display,
+ window.desktop,
+ window.x, window.y, w, h, 0,
+ CopyFromParent,
+ InputOutput,
+ CopyFromParent,
+ CWBackPixel|CWOverrideRedirect,
+ &attrs);
- window.root = find_desktop_window();
+ XLowerWindow(display, window.window);
- window.window = XCreateWindow(display, window.root,
- window.x, window.y, w, h, 0,
- CopyFromParent,
- InputOutput,
- CopyFromParent,
- CWBackPixel|CWOverrideRedirect,
- &attrs);
+ fprintf(stderr, "Conky: window type - override\n"); fflush(stderr);
- fprintf(stderr, "Conky: drawing to created window (%lx)\n", window.window);
- fflush(stderr);
+ }
+
+ else { /* window.type != TYPE_OVERRIDE */
+
+ /*
+ A window managed by the window manager. Process hints and buttons.
+ */
+ XSetWindowAttributes attrs = {
+ ParentRelative,0L,0,0L,0,0,Always,0L,0L,False,
+ StructureNotifyMask|ExposureMask|ButtonPressMask|ButtonReleaseMask,
+ 0L,
+ False,
+ 0,0 };
+
+ XClassHint classHint;
+ XWMHints wmHint;
+ Atom xa;
- classHint.res_name = window.wm_class_name;
+ /* Parent is root window so WM can take control */
+ window.window = XCreateWindow(display,
+ window.root,
+ window.x, window.y, w, h, 0,
+ CopyFromParent,
+ InputOutput,
+ CopyFromParent,
+ CWBackPixel|CWOverrideRedirect,
+ &attrs);
+
+ classHint.res_name = window.class_name;
classHint.res_class = classHint.res_name;
wmHint.flags = InputHint | StateHint;
- wmHint.input = False;
+ /* allow decorated windows to be given input focus by WM */
+ wmHint.input = TEST_HINT(window.hints,HINT_UNDECORATED) ? False : True;
wmHint.initial_state = NormalState;
- sprintf(window_title,WINDOW_NAME_FMT,nodename);
-
- XmbSetWMProperties (display, window.window, window_title, NULL,
+ XmbSetWMProperties (display, window.window, window.title, NULL,
argv, argc,
NULL, &wmHint, &classHint);
XSetWMProtocols(display,window.window,NULL,0);
- /* Set NORMAL window type for _NET_WM_WINDOW_TYPE. */
- xa = ATOM(_NET_WM_WINDOW_TYPE);
- if (xa != None) {
- Atom prop = ATOM(_NET_WM_WINDOW_TYPE_NORMAL);
+ /* Set window type */
+ if ( (xa = ATOM(_NET_WM_WINDOW_TYPE)) != None )
+ {
+ Atom prop;
+ switch(window.type) {
+ case TYPE_DESKTOP:
+ {
+ prop = ATOM(_NET_WM_WINDOW_TYPE_DESKTOP);
+ fprintf(stderr, "Conky: window type - desktop\n"); fflush(stderr);
+ }
+ break;
+ case TYPE_NORMAL:
+ default:
+ {
+ prop = ATOM(_NET_WM_WINDOW_TYPE_NORMAL);
+ fprintf(stderr, "Conky: window type - normal\n"); fflush(stderr);
+ }
+ break;
+ }
XChangeProperty(display, window.window, xa,
XA_ATOM, 32,
PropModeReplace,
- (unsigned char *) &prop,
- 1);
+ (unsigned char *) &prop, 1);
}
/* Set desired hints */
/* Window decorations */
if (TEST_HINT(window.hints,HINT_UNDECORATED)) {
- fprintf(stderr, "Conky: hint - undecorated\n"); fflush(stderr);
+ /*fprintf(stderr, "Conky: hint - undecorated\n"); fflush(stderr);*/
xa = ATOM(_MOTIF_WM_HINTS);
if (xa != None) {
long prop[5] = { 2, 0, 0, 0, 0 };
XChangeProperty(display, window.window, xa,
- xa, 32, PropModeAppend,
+ xa, 32, PropModeReplace,
(unsigned char *) prop, 5);
}
}
/* Below other windows */
if (TEST_HINT(window.hints,HINT_BELOW)) {
- fprintf(stderr, "Conky: hint - below\n"); fflush(stderr);
+ /*fprintf(stderr, "Conky: hint - below\n"); fflush(stderr); */
xa = ATOM(_WIN_LAYER);
if (xa != None) {
/* Above other windows */
if (TEST_HINT(window.hints,HINT_ABOVE)) {
- fprintf(stderr, "Conky: hint - above\n"); fflush(stderr);
+ /*fprintf(stderr, "Conky: hint - above\n"); fflush(stderr);*/
xa = ATOM(_WIN_LAYER);
if (xa != None) {
/* Sticky */
if (TEST_HINT(window.hints,HINT_STICKY)) {
- fprintf(stderr, "Conky: hint - sticky\n"); fflush(stderr);
+ /*fprintf(stderr, "Conky: hint - sticky\n"); fflush(stderr); */
- xa = ATOM(_NET_WM_STATE);
+ xa = ATOM(_NET_WM_DESKTOP);
+ if (xa != None) {
+ CARD32 xa_prop = 0xFFFFFFFF;
+ XChangeProperty(display, window.window, xa,
+ XA_CARDINAL, 32,
+ PropModeAppend,
+ (unsigned char *) &xa_prop,
+ 1);
+ }
+
+ xa = ATOM(_NET_WM_STATE);
if (xa != None) {
Atom xa_prop = ATOM(_NET_WM_STATE_STICKY);
XChangeProperty(display, window.window, xa,
/* Skip taskbar */
if (TEST_HINT(window.hints,HINT_SKIP_TASKBAR)) {
- fprintf(stderr, "Conky: hint - skip_taskbar\n"); fflush(stderr);
+ /*fprintf(stderr, "Conky: hint - skip_taskbar\n"); fflush(stderr);*/
xa = ATOM(_NET_WM_STATE);
if (xa != None) {
/* Skip pager */
if (TEST_HINT(window.hints,HINT_SKIP_PAGER)) {
- fprintf(stderr, "Conky: hint - skip_pager\n"); fflush(stderr);
+ /*fprintf(stderr, "Conky: hint - skip_pager\n"); fflush(stderr);*/
xa = ATOM(_NET_WM_STATE);
if (xa != None) {
}
}
- XMapWindow(display, window.window);
+ } /* else { window.type != TYPE_OVERRIDE */
+
+ fprintf(stderr, "Conky: drawing to created window (%lx)\n", window.window);
+ fflush(stderr);
+
+ XMapWindow(display, window.window);
- }
- } else
+ } else /* if (own_window) { */
#endif
/* root / desktop window */
{
XWindowAttributes attrs;
if (!window.window)
- window.window = find_desktop_window();
+ window.window = find_desktop_window( &window.root, &window.desktop );
if (XGetWindowAttributes(display, window.window, &attrs)) {
window.width = attrs.width;
/* Drawable is same as window. This may be changed by double buffering. */
window.drawable = window.window;
-#ifdef XDBE
+#ifdef HAVE_XDBE
if (use_xdbe) {
int major, minor;
if (!XdbeQueryExtension(display, &major, &minor)) {
XSelectInput(display, window.window, ExposureMask
#ifdef OWN_WINDOW
| (own_window
- ? (StructureNotifyMask | PropertyChangeMask | ButtonPressMask) : 0)
+ ? (StructureNotifyMask | PropertyChangeMask |
+ ButtonPressMask | ButtonReleaseMask) : 0)
#endif
);
}
projects / monky / blobdiff