xserver: Branch 'master' - 6 commits
Eric Anholt
anholt at kemper.freedesktop.org
Thu May 24 14:45:49 PDT 2007
composite/compext.c | 2 ++
configure.ac | 6 +++---
dix/devices.c | 1 +
dix/events.c | 7 +++++++
hw/xfree86/os-support/bsd/i386_video.c | 5 +++++
hw/xwin/winmultiwindowclass.c | 2 +-
os/utils.c | 14 +++++++++++++-
randr/Makefile.am | 10 ++++++++--
randr/randr.c | 3 ++-
9 files changed, 42 insertions(+), 8 deletions(-)
New commits:
diff-tree 3c982bc1a49509dda7bc469b0eced44df02755b3 (from 4d7469f75fadfc4a59664e88e18eb304203670f4)
Author: Luo Jie <luojie at nlsde.buaa.edu.cn>
Date: Thu May 24 11:13:03 2007 -0700
Reinstate an apparently mis-deleted ';' from a for loop with no body.
Fixes an error returning "No core keyboard" with multiple keyboards.
diff --git a/dix/devices.c b/dix/devices.c
index e227617..da6e590 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -425,6 +425,7 @@ InitAndStartDevices(void)
for (dev = inputInfo.devices;
dev && (dev != inputInfo.keyboard);
dev = dev->next)
+ ;
if (!dev || (dev != inputInfo.keyboard)) {
ErrorF("No core keyboard\n");
return BadImplementation;
diff-tree 4d7469f75fadfc4a59664e88e18eb304203670f4 (from 0b988450462ddb005311e68502357baf272e6371)
Author: Luo Jie <luojie at nlsde.buaa.edu.cn>
Date: Thu May 24 11:04:06 2007 -0700
Fix a typo in using memcpy in xwin.
diff --git a/hw/xwin/winmultiwindowclass.c b/hw/xwin/winmultiwindowclass.c
index d8909f0..57c4346 100755
--- a/hw/xwin/winmultiwindowclass.c
+++ b/hw/xwin/winmultiwindowclass.c
@@ -264,7 +264,7 @@ winMultiWindowGetTransientFor (WindowPtr
if (prop->propertyName == XA_WM_TRANSIENT_FOR)
{
if (ppDaddy)
- memcpy (*ppDaddy, prop->data, sizeof (WindowPtr *));
+ memcpy (*ppDaddy, prop->data, sizeof (WindowPtr));
return 1;
}
else
diff-tree 0b988450462ddb005311e68502357baf272e6371 (from 1f48995d66c0072caa7e5ce2845be642221dd56d)
Author: Luo Jie <luojie at nlsde.buaa.edu.cn>
Date: Thu May 24 11:02:28 2007 -0700
Fix os/utils.c compile with mingw.
diff --git a/os/utils.c b/os/utils.c
index 5058285..dd5acd3 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -64,8 +64,10 @@ OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/Xos.h>
#include <stdio.h>
#include <time.h>
+#if !defined(WIN32) || !defined(__MINGW32__)
#include <sys/time.h>
#include <sys/resource.h>
+#endif
#include "misc.h"
#include <X11/X.h>
#define XSERV_t
@@ -527,6 +529,13 @@ GiveUp(int sig)
errno = olderrno;
}
+#if defined WIN32 && defined __MINGW32__
+_X_EXPORT CARD32
+GetTimeInMillis (void)
+{
+ return GetTickCount ();
+}
+#else
_X_EXPORT CARD32
GetTimeInMillis(void)
{
@@ -541,6 +550,7 @@ GetTimeInMillis(void)
X_GETTIMEOFDAY(&tv);
return(tv.tv_sec * 1000) + (tv.tv_usec / 1000);
}
+#endif
_X_EXPORT void
AdjustWaitForDelay (pointer waitTime, unsigned long newdelay)
@@ -798,11 +808,13 @@ ProcessCommandLine(int argc, char *argv[
}
else if ( strcmp( argv[i], "-core") == 0)
{
- struct rlimit core_limit;
CoreDump = TRUE;
+#if !defined(WIN32) || !defined(__MINGW32__)
+ struct rlimit core_limit;
getrlimit (RLIMIT_CORE, &core_limit);
core_limit.rlim_cur = core_limit.rlim_max;
setrlimit (RLIMIT_CORE, &core_limit);
+#endif
}
else if ( strcmp( argv[i], "-dpi") == 0)
{
diff-tree 1f48995d66c0072caa7e5ce2845be642221dd56d (from 8f98be7db303bc3db650054efb86843c70114451)
Author: Luo Jie <luojie at nlsde.buaa.edu.cn>
Date: Thu May 24 11:01:15 2007 -0700
Fix build of composite, dix, and randr when Xinerama is disabled.
diff --git a/composite/compext.c b/composite/compext.c
index ba37e7d..bea8bcf 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -696,11 +696,13 @@ CompositeExtensionInit (void)
if (GetPictureScreenIfSet(pScreen) == NULL)
return;
}
+#ifdef PANORAMIX
/* Xinerama's rewriting of window drawing before Composite gets to it
* breaks Composite.
*/
if (!noPanoramiXExtension)
return;
+#endif
CompositeClientWindowType = CreateNewResourceType (FreeCompositeClientWindow);
if (!CompositeClientWindowType)
diff --git a/dix/events.c b/dix/events.c
index bc6b6ae..887cbcd 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -695,6 +695,13 @@ XineramaChangeToCursor(CursorPtr cursor)
}
}
+#else
+#define SyntheticMotion(x, y) \
+ PostSyntheticMotion(x, y, \
+ 0, \
+ syncEvents.playingEvents ? \
+ syncEvents.time.milliseconds : \
+ currentTime.milliseconds);
#endif /* PANORAMIX */
diff --git a/randr/Makefile.am b/randr/Makefile.am
index 9bf0e65..20b0f72 100644
--- a/randr/Makefile.am
+++ b/randr/Makefile.am
@@ -2,6 +2,8 @@ noinst_LTLIBRARIES = librandr.la
AM_CFLAGS = $(DIX_CFLAGS)
+XINERAMA_SRCS = rrxinerama.c
+
if XORG
sdk_HEADERS = randrstr.h
endif
@@ -18,5 +20,9 @@ librandr_la_SOURCES = \
rrpointer.c \
rrproperty.c \
rrscreen.c \
- rrsdispatch.c \
- rrxinerama.c
+ rrsdispatch.c
+
+if XINERAMA
+librandr_la_SOURCES += ${XINERAMA_SRCS}
+endif
+
diff --git a/randr/randr.c b/randr/randr.c
index 4dd0ee5..958f9c1 100644
--- a/randr/randr.c
+++ b/randr/randr.c
@@ -358,8 +358,9 @@ RRExtensionInit (void)
SRRScreenChangeNotifyEvent;
EventSwapVector[RREventBase + RRNotify] = (EventSwapPtr)
SRRNotifyEvent;
-
+#ifdef PANORAMIX
RRXineramaExtensionInit();
+#endif
}
static int
diff-tree 8f98be7db303bc3db650054efb86843c70114451 (from 9616a042855399f0ee9c6489ea824621ea5fee18)
Author: Eric Anholt <eric at anholt.net>
Date: Thu May 24 11:00:04 2007 -0700
Fix bswap detection on BSD (mis-added '_' in function names).
diff --git a/configure.ac b/configure.ac
index d7d00e2..37199cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,19 +123,19 @@ b = __swap16(a);
], [SYS_ENDIAN__SWAP='yes'], [SYS_ENDIAN__SWAP='no'])
AC_MSG_RESULT([$SYS_ENDIAN__SWAP])
- AC_MSG_CHECKING([for bswap_16 variant of <sys/endian.h> byteswapping macros])
+ AC_MSG_CHECKING([for bswap16 variant of <sys/endian.h> byteswapping macros])
AC_LINK_IFELSE([AC_LANG_PROGRAM([
#include <sys/endian.h>
], [
int a = 1, b;
-b = bswap_16(a);
+b = bswap16(a);
])
], [SYS_ENDIAN_BSWAP='yes'], [SYS_ENDIAN_BSWAP='no'])
AC_MSG_RESULT([$SYS_ENDIAN_BSWAP])
if test "$SYS_ENDIAN_BSWAP" = "yes" ; then
USE_SYS_ENDIAN_H=yes
- BSWAP=bswap_
+ BSWAP=bswap
else
if test "$SYS_ENDIAN__SWAP" = "yes" ; then
USE_SYS_ENDIAN_H=yes
diff-tree 9616a042855399f0ee9c6489ea824621ea5fee18 (from 649e7f82d8d4333443493056b81eb20d6cf022bc)
Author: Matthias Drochner <drochner at netbsd.org>
Date: Tue Apr 10 16:15:40 2007 -0700
Fix build on NetBSD/amd64.
diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c
index f4ea3f5..ae16b78 100644
--- a/hw/xfree86/os-support/bsd/i386_video.c
+++ b/hw/xfree86/os-support/bsd/i386_video.c
@@ -50,6 +50,11 @@
#include <machine/mtrr.h>
#include <machine/sysarch.h>
#include <sys/queue.h>
+#ifdef __x86_64__
+#define i386_set_mtrr x86_64_set_mtrr
+#define i386_get_mtrr x86_64_get_mtrr
+#define i386_iopl x86_64_iopl
+#endif
#endif
#if defined(__OpenBSD__) && defined(__amd64__)
More information about the xorg-commit
mailing list