Fixed compile errors, added Semaphore code
[tpg/acess2.git] / Modules / Display / VESA / main.c
index 216fcd1..479be30 100644 (file)
@@ -2,7 +2,7 @@
  * AcessOS 1\r
  * Video BIOS Extensions (Vesa) Driver\r
  */\r
-#define DEBUG  0\r
+#define DEBUG  1\r
 #define VERSION        0x100\r
 \r
 #include <acess.h>\r
 \r
 // === CONSTANTS ===\r
 #define        FLAG_LFB        0x1\r
+#define VESA_DEFAULT_FRAMEBUFFER       (KERNEL_BASE|0xA0000)\r
+#define BLINKING_CURSOR        1\r
+#if BLINKING_CURSOR\r
+# define VESA_CURSOR_PERIOD    1000\r
+#endif\r
 \r
 // === PROTOTYPES ===\r
  int   Vesa_Install(char **Arguments);\r
@@ -24,27 +29,45 @@ Uint64      Vesa_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
  int   Vesa_Int_SetMode(int Mode);\r
  int   Vesa_Int_FindMode(tVideo_IOCtl_Mode *data);\r
  int   Vesa_Int_ModeInfo(tVideo_IOCtl_Mode *data);\r
+void   Vesa_FlipCursor(void *Arg);\r
+// --- 2D Acceleration Functions --\r
+void   Vesa_2D_Fill(void *Ent, Uint16 X, Uint16 Y, Uint16 W, Uint16 H, Uint32 Colour);\r
+void   Vesa_2D_Blit(void *Ent, Uint16 DstX, Uint16 DstY, Uint16 SrcX, Uint16 SrcY, Uint16 W, Uint16 H);\r
 \r
 // === GLOBALS ===\r
 MODULE_DEFINE(0, VERSION, Vesa, Vesa_Install, NULL, "PCI", "VM8086", NULL);\r
 tDevFS_Driver  gVesa_DriverStruct = {\r
-       NULL, "VESA",\r
+       NULL, "Vesa",\r
        {\r
        .Read = Vesa_Read,\r
        .Write = Vesa_Write,\r
        .IOCtl = Vesa_Ioctl\r
        }\r
 };\r
-tSpinlock      glVesa_Lock;\r
+tMutex glVesa_Lock;\r
 tVM8086        *gpVesa_BiosState;\r
- int   giVesaCurrentMode = -1;\r
  int   giVesaDriverId = -1;\r
-char   *gVesaFramebuffer = (void*)0xC00A0000;\r
+// --- Video Modes ---\r
+ int   giVesaCurrentMode = 0;\r
+ int   giVesaCurrentFormat = VIDEO_BUFFMT_TEXT;\r
 tVesa_Mode     *gVesa_Modes;\r
+tVesa_Mode     *gpVesaCurMode;\r
  int   giVesaModeCount = 0;\r
- int   giVesaPageCount = 0;\r
+// --- Framebuffer ---\r
+char   *gpVesa_Framebuffer = (void*)VESA_DEFAULT_FRAMEBUFFER;\r
+ int   giVesaPageCount = 0;    //!< Framebuffer size in pages\r
+// --- Cursor Control ---\r
+ int   giVesaCursorX = -1;\r
+ int   giVesaCursorY = -1;\r
+ int   giVesaCursorTimer = -1; // Invalid timer\r
+// --- 2D Video Stream Handlers ---\r
+tDrvUtil_Video_2DHandlers      gVesa_2DFunctions = {\r
+       NULL,\r
+       Vesa_2D_Fill,\r
+       Vesa_2D_Blit\r
+};\r
 \r
-//CODE\r
+// === CODE ===\r
 int Vesa_Install(char **Arguments)\r
 {\r
        tVesa_CallInfo  *info;\r
@@ -66,21 +89,27 @@ int Vesa_Install(char **Arguments)
        // Call Interrupt\r
        VM8086_Int(gpVesa_BiosState, 0x10);\r
        if(gpVesa_BiosState->AX != 0x004F) {\r
-               Log_Warning("Vesa", "Vesa_Install - VESA/VBE Unsupported (AX = 0x%x)\n", gpVesa_BiosState->AX);\r
+               Log_Warning("VESA", "Vesa_Install - VESA/VBE Unsupported (AX = 0x%x)", gpVesa_BiosState->AX);\r
                return MODULE_ERR_NOTNEEDED;\r
        }\r
        \r
+       //Log_Debug("VESA", "info->VideoModes = %04x:%04x", info->VideoModes.seg, info->VideoModes.ofs);\r
        modes = (Uint16 *) VM8086_GetPointer(gpVesa_BiosState, info->VideoModes.seg, info->VideoModes.ofs);\r
        \r
        // Read Modes\r
-       for( giVesaModeCount = 1; modes[giVesaModeCount] != 0xFFFF; giVesaModeCount++ );\r
+       for( giVesaModeCount = 0; modes[giVesaModeCount] != 0xFFFF; giVesaModeCount++ );\r
        gVesa_Modes = (tVesa_Mode *)malloc( giVesaModeCount * sizeof(tVesa_Mode) );\r
        \r
+       Log_Debug("VESA", "%i Modes", giVesaModeCount);\r
+       \r
        // Insert Text Mode\r
        gVesa_Modes[0].width = 80;\r
        gVesa_Modes[0].height = 25;\r
-       gVesa_Modes[0].bpp = 4;\r
+       gVesa_Modes[0].bpp = 12;\r
        gVesa_Modes[0].code = 0x3;\r
+       gVesa_Modes[0].flags = 1;\r
+       gVesa_Modes[0].fbSize = 80*25*2;\r
+       gVesa_Modes[0].framebuffer = 0xB8000;\r
        \r
        for( i = 1; i < giVesaModeCount; i++ )\r
        {\r
@@ -104,12 +133,13 @@ int Vesa_Install(char **Arguments)
                        gVesa_Modes[i].fbSize = 0;\r
                }\r
                \r
+               gVesa_Modes[i].pitch = modeinfo->pitch;\r
                gVesa_Modes[i].width = modeinfo->Xres;\r
                gVesa_Modes[i].height = modeinfo->Yres;\r
                gVesa_Modes[i].bpp = modeinfo->bpp;\r
                \r
                #if DEBUG\r
-               LogF(" Vesa_Install: 0x%x - %ix%ix%i\n",\r
+               Log_Log("VESA", "0x%x - %ix%ix%i",\r
                        gVesa_Modes[i].code, gVesa_Modes[i].width, gVesa_Modes[i].height, gVesa_Modes[i].bpp);\r
                #endif\r
        }\r
@@ -127,7 +157,7 @@ int Vesa_Install(char **Arguments)
 Uint64 Vesa_Read(tVFS_Node *Node, Uint64 off, Uint64 len, void *buffer)\r
 {\r
        #if DEBUG >= 2\r
-       LogF("Vesa_Read: () - NULL\n");\r
+       Log("Vesa_Read: () - NULL\n");\r
        #endif\r
        return 0;\r
 }\r
@@ -137,26 +167,170 @@ Uint64 Vesa_Read(tVFS_Node *Node, Uint64 off, Uint64 len, void *buffer)
  */\r
 Uint64 Vesa_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)\r
 {\r
-       ENTER("pNode XOffset XLength pBuffer", Node, Offset, Length, Bufffer);\r
+       ENTER("pNode XOffset XLength pBuffer", Node, Offset, Length, Buffer);\r
 \r
        if(Buffer == NULL) {\r
                LEAVE('i', 0);\r
                return 0;\r
        }\r
 \r
+       // Default Text mode\r
+       if( giVesaCurrentMode == 0 )\r
+       {\r
+               Uint16  *fb = (Uint16*)(KERNEL_BASE|0xB8000);\r
+               tVT_Char        *chars = Buffer;\r
+                int    rem;\r
+               \r
+               Length /= sizeof(tVT_Char);\r
+               Offset /= sizeof(tVT_Char);\r
+               \r
+               if( giVesaCurrentFormat != VIDEO_BUFFMT_TEXT ) {\r
+                       Log_Warning("VESA", "Vesa_Write - Mode 0 is not framebuffer");\r
+                       LEAVE('i', -1);\r
+                       return -1;\r
+               }\r
+               \r
+               if( Offset + Length > 25*80 ) {\r
+                       Log_Warning("VESA", "Vesa_Write - Framebuffer Overflow");\r
+                       LEAVE('i', 0);\r
+                       return 0;\r
+               }\r
+               \r
+               fb += 2*Offset;\r
+               LOG("fb = %p", fb);\r
+               for(rem = Length; rem --; fb ++, chars++)\r
+               {\r
+                       if( chars->Ch < 0x80 )\r
+                               *fb = chars->Ch & 0x7F;\r
+                       else\r
+                               *fb = 0x00;\r
+                       \r
+                       *fb |= (chars->FGCol & 0x888) == 0x888 ? 0x8 : 0;\r
+                       *fb |= (chars->FGCol & 0x700) > 0x300 ? 0x4 : 0;\r
+                       *fb |= (chars->FGCol & 0x070) > 0x030 ? 0x2 : 0;\r
+                       *fb |= (chars->FGCol & 0x007) > 0x003 ? 0x1 : 0;\r
+                       *fb |= (chars->BGCol & 0x888) == 0x888 ? 0x80 : 0;\r
+                       *fb |= (chars->BGCol & 0x700) > 0x300 ? 0x40 : 0;\r
+                       *fb |= (chars->BGCol & 0x070) > 0x030 ? 0x20 : 0;\r
+                       *fb |= (chars->BGCol & 0x007) > 0x003 ? 0x10 : 0;\r
+                       //LOG("%08x (%03x,%03x) = %04x",\r
+                       //      chars->Ch, chars->BGCol, chars->FGCol, *fb);\r
+               }\r
+               Length *= sizeof(tVT_Char);\r
+               LEAVE('X', Length);\r
+               return Length;\r
+       }\r
+\r
        if( gVesa_Modes[giVesaCurrentMode].framebuffer == 0 ) {\r
                Log_Warning("VESA", "Vesa_Write - Non-LFB Modes not yet supported.");\r
                LEAVE('i', 0);\r
                return 0;\r
        }\r
-       if(gVesa_Modes[giVesaCurrentMode].fbSize < Offset+Length)\r
+       \r
+       // Text Mode\r
+       switch( giVesaCurrentFormat )\r
        {\r
-               Log_Warning("VESA", "Vesa_Write - Framebuffer Overflow");\r
-               LEAVE('i', 0);\r
-               return 0;\r
-       }\r
+       case VIDEO_BUFFMT_TEXT:\r
+               {\r
+               tVT_Char        *chars = Buffer;\r
+                int    pitch = gVesa_Modes[giVesaCurrentMode].width;\r
+                int    widthInChars = gVesa_Modes[giVesaCurrentMode].width/giVT_CharWidth;\r
+                int    heightInChars = gVesa_Modes[giVesaCurrentMode].height/giVT_CharHeight;\r
+                int    x, y;\r
+               Uint32  *dest = (void*)gpVesa_Framebuffer;\r
+                int    i;\r
+               \r
+               Length /= sizeof(tVT_Char);\r
+               Offset /= sizeof(tVT_Char);\r
+               \r
+               LOG("gVesa_Modes[%i].width = %i", giVesaCurrentMode, gVesa_Modes[giVesaCurrentMode].width);\r
+               x = Offset % widthInChars;\r
+               y = Offset / widthInChars;\r
+               LOG("(x,y) = (%i,%i) = [%i,%i]", x, y, x * giVT_CharWidth, y * giVT_CharHeight * pitch);\r
+               LOG("(w,h) = (%i,%i) = [%i,%i]",\r
+                       (int)(Length % widthInChars),\r
+                       (int)(Length / widthInChars),\r
+                       (int)((Length % widthInChars) * giVT_CharWidth),\r
+                       (int)((Length / widthInChars) * giVT_CharHeight * pitch)\r
+                       );\r
+               \r
+               // Sanity Check\r
+               if( Offset > (Uint64)(heightInChars*widthInChars) ) {\r
+                       LEAVE('i', 0);\r
+                       return 0;\r
+               }\r
+               if(y >= heightInChars) {\r
+                       LEAVE('i', 0);\r
+                       return 0;\r
+               }\r
+               \r
+               \r
+               if( (int)Offset + (int)Length > heightInChars*widthInChars ) {\r
+                       Log_Debug("VESA", "%i + %i > %i*%i (%i)",\r
+                               (int)Offset, (int)Length, heightInChars, widthInChars, heightInChars*widthInChars);\r
+                       Length = heightInChars*widthInChars - Offset;\r
+                       Log_Notice("VESA", "Clipping write size to %i characters", (int)Length);\r
+               }\r
+               \r
+               dest += y * giVT_CharHeight * pitch;\r
+               dest += x * giVT_CharWidth;\r
+               \r
+               LOG("dest = %p", dest);\r
+               \r
+               for( i = 0; i < (int)Length; i++ )\r
+               {\r
+                       VT_Font_Render(\r
+                               chars->Ch,\r
+                               dest + x*giVT_CharWidth, pitch,\r
+                               VT_Colour12to24(chars->BGCol),\r
+                               VT_Colour12to24(chars->FGCol)\r
+                               );\r
+                       \r
+                       chars ++;\r
+                       x ++;\r
+                       if( x >= widthInChars ) {\r
+                               x = 0;\r
+                               y ++;\r
+                               dest += pitch*giVT_CharHeight;\r
+                       }\r
+               }\r
+               Length *= sizeof(tVT_Char);\r
+               }\r
+               break;\r
        \r
-       memcpy(gVesaFramebuffer + Offset, Buffer, Length);\r
+       case VIDEO_BUFFMT_FRAMEBUFFER:\r
+               {\r
+               Uint8   *destBuf = (Uint8*) ((Uint)gpVesa_Framebuffer + (Uint)Offset);\r
+               \r
+               if(gVesa_Modes[giVesaCurrentMode].fbSize < Offset+Length)\r
+               {\r
+                       Log_Warning("VESA", "Vesa_Write - Framebuffer Overflow");\r
+                       LEAVE('i', 0);\r
+                       return 0;\r
+               }\r
+               \r
+               LOG("buffer = %p", Buffer);\r
+               LOG("Updating Framebuffer (%p to %p)", destBuf, destBuf + (Uint)Length);\r
+               \r
+               \r
+               // Copy to Frambuffer\r
+               memcpy(destBuf, Buffer, Length);\r
+               \r
+               LOG("BGA Framebuffer updated");\r
+               }\r
+               break;\r
+       \r
+       case VIDEO_BUFFMT_2DSTREAM:\r
+               Length = DrvUtil_Video_2DStream(\r
+                       NULL,   // Single framebuffer, so Ent is unused\r
+                       Buffer, Length, &gVesa_2DFunctions, sizeof(gVesa_2DFunctions)\r
+                       );\r
+               break;\r
+       \r
+       default:\r
+               LEAVE('i', -1);\r
+               return -1;\r
+       }\r
        \r
        LEAVE('X', Length);\r
        return Length;\r
@@ -168,6 +342,8 @@ Uint64 Vesa_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
  */\r
 int Vesa_Ioctl(tVFS_Node *Node, int ID, void *Data)\r
 {\r
+        int    ret;\r
+       //Log_Debug("VESA", "Vesa_Ioctl: (Node=%p, ID=%i, Data=%p)", Node, ID, Data);\r
        switch(ID)\r
        {\r
        case DRV_IOCTL_TYPE:    return DRV_TYPE_VIDEO;\r
@@ -183,17 +359,60 @@ int Vesa_Ioctl(tVFS_Node *Node, int ID, void *Data)
        case VIDEO_IOCTL_MODEINFO:\r
                return Vesa_Int_ModeInfo((tVideo_IOCtl_Mode*)Data);\r
        \r
+       case VIDEO_IOCTL_SETBUFFORMAT:\r
+               ret = giVesaCurrentFormat;\r
+               if(Data) {\r
+                       //Log_Log("VESA", "Buffer mode to %i", *(int*)Data);\r
+                       giVesaCurrentFormat = *(int*)Data;\r
+               }\r
+               return ret;\r
+       \r
+       case VIDEO_IOCTL_SETCURSOR:     // Set cursor position\r
+               #if !BLINKING_CURSOR\r
+               if(giVesaCursorX > 0)\r
+                       Vesa_FlipCursor(Node);\r
+               #endif\r
+               giVesaCursorX = ((tVideo_IOCtl_Pos*)Data)->x;\r
+               giVesaCursorY = ((tVideo_IOCtl_Pos*)Data)->y;\r
+               //Log_Debug("VESA", "Cursor position (%i,%i)", giVesaCursorX, giVesaCursorY);\r
+               if(\r
+                       giVesaCursorX < 0 || giVesaCursorY < 0\r
+               ||      giVesaCursorX >= gpVesaCurMode->width/giVT_CharWidth\r
+               ||      giVesaCursorY >= gpVesaCurMode->height/giVT_CharHeight)\r
+               {\r
+                       #if BLINKING_CURSOR\r
+                       if(giVesaCursorTimer != -1) {\r
+                               Time_RemoveTimer(giVesaCursorTimer);\r
+                               giVesaCursorTimer = -1;\r
+                       }\r
+                       #endif\r
+                       giVesaCursorX = -1;\r
+                       giVesaCursorY = -1;\r
+               }\r
+               else {\r
+                       #if BLINKING_CURSOR\r
+               //      Log_Debug("VESA", "Updating timer %i?", giVesaCursorTimer);\r
+                       if(giVesaCursorTimer == -1)\r
+                               giVesaCursorTimer = Time_CreateTimer(VESA_CURSOR_PERIOD, Vesa_FlipCursor, Node);\r
+                       #else\r
+                       Vesa_FlipCursor(Node);\r
+                       #endif\r
+               }\r
+               //Log_Debug("VESA", "Cursor position (%i,%i) Timer %i", giVesaCursorX, giVesaCursorY, giVesaCursorTimer);\r
+               return 0;\r
+       \r
        case VIDEO_IOCTL_REQLFB:        // Request Linear Framebuffer\r
                return 0;\r
        }\r
        return 0;\r
 }\r
 \r
+/**\r
+ * \brief Updates the video mode\r
+ */\r
 int Vesa_Int_SetMode(int mode)\r
-{      \r
-       #if DEBUG\r
-       LogF("Vesa_Int_SetMode: (mode=%i)\n", mode);\r
-       #endif\r
+{\r
+       Log_Log("VESA", "Setting mode to %i", mode);\r
        \r
        // Sanity Check values\r
        if(mode < 0 || mode > giVesaModeCount)  return -1;\r
@@ -201,12 +420,15 @@ int Vesa_Int_SetMode(int mode)
        // Check for fast return\r
        if(mode == giVesaCurrentMode)   return 1;\r
        \r
-       LOCK( &glVesa_Lock );\r
+       Time_RemoveTimer(giVesaCursorTimer);\r
+       giVesaCursorTimer = -1;\r
+       \r
+       Mutex_Acquire( &glVesa_Lock );\r
        \r
        gpVesa_BiosState->AX = 0x4F02;\r
        gpVesa_BiosState->BX = gVesa_Modes[mode].code;\r
        if(gVesa_Modes[mode].flags & FLAG_LFB) {\r
-               LogF(" Vesa_Int_SetMode: Using LFB\n");\r
+               Log_Log("VESA", "Using LFB");\r
                gpVesa_BiosState->BX |= 0x4000; // Bit 14 - Use LFB\r
        }\r
        \r
@@ -214,17 +436,19 @@ int Vesa_Int_SetMode(int mode)
        VM8086_Int(gpVesa_BiosState, 0x10);\r
        \r
        // Map Framebuffer\r
-       MM_UnmapHWPages((tVAddr)gVesaFramebuffer, giVesaPageCount);\r
+       if( (tVAddr)gpVesa_Framebuffer != VESA_DEFAULT_FRAMEBUFFER )\r
+               MM_UnmapHWPages((tVAddr)gpVesa_Framebuffer, giVesaPageCount);\r
        giVesaPageCount = (gVesa_Modes[mode].fbSize + 0xFFF) >> 12;\r
-       gVesaFramebuffer = (void*)MM_MapHWPages(gVesa_Modes[mode].framebuffer, giVesaPageCount);\r
+       gpVesa_Framebuffer = (void*)MM_MapHWPages(gVesa_Modes[mode].framebuffer, giVesaPageCount);\r
        \r
-       LogF(" Vesa_Int_SetMode: Fb (Phys) = 0x%x\n", gVesa_Modes[mode].framebuffer);\r
-       LogF(" Vesa_Int_SetMode: Fb (Virt) = 0x%x\n", gVesaFramebuffer);\r
+       Log_Log("VESA", "Framebuffer (Phys) = 0x%x", gVesa_Modes[mode].framebuffer);\r
+       Log_Log("VESA", "Framebuffer (Virt) = 0x%x", gpVesa_Framebuffer);\r
        \r
        // Record Mode Set\r
        giVesaCurrentMode = mode;\r
+       gpVesaCurMode = &gVesa_Modes[giVesaCurrentMode];\r
        \r
-       RELEASE( &glVesa_Lock );\r
+       Mutex_Release( &glVesa_Lock );\r
        \r
        return 1;\r
 }\r
@@ -234,22 +458,18 @@ int Vesa_Int_FindMode(tVideo_IOCtl_Mode *data)
         int    i;\r
         int    best = -1, bestFactor = 1000;\r
         int    factor, tmp;\r
-       #if DEBUG\r
-       LogF("Vesa_Int_FindMode: (data={width:%i,height:%i,bpp:%i})\n", data->width, data->height, data->bpp);\r
-       #endif\r
+       \r
+       ENTER("idata->width idata->height idata->bpp", data->width, data->height, data->bpp);\r
+       \r
        for(i=0;i<giVesaModeCount;i++)\r
        {\r
-               #if DEBUG >= 2\r
-               LogF("Mode %i (%ix%ix%i), ", i, gVesa_Modes[i].width, gVesa_Modes[i].height, gVesa_Modes[i].bpp);\r
-               #endif\r
+               LOG("Mode %i (%ix%ix%i)", i, gVesa_Modes[i].width, gVesa_Modes[i].height, gVesa_Modes[i].bpp);\r
        \r
                if(gVesa_Modes[i].width == data->width\r
                && gVesa_Modes[i].height == data->height\r
                && gVesa_Modes[i].bpp == data->bpp)\r
                {\r
-                       #if DEBUG >= 2\r
-                       LogF("Perfect!\n");\r
-                       #endif\r
+                       LOG("Perfect!");\r
                        best = i;\r
                        break;\r
                }\r
@@ -259,9 +479,7 @@ int Vesa_Int_FindMode(tVideo_IOCtl_Mode *data)
                tmp = tmp < 0 ? -tmp : tmp;\r
                factor = tmp * 100 / (data->width * data->height * data->bpp);\r
                \r
-               #if DEBUG >= 2\r
-               LogF("factor = %i\n", factor);\r
-               #endif\r
+               LOG("factor = %i", factor);\r
                \r
                if(factor < bestFactor)\r
                {\r
@@ -273,6 +491,7 @@ int Vesa_Int_FindMode(tVideo_IOCtl_Mode *data)
        data->width = gVesa_Modes[best].width;\r
        data->height = gVesa_Modes[best].height;\r
        data->bpp = gVesa_Modes[best].bpp;\r
+       LEAVE('i', best);\r
        return best;\r
 }\r
 \r
@@ -284,3 +503,92 @@ int Vesa_Int_ModeInfo(tVideo_IOCtl_Mode *data)
        data->bpp = gVesa_Modes[data->id].bpp;\r
        return 1;\r
 }\r
+\r
+/**\r
+ * \brief Updates the state of the text cursor\r
+ * \note Just does a bitwise not on the cursor region\r
+ */\r
+void Vesa_FlipCursor(void *Arg)\r
+{\r
+        int    pitch = gpVesaCurMode->pitch/4;\r
+        int    x = giVesaCursorX*giVT_CharWidth;\r
+        int    y = giVesaCursorY*giVT_CharHeight;\r
+        int    i;\r
+       Uint32  *fb = (void*)gpVesa_Framebuffer;\r
+       \r
+       //Debug("Cursor flip");\r
+       \r
+       // Sanity check\r
+       if(giVesaCursorX < 0 || giVesaCursorY < 0\r
+       || y*pitch + x + (giVT_CharHeight-1)*pitch > (int)gpVesaCurMode->fbSize/4) {\r
+               Log_Notice("VESA", "Cursor OOB (%i,%i)", x, y);\r
+               giVesaCursorTimer = -1;\r
+               return;\r
+       }\r
+       \r
+       // Draw cursor\r
+       fb += (y+1)*pitch + x;\r
+       for( i = 1; i < giVT_CharHeight-1; i++, fb += pitch )\r
+               *fb = ~*fb;\r
+       \r
+       #if BLINKING_CURSOR\r
+       giVesaCursorTimer = Time_CreateTimer(VESA_CURSOR_PERIOD, Vesa_FlipCursor, Arg);\r
+       #endif\r
+}\r
+\r
+// ------------------------\r
+// --- 2D Accelleration ---\r
+// ------------------------\r
+void Vesa_2D_Fill(void *Ent, Uint16 X, Uint16 Y, Uint16 W, Uint16 H, Uint32 Colour)\r
+{\r
+        int    pitch = gpVesaCurMode->pitch/4;\r
+       Uint32  *buf = (Uint32*)gpVesa_Framebuffer + Y*pitch + X;\r
+       while( H -- ) {\r
+               memsetd(buf, Colour, W);\r
+               buf += pitch;\r
+       }\r
+}\r
+\r
+void Vesa_2D_Blit(void *Ent, Uint16 DstX, Uint16 DstY, Uint16 SrcX, Uint16 SrcY, Uint16 W, Uint16 H)\r
+{\r
+        int    scrnpitch = gVesa_Modes[giVesaCurrentMode].pitch;\r
+        int    dst = DstY*scrnpitch + DstX;\r
+        int    src = SrcY*scrnpitch + SrcX;\r
+        int    tmp;\r
+       \r
+       //Log("Vesa_2D_Blit: (Ent=%p, DstX=%i, DstY=%i, SrcX=%i, SrcY=%i, W=%i, H=%i)",\r
+       //      Ent, DstX, DstY, SrcX, SrcY, W, H);\r
+       \r
+       if(SrcX + W > gVesa_Modes[giVesaCurrentMode].width)\r
+               W = gVesa_Modes[giVesaCurrentMode].width - SrcX;\r
+       if(DstX + W > gVesa_Modes[giVesaCurrentMode].width)\r
+               W = gVesa_Modes[giVesaCurrentMode].width - DstX;\r
+       if(SrcY + H > gVesa_Modes[giVesaCurrentMode].height)\r
+               H = gVesa_Modes[giVesaCurrentMode].height - SrcY;\r
+       if(DstY + H > gVesa_Modes[giVesaCurrentMode].height)\r
+               H = gVesa_Modes[giVesaCurrentMode].height - DstY;\r
+       \r
+       //Debug("W = %i, H = %i", W, H);\r
+       \r
+       if( dst > src ) {\r
+               // Reverse copy\r
+               dst += H*scrnpitch;\r
+               src += H*scrnpitch;\r
+               while( H -- ) {\r
+                       dst -= scrnpitch;\r
+                       src -= scrnpitch;\r
+                       tmp = W;\r
+                       for( tmp = W; tmp --; ) {\r
+                               *(Uint32*)(gpVesa_Framebuffer + dst + tmp) = *(Uint32*)(gpVesa_Framebuffer + src + tmp);\r
+                       }\r
+               }\r
+       }\r
+       else {\r
+               // Normal copy is OK\r
+               while( H -- ) {\r
+                       memcpy((void*)gpVesa_Framebuffer + dst, (void*)gpVesa_Framebuffer + src, W*sizeof(Uint32));\r
+                       dst += scrnpitch;\r
+                       src += scrnpitch;\r
+               }\r
+       }\r
+}\r

UCC git Repository :: git.ucc.asn.au