xorg-server: Changes to 'debian-unstable'
ChangeLog | 46 ++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 4 +--
debian/changelog | 6 ++++-
hw/xquartz/darwin.c | 6 +++++
hw/xquartz/quartzKeyboard.c | 24 +++++-----------------
5 files changed, 65 insertions(+), 21 deletions(-)
New commits:
commit 89496cdbc2c275fca05a8798a203b94c60b5f933
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Thu Mar 18 13:55:01 2010 +0200
Update the changelogs.
diff --git a/ChangeLog b/ChangeLog
index 423f702..f79a90a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,49 @@
+commit c552ec12f9112901d5266c00fb3aaf4e06f5d614
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Mar 17 10:49:28 2010 +1000
+
+ xserver 1.7.6
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 63ef872068299aa2ea6bfd7d11935c222cc1e102
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue Mar 16 11:40:53 2010 -0700
+
+ Revert "XQuartz: Explicitly pass a bellProc to make XBell() work again."
+
+ I'm not quite sure why this was necessary, but DDXRingBell is being called
+ from CoreKeyboardBell, so we don't need a separate bellProc which would
+ result in multiple rings.
+
+ This reverts commit 7e7e7935eeb86b5990664a662471800cfd2e7ce0.
+
+ Conflicts:
+
+ hw/xquartz/quartzKeyboard.c
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 31292a7c775e4a249926140a86bc19c3805cdd96
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed Feb 10 15:52:14 2010 -0800
+
+ XQuartz: Use an empty xkb keymap by default
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ (cherry picked from commit 5172253bae3b9867118c6717434e73c173acd5e9)
+
+commit 5b4fabb910eefb393eb3bfb45df5e63fdeb71f26
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Mar 15 08:44:01 2010 +1000
+
+ configure: restore SHA1_LIB for XSERVER_SYS_LIBS
+
+ Accidentally removed in ff5fb43a4b38c707a, caused by
+ a botched merge when cherry-picking 178da6534fe7ab4b99fb.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
commit 5a2b3f36a05d1e0fcfd1b0f85d6584478ba24eda
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 12 16:53:06 2010 +1000
diff --git a/debian/changelog b/debian/changelog
index d8b15d3..8954a36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-xorg-server (2:1.7.5.902-2) UNRELEASED; urgency=low
+xorg-server (2:1.7.6-1) UNRELEASED; urgency=low
+ [ Brice Goglin ]
* Add 06_dont_trap_access_to_timer_and_keyboard.diff,
thanks Samuel Thibault.
+ [ Timo Aaltonen ]
+ * New upstream release.
+
-- Brice Goglin <bgoglin@debian.org> Tue, 16 Mar 2010 08:06:29 +0100
xorg-server (2:1.7.5.902-1) unstable; urgency=low
commit c552ec12f9112901d5266c00fb3aaf4e06f5d614
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 17 10:49:28 2010 +1000
xserver 1.7.6
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index c215b5c..4a19ae4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.7.5.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2010-03-12"
+AC_INIT([xorg-server], 1.7.6, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2010-03-17"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
commit 63ef872068299aa2ea6bfd7d11935c222cc1e102
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Mar 16 11:40:53 2010 -0700
Revert "XQuartz: Explicitly pass a bellProc to make XBell() work again."
I'm not quite sure why this was necessary, but DDXRingBell is being called
from CoreKeyboardBell, so we don't need a separate bellProc which would
result in multiple rings.
This reverts commit 7e7e7935eeb86b5990664a662471800cfd2e7ce0.
Conflicts:
hw/xquartz/quartzKeyboard.c
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index 7e36a9a..c9ef7cc 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -184,12 +184,6 @@ static void DarwinChangeKeyboardControl(DeviceIntPtr device, KeybdCtrl *ctrl) {
// keyclick, bell volume / pitch, autorepead, LED's
}
-static void DarwinKeyboardBell(int volume, DeviceIntPtr pDev, pointer arg, int something) {
- KeybdCtrl *ctrl = arg;
-
- DDXRingBell(volume, ctrl->bell_pitch, ctrl->bell_duration);
-}
-
//-----------------------------------------------------------------------------
// Utility functions to help parse Darwin keymap
//-----------------------------------------------------------------------------
@@ -301,7 +295,7 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) {
// for a kIOHIDParamConnectType connection.
assert(darwinParamConnect = NXOpenEventStatus());
- InitKeyboardDeviceStruct(pDev, NULL, DarwinKeyboardBell, DarwinChangeKeyboardControl);
+ InitKeyboardDeviceStruct(pDev, NULL, NULL, DarwinChangeKeyboardControl);
DarwinKeyboardReloadHandler();
commit 31292a7c775e4a249926140a86bc19c3805cdd96
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Feb 10 15:52:14 2010 -0800
XQuartz: Use an empty xkb keymap by default
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 5172253bae3b9867118c6717434e73c173acd5e9)
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index 30b8905..8b6ce62 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -45,6 +45,7 @@
#include "site.h"
#include "globals.h"
#include "dix.h"
+#include "xkbsrv.h"
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
@@ -463,6 +464,11 @@ int DarwinParseModifierList(const char *constmodifiers, int separatelr)
*/
void InitInput( int argc, char **argv )
{
+ XkbRMLVOSet rmlvo = { .rules = "base", .model = "empty", .layout = "empty",
+ .variant = NULL, .options = NULL };
+ /* We need to really have rules... or something... */
+ XkbSetRulesDflts(&rmlvo);
+
darwinKeyboard = AddInputDevice(serverClient, DarwinKeybdProc, TRUE);
RegisterKeyboardDevice( darwinKeyboard );
darwinKeyboard->name = strdup("keyboard");
diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index 3b4eac3..7e36a9a 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -301,9 +301,6 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) {
// for a kIOHIDParamConnectType connection.
assert(darwinParamConnect = NXOpenEventStatus());
- /* We need to really have rules... or something... */
- //XkbSetRulesDflts("base", "pc105", "us", NULL, NULL);
-
InitKeyboardDeviceStruct(pDev, NULL, DarwinKeyboardBell, DarwinChangeKeyboardControl);
DarwinKeyboardReloadHandler();
@@ -775,12 +772,9 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
#endif
}
- // There seems to be an issue with this in 1.5+, shift-space is not
- // producing space, it's sending NoSymbol... ?
- //if (k[3] == k[2]) k[3] = NoSymbol;
- //if (k[1] == k[0]) k[1] = NoSymbol;
- //if (k[0] == k[2] && k[1] == k[3]) k[2] = k[3] = NoSymbol;
- //if (k[3] == k[0] && k[2] == k[1] && k[2] == NoSymbol) k[3] = NoSymbol;
+ if (k[3] == k[2]) k[3] = NoSymbol;
+ if (k[1] == k[0]) k[1] = NoSymbol;
+ if (k[0] == k[2] && k[1] == k[3]) k[2] = k[3] = NoSymbol;
}
/* Fix up some things that are normally missing.. */
@@ -791,7 +785,7 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
if (k[0] == NoSymbol && k[1] == NoSymbol
&& k[2] == NoSymbol && k[3] == NoSymbol)
- k[0] = k[1] = k[2] = k[3] = known_keys[i].keysym;
+ k[0] = known_keys[i].keysym;
}
}
@@ -804,7 +798,7 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
k = info->keyMap + known_numeric_keys[i].keycode * GLYPHS_PER_KEY;
if (k[0] == known_numeric_keys[i].normal)
- k[0] = k[1] = k[2] = k[3] = known_numeric_keys[i].keypad;
+ k[0] = known_numeric_keys[i].keypad;
}
}
Reply to: