Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/engines/ecore_evas_software_x11
Modified Files:
ecore_evas_software_x11.c
Log Message:
* Clean up the engine code and more comments to etk_engine.c
===================================================================
RCS file:
/cvs/e/e17/proto/etk/src/engines/ecore_evas_software_x11/ecore_evas_software_x11.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ecore_evas_software_x11.c 28 Jul 2006 00:57:05 -0000 1.5
+++ ecore_evas_software_x11.c 28 Jul 2006 02:13:07 -0000 1.6
@@ -1,17 +1,11 @@
-#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <Evas.h>
#include <Ecore_Evas.h>
-#include <Ecore_X.h>
-#include <Ecore_X_Cursor.h>
#include "etk_types.h"
-#include "etk_dnd.h"
#include "etk_engine.h"
+#include "etk_window.h"
#include "etk_utils.h"
-#include "etk_toplevel_widget.h"
-#include "etk_main.h"
#include "Etk_Engine_Ecore_Evas.h"
#include "Etk_Engine_Ecore_Evas_X11.h"
@@ -24,9 +18,6 @@
/* General engine functions */
Etk_Engine *engine_open();
-static Etk_Bool _engine_init();
-static void _engine_shutdown();
-
/* Etk_Window functions */
static void _window_constructor(Etk_Window *window);
@@ -36,7 +27,7 @@
NULL, /* engine name */
NULL, /* super (parent) engine */
NULL, /* DL handle */
-
+
NULL, /* engine_init */
NULL, /* engine_shutdown */
@@ -78,27 +69,32 @@
NULL, /* window_dnd_aware_set */
NULL, /* window_dnd_aware_get */
NULL, /* window_pointer_set */
-
+
NULL, /* popup_window_constructor */
NULL, /* popup_window_popup_at_xy */
NULL, /* popup_window_popup */
NULL, /* popup_window_popdown */
NULL, /* popup_window_popped_get */
-
+
NULL, /* drag_constructor */
NULL, /* drag_begin */
-
+
NULL, /* dnd_init */
NULL, /* dnd_shutdown */
-
+
NULL, /* clipboard_text_request */
NULL, /* clipboard_text_set */
-
+
NULL, /* selection_text_request */
NULL, /* selection_text_set */
NULL /* selection_clear */
};
+/**************************
+ *
+ * Engine general functions
+ *
+ **************************/
Etk_Engine *engine_open()
{
@@ -108,6 +104,12 @@
return &engine_info;
}
+/**************************
+ *
+ * Etk_Window's functions
+ *
+ **************************/
+
static void _window_constructor(Etk_Window *window)
{
/* We _MUST_ initialize and create the ecore_evas and the x_window
@@ -117,7 +119,7 @@
engine_data = malloc(sizeof(Etk_Engine_Window_Data));
window->engine_data = engine_data;
- ETK_ENGINE_ECORE_EVAS_WINDOW_DATA(engine_data)->ecore_evas =
ecore_evas_software_x11_new(0, 0, 0, 0, 0, 0);
+ ETK_ENGINE_ECORE_EVAS_WINDOW_DATA(engine_data)->ecore_evas =
ecore_evas_software_x11_new(NULL, 0, 0, 0, 0, 0);
engine_data->x_window =
ecore_evas_software_x11_window_get(ETK_ENGINE_ECORE_EVAS_WINDOW_DATA(engine_data)->ecore_evas);
engine_info.super->window_constructor(window);
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs