xserver: Branch 'server-1.7-branch' - 9 commits
Peter Hutterer
whot at kemper.freedesktop.org
Sun Sep 27 17:33:23 PDT 2009
Xi/exevents.c | 2 +-
hw/xfree86/os-support/hurd/hurd_video.c | 2 +-
hw/xquartz/GL/capabilities.c | 14 ++++++++------
hw/xquartz/darwin.c | 12 +++++++-----
hw/xquartz/mach-startup/stub.c | 14 --------------
hw/xquartz/quartzKeyboard.c | 2 --
include/dix.h | 1 +
7 files changed, 18 insertions(+), 29 deletions(-)
New commits:
commit 4aeac52c495c4cf691de7ef7d9e4030e90b3c8b8
Merge: 498135f... 77099b9...
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Mon Sep 28 09:54:53 2009 +1000
Merge remote branch 'origin/xorg-server-1.7-apple' into server-1.7-branch
commit 498135f26e8504e103ffe4512acf6fddca8e92e8
Author: Samuel Thibault <samuel.thibault at ens-lyon.org>
Date: Sun Sep 27 17:30:23 2009 +0200
xfree86: Hurd fix
I hadn't paid attention that the parameters order had changed, here is a
trivial patch, please apply.
Signed-off-by: Julien Cristau <jcristau at debian.org>
(cherry picked from commit 78ad6ca9a97440b74019c00a28144ea7d1e03431)
diff --git a/hw/xfree86/os-support/hurd/hurd_video.c b/hw/xfree86/os-support/hurd/hurd_video.c
index b8b00c8..4a99db3 100644
--- a/hw/xfree86/os-support/hurd/hurd_video.c
+++ b/hw/xfree86/os-support/hurd/hurd_video.c
@@ -42,7 +42,7 @@
* Video Memory Mapping section
***************************************************************************/
static pointer
-mapVidMem(int ScreenNum,int Flags, unsigned long Base, unsigned long Size)
+mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int Flags)
{
mach_port_t device,iopl_dev;
memory_object_t iopl_mem;
commit 77099b933a0362d40a28f9afea46c5cc97c29e13
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Sat Sep 26 23:41:45 2009 -0700
XQuartz: Stop checking version numbers of the bundle because CFBundleGetVersionNumber is gimpish
(cherry picked from commit 9f5bdd89608ec12012592ff395b82e954fbb4da8)
diff --git a/hw/xquartz/mach-startup/stub.c b/hw/xquartz/mach-startup/stub.c
index 7a557bd..fd831a8 100644
--- a/hw/xquartz/mach-startup/stub.c
+++ b/hw/xquartz/mach-startup/stub.c
@@ -96,20 +96,6 @@ static void set_x11_path() {
exit(3);
}
- ver = CFBundleGetVersionNumber(bundle);
- if( !(ver >= 0x02308000 || (ver >= 0x02168000 && ver < 0x02208000))) {
- CFStringRef versionStr = CFBundleGetValueForInfoDictionaryKey(bundle, kCFBundleVersionKey);
- const char * versionCStr = "Unknown";
-
- if(versionStr)
- versionCStr = CFStringGetCStringPtr(versionStr, kCFStringEncodingMacRoman);
-
- fprintf(stderr, "Xquartz: Could not find a new enough X11.app LSFindApplicationForInfo() returned\n");
- fprintf(stderr, " X11.app = %s\n", x11_path);
- fprintf(stderr, " Version = %s (%x), Expected Version > 2.3.0 or 2.1.6\n", versionCStr, (unsigned)ver);
- exit(9);
- }
-
strlcat(x11_path, kX11AppBundlePath, sizeof(x11_path));
#ifdef DEBUG
fprintf(stderr, "Xquartz: X11.app = %s\n", x11_path);
commit 7958f6b75b3c6b8a827188af2e684f181bdd7688
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Sat Sep 26 22:52:39 2009 -0700
XQuartz: Add pressure/tilt property labels
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index 8836782..30b8905 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -353,6 +353,9 @@ static int DarwinTabletProc(DeviceIntPtr pPointer, int what) {
axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_X);
axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_Y);
+ axes_labels[2] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_PRESSURE);
+ axes_labels[3] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_TILT_X);
+ axes_labels[4] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_TILT_Y);
// Set button map.
InitPointerDeviceStruct((DevicePtr)pPointer, map, NBUTTONS,
commit 29b2d9cdf5095399b79d9ff2a2f12f5a9c49cf1f
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Sat Sep 26 22:48:49 2009 -0700
XQuartz: Fix a brain-o array indexing problem
/bop Peter
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index 5ad5392..8836782 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -290,8 +290,8 @@ static int DarwinMouseProc(DeviceIntPtr pPointer, int what) {
#define NAXES 2
// 7 buttons: left, right, middle, then four scroll wheel "buttons"
CARD8 map[NBUTTONS + 1] = {0, 1, 2, 3, 4, 5, 6, 7};
- Atom btn_labels[NAXES] = {0};
- Atom axes_labels[NBUTTONS] = {0};
+ Atom btn_labels[NBUTTONS] = {0};
+ Atom axes_labels[NAXES] = {0};
switch (what) {
case DEVICE_INIT:
@@ -340,8 +340,8 @@ static int DarwinTabletProc(DeviceIntPtr pPointer, int what) {
#define NBUTTONS 3
#define NAXES 5
CARD8 map[NBUTTONS + 1] = {0, 1, 2, 3};
- Atom axes_labels[NAXES] = {0};
Atom btn_labels[NBUTTONS] = {0};
+ Atom axes_labels[NAXES] = {0};
switch (what) {
case DEVICE_INIT:
commit fd1adc21a931e2dd1ff2e52b60a77c2153a30fe0
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Sat Sep 26 22:17:09 2009 -0700
XQuartz: Nuke duplicate locks that make painful headaches
diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index 4abf4af..503383f 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -296,13 +296,11 @@ static void DarwinLoadKeyboardMapping(KeySymsRec *keySyms) {
static void DarwinKeyboardSetDeviceKeyMap(KeySymsRec *keySyms, CARD8 *modmap) {
DeviceIntPtr pDev;
- pthread_mutex_lock(&keyInfo_mutex);
for (pDev = inputInfo.devices; pDev; pDev = pDev->next)
if ((pDev->coreEvents || pDev == inputInfo.keyboard) && pDev->key)
XkbApplyMappingChange(pDev, keySyms, keySyms->minKeyCode,
keySyms->maxKeyCode - keySyms->minKeyCode + 1,
modmap, serverClient);
- pthread_mutex_unlock(&keyInfo_mutex);
}
/*
commit 6e4fc5d066d9c1ea4fca444cfee1e73147c5fefb
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Sat Sep 26 22:13:49 2009 -0700
Xi: CopyKeyClass is not static for XQuartz
diff --git a/Xi/exevents.c b/Xi/exevents.c
index 2673552..cb2452b 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -192,7 +192,7 @@ XIGetDevice(xEvent* xE)
* This code is basically the old SwitchCoreKeyboard.
*/
-static void
+void
CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master)
{
KeyClassPtr mk = master->key;
diff --git a/include/dix.h b/include/dix.h
index 49dfe37..b1edb6c 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -592,6 +592,7 @@ extern Bool IsKeyboardDevice(DeviceIntPtr dev);
extern Bool IsPointerEvent(InternalEvent *event);
extern Bool IsMaster(DeviceIntPtr dev);
+extern _X_HIDDEN void CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
extern _X_HIDDEN int CorePointerProc(DeviceIntPtr dev, int what);
extern _X_HIDDEN int CoreKeyboardProc(DeviceIntPtr dev, int what);
commit e0e2eaf1f30ebce4c0ff28416259d8e976fdf0d7
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Fri Aug 7 00:02:21 2009 -0700
XQuartz: Use internal xshm header for new xextproto
(cherry picked from commit 1755239330c0bdac820d88a3e06ff391d65f29be)
(cherry picked from commit 697be460d0e555e2c75eed6889293650e02d423c)
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index 7129ac6..5ad5392 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -67,8 +67,7 @@
#include <IOKit/hidsystem/IOHIDLib.h>
#ifdef MITSHM
-#define _XSHM_SERVER_
-#include <X11/extensions/XShm.h>
+#include "shmint.h"
#endif
#include "darwin.h"
commit 1a0dfde2d102d845f1ceda66ad7a078aa1b42ef9
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Wed Sep 23 17:41:28 2009 -0700
XQuartz: GLX capabilities: Allow 16bit accumulation buffers
http://xquartz.macosforge.org/trac/ticket/308
(cherry picked from commit e9e63a2118b76b6c31c4081fec08a99e4d796e22)
diff --git a/hw/xquartz/GL/capabilities.c b/hw/xquartz/GL/capabilities.c
index 99b9eae..4306404 100644
--- a/hw/xquartz/GL/capabilities.c
+++ b/hw/xquartz/GL/capabilities.c
@@ -103,7 +103,7 @@ static void handleStencilModes(struct glCapabilitiesConfig *c, GLint smodes) {
}
static int handleColorAndAccumulation(struct glColorBufCapabilities *c,
- GLint cmodes) {
+ GLint cmodes, int forAccum) {
int offset = 0;
/*1*/
@@ -204,8 +204,9 @@ static int handleColorAndAccumulation(struct glColorBufCapabilities *c,
++offset;
}
-#if 0
- /*
+ if(forAccum) {
+//#if 0
+ /* FIXME
* Disable this path, because some part of libGL, X, or Xplugin
* doesn't work with sizes greater than 8.
* When this is enabled and visuals are chosen using depths
@@ -274,7 +275,8 @@ static int handleColorAndAccumulation(struct glColorBufCapabilities *c,
c[offset].a = 16;
++offset;
}
-#endif
+ }
+//#endif
/* FIXME should we handle the floating point color modes, and if so, how? */
@@ -284,14 +286,14 @@ static int handleColorAndAccumulation(struct glColorBufCapabilities *c,
static void handleColorModes(struct glCapabilitiesConfig *c, GLint cmodes) {
c->total_color_buffers = handleColorAndAccumulation(c->color_buffers,
- cmodes);
+ cmodes, 0);
assert(c->total_color_buffers < GLCAPS_COLOR_BUFFERS);
}
static void handleAccumulationModes(struct glCapabilitiesConfig *c, GLint cmodes) {
c->total_accum_buffers = handleColorAndAccumulation(c->accum_buffers,
- cmodes);
+ cmodes, 1);
assert(c->total_accum_buffers < GLCAPS_COLOR_BUFFERS);
}
More information about the xorg-commit
mailing list