added a window to gui which is draggable by the mouse

5 files changed, 130 insertions, 9 deletions

diff --git a/src/Makefile b/src/Makefile
index c9ccda8..bcb0da7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -33,7 +33,7 @@ kernel.bin: kernel.elf
 kernel.sym: kernel.elf
 	$(OBJCOPY) --only-keep-debug kernel.elf kernel.sym
 
-kernel.elf: kernel/kernel.o kernel/kernel_asm.o kernel/console.o kernel/vgatext.o kernel/serial.o hardware/port.o hardware/port_asm.o hardware/interrupts.o hardware/interrupts_asm.o hardware/pci.o drivers/driver.o drivers/hdi/ps2/keyboard.o drivers/hdi/ps2/mouse.o drivers/video/vga.o drivers/video/vga_font.o gui/widget.o gui/composite_widget.o gui/desktop.o gui/text_widget.o libc/string.o libc/stdlib.o libc/stdio.o libc/setjmp.o
+kernel.elf: kernel/kernel.o kernel/kernel_asm.o kernel/console.o kernel/vgatext.o kernel/serial.o hardware/port.o hardware/port_asm.o hardware/interrupts.o hardware/interrupts_asm.o hardware/pci.o drivers/driver.o drivers/hdi/ps2/keyboard.o drivers/hdi/ps2/mouse.o drivers/video/vga.o drivers/video/vga_font.o gui/widget.o gui/composite_widget.o gui/window.o gui/desktop.o gui/text_widget.o libc/string.o libc/stdlib.o libc/stdio.o libc/setjmp.o
 	$(LD) -o kernel.elf -N -n -Ttext 0x8800 --oformat elf32-i386 \
 		kernel/kernel.o kernel/kernel_asm.o \
 		kernel/console.o kernel/vgatext.o kernel/serial.o \
@@ -44,8 +44,8 @@ kernel.elf: kernel/kernel.o kernel/kernel_asm.o kernel/console.o kernel/vgatext.
 		drivers/hdi/ps2/keyboard.o drivers/hdi/ps2/mouse.o \
 		drivers/video/vga.o drivers/video/vga_font.o \
 		libc/string.o libc/stdlib.o libc/stdio.o libc/setjmp.o \
-		gui/widget.o gui/composite_widget.o gui/desktop.o \
-		gui/text_widget.o
+		gui/widget.o gui/composite_widget.o gui/window.o \
+		gui/desktop.o gui/text_widget.o
 
 magic.bin: boot/magic.asm
 	$(NASM) boot/magic.asm -DMAGIC='"$(MAGIC)"' -f bin -o magic.bin
@@ -110,6 +110,9 @@ gui/widget.o: gui/widget.c gui/widget.h
 gui/composite_widget.o: gui/composite_widget.c gui/composite_widget.h
 	$(CC) $(CFLAGS) -c -o gui/composite_widget.o gui/composite_widget.c
 
+gui/window.o: gui/window.c gui/window.h
+	$(CC) $(CFLAGS) -c -o gui/window.o gui/window.c
+
 gui/desktop.o: gui/desktop.c gui/desktop.h
 	$(CC) $(CFLAGS) -c -o gui/desktop.o gui/desktop.c
 
diff --git a/src/gui/desktop.c b/src/gui/desktop.c
index 0c0aa01..6592b52 100644
--- a/src/gui/desktop.c
+++ b/src/gui/desktop.c
@@ -60,6 +60,7 @@ void desktop_draw( void *obj, graphics_context_t *context )
 
 void desktop_on_mouse_down( void *obj, const int x, const int y )
 {
+	composite_widget_on_mouse_down( obj, x, y );
 }
 
 void desktop_on_mouse_up( void *obj, const int x, const int y )
@@ -73,4 +74,6 @@ void desktop_on_mouse_move( void *obj, const int old_x, const int old_y, const i
 
 	desktop->mouse_x = x;
 	desktop->mouse_y = y;
+
+	composite_widget_on_mouse_move( obj, old_x, old_y, x, y );
 }
diff --git a/src/gui/window.c b/src/gui/window.c
new file mode 100644
index 0000000..cd62e47
--- /dev/null
+++ b/src/gui/window.c
@@ -0,0 +1,81 @@
+#include "window.h"
+
+#include "string.h"
+#include "stddef.h"
+
+static window_vtable_t window_vtable = {
+	{
+		{
+			window_draw,
+			composite_widget_get_focus,
+			widget_model_to_screen,
+			widget_contains_coordinate,
+			window_on_mouse_down,
+			window_on_mouse_up,
+			window_on_mouse_move,
+			composite_widget_on_key_down,
+			composite_widget_on_key_up
+		},
+		composite_widget_add_child
+	}
+};
+
+
+void window_init( window_t *window, widget_t *parent, const int x, const int y, const int w, const int h, const vga_color_t background_color )
+{
+	memset( window, 0, sizeof( window_t ) );
+
+	composite_widget_init( &window->base, parent, x, y, w, h, background_color );	
+
+	window->dragging = false;
+
+	window->base.base.vtable = (widget_vtable_t *)&window_vtable;
+	window->base.vtable = (composite_widget_vtable_t *)&window_vtable;
+	window->vtable = &window_vtable;
+}
+
+void window_draw( void *obj, graphics_context_t *context )
+{
+	window_t *widget = obj;
+
+	if( widget->base.base.x < 0 ) {
+		widget->base.base.x = 0;
+	}
+	if( widget->base.base.x > context->mode.x - widget->base.base.w ) {
+		widget->base.base.x = context->mode.x - widget->base.base.w;
+	}
+	if( widget->base.base.y < 0 ) {
+		widget->base.base.y = 0;
+	}
+	if( widget->base.base.y > context->mode.y - widget->base.base.h ) {
+		widget->base.base.y = context->mode.y - widget->base.base.h;
+	}
+
+	composite_widget_draw( obj, context );
+}
+
+void window_on_mouse_down( void *obj, const int x, const int y )
+{
+	window_t *widget = obj;
+
+	widget->dragging = true;
+	composite_widget_on_mouse_down( obj, x, y );
+}
+
+void window_on_mouse_up( void *obj, const int x, const int y )
+{
+	window_t *widget = obj;
+
+	widget->dragging = false;
+	composite_widget_on_mouse_up( obj, x, y );
+}
+
+void window_on_mouse_move( void *obj, const int old_x, const int old_y, const int x, const int y )
+{
+	window_t *widget = obj;
+
+	if( widget->dragging ) {
+		widget->base.base.x += x - old_x;
+		widget->base.base.y += y - old_y;
+	}
+}
diff --git a/src/gui/window.h b/src/gui/window.h
new file mode 100644
index 0000000..3a0cc97
--- /dev/null
+++ b/src/gui/window.h
@@ -0,0 +1,25 @@
+#ifndef WINDOW_H
+#define WINDOW_H
+
+#include "composite_widget.h"
+
+#include <stdbool.h>
+
+typedef struct {
+	composite_widget_vtable_t base;
+} window_vtable_t;
+
+typedef struct {
+	composite_widget_t base;
+	window_vtable_t *vtable;
+	bool dragging;
+} window_t;
+
+void window_init( window_t *window, widget_t *parent, const int x, const int y, const int w, const int h, const vga_color_t background_color );
+
+void window_draw( void *obj, graphics_context_t *context );
+void window_on_mouse_down( void *obj, const int x, const int y );
+void window_on_mouse_up( void *obj, const int x, const int y );
+void window_on_mouse_move( void *obj, const int old_x, const int old_y, const int x, const int y );
+
+#endif // WINDOW_H
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index dbf0cab..eff6a4c 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -24,6 +24,7 @@
 #include "composite_widget.h"
 #include "desktop.h"
 #include "text_widget.h"
+#include "window.h"
 
 static jmp_buf panic_jmp_buf;
 
@@ -44,8 +45,8 @@ typedef struct {
 	mode_t mode;
 	mouse_t mouse;
 	desktop_t desktop;
-	widget_t widget1;
-	widget_t widget2;
+	window_t window1;
+	window_t window2;
 } global_context_t;
 
 static global_context_t global_context;
@@ -214,11 +215,11 @@ static void handle_keyboard_event( keyboard_event_t *event, void *context )
 							if( vga_set_mode( vga, vga_make_mode( VGA_MODE_TYPE_GRAPHICS, 320, 200, 8 ) ) ) {
 								desktop_init( &global_context->desktop, 320, 200, VGA_COLOR_BLUE );
 
-								widget_init( &global_context->widget1, (widget_t *)&global_context->desktop, 60, 90, 60, 70, VGA_COLOR_LIGHT_GREY );
-								((composite_widget_vtable_t *)global_context->desktop.vtable)->add_child( &global_context->desktop, &global_context->widget1 );
+								window_init( &global_context->window1, (widget_t *)&global_context->desktop, 60, 90, 60, 70, VGA_COLOR_LIGHT_GREY );
+								((composite_widget_vtable_t *)global_context->desktop.vtable)->add_child( &global_context->desktop, (widget_t *)&global_context->window1 );
 
-								widget_init( &global_context->widget2, (widget_t *)&global_context->desktop, 130, 80, 60, 70, VGA_COLOR_GREEN );
-								((composite_widget_vtable_t *)global_context->desktop.vtable)->add_child( &global_context->desktop, &global_context->widget2 );
+								window_init( &global_context->window2, (widget_t *)&global_context->desktop, 130, 80, 60, 70, VGA_COLOR_GREEN );
+								((composite_widget_vtable_t *)global_context->desktop.vtable)->add_child( &global_context->desktop, (widget_t *)&global_context->window2 );
 
 								char s[100];
 								char *p = s;
@@ -295,7 +296,15 @@ static void handle_mouse_event( mouse_event_t *event, void *context )
 		case MODE_GRAPHICS:
 			switch( event->type ) {
 				case MOUSE_EVENT_TYPE_BUTTON_UP:
+					if( event->button == MOUSE_BUTTON_LEFT ) {
+						desktop_on_mouse_up( desktop, event->cursor_x, event->cursor_y );
+					}
+					break;
+
 				case MOUSE_EVENT_TYPE_BUTTON_DOWN:
+					if( event->button == MOUSE_BUTTON_LEFT ) {
+						desktop_on_mouse_down( desktop, event->cursor_x, event->cursor_y );
+					}
 					break;
 
 				case MOUSE_EVENT_TYPE_MOVE: