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
}
// 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);
void event_configure_notify (Window win)
{
- if (panel_mode != SINGLE_MONITOR) return;
+ if (nb_panel == 1) return;
if (server.nb_monitor == 1) return;
Task *tsk = task_get_task (win);
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) {
// 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;
}
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:
}
}
}
- else event_timer();
+ event_timer();
switch (signal_pending) {
case SIGUSR1:
}
}
-// ****************************************************
-// 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);