diff options
| author | raveit65 <[email protected]> | 2019-06-03 19:56:29 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2019-06-07 15:27:21 +0200 |
| commit | 894645c7bce5a4f554976ab48f66293bf9fd70cc (patch) | |
| tree | 3cbb8d1e4d915f3cc1d1acec75da608aa905605d /mate-panel/panel-util.c | |
| parent | a9e608411f519b5cb1bc268f7384dc8449221d4f (diff) | |
| download | mate-panel-894645c7bce5a4f554976ab48f66293bf9fd70cc.tar.bz2 mate-panel-894645c7bce5a4f554976ab48f66293bf9fd70cc.tar.xz | |
revert menu-bar: transfer focus correctly on alt-F1
This revert
https://github.com/mate-desktop/mate-panel/commit/f0f4c5e
and fixes hopefully https://github.com/mate-desktop/marco/issues/209
Diffstat (limited to 'mate-panel/panel-util.c')
| -rw-r--r-- | mate-panel/panel-util.c | 96 |
1 files changed, 0 insertions, 96 deletions
diff --git a/mate-panel/panel-util.c b/mate-panel/panel-util.c index e6bdd653..7389b321 100644 --- a/mate-panel/panel-util.c +++ b/mate-panel/panel-util.c @@ -47,13 +47,6 @@ #include "panel-icon-names.h" #include "panel-lockdown.h" -#ifdef HAVE_X11 -#include <X11/Xlib.h> -#include <X11/Xatom.h> -#include <gdk/gdkx.h> -static Atom _net_active_window = None; -#endif - char * panel_util_make_exec_uri_for_desktop (const char *exec) { @@ -1249,92 +1242,3 @@ panel_util_get_file_optional_homedir (const char *location) return file; } -#ifdef HAVE_X11 - -static void panel_menu_bar_get_net_active_x11_window(Display *xdisplay) -{ - if (_net_active_window == None) - _net_active_window = XInternAtom (xdisplay, - "_NET_ACTIVE_WINDOW", - False); -} - -Window panel_util_get_current_active_x11_window (GtkWidget *toplevel) -{ - GdkScreen *screen; - GdkDisplay *display; - GdkWindow *root; - Display *xdisplay; - Window xroot; - - Window res = None; - - Atom return_type; - int return_format; - unsigned long n; - unsigned long bytes; - unsigned char *prop = NULL; - - screen = gtk_window_get_screen (GTK_WINDOW(toplevel)); - display = gdk_screen_get_display (screen); - root = gdk_screen_get_root_window (screen); - - xdisplay = GDK_DISPLAY_XDISPLAY (display); - xroot = GDK_WINDOW_XID (root); - - panel_menu_bar_get_net_active_x11_window (xdisplay); - if (_net_active_window != None - && XGetWindowProperty (xdisplay, xroot, _net_active_window, 0, 1, - False, XA_WINDOW, &return_type, &return_format, - &n, &bytes, &prop) == Success) - { - if ((return_type == XA_WINDOW) && (return_format == 32) && - (n == 1) && (prop)) { - res = *(Window *)prop; - } - - if (prop) - XFree (prop); - - } - return res; -} - -void panel_util_set_current_active_x11_window (GtkWidget *toplevel, Window window) -{ - GdkScreen *screen; - GdkDisplay *display; - GdkWindow *root; - Display *xdisplay; - Window xroot; - XEvent xev; - - screen = gtk_window_get_screen (GTK_WINDOW(toplevel)); - display = gdk_screen_get_display (screen); - root = gdk_screen_get_root_window (screen); - - xdisplay = GDK_DISPLAY_XDISPLAY (display); - xroot = GDK_WINDOW_XID (root); - - panel_menu_bar_get_net_active_x11_window (xdisplay); - if (_net_active_window == None) - return; - - xev.xclient.type = ClientMessage; - xev.xclient.serial = 0; - xev.xclient.send_event = True; - xev.xclient.window = window; - xev.xclient.message_type = _net_active_window; - xev.xclient.format = 32; - xev.xclient.data.l[0] = 2; /* requestor type; we're not an app */ - xev.xclient.data.l[1] = CurrentTime; - xev.xclient.data.l[2] = None; /* our currently active window */ - xev.xclient.data.l[3] = 0; - xev.xclient.data.l[4] = 0; - - XSendEvent (xdisplay, xroot, False, - SubstructureRedirectMask | SubstructureNotifyMask, - &xev); -} - -#endif |