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

fixed bug when active window draged to another desktop

Browse source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@135 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
lorthiois@bbsoft.fr 2009-06-29 19:50:29 +00:00
parent f100b49158
commit 94a8948466
4 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,3 +1,6 @@
2009-06-29
- fixed bug when active window draged to another desktop
2009-06-29 2009-06-29
- fixed issue 110 and issue 107 - fixed issue 110 and issue 107

10
src/taskbar/task.c
View file

@ -34,10 +34,10 @@
void add_task (Window win) Task *add_task (Window win)
{ {
if (!win) return; if (!win) return 0;
if (window_is_hidden(win)) return; if (window_is_hidden(win)) return 0;
int monitor; int monitor;
@ -45,7 +45,6 @@ void add_task (Window win)
new_tsk.win = win; new_tsk.win = win;
new_tsk.area.panel = &panel1[0]; new_tsk.area.panel = &panel1[0];
new_tsk.desktop = window_get_desktop (win); new_tsk.desktop = window_get_desktop (win);
// if (panel_mode == SINGLE_MONITOR) monitor = window_get_monitor (win);
if (nb_panel > 1) monitor = window_get_monitor (win); if (nb_panel > 1) monitor = window_get_monitor (win);
else monitor = 0; else monitor = 0;
@ -60,7 +59,7 @@ void add_task (Window win)
XSelectInput (server.dsp, new_tsk.win, PropertyChangeMask|StructureNotifyMask); XSelectInput (server.dsp, new_tsk.win, PropertyChangeMask|StructureNotifyMask);
Taskbar *tskbar; Taskbar *tskbar;
Task *new_tsk2; Task *new_tsk2=0;
int i, j; int i, j;
for (i=0 ; i < nb_panel ; i++) { for (i=0 ; i < nb_panel ; i++) {
for (j=0 ; j < panel1[i].nb_desktop ; j++) { for (j=0 ; j < panel1[i].nb_desktop ; j++) {
@ -82,6 +81,7 @@ void add_task (Window win)
//printf("add_task panel %d, desktop %d, task %s\n", i, j, new_tsk2->title); //printf("add_task panel %d, desktop %d, task %s\n", i, j, new_tsk2->title);
} }
} }
return new_tsk2;
} }

2
src/taskbar/task.h
View file

@ -51,7 +51,7 @@ typedef struct {
void add_task (Window win); Task *add_task (Window win);
void remove_task (Task *tsk); void remove_task (Task *tsk);
void draw_task (void *obj, cairo_t *c, int active); void draw_task (void *obj, cairo_t *c, int active);

7
src/tint.c
View file

@ -479,11 +479,16 @@ void event_property_notify (XEvent *e)
// Window desktop changed // Window desktop changed
else if (at == server.atom._NET_WM_DESKTOP) { else if (at == server.atom._NET_WM_DESKTOP) {
int desktop = window_get_desktop (win); int desktop = window_get_desktop (win);
int active = tsk->area.is_active;
//printf(" Window desktop changed %d, %d\n", tsk->desktop, desktop); //printf(" Window desktop changed %d, %d\n", tsk->desktop, desktop);
// bug in windowmaker : send unecessary 'desktop changed' when focus changed // bug in windowmaker : send unecessary 'desktop changed' when focus changed
if (desktop != tsk->desktop) { if (desktop != tsk->desktop) {
remove_task (tsk); remove_task (tsk);
add_task (win); tsk = add_task (win);
if (tsk && active) {
tsk->area.is_active = 1;
task_active = tsk;
}
panel_refresh = 1; panel_refresh = 1;
} }
} }