diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | src/msg.c | 17 | ||||
| -rw-r--r-- | src/msg.h | 1 | ||||
| -rw-r--r-- | src/panel.c | 1 | ||||
| -rw-r--r-- | src/panel.h | 1 |
5 files changed, 29 insertions, 0 deletions
@@ -1,5 +1,14 @@ 2006-01-24 Matthew Allum <mallum@openedhand.com> + * src/msg.c: (msg_win_create), (msg_handle_events): + * src/msg.h: + * src/panel.c: (panel_handle_client_message): + * src/panel.h: + Apply patch from Phil Blundell to implement cancelation + of systray popup messages. + +2006-01-24 Matthew Allum <mallum@openedhand.com> + * applets/mb-applet-wireless.c: (find_iwface): Workaround for issues with Z hostap driver that presents multiple wireless interfaces. The first @@ -547,6 +547,22 @@ msg_win_create(MBPanel *panel, XFreePixmap(panel->dpy, mask); } +void +msg_cancel (MBPanel *panel, XClientMessageEvent *e) +{ + MBPanelApp *sender; + + if ((sender = panel_app_get_from_window(panel, e->window )) == NULL) + return; + + if (panel->msg_win + && panel->msg_win_sender == sender + && panel->msg_sender_id == e->data.l[2]) + { + XDestroyWindow(panel->dpy, panel->msg_win); + panel->msg_win = None; + } +} void msg_handle_events(MBPanel *panel, XEvent *e) @@ -566,6 +582,7 @@ msg_handle_events(MBPanel *panel, XEvent *e) panel->msg_starttime = msg->starttime; panel->msg_timeout = msg->timeout; panel->msg_win_sender = msg->sender; + panel->msg_sender_id = msg->id; panel->msg_has_context = False; @@ -16,5 +16,6 @@ void msg_destroy(MBPanel *d, MBPanelMessageQueue *m); void msg_add_data(MBPanel *d, XClientMessageEvent *e); void msg_handle_events(MBPanel *d, XEvent *e); void msg_handle_timeouts(MBPanel *d); +void msg_cancel(MBPanel *d, XClientMessageEvent *e); #endif diff --git a/src/panel.c b/src/panel.c index f20e134..5713e4d 100644 --- a/src/panel.c +++ b/src/panel.c @@ -886,6 +886,7 @@ panel_handle_client_message(MBPanel *panel, XClientMessageEvent *e) break; case SYSTEM_TRAY_CANCEL_MESSAGE: DBG("%s() is SYSTEM_TRAY_CANCEL_MESSAGE\n", __func__ ); + msg_cancel(panel, e); break; } return; diff --git a/src/panel.h b/src/panel.h index 20f6be6..7e54fa4 100644 --- a/src/panel.h +++ b/src/panel.h @@ -212,6 +212,7 @@ typedef struct _panel { int msg_timeout; MBPanelApp *msg_win_sender; Bool msg_has_context; + unsigned long msg_sender_id; int msg_context_y1, msg_context_y2; GC msg_gc; |