default_icon = imlib_load_image(path);
g_free(path);
}
+
+ // get monitor and desktop config
+ get_monitors();
+ get_desktops();
}
void cleanup()
{
cleanup_systray();
+ stop_net();
cleanup_panel();
+ cleanup_tooltip();
+ cleanup_clock();
+#ifdef ENABLE_BATTERY
+ cleanup_battery();
+#endif
if (default_icon) {
imlib_context_set_image(default_icon);
imlib_free_image();
}
- if (g_tooltip.window) {
- XDestroyWindow(server.dsp, g_tooltip.window);
- g_tooltip.window = 0;
- }
- if (g_tooltip.font_desc) {
- pango_font_description_free(g_tooltip.font_desc);
- g_tooltip.font_desc = 0;
- }
- if (time1_font_desc) pango_font_description_free(time1_font_desc);
- if (time2_font_desc) pango_font_description_free(time2_font_desc);
- if (time1_format) g_free(time1_format);
- if (time2_format) g_free(time2_format);
-#ifdef ENABLE_BATTERY
- if (bat1_font_desc) pango_font_description_free(bat1_font_desc);
- if (bat2_font_desc) pango_font_description_free(bat2_font_desc);
- if (battery_low_cmd) g_free(battery_low_cmd);
- if (path_energy_now) g_free(path_energy_now);
- if (path_energy_full) g_free(path_energy_full);
- if (path_current_now) g_free(path_current_now);
- if (path_status) g_free(path_status);
-#endif
- if (clock_lclick_command) g_free(clock_lclick_command);
- if (clock_rclick_command) g_free(clock_rclick_command);
if (config_path) g_free(config_path);
if (thumbnail_path) g_free(thumbnail_path);
e->xbutton.window = server.root_win;
// icewm doesn't open under the mouse.
// and xfce doesn't open at all.
- //e->xbutton.x = e->xbutton.x_root;
- //e->xbutton.y = e->xbutton.y_root;
+ e->xbutton.x = e->xbutton.x_root;
+ e->xbutton.y = e->xbutton.y_root;
//printf("**** %d, %d\n", e->xbutton.x, e->xbutton.y);
- XSetInputFocus(server.dsp, e->xbutton.window, RevertToParent, e->xbutton.time);
+ //XSetInputFocus(server.dsp, e->xbutton.window, RevertToParent, e->xbutton.time);
XSendEvent(server.dsp, e->xbutton.window, False, ButtonPressMask, e);
return;
}
if (panel_mode == MULTI_DESKTOP && panel->g_taskbar.use_active) {
// redraw both taskbar
panel->taskbar[old_desktop].area.is_active = 0;
- panel->taskbar[old_desktop].area.redraw = 1;
+ panel->taskbar[old_desktop].area.resize = 1;
panel->taskbar[server.desktop].area.is_active = 1;
- panel->taskbar[server.desktop].area.redraw = 1;
+ panel->taskbar[server.desktop].area.resize = 1;
panel_refresh = 1;
}
// check ALLDESKTOP task => resize taskbar
}
// Change active
else if (at == server.atom._NET_ACTIVE_WINDOW) {
- GSList *l0;
- if (task_active) {
- 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) {
- tsk = l0->data;
- tsk->area.is_active = 0;
- }
- }
- }
- task_active = 0;
- }
- Window w1 = window_get_active ();
- Task *t = task_get_task(w1);
- if (!t) {
- Window w2;
- if (XGetTransientForHint(server.dsp, w1, &w2) != 0)
- if (w2) t = task_get_task(w2);
- }
- if (task_urgent == t) {
- init_precision();
- task_urgent = 0;
- }
- // put active state on all task (multi_desktop)
- if (t) {
- 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) {
- tsk = l0->data;
- if (tsk->win == t->win) {
- tsk->area.is_active = 1;
- //printf("active monitor %d, task %s\n", panel1[i].monitor, tsk->title);
- }
- }
- }
- }
- task_active = t;
- }
+ active_task();
panel_refresh = 1;
}
else if (at == server.atom._XROOTPMAP_ID) {
// change in root window (xrandr)
if (win == server.root_win) {
get_monitors();
+ init_config();
+ config_read_file (config_path);
init_panel();
+ cleanup_config();
return;
}
// update battery
#ifdef ENABLE_BATTERY
- if (panel1[0].battery.area.on_screen) {
+ if (battery_enabled) {
update_battery();
for (i=0 ; i < nb_panel ; i++)
panel1[i].battery.area.resize = 1;
cleanup();
exit(1);
}
- config_finish();
+ init_panel();
+ cleanup_config();
if (thumbnail_path) {
// usage: tint2 -j <file> for internal use
printf("file %s\n", thumbnail_path);
break;
case MotionNotify: {
+ if (!g_tooltip.enabled) break;
Panel* panel = get_panel(e.xmotion.window);
Task* task = click_task(panel, e.xmotion.x, e.xmotion.y);
if (task)
break;
case ReparentNotify:
- if (!systray.area.on_screen)
+ if (!systray_enabled)
break;
panel = (Panel*)systray.area.panel;
if (e.xany.window == panel->main_win) // reparented to us
event_timer();
switch (signal_pending) {
- case SIGUSR1:
+ case SIGUSR1: // reload config file
signal_pending = 0;
- printf("SIGUSR1\n");
+ init_config();
config_read_file (config_path);
init_panel();
+ cleanup_config();
break;
case SIGINT:
case SIGTERM: