void cleanup()
{
+ stop_all_timeouts();
cleanup_systray();
stop_net();
cleanup_panel();
if (snapshot_path) g_free(snapshot_path);
cleanup_server();
- XCloseDisplay(server.dsp);
+ if (server.dsp) XCloseDisplay(server.dsp);
}
if (wm_menu && !tint2_handles_click(panel, &e->xbutton)) {
forward_click(e);
+ XLowerWindow (server.dsp, panel->main_win);
task_drag = 0;
return;
}
void event_property_notify (XEvent *e)
{
- int i, j;
+ int i;
Task *tsk;
Window win = e->xproperty.window;
Atom at = e->xproperty.atom;
// redraw both taskbar
if (server.nb_desktop > old_desktop) {
// can happen if last desktop is deleted and we've been on the last desktop
- panel->taskbar[old_desktop].area.is_active = 0;
+ panel->taskbar[old_desktop].area.bg = panel->g_taskbar.bg;
panel->taskbar[old_desktop].area.resize = 1;
}
- panel->taskbar[server.desktop].area.is_active = 1;
+ panel->taskbar[server.desktop].area.bg = panel->g_taskbar.bg_active;
panel->taskbar[server.desktop].area.resize = 1;
panel_refresh = 1;
}
// Window title changed
if (at == server.atom._NET_WM_VISIBLE_NAME || at == server.atom._NET_WM_NAME || at == server.atom.WM_NAME) {
- Task *tsk2;
- GSList *l0;
get_title(tsk);
- // changed other tsk->title
- for (i=0 ; i < nb_panel ; i++) {
- for (j=0 ; j < panel1[i].nb_desktop ; j++) {
- for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) {
- tsk2 = l0->data;
- if (tsk->win == tsk2->win && tsk != tsk2) {
- tsk2->title = tsk->title;
- tsk2->area.redraw = 1;
- }
- }
- }
- }
panel_refresh = 1;
}
// Demand attention
panel_refresh = 1;
}
}
-// We do not check for the iconified state, since it only unsets our active window
-// but in openbox a shaded window is considered iconified. So we would loose the active window
-// property on unshading it again (commented 01.10.2009)
-// else if (at == server.atom.WM_STATE) {
-// // Iconic state
-// // TODO : try to delete following code
-// if (window_is_iconified (win)) {
-// if (task_active) {
-// if (task_active->win == tsk->win) {
-// Task *tsk2;
-// GSList *l0;
-// for (i=0 ; i < nb_panel ; i++) {
-// for (j=0 ; j < panel1[i].nb_desktop ; j++) {
-// for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) {
-// tsk2 = l0->data;
-// tsk2->area.is_active = 0;
-// }
-// }
-// }
-// task_active = 0;
-// }
-// }
-// }
-// }
+ else if (at == server.atom.WM_STATE) {
+ // Iconic state
+ int state = (task_active && tsk->win == task_active->win ? TASK_ACTIVE : TASK_NORMAL);
+ if (window_is_iconified(win))
+ state = TASK_ICONIFIED;
+ set_task_state(tsk, state);
+ panel_refresh = 1;
+ }
// Window icon changed
else if (at == server.atom._NET_WM_ICON) {
get_icon(tsk);
- Task *tsk2;
- GSList *l0;
- for (i=0 ; i < nb_panel ; i++) {
- for (j=0 ; j < panel1[i].nb_desktop ; j++) {
- for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) {
- tsk2 = l0->data;
- if (tsk->win == tsk2->win && tsk != tsk2) {
- tsk2->icon_width = tsk->icon_width;
- tsk2->icon_height = tsk->icon_height;
- tsk2->icon = tsk->icon;
- tsk2->icon_active = tsk->icon_active;
- tsk2->area.redraw = 1;
- }
- }
- }
- }
panel_refresh = 1;
}
// Window desktop changed
Panel *p = tsk->area.panel;
if (p->monitor != window_get_monitor (win)) {
remove_task (tsk);
- add_task (win);
+ tsk = add_task (win);
if (win == window_get_active ()) {
- GSList* task_list = task_get_tasks(win);
- while (task_list) {
- Task *tsk = task_list->data;
- tsk->area.is_active = 1;
- task_active = tsk;
- task_list = task_list->next;
- }
+ set_task_state(tsk, TASK_ACTIVE);
+ task_active = tsk;
}
panel_refresh = 1;
}
for (i=0 ; i < nb_panel ; i++) {
panel = &panel1[i];
- if (panel->is_hidden)
+ if (panel->is_hidden) {
XCopyArea(server.dsp, panel->hidden_pixmap, panel->main_win, server.gc, 0, 0, panel->hidden_width, panel->hidden_height, 0, 0);
+ XSetWindowBackgroundPixmap(server.dsp, panel->main_win, panel->hidden_pixmap);
+ }
else {
if (panel->temp_pmap) XFreePixmap(server.dsp, panel->temp_pmap);
panel->temp_pmap = XCreatePixmap(server.dsp, server.root_win, panel->area.width, panel->area.height, server.depth);
break;
default:
- if (e.type == XDamageNotify+damage_event)
- // TODO: update only the damaged icon, not all of them
- systray.area.redraw = 1;
+ if (e.type == XDamageNotify+damage_event) {
+ // union needed to avoid strict-aliasing warnings by gcc
+ union { XEvent e; XDamageNotifyEvent de; } event_union = {.e=e};
+ TrayWindow *traywin;
+ GSList *l;
+ XDamageNotifyEvent* de = &event_union.de;
+ for (l = systray.list_icons; l ; l = l->next) {
+ traywin = (TrayWindow*)l->data;
+ if ( traywin->id == de->drawable && !de->more ) {
+ systray_render_icon(traywin);
+ break;
+ }
+ }
+ }
}
}
}
projects / chaz / tint2 / blobdiff