{
// Set signal handler
signal(SIGUSR1, signal_handler);
- signal(SIGINT, signal_handler);
- signal(SIGTERM, signal_handler);
+ signal(SIGINT, signal_handler);
+ signal(SIGTERM, signal_handler);
+ signal(SIGHUP, signal_handler);
// set global data
memset(&server, 0, sizeof(Server_global));
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_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);
// forward the click to the desktop window (thanks conky)
XUngrabPointer(server.dsp, e->xbutton.time);
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;
+ //printf("**** %d, %d\n", e->xbutton.x, e->xbutton.y);
XSetInputFocus(server.dsp, e->xbutton.window, RevertToParent, e->xbutton.time);
XSendEvent(server.dsp, e->xbutton.window, False, ButtonPressMask, e);
return;
}
panel_refresh = 1;
}
- // Wallpaper changed
else if (at == server.atom._XROOTPMAP_ID) {
+ // change Wallpaper
for (i=0 ; i < nb_panel ; i++) {
set_panel_background(&panel1[i]);
}
else if (at == server.atom._NET_WM_STATE) {
if (window_is_urgent (win)) {
task_urgent = tsk;
+ tick_urgent = 0;
time_precision = 1;
}
}
panel = get_panel(e->xany.window);
if (!panel) return;
-/*
- if (systray.area.on_screen) {
- // force trayer refresh
- //XClearWindow(tray_data.dpy, ti->mid_parent);
- //x11_send_visibility(tray_data.dpy, dst, VisibilityFullyObscured);
- //x11_send_visibility(tray_data.dpy, dst, VisibilityUnobscured);
-
- GSList *l;
- TrayWindow *traywin;
- for (l = systray.list_icons; l ; l = l->next) {
- traywin = (TrayWindow*)l->data;
- // send Expose event
- XClearArea(server.dsp, traywin->id, 0, 0, systray.area.width, systray.area.height, True);
- //printf("expose %lx\n", traywin->id);
- }
-
- //x11_refresh_window(tray_data.dpy, ti->wid, ti->l.wnd_sz.x, ti->l.wnd_sz.y, True);
- }
-*/
+ // TODO : one panel_refresh per panel ?
panel_refresh = 1;
- //XCopyArea (server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0);
-
}
void event_configure_notify (Window win)
{
+ // check 'win' move in systray
+ TrayWindow *traywin;
+ GSList *l;
+ for (l = systray.list_icons; l ; l = l->next) {
+ 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;
+ }
+ }
+
+ // 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)) {
- // task on another monitor
remove_task (tsk);
add_task (win);
if (win == window_get_active ()) {
if (abs(stv.tv_sec - time_clock.tv_sec) < time_precision) return;
time_clock.tv_sec = stv.tv_sec;
time_clock.tv_sec -= time_clock.tv_sec % time_precision;
-printf("event_timer %d\n", time_precision);
// urgent task
if (task_urgent) {
- task_urgent->area.is_active = !task_urgent->area.is_active;
- task_urgent->area.redraw = 1;
+ if (tick_urgent < max_tick_urgent) {
+ task_urgent->area.is_active = !task_urgent->area.is_active;
+ task_urgent->area.redraw = 1;
+ tick_urgent++;
+ }
}
// update battery
+#ifdef ENABLE_BATTERY
if (panel1[0].battery.area.on_screen) {
- update_battery(&battery_state);
+ update_battery();
for (i=0 ; i < nb_panel ; i++)
panel1[i].battery.area.resize = 1;
}
+#endif
// update clock
if (time1_format) {
load_config:
i = 0;
init_config();
- if (c != -1)
+ if (c != -1) {
i = config_read_file (optarg);
+ c = getopt (argc, argv, "j:");
+ if (c != -1) {
+ // usage: tint2 [-c] <config_file> -j <jpeg_file> for internal use
+ printf("jpeg file %s\n", optarg);
+ cleanup();
+ exit(0);
+ }
+ }
if (!i)
i = config_read ();
if (!i) {
event_configure_notify (e.xconfigure.window);
break;
+ case ReparentNotify:
+ if (e.xany.window == server.root_win) // reparented to us
+ break;
case UnmapNotify:
case DestroyNotify:
- if (!systray.area.on_screen) break;
+ if (!systray.area.on_screen)
+ break;
for (it = systray.list_icons; it; it = g_slist_next(it)) {
if (((TrayWindow*)it->data)->id == e.xany.window) {
remove_icon((TrayWindow*)it->data);
case ClientMessage:
if (!systray.area.on_screen) break;
- //printf("ClientMessage\n");
if (e.xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE && e.xclient.format == 32 && e.xclient.window == net_sel_win) {
net_message(&e.xclient);
}
goto load_config;
case SIGINT:
case SIGTERM:
+ case SIGHUP:
cleanup ();
return 0;
}
if (panel_refresh) {
panel_refresh = 0;
+ if (refresh_systray) {
+ panel = (Panel*)systray.area.panel;
+ XSetWindowBackgroundPixmap (server.dsp, panel->main_win, None);
+ }
for (i=0 ; i < nb_panel ; i++) {
panel = &panel1[i];
XCopyArea(server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0);
}
XFlush (server.dsp);
+
+ if (refresh_systray) {
+ refresh_systray = 0;
+ panel = (Panel*)systray.area.panel;
+ // tint2 doen't draw systray icons. it just redraw background.
+ XSetWindowBackgroundPixmap (server.dsp, panel->main_win, panel->temp_pmap);
+ // force icon's refresh
+ refresh_systray_icon();
+ }
}
}
}
projects / chaz / tint2 / blobdiff