rpms/control-center/devel control-center-2.11.91-add-pango-xft.patch, NONE, 1.1 control-center-2.11.91-help-left-handed-dual-mice-users.patch, 1.1, 1.2 control-center.spec, 1.87, 1.88
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Aug 24 18:06:33 UTC 2005
- Previous message (by thread): rpms/evolution-connector/devel .cvsignore, 1.17, 1.18 evolution-connector.spec, 1.35, 1.36 regenerate-patch.sh, 1.7, 1.8 sources, 1.17, 1.18 ximian-connector-2.1.4-generated-autotool.patch, 1.6, 1.7
- Next message (by thread): rpms/cairo/devel .cvsignore, 1.8, 1.9 cairo.spec, 1.23, 1.24 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rstrode
Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2044
Modified Files:
control-center-2.11.91-help-left-handed-dual-mice-users.patch
control-center.spec
Added Files:
control-center-2.11.91-add-pango-xft.patch
Log Message:
- explicitly link in pango-xft which is used for rendering the keyboard
control-center-2.11.91-add-pango-xft.patch:
configure.in | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE control-center-2.11.91-add-pango-xft.patch ---
--- control-center-2.11.91/configure.in.add-pango-xft 2005-08-24 13:36:48.000000000 -0400
+++ control-center-2.11.91/configure.in 2005-08-24 13:45:47.000000000 -0400
@@ -98,7 +98,8 @@
libglade-2.0 >= 2.0.0 dnl
libbonobo-2.0 dnl
libbonoboui-2.0 dnl
- gnome-desktop-2.0 >= 2.2.0"
+ gnome-desktop-2.0 >= 2.2.0 dnl
+ pangoxft"
PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.11.1)
PKG_CHECK_MODULES(GNOME_SETTINGS_DAEMON,
control-center-2.11.91-help-left-handed-dual-mice-users.patch:
configure.in | 2
gnome-settings-daemon/gnome-settings-mouse.c | 169 +++++++++++++++++++++++----
2 files changed, 147 insertions(+), 24 deletions(-)
Index: control-center-2.11.91-help-left-handed-dual-mice-users.patch
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center-2.11.91-help-left-handed-dual-mice-users.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- control-center-2.11.91-help-left-handed-dual-mice-users.patch 24 Aug 2005 14:56:03 -0000 1.1
+++ control-center-2.11.91-help-left-handed-dual-mice-users.patch 24 Aug 2005 18:06:29 -0000 1.2
@@ -1,12 +1,12 @@
--- control-center-2.11.91/gnome-settings-daemon/gnome-settings-mouse.c.help-left-handed-dual-mice-users 2005-05-22 11:46:43.000000000 -0400
-+++ control-center-2.11.91/gnome-settings-daemon/gnome-settings-mouse.c 2005-08-24 10:41:25.000000000 -0400
++++ control-center-2.11.91/gnome-settings-daemon/gnome-settings-mouse.c 2005-08-24 11:32:48.000000000 -0400
@@ -1,3 +1,5 @@
+#include <config.h>
+
#include <string.h>
#include <math.h>
-@@ -6,43 +8,163 @@
+@@ -6,43 +8,162 @@
#include <gdk/gdkkeysyms.h>
#include <X11/keysym.h>
@@ -20,14 +20,38 @@
#include "gnome-settings-daemon.h"
-#define DEFAULT_PTR_MAP_SIZE 128
++#ifdef HAVE_X11_EXTENSIONS_XINPUT_H
++static gboolean
++supports_xinput_devices (void)
++{
++ gint op_code, event, error;
+
+-static void
+-set_left_handed (gboolean left_handed)
++ return XQueryExtension (GDK_DISPLAY (), "XInputExtension",
++ &op_code, &event, &error);
++}
++#endif
++
+static void
+configure_button_layout (guchar *buttons,
+ gint n_buttons,
+ gboolean left_handed)
-+{
+ {
+- unsigned char *buttons;
+- gint n_buttons, i;
+- gint idx_1 = 0, idx_3 = 1;
+-
+- buttons = g_alloca (DEFAULT_PTR_MAP_SIZE);
+- n_buttons = XGetPointerMapping (GDK_DISPLAY (), buttons, DEFAULT_PTR_MAP_SIZE);
+- if (n_buttons > DEFAULT_PTR_MAP_SIZE) {
+- buttons = g_alloca (n_buttons);
+- n_buttons = XGetPointerMapping (GDK_DISPLAY (), buttons, n_buttons);
+- }
+ const gint left_button = 0;
+ gint right_button;
-+
+
+- for (i = 0; i < n_buttons; i++)
+ /* if the button is higher than 2 (3rd button) then it's
+ * probably one direction of a scroll wheel or something else
+ * uninteresting
@@ -40,31 +64,30 @@
+ buttons[right_button] = left_button + 1;
+ }
+ else
-+ {
+ {
+- if (buttons[i] == 1)
+- idx_1 = i;
+- else if (buttons[i] == ((n_buttons < 3) ? 2 : 3))
+- idx_3 = i;
+ buttons[left_button] = left_button + 1;
+ buttons[right_button] = right_button + 1;
-+ }
+ }
+}
+
+#ifdef HAVE_X11_EXTENSIONS_XINPUT_H
+static gboolean
-+supports_xinput_devices (void)
-+{
-+ gint op_code, event, error;
-+
-+ return XQueryExtension (GDK_DISPLAY (), "XInputExtension",
-+ &op_code, &event, &error);
-+}
-+
-+static gboolean
+xinput_device_has_buttons (XDeviceInfo *device_info)
+{
+ int i;
+ XAnyClassInfo *class_info;
-+
+
+- if ((left_handed && idx_1 < idx_3) ||
+- (!left_handed && idx_1 > idx_3))
+ class_info = device_info->inputclassinfo;
+ for (i = 0; i < device_info->num_classes; i++)
-+ {
+ {
+- buttons[idx_1] = ((n_buttons < 3) ? 2 : 3);
+- buttons[idx_3] = 1;
+
+ if (class_info->class == ButtonClass)
+ {
@@ -77,32 +100,20 @@
+
+ class_info = (XAnyClassInfo *) (((guchar *) class_info) +
+ class_info->length);
-+ }
+ }
+ return FALSE;
+}
-
- static void
--set_left_handed (gboolean left_handed)
++
++static void
+set_xinput_devices_left_handed (gboolean left_handed)
- {
-- unsigned char *buttons;
-- gint n_buttons, i;
-- gint idx_1 = 0, idx_3 = 1;
--
-- buttons = g_alloca (DEFAULT_PTR_MAP_SIZE);
-- n_buttons = XGetPointerMapping (GDK_DISPLAY (), buttons, DEFAULT_PTR_MAP_SIZE);
-- if (n_buttons > DEFAULT_PTR_MAP_SIZE) {
-- buttons = g_alloca (n_buttons);
-- n_buttons = XGetPointerMapping (GDK_DISPLAY (), buttons, n_buttons);
-- }
++{
+ XDeviceInfo *device_info;
+ gint n_devices;
+ guchar *buttons;
+ gsize buttons_capacity = 16;
+ gint n_buttons;
+ gint i;
-
-- for (i = 0; i < n_buttons; i++)
++
+ device_info = XListInputDevices (GDK_DISPLAY (), &n_devices);
+
+ if (n_devices > 0)
@@ -111,11 +122,7 @@
+ buttons = NULL;
+
+ for (i = 0; i < n_devices; i++)
- {
-- if (buttons[i] == 1)
-- idx_1 = i;
-- else if (buttons[i] == ((n_buttons < 3) ? 2 : 3))
-- idx_3 = i;
++ {
+ XDevice *device;
+
+ if ((device_info[i].use != IsXExtensionDevice) ||
@@ -139,23 +146,18 @@
+ buttons_capacity);
+ }
+
-+ g_print ("setting device '%s' to %sbe left-handed\n",
-+ device_info[i].name, left_handed? "" : "not ");
-+
+ configure_button_layout (buttons, n_buttons, left_handed);
+
+ XSetDeviceButtonMapping (GDK_DISPLAY (), device, buttons, n_buttons);
+ XCloseDevice (GDK_DISPLAY (), device);
- }
++ }
+ g_free (buttons);
+
+ if (device_info != NULL)
+ XFreeDeviceList (device_info);
+}
+#endif
-
-- if ((left_handed && idx_1 < idx_3) ||
-- (!left_handed && idx_1 > idx_3))
++
+static void
+set_left_handed (gboolean left_handed)
+{
@@ -172,27 +174,25 @@
+ n_buttons = XGetPointerMapping (GDK_DISPLAY (), buttons,
+ (gint) buttons_capacity);
+ while (n_buttons > buttons_capacity)
- {
-- buttons[idx_1] = ((n_buttons < 3) ? 2 : 3);
-- buttons[idx_3] = 1;
++ {
+ buttons_capacity = n_buttons;
+ buttons = (guchar *) g_realloc (buttons,
+ buttons_capacity * sizeof (guchar));
+
+ n_buttons = XGetPointerMapping (GDK_DISPLAY (), buttons,
+ (gint) buttons_capacity);
- }
-
-- XSetPointerMapping (GDK_DISPLAY (), buttons, n_buttons);
++ }
++
+ configure_button_layout (buttons, n_buttons, left_handed);
+
+ XSetPointerMapping (GDK_DISPLAY (), buttons, n_buttons);
-+
+
+- XSetPointerMapping (GDK_DISPLAY (), buttons, n_buttons);
+ g_free (buttons);
}
static void
-@@ -271,7 +393,7 @@
+@@ -271,7 +392,7 @@
if (! strcmp (entry->key, "/desktop/gnome/peripherals/mouse/left_handed"))
{
if (entry->value->type == GCONF_VALUE_BOOL)
@@ -201,8 +201,8 @@
}
else if (! strcmp (entry->key, "/desktop/gnome/peripherals/mouse/motion_acceleration"))
{
---- control-center-2.11.91/configure.in.help-left-handed-dual-mice-users 2005-08-24 10:14:37.000000000 -0400
-+++ control-center-2.11.91/configure.in 2005-08-24 10:14:37.000000000 -0400
+--- control-center-2.11.91/configure.in.help-left-handed-dual-mice-users 2005-08-24 10:41:50.000000000 -0400
++++ control-center-2.11.91/configure.in 2005-08-24 10:41:50.000000000 -0400
@@ -83,9 +83,11 @@
])
AC_SUBST(XF86MISC_LIBS)
Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- control-center.spec 24 Aug 2005 14:56:03 -0000 1.87
+++ control-center.spec 24 Aug 2005 18:06:29 -0000 1.88
@@ -33,6 +33,7 @@
Patch6: control-center-2.11.6-xft.patch
Patch7: control-center-2.11.91-fix-about-me-disablement.patch
Patch8: control-center-2.11.91-help-left-handed-dual-mice-users.patch
+Patch9: control-center-2.11.91-add-pango-xft.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
URL: http://www.gnome.org
@@ -95,6 +96,7 @@
%patch6 -p1 -b .xft
%patch7 -p1 -b .fix-about-me-disablement
%patch8 -p1 -b .help-left-handed-dual-mice-users
+%patch9 -p1 -b .add-pango-xft
%build
@@ -207,6 +209,7 @@
%changelog
* Tue Aug 23 2005 Ray Strode <rstrode at redhat.com> - 1:2.11.91-3
- Configure all mice for left-handed mode in left-handed mode (bug 126420)
+- explicitly link in pango-xft which is used for rendering the keyboard
* Tue Aug 16 2005 Warren Togami <wtogami at redhat.com> - 1:2.11.91-2
- rebuild for new cairo
- Previous message (by thread): rpms/evolution-connector/devel .cvsignore, 1.17, 1.18 evolution-connector.spec, 1.35, 1.36 regenerate-patch.sh, 1.7, 1.8 sources, 1.17, 1.18 ximian-connector-2.1.4-generated-autotool.patch, 1.6, 1.7
- Next message (by thread): rpms/cairo/devel .cvsignore, 1.8, 1.9 cairo.spec, 1.23, 1.24 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list