3 files changed, 84 insertions, 4 deletions

diff --git a/include/gui/button.h b/include/gui/button.h
index 62f75a3..8537151 100644
--- a/include/gui/button.h
+++ b/include/gui/button.h
@@ -1,16 +1,37 @@
 #ifndef UPEM_MORPHING_BUTTON
 #define UPEM_MORPHING_BUTTON
 
+#include "window.h"
 /**
  * File: button.h
+ * Buttons handling
  */
 
+/**
+ * Type: Button
+ * Component that can be triggered by click to execute a specific action.
+ */
 typedef struct {
   Component component;
 } Button;
 
+/**
+ * Function: button_init
+ * Initializes the button.
+ *
+ * Parameters:
+ *  *button - pointer to the input button
+ *  text - label for the button
+ */
 void button_init(Button *button, char *text);
 
+/**
+ * Function: button_free
+ * Frees the resources for the button.
+ *
+ * Parameters:
+ *  *button - pointer to the input button
+ */
 void button_free(Button *button);
 
 #endif
diff --git a/include/gui/group.h b/include/gui/group.h
index 6914d55..45ec3b2 100644
--- a/include/gui/group.h
+++ b/include/gui/group.h
@@ -1,13 +1,20 @@
 #ifndef UPEM_MORPHING_GROUP
 #define UPEM_MORPHING_GROUP
 
+#include "window.h"
+
 /**
  * File: group.h
  */
 
+typedef struct _GroupElement {
+  Component *c;
+  struct _GroupElement *next;
+} GroupElement;
+
 typedef struct {
   Component component;
-  Component *sub_components;
+  GroupElement *group_head;
 } Group;
 
 void group_init(Group *group, int padding);
diff --git a/include/gui/window.h b/include/gui/window.h
index 9394c84..6ccf00a 100644
--- a/include/gui/window.h
+++ b/include/gui/window.h
@@ -3,24 +3,76 @@
 
 /**
  * File: window.h
+ * Windows and components handling.
+ *
+ * See also:
+ *  The famous OS
  */
 
+#include "group.h"
+
+/**
+ * Type: ClickHandler
+ * Type of functions that handle mouse's clicks.
+ */
 typedef void (*ClickHandler)(int x_pos, int y_pos);
 
+/**
+ * Type: PrintMethod
+ * Type of functions that will be used to print our component. This must be initialized by the initialization function of the component.
+ */
+typedef void (*PrintMethod)(void);
+
+/**
+ * Type: Component
+ * Abstract component that handles clicks.
+ */
 typedef struct {
   int width, height;
+  int x_pos, y_pos;
   ClickHandler click_handler;
+  PrintMethod print_method;
 } Component;
-
+/**
+ * Type: Window
+ * Supports and handles components.
+ */
 typedef struct {
   int width, height;
-  Component *components;
+  Group *group_buttons;
+  Group *group_images;
 } Window;
 
+/**
+ * Function: window_init
+ * Initializes a window.
+ *
+ * Parameters:
+ *  *window - pointer to the input window
+ *  width - width of the window to initialize
+ *  height - height of the window to initialize
+ *  *title - title of the actual window
+ */
 void window_init(Window *window, int width, int height, char *title);
 
+/**
+ * Function: window_free
+ * Frees the resources supported by the window and the window itself.
+ *
+ * Parameters:
+ *  *window - pointer to the input window
+ */
 void window_free(Window *window);
 
-void window_add_component(Window *window, Component *component, int x_pos, int y_pos);
+/**
+ * Function: window_add_component
+ * Adds components to the current window at the position specified in x and y.
+ *
+ * Parameters:
+ *  *window - pointer to the input window
+ *  *component - pointer to the input component
+ */
+void window_add_component(Window *window, Component *component);
+
 
 #endif