support skip_taskbar by Andreas.Fink85
git-svn-id: http://tint2.googlecode.com/svn/trunk@169 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
lorthiois@bbsoft.fr
152
src/panel.c
152
src/panel.c
@@ -69,21 +69,21 @@ void init_panel()
|
||||
p->area.parent = p;
|
||||
p->area.panel = p;
|
||||
p->area.on_screen = 1;
|
||||
p->area.resize = 1;
|
||||
p->area.resize = 1;
|
||||
p->area._resize = resize_panel;
|
||||
p->g_taskbar.parent = p;
|
||||
p->g_taskbar.panel = p;
|
||||
p->g_task.area.panel = p;
|
||||
|
||||
// add childs
|
||||
if (p->clock.area.on_screen)
|
||||
if (p->clock.area.on_screen)
|
||||
p->area.list = g_slist_append(p->area.list, &p->clock);
|
||||
#ifdef ENABLE_BATTERY
|
||||
if (p->battery.area.on_screen)
|
||||
p->area.list = g_slist_append(p->area.list, &p->battery);
|
||||
#endif
|
||||
// systray only on first panel
|
||||
if (systray.area.on_screen && i == 0)
|
||||
// systray only on first panel
|
||||
if (systray.area.on_screen && i == 0)
|
||||
p->area.list = g_slist_append(p->area.list, &systray);
|
||||
|
||||
// full width mode
|
||||
@@ -168,12 +168,12 @@ void cleanup_panel()
|
||||
task_drag = 0;
|
||||
task_urgent = 0;
|
||||
cleanup_systray();
|
||||
cleanup_taskbar();
|
||||
cleanup_taskbar();
|
||||
|
||||
// font allocated once
|
||||
if (panel1[0].g_task.font_desc) {
|
||||
pango_font_description_free(panel1[0].g_task.font_desc);
|
||||
panel1[0].g_task.font_desc = 0;
|
||||
if (panel1[0].g_task.font_desc) {
|
||||
pango_font_description_free(panel1[0].g_task.font_desc);
|
||||
panel1[0].g_task.font_desc = 0;
|
||||
}
|
||||
|
||||
int i;
|
||||
@@ -182,8 +182,8 @@ void cleanup_panel()
|
||||
p = &panel1[i];
|
||||
|
||||
free_area(&p->area);
|
||||
free_area(&p->g_task.area);
|
||||
free_area(&p->g_taskbar);
|
||||
free_area(&p->g_task.area);
|
||||
free_area(&p->g_taskbar);
|
||||
|
||||
if (p->temp_pmap) {
|
||||
XFreePixmap(server.dsp, p->temp_pmap);
|
||||
@@ -195,17 +195,17 @@ void cleanup_panel()
|
||||
}
|
||||
}
|
||||
|
||||
if (panel1) free(panel1);
|
||||
panel1 = 0;
|
||||
if (panel1) free(panel1);
|
||||
panel1 = 0;
|
||||
}
|
||||
|
||||
|
||||
void resize_panel(void *obj)
|
||||
{
|
||||
Panel *panel = (Panel*)obj;
|
||||
Panel *panel = (Panel*)obj;
|
||||
|
||||
if (panel_horizontal) {
|
||||
int taskbar_width, modulo_width = 0;
|
||||
int taskbar_width, modulo_width = 0;
|
||||
|
||||
taskbar_width = panel->area.width - (2 * panel->area.paddingxlr) - (2 * panel->area.pix.border.width);
|
||||
if (panel->clock.area.on_screen && panel->clock.area.width)
|
||||
@@ -241,7 +241,7 @@ void resize_panel(void *obj)
|
||||
}
|
||||
}
|
||||
else {
|
||||
int taskbar_height, modulo_height = 0;
|
||||
int taskbar_height, modulo_height = 0;
|
||||
int i, posy;
|
||||
|
||||
taskbar_height = panel->area.height - (2 * panel->area.paddingxlr) - (2 * panel->area.pix.border.width);
|
||||
@@ -280,8 +280,8 @@ void resize_panel(void *obj)
|
||||
|
||||
void visible_object()
|
||||
{
|
||||
Panel *panel;
|
||||
int i, j;
|
||||
Panel *panel;
|
||||
int i, j;
|
||||
|
||||
for (i=0 ; i < nb_panel ; i++) {
|
||||
panel = &panel1[i];
|
||||
@@ -304,22 +304,22 @@ void visible_object()
|
||||
|
||||
void set_panel_properties(Panel *p)
|
||||
{
|
||||
XStoreName (server.dsp, p->main_win, "tint2");
|
||||
XStoreName (server.dsp, p->main_win, "tint2");
|
||||
|
||||
// TODO: check if the name is really needed for a panel/taskbar ?
|
||||
gsize len;
|
||||
gchar *name = g_locale_to_utf8("tint2", -1, NULL, &len, NULL);
|
||||
if (name != NULL) {
|
||||
XChangeProperty(server.dsp, p->main_win, server.atom._NET_WM_NAME, server.atom.UTF8_STRING, 8, PropModeReplace, (unsigned char *) name, (int) len);
|
||||
g_free(name);
|
||||
}
|
||||
// TODO: check if the name is really needed for a panel/taskbar ?
|
||||
gsize len;
|
||||
gchar *name = g_locale_to_utf8("tint2", -1, NULL, &len, NULL);
|
||||
if (name != NULL) {
|
||||
XChangeProperty(server.dsp, p->main_win, server.atom._NET_WM_NAME, server.atom.UTF8_STRING, 8, PropModeReplace, (unsigned char *) name, (int) len);
|
||||
g_free(name);
|
||||
}
|
||||
|
||||
// Dock
|
||||
long val = server.atom._NET_WM_WINDOW_TYPE_DOCK;
|
||||
XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_WINDOW_TYPE, XA_ATOM, 32, PropModeReplace, (unsigned char *) &val, 1);
|
||||
// Dock
|
||||
long val = server.atom._NET_WM_WINDOW_TYPE_DOCK;
|
||||
XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_WINDOW_TYPE, XA_ATOM, 32, PropModeReplace, (unsigned char *) &val, 1);
|
||||
|
||||
// Reserved space
|
||||
long struts [12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
|
||||
// Reserved space
|
||||
long struts [12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
|
||||
if (panel_horizontal) {
|
||||
if (panel_position & TOP) {
|
||||
struts[2] = p->area.height + p->marginy;
|
||||
@@ -348,69 +348,69 @@ void set_panel_properties(Panel *p)
|
||||
struts[7] = p->posy + p->area.height - 1;
|
||||
}
|
||||
}
|
||||
// Old specification : fluxbox need _NET_WM_STRUT.
|
||||
XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_STRUT, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &struts, 4);
|
||||
XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_STRUT_PARTIAL, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &struts, 12);
|
||||
// Old specification : fluxbox need _NET_WM_STRUT.
|
||||
XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_STRUT, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &struts, 4);
|
||||
XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_STRUT_PARTIAL, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &struts, 12);
|
||||
|
||||
// Sticky and below other window
|
||||
val = 0xFFFFFFFF;
|
||||
XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_DESKTOP, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &val, 1);
|
||||
Atom state[4];
|
||||
state[0] = server.atom._NET_WM_STATE_SKIP_PAGER;
|
||||
state[1] = server.atom._NET_WM_STATE_SKIP_TASKBAR;
|
||||
state[2] = server.atom._NET_WM_STATE_STICKY;
|
||||
state[3] = server.atom._NET_WM_STATE_BELOW;
|
||||
XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_STATE, XA_ATOM, 32, PropModeReplace, (unsigned char *) state, 4);
|
||||
// Sticky and below other window
|
||||
val = 0xFFFFFFFF;
|
||||
XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_DESKTOP, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &val, 1);
|
||||
Atom state[4];
|
||||
state[0] = server.atom._NET_WM_STATE_SKIP_PAGER;
|
||||
state[1] = server.atom._NET_WM_STATE_SKIP_TASKBAR;
|
||||
state[2] = server.atom._NET_WM_STATE_STICKY;
|
||||
state[3] = server.atom._NET_WM_STATE_BELOW;
|
||||
XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_STATE, XA_ATOM, 32, PropModeReplace, (unsigned char *) state, 4);
|
||||
|
||||
// Fixed position
|
||||
XSizeHints size_hints;
|
||||
size_hints.flags = PPosition;
|
||||
XChangeProperty (server.dsp, p->main_win, XA_WM_NORMAL_HINTS, XA_WM_SIZE_HINTS, 32, PropModeReplace, (unsigned char *) &size_hints, sizeof (XSizeHints) / 4);
|
||||
// Fixed position
|
||||
XSizeHints size_hints;
|
||||
size_hints.flags = PPosition;
|
||||
XChangeProperty (server.dsp, p->main_win, XA_WM_NORMAL_HINTS, XA_WM_SIZE_HINTS, 32, PropModeReplace, (unsigned char *) &size_hints, sizeof (XSizeHints) / 4);
|
||||
|
||||
// Unfocusable
|
||||
XWMHints wmhints;
|
||||
wmhints.flags = InputHint;
|
||||
wmhints.input = False;
|
||||
XChangeProperty (server.dsp, p->main_win, XA_WM_HINTS, XA_WM_HINTS, 32, PropModeReplace, (unsigned char *) &wmhints, sizeof (XWMHints) / 4);
|
||||
// Unfocusable
|
||||
XWMHints wmhints;
|
||||
wmhints.flags = InputHint;
|
||||
wmhints.input = False;
|
||||
XChangeProperty (server.dsp, p->main_win, XA_WM_HINTS, XA_WM_HINTS, 32, PropModeReplace, (unsigned char *) &wmhints, sizeof (XWMHints) / 4);
|
||||
|
||||
// Undecorated
|
||||
long prop[5] = { 2, 0, 0, 0, 0 };
|
||||
XChangeProperty(server.dsp, p->main_win, server.atom._MOTIF_WM_HINTS, server.atom._MOTIF_WM_HINTS, 32, PropModeReplace, (unsigned char *) prop, 5);
|
||||
// Undecorated
|
||||
long prop[5] = { 2, 0, 0, 0, 0 };
|
||||
XChangeProperty(server.dsp, p->main_win, server.atom._MOTIF_WM_HINTS, server.atom._MOTIF_WM_HINTS, 32, PropModeReplace, (unsigned char *) prop, 5);
|
||||
}
|
||||
|
||||
|
||||
void set_panel_background(Panel *p)
|
||||
{
|
||||
get_root_pixmap();
|
||||
get_root_pixmap();
|
||||
|
||||
if (p->area.pix.pmap) XFreePixmap (server.dsp, p->area.pix.pmap);
|
||||
p->area.pix.pmap = XCreatePixmap (server.dsp, server.root_win, p->area.width, p->area.height, server.depth);
|
||||
if (p->area.pix.pmap) XFreePixmap (server.dsp, p->area.pix.pmap);
|
||||
p->area.pix.pmap = XCreatePixmap (server.dsp, server.root_win, p->area.width, p->area.height, server.depth);
|
||||
|
||||
// copy background (server.root_pmap) in panel.area.pix.pmap
|
||||
Window dummy;
|
||||
int x, y;
|
||||
XTranslateCoordinates(server.dsp, p->main_win, server.root_win, 0, 0, &x, &y, &dummy);
|
||||
XSetTSOrigin(server.dsp, server.gc, -x, -y) ;
|
||||
XFillRectangle(server.dsp, p->area.pix.pmap, server.gc, 0, 0, p->area.width, p->area.height);
|
||||
// copy background (server.root_pmap) in panel.area.pix.pmap
|
||||
Window dummy;
|
||||
int x, y;
|
||||
XTranslateCoordinates(server.dsp, p->main_win, server.root_win, 0, 0, &x, &y, &dummy);
|
||||
XSetTSOrigin(server.dsp, server.gc, -x, -y) ;
|
||||
XFillRectangle(server.dsp, p->area.pix.pmap, server.gc, 0, 0, p->area.width, p->area.height);
|
||||
|
||||
// draw background panel
|
||||
cairo_surface_t *cs;
|
||||
cairo_t *c;
|
||||
cs = cairo_xlib_surface_create (server.dsp, p->area.pix.pmap, server.visual, p->area.width, p->area.height);
|
||||
c = cairo_create (cs);
|
||||
// draw background panel
|
||||
cairo_surface_t *cs;
|
||||
cairo_t *c;
|
||||
cs = cairo_xlib_surface_create (server.dsp, p->area.pix.pmap, server.visual, p->area.width, p->area.height);
|
||||
c = cairo_create (cs);
|
||||
|
||||
draw_background(&p->area, c, 0);
|
||||
draw_background(&p->area, c, 0);
|
||||
|
||||
cairo_destroy (c);
|
||||
cairo_surface_destroy (cs);
|
||||
cairo_destroy (c);
|
||||
cairo_surface_destroy (cs);
|
||||
|
||||
// redraw panel's object
|
||||
GSList *l0;
|
||||
Area *a;
|
||||
GSList *l0;
|
||||
Area *a;
|
||||
for (l0 = p->area.list; l0 ; l0 = l0->next) {
|
||||
a = l0->data;
|
||||
set_redraw(a);
|
||||
}
|
||||
a = l0->data;
|
||||
set_redraw(a);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user