summaryrefslogtreecommitdiffhomepage
path: root/dev/Modules
diff options
context:
space:
mode:
Diffstat (limited to 'dev/Modules')
-rw-r--r--dev/Modules/FB/Math.h26
-rw-r--r--dev/Modules/Flash/Flash.h4
-rw-r--r--dev/Modules/GfxMgr/AccessibilityMgr.h (renamed from dev/Modules/FB/AccessibilityMgr.h)8
-rw-r--r--dev/Modules/GfxMgr/AppearanceMgr.h (renamed from dev/Modules/FB/AppearanceMgr.h)50
-rw-r--r--dev/Modules/GfxMgr/FBMgr.h (renamed from dev/Modules/FB/FB.h)39
-rw-r--r--dev/Modules/GfxMgr/MathMgr.h29
-rw-r--r--dev/Modules/GfxMgr/Rsrc/Controls.rsrc (renamed from dev/Modules/FB/Rsrc/WndControls.rsrc)4
-rw-r--r--dev/Modules/GfxMgr/Rsrc/Cursor.rsrc (renamed from dev/Modules/FB/Rsrc/Cursor.rsrc)0
-rw-r--r--dev/Modules/GfxMgr/TextMgr.h (renamed from dev/Modules/FB/Text.h)4
9 files changed, 77 insertions, 87 deletions
diff --git a/dev/Modules/FB/Math.h b/dev/Modules/FB/Math.h
deleted file mode 100644
index 123e9914..00000000
--- a/dev/Modules/FB/Math.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -------------------------------------------
-
- Copyright ZKA Technologies.
-
-------------------------------------------- */
-
-#pragma once
-
-/// @file Math.h
-/// @brief Linear interpolation implementation.
-
-#ifdef ZKA_FB_USE_DOUBLE
-typedef double fb_real_t;
-#else
-typedef float fb_real_t;
-#endif
-
-/// @brief Linear interpolation equation solver.
-/// @param from where?
-/// @param to to?
-/// @param at which state we're at **to**.
-inline fb_real_t fb_math_lerp(fb_real_t to, fb_real_t from, fb_real_t stat)
-{
- fb_real_t difference = to - from;
- return from + (difference * stat);
-}
diff --git a/dev/Modules/Flash/Flash.h b/dev/Modules/Flash/Flash.h
index f549ef44..9f5d4117 100644
--- a/dev/Modules/Flash/Flash.h
+++ b/dev/Modules/Flash/Flash.h
@@ -6,7 +6,7 @@
#pragma once
-#ifdef __USE_MBCI_FLASH__
+#ifdef ZKA_USE_MBCI_FLASH
#include <NewKit/Defines.h>
@@ -18,4 +18,4 @@ Kernel::SizeT drv_get_sector_count();
/// @return drive size
Kernel::SizeT drv_get_size();
-#endif // ifdef __USE_MBCI_FLASH__
+#endif // ifdef ZKA_USE_MBCI_FLASH
diff --git a/dev/Modules/FB/AccessibilityMgr.h b/dev/Modules/GfxMgr/AccessibilityMgr.h
index 843ad9a7..7507f5c0 100644
--- a/dev/Modules/FB/AccessibilityMgr.h
+++ b/dev/Modules/GfxMgr/AccessibilityMgr.h
@@ -1,6 +1,6 @@
/* -------------------------------------------
- Copyright ZKA Technologies.
+ Copyright Theater Quality Inc.
------------------------------------------- */
@@ -9,11 +9,11 @@
#include <NewKit/NewKit.h>
#include <KernelKit/LPC.h>
-#include <Modules/FB/FB.h>
-#include <Modules/FB/Math.h>
+#include <Modules/GfxMgr/FBMgr.h>
+#include <Modules/GfxMgr/MathMgr.h>
#include <ArchKit/ArchKit.h>
-namespace CG
+namespace UI
{
using namespace Kernel;
diff --git a/dev/Modules/FB/AppearanceMgr.h b/dev/Modules/GfxMgr/AppearanceMgr.h
index ca6fff10..2318231d 100644
--- a/dev/Modules/FB/AppearanceMgr.h
+++ b/dev/Modules/GfxMgr/AppearanceMgr.h
@@ -1,22 +1,22 @@
/* -------------------------------------------
- Copyright ZKA Technologies.
+ Copyright Theater Quality Inc.
------------------------------------------- */
#pragma once
-#include <Modules/FB/AccessibilityMgr.h>
+#include <Modules/GfxMgr/AccessibilityMgr.h>
#include <KernelKit/Heap.h>
#include <KernelKit/UserProcessScheduler.h>
#include <KernelKit/LPC.h>
#include <NewKit/Defines.h>
#include <NewKit/Utils.h>
-#include <Modules/FB/FB.h>
-#include <Modules/FB/Rsrc/WndControls.rsrc>
-#include <Modules/FB/Text.h>
+#include <Modules/GfxMgr/FBMgr.h>
+#include <Modules/GfxMgr/Rsrc/Controls.rsrc>
+#include <Modules/GfxMgr/TextMgr.h>
-namespace CG
+namespace UI
{
using namespace Kernel;
@@ -57,12 +57,12 @@ namespace CG
inline Void ui_draw_background() noexcept
{
- cg_init();
+ fb_init();
- CGDrawInRegion(cg_get_clear_clr(), CG::UIAccessibilty::Height(), CG::UIAccessibilty::Width(),
+ FBDrawInRegion(fb_get_clear_clr(), UI::UIAccessibilty::Height(), UI::UIAccessibilty::Width(),
0, 0);
- cg_fini();
+ fb_fini();
}
inline struct UIObject* ui_create_object(Int32 kind, const Char* obj_name, const Char* class_name, Int32 x, Int32 y, Int32 width, Int32 height, UIObject* parent = nullptr)
@@ -142,7 +142,7 @@ namespace CG
!obj->w_needs_repaint)
return 1;
- cg_init();
+ fb_init();
obj->w_needs_repaint = false;
@@ -181,26 +181,26 @@ namespace CG
{
if (obj->w_display_ptr)
{
- CGDrawInRegion(cg_color(0xDF, 0xDF, 0xDF), obj->w_h, obj->w_w, obj->w_x, obj->w_y);
- CGDrawBitMapInRegion(obj->w_display_ptr, obj->w_display_ptr_h, obj->w_display_ptr_w, obj->w_x, obj->w_y);
+ FBDrawInRegion(fb_color(0xDF, 0xDF, 0xDF), obj->w_h, obj->w_w, obj->w_x, obj->w_y);
+ FBDrawBitMapInRegion(obj->w_display_ptr, obj->w_display_ptr_h, obj->w_display_ptr_w, obj->w_x, obj->w_y);
}
else
{
- CGDrawInRegion(cg_color(0xDF, 0xDF, 0xDF), obj->w_w, obj->w_h, obj->w_y, obj->w_x);
+ FBDrawInRegion(fb_color(0xDF, 0xDF, 0xDF), obj->w_w, obj->w_h, obj->w_y, obj->w_x);
}
- CGDrawInRegion(cg_color(0xFF, 0xFF, 0xFF), obj->w_w, FLAT_CONTROLS_HEIGHT, obj->w_y, obj->w_x);
+ FBDrawInRegion(fb_color(0xFF, 0xFF, 0xFF), obj->w_w, FLAT_CONTROLS_HEIGHT, obj->w_y, obj->w_x);
if (obj->w_sub_type != kUIFlagHideCloseControl)
{
- CGDrawBitMapInRegion(zka_flat_controls, FLAT_CONTROLS_HEIGHT, FLAT_CONTROLS_WIDTH, obj->w_y, obj->w_x + obj->w_w - FLAT_CONTROLS_WIDTH);
+ FBDrawBitMapInRegion(zka_flat_controls, FLAT_CONTROLS_HEIGHT, FLAT_CONTROLS_WIDTH, obj->w_y, obj->w_x + obj->w_w - FLAT_CONTROLS_WIDTH);
}
else if (obj->w_sub_type == kUIFlagCloseControlSelect)
{
- CGDrawBitMapInRegion(zka_flat_controls_active, FLAT_CONTROLS_CLOSEHEIGHT, FLAT_CONTROLS_CLOSEWIDTH, obj->w_y, obj->w_x + obj->w_w - FLAT_CONTROLS_WIDTH);
+ FBDrawBitMapInRegion(zka_flat_controls_active, FLAT_CONTROLS_CLOSE_HEIGHT, FLAT_CONTROLS_CLOSE_WIDTH, obj->w_y, obj->w_x + obj->w_w - FLAT_CONTROLS_WIDTH);
}
- fb_render_string(obj->w_window_name, obj->w_x + 8, obj->w_y + 8, cg_color(0x00, 0x00, 0x00));
+ fb_render_string(obj->w_window_name, obj->w_x + 8, obj->w_y + 8, fb_color(0x00, 0x00, 0x00));
}
else
{
@@ -216,9 +216,9 @@ namespace CG
if (!obj->w_display_custom_draw)
{
- CGDrawInRegion(cg_color(0xD3, 0x74, 0x00), obj->w_w + 1, obj->w_h + 1, obj->w_x, obj->w_y);
- CGDrawInRegion(cg_color(0xFF, 0xFF, 0xFF), obj->w_w - 1, obj->w_h - 1, obj->w_x + 1, obj->w_y + 1);
- ui_render_text(obj, obj->w_window_name, y_center, x_center, cg_color(0x00, 0x00, 0x00));
+ FBDrawInRegion(fb_color(0xD3, 0x74, 0x00), obj->w_w + 1, obj->w_h + 1, obj->w_x, obj->w_y);
+ FBDrawInRegion(fb_color(0xFF, 0xFF, 0xFF), obj->w_w - 1, obj->w_h - 1, obj->w_x + 1, obj->w_y + 1);
+ ui_render_text(obj, obj->w_window_name, y_center, x_center, fb_color(0x00, 0x00, 0x00));
}
else
{
@@ -232,9 +232,9 @@ namespace CG
if (!obj->w_display_custom_draw)
{
- CGDrawInRegion(cg_color(0xDC, 0xDC, 0xDC), obj->w_w + 1, obj->w_h + 1, obj->w_y, obj->w_x);
- CGDrawInRegion(cg_color(0xFF, 0xFF, 0xFF), obj->w_w - 1, obj->w_h - 1, obj->w_y + 1, obj->w_x + 1);
- fb_render_string(obj->w_window_name, y_center, x_center, cg_color(0x00, 0x00, 0x00));
+ FBDrawInRegion(fb_color(0xDC, 0xDC, 0xDC), obj->w_w + 1, obj->w_h + 1, obj->w_y, obj->w_x);
+ FBDrawInRegion(fb_color(0xFF, 0xFF, 0xFF), obj->w_w - 1, obj->w_h - 1, obj->w_y + 1, obj->w_x + 1);
+ fb_render_string(obj->w_window_name, y_center, x_center, fb_color(0x00, 0x00, 0x00));
}
else
{
@@ -242,7 +242,7 @@ namespace CG
}
}
- cg_fini();
+ fb_fini();
// draw child windows and controls.
// doesn't have to be a window, enabling then windows in windows.
@@ -259,7 +259,7 @@ namespace CG
ui_render_object(obj->w_child_elements[child]);
}
- cg_fini();
+ fb_fini();
return 0;
}
diff --git a/dev/Modules/FB/FB.h b/dev/Modules/GfxMgr/FBMgr.h
index 6a609255..f5cdf4d2 100644
--- a/dev/Modules/FB/FB.h
+++ b/dev/Modules/GfxMgr/FBMgr.h
@@ -8,18 +8,16 @@
#include <NewKit/Defines.h>
-#define cg_init() Kernel::SizeT kCGCursor = 0
+#define fb_init() Kernel::SizeT kCGCursor = 0
-#define cg_color(R, G, B) RGB(R, G, B)
+#define fb_color(R, G, B) RGB(R, G, B)
-#define cg_get_clear_clr() cg_color(0x20, 0x20, 0x20)
+#define fb_get_clear_clr() fb_color(0x20, 0x20, 0x20)
-#define cg_fini() kCGCursor = 0
+#define fb_fini() kCGCursor = 0
/// @brief Performs OR drawing on the framebuffer.
-#define CGDrawBitMapInRegionA(_BitMp, _Height, _Width, _BaseX, _BaseY) \
- kCGCursor = 0; \
- \
+#define FBDrawBitMapInRegionA(_BitMp, _Height, _Width, _BaseX, _BaseY) \
for (Kernel::SizeT i = _BaseX; i < (_Height + _BaseX); ++i) \
{ \
for (Kernel::SizeT u = _BaseY; u < (_Width + _BaseY); ++u) \
@@ -34,9 +32,7 @@
}
/// @brief Draws a resource.
-#define CGDrawBitMapInRegion(_BitMp, _Height, _Width, _BaseX, _BaseY) \
- kCGCursor = 0; \
- \
+#define FBDrawBitMapInRegion(_BitMp, _Height, _Width, _BaseX, _BaseY) \
for (Kernel::SizeT i = _BaseX; i < (_Height + _BaseX); ++i) \
{ \
for (Kernel::SizeT u = _BaseY; u < (_Width + _BaseY); ++u) \
@@ -50,9 +46,7 @@
} \
}
-#define CGDrawBitMapInRegionToRgn(_Rgn, _BitMp, _Height, _Width, _BaseX, _BaseY) \
- kCGCursor = 0; \
- \
+#define FBDrawBitMapInRegionToRgn(_Rgn, _BitMp, _Height, _Width, _BaseX, _BaseY) \
for (Kernel::SizeT i = _BaseX; i < (_Height + _BaseX); ++i) \
{ \
for (Kernel::SizeT u = _BaseY; u < (_Width + _BaseY); ++u) \
@@ -68,7 +62,6 @@
/// @brief Cleans a resource.
#define CGClearRegion(_Height, _Width, _BaseX, _BaseY) \
- \
for (Kernel::SizeT i = _BaseX; i < _Height + _BaseX; ++i) \
{ \
for (Kernel::SizeT u = _BaseY; u < _Width + _BaseY; ++u) \
@@ -76,13 +69,12 @@
*(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \
4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
i + \
- 4 * u))) = cg_get_clear_clr(); \
+ 4 * u))) = fb_get_clear_clr(); \
} \
}
/// @brief Draws inside a zone.
-#define CGDrawInRegion(_Clr, _Height, _Width, _BaseX, _BaseY) \
- \
+#define FBDrawInRegion(_Clr, _Height, _Width, _BaseX, _BaseY) \
for (Kernel::SizeT x_base = _BaseX; x_base < (_Width + _BaseX); ++x_base) \
{ \
for (Kernel::SizeT y_base = _BaseY; y_base < (_Height + _BaseY); ++y_base) \
@@ -95,9 +87,7 @@
}
/// @brief Draws inside a zone.
-#define CGDrawInRegionToRgn(_Rgn, _Clr, _Height, _Width, _BaseX, _BaseY) \
- kCGCursor = 0; \
- \
+#define FBDrawInRegionToRgn(_Rgn, _Clr, _Height, _Width, _BaseX, _BaseY) \
for (Kernel::SizeT x_base = _BaseX; x_base < (_Width + _BaseX); ++x_base) \
{ \
for (Kernel::SizeT y_base = _BaseY; y_base < (_Height + _BaseY); ++y_base) \
@@ -110,7 +100,7 @@
} \
}
-#define CGDrawInRegionToVideoRgn(_VideoRgn, _Clr, _Height, _Width, _BaseX, _BaseY) \
+#define FBDrawInRegionToVideoRgn(_VideoRgn, _Clr, _Height, _Width, _BaseX, _BaseY) \
kCGCursor = 0; \
\
for (Kernel::SizeT x_base = _BaseX; x_base < (_Width + _BaseX); ++x_base) \
@@ -125,9 +115,7 @@
} \
}
-#define CGDrawInRegionToVideoRgnA(_VideoRgn, _Clr, _Height, _Width, _BaseX, _BaseY) \
- kCGCursor = 0; \
- \
+#define FBDrawInRegionToVideoRgnA(_VideoRgn, _Clr, _Height, _Width, _BaseX, _BaseY) \
for (Kernel::SizeT x_base = _BaseX; x_base < (_Width + _BaseX); ++x_base) \
{ \
for (Kernel::SizeT y_base = _BaseY; y_base < (_Height + _BaseY); ++y_base) \
@@ -140,8 +128,7 @@
} \
}
-#define CGDrawInRegionA(_Clr, _Height, _Width, _BaseX, _BaseY) \
- \
+#define FBDrawInRegionA(_Clr, _Height, _Width, _BaseX, _BaseY) \
for (Kernel::SizeT x_base = _BaseX; x_base < (_Width + _BaseX); ++x_base) \
{ \
for (Kernel::SizeT y_base = _BaseY; y_base < (_Height + _BaseY); ++y_base) \
diff --git a/dev/Modules/GfxMgr/MathMgr.h b/dev/Modules/GfxMgr/MathMgr.h
new file mode 100644
index 00000000..13e653a5
--- /dev/null
+++ b/dev/Modules/GfxMgr/MathMgr.h
@@ -0,0 +1,29 @@
+/* -------------------------------------------
+
+ Copyright Theater Quality Inc.
+
+------------------------------------------- */
+
+#pragma once
+
+/// @file MathMgr.h
+/// @brief Linear interpolation implementation.
+
+namespace UI
+{
+#ifdef ZKA_FB_USE_DOUBLE
+ typedef double fb_real_t;
+#else
+ typedef float fb_real_t;
+#endif
+
+ /// @brief Linear interpolation equation solver.
+ /// @param from where?
+ /// @param to to?
+ /// @param at which state we're at **to**.
+ inline fb_real_t fb_math_lerp(fb_real_t to, fb_real_t from, fb_real_t stat)
+ {
+ fb_real_t difference = to - from;
+ return from + (difference * stat);
+ }
+} // namespace UI \ No newline at end of file
diff --git a/dev/Modules/FB/Rsrc/WndControls.rsrc b/dev/Modules/GfxMgr/Rsrc/Controls.rsrc
index e571fcbf..1534656e 100644
--- a/dev/Modules/FB/Rsrc/WndControls.rsrc
+++ b/dev/Modules/GfxMgr/Rsrc/Controls.rsrc
@@ -29,8 +29,8 @@ static inline const unsigned int zka_flat_controls[] = {
0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff
};
-#define FLAT_CONTROLS_CLOSEHEIGHT 24
-#define FLAT_CONTROLS_CLOSEWIDTH 44
+#define FLAT_CONTROLS_CLOSE_HEIGHT 24
+#define FLAT_CONTROLS_CLOSE_WIDTH 44
// array size is 3168
static inline const unsigned int zka_flat_controls_active[] = {
diff --git a/dev/Modules/FB/Rsrc/Cursor.rsrc b/dev/Modules/GfxMgr/Rsrc/Cursor.rsrc
index 2283cb32..2283cb32 100644
--- a/dev/Modules/FB/Rsrc/Cursor.rsrc
+++ b/dev/Modules/GfxMgr/Rsrc/Cursor.rsrc
diff --git a/dev/Modules/FB/Text.h b/dev/Modules/GfxMgr/TextMgr.h
index ba328314..970fbb8e 100644
--- a/dev/Modules/FB/Text.h
+++ b/dev/Modules/GfxMgr/TextMgr.h
@@ -7,7 +7,7 @@
#pragma once
#include <NewKit/Defines.h>
-#include <Modules/FB/FB.h>
+#include <Modules/GfxMgr/FBMgr.h>
#define FONT_SIZE_X 8
#define FONT_SIZE_Y 8
@@ -162,7 +162,7 @@ inline Kernel::Void fb_render_string_for_bitmap(const Kernel::UInt8* bitmap, con
if (set)
{
- CGDrawInRegion(color, 1, 1, ((x_dst) + x), ((y_dst) + y));
+ FBDrawInRegion(color, 1, 1, ((x_dst) + x), ((y_dst) + y));
}
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2026-03-14 22:50:54 +0000