Canvas implementation, started writing a desktop

Author: maxdev1

CHANGELOG

@@ -24,3 +24,4 @@ This changelog is used to keep track of the major system changes for each versio
 0.5.3
 - removed old messaging interface
 - added handling of close syscall to fs delegates
+- fixed a bug for large shared memory mappings that would cause stack overflow

applications/login-screen/.cproject

@@ -5,16 +5,16 @@
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.cross.exe.release.1792932368" moduleId="org.eclipse.cdt.core.settings" name="build">
 				<externalSettings/>
 				<extensions>
-					<extension id="org.eclipse.cdt.core.Cygwin_PE" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.Cygwin_PE" point="org.eclipse.cdt.core.BinaryParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="bin" artifactName="idle" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" description="" id="cdt.managedbuild.config.gnu.cross.exe.release.1792932368" name="build" parent="cdt.managedbuild.config.gnu.cross.exe.release">
+				<configuration artifactExtension="bin" artifactName="idle" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" description="" id="cdt.managedbuild.config.gnu.cross.exe.release.1792932368" name="build" parent="cdt.managedbuild.config.gnu.cross.exe.release">
 					<folderInfo id="cdt.managedbuild.config.gnu.cross.exe.release.1792932368." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.cygwin.base.620111594" name="Cygwin GCC" superClass="cdt.managedbuild.toolchain.gnu.cygwin.base">
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.Cygwin_PE" id="cdt.managedbuild.target.gnu.platform.cygwin.base.1442479920" name="Debug Platform" osList="win32" superClass="cdt.managedbuild.target.gnu.platform.cygwin.base"/>

applications/login-screen/build.sh

@@ -6,7 +6,7 @@ SRC=src
 OBJ=obj
 ARTIFACT_NAME=login-screen.bin
 CFLAGS="-std=c++11 -I$SRC"
-LDFLAGS=""
+LDFLAGS="-lcairo -lfreetype -lpixman-1 -lpng -lz"
 
 # Include application build tasks
 . ../applications.sh

applications/login-screen/src/login-screen.cpp

@@ -23,6 +23,7 @@
 #include <ghostuser/ui/ui.hpp>
 #include <ghostuser/ui/window.hpp>
 #include <ghostuser/ui/label.hpp>
+#include <ghostuser/ui/canvas.hpp>
 #include <ghostuser/ui/button.hpp>
 #include <ghostuser/ui/textfield.hpp>
 #include <ghostuser/ui/action_listener.hpp>
@@ -49,9 +50,7 @@ class test_layouting_bounds_listener_t: public g_bounds_listener {
 	/**
 	 *
 	 */
-	virtual void handle_bounds_changed() {
-		g_rectangle b = window->getBounds();
-
+	virtual void handle_bounds_changed(g_rectangle b) {
 		b.x = 10;
 		b.y = b.height - 80;
 		b.height = 40;
@@ -89,7 +88,7 @@ class login_button_action_listener_t: public g_action_listener {
 
 			test_layouting_bounds_listener_t* layouter = new test_layouting_bounds_listener_t(dialog, button);
 			dialog->setBoundsListener(layouter);
-			layouter->handle_bounds_changed();
+			layouter->handle_bounds_changed(dialog->getBounds());
 
 		} else {
 			g_label* label = g_label::create();
@@ -144,14 +143,98 @@ int main(int argc, char** argv) {
 		loginButton->setBounds(g_rectangle(10, 120, 200, 30));
 		loginButton->setTitle("Login");
 
+		g_canvas* canvas = g_canvas::create();
+		loginWindow->addChild(canvas);
+		canvas->setBounds(g_rectangle(10, 160, 200, 30));
+
 		loginButton->setActionListener(new login_button_action_listener_t());
 
-		g_rectangle login_window_bounds(800 / 2 - 100, 600 / 2 - 100, 220, 190);
+		g_rectangle login_window_bounds(800 / 2 - 100, 600 / 2 - 100, 220, 250);
 		loginWindow->setBounds(login_window_bounds);
 
 		loginWindow->setResizable(false);
 		loginWindow->setVisible(true);
 
+		// canvas test
+		auto bufferInfo = canvas->getBuffer();
+		klog("buffer: %x, size: %ix%i", bufferInfo.buffer, bufferInfo.width, bufferInfo.height);
+
+		int x = 0;
+		double rainbowR = 0;
+		double rainbowG = 0.5;
+		double rainbowB = 1;
+
+		bool dir = true;
+		while (true) {
+
+			double fact = 0.05;
+			if ((rainbowR == 1) && (rainbowG < 1) && (rainbowB == 0)) {
+				rainbowG += fact;
+			}
+			if ((rainbowG == 1) && (rainbowR > 0) && (rainbowB == 0)) {
+				rainbowR -= fact;
+			}
+			if ((rainbowG == 1) && (rainbowB < 1) && (rainbowR == 0)) {
+				rainbowB += fact;
+			}
+			if ((rainbowB == 1) && (rainbowG > 0) && (rainbowR == 0)) {
+				rainbowG -= fact;
+			}
+			if ((rainbowB == 1) && (rainbowR < 1) && (rainbowG == 0)) {
+				rainbowR += fact;
+			}
+			if ((rainbowR == 1) && (rainbowB > 0) && (rainbowG == 0)) {
+				rainbowB -= fact;
+			}
+			if (rainbowR > 1) {
+				rainbowR = 1;
+			} else if (rainbowR < 0) {
+				rainbowR = 0;
+			}
+			if (rainbowG > 1) {
+				rainbowG = 1;
+			} else if (rainbowG < 0) {
+				rainbowG = 0;
+			}
+			if (rainbowB > 1) {
+				rainbowB = 1;
+			} else if (rainbowB < 0) {
+				rainbowB = 0;
+			}
+
+			if (dir) {
+				++x;
+			} else {
+				--x;
+			}
+
+			if (dir && x > 200 - 10) {
+				dir = false;
+
+			} else if (!dir && x < 10) {
+				dir = true;
+			}
+
+			cairo_surface_t* bufferSurface = cairo_image_surface_create_for_data((uint8_t*) bufferInfo.buffer, CAIRO_FORMAT_ARGB32, bufferInfo.width,
+					bufferInfo.height, cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, bufferInfo.width));
+			auto cr = cairo_create(bufferSurface);
+
+			cairo_save(cr);
+			cairo_set_source_rgba(cr, 0, 0, 0, 0);
+			cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
+			cairo_paint(cr);
+			cairo_restore(cr);
+
+			cairo_set_source_rgb(cr, rainbowR, rainbowG, rainbowB);
+			cairo_rectangle(cr, x, 0, 10, 100);
+			cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
+			cairo_fill(cr);
+
+			canvas->blit(g_rectangle(0, 0, bufferInfo.width, bufferInfo.height));
+
+			g_sleep(10);
+		}
+
 		uint8_t blocker = true;
 		g_atomic_block(&blocker);
 	}

applications/ps2driver/src/ps2_driver.cpp

@@ -83,7 +83,7 @@ int main() {
 
 	// wait for control requests
 	size_t buflen = sizeof(g_message_header) + sizeof(g_ps2_register_request);
-	uint8_t buf[buflen];
+	uint8_t* buf = new uint8_t[buflen];
 	g_tid tid = g_get_tid();
 	while (true) {
 		g_message_receive_status stat = g_receive_message(buf, buflen);

applications/vbedriver/.cproject

@@ -5,12 +5,12 @@
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.cross.exe.release.1792932368" moduleId="org.eclipse.cdt.core.settings" name="build">
 				<externalSettings/>
 				<extensions>
-					<extension id="org.eclipse.cdt.core.Cygwin_PE" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.Cygwin_PE" point="org.eclipse.cdt.core.BinaryParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">

applications/windowserver/src/components/component.hpp

@@ -76,13 +76,15 @@ class component_t: public bounds_event_component_t {
 	bool visible;
 
 public:
+	g_ui_component_id id;
+
 	/**
 	 * Creates the component; initially marks it as dirty
 	 * and sets no parent
 	 */
 	component_t(bool transparentBackground = false) :
-			graphics(transparentBackground), visible(true), requirements(COMPONENT_REQUIREMENT_ALL), childRequirements(COMPONENT_REQUIREMENT_ALL), parent(0), layoutManager(
-					0), bounds_event_component_t(this) {
+			id(-1), graphics(transparentBackground), visible(true), requirements(COMPONENT_REQUIREMENT_ALL), childRequirements(COMPONENT_REQUIREMENT_ALL), parent(
+					0), layoutManager(0), bounds_event_component_t(this) {
 	}
 
 	/**

applications/windowserver/src/events/event_processor.cpp

@@ -20,15 +20,18 @@
 
 #include <components/cursor.hpp>
 #include <events/event_processor.hpp>
-#include <ghostuser/tasking/lock.hpp>
 #include <input/input_receiver.hpp>
 #include <interface/component_registry.hpp>
 
+#include <ghostuser/tasking/lock.hpp>
+#include <ghostuser/ui/interface_specification.hpp>
+
 #include <windowserver.hpp>
 #include <components/window.hpp>
 #include <components/button.hpp>
 #include <components/text/text_field.hpp>
 #include <components/label.hpp>
+#include <components/canvas.hpp>
 
 #include <events/event.hpp>
 #include <events/mouse_event.hpp>
@@ -83,7 +86,7 @@ void event_processor_t::process() {
 		buf_response.message = 0;
 
 		// process the actual action
-		process_command((g_ui_message_header*) G_MESSAGE_CONTENT(request_buffer), buf_response);
+		process_command(message->sender, (g_ui_message_header*) G_MESSAGE_CONTENT(request_buffer), buf_response);
 
 		// add generated response to queue
 		if (buf_response.message != 0) {
@@ -98,7 +101,7 @@ void event_processor_t::process() {
 /**
  *
  */
-void event_processor_t::process_command(g_ui_message_header* request_header, command_message_response_t& response_out) {
+void event_processor_t::process_command(g_tid sender_tid, g_ui_message_header* request_header, command_message_response_t& response_out) {
 
 	if (request_header->id == G_UI_PROTOCOL_CREATE_COMPONENT) {
 		component_t* component = 0;
@@ -112,16 +115,24 @@ void event_processor_t::process_command(g_ui_message_header* request_header, com
 			component = new window_t();
 			windowserver_t::instance()->screen->addChild(component);
 			break;
+
 		case G_UI_COMPONENT_TYPE_LABEL:
 			component = new label_t();
 			break;
+
 		case G_UI_COMPONENT_TYPE_BUTTON:
 			component = new button_t();
 			break;
+
 		case G_UI_COMPONENT_TYPE_TEXTFIELD:
 			component = new text_field_t();
 			break;
 
+		case G_UI_COMPONENT_TYPE_CANVAS: {
+			component = new canvas_t(sender_tid);
+			break;
+		}
+
 		default:
 			klog("don't know how to create a component of type %i", create_request->type);
 			break;
@@ -130,6 +141,7 @@ void event_processor_t::process_command(g_ui_message_header* request_header, com
 		// register the component
 		if (component != 0) {
 			component_id = component_registry_t::add(component);
+
 			// apply default properties
 			component->setBounds(g_rectangle(100, 100, 200, 80));
 		}
@@ -319,6 +331,39 @@ void event_processor_t::process_command(g_ui_message_header* request_header, com
 		response_out.message = response;
 		response_out.length = sizeof(g_ui_component_get_title_response);
 
+	} else if (request_header->id == G_UI_PROTOCOL_CANVAS_ACK_BUFFER_REQUEST) {
+		g_ui_component_canvas_ack_buffer_request* request = (g_ui_component_canvas_ack_buffer_request*) request_header;
+		component_t* component = component_registry_t::get(request->id);
+
+		canvas_t* canvas = (canvas_t*) component;
+		canvas->acknowledgeCurrentBuffer();
+
+	} else if (request_header->id == G_UI_PROTOCOL_CANVAS_BLIT) {
+		g_ui_component_canvas_ack_buffer_request* request = (g_ui_component_canvas_ack_buffer_request*) request_header;
+		component_t* component = component_registry_t::get(request->id);
+
+		canvas_t* canvas = (canvas_t*) component;
+		canvas->blit();
+
+	} else if (request_header->id == G_UI_PROTOCOL_REGISTER_DESKTOP_CANVAS) {
+		g_ui_register_desktop_canvas_request* request = (g_ui_register_desktop_canvas_request*) request_header;
+		component_t* component = component_registry_t::get(request->canvas_id);
+
+		// create response message
+		g_ui_register_desktop_canvas_response* response = new g_ui_register_desktop_canvas_response;
+		if (component == 0) {
+			response->status = G_UI_PROTOCOL_FAIL;
+		} else {
+			response->status = G_UI_PROTOCOL_SUCCESS;
+
+			canvas_t* canvas = (canvas_t*) component;
+			screen_t* screen = windowserver_t::instance()->screen;
+			screen->addChild(canvas);
+			canvas->setBounds(screen->getBounds());
+		}
+
+		response_out.message = response;
+		response_out.length = sizeof(g_ui_register_desktop_canvas_response);
 	}
 
 }

applications/windowserver/src/events/event_processor.hpp

@@ -46,7 +46,7 @@ class event_processor_t {
 	void bufferCommandMessage(void* commandMessage);
 
 	void process();
-	void process_command(g_ui_message_header* request_header, command_message_response_t& response_out);
+	void process_command(g_tid sender_tid, g_ui_message_header* request_header, command_message_response_t& response_out);
 
 	void translateKeyEvent(g_key_info& info);
 	void processMouseState();

applications/windowserver/src/interface/component_registry.cpp

@@ -30,6 +30,7 @@ static g_ui_component_id next_id = 1;
 g_ui_component_id component_registry_t::add(component_t* component) {
 	g_ui_component_id id = next_id++;
 	components[id] = component;
+	component->id = id;
 	return id;
 }