[gnome-shell/wip/carlosg/init-xdnd] shell: Drop XDND initialization code
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/carlosg/init-xdnd] shell: Drop XDND initialization code
- Date: Wed, 3 Jul 2019 14:37:38 +0000 (UTC)
commit 8a220926323e5a446ccd37ace9896dc3ee7cddcf
Author: Carlos Garnacho <carlosg gnome org>
Date: Wed Jul 3 16:28:00 2019 +0200
shell: Drop XDND initialization code
Let mutter take over this, and drop this piece of backend-specific
code.
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/611
js/ui/xdndHandler.js | 3 ---
src/shell-global.c | 36 +-----------------------------------
src/shell-global.h | 2 --
3 files changed, 1 insertion(+), 40 deletions(-)
---
diff --git a/js/ui/xdndHandler.js b/js/ui/xdndHandler.js
index 86c75975d..9749b81bf 100644
--- a/js/ui/xdndHandler.js
+++ b/js/ui/xdndHandler.js
@@ -17,9 +17,6 @@ var XdndHandler = class {
Main.uiGroup.add_actor(this._dummy);
this._dummy.hide();
- if (!Meta.is_wayland_compositor())
- global.init_xdnd();
-
var dnd = Meta.get_backend().get_dnd();
dnd.connect('dnd-enter', this._onEnter.bind(this));
dnd.connect('dnd-position-change', this._onPositionChanged.bind(this));
diff --git a/src/shell-global.c b/src/shell-global.c
index 28a1ccb2e..d8fd8046b 100644
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -51,7 +51,6 @@ struct _ShellGlobal {
GObject parent;
ClutterStage *stage;
- Window stage_xwindow;
MetaDisplay *meta_display;
MetaWorkspaceManager *workspace_manager;
@@ -852,15 +851,10 @@ _shell_global_set_plugin (ShellGlobal *global,
global->stage = CLUTTER_STAGE (meta_get_stage_for_display (display));
- if (meta_is_wayland_compositor ())
- {
- global->stage_xwindow = None;
- }
- else
+ if (!meta_is_wayland_compositor ())
{
MetaX11Display *x11_display = meta_display_get_x11_display (display);
global->xdisplay = meta_x11_display_get_xdisplay (x11_display);
- global->stage_xwindow = clutter_x11_get_stage_window (global->stage);
}
st_entry_set_cursor_func (entry_cursor_func, global);
@@ -1184,34 +1178,6 @@ shell_global_notify_error (ShellGlobal *global,
g_signal_emit_by_name (global, "notify-error", msg, details);
}
-/**
- * shell_global_init_xdnd:
- * @global: the #ShellGlobal
- *
- * Enables tracking of Xdnd events
- */
-void shell_global_init_xdnd (ShellGlobal *global)
-{
- Window output_window = meta_get_overlay_window (global->meta_display);
- long xdnd_version = 5;
-
- XChangeProperty (global->xdisplay, global->stage_xwindow,
- gdk_x11_get_xatom_by_name ("XdndAware"), XA_ATOM,
- 32, PropModeReplace, (const unsigned char *)&xdnd_version, 1);
-
- XChangeProperty (global->xdisplay, output_window,
- gdk_x11_get_xatom_by_name ("XdndProxy"), XA_WINDOW,
- 32, PropModeReplace, (const unsigned char *)&global->stage_xwindow, 1);
-
- /*
- * XdndProxy is additionally set on the proxy window as verification that the
- * XdndProxy property on the target window isn't a left-over
- */
- XChangeProperty (global->xdisplay, global->stage_xwindow,
- gdk_x11_get_xatom_by_name ("XdndProxy"), XA_WINDOW,
- 32, PropModeReplace, (const unsigned char *)&global->stage_xwindow, 1);
-}
-
/**
* shell_global_get_pointer:
* @global: the #ShellGlobal
diff --git a/src/shell-global.h b/src/shell-global.h
index 67556263b..ad67c72c0 100644
--- a/src/shell-global.h
+++ b/src/shell-global.h
@@ -75,8 +75,6 @@ void shell_global_notify_error (ShellGlobal *global,
const char *msg,
const char *details);
-void shell_global_init_xdnd (ShellGlobal *global);
-
void shell_global_reexec_self (ShellGlobal *global);
const char * shell_global_get_session_mode (ShellGlobal *global);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]