Add debouncing to windowserver to avoid huge number of rerenders; Fix vertical label centering

Author: maxdev1

applications/windowserver/src/components/component.cpp

@@ -80,6 +80,12 @@ void component_t::setBoundsInternal(const g_rectangle& newBounds)
 	g_mutex_release(lock);
 }
 
+void component_t::recheckGraphics()
+{
+	if(hasGraphics())
+		graphics.resize(bounds.width, bounds.height);
+}
+
 g_rectangle component_t::getBounds() const
 {
 	g_mutex_acquire(lock);
@@ -451,7 +457,7 @@ void component_t::markFor(component_requirement_t req)
 	if(parent)
 		parent->markChildsFor(req);
 
-	windowserver_t::instance()->requestUpdate();
+	windowserver_t::instance()->requestUpdateLater();
 }
 
 void component_t::markChildsFor(component_requirement_t req)

applications/windowserver/src/components/component.hpp

@@ -348,6 +348,8 @@ class component_t : public bounding_component_t, public focusable_component_t
 
     void addListener(g_ui_component_event_type eventType, g_tid target_thread, g_ui_component_id id);
     bool callForListeners(g_ui_component_event_type eventType, const std::function<void(event_listener_info_t&)>& func);
+
+    void recheckGraphics();
 };
 
 #endif

applications/windowserver/src/components/label.cpp

@@ -25,6 +25,7 @@
 #include <cairo/cairo.h>
 #include <ghost.h>
 #include <sstream>
+#include <windowserver.hpp>
 
 label_t::label_t()
 {
@@ -42,16 +43,6 @@ void label_t::setFont(g_font* newFont)
 
 void label_t::update()
 {
-	g_rectangle thisBounds(0, 0, getBounds().width, getBounds().height);
-
-	// Check if the component was ever layouted, otherwise set to a high value
-	if(thisBounds.width == 0 && thisBounds.height == 0)
-	{
-		thisBounds.width = 9999;
-		thisBounds.height = 9999;
-	}
-
-	// get text bounds
 	auto cr = graphics.acquireContext();
 	if(!cr)
 		return;
@@ -81,34 +72,29 @@ void label_t::paint()
 {
 	clearSurface();
 
-	auto cr = graphics.acquireContext();
-	if(!cr)
-		return;
-
-	g_mutex_acquire(lock);
 	auto bounds = getBounds();
-	g_mutex_release(lock);
-
-	cairo_save(cr);
-	cairo_set_source_rgb(cr, ARGB_FR_FROM(color), ARGB_FB_FROM(color), ARGB_FG_FROM(color));
-
-	int textLeft;
-	int textBot = (bounds.height / 2 - fontExtents.height / 2) + fontExtents.height;
 
+	int textX;
+	int textY = bounds.height / 2 - fontExtents.height / 2 + fontExtents.ascent;
 	if(alignment == g_text_alignment::CENTER)
 	{
-		textLeft = bounds.width / 2 - textExtents.width / 2;
+		textX = bounds.width / 2 - textExtents.width / 2;
 	}
 	else if(alignment == g_text_alignment::RIGHT)
 	{
-		textLeft = bounds.width - textExtents.width;
+		textX = bounds.width - textExtents.width;
 	}
 	else
 	{
-		textLeft = 0;
+		textX = 0;
 	}
 
-	cairo_move_to(cr, textLeft, textBot);
+	auto cr = graphics.acquireContext();
+	if(!cr)
+		return;
+	cairo_save(cr);
+	cairo_set_source_rgb(cr, ARGB_FR_FROM(color), ARGB_FB_FROM(color), ARGB_FG_FROM(color));
+	cairo_move_to(cr, textX, textY);
 	cairo_set_font_face(cr, font->getFace());
 	cairo_set_font_size(cr, fontSize);
 	cairo_show_text(cr, text.c_str());

applications/windowserver/src/components/panel.cpp

@@ -42,6 +42,7 @@ void panel_t::setBackground(g_color_argb color)
 {
 	background = color;
 	markFor(COMPONENT_REQUIREMENT_PAINT);
+	recheckGraphics();
 }
 
 g_color_argb panel_t::getBackground()

applications/windowserver/src/input/input_receiver.cpp

@@ -54,7 +54,7 @@ void input_receiver_t::startReceiveKeyEvents()
 
 		event_queue->bufferKeyEvent(key);
 
-		windowserver_t::instance()->requestUpdate();
+		windowserver_t::instance()->requestUpdateImmediately();
 	}
 }
 
@@ -103,6 +103,6 @@ void input_receiver_t::startReceiveMouseEvents()
 			cursor_t::nextPressedButtons |= G_MOUSE_BUTTON_3;
 		}
 
-		windowserver_t::instance()->requestUpdate();
+		windowserver_t::instance()->requestUpdateImmediately();
 	}
 }

applications/windowserver/src/interface/interface_receiver.cpp

@@ -560,7 +560,7 @@ void interfaceReceiverProcessCommand(g_message_header* requestMessage)
 		responseLength = sizeof(g_ui_simple_response);
 	}
 
-	windowserver_t::instance()->requestUpdate();
+	windowserver_t::instance()->requestUpdateLater();
 
 	if(responseMessage)
 	{

applications/windowserver/src/windowserver.cpp

@@ -72,16 +72,21 @@ void windowserver_t::startInputHandlers()
 	}
 
 	server->loadCursor();
-	server->requestUpdate();
+	server->requestUpdateLater();
 }
 
-void startOtherTasks()
+void windowserver_t::startOtherTasks()
 {
 	g_task_register_id("windowserver/launcher");
 	// TODO not the windowservers job
 	g_spawn("/applications/desktop.bin", "", "", G_SECURITY_LEVEL_APPLICATION);
 }
 
+void windowserver_t::startLazyUpdateLoop()
+{
+	windowserver_t::instance()->updateDebounceLoop();
+}
+
 void windowserver_t::launch()
 {
 	g_task_register_id("windowserver");
@@ -98,10 +103,10 @@ void windowserver_t::launch()
 
 	g_create_task((void*) &interfaceRegistrationThread);
 	g_create_task((void*) &startOtherTasks);
+	g_create_task((void*) &startLazyUpdateLoop);
 
-	updateTask = g_create_task_d((void*) startUpdateLoop, this);
 	renderTask = g_get_tid();
-	renderLoop(screenBounds);
+	updateLoop(screenBounds);
 }
 
 void windowserver_t::createVitalComponents(g_rectangle screenBounds)
@@ -146,70 +151,62 @@ void windowserver_t::initializeVideo()
 	}
 }
 
-void windowserver_t::startUpdateLoop(windowserver_t* self)
-{
-	self->updateLoop();
-}
-
-void windowserver_t::updateLoop()
+void windowserver_t::updateLoop(const g_rectangle& screenBounds) const
 {
 	g_task_register_id("windowserver/updater");
 
-	int timesUpdated = 0;
+	graphics_t global;
+	global.resize(screenBounds.width, screenBounds.height, false);
+
+	cursor_t::nextPosition = g_point(screenBounds.width / 2, screenBounds.height / 2);
 
+	uint64_t lastUpdate = 0;
 	g_mutex_acquire(updateLock);
 	while(true)
 	{
-		++timesUpdated;
 		eventProcessor->process();
 
 		screen->resolveRequirement(COMPONENT_REQUIREMENT_UPDATE, 0);
 		screen->resolveRequirement(COMPONENT_REQUIREMENT_LAYOUT, 0);
 		screen->resolveRequirement(COMPONENT_REQUIREMENT_PAINT, 0);
 
-		requestRender();
+		screen->blit(&global, screenBounds, g_point(0, 0));
+		cursor_t::paint(&global);
+
+		output(&global);
 
+		framesTotal++;
 		if(!g_mutex_acquire_to(updateLock, 1000))
-		{
-			klog("Times updated: %i", timesUpdated);
-		}
+			klog("Times updated: %i", framesTotal);
+
+		auto now = g_millis();
+		if(now - lastUpdate < 10)
+			g_sleep(5);
+		lastUpdate = now;
 	}
 }
 
-void windowserver_t::requestUpdate() const
+void windowserver_t::requestUpdateImmediately() const
 {
 	g_mutex_release(updateLock);
 }
 
-
-void windowserver_t::renderLoop(g_rectangle screenBounds)
+void windowserver_t::requestUpdateLater() const
 {
-	g_task_register_id("windowserver/renderer");
-
-	graphics_t global;
-	global.resize(screenBounds.width, screenBounds.height, false);
-
-	cursor_t::nextPosition = g_point(screenBounds.width / 2, screenBounds.height / 2);
+	g_mutex_release(lazyUpdateLock);
+}
 
-	g_mutex_acquire(renderLock);
+void windowserver_t::updateDebounceLoop() const
+{
+	g_mutex_acquire(lazyUpdateLock);
 	while(true)
 	{
-		screen->blit(&global, screenBounds, g_point(0, 0));
-		cursor_t::paint(&global);
-
-		output(&global);
-
-		framesTotal++;
-		g_mutex_acquire_to(renderLock, 1000);
+		g_sleep(10);
+		g_mutex_acquire_to(lazyUpdateLock, 1000);
+		g_mutex_release(updateLock);
 	}
 }
 
-void windowserver_t::requestRender() const
-{
-	g_mutex_release(renderLock);
-	g_yield_t(renderTask);
-}
-
 void windowserver_t::output(graphics_t* graphics) const
 {
 	g_rectangle invalid = screen->grabInvalid();
@@ -360,7 +357,7 @@ void windowserver_t::fpsCounter()
 		std::stringstream s;
 		s << "FPS: " << framesTotal << ", Time: " << seconds;
 		instance()->stateLabel->setTitle(s.str());
-		instance()->requestUpdate();
+		instance()->requestUpdateLater();
 		framesTotal = 0;
 	}
 }

applications/windowserver/src/windowserver.hpp

@@ -36,18 +36,17 @@ class windowserver_t
 {
     g_tid updateTask = G_TID_NONE;
     g_tid renderTask = G_TID_NONE;
+
     g_user_mutex updateLock = g_mutex_initialize();
-    g_user_mutex renderLock = g_mutex_initialize();
+    g_user_mutex lazyUpdateLock = g_mutex_initialize();
 
     void initializeVideo();
     void createVitalComponents(g_rectangle screenBounds);
     void loadCursor();
     static void startInputHandlers();
 
-    void renderLoop(g_rectangle screenBounds);
-
-    static void startUpdateLoop(windowserver_t* self);
-    void updateLoop();
+    void updateLoop(const g_rectangle& screenBounds) const;
+    void updateDebounceLoop() const;
 
     static void fpsCounter();
 
@@ -67,15 +66,17 @@ class windowserver_t
     void launch();
 
     /**
-     * When components have changed, requests the windowserver to perform an
-     * update of all dirty components on the screen.
+     * When components have changed, requests the server to perform an update of
+     * all components. This triggers the update to run immediately.
      */
-    void requestUpdate() const;
+    void requestUpdateImmediately() const;
 
     /**
-     * Requests the windowserver to perform a rendering.
+     * Also requests an update, but debounces requests that come in very quickly.
+     * This is used to avoid that for example a large amount of changes via the
+     * interface cause too many updates.
      */
-    void requestRender() const;
+    void requestUpdateLater() const;
 
     static void setDebug(bool cond);
     static bool isDebug();
@@ -97,6 +98,10 @@ class windowserver_t
      */
     component_t* dispatchUpwards(component_t* component, event_t& event);
 
+    /**
+     * Switches the focus from the currently focused component to a different
+     * component. Must be used to ensure state is updated correctly.
+     */
     component_t* switchFocus(component_t* to);
 
     /**
@@ -105,6 +110,9 @@ class windowserver_t
      * @return the instance
      */
     static windowserver_t* instance();
+
+    static void startLazyUpdateLoop();
+    static void startOtherTasks();
 };
 
 #endif