XSelectInput (server.dsp, server.root_win, PropertyChangeMask|StructureNotifyMask);
setlocale (LC_ALL, "");
+
+ // load default icon
+ int i;
+ char *path;
+ const gchar * const *data_dirs;
+ data_dirs = g_get_system_data_dirs ();
+ for (i = 0; data_dirs[i] != NULL; i++) {
+ path = g_build_filename(data_dirs[i], "tint2", "default_icon.png", NULL);
+ if (g_file_test (path, G_FILE_TEST_EXISTS))
+ 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();
-
- 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);
+ cleanup_tooltip();
+ cleanup_clock();
#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);
+ cleanup_battery();
#endif
- if (clock_lclick_command) g_free(clock_lclick_command);
- if (clock_rclick_command) g_free(clock_rclick_command);
+
+ if (default_icon) {
+ imlib_context_set_image(default_icon);
+ imlib_free_image();
+ }
if (config_path) g_free(config_path);
if (thumbnail_path) g_free(thumbnail_path);
if (panel_horizontal) {
for (i=0; i < panel->nb_desktop ; i++) {
tskbar = &panel->taskbar[i];
- if (!tskbar->area.on_screen) continue;
- if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
+ if (tskbar->area.on_screen && x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
return tskbar;
}
}
else {
for (i=0; i < panel->nb_desktop ; i++) {
tskbar = &panel->taskbar[i];
- if (!tskbar->area.on_screen) continue;
- if (y >= tskbar->area.posy && y <= (tskbar->area.posy + tskbar->area.height))
+ if (tskbar->area.on_screen && y >= tskbar->area.posy && y <= (tskbar->area.posy + tskbar->area.height))
return tskbar;
}
}
Task *tsk;
for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
tsk = l0->data;
- if (x >= tsk->area.posx && x <= (tsk->area.posx + tsk->area.width)) {
+ if (tsk->area.on_screen && x >= tsk->area.posx && x <= (tsk->area.posx + tsk->area.width)) {
return tsk;
}
}
Task *tsk;
for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
tsk = l0->data;
- if (y >= tsk->area.posy && y <= (tsk->area.posy + tsk->area.height)) {
+ if (tsk->area.on_screen && y >= tsk->area.posy && y <= (tsk->area.posy + tsk->area.height)) {
return tsk;
}
}
Panel *panel = get_panel(e->xany.window);
if (!panel) return;
- if (panel_mode == MULTI_DESKTOP)
- task_drag = click_task(panel, e->xbutton.x, e->xbutton.y);
+ task_drag = click_task(panel, e->xbutton.x, e->xbutton.y);
if (wm_menu && !task_drag && !click_clock(panel, e->xbutton.x, e->xbutton.y) && (e->xbutton.button != 1) ) {
// forward the click to the desktop window (thanks conky)
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;
}
Panel *panel = get_panel(e->xany.window);
if (!panel) return;
- if (wm_menu && click_padding(panel, e->xbutton.x, e->xbutton.y)) {
- // forward the click to the desktop window (thanks conky)
- e->xbutton.window = server.root_win;
- XSendEvent(server.dsp, e->xbutton.window, False, ButtonReleaseMask, e);
- return;
- }
-
int action = TOGGLE_ICONIFY;
switch (e->xbutton.button) {
case 2:
}
// Change desktop
else if (at == server.atom._NET_CURRENT_DESKTOP) {
+ 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 taskbar
+ // redraw both taskbar
+ panel->taskbar[old_desktop].area.is_active = 0;
+ panel->taskbar[old_desktop].area.redraw = 1;
+ panel->taskbar[server.desktop].area.is_active = 1;
+ panel->taskbar[server.desktop].area.redraw = 1;
panel_refresh = 1;
- Taskbar *tskbar;
- Task *tsk;
- GSList *l;
- for (j=0 ; j < panel->nb_desktop ; j++) {
- tskbar = &panel->taskbar[j];
- if (tskbar->area.is_active) {
- tskbar->area.is_active = 0;
- tskbar->area.redraw = 1;
- for (l = tskbar->area.list; l ; l = l->next) {
- tsk = l->data;
- tsk->area.redraw = 1;
- }
- }
- if (j == server.desktop) {
- tskbar->area.is_active = 1;
- tskbar->area.redraw = 1;
- for (l = tskbar->area.list; l ; l = l->next) {
- tsk = l->data;
- tsk->area.redraw = 1;
- }
- }
+ }
+ // check ALLDESKTOP task => resize taskbar
+ Taskbar *tskbar;
+ Task *tsk;
+ GSList *l;
+ tskbar = &panel->taskbar[old_desktop];
+ for (l = tskbar->area.list; l ; l = l->next) {
+ tsk = l->data;
+ if (tsk->desktop == ALLDESKTOP) {
+ tsk->area.on_screen = 0;
+ tskbar->area.resize = 1;
+ panel_refresh = 1;
+ }
+ }
+ tskbar = &panel->taskbar[server.desktop];
+ for (l = tskbar->area.list; l ; l = l->next) {
+ tsk = l->data;
+ if (tsk->desktop == ALLDESKTOP) {
+ tsk->area.on_screen = 1;
+ tskbar->area.resize = 1;
}
}
}
}
// 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) {
panel_refresh = 1;
}
}
- 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;
- }
- }
- }
- }
+// 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;
+// }
+// }
+// }
+// }
// Window icon changed
else if (at == server.atom._NET_WM_ICON) {
get_icon(tsk);
void event_configure_notify (Window win)
{
- // check 'win' move in systray
+ // change in root window (xrandr)
+ if (win == server.root_win) {
+ get_monitors();
+ init_panel();
+ return;
+ }
+
+ // 'win' is a trayer icon
TrayWindow *traywin;
GSList *l;
for (l = systray.list_icons; l ; l = l->next) {
}
}
- // check 'win' move in another monitor
+ // '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;
// 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;
GSList *it;
init (argc, argv);
-load_config:
+
i = 0;
init_config();
if (config_path)
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 ConfigureNotify:
- if (e.xconfigure.window == server.root_win)
- goto load_config;
- else
- event_configure_notify (e.xconfigure.window);
+ event_configure_notify (e.xconfigure.window);
break;
case ReparentNotify:
event_timer();
switch (signal_pending) {
- case SIGUSR1:
+ case SIGUSR1: // reload config file
signal_pending = 0;
- goto load_config;
+ init_config();
+ config_read_file (config_path);
+ init_panel();
+ cleanup_config();
+ break;
case SIGINT:
case SIGTERM:
case SIGHUP:
projects / chaz / tint2 / blobdiff