frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'whot/for-keith'

This commit is contained in:
Keith Packard 2014-11-24 15:39:51 -08:00
parent 65cc0982af 0f88d4e793
commit ec0ac8970b
336 changed files with 1596 additions and 1584 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Xext/shm.c
View File

@ -1147,7 +1147,7 @@ ProcShmAttachFd(ClientPtr client)
fd, 0); fd, 0);
close(fd); close(fd);
if ((shmdesc->addr == ((char *) -1))) { if (shmdesc->addr == ((char *) -1)) {
free(shmdesc); free(shmdesc);
return BadAccess; return BadAccess;
} }
@ -1237,7 +1237,7 @@ ProcShmCreateSegment(ClientPtr client)
MAP_SHARED, MAP_SHARED,
fd, 0); fd, 0);
if ((shmdesc->addr == ((char *) -1))) { if (shmdesc->addr == ((char *) -1)) {
close(fd); close(fd);
free(shmdesc); free(shmdesc);
return BadAccess; return BadAccess;

2
dix/devices.c
View File

@ -2622,7 +2622,7 @@ GetPairedDevice(DeviceIntPtr dev)
* slave. * slave.
* - MASTER_KEYBOARD: the master keyboard for this device or NULL for a * - MASTER_KEYBOARD: the master keyboard for this device or NULL for a
* floating slave * floating slave
* - MASTER_POINTER: the master keyboard for this device or NULL for a * - MASTER_POINTER: the master pointer for this device or NULL for a
* floating slave * floating slave
* - POINTER_OR_FLOAT: the master pointer for this device or the device for * - POINTER_OR_FLOAT: the master pointer for this device or the device for
* a floating slave * a floating slave

2
dix/inpututils.c
View File

@ -239,8 +239,10 @@ build_modmap_from_modkeymap(CARD8 *modmap, KeyCode *modkeymap,
if (!modkeymap[i]) if (!modkeymap[i])
continue; continue;
#if MAP_LENGTH < 256
if (modkeymap[i] >= MAP_LENGTH) if (modkeymap[i] >= MAP_LENGTH)
return BadValue; return BadValue;
#endif
if (modmap[modkeymap[i]]) if (modmap[modkeymap[i]])
return BadValue; return BadValue;

2
dix/window.c
View File

@ -3243,7 +3243,7 @@ CheckWindowOptionalNeed(WindowPtr w)
return; return;
if (optional->userProps != NULL) if (optional->userProps != NULL)
return; return;
if (optional->backingBitPlanes != ~0L) if (optional->backingBitPlanes != (CARD32)~0L)
return; return;
if (optional->backingPixel != 0) if (optional->backingPixel != 0)
return; return;

4
hw/xfree86/common/Makefile.am
View File

@ -103,4 +103,8 @@ if LNXACPI
XORG_CFLAGS += -DHAVE_ACPI XORG_CFLAGS += -DHAVE_ACPI
endif endif
if NEED_DBUS
XORG_CFLAGS += $(DBUS_CFLAGS)
endif
AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)

1
hw/xwayland/xwayland.c
View File

@ -656,6 +656,7 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv)
return ret; return ret;
} }
_X_NORETURN
static void _X_ATTRIBUTE_PRINTF(1, 0) static void _X_ATTRIBUTE_PRINTF(1, 0)
xwl_log_handler(const char *format, va_list args) xwl_log_handler(const char *format, va_list args)
{ {

2
include/dbus-core.h
View File

@ -27,7 +27,7 @@
#define DBUS_CORE_H #define DBUS_CORE_H
#ifdef NEED_DBUS #ifdef NEED_DBUS
typedef struct DBusConnection DBusConnection; #include <dbus/dbus.h>
typedef void (*dbus_core_connect_hook) (DBusConnection * connection, typedef void (*dbus_core_connect_hook) (DBusConnection * connection,
void *data); void *data);

2
include/list.h
View File

@ -117,7 +117,7 @@ struct xorg_list {
* Example: * Example:
* xorg_list_init(&bar->list_of_foos); * xorg_list_init(&bar->list_of_foos);
* *
* @param The list to initialized. * @param list The list to initialize
*/ */
static inline void static inline void
xorg_list_init(struct xorg_list *list) xorg_list_init(struct xorg_list *list)

2
include/misc.h
View File

@ -138,7 +138,7 @@ lswapl(uint32_t x)
static inline uint16_t static inline uint16_t
lswaps(uint16_t x) lswaps(uint16_t x)
{ {
return ((x & 0xff) << 8) | ((x >> 8) & 0xff); return (uint16_t)((x & 0xff) << 8) | ((x >> 8) & 0xff);
} }
#undef min #undef min

2
include/regionstr.h
View File

@ -125,7 +125,7 @@ RegionEnd(RegionPtr reg)
} }
static inline size_t static inline size_t
RegionSizeof(int n) RegionSizeof(size_t n)
{ {
return (sizeof(RegDataRec) + ((n) * sizeof(BoxRec))); return (sizeof(RegDataRec) + ((n) * sizeof(BoxRec)));
} }

5
mi/mipointer.c
View File

@ -553,10 +553,15 @@ miPointerMoveNoEvent(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
* The coordinates provided are always absolute. The parameter mode whether * The coordinates provided are always absolute. The parameter mode whether
* it was relative or absolute movement that landed us at those coordinates. * it was relative or absolute movement that landed us at those coordinates.
* *
* If the cursor was constrained by a barrier, ET_Barrier* events may be
* generated and appended to the InternalEvent list provided.
*
* @param pDev The device to move * @param pDev The device to move
* @param mode Movement mode (Absolute or Relative) * @param mode Movement mode (Absolute or Relative)
* @param[in,out] screenx The x coordinate in desktop coordinates * @param[in,out] screenx The x coordinate in desktop coordinates
* @param[in,out] screeny The y coordinate in desktop coordinates * @param[in,out] screeny The y coordinate in desktop coordinates
* @param[in,out] nevents The number of events in events (before/after)
* @param[in,out] events The list of events before/after being constrained
*/ */
ScreenPtr ScreenPtr
miPointerSetPosition(DeviceIntPtr pDev, int mode, double *screenx, miPointerSetPosition(DeviceIntPtr pDev, int mode, double *screenx,