Changeset 6497 in vbox for trunk/src/VBox/Additions/x11/xgraphics

Timestamp:

Jan 25, 2008 6:38:54 AM (17 years ago)

Author:

vboxsync

Message:

Skip unused members in vboxvideo.h for solaris and clean-ups, spaces, hungarian...

Location:

trunk/src/VBox/Additions/x11/xgraphics

Files:

• vboxutils-new.c (modified) (25 diffs)
• vboxvideo.h (modified) (2 diffs)

trunk/src/VBox/Additions/x11/xgraphics/vboxutils-new.c

@@ -1 +1 @@
 /** @file
  *
- * Linux Additions X11 graphics driver helper module
+ * VirtualBox X11 Additions graphics driver utility functions
  */
 
@@ -68 +68 @@
     size_t size_mask;
 
-    image    += offsetof (VMMDevReqMousePointer, pointerData);
+    image    += offsetof(VMMDevReqMousePointer, pointerData);
     mask      = image;
     pitch     = (w + 7) / 8;
@@ -74 +74 @@
     color     = (CARD32 *)(image + size_mask);
 
-    TRACE_ENTRY ();
+    TRACE_ENTRY();
     for (y = 0; y < h; ++y, mask += pitch, color += w)
     {
@@ -81 +81 @@
             if (mask[x / 8] & (1 << (7 - (x % 8))))
                 ErrorF (" ");
-
             else
             {
                 CARD32 c = color[x];
                 if (c == bg)
-                    ErrorF ("Y");
+                    ErrorF("Y");
                 else
-                    ErrorF ("X");
+                    ErrorF("X");
             }
         }
-        ErrorF ("\n");
+        ErrorF("\n");
     }
 }
@@ -117 +116 @@
 vbox_close(ScrnInfoPtr pScrn, VBOXPtr pVBox)
 {
-    TRACE_ENTRY ();
+    TRACE_ENTRY();
 
     xfree (pVBox->reqp);
@@ -320 +319 @@
     int scrnIndex = pScrn->scrnIndex;
 
-    TRACE_ENTRY ();
+    TRACE_ENTRY();
 
     pVBox->useVbva = FALSE;
@@ -339 +338 @@
 
     size = vmmdevGetRequestSize (VMMDevReq_SetPointerShape);
-    p = xcalloc (1, size);
+    p = xcalloc(1, size);
     if (p)
     {
-        rc = vmmdevInitRequest (p, VMMDevReq_SetPointerShape);
+        rc = vmmdevInitRequest(p, VMMDevReq_SetPointerShape);
         if (RT_SUCCESS(rc))
         {
@@ -393 +392 @@
     reqp = (VMMDevReqMousePointer *)image;
 
-    dolog ("w=%d h=%d size=%d\n", reqp->width, reqp->height, reqp->header.size);
+    dolog("w=%d h=%d size=%d\n", reqp->width, reqp->height, reqp->header.size);
 #ifdef DEBUG_X
-    vbox_show_shape (reqp->width, reqp->height, 0, image);
+    vbox_show_shape(reqp->width, reqp->height, 0, image);
 #endif
 
@@ -407 +406 @@
 vbox_set_cursor_colors(ScrnInfoPtr pScrn, int bg, int fg)
 {
-    TRACE_ENTRY ();
-
-    (void) pScrn;
-    (void) bg;
-    (void) fg;
-    /* ErrorF ("vbox_set_cursor_colors NOT IMPLEMENTED\n"); */
+    TRACE_ENTRY();
+
+    NOREF(pScrn);
+    NOREF(bg);
+    NOREF(fg);
+    /* ErrorF("vbox_set_cursor_colors NOT IMPLEMENTED\n"); */
 }
 
@@ -420 +419 @@
     /* VBOXPtr pVBox = pScrn->driverPrivate; */
 
-    /* TRACE_ENTRY (); */
+    /* TRACE_ENTRY(); */
 
     /* don't disable the mouse cursor if we go out of our visible area
@@ -431 +430 @@
         {
             pVBox->pointer_offscreen = TRUE;
-            vbox_vmm_hide_cursor (pScrn, pVBox);
+            vbox_vmm_hide_cursor(pScrn, pVBox);
         }
     }
@@ -439 +438 @@
         {
             pVBox->pointer_offscreen = FALSE;
-            vbox_vmm_show_cursor (pScrn, pVBox);
+            vbox_vmm_show_cursor(pScrn, pVBox);
         }
     }
@@ -450 +449 @@
     VBOXPtr pVBox = pScrn->driverPrivate;
 
-    TRACE_ENTRY ();
-
-    vbox_vmm_hide_cursor (pScrn, pVBox);
+    TRACE_ENTRY();
+
+    vbox_vmm_hide_cursor(pScrn, pVBox);
 }
 
@@ -460 +459 @@
     VBOXPtr pVBox = pScrn->driverPrivate;
 
-    TRACE_ENTRY ();
-
-    vbox_vmm_show_cursor (pScrn, pVBox);
+    TRACE_ENTRY();
+
+    vbox_vmm_show_cursor(pScrn, pVBox);
 }
 
@@ -470 +469 @@
     VBOXPtr pVBox = pScrn->driverPrivate;
 
-    TRACE_ENTRY ();
-
-    vbox_vmm_load_cursor_image (pScrn, pVBox, image);
+    TRACE_ENTRY();
+
+    vbox_vmm_load_cursor_image(pScrn, pVBox, image);
 }
 
@@ -527 +526 @@
                  (unsigned long) size);
 
-    rc = vmmdevInitRequest ((VMMDevRequestHeader *)p, VMMDevReq_SetPointerShape);
-    if (VBOX_FAILURE (rc))
+    rc = vmmdevInitRequest((VMMDevRequestHeader *)p, VMMDevReq_SetPointerShape);
+    if (VBOX_FAILURE(rc))
     {
         xf86DrvMsg(scrnIndex, X_ERROR, "Could not init VMM request: rc = %d\n", rc);
@@ -535 +534 @@
     }
 
-    m = p + offsetof (VMMDevReqMousePointer, pointerData);
+    m = p + offsetof(VMMDevReqMousePointer, pointerData);
     cp = (CARD32 *)(m + size_mask);
 
@@ -580 +579 @@
                 {
                     *cp++ = fc;
-                    PUT_PIXEL ('X');
+                    PUT_PIXEL('X');
                 }
                 else
                 {
                     *cp++ = bc;
-                    PUT_PIXEL ('*');
+                    PUT_PIXEL('*');
                 }
             }
@@ -594 +593 @@
                 /* don't change the screen pixel */
                 *cp++ = 0;
-                PUT_PIXEL (' ');
+                PUT_PIXEL(' ');
             }
         }
-        PUT_PIXEL ('\n');
+        PUT_PIXEL('\n');
     }
 
@@ -609 +608 @@
 
 #ifdef DEBUG_X
-    ErrorF ("shape = %p\n", p);
-    vbox_show_shape (w, h, bc, c);
+    ErrorF("shape = %p\n", p);
+    vbox_show_shape(w, h, bc, c);
 #endif
 
@@ -660 +659 @@
 
     size = w * h * 4 + pVBox->set_pointer_shape_size + mask_size;
-    p = xcalloc (1, size);
+    p = xcalloc(1, size);
     if (!p)
         RETERROR(scrnIndex, ,
@@ -675 +674 @@
     reqp->header.size = size;
 
-    memcpy (p + offsetof (VMMDevReqMousePointer, pointerData) + mask_size,
+    memcpy(p + offsetof(VMMDevReqMousePointer, pointerData) + mask_size,
             bitsp->argb, w * h * 4);
 
     /* Emulate the AND mask. */
-    pm = p + offsetof (VMMDevReqMousePointer, pointerData);
+    pm = p + offsetof(VMMDevReqMousePointer, pointerData);
     pc = bitsp->argb;
 
     /* Init AND mask to 1 */
-    memset (pm, 0xFF, mask_size);
+    memset(pm, 0xFF, mask_size);
 
     /**
@@ -711 +710 @@
     VbglR3SetPointerShape(VBOX_MOUSE_POINTER_SHAPE | VBOX_MOUSE_POINTER_ALPHA, bitsp->xhot, bitsp->yhot, w, h,
                 (void *)pm, reqp->header.size - pVBox->set_pointer_shape_size);
-    xfree (p);
+    xfree(p);
 }
 #endif
@@ -735 +734 @@
     }
 
-    pVBox->pCurs = pCurs = xf86CreateCursorInfoRec ();
+    pVBox->pCurs = pCurs = xf86CreateCursorInfoRec();
     if (!pCurs)
         RETERROR(pScrn->scrnIndex, FALSE,
@@ -759 +758 @@
 #endif
 
-    rc = xf86InitCursor (pScreen, pCurs);
+    rc = xf86InitCursor(pScreen, pCurs);
     if (rc == TRUE)
         return TRUE;

trunk/src/VBox/Additions/x11/xgraphics/vboxvideo.h

@@ -1 +1 @@
 /** @file
  *
- * Linux Additions X11 graphics driver
+ * VirtualBox X11 Additions graphics driver
  */
 
@@ -165 +165 @@
     Bool pointer_offscreen;
     Bool useVbva;
+#ifndef RT_OS_SOLARIS
     VMMDevVideoAccelFlush *reqf;
     VMMDevVideoAccelEnable *reqe;
+#endif
     VMMDevMemory *pVMMDevMemory;
     VBVAMEMORY *pVbvaMemory;