From ff2d78256b6b2288e9a5954a49fe4babaf6400cb Mon Sep 17 00:00:00 2001
From: Adam NAILI
Date: Mon, 1 Jan 2018 23:36:39 +0100
Subject: Implementing rendering

---
 include/gui/pictureframe.h | 6 ++----
 include/gui/window.h       | 6 ++++++
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/gui/pictureframe.h b/include/gui/pictureframe.h
index f06a530..7b9644e 100644
--- a/include/gui/pictureframe.h
+++ b/include/gui/pictureframe.h
@@ -61,16 +61,14 @@ bool pictureframe_is_selected(int x, int y, PictureFrame *pictureFrame);
  *  y - value on y axis from the origin of the window to convert
  *  *pictureFrame - pointer to the reference pictureframe that will give his relative coordinates
  */
-CartesianVector pictureframe_conversion_to_origin(int x, int y, PictureFrame *pictureFrame);
+CartesianVector pictureframe_conversion_to_pic(int x, int y, PictureFrame *pictureFrame);
 
-CartesianVector pictureframe_conversion_to_picture(int x, int y, PictureFrame *pictureFrame);
+CartesianVector pictureframe_conversion_to_origin(int x, int y, PictureFrame *pictureFrame);
 
 void pictureframe_init(PictureFrame *pictureFrame, int width, int height, int x_pos, int y_pos,
                        CartesianMappingDivision cartesianMappingDivision, Morphing *morphing, Canvas *canvas,
                        ClickHandler clickHandler);
 
-void pictureframe_free(PictureFrame *pictureFrame);
-
 /**
  * Function: pictureframe_draw_canvas
  * Draws the contained Canvas of the PictureFrame.
diff --git a/include/gui/window.h b/include/gui/window.h
index 329997b..10f0e74 100644
--- a/include/gui/window.h
+++ b/include/gui/window.h
@@ -9,6 +9,7 @@
  *  The famous OS
  */
 
+#include <MLV/MLV_keyboard.h>
 #include "group.h"
 #include "component.h"
 #include "button.h"
@@ -100,4 +101,9 @@ void window_print_buttons(Window *window);
  */
 void window_print_pictureframes(Window *window);
 
+void window_click_keyboard_handler(Window *window, MLV_Keyboard_button *keyboardButton,
+                                   MLV_Keyboard_modifier *keyboardModifier,
+                                   int *unicode, int *mouse_x, int *mouse_y);
+void window_rendering(Window *window,PictureFrame *pictureFrame1,Canvas *canvasSrc, Canvas *canvasTarget, Morphing *morphing);
+
 #endif
-- 
cgit v1.2.3