{
// 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);
Panel *panel = get_panel(e->xany.window);
if (!panel) return;
+ if (wm_menu) {
+ if ((e->xbutton.x < panel->area.paddingxlr) || (e->xbutton.x > panel->area.width-panel->area.paddingxlr) || (e->xbutton.y < panel->area.paddingy) || (e->xbutton.y > panel->area.paddingy+panel->g_taskbar.height)) {
+ // 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;
+ }
+ }
+
+ if (e->xbutton.button != 1) return;
+
if (panel_mode != MULTI_DESKTOP) {
// drag and drop disabled
XLowerWindow (server.dsp, panel->main_win);
GSList *l0;
Taskbar *tskbar;
int x = e->xbutton.x;
- //int y = e->xbutton.y; // unused
for (l0 = panel->area.list; l0 ; l0 = l0->next) {
tskbar = l0->data;
if (!tskbar->area.on_screen) continue;
void event_button_release (XEvent *e)
{
- // TODO: convert event_button_press(int x, int y) to area->event_button_press()
-
Panel *panel = get_panel(e->xany.window);
if (!panel) return;
+ if (wm_menu) {
+ if ((e->xbutton.x < panel->area.paddingxlr) || (e->xbutton.x > panel->area.width-panel->area.paddingxlr) || (e->xbutton.y < panel->area.paddingy) || (e->xbutton.y > panel->area.paddingy+panel->g_taskbar.height)) {
+ // 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;
int x = e->xbutton.x;
//int y = e->xbutton.y; // unused
if (XGetTransientForHint(server.dsp, w1, &w2) != 0)
if (w2) t = task_get_task(w2);
}
+ if (task_urgent == t) {
+ init_precision();
+ task_urgent = 0;
+ }
if (t) {
for (i=0 ; i < nb_panel ; i++) {
for (j=0 ; j < panel1[i].nb_desktop ; j++) {
}
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]);
}
// Demand attention
else if (at == server.atom._NET_WM_STATE) {
if (window_is_urgent (win)) {
- printf(" event_property_notify _NET_WM_STATE_DEMANDS_ATTENTION\n");
- }
- else {
+ task_urgent = tsk;
+ tick_urgent = 0;
+ time_precision = 1;
}
}
else if (at == server.atom.WM_STATE) {
}
// Window desktop changed
else if (at == server.atom._NET_WM_DESKTOP) {
- remove_task (tsk);
- add_task (win);
- panel_refresh = 1;
+ int desktop = window_get_desktop (win);
+ //printf(" Window desktop changed %d, %d\n", tsk->desktop, desktop);
+ // bug in windowmaker : send unecessary 'desktop changed' when focus changed
+ if (desktop != tsk->desktop) {
+ remove_task (tsk);
+ add_task (win);
+ panel_refresh = 1;
+ }
}
if (!server.got_root_win) server.root_win = RootWindow (server.dsp, server.screen);
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)
{
- if (panel_mode != SINGLE_MONITOR) return;
- if (server.nb_monitor == 1) return;
+ // 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 ()) {
void event_timer()
{
struct timeval stv;
-
- if (!time1_format) return;
+ int i;
if (gettimeofday(&stv, 0)) return;
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;
+
+ // urgent task
+ if (task_urgent) {
+ 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
- if (panel1[0].battery.area.on_screen)
- update_battery(&battery_state);
+#ifdef ENABLE_BATTERY
+ if (panel1[0].battery.area.on_screen) {
+ update_battery();
+ for (i=0 ; i < nb_panel ; i++)
+ panel1[i].battery.area.resize = 1;
+ }
+#endif
// update clock
- time_clock.tv_sec = stv.tv_sec;
- time_clock.tv_sec -= time_clock.tv_sec % time_precision;
-
- int i;
- for (i=0 ; i < nb_panel ; i++) {
- panel1[i].clock.area.resize = 1;
- panel1[i].battery.area.resize = 1;
+ if (time1_format) {
+ for (i=0 ; i < nb_panel ; i++)
+ panel1[i].clock.area.resize = 1;
}
panel_refresh = 1;
}
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) {
switch (e.type) {
case ButtonPress:
- //printf("ButtonPress %lx\n", e.xproperty.window);
- if (e.xbutton.button == 1) event_button_press (&e);
+ event_button_press (&e);
break;
case ButtonRelease:
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);
}
}
}
}
- else event_timer();
+ event_timer();
switch (signal_pending) {
case SIGUSR1:
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();
+ }
}
}
}
-// ****************************************************
-// main_win doesn't include panel.area.paddingx, so we have WM capabilities on left and right.
-// this feature is disabled !
-//XCopyArea (server.dsp, server.pmap, p->main_win, server.gc, p->area.paddingxlr, 0, p->area.width-(2*p->area.paddingxlr), p->area.height, 0, 0);
-//XCopyArea (server.dsp, panel.area.pix.pmap, server.root_win, server.gc_root, 0, 0, panel.area.width, panel.area.height, server.posx, server.posy);
-//XCopyArea (server.dsp, server.pmap, panel.main_win, server.gc, panel.area.paddingxlr, 0, panel.area.width-(2*panel.area.paddingxlr), panel.area.height, 0, 0);
projects / chaz / tint2 / blobdiff