summaryrefslogtreecommitdiffhomepage
path: root/dev/modules/CoreGfx
diff options
context:
space:
mode:
Diffstat (limited to 'dev/modules/CoreGfx')
-rw-r--r--dev/modules/CoreGfx/AccessibilityMgr.h8
-rw-r--r--dev/modules/CoreGfx/FBMgr.h124
2 files changed, 66 insertions, 66 deletions
diff --git a/dev/modules/CoreGfx/AccessibilityMgr.h b/dev/modules/CoreGfx/AccessibilityMgr.h
index d74059d0..61e0379a 100644
--- a/dev/modules/CoreGfx/AccessibilityMgr.h
+++ b/dev/modules/CoreGfx/AccessibilityMgr.h
@@ -18,13 +18,13 @@ namespace FB
using namespace Kernel;
/// @brief common User interface class.
- class UIAccessibilty final
+ class FBAccessibilty final
{
- explicit UIAccessibilty() = default;
- ~UIAccessibilty() = default;
+ explicit FBAccessibilty() = default;
+ ~FBAccessibilty() = default;
public:
- NE_COPY_DELETE(UIAccessibilty);
+ NE_COPY_DELETE(FBAccessibilty);
static Int64 Width() noexcept
{
diff --git a/dev/modules/CoreGfx/FBMgr.h b/dev/modules/CoreGfx/FBMgr.h
index 6ac4df02..73c51580 100644
--- a/dev/modules/CoreGfx/FBMgr.h
+++ b/dev/modules/CoreGfx/FBMgr.h
@@ -18,115 +18,115 @@
#ifdef __NE_AMD64__
/// @brief Performs Alpha drawing on the framebuffer.
-#define FBDrawBitMapInRegionA(reg_ptr, height, width, base_x, base_y) \
+#define FBDrawBitMapInRegionA(reg_ptr, height, width, base_x, base_y) \
for (Kernel::SizeT i = base_x; i < (width + base_x); ++i) \
- { \
+ { \
for (Kernel::SizeT u = base_y; u < (height + base_y); ++u) \
- { \
+ { \
*(((Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \
- 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
- i + \
- 4 * u))) |= (reg_ptr)[kCGCursor]; \
- \
- ++kCGCursor; \
- } \
+ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
+ i + \
+ 4 * u))) |= (reg_ptr)[kCGCursor]; \
+ \
+ ++kCGCursor; \
+ } \
}
/// @brief Performs drawing on the framebuffer.
-#define FBDrawBitMapInRegion(reg_ptr, height, width, base_x, base_y) \
+#define FBDrawBitMapInRegion(reg_ptr, height, width, base_x, base_y) \
for (Kernel::SizeT i = base_x; i < (width + base_x); ++i) \
- { \
+ { \
for (Kernel::SizeT u = base_y; u < (height + base_y); ++u) \
- { \
+ { \
*(((Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \
- 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
- i + \
- 4 * u))) = (reg_ptr)[kCGCursor]; \
- \
- ++kCGCursor; \
- } \
+ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
+ i + \
+ 4 * u))) = (reg_ptr)[kCGCursor]; \
+ \
+ ++kCGCursor; \
+ } \
}
#define FBDrawBitMapInRegionToRgn(_Rgn, reg_ptr, height, width, base_x, base_y) \
- for (Kernel::SizeT i = base_x; i < (width + base_x); ++i) \
+ for (Kernel::SizeT i = base_x; i < (width + base_x); ++i) \
{ \
- for (Kernel::SizeT u = base_y; u < (height + base_y); ++u) \
+ for (Kernel::SizeT u = base_y; u < (height + base_y); ++u) \
{ \
- *(((Kernel::UInt32*)(_Rgn + \
- 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
- i + \
- 4 * u))) = (reg_ptr)[kCGCursor]; \
+ *(((Kernel::UInt32*)(_Rgn + \
+ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
+ i + \
+ 4 * u))) = (reg_ptr)[kCGCursor]; \
\
++kCGCursor; \
} \
}
/// @brief Cleans a resource.
-#define CGClearRegion(height, width, base_x, base_y) \
+#define FBClearRegion(height, width, base_x, base_y) \
for (Kernel::SizeT i = base_x; i < (width + base_x); ++i) \
- { \
+ { \
for (Kernel::SizeT u = base_y; u < (height + base_y); ++u) \
- { \
+ { \
*(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \
- 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
- i + \
- 4 * u))) = fb_get_clear_clr(); \
- } \
+ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
+ i + \
+ 4 * u))) = fb_get_clear_clr(); \
+ } \
}
/// @brief Draws inside a zone.
-#define FBDrawInRegion(_Clr, height, width, base_x, base_y) \
+#define FBDrawInRegion(clr, height, width, base_x, base_y) \
for (Kernel::SizeT x_base = base_x; x_base < (width + base_x); ++x_base) \
- { \
+ { \
for (Kernel::SizeT y_base = base_y; y_base < (height + base_y); ++y_base) \
- { \
+ { \
*(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \
- 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
- x_base + \
- 4 * y_base))) = _Clr; \
- } \
+ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
+ x_base + \
+ 4 * y_base))) = clr; \
+ } \
}
/// @brief Draws inside a zone.
-#define FBDrawInRegionToRgn(_Rgn, _Clr, height, width, base_x, base_y) \
+#define FBDrawInRegionToRgn(_Rgn, clr, height, width, base_x, base_y) \
for (Kernel::SizeT x_base = base_x; x_base < (width + base_x); ++x_base) \
- { \
+ { \
for (Kernel::SizeT y_base = base_y; y_base < (height + base_y); ++y_base) \
- { \
+ { \
*(((volatile Kernel::UInt32*)(_Rgn + \
- 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
- x_base + \
- 4 * y_base))) = _Clr[kCGCursor]; \
- ++kCGCursor; \
- } \
+ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
+ x_base + \
+ 4 * y_base))) = clr[kCGCursor]; \
+ ++kCGCursor; \
+ } \
}
-#define FBDrawInRegionA(_Clr, height, width, base_x, base_y) \
+#define FBDrawInRegionA(clr, height, width, base_x, base_y) \
for (Kernel::SizeT x_base = base_x; x_base < (width + base_x); ++x_base) \
- { \
+ { \
for (Kernel::SizeT y_base = base_y; y_base < (height + base_y); ++y_base) \
- { \
+ { \
*(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \
- 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
- x_base + \
- 4 * y_base))) |= _Clr; \
- } \
+ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \
+ x_base + \
+ 4 * y_base))) |= clr; \
+ } \
}
#else
#define FBDrawBitMapInRegionA(reg_ptr, height, width, base_x, base_y)
#define FBDrawBitMapInRegion(reg_ptr, height, width, base_x, base_y)
#define FBDrawBitMapInRegionToRgn(_Rgn, reg_ptr, height, width, base_x, base_y)
-#define CGClearRegion(height, width, base_x, base_y)
-#define FBDrawInRegion(_Clr, height, width, base_x, base_y)
-#define FBDrawInRegionToRgn(_Rgn, _Clr, height, width, base_x, base_y)
-#define FBDrawInRegionA(_Clr, height, width, base_x, base_y)
+#define FBClearRegion(height, width, base_x, base_y)
+#define FBDrawInRegion(clr, height, width, base_x, base_y)
+#define FBDrawInRegionToRgn(_Rgn, clr, height, width, base_x, base_y)
+#define FBDrawInRegionA(clr, height, width, base_x, base_y)
#define FBDrawBitMapInRegionA(reg_ptr, height, width, base_x, base_y)
#define FBDrawBitMapInRegion(reg_ptr, height, width, base_x, base_y)
#define FBDrawBitMapInRegionToRgn(_Rgn, reg_ptr, height, width, base_x, base_y)
-#define CGClearRegion(height, width, base_x, base_y)
-#define FBDrawInRegion(_Clr, height, width, base_x, base_y)
-#define FBDrawInRegionToRgn(_Rgn, _Clr, height, width, base_x, base_y)
-#define FBDrawInRegionA(_Clr, height, width, base_x, base_y)
+#define FBClearRegion(height, width, base_x, base_y)
+#define FBDrawInRegion(clr, height, width, base_x, base_y)
+#define FBDrawInRegionToRgn(_Rgn, clr, height, width, base_x, base_y)
+#define FBDrawInRegionA(clr, height, width, base_x, base_y)
#endif // __NE_AMD64__
#ifndef GFX_MGR_ACCESSIBILITY_H
@@ -141,7 +141,7 @@ namespace FB
{
fb_init();
- FBDrawInRegion(fb_get_clear_clr(), FB::UIAccessibilty::Height(), FB::UIAccessibilty::Width(),
+ FBDrawInRegion(fb_get_clear_clr(), FB::FBAccessibilty::Height(), FB::FBAccessibilty::Width(),
0, 0);
fb_clear();