void cleanup()
{
- cleanup_systray();
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);
+ 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);
+ if (clock_lclick_command) g_free(clock_lclick_command);
+ if (clock_rclick_command) g_free(clock_rclick_command);
if (server.monitor) free(server.monitor);
XFreeGC(server.dsp, server.gc);
Panel *panel = get_panel(e->xany.window);
if (!panel) return;
+ 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;
+ 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;
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 ((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;
+ //int y = e->xbutton.y; // unused
switch (e->xbutton.button) {
case 2:
action = mouse_middle;
// search taskbar
Taskbar *tskbar;
GSList *l0;
- 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))
- goto suite;
- }
+ Clock clk = panel->clock;
+ if (clk.area.on_screen && x >= clk.area.posx && x <= (clk.area.posx + clk.area.width))
+ clock_action(e->xbutton.button);
+ else {
+ 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))
+ goto suite;
+ }
+ }
// TODO: check better solution to keep window below
XLowerWindow (server.dsp, panel->main_win);
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++) {
// 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;
+ time_precision = 1;
}
}
else if (at == server.atom.WM_STATE) {
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;
- // update clock
- time_clock.tv_sec = stv.tv_sec;
- time_clock.tv_sec -= time_clock.tv_sec % time_precision;
+ // urgent task
+ if (task_urgent) {
+ task_urgent->area.is_active = !task_urgent->area.is_active;
+ task_urgent->area.redraw = 1;
+ }
- int i;
- for (i=0 ; i < nb_panel ; i++) {
- panel1[i].clock.area.resize = 1;
+ // update battery
+ if (panel1[0].battery.area.on_screen) {
+ update_battery(&battery_state);
+ for (i=0 ; i < nb_panel ; i++)
+ panel1[i].battery.area.resize = 1;
}
- panel_refresh = 1;
+
+ // update clock
+ if (time1_format) {
+ time_clock.tv_sec = stv.tv_sec;
+ time_clock.tv_sec -= time_clock.tv_sec % time_precision;
+ for (i=0 ; i < nb_panel ; i++)
+ panel1[i].clock.area.resize = 1;
+ }
+ panel_refresh = 1;
}
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:
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) {
remove_icon((TrayWindow*)it->data);
break;
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);