xserver: Branch 'input-hotplug' - 2 commits

[Daniel Stone]

 dix/events.c           |    9 ++++++++-
 hw/kdrive/src/kdrive.c |    2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
diff-tree cec284f2b3e948deb9e56a1a8519fddf693ab952 (from 45bce556e8665412b9f6e89f88ed5bedb41de1ba)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Thu Aug 10 18:03:58 2006 +0300

    kdrive: properly ifdef composite enabling

diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
index 05102ab..1cc2932 100644
--- a/hw/kdrive/src/kdrive.c
+++ b/hw/kdrive/src/kdrive.c
@@ -1396,9 +1396,11 @@ KdInitOutput (ScreenInfo    *pScreenInfo
     KdCardInfo	    *card;
     KdScreenInfo    *screen;
 
+#ifdef COMPOSITE
     /* kind of a hack: we want Composite enabled, but it's disabled per
      * default. */
     noCompositeExtension = FALSE;
+#endif
     
     if (!kdCardInfo)
     {
diff-tree 45bce556e8665412b9f6e89f88ed5bedb41de1ba (from 172d45b9b75f95c997d1e9358040eead496e2a06)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Thu Aug 10 18:02:47 2006 +0300

    GetMaximumEventsNum: be more conservative
    Be slightly more conservative in our maximum event count if we're using
    XKB (and thus don't need to count the extra repeat events).

diff --git a/dix/events.c b/dix/events.c
index 171e277..f1e2fd8 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -4672,7 +4672,14 @@ int
 GetMaximumEventsNum() {
     /* Two base events -- core and device, plus valuator events.  Multiply
      * by two if we're doing key repeats. */
-    return 2 * (2 + MAX_VALUATOR_EVENTS);
+    int ret = 2 + MAX_VALUATOR_EVENTS;
+
+#ifdef XKB
+    if (noXkbExtension)
+#endif
+        ret *= 2;
+
+    return ret;
 }
 
 /**