* Please see COPYING for details
*
* Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
* (see AUTHORS)
* All rights reserved.
*
#ifdef XFT
#include <X11/Xft/Xft.h>
-int use_xft = 0;
+int use_xft;
#endif
#ifdef HAVE_XDBE
int use_argb_visual;
int have_argb_visual;
#endif /* USE_ARGB */
+int own_window_argb_value;
/* some basic X11 stuff */
Display *display = NULL;
return win;
}
+static int colour_set = -1;
/* if no argb visual is configured sets background to ParentRelative for the Window and all parents,
else real transparency is used */
-void set_transparent_background(Window win)
+void set_transparent_background(Window win, int alpha)
{
- static int colour_set = -1;
+ (void)alpha; /* disable warnings when unused */
#ifdef USE_ARGB
if (have_argb_visual) {
XSetWindowBackground(display, win, 0x00);
} else if (colour_set != background_colour) {
XSetWindowBackground(display, win,
- background_colour | (0xff << 24));
+ background_colour | (alpha << 24));
colour_set = background_colour;
}
} else {
#endif /* USE_ARGB */
// pseudo transparency
-
+
if (set_transparent) {
Window parent = win;
unsigned int i;
XVisualInfo visual_template;
XVisualInfo *visual_list;
int nxvisuals = 0, i;
-
+
visual_template.screen = screen;
visual_list = XGetVisualInfo (display, VisualScreenMask,
&visual_template, &nxvisuals);
visual_list[i].blue_mask == 0x0000ff)) {
*visual = visual_list[i].visual;
*depth = visual_list[i].depth;
+ DBGP("Found ARGB Visual");
+ XFree(visual_list);
return 1;
}
}
// no argb visual available
+ DBGP("No ARGB Visual found");
+ XFree(visual_list);
return 0;
}
#endif /* USE_ARGB */
XFreeGC(display, window.gc);
}
memset(&window, 0, sizeof(struct conky_window));
+ colour_set = -1;
}
void init_window(int own_window, int w, int h, int set_trans, int back_colour,
if (own_window) {
int depth = 0, flags;
Visual *visual = NULL;
-
+
if (!find_desktop_window(&window.root, &window.desktop)) {
return;
}
-
+
#ifdef USE_ARGB
if (use_argb_visual && get_argb_visual(&visual, &depth)) {
have_argb_visual = 1;
XClassHint classHint;
XWMHints wmHint;
Atom xa;
-
+
#ifdef USE_ARGB
if (have_argb_visual) {
attrs.colormap = window.colourmap;
}
/* Skip pager */
- if (TEST_HINT(window.hints, HINT_SKIP_PAGER)) {
+ if (TEST_HINT(window.hints, HINT_FULLSCREEN)) {
/* fprintf(stderr, PACKAGE_NAME": hint - skip_pager\n");
fflush(stderr); */
xa = ATOM(_NET_WM_STATE);
if (xa != None) {
- Atom xa_prop = ATOM(_NET_WM_STATE_SKIP_PAGER);
+ Atom xa_prop = ATOM(_NET_WM_STATE_FULLSCREEN);
XChangeProperty(display, window.window, xa, XA_ATOM, 32,
PropModeAppend, (unsigned char *) &xa_prop, 1);
if (!window.window) {
window.window = find_desktop_window(&window.root, &window.desktop);
}
+ window.visual = DefaultVisual(display, screen);
+ window.colourmap = DefaultColormap(display, screen);
if (XGetWindowAttributes(display, window.window, &attrs)) {
window.width = attrs.width;
}
}
-void update_x11info(void)
+int update_x11info(void)
{
struct information *current_info = &info;
- if (!x_initialised == YES)
- return;
+ if (x_initialised != YES)
+ return 0;
current_info->x11.monitor.number = XScreenCount(display);
current_info->x11.monitor.current = XDefaultScreen(display);
+ return 0;
}
#ifdef OWN_WINDOW