|
 |
70130e |
From 8157fe1fecd6696a534fef89bc4a1c12ff8f2818 Mon Sep 17 00:00:00 2001
|
|
|
70130e |
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
|
|
|
70130e |
Date: Wed, 11 Sep 2013 11:15:18 -0700
|
|
|
70130e |
Subject: [PATCH 22/39] xwayland: Remove Xdnd selection watching code
|
|
|
70130e |
|
|
|
70130e |
We don't need this in the server, the wm can manage dnd proxying.
|
|
|
70130e |
---
|
|
|
70130e |
hw/xfree86/xwayland/xwayland.c | 32 --------------------------------
|
|
|
70130e |
1 file changed, 32 deletions(-)
|
|
|
70130e |
|
|
|
70130e |
diff --git a/hw/xfree86/xwayland/xwayland.c b/hw/xfree86/xwayland/xwayland.c
|
|
|
70130e |
index 36f7cbf..e8c58fd 100644
|
|
|
70130e |
--- a/hw/xfree86/xwayland/xwayland.c
|
|
|
70130e |
+++ b/hw/xfree86/xwayland/xwayland.c
|
|
|
70130e |
@@ -54,7 +54,6 @@
|
|
|
70130e |
*/
|
|
|
70130e |
|
|
|
70130e |
static DevPrivateKeyRec xwl_screen_private_key;
|
|
|
70130e |
-static Atom xdnd_atom;
|
|
|
70130e |
|
|
|
70130e |
static void
|
|
|
70130e |
xserver_client(void *data, struct xserver *xserver, int fd)
|
|
|
70130e |
@@ -178,31 +177,6 @@ xwl_screen_get(ScreenPtr screen)
|
|
|
70130e |
return dixLookupPrivate(&screen->devPrivates, &xwl_screen_private_key);
|
|
|
70130e |
}
|
|
|
70130e |
|
|
|
70130e |
-static void
|
|
|
70130e |
-xwayland_selection_callback(CallbackListPtr *callbacks,
|
|
|
70130e |
- pointer data, pointer args)
|
|
|
70130e |
-{
|
|
|
70130e |
- SelectionInfoRec *info = (SelectionInfoRec *) args;
|
|
|
70130e |
- Selection *selection = info->selection;
|
|
|
70130e |
-
|
|
|
70130e |
- switch (info->kind) {
|
|
|
70130e |
- case SelectionSetOwner:
|
|
|
70130e |
- if (selection->selection == xdnd_atom) {
|
|
|
70130e |
- if (selection->window != None)
|
|
|
70130e |
- ErrorF("client %p starts dnd\n", info->client);
|
|
|
70130e |
- else
|
|
|
70130e |
- ErrorF("client %p stops dnd\n", info->client);
|
|
|
70130e |
- }
|
|
|
70130e |
- break;
|
|
|
70130e |
- case SelectionWindowDestroy:
|
|
|
70130e |
- ErrorF("selection window destroy\n");
|
|
|
70130e |
- break;
|
|
|
70130e |
- case SelectionClientClose:
|
|
|
70130e |
- ErrorF("selection client close\n");
|
|
|
70130e |
- break;
|
|
|
70130e |
- }
|
|
|
70130e |
-}
|
|
|
70130e |
-
|
|
|
70130e |
struct xwl_screen *
|
|
|
70130e |
xwl_screen_create(void)
|
|
|
70130e |
{
|
|
|
70130e |
@@ -231,12 +205,6 @@ xwl_screen_pre_init(ScrnInfoPtr scrninfo, struct xwl_screen *xwl_screen,
|
|
|
70130e |
|
|
|
70130e |
noScreenSaverExtension = TRUE;
|
|
|
70130e |
|
|
|
70130e |
- xdnd_atom = MakeAtom("XdndSelection", 13, 1);
|
|
|
70130e |
- if (!AddCallback(&SelectionCallback,
|
|
|
70130e |
- xwayland_selection_callback, xwl_screen)) {
|
|
|
70130e |
- return FALSE;
|
|
|
70130e |
- }
|
|
|
70130e |
-
|
|
|
70130e |
xorg_list_init(&xwl_screen->output_list);
|
|
|
70130e |
xorg_list_init(&xwl_screen->seat_list);
|
|
|
70130e |
xorg_list_init(&xwl_screen->damage_window_list);
|
|
|
70130e |
--
|
|
|
70130e |
1.8.3.1
|
|
|
70130e |
|