xserver: Branch 'input-hotplug' - 16 commits
Daniel Stone
daniels at kemper.freedesktop.org
Mon Aug 7 16:54:21 EEST 2006
Xext/Makefile.am | 2
Xext/xres.c | 64 +++++++++++
configure.ac | 2
dix/events.c | 66 ++++++++++--
hw/darwin/Makefile.am | 5
hw/kdrive/ephyr/hostx.c | 6 -
hw/kdrive/src/kinput.c | 32 -----
hw/xfree86/Makefile.am | 1
hw/xfree86/doc/man/xorg.conf.man.pre | 3
hw/xfree86/dummylib/Makefile.am | 11 --
hw/xfree86/exa/Makefile.am | 2
hw/xfree86/loader/Makefile.am | 1
hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am | 1
mi/mieq.c | 9 -
14 files changed, 138 insertions(+), 67 deletions(-)
New commits:
diff-tree 98fdf874eeadd5b37413922d8afba8415d0c56bb (from 5c7001fef8ffc6e3d8585a37d3f79a9495be8ed0)
Author: Daniel Stone <daniel at fooishbar.org>
Date: Mon Aug 7 16:51:39 2006 +0300
move all autorepeat logic to DIX
Move core autorepeat logic for keyboards down to the DIX, remove it from
KDrive.
diff --git a/dix/events.c b/dix/events.c
index 5d6b28b..f87e850 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -4661,18 +4661,34 @@ WriteEventsToClient(ClientPtr pClient, i
}
}
+/**
+ * Convenience wrapper around GetKeyboardValuatorEvents, that takes no
+ * valuators.
+ */
int
GetKeyboardEvents(xEvent **xE, DeviceIntPtr pDev, int type, int key_code) {
return GetKeyboardValuatorEvents(xE, pDev, type, key_code, 0, NULL);
}
+/**
+ * Returns a set of keyboard events for KeyPress/KeyRelease, optionally
+ * also with valuator events. Handles Xi and XKB.
+ *
+ * xE will be set to an array of events, which must be freed by the user;
+ * the return value is the number of events in xE, which is not
+ * NULL-terminated.
+ *
+ * Note that this function recurses! If called for non-XKB, a repeating
+ * key press will trigger a matching KeyRelease, as well as the
+ * KeyPresses.
+ */
int GetKeyboardValuatorEvents(xEvent **xE, DeviceIntPtr pDev, int type,
int key_code, int num_valuators,
int *valuators) {
- int numEvents = 0, ms = 0, first_valuator = 0;
+ int numEvents = 0, numRepeatEvents = 0, ms = 0, first_valuator = 0, i = 0;
deviceKeyButtonPointer *kbp = NULL;
deviceValuator *xv = NULL;
- xEvent *ev = NULL;
+ xEvent *ev = NULL, *repeatEvents = NULL;
KeyClassPtr ckeyc;
#ifdef XKB
xkbNewKeyboardNotify nkn;
@@ -4693,10 +4709,44 @@ int GetKeyboardValuatorEvents(xEvent **x
if (num_valuators)
numEvents += (num_valuators % 6) + 1;
+ /* Handle core repeating, via press/release/press/release.
+ * FIXME: In theory, if you're repeating with two keyboards,
+ * you could get unbalanced events here. */
+ if (type == KeyPress &&
+ ((pDev->key->down[key_code >> 3] & (key_code & 7)) & 1)
+#ifdef XKB
+ && noXkbExtension
+#endif
+ ) {
+ if (!pDev->kbdfeed->ctrl.autoRepeat ||
+ pDev->key->modifierMap[key_code] ||
+ !(pDev->kbdfeed->ctrl.autoRepeats[key_code >> 3]
+ & (1 << (key_code & 7))))
+ return 0;
+ numEvents += GetKeyboardValuatorEvents(&repeatEvents, pDev,
+ KeyRelease, key_code,
+ num_valuators, valuators);
+ }
+ else if (type == KeyRelease &&
+ !((pDev->key->down[key_code >> 3] & (key_code & 7)) & 1)
+#ifdef XKB
+ && noXkbExtension
+#endif
+ ) {
+ return;
+ }
+
ev = (xEvent *)xcalloc(sizeof(xEvent), numEvents);
if (!ev)
return 0;
+ if (repeatEvents) {
+ for (i = 0; i < numRepeatEvents; i++) {
+ ev = repeatEvents++;
+ ev++;
+ }
+ }
+
*xE = ev;
ms = GetTimeInMillis();
@@ -4791,7 +4841,7 @@ int GetKeyboardValuatorEvents(xEvent **x
}
#ifdef DEBUG
- ErrorF("GKE: putting out %d events with detail %d\n", numEvents, key_code);
+ ErrorF("GKVE: putting out %d events with detail %d\n", numEvents, key_code);
#endif
return numEvents;
@@ -4855,6 +4905,13 @@ acceleratePointer(DeviceIntPtr pDev, int
}
}
+/**
+ * Generate a series of xEvents (returned in xE) representing pointer
+ * motion, or button presses. Xi and XKB-aware.
+ *
+ * xE is not NULL-terminated; the return value is the number of events.
+ * The user is responsible for freeing these events.
+ */
int
GetPointerEvents(xEvent **xE, DeviceIntPtr pDev, int type, int buttons,
int flags, int num_valuators, int *valuators) {
@@ -4990,9 +5047,6 @@ GetPointerEvents(xEvent **xE, DeviceIntP
kbp->detail = buttons;
}
- /* XXX: the spec says that Device{Key,Button}{Press,Release} events
- * for relative devices shouldn't contain valuators since only the
- * state field will have meaning, but I don't see why. */
if (num_valuators > 2 && (type == MotionNotify ||
flags & POINTER_ABSOLUTE)) {
kbp->deviceid |= MORE_EVENTS;
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 6d33c31..e8a00dc 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -1943,34 +1943,6 @@ KdEnqueueKeyboardEvent(KdKeyboardInfo
type = KeyPress;
}
- /*
- * Check pressed keys which are already down
- */
- if (IsKeyDown (ki, key_code) && type == KeyPress) {
- /*
- * Check auto repeat
- */
- if (!ctrl->autoRepeat || keyc->modifierMap[key_code] ||
- !(ctrl->autoRepeats[key_code >> 3] & (1 << (key_code & 7))))
- return;
-
- /*
- * X delivers press/release even for autorepeat
- */
- nEvents = GetKeyboardEvents(&xE, ki->dixdev, KeyRelease, key_code);
- for (i = 0; i < nEvents; i++)
- KdQueueEvent(xE++);
- nEvents = GetKeyboardEvents(&xE, ki->dixdev, KeyPress, key_code);
- for (i = 0; i < nEvents; i++)
- KdQueueEvent(xE++);
- }
- /*
- * Check released keys which are already up
- */
- else if (!IsKeyDown (ki, key_code) && type == KeyRelease) {
- return;
- }
-
KdCheckSpecialKeys(ki, type, key_code);
KdHandleKeyboardEvent(ki, type, key_code);
nEvents = GetKeyboardEvents(&xE, ki->dixdev, type, key_code);
diff-tree 5c7001fef8ffc6e3d8585a37d3f79a9495be8ed0 (from c85e64cba1d2d88f676ca7cf23b52a6f8219e90e)
Author: Daniel Stone <daniel at fooishbar.org>
Date: Mon Aug 7 16:51:09 2006 +0300
memcpy() events in
memcpy events into our event structure instead of doing pointer assignment.
diff --git a/mi/mieq.c b/mi/mieq.c
index 0d9dcb8..3d44ee7 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -51,7 +51,7 @@ in this Software without prior written a
#define QUEUE_SIZE 256
typedef struct _Event {
- xEvent event[2];
+ xEvent event[7];
int nevents;
ScreenPtr pScreen;
DeviceIntPtr pDev;
@@ -101,6 +101,7 @@ mieqEnqueue (xEvent *e)
#ifdef DEBUG
ErrorF("mieqEnqueue: slamming an event on to the queue from %d\n", kbp->deviceid & DEVICE_BITS);
+ ErrorF(" type %d, detail %d\n", e->u.u.type, e->u.u.detail);
#endif
if (e->u.u.type == MotionNotify) {
@@ -122,9 +123,8 @@ mieqEnqueue (xEvent *e)
/* We silently steal valuator events: just tack them on to the last
* motion event they need to be attached to. Sigh. */
if (e->u.u.type == DeviceValuator) {
- if (laste->nevents >= 6) {
+ if (laste->nevents > 6) {
ErrorF("mieqEnqueue: more than six valuator events; dropping.\n");
- free(e);
return;
}
if (oldtail == miEventQueue.head ||
@@ -134,10 +134,9 @@ mieqEnqueue (xEvent *e)
((lastkbp->deviceid & DEVICE_BITS) !=
(v->deviceid & DEVICE_BITS))) {
ErrorF("mieqEnequeue: out-of-order valuator event; dropping.\n");
- free(e);
return;
}
- laste->event[laste->nevents++] = *e;
+ memcpy(&(laste->event[laste->nevents++]), e, sizeof(xEvent));
return;
}
else if (e->u.u.type == DeviceMotionNotify) {
@@ -161,13 +160,12 @@ mieqEnqueue (xEvent *e)
/* Toss events which come in late */
if (newtail == miEventQueue.head) {
ErrorF("tossed event which came in late\n");
- free(e);
return;
}
miEventQueue.tail = newtail;
}
- miEventQueue.events[oldtail].event[0] = *e;
+ memcpy(&(miEventQueue.events[oldtail].event[0]), e, sizeof(xEvent));
miEventQueue.events[oldtail].nevents = 1;
/*
@@ -238,7 +236,5 @@ void mieqProcessInputEvents ()
++miEventQueue.head;
(*e->pDev->public.processInputProc)(e->event, e->pDev, e->nevents);
}
-
- free(e->event);
}
}
diff-tree c85e64cba1d2d88f676ca7cf23b52a6f8219e90e (from parents)
Merge: a406f6bfeaa46e3236f7ab46813fe6c30b936a35 f54b71b772a1f587394ae3968782b611e52f0e2d
Author: Daniel Stone <daniel at fooishbar.org>
Date: Mon Aug 7 15:54:55 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
diff-tree f54b71b772a1f587394ae3968782b611e52f0e2d (from 39169fd373b97f34923f6494d697d9429d0b8aa3)
Author: David Nusinow <david at nee.(none)>
Date: Sun Aug 6 18:11:00 2006 +0000
Document enable/disable flag for AIGLX in xorg.conf manpage.
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index 77d4856..3340af0 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -602,6 +602,9 @@ the keymap for a mapping to the
.B Terminate
action and, if found, use XKEYBOARD for processing actions, otherwise
the builtin handler will be used.
+.TP 7
+.BI "Option \*qAIGLX\*q \*q" boolean \*q
+enable or disable AIGLX. AIGLX is enabled by default.
.SH MODULE SECTION
The
.B Module
diff-tree a406f6bfeaa46e3236f7ab46813fe6c30b936a35 (from 997ba45b192f21810099ed888792a45f1677a9ce)
Author: Daniel Stone <daniel at fooishbar.org>
Date: Fri Aug 4 12:40:19 2006 +0300
mieq: don't leak events
free all events posted through mieqEnqueue.
diff --git a/mi/mieq.c b/mi/mieq.c
index 8dbf166..0d9dcb8 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -124,6 +124,7 @@ mieqEnqueue (xEvent *e)
if (e->u.u.type == DeviceValuator) {
if (laste->nevents >= 6) {
ErrorF("mieqEnqueue: more than six valuator events; dropping.\n");
+ free(e);
return;
}
if (oldtail == miEventQueue.head ||
@@ -133,6 +134,7 @@ mieqEnqueue (xEvent *e)
((lastkbp->deviceid & DEVICE_BITS) !=
(v->deviceid & DEVICE_BITS))) {
ErrorF("mieqEnequeue: out-of-order valuator event; dropping.\n");
+ free(e);
return;
}
laste->event[laste->nevents++] = *e;
@@ -159,6 +161,7 @@ mieqEnqueue (xEvent *e)
/* Toss events which come in late */
if (newtail == miEventQueue.head) {
ErrorF("tossed event which came in late\n");
+ free(e);
return;
}
miEventQueue.tail = newtail;
@@ -235,5 +238,7 @@ void mieqProcessInputEvents ()
++miEventQueue.head;
(*e->pDev->public.processInputProc)(e->event, e->pDev, e->nevents);
}
+
+ free(e->event);
}
}
diff-tree 997ba45b192f21810099ed888792a45f1677a9ce (from 87fe85f38b6f781bf0e2eb555526e3d77779f9fa)
Author: Daniel Stone <daniel at fooishbar.org>
Date: Fri Aug 4 11:18:16 2006 +0300
fix incorrect button test
Test for n (1..nButtons) being under nButtons, not button (1..(1<<nButtons)).
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index f072ef1..6d33c31 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -2087,7 +2087,7 @@ KdEnqueuePointerEvent(KdPointerInfo *pi,
buttons = flags;
- for (button = KD_BUTTON_1, n = 1; button <= pi->nButtons;
+ for (button = KD_BUTTON_1, n = 1; n <= pi->nButtons;
button <<= 1, n++) {
if (((pi->buttonState & button) ^ (buttons & button)) &&
!(buttons & button)) {
@@ -2098,7 +2098,7 @@ KdEnqueuePointerEvent(KdPointerInfo *pi,
dixflags, FALSE);
}
}
- for (button = KD_BUTTON_1, n = 1; button <= pi->nButtons;
+ for (button = KD_BUTTON_1, n = 1; n <= pi->nButtons;
button <<= 1, n++) {
if (((pi->buttonState & button) ^ (buttons & button)) &&
(buttons & button)) {
diff-tree 39169fd373b97f34923f6494d697d9429d0b8aa3 (from b74c845a1233f78b841ff8840272c50873300c20)
Author: Matthew Allum <mallum at polystyrene.(none)>
Date: Tue Aug 1 13:39:22 2006 +0100
Back out 'mystery' spurious host window hints.
diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
index 32a46dc..d0a2f2f 100644
--- a/hw/kdrive/ephyr/hostx.c
+++ b/hw/kdrive/ephyr/hostx.c
@@ -533,15 +533,9 @@ hostx_screen_init (int width, int height
/* Ask the WM to keep our size static */
size_hints = XAllocSizeHints();
-#if 0
size_hints->max_width = size_hints->min_width = width;
size_hints->max_height = size_hints->min_height = height;
size_hints->flags = PMinSize|PMaxSize;
-#else
- size_hints->min_width = 100;
- size_hints->min_height = 100;
- size_hints->flags = PMinSize;
-#endif
XSetWMNormalHints(HostX.dpy, HostX.win, size_hints);
XFree(size_hints);
diff-tree b74c845a1233f78b841ff8840272c50873300c20 (from parents)
Merge: 3112a6c4f26d5e9258b8def7ce4109b4bd408c67 02daa6bb103e53e5a33db2bb6acbe57d0bf2c30e
Author: Ian Romanick <idr at umwelt.(none)>
Date: Mon Jul 31 10:26:06 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
diff-tree 3112a6c4f26d5e9258b8def7ce4109b4bd408c67 (from 24051ef97406f28c102cf46a78223400b61fdae2)
Author: Ian Romanick <idr at umwelt.(none)>
Date: Mon Jul 31 10:25:31 2006 -0700
Noting uses libdummy.a, so don't build it. Only libdummy-nonserver.a
is actually used.
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 525c4e0..67bfd80 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -40,7 +40,6 @@ XORG_LIBS = \
libosandcommon.la \
rac/librac.a \
parser/libxf86config.a \
- dummylib/libdummy.a \
dixmods/libdixmods.la \
@XORG_LIBS@
diff --git a/hw/xfree86/dummylib/Makefile.am b/hw/xfree86/dummylib/Makefile.am
index bd69b57..d89ee59 100644
--- a/hw/xfree86/dummylib/Makefile.am
+++ b/hw/xfree86/dummylib/Makefile.am
@@ -2,7 +2,7 @@
# libdummy-nonserver.a contains additional routines normally found in the
# server for use in building the utilities like scanpci & the config tools
-noinst_LIBRARIES = libdummy.a libdummy-nonserver.a
+noinst_LIBRARIES = libdummy-nonserver.a
INCLUDES = $(XORG_INCS)
@@ -12,15 +12,6 @@ if NEED_STRLCAT
STRL_SRCS = $(top_srcdir)/os/strlcat.c $(top_srcdir)/os/strlcpy.c
endif
-libdummy_a_SOURCES = getvalidbios.c getemptypci.c \
- pcitestmulti.c xf86allocscripi.c \
- xf86addrestolist.c xf86drvmsg.c xf86drvmsgverb.c \
- xf86getverb.c \
- xf86opt.c xf86screens.c xf86servisinit.c xf86verbose.c \
- #xf86errorf.c xf86errorfverb.c xf86msg.c xf86msgverb.c \
- #logvwrite.c verrorf.c xf86info.c xalloc.c fatalerror.c \
- #$(srcdir)/../os-support/shared/sigiostubs.c
-
libdummy_nonserver_a_SOURCES = \
fatalerror.c \
getvalidbios.c \
diff-tree 02daa6bb103e53e5a33db2bb6acbe57d0bf2c30e (from 24051ef97406f28c102cf46a78223400b61fdae2)
Author: Matthew Allum <mallum at polystyrene.(none)>
Date: Mon Jul 31 17:32:05 2006 +0100
Improve XRes to;
- Better estimate general pixmap memory usage.
- Account for pixmaps shared between clients.
- Account for window background and border pixmaps,
and GC stripple and tile pixmaps.
diff --git a/Xext/xres.c b/Xext/xres.c
index 3e82316..1617337 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -19,6 +19,8 @@
#include "swaprep.h"
#include <X11/extensions/XResproto.h>
#include "pixmapstr.h"
+#include "windowstr.h"
+#include "gcstruct.h"
#include "modinit.h"
static int
@@ -154,6 +156,7 @@ ProcXResQueryClientResources (ClientPtr
swapl (&rep.length, n);
swapl (&rep.num_types, n);
}
+
WriteToClient (client,sizeof(xXResQueryClientResourcesReply),(char*)&rep);
if(num_types) {
@@ -185,13 +188,54 @@ ProcXResQueryClientResources (ClientPtr
return (client->noClientException);
}
+static unsigned long
+ResGetApproxPixmapBytes (PixmapPtr pix)
+{
+ unsigned long nPixels;
+ int bytesPerPixel;
+
+ bytesPerPixel = pix->drawable.bitsPerPixel>>3;
+ nPixels = pix->drawable.width * pix->drawable.height;
+
+ /* Divide by refcnt as pixmap could be shared between clients,
+ * so total pixmap mem is shared between these.
+ */
+ return ( nPixels * bytesPerPixel ) / pix->refcnt;
+}
+
static void
ResFindPixmaps (pointer value, XID id, pointer cdata)
{
unsigned long *bytes = (unsigned long *)cdata;
PixmapPtr pix = (PixmapPtr)value;
- *bytes += (pix->devKind * pix->drawable.height);
+ *bytes += ResGetApproxPixmapBytes(pix);
+}
+
+static void
+ResFindWindowPixmaps (pointer value, XID id, pointer cdata)
+{
+ unsigned long *bytes = (unsigned long *)cdata;
+ WindowPtr pWin = (WindowPtr)value;
+
+ if (pWin->backgroundState == BackgroundPixmap)
+ *bytes += ResGetApproxPixmapBytes(pWin->background.pixmap);
+
+ if (pWin->border.pixmap != NULL && !pWin->borderIsPixel)
+ *bytes += ResGetApproxPixmapBytes(pWin->border.pixmap);
+}
+
+static void
+ResFindGCPixmaps (pointer value, XID id, pointer cdata)
+{
+ unsigned long *bytes = (unsigned long *)cdata;
+ GCPtr pGC = (GCPtr)value;
+
+ if (pGC->stipple != NULL)
+ *bytes += ResGetApproxPixmapBytes(pGC->stipple);
+
+ if (pGC->tile.pixmap != NULL && !pGC->tileIsPixel)
+ *bytes += ResGetApproxPixmapBytes(pGC->tile.pixmap);
}
static int
@@ -218,6 +262,24 @@ ProcXResQueryClientPixmapBytes (ClientPt
FindClientResourcesByType(clients[clientID], RT_PIXMAP, ResFindPixmaps,
(pointer)(&bytes));
+ /*
+ * Make sure win background pixmaps also held to account.
+ */
+ FindClientResourcesByType(clients[clientID], RT_WINDOW,
+ ResFindWindowPixmaps,
+ (pointer)(&bytes));
+
+ /*
+ * GC Tile & Stipple pixmaps too.
+ */
+ FindClientResourcesByType(clients[clientID], RT_GC,
+ ResFindGCPixmaps,
+ (pointer)(&bytes));
+
+#ifdef COMPOSITE
+ /* FIXME: include composite pixmaps too */
+#endif
+
rep.type = X_Reply;
rep.sequenceNumber = client->sequence;
rep.length = 0;
diff-tree 24051ef97406f28c102cf46a78223400b61fdae2 (from ecb7d43a76d507d04891ab7f189b23be5eccda51)
Author: Daniel Stone <daniel at fooishbar.org>
Date: Sun Jul 30 12:15:33 2006 +0300
remove filename that's too long for tar
diff --git a/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am b/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
index 7cdfd8e..e7ddb6c 100644
--- a/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
@@ -17,7 +17,6 @@ dist_xpc_DATA = \
LubalinGraph-Book.pmf \
LubalinGraph-DemiOblique.pmf \
LubalinGraph-Demi.pmf \
- NewCenturySchlbk-BoldItalic.pmf \
NewCenturySchlbk-Bold.pmf \
NewCenturySchlbk-Italic.pmf \
NewCenturySchlbk-Roman.pmf \
diff-tree ecb7d43a76d507d04891ab7f189b23be5eccda51 (from bf2d7499c84c94f228d03b21448f5688b3cda1a8)
Author: Daniel Stone <daniel at fooishbar.org>
Date: Sun Jul 30 11:52:41 2006 +0300
add sym.h to sources
diff --git a/hw/xfree86/loader/Makefile.am b/hw/xfree86/loader/Makefile.am
index 357af77..0306723 100644
--- a/hw/xfree86/loader/Makefile.am
+++ b/hw/xfree86/loader/Makefile.am
@@ -30,4 +30,5 @@ libloader_a_SOURCES = \
fontsym.c \
misym.c \
xf86sym.c \
+ sym.h \
$(SPARC_SOURCES)
diff-tree bf2d7499c84c94f228d03b21448f5688b3cda1a8 (from e87e68634d8eb66ab783e2802e2d5d12ff1031be)
Author: Daniel Stone <daniel at fooishbar.org>
Date: Sun Jul 30 11:17:02 2006 +0300
add securitysrv.h
diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index fde0550..ad3f98e 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -66,7 +66,7 @@ BUILTIN_SRCS += $(XINERAMA_SRCS)
endif
# Security extension: multi-level security to protect clients from each other
-XCSECURITY_SRCS = security.c
+XCSECURITY_SRCS = security.c securitysrv.h
if XCSECURITY
BUILTIN_SRCS += $(XCSECURITY_SRCS)
diff-tree e87e68634d8eb66ab783e2802e2d5d12ff1031be (from ed0c807de9f07468385fcbd2e8a9c0737759a461)
Author: Daniel Stone <daniel at fooishbar.org>
Date: Sun Jul 30 11:11:59 2006 +0300
remove .cvsignores from EXTRA_DIST
diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am
index 8a5e981..542bfdb 100644
--- a/hw/darwin/Makefile.am
+++ b/hw/darwin/Makefile.am
@@ -54,7 +54,6 @@ EXTRA_DIST = \
darwinKeyboard.c \
darwinKeyboard.h \
darwinXinput.c \
- iokit/.cvsignore \
iokit/xfIOKit.c \
iokit/xfIOKitCursor.c \
iokit/xfIOKit.h \
@@ -66,11 +65,8 @@ EXTRA_DIST = \
quartz/cr/crFrame.m \
quartz/cr/cr.h \
quartz/cr/crScreen.m \
- quartz/cr/.cvsignore \
quartz/cr/XView.h \
quartz/cr/XView.m \
- quartz/.cvsignore \
- quartz/fullscreen/.cvsignore \
quartz/fullscreen/fullscreen.c \
quartz/fullscreen/quartzCursor.c \
quartz/fullscreen/quartzCursor.h \
@@ -98,7 +94,6 @@ EXTRA_DIST = \
quartz/XDarwinStartup.c \
quartz/XDarwinStartup.man \
quartz/xpr/appledri.c \
- quartz/xpr/.cvsignore \
quartz/xpr/dri.c \
quartz/xpr/dri.h \
quartz/xpr/dristruct.h \
diff-tree ed0c807de9f07468385fcbd2e8a9c0737759a461 (from a68dc013a33d867e65a7e76b3eec5947b862a5b4)
Author: Daniel Stone <daniel at fooishbar.org>
Date: Sun Jul 30 11:08:54 2006 +0300
bump to 1.1.99.3
diff --git a/configure.ac b/configure.ac
index c14187e..46b1280 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ dnl Process this file with autoconf to c
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.1.99.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.1.99.3, [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-tree a68dc013a33d867e65a7e76b3eec5947b862a5b4 (from 654619d76c779606f2315782fc01d1410399fa3b)
Author: Daniel Stone <daniel at fooishbar.org>
Date: Sun Jul 30 11:08:47 2006 +0300
remove README (which doesn't exist) from EXTRA_DIST
diff --git a/hw/xfree86/exa/Makefile.am b/hw/xfree86/exa/Makefile.am
index 1a2831c..31682c4 100644
--- a/hw/xfree86/exa/Makefile.am
+++ b/hw/xfree86/exa/Makefile.am
@@ -25,4 +25,4 @@ exa.$(DRIVER_MAN_SUFFIX): exa.man
-rm -f exa.$(DRIVER_MAN_SUFFIX)
$(LN_S) exa.man exa.$(DRIVER_MAN_SUFFIX)
-EXTRA_DIST = exa.man.pre README
+EXTRA_DIST = exa.man.pre
More information about the xorg-commit
mailing list