xserver git update 11/6/2010

8 files changed, 2215 insertions, 2211 deletions

diff --git a/xorg-server/hw/kdrive/ephyr/ephyr.c b/xorg-server/hw/kdrive/ephyr/ephyr.c
index 439a2b274..8ed97d614 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyr.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyr.c
@@ -343,13 +343,13 @@ ephyrInternalDamageRedisplay (ScreenPtr pScreen)
 

   pRegion = DamageRegion (scrpriv->pDamage);

 

-  if (REGION_NOTEMPTY (pScreen, pRegion))

+  if (RegionNotEmpty(pRegion))

     {

       int           nbox;

       BoxPtr        pbox;

 

-      nbox = REGION_NUM_RECTS (pRegion);

-      pbox = REGION_RECTS (pRegion);

+      nbox = RegionNumRects (pRegion);

+      pbox = RegionRects (pRegion);

 

       while (nbox--)

         {

@@ -897,10 +897,10 @@ ephyrExposePairedWindow (int a_remote)
 	return;

     }

     screen = pair->local->drawable.pScreen;

-    REGION_NULL (screen, &reg);

-    REGION_COPY (screen, &reg, &pair->local->clipList);

+    RegionNull(&reg);

+    RegionCopy(&reg, &pair->local->clipList);

     screen->WindowExposures (pair->local, &reg, NullRegion);

-    REGION_UNINIT (screen, &reg);

+    RegionUninit(&reg);

 }

 #endif /* XF86DRI */

 

diff --git a/xorg-server/hw/kdrive/ephyr/ephyrdriext.c b/xorg-server/hw/kdrive/ephyr/ephyrdriext.c
index 3d3d18a39..af411848f 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrdriext.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrdriext.c
@@ -109,10 +109,10 @@ static Bool findWindowPairFromLocal (WindowPtr a_local,
 

 static unsigned char DRIReqCode = 0;

 

-static int ephyrDRIWindowKeyIndex;

-static DevPrivateKey ephyrDRIWindowKey = &ephyrDRIWindowKeyIndex;

-static int ephyrDRIScreenKeyIndex;

-static DevPrivateKey ephyrDRIScreenKey = &ephyrDRIScreenKeyIndex;

+static DevPrivateKeyRec ephyrDRIWindowKeyRec;

+#define ephyrDRIWindowKey (&ephyrDRIWindowKeyRec)

+static DevPrivateKeyRec ephyrDRIScreenKeyRec;

+#define ephyrDRIScreenKey (&ephyrDRIScreenKeyRec)

 

 #define GET_EPHYR_DRI_WINDOW_PRIV(win) ((EphyrDRIWindowPrivPtr) \

     dixLookupPrivate(&(win)->devPrivates, ephyrDRIWindowKey))

@@ -418,11 +418,11 @@ ephyrDRIClipNotify (WindowPtr a_win,
         EPHYR_LOG_ERROR ("failed to get window pair\n") ;

         goto out ;

     }

-    rects = calloc(REGION_NUM_RECTS (&a_win->clipList),

+    rects = calloc(RegionNumRects (&a_win->clipList),

                      sizeof (EphyrRect)) ;

-    for (i=0; i < REGION_NUM_RECTS (&a_win->clipList); i++) {

+    for (i=0; i < RegionNumRects (&a_win->clipList); i++) {

         memmove (&rects[i],

-                 &REGION_RECTS (&a_win->clipList)[i],

+                 &RegionRects (&a_win->clipList)[i],

                  sizeof (EphyrRect)) ;

         rects[i].x1 -= a_win->drawable.x;

         rects[i].x2 -= a_win->drawable.x;

@@ -436,7 +436,7 @@ ephyrDRIClipNotify (WindowPtr a_win,
     is_ok = hostx_set_window_bounding_rectangles

                                 (pair->remote,

                                  rects,

-                                 REGION_NUM_RECTS (&a_win->clipList)) ;

+                                 RegionNumRects (&a_win->clipList)) ;

     is_ok = TRUE ;

 

 out:

@@ -1168,12 +1168,12 @@ ProcXF86DRIGetDrawableInfo (register ClientPtr client)
         return BadMatch ;

     }

     EPHYR_LOG ("clip list of xephyr gl drawable:\n") ;

-    for (i=0; i < REGION_NUM_RECTS (&window->clipList); i++) {

+    for (i=0; i < RegionNumRects (&window->clipList); i++) {

         EPHYR_LOG ("x1:%d, y1:%d, x2:%d, y2:%d\n",

-                   REGION_RECTS (&window->clipList)[i].x1,

-                   REGION_RECTS (&window->clipList)[i].y1,

-                   REGION_RECTS (&window->clipList)[i].x2,

-                   REGION_RECTS (&window->clipList)[i].y2) ;

+                   RegionRects (&window->clipList)[i].x1,

+                   RegionRects (&window->clipList)[i].y1,

+                   RegionRects (&window->clipList)[i].x2,

+                   RegionRects (&window->clipList)[i].y2) ;

     }

 

     if (!ephyrDRIGetDrawableInfo (stuff->screen,

diff --git a/xorg-server/hw/kdrive/ephyr/ephyrvideo.c b/xorg-server/hw/kdrive/ephyr/ephyrvideo.c
index 14213c966..0fd1a63d4 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrvideo.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrvideo.c
@@ -946,8 +946,8 @@ ephyrPutImage (KdScreenInfo *a_info,
                               a_drw_x, a_drw_y, a_drw_w, a_drw_h,

                               a_src_x, a_src_y, a_src_w, a_src_h,

                               a_width, a_height, a_buf,

-                              (EphyrHostBox*)REGION_RECTS (a_clipping_region),

-                              REGION_NUM_RECTS (a_clipping_region))) {

+                              (EphyrHostBox*)RegionRects (a_clipping_region),

+                              RegionNumRects (a_clipping_region))) {

         EPHYR_LOG_ERROR ("EphyrHostXVPutImage() failed\n") ;

         goto out ;

     }

@@ -1025,8 +1025,8 @@ ephyrReputImage (KdScreenInfo *a_info,
                               port_priv->src_w, port_priv->src_h,

                               port_priv->image_width, port_priv->image_height,

                               port_priv->image_buf,

-                              (EphyrHostBox*)REGION_RECTS (a_clipping_region),

-                              REGION_NUM_RECTS (a_clipping_region))) {

+                              (EphyrHostBox*)RegionRects (a_clipping_region),

+                              RegionNumRects (a_clipping_region))) {

         EPHYR_LOG_ERROR ("ephyrHostXVPutImage() failed\n") ;

         goto out ;

     }

@@ -1064,7 +1064,7 @@ ephyrPutVideo (KdScreenInfo *a_info,
     dst_box.y2 = a_drw_y + a_drw_h;

 

     if (!DoSimpleClip (&dst_box,

-                       REGION_EXTENTS (pScreen->pScreen, a_clipping_region),

+                       RegionExtents(a_clipping_region),

                        &clipped_area)) {

         EPHYR_LOG_ERROR ("failed to simple clip\n") ;

         goto out ;

@@ -1115,7 +1115,7 @@ ephyrGetVideo (KdScreenInfo *a_info,
     dst_box.y2 = a_drw_y + a_drw_h;

 

     if (!DoSimpleClip (&dst_box,

-                       REGION_EXTENTS (pScreen->pScreen, a_clipping_region),

+                       RegionExtents(a_clipping_region),

                        &clipped_area)) {

         EPHYR_LOG_ERROR ("failed to simple clip\n") ;

         goto out ;

@@ -1166,7 +1166,7 @@ ephyrPutStill (KdScreenInfo *a_info,
     dst_box.y2 = a_drw_y + a_drw_h;

 

     if (!DoSimpleClip (&dst_box,

-                       REGION_EXTENTS (pScreen->pScreen, a_clipping_region),

+                       RegionExtents(a_clipping_region),

                        &clipped_area)) {

         EPHYR_LOG_ERROR ("failed to simple clip\n") ;

         goto out ;

@@ -1217,7 +1217,7 @@ ephyrGetStill (KdScreenInfo *a_info,
     dst_box.y2 = a_drw_y + a_drw_h;

 

     if (!DoSimpleClip (&dst_box,

-                       REGION_EXTENTS (pScreen->pScreen, a_clipping_region),

+                       RegionExtents(a_clipping_region),

                        &clipped_area)) {

         EPHYR_LOG_ERROR ("failed to simple clip\n") ;

         goto out ;

diff --git a/xorg-server/hw/kdrive/ephyr/hostx.c b/xorg-server/hw/kdrive/ephyr/hostx.c
index d546370ba..0f03004ed 100644
--- a/xorg-server/hw/kdrive/ephyr/hostx.c
+++ b/xorg-server/hw/kdrive/ephyr/hostx.c
@@ -1,1456 +1,1456 @@
-/*
- * Xephyr - A kdrive X server thats runs in a host X window.
- *          Authored by Matthew Allum <mallum@o-hand.com>
- * 
- * Copyright © 2004 Nokia 
- *
- * 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, and that the name of Nokia not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Nokia makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * NOKIA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL NOKIA BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <kdrive-config.h>
-#endif
-
-/*
- * including some server headers (like kdrive-config.h)
- * might define the macro _XSERVER64
- * on 64 bits machines. That macro must _NOT_ be defined for Xlib
- * client code, otherwise bad things happen.
- * So let's undef that macro if necessary.
- */
-#ifdef _XSERVER64
-#undef _XSERVER64
-#endif
-
-
-#include "hostx.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h> 		/* for memset */
-#include <time.h>
-
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <sys/time.h>
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include <X11/keysym.h>
-#include <X11/extensions/XShm.h>
-#include <X11/extensions/shape.h>
-#ifdef XF86DRI
-#include <GL/glx.h>
-#endif /* XF86DRI */
-#include "ephyrlog.h"
-
-#ifdef XF86DRI
-extern Bool XF86DRIQueryExtension (Display *dpy,
-                                   int *event_basep,
-                                   int *error_basep);
-#endif
-
-/*  
- * All xlib calls go here, which gets built as its own .a .
- * Mixing kdrive and xlib headers causes all sorts of types
- * to get clobbered. 
- */
-
-struct EphyrHostScreen
-{
-  Window          win;
-  Window          win_pre_existing; 	/* Set via -parent option like xnest */
-  Window          peer_win;          /* Used for GL; should be at most one */
-  XImage         *ximg;
-  int             win_width, win_height;
-  int             server_depth;
-  unsigned char  *fb_data;   	/* only used when host bpp != server bpp */
-  XShmSegmentInfo shminfo;
-
-  void           *info;   /* Pointer to the screen this is associated with */
-  int             mynum;  /* Screen number */
-};
-
-struct EphyrHostXVars
-{
-  char           *server_dpy_name;
-  Display        *dpy;
-  int             screen;
-  Visual         *visual;
-  Window          winroot;
-  GC              gc;
-  int             depth;
-  Bool            use_host_cursor;
-  Bool            use_fullscreen;
-  Bool            have_shm;
-
-  int             n_screens;
-  struct EphyrHostScreen *screens;
-
-  long            damage_debug_msec;
-
-  unsigned long   cmap[256];
-};
-
-/* memset ( missing> ) instead of below  */
-/*static EphyrHostXVars HostX = { "?", 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};*/
-static EphyrHostXVars HostX;
-
-static int            HostXWantDamageDebug = 0;
-
-extern EphyrKeySyms   ephyrKeySyms;
-
-extern int            monitorResolution;
-
-char           *ephyrResName = NULL;
-int             ephyrResNameFromCmd = 0;
-char	       *ephyrTitle = NULL;
-
-static void
-hostx_set_fullscreen_hint(void);
-
-/* X Error traps */
-
-static int trapped_error_code = 0;
-static int (*old_error_handler) (Display *d, XErrorEvent *e);
-
-#define host_depth_matches_server(_vars) (HostX.depth == (_vars)->server_depth)
-
-static struct EphyrHostScreen *
-host_screen_from_screen_info (EphyrScreenInfo *screen)
-{
-  int i;
-
-  for (i = 0 ; i < HostX.n_screens ; i++)
-    {
-      if ( HostX.screens[i].info == screen)
-        {
-          return &HostX.screens[i];
-        }
-    }
-  return NULL;
-}
-
-static int
-error_handler(Display     *display,
-              XErrorEvent *error)
-{
-  trapped_error_code = error->error_code;
-  return 0;
-}
-
-static void
-hostx_errors_trap(void)
-{
-  trapped_error_code = 0;
-  old_error_handler = XSetErrorHandler(error_handler);
-}
-
-static int
-hostx_errors_untrap(void)
-{
-  XSetErrorHandler(old_error_handler);
-  return trapped_error_code;
-}
-
-int
-hostx_want_screen_size (EphyrScreenInfo screen, int *width, int *height )
-{
-  struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);
-
-  if (host_screen &&
-       (host_screen->win_pre_existing != None ||
-         HostX.use_fullscreen == True))
-    {
-      *width  = host_screen->win_width;
-      *height = host_screen->win_height;
-      return 1;
-    }
-
- return 0;
-}
-
-void
-hostx_add_screen (EphyrScreenInfo screen,
-                  unsigned long win_id,
-                  int screen_num)
-{
-  int index = HostX.n_screens;
-
-  HostX.n_screens += 1;
-  HostX.screens = realloc (HostX.screens,
-                           HostX.n_screens * sizeof(struct EphyrHostScreen));
-  memset (&HostX.screens[index], 0, sizeof (struct EphyrHostScreen));
-
-  HostX.screens[index].info       = screen;
-  HostX.screens[index].win_pre_existing = win_id;
-}
-
-
-void
-hostx_set_display_name (char *name)
-{
-  HostX.server_dpy_name = strdup (name);
-}
-
-void
-hostx_set_screen_number(EphyrScreenInfo screen, int number)
-{
-  struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);
-  if (host_screen) {
-    host_screen->mynum = number;
-    hostx_set_win_title (host_screen->info, "") ;
-  }}
-
-void
-hostx_set_win_title (EphyrScreenInfo screen, char *extra_text)
-{
-    struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);
-
-    if (!host_screen)
-    return;
-
-    if (ephyrTitle) {
-      XStoreName(HostX.dpy, host_screen->win, ephyrTitle);
-    } else {
-#define BUF_LEN 256
-      char buf[BUF_LEN+1];
-
-      memset (buf, 0, BUF_LEN+1) ;
-      snprintf (buf, BUF_LEN, "Xephyr on %s.%d %s", 
-		HostX.server_dpy_name, 
-		host_screen->mynum,
-		(extra_text != NULL) ? extra_text : "");
-
-      XStoreName (HostX.dpy, host_screen->win, buf);
-    }
-}
-
-int
-hostx_want_host_cursor (void)
-{
-  return HostX.use_host_cursor;
-}
-
-void
-hostx_use_host_cursor (void)
-{
-  HostX.use_host_cursor = True;
-}
-
-int
-hostx_want_preexisting_window (EphyrScreenInfo screen)
-{
-  struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);
-
-  if (host_screen && host_screen->win_pre_existing)
-    {
-      return 1;
-    }
-  else
-    {
-    return 0;
-    }
-}
-
-void
-hostx_use_fullscreen (void)
-{
-  HostX.use_fullscreen = True;
-}
-
-int
-hostx_want_fullscreen (void)
-{
-  return HostX.use_fullscreen;
-}
-
-static void
-hostx_set_fullscreen_hint (void)
-{
-  Atom atom_WINDOW_STATE, atom_WINDOW_STATE_FULLSCREEN;
-  int index;
-
-  atom_WINDOW_STATE 
-    = XInternAtom(HostX.dpy, "_NET_WM_STATE", False);
-  atom_WINDOW_STATE_FULLSCREEN 
-    = XInternAtom(HostX.dpy, "_NET_WM_STATE_FULLSCREEN",False);
-
-  for (index = 0 ; index < HostX.n_screens ; index++)
-    {
-      XChangeProperty (HostX.dpy, HostX.screens[index].win,
-                       atom_WINDOW_STATE, XA_ATOM, 32,
-                       PropModeReplace,
-                       (unsigned char *)&atom_WINDOW_STATE_FULLSCREEN, 1);
-    }
-}
-
-
-static void
-hostx_toggle_damage_debug (void)
-{
-  HostXWantDamageDebug ^= 1;
-}
-
-void
-hostx_handle_signal (int signum)
-{
-  hostx_toggle_damage_debug();
-  EPHYR_DBG ("Signal caught. Damage Debug:%i\n",
-              HostXWantDamageDebug);
-}
-
-void
-hostx_use_resname (char *name, int fromcmd)
-{
-  ephyrResName = name;
-  ephyrResNameFromCmd = fromcmd;
-}
-
-void
-hostx_set_title (char *title)
-{
-  ephyrTitle = title;
-}
-
-int
-hostx_init (void)
-{
-  XSetWindowAttributes  attr;
-  Cursor                empty_cursor;
-  Pixmap                cursor_pxm;
-  XColor                col;
-  int                   index;
-  char                  *tmpstr;
-  XClassHint            *class_hint;
-
-  attr.event_mask =
-    ButtonPressMask
-    |ButtonReleaseMask
-    |PointerMotionMask
-    |KeyPressMask
-    |KeyReleaseMask
-    |ExposureMask;
-
-  EPHYR_DBG("mark");
-
-  if ((HostX.dpy = XOpenDisplay(getenv("DISPLAY"))) == NULL)
-    {
-      fprintf(stderr, "\nXephyr cannot open host display. Is DISPLAY set?\n");
-      exit(1);
-    }
-
-  HostX.screen  = DefaultScreen(HostX.dpy);
-  HostX.winroot = RootWindow(HostX.dpy, HostX.screen);
-  HostX.gc      = XCreateGC(HostX.dpy, HostX.winroot, 0, NULL);
-  HostX.depth   = DefaultDepth(HostX.dpy, HostX.screen);
-  HostX.visual  = DefaultVisual(HostX.dpy, HostX.screen);
-
-  class_hint = XAllocClassHint();
-
-  for (index = 0 ; index < HostX.n_screens ; index++)
-    {
-      struct EphyrHostScreen *host_screen = &HostX.screens[index];
-
-      host_screen->server_depth = HostX.depth;
-      if (host_screen->win_pre_existing != None)
-        {
-          Status            result;
-          XWindowAttributes prewin_attr;
-
-          /* Get screen size from existing window */
-
-          hostx_errors_trap();
-
-          result = XGetWindowAttributes (HostX.dpy,
-                                         host_screen->win_pre_existing,
-                                         &prewin_attr);
-
-
-          if (hostx_errors_untrap() || !result)
-          {
-              fprintf (stderr, "\nXephyr -parent window' does not exist!\n");
-              exit (1);
-          }
-
-          host_screen->win_width  = prewin_attr.width;
-          host_screen->win_height = prewin_attr.height;
-
-          host_screen->win = XCreateWindow (HostX.dpy,
-                                            host_screen->win_pre_existing,
-                                            0,0,
-                                            host_screen->win_width,
-                                            host_screen->win_height,
-                                            0,
-                                            CopyFromParent,
-                                            CopyFromParent,
-                                            CopyFromParent,
-                                            CWEventMask,
-                                            &attr);
-        }
-      else
-        {
-          host_screen->win = XCreateWindow (HostX.dpy,
-                                            HostX.winroot,
-                                            0,0,100,100, /* will resize */
-                                            0,
-                                            CopyFromParent,
-                                            CopyFromParent,
-                                            CopyFromParent,
-                                            CWEventMask,
-                                            &attr);
-
-          hostx_set_win_title (host_screen->info,
-                               "(ctrl+shift grabs mouse and keyboard)");
-
-          if (HostX.use_fullscreen)
-            {
-              host_screen->win_width  = DisplayWidth(HostX.dpy, HostX.screen);
-              host_screen->win_height = DisplayHeight(HostX.dpy, HostX.screen);
-
-              hostx_set_fullscreen_hint();
-            }
-
-          if (class_hint) 
-            {
-              tmpstr = getenv("RESOURCE_NAME");
-              if (tmpstr && (!ephyrResNameFromCmd))
-                ephyrResName = tmpstr;
-              class_hint->res_name = ephyrResName;
-              class_hint->res_class = "Xephyr";
-              XSetClassHint(hostx_get_display(), host_screen->win, class_hint);
-
-            }
-
-        }
-    }
-
-  if (class_hint)
-      XFree(class_hint);
-
-  XParseColor (HostX.dpy, DefaultColormap (HostX.dpy,HostX.screen),
-               "red", &col);
-  XAllocColor (HostX.dpy, DefaultColormap (HostX.dpy, HostX.screen),
-               &col);
-  XSetForeground (HostX.dpy, HostX.gc, col.pixel);
-
-  if (!hostx_want_host_cursor ())
-    {
-      /* Ditch the cursor, we provide our 'own' */
-      cursor_pxm = XCreatePixmap (HostX.dpy, HostX.winroot, 1, 1, 1);
-      memset (&col, 0, sizeof (col));
-      empty_cursor = XCreatePixmapCursor (HostX.dpy,
-                                          cursor_pxm, cursor_pxm, 
-                                          &col, &col, 1, 1);
-      for ( index = 0 ; index < HostX.n_screens ; index++ )
-        {
-          XDefineCursor (HostX.dpy,
-                         HostX.screens[index].win,
-                         empty_cursor);
-        }
-      XFreePixmap (HostX.dpy, cursor_pxm);
-    }
-
-  for (index = 0 ; index < HostX.n_screens ; index++)
-    {
-      HostX.screens[index].ximg   = NULL;
-    }
-  /* Try to get share memory ximages for a little bit more speed */
-
-  if (!XShmQueryExtension(HostX.dpy) || getenv("XEPHYR_NO_SHM"))
-    {
-      fprintf(stderr, "\nXephyr unable to use SHM XImages\n");
-      HostX.have_shm = False;
-    }
-  else
-    {
-      /* Really really check we have shm - better way ?*/
-      XShmSegmentInfo shminfo;
-
-        HostX.have_shm = True;
-
-        shminfo.shmid=shmget(IPC_PRIVATE, 1, IPC_CREAT|0777);
-        shminfo.shmaddr=shmat(shminfo.shmid,0,0);
-        shminfo.readOnly=True;
-
-        hostx_errors_trap();
-
-        XShmAttach(HostX.dpy, &shminfo);
-        XSync(HostX.dpy, False);
-
-        if (hostx_errors_untrap())
-          {
-            fprintf(stderr, "\nXephyr unable to use SHM XImages\n");
-            HostX.have_shm = False;
-          }
-
-        shmdt(shminfo.shmaddr);
-        shmctl(shminfo.shmid, IPC_RMID, 0);
-}
-
-  XFlush(HostX.dpy);
-
-  /* Setup the pause time between paints when debugging updates */
-
-  HostX.damage_debug_msec = 20000; /* 1/50 th of a second */
-
-  if (getenv ("XEPHYR_PAUSE"))
-    {
-      HostX.damage_debug_msec = strtol (getenv ("XEPHYR_PAUSE"), NULL, 0);
-      EPHYR_DBG ("pause is %li\n", HostX.damage_debug_msec);
-    }
-
-  return 1;
-}
-
-int
-hostx_get_depth (void)
-{
-  return HostX.depth;
-}
-
-int
-hostx_get_server_depth (EphyrScreenInfo screen)
-{
-  struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);
-
-  return (host_screen ? host_screen->server_depth : 0);
-}
-
-void
-hostx_set_server_depth (EphyrScreenInfo screen, int depth)
-{
-  struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);
-
-  if (host_screen)
-    host_screen->server_depth = depth;
-}
-
-int
-hostx_get_bpp (EphyrScreenInfo screen)
-{
-  struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);
-
-  if (!host_screen)
-    return 0;
-
-  if (host_depth_matches_server (host_screen))
-    return HostX.visual->bits_per_rgb;
-  else
-    return host_screen->server_depth; /*XXX correct ?*/
-}
-
-void
-hostx_get_visual_masks (EphyrScreenInfo screen,
-			CARD32 *rmsk,
-			CARD32 *gmsk,
-			CARD32 *bmsk)
-{
-  struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);
-
-  if (!host_screen)
-    return;
-
-  if (host_depth_matches_server(host_screen))
-    {
-      *rmsk = HostX.visual->red_mask;
-      *gmsk = HostX.visual->green_mask;
-      *bmsk = HostX.visual->blue_mask;
-    }
-  else if (host_screen->server_depth == 16)
-    {
-      /* Assume 16bpp 565 */
-      *rmsk = 0xf800;
-      *gmsk = 0x07e0;
-      *bmsk = 0x001f;
-    }
-  else
-    {
-      *rmsk = 0x0;
-      *gmsk = 0x0;
-      *bmsk = 0x0;
-    }
-}
-
-static int 
-hostx_calculate_color_shift(unsigned long mask)
-{
-    int shift = 1;
-    /* count # of bits in mask */
-    while ((mask = (mask >> 1))) shift++;
-    /* cmap entry is an unsigned char so adjust it by size of that */
-    shift = shift - sizeof(unsigned char) * 8;
-    if (shift < 0) shift = 0;
-    return shift;
-}
-
-void
-hostx_set_cmap_entry(unsigned char idx,
-		     unsigned char r,
-		     unsigned char g,
-		     unsigned char b)
-{
-/* need to calculate the shifts for RGB because server could be BGR. */
-/* XXX Not sure if this is correct for 8 on 16, but this works for 8 on 24.*/
-    static int rshift, bshift, gshift = 0;
-    static int first_time = 1;
-    if (first_time) {
-	first_time = 0;
-	rshift = hostx_calculate_color_shift(HostX.visual->red_mask);
-	gshift = hostx_calculate_color_shift(HostX.visual->green_mask);
-	bshift = hostx_calculate_color_shift(HostX.visual->blue_mask);
-    }
-    HostX.cmap[idx] = ((r << rshift) & HostX.visual->red_mask) |
-		      ((g << gshift) & HostX.visual->green_mask) |
-		      ((b << bshift) & HostX.visual->blue_mask);
-}
-
-/**
- * hostx_screen_init creates the XImage that will contain the front buffer of
- * the ephyr screen, and possibly offscreen memory.
- *
- * @param width width of the screen
- * @param height height of the screen
- * @param buffer_height  height of the rectangle to be allocated.
- *
- * hostx_screen_init() creates an XImage, using MIT-SHM if it's available.
- * buffer_height can be used to create a larger offscreen buffer, which is used
- * by fakexa for storing offscreen pixmap data.
- */
-void*
-hostx_screen_init (EphyrScreenInfo screen,
-                   int width, int height,
-                   int buffer_height)
-{
-  int         bitmap_pad;
-  Bool        shm_success = False;
-  XSizeHints *size_hints;
-
-  struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);
-  if (!host_screen)
-    {
-      fprintf (stderr, "%s: Error in accessing hostx data\n", __func__ );
-      exit(1);
-    }
-
-  EPHYR_DBG ("host_screen=%p wxh=%dx%d, buffer_height=%d",
-             host_screen, width, height, buffer_height);
-
-  if (host_screen->ximg != NULL)
-    {
-      /* Free up the image data if previously used
-       * i.ie called by server reset
-       */
-
-      if (HostX.have_shm)
-	{
-	  XShmDetach(HostX.dpy, &host_screen->shminfo);
-	  XDestroyImage (host_screen->ximg);
-	  shmdt(host_screen->shminfo.shmaddr);
-	  shmctl(host_screen->shminfo.shmid, IPC_RMID, 0);
-	}
-      else
-	{
-	  if (host_screen->ximg->data) 
-	    {
-	      free(host_screen->ximg->data);
-	      host_screen->ximg->data = NULL;
-	    } 
-
-	  XDestroyImage(host_screen->ximg);
-	}
-    }
-
-  if (HostX.have_shm)
-    {
-      host_screen->ximg = XShmCreateImage (HostX.dpy, HostX.visual, HostX.depth,
-                                           ZPixmap, NULL, &host_screen->shminfo,
-                                           width, buffer_height );
-
-      host_screen->shminfo.shmid =
-                      shmget(IPC_PRIVATE,
-                             host_screen->ximg->bytes_per_line * buffer_height,
-                             IPC_CREAT|0777);
-      host_screen->ximg->data = shmat(host_screen->shminfo.shmid, 0, 0);
-      host_screen->shminfo.shmaddr = host_screen->ximg->data;
-
-      if (host_screen->ximg->data == (char *)-1)
-	{
-	  EPHYR_DBG("Can't attach SHM Segment, falling back to plain XImages");
-	  HostX.have_shm = False;
-	  XDestroyImage(host_screen->ximg);
-	  shmctl(host_screen->shminfo.shmid, IPC_RMID, 0);
-	}
-      else
-	{
-	  EPHYR_DBG("SHM segment attached %p", host_screen->shminfo.shmaddr);
-	  host_screen->shminfo.readOnly = False;
-	  XShmAttach(HostX.dpy, &host_screen->shminfo);
-	  shm_success = True;
-	}
-    }
-
-  if (!shm_success)
-    {
-      bitmap_pad = ( HostX.depth > 16 )? 32 : (( HostX.depth > 8 )? 16 : 8 );
-
-      EPHYR_DBG("Creating image %dx%d for screen host_screen=%p\n",
-                width, buffer_height, host_screen );
-      host_screen->ximg = XCreateImage (HostX.dpy,
-                                        HostX.visual,
-                                        HostX.depth,
-                                        ZPixmap, 0, 0,
-                                        width,
-                                        buffer_height,
-                                        bitmap_pad,
-                                        0);
-
-      host_screen->ximg->data =
-              malloc (host_screen->ximg->bytes_per_line * buffer_height);
-    }
-
-  XResizeWindow (HostX.dpy, host_screen->win, width, height);
-
-  /* Ask the WM to keep our size static */
-  size_hints = XAllocSizeHints();
-  size_hints->max_width = size_hints->min_width = width;
-  size_hints->max_height = size_hints->min_height = height;
-  size_hints->flags = PMinSize|PMaxSize;
-  XSetWMNormalHints(HostX.dpy, host_screen->win, size_hints);
-  XFree(size_hints);
-
-  XMapWindow(HostX.dpy, host_screen->win);
-
-  XSync(HostX.dpy, False);
-
-  host_screen->win_width  = width;
-  host_screen->win_height = height;
-
-  if (host_depth_matches_server(host_screen))
-    {
-      EPHYR_DBG("Host matches server");
-      return host_screen->ximg->data;
-    }
-  else
-    {
-      EPHYR_DBG("server bpp %i", host_screen->server_depth>>3);
-      host_screen->fb_data = malloc(width*buffer_height*(host_screen->server_depth>>3));
-      return host_screen->fb_data;
-    }
-}
-
-static void hostx_paint_debug_rect (struct EphyrHostScreen *host_screen,
-                                    int x,     int y,
-                                    int width, int height);
-
-void
-hostx_paint_rect (EphyrScreenInfo screen,
-                  int sx,    int sy,
-                  int dx,    int dy,
-                  int width, int height)
-{
-  struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);
-
-  EPHYR_DBG ("painting in screen %d\n", host_screen->mynum) ;
-
-  /*
-   *  Copy the image data updated by the shadow layer
-   *  on to the window
-   */
-
-  if (HostXWantDamageDebug)
-    {
-      hostx_paint_debug_rect(host_screen, dx, dy, width, height);
-    }
-
-  /* 
-   * If the depth of the ephyr server is less than that of the host,
-   * the kdrive fb does not point to the ximage data but to a buffer
-   * ( fb_data ), we shift the various bits from this onto the XImage
-   * so they match the host.
-   *
-   * Note, This code is pretty new ( and simple ) so may break on 
-   *       endian issues, 32 bpp host etc. 
-   *       Not sure if 8bpp case is right either. 
-   *       ... and it will be slower than the matching depth case.
-   */
-
-  if (!host_depth_matches_server(host_screen))
-    {
-      int            x,y,idx, bytes_per_pixel = (host_screen->server_depth>>3);
-      unsigned char  r,g,b;
-      unsigned long  host_pixel;
-
-      EPHYR_DBG("Unmatched host depth host_screen=%p\n", host_screen);
-      for (y=sy; y<sy+height; y++)
-	for (x=sx; x<sx+width; x++)
-	  {
-	    idx = (host_screen->win_width*y*bytes_per_pixel)+(x*bytes_per_pixel);
-
-	    switch (host_screen->server_depth)
-	      {
-	      case 16:
-		{
-		  unsigned short pixel = *(unsigned short*)(host_screen->fb_data+idx);
-
-		  r = ((pixel & 0xf800) >> 8);
-		  g = ((pixel & 0x07e0) >> 3);
-		  b = ((pixel & 0x001f) << 3);
-
-		  host_pixel = (r << 16) | (g << 8) | (b);
-		  
-		  XPutPixel(host_screen->ximg, x, y, host_pixel);
-		  break;
-		}
-	      case 8:
-		{
-		  unsigned char pixel = *(unsigned char*)(host_screen->fb_data+idx);
-		  XPutPixel(host_screen->ximg, x, y, HostX.cmap[pixel]);
-		  break;
-		}
-	      default:
-		break;
-	      }
-	  }
-    }
-
-  if (HostX.have_shm)
-    {
-      XShmPutImage (HostX.dpy, host_screen->win,
-                    HostX.gc, host_screen->ximg,
-                    sx, sy, dx, dy, width, height, False);
-    }
-  else
-    {
-      XPutImage (HostX.dpy, host_screen->win, HostX.gc, host_screen->ximg, 
-                 sx, sy, dx, dy, width, height);
-    }
-
-  XSync (HostX.dpy, False);
-}
-
-static void
-hostx_paint_debug_rect (struct EphyrHostScreen *host_screen,
-                        int x,     int y,
-                        int width, int height)
-{
-  struct timespec tspec;
-
-  tspec.tv_sec  = HostX.damage_debug_msec / (1000000);
-  tspec.tv_nsec = (HostX.damage_debug_msec % 1000000) * 1000;
-
-  EPHYR_DBG("msec: %li tv_sec %li, tv_msec %li", 
-	    HostX.damage_debug_msec, tspec.tv_sec, tspec.tv_nsec);
-
-  /* fprintf(stderr, "Xephyr updating: %i+%i %ix%i\n", x, y, width, height); */
-
-  XFillRectangle (HostX.dpy, host_screen->win, HostX.gc, x, y, width,height);
-  XSync (HostX.dpy, False);
-
-  /* nanosleep seems to work better than usleep for me... */
-  nanosleep(&tspec, NULL);
-}
-
-void
-hostx_load_keymap(void)
-{
-  XID             *keymap;
-  int              host_width, min_keycode, max_keycode, width;
-  int              i,j;
-
-  XDisplayKeycodes (HostX.dpy, &min_keycode, &max_keycode);
-
-  EPHYR_DBG ("min: %d, max: %d", min_keycode, max_keycode);
-
-  keymap = XGetKeyboardMapping (HostX.dpy,
-			        min_keycode,
-			        max_keycode - min_keycode + 1,
-			        &host_width);
-
-  /* Try and copy the hosts keymap into our keymap to avoid loads
-   * of messing around.
-   *
-   * kdrive cannot can have more than 4 keysyms per keycode
-   * so we only copy at most the first 4 ( xorg has 6 per keycode, XVNC 2 )
-   */
-  width = (host_width > 4) ? 4 : host_width;
-
-  ephyrKeySyms.map = (CARD32 *)calloc(sizeof(CARD32),
-                                      (max_keycode - min_keycode + 1) *
-                                      width);
-  if (!ephyrKeySyms.map)
-        return;
-
-  for (i=0; i<(max_keycode - min_keycode+1); i++)
-    for (j=0; j<width; j++)
-      ephyrKeySyms.map[(i*width)+j] = (CARD32) keymap[(i*host_width) + j];
-
-  EPHYR_DBG("keymap width, host:%d kdrive:%d", host_width, width);
-
-  ephyrKeySyms.minKeyCode  = min_keycode;
-  ephyrKeySyms.maxKeyCode  = max_keycode;
-  ephyrKeySyms.mapWidth    = width;
-
-  XFree(keymap);
-}
-
-static struct EphyrHostScreen *
-host_screen_from_window (Window w)
-{
-  int index = 0;
-  struct EphyrHostScreen *result  = NULL;
-
-  for (index = 0 ; index < HostX.n_screens ; index++)
-    {
-      if (HostX.screens[index].win == w || HostX.screens[index].peer_win == w)
-        {
-          result = &HostX.screens[index];
-          goto out;
-        }
-    }
-
-out:
-  return result;
-}
-
-int
-hostx_get_event(EphyrHostXEvent *ev)
-{
-  XEvent      xev;
-  static int  grabbed_screen = -1;
-
-  if (XPending(HostX.dpy))
-    {
-      XNextEvent(HostX.dpy, &xev);
-
-      switch (xev.type) 
-	{
-	case Expose:
-	  /* Not so great event compression, but works ok */
-	  while (XCheckTypedWindowEvent(HostX.dpy, xev.xexpose.window,
-					Expose, &xev));
-	  {
-	    struct EphyrHostScreen *host_screen =
-                host_screen_from_window (xev.xexpose.window);
-            if (host_screen)
-              {
-                hostx_paint_rect (host_screen->info, 0, 0, 0, 0,
-                                  host_screen->win_width,
-                                  host_screen->win_height);
-              }
-            else
-              {
-                EPHYR_LOG_ERROR ("failed to get host screen\n");
-                ev->type = EPHYR_EV_EXPOSE;
-                ev->data.expose.window = xev.xexpose.window;
-                return 1;
-              }
-	  }
-	  return 0;
-
-	case MotionNotify:
-	  {
-	    struct EphyrHostScreen *host_screen =
-                host_screen_from_window (xev.xmotion.window);
-
-	    ev->type = EPHYR_EV_MOUSE_MOTION;
-	    ev->data.mouse_motion.x = xev.xmotion.x;
-	    ev->data.mouse_motion.y = xev.xmotion.y;
-	    ev->data.mouse_motion.window = xev.xmotion.window;
-	    ev->data.mouse_motion.screen = (host_screen ? host_screen->mynum : -1);
-	  }
-	  return 1;
-
-	case ButtonPress:
-	  ev->type = EPHYR_EV_MOUSE_PRESS;
-	  ev->key_state = xev.xkey.state;
-	  /* 
-	   * This is a bit hacky. will break for button 5 ( defined as 0x10 )
-           * Check KD_BUTTON defines in kdrive.h 
-	   */
-	  ev->data.mouse_down.button_num = 1<<(xev.xbutton.button-1);
-	  return 1;
-
-	case ButtonRelease:
-	  ev->type = EPHYR_EV_MOUSE_RELEASE;
-	  ev->key_state = xev.xkey.state;
-	  ev->data.mouse_up.button_num = 1<<(xev.xbutton.button-1);
-	  return 1;
-
-	case KeyPress:
-	  {
-	    ev->type = EPHYR_EV_KEY_PRESS;
-	    ev->key_state = xev.xkey.state;
-	    ev->data.key_down.scancode = xev.xkey.keycode;  
-	    return 1;
-	  }
-	case KeyRelease:
-
-	  if ((XKeycodeToKeysym(HostX.dpy,xev.xkey.keycode,0) == XK_Shift_L
-	       || XKeycodeToKeysym(HostX.dpy,xev.xkey.keycode,0) == XK_Shift_R)
-	      && (xev.xkey.state & ControlMask))
-	    {
-	      struct EphyrHostScreen *host_screen =
-                  host_screen_from_window (xev.xexpose.window);
-
-	      if (grabbed_screen != -1)
-		{
-		  XUngrabKeyboard (HostX.dpy, CurrentTime);
-		  XUngrabPointer (HostX.dpy, CurrentTime);
-		  grabbed_screen = -1;
-		  hostx_set_win_title (host_screen->info,
-                                       "(ctrl+shift grabs mouse and keyboard)");
-		}
-	      else
-		{
-		  /* Attempt grab */
-		  if (XGrabKeyboard (HostX.dpy, host_screen->win, True, 
-				     GrabModeAsync, 
-				     GrabModeAsync, 
-				     CurrentTime) == 0)
-		    {
-		      if (XGrabPointer (HostX.dpy, host_screen->win, True, 
-					NoEventMask, 
-					GrabModeAsync, 
-					GrabModeAsync, 
-					host_screen->win, None, CurrentTime) == 0)
-			{
-			  grabbed_screen = host_screen->mynum;
-			  hostx_set_win_title
-                                  (host_screen->info,
-                                   "(ctrl+shift releases mouse and keyboard)");
-			}
-		      else 	/* Failed pointer grabm  ungrab keyboard */
-			XUngrabKeyboard (HostX.dpy, CurrentTime);
-		    }
-		}
-	    }
-
-	  /* Still send the release event even if above has happened
-           * server will get confused with just an up event. 
-           * Maybe it would be better to just block shift+ctrls getting to
-           * kdrive all togeather. 
- 	   */
-	  ev->type = EPHYR_EV_KEY_RELEASE;
-	  ev->key_state = xev.xkey.state;
-	  ev->data.key_up.scancode = xev.xkey.keycode;
-	  return 1;
-
-	default:
-	  break;
-
-	}
-    }
-  return 0;
-}
-
-void*
-hostx_get_display(void)
-{
-    return HostX.dpy ;
-}
-
-int
-hostx_get_window (int a_screen_number)
-{
-    if (a_screen_number < 0 || a_screen_number >= HostX.n_screens) {
-        EPHYR_LOG_ERROR ("bad screen number:%d\n", a_screen_number) ;
-        return 0;
-    }
-    return HostX.screens[a_screen_number].win ;
-}
-
-int
-hostx_get_window_attributes (int a_window, EphyrHostWindowAttributes *a_attrs)
-{
-    XWindowAttributes attrs ;
-
-    memset (&attrs, 0, sizeof (attrs)) ;
-
-    if (!XGetWindowAttributes (hostx_get_display (),
-                               a_window,
-                               &attrs)) {
-        return FALSE ;
-    }
-    a_attrs->x = attrs.x ;
-    a_attrs->y = attrs.y ;
-    a_attrs->width = attrs.width ;
-    a_attrs->height = attrs.height ;
-    if (attrs.visual)
-        a_attrs->visualid = attrs.visual->visualid ;
-    return TRUE ;
-}
-
-int
-hostx_get_extension_info (const char *a_ext_name,
-                          int *a_major_opcode,
-                          int *a_first_event,
-                          int *a_first_error)
-{
-    if (!a_ext_name || !a_major_opcode || !a_first_event || !a_first_error)
-      return 0 ;
-   if (!XQueryExtension (HostX.dpy,
-                         a_ext_name,
-                         a_major_opcode,
-                         a_first_event,
-                         a_first_error))
-     {
-       return 0 ;
-     }
-   return 1 ;
-}
-
-int
-hostx_get_visuals_info (EphyrHostVisualInfo **a_visuals,
-                        int *a_num_entries)
-{
-    Display *dpy=hostx_get_display () ;
-    Bool is_ok=False ;
-    XVisualInfo templ, *visuals=NULL;
-    EphyrHostVisualInfo *host_visuals=NULL ;
-    int nb_items=0, i=0;
-
-    EPHYR_RETURN_VAL_IF_FAIL (a_visuals && a_num_entries && dpy,
-                              False) ;
-    EPHYR_LOG ("enter\n") ;
-    memset (&templ, 0, sizeof (templ)) ;
-    visuals = XGetVisualInfo (dpy, VisualNoMask, &templ, &nb_items) ;
-    if (!visuals) {
-        EPHYR_LOG_ERROR ("host does not advertise any visual\n") ;
-        goto out ;
-    }
-    EPHYR_LOG ("host advertises %d visuals\n", nb_items) ;
-    host_visuals = calloc (nb_items, sizeof (EphyrHostVisualInfo)) ;
-    for (i=0; i<nb_items; i++) {
-        host_visuals[i].visualid = visuals[i].visualid ;
-        host_visuals[i].screen = visuals[i].screen ;
-        host_visuals[i].depth = visuals[i].depth ;
-        host_visuals[i].class = visuals[i].class ;
-        host_visuals[i].red_mask = visuals[i].red_mask ;
-        host_visuals[i].green_mask = visuals[i].green_mask ;
-        host_visuals[i].blue_mask = visuals[i].blue_mask ;
-        host_visuals[i].colormap_size = visuals[i].colormap_size ;
-        host_visuals[i].bits_per_rgb = visuals[i].bits_per_rgb ;
-    }
-    *a_visuals = host_visuals ;
-    *a_num_entries = nb_items;
-    host_visuals=NULL;
-
-    is_ok = TRUE;
-out:
-    if (visuals) {
-        XFree (visuals) ;
-        visuals = NULL;
-    }
-    if (host_visuals) {
-        free (host_visuals) ;
-        host_visuals = NULL;
-    }
-    EPHYR_LOG ("leave\n") ;
-    return is_ok ;
-
-}
-
-int
-hostx_create_window (int a_screen_number,
-                     EphyrBox *a_geometry,
-                     int a_visual_id,
-                     int *a_host_peer /*out parameter*/)
-{
-    Bool is_ok=FALSE ;
-    Display *dpy=hostx_get_display () ;
-    XVisualInfo *visual_info=NULL, visual_info_templ;
-    int visual_mask=VisualIDMask ;
-    Window win=None ;
-    int nb_visuals=0, winmask=0;
-    XSetWindowAttributes attrs;
-
-    EPHYR_RETURN_VAL_IF_FAIL (dpy && a_geometry, FALSE) ;
-
-    EPHYR_LOG ("enter\n") ;
-
-     /*get visual*/
-    memset (&visual_info, 0, sizeof (visual_info)) ;
-    visual_info_templ.visualid = a_visual_id ;
-    visual_info = XGetVisualInfo (dpy, visual_mask,
-                                  &visual_info_templ,
-                                  &nb_visuals) ;
-    if (!visual_info) {
-        EPHYR_LOG_ERROR ("argh, could not find a remote visual with id:%d\n",
-                         a_visual_id) ;
-        goto out ;
-    }
-    memset (&attrs, 0, sizeof (attrs)) ;
-    attrs.colormap = XCreateColormap (dpy,
-                                      RootWindow (dpy,
-                                                  visual_info->screen),
-                                      visual_info->visual,
-                                      AllocNone) ;
-    attrs.event_mask = ButtonPressMask
-                       |ButtonReleaseMask
-                       |PointerMotionMask
-                       |KeyPressMask
-                       |KeyReleaseMask
-                       |ExposureMask;
-    winmask = CWColormap|CWEventMask;
-
-    win = XCreateWindow (dpy, hostx_get_window (a_screen_number),
-                         a_geometry->x, a_geometry->y,
-                         a_geometry->width, a_geometry->height, 0,
-                         visual_info->depth, CopyFromParent,
-                         visual_info->visual, winmask, &attrs) ;
-    if (win == None) {
-        EPHYR_LOG_ERROR ("failed to create peer window\n") ;
-        goto out ;
-    }
-    if (HostX.screens[a_screen_number].peer_win == None) {
-	HostX.screens[a_screen_number].peer_win = win;
-    } else {
-        EPHYR_LOG_ERROR ("multiple peer windows created for same screen\n") ;
-    }
-    XFlush (dpy) ;
-    XMapWindow (dpy, win) ;
-    *a_host_peer = win ;
-    is_ok = TRUE ;
-out:
-    EPHYR_LOG ("leave\n") ;
-    return is_ok ;
-}
-
-int
-hostx_destroy_window (int a_win)
-{
-    Display *dpy=hostx_get_display () ;
-
-    EPHYR_RETURN_VAL_IF_FAIL (dpy, FALSE) ;
-    XDestroyWindow (dpy, a_win) ;
-    XFlush (dpy) ;
-    return TRUE ;
-}
-
-int
-hostx_set_window_geometry (int a_win, EphyrBox *a_geo)
-{
-    Display *dpy=hostx_get_display ();
-
-    EPHYR_RETURN_VAL_IF_FAIL (dpy && a_geo, FALSE) ;
-
-    EPHYR_LOG ("enter. x,y,w,h:(%d,%d,%d,%d)\n",
-               a_geo->x, a_geo->y,
-               a_geo->width, a_geo->height) ;
-
-    XMoveWindow (dpy, a_win, a_geo->x, a_geo->y) ;
-    XResizeWindow (dpy, a_win, a_geo->width, a_geo->height) ;
-    EPHYR_LOG ("leave\n") ;
-    return TRUE;
-}
-
-int
-hostx_set_window_bounding_rectangles (int a_window,
-                                      EphyrRect *a_rects,
-                                      int a_num_rects)
-{
-    Bool is_ok=FALSE;
-    Display *dpy=hostx_get_display () ;
-    int i=0 ;
-    XRectangle *rects=NULL ;
-
-    EPHYR_RETURN_VAL_IF_FAIL (dpy && a_rects, FALSE) ;
-
-    EPHYR_LOG ("enter. num rects:%d\n", a_num_rects) ;
-
-    rects = calloc (a_num_rects, sizeof (XRectangle)) ;
-    for (i=0; i<a_num_rects; i++) {
-        rects[i].x = a_rects[i].x1 ;
-        rects[i].y = a_rects[i].y1 ;
-        rects[i].width = abs (a_rects[i].x2 - a_rects[i].x1);
-        rects[i].height = abs (a_rects[i].y2 - a_rects[i].y1) ;
-        EPHYR_LOG ("borders clipped to rect[x:%d,y:%d,w:%d,h:%d]\n",
-                   rects[i].x, rects[i].y,
-                   rects[i].width, rects[i].height) ;
-    }
-    /*this aways returns 1*/
-    XShapeCombineRectangles (dpy, a_window, ShapeBounding, 0, 0,
-                             rects, a_num_rects, ShapeSet, YXBanded) ;
-    is_ok = TRUE ;
-
-    if (rects) {
-        free (rects) ;
-        rects = NULL ;
-    }
-    EPHYR_LOG ("leave\n") ;
-    return is_ok;
-}
-
-int
-hostx_set_window_clipping_rectangles (int a_window,
-                                      EphyrRect *a_rects,
-                                      int a_num_rects)
-{
-    Bool is_ok=FALSE;
-    Display *dpy=hostx_get_display () ;
-    int i=0 ;
-    XRectangle *rects=NULL ;
-
-    EPHYR_RETURN_VAL_IF_FAIL (dpy && a_rects, FALSE) ;
-
-    EPHYR_LOG ("enter. num rects:%d\n", a_num_rects) ;
-
-    rects = calloc (a_num_rects, sizeof (XRectangle)) ;
-    for (i=0; i<a_num_rects; i++) {
-        rects[i].x = a_rects[i].x1 ;
-        rects[i].y = a_rects[i].y1 ;
-        rects[i].width = abs (a_rects[i].x2 - a_rects[i].x1);
-        rects[i].height = abs (a_rects[i].y2 - a_rects[i].y1) ;
-        EPHYR_LOG ("clipped to rect[x:%d,y:%d,w:%d,h:%d]\n",
-                   rects[i].x, rects[i].y,
-                   rects[i].width, rects[i].height) ;
-    }
-    /*this aways returns 1*/
-    XShapeCombineRectangles (dpy, a_window, ShapeClip, 0, 0,
-                             rects, a_num_rects, ShapeSet, YXBanded) ;
-    is_ok = TRUE ;
-
-    if (rects) {
-        free (rects) ;
-        rects = NULL ;
-    }
-    EPHYR_LOG ("leave\n") ;
-    return is_ok;
-}
-
-int
-hostx_has_xshape (void)
-{
-    int event_base=0, error_base=0 ;
-    Display *dpy=hostx_get_display () ;
-    if (!XShapeQueryExtension (dpy,
-                               &event_base,
-                               &error_base)) {
-        return FALSE ;
-    }
-    return TRUE;
-}
-
-#ifdef XF86DRI
-typedef struct {
-    int is_valid ;
-    int local_id ;
-    int remote_id ;
-} ResourcePair ;
-
-#define RESOURCE_PEERS_SIZE 1024*10
-static ResourcePair resource_peers[RESOURCE_PEERS_SIZE] ;
-
-
-int
-hostx_allocate_resource_id_peer (int a_local_resource_id,
-                                 int *a_remote_resource_id)
-{
-    int i=0 ;
-    ResourcePair *peer=NULL ;
-    Display *dpy=hostx_get_display ();
-
-    /*
-     * first make sure a resource peer
-     * does not exist already for
-     * a_local_resource_id
-     */
-    for (i=0; i<RESOURCE_PEERS_SIZE; i++) {
-        if (resource_peers[i].is_valid
-            && resource_peers[i].local_id == a_local_resource_id) {
-            peer = &resource_peers[i] ;
-            break ;
-        }
-    }
-    /*
-     * find one free peer entry, an feed it with
-     */
-    if (!peer) {
-        for (i=0; i<RESOURCE_PEERS_SIZE; i++) {
-            if (!resource_peers[i].is_valid) {
-                peer = &resource_peers[i] ;
-                break ;
-            }
-        }
-        if (peer) {
-            peer->remote_id = XAllocID (dpy);
-            peer->local_id = a_local_resource_id ;
-            peer->is_valid = TRUE ;
-        }
-    }
-    if (peer) {
-        *a_remote_resource_id = peer->remote_id ;
-        return TRUE ;
-    }
-    return FALSE ;
-}
-
-int
-hostx_get_resource_id_peer (int a_local_resource_id,
-                            int *a_remote_resource_id)
-{
-    int i=0 ;
-    ResourcePair *peer=NULL ;
-    for (i=0; i<RESOURCE_PEERS_SIZE; i++) {
-        if (resource_peers[i].is_valid
-            && resource_peers[i].local_id == a_local_resource_id) {
-            peer = &resource_peers[i] ;
-            break ;
-        }
-    }
-    if (peer) {
-        *a_remote_resource_id = peer->remote_id ;
-        return TRUE ;
-    }
-    return FALSE ;
-}
-
-int
-hostx_has_dri (void)
-{
-    int event_base=0, error_base=0 ;
-    Display *dpy=hostx_get_display () ;
-
-    if (!dpy)
-        return FALSE ;
-
-    if (!XF86DRIQueryExtension (dpy,
-                                &event_base,
-                                &error_base)) {
-        return FALSE ;
-    }
-    return TRUE ;
-}
-
-int
-hostx_has_glx (void)
-{
-    Display *dpy=hostx_get_display () ;
-    int event_base=0, error_base=0 ;
-
-    if (!glXQueryExtension (dpy, &event_base, &error_base)) {
-        return FALSE ;
-    }
-    return TRUE ;
-}
-
-#endif /* XF86DRI */
+/*

+ * Xephyr - A kdrive X server thats runs in a host X window.

+ *          Authored by Matthew Allum <mallum@o-hand.com>

+ * 

+ * Copyright © 2004 Nokia 

+ *

+ * 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, and that the name of Nokia not be used in

+ * advertising or publicity pertaining to distribution of the software without

+ * specific, written prior permission. Nokia makes no

+ * representations about the suitability of this software for any purpose.  It

+ * is provided "as is" without express or implied warranty.

+ *

+ * NOKIA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL NOKIA BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+ * PERFORMANCE OF THIS SOFTWARE.

+ */

+

+#ifdef HAVE_CONFIG_H

+#include <kdrive-config.h>

+#endif

+

+/*

+ * including some server headers (like kdrive-config.h)

+ * might define the macro _XSERVER64

+ * on 64 bits machines. That macro must _NOT_ be defined for Xlib

+ * client code, otherwise bad things happen.

+ * So let's undef that macro if necessary.

+ */

+#ifdef _XSERVER64

+#undef _XSERVER64

+#endif

+

+

+#include "hostx.h"

+

+#include <stdlib.h>

+#include <stdio.h>

+#include <unistd.h>

+#include <string.h> 		/* for memset */

+#include <time.h>

+

+#include <sys/ipc.h>

+#include <sys/shm.h>

+#include <sys/time.h>

+

+#include <X11/Xlib.h>

+#include <X11/Xutil.h>

+#include <X11/Xatom.h>

+#include <X11/keysym.h>

+#include <X11/extensions/XShm.h>

+#include <X11/extensions/shape.h>

+#ifdef XF86DRI

+#include <GL/glx.h>

+#endif /* XF86DRI */

+#include "ephyrlog.h"

+

+#ifdef XF86DRI

+extern Bool XF86DRIQueryExtension (Display *dpy,

+                                   int *event_basep,

+                                   int *error_basep);

+#endif

+

+/*  

+ * All xlib calls go here, which gets built as its own .a .

+ * Mixing kdrive and xlib headers causes all sorts of types

+ * to get clobbered. 

+ */

+

+struct EphyrHostScreen

+{

+  Window          win;

+  Window          win_pre_existing; 	/* Set via -parent option like xnest */

+  Window          peer_win;          /* Used for GL; should be at most one */

+  XImage         *ximg;

+  int             win_width, win_height;

+  int             server_depth;

+  unsigned char  *fb_data;   	/* only used when host bpp != server bpp */

+  XShmSegmentInfo shminfo;

+

+  void           *info;   /* Pointer to the screen this is associated with */

+  int             mynum;  /* Screen number */

+};

+

+struct EphyrHostXVars

+{

+  char           *server_dpy_name;

+  Display        *dpy;

+  int             screen;

+  Visual         *visual;

+  Window          winroot;

+  GC              gc;

+  int             depth;

+  Bool            use_host_cursor;

+  Bool            use_fullscreen;

+  Bool            have_shm;

+

+  int             n_screens;

+  struct EphyrHostScreen *screens;

+

+  long            damage_debug_msec;

+

+  unsigned long   cmap[256];

+};

+

+/* memset ( missing> ) instead of below  */

+/*static EphyrHostXVars HostX = { "?", 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};*/

+static EphyrHostXVars HostX;

+

+static int            HostXWantDamageDebug = 0;

+

+extern EphyrKeySyms   ephyrKeySyms;

+

+extern int            monitorResolution;

+

+char           *ephyrResName = NULL;

+int             ephyrResNameFromCmd = 0;

+char	       *ephyrTitle = NULL;

+

+static void

+hostx_set_fullscreen_hint(void);

+

+/* X Error traps */

+

+static int trapped_error_code = 0;

+static int (*old_error_handler) (Display *d, XErrorEvent *e);

+

+#define host_depth_matches_server(_vars) (HostX.depth == (_vars)->server_depth)

+

+static struct EphyrHostScreen *

+host_screen_from_screen_info (EphyrScreenInfo *screen)

+{

+  int i;

+

+  for (i = 0 ; i < HostX.n_screens ; i++)

+    {

+      if ( HostX.screens[i].info == screen)

+        {

+          return &HostX.screens[i];

+        }

+    }

+  return NULL;

+}

+

+static int

+error_handler(Display     *display,

+              XErrorEvent *error)

+{

+  trapped_error_code = error->error_code;

+  return 0;

+}

+

+static void

+hostx_errors_trap(void)

+{

+  trapped_error_code = 0;

+  old_error_handler = XSetErrorHandler(error_handler);

+}

+

+static int

+hostx_errors_untrap(void)

+{

+  XSetErrorHandler(old_error_handler);

+  return trapped_error_code;

+}

+

+int

+hostx_want_screen_size (EphyrScreenInfo screen, int *width, int *height )

+{

+  struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);

+

+  if (host_screen &&

+       (host_screen->win_pre_existing != None ||

+         HostX.use_fullscreen == True))

+    {

+      *width  = host_screen->win_width;

+      *height = host_screen->win_height;

+      return 1;

+    }

+

+ return 0;

+}

+

+void

+hostx_add_screen (EphyrScreenInfo screen,

+                  unsigned long win_id,

+                  int screen_num)

+{

+  int index = HostX.n_screens;

+

+  HostX.n_screens += 1;

+  HostX.screens = realloc (HostX.screens,

+                           HostX.n_screens * sizeof(struct EphyrHostScreen));

+  memset (&HostX.screens[index], 0, sizeof (struct EphyrHostScreen));

+

+  HostX.screens[index].info       = screen;

+  HostX.screens[index].win_pre_existing = win_id;

+}

+

+

+void

+hostx_set_display_name (char *name)

+{

+  HostX.server_dpy_name = strdup (name);

+}

+

+void

+hostx_set_screen_number(EphyrScreenInfo screen, int number)

+{

+  struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);

+  if (host_screen) {

+    host_screen->mynum = number;

+    hostx_set_win_title (host_screen->info, "") ;

+  }}

+

+void

+hostx_set_win_title (EphyrScreenInfo screen, char *extra_text)

+{

+    struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);

+

+    if (!host_screen)

+    return;

+

+    if (ephyrTitle) {

+      XStoreName(HostX.dpy, host_screen->win, ephyrTitle);

+    } else {

+#define BUF_LEN 256

+      char buf[BUF_LEN+1];

+

+      memset (buf, 0, BUF_LEN+1) ;

+      snprintf (buf, BUF_LEN, "Xephyr on %s.%d %s", 

+		HostX.server_dpy_name, 

+		host_screen->mynum,

+		(extra_text != NULL) ? extra_text : "");

+

+      XStoreName (HostX.dpy, host_screen->win, buf);

+    }

+}

+

+int

+hostx_want_host_cursor (void)

+{

+  return HostX.use_host_cursor;

+}

+

+void

+hostx_use_host_cursor (void)

+{

+  HostX.use_host_cursor = True;

+}

+

+int

+hostx_want_preexisting_window (EphyrScreenInfo screen)

+{

+  struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);

+

+  if (host_screen && host_screen->win_pre_existing)

+    {

+      return 1;

+    }

+  else

+    {

+    return 0;

+    }

+}

+

+void

+hostx_use_fullscreen (void)

+{

+  HostX.use_fullscreen = True;

+}

+

+int

+hostx_want_fullscreen (void)

+{

+  return HostX.use_fullscreen;

+}

+

+static void

+hostx_set_fullscreen_hint (void)

+{

+  Atom atom_WINDOW_STATE, atom_WINDOW_STATE_FULLSCREEN;

+  int index;

+

+  atom_WINDOW_STATE 

+    = XInternAtom(HostX.dpy, "_NET_WM_STATE", False);

+  atom_WINDOW_STATE_FULLSCREEN 

+    = XInternAtom(HostX.dpy, "_NET_WM_STATE_FULLSCREEN",False);

+

+  for (index = 0 ; index < HostX.n_screens ; index++)

+    {

+      XChangeProperty (HostX.dpy, HostX.screens[index].win,

+                       atom_WINDOW_STATE, XA_ATOM, 32,

+                       PropModeReplace,

+                       (unsigned char *)&atom_WINDOW_STATE_FULLSCREEN, 1);

+    }

+}

+

+

+static void

+hostx_toggle_damage_debug (void)

+{

+  HostXWantDamageDebug ^= 1;

+}

+

+void

+hostx_handle_signal (int signum)

+{

+  hostx_toggle_damage_debug();

+  EPHYR_DBG ("Signal caught. Damage Debug:%i\n",

+              HostXWantDamageDebug);

+}

+

+void

+hostx_use_resname (char *name, int fromcmd)

+{

+  ephyrResName = name;

+  ephyrResNameFromCmd = fromcmd;

+}

+

+void

+hostx_set_title (char *title)

+{

+  ephyrTitle = title;

+}

+

+int

+hostx_init (void)

+{

+  XSetWindowAttributes  attr;

+  Cursor                empty_cursor;

+  Pixmap                cursor_pxm;

+  XColor                col;

+  int                   index;

+  char                  *tmpstr;

+  XClassHint            *class_hint;

+

+  attr.event_mask =

+    ButtonPressMask

+    |ButtonReleaseMask

+    |PointerMotionMask

+    |KeyPressMask

+    |KeyReleaseMask

+    |ExposureMask;

+

+  EPHYR_DBG("mark");

+

+  if ((HostX.dpy = XOpenDisplay(getenv("DISPLAY"))) == NULL)

+    {

+      fprintf(stderr, "\nXephyr cannot open host display. Is DISPLAY set?\n");

+      exit(1);

+    }

+

+  HostX.screen  = DefaultScreen(HostX.dpy);

+  HostX.winroot = RootWindow(HostX.dpy, HostX.screen);

+  HostX.gc      = XCreateGC(HostX.dpy, HostX.winroot, 0, NULL);

+  HostX.depth   = DefaultDepth(HostX.dpy, HostX.screen);

+  HostX.visual  = DefaultVisual(HostX.dpy, HostX.screen);

+

+  class_hint = XAllocClassHint();

+

+  for (index = 0 ; index < HostX.n_screens ; index++)

+    {

+      struct EphyrHostScreen *host_screen = &HostX.screens[index];

+

+      host_screen->server_depth = HostX.depth;

+      if (host_screen->win_pre_existing != None)

+        {

+          Status            result;

+          XWindowAttributes prewin_attr;

+

+          /* Get screen size from existing window */

+

+          hostx_errors_trap();

+

+          result = XGetWindowAttributes (HostX.dpy,

+                                         host_screen->win_pre_existing,

+                                         &prewin_attr);

+

+

+          if (hostx_errors_untrap() || !result)

+          {

+              fprintf (stderr, "\nXephyr -parent window' does not exist!\n");

+              exit (1);

+          }

+

+          host_screen->win_width  = prewin_attr.width;

+          host_screen->win_height = prewin_attr.height;

+

+          host_screen->win = XCreateWindow (HostX.dpy,

+                                            host_screen->win_pre_existing,

+                                            0,0,

+                                            host_screen->win_width,

+                                            host_screen->win_height,

+                                            0,

+                                            CopyFromParent,

+                                            CopyFromParent,

+                                            CopyFromParent,

+                                            CWEventMask,

+                                            &attr);

+        }

+      else

+        {

+          host_screen->win = XCreateWindow (HostX.dpy,

+                                            HostX.winroot,

+                                            0,0,100,100, /* will resize */

+                                            0,

+                                            CopyFromParent,

+                                            CopyFromParent,

+                                            CopyFromParent,

+                                            CWEventMask,

+                                            &attr);

+

+          hostx_set_win_title (host_screen->info,

+                               "(ctrl+shift grabs mouse and keyboard)");

+

+          if (HostX.use_fullscreen)

+            {

+              host_screen->win_width  = DisplayWidth(HostX.dpy, HostX.screen);

+              host_screen->win_height = DisplayHeight(HostX.dpy, HostX.screen);

+

+              hostx_set_fullscreen_hint();

+            }

+

+          if (class_hint) 

+            {

+              tmpstr = getenv("RESOURCE_NAME");

+              if (tmpstr && (!ephyrResNameFromCmd))

+                ephyrResName = tmpstr;

+              class_hint->res_name = ephyrResName;

+              class_hint->res_class = "Xephyr";

+              XSetClassHint(hostx_get_display(), host_screen->win, class_hint);

+

+            }

+

+        }

+    }

+

+  if (class_hint)

+      XFree(class_hint);

+

+  XParseColor (HostX.dpy, DefaultColormap (HostX.dpy,HostX.screen),

+               "red", &col);

+  XAllocColor (HostX.dpy, DefaultColormap (HostX.dpy, HostX.screen),

+               &col);

+  XSetForeground (HostX.dpy, HostX.gc, col.pixel);

+

+  if (!hostx_want_host_cursor ())

+    {

+      /* Ditch the cursor, we provide our 'own' */

+      cursor_pxm = XCreatePixmap (HostX.dpy, HostX.winroot, 1, 1, 1);

+      memset (&col, 0, sizeof (col));

+      empty_cursor = XCreatePixmapCursor (HostX.dpy,

+                                          cursor_pxm, cursor_pxm, 

+                                          &col, &col, 1, 1);

+      for ( index = 0 ; index < HostX.n_screens ; index++ )

+        {

+          XDefineCursor (HostX.dpy,

+                         HostX.screens[index].win,

+                         empty_cursor);

+        }

+      XFreePixmap (HostX.dpy, cursor_pxm);

+    }

+

+  for (index = 0 ; index < HostX.n_screens ; index++)

+    {

+      HostX.screens[index].ximg   = NULL;

+    }

+  /* Try to get share memory ximages for a little bit more speed */

+

+  if (!XShmQueryExtension(HostX.dpy) || getenv("XEPHYR_NO_SHM"))

+    {

+      fprintf(stderr, "\nXephyr unable to use SHM XImages\n");

+      HostX.have_shm = False;

+    }

+  else

+    {

+      /* Really really check we have shm - better way ?*/

+      XShmSegmentInfo shminfo;

+

+        HostX.have_shm = True;

+

+        shminfo.shmid=shmget(IPC_PRIVATE, 1, IPC_CREAT|0777);

+        shminfo.shmaddr=shmat(shminfo.shmid,0,0);

+        shminfo.readOnly=True;

+

+        hostx_errors_trap();

+

+        XShmAttach(HostX.dpy, &shminfo);

+        XSync(HostX.dpy, False);

+

+        if (hostx_errors_untrap())

+          {

+            fprintf(stderr, "\nXephyr unable to use SHM XImages\n");

+            HostX.have_shm = False;

+          }

+

+        shmdt(shminfo.shmaddr);

+        shmctl(shminfo.shmid, IPC_RMID, 0);

+}

+

+  XFlush(HostX.dpy);

+

+  /* Setup the pause time between paints when debugging updates */

+

+  HostX.damage_debug_msec = 20000; /* 1/50 th of a second */

+

+  if (getenv ("XEPHYR_PAUSE"))

+    {

+      HostX.damage_debug_msec = strtol (getenv ("XEPHYR_PAUSE"), NULL, 0);

+      EPHYR_DBG ("pause is %li\n", HostX.damage_debug_msec);

+    }

+

+  return 1;

+}

+

+int

+hostx_get_depth (void)

+{

+  return HostX.depth;

+}

+

+int

+hostx_get_server_depth (EphyrScreenInfo screen)

+{

+  struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);

+

+  return host_screen ? host_screen->server_depth : 0;

+}

+

+void

+hostx_set_server_depth (EphyrScreenInfo screen, int depth)

+{

+  struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);

+

+  if (host_screen)

+    host_screen->server_depth = depth;

+}

+

+int

+hostx_get_bpp (EphyrScreenInfo screen)

+{

+  struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);

+

+  if (!host_screen)

+    return 0;

+

+  if (host_depth_matches_server (host_screen))

+    return HostX.visual->bits_per_rgb;

+  else

+    return host_screen->server_depth; /*XXX correct ?*/

+}

+

+void

+hostx_get_visual_masks (EphyrScreenInfo screen,

+			CARD32 *rmsk,

+			CARD32 *gmsk,

+			CARD32 *bmsk)

+{

+  struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);

+

+  if (!host_screen)

+    return;

+

+  if (host_depth_matches_server(host_screen))

+    {

+      *rmsk = HostX.visual->red_mask;

+      *gmsk = HostX.visual->green_mask;

+      *bmsk = HostX.visual->blue_mask;

+    }

+  else if (host_screen->server_depth == 16)

+    {

+      /* Assume 16bpp 565 */

+      *rmsk = 0xf800;

+      *gmsk = 0x07e0;

+      *bmsk = 0x001f;

+    }

+  else

+    {

+      *rmsk = 0x0;

+      *gmsk = 0x0;

+      *bmsk = 0x0;

+    }

+}

+

+static int 

+hostx_calculate_color_shift(unsigned long mask)

+{

+    int shift = 1;

+    /* count # of bits in mask */

+    while ((mask = (mask >> 1))) shift++;

+    /* cmap entry is an unsigned char so adjust it by size of that */

+    shift = shift - sizeof(unsigned char) * 8;

+    if (shift < 0) shift = 0;

+    return shift;

+}

+

+void

+hostx_set_cmap_entry(unsigned char idx,

+		     unsigned char r,

+		     unsigned char g,

+		     unsigned char b)

+{

+/* need to calculate the shifts for RGB because server could be BGR. */

+/* XXX Not sure if this is correct for 8 on 16, but this works for 8 on 24.*/

+    static int rshift, bshift, gshift = 0;

+    static int first_time = 1;

+    if (first_time) {

+	first_time = 0;

+	rshift = hostx_calculate_color_shift(HostX.visual->red_mask);

+	gshift = hostx_calculate_color_shift(HostX.visual->green_mask);

+	bshift = hostx_calculate_color_shift(HostX.visual->blue_mask);

+    }

+    HostX.cmap[idx] = ((r << rshift) & HostX.visual->red_mask) |

+		      ((g << gshift) & HostX.visual->green_mask) |

+		      ((b << bshift) & HostX.visual->blue_mask);

+}

+

+/**

+ * hostx_screen_init creates the XImage that will contain the front buffer of

+ * the ephyr screen, and possibly offscreen memory.

+ *

+ * @param width width of the screen

+ * @param height height of the screen

+ * @param buffer_height  height of the rectangle to be allocated.

+ *

+ * hostx_screen_init() creates an XImage, using MIT-SHM if it's available.

+ * buffer_height can be used to create a larger offscreen buffer, which is used

+ * by fakexa for storing offscreen pixmap data.

+ */

+void*

+hostx_screen_init (EphyrScreenInfo screen,

+                   int width, int height,

+                   int buffer_height)

+{

+  int         bitmap_pad;

+  Bool        shm_success = False;

+  XSizeHints *size_hints;

+

+  struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);

+  if (!host_screen)

+    {

+      fprintf (stderr, "%s: Error in accessing hostx data\n", __func__ );

+      exit(1);

+    }

+

+  EPHYR_DBG ("host_screen=%p wxh=%dx%d, buffer_height=%d",

+             host_screen, width, height, buffer_height);

+

+  if (host_screen->ximg != NULL)

+    {

+      /* Free up the image data if previously used

+       * i.ie called by server reset

+       */

+

+      if (HostX.have_shm)

+	{

+	  XShmDetach(HostX.dpy, &host_screen->shminfo);

+	  XDestroyImage (host_screen->ximg);

+	  shmdt(host_screen->shminfo.shmaddr);

+	  shmctl(host_screen->shminfo.shmid, IPC_RMID, 0);

+	}

+      else

+	{

+	  if (host_screen->ximg->data) 

+	    {

+	      free(host_screen->ximg->data);

+	      host_screen->ximg->data = NULL;

+	    } 

+

+	  XDestroyImage(host_screen->ximg);

+	}

+    }

+

+  if (HostX.have_shm)

+    {

+      host_screen->ximg = XShmCreateImage (HostX.dpy, HostX.visual, HostX.depth,

+                                           ZPixmap, NULL, &host_screen->shminfo,

+                                           width, buffer_height );

+

+      host_screen->shminfo.shmid =

+                      shmget(IPC_PRIVATE,

+                             host_screen->ximg->bytes_per_line * buffer_height,

+                             IPC_CREAT|0777);

+      host_screen->ximg->data = shmat(host_screen->shminfo.shmid, 0, 0);

+      host_screen->shminfo.shmaddr = host_screen->ximg->data;

+

+      if (host_screen->ximg->data == (char *)-1)

+	{

+	  EPHYR_DBG("Can't attach SHM Segment, falling back to plain XImages");

+	  HostX.have_shm = False;

+	  XDestroyImage(host_screen->ximg);

+	  shmctl(host_screen->shminfo.shmid, IPC_RMID, 0);

+	}

+      else

+	{

+	  EPHYR_DBG("SHM segment attached %p", host_screen->shminfo.shmaddr);

+	  host_screen->shminfo.readOnly = False;

+	  XShmAttach(HostX.dpy, &host_screen->shminfo);

+	  shm_success = True;

+	}

+    }

+

+  if (!shm_success)

+    {

+      bitmap_pad = ( HostX.depth > 16 )? 32 : (( HostX.depth > 8 )? 16 : 8 );

+

+      EPHYR_DBG("Creating image %dx%d for screen host_screen=%p\n",

+                width, buffer_height, host_screen );

+      host_screen->ximg = XCreateImage (HostX.dpy,

+                                        HostX.visual,

+                                        HostX.depth,

+                                        ZPixmap, 0, 0,

+                                        width,

+                                        buffer_height,

+                                        bitmap_pad,

+                                        0);

+

+      host_screen->ximg->data =

+              malloc (host_screen->ximg->bytes_per_line * buffer_height);

+    }

+

+  XResizeWindow (HostX.dpy, host_screen->win, width, height);

+

+  /* Ask the WM to keep our size static */

+  size_hints = XAllocSizeHints();

+  size_hints->max_width = size_hints->min_width = width;

+  size_hints->max_height = size_hints->min_height = height;

+  size_hints->flags = PMinSize|PMaxSize;

+  XSetWMNormalHints(HostX.dpy, host_screen->win, size_hints);

+  XFree(size_hints);

+

+  XMapWindow(HostX.dpy, host_screen->win);

+

+  XSync(HostX.dpy, False);

+

+  host_screen->win_width  = width;

+  host_screen->win_height = height;

+

+  if (host_depth_matches_server(host_screen))

+    {

+      EPHYR_DBG("Host matches server");

+      return host_screen->ximg->data;

+    }

+  else

+    {

+      EPHYR_DBG("server bpp %i", host_screen->server_depth>>3);

+      host_screen->fb_data = malloc(width*buffer_height*(host_screen->server_depth>>3));

+      return host_screen->fb_data;

+    }

+}

+

+static void hostx_paint_debug_rect (struct EphyrHostScreen *host_screen,

+                                    int x,     int y,

+                                    int width, int height);

+

+void

+hostx_paint_rect (EphyrScreenInfo screen,

+                  int sx,    int sy,

+                  int dx,    int dy,

+                  int width, int height)

+{

+  struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen);

+

+  EPHYR_DBG ("painting in screen %d\n", host_screen->mynum) ;

+

+  /*

+   *  Copy the image data updated by the shadow layer

+   *  on to the window

+   */

+

+  if (HostXWantDamageDebug)

+    {

+      hostx_paint_debug_rect(host_screen, dx, dy, width, height);

+    }

+

+  /* 

+   * If the depth of the ephyr server is less than that of the host,

+   * the kdrive fb does not point to the ximage data but to a buffer

+   * ( fb_data ), we shift the various bits from this onto the XImage

+   * so they match the host.

+   *

+   * Note, This code is pretty new ( and simple ) so may break on 

+   *       endian issues, 32 bpp host etc. 

+   *       Not sure if 8bpp case is right either. 

+   *       ... and it will be slower than the matching depth case.

+   */

+

+  if (!host_depth_matches_server(host_screen))

+    {

+      int            x,y,idx, bytes_per_pixel = (host_screen->server_depth>>3);

+      unsigned char  r,g,b;

+      unsigned long  host_pixel;

+

+      EPHYR_DBG("Unmatched host depth host_screen=%p\n", host_screen);

+      for (y=sy; y<sy+height; y++)

+	for (x=sx; x<sx+width; x++)

+	  {

+	    idx = (host_screen->win_width*y*bytes_per_pixel)+(x*bytes_per_pixel);

+

+	    switch (host_screen->server_depth)

+	      {

+	      case 16:

+		{

+		  unsigned short pixel = *(unsigned short*)(host_screen->fb_data+idx);

+

+		  r = ((pixel & 0xf800) >> 8);

+		  g = ((pixel & 0x07e0) >> 3);

+		  b = ((pixel & 0x001f) << 3);

+

+		  host_pixel = (r << 16) | (g << 8) | (b);

+		  

+		  XPutPixel(host_screen->ximg, x, y, host_pixel);

+		  break;

+		}

+	      case 8:

+		{

+		  unsigned char pixel = *(unsigned char*)(host_screen->fb_data+idx);

+		  XPutPixel(host_screen->ximg, x, y, HostX.cmap[pixel]);

+		  break;

+		}

+	      default:

+		break;

+	      }

+	  }

+    }

+

+  if (HostX.have_shm)

+    {

+      XShmPutImage (HostX.dpy, host_screen->win,

+                    HostX.gc, host_screen->ximg,

+                    sx, sy, dx, dy, width, height, False);

+    }

+  else

+    {

+      XPutImage (HostX.dpy, host_screen->win, HostX.gc, host_screen->ximg, 

+                 sx, sy, dx, dy, width, height);

+    }

+

+  XSync (HostX.dpy, False);

+}

+

+static void

+hostx_paint_debug_rect (struct EphyrHostScreen *host_screen,

+                        int x,     int y,

+                        int width, int height)

+{

+  struct timespec tspec;

+

+  tspec.tv_sec  = HostX.damage_debug_msec / (1000000);

+  tspec.tv_nsec = (HostX.damage_debug_msec % 1000000) * 1000;

+

+  EPHYR_DBG("msec: %li tv_sec %li, tv_msec %li", 

+	    HostX.damage_debug_msec, tspec.tv_sec, tspec.tv_nsec);

+

+  /* fprintf(stderr, "Xephyr updating: %i+%i %ix%i\n", x, y, width, height); */

+

+  XFillRectangle (HostX.dpy, host_screen->win, HostX.gc, x, y, width,height);

+  XSync (HostX.dpy, False);

+

+  /* nanosleep seems to work better than usleep for me... */

+  nanosleep(&tspec, NULL);

+}

+

+void

+hostx_load_keymap(void)

+{

+  XID             *keymap;

+  int              host_width, min_keycode, max_keycode, width;

+  int              i,j;

+

+  XDisplayKeycodes (HostX.dpy, &min_keycode, &max_keycode);

+

+  EPHYR_DBG ("min: %d, max: %d", min_keycode, max_keycode);

+

+  keymap = XGetKeyboardMapping (HostX.dpy,

+			        min_keycode,

+			        max_keycode - min_keycode + 1,

+			        &host_width);

+

+  /* Try and copy the hosts keymap into our keymap to avoid loads

+   * of messing around.

+   *

+   * kdrive cannot can have more than 4 keysyms per keycode

+   * so we only copy at most the first 4 ( xorg has 6 per keycode, XVNC 2 )

+   */

+  width = (host_width > 4) ? 4 : host_width;

+

+  ephyrKeySyms.map = (CARD32 *)calloc(sizeof(CARD32),

+                                      (max_keycode - min_keycode + 1) *

+                                      width);

+  if (!ephyrKeySyms.map)

+        return;

+

+  for (i=0; i<(max_keycode - min_keycode+1); i++)

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

+      ephyrKeySyms.map[(i*width)+j] = (CARD32) keymap[(i*host_width) + j];

+

+  EPHYR_DBG("keymap width, host:%d kdrive:%d", host_width, width);

+

+  ephyrKeySyms.minKeyCode  = min_keycode;

+  ephyrKeySyms.maxKeyCode  = max_keycode;

+  ephyrKeySyms.mapWidth    = width;

+

+  XFree(keymap);

+}

+

+static struct EphyrHostScreen *

+host_screen_from_window (Window w)

+{

+  int index = 0;

+  struct EphyrHostScreen *result  = NULL;

+

+  for (index = 0 ; index < HostX.n_screens ; index++)

+    {

+      if (HostX.screens[index].win == w || HostX.screens[index].peer_win == w)

+        {

+          result = &HostX.screens[index];

+          goto out;

+        }

+    }

+

+out:

+  return result;

+}

+

+int

+hostx_get_event(EphyrHostXEvent *ev)

+{

+  XEvent      xev;

+  static int  grabbed_screen = -1;

+

+  if (XPending(HostX.dpy))

+    {

+      XNextEvent(HostX.dpy, &xev);

+

+      switch (xev.type) 

+	{

+	case Expose:

+	  /* Not so great event compression, but works ok */

+	  while (XCheckTypedWindowEvent(HostX.dpy, xev.xexpose.window,

+					Expose, &xev));

+	  {

+	    struct EphyrHostScreen *host_screen =

+                host_screen_from_window (xev.xexpose.window);

+            if (host_screen)

+              {

+                hostx_paint_rect (host_screen->info, 0, 0, 0, 0,

+                                  host_screen->win_width,

+                                  host_screen->win_height);

+              }

+            else

+              {

+                EPHYR_LOG_ERROR ("failed to get host screen\n");

+                ev->type = EPHYR_EV_EXPOSE;

+                ev->data.expose.window = xev.xexpose.window;

+                return 1;

+              }

+	  }

+	  return 0;

+

+	case MotionNotify:

+	  {

+	    struct EphyrHostScreen *host_screen =

+                host_screen_from_window (xev.xmotion.window);

+

+	    ev->type = EPHYR_EV_MOUSE_MOTION;

+	    ev->data.mouse_motion.x = xev.xmotion.x;

+	    ev->data.mouse_motion.y = xev.xmotion.y;

+	    ev->data.mouse_motion.window = xev.xmotion.window;

+	    ev->data.mouse_motion.screen = (host_screen ? host_screen->mynum : -1);

+	  }

+	  return 1;

+

+	case ButtonPress:

+	  ev->type = EPHYR_EV_MOUSE_PRESS;

+	  ev->key_state = xev.xkey.state;

+	  /* 

+	   * This is a bit hacky. will break for button 5 ( defined as 0x10 )

+           * Check KD_BUTTON defines in kdrive.h 

+	   */

+	  ev->data.mouse_down.button_num = 1<<(xev.xbutton.button-1);

+	  return 1;

+

+	case ButtonRelease:

+	  ev->type = EPHYR_EV_MOUSE_RELEASE;

+	  ev->key_state = xev.xkey.state;

+	  ev->data.mouse_up.button_num = 1<<(xev.xbutton.button-1);

+	  return 1;

+

+	case KeyPress:

+	  {

+	    ev->type = EPHYR_EV_KEY_PRESS;

+	    ev->key_state = xev.xkey.state;

+	    ev->data.key_down.scancode = xev.xkey.keycode;  

+	    return 1;

+	  }

+	case KeyRelease:

+

+	  if ((XKeycodeToKeysym(HostX.dpy,xev.xkey.keycode,0) == XK_Shift_L

+	       || XKeycodeToKeysym(HostX.dpy,xev.xkey.keycode,0) == XK_Shift_R)

+	      && (xev.xkey.state & ControlMask))

+	    {

+	      struct EphyrHostScreen *host_screen =

+                  host_screen_from_window (xev.xexpose.window);

+

+	      if (grabbed_screen != -1)

+		{

+		  XUngrabKeyboard (HostX.dpy, CurrentTime);

+		  XUngrabPointer (HostX.dpy, CurrentTime);

+		  grabbed_screen = -1;

+		  hostx_set_win_title (host_screen->info,

+                                       "(ctrl+shift grabs mouse and keyboard)");

+		}

+	      else

+		{

+		  /* Attempt grab */

+		  if (XGrabKeyboard (HostX.dpy, host_screen->win, True, 

+				     GrabModeAsync, 

+				     GrabModeAsync, 

+				     CurrentTime) == 0)

+		    {

+		      if (XGrabPointer (HostX.dpy, host_screen->win, True, 

+					NoEventMask, 

+					GrabModeAsync, 

+					GrabModeAsync, 

+					host_screen->win, None, CurrentTime) == 0)

+			{

+			  grabbed_screen = host_screen->mynum;

+			  hostx_set_win_title

+                                  (host_screen->info,

+                                   "(ctrl+shift releases mouse and keyboard)");

+			}

+		      else 	/* Failed pointer grabm  ungrab keyboard */

+			XUngrabKeyboard (HostX.dpy, CurrentTime);

+		    }

+		}

+	    }

+

+	  /* Still send the release event even if above has happened

+           * server will get confused with just an up event. 

+           * Maybe it would be better to just block shift+ctrls getting to

+           * kdrive all togeather. 

+ 	   */

+	  ev->type = EPHYR_EV_KEY_RELEASE;

+	  ev->key_state = xev.xkey.state;

+	  ev->data.key_up.scancode = xev.xkey.keycode;

+	  return 1;

+

+	default:

+	  break;

+

+	}

+    }

+  return 0;

+}

+

+void*

+hostx_get_display(void)

+{

+    return HostX.dpy ;

+}

+

+int

+hostx_get_window (int a_screen_number)

+{

+    if (a_screen_number < 0 || a_screen_number >= HostX.n_screens) {

+        EPHYR_LOG_ERROR ("bad screen number:%d\n", a_screen_number) ;

+        return 0;

+    }

+    return HostX.screens[a_screen_number].win ;

+}

+

+int

+hostx_get_window_attributes (int a_window, EphyrHostWindowAttributes *a_attrs)

+{

+    XWindowAttributes attrs ;

+

+    memset (&attrs, 0, sizeof (attrs)) ;

+

+    if (!XGetWindowAttributes (hostx_get_display (),

+                               a_window,

+                               &attrs)) {

+        return FALSE ;

+    }

+    a_attrs->x = attrs.x ;

+    a_attrs->y = attrs.y ;

+    a_attrs->width = attrs.width ;

+    a_attrs->height = attrs.height ;

+    if (attrs.visual)

+        a_attrs->visualid = attrs.visual->visualid ;

+    return TRUE ;

+}

+

+int

+hostx_get_extension_info (const char *a_ext_name,

+                          int *a_major_opcode,

+                          int *a_first_event,

+                          int *a_first_error)

+{

+    if (!a_ext_name || !a_major_opcode || !a_first_event || !a_first_error)

+      return 0 ;

+   if (!XQueryExtension (HostX.dpy,

+                         a_ext_name,

+                         a_major_opcode,

+                         a_first_event,

+                         a_first_error))

+     {

+       return 0 ;

+     }

+   return 1 ;

+}

+

+int

+hostx_get_visuals_info (EphyrHostVisualInfo **a_visuals,

+                        int *a_num_entries)

+{

+    Display *dpy=hostx_get_display () ;

+    Bool is_ok=False ;

+    XVisualInfo templ, *visuals=NULL;

+    EphyrHostVisualInfo *host_visuals=NULL ;

+    int nb_items=0, i=0;

+

+    EPHYR_RETURN_VAL_IF_FAIL (a_visuals && a_num_entries && dpy,

+                              False) ;

+    EPHYR_LOG ("enter\n") ;

+    memset (&templ, 0, sizeof (templ)) ;

+    visuals = XGetVisualInfo (dpy, VisualNoMask, &templ, &nb_items) ;

+    if (!visuals) {

+        EPHYR_LOG_ERROR ("host does not advertise any visual\n") ;

+        goto out ;

+    }

+    EPHYR_LOG ("host advertises %d visuals\n", nb_items) ;

+    host_visuals = calloc (nb_items, sizeof (EphyrHostVisualInfo)) ;

+    for (i=0; i<nb_items; i++) {

+        host_visuals[i].visualid = visuals[i].visualid ;

+        host_visuals[i].screen = visuals[i].screen ;

+        host_visuals[i].depth = visuals[i].depth ;

+        host_visuals[i].class = visuals[i].class ;

+        host_visuals[i].red_mask = visuals[i].red_mask ;

+        host_visuals[i].green_mask = visuals[i].green_mask ;

+        host_visuals[i].blue_mask = visuals[i].blue_mask ;

+        host_visuals[i].colormap_size = visuals[i].colormap_size ;

+        host_visuals[i].bits_per_rgb = visuals[i].bits_per_rgb ;

+    }

+    *a_visuals = host_visuals ;

+    *a_num_entries = nb_items;

+    host_visuals=NULL;

+

+    is_ok = TRUE;

+out:

+    if (visuals) {

+        XFree (visuals) ;

+        visuals = NULL;

+    }

+    if (host_visuals) {

+        free (host_visuals) ;

+        host_visuals = NULL;

+    }

+    EPHYR_LOG ("leave\n") ;

+    return is_ok ;

+

+}

+

+int

+hostx_create_window (int a_screen_number,

+                     EphyrBox *a_geometry,

+                     int a_visual_id,

+                     int *a_host_peer /*out parameter*/)

+{

+    Bool is_ok=FALSE ;

+    Display *dpy=hostx_get_display () ;

+    XVisualInfo *visual_info=NULL, visual_info_templ;

+    int visual_mask=VisualIDMask ;

+    Window win=None ;

+    int nb_visuals=0, winmask=0;

+    XSetWindowAttributes attrs;

+

+    EPHYR_RETURN_VAL_IF_FAIL (dpy && a_geometry, FALSE) ;

+

+    EPHYR_LOG ("enter\n") ;

+

+     /*get visual*/

+    memset (&visual_info, 0, sizeof (visual_info)) ;

+    visual_info_templ.visualid = a_visual_id ;

+    visual_info = XGetVisualInfo (dpy, visual_mask,

+                                  &visual_info_templ,

+                                  &nb_visuals) ;

+    if (!visual_info) {

+        EPHYR_LOG_ERROR ("argh, could not find a remote visual with id:%d\n",

+                         a_visual_id) ;

+        goto out ;

+    }

+    memset (&attrs, 0, sizeof (attrs)) ;

+    attrs.colormap = XCreateColormap (dpy,

+                                      RootWindow (dpy,

+                                                  visual_info->screen),

+                                      visual_info->visual,

+                                      AllocNone) ;

+    attrs.event_mask = ButtonPressMask

+                       |ButtonReleaseMask

+                       |PointerMotionMask

+                       |KeyPressMask

+                       |KeyReleaseMask

+                       |ExposureMask;

+    winmask = CWColormap|CWEventMask;

+

+    win = XCreateWindow (dpy, hostx_get_window (a_screen_number),

+                         a_geometry->x, a_geometry->y,

+                         a_geometry->width, a_geometry->height, 0,

+                         visual_info->depth, CopyFromParent,

+                         visual_info->visual, winmask, &attrs) ;

+    if (win == None) {

+        EPHYR_LOG_ERROR ("failed to create peer window\n") ;

+        goto out ;

+    }

+    if (HostX.screens[a_screen_number].peer_win == None) {

+	HostX.screens[a_screen_number].peer_win = win;

+    } else {

+        EPHYR_LOG_ERROR ("multiple peer windows created for same screen\n") ;

+    }

+    XFlush (dpy) ;

+    XMapWindow (dpy, win) ;

+    *a_host_peer = win ;

+    is_ok = TRUE ;

+out:

+    EPHYR_LOG ("leave\n") ;

+    return is_ok ;

+}

+

+int

+hostx_destroy_window (int a_win)

+{

+    Display *dpy=hostx_get_display () ;

+

+    EPHYR_RETURN_VAL_IF_FAIL (dpy, FALSE) ;

+    XDestroyWindow (dpy, a_win) ;

+    XFlush (dpy) ;

+    return TRUE ;

+}

+

+int

+hostx_set_window_geometry (int a_win, EphyrBox *a_geo)

+{

+    Display *dpy=hostx_get_display ();

+

+    EPHYR_RETURN_VAL_IF_FAIL (dpy && a_geo, FALSE) ;

+

+    EPHYR_LOG ("enter. x,y,w,h:(%d,%d,%d,%d)\n",

+               a_geo->x, a_geo->y,

+               a_geo->width, a_geo->height) ;

+

+    XMoveWindow (dpy, a_win, a_geo->x, a_geo->y) ;

+    XResizeWindow (dpy, a_win, a_geo->width, a_geo->height) ;

+    EPHYR_LOG ("leave\n") ;

+    return TRUE;

+}

+

+int

+hostx_set_window_bounding_rectangles (int a_window,

+                                      EphyrRect *a_rects,

+                                      int a_num_rects)

+{

+    Bool is_ok=FALSE;

+    Display *dpy=hostx_get_display () ;

+    int i=0 ;

+    XRectangle *rects=NULL ;

+

+    EPHYR_RETURN_VAL_IF_FAIL (dpy && a_rects, FALSE) ;

+

+    EPHYR_LOG ("enter. num rects:%d\n", a_num_rects) ;

+

+    rects = calloc (a_num_rects, sizeof (XRectangle)) ;

+    for (i=0; i<a_num_rects; i++) {

+        rects[i].x = a_rects[i].x1 ;

+        rects[i].y = a_rects[i].y1 ;

+        rects[i].width = abs (a_rects[i].x2 - a_rects[i].x1);

+        rects[i].height = abs (a_rects[i].y2 - a_rects[i].y1) ;

+        EPHYR_LOG ("borders clipped to rect[x:%d,y:%d,w:%d,h:%d]\n",

+                   rects[i].x, rects[i].y,

+                   rects[i].width, rects[i].height) ;

+    }

+    /*this aways returns 1*/

+    XShapeCombineRectangles (dpy, a_window, ShapeBounding, 0, 0,

+                             rects, a_num_rects, ShapeSet, YXBanded) ;

+    is_ok = TRUE ;

+

+    if (rects) {

+        free (rects) ;

+        rects = NULL ;

+    }

+    EPHYR_LOG ("leave\n") ;

+    return is_ok;

+}

+

+int

+hostx_set_window_clipping_rectangles (int a_window,

+                                      EphyrRect *a_rects,

+                                      int a_num_rects)

+{

+    Bool is_ok=FALSE;

+    Display *dpy=hostx_get_display () ;

+    int i=0 ;

+    XRectangle *rects=NULL ;

+

+    EPHYR_RETURN_VAL_IF_FAIL (dpy && a_rects, FALSE) ;

+

+    EPHYR_LOG ("enter. num rects:%d\n", a_num_rects) ;

+

+    rects = calloc (a_num_rects, sizeof (XRectangle)) ;

+    for (i=0; i<a_num_rects; i++) {

+        rects[i].x = a_rects[i].x1 ;

+        rects[i].y = a_rects[i].y1 ;

+        rects[i].width = abs (a_rects[i].x2 - a_rects[i].x1);

+        rects[i].height = abs (a_rects[i].y2 - a_rects[i].y1) ;

+        EPHYR_LOG ("clipped to rect[x:%d,y:%d,w:%d,h:%d]\n",

+                   rects[i].x, rects[i].y,

+                   rects[i].width, rects[i].height) ;

+    }

+    /*this aways returns 1*/

+    XShapeCombineRectangles (dpy, a_window, ShapeClip, 0, 0,

+                             rects, a_num_rects, ShapeSet, YXBanded) ;

+    is_ok = TRUE ;

+

+    if (rects) {

+        free (rects) ;

+        rects = NULL ;

+    }

+    EPHYR_LOG ("leave\n") ;

+    return is_ok;

+}

+

+int

+hostx_has_xshape (void)

+{

+    int event_base=0, error_base=0 ;

+    Display *dpy=hostx_get_display () ;

+    if (!XShapeQueryExtension (dpy,

+                               &event_base,

+                               &error_base)) {

+        return FALSE ;

+    }

+    return TRUE;

+}

+

+#ifdef XF86DRI

+typedef struct {

+    int is_valid ;

+    int local_id ;

+    int remote_id ;

+} ResourcePair ;

+

+#define RESOURCE_PEERS_SIZE 1024*10

+static ResourcePair resource_peers[RESOURCE_PEERS_SIZE] ;

+

+

+int

+hostx_allocate_resource_id_peer (int a_local_resource_id,

+                                 int *a_remote_resource_id)

+{

+    int i=0 ;

+    ResourcePair *peer=NULL ;

+    Display *dpy=hostx_get_display ();

+

+    /*

+     * first make sure a resource peer

+     * does not exist already for

+     * a_local_resource_id

+     */

+    for (i=0; i<RESOURCE_PEERS_SIZE; i++) {

+        if (resource_peers[i].is_valid

+            && resource_peers[i].local_id == a_local_resource_id) {

+            peer = &resource_peers[i] ;

+            break ;

+        }

+    }

+    /*

+     * find one free peer entry, an feed it with

+     */

+    if (!peer) {

+        for (i=0; i<RESOURCE_PEERS_SIZE; i++) {

+            if (!resource_peers[i].is_valid) {

+                peer = &resource_peers[i] ;

+                break ;

+            }

+        }

+        if (peer) {

+            peer->remote_id = XAllocID (dpy);

+            peer->local_id = a_local_resource_id ;

+            peer->is_valid = TRUE ;

+        }

+    }

+    if (peer) {

+        *a_remote_resource_id = peer->remote_id ;

+        return TRUE ;

+    }

+    return FALSE ;

+}

+

+int

+hostx_get_resource_id_peer (int a_local_resource_id,

+                            int *a_remote_resource_id)

+{

+    int i=0 ;

+    ResourcePair *peer=NULL ;

+    for (i=0; i<RESOURCE_PEERS_SIZE; i++) {

+        if (resource_peers[i].is_valid

+            && resource_peers[i].local_id == a_local_resource_id) {

+            peer = &resource_peers[i] ;

+            break ;

+        }

+    }

+    if (peer) {

+        *a_remote_resource_id = peer->remote_id ;

+        return TRUE ;

+    }

+    return FALSE ;

+}

+

+int

+hostx_has_dri (void)

+{

+    int event_base=0, error_base=0 ;

+    Display *dpy=hostx_get_display () ;

+

+    if (!dpy)

+        return FALSE ;

+

+    if (!XF86DRIQueryExtension (dpy,

+                                &event_base,

+                                &error_base)) {

+        return FALSE ;

+    }

+    return TRUE ;

+}

+

+int

+hostx_has_glx (void)

+{

+    Display *dpy=hostx_get_display () ;

+    int event_base=0, error_base=0 ;

+

+    if (!glXQueryExtension (dpy, &event_base, &error_base)) {

+        return FALSE ;

+    }

+    return TRUE ;

+}

+

+#endif /* XF86DRI */

diff --git a/xorg-server/hw/kdrive/fake/fake.c b/xorg-server/hw/kdrive/fake/fake.c
index 9f2327d94..626b2d25a 100644
--- a/xorg-server/hw/kdrive/fake/fake.c
+++ b/xorg-server/hw/kdrive/fake/fake.c
@@ -168,8 +168,7 @@ fakeMapFramebuffer (KdScreenInfo *screen)
     KdSetPointerMatrix (&m);

     

     priv->bytes_per_line = ((screen->width * screen->fb.bitsPerPixel + 31) >> 5) << 2;

-    if (priv->base)

-	free (priv->base);

+    free(priv->base);

     priv->base = malloc (priv->bytes_per_line * screen->height);

     

     if (scrpriv->shadow)

diff --git a/xorg-server/hw/kdrive/src/kdrive.c b/xorg-server/hw/kdrive/src/kdrive.c
index d1f00fc69..5c8819c73 100644
--- a/xorg-server/hw/kdrive/src/kdrive.c
+++ b/xorg-server/hw/kdrive/src/kdrive.c
@@ -64,8 +64,7 @@ KdDepths    kdDepths[] = {
 

 #define KD_DEFAULT_BUTTONS 5

 

-static int          kdScreenPrivateKeyIndex;

-DevPrivateKey       kdScreenPrivateKey = &kdScreenPrivateKeyIndex;

+DevPrivateKeyRec    kdScreenPrivateKeyRec;

 unsigned long	    kdGeneration;

 

 Bool                kdVideoTest;

@@ -95,7 +94,7 @@ KdOsFuncs	*kdOsFuncs;
 void

 KdSetRootClip (ScreenPtr pScreen, BOOL enable)

 {

-    WindowPtr	pWin = WindowTable[pScreen->myNum];

+    WindowPtr	pWin = pScreen->root;

     WindowPtr	pChild;

     Bool	WasViewable;

     Bool	anyMarked = FALSE;

@@ -121,8 +120,8 @@ KdSetRootClip (ScreenPtr pScreen, BOOL enable)
 	    {

 		RegionPtr	borderVisible;

 

-		borderVisible = REGION_CREATE(pScreen, NullBox, 1);

-		REGION_SUBTRACT(pScreen, borderVisible,

+		borderVisible = RegionCreate(NullBox, 1);

+		RegionSubtract(borderVisible,

 				&pWin->borderClip, &pWin->winSize);

 		pWin->valdata->before.borderVisible = borderVisible;

 	    }

@@ -138,15 +137,15 @@ KdSetRootClip (ScreenPtr pScreen, BOOL enable)
 	box.y2 = pScreen->height;

 	pWin->drawable.width = pScreen->width;

 	pWin->drawable.height = pScreen->height;

-	REGION_INIT (pScreen, &pWin->winSize, &box, 1);

-	REGION_INIT (pScreen, &pWin->borderSize, &box, 1);

-	REGION_RESET(pScreen, &pWin->borderClip, &box);

-	REGION_BREAK (pWin->drawable.pScreen, &pWin->clipList);

+	RegionInit(&pWin->winSize, &box, 1);

+	RegionInit(&pWin->borderSize, &box, 1);

+	RegionReset(&pWin->borderClip, &box);

+	RegionBreak(&pWin->clipList);

     }

     else

     {

-	REGION_EMPTY(pScreen, &pWin->borderClip);

-	REGION_BREAK (pWin->drawable.pScreen, &pWin->clipList);

+	RegionEmpty(&pWin->borderClip);

+	RegionBreak(&pWin->clipList);

     }

 

     ResizeChildrenWinSize (pWin, 0, 0, 0, 0);

@@ -699,6 +698,9 @@ KdAllocatePrivates (ScreenPtr pScreen)
     if (kdGeneration != serverGeneration)

 	kdGeneration = serverGeneration;

 

+    if (!dixRegisterPrivateKey(&kdScreenPrivateKeyRec, PRIVATE_SCREEN, 0))

+	return FALSE;

+

     pScreenPriv = calloc(1, sizeof (*pScreenPriv));

     if (!pScreenPriv)

 	return FALSE;

@@ -836,8 +838,8 @@ KdCreateWindow (WindowPtr pWin)
 

 	if (!pScreenPriv->enabled)

 	{

-	    REGION_EMPTY (pWin->drawable.pScreen, &pWin->borderClip);

-	    REGION_BREAK (pWin->drawable.pScreen, &pWin->clipList);

+	    RegionEmpty(&pWin->borderClip);

+	    RegionBreak(&pWin->clipList);

 	}

     }

 #endif

@@ -941,9 +943,8 @@ KdScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
     pScreenPriv->card = card;

     pScreenPriv->bytesPerPixel = screen->fb.bitsPerPixel >> 3;

     pScreenPriv->dpmsState = KD_DPMS_NORMAL;

-#ifdef PANORAMIX

-    dixScreenOrigins[pScreen->myNum] = screen->origin;

-#endif

+    pScreen->x = screen->origin.x;

+    pScreen->y = screen->origin.y;

 

     if (!monitorResolution)

 	monitorResolution = 75;

diff --git a/xorg-server/hw/kdrive/src/kdrive.h b/xorg-server/hw/kdrive/src/kdrive.h
index 35ce03660..8873662ee 100644
--- a/xorg-server/hw/kdrive/src/kdrive.h
+++ b/xorg-server/hw/kdrive/src/kdrive.h
@@ -1,626 +1,628 @@
-/*
- * Copyright © 1999 Keith Packard
- *
- * 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, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _KDRIVE_H_
-#define _KDRIVE_H_
-
-#include <stdio.h>
-#include <string.h>
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/Xos.h>
-#include "scrnintstr.h"
-#include "pixmapstr.h"
-#include "windowstr.h"
-#include "servermd.h"
-#include "mibstore.h"
-#include "colormapst.h"
-#include "gcstruct.h"
-#include "input.h"
-#include "mipointer.h"
-#include "mi.h"
-#include "dix.h"
-#include "fb.h"
-#include "fboverlay.h"
-#include "shadow.h"
-#include "randrstr.h"
-#include "globals.h"
-
-#include "xkbstr.h"
-
-#define KD_DPMS_NORMAL	    0
-#define KD_DPMS_STANDBY	    1
-#define KD_DPMS_SUSPEND	    2
-#define KD_DPMS_POWERDOWN   3
-#define KD_DPMS_MAX	    KD_DPMS_POWERDOWN
-
-#define Status int
-
-typedef struct _KdCardInfo {
-    struct _KdCardFuncs	    *cfuncs;
-    void		    *closure;
-    void		    *driver;
-    struct _KdScreenInfo    *screenList;
-    int			    selected;
-    struct _KdCardInfo	    *next;
-} KdCardInfo;
-
-extern KdCardInfo	*kdCardInfo;
-
-/*
- * Configuration information per X screen
- */
-typedef struct _KdFrameBuffer {
-    CARD8	*frameBuffer;
-    int		depth;
-    int		bitsPerPixel;
-    int		pixelStride;
-    int		byteStride;
-    Bool	shadow;
-    unsigned long   visuals;
-    Pixel       redMask, greenMask, blueMask;
-    void	*closure;
-} KdFrameBuffer;
-
-#define RR_Rotate_All	(RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270)
-#define RR_Reflect_All	(RR_Reflect_X|RR_Reflect_Y)
-
-typedef struct _KdScreenInfo {
-    struct _KdScreenInfo    *next;
-    KdCardInfo	*card;
-    ScreenPtr	pScreen;
-    void	*driver;
-    Rotation	randr;	/* rotation and reflection */
-    int		width;
-    int		height;
-    int		rate;
-    int		width_mm;
-    int		height_mm;
-    int		subpixel_order;
-    Bool        dumb;
-    Bool        softCursor;
-    int		mynum;
-    DDXPointRec	origin;
-    KdFrameBuffer   fb;
-} KdScreenInfo;
-
-typedef struct _KdCardFuncs {
-    Bool	(*cardinit) (KdCardInfo *); /* detect and map device */
-    Bool	(*scrinit) (KdScreenInfo *);/* initialize screen information */
-    Bool	(*initScreen) (ScreenPtr);  /* initialize ScreenRec */
-    Bool	(*finishInitScreen) (ScreenPtr pScreen);
-    Bool	(*createRes) (ScreenPtr);   /* create screen resources */
-    void	(*preserve) (KdCardInfo *); /* save graphics card state */
-    Bool        (*enable) (ScreenPtr);      /* set up for rendering */
-    Bool	(*dpms) (ScreenPtr, int);   /* set DPMS screen saver */
-    void        (*disable) (ScreenPtr);     /* turn off rendering */
-    void	(*restore) (KdCardInfo *);  /* restore graphics card state */
-    void	(*scrfini) (KdScreenInfo *);/* close down screen */
-    void        (*cardfini) (KdCardInfo *); /* close down */
-
-    Bool        (*initCursor) (ScreenPtr);      /* detect and map cursor */
-    void        (*enableCursor) (ScreenPtr);    /* enable cursor */
-    void        (*disableCursor) (ScreenPtr);   /* disable cursor */
-    void        (*finiCursor) (ScreenPtr);      /* close down */
-    void        (*recolorCursor) (ScreenPtr, int, xColorItem *);
-
-    Bool        (*initAccel) (ScreenPtr);
-    void        (*enableAccel) (ScreenPtr);
-    void        (*disableAccel) (ScreenPtr);
-    void        (*finiAccel) (ScreenPtr);
-
-    void        (*getColors) (ScreenPtr, int, xColorItem *);
-    void        (*putColors) (ScreenPtr, int, xColorItem *);
-
-} KdCardFuncs;
-
-#define KD_MAX_PSEUDO_DEPTH 8
-#define KD_MAX_PSEUDO_SIZE	    (1 << KD_MAX_PSEUDO_DEPTH)
-
-typedef struct {
-    KdScreenInfo    *screen;
-    KdCardInfo	    *card;
-
-    Bool	    enabled;
-    Bool	    closed;
-    int		    bytesPerPixel;
-
-    int		    dpmsState;
-
-    ColormapPtr     pInstalledmap;                    /* current colormap */
-    xColorItem      systemPalette[KD_MAX_PSEUDO_SIZE];/* saved windows colors */
-
-    CreateScreenResourcesProcPtr    CreateScreenResources;
-    CloseScreenProcPtr  CloseScreen;
-} KdPrivScreenRec, *KdPrivScreenPtr;
-
-typedef enum _kdPointerState {
-    start,
-    button_1_pend,
-    button_1_down,
-    button_2_down,
-    button_3_pend,
-    button_3_down,
-    synth_2_down_13,
-    synth_2_down_3,
-    synth_2_down_1,
-    num_input_states
-} KdPointerState;
-
-#define KD_MAX_BUTTON  32
-
-#define KD_KEYBOARD 1
-#define KD_MOUSE 2
-#define KD_TOUCHSCREEN 3
-
-typedef struct _KdPointerInfo KdPointerInfo;
-
-typedef struct _KdPointerDriver {
-    char                    *name;
-    Status                  (*Init)    (KdPointerInfo *);
-    Status                  (*Enable)  (KdPointerInfo *);
-    void                    (*Disable) (KdPointerInfo *);
-    void                    (*Fini)    (KdPointerInfo *);
-    struct _KdPointerDriver *next;
-} KdPointerDriver;
-
-struct _KdPointerInfo {
-    DeviceIntPtr          dixdev;
-    char                  *name;
-    char                  *path;
-    char                  *protocol;
-    InputOption           *options;
-    int                   inputClass;
-
-    CARD8                 map[KD_MAX_BUTTON + 1];
-    int                   nButtons;
-    int                   nAxes;
-
-    Bool                  emulateMiddleButton;
-    unsigned long         emulationTimeout;
-    int                   emulationDx, emulationDy;
-
-    Bool                  timeoutPending;
-    KdPointerState        mouseState;
-    Bool                  eventHeld;
-    struct {
-        int type;
-        int x;
-        int y;
-        int z;
-        int flags;
-        int absrel;
-    } heldEvent;
-    unsigned char         buttonState;
-    Bool                  transformCoordinates;
-    int                   pressureThreshold;
-
-    KdPointerDriver       *driver;
-    void                  *driverPrivate;
-
-    struct _KdPointerInfo *next;
-};
-
-extern int KdCurScreen;
-
-void KdAddPointerDriver (KdPointerDriver *driver);
-void KdRemovePointerDriver (KdPointerDriver *driver);
-KdPointerInfo *KdNewPointer (void);
-void KdFreePointer (KdPointerInfo *);
-int KdAddPointer (KdPointerInfo *ki);
-int KdAddConfigPointer (char *pointer);
-void KdRemovePointer (KdPointerInfo *ki);
-
-
-#define KD_KEY_COUNT 248
-#define KD_MIN_KEYCODE  8
-#define KD_MAX_KEYCODE  255
-#define KD_MAX_WIDTH    4
-#define KD_MAX_LENGTH   (KD_MAX_KEYCODE - KD_MIN_KEYCODE + 1)
-
-typedef struct {
-    KeySym modsym;
-    int    modbit;
-} KdKeySymModsRec;
-
-typedef struct _KdKeyboardInfo KdKeyboardInfo;
-
-typedef struct _KdKeyboardDriver {
-    char                  *name;
-    Bool                  (*Init)    (KdKeyboardInfo *);
-    Bool                  (*Enable)  (KdKeyboardInfo *);
-    void                  (*Leds)    (KdKeyboardInfo *, int);
-    void                  (*Bell)    (KdKeyboardInfo *, int, int, int);
-    void                  (*Disable) (KdKeyboardInfo *);
-    void                  (*Fini)    (KdKeyboardInfo *);
-    struct _KdKeyboardDriver *next;
-} KdKeyboardDriver;
-
-struct _KdKeyboardInfo {
-    struct _KdKeyboardInfo *next;
-    DeviceIntPtr        dixdev;
-    void                *closure;
-    char                *name;
-    char                *path;
-    int                 inputClass;
-    char                *xkbRules;
-    char                *xkbModel;
-    char                *xkbLayout;
-    char                *xkbVariant;
-    char                *xkbOptions;
-    int                 LockLed;
-
-    int                 minScanCode;
-    int                 maxScanCode;
-
-    int                 leds;
-    int                 bellPitch;
-    int                 bellDuration;
-    InputOption         *options;
-
-    KdKeyboardDriver    *driver;
-    void                *driverPrivate;
-};
-
-void KdAddKeyboardDriver (KdKeyboardDriver *driver);
-void KdRemoveKeyboardDriver (KdKeyboardDriver *driver);
-KdKeyboardInfo *KdNewKeyboard (void);
-void KdFreeKeyboard (KdKeyboardInfo *ki);
-int KdAddConfigKeyboard (char *pointer);
-int KdAddKeyboard (KdKeyboardInfo *ki);
-void KdRemoveKeyboard (KdKeyboardInfo *ki);
-
-typedef struct _KdOsFuncs {
-    int		    (*Init) (void);
-    void	    (*Enable) (void);
-    Bool	    (*SpecialKey) (KeySym);
-    void	    (*Disable) (void);
-    void	    (*Fini) (void);
-    void	    (*pollEvents) (void);
-    void            (*Bell) (int, int, int);
-} KdOsFuncs;
-
-typedef enum _KdSyncPolarity {
-    KdSyncNegative, KdSyncPositive
-} KdSyncPolarity;
-
-typedef struct _KdMonitorTiming {
-    /* label */
-    int		    horizontal;
-    int		    vertical;
-    int		    rate;
-    /* pixel clock */
-    int		    clock;  /* in KHz */
-    /* horizontal timing */
-    int		    hfp;    /* front porch */
-    int		    hbp;    /* back porch */
-    int		    hblank; /* blanking */
-    KdSyncPolarity  hpol;   /* polarity */
-    /* vertical timing */
-    int		    vfp;    /* front porch */
-    int		    vbp;    /* back porch */
-    int		    vblank; /* blanking */
-    KdSyncPolarity  vpol;   /* polarity */
-} KdMonitorTiming;
-
-extern const KdMonitorTiming	kdMonitorTimings[];
-extern const int		kdNumMonitorTimings;
-
-typedef struct _KdPointerMatrix {
-    int	    matrix[2][3];
-} KdPointerMatrix;
-
-/*
- * This is the only completely portable way to
- * compute this info.
- */
-
-#ifndef BitsPerPixel
-#define BitsPerPixel(d) (\
-    PixmapWidthPaddingInfo[d].notPower2 ? \
-    (PixmapWidthPaddingInfo[d].bytesPerPixel * 8) : \
-    ((1 << PixmapWidthPaddingInfo[d].padBytesLog2) * 8 / \
-    (PixmapWidthPaddingInfo[d].padRoundUp+1)))
-#endif
-
-extern DevPrivateKey	kdScreenPrivateKey;
-extern unsigned long	kdGeneration;
-extern Bool		kdEnabled;
-extern Bool		kdSwitchPending;
-extern Bool		kdEmulateMiddleButton;
-extern Bool		kdDisableZaphod;
-extern Bool		kdAllowZap;
-extern int		kdVirtualTerminal;
-extern char		*kdSwitchCmd;
-extern KdOsFuncs	*kdOsFuncs;
-
-#define KdGetScreenPriv(pScreen) ((KdPrivScreenPtr) \
-    dixLookupPrivate(&(pScreen)->devPrivates, kdScreenPrivateKey))
-#define KdSetScreenPriv(pScreen,v) \
-    dixSetPrivate(&(pScreen)->devPrivates, kdScreenPrivateKey, v)
-#define KdScreenPriv(pScreen) KdPrivScreenPtr pScreenPriv = KdGetScreenPriv(pScreen)
-
-/* kcmap.c */
-void
-KdSetColormap (ScreenPtr pScreen);
-
-void
-KdEnableColormap (ScreenPtr pScreen);
-
-void
-KdDisableColormap (ScreenPtr pScreen);
-
-void
-KdInstallColormap (ColormapPtr pCmap);
-
-void
-KdUninstallColormap (ColormapPtr pCmap);
-
-int
-KdListInstalledColormaps (ScreenPtr pScreen, Colormap *pCmaps);
-
-void
-KdStoreColors (ColormapPtr pCmap, int ndef, xColorItem *pdefs);
-
-/* kdrive.c */
-extern miPointerScreenFuncRec kdPointerScreenFuncs;
-
-void
-KdSetRootClip (ScreenPtr pScreen, BOOL enable);
-
-void
-KdDisableScreen (ScreenPtr pScreen);
-
-void
-KdDisableScreens (void);
-
-Bool
-KdEnableScreen (ScreenPtr pScreen);
-
-void
-KdEnableScreens (void);
-
-void
-KdSuspend (void);
-
-void
-KdResume (void);
-
-void
-KdProcessSwitch (void);
-
-Rotation
-KdAddRotation (Rotation a, Rotation b);
-
-Rotation
-KdSubRotation (Rotation a, Rotation b);
-
-void
-KdParseScreen (KdScreenInfo *screen,
-	       char	    *arg);
-
-KdPointerInfo *
-KdParsePointer (char *arg);
-
-KdKeyboardInfo *
-KdParseKeyboard (char *arg);
-
-char *
-KdParseFindNext (char *cur, char *delim, char *save, char *last);
-
-void
-KdParseRgba (char *rgba);
-
-void
-KdUseMsg (void);
-
-int
-KdProcessArgument (int argc, char **argv, int i);
-
-void
-KdOsInit (KdOsFuncs *pOsFuncs);
-
-void
-KdOsAddInputDrivers (void);
-
-Bool
-KdAllocatePrivates (ScreenPtr pScreen);
-
-Bool
-KdCreateScreenResources (ScreenPtr pScreen);
-
-Bool
-KdCloseScreen (int index, ScreenPtr pScreen);
-
-Bool
-KdSaveScreen (ScreenPtr pScreen, int on);
-
-Bool
-KdScreenInit(int index, ScreenPtr pScreen, int argc, char **argv);
-
-void
-KdInitScreen (ScreenInfo    *pScreenInfo,
-	      KdScreenInfo  *screen,
-	      int	    argc,
-	      char	    **argv);
-
-void
-KdInitCard (ScreenInfo	    *pScreenInfo,
-	    KdCardInfo	    *card,
-	    int		    argc,
-	    char	    **argv);
-
-void
-KdInitOutput (ScreenInfo    *pScreenInfo,
-	      int	    argc,
-	      char	    **argv);
-
-void
-KdSetSubpixelOrder (ScreenPtr pScreen, Rotation randr);
-
-void
-KdBacktrace (int signum);
-
-/* kinfo.c */
-KdCardInfo *
-KdCardInfoAdd (KdCardFuncs  *funcs,
-	       void	    *closure);
-
-KdCardInfo *
-KdCardInfoLast (void);
-
-void
-KdCardInfoDispose (KdCardInfo *ci);
-
-KdScreenInfo *
-KdScreenInfoAdd (KdCardInfo *ci);
-
-void
-KdScreenInfoDispose (KdScreenInfo *si);
-
-
-/* kinput.c */
-void
-KdInitInput(void);
-
-void
-KdAddPointerDriver(KdPointerDriver *);
-
-void
-KdAddKeyboardDriver(KdKeyboardDriver *);
-
-Bool
-KdRegisterFd (int fd, void (*read) (int fd, void *closure), void *closure);
-
-void
-KdUnregisterFds (void *closure, Bool do_close);
-
-void
-KdUnregisterFd (void *closure, int fd, Bool do_close);
-
-void
-KdEnqueueKeyboardEvent(KdKeyboardInfo *ki, unsigned char scan_code,
-                    unsigned char is_up);
-
-#define KD_BUTTON_1	0x01
-#define KD_BUTTON_2	0x02
-#define KD_BUTTON_3	0x04
-#define KD_BUTTON_4	0x08
-#define KD_BUTTON_5	0x10
-#define KD_BUTTON_8	0x80
-#define KD_MOUSE_DELTA	0x80000000
-
-void
-KdEnqueuePointerEvent(KdPointerInfo *pi, unsigned long flags, int rx, int ry,
-                      int rz);
-
-void
-_KdEnqueuePointerEvent(KdPointerInfo *pi, int type, int x, int y, int z,
-                       int b, int absrel, Bool force);
-
-void
-KdReleaseAllKeys (void);
-
-void
-KdSetLed (KdKeyboardInfo *ki, int led, Bool on);
-
-void
-KdSetPointerMatrix (KdPointerMatrix *pointer);
-
-void
-KdComputePointerMatrix (KdPointerMatrix *pointer, Rotation randr, int width, int height);
-
-void
-KdScreenToPointerCoords (int *x, int *y);
-
-void
-KdBlockHandler (int		screen,
-		pointer		blockData,
-		pointer		timeout,
-		pointer		readmask);
-
-void
-KdWakeupHandler (int		screen,
-		 pointer    	data,
-		 unsigned long	result,
-		 pointer	readmask);
-
-void
-KdDisableInput (void);
-
-void
-KdEnableInput (void);
-
-void
-ProcessInputEvents (void);
-
-void
-KdRingBell (KdKeyboardInfo      *ki,
-            int                 volume,
-            int                 pitch,
-            int                 duration);
-
-/* kmode.c */
-const KdMonitorTiming *
-KdFindMode (KdScreenInfo    *screen,
-	    Bool	    (*supported) (KdScreenInfo *,
-					  const KdMonitorTiming *));
-
-Bool
-KdTuneMode (KdScreenInfo    *screen,
-	    Bool	    (*usable) (KdScreenInfo *),
-	    Bool	    (*supported) (KdScreenInfo *,
-					  const KdMonitorTiming *));
-
-#ifdef RANDR
-Bool
-KdRandRGetInfo (ScreenPtr pScreen,
-		int randr,
-		Bool (*supported) (ScreenPtr pScreen,
-				   const KdMonitorTiming *));
-
-const KdMonitorTiming *
-KdRandRGetTiming (ScreenPtr	    pScreen,
-		  Bool		    (*supported) (ScreenPtr pScreen,
-						  const KdMonitorTiming *),
-		  int		    rate,
-		  RRScreenSizePtr   pSize);
-#endif
-
-/* kshadow.c */
-Bool
-KdShadowFbAlloc (KdScreenInfo *screen, Bool rotate);
-
-void
-KdShadowFbFree (KdScreenInfo *screen);
-
-Bool
-KdShadowSet (ScreenPtr pScreen, int randr, ShadowUpdateProc update, ShadowWindowProc window);
-
-void
-KdShadowUnset (ScreenPtr pScreen);
-
-/* function prototypes to be implemented by the drivers */
-void
-InitCard (char *name);
-
-#endif /* _KDRIVE_H_ */
+/*

+ * Copyright © 1999 Keith Packard

+ *

+ * 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, and that the name of Keith Packard not be used in

+ * advertising or publicity pertaining to distribution of the software without

+ * specific, written prior permission.  Keith Packard makes no

+ * representations about the suitability of this software for any purpose.  It

+ * is provided "as is" without express or implied warranty.

+ *

+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+ * PERFORMANCE OF THIS SOFTWARE.

+ */

+

+#ifndef _KDRIVE_H_

+#define _KDRIVE_H_

+

+#include <stdio.h>

+#include <string.h>

+#include <X11/X.h>

+#include <X11/Xproto.h>

+#include <X11/Xos.h>

+#include "scrnintstr.h"

+#include "pixmapstr.h"

+#include "windowstr.h"

+#include "servermd.h"

+#include "mibstore.h"

+#include "colormapst.h"

+#include "gcstruct.h"

+#include "input.h"

+#include "mipointer.h"

+#include "mi.h"

+#include "dix.h"

+#include "fb.h"

+#include "fboverlay.h"

+#include "shadow.h"

+#include "randrstr.h"

+#include "globals.h"

+

+#include "xkbstr.h"

+

+#define KD_DPMS_NORMAL	    0

+#define KD_DPMS_STANDBY	    1

+#define KD_DPMS_SUSPEND	    2

+#define KD_DPMS_POWERDOWN   3

+#define KD_DPMS_MAX	    KD_DPMS_POWERDOWN

+

+#define Status int

+

+typedef struct _KdCardInfo {

+    struct _KdCardFuncs	    *cfuncs;

+    void		    *closure;

+    void		    *driver;

+    struct _KdScreenInfo    *screenList;

+    int			    selected;

+    struct _KdCardInfo	    *next;

+} KdCardInfo;

+

+extern KdCardInfo	*kdCardInfo;

+

+/*

+ * Configuration information per X screen

+ */

+typedef struct _KdFrameBuffer {

+    CARD8	*frameBuffer;

+    int		depth;

+    int		bitsPerPixel;

+    int		pixelStride;

+    int		byteStride;

+    Bool	shadow;

+    unsigned long   visuals;

+    Pixel       redMask, greenMask, blueMask;

+    void	*closure;

+} KdFrameBuffer;

+

+#define RR_Rotate_All	(RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270)

+#define RR_Reflect_All	(RR_Reflect_X|RR_Reflect_Y)

+

+typedef struct _KdScreenInfo {

+    struct _KdScreenInfo    *next;

+    KdCardInfo	*card;

+    ScreenPtr	pScreen;

+    void	*driver;

+    Rotation	randr;	/* rotation and reflection */

+    int		width;

+    int		height;

+    int		rate;

+    int		width_mm;

+    int		height_mm;

+    int		subpixel_order;

+    Bool        dumb;

+    Bool        softCursor;

+    int		mynum;

+    DDXPointRec	origin;

+    KdFrameBuffer   fb;

+} KdScreenInfo;

+

+typedef struct _KdCardFuncs {

+    Bool	(*cardinit) (KdCardInfo *); /* detect and map device */

+    Bool	(*scrinit) (KdScreenInfo *);/* initialize screen information */

+    Bool	(*initScreen) (ScreenPtr);  /* initialize ScreenRec */

+    Bool	(*finishInitScreen) (ScreenPtr pScreen);

+    Bool	(*createRes) (ScreenPtr);   /* create screen resources */

+    void	(*preserve) (KdCardInfo *); /* save graphics card state */

+    Bool        (*enable) (ScreenPtr);      /* set up for rendering */

+    Bool	(*dpms) (ScreenPtr, int);   /* set DPMS screen saver */

+    void        (*disable) (ScreenPtr);     /* turn off rendering */

+    void	(*restore) (KdCardInfo *);  /* restore graphics card state */

+    void	(*scrfini) (KdScreenInfo *);/* close down screen */

+    void        (*cardfini) (KdCardInfo *); /* close down */

+

+    Bool        (*initCursor) (ScreenPtr);      /* detect and map cursor */

+    void        (*enableCursor) (ScreenPtr);    /* enable cursor */

+    void        (*disableCursor) (ScreenPtr);   /* disable cursor */

+    void        (*finiCursor) (ScreenPtr);      /* close down */

+    void        (*recolorCursor) (ScreenPtr, int, xColorItem *);

+

+    Bool        (*initAccel) (ScreenPtr);

+    void        (*enableAccel) (ScreenPtr);

+    void        (*disableAccel) (ScreenPtr);

+    void        (*finiAccel) (ScreenPtr);

+

+    void        (*getColors) (ScreenPtr, int, xColorItem *);

+    void        (*putColors) (ScreenPtr, int, xColorItem *);

+

+} KdCardFuncs;

+

+#define KD_MAX_PSEUDO_DEPTH 8

+#define KD_MAX_PSEUDO_SIZE	    (1 << KD_MAX_PSEUDO_DEPTH)

+

+typedef struct {

+    KdScreenInfo    *screen;

+    KdCardInfo	    *card;

+

+    Bool	    enabled;

+    Bool	    closed;

+    int		    bytesPerPixel;

+

+    int		    dpmsState;

+

+    ColormapPtr     pInstalledmap;                    /* current colormap */

+    xColorItem      systemPalette[KD_MAX_PSEUDO_SIZE];/* saved windows colors */

+

+    CreateScreenResourcesProcPtr    CreateScreenResources;

+    CloseScreenProcPtr  CloseScreen;

+} KdPrivScreenRec, *KdPrivScreenPtr;

+

+typedef enum _kdPointerState {

+    start,

+    button_1_pend,

+    button_1_down,

+    button_2_down,

+    button_3_pend,

+    button_3_down,

+    synth_2_down_13,

+    synth_2_down_3,

+    synth_2_down_1,

+    num_input_states

+} KdPointerState;

+

+#define KD_MAX_BUTTON  32

+

+#define KD_KEYBOARD 1

+#define KD_MOUSE 2

+#define KD_TOUCHSCREEN 3

+

+typedef struct _KdPointerInfo KdPointerInfo;

+

+typedef struct _KdPointerDriver {

+    char                    *name;

+    Status                  (*Init)    (KdPointerInfo *);

+    Status                  (*Enable)  (KdPointerInfo *);

+    void                    (*Disable) (KdPointerInfo *);

+    void                    (*Fini)    (KdPointerInfo *);

+    struct _KdPointerDriver *next;

+} KdPointerDriver;

+

+struct _KdPointerInfo {

+    DeviceIntPtr          dixdev;

+    char                  *name;

+    char                  *path;

+    char                  *protocol;

+    InputOption           *options;

+    int                   inputClass;

+

+    CARD8                 map[KD_MAX_BUTTON + 1];

+    int                   nButtons;

+    int                   nAxes;

+

+    Bool                  emulateMiddleButton;

+    unsigned long         emulationTimeout;

+    int                   emulationDx, emulationDy;

+

+    Bool                  timeoutPending;

+    KdPointerState        mouseState;

+    Bool                  eventHeld;

+    struct {

+        int type;

+        int x;

+        int y;

+        int z;

+        int flags;

+        int absrel;

+    } heldEvent;

+    unsigned char         buttonState;

+    Bool                  transformCoordinates;

+    int                   pressureThreshold;

+

+    KdPointerDriver       *driver;

+    void                  *driverPrivate;

+

+    struct _KdPointerInfo *next;

+};

+

+extern int KdCurScreen;

+

+void KdAddPointerDriver (KdPointerDriver *driver);

+void KdRemovePointerDriver (KdPointerDriver *driver);

+KdPointerInfo *KdNewPointer (void);

+void KdFreePointer (KdPointerInfo *);

+int KdAddPointer (KdPointerInfo *ki);

+int KdAddConfigPointer (char *pointer);

+void KdRemovePointer (KdPointerInfo *ki);

+

+

+#define KD_KEY_COUNT 248

+#define KD_MIN_KEYCODE  8

+#define KD_MAX_KEYCODE  255

+#define KD_MAX_WIDTH    4

+#define KD_MAX_LENGTH   (KD_MAX_KEYCODE - KD_MIN_KEYCODE + 1)

+

+typedef struct {

+    KeySym modsym;

+    int    modbit;

+} KdKeySymModsRec;

+

+typedef struct _KdKeyboardInfo KdKeyboardInfo;

+

+typedef struct _KdKeyboardDriver {

+    char                  *name;

+    Bool                  (*Init)    (KdKeyboardInfo *);

+    Bool                  (*Enable)  (KdKeyboardInfo *);

+    void                  (*Leds)    (KdKeyboardInfo *, int);

+    void                  (*Bell)    (KdKeyboardInfo *, int, int, int);

+    void                  (*Disable) (KdKeyboardInfo *);

+    void                  (*Fini)    (KdKeyboardInfo *);

+    struct _KdKeyboardDriver *next;

+} KdKeyboardDriver;

+

+struct _KdKeyboardInfo {

+    struct _KdKeyboardInfo *next;

+    DeviceIntPtr        dixdev;

+    void                *closure;

+    char                *name;

+    char                *path;

+    int                 inputClass;

+    char                *xkbRules;

+    char                *xkbModel;

+    char                *xkbLayout;

+    char                *xkbVariant;

+    char                *xkbOptions;

+    int                 LockLed;

+

+    int                 minScanCode;

+    int                 maxScanCode;

+

+    int                 leds;

+    int                 bellPitch;

+    int                 bellDuration;

+    InputOption         *options;

+

+    KdKeyboardDriver    *driver;

+    void                *driverPrivate;

+};

+

+void KdAddKeyboardDriver (KdKeyboardDriver *driver);

+void KdRemoveKeyboardDriver (KdKeyboardDriver *driver);

+KdKeyboardInfo *KdNewKeyboard (void);

+void KdFreeKeyboard (KdKeyboardInfo *ki);

+int KdAddConfigKeyboard (char *pointer);

+int KdAddKeyboard (KdKeyboardInfo *ki);

+void KdRemoveKeyboard (KdKeyboardInfo *ki);

+

+typedef struct _KdOsFuncs {

+    int		    (*Init) (void);

+    void	    (*Enable) (void);

+    Bool	    (*SpecialKey) (KeySym);

+    void	    (*Disable) (void);

+    void	    (*Fini) (void);

+    void	    (*pollEvents) (void);

+    void            (*Bell) (int, int, int);

+} KdOsFuncs;

+

+typedef enum _KdSyncPolarity {

+    KdSyncNegative, KdSyncPositive

+} KdSyncPolarity;

+

+typedef struct _KdMonitorTiming {

+    /* label */

+    int		    horizontal;

+    int		    vertical;

+    int		    rate;

+    /* pixel clock */

+    int		    clock;  /* in KHz */

+    /* horizontal timing */

+    int		    hfp;    /* front porch */

+    int		    hbp;    /* back porch */

+    int		    hblank; /* blanking */

+    KdSyncPolarity  hpol;   /* polarity */

+    /* vertical timing */

+    int		    vfp;    /* front porch */

+    int		    vbp;    /* back porch */

+    int		    vblank; /* blanking */

+    KdSyncPolarity  vpol;   /* polarity */

+} KdMonitorTiming;

+

+extern const KdMonitorTiming	kdMonitorTimings[];

+extern const int		kdNumMonitorTimings;

+

+typedef struct _KdPointerMatrix {

+    int	    matrix[2][3];

+} KdPointerMatrix;

+

+/*

+ * This is the only completely portable way to

+ * compute this info.

+ */

+

+#ifndef BitsPerPixel

+#define BitsPerPixel(d) (\

+    PixmapWidthPaddingInfo[d].notPower2 ? \

+    (PixmapWidthPaddingInfo[d].bytesPerPixel * 8) : \

+    ((1 << PixmapWidthPaddingInfo[d].padBytesLog2) * 8 / \

+    (PixmapWidthPaddingInfo[d].padRoundUp+1)))

+#endif

+

+extern DevPrivateKeyRec	kdScreenPrivateKeyRec;

+#define kdScreenPrivateKey (&kdScreenPrivateKeyRec)

+

+extern unsigned long	kdGeneration;

+extern Bool		kdEnabled;

+extern Bool		kdSwitchPending;

+extern Bool		kdEmulateMiddleButton;

+extern Bool		kdDisableZaphod;

+extern Bool		kdAllowZap;

+extern int		kdVirtualTerminal;

+extern char		*kdSwitchCmd;

+extern KdOsFuncs	*kdOsFuncs;

+

+#define KdGetScreenPriv(pScreen) ((KdPrivScreenPtr) \

+    dixLookupPrivate(&(pScreen)->devPrivates, kdScreenPrivateKey))

+#define KdSetScreenPriv(pScreen,v) \

+    dixSetPrivate(&(pScreen)->devPrivates, kdScreenPrivateKey, v)

+#define KdScreenPriv(pScreen) KdPrivScreenPtr pScreenPriv = KdGetScreenPriv(pScreen)

+

+/* kcmap.c */

+void

+KdSetColormap (ScreenPtr pScreen);

+

+void

+KdEnableColormap (ScreenPtr pScreen);

+

+void

+KdDisableColormap (ScreenPtr pScreen);

+

+void

+KdInstallColormap (ColormapPtr pCmap);

+

+void

+KdUninstallColormap (ColormapPtr pCmap);

+

+int

+KdListInstalledColormaps (ScreenPtr pScreen, Colormap *pCmaps);

+

+void

+KdStoreColors (ColormapPtr pCmap, int ndef, xColorItem *pdefs);

+

+/* kdrive.c */

+extern miPointerScreenFuncRec kdPointerScreenFuncs;

+

+void

+KdSetRootClip (ScreenPtr pScreen, BOOL enable);

+

+void

+KdDisableScreen (ScreenPtr pScreen);

+

+void

+KdDisableScreens (void);

+

+Bool

+KdEnableScreen (ScreenPtr pScreen);

+

+void

+KdEnableScreens (void);

+

+void

+KdSuspend (void);

+

+void

+KdResume (void);

+

+void

+KdProcessSwitch (void);

+

+Rotation

+KdAddRotation (Rotation a, Rotation b);

+

+Rotation

+KdSubRotation (Rotation a, Rotation b);

+

+void

+KdParseScreen (KdScreenInfo *screen,

+	       char	    *arg);

+

+KdPointerInfo *

+KdParsePointer (char *arg);

+

+KdKeyboardInfo *

+KdParseKeyboard (char *arg);

+

+char *

+KdParseFindNext (char *cur, char *delim, char *save, char *last);

+

+void

+KdParseRgba (char *rgba);

+

+void

+KdUseMsg (void);

+

+int

+KdProcessArgument (int argc, char **argv, int i);

+

+void

+KdOsInit (KdOsFuncs *pOsFuncs);

+

+void

+KdOsAddInputDrivers (void);

+

+Bool

+KdAllocatePrivates (ScreenPtr pScreen);

+

+Bool

+KdCreateScreenResources (ScreenPtr pScreen);

+

+Bool

+KdCloseScreen (int index, ScreenPtr pScreen);

+

+Bool

+KdSaveScreen (ScreenPtr pScreen, int on);

+

+Bool

+KdScreenInit(int index, ScreenPtr pScreen, int argc, char **argv);

+

+void

+KdInitScreen (ScreenInfo    *pScreenInfo,

+	      KdScreenInfo  *screen,

+	      int	    argc,

+	      char	    **argv);

+

+void

+KdInitCard (ScreenInfo	    *pScreenInfo,

+	    KdCardInfo	    *card,

+	    int		    argc,

+	    char	    **argv);

+

+void

+KdInitOutput (ScreenInfo    *pScreenInfo,

+	      int	    argc,

+	      char	    **argv);

+

+void

+KdSetSubpixelOrder (ScreenPtr pScreen, Rotation randr);

+

+void

+KdBacktrace (int signum);

+

+/* kinfo.c */

+KdCardInfo *

+KdCardInfoAdd (KdCardFuncs  *funcs,

+	       void	    *closure);

+

+KdCardInfo *

+KdCardInfoLast (void);

+

+void

+KdCardInfoDispose (KdCardInfo *ci);

+

+KdScreenInfo *

+KdScreenInfoAdd (KdCardInfo *ci);

+

+void

+KdScreenInfoDispose (KdScreenInfo *si);

+

+

+/* kinput.c */

+void

+KdInitInput(void);

+

+void

+KdAddPointerDriver(KdPointerDriver *);

+

+void

+KdAddKeyboardDriver(KdKeyboardDriver *);

+

+Bool

+KdRegisterFd (int fd, void (*read) (int fd, void *closure), void *closure);

+

+void

+KdUnregisterFds (void *closure, Bool do_close);

+

+void

+KdUnregisterFd (void *closure, int fd, Bool do_close);

+

+void

+KdEnqueueKeyboardEvent(KdKeyboardInfo *ki, unsigned char scan_code,

+                    unsigned char is_up);

+

+#define KD_BUTTON_1	0x01

+#define KD_BUTTON_2	0x02

+#define KD_BUTTON_3	0x04

+#define KD_BUTTON_4	0x08

+#define KD_BUTTON_5	0x10

+#define KD_BUTTON_8	0x80

+#define KD_MOUSE_DELTA	0x80000000

+

+void

+KdEnqueuePointerEvent(KdPointerInfo *pi, unsigned long flags, int rx, int ry,

+                      int rz);

+

+void

+_KdEnqueuePointerEvent(KdPointerInfo *pi, int type, int x, int y, int z,

+                       int b, int absrel, Bool force);

+

+void

+KdReleaseAllKeys (void);

+

+void

+KdSetLed (KdKeyboardInfo *ki, int led, Bool on);

+

+void

+KdSetPointerMatrix (KdPointerMatrix *pointer);

+

+void

+KdComputePointerMatrix (KdPointerMatrix *pointer, Rotation randr, int width, int height);

+

+void

+KdScreenToPointerCoords (int *x, int *y);

+

+void

+KdBlockHandler (int		screen,

+		pointer		blockData,

+		pointer		timeout,

+		pointer		readmask);

+

+void

+KdWakeupHandler (int		screen,

+		 pointer    	data,

+		 unsigned long	result,

+		 pointer	readmask);

+

+void

+KdDisableInput (void);

+

+void

+KdEnableInput (void);

+

+void

+ProcessInputEvents (void);

+

+void

+KdRingBell (KdKeyboardInfo      *ki,

+            int                 volume,

+            int                 pitch,

+            int                 duration);

+

+/* kmode.c */

+const KdMonitorTiming *

+KdFindMode (KdScreenInfo    *screen,

+	    Bool	    (*supported) (KdScreenInfo *,

+					  const KdMonitorTiming *));

+

+Bool

+KdTuneMode (KdScreenInfo    *screen,

+	    Bool	    (*usable) (KdScreenInfo *),

+	    Bool	    (*supported) (KdScreenInfo *,

+					  const KdMonitorTiming *));

+

+#ifdef RANDR

+Bool

+KdRandRGetInfo (ScreenPtr pScreen,

+		int randr,

+		Bool (*supported) (ScreenPtr pScreen,

+				   const KdMonitorTiming *));

+

+const KdMonitorTiming *

+KdRandRGetTiming (ScreenPtr	    pScreen,

+		  Bool		    (*supported) (ScreenPtr pScreen,

+						  const KdMonitorTiming *),

+		  int		    rate,

+		  RRScreenSizePtr   pSize);

+#endif

+

+/* kshadow.c */

+Bool

+KdShadowFbAlloc (KdScreenInfo *screen, Bool rotate);

+

+void

+KdShadowFbFree (KdScreenInfo *screen);

+

+Bool

+KdShadowSet (ScreenPtr pScreen, int randr, ShadowUpdateProc update, ShadowWindowProc window);

+

+void

+KdShadowUnset (ScreenPtr pScreen);

+

+/* function prototypes to be implemented by the drivers */

+void

+InitCard (char *name);

+

+#endif /* _KDRIVE_H_ */

diff --git a/xorg-server/hw/kdrive/src/kxv.c b/xorg-server/hw/kdrive/src/kxv.c
index 9fef34d1f..cf960e62b 100644
--- a/xorg-server/hw/kdrive/src/kxv.c
+++ b/xorg-server/hw/kdrive/src/kxv.c
@@ -103,10 +103,9 @@ static void KdXVClipNotify(WindowPtr pWin, int dx, int dy);
 /* misc */

 static Bool KdXVInitAdaptors(ScreenPtr, KdVideoAdaptorPtr*, int);

 

-static int KdXVWindowKeyIndex;

-DevPrivateKey KdXVWindowKey = &KdXVWindowKeyIndex;

-static int KdXvScreenKeyIndex;

-DevPrivateKey KdXvScreenKey = &KdXvScreenKeyIndex;

+static DevPrivateKeyRec KdXVWindowKeyRec;

+#define KdXVWindowKey (&KdXVWindowKeyRec)

+static DevPrivateKey KdXvScreenKey;

 static unsigned long KdXVGeneration = 0;

 static unsigned long PortResource = 0;

 

@@ -199,6 +198,9 @@ KdXVScreenInit(
   if(!XvGetScreenKeyProc || !XvGetRTPortProc || !XvScreenInitProc)

 	return FALSE;

 

+  if (!dixRegisterPrivateKey(&KdXVWindowKeyRec, PRIVATE_WINDOW, 0))

+      return FALSE;

+

   if(Success != (*XvScreenInitProc)(pScreen)) return FALSE;

 

   KdXvScreenKey = (*XvGetScreenKeyProc)();

@@ -268,9 +270,9 @@ KdXVFreeAdaptor(XvAdaptorPtr pAdaptor)
           pPriv = (XvPortRecPrivatePtr)pPort->devPriv.ptr;

 	  if(pPriv) {

 	     if(pPriv->clientClip)

-		REGION_DESTROY(pAdaptor->pScreen, pPriv->clientClip);

+		RegionDestroy(pPriv->clientClip);

              if(pPriv->pCompositeClip && pPriv->FreeCompositeClip)

-		REGION_DESTROY(pAdaptor->pScreen, pPriv->pCompositeClip);

+		RegionDestroy(pPriv->pCompositeClip);

 	     free(pPriv);

 	  }

       }

@@ -607,18 +609,18 @@ KdXVUpdateCompositeClip(XvPortRecPrivatePtr portPriv)
 	return;

    }

 

-   pCompositeClip = REGION_CREATE(pWin->pScreen, NullBox, 1);

-   REGION_COPY(pWin->pScreen, pCompositeClip, portPriv->clientClip);

-   REGION_TRANSLATE(pWin->pScreen, pCompositeClip,

+   pCompositeClip = RegionCreate(NullBox, 1);

+   RegionCopy(pCompositeClip, portPriv->clientClip);

+   RegionTranslate(pCompositeClip,

 			portPriv->pDraw->x + portPriv->clipOrg.x,

 			portPriv->pDraw->y + portPriv->clipOrg.y);

-   REGION_INTERSECT(pWin->pScreen, pCompositeClip, pregWin, pCompositeClip);

+   RegionIntersect(pCompositeClip, pregWin, pCompositeClip);

 

    portPriv->pCompositeClip = pCompositeClip;

    portPriv->FreeCompositeClip = TRUE;

 

    if(freeCompClip) {

-   	REGION_DESTROY(pWin->pScreen, pregWin);

+	RegionDestroy(pregWin);

    }

 }

 

@@ -633,17 +635,17 @@ KdXVCopyClip(
     /* copy the new clip if it exists */

     if((pGC->clientClipType == CT_REGION) && pGC->clientClip) {

 	if(!portPriv->clientClip)

-	    portPriv->clientClip = REGION_CREATE(pGC->pScreen, NullBox, 1);

+	    portPriv->clientClip = RegionCreate(NullBox, 1);

 	/* Note: this is in window coordinates */

-	REGION_COPY(pGC->pScreen, portPriv->clientClip, pGC->clientClip);

+	RegionCopy(portPriv->clientClip, pGC->clientClip);

     } else if(portPriv->clientClip) { /* free the old clientClip */

-	REGION_DESTROY(pGC->pScreen, portPriv->clientClip);

+	RegionDestroy(portPriv->clientClip);

 	portPriv->clientClip = NULL;

     }

 

     /* get rid of the old clip list */

     if(portPriv->pCompositeClip && portPriv->FreeCompositeClip) {

-	REGION_DESTROY(pWin->pScreen, portPriv->pCompositeClip);

+	RegionDestroy(portPriv->pCompositeClip);

     }

 

     portPriv->clipOrg = pGC->clipOrg;

@@ -670,18 +672,18 @@ KdXVRegetVideo(XvPortRecPrivatePtr portPriv)
   WinBox.y2 = WinBox.y1 + portPriv->drw_h;

 

   /* clip to the window composite clip */

-  REGION_INIT(portPriv->pDraw->pScreen, &WinRegion, &WinBox, 1);

-  REGION_INIT(portPriv->pDraw->pScreen, &ClipRegion, NullBox, 1);

-  REGION_INTERSECT(portPriv->pDraw->pScreen, &ClipRegion, &WinRegion, portPriv->pCompositeClip);

+  RegionInit(&WinRegion, &WinBox, 1);

+  RegionInit(&ClipRegion, NullBox, 1);

+  RegionIntersect(&ClipRegion, &WinRegion, portPriv->pCompositeClip);

 

   /* that's all if it's totally obscured */

-  if(!REGION_NOTEMPTY(portPriv->pDraw->pScreen, &ClipRegion)) {

+  if(!RegionNotEmpty(&ClipRegion)) {

 	clippedAway = TRUE;

 	goto CLIP_VIDEO_BAILOUT;

   }

 

   if(portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {

-     REGION_SUBTRACT(portPriv->pDraw->pScreen, &ClipRegion, &WinRegion, &ClipRegion);

+     RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);

   }

 

   ret = (*portPriv->AdaptorRec->GetVideo)(portPriv->screen, portPriv->pDraw,

@@ -706,8 +708,8 @@ CLIP_VIDEO_BAILOUT:
   if(!portPriv->FreeCompositeClip)

      portPriv->pCompositeClip = NULL;

 

-  REGION_UNINIT(portPriv->pDraw->pScreen, &WinRegion);

-  REGION_UNINIT(portPriv->pDraw->pScreen, &ClipRegion);

+  RegionUninit(&WinRegion);

+  RegionUninit(&ClipRegion);

 

   return ret;

 }

@@ -734,9 +736,9 @@ KdXVReputVideo(XvPortRecPrivatePtr portPriv)
   WinBox.y2 = WinBox.y1 + portPriv->drw_h;

 

   /* clip to the window composite clip */

-  REGION_INIT(pScreen, &WinRegion, &WinBox, 1);

-  REGION_INIT(pScreen, &ClipRegion, NullBox, 1);

-  REGION_INTERSECT(Screen, &ClipRegion, &WinRegion, portPriv->pCompositeClip);

+  RegionInit(&WinRegion, &WinBox, 1);

+  RegionInit(&ClipRegion, NullBox, 1);

+  RegionIntersect(&ClipRegion, &WinRegion, portPriv->pCompositeClip);

 

   /* clip and translate to the viewport */

   if(portPriv->AdaptorRec->flags & VIDEO_CLIP_TO_VIEWPORT) {

@@ -748,21 +750,21 @@ KdXVReputVideo(XvPortRecPrivatePtr portPriv)
      VPBox.x2 = screen->width;

      VPBox.y2 = screen->height;

 

-     REGION_INIT(pScreen, &VPReg, &VPBox, 1);

-     REGION_INTERSECT(Screen, &ClipRegion, &ClipRegion, &VPReg);

-     REGION_UNINIT(pScreen, &VPReg);

+     RegionInit(&VPReg, &VPBox, 1);

+     RegionIntersect(&ClipRegion, &ClipRegion, &VPReg);

+     RegionUninit(&VPReg);

   }

 

   /* that's all if it's totally obscured */

-  if(!REGION_NOTEMPTY(pScreen, &ClipRegion)) {

+  if(!RegionNotEmpty(&ClipRegion)) {

 	clippedAway = TRUE;

 	goto CLIP_VIDEO_BAILOUT;

   }

 

   /* bailout if we have to clip but the hardware doesn't support it */

   if(portPriv->AdaptorRec->flags & VIDEO_NO_CLIPPING) {

-     BoxPtr clipBox = REGION_RECTS(&ClipRegion);

-     if(  (REGION_NUM_RECTS(&ClipRegion) != 1) ||

+     BoxPtr clipBox = RegionRects(&ClipRegion);

+     if(  (RegionNumRects(&ClipRegion) != 1) ||

 	  (clipBox->x1 != WinBox.x1) || (clipBox->x2 != WinBox.x2) ||

 	  (clipBox->y1 != WinBox.y1) || (clipBox->y2 != WinBox.y2))

      {

@@ -772,7 +774,7 @@ KdXVReputVideo(XvPortRecPrivatePtr portPriv)
   }

 

   if(portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {

-     REGION_SUBTRACT(pScreen, &ClipRegion, &WinRegion, &ClipRegion);

+     RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);

   }

 

   ret = (*portPriv->AdaptorRec->PutVideo)(portPriv->screen, portPriv->pDraw,

@@ -796,8 +798,8 @@ CLIP_VIDEO_BAILOUT:
   if(!portPriv->FreeCompositeClip)

      portPriv->pCompositeClip = NULL;

 

-  REGION_UNINIT(pScreen, &WinRegion);

-  REGION_UNINIT(pScreen, &ClipRegion);

+  RegionUninit(&WinRegion);

+  RegionUninit(&ClipRegion);

 

   return ret;

 }

@@ -823,9 +825,9 @@ KdXVReputImage(XvPortRecPrivatePtr portPriv)
   WinBox.y2 = WinBox.y1 + portPriv->drw_h;

 

   /* clip to the window composite clip */

-  REGION_INIT(pScreen, &WinRegion, &WinBox, 1);

-  REGION_INIT(pScreen, &ClipRegion, NullBox, 1);

-  REGION_INTERSECT(Screen, &ClipRegion, &WinRegion, portPriv->pCompositeClip);

+  RegionInit(&WinRegion, &WinBox, 1);

+  RegionInit(&ClipRegion, NullBox, 1);

+  RegionIntersect(&ClipRegion, &WinRegion, portPriv->pCompositeClip);

 

   /* clip and translate to the viewport */

   if(portPriv->AdaptorRec->flags & VIDEO_CLIP_TO_VIEWPORT) {

@@ -837,21 +839,21 @@ KdXVReputImage(XvPortRecPrivatePtr portPriv)
      VPBox.x2 = screen->width;

      VPBox.y2 = screen->height;

 

-     REGION_INIT(pScreen, &VPReg, &VPBox, 1);

-     REGION_INTERSECT(Screen, &ClipRegion, &ClipRegion, &VPReg);

-     REGION_UNINIT(pScreen, &VPReg);

+     RegionInit(&VPReg, &VPBox, 1);

+     RegionIntersect(&ClipRegion, &ClipRegion, &VPReg);

+     RegionUninit(&VPReg);

   }

 

   /* that's all if it's totally obscured */

-  if(!REGION_NOTEMPTY(pScreen, &ClipRegion)) {

+  if(!RegionNotEmpty(&ClipRegion)) {

 	clippedAway = TRUE;

 	goto CLIP_VIDEO_BAILOUT;

   }

 

   /* bailout if we have to clip but the hardware doesn't support it */

   if(portPriv->AdaptorRec->flags & VIDEO_NO_CLIPPING) {

-     BoxPtr clipBox = REGION_RECTS(&ClipRegion);

-     if(  (REGION_NUM_RECTS(&ClipRegion) != 1) ||

+     BoxPtr clipBox = RegionRects(&ClipRegion);

+     if(  (RegionNumRects(&ClipRegion) != 1) ||

 	  (clipBox->x1 != WinBox.x1) || (clipBox->x2 != WinBox.x2) ||

 	  (clipBox->y1 != WinBox.y1) || (clipBox->y2 != WinBox.y2))

      {

@@ -861,7 +863,7 @@ KdXVReputImage(XvPortRecPrivatePtr portPriv)
   }

 

   if(portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {

-     REGION_SUBTRACT(pScreen, &ClipRegion, &WinRegion, &ClipRegion);

+     RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);

   }

 

   ret = (*portPriv->AdaptorRec->ReputImage)(portPriv->screen, portPriv->pDraw,

@@ -882,8 +884,8 @@ CLIP_VIDEO_BAILOUT:
   if(!portPriv->FreeCompositeClip)

      portPriv->pCompositeClip = NULL;

 

-  REGION_UNINIT(pScreen, &WinRegion);

-  REGION_UNINIT(pScreen, &ClipRegion);

+  RegionUninit(&WinRegion);

+  RegionUninit(&ClipRegion);

 

   return ret;

 }

@@ -1021,7 +1023,7 @@ KdXVWindowExposures(WindowPtr pWin, RegionPtr reg1, RegionPtr reg2)
   XvPortRecPrivatePtr pPriv;

   Bool AreasExposed;

 

-  AreasExposed = (WinPriv && reg1 && REGION_NOTEMPTY(pScreen, reg1));

+  AreasExposed = (WinPriv && reg1 && RegionNotEmpty(reg1));

 

   pScreen->WindowExposures = ScreenPriv->WindowExposures;

   (*pScreen->WindowExposures)(pWin, reg1, reg2);

@@ -1089,7 +1091,7 @@ KdXVClipNotify(WindowPtr pWin, int dx, int dy)
      pPriv = WinPriv->PortRec;

 

      if(pPriv->pCompositeClip && pPriv->FreeCompositeClip)

-	REGION_DESTROY(pScreen, pPriv->pCompositeClip);

+	RegionDestroy(pPriv->pCompositeClip);

 

      pPriv->pCompositeClip = NULL;

 

@@ -1171,7 +1173,7 @@ KdXVQueryAdaptors(
   *p_nAdaptors = pxvs->nAdaptors;

   *p_pAdaptors = pxvs->pAdaptors;

 

-  return (Success);

+  return Success;

 }

 

 static Bool

@@ -1220,7 +1222,7 @@ KdXVDisable(ScreenPtr pScreen)
 		pPriv->isOn = XV_OFF;

 

 		if(pPriv->pCompositeClip && pPriv->FreeCompositeClip)

-		    REGION_DESTROY(pScreen, pPriv->pCompositeClip);

+		    RegionDestroy(pPriv->pCompositeClip);

 

 		pPriv->pCompositeClip = NULL;

 

@@ -1330,9 +1332,9 @@ KdXVPutStill(
   WinBox.x2 = WinBox.x1 + drw_w;

   WinBox.y2 = WinBox.y1 + drw_h;

 

-  REGION_INIT(pScreen, &WinRegion, &WinBox, 1);

-  REGION_INIT(pScreen, &ClipRegion, NullBox, 1);

-  REGION_INTERSECT(pScreen, &ClipRegion, &WinRegion, pGC->pCompositeClip);

+  RegionInit(&WinRegion, &WinBox, 1);

+  RegionInit(&ClipRegion, NullBox, 1);

+  RegionIntersect(&ClipRegion, &WinRegion, pGC->pCompositeClip);

 

   if(portPriv->AdaptorRec->flags & VIDEO_CLIP_TO_VIEWPORT) {

      RegionRec VPReg;

@@ -1343,23 +1345,23 @@ KdXVPutStill(
      VPBox.x2 = screen->width;

      VPBox.y2 = screen->height;

 

-     REGION_INIT(pScreen, &VPReg, &VPBox, 1);

-     REGION_INTERSECT(Screen, &ClipRegion, &ClipRegion, &VPReg);

-     REGION_UNINIT(pScreen, &VPReg);

+     RegionInit(&VPReg, &VPBox, 1);

+     RegionIntersect(&ClipRegion, &ClipRegion, &VPReg);

+     RegionUninit(&VPReg);

   }

 

   if(portPriv->pDraw) {

      KdXVRemovePortFromWindow((WindowPtr)(portPriv->pDraw), portPriv);

   }

 

-  if(!REGION_NOTEMPTY(pScreen, &ClipRegion)) {

+  if(!RegionNotEmpty(&ClipRegion)) {

      clippedAway = TRUE;

      goto PUT_STILL_BAILOUT;

   }

 

   if(portPriv->AdaptorRec->flags & VIDEO_NO_CLIPPING) {

-     BoxPtr clipBox = REGION_RECTS(&ClipRegion);

-     if(  (REGION_NUM_RECTS(&ClipRegion) != 1) ||

+     BoxPtr clipBox = RegionRects(&ClipRegion);

+     if(  (RegionNumRects(&ClipRegion) != 1) ||

 	  (clipBox->x1 != WinBox.x1) || (clipBox->x2 != WinBox.x2) ||

 	  (clipBox->y1 != WinBox.y1) || (clipBox->y2 != WinBox.y2))

      {

@@ -1369,7 +1371,7 @@ KdXVPutStill(
   }

 

   if(portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {

-     REGION_SUBTRACT(pScreen, &ClipRegion, &WinRegion, &ClipRegion);

+     RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);

   }

 

   ret = (*portPriv->AdaptorRec->PutStill)(portPriv->screen, pDraw,

@@ -1398,8 +1400,8 @@ PUT_STILL_BAILOUT:
         portPriv->isOn = XV_PENDING;

   }

 

-  REGION_UNINIT(pScreen, &WinRegion);

-  REGION_UNINIT(pScreen, &ClipRegion);

+  RegionUninit(&WinRegion);

+  RegionUninit(&ClipRegion);

 

   return ret;

 }

@@ -1483,21 +1485,21 @@ KdXVGetStill(
   WinBox.x2 = WinBox.x1 + drw_w;

   WinBox.y2 = WinBox.y1 + drw_h;

 

-  REGION_INIT(pScreen, &WinRegion, &WinBox, 1);

-  REGION_INIT(pScreen, &ClipRegion, NullBox, 1);

-  REGION_INTERSECT(pScreen, &ClipRegion, &WinRegion, pGC->pCompositeClip);

+  RegionInit(&WinRegion, &WinBox, 1);

+  RegionInit(&ClipRegion, NullBox, 1);

+  RegionIntersect(&ClipRegion, &WinRegion, pGC->pCompositeClip);

 

   if(portPriv->pDraw) {

      KdXVRemovePortFromWindow((WindowPtr)(portPriv->pDraw), portPriv);

   }

 

-  if(!REGION_NOTEMPTY(pScreen, &ClipRegion)) {

+  if(!RegionNotEmpty(&ClipRegion)) {

      clippedAway = TRUE;

      goto GET_STILL_BAILOUT;

   }

 

   if(portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {

-     REGION_SUBTRACT(pScreen, &ClipRegion, &WinRegion, &ClipRegion);

+     RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);

   }

 

   ret = (*portPriv->AdaptorRec->GetStill)(portPriv->screen, pDraw,

@@ -1513,8 +1515,8 @@ GET_STILL_BAILOUT:
         portPriv->isOn = XV_PENDING;

   }

 

-  REGION_UNINIT(pScreen, &WinRegion);

-  REGION_UNINIT(pScreen, &ClipRegion);

+  RegionUninit(&WinRegion);

+  RegionUninit(&ClipRegion);

 

   return ret;

 }

@@ -1630,9 +1632,9 @@ KdXVPutImage(
   WinBox.x2 = WinBox.x1 + drw_w;

   WinBox.y2 = WinBox.y1 + drw_h;

 

-  REGION_INIT(pScreen, &WinRegion, &WinBox, 1);

-  REGION_INIT(pScreen, &ClipRegion, NullBox, 1);

-  REGION_INTERSECT(pScreen, &ClipRegion, &WinRegion, pGC->pCompositeClip);

+  RegionInit(&WinRegion, &WinBox, 1);

+  RegionInit(&ClipRegion, NullBox, 1);

+  RegionIntersect(&ClipRegion, &WinRegion, pGC->pCompositeClip);

 

   if(portPriv->AdaptorRec->flags & VIDEO_CLIP_TO_VIEWPORT) {

      RegionRec VPReg;

@@ -1643,23 +1645,23 @@ KdXVPutImage(
      VPBox.x2 = pScreen->width;

      VPBox.y2 = pScreen->height;

 

-     REGION_INIT(pScreen, &VPReg, &VPBox, 1);

-     REGION_INTERSECT(Screen, &ClipRegion, &ClipRegion, &VPReg);

-     REGION_UNINIT(pScreen, &VPReg);

+     RegionInit(&VPReg, &VPBox, 1);

+     RegionIntersect(&ClipRegion, &ClipRegion, &VPReg);

+     RegionUninit(&VPReg);

   }

 

   if(portPriv->pDraw) {

      KdXVRemovePortFromWindow((WindowPtr)(portPriv->pDraw), portPriv);

   }

 

-  if(!REGION_NOTEMPTY(pScreen, &ClipRegion)) {

+  if(!RegionNotEmpty(&ClipRegion)) {

      clippedAway = TRUE;

      goto PUT_IMAGE_BAILOUT;

   }

 

   if(portPriv->AdaptorRec->flags & VIDEO_NO_CLIPPING) {

-     BoxPtr clipBox = REGION_RECTS(&ClipRegion);

-     if(  (REGION_NUM_RECTS(&ClipRegion) != 1) ||

+     BoxPtr clipBox = RegionRects(&ClipRegion);

+     if(  (RegionNumRects(&ClipRegion) != 1) ||

 	  (clipBox->x1 != WinBox.x1) || (clipBox->x2 != WinBox.x2) ||

 	  (clipBox->y1 != WinBox.y1) || (clipBox->y2 != WinBox.y2))

      {

@@ -1669,7 +1671,7 @@ KdXVPutImage(
   }

 

   if(portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {

-     REGION_SUBTRACT(pScreen, &ClipRegion, &WinRegion, &ClipRegion);

+     RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);

   }

 

   ret = (*portPriv->AdaptorRec->PutImage)(portPriv->screen, pDraw,

@@ -1698,8 +1700,8 @@ PUT_IMAGE_BAILOUT:
         portPriv->isOn = XV_PENDING;

   }

 

-  REGION_UNINIT(pScreen, &WinRegion);

-  REGION_UNINIT(pScreen, &ClipRegion);

+  RegionUninit(&WinRegion);

+  RegionUninit(&ClipRegion);

 

   return ret;

 }

@@ -1869,8 +1871,8 @@ KXVPaintRegion (DrawablePtr pDraw, RegionPtr pRgn, Pixel fg)
     GCPtr	pGC;

     ChangeGCVal	val[2];

     xRectangle	*rects, *r;

-    BoxPtr	pBox = REGION_RECTS (pRgn);

-    int		nBox = REGION_NUM_RECTS (pRgn);

+    BoxPtr	pBox = RegionRects (pRgn);

+    int		nBox = RegionNumRects (pRgn);

 

     rects = malloc(nBox * sizeof (xRectangle));

     if (!rects)

@@ -1897,7 +1899,7 @@ KXVPaintRegion (DrawablePtr pDraw, RegionPtr pRgn, Pixel fg)
     ValidateGC (pDraw, pGC);

 

     (*pGC->ops->PolyFillRect) (pDraw, pGC,

-			       REGION_NUM_RECTS (pRgn), rects);

+			       RegionNumRects (pRgn), rects);

 

     FreeScratchGC (pGC);

 bail1: