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

starting point on issue 135

Browse source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@201 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
lorthiois@bbsoft.fr 2009-09-27 13:33:31 +00:00
parent fe2dde30db
commit e015d5b19c
1 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
src/tint.c
View file

@ -142,16 +142,14 @@ Taskbar *click_taskbar (Panel *panel, int x, int y)
if (panel_horizontal) { if (panel_horizontal) {
for (i=0; i < panel->nb_desktop ; i++) { for (i=0; i < panel->nb_desktop ; i++) {
tskbar = &panel->taskbar[i]; tskbar = &panel->taskbar[i];
if (!tskbar->area.on_screen) continue; if (tskbar->area.on_screen && x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
return tskbar; return tskbar;
} }
} }
else { else {
for (i=0; i < panel->nb_desktop ; i++) { for (i=0; i < panel->nb_desktop ; i++) {
tskbar = &panel->taskbar[i]; tskbar = &panel->taskbar[i];
if (!tskbar->area.on_screen) continue; if (tskbar->area.on_screen && y >= tskbar->area.posy && y <= (tskbar->area.posy + tskbar->area.height))
if (y >= tskbar->area.posy && y <= (tskbar->area.posy + tskbar->area.height))
return tskbar; return tskbar;
} }
} }
@ -615,35 +613,42 @@ void event_expose (XEvent *e)
void event_configure_notify (Window win) void event_configure_notify (Window win)
{ {
// check 'win' move in systray if (win == server.root_win) {
TrayWindow *traywin; printf("ConfigureNotify on root\n");
GSList *l; //XMoveWindow(dpy, fen, pos_x, pos_y);
for (l = systray.list_icons; l ; l = l->next) { //XResizeWindow(dpy, fen, largeur, hauteur);
traywin = (TrayWindow*)l->data;
if (traywin->id == win) {
//printf("move tray %d\n", traywin->x);
XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, traywin->width, traywin->height);
panel_refresh = 1;
return;
}
} }
else {
// check 'win' move in another monitor // check 'win' move in systray
if (nb_panel == 1) return; TrayWindow *traywin;
if (server.nb_monitor == 1) return; GSList *l;
Task *tsk = task_get_task (win); for (l = systray.list_icons; l ; l = l->next) {
if (!tsk) return; traywin = (TrayWindow*)l->data;
if (traywin->id == win) {
Panel *p = tsk->area.panel; //printf("move tray %d\n", traywin->x);
if (p->monitor != window_get_monitor (win)) { XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, traywin->width, traywin->height);
remove_task (tsk); panel_refresh = 1;
add_task (win); return;
if (win == window_get_active ()) { }
Task *tsk = task_get_task (win); }
tsk->area.is_active = 1;
task_active = tsk; // check 'win' move in another monitor
if (nb_panel == 1) return;
if (server.nb_monitor == 1) return;
Task *tsk = task_get_task (win);
if (!tsk) return;
Panel *p = tsk->area.panel;
if (p->monitor != window_get_monitor (win)) {
remove_task (tsk);
add_task (win);
if (win == window_get_active ()) {
Task *tsk = task_get_task (win);
tsk->area.is_active = 1;
task_active = tsk;
}
panel_refresh = 1;
} }
panel_refresh = 1;
} }
} }
@ -796,12 +801,7 @@ load_config:
break; break;
case ConfigureNotify: case ConfigureNotify:
//XMoveWindow(dpy, fen, pos_x, pos_y); event_configure_notify (e.xconfigure.window);
//XResizeWindow(dpy, fen, largeur, hauteur);
if (e.xconfigure.window == server.root_win)
goto load_config;
else
event_configure_notify (e.xconfigure.window);
break; break;
case ReparentNotify: case ReparentNotify: