merge ^/branches/released .

2 files changed, 160 insertions, 180 deletions

diff --git a/xorg-server/hw/xnest/Events.c b/xorg-server/hw/xnest/Events.c
index 4e3fe86d1..2abc6c73c 100644
--- a/xorg-server/hw/xnest/Events.c
+++ b/xorg-server/hw/xnest/Events.c
@@ -43,8 +43,6 @@ is" without express or implied warranty.
 

 CARD32 lastEventTime = 0;

 

-extern EventList *xnestEvents;

-

 void

 ProcessInputEvents(void)

 {

@@ -104,23 +102,17 @@ xnestCollectExposures(void)
 void

 xnestQueueKeyEvent(int type, unsigned int keycode)

 {

-  int i, n;

-

-  GetEventList(&xnestEvents);

   lastEventTime = GetTimeInMillis();

-  n = GetKeyboardEvents(xnestEvents, xnestKeyboardDevice, type, keycode, NULL);

-  for (i = 0; i < n; i++)

-    mieqEnqueue(xnestKeyboardDevice, (InternalEvent*)(xnestEvents + i)->event);

+  QueueKeyboardEvents(xnestKeyboardDevice, type, keycode, NULL);

 }

 

 void

 xnestCollectEvents(void)

 {

   XEvent X;

-  int i, n, valuators[2];

+  int valuators[2];

   ValuatorMask mask;

   ScreenPtr pScreen;

-  GetEventList(&xnestEvents);

 

   while (XCheckIfEvent(xnestDisplay, &X, xnestNotExposurePredicate, NULL)) {

     switch (X.type) {

@@ -138,20 +130,16 @@ xnestCollectEvents(void)
       valuator_mask_set_range(&mask, 0, 0, NULL);

       xnestUpdateModifierState(X.xkey.state);

       lastEventTime = GetTimeInMillis();

-      n = GetPointerEvents(xnestEvents, xnestPointerDevice, ButtonPress,

-                           X.xbutton.button, POINTER_RELATIVE, &mask);

-      for (i = 0; i < n; i++)

-        mieqEnqueue(xnestPointerDevice, (InternalEvent*)(xnestEvents + i)->event);

+      QueuePointerEvents(xnestPointerDevice, ButtonPress,

+                         X.xbutton.button, POINTER_RELATIVE, &mask);

       break;

       

     case ButtonRelease:

       valuator_mask_set_range(&mask, 0, 0, NULL);

       xnestUpdateModifierState(X.xkey.state);

       lastEventTime = GetTimeInMillis();

-      n = GetPointerEvents(xnestEvents, xnestPointerDevice, ButtonRelease,

-                           X.xbutton.button, POINTER_RELATIVE, &mask);

-      for (i = 0; i < n; i++)

-        mieqEnqueue(xnestPointerDevice, (InternalEvent*)(xnestEvents + i)->event);

+      QueuePointerEvents(xnestPointerDevice, ButtonRelease,

+                         X.xbutton.button, POINTER_RELATIVE, &mask);

       break;

       

     case MotionNotify:

@@ -159,10 +147,8 @@ xnestCollectEvents(void)
       valuators[1] = X.xmotion.y;

       valuator_mask_set_range(&mask, 0, 2, valuators);

       lastEventTime = GetTimeInMillis();

-      n = GetPointerEvents(xnestEvents, xnestPointerDevice, MotionNotify,

-                           0, POINTER_ABSOLUTE, &mask);

-      for (i = 0; i < n; i++)

-        mieqEnqueue(xnestPointerDevice, (InternalEvent*)(xnestEvents + i)->event);

+      QueuePointerEvents(xnestPointerDevice, MotionNotify,

+                         0, POINTER_ABSOLUTE, &mask);

       break;

       

     case FocusIn:

@@ -193,10 +179,8 @@ xnestCollectEvents(void)
           valuators[1] = X.xcrossing.y;

           valuator_mask_set_range(&mask, 0, 2, valuators);

           lastEventTime = GetTimeInMillis();

-          n = GetPointerEvents(xnestEvents, xnestPointerDevice, MotionNotify,

-                               0, POINTER_ABSOLUTE, &mask);

-          for (i = 0; i < n; i++)

-            mieqEnqueue(xnestPointerDevice, (InternalEvent*)(xnestEvents + i)->event);

+          QueuePointerEvents(xnestPointerDevice, MotionNotify,

+                             0, POINTER_ABSOLUTE, &mask);

 	  xnestDirectInstallColormaps(pScreen);

 	}

       }

diff --git a/xorg-server/hw/xnest/Init.c b/xorg-server/hw/xnest/Init.c
index 8a90cc65e..174ce035d 100644
--- a/xorg-server/hw/xnest/Init.c
+++ b/xorg-server/hw/xnest/Init.c
@@ -1,154 +1,150 @@
-/*
-
-Copyright 1993 by Davor Matic
-
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation.  Davor Matic makes no representations about
-the suitability of this software for any purpose.  It is provided "as
-is" without express or implied warranty.
-
-*/
-
-#ifdef HAVE_XNEST_CONFIG_H
-#include <xnest-config.h>
-#endif
-
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include "screenint.h"
-#include "input.h"
-#include "misc.h"
-#include "scrnintstr.h"
-#include "windowstr.h"
-#include "servermd.h"
-#include "mi.h"
-#include <X11/fonts/fontstruct.h>
-
-#include "Xnest.h"
-
-#include "Display.h"
-#include "Screen.h"
-#include "Pointer.h"
-#include "Keyboard.h"
-#include "Handlers.h"
-#include "Init.h"
-#include "Args.h"
-#include "Drawable.h"
-#include "XNGC.h"
-#include "XNFont.h"
-#ifdef DPMSExtension
-#include "dpmsproc.h"
-#endif
-
-Bool xnestDoFullGeneration = True;
-
-EventList *xnestEvents = NULL;
-
-void
-InitOutput(ScreenInfo *screenInfo, int argc, char *argv[])
-{
-  int i, j;
-
-  xnestOpenDisplay(argc, argv);
-  
-  screenInfo->imageByteOrder = ImageByteOrder(xnestDisplay);
-  screenInfo->bitmapScanlineUnit = BitmapUnit(xnestDisplay);
-  screenInfo->bitmapScanlinePad = BitmapPad(xnestDisplay);
-  screenInfo->bitmapBitOrder = BitmapBitOrder(xnestDisplay);
-  
-  screenInfo->numPixmapFormats = 0;
-  for (i = 0; i < xnestNumPixmapFormats; i++) 
-    for (j = 0; j < xnestNumDepths; j++)
-      if ((xnestPixmapFormats[i].depth == 1) ||
-          (xnestPixmapFormats[i].depth == xnestDepths[j])) {
-	screenInfo->formats[screenInfo->numPixmapFormats].depth = 
-	  xnestPixmapFormats[i].depth;
-	screenInfo->formats[screenInfo->numPixmapFormats].bitsPerPixel = 
-	  xnestPixmapFormats[i].bits_per_pixel;
-	screenInfo->formats[screenInfo->numPixmapFormats].scanlinePad = 
-	  xnestPixmapFormats[i].scanline_pad;
-	screenInfo->numPixmapFormats++;
-	break;
-      }
-  
-  xnestFontPrivateIndex = AllocateFontPrivateIndex();
-  
-  if (!xnestNumScreens) xnestNumScreens = 1;
-
-  for (i = 0; i < xnestNumScreens; i++)
-    AddScreen(xnestOpenScreen, argc, argv);
-
-  xnestNumScreens = screenInfo->numScreens;
-
-  xnestDoFullGeneration = xnestFullGeneration;
-}
-
-void
-InitInput(int argc, char *argv[])
-{
-  int rc;
-  rc = AllocDevicePair(serverClient, "Xnest",
-                       &xnestPointerDevice,
-                       &xnestKeyboardDevice,
-                       xnestPointerProc,
-                       xnestKeyboardProc,
-                       FALSE);
-
-  if (rc != Success)
-      FatalError("Failed to init Xnest default devices.\n");
-
-  GetEventList(&xnestEvents);
-
-  mieqInit();
-
-  AddEnabledDevice(XConnectionNumber(xnestDisplay));
-
-  RegisterBlockAndWakeupHandlers(xnestBlockHandler, xnestWakeupHandler, NULL);
-}
-
-void
-CloseInput(void)
-{
-}
-
-/*
- * DDX - specific abort routine.  Called by AbortServer().
- */
-void AbortDDX(void)
-{
-  xnestDoFullGeneration = True;
-  xnestCloseDisplay();
-}
-
-/* Called by GiveUp(). */
-void ddxGiveUp(void)
-{
-  AbortDDX();
-}
-
-#ifdef __APPLE__
-void
-DarwinHandleGUI(int argc, char *argv[])
-{
-}
-#endif
-
-void OsVendorInit(void)
-{
-    return;
-}
-
-void OsVendorFatalError(void)
-{
-    return;
-}
-
-#if defined(DDXBEFORERESET)
-void ddxBeforeReset(void)
-{
-    return;
-}
-#endif
+/*

+

+Copyright 1993 by Davor Matic

+

+Permission to use, copy, modify, distribute, and sell this software

+and its documentation for any purpose is hereby granted without fee,

+provided that the above copyright notice appear in all copies and that

+both that copyright notice and this permission notice appear in

+supporting documentation.  Davor Matic makes no representations about

+the suitability of this software for any purpose.  It is provided "as

+is" without express or implied warranty.

+

+*/

+

+#ifdef HAVE_XNEST_CONFIG_H

+#include <xnest-config.h>

+#endif

+

+#include <X11/X.h>

+#include <X11/Xproto.h>

+#include "screenint.h"

+#include "input.h"

+#include "misc.h"

+#include "scrnintstr.h"

+#include "windowstr.h"

+#include "servermd.h"

+#include "mi.h"

+#include <X11/fonts/fontstruct.h>

+

+#include "Xnest.h"

+

+#include "Display.h"

+#include "Screen.h"

+#include "Pointer.h"

+#include "Keyboard.h"

+#include "Handlers.h"

+#include "Init.h"

+#include "Args.h"

+#include "Drawable.h"

+#include "XNGC.h"

+#include "XNFont.h"

+#ifdef DPMSExtension

+#include "dpmsproc.h"

+#endif

+

+Bool xnestDoFullGeneration = True;

+

+void

+InitOutput(ScreenInfo *screenInfo, int argc, char *argv[])

+{

+  int i, j;

+

+  xnestOpenDisplay(argc, argv);

+  

+  screenInfo->imageByteOrder = ImageByteOrder(xnestDisplay);

+  screenInfo->bitmapScanlineUnit = BitmapUnit(xnestDisplay);

+  screenInfo->bitmapScanlinePad = BitmapPad(xnestDisplay);

+  screenInfo->bitmapBitOrder = BitmapBitOrder(xnestDisplay);

+  

+  screenInfo->numPixmapFormats = 0;

+  for (i = 0; i < xnestNumPixmapFormats; i++) 

+    for (j = 0; j < xnestNumDepths; j++)

+      if ((xnestPixmapFormats[i].depth == 1) ||

+          (xnestPixmapFormats[i].depth == xnestDepths[j])) {

+	screenInfo->formats[screenInfo->numPixmapFormats].depth = 

+	  xnestPixmapFormats[i].depth;

+	screenInfo->formats[screenInfo->numPixmapFormats].bitsPerPixel = 

+	  xnestPixmapFormats[i].bits_per_pixel;

+	screenInfo->formats[screenInfo->numPixmapFormats].scanlinePad = 

+	  xnestPixmapFormats[i].scanline_pad;

+	screenInfo->numPixmapFormats++;

+	break;

+      }

+  

+  xnestFontPrivateIndex = AllocateFontPrivateIndex();

+  

+  if (!xnestNumScreens) xnestNumScreens = 1;

+

+  for (i = 0; i < xnestNumScreens; i++)

+    AddScreen(xnestOpenScreen, argc, argv);

+

+  xnestNumScreens = screenInfo->numScreens;

+

+  xnestDoFullGeneration = xnestFullGeneration;

+}

+

+void

+InitInput(int argc, char *argv[])

+{

+  int rc;

+  rc = AllocDevicePair(serverClient, "Xnest",

+                       &xnestPointerDevice,

+                       &xnestKeyboardDevice,

+                       xnestPointerProc,

+                       xnestKeyboardProc,

+                       FALSE);

+

+  if (rc != Success)

+      FatalError("Failed to init Xnest default devices.\n");

+

+  mieqInit();

+

+  AddEnabledDevice(XConnectionNumber(xnestDisplay));

+

+  RegisterBlockAndWakeupHandlers(xnestBlockHandler, xnestWakeupHandler, NULL);

+}

+

+void

+CloseInput(void)

+{

+}

+

+/*

+ * DDX - specific abort routine.  Called by AbortServer().

+ */

+void AbortDDX(void)

+{

+  xnestDoFullGeneration = True;

+  xnestCloseDisplay();

+}

+

+/* Called by GiveUp(). */

+void ddxGiveUp(void)

+{

+  AbortDDX();

+}

+

+#ifdef __APPLE__

+void

+DarwinHandleGUI(int argc, char *argv[])

+{

+}

+#endif

+

+void OsVendorInit(void)

+{

+    return;

+}

+

+void OsVendorFatalError(void)

+{

+    return;

+}

+

+#if defined(DDXBEFORERESET)

+void ddxBeforeReset(void)

+{

+    return;

+}

+#endif