}
-void init ()
+void init (int argc, char *argv[])
{
+ int c;
+
+ // read options
+ c = getopt (argc, argv, "c:");
+ if (c != -1) {
+ config_path = strdup (optarg);
+ c = getopt (argc, argv, "j:");
+ if (c != -1)
+ thumbnail_path = strdup (optarg);
+ }
+
// 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);
+ signal(SIGCHLD, SIG_IGN); // don't have to wait() after fork()
// set global data
memset(&server, 0, sizeof(Server_global));
void cleanup()
{
cleanup_panel();
- cleanup_systray();
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);
if (server.monitor) free(server.monitor);
XFreeGC(server.dsp, server.gc);
}
+Taskbar *click_taskbar (Panel *panel, XEvent *e)
+{
+ GSList *l0;
+ Taskbar *tskbar = NULL;
+ if (panel_horizontal) {
+ int x = e->xbutton.x;
+ for (l0 = panel->area.list; l0 ; l0 = l0->next) {
+ tskbar = l0->data;
+ if (!tskbar->area.on_screen) continue;
+ if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
+ break;
+ }
+ }
+ else {
+ int y = e->xbutton.y;
+ for (l0 = panel->area.list; l0 ; l0 = l0->next) {
+ tskbar = l0->data;
+ if (!tskbar->area.on_screen) continue;
+ if (y >= tskbar->area.posy && y <= (tskbar->area.posy + tskbar->area.height))
+ break;
+ }
+ }
+ return tskbar;
+}
+
+
+Task *click_task (Panel *panel, XEvent *e)
+{
+ GSList *l0;
+ Taskbar *tskbar;
+
+ if ( (tskbar = click_taskbar(panel, e)) ) {
+ if (panel_horizontal) {
+ int x = e->xbutton.x;
+ 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)) {
+ return tsk;
+ }
+ }
+ }
+ else {
+ int y = e->xbutton.y;
+ 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)) {
+ return tsk;
+ }
+ }
+ }
+ }
+ return NULL;
+}
+
+
+int click_padding(Panel *panel, XEvent *e)
+{
+ if (panel_horizontal) {
+ if (e->xbutton.x < panel->area.paddingxlr || e->xbutton.x > panel->area.width-panel->area.paddingxlr)
+ return 1;
+ }
+ else {
+ if (e->xbutton.y < panel->area.paddingxlr || e->xbutton.y > panel->area.height-panel->area.paddingxlr)
+ return 1;
+ }
+ return 0;
+}
+
+
+int click_clock(Panel *panel, XEvent *e)
+{
+ Clock clk = panel->clock;
+ if (panel_horizontal) {
+ if (clk.area.on_screen && e->xbutton.x >= clk.area.posx && e->xbutton.x <= (clk.area.posx + clk.area.width))
+ return TRUE;
+ } else {
+ if (clk.area.on_screen && e->xbutton.y >= clk.area.posy && e->xbutton.y <= (clk.area.posy + clk.area.height))
+ return TRUE;
+ }
+ return FALSE;
+}
+
+
void window_action (Task *tsk, int action)
{
- switch (action) {
- case CLOSE:
- set_close (tsk->win);
- break;
- case TOGGLE:
- set_active(tsk->win);
- break;
- case ICONIFY:
- XIconifyWindow (server.dsp, tsk->win, server.screen);
- break;
- case TOGGLE_ICONIFY:
- if (tsk == task_active) XIconifyWindow (server.dsp, tsk->win, server.screen);
- else set_active (tsk->win);
- break;
- case SHADE:
- window_toggle_shade (tsk->win);
- break;
- }
+ if (!tsk) return;
+ int desk;
+ switch (action) {
+ case CLOSE:
+ set_close (tsk->win);
+ break;
+ case TOGGLE:
+ set_active(tsk->win);
+ break;
+ case ICONIFY:
+ XIconifyWindow (server.dsp, tsk->win, server.screen);
+ break;
+ case TOGGLE_ICONIFY:
+ if (tsk == task_active) XIconifyWindow (server.dsp, tsk->win, server.screen);
+ else set_active (tsk->win);
+ break;
+ case SHADE:
+ window_toggle_shade (tsk->win);
+ break;
+ case MAXIMIZE_RESTORE:
+ window_maximize_restore (tsk->win);
+ break;
+ case MAXIMIZE:
+ window_maximize_restore (tsk->win);
+ break;
+ case RESTORE:
+ window_maximize_restore (tsk->win);
+ break;
+ case DESKTOP_LEFT:
+ if ( tsk->desktop == 0 ) break;
+ desk = tsk->desktop - 1;
+ windows_set_desktop(tsk->win, desk);
+ if (desk == server.desktop)
+ set_active(tsk->win);
+ break;
+ case DESKTOP_RIGHT:
+ if (tsk->desktop == server.nb_desktop ) break;
+ desk = tsk->desktop + 1;
+ windows_set_desktop(tsk->win, desk);
+ if (desk == server.desktop)
+ set_active(tsk->win);
+ }
}
Panel *panel = get_panel(e->xany.window);
if (!panel) return;
- if (panel_mode != MULTI_DESKTOP) {
- // drag and drop disabled
- XLowerWindow (server.dsp, panel->main_win);
- return;
- }
-
- GSList *l0;
- Taskbar *tskbar;
- int x = e->xbutton.x;
- int y = e->xbutton.y;
- for (l0 = panel->area.list; l0 ; l0 = l0->next) {
- tskbar = l0->data;
- if (!tskbar->area.visible) continue;
- if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
- break;
- }
-
- if (l0) {
- 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)) {
- task_drag = tsk;
- break;
- }
- }
+ if (panel_mode == MULTI_DESKTOP)
+ task_drag = click_task(panel, e);
+
+ if (wm_menu && !task_drag && !click_clock(panel, e) && (e->xbutton.button != 1) ) {
+ // 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;
}
XLowerWindow (server.dsp, panel->main_win);
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 && click_padding(panel, e)) {
+ // 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;
switch (e->xbutton.button) {
case 2:
action = mouse_middle;
case 5:
action = mouse_scroll_down;
break;
+ case 6:
+ action = mouse_tilt_left;
+ break;
+ case 7:
+ action = mouse_tilt_right;
+ break;
}
- // search taskbar
- Taskbar *tskbar;
- GSList *l0;
- for (l0 = panel->area.list; l0 ; l0 = l0->next) {
- tskbar = l0->data;
- if (!tskbar->area.visible) continue;
- if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
- goto suite;
- }
+ if ( click_clock(panel, e)) {
+ clock_action(e->xbutton.button);
+ XLowerWindow (server.dsp, panel->main_win);
+ task_drag = 0;
+ return;
+ }
- // TODO: check better solution to keep window below
- XLowerWindow (server.dsp, panel->main_win);
- task_drag = 0;
- return;
+ Taskbar *tskbar;
+ if ( !(tskbar = click_taskbar(panel, e)) ) {
+ // TODO: check better solution to keep window below
+ XLowerWindow (server.dsp, panel->main_win);
+ task_drag = 0;
+ return;
+ }
-suite:
// drag and drop task
if (task_drag) {
if (tskbar != task_drag->area.parent && action == TOGGLE_ICONIFY) {
}
// switch desktop
- if (panel_mode == MULTI_DESKTOP)
- if (tskbar->desktop != server.desktop && action != CLOSE)
+ if (panel_mode == MULTI_DESKTOP) {
+ if (tskbar->desktop != server.desktop && action != CLOSE && action != DESKTOP_LEFT && action != DESKTOP_RIGHT)
set_desktop (tskbar->desktop);
+ }
// action on task
- Task *tsk;
- GSList *l;
- for (l = tskbar->area.list ; l ; l = l->next) {
- tsk = l->data;
- if (x >= tsk->area.posx && x <= (tsk->area.posx + tsk->area.width)) {
- window_action (tsk, action);
- break;
- }
- }
+ window_action( click_task(panel, e), action);
// to keep window below
XLowerWindow (server.dsp, panel->main_win);
// Change desktop
else if (at == server.atom._NET_CURRENT_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
+ 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;
+ }
+ }
+ }
+ }
+ }
if (panel_mode != MULTI_DESKTOP) {
visible_object();
}
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++) {
}
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) {
tsk2->icon_width = tsk->icon_width;
tsk2->icon_height = tsk->icon_height;
tsk2->icon_data = tsk->icon_data;
+ tsk2->icon_data_active = tsk->icon_data_active;
tsk2->area.redraw = 1;
}
}
}
// 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);
+ int active = tsk->area.is_active;
+ //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);
+ tsk = add_task (win);
+ if (tsk && active) {
+ tsk->area.is_active = 1;
+ task_active = tsk;
+ }
+ panel_refresh = 1;
+ }
}
if (!server.got_root_win) server.root_win = RootWindow (server.dsp, server.screen);
}
+void event_expose (XEvent *e)
+{
+ Panel *panel;
+
+ panel = get_panel(e->xany.window);
+ if (!panel) return;
+ // TODO : one panel_refresh per panel ?
+ panel_refresh = 1;
+}
+
+
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 clock
- time_clock.tv_sec = stv.tv_sec;
- time_clock.tv_sec -= time_clock.tv_sec % time_precision;
+ // update battery
+#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
- int i;
- for (i=0 ; i < nb_panel ; i++) {
- panel1[i].clock.area.resize = 1;
+ // update clock
+ if (time1_format) {
+ for (i=0 ; i < nb_panel ; i++)
+ panel1[i].clock.area.resize = 1;
}
- panel_refresh = 1;
+ panel_refresh = 1;
}
{
XEvent e;
fd_set fd;
- int x11_fd, i, c;
+ int x11_fd, i;
struct timeval tv;
Panel *panel;
GSList *it;
- c = getopt (argc, argv, "c:");
- init ();
+ init (argc, argv);
load_config:
i = 0;
init_config();
- if (c != -1)
- i = config_read_file (optarg);
- if (!i)
- i = config_read ();
- if (!i) {
- fprintf(stderr, "usage: tint2 [-c] <config_file>\n");
- cleanup();
- exit(1);
- }
+ if (config_path)
+ i = config_read_file (config_path);
+ else
+ i = config_read ();
+ if (!i) {
+ fprintf(stderr, "usage: tint2 [-c] <config_file>\n");
+ cleanup();
+ exit(1);
+ }
config_finish();
+ if (thumbnail_path) {
+ // usage: tint2 -j <file> for internal use
+ printf("file %s\n", thumbnail_path);
+ cleanup();
+ exit(0);
+ }
x11_fd = ConnectionNumber(server.dsp);
XSync(server.dsp, False);
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_button_release (&e);
+ event_button_release(&e);
break;
case Expose:
- panel = get_panel(e.xany.window);
- if (!panel) break;
- XCopyArea (server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0);
+ event_expose(&e);
break;
case PropertyNotify:
- event_property_notify (&e);
+ event_property_notify(&e);
break;
case ConfigureNotify:
event_configure_notify (e.xconfigure.window);
break;
+ case ReparentNotify:
+ if (!systray.area.on_screen)
+ break;
+ panel = (Panel*)systray.area.panel;
+ if (e.xany.window == panel->main_win) // reparented to us
+ break;
+ // FIXME: 'reparent to us' badly detected => disabled
+ break;
case UnmapNotify:
case DestroyNotify:
+ 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) {
- icon_remove((TrayWindow*)it->data);
+ remove_icon((TrayWindow*)it->data);
break;
}
}
break;
case ClientMessage:
- //printf("ClientMessage\n");
+ if (!systray.area.on_screen) break;
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:
+ signal_pending = 0;
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