xserver: Branch 'xorg-server-1.2-apple' - 5 commits
Ben Byer
bbyer at kemper.freedesktop.org
Wed Oct 31 23:51:33 PDT 2007
configure.ac | 4 ++--
hw/darwin/apple/X11Application.m | 2 +-
hw/darwin/darwin.c | 4 ++--
hw/darwin/quartz/quartzKeyboard.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit a6f038d2f4b455cb2f1376f55f08d04bb9b6ab0f
Author: Ben Byer <bbyer at bbyer.local>
Date: Wed Oct 31 23:51:28 2007 -0700
bump version to 1.2a3
diff --git a/configure.ac b/configure.ac
index f2ac551..b9b8889 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
dnl This is the not the Xorg version number, it's the server version number.
dnl Yes, that's weird.
-AC_INIT([xorg-server], 1.2.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.2a3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
diff --git a/hw/darwin/apple/X11Application.m b/hw/darwin/apple/X11Application.m
index afd495b..fe18214 100644
--- a/hw/darwin/apple/X11Application.m
+++ b/hw/darwin/apple/X11Application.m
@@ -156,7 +156,7 @@ message_kit_thread (SEL selector, NSObject *arg)
tem = [infoDict objectForKey:@"CFBundleShortVersionString"];
- [dict setObject:[NSString stringWithFormat:@"X11.app %@ - X.org X11R7.2",
+ [dict setObject:[NSString stringWithFormat:@"X11.app %@ - X.org X11R7.2 (xorg-server-1.2a3)",
tem] forKey:@"ApplicationVersion"];
[self orderFrontStandardAboutPanelWithOptions: dict];
commit bac801abf259b2d2013e1817960057249c9280b2
Author: Ben Byer <bbyer at bbyer.local>
Date: Wed Oct 31 23:46:50 2007 -0700
Swap modifier keys for buttons 2 and 3 -- now Option-click is the middle click
diff --git a/hw/darwin/darwin.c b/hw/darwin/darwin.c
index 5500a5f..52fd170 100644
--- a/hw/darwin/darwin.c
+++ b/hw/darwin/darwin.c
@@ -96,8 +96,8 @@ int darwinSyncKeymap = FALSE;
int darwinSwapAltMeta = FALSE;
// modifier masks for faking mouse buttons
-int darwinFakeMouse2Mask = NX_COMMANDMASK;
-int darwinFakeMouse3Mask = NX_ALTERNATEMASK;
+int darwinFakeMouse2Mask = NX_ALTERNATEMASK;
+int darwinFakeMouse3Mask = NX_COMMANDMASK;
// devices
DeviceIntPtr darwinPointer = NULL;
commit 11259dc8c94db780ec1a6b5438a37c4b57b7d780
Author: Ben Byer <bbyer at bbyer.local>
Date: Wed Oct 31 23:45:58 2007 -0700
default for is_uchr should be 1, not 0
diff --git a/hw/darwin/quartz/quartzKeyboard.c b/hw/darwin/quartz/quartzKeyboard.c
index 3ecee3a..60f73e5 100644
--- a/hw/darwin/quartz/quartzKeyboard.c
+++ b/hw/darwin/quartz/quartzKeyboard.c
@@ -220,7 +220,7 @@ DarwinModeReadSystemKeymap (darwinKeyboardInfo *info)
const void *chr_data = NULL;
int num_keycodes = NUM_KEYCODES;
UInt32 keyboard_type = 0;
- int is_uchr = 0, i, j;
+ int is_uchr = 1, i, j;
OSStatus err;
KeySym *k;
commit 6479d4e01ea98701892d453ac41cf50e21194330
Author: Ben Byer <bbyer at bbyer.apple.com>
Date: Wed Oct 31 16:19:46 2007 -0700
fixed an uninitialized variable, which caused keyboard breakage on x86
when building with optimization enabled.
diff --git a/hw/darwin/quartz/quartzKeyboard.c b/hw/darwin/quartz/quartzKeyboard.c
index f9c5963..3ecee3a 100644
--- a/hw/darwin/quartz/quartzKeyboard.c
+++ b/hw/darwin/quartz/quartzKeyboard.c
@@ -220,7 +220,7 @@ DarwinModeReadSystemKeymap (darwinKeyboardInfo *info)
const void *chr_data = NULL;
int num_keycodes = NUM_KEYCODES;
UInt32 keyboard_type = 0;
- int is_uchr, i, j;
+ int is_uchr = 0, i, j;
OSStatus err;
KeySym *k;
commit a3f72edee84bca4e817948205b656e00fa869c4e
Author: Ben Byer <bbyer at bbyer.apple.com>
Date: Wed Oct 31 16:17:06 2007 -0700
add -DROOTLESS_WORKAROUND to CFLAGS
diff --git a/configure.ac b/configure.ac
index d63b681..f2ac551 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1649,7 +1649,7 @@ return 0;}
AC_SUBST([DARWIN_LIBS])
AC_CHECK_LIB([Xplugin],[xp_init],[:])
AC_SUBST([APPLE_APPLICATIONS_DIR])
- CFLAGS="${CFLAGS} -D__DARWIN__ -DDARWIN_WITH_QUARTZ"
+ CFLAGS="${CFLAGS} -D__DARWIN__ -DDARWIN_WITH_QUARTZ -DROOTLESS_WORKAROUND"
PLIST_VERSION_STRING=$PACKAGE_VERSION
AC_SUBST([PLIST_VERSION_STRING])
PLIST_VENDOR_WEB=$VENDOR_WEB
More information about the xorg-commit
mailing list