Merge remote-tracking branch 'origin/released'

Conflicts:
	pixman/pixman/pixman-mmx.c
	xorg-server/Xext/shm.c
	xorg-server/Xext/syncsrv.h
	xorg-server/Xext/xvmain.c
	xorg-server/Xi/exevents.c
	xorg-server/Xi/opendev.c
	xorg-server/composite/compalloc.c
	xorg-server/composite/compoverlay.c
	xorg-server/dix/colormap.c
	xorg-server/dix/devices.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/dix/eventconvert.c
	xorg-server/dix/events.c
	xorg-server/dix/gc.c
	xorg-server/dix/getevents.c
	xorg-server/dix/main.c
	xorg-server/dix/privates.c
	xorg-server/dix/registry.c
	xorg-server/dix/resource.c
	xorg-server/exa/exa_accel.c
	xorg-server/exa/exa_migration_classic.c
	xorg-server/exa/exa_unaccel.c
	xorg-server/fb/fb.h
	xorg-server/fb/fbcopy.c
	xorg-server/fb/fbpixmap.c
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmds.c
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdricommon.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/glxext.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_util.c
	xorg-server/glx/rensize.c
	xorg-server/glx/single2swap.c
	xorg-server/glx/singlepix.c
	xorg-server/glx/singlepixswap.c
	xorg-server/glx/singlesize.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/hostx.c
	xorg-server/hw/kdrive/ephyr/hostx.h
	xorg-server/hw/kdrive/src/kinput.c
	xorg-server/hw/xfree86/common/compiler.h
	xorg-server/hw/xwin/InitInput.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/glwrap.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/glx/wgl_ext_api.h
	xorg-server/hw/xwin/glx/winpriv.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winallpriv.c
	xorg-server/hw/xwin/winauth.c
	xorg-server/hw/xwin/winclipboard.h
	xorg-server/hw/xwin/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardunicode.c
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/wincmap.c
	xorg-server/hw/xwin/winconfig.c
	xorg-server/hw/xwin/wincreatewnd.c
	xorg-server/hw/xwin/wincursor.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/wingetsp.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winkeybd.h
	xorg-server/hw/xwin/winlayouts.h
	xorg-server/hw/xwin/winmisc.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/hw/xwin/winmsg.c
	xorg-server/hw/xwin/winmsg.h
	xorg-server/hw/xwin/winmultiwindowclass.c
	xorg-server/hw/xwin/winmultiwindowicons.c
	xorg-server/hw/xwin/winmultiwindowshape.c
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winnativegdi.c
	xorg-server/hw/xwin/winpfbdd.c
	xorg-server/hw/xwin/winpixmap.c
	xorg-server/hw/xwin/winpolyline.c
	xorg-server/hw/xwin/winprefs.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winregistry.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winsetsp.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/hw/xwin/winshadddnl.c
	xorg-server/hw/xwin/winshadgdi.c
	xorg-server/hw/xwin/wintrayicon.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwin32rootlesswindow.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/hw/xwin/winwindow.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/hw/xwin/winwndproc.c
	xorg-server/include/callback.h
	xorg-server/include/dixstruct.h
	xorg-server/include/misc.h
	xorg-server/include/os.h
	xorg-server/include/scrnintstr.h
	xorg-server/mi/micmap.c
	xorg-server/mi/miinitext.c
	xorg-server/mi/mioverlay.c
	xorg-server/mi/misprite.c
	xorg-server/mi/mivaltree.c
	xorg-server/mi/miwindow.c
	xorg-server/miext/damage/damage.c
	xorg-server/miext/rootless/rootlessGC.c
	xorg-server/miext/rootless/rootlessWindow.c
	xorg-server/os/WaitFor.c
	xorg-server/os/access.c
	xorg-server/os/connection.c
	xorg-server/os/io.c
	xorg-server/os/log.c
	xorg-server/os/osinit.c
	xorg-server/os/utils.c
	xorg-server/os/xdmcp.c
	xorg-server/os/xprintf.c
	xorg-server/os/xstrans.c
	xorg-server/render/mipict.c
	xorg-server/xkb/xkbActions.c
	xorg-server/xkb/xkbInit.c
	xorg-server/xkeyboard-config/compat/default.in

1 files changed, 506 insertions, 547 deletions

diff --git a/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c b/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c
index 69ad8a517..05a821b39 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrhostvideo.c
@@ -53,42 +53,37 @@
 #ifndef TRUE
 #define TRUE 1
 #endif /*TRUE*/
-
 #ifndef FALSE
 #define FALSE 0
 #endif /*FALSE*/
-
 static XExtensionInfo _xv_info_data;
 static XExtensionInfo *xv_info = &_xv_info_data;
 static char *xv_extension_name = XvName;
-static char *xv_error_string(Display *dpy, int code, XExtCodes *codes,
-                             char * buf, int n);
-static int xv_close_display(Display *dpy, XExtCodes *codes);
-static Bool xv_wire_to_event(Display *dpy, XEvent *host, xEvent *wire);
+static char *xv_error_string(Display * dpy, int code, XExtCodes * codes,
+                             char *buf, int n);
+static int xv_close_display(Display * dpy, XExtCodes * codes);
+static Bool xv_wire_to_event(Display * dpy, XEvent * host, xEvent *wire);
 
 static XExtensionHooks xv_extension_hooks = {
-    NULL,                               /* create_gc */
-    NULL,                               /* copy_gc */
-    NULL,                               /* flush_gc */
-    NULL,                               /* free_gc */
-    NULL,                               /* create_font */
-    NULL,                               /* free_font */
-    xv_close_display,                   /* close_display */
-    xv_wire_to_event,                   /* wire_to_event */
-    NULL,                               /* event_to_wire */
-    NULL,                               /* error */
-    xv_error_string                     /* error_string */
+    NULL,                       /* create_gc */
+    NULL,                       /* copy_gc */
+    NULL,                       /* flush_gc */
+    NULL,                       /* free_gc */
+    NULL,                       /* create_font */
+    NULL,                       /* free_font */
+    xv_close_display,           /* close_display */
+    xv_wire_to_event,           /* wire_to_event */
+    NULL,                       /* event_to_wire */
+    NULL,                       /* error */
+    xv_error_string             /* error_string */
 };
 
-
-static char *xv_error_list[] =
-{
-   "BadPort",       /* XvBadPort     */
-   "BadEncoding",   /* XvBadEncoding */
-   "BadControl"     /* XvBadControl  */
+static char *xv_error_list[] = {
+    "BadPort",                  /* XvBadPort     */
+    "BadEncoding",              /* XvBadEncoding */
+    "BadControl"                /* XvBadControl  */
 };
 
-
 #define XvCheckExtension(dpy, i, val) \
   XextCheckExtension(dpy, i, xv_extension_name, val)
 #define XvGetReq(name, req) \
@@ -102,51 +97,51 @@ static char *xv_error_list[] =
         dpy->bufptr += SIZEOF(xv##name##Req);\
         dpy->request++
 
-static XEXT_GENERATE_CLOSE_DISPLAY (xv_close_display, xv_info)
-
+static
+XEXT_GENERATE_CLOSE_DISPLAY(xv_close_display, xv_info)
 
-static XEXT_GENERATE_FIND_DISPLAY (xv_find_display, xv_info,
-                                   xv_extension_name,
-                                   &xv_extension_hooks,
-                                   XvNumEvents, NULL)
+static
+XEXT_GENERATE_FIND_DISPLAY(xv_find_display, xv_info,
+                           xv_extension_name,
+                           &xv_extension_hooks, XvNumEvents, NULL)
 
-static XEXT_GENERATE_ERROR_STRING (xv_error_string, xv_extension_name,
-                                   XvNumErrors, xv_error_list)
+static
+XEXT_GENERATE_ERROR_STRING(xv_error_string, xv_extension_name,
+                           XvNumErrors, xv_error_list)
 
 struct _EphyrHostXVAdaptorArray {
-    XvAdaptorInfo *adaptors ;
-    unsigned int nb_adaptors ;
+    XvAdaptorInfo *adaptors;
+    unsigned int nb_adaptors;
 };
 
 /*heavily copied from libx11*/
 #define BUFSIZE 2048
 static void
-ephyrHostXVLogXErrorEvent (Display *a_display,
-                           XErrorEvent *a_err_event,
-                           FILE *a_fp)
+ephyrHostXVLogXErrorEvent(Display * a_display,
+                          XErrorEvent * a_err_event, FILE * a_fp)
 {
     char buffer[BUFSIZ];
     char mesg[BUFSIZ];
     char number[32];
     const char *mtype = "XlibMessage";
-    register _XExtension *ext = (_XExtension *)NULL;
-    _XExtension *bext = (_XExtension *)NULL;
-    Display *dpy = a_display ;
+    register _XExtension *ext = (_XExtension *) NULL;
+    _XExtension *bext = (_XExtension *) NULL;
+    Display *dpy = a_display;
 
     XGetErrorText(dpy, a_err_event->error_code, buffer, BUFSIZ);
     XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
     (void) fprintf(a_fp, "%s:  %s\n  ", mesg, buffer);
     XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d",
-            mesg, BUFSIZ);
+                          mesg, BUFSIZ);
     (void) fprintf(a_fp, mesg, a_err_event->request_code);
     if (a_err_event->request_code < 128) {
         snprintf(number, sizeof(number), "%d", a_err_event->request_code);
         XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
-    } else {
+    }
+    else {
         for (ext = dpy->ext_procs;
-                ext && (ext->codes.major_opcode != a_err_event->request_code);
-                ext = ext->next)
-            ; 
+             ext && (ext->codes.major_opcode != a_err_event->request_code);
+             ext = ext->next);
         if (ext)
             strcpy(buffer, ext->name);
         else
@@ -155,7 +150,7 @@ ephyrHostXVLogXErrorEvent (Display *a_display,
     (void) fprintf(a_fp, " (%s)\n", buffer);
     if (a_err_event->request_code >= 128) {
         XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
-                mesg, BUFSIZ);
+                              mesg, BUFSIZ);
         fputs("  ", a_fp);
         (void) fprintf(a_fp, mesg, a_err_event->minor_code);
         if (ext) {
@@ -166,20 +161,20 @@ ephyrHostXVLogXErrorEvent (Display *a_display,
         }
         fputs("\n", a_fp);
     }
-    if (a_err_event->error_code >= 128) { 
+    if (a_err_event->error_code >= 128) {
         /* kludge, try to find the extension that caused it */
         buffer[0] = '\0';
         for (ext = dpy->ext_procs; ext; ext = ext->next) {
             if (ext->error_string)
-                (*ext->error_string)(dpy, a_err_event->error_code, &ext->codes,
-                        buffer, BUFSIZ);
+                (*ext->error_string) (dpy, a_err_event->error_code, &ext->codes,
+                                      buffer, BUFSIZ);
             if (buffer[0]) {
                 bext = ext;
                 break;
             }
             if (ext->codes.first_error &&
-                    ext->codes.first_error < (int)a_err_event->error_code &&
-                    (!bext || ext->codes.first_error > bext->codes.first_error))
+                ext->codes.first_error < (int) a_err_event->error_code &&
+                (!bext || ext->codes.first_error > bext->codes.first_error))
                 bext = ext;
         }
         if (bext)
@@ -196,505 +191,476 @@ ephyrHostXVLogXErrorEvent (Display *a_display,
         /* let extensions try to print the values */
         for (ext = dpy->ext_procs; ext; ext = ext->next) {
             if (ext->error_values)
-                (*ext->error_values)(dpy, a_err_event, a_fp);
+                (*ext->error_values) (dpy, a_err_event, a_fp);
         }
-    } else if ((a_err_event->error_code == BadWindow) ||
-            (a_err_event->error_code == BadPixmap) ||
-            (a_err_event->error_code == BadCursor) ||
-            (a_err_event->error_code == BadFont) ||
-            (a_err_event->error_code == BadDrawable) ||
-            (a_err_event->error_code == BadColor) ||
-            (a_err_event->error_code == BadGC) ||
-            (a_err_event->error_code == BadIDChoice) ||
-            (a_err_event->error_code == BadValue) ||
-            (a_err_event->error_code == BadAtom)) {
+    }
+    else if ((a_err_event->error_code == BadWindow) ||
+             (a_err_event->error_code == BadPixmap) ||
+             (a_err_event->error_code == BadCursor) ||
+             (a_err_event->error_code == BadFont) ||
+             (a_err_event->error_code == BadDrawable) ||
+             (a_err_event->error_code == BadColor) ||
+             (a_err_event->error_code == BadGC) ||
+             (a_err_event->error_code == BadIDChoice) ||
+             (a_err_event->error_code == BadValue) ||
+             (a_err_event->error_code == BadAtom)) {
         if (a_err_event->error_code == BadValue)
             XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
-                    mesg, BUFSIZ);
+                                  mesg, BUFSIZ);
         else if (a_err_event->error_code == BadAtom)
             XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
-                    mesg, BUFSIZ);
+                                  mesg, BUFSIZ);
         else
             XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
-                    mesg, BUFSIZ);
+                                  mesg, BUFSIZ);
         fputs("  ", a_fp);
         (void) fprintf(a_fp, mesg, a_err_event->resourceid);
         fputs("\n", a_fp);
     }
     XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
-            mesg, BUFSIZ);
+                          mesg, BUFSIZ);
     fputs("  ", a_fp);
     (void) fprintf(a_fp, mesg, a_err_event->serial);
     XGetErrorDatabaseText(dpy, mtype, "CurrentSerial", "Current Serial #%d",
-            mesg, BUFSIZ);
+                          mesg, BUFSIZ);
     fputs("\n  ", a_fp);
     (void) fprintf(a_fp, mesg, dpy->request);
     fputs("\n", a_fp);
 }
 
 static int
-ephyrHostXVErrorHandler (Display *a_display,
-                         XErrorEvent *a_error_event)
+ephyrHostXVErrorHandler(Display * a_display, XErrorEvent * a_error_event)
 {
-    EPHYR_LOG_ERROR ("got an error from the host xserver:\n") ;
-    ephyrHostXVLogXErrorEvent (a_display, a_error_event, stderr) ;
-    return Success ;
+    EPHYR_LOG_ERROR("got an error from the host xserver:\n");
+    ephyrHostXVLogXErrorEvent(a_display, a_error_event, stderr);
+    return Success;
 }
 
 void
-ephyrHostXVInit (void)
+ephyrHostXVInit(void)
 {
-    static Bool s_initialized ;
+    static Bool s_initialized;
 
     if (s_initialized)
-        return ;
-    XSetErrorHandler (ephyrHostXVErrorHandler) ;
-    s_initialized = TRUE ;
+        return;
+    XSetErrorHandler(ephyrHostXVErrorHandler);
+    s_initialized = TRUE;
 }
 
 Bool
-ephyrHostXVQueryAdaptors (EphyrHostXVAdaptorArray **a_adaptors)
+ephyrHostXVQueryAdaptors(EphyrHostXVAdaptorArray ** a_adaptors)
 {
-    EphyrHostXVAdaptorArray *result=NULL ;
-    int ret=0 ;
-    Bool is_ok=FALSE ;
+    EphyrHostXVAdaptorArray *result = NULL;
+    int ret = 0;
+    Bool is_ok = FALSE;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_adaptors, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_adaptors, FALSE);
 
-    EPHYR_LOG ("enter\n") ;
+    EPHYR_LOG("enter\n");
 
-    result = calloc (1, sizeof (EphyrHostXVAdaptorArray)) ;
+    result = calloc(1, sizeof(EphyrHostXVAdaptorArray));
     if (!result)
-        goto out ;
+        goto out;
 
-    ret = XvQueryAdaptors (hostx_get_display (),
-                           DefaultRootWindow (hostx_get_display ()),
-                           &result->nb_adaptors,
-                           &result->adaptors) ;
+    ret = XvQueryAdaptors(hostx_get_display(),
+                          DefaultRootWindow(hostx_get_display()),
+                          &result->nb_adaptors, &result->adaptors);
     if (ret != Success) {
-        EPHYR_LOG_ERROR ("failed to query host adaptors: %d\n", ret) ;
-        goto out ;
+        EPHYR_LOG_ERROR("failed to query host adaptors: %d\n", ret);
+        goto out;
     }
-    *a_adaptors = result ;
-    is_ok = TRUE ;
+    *a_adaptors = result;
+    is_ok = TRUE;
 
-out:
-    EPHYR_LOG ("leave\n") ;
-    return is_ok ;
+ out:
+    EPHYR_LOG("leave\n");
+    return is_ok;
 }
 
 void
-ephyrHostXVAdaptorArrayDelete (EphyrHostXVAdaptorArray *a_adaptors)
+ephyrHostXVAdaptorArrayDelete(EphyrHostXVAdaptorArray * a_adaptors)
 {
     if (!a_adaptors)
-        return ;
+        return;
     if (a_adaptors->adaptors) {
-        XvFreeAdaptorInfo (a_adaptors->adaptors) ;
-        a_adaptors->adaptors = NULL ;
-        a_adaptors->nb_adaptors = 0 ;
+        XvFreeAdaptorInfo(a_adaptors->adaptors);
+        a_adaptors->adaptors = NULL;
+        a_adaptors->nb_adaptors = 0;
     }
-    XFree (a_adaptors) ;
+    XFree(a_adaptors);
 }
 
 int
-ephyrHostXVAdaptorArrayGetSize (const EphyrHostXVAdaptorArray *a_this)
+ephyrHostXVAdaptorArrayGetSize(const EphyrHostXVAdaptorArray * a_this)
 {
-    EPHYR_RETURN_VAL_IF_FAIL (a_this, -1) ;
-    return a_this->nb_adaptors ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_this, -1);
+    return a_this->nb_adaptors;
 }
 
-EphyrHostXVAdaptor*
-ephyrHostXVAdaptorArrayAt (const EphyrHostXVAdaptorArray *a_this,
-                           int a_index)
+EphyrHostXVAdaptor *
+ephyrHostXVAdaptorArrayAt(const EphyrHostXVAdaptorArray * a_this, int a_index)
 {
-    EPHYR_RETURN_VAL_IF_FAIL (a_this, NULL) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_this, NULL);
 
     if (a_index >= a_this->nb_adaptors)
-        return NULL ;
-    return (EphyrHostXVAdaptor*)&a_this->adaptors[a_index] ;
+        return NULL;
+    return (EphyrHostXVAdaptor *) & a_this->adaptors[a_index];
 }
 
 char
-ephyrHostXVAdaptorGetType (const EphyrHostXVAdaptor *a_this)
+ephyrHostXVAdaptorGetType(const EphyrHostXVAdaptor * a_this)
 {
-    EPHYR_RETURN_VAL_IF_FAIL (a_this, -1) ;
-    return ((XvAdaptorInfo*)a_this)->type ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_this, -1);
+    return ((XvAdaptorInfo *) a_this)->type;
 }
 
-const char*
-ephyrHostXVAdaptorGetName (const EphyrHostXVAdaptor *a_this)
+const char *
+ephyrHostXVAdaptorGetName(const EphyrHostXVAdaptor * a_this)
 {
-    EPHYR_RETURN_VAL_IF_FAIL (a_this, NULL) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_this, NULL);
 
-    return ((XvAdaptorInfo*)a_this)->name ;
+    return ((XvAdaptorInfo *) a_this)->name;
 }
 
-EphyrHostVideoFormat*
-ephyrHostXVAdaptorGetVideoFormats (const EphyrHostXVAdaptor *a_this,
-                                   int *a_nb_formats)
+EphyrHostVideoFormat *
+ephyrHostXVAdaptorGetVideoFormats(const EphyrHostXVAdaptor * a_this,
+                                  int *a_nb_formats)
 {
-    EphyrHostVideoFormat *formats=NULL ;
-    int nb_formats=0, i=0 ;
-    XVisualInfo *visual_info, visual_info_template ;
-    int nb_visual_info ;
+    EphyrHostVideoFormat *formats = NULL;
+    int nb_formats = 0, i = 0;
+    XVisualInfo *visual_info, visual_info_template;
+    int nb_visual_info;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_this, NULL) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_this, NULL);
 
-    nb_formats = ((XvAdaptorInfo*)a_this)->num_formats ;
-    formats = calloc (nb_formats, sizeof (EphyrHostVideoFormat)) ;
-    for (i=0; i < nb_formats; i++) {
-        memset (&visual_info_template, 0, sizeof (visual_info_template)) ;
+    nb_formats = ((XvAdaptorInfo *) a_this)->num_formats;
+    formats = calloc(nb_formats, sizeof(EphyrHostVideoFormat));
+    for (i = 0; i < nb_formats; i++) {
+        memset(&visual_info_template, 0, sizeof(visual_info_template));
         visual_info_template.visualid =
-                            ((XvAdaptorInfo*)a_this)->formats[i].visual_id;
-        visual_info = XGetVisualInfo (hostx_get_display (),
-                                      VisualIDMask,
-                                      &visual_info_template,
-                                      &nb_visual_info) ;
-        formats[i].depth = ((XvAdaptorInfo*)a_this)->formats[i].depth ;
-        formats[i].visual_class = visual_info->class ;
-        XFree (visual_info) ;
+            ((XvAdaptorInfo *) a_this)->formats[i].visual_id;
+        visual_info = XGetVisualInfo(hostx_get_display(),
+                                     VisualIDMask,
+                                     &visual_info_template, &nb_visual_info);
+        formats[i].depth = ((XvAdaptorInfo *) a_this)->formats[i].depth;
+        formats[i].visual_class = visual_info->class;
+        XFree(visual_info);
     }
     if (a_nb_formats)
-        *a_nb_formats = nb_formats ;
-    return formats ;
+        *a_nb_formats = nb_formats;
+    return formats;
 }
 
 int
-ephyrHostXVAdaptorGetNbPorts (const EphyrHostXVAdaptor *a_this)
+ephyrHostXVAdaptorGetNbPorts(const EphyrHostXVAdaptor * a_this)
 {
-    EPHYR_RETURN_VAL_IF_FAIL (a_this, -1) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_this, -1);
 
-    return ((XvAdaptorInfo*)a_this)->num_ports ;
+    return ((XvAdaptorInfo *) a_this)->num_ports;
 }
 
 int
-ephyrHostXVAdaptorGetFirstPortID (const EphyrHostXVAdaptor *a_this)
+ephyrHostXVAdaptorGetFirstPortID(const EphyrHostXVAdaptor * a_this)
 {
-    EPHYR_RETURN_VAL_IF_FAIL (a_this, -1) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_this, -1);
 
-    return ((XvAdaptorInfo*)a_this)->base_id ;
+    return ((XvAdaptorInfo *) a_this)->base_id;
 }
 
 Bool
-ephyrHostXVAdaptorHasPutVideo (const EphyrHostXVAdaptor *a_this,
-                               Bool *a_result)
+ephyrHostXVAdaptorHasPutVideo(const EphyrHostXVAdaptor * a_this, Bool *a_result)
 {
-    EPHYR_RETURN_VAL_IF_FAIL (a_this && a_result, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_this && a_result, FALSE);
 
-    if ((((XvAdaptorInfo*)a_this)->type & (XvVideoMask | XvInputMask)) ==
-		    (XvVideoMask | XvInputMask))
-        *a_result = TRUE ;
+    if ((((XvAdaptorInfo *) a_this)->type & (XvVideoMask | XvInputMask)) ==
+        (XvVideoMask | XvInputMask))
+        *a_result = TRUE;
     else
-        *a_result = FALSE ;
-    return TRUE ;
+        *a_result = FALSE;
+    return TRUE;
 }
 
 Bool
-ephyrHostXVAdaptorHasGetVideo (const EphyrHostXVAdaptor *a_this,
-                               Bool *a_result)
+ephyrHostXVAdaptorHasGetVideo(const EphyrHostXVAdaptor * a_this, Bool *a_result)
 {
-    if ((((XvAdaptorInfo*)a_this)->type & (XvVideoMask | XvOutputMask)) ==
-		    (XvVideoMask | XvOutputMask))
-        *a_result = TRUE ;
+    if ((((XvAdaptorInfo *) a_this)->type & (XvVideoMask | XvOutputMask)) ==
+        (XvVideoMask | XvOutputMask))
+        *a_result = TRUE;
     else
-        *a_result = FALSE ;
-    return TRUE ;
+        *a_result = FALSE;
+    return TRUE;
 }
 
 Bool
-ephyrHostXVAdaptorHasPutStill (const EphyrHostXVAdaptor *a_this,
-                               Bool *a_result)
+ephyrHostXVAdaptorHasPutStill(const EphyrHostXVAdaptor * a_this, Bool *a_result)
 {
-    EPHYR_RETURN_VAL_IF_FAIL (a_this && a_result, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_this && a_result, FALSE);
 
-    if ((((XvAdaptorInfo*)a_this)->type & (XvStillMask | XvInputMask)) ==
-		    (XvStillMask | XvInputMask))
-        *a_result = TRUE ;
+    if ((((XvAdaptorInfo *) a_this)->type & (XvStillMask | XvInputMask)) ==
+        (XvStillMask | XvInputMask))
+        *a_result = TRUE;
     else
-        *a_result = FALSE ;
-    return TRUE ;
+        *a_result = FALSE;
+    return TRUE;
 }
 
 Bool
-ephyrHostXVAdaptorHasGetStill (const EphyrHostXVAdaptor *a_this,
-                               Bool *a_result)
+ephyrHostXVAdaptorHasGetStill(const EphyrHostXVAdaptor * a_this, Bool *a_result)
 {
-    EPHYR_RETURN_VAL_IF_FAIL (a_this && a_result, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_this && a_result, FALSE);
 
-    if ((((XvAdaptorInfo*)a_this)->type & (XvStillMask | XvOutputMask)) ==
-		    (XvStillMask | XvOutputMask))
-        *a_result = TRUE ;
+    if ((((XvAdaptorInfo *) a_this)->type & (XvStillMask | XvOutputMask)) ==
+        (XvStillMask | XvOutputMask))
+        *a_result = TRUE;
     else
-        *a_result = FALSE ;
-    return TRUE ;
+        *a_result = FALSE;
+    return TRUE;
 }
 
 Bool
-ephyrHostXVAdaptorHasPutImage (const EphyrHostXVAdaptor *a_this,
-                               Bool *a_result)
+ephyrHostXVAdaptorHasPutImage(const EphyrHostXVAdaptor * a_this, Bool *a_result)
 {
-    EPHYR_RETURN_VAL_IF_FAIL (a_this && a_result, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_this && a_result, FALSE);
 
-    if ((((XvAdaptorInfo*)a_this)->type & (XvImageMask | XvInputMask)) ==
-		    (XvImageMask | XvInputMask))
-        *a_result = TRUE ;
+    if ((((XvAdaptorInfo *) a_this)->type & (XvImageMask | XvInputMask)) ==
+        (XvImageMask | XvInputMask))
+        *a_result = TRUE;
     else
-        *a_result = FALSE ;
-    return TRUE ;
+        *a_result = FALSE;
+    return TRUE;
 }
 
 Bool
-ephyrHostXVQueryEncodings (int a_port_id,
-                           EphyrHostEncoding **a_encodings,
-                           unsigned int *a_num_encodings)
+ephyrHostXVQueryEncodings(int a_port_id,
+                          EphyrHostEncoding ** a_encodings,
+                          unsigned int *a_num_encodings)
 {
-    EphyrHostEncoding *encodings=NULL ;
-    XvEncodingInfo *encoding_info=NULL ;
-    unsigned int num_encodings=0, i;
-    int ret=0 ;
+    EphyrHostEncoding *encodings = NULL;
+    XvEncodingInfo *encoding_info = NULL;
+    unsigned int num_encodings = 0, i;
+    int ret = 0;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_encodings && a_num_encodings, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_encodings && a_num_encodings, FALSE);
 
-    ret = XvQueryEncodings (hostx_get_display (),
-                            a_port_id,
-                            &num_encodings,
-                            &encoding_info) ;
+    ret = XvQueryEncodings(hostx_get_display(),
+                           a_port_id, &num_encodings, &encoding_info);
     if (num_encodings && encoding_info) {
-        encodings = calloc (num_encodings, sizeof (EphyrHostEncoding)) ;
-        for (i=0; i<num_encodings; i++) {
-            encodings[i].id = encoding_info[i].encoding_id ;
-            encodings[i].name = strdup (encoding_info[i].name) ;
-            encodings[i].width = encoding_info[i].width ;
-            encodings[i].height = encoding_info[i].height ;
-            encodings[i].rate.numerator = encoding_info[i].rate.numerator ;
-            encodings[i].rate.denominator = encoding_info[i].rate.denominator ;
+        encodings = calloc(num_encodings, sizeof(EphyrHostEncoding));
+        for (i = 0; i < num_encodings; i++) {
+            encodings[i].id = encoding_info[i].encoding_id;
+            encodings[i].name = strdup(encoding_info[i].name);
+            encodings[i].width = encoding_info[i].width;
+            encodings[i].height = encoding_info[i].height;
+            encodings[i].rate.numerator = encoding_info[i].rate.numerator;
+            encodings[i].rate.denominator = encoding_info[i].rate.denominator;
         }
     }
     if (encoding_info) {
-        XvFreeEncodingInfo (encoding_info) ;
-        encoding_info = NULL ;
+        XvFreeEncodingInfo(encoding_info);
+        encoding_info = NULL;
     }
-    *a_encodings = encodings ;
-    *a_num_encodings = num_encodings ;
+    *a_encodings = encodings;
+    *a_num_encodings = num_encodings;
 
     if (ret != Success)
-        return FALSE ;
-    return TRUE ;
+        return FALSE;
+    return TRUE;
 }
 
 void
-ephyrHostEncodingsDelete (EphyrHostEncoding *a_encodings,
-                          int a_num_encodings)
+ephyrHostEncodingsDelete(EphyrHostEncoding * a_encodings, int a_num_encodings)
 {
-    int i=0 ;
+    int i = 0;
 
     if (!a_encodings)
-        return ;
-    for (i=0; i < a_num_encodings; i++) {
-        free(a_encodings[i].name) ;
-        a_encodings[i].name = NULL ;
+        return;
+    for (i = 0; i < a_num_encodings; i++) {
+        free(a_encodings[i].name);
+        a_encodings[i].name = NULL;
     }
-    free(a_encodings) ;
+    free(a_encodings);
 }
 
 void
-ephyrHostAttributesDelete (EphyrHostAttribute *a_attributes)
+ephyrHostAttributesDelete(EphyrHostAttribute * a_attributes)
 {
     if (!a_attributes)
-        return ;
-    XFree (a_attributes) ;
+        return;
+    XFree(a_attributes);
 }
 
 Bool
-ephyrHostXVQueryPortAttributes (int a_port_id,
-                                EphyrHostAttribute **a_attributes,
-                                int *a_num_attributes)
+ephyrHostXVQueryPortAttributes(int a_port_id,
+                               EphyrHostAttribute ** a_attributes,
+                               int *a_num_attributes)
 {
-    EPHYR_RETURN_VAL_IF_FAIL (a_attributes && a_num_attributes, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_attributes && a_num_attributes, FALSE);
 
     *a_attributes =
-        (EphyrHostAttribute*)XvQueryPortAttributes (hostx_get_display (),
-                                                    a_port_id,
-                                                    a_num_attributes);
+        (EphyrHostAttribute *) XvQueryPortAttributes(hostx_get_display(),
+                                                     a_port_id,
+                                                     a_num_attributes);
 
-    return TRUE ;
+    return TRUE;
 }
 
 Bool
-ephyrHostXVQueryImageFormats (int a_port_id,
-                              EphyrHostImageFormat **a_formats,
-                              int *a_num_format)
+ephyrHostXVQueryImageFormats(int a_port_id,
+                             EphyrHostImageFormat ** a_formats,
+                             int *a_num_format)
 {
-    XvImageFormatValues *result=NULL ;
+    XvImageFormatValues *result = NULL;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_formats && a_num_format, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_formats && a_num_format, FALSE);
 
-    result = XvListImageFormats (hostx_get_display (),
-                                 a_port_id,
-                                 a_num_format) ;
-    *a_formats = (EphyrHostImageFormat*) result ;
-    return TRUE ;
+    result = XvListImageFormats(hostx_get_display(), a_port_id, a_num_format);
+    *a_formats = (EphyrHostImageFormat *) result;
+    return TRUE;
 
 }
 
 Bool
-ephyrHostXVSetPortAttribute (int a_port_id,
-                             int a_atom,
-                             int a_attr_value)
+ephyrHostXVSetPortAttribute(int a_port_id, int a_atom, int a_attr_value)
 {
-    int res=Success ;
+    int res = Success;
 
-    EPHYR_LOG ("atom,name,value: (%d,%s,%d)\n",
-               a_atom,
-               XGetAtomName (hostx_get_display (), a_atom),
-               a_attr_value) ;
+    EPHYR_LOG("atom,name,value: (%d,%s,%d)\n",
+              a_atom, XGetAtomName(hostx_get_display(), a_atom), a_attr_value);
 
-    res = XvSetPortAttribute (hostx_get_display (),
-                              a_port_id,
-                              a_atom,
-                              a_attr_value) ;
+    res = XvSetPortAttribute(hostx_get_display(),
+                             a_port_id, a_atom, a_attr_value);
     if (res != Success) {
-        EPHYR_LOG_ERROR ("XvSetPortAttribute() failed: %d\n", res) ;
-        return FALSE ;
+        EPHYR_LOG_ERROR("XvSetPortAttribute() failed: %d\n", res);
+        return FALSE;
     }
-    XFlush (hostx_get_display ()) ;
-    EPHYR_LOG ("leave\n") ;
+    XFlush(hostx_get_display());
+    EPHYR_LOG("leave\n");
 
-    return TRUE ;
+    return TRUE;
 }
 
 Bool
-ephyrHostXVGetPortAttribute (int a_port_id,
-                             int a_atom,
-                             int *a_attr_value)
+ephyrHostXVGetPortAttribute(int a_port_id, int a_atom, int *a_attr_value)
 {
-    int res=Success ;
-    Bool ret=FALSE ;
+    int res = Success;
+    Bool ret = FALSE;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_attr_value, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_attr_value, FALSE);
 
-    EPHYR_LOG ("enter, a_port_id: %d, a_atomid: %d, attr_name: %s\n",
-               a_port_id, a_atom, XGetAtomName (hostx_get_display (), a_atom)) ;
+    EPHYR_LOG("enter, a_port_id: %d, a_atomid: %d, attr_name: %s\n",
+              a_port_id, a_atom, XGetAtomName(hostx_get_display(), a_atom));
 
-    res = XvGetPortAttribute (hostx_get_display (),
-                              a_port_id,
-                              a_atom,
-                              a_attr_value) ;
+    res = XvGetPortAttribute(hostx_get_display(),
+                             a_port_id, a_atom, a_attr_value);
     if (res != Success) {
-        EPHYR_LOG_ERROR ("XvGetPortAttribute() failed: %d \n", res) ;
-        goto out ;
+        EPHYR_LOG_ERROR("XvGetPortAttribute() failed: %d \n", res);
+        goto out;
     }
-    EPHYR_LOG ("atom,value: (%d, %d)\n", a_atom, *a_attr_value) ;
+    EPHYR_LOG("atom,value: (%d, %d)\n", a_atom, *a_attr_value);
 
-    ret = TRUE ;
+    ret = TRUE;
 
-out:
-    EPHYR_LOG ("leave\n") ;
-    return ret ;
+ out:
+    EPHYR_LOG("leave\n");
+    return ret;
 }
 
 Bool
-ephyrHostXVQueryBestSize (int a_port_id,
-                          Bool a_motion,
-                          unsigned int a_frame_w,
-                          unsigned int a_frame_h,
-                          unsigned int a_drw_w,
-                          unsigned int a_drw_h,
-                          unsigned int *a_actual_w,
-                          unsigned int *a_actual_h)
-{
-    int res=0 ;
-    Bool is_ok=FALSE ;
-
-    EPHYR_RETURN_VAL_IF_FAIL (a_actual_w && a_actual_h, FALSE) ;
-
-    EPHYR_LOG ("enter: frame (%dx%d), drw (%dx%d)\n",
-               a_frame_w, a_frame_h,
-               a_drw_w, a_drw_h) ;
-
-    res = XvQueryBestSize (hostx_get_display (),
-                           a_port_id,
-                           a_motion,
-                           a_frame_w, a_frame_h,
-                           a_drw_w, a_drw_h,
-                           a_actual_w, a_actual_h) ;
+ephyrHostXVQueryBestSize(int a_port_id,
+                         Bool a_motion,
+                         unsigned int a_frame_w,
+                         unsigned int a_frame_h,
+                         unsigned int a_drw_w,
+                         unsigned int a_drw_h,
+                         unsigned int *a_actual_w, unsigned int *a_actual_h)
+{
+    int res = 0;
+    Bool is_ok = FALSE;
+
+    EPHYR_RETURN_VAL_IF_FAIL(a_actual_w && a_actual_h, FALSE);
+
+    EPHYR_LOG("enter: frame (%dx%d), drw (%dx%d)\n",
+              a_frame_w, a_frame_h, a_drw_w, a_drw_h);
+
+    res = XvQueryBestSize(hostx_get_display(),
+                          a_port_id,
+                          a_motion,
+                          a_frame_w, a_frame_h,
+                          a_drw_w, a_drw_h, a_actual_w, a_actual_h);
     if (res != Success) {
-        EPHYR_LOG_ERROR ("XvQueryBestSize() failed: %d\n", res) ;
-        goto out ;
+        EPHYR_LOG_ERROR("XvQueryBestSize() failed: %d\n", res);
+        goto out;
     }
-    XSync (hostx_get_display (), FALSE) ;
+    XSync(hostx_get_display(), FALSE);
 
-    EPHYR_LOG ("actual (%dx%d)\n", *a_actual_w, *a_actual_h) ;
-    is_ok = TRUE ;
+    EPHYR_LOG("actual (%dx%d)\n", *a_actual_w, *a_actual_h);
+    is_ok = TRUE;
 
-out:
-    EPHYR_LOG ("leave\n") ;
-    return is_ok ;
+ out:
+    EPHYR_LOG("leave\n");
+    return is_ok;
 }
 
 static Bool
-xv_wire_to_event(Display *dpy, XEvent *host, xEvent *wire)
+xv_wire_to_event(Display * dpy, XEvent * host, xEvent *wire)
 {
-    XExtDisplayInfo *info = xv_find_display (dpy);
-    XvEvent *re    = (XvEvent *)host;
-    xvEvent *event = (xvEvent *)wire;
+    XExtDisplayInfo *info = xv_find_display(dpy);
+    XvEvent *re = (XvEvent *) host;
+    xvEvent *event = (xvEvent *) wire;
 
     XvCheckExtension(dpy, info, False);
 
     switch ((event->u.u.type & 0x7F) - info->codes->first_event) {
-        case XvVideoNotify:
-            re->xvvideo.type = event->u.u.type & 0x7f;
-            re->xvvideo.serial =
-            _XSetLastRequestRead(dpy, (xGenericReply *)event);
-            re->xvvideo.send_event = ((event->u.u.type & 0x80) != 0);
-            re->xvvideo.display = dpy;
-            re->xvvideo.time = event->u.videoNotify.time;
-            re->xvvideo.reason = event->u.videoNotify.reason;
-            re->xvvideo.drawable = event->u.videoNotify.drawable;
-            re->xvvideo.port_id = event->u.videoNotify.port;
-            break;
-        case XvPortNotify:
-            re->xvport.type = event->u.u.type & 0x7f;
-            re->xvport.serial =
-            _XSetLastRequestRead(dpy, (xGenericReply *)event);
-            re->xvport.send_event = ((event->u.u.type & 0x80) != 0);
-            re->xvport.display = dpy;
-            re->xvport.time = event->u.portNotify.time;
-            re->xvport.port_id = event->u.portNotify.port;
-            re->xvport.attribute = event->u.portNotify.attribute;
-            re->xvport.value = event->u.portNotify.value;
-            break;
-        default:
-            return False;
-    }
-
-    return True ;
+    case XvVideoNotify:
+        re->xvvideo.type = event->u.u.type & 0x7f;
+        re->xvvideo.serial = _XSetLastRequestRead(dpy, (xGenericReply *) event);
+        re->xvvideo.send_event = ((event->u.u.type & 0x80) != 0);
+        re->xvvideo.display = dpy;
+        re->xvvideo.time = event->u.videoNotify.time;
+        re->xvvideo.reason = event->u.videoNotify.reason;
+        re->xvvideo.drawable = event->u.videoNotify.drawable;
+        re->xvvideo.port_id = event->u.videoNotify.port;
+        break;
+    case XvPortNotify:
+        re->xvport.type = event->u.u.type & 0x7f;
+        re->xvport.serial = _XSetLastRequestRead(dpy, (xGenericReply *) event);
+        re->xvport.send_event = ((event->u.u.type & 0x80) != 0);
+        re->xvport.display = dpy;
+        re->xvport.time = event->u.portNotify.time;
+        re->xvport.port_id = event->u.portNotify.port;
+        re->xvport.attribute = event->u.portNotify.attribute;
+        re->xvport.value = event->u.portNotify.value;
+        break;
+    default:
+        return False;
+    }
+
+    return True;
 }
 
 Bool
-ephyrHostXVQueryImageAttributes (int a_port_id,
-                                 int a_image_id /*image fourcc code*/,
-                                 unsigned short *a_width,
-                                 unsigned short *a_height,
-                                 int *a_image_size,
-                                 int *a_pitches,
-                                 int *a_offsets)
-{
-    Display *dpy = hostx_get_display () ;
-    Bool ret=FALSE ;
-    XExtDisplayInfo *info = xv_find_display (dpy);
-    xvQueryImageAttributesReq *req=NULL;
+ephyrHostXVQueryImageAttributes(int a_port_id,
+                                int a_image_id /*image fourcc code */ ,
+                                unsigned short *a_width,
+                                unsigned short *a_height,
+                                int *a_image_size,
+                                int *a_pitches, int *a_offsets)
+{
+    Display *dpy = hostx_get_display();
+    Bool ret = FALSE;
+    XExtDisplayInfo *info = xv_find_display(dpy);
+    xvQueryImageAttributesReq *req = NULL;
     xvQueryImageAttributesReply rep;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_width, FALSE) ;
-    EPHYR_RETURN_VAL_IF_FAIL (a_height, FALSE) ;
-    EPHYR_RETURN_VAL_IF_FAIL (a_image_size, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_width, FALSE);
+    EPHYR_RETURN_VAL_IF_FAIL(a_height, FALSE);
+    EPHYR_RETURN_VAL_IF_FAIL(a_image_size, FALSE);
 
-    XvCheckExtension (dpy, info, FALSE);
+    XvCheckExtension(dpy, info, FALSE);
 
-    LockDisplay (dpy);
+    LockDisplay(dpy);
 
-    XvGetReq (QueryImageAttributes, req);
+    XvGetReq(QueryImageAttributes, req);
     req->id = a_image_id;
     req->port = a_port_id;
     req->width = *a_width;
@@ -702,315 +668,308 @@ ephyrHostXVQueryImageAttributes (int a_port_id,
     /*
      * read the reply
      */
-    if (!_XReply (dpy, (xReply *)&rep, 0, xFalse)) {
-        EPHYR_LOG_ERROR ("QeryImageAttribute req failed\n") ;
-        goto out ;
+    if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) {
+        EPHYR_LOG_ERROR("QeryImageAttribute req failed\n");
+        goto out;
     }
     if (a_pitches && a_offsets) {
-        _XRead (dpy,
-                (char*)a_pitches,
-                rep.num_planes << 2);
-        _XRead (dpy,
-                (char*)a_offsets,
-                rep.num_planes << 2);
-    } else {
+        _XRead(dpy, (char *) a_pitches, rep.num_planes << 2);
+        _XRead(dpy, (char *) a_offsets, rep.num_planes << 2);
+    }
+    else {
         _XEatData(dpy, rep.length << 2);
     }
-    *a_width = rep.width ;
-    *a_height = rep.height ;
-    *a_image_size = rep.data_size ;
+    *a_width = rep.width;
+    *a_height = rep.height;
+    *a_image_size = rep.data_size;
 
-    ret = TRUE ;
+    ret = TRUE;
 
-out:
-    UnlockDisplay (dpy) ;
-    SyncHandle ();
-    return ret ;
+ out:
+    UnlockDisplay(dpy);
+    SyncHandle();
+    return ret;
 }
 
 Bool
-ephyrHostGetAtom (const char* a_name,
-                  Bool a_create_if_not_exists,
-                  int *a_atom)
+ephyrHostGetAtom(const char *a_name, Bool a_create_if_not_exists, int *a_atom)
 {
-    int atom=None ;
+    int atom = None;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_atom, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_atom, FALSE);
 
-    atom = XInternAtom (hostx_get_display (), a_name, a_create_if_not_exists);
+    atom = XInternAtom(hostx_get_display(), a_name, a_create_if_not_exists);
     if (atom == None) {
-        return FALSE ;
+        return FALSE;
     }
-    *a_atom = atom ;
-    return TRUE ;
+    *a_atom = atom;
+    return TRUE;
 }
 
-char*
-ephyrHostGetAtomName (int a_atom)
+char *
+ephyrHostGetAtomName(int a_atom)
 {
-    return XGetAtomName (hostx_get_display (), a_atom) ;
+    return XGetAtomName(hostx_get_display(), a_atom);
 }
 
 void
-ephyrHostFree (void *a_pointer)
+ephyrHostFree(void *a_pointer)
 {
     if (a_pointer)
-        XFree (a_pointer) ;
+        XFree(a_pointer);
 }
 
 Bool
-ephyrHostXVPutImage (int a_screen_num,
-                     int a_port_id,
-                     int a_image_id,
-                     int a_drw_x,
-                     int a_drw_y,
-                     int a_drw_w,
-                     int a_drw_h,
-                     int a_src_x,
-                     int a_src_y,
-                     int a_src_w,
-                     int a_src_h,
-                     int a_image_width,
-                     int a_image_height,
-                     unsigned char *a_buf,
-                     EphyrHostBox *a_clip_rects,
-                     int a_clip_rect_nums )
-{
-    Bool is_ok=TRUE ;
-    XvImage *xv_image=NULL ;
-    GC gc=0 ;
+ephyrHostXVPutImage(int a_screen_num,
+                    int a_port_id,
+                    int a_image_id,
+                    int a_drw_x,
+                    int a_drw_y,
+                    int a_drw_w,
+                    int a_drw_h,
+                    int a_src_x,
+                    int a_src_y,
+                    int a_src_w,
+                    int a_src_h,
+                    int a_image_width,
+                    int a_image_height,
+                    unsigned char *a_buf,
+                    EphyrHostBox * a_clip_rects, int a_clip_rect_nums)
+{
+    Bool is_ok = TRUE;
+    XvImage *xv_image = NULL;
+    GC gc = 0;
     XGCValues gc_values;
-    Display *dpy = hostx_get_display () ;
-    XRectangle *rects=NULL ;
-    int res = 0 ;
+    Display *dpy = hostx_get_display();
+    XRectangle *rects = NULL;
+    int res = 0;
 
-    EPHYR_RETURN_VAL_IF_FAIL (a_buf, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(a_buf, FALSE);
 
-    EPHYR_LOG ("enter, num_clip_rects: %d\n", a_clip_rect_nums) ;
+    EPHYR_LOG("enter, num_clip_rects: %d\n", a_clip_rect_nums);
 
-    memset (&gc_values, 0, sizeof (gc_values)) ;
-    gc = XCreateGC (dpy, hostx_get_window (a_screen_num), 0L, &gc_values);
+    memset(&gc_values, 0, sizeof(gc_values));
+    gc = XCreateGC(dpy, hostx_get_window(a_screen_num), 0L, &gc_values);
     if (!gc) {
-        EPHYR_LOG_ERROR ("failed to create gc \n") ;
-        goto out ;
+        EPHYR_LOG_ERROR("failed to create gc \n");
+        goto out;
     }
-    xv_image = (XvImage*) XvCreateImage (hostx_get_display (),
+    xv_image = (XvImage *) XvCreateImage(hostx_get_display(),
                                          a_port_id, a_image_id,
-                                         NULL, a_image_width, a_image_height) ;
+                                         NULL, a_image_width, a_image_height);
     if (!xv_image) {
-        EPHYR_LOG_ERROR ("failed to create image\n") ;
-        goto out ;
+        EPHYR_LOG_ERROR("failed to create image\n");
+        goto out;
     }
-    xv_image->data = (char*)a_buf ;
+    xv_image->data = (char *) a_buf;
     if (a_clip_rect_nums) {
-        int i=0 ;
-        rects = calloc (a_clip_rect_nums, sizeof (XRectangle)) ;
-        for (i=0; i < a_clip_rect_nums; i++) {
-            rects[i].x = a_clip_rects[i].x1 ;
-            rects[i].y = a_clip_rects[i].y1 ;
+        int i = 0;
+
+        rects = calloc(a_clip_rect_nums, sizeof(XRectangle));
+        for (i = 0; i < a_clip_rect_nums; i++) {
+            rects[i].x = a_clip_rects[i].x1;
+            rects[i].y = a_clip_rects[i].y1;
             rects[i].width = a_clip_rects[i].x2 - a_clip_rects[i].x1;
             rects[i].height = a_clip_rects[i].y2 - a_clip_rects[i].y1;
-            EPHYR_LOG ("(x,y,w,h): (%d,%d,%d,%d)\n",
-                       rects[i].x, rects[i].y,
-                       rects[i].width, rects[i].height) ;
+            EPHYR_LOG("(x,y,w,h): (%d,%d,%d,%d)\n",
+                      rects[i].x, rects[i].y, rects[i].width, rects[i].height);
         }
-        XSetClipRectangles (dpy, gc, 0, 0, rects, a_clip_rect_nums, YXBanded) ;
-        /*this always returns 1*/
-    }
-    res = XvPutImage (dpy, a_port_id,
-                      hostx_get_window (a_screen_num),
-                      gc, xv_image,
-                      a_src_x, a_src_y, a_src_w, a_src_h,
-                      a_drw_x, a_drw_y, a_drw_w, a_drw_h) ;
+        XSetClipRectangles(dpy, gc, 0, 0, rects, a_clip_rect_nums, YXBanded);
+        /*this always returns 1 */
+    }
+    res = XvPutImage(dpy, a_port_id,
+                     hostx_get_window(a_screen_num),
+                     gc, xv_image,
+                     a_src_x, a_src_y, a_src_w, a_src_h,
+                     a_drw_x, a_drw_y, a_drw_w, a_drw_h);
     if (res != Success) {
-        EPHYR_LOG_ERROR ("XvPutImage() failed: %d\n", res) ;
-        goto out ;
+        EPHYR_LOG_ERROR("XvPutImage() failed: %d\n", res);
+        goto out;
     }
-    is_ok = TRUE ;
+    is_ok = TRUE;
 
-out:
+ out:
     if (xv_image) {
-        XFree (xv_image) ;
-        xv_image = NULL ;
+        XFree(xv_image);
+        xv_image = NULL;
     }
     if (gc) {
-        XFreeGC (dpy, gc) ;
-        gc = NULL ;
+        XFreeGC(dpy, gc);
+        gc = NULL;
     }
     free(rects);
     rects = NULL;
-    EPHYR_LOG ("leave\n") ;
-    return is_ok ;
+    EPHYR_LOG("leave\n");
+    return is_ok;
 }
 
 Bool
-ephyrHostXVPutVideo (int a_screen_num, int a_port_id,
-                     int a_vid_x, int a_vid_y, int a_vid_w, int a_vid_h,
-                     int a_drw_x, int a_drw_y, int a_drw_w, int a_drw_h)
+ephyrHostXVPutVideo(int a_screen_num, int a_port_id,
+                    int a_vid_x, int a_vid_y, int a_vid_w, int a_vid_h,
+                    int a_drw_x, int a_drw_y, int a_drw_w, int a_drw_h)
 {
-    Bool is_ok=FALSE ;
-    int res=FALSE ;
-    GC gc=0 ;
+    Bool is_ok = FALSE;
+    int res = FALSE;
+    GC gc = 0;
     XGCValues gc_values;
-    Display *dpy=hostx_get_display () ;
+    Display *dpy = hostx_get_display();
 
-    EPHYR_RETURN_VAL_IF_FAIL (dpy, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(dpy, FALSE);
 
-    gc = XCreateGC (dpy, hostx_get_window (a_screen_num), 0L, &gc_values);
+    gc = XCreateGC(dpy, hostx_get_window(a_screen_num), 0L, &gc_values);
     if (!gc) {
-        EPHYR_LOG_ERROR ("failed to create gc \n") ;
-        goto out ;
+        EPHYR_LOG_ERROR("failed to create gc \n");
+        goto out;
     }
-    res = XvPutVideo (dpy, a_port_id, hostx_get_window (a_screen_num), gc,
-                      a_vid_x, a_vid_y, a_vid_w, a_vid_h,
-                      a_drw_x, a_drw_y, a_drw_w, a_drw_h) ;
+    res = XvPutVideo(dpy, a_port_id, hostx_get_window(a_screen_num), gc,
+                     a_vid_x, a_vid_y, a_vid_w, a_vid_h,
+                     a_drw_x, a_drw_y, a_drw_w, a_drw_h);
 
     if (res != Success) {
-        EPHYR_LOG_ERROR ("XvPutVideo() failed: %d\n", res) ;
-        goto out ;
+        EPHYR_LOG_ERROR("XvPutVideo() failed: %d\n", res);
+        goto out;
     }
 
-    is_ok = TRUE ;
+    is_ok = TRUE;
 
-out:
+ out:
     if (gc) {
-        XFreeGC (dpy, gc) ;
-        gc = NULL ;
+        XFreeGC(dpy, gc);
+        gc = NULL;
     }
-    return is_ok ;
+    return is_ok;
 }
 
 Bool
-ephyrHostXVGetVideo (int a_screen_num, int a_port_id,
-                     int a_vid_x, int a_vid_y, int a_vid_w, int a_vid_h,
-                     int a_drw_x, int a_drw_y, int a_drw_w, int a_drw_h)
+ephyrHostXVGetVideo(int a_screen_num, int a_port_id,
+                    int a_vid_x, int a_vid_y, int a_vid_w, int a_vid_h,
+                    int a_drw_x, int a_drw_y, int a_drw_w, int a_drw_h)
 {
-    Bool is_ok=FALSE ;
-    int res=FALSE ;
-    GC gc=0 ;
+    Bool is_ok = FALSE;
+    int res = FALSE;
+    GC gc = 0;
     XGCValues gc_values;
-    Display *dpy=hostx_get_display () ;
+    Display *dpy = hostx_get_display();
 
-    EPHYR_RETURN_VAL_IF_FAIL (dpy, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(dpy, FALSE);
 
-    gc = XCreateGC (dpy, hostx_get_window (a_screen_num), 0L, &gc_values);
+    gc = XCreateGC(dpy, hostx_get_window(a_screen_num), 0L, &gc_values);
     if (!gc) {
-        EPHYR_LOG_ERROR ("failed to create gc \n") ;
-        goto out ;
+        EPHYR_LOG_ERROR("failed to create gc \n");
+        goto out;
     }
-    res = XvGetVideo (dpy, a_port_id, hostx_get_window (a_screen_num), gc,
-                      a_vid_x, a_vid_y, a_vid_w, a_vid_h,
-                      a_drw_x, a_drw_y, a_drw_w, a_drw_h) ;
+    res = XvGetVideo(dpy, a_port_id, hostx_get_window(a_screen_num), gc,
+                     a_vid_x, a_vid_y, a_vid_w, a_vid_h,
+                     a_drw_x, a_drw_y, a_drw_w, a_drw_h);
 
     if (res != Success) {
-        EPHYR_LOG_ERROR ("XvGetVideo() failed: %d\n", res) ;
-        goto out ;
+        EPHYR_LOG_ERROR("XvGetVideo() failed: %d\n", res);
+        goto out;
     }
 
-    is_ok = TRUE ;
+    is_ok = TRUE;
 
-out:
+ out:
     if (gc) {
-        XFreeGC (dpy, gc) ;
-        gc = NULL ;
+        XFreeGC(dpy, gc);
+        gc = NULL;
     }
-    return is_ok ;
+    return is_ok;
 }
 
 Bool
-ephyrHostXVPutStill (int a_screen_num, int a_port_id,
-                     int a_vid_x, int a_vid_y, int a_vid_w, int a_vid_h,
-                     int a_drw_x, int a_drw_y, int a_drw_w, int a_drw_h)
+ephyrHostXVPutStill(int a_screen_num, int a_port_id,
+                    int a_vid_x, int a_vid_y, int a_vid_w, int a_vid_h,
+                    int a_drw_x, int a_drw_y, int a_drw_w, int a_drw_h)
 {
-    Bool is_ok=FALSE ;
-    int res=FALSE ;
-    GC gc=0 ;
+    Bool is_ok = FALSE;
+    int res = FALSE;
+    GC gc = 0;
     XGCValues gc_values;
-    Display *dpy=hostx_get_display () ;
+    Display *dpy = hostx_get_display();
 
-    EPHYR_RETURN_VAL_IF_FAIL (dpy, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(dpy, FALSE);
 
-    gc = XCreateGC (dpy, hostx_get_window (a_screen_num), 0L, &gc_values);
+    gc = XCreateGC(dpy, hostx_get_window(a_screen_num), 0L, &gc_values);
     if (!gc) {
-        EPHYR_LOG_ERROR ("failed to create gc \n") ;
-        goto out ;
+        EPHYR_LOG_ERROR("failed to create gc \n");
+        goto out;
     }
-    res = XvPutStill (dpy, a_port_id, hostx_get_window (a_screen_num), gc,
-                      a_vid_x, a_vid_y, a_vid_w, a_vid_h,
-                      a_drw_x, a_drw_y, a_drw_w, a_drw_h) ;
+    res = XvPutStill(dpy, a_port_id, hostx_get_window(a_screen_num), gc,
+                     a_vid_x, a_vid_y, a_vid_w, a_vid_h,
+                     a_drw_x, a_drw_y, a_drw_w, a_drw_h);
 
     if (res != Success) {
-        EPHYR_LOG_ERROR ("XvPutStill() failed: %d\n", res) ;
-        goto out ;
+        EPHYR_LOG_ERROR("XvPutStill() failed: %d\n", res);
+        goto out;
     }
 
-    is_ok = TRUE ;
+    is_ok = TRUE;
 
-out:
+ out:
     if (gc) {
-        XFreeGC (dpy, gc) ;
-        gc = NULL ;
+        XFreeGC(dpy, gc);
+        gc = NULL;
     }
-    return is_ok ;
+    return is_ok;
 }
 
 Bool
-ephyrHostXVGetStill (int a_screen_num, int a_port_id,
-                     int a_vid_x, int a_vid_y, int a_vid_w, int a_vid_h,
-                     int a_drw_x, int a_drw_y, int a_drw_w, int a_drw_h)
+ephyrHostXVGetStill(int a_screen_num, int a_port_id,
+                    int a_vid_x, int a_vid_y, int a_vid_w, int a_vid_h,
+                    int a_drw_x, int a_drw_y, int a_drw_w, int a_drw_h)
 {
-    Bool is_ok=FALSE ;
-    int res=FALSE ;
-    GC gc=0 ;
+    Bool is_ok = FALSE;
+    int res = FALSE;
+    GC gc = 0;
     XGCValues gc_values;
-    Display *dpy=hostx_get_display () ;
+    Display *dpy = hostx_get_display();
 
-    EPHYR_RETURN_VAL_IF_FAIL (dpy, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(dpy, FALSE);
 
-    gc = XCreateGC (dpy, hostx_get_window (a_screen_num), 0L, &gc_values);
+    gc = XCreateGC(dpy, hostx_get_window(a_screen_num), 0L, &gc_values);
     if (!gc) {
-        EPHYR_LOG_ERROR ("failed to create gc \n") ;
-        goto out ;
+        EPHYR_LOG_ERROR("failed to create gc \n");
+        goto out;
     }
-    res = XvGetStill (dpy, a_port_id, hostx_get_window (a_screen_num), gc,
-                      a_vid_x, a_vid_y, a_vid_w, a_vid_h,
-                      a_drw_x, a_drw_y, a_drw_w, a_drw_h) ;
+    res = XvGetStill(dpy, a_port_id, hostx_get_window(a_screen_num), gc,
+                     a_vid_x, a_vid_y, a_vid_w, a_vid_h,
+                     a_drw_x, a_drw_y, a_drw_w, a_drw_h);
 
     if (res != Success) {
-        EPHYR_LOG_ERROR ("XvGetStill() failed: %d\n", res) ;
-        goto out ;
+        EPHYR_LOG_ERROR("XvGetStill() failed: %d\n", res);
+        goto out;
     }
 
-    is_ok = TRUE ;
+    is_ok = TRUE;
 
-out:
+ out:
     if (gc) {
-        XFreeGC (dpy, gc) ;
-        gc = NULL ;
+        XFreeGC(dpy, gc);
+        gc = NULL;
     }
-    return is_ok ;
+    return is_ok;
 }
 
 Bool
-ephyrHostXVStopVideo (int a_screen_num, int a_port_id)
+ephyrHostXVStopVideo(int a_screen_num, int a_port_id)
 {
-    int ret=0 ;
-    Bool is_ok=FALSE ;
-    Display *dpy = hostx_get_display () ;
+    int ret = 0;
+    Bool is_ok = FALSE;
+    Display *dpy = hostx_get_display();
 
-    EPHYR_RETURN_VAL_IF_FAIL (dpy, FALSE) ;
+    EPHYR_RETURN_VAL_IF_FAIL(dpy, FALSE);
 
-    EPHYR_LOG ("enter\n") ;
+    EPHYR_LOG("enter\n");
 
-    ret = XvStopVideo (dpy, a_port_id, hostx_get_window (a_screen_num)) ;
+    ret = XvStopVideo(dpy, a_port_id, hostx_get_window(a_screen_num));
     if (ret != Success) {
-        EPHYR_LOG_ERROR ("XvStopVideo() failed: %d \n", ret) ;
-        goto out ;
+        EPHYR_LOG_ERROR("XvStopVideo() failed: %d \n", ret);
+        goto out;
     }
-    is_ok = TRUE ;
+    is_ok = TRUE;
 
-out:
-    EPHYR_LOG ("leave\n") ;
-    return is_ok ;
+ out:
+    EPHYR_LOG("leave\n");
+    return is_ok;
 }
-