rpms/gdm/F-7 gdm-2.18.0-dont-warp-pointer-to-stylus.patch, NONE, 1.1 gdm-2.18.0-change-defaults.patch, 1.1, 1.2 gdm.spec, 1.254, 1.255
Ray Strode (rstrode)
fedora-extras-commits at redhat.com
Fri Aug 17 21:03:47 UTC 2007
Author: rstrode
Update of /cvs/pkgs/rpms/gdm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32510
Modified Files:
gdm-2.18.0-change-defaults.patch gdm.spec
Added Files:
gdm-2.18.0-dont-warp-pointer-to-stylus.patch
Log Message:
- Provide fix to upstream bug 457998 for Hans de Goede to
test
- disable dwellmouselistener by default to address bug 457998
gdm-2.18.0-dont-warp-pointer-to-stylus.patch:
--- NEW FILE gdm-2.18.0-dont-warp-pointer-to-stylus.patch ---
diff -up gdm-2.19.5/gui/modules/dwellmouselistener.c.dont-warp-pointer-to-stylus gdm-2.19.5/gui/modules/dwellmouselistener.c
--- gdm-2.19.5/gui/modules/dwellmouselistener.c.dont-warp-pointer-to-stylus 2007-08-06 11:09:49.000000000 -0400
+++ gdm-2.19.5/gui/modules/dwellmouselistener.c 2007-08-06 11:22:18.000000000 -0400
@@ -35,10 +35,6 @@
#include <X11/Xlib.h>
-#ifdef HAVE_XINPUT
-#include <X11/extensions/XInput.h>
-#endif
-
/*
* Note that CONFIGFILE will have to be changed to something more generic
* if this module is ever moved outside of gdm.
@@ -90,14 +86,10 @@ extern char **environ;
static guint enter_signal_id = 0;
static guint leave_signal_id = 0;
-static int xinput_type_motion = 0;
static Crossings *crossings = NULL;
static int cross_pos = 0;
static guint max_crossings = 0;
-static XID *ext_input_devices = NULL;
-static gint ext_device_count = 0;
-static gboolean latch_core_pointer = TRUE;
static void create_event_watcher (void);
static void load_bindings(gchar *path);
@@ -110,77 +102,6 @@ static gboolean debug_gestures = FALSE;
BindingType get_binding_type(char c);
BindingDirection get_binding_direction(char c);
-static gboolean
-is_ext_device (XID id)
-{
- gint i;
- for (i=0; i < ext_device_count; i++)
- if (id == ext_input_devices[i])
- return TRUE;
-
- if (debug_gestures)
- syslog (LOG_WARNING, "is-ext-device failed for %d", (int) id);
-
- return FALSE;
-}
-
-static void
-init_xinput (GdkDisplay *display, GdkWindow *root)
-{
-#ifdef HAVE_XINPUT
- XEventClass event_list[40];
- int i, j, number = 0, num_devices;
- XDeviceInfo *devices = NULL;
- XDevice *device = NULL;
-
- devices = XListInputDevices (GDK_DISPLAY_XDISPLAY (display),
- &num_devices);
-
- if (debug_gestures)
- syslog (LOG_WARNING, "Checking %d input devices...",
- num_devices);
-
- for (i=0; i < num_devices; i++) {
- if (devices[i].use == IsXExtensionDevice) {
- device = XOpenDevice (GDK_DISPLAY_XDISPLAY (display),
- devices[i].id);
- for (j=0; j < device->num_classes && number < 39; j++) {
- switch (device->classes[j].input_class)
- {
- case ValuatorClass:
- DeviceMotionNotify (device,
- xinput_type_motion,
- event_list[number]);
- number++;
- default:
- break;
- }
- }
- ++ext_device_count;
-
- if (ext_input_devices) {
- ext_input_devices = g_realloc (ext_input_devices,
- sizeof (XID *) * ext_device_count);
- } else {
- ext_input_devices = g_malloc (sizeof (XID *));
- }
- ext_input_devices[ext_device_count - 1] = devices[i].id;
- }
- }
-
- if (debug_gestures)
- syslog (LOG_WARNING, "%d event types available", number);
-
- if (XSelectExtensionEvent (GDK_WINDOW_XDISPLAY (root),
- GDK_WINDOW_XWINDOW (root),
- event_list, number)) {
- if (debug_gestures)
- syslog (LOG_WARNING,
- "Can't select input device events!");
- }
-#endif
-}
-
static gchar *
screen_exec_display_string (GdkScreen *screen, const char *old)
{
@@ -687,9 +608,6 @@ leave_enter_emission_hook (GSignalInvoca
cursor);
gdk_cursor_unref (cursor);
g_timeout_add (2000, change_cursor_back, NULL);
- latch_core_pointer = FALSE;
- /* once we've recognized a gesture, we need to *
- * leave the pointer alone */
at_name = strstr (action, "#AT_TYPE=");
if (at_name != NULL) {
@@ -719,25 +637,6 @@ leave_enter_emission_hook (GSignalInvoca
return TRUE;
}
-static GdkFilterReturn
-gestures_filter (GdkXEvent *gdk_xevent,
- GdkEvent *event,
- gpointer data)
-{
- XEvent *xevent = (XEvent *)gdk_xevent;
-
- if (xevent->type == xinput_type_motion) {
- XDeviceMotionEvent *motion = (XDeviceMotionEvent *) xevent;
- if ((motion->axes_count < 2) || !is_ext_device (motion->deviceid))
- return GDK_FILTER_CONTINUE;
- if (latch_core_pointer)
- XWarpPointer (motion->display, None,
- motion->root,
- 0, 0, 0, 0, motion->axis_data[0], motion->axis_data[1]);
- }
- return GDK_FILTER_CONTINUE;
-}
-
static void
create_event_watcher (void)
{
@@ -758,12 +657,6 @@ create_event_watcher (void)
crossings[i].time = 0;
}
- init_xinput (display,
- gdk_screen_get_root_window (
- gdk_display_get_default_screen (display)));
-
- gdk_window_add_filter (NULL, gestures_filter, NULL);
-
/* set up emission hook */
gtk_type_class (GTK_TYPE_WIDGET);
enter_signal_id = g_signal_lookup ("enter-notify-event", GTK_TYPE_WIDGET);
gdm-2.18.0-change-defaults.patch:
Index: gdm-2.18.0-change-defaults.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-7/gdm-2.18.0-change-defaults.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdm-2.18.0-change-defaults.patch 13 Mar 2007 23:29:39 -0000 1.1
+++ gdm-2.18.0-change-defaults.patch 17 Aug 2007 21:03:43 -0000 1.2
@@ -21,7 +21,7 @@
+AddGtkModules=true
# By default, these are the accessibility modules.
-#GtkModulesList=gail:atk-bridge:@libdir@/gtk-2.0/modules/libdwellmouselistener:@libdir@/gtk-2.0/modules/libkeymouselistener
-+GtkModulesList=gail:atk-bridge:@libdir@/gtk-2.0/modules/libdwellmouselistener:@libdir@/gtk-2.0/modules/libkeymouselistener
++GtkModulesList=gail:atk-bridge:@libdir@/gtk-2.0/modules/libkeymouselistener
# Default path to set. The profile scripts will likely override this value.
# This value will be overridden with the value from /etc/default/login if it
Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-7/gdm.spec,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- gdm.spec 31 Jul 2007 15:31:18 -0000 1.254
+++ gdm.spec 17 Aug 2007 21:03:43 -0000 1.255
@@ -17,7 +17,7 @@
Summary: The GNOME Display Manager
Name: gdm
Version: 2.18.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: LGPL/GPL
Group: User Interface/X
@@ -75,6 +75,9 @@
Patch37: gdm-2.18.0-hide-disabled-users.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=457998
+Patch38: gdm-2.18.0-dont-warp-pointer-to-stylus.patch
+
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=234567
Patch99: gdm-2.18.0-be-more-verbose.patch
@@ -167,6 +170,7 @@
%patch34 -p1 -b .add-lowres-fix
%patch36 -p1 -b .dont-expect-utf8
%patch37 -p1 -b hide-disabled-users
+%patch38 -p1 -b .dont-warp-pointer-to-stylus
%patch99 -p1 -b .be-more-verbose
%build
@@ -390,6 +394,11 @@
%{_datadir}/pixmaps/faces/extras/*.jpg
%changelog
+* Fri Aug 17 2007 Ray Strode <rstrode at redhat.com> - 1:2.18.4-2
+- Provide fix to upstream bug 457998 for Hans de Goede to
+ test
+- disable dwellmouselistener by default to address bug 457998
+
* Tue Jul 31 2007 Ray Strode <rstrode at redhat.com> - 1:2.18.4-1
- Update to 2.18.4
- Fixes CVE-2007-3381
More information about the fedora-extras-commits
mailing list