mirror/ede
1
0
Fork 0
mirror of https://github.com/edeproject/ede.git synced 2023-08-10 21:13:03 +03:00
Code Issues Projects Releases Wiki Activity

Do not tray windows that are not valid

Browse Source
This commit is contained in:
Sanel Zukan 2011-10-27 15:00:15 +00:00
parent d9e4715752
commit c97c675153
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ede-panel/applets/system-tray/Tray.cpp
View File

@ -12,6 +12,10 @@
#define SYSTEM_TRAY_BEGIN_MESSAGE 1 #define SYSTEM_TRAY_BEGIN_MESSAGE 1
#define SYSTEM_TRAY_CANCEL_MESSAGE 2 #define SYSTEM_TRAY_CANCEL_MESSAGE 2
/* try orientation type */
#define SYSTEM_TRAY_ORIENTATION_HORZ 0
#define SYSTEM_TRAY_ORIENTATION_VERT 1
/* dimenstions of tray items */ /* dimenstions of tray items */
#define TRAY_ICON_W 25 #define TRAY_ICON_W 25
#define TRAY_ICON_H 25 #define TRAY_ICON_H 25
@ -48,6 +52,18 @@ static int handle_xevent(int e) {
return false; return false;
} }
static int validate_drawable(Display *d, Window xid) {
Window root;
int x, y, st;
unsigned int w, h, b, depth;
XSync(d, False);
st = XGetGeometry(d, xid, &root, &x, &y, &w, &h, &b, &depth);
XSync(d, False);
return st;
}
Tray::Tray() : Fl_Group(0, 0, 1, 25), opcode(0) { Tray::Tray() : Fl_Group(0, 0, 1, 25), opcode(0) {
box(FL_FLAT_BOX); box(FL_FLAT_BOX);
register_notification_area(); register_notification_area();
@ -92,9 +108,18 @@ void Tray::register_notification_area(void) {
} }
/* setup visual atom so registering icons knows how to draw images */ /* setup visual atom so registering icons knows how to draw images */
Atom visual = XInternAtom(fl_display, "_NET_SYSTEM_TRAY_VISUAL", False); Atom visual_atom = XInternAtom(fl_display, "_NET_SYSTEM_TRAY_VISUAL", False);
XChangeProperty(fl_display, fl_message_window, visual, XA_VISUALID, 32, PropModeReplace, (unsigned char*)&fl_visual->visualid, 1); XChangeProperty(fl_display, fl_message_window, visual_atom, XA_VISUALID, 32, PropModeReplace, (unsigned char*)&fl_visual->visualid, 1);
/*
* setup orientation; also required by spec
* panel is always in horizontal position, so value is hardcoded here
*/
Atom or_atom = XInternAtom(fl_display, "_NET_SYSTEM_TRAY_ORIENTATION", False);
int or_val = SYSTEM_TRAY_ORIENTATION_HORZ;
XChangeProperty(fl_display, fl_message_window, or_atom, XA_CARDINAL, 32, PropModeReplace, (unsigned char*)&or_val, 1);
/* notify root who is manager */
XClientMessageEvent xev; XClientMessageEvent xev;
xev.type = ClientMessage; xev.type = ClientMessage;
xev.message_type = XInternAtom(fl_display, "MANAGER", False); xev.message_type = XInternAtom(fl_display, "MANAGER", False);
@ -114,6 +139,9 @@ void Tray::register_notification_area(void) {
} }
void Tray::embed_window(Window id) { void Tray::embed_window(Window id) {
/* make sure we don't get some windows that could not be displayed */
E_RETURN_IF_FAIL(validate_drawable(fl_display, id) == 1);
Fl_Window *win = new Fl_Window(TRAY_ICON_W, TRAY_ICON_H); Fl_Window *win = new Fl_Window(TRAY_ICON_W, TRAY_ICON_H);
win->end(); win->end();
@ -160,13 +188,10 @@ void Tray::remove_from_tray(Fl_Widget *win) {
remove(win); remove(win);
w(w() - win->w() - TRAY_ICONS_SPACE); w(w() - win->w() - TRAY_ICONS_SPACE);
E_DEBUG("Removing child, left: %i\n", children());
distribute_children(); distribute_children();
redraw(); redraw();
EDE_PANEL_GET_PANEL_OBJECT(this)->relayout(); EDE_PANEL_GET_PANEL_OBJECT(this)->relayout();
EDE_PANEL_GET_PANEL_OBJECT(this)->redraw();
} }
int Tray::handle(int e) { int Tray::handle(int e) {