moparisthebest
/
FireTray
mirror of https://github.com/moparisthebest/FireTray
1
0
Fork 0
Code Issues Releases Wiki Activity

fix wrong xid provision ("missing UnmapNotify")

This commit is contained in:
foudfou 2012-09-05 13:45:02 +02:00
parent ca39dec2de
commit ee1eac01b3
3 changed files with 54 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/ctypes/linux/gdk.jsm
View File

@ -248,6 +248,10 @@ function gdk_defines(lib) {
ctypes.default_abi, this.GdkFilterReturn,
[this.GdkXEvent.ptr, this.GdkEvent.ptr, gobject.gpointer]).ptr;
lib.lazy_bind("gdk_flush", ctypes.void_t);
lib.lazy_bind("gdk_error_trap_push", ctypes.void_t);
lib.lazy_bind("gdk_error_trap_pop", gobject.gint);
lib.lazy_bind("gdk_x11_drawable_get_xid", x11.XID, this.GdkDrawable.ptr);
lib.lazy_bind("gdk_window_new", this.GdkWindow.ptr, this.GdkWindow.ptr, this.GdkWindowAttributes.ptr, gobject.gint);
lib.lazy_bind("gdk_window_destroy", ctypes.void_t, this.GdkWindow.ptr);
@ -298,6 +302,7 @@ function gdk_defines(lib) {
lib.lazy_bind("gdk_window_get_user_data", ctypes.void_t, this.GdkWindow.ptr, gobject.gpointer.ptr);
lib.lazy_bind("gdk_atom_intern", this.GdkAtom, gobject.gchar.ptr, gobject.gboolean);
lib.lazy_bind("gdk_property_change", ctypes.void_t, this.GdkWindow.ptr, this.GdkAtom, this.GdkAtom, gobject.gint, this.GdkPropMode, gobject.guchar.ptr, gobject.gint);
lib.lazy_bind("gdk_window_get_effective_toplevel", this.GdkWindow.ptr, this.GdkWindow.ptr);
lib.lazy_bind("gdk_display_get_n_screens", gobject.gint, this.GdkDisplay.ptr);
lib.lazy_bind("gdk_display_get_screen", this.GdkScreen.ptr, this.GdkDisplay.ptr, gobject.gint);

1
src/modules/ctypes/linux/x11.jsm
View File

@ -120,6 +120,7 @@ function x11_defines(lib) {
this.StructureNotifyMask = 1<<17
this.SubstructureNotifyMask = 1<<19;
this.SubstructureRedirectMask = 1<<20;
this.FocusChangeMask = 1<<21
this.PropertyChangeMask = 1<<22
this.Bool = ctypes.int;

56
src/modules/linux/FiretrayWindow.jsm
View File

@ -162,6 +162,7 @@ firetray.Window = {
getGdkWindowFromNativeHandle: function(nativeHandle) {
let gdkw = new gdk.GdkWindow.ptr(ctypes.UInt64(nativeHandle)); // a new pointer to the GdkWindow
gdkw = gdk.gdk_window_get_effective_toplevel(gdkw);
log.debug("gdkw="+gdkw+" *gdkw="+this.addrPointedByInHex(gdkw));
return gdkw;
},
@ -171,9 +172,6 @@ firetray.Window = {
gdk.gdk_window_get_user_data(gdkWin, gptr.address());
log.debug("gptr="+gptr+" *gptr="+this.addrPointedByInHex(gptr));
let gtkw = ctypes.cast(gptr, gtk.GtkWindow.ptr);
let gtkw_voidp = ctypes.cast(gtkw, ctypes.void_t.ptr);
let gtkwid_top = gtk.gtk_widget_get_toplevel(ctypes.cast(gtkw, gtk.GtkWidget.ptr));
gtkw = ctypes.cast(gtkwid_top, gtk.GtkWindow.ptr);
log.debug("gtkw="+gtkw+" *gtkw="+this.addrPointedByInHex(gtkw));
return gtkw;
},
@ -494,17 +492,24 @@ firetray.Window = {
return null;
},
checkSubscribedEventMasks: function(xid) {
checkSubscribedEventMasks: function(xid, gdkWin) {
let xWindowAttributes = new x11.XWindowAttributes;
let status = x11.XGetWindowAttributes(x11.current.Display, xid, xWindowAttributes.address());
log.debug("xWindowAttributes: "+xWindowAttributes);
let xEventMask = xWindowAttributes.your_event_mask;
let xEventMaskNeeded = x11.VisibilityChangeMask|x11.StructureNotifyMask|x11.PropertyChangeMask;
let xEventMaskNeeded = x11.VisibilityChangeMask|x11.StructureNotifyMask|
x11.FocusChangeMask|x11.PropertyChangeMask;
log.debug("xEventMask="+xEventMask+" xEventMaskNeeded="+xEventMaskNeeded);
if ((xEventMask & xEventMaskNeeded) !== xEventMaskNeeded) {
log.warn("missing mandatory event-masks");
// could try to subscribe here with XChangeWindowAttributes()
log.error("missing mandatory event-masks"); // change with gdk_window_set_events()
}
// TEST
let gdkEventMask = gdk.gdk_window_get_events(gdkWin);
log.info("gdkEventMask="+gdkEventMask);
gdk.gdk_window_set_events(gdkWin, 64514);
gdkEventMask = gdk.gdk_window_get_events(gdkWin);
log.info("gdkEventMask="+gdkEventMask);
},
filterWindow: function(xev, gdkEv, data) {
@ -517,6 +522,7 @@ firetray.Window = {
switch (xany.contents.type) {
case x11.UnmapNotify:
log.info("UnmapNotify");
let gdkWinState = gdk.gdk_window_get_state(firetray.Handler.gdkWindows.get(xwin));
log.debug("gdkWinState="+gdkWinState+" for xid="+xwin);
// NOTE: Gecko 8.0 provides the 'sizemodechange' event
@ -539,7 +545,37 @@ firetray.Window = {
}
return gdk.GDK_FILTER_CONTINUE;
},
// TEST
onUnmap: function(widget, event, data) {
log.debug("onUnmap");
let gdkWin = ctypes.cast(data, gdk.GdkWindow.ptr);
let xid = firetray.Window.getXIDFromGdkWindow(gdkWin);
log.info("gdkWin="+gdkWin+" xid="+xid);
try {
let gdkWinState = gdk.gdk_window_get_state(gdkWin);
log.debug("gdkWinState="+gdkWinState);
// NOTE: Gecko 8.0 provides the 'sizemodechange' event
if (gdkWinState === gdk.GDK_WINDOW_STATE_ICONIFIED) {
log.debug("GOT ICONIFIED");
let hides_on_minimize = firetray.Utils.prefService.getBoolPref('hides_on_minimize');
let hides_single_window = firetray.Utils.prefService.getBoolPref('hides_single_window');
if (hides_on_minimize) {
if (hides_single_window)
firetray.Handler.hideWindow(xid);
else
firetray.Handler.hideAllWindows();
}
}
} catch(error) {log.error(error);}
return false; // do propagate
}
}; // firetray.Window
@ -561,7 +597,7 @@ firetray.Handler.registerWindow = function(win) {
this.windows[xid] = {};
this.windows[xid].chromeWin = win;
this.windows[xid].baseWin = baseWin;
firetray.Window.checkSubscribedEventMasks(xid);
firetray.Window.checkSubscribedEventMasks(xid, gdkWin);
try {
this.gtkWindows.insert(xid, gtkWin);
this.gdkWindows.insert(xid, gdkWin);
@ -588,6 +624,10 @@ firetray.Handler.registerWindow = function(win) {
this.windows[xid].filterWindowCb = gdk.GdkFilterFunc_t(firetray.Window.filterWindow);
gdk.gdk_window_add_filter(gdkWin, this.windows[xid].filterWindowCb, null);
// // TEST
// this.windows[xid].unmapEventCb = gtk.GCallbackWidgetFocuEvent_t(firetray.Window.onUnmap);
// gobject.g_signal_connect(gtkWin, "unmap-event", this.windows[xid].unmapEventCb, gdkWin);
if (firetray.Handler.appHasChat && firetray.Chat.initialized) { // missing import ok
Cu.import("resource://firetray/linux/FiretrayChatStatusIcon.jsm");
firetray.ChatStatusIcon.attachOnFocusInCallback(xid);