Update fenster & use new namespaces

Author: maxdev1

applications/calculator/src/calculator.cpp

@@ -24,56 +24,59 @@
 #include <libwindow/textfield.hpp>
 #include <libwindow/ui.hpp>
 #include <libwindow/window.hpp>
+#include <libwindow/metrics/rectangle.hpp>
 
 #include <algorithm>
 #include <sstream>
 
-g_window* window;
-g_textfield* display;
-g_button* but1;
-g_button* but2;
-g_button* but3;
-g_button* but4;
-g_button* but5;
-g_button* but6;
-g_button* but7;
-g_button* but8;
-g_button* but9;
-g_button* but0;
-g_button* butPlus;
-g_button* butMinus;
-g_button* butMult;
-g_button* butDiv;
-g_button* butEq;
-g_button* butClear;
+using namespace fenster;
+
+Window* window;
+TextField* display;
+Button* but1;
+Button* but2;
+Button* but3;
+Button* but4;
+Button* but5;
+Button* but6;
+Button* but7;
+Button* but8;
+Button* but9;
+Button* but0;
+Button* butPlus;
+Button* butMinus;
+Button* butMult;
+Button* butDiv;
+Button* butEq;
+Button* butClear;
 
 double totalValue = 0;
 double currentValue = 0;
 int previousCommand = COM_NONE;
 
 int main()
 {
-	g_ui_open_status open_stat = g_ui::open();
+	ApplicationOpenStatus open_stat = Application::open();
 
-	if(open_stat == G_UI_OPEN_STATUS_SUCCESSFUL)
+	if(open_stat == FENSTER_APPLICATION_STATUS_SUCCESSFUL)
 	{
-		window = g_window::create();
+		window = Window::create();
 		window->setTitle("Calculator");
 		window->setResizable(false);
 		window->onClose([]()
 		{
 			g_exit(0);
 		});
 
-		display = g_textfield::create();
+		display = TextField::create();
 		display->setTitle("0");
-		display->setBounds(g_rectangle(10, 10, 150, 30));
+		display->setBounds(Rectangle(10, 10, 150, 30));
 		window->addChild(display);
 
 #define PLACE_BUTTON_T(num, text, x, y)             \
-	but##num = g_button::create();                  \
+	but##num = Button::create();                  \
 	but##num->setTitle(text);                       \
-	but##num->setBounds(g_rectangle(x, y, 30, 30)); \
+	but##num->setBounds(Rectangle(x, y, 30, 30)); \
 	window->addChild(but##num);
 
 #define PLACE_BUTTON(num, x, y) PLACE_BUTTON_T(num, #num, x, y);
@@ -123,7 +126,7 @@ int main()
 		PLACE_BUTTON_T(Eq, "=", grid4, grid5 + dispOff);
 		butEq->setActionListener([]() { command_pressed(COM_EQ); });
 
-		window->setBounds(g_rectangle(70, 70, 190, 320));
+		window->setBounds(Rectangle(70, 70, 190, 320));
 		window->setVisible(true);
 
 		g_user_mutex lock = g_mutex_initialize();

applications/desktop/src/background.cpp

@@ -22,6 +22,8 @@
 #include <cairo/cairo.h>
 #include <stdlib.h>
 
+using namespace fenster;
+
 background_t* background_t::create()
 {
 	auto instance = createCanvasComponent<background_t>();
@@ -38,40 +40,40 @@ void background_t::init()
 		paint();
 	});
 
-	this->addMouseListener([this](g_ui_component_mouse_event* e)
+	this->addMouseListener([this](ComponentMouseEvent* e)
 	{
 		auto position = e->position;
-		if(e->type == G_MOUSE_EVENT_MOVE)
+		if(e->type == FENSTER_MOUSE_EVENT_MOVE)
 		{
 			onMouseMove(position);
 		}
-		else if(e->type == G_MOUSE_EVENT_PRESS && e->buttons & G_MOUSE_BUTTON_1)
+		else if(e->type == FENSTER_MOUSE_EVENT_PRESS && e->buttons & FENSTER_MOUSE_BUTTON_1)
 		{
 			onMouseLeftPress(position, e->clickCount);
 		}
-		else if(e->type == G_MOUSE_EVENT_DRAG && e->buttons & G_MOUSE_BUTTON_1)
+		else if(e->type == FENSTER_MOUSE_EVENT_DRAG && e->buttons & FENSTER_MOUSE_BUTTON_1)
 		{
 			onMouseDrag(position);
 		}
-		else if(e->type == G_MOUSE_EVENT_RELEASE)
+		else if(e->type == FENSTER_MOUSE_EVENT_RELEASE)
 		{
 			onMouseRelease(position);
 		}
-		else if(e->type == G_MOUSE_EVENT_LEAVE)
+		else if(e->type == FENSTER_MOUSE_EVENT_LEAVE)
 		{
 			onMouseRelease(position);
 		}
 	});
 
-	selection = g_selection::create();
+	selection = Selection::create();
 	selection->setBounds(this->getBounds());
 	selection->setVisible(false);
 	this->addChild(selection);
 
 	this->organize();
 }
 
-void background_t::onMouseMove(const g_point& position)
+void background_t::onMouseMove(const Point& position)
 {
 	for(auto item: items)
 	{
@@ -84,10 +86,10 @@ void background_t::onMouseMove(const g_point& position)
 	}
 }
 
-void background_t::onMouseLeftPress(const g_point& position, int clickCount)
+void background_t::onMouseLeftPress(const Point& position, int clickCount)
 {
 	item_t* pressedItem = nullptr;
-	std::vector<g_rectangle> itemsBounds;
+	std::vector<Rectangle> itemsBounds;
 	for(auto& item: items)
 	{
 		auto itemBounds = item->getBounds();
@@ -148,7 +150,7 @@ void background_t::onMouseLeftPress(const g_point& position, int clickCount)
 	}
 }
 
-void background_t::onMouseDrag(const g_point& position)
+void background_t::onMouseDrag(const Point& position)
 {
 	if(dragItems)
 	{
@@ -157,21 +159,21 @@ void background_t::onMouseDrag(const g_point& position)
 			if(item->selected)
 			{
 				auto point = position - item->dragOffset;
-				item->setBounds(g_rectangle(point.x, point.y, 100, 100));
+				item->setBounds(Rectangle(point.x, point.y, 100, 100));
 			}
 		}
 	}
 	else
 	{
-		g_rectangle bounds(selectionStart.x, selectionStart.y, position.x - selectionStart.x,
+		Rectangle bounds(selectionStart.x, selectionStart.y, position.x - selectionStart.x,
 		                   position.y - selectionStart.y);
 		auto boundsNorm = bounds.asNormalized();
 		selection->setBounds(boundsNorm);
 		selection->setVisible(true);
 
 		for(auto item: items)
 		{
-			g_rectangle rect = item->getBounds();
+			Rectangle rect = item->getBounds();
 			if(boundsNorm.intersects(rect))
 			{
 				auto wasSelected = item->selected;
@@ -190,7 +192,7 @@ void background_t::onMouseDrag(const g_point& position)
 	}
 }
 
-void background_t::onMouseRelease(const g_point& position)
+void background_t::onMouseRelease(const Point& position)
 {
 	if(dragItems)
 		dragItems = false;
@@ -240,7 +242,7 @@ void background_t::paint()
 	cairo_rectangle(cr, bgX, bgY, bounds.width, bounds.height);
 	cairo_fill(cr);
 
-	this->blit(g_rectangle(0, 0, bounds.width, bounds.height));
+	this->blit(Rectangle(0, 0, bounds.width, bounds.height));
 
 	this->releaseGraphics();
 }

applications/desktop/src/background.hpp

@@ -30,28 +30,30 @@
 #include <libwindow/selection.hpp>
 #include <vector>
 
-class background_t : virtual public g_canvas
+using namespace fenster;
+
+class background_t : virtual public Canvas
 {
 protected:
     void init();
 
     taskbar_t* taskbar;
     std::vector<item_t*> items;
-    void onMouseMove(const g_point& position);
+    void onMouseMove(const Point& position);
     bool dragItems;
-    g_point selectionStart;
-    g_selection* selection = nullptr;
+    Point selectionStart;
+    Selection* selection = nullptr;
     item_organizer_t* organizer = nullptr;
 
-    void onMouseLeftPress(const g_point& position, int clickCount);
-    void onMouseDrag(const g_point& position);
-    void onMouseRelease(const g_point& position);
+    void onMouseLeftPress(const Point& position, int clickCount);
+    void onMouseDrag(const Point& position);
+    void onMouseRelease(const Point& position);
 
 public:
-    explicit background_t(g_ui_component_id id):
-        g_component(id),
-        g_canvas(id), dragItems(false),
-        g_focusable_component(id)
+    explicit background_t(ComponentId id):
+        Component(id),
+        Canvas(id), dragItems(false),
+        FocusableComponent(id)
     {
     }
 

applications/desktop/src/desktop.cpp

@@ -23,30 +23,31 @@
 #include "taskbar.hpp"
 
 #include <fstream>
-#include <libproperties/parser.hpp>
+#include <libproperties/properties.hpp>
 
 #define USER_DESKTOP_DIR "/user/desktop/"
 
+using namespace fenster;
 background_t* background = nullptr;
 taskbar_t* taskbar = nullptr;
 
 int main()
 {
-	if(g_ui::open() != G_UI_OPEN_STATUS_SUCCESSFUL)
+	if(Application::open() != FENSTER_APPLICATION_STATUS_SUCCESSFUL)
 	{
 		klog("failed to create UI");
 		return -1;
 	}
 
 	background = background_t::create();
-	g_ui::registerDesktopCanvas(background);
+	Application::registerDesktopCanvas(background);
 
-	g_dimension screenDimension;
-	g_ui::getScreenDimension(screenDimension);
+	Dimension screenDimension;
+	Application::getScreenDimension(screenDimension);
 	taskbar = taskbar_t::create();
-	taskbar->setBounds(g_rectangle(0, screenDimension.height - 40, screenDimension.width, 40));
+	taskbar->setBounds(Rectangle(0, screenDimension.height - 40, screenDimension.width, 40));
 	background->addTaskbar(taskbar);
-	background->setDesktopListener([](g_ui_windows_event* event)
+	background->setDesktopListener([](WindowsEvent* event)
 	{
 		taskbar->handleDesktopEvent(event);
 	});
@@ -70,12 +71,12 @@ void desktopLoadItems()
 		std::string path = std::string(USER_DESKTOP_DIR) + entry->name;
 
 		std::ifstream cfg(path);
-		g_properties_parser parser(cfg);
+		properties::Properties parser(cfg);
 		auto properties = parser.getProperties();
 
 		auto item = item_t::create(properties["name"], properties["icon"], properties["application"]);
 		background->addItem(item);
-		item->setBounds(g_rectangle(0, next++ * 100, 100, 100));
+		item->setBounds(Rectangle(0, next++ * 100, 100, 100));
 	}
 	background->organize();
 }

applications/desktop/src/item.cpp

@@ -25,10 +25,12 @@
 #include <libwindow/color_argb.hpp>
 #include <helper.hpp>
 
+using namespace fenster;
+
 item_t::item_t(uint32_t id):
-	g_component(id),
-	g_canvas(id),
-	g_focusable_component(id)
+	Component(id),
+	Canvas(id),
+	FocusableComponent(id)
 {
 	this->setBufferListener([this]()
 	{
@@ -53,11 +55,11 @@ void item_t::init(std::string name, std::string icon, std::string application)
 		iconSurface = nullptr;
 	}
 
-	label = g_label::create();
+	label = Label::create();
 	label->setTitle(name.c_str());
-	label->setBounds(g_rectangle(0, 75, 100, 20));
+	label->setBounds(Rectangle(0, 75, 100, 20));
 	label->setColor(ARGB(255, 255, 255, 255));
-	label->setAlignment(g_text_alignment::CENTER);
+	label->setAlignment(TextAlignment::CENTER);
 	this->addChild(label);
 }
 
@@ -97,7 +99,7 @@ void item_t::paint()
 	}
 
 	this->releaseGraphics();
-	this->blit(g_rectangle(0, 0, bounds.width, bounds.height));
+	this->blit(Rectangle(0, 0, bounds.width, bounds.height));
 }
 
 void item_t::onDoubleClick()

applications/desktop/src/item.hpp

@@ -25,11 +25,13 @@
 #include <libwindow/label.hpp>
 #include <cairo/cairo.h>
 
-class item_t : virtual public g_canvas
+using namespace fenster;
+
+class item_t : virtual public Canvas
 {
 protected:
     cairo_surface_t* iconSurface = nullptr;
-    g_label* label = nullptr;
+    Label* label = nullptr;
     std::string application;
 
     void init(std::string name, std::string icon, std::string application);
@@ -39,7 +41,7 @@ class item_t : virtual public g_canvas
 
     bool hover = false;
     bool selected = false;
-    g_point dragOffset;
+    Point dragOffset;
 
     static item_t* create(std::string name, std::string icon, std::string application);
 

applications/desktop/src/item_organizer.cpp

@@ -21,9 +21,11 @@
 
 #include "item_organizer.hpp"
 
-void item_organizer_t::organize(const std::vector<item_t*>& items, const g_rectangle& backgroundBounds) const
+using namespace fenster;
+
+void item_organizer_t::organize(const std::vector<item_t*>& items, const Rectangle& backgroundBounds) const
 {
-	std::vector<g_rectangle> allBounds;
+	std::vector<Rectangle> allBounds;
 	for(auto& item: items)
 	{
 		auto bounds = item->getBounds();