Minor rename: KernelStateInfo.gx_back -> gx_backfb

Author: coderarjob

include/compositor.h

@@ -29,8 +29,8 @@ typedef struct Window {
 #define WINMAN_GRID_COLS_MAX   (2U)
 #define WINMAN_GRID_CELL_COUNT (WINMAN_GRID_ROWS_MAX * WINMAN_GRID_COLS_MAX)
 
-#define WINMAN_GRID_CELL_WIDTH_PX()         (g_kstate.gx_back.width_px / WINMAN_GRID_COLS_MAX)
-#define WINMAN_GRID_CELL_HEIGHT_PX()        (g_kstate.gx_back.height_px / WINMAN_GRID_ROWS_MAX)
+#define WINMAN_GRID_CELL_WIDTH_PX()         (g_kstate.gx_backfb.width_px / WINMAN_GRID_COLS_MAX)
+#define WINMAN_GRID_CELL_HEIGHT_PX()        (g_kstate.gx_backfb.height_px / WINMAN_GRID_ROWS_MAX)
 
 // Window grid coordiate of rows and columns to screen coordinates
 #define WINMAN_GRID_CELL_Y(r)               (WINMAN_GRID_CELL_HEIGHT_PX() * r)

include/kernel.h

@@ -33,7 +33,7 @@ typedef struct KernelStateInfo {
     U32 tick_count; // incremented every CONFIG_TICK_PERIOD_MICROSEC micro seconds.
 #ifdef GRAPHICS_MODE_ENABLED
     // Kernel Graphics back buffer
-    KGraphicsArea gx_back;
+    KGraphicsArea gx_backfb;
     // HW Video Framebuffer
     KGraphicsArea gx_hwfb;
 #endif

src/kernel/compositor.c

@@ -37,7 +37,7 @@
 static SIZE getWindowAreaSizeBytes()
 {
     return WINMAN_GRID_CELL_WIDTH_PX() * WINMAN_GRID_CELL_HEIGHT_PX() *
-           g_kstate.gx_back.bytesPerPixel;
+           g_kstate.gx_backfb.bytesPerPixel;
 }
 
 static ListNode windowsListHead;
@@ -92,11 +92,11 @@ static void drawWindowDecorations (const KGraphicsArea* wa, const char* title)
 static Window* allocWindow (UINT processID, UINT screen_x, UINT screen_y)
 {
     // Create new window graphics area
-    KGraphicsArea windowArea = { .bytesPerPixel = g_kstate.gx_back.bytesPerPixel,
+    KGraphicsArea windowArea = { .bytesPerPixel = g_kstate.gx_backfb.bytesPerPixel,
                                  .width_px      = WINMAN_GRID_CELL_WIDTH_PX(),
                                  .height_px     = WINMAN_GRID_CELL_HEIGHT_PX(),
                                  .bytesPerRow   = WINMAN_GRID_CELL_WIDTH_PX() *
-                                                g_kstate.gx_back.bytesPerPixel };
+                                                g_kstate.gx_backfb.bytesPerPixel };
 
     VMemoryManager* vmm        = kprocess_getCurrentContext();
     SIZE bufferSzPages         = BYTES_TO_PAGEFRAMES_CEILING (getWindowAreaSizeBytes());
@@ -208,8 +208,9 @@ void kcompose_flush()
     FUNC_ENTRY();
 
     KERNEL_PHASE_VALIDATE (KERNEL_PHASE_STATE_GRAPHICS_READY);
-    KGraphicsArea* backbuffer = (KGraphicsArea*)&g_kstate.gx_back;
-    kgraphics_rect (backbuffer, 0, 0, backbuffer->width_px, backbuffer->height_px, DESKTOP_BG_COLOR);
+    KGraphicsArea* backbuffer = (KGraphicsArea*)&g_kstate.gx_backfb;
+    kgraphics_rect (backbuffer, 0, 0, backbuffer->width_px, backbuffer->height_px,
+                    DESKTOP_BG_COLOR);
 
     ListNode* node;
     list_for_each (&windowsListHead, node)

src/kernel/kgraphics.c

@@ -145,8 +145,8 @@ void kgraphics_blit (const KGraphicsArea* destg, UINT x, UINT y, const KGraphics
     }
 }
 
-void kgraphics_image_raw (const KGraphicsArea* g, UINT x, UINT y, UINT w, UINT h, UINT bytesPerPixel,
-                         U8* bytes)
+void kgraphics_image_raw (const KGraphicsArea* g, UINT x, UINT y, UINT w, UINT h,
+                          UINT bytesPerPixel, U8* bytes)
 {
     FUNC_ENTRY ("area: %px, x: %u, y: %u, w: %u, h: %u, bytes: %px", g, x, y, w, h, bytes);
 
@@ -219,21 +219,21 @@ bool kgraphics_init()
     kvmm_setAddressSpaceMetadata (g_kstate.context, (PTR)framebuffer, "vesafb", NULL);
 
     // Backbuffer: Store a copy of basic/global graphics mode information.
-    g_kstate.gx_back.bytesPerPixel   = gxi.bytesPerPixel;
-    g_kstate.gx_back.bytesPerRow     = gxi.bytesPerScanLine;
-    g_kstate.gx_back.width_px        = gxi.xResolution;
-    g_kstate.gx_back.height_px       = gxi.yResolution;
-    g_kstate.gx_back.bufferSizeBytes = PAGEFRAMES_TO_BYTES (szPages);
-    if (!(g_kstate.gx_back.buffer = (U8*)
+    g_kstate.gx_backfb.bytesPerPixel   = gxi.bytesPerPixel;
+    g_kstate.gx_backfb.bytesPerRow     = gxi.bytesPerScanLine;
+    g_kstate.gx_backfb.width_px        = gxi.xResolution;
+    g_kstate.gx_backfb.height_px       = gxi.yResolution;
+    g_kstate.gx_backfb.bufferSizeBytes = PAGEFRAMES_TO_BYTES (szPages);
+    if (!(g_kstate.gx_backfb.buffer = (U8*)
               kvmm_memmap (g_kstate.context, 0, NULL, szPages,
                            VMM_MEMMAP_FLAG_IMMCOMMIT | VMM_MEMMAP_FLAG_KERNEL_PAGE, NULL))) {
         RETURN_ERROR (ERROR_PASSTHROUGH, false);
     }
-    kvmm_setAddressSpaceMetadata (g_kstate.context, (PTR)g_kstate.gx_back.buffer, "gxbackbuffer",
+    kvmm_setAddressSpaceMetadata (g_kstate.context, (PTR)g_kstate.gx_backfb.buffer, "gxbackbuffer",
                                   NULL);
 
     // HW Framebuffer: Store a copy of basic/global graphics mode information.
-    g_kstate.gx_hwfb        = g_kstate.gx_back;
+    g_kstate.gx_hwfb        = g_kstate.gx_backfb;
     g_kstate.gx_hwfb.buffer = (U8*)framebuffer;
 
     KERNEL_PHASE_SET (KERNEL_PHASE_STATE_GRAPHICS_READY);
@@ -246,14 +246,14 @@ void kgraphis_flush()
         return; // Graphics mode is not ready
     }
 
-    KGraphicsArea* backbuffer = (KGraphicsArea*)&g_kstate.gx_back;
+    KGraphicsArea* backbuffer = (KGraphicsArea*)&g_kstate.gx_backfb;
 
     // Backbuffer must exactly match the vesa framebuffer
     k_assert (backbuffer != NULL && (void*)framebuffer != NULL, "Graphics buffers cannot be NULL");
-    k_assert (g_kstate.gx_back.bytesPerRow == gxi.bytesPerScanLine, "Invalid backbuffer");
-    k_assert (g_kstate.gx_back.bytesPerPixel == gxi.bytesPerPixel, "Invalid backbuffer");
-    k_assert (g_kstate.gx_back.width_px == gxi.xResolution, "Invalid backbuffer");
-    k_assert (g_kstate.gx_back.height_px == gxi.yResolution, "Invalid backbuffer");
+    k_assert (g_kstate.gx_backfb.bytesPerRow == gxi.bytesPerScanLine, "Invalid backbuffer");
+    k_assert (g_kstate.gx_backfb.bytesPerPixel == gxi.bytesPerPixel, "Invalid backbuffer");
+    k_assert (g_kstate.gx_backfb.width_px == gxi.xResolution, "Invalid backbuffer");
+    k_assert (g_kstate.gx_backfb.height_px == gxi.yResolution, "Invalid backbuffer");
 
     arch_waitForNextVerticalRetrace();
     draw_cursor (backbuffer);