got rid of superflous vtables in GUI class hierarchy

9 files changed, 6 insertions, 16 deletions

diff --git a/src/gui/composite_widget.c b/src/gui/composite_widget.c
index e71bac6..355e3c6 100644
--- a/src/gui/composite_widget.c
+++ b/src/gui/composite_widget.c
@@ -29,7 +29,6 @@ void composite_widget_init( composite_widget_t *widget, widget_t *parent, const
 	memset( widget->children, 0, MAX_NOF_WIDGET_CHILDREN * sizeof( widget_t * ) );
 
 	widget->base.vtable = (widget_vtable_t *)&composite_widget_vtable;
-	widget->vtable = &composite_widget_vtable;
 }
 
 void composite_widget_draw( void *obj, graphics_context_t *context )
diff --git a/src/gui/composite_widget.h b/src/gui/composite_widget.h
index 28e1e02..c055e09 100644
--- a/src/gui/composite_widget.h
+++ b/src/gui/composite_widget.h
@@ -12,7 +12,6 @@ typedef struct {
 
 typedef struct {
 	widget_t base;
-	composite_widget_vtable_t *vtable;
 	widget_t *children[MAX_NOF_WIDGET_CHILDREN];
 	int nof_children;
 	widget_t *focused_child;
diff --git a/src/gui/desktop.c b/src/gui/desktop.c
index 4a3876e..08da59b 100644
--- a/src/gui/desktop.c
+++ b/src/gui/desktop.c
@@ -31,8 +31,6 @@ void desktop_init( desktop_t *desktop, const int w, const int h, const vga_color
 	desktop->needs_redrawing = true;
 
 	desktop->base.base.vtable = (widget_vtable_t *)&desktop_vtable;
-	desktop->base.vtable = (composite_widget_vtable_t *)&desktop_vtable;
-	desktop->vtable = &desktop_vtable;
 }
 
 void desktop_draw( void *obj, graphics_context_t *context )
diff --git a/src/gui/desktop.h b/src/gui/desktop.h
index f644691..09a2d75 100644
--- a/src/gui/desktop.h
+++ b/src/gui/desktop.h
@@ -13,7 +13,6 @@ typedef struct {
 
 typedef struct {
 	composite_widget_t base;
-	desktop_vtable_t *vtable;
 	int mouse_x;
 	int mouse_y;
 	bool needs_redrawing;
diff --git a/src/gui/text_widget.c b/src/gui/text_widget.c
index f6ba8eb..2567df3 100644
--- a/src/gui/text_widget.c
+++ b/src/gui/text_widget.c
@@ -29,7 +29,6 @@ void text_widget_init( text_widget_t *widget, widget_t *parent, const int x, con
 	widget->base.focusable = true;
 
 	widget->base.vtable = (widget_vtable_t *)&text_widget_vtable;
-	widget->vtable = &text_widget_vtable;
 }
 
 void text_widget_draw( void *obj, graphics_context_t *context )
diff --git a/src/gui/text_widget.h b/src/gui/text_widget.h
index 3b22cf1..316f56e 100644
--- a/src/gui/text_widget.h
+++ b/src/gui/text_widget.h
@@ -12,7 +12,6 @@ typedef struct {
 
 typedef struct {
 	widget_t base;
-	text_widget_vtable_t *vtable;
 	char s[TEXT_WIDGET_MAX_TEXT_SIZE];
 } text_widget_t;
 
diff --git a/src/gui/window.c b/src/gui/window.c
index cd62e47..f56c8e6 100644
--- a/src/gui/window.c
+++ b/src/gui/window.c
@@ -30,8 +30,6 @@ void window_init( window_t *window, widget_t *parent, const int x, const int y,
 	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 )
diff --git a/src/gui/window.h b/src/gui/window.h
index 3a0cc97..793d8b3 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -11,7 +11,6 @@ typedef struct {
 
 typedef struct {
 	composite_widget_t base;
-	window_vtable_t *vtable;
 	bool dragging;
 } window_t;
 
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index 9a66e89..12fc33f 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -153,7 +153,7 @@ void kernel_main( void )
 				interrupts_disable( );
 
 				// as vga_t is equals to the graphical context for now
-				((widget_vtable_t *)global_context.desktop.vtable)->draw( &global_context.desktop, &global_context.vga );
+				((widget_vtable_t *)global_context.desktop.base.base.vtable)->draw( &global_context.desktop, &global_context.vga );
 
 				vga_refresh( &global_context.vga );
 
@@ -236,10 +236,10 @@ static void handle_keyboard_event( keyboard_event_t *event, void *context )
 										desktop_init( &global_context->desktop, 320, 200, VGA_COLOR_BLUE );
 
 										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 );
+										((composite_widget_vtable_t *)global_context->desktop.base.base.vtable)->add_child( &global_context->desktop, (widget_t *)&global_context->window1 );
 
 										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 );
+										((composite_widget_vtable_t *)global_context->desktop.base.base.vtable)->add_child( &global_context->desktop, (widget_t *)&global_context->window2 );
 
 										char s[100];
 
@@ -250,10 +250,10 @@ static void handle_keyboard_event( keyboard_event_t *event, void *context )
 										*p = '\0';
 
 										window_init( &global_context->window3, (widget_t *)&global_context->desktop, 55, 5, vga->mode.x - 65, 100, VGA_COLOR_CYAN );
-										((composite_widget_vtable_t *)global_context->desktop.vtable)->add_child( &global_context->desktop, (widget_t *)&global_context->window3 );
+										((composite_widget_vtable_t *)global_context->desktop.base.base.vtable)->add_child( &global_context->desktop, (widget_t *)&global_context->window3 );
 
 										text_widget_init( &global_context->widget3, (widget_t *)&global_context->window3, 1, 1, global_context->window3.base.base.w - 2, global_context->window3.base.base.h - 2, VGA_COLOR_RED, s );
-										((composite_widget_vtable_t *)global_context->window3.vtable)->add_child( (composite_widget_t *)&global_context->window3, (widget_t *)&global_context->widget3 );
+										((composite_widget_vtable_t *)global_context->window3.base.base.vtable)->add_child( (composite_widget_t *)&global_context->window3, (widget_t *)&global_context->widget3 );
 
 										mouse_set_resolution( mouse, vga->mode.x, vga->mode.y );
 
@@ -295,7 +295,7 @@ static void handle_keyboard_event( keyboard_event_t *event, void *context )
 		case MODE_GRAPHICS:
 			if( event->type == KEYBOARD_EVENT_TYPE_KEY_PRESSED ) {
 				if( event->key == KEYBOARD_KEY_ASCII ) {
-					((widget_vtable_t *)global_context->desktop.vtable)->on_key_down( &global_context->desktop, event->ascii_key );
+					((widget_vtable_t *)global_context->desktop.base.base.vtable)->on_key_down( &global_context->desktop, event->ascii_key );
 				}
 			}
 			break;