void cleanup()
{
- cleanup_timeout();
cleanup_systray();
cleanup_tooltip();
cleanup_clock();
imlib_context_disconnect_display();
cleanup_server();
+ cleanup_timeout();
if (server.dsp) XCloseDisplay(server.dsp);
}
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;
server.nb_desktop = server_get_number_of_desktop ();
cleanup_taskbar();
init_taskbar();
- visible_object();
for (i=0 ; i < nb_panel ; i++) {
+ init_taskbar_panel(&panel1[i]);
+ set_panel_items_order(&panel1[i]);
+ visible_taskbar(&panel1[i]);
panel1[i].area.resize = 1;
}
task_refresh_tasklist();
}
// Change desktop
else if (at == server.atom._NET_CURRENT_DESKTOP) {
+ if (!taskbar_enabled) return;
int old_desktop = server.desktop;
server.desktop = server_get_current_desktop ();
for (i=0 ; i < nb_panel ; i++) {
Panel *panel = &panel1[i];
- if (panel_mode == MULTI_DESKTOP && panel->g_taskbar.use_active) {
- // 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.bg = panel->g_taskbar.bg;
- panel->taskbar[old_desktop].area.resize = 1;
- }
- panel->taskbar[server.desktop].area.bg = panel->g_taskbar.bg_active;
- panel->taskbar[server.desktop].area.resize = 1;
- panel_refresh = 1;
- }
+ set_taskbar_state(&panel->taskbar[old_desktop], TASKBAR_NORMAL);
+ set_taskbar_state(&panel->taskbar[server.desktop], TASKBAR_ACTIVE);
// check ALLDESKTOP task => resize taskbar
Taskbar *tskbar;
Task *tsk;
tskbar->area.resize = 1;
}
}
- }
- if (panel_mode != MULTI_DESKTOP) {
- visible_object();
+ if (panel_mode != MULTI_DESKTOP)
+ visible_taskbar(panel);
}
}
// Window list
// Window title changed
if (at == server.atom._NET_WM_VISIBLE_NAME || at == server.atom._NET_WM_NAME || at == server.atom.WM_NAME) {
- get_title(tsk);
- if (g_tooltip.mapped && (g_tooltip.area == (Area*)tsk)) {
- tooltip_copy_text((Area*)tsk);
- tooltip_update();
+ if (get_title(tsk)) {
+ if (g_tooltip.mapped && (g_tooltip.area == (Area*)tsk)) {
+ tooltip_copy_text((Area*)tsk);
+ tooltip_update();
+ }
+ panel_refresh = 1;
}
- panel_refresh = 1;
}
// Demand attention
else if (at == server.atom._NET_WM_STATE) {
signal_pending = SIGUSR1;
break;
}
- if (e.xany.window == g_tooltip.window || !systray.area.on_screen)
+ if (e.xany.window == g_tooltip.window || !systray_enabled)
break;
for (it = systray.list_icons; it; it = g_slist_next(it)) {
if (((TrayWindow*)it->data)->tray_id == e.xany.window) {
// Start real_transparency
signal_pending = SIGUSR1;
}
- if (systray.area.on_screen && e.xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE && e.xclient.format == 32 && e.xclient.window == net_sel_win) {
+ if (systray_enabled && e.xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE && e.xclient.format == 32 && e.xclient.window == net_sel_win) {
net_message(&e.xclient);
}
else if (e.xclient.message_type == server.atom.XdndPosition) {