Window server bugfixes, reduce overhead, fix blitting error; begin tree view & text area implementation

Author: maxdev1

applications/applications.sh

@@ -25,7 +25,7 @@ with SRC        "src"
 with OBJ        "obj"
 with LDFLAGS    ""
 with CFLAGS_ADD ""
-with CFLAGS     "-std=c++11 -I$SRC $CFLAGS_ADD"
+with CFLAGS     "-std=c++17 -I$SRC $CFLAGS_ADD"
 
 with ARTIFACT_LOCAL "$OBJ/$ARTIFACT_NAME"
 with ARTIFACT_LOCAL_STATIC "$OBJ/$ARTIFACT_NAME_STATIC"

applications/libraries.sh

@@ -32,7 +32,7 @@ with ARTIFACT_LOCAL_SHARED "$ARTIFACT_NAME_SHARED"
 with ARTIFACT_TARGET_SHARED "$SYSROOT_SYSTEM_LIB/$ARTIFACT_NAME_SHARED"
 
 with CFLAGS_ADD ""
-with CFLAGS "-std=c++11 -I$INC $CFLAGS_ADD"
+with CFLAGS "-std=c++17 -I$INC $CFLAGS_ADD"
 with LDFLAGS "-shared"
 
 # Targets

applications/libwindow/inc/libwindow/button.hpp

@@ -25,6 +25,10 @@
 #include "component.hpp"
 #include "titled_component.hpp"
 
+typedef uint8_t g_button_style;
+#define G_BUTTON_STYLE_DEFAULT  0
+#define G_BUTTON_STYLE_GHOST    1
+
 class g_button : virtual public g_component, virtual public g_titled_component, virtual public g_action_component
 {
 public:
@@ -36,6 +40,9 @@ class g_button : virtual public g_component, virtual public g_titled_component,
 
     void setEnabled(bool enabled);
     bool isEnabled();
+
+    void setStyle(g_button_style style);
+    g_button_style getStyle();
 };
 
 #endif

applications/libwindow/inc/libwindow/interface.hpp

@@ -38,7 +38,6 @@
  */
 #define G_UI_MAXIMUM_MESSAGE_SIZE 4096
 
-#define G_UI_STRING_PROPERTY_MAXIMUM 1024
 #define G_UI_COMPONENT_TITLE_MAXIMUM 1024
 
 /**
@@ -63,8 +62,7 @@ typedef uint8_t g_ui_protocol_command_id;
 #define G_UI_PROTOCOL_INITIALIZATION			((g_ui_protocol_command_id) 1)
 #define G_UI_PROTOCOL_CREATE_COMPONENT			((g_ui_protocol_command_id) 2)
 #define G_UI_PROTOCOL_ADD_COMPONENT				((g_ui_protocol_command_id) 3)
-#define G_UI_PROTOCOL_SET_TITLE					((g_ui_protocol_command_id) 4)
-#define G_UI_PROTOCOL_GET_TITLE					((g_ui_protocol_command_id) 5)
+
 #define G_UI_PROTOCOL_SET_BOUNDS				((g_ui_protocol_command_id) 6)
 #define G_UI_PROTOCOL_FOCUS        				((g_ui_protocol_command_id) 7)
 #define G_UI_PROTOCOL_ADD_LISTENER				((g_ui_protocol_command_id) 8)
@@ -268,38 +266,6 @@ typedef struct
     g_rectangle bounds;
 } __attribute__((packed)) g_ui_component_get_bounds_response;
 
-/**
- * Request/response for setting the title on a titled component
- */
-typedef struct
-{
-    g_ui_message_header header;
-    g_ui_component_id id;
-    char title[G_UI_COMPONENT_TITLE_MAXIMUM];
-} __attribute__((packed)) g_ui_component_set_title_request;
-
-typedef struct
-{
-    g_ui_message_header header;
-    g_ui_protocol_status status;
-} __attribute__((packed)) g_ui_component_set_title_response;
-
-/**
- * Request/response for getting the title on a titled component
- */
-typedef struct
-{
-    g_ui_message_header header;
-    g_ui_component_id id;
-} __attribute__((packed)) g_ui_component_get_title_request;
-
-typedef struct
-{
-    g_ui_message_header header;
-    g_ui_protocol_status status;
-    char title[G_UI_COMPONENT_TITLE_MAXIMUM];
-} __attribute__((packed)) g_ui_component_get_title_response;
-
 /**
  * Request/response for getting a numeric property
  */
@@ -342,7 +308,7 @@ typedef struct
     g_ui_message_header header;
     g_ui_component_id id;
     int property;
-    char value[G_UI_STRING_PROPERTY_MAXIMUM];
+    char value[];
 } __attribute__((packed)) g_ui_component_set_string_property_request;
 
 /**
@@ -359,7 +325,7 @@ typedef struct
 {
     g_ui_message_header header;
     g_ui_protocol_status status;
-    char value[G_UI_STRING_PROPERTY_MAXIMUM];
+    char value[];
 } __attribute__((packed)) g_ui_component_get_string_property_response;
 
 /**

applications/libwindow/inc/libwindow/properties.hpp

@@ -40,5 +40,7 @@
 #define G_UI_PROPERTY_DISPATCHES_FOCUS  12
 #define G_UI_PROPERTY_FLEX_GAP          13
 #define G_UI_PROPERTY_IMAGE_SOURCE      14
+#define G_UI_PROPERTY_STYLE             15
+#define G_UI_PROPERTY_TITLE             16
 
 #endif

applications/libwindow/src/button.cpp

@@ -38,3 +38,17 @@ bool g_button::isEnabled()
 	getNumericProperty(G_UI_PROPERTY_ENABLED, &value);
 	return value;
 }
+
+void g_button::setStyle(g_button_style style)
+{
+	setNumericProperty(G_UI_PROPERTY_STYLE, style);
+}
+
+g_button_style g_button::getStyle()
+{
+	uint32_t value;
+	getNumericProperty(G_UI_PROPERTY_STYLE, &value);
+	return value;
+}
+
+

applications/libwindow/src/component.cpp

@@ -23,6 +23,7 @@
 
 #include <utility>
 #include <cstring>
+#include <malloc.h>
 
 g_component::~g_component()
 {
@@ -201,21 +202,24 @@ bool g_component::setStringProperty(int property, std::string value)
 
 	g_message_transaction tx = g_get_message_tx_id();
 
-	auto request = new g_ui_component_set_string_property_request();
+	auto requestSize = sizeof(g_ui_component_set_string_property_request) + value.length() + 1;
+	auto request = static_cast<g_ui_component_set_string_property_request*>(
+		operator new(sizeof(g_ui_component_set_string_property_request) + value.length() + 1)
+	);
 	request->header.id = G_UI_PROTOCOL_SET_STRING_PROPERTY;
 	request->id = this->id;
 	request->property = property;
-	strncpy(request->value, value.c_str(), G_UI_STRING_PROPERTY_MAXIMUM - 1);
+	strcpy(request->value, value.c_str());
 
-	g_send_message_t(g_ui_delegate_tid, request, sizeof(g_ui_component_set_string_property_request), tx);
+	g_send_message_t(g_ui_delegate_tid, request, requestSize, tx);
 	g_yield_t(g_ui_delegate_tid);
 
-	size_t bufferSize = sizeof(g_message_header) + sizeof(g_ui_simple_response);
-	uint8_t buffer[bufferSize];
+	size_t responseBufferSize = sizeof(g_message_header) + sizeof(g_ui_simple_response);
+	uint8_t responseBuffer[responseBufferSize];
 	bool success = false;
-	if(g_receive_message_t(buffer, bufferSize, tx) == G_MESSAGE_RECEIVE_STATUS_SUCCESSFUL)
+	if(g_receive_message_t(responseBuffer, responseBufferSize, tx) == G_MESSAGE_RECEIVE_STATUS_SUCCESSFUL)
 	{
-		auto response = (g_ui_simple_response*) G_MESSAGE_CONTENT(buffer);
+		auto response = (g_ui_simple_response*) G_MESSAGE_CONTENT(responseBuffer);
 		success = (response->status == G_UI_PROTOCOL_SUCCESS);
 	}
 
@@ -237,20 +241,26 @@ bool g_component::getStringProperty(int property, std::string& out)
 	g_send_message_t(g_ui_delegate_tid, &request, sizeof(g_ui_component_get_string_property_request), tx);
 	g_yield_t(g_ui_delegate_tid);
 
-	size_t bufferSize = sizeof(g_message_header) + sizeof(g_ui_component_get_string_property_response);
-	auto buffer = new uint8_t[bufferSize];
 	bool success = false;
-	if(g_receive_message_t(buffer, bufferSize, tx) == G_MESSAGE_RECEIVE_STATUS_SUCCESSFUL)
+	for(int size = 128; size <= 1024; size *= 2)
 	{
-		auto response = (g_ui_component_get_string_property_response*) G_MESSAGE_CONTENT(buffer);
-		if(response->status == G_UI_PROTOCOL_SUCCESS)
+		size_t bufferSize = sizeof(g_message_header) + sizeof(g_ui_component_get_string_property_response) + size;
+		auto buffer = new uint8_t[bufferSize];
+		auto receiveStatus = g_receive_message_t(buffer, bufferSize, tx);
+		if(receiveStatus == G_MESSAGE_RECEIVE_STATUS_SUCCESSFUL)
 		{
-			success = true;
-			out = std::string(response->value);
+			auto response = (g_ui_component_get_string_property_response*) G_MESSAGE_CONTENT(buffer);
+			if(response->status == G_UI_PROTOCOL_SUCCESS)
+			{
+				success = true;
+				out = std::string(response->value);
+			}
 		}
-	}
+		delete buffer;
 
-	delete buffer;
+		if(success || receiveStatus != G_MESSAGE_RECEIVE_STATUS_EXCEEDS_BUFFER_SIZE)
+			break;
+	}
 	return success;
 }
 

applications/libwindow/src/titled_component.cpp

@@ -18,87 +18,22 @@
  *                                                                           *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <cstring>
 #include <utility>
 
 #include "libwindow/titled_component.hpp"
-#include "libwindow/ui.hpp"
 #include "libwindow/listener/title_listener.hpp"
+#include "libwindow/properties.hpp"
 
 bool g_titled_component::setTitle(std::string title)
 {
-	if(!g_ui_initialized)
-		return false;
-
-	// send initialization request
-	g_message_transaction tx = g_get_message_tx_id();
-
-	auto request = new g_ui_component_set_title_request();
-	request->header.id = G_UI_PROTOCOL_SET_TITLE;
-	request->id = this->id;
-
-	// fill text (truncate if necessary)
-	const char* title_str = title.c_str();
-	size_t title_len;
-	if(title.length() >= G_UI_COMPONENT_TITLE_MAXIMUM)
-	{
-		title_len = G_UI_COMPONENT_TITLE_MAXIMUM;
-	}
-	else
-	{
-		title_len = title.length();
-	}
-	memcpy(request->title, title.c_str(), title_len);
-	request->title[title_len] = 0;
-
-	g_send_message_t(g_ui_delegate_tid, request, sizeof(g_ui_component_set_title_request), tx);
-	g_yield_t(g_ui_delegate_tid);
-
-	// read response
-	size_t bufferSize = sizeof(g_message_header) + sizeof(g_ui_component_set_title_response);
-	uint8_t buffer[bufferSize];
-
-	bool success = false;
-	if(g_receive_message_t(buffer, bufferSize, tx) == G_MESSAGE_RECEIVE_STATUS_SUCCESSFUL)
-	{
-		auto response = (g_ui_component_set_title_response*) G_MESSAGE_CONTENT(buffer);
-		success = (response->status == G_UI_PROTOCOL_SUCCESS);
-	}
-
-	delete request;
-	return success;
+	return setStringProperty(G_UI_PROPERTY_TITLE, title);
 }
 
 std::string g_titled_component::getTitle()
 {
-	if(!g_ui_initialized)
-		return "";
-
-	// send initialization request
-	g_message_transaction tx = g_get_message_tx_id();
-
-	g_ui_component_get_title_request request;
-	request.header.id = G_UI_PROTOCOL_GET_TITLE;
-	request.id = this->id;
-	g_send_message_t(g_ui_delegate_tid, &request, sizeof(g_ui_component_get_title_request), tx);
-	g_yield_t(g_ui_delegate_tid);
-
-	// read response
-	size_t bufferSize = sizeof(g_message_header) + sizeof(g_ui_component_get_title_response);
-	auto buffer = new uint8_t[bufferSize];
-
-	std::string title = "";
-	if(g_receive_message_t(buffer, bufferSize, tx) == G_MESSAGE_RECEIVE_STATUS_SUCCESSFUL)
-	{
-		auto response = (g_ui_component_get_title_response*) G_MESSAGE_CONTENT(buffer);
-		if(response->status == G_UI_PROTOCOL_SUCCESS)
-		{
-			title = std::string(response->title);
-		}
-	}
-
-	delete buffer;
-	return title;
+	std::string out;
+	getStringProperty(G_UI_PROPERTY_TITLE, out);
+	return out;
 }
 
 void g_titled_component::addTitleListener(std::function<void(std::string)> func)

applications/navigator/src/navigator.cpp

@@ -76,6 +76,7 @@ int main()
 	navBar->setFlexGap(10);
 	{
 		navPrev = g_button::create();
+		navPrev->setStyle(G_BUTTON_STYLE_GHOST);
 		navPrev->setTitle("<");
 		navBar->addChild(navPrev);
 		navBar->setFlexComponentInfo(navPrev, 0, 1, 50);
@@ -90,6 +91,7 @@ int main()
 		});
 
 		navNext = g_button::create();
+		navNext->setStyle(G_BUTTON_STYLE_GHOST);
 		navNext->setTitle(">");
 		navBar->addChild(navNext);
 		navBar->setFlexComponentInfo(navNext, 0, 1, 50);
@@ -119,6 +121,7 @@ int main()
 
 		navUp = g_button::create();
 		navUp->setTitle("^");
+		navUp->setStyle(G_BUTTON_STYLE_GHOST);
 		navBar->addChild(navUp);
 		navBar->setFlexComponentInfo(navUp, 0, 1, 50);
 

applications/windowserver/build.sh

@@ -8,7 +8,7 @@ fi
 # Build configuration
 ARTIFACT_NAME="windowserver.bin"
 CFLAGS_ADD="-I$SYSROOT_SYSTEM_INCLUDE/freetype2 -msse2"
-LDFLAGS="-linput -lvideo -lps2driver -lproperties -lwindow -lfont -lcairo -lfreetype -lpixman-1 -lpng -lz"
+LDFLAGS="-ljson -linput -lvideo -lps2driver -lproperties -lwindow -lfont -lcairo -lfreetype -lpixman-1 -lpng -lz"
 
 # Include application build tasks
 . "../applications.sh"