Layout fixes & log pipe syscall

maxdev1 · maxdev1 · commit 0f68f9c12012 · 2025-11-20T08:43:36.000+01:00
diff --git a/applications/desktop/src/taskbar.cpp b/applications/desktop/src/taskbar.cpp
@@ -187,11 +187,11 @@ void taskbar_t::paint()
 			{
 				if(entry->hovered)
 				{
-					cairo_set_source_rgb(cr, 37.0 / 255, 32.0 / 255, 39.0 / 255);
+					cairo_set_source_rgb(cr, 30.0 / 255, 32.0 / 255, 39.0 / 255);
 				}
 				else
 				{
-					cairo_set_source_rgb(cr, 27.0 / 255, 28.0 / 255, 33.0 / 255);
+					cairo_set_source_rgb(cr, 20.0 / 255, 28.0 / 255, 33.0 / 255);
 				}
 			}
 			else
@@ -215,10 +215,9 @@ void taskbar_t::paint()
 			TextLayouter::layout(cr, entry->title.c_str(), font, 14, textArea, TextAlignment::LEFT, textLayoutBuffer);
 			for(PositionedGlyph& g: textLayoutBuffer->positions)
 			{
-
 				cairo_save(cr);
 				cairo_set_source_rgb(cr, 0.96, 0.98, 0.98);
-				TextLayouter::paintChar(cr, g);
+				TextLayouter::paintChar(cr, g, Point(entryLeft, 10));
 				cairo_restore(cr);
 			}
 		}
diff --git a/applications/fenster b/applications/fenster
@@ -1 +1 @@
-Subproject commit c93ea1ec8d63a97dbef973b3400dd87f0fa5dc1c
+Subproject commit 9114772b561daf6aeab077d892ee9a8b023c1046
diff --git a/applications/navigator/src/navigator.cpp b/applications/navigator/src/navigator.cpp
@@ -31,6 +31,7 @@
 #include <libfenster/layout/flex_layout.hpp>
 #include <libfenster/layout/grid_layout.hpp>
 #include <libfenster/layout/flow_layout.hpp>
+#include <libfenster/layout/stack_layout.hpp>
 
 using namespace fenster;
 
@@ -113,7 +114,7 @@ int main()
 
 		navText = TextBox::create();
 		navBar->addChild(navText);
-		navBarLayout->setComponentInfo(navText, 1, 1, 0);
+		navBarLayout->setComponentInfo(navText, 1, 1, -1);
 		navText->addKeyListener([](KeyEvent& e)
 		{
 			// TODO: g_keyboard needs a layout right now, maybe key events should already send ASCII codes:
@@ -144,8 +145,8 @@ int main()
 
 	Panel* centerPanel = Panel::create();
 	centerPanel->setBackground(_RGB(255, 255, 255));
-	GridLayout::create(centerPanel);
 	{
+		GridLayout::create(centerPanel);
 		scroller = ScrollPane::create();
 		content = Panel::create();
 
@@ -158,7 +159,7 @@ int main()
 		centerPanel->addChild(scroller);
 	}
 	window->addChild(centerPanel);
-	windowLayout->setComponentInfo(centerPanel, 1, 1, 0);
+	windowLayout->setComponentInfo(centerPanel, 1, 1, -1);
 
 	window->setVisible(true);
 	window->onClose([]()
diff --git a/applications/testprogram/src/tester.cpp b/applications/testprogram/src/tester.cpp
@@ -26,7 +26,9 @@
 #include <cstdio>
 #include <libfenster/components/checkbox.hpp>
 #include <libfenster/components/label.hpp>
-#include <libfenster/layout/stack_layout.hpp>
+#include <libfenster/components/text_box.hpp>
+#include <libfenster/layout/grid_layout.hpp>
+#include <libfenster/layout/flex_layout.hpp>
 
 int main(int argc, char** argv)
 {
@@ -41,45 +43,50 @@ int main(int argc, char** argv)
 	{
 		g_exit(0);
 	});
-	fenster::StackLayout::create(window);
+	auto flex = fenster::FlexLayout::create(window);
 
-	auto panel = fenster::Panel::create();
-	panel->setBackground(_RGB(200, 200, 255));
+	auto textArea = fenster::TextBox::create();
+	textArea->setMultiLine(true);
+	textArea->setTitle("...");
+	window->addChild(textArea);
+	flex->setComponentInfo(textArea, 1, 1, -1);
 
-	auto stackLayout = fenster::StackLayout::create(panel);
-	stackLayout->setPadding(fenster::Insets(10, 10, 10, 10));
-	stackLayout->setSpace(20);
+	auto lastRead = fenster::Label::create();
+	lastRead->setTitle("Last read: -");
+	window->addChild(lastRead);
+	flex->setComponentInfo(lastRead, 0,0, 50);
 
-	auto testLabel = fenster::Label::create();
-	testLabel->setTitle("Choose the checkbox to test listener behaviour:");
-	panel->addChild(testLabel);
-
-	auto check = fenster::Checkbox::create();
-	check->setTitle("Enable other field");
-	panel->addChild(check);
+	window->setTitle("Kernel log");
+	window->setBounds(fenster::Rectangle(50, 50, 600, 600));
+	window->setVisible(true);
 
-	auto conditionalLabel = fenster::Label::create();
-	conditionalLabel->setTitle("Conditional label");
-	conditionalLabel->setVisible(false);
-	panel->addChild(conditionalLabel);
-	check->addCheckedListener([conditionalLabel](bool checked)
+	g_fd logPipe = g_open_log_pipe();
+	if(logPipe == G_FD_NONE)
 	{
-		printf("Check state changed to %s\n", checked ? "checked" : "unchecked");
-		conditionalLabel->setVisible(checked);
-	});
+		textArea->setTitle("Failed to open kernel log pipe");
+		g_sleep(999999999);
+	}
 
-	auto testLabel2 = fenster::Label::create();
-	testLabel2->setTitle("Very cool.");
-	panel->addChild(testLabel2);
+	uint8_t buf[1] ={0};
+	std::stringstream s;
+	for(;;)
+	{
+		int r = g_read(logPipe, buf, 1);
+		if(r == 0)
+		{
+			// Pipe is not blocking in both directions right now...
+			g_sleep(100);
+			continue;
+		}
+		s << (char) buf[0];
 
-	window->addChild(panel);
+		textArea->setTitle(s.str());
 
-	window->setTitle("Test window");
-	window->setBounds(fenster::Rectangle(70, 70, 400, 300));
-	window->setVisible(true);
+		if(s.str().size() > 1000)
+			s.str("");
 
-	for(;;)
-	{
-		g_sleep(999999);
+		std::stringstream out;
+		out << s.str().size();
+		lastRead->setTitle(out.str());
 	}
 }
diff --git a/kernel/src/kernel/calls/syscall.cpp b/kernel/src/kernel/calls/syscall.cpp
@@ -153,6 +153,7 @@ void syscallRegisterAll()
 
 	// System
 	_syscallRegister(G_SYSCALL_LOG, (g_syscall_handler) syscallLog);
+	_syscallRegister(G_SYSCALL_OPEN_LOG_PIPE, (g_syscall_handler) syscallOpenLogPipe);
 	_syscallRegister(G_SYSCALL_SET_VIDEO_LOG, (g_syscall_handler) syscallSetVideoLog);
 	_syscallRegister(G_SYSCALL_TEST, (g_syscall_handler) syscallTest);
 	_syscallRegister(G_SYSCALL_CALL_VM86, (g_syscall_handler) syscallCallVm86);
diff --git a/kernel/src/kernel/calls/syscall_system.cpp b/kernel/src/kernel/calls/syscall_system.cpp
@@ -59,6 +59,29 @@ void syscallLog(g_task* task, g_syscall_log* data)
 	}
 }
 
+void syscallOpenLogPipe(g_task* task, g_syscall_open_log_pipe* data)
+{
+	g_fs_node* node;
+	if(filesystemCreatePipe(false, &node) != G_FS_PIPE_SUCCESSFUL)
+	{
+		logInfo("%! failed to open kernel log read pipe", "log");
+		data->fd = G_FD_NONE;
+		return;
+	}
+
+	g_file_flag_mode readFlags = G_FILE_FLAG_MODE_READ;
+	g_fs_open_status readOpen = filesystemOpenNodeFd(node, readFlags, task->process->id, &data->fd);
+	if(readOpen != G_FS_OPEN_SUCCESSFUL)
+	{
+		logInfo("%! failed to open read end of kernel log pipe %i for task %i with status %i", "filesystem", node->id,
+		        task->id, readOpen);
+		data->fd = G_FD_NONE;
+		return;
+	}
+
+	loggerEnablePipe(node);
+}
+
 void syscallSetVideoLog(g_task* task, g_syscall_set_video_log* data)
 {
 	loggerEnableVideo(data->enabled);
diff --git a/kernel/src/kernel/calls/syscall_system.hpp b/kernel/src/kernel/calls/syscall_system.hpp
@@ -26,6 +26,8 @@
 
 void syscallLog(g_task* task, g_syscall_log* data);
 
+void syscallOpenLogPipe(g_task* task, g_syscall_open_log_pipe* data);
+
 void syscallSetVideoLog(g_task* task, g_syscall_set_video_log* data);
 
 void syscallTest(g_task* task, g_syscall_test* data);
diff --git a/kernel/src/kernel/kernel.cpp b/kernel/src/kernel/kernel.cpp
@@ -226,6 +226,7 @@ void kernelInitializationThread()
 
 	G_PRETTY_BOOT_STATUS_P(80);
 	kernelSpawnService("/applications/fenster.bin", "", G_SECURITY_LEVEL_APPLICATION);
+	kernelSpawnService("/applications/tester.bin", "", G_SECURITY_LEVEL_APPLICATION);
 	// G_PRETTY_BOOT_STATUS_P(80);
 	// kernelSpawnService("/applications/terminal.bin", "--headless", G_SECURITY_LEVEL_DRIVER);
 
diff --git a/kernel/src/kernel/logger/logger.cpp b/kernel/src/kernel/logger/logger.cpp
@@ -19,6 +19,10 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "kernel/logger/logger.hpp"
+
+#include <kernel/ipc/pipes.hpp>
+
+#include "kernel/memory/memory.hpp"
 #include "kernel/system/spinlock.hpp"
 #include "kernel/system/interrupts/interrupts.hpp"
 #include "kernel/build_config.hpp"
@@ -32,6 +36,8 @@ static bool logSerial = false;
 static bool logVideo = G_VIDEO_LOG_BOOT;
 g_spinlock loggerLock = 0;
 
+g_fs_node* pipeNode = nullptr;
+
 void loggerPrintLocked(const char* message, ...)
 {
 	INTERRUPTS_PAUSE;
@@ -245,11 +251,25 @@ void loggerPrintPlain(const char* message_const)
 void loggerPrintCharacter(char c)
 {
 	if(logVideo)
-	{
 		consoleVideoPrint(c);
-	}
 	if(logSerial)
-	{
 		debugInterfaceWriteLogCharacter(c);
+
+	if(pipeNode != nullptr)
+	{
+		uint8_t buf[1];
+		buf[0] = c;
+		int64_t wrote;
+		pipeWrite(pipeNode->physicalId, buf, 0, 1, &wrote);
+		if(wrote == 0)
+		{
+			pipeTruncate(pipeNode->physicalId);
+			pipeWrite(pipeNode->physicalId, buf, 0, 1, &wrote);
+		}
 	}
 }
+
+void loggerEnablePipe(g_fs_node* node)
+{
+	pipeNode = node;
+}
diff --git a/kernel/src/kernel/logger/logger.hpp b/kernel/src/kernel/logger/logger.hpp
@@ -26,6 +26,8 @@
 
 #include "kernel/logger/logger_macros.hpp"
 
+struct g_fs_node;
+
 void loggerPrintLocked(const char *message, ...);
 
 void loggerPrintlnLocked(const char *message, ...);
@@ -38,6 +40,8 @@ void loggerEnableSerial(bool enable);
 
 void loggerEnableVideo(bool video);
 
+void loggerEnablePipe(g_fs_node* node);
+
 void loggerPrintPlain(const char *message);
 
 void loggerPrintCharacter(char c);
diff --git a/libapi/inc/ghost/filesystem/types.h b/libapi/inc/ghost/filesystem/types.h
@@ -29,8 +29,8 @@ __BEGIN_C
  * Types
  */
 typedef int32_t g_fd; // a file descriptor
-typedef uint32_t g_fs_virt_id; // a vfs node id
-typedef uint64_t g_fs_phys_id; // a physical filesystem node identifier
+typedef int32_t g_fs_virt_id; // a vfs node id
+typedef int32_t g_fs_phys_id; // a physical filesystem node identifier
 typedef int32_t g_device; // a device id
 
 #define G_FD_NONE		((g_fd) -1)
diff --git a/libapi/inc/ghost/syscall/definitions.h b/libapi/inc/ghost/syscall/definitions.h
@@ -103,6 +103,7 @@ __BEGIN_C
 #define G_SYSCALL_IRQ_CREATE_REDIRECT           124
 #define G_SYSCALL_AWAIT_IRQ         			125
 #define G_SYSCALL_GET_EFI_FRAMEBUFFER			126
+#define G_SYSCALL_OPEN_LOG_PIPE					127
 
 // Kernquery
 #define G_SYSCALL_KERNQUERY						129
diff --git a/libapi/inc/ghost/system.h b/libapi/inc/ghost/system.h
@@ -23,6 +23,7 @@
 
 #include "common.h"
 #include "stdint.h"
+#include "filesystem/types.h"
 #include "system/types.h"
 #include "memory/types.h"
 
@@ -57,6 +58,13 @@ g_vm86_call_status g_call_vm86(uint32_t interrupt, g_vm86_registers* in, g_vm86_
  */
 void g_log(const char* message);
 
+/**
+ * Opens the kernel log pipe for reading.
+ * 
+ * @return file descriptor to the kernel log pipe
+ */
+g_fd g_open_log_pipe();
+
 /**
  * Enables or disables logging to the video output.
  *
diff --git a/libapi/inc/ghost/system/callstructs.h b/libapi/inc/ghost/system/callstructs.h
@@ -59,6 +59,15 @@ typedef struct
 	char* message;
 }__attribute__((packed)) g_syscall_log;
 
+/**
+ * @field fd
+ * 		the opened fd
+ */
+typedef struct
+{
+	g_fd fd;
+}__attribute__((packed)) g_syscall_open_log_pipe;
+
 /**
  * @field enabled
  * 		whether or not to enable the video log
diff --git a/libapi/src/system/g_open_log_pipe.cpp b/libapi/src/system/g_open_log_pipe.cpp
@@ -0,0 +1,35 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *                                                                           *
+ *  Ghost, a micro-kernel based operating system for the x86 architecture    *
+ *  Copyright (C) 2015, Max Schlüssel <lokoxe@gmail.com>                     *
+ *                                                                           *
+ *  This program is free software: you can redistribute it and/or modify     *
+ *  it under the terms of the GNU General Public License as published by     *
+ *  the Free Software Foundation, either version 3 of the License, or        *
+ *  (at your option) any later version.                                      *
+ *                                                                           *
+ *  This program is distributed in the hope that it will be useful,          *
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            *
+ *  GNU General Public License for more details.                             *
+ *                                                                           *
+ *  You should have received a copy of the GNU General Public License        *
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.    *
+ *                                                                           *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include "ghost/syscall.h"
+#include "ghost/system.h"
+#include "ghost/system/callstructs.h"
+
+/**
+ *
+ */
+g_fd g_open_log_pipe()
+{
+	g_syscall_open_log_pipe data;
+
+	g_syscall(G_SYSCALL_OPEN_LOG_PIPE, (g_address) &data);
+
+	return data.fd;
+}

Original file line number	Diff line number	Diff line change
`@@ -187,11 +187,11 @@ void taskbar_t::paint()`
`187`	`187`	`{`
`188`	`188`	`if(entry->hovered)`
`189`	`189`	`{`
`190`		`- cairo_set_source_rgb(cr, 37.0 / 255, 32.0 / 255, 39.0 / 255);`
	`190`	`+ cairo_set_source_rgb(cr, 30.0 / 255, 32.0 / 255, 39.0 / 255);`
`191`	`191`	`}`
`192`	`192`	`else`
`193`	`193`	`{`
`194`		`- cairo_set_source_rgb(cr, 27.0 / 255, 28.0 / 255, 33.0 / 255);`
	`194`	`+ cairo_set_source_rgb(cr, 20.0 / 255, 28.0 / 255, 33.0 / 255);`
`195`	`195`	`}`
`196`	`196`	`}`
`197`	`197`	`else`
`@@ -215,10 +215,9 @@ void taskbar_t::paint()`
`215`	`215`	`TextLayouter::layout(cr, entry->title.c_str(), font, 14, textArea, TextAlignment::LEFT, textLayoutBuffer);`
`216`	`216`	`for(PositionedGlyph& g: textLayoutBuffer->positions)`
`217`	`217`	`{`
`218`		`-`
`219`	`218`	`cairo_save(cr);`
`220`	`219`	`cairo_set_source_rgb(cr, 0.96, 0.98, 0.98);`
`221`		`- TextLayouter::paintChar(cr, g);`
	`220`	`+ TextLayouter::paintChar(cr, g, Point(entryLeft, 10));`
`222`	`221`	`cairo_restore(cr);`
`223`	`222`	`}`
`224`	`223`	`}`