mirror of
https://github.com/moparisthebest/FireTray
synced 2024-12-22 05:48:49 -05:00
unsuccessful attempt to detect minimize event (XGetWindowProperty)
at this stage: - we need to take the virtyal workspace into account - JS console disappeared
This commit is contained in:
foudfou
parent
57b443037d
commit
0acd053155
@ -50,7 +50,7 @@ firetray.IconLinux = {
|
||||
tryIcon: null,
|
||||
menu: null,
|
||||
MIN_FONT_SIZE: 4,
|
||||
X11Atoms: {},
|
||||
X11: {},
|
||||
|
||||
init: function() {
|
||||
try {
|
||||
@ -81,13 +81,13 @@ firetray.IconLinux = {
|
||||
}
|
||||
|
||||
// TEST - should probably be done in Main.onLoad()
|
||||
this._initX11Atoms();
|
||||
this._initX11();
|
||||
let win = Services.wm.getMostRecentWindow(null);
|
||||
let gdkWin = this.getGdkWindowHandle(win);
|
||||
// TODO: register window here ? (and unregister in shutdown)
|
||||
try {
|
||||
let that = this;
|
||||
let filterData = null; // FIXME
|
||||
let filterData = gdkWin;
|
||||
firetray_filterWindowCb = gdk.GdkFilterFunc_t(that.filterWindow);
|
||||
gdk.gdk_window_add_filter(gdkWin, firetray_filterWindowCb, filterData);
|
||||
} catch(x) {
|
||||
@ -127,7 +127,7 @@ firetray.IconLinux = {
|
||||
gtk.gtk_widget_show_all(menuWidget);
|
||||
|
||||
/* NOTE: here we do use a function handler (instead of a function
|
||||
definition) because we need the args passed to it ! On the other hand we
|
||||
definition) because we need the args passed to it ! As a consequence, we
|
||||
need to abandon 'this' in popupMenu() */
|
||||
let that = this;
|
||||
firetray_popupMenuCb =
|
||||
@ -248,12 +248,38 @@ firetray.IconLinux = {
|
||||
return null;
|
||||
},
|
||||
|
||||
_initX11Atoms: function() {
|
||||
_initX11: function() {
|
||||
if (!isEmpty(this.X11))
|
||||
return true; // init only once
|
||||
|
||||
this.X11.MAX_NET_WM_STATES = 12;
|
||||
try {
|
||||
let gdkDisplay = gdk.gdk_display_get_default();
|
||||
let x11Display = gdk.gdk_x11_display_get_xdisplay(gdkDisplay);
|
||||
this.X11Atoms.DeleteWindow = x11.XInternAtom(x11Display, "WM_DELETE_WINDOW", 0); // only_if_exsits=false
|
||||
LOG("X11Atoms.DeleteWindow="+this.X11Atoms.DeleteWindow);
|
||||
this.X11.Display = gdk.gdk_x11_display_get_xdisplay(gdkDisplay);
|
||||
this.X11.Atoms = {};
|
||||
let atoms = {
|
||||
WM_DELETE_WINDOW: "WM_DELETE_WINDOW",
|
||||
WM_STATE: "WM_STATE",
|
||||
_NET_CLOSE_WINDOW: "_NET_CLOSE_WINDOW",
|
||||
// don't forget to update firetray.IconLinux.X11.MAX_NET_WM_STATES
|
||||
_NET_WM_STATE: "_NET_WM_STATE",
|
||||
_NET_WM_STATE_MODAL: "_NET_WM_STATE_MODAL",
|
||||
_NET_WM_STATE_STICKY: "_NET_WM_STATE_STICKY",
|
||||
_NET_WM_STATE_MAXIMIZED_VERT: "_NET_WM_STATE_MAXIMIZED_VERT",
|
||||
_NET_WM_STATE_MAXIMIZED_HORZ: "_NET_WM_STATE_MAXIMIZED_HORZ",
|
||||
_NET_WM_STATE_SHADED: "_NET_WM_STATE_SHADED",
|
||||
_NET_WM_STATE_SKIP_TASKBAR: "_NET_WM_STATE_SKIP_TASKBAR",
|
||||
_NET_WM_STATE_SKIP_PAGER: "_NET_WM_STATE_SKIP_PAGER",
|
||||
_NET_WM_STATE_HIDDEN: "_NET_WM_STATE_HIDDEN",
|
||||
_NET_WM_STATE_FULLSCREEN: "_NET_WM_STATE_FULLSCREEN",
|
||||
_NET_WM_STATE_ABOVE: "_NET_WM_STATE_ABOVE",
|
||||
_NET_WM_STATE_BELOW: "_NET_WM_STATE_BELOW",
|
||||
_NET_WM_STATE_DEMANDS_ATTENTION: "_NET_WM_STATE_DEMANDS_ATTENTION"
|
||||
};
|
||||
for (let atomName in atoms) {
|
||||
this.X11.Atoms[atomName] = x11.XInternAtom(this.X11.Display, atoms[atomName], 0);
|
||||
LOG("X11.Atoms."+atomName+"="+this.X11.Atoms[atomName]);
|
||||
}
|
||||
return true;
|
||||
} catch (x) {
|
||||
ERROR(x);
|
||||
@ -265,26 +291,75 @@ firetray.IconLinux = {
|
||||
if (!xev)
|
||||
return gdk.GDK_FILTER_CONTINUE;
|
||||
|
||||
let gdkWin = ctypes.cast(data, gdk.GdkWindow.ptr);
|
||||
|
||||
try {
|
||||
let xany = ctypes.cast(xev, x11.XAnyEvent.ptr);
|
||||
let xwin = xany.contents.window;
|
||||
|
||||
switch (xany.contents.type) {
|
||||
case x11.MapNotify:
|
||||
LOG("MapNotify");
|
||||
break;
|
||||
|
||||
case x11.UnmapNotify:
|
||||
LOG("UnmapNotify");
|
||||
|
||||
let prop = firetray.IconLinux.X11.Atoms._NET_WM_STATE;
|
||||
LOG("prop="+prop);
|
||||
|
||||
/*
|
||||
// infos returned by XGetWindowProperty()
|
||||
let actual_type = new ctypes.unsigned_long; // FIXME: let actual_type = new x11.Atom;
|
||||
let actual_format = new ctypes.int;
|
||||
let nitems = new ctypes.unsigned_long;
|
||||
let bytes_after = new ctypes.unsigned_long;
|
||||
let prop_value = new ctypes.unsigned_char.ptr;
|
||||
|
||||
let res = x11.XGetWindowProperty(
|
||||
firetray.IconLinux.X11.Display, xwin, prop, 0, firetray.IconLinux.X11.MAX_NET_WM_STATES, 0, x11.AnyPropertyType,
|
||||
actual_type.address(), actual_format.address(), nitems.address(), bytes_after.address(), prop_value.address());
|
||||
LOG("XGetWindowProperty res="+res+", actual_type="+actual_type.value+", actual_format="+actual_format.value+", bytes_after="+bytes_after.value+", nitems="+nitems.value);
|
||||
|
||||
if (res.toString() !== x11.Success.toString()) {
|
||||
ERROR("XGetWindowProperty failed");
|
||||
break;
|
||||
}
|
||||
if (actual_type.value.toString() === x11.None.toString()) {
|
||||
WARN("property does not exist");
|
||||
break;
|
||||
}
|
||||
|
||||
LOG("prop_value="+prop_value);
|
||||
// LOG("prop_value.str="+prop_value.readString());
|
||||
// LOG("prop_value.size="+prop_value.size);
|
||||
LOG("size="+ctypes.uint32_t.array(nitems.value).size);
|
||||
let props;
|
||||
// if (actual_format == 32)
|
||||
// props = ctypes.cast(prop_value, ctypes.uint32_t.array(nitems.value));
|
||||
// LOG("props="+props);
|
||||
// for (let i=0; i<nitems.value; ++i) {
|
||||
// // LOG(props[i]);
|
||||
// // let p = props[i];
|
||||
// // let p_ulong = ctypes.cast(p, ctypes.unsigned_long);
|
||||
// // LOG(p_ulong);
|
||||
// }
|
||||
*/
|
||||
|
||||
break;
|
||||
|
||||
case x11.ClientMessage:
|
||||
LOG("ClientMessage");
|
||||
let xclient = ctypes.cast(xev, x11.XClientMessageEvent.ptr);
|
||||
LOG("xclient.contents.data="+xclient.contents.data);
|
||||
// NOTE: need toString() for comparison !
|
||||
if (xclient.contents.data[0].toString() ===
|
||||
firetray.IconLinux.X11Atoms.DeleteWindow.toString()) {
|
||||
firetray.IconLinux.X11.Atoms.WM_DELETE_WINDOW.toString()) {
|
||||
LOG("Delete Window prevented");
|
||||
return gdk.GDK_FILTER_REMOVE;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
// LOG("xany.type="+xany.contents.type);
|
||||
break;
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
var EXPORTED_SYMBOLS =
|
||||
[ "firetray", "Cc", "Ci", "Cu", "LOG", "WARN", "ERROR", "FIREFOX_ID",
|
||||
"THUNDERBIRD_ID", "SEAMONKEY_ID", "XPath", "isArray",
|
||||
"THUNDERBIRD_ID", "SEAMONKEY_ID", "XPath", "isArray", "isEmpty",
|
||||
"NOTIFICATION_DISABLED", "NOTIFICATION_UNREAD_MESSAGE_COUNT",
|
||||
"NOTIFICATION_NEWMAIL_ICON", "NOTIFICATION_CUSTOM_ICON" ];
|
||||
|
||||
@ -189,3 +189,12 @@ if(!Object.keys) Object.keys = function(o){
|
||||
for(p in o) if(Object.prototype.hasOwnProperty.call(o,p)) ret.push(p);
|
||||
return ret;
|
||||
};
|
||||
|
||||
// http://stackoverflow.com/questions/679915/how-do-i-test-for-an-empty-javascript-object-from-json
|
||||
function isEmpty(obj) {
|
||||
for(var prop in obj) {
|
||||
if(obj.hasOwnProperty(prop))
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -60,6 +60,9 @@ function gdk_defines(lib) {
|
||||
this.GDK_FILTER_CONTINUE = 0;
|
||||
this.GDK_FILTER_TRANSLATE = 1;
|
||||
this.GDK_FILTER_REMOVE = 2;
|
||||
this.GdkWindowState = ctypes.int; // enum
|
||||
this.GDK_WINDOW_STATE_ICONIFIED = 2;
|
||||
this.GDK_WINDOW_STATE_MAXIMIZED = 4;
|
||||
|
||||
this.GdkWindow = ctypes.StructType("GdkWindow");
|
||||
this.GdkByteOrder = ctypes.int; // enum
|
||||
@ -163,6 +166,7 @@ function gdk_defines(lib) {
|
||||
lib.lazy_bind("gdk_window_add_filter", ctypes.void_t, this.GdkWindow.ptr, this.GdkFilterFunc, gobject.gpointer);
|
||||
lib.lazy_bind("gdk_display_get_default", this.GdkDisplay.ptr);
|
||||
lib.lazy_bind("gdk_x11_display_get_xdisplay", x11.Display.ptr, this.GdkDisplay.ptr);
|
||||
lib.lazy_bind("gdk_window_get_state", this.GdkWindowState, this.GdkWindow.ptr);
|
||||
}
|
||||
|
||||
if (!gdk) {
|
||||
|
||||
@ -15,9 +15,24 @@ Cu.import("resource://firetray/ctypes-utils.jsm");
|
||||
|
||||
function x11_defines(lib) {
|
||||
// X.h
|
||||
this.Success = 0;
|
||||
this.None = 0;
|
||||
this.AnyPropertyType = 0;
|
||||
this.BadValue = 2;
|
||||
this.BadWindow = 3;
|
||||
this.BadAtom = 5;
|
||||
this.BadMatch = 8;
|
||||
this.BadAlloc = 11;
|
||||
// Event names
|
||||
this.UnmapNotify = 18;
|
||||
this.MapNotify = 19;
|
||||
this.ClientMessage = 33;
|
||||
// Xutils.h: definitions for initial window state
|
||||
this.WithdrawnState = 0; /* for windows that are not mapped */
|
||||
this.NormalState = 1; /* most applications want to start this way */
|
||||
this.IconicState = 3; /* application wants to start as an icon */
|
||||
// Xtom
|
||||
this.XA_ATOM = 4;
|
||||
|
||||
this.Bool = ctypes.int;
|
||||
this.Display = ctypes.StructType("Display");
|
||||
@ -43,14 +58,19 @@ function x11_defines(lib) {
|
||||
{ "data": ctypes.long.array(5) } // actually a union char b[20]; short s[10]; long l[5];
|
||||
]);
|
||||
|
||||
lib.lazy_bind("XInternAtom", x11.Atom, this.Display.ptr, ctypes.char.ptr, this.Bool);
|
||||
|
||||
lib.lazy_bind("XInternAtom", x11.Atom, this.Display.ptr, ctypes.char.ptr, this.Bool); // only_if_exsits
|
||||
lib.lazy_bind("XGetWindowProperty", ctypes.int, this.Display.ptr, x11.Window, x11.Atom, ctypes.long, ctypes.long, this.Bool, x11.Atom, x11.Atom.ptr, ctypes.int.ptr, ctypes.unsigned_long.ptr, ctypes.unsigned_long.ptr, ctypes.unsigned_char.ptr.ptr);
|
||||
lib.lazy_bind("XChangeProperty", ctypes.int, this.Display.ptr, x11.Window, x11.Atom, x11.Atom, ctypes.int, ctypes.int, ctypes.unsigned_char.ptr, ctypes.int);
|
||||
}
|
||||
|
||||
if (!x11) {
|
||||
var x11 = {};
|
||||
|
||||
// We *try to guess* the size of Atom and Window...
|
||||
guessX11TypeSizes();
|
||||
x11 = new ctypes_library(X11_LIBNAME, X11_ABIS, x11_defines);
|
||||
}
|
||||
|
||||
function guessX11TypeSizes() {
|
||||
try {
|
||||
// http://mxr.mozilla.org/mozilla-central/source/configure.in
|
||||
if (/^(Alpha|hppa|ia64|ppc64|s390|x86_64)-/.test(Services.appinfo.XPCOMABI)) {
|
||||
@ -65,8 +85,6 @@ if (!x11) {
|
||||
} catch(x) {
|
||||
ERROR(x);
|
||||
}
|
||||
|
||||
x11 = new ctypes_library(X11_LIBNAME, X11_ABIS, x11_defines);
|
||||
}
|
||||
|
||||
/* Xorg 1.10.4
|
||||
|
||||
@ -5,8 +5,10 @@
|
||||
#include <X11/Xmd.h>
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
printf("sizeof(char)=%d\n",sizeof(char));
|
||||
printf("sizeof(int)=%d\n",sizeof(int));
|
||||
printf("sizeof(long)=%d\n",sizeof(long));
|
||||
printf("sizeof(unsigned_long)=%d\n",sizeof(unsigned long));
|
||||
printf("sizeof(CARD32)=%d\n",sizeof(CARD32));
|
||||
printf("sizeof(Atom)=%d\n",sizeof(Atom)); /* supposed to be CARD32 */
|
||||
printf("sizeof(Window)=%d\n",sizeof(Window));
|
||||
|
||||
Loading…
Reference in New Issue
Block a user