nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

panel_items : fixed _NET_WM_ICON_GEOMETRY. panel_items is done for me.

Browse source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@563 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
thilor77 2010-09-23 20:28:30 +00:00
parent 98c3cbe874
commit c19819843e
5 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/server.c
View file

@ -38,6 +38,7 @@ void server_init_atoms ()
server.atom._XROOTPMAP_ID = XInternAtom (server.dsp, "_XROOTPMAP_ID", False);
server.atom._NET_CURRENT_DESKTOP = XInternAtom (server.dsp, "_NET_CURRENT_DESKTOP", False);
server.atom._NET_NUMBER_OF_DESKTOPS = XInternAtom (server.dsp, "_NET_NUMBER_OF_DESKTOPS", False);
server.atom._NET_DESKTOP_NAMES = XInternAtom (server.dsp, "_NET_DESKTOP_NAMES", False);
server.atom._NET_DESKTOP_GEOMETRY = XInternAtom (server.dsp, "_NET_DESKTOP_GEOMETRY", False);
server.atom._NET_DESKTOP_VIEWPORT = XInternAtom (server.dsp, "_NET_DESKTOP_VIEWPORT", False);
server.atom._NET_ACTIVE_WINDOW = XInternAtom (server.dsp, "_NET_ACTIVE_WINDOW", False);

1
src/server.h
View file

@ -19,6 +19,7 @@ typedef struct Global_atom
Atom _XROOTPMAP_ID;
Atom _NET_CURRENT_DESKTOP;
Atom _NET_NUMBER_OF_DESKTOPS;
Atom _NET_DESKTOP_NAMES;
Atom _NET_DESKTOP_GEOMETRY;
Atom _NET_DESKTOP_VIEWPORT;
Atom _NET_ACTIVE_WINDOW;

3
src/taskbar/task.c
View file

@ -344,6 +344,9 @@ void draw_task (void *obj, cairo_t *c)
Panel *panel = (Panel*)tsk->area.panel;
//printf("draw_task %d %d\n", tsk->area.posx, tsk->area.posy);
long value[] = { panel->posx+tsk->area.posx, panel->posy+tsk->area.posy, tsk->area.width, tsk->area.height };
XChangeProperty (server.dsp, tsk->win, server.atom._NET_WM_ICON_GEOMETRY, XA_CARDINAL, 32, PropModeReplace, (unsigned char*)value, 4);
if (panel->g_task.text) {
/* Layout */
layout = pango_cairo_create_layout (c);

7
src/taskbar/taskbar.c
View file

@ -266,6 +266,7 @@ int resize_taskbar(void *obj)
GSList *l;
int task_count, border_width;
//printf("resize_taskbar %d %d\n", taskbar->area.posx, taskbar->area.posy);
// taskbar->area.redraw = 1;
border_width = taskbar->area.bg->border.width;
@ -297,9 +298,6 @@ int resize_taskbar(void *obj)
if (!tsk->area.on_screen) continue;
//set_task_redraw(tsk); // always redraw task, because the background could have changed (taskbar_active_id)
tsk->area.width = pixel_width;
// TODO : move later (when posx is known)
// long value[] = { panel->posx+x, panel->posy, pixel_width, panel->area.height };
// XChangeProperty (server.dsp, tsk->win, server.atom._NET_WM_ICON_GEOMETRY, XA_CARDINAL, 32, PropModeReplace, (unsigned char*)value, 4);
if (modulo_width) {
tsk->area.width++;
@ -335,9 +333,6 @@ int resize_taskbar(void *obj)
if (!tsk->area.on_screen) continue;
//set_task_redraw(tsk); // always redraw task, because the background could have changed (taskbar_active_id)
tsk->area.height = pixel_height;
// TODO : move later (when posy is known)
// long value[] = { panel->posx, panel->posy+y, panel->area.width, pixel_height };
// XChangeProperty (server.dsp, tsk->win, server.atom._NET_WM_ICON_GEOMETRY, XA_CARDINAL, 32, PropModeReplace, (unsigned char*)value, 4);
if (modulo_height) {
tsk->area.height++;

5
src/tint.c
View file

@ -485,6 +485,11 @@ void event_property_notify (XEvent *e)
server.got_root_win = 1;
}
// Change name of desktops
else if (at == server.atom._NET_DESKTOP_NAMES) {
printf("_NET_DESKTOP_NAMES\n");
panel_refresh = 1;
}
// Change number of desktops
else if (at == server.atom._NET_NUMBER_OF_DESKTOPS) {
if (!taskbar_enabled) return;