[Xfce4-commits] [apps/xfce4-screensaver] 04/05: drop libXxf86 dependency
noreply at xfce.org
noreply at xfce.org
Mon Jul 22 01:49:41 CEST 2019
This is an automated email from the git hooks/post-receive script.
b l u e s a b r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository apps/xfce4-screensaver.
commit d3fae75473a6a6ae44f3983aff51a9d5979ec7f4
Author: Alexander Butenko <a.butenka at gmail.com>
Date: Mon Jul 15 13:16:05 2019 -0400
drop libXxf86 dependency
The X server hasn't implemented it in over 10 years.
and it was dropped from debian since a long time.
fixes https://github.com/mate-desktop/mate-screensaver/issues/199
by raveit65 <mate at raveit.de>
Signed-off-by: Sean Davis <smd.seandavis at gmail.com>
---
configure.ac | 17 -------------
src/gs-grab-x11.c | 71 -------------------------------------------------------
2 files changed, 88 deletions(-)
diff --git a/configure.ac b/configure.ac
index 335e8e3..6c9e4cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -453,23 +453,6 @@ elif test "$with_xf86gamma" != no; then
fi
dnl ---------------------------------------------------------------------------
-dnl - Check for XF86MiscSetGrabKeysState (but only bother if we are already
-dnl - using other XF86 stuff.)
-dnl ---------------------------------------------------------------------------
-
-
-have_xf86miscsetgrabkeysstate=no
-if test "$have_xf86gamma" = yes -o "$have_xf86vmode" = yes; then
- AC_CHECK_X_LIB(Xxf86misc, XF86MiscSetGrabKeysState,
- [have_xf86miscsetgrabkeysstate=yes],
- [true], -lXext -lX11)
- if test "$have_xf86miscsetgrabkeysstate" = yes ; then
- SAVER_LIBS="$SAVER_LIBS -lXxf86misc"
- AC_DEFINE(HAVE_XF86MISCSETGRABKEYSSTATE, , [Define this if you have the XF86MiscSetGrabKeysState function])
- fi
-fi
-
-dnl ---------------------------------------------------------------------------
dnl - The --enable-locking option
dnl ---------------------------------------------------------------------------
diff --git a/src/gs-grab-x11.c b/src/gs-grab-x11.c
index e7b87a4..3892af4 100644
--- a/src/gs-grab-x11.c
+++ b/src/gs-grab-x11.c
@@ -32,10 +32,6 @@
#include <gdk/gdkx.h>
#include <gtk/gtk.h>
-#ifdef HAVE_XF86MISCSETGRABKEYSSTATE
-# include <X11/extensions/xf86misc.h>
-#endif /* HAVE_XF86MISCSETGRABKEYSSTATE */
-
#include "gs-window.h"
#include "gs-grab.h"
#include "gs-debug.h"
@@ -82,69 +78,6 @@ grab_string (int status) {
}
}
-#ifdef HAVE_XF86MISCSETGRABKEYSSTATE
-/* This function enables and disables the Ctrl-Alt-KP_star and
- Ctrl-Alt-KP_slash hot-keys, which (in XFree86 4.2) break any
- grabs and/or kill the grabbing client. That would effectively
- unlock the screen, so we don't like that.
-
- The Ctrl-Alt-KP_star and Ctrl-Alt-KP_slash hot-keys only exist
- if AllowDeactivateGrabs and/or AllowClosedownGrabs are turned on
- in XF86Config. I believe they are disabled by default.
-
- This does not affect any other keys (specifically Ctrl-Alt-BS or
- Ctrl-Alt-F1) but I wish it did. Maybe it will someday.
- */
-static void
-xorg_lock_smasher_set_active (GSGrab *grab,
- gboolean active) {
- int status, event, error;
- GdkDisplay *display;
-
- display = gdk_display_get_default();
-
- if (!XF86MiscQueryExtension (GDK_DISPLAY_XDISPLAY (display), &event, &error)) {
- gs_debug ("No XFree86-Misc extension present");
- return;
- }
-
- if (active) {
- gs_debug ("Enabling the x.org grab smasher");
- } else {
- gs_debug ("Disabling the x.org grab smasher");
- }
-
- gdk_x11_display_error_trap_push (display);
-
- status = XF86MiscSetGrabKeysState (GDK_DISPLAY_XDISPLAY (display), active);
-
- gdk_display_sync (display);
- error = gdk_x11_display_error_trap_pop (display);
-
- if (active && status == MiscExtGrabStateAlready) {
- /* shut up, consider this success */
- status = MiscExtGrabStateSuccess;
- }
-
- if (error == Success) {
- gs_debug ("XF86MiscSetGrabKeysState(%s) returned %s\n",
- active ? "on" : "off",
- (status == MiscExtGrabStateSuccess ? "MiscExtGrabStateSuccess" :
- status == MiscExtGrabStateLocked ? "MiscExtGrabStateLocked" :
- status == MiscExtGrabStateAlready ? "MiscExtGrabStateAlready" :
- "unknown value"));
- } else {
- gs_debug ("XF86MiscSetGrabKeysState(%s) failed with error code %d\n",
- active ? "on" : "off", error);
- }
-}
-#else
-static void
-xorg_lock_smasher_set_active (GSGrab *grab,
- gboolean active) {
-}
-#endif /* HAVE_XF86MISCSETGRABKEYSSTATE */
-
static void
prepare_window_grab_cb (GdkSeat *seat,
GdkWindow *window,
@@ -243,8 +176,6 @@ gs_grab_release (GSGrab *grab, gboolean flush) {
/* FIXME: decide when this is good and when not */
if (flush) {
/* FIXME: is it right to enable this? */
- xorg_lock_smasher_set_active (grab, TRUE);
-
gdk_display_sync (display);
gdk_display_flush (display);
}
@@ -437,8 +368,6 @@ gs_grab_move_to_window (GSGrab *grab,
g_return_if_fail (GS_IS_GRAB (grab));
- xorg_lock_smasher_set_active (grab, FALSE);
-
while (!result) {
result = gs_grab_move (grab, window, display,
no_pointer_grab, hide_cursor);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list