Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_evas
Modified Files:
Ecore_Evas.h ecore_evas_private.h ecore_evas_x.c
Log Message:
just DONT ask! DONT! x. focvus. client, self, not getting key events... fuck!
workarounds.
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/Ecore_Evas.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- Ecore_Evas.h 7 Jul 2005 03:33:17 -0000 1.11
+++ Ecore_Evas.h 24 Sep 2005 09:00:22 -0000 1.12
@@ -79,12 +79,14 @@
EAPI Ecore_X_Window ecore_evas_software_x11_subwindow_get(Ecore_Evas *ee);
EAPI void ecore_evas_software_x11_direct_resize_set(Ecore_Evas *ee,
int on);
EAPI int ecore_evas_software_x11_direct_resize_get(Ecore_Evas *ee);
+EAPI void ecore_evas_software_x11_extra_event_window_add(Ecore_Evas
*ee, Ecore_X_Window win);
EAPI Ecore_Evas *ecore_evas_gl_x11_new(const char *disp_name,
Ecore_X_Window parent, int x, int y, int w, int h);
EAPI Ecore_X_Window ecore_evas_gl_x11_window_get(Ecore_Evas *ee);
EAPI Ecore_X_Window ecore_evas_gl_x11_subwindow_get(Ecore_Evas *ee);
EAPI void ecore_evas_gl_x11_direct_resize_set(Ecore_Evas *ee, int
on);
EAPI int ecore_evas_gl_x11_direct_resize_get(Ecore_Evas *ee);
+EAPI void ecore_evas_gl_x11_extra_event_window_add(Ecore_Evas *ee,
Ecore_X_Window win);
EAPI Ecore_Evas *ecore_evas_fb_new(char *disp_name, int rotation, int w,
int h);
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_private.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ecore_evas_private.h 5 Sep 2005 10:17:08 -0000 1.15
+++ ecore_evas_private.h 24 Sep 2005 09:00:22 -0000 1.16
@@ -90,6 +90,7 @@
Ecore_X_Window win_root;
Ecore_X_Window win_container;
Ecore_X_Window win;
+ Evas_List *win_extra;
Ecore_X_Pixmap pmap;
Ecore_X_Pixmap mask;
Ecore_X_GC gc;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_x.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- ecore_evas_x.c 18 Sep 2005 03:59:09 -0000 1.56
+++ ecore_evas_x.c 24 Sep 2005 09:00:22 -0000 1.57
@@ -872,6 +872,15 @@
ee->engine.x.damages = 0;
ecore_evases_hash = evas_hash_del(ecore_evases_hash,
_ecore_evas_x_winid_str_get(ee->engine.x.win), ee);
ecore_evases_hash = evas_hash_del(ecore_evases_hash,
_ecore_evas_x_winid_str_get(ee->engine.x.win_container), ee);
+ while (ee->engine.x.win_extra)
+ {
+ Ecore_X_Window *winp;
+
+ winp = ee->engine.x.win_extra->data;
+ ee->engine.x.win_extra = evas_list_remove_list(ee->engine.x.win_extra,
ee->engine.x.win_extra);
+ ecore_evases_hash = evas_hash_del(ecore_evases_hash,
_ecore_evas_x_winid_str_get(*winp), ee);
+ free(winp);
+ }
ecore_evases = _ecore_list2_remove(ecore_evases, ee);
_ecore_evas_x_shutdown();
ecore_x_shutdown();
@@ -1757,6 +1766,28 @@
*
* FIXME: To be fixed.
*/
+void
+ecore_evas_software_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window
win)
+{
+#ifdef BUILD_ECORE_X
+ Ecore_X_Window *winp;
+
+ winp = malloc(sizeof(Ecore_X_Window));
+ if (winp)
+ {
+ *winp = win;
+ ee->engine.x.win_extra = evas_list_append(ee->engine.x.win_extra, winp);
+ ecore_evases_hash = evas_hash_add(ecore_evases_hash,
_ecore_evas_x_winid_str_get(win), ee);
+ }
+#else
+#endif
+}
+
+/**
+ * To be documented.
+ *
+ * FIXME: To be fixed.
+ */
Ecore_Evas *
ecore_evas_gl_x11_new(const char *disp_name, Ecore_X_Window parent,
int x, int y, int w, int h)
@@ -1953,3 +1984,14 @@
#endif
}
+/**
+ * To be documented.
+ *
+ * FIXME: To be fixed.
+ */
+void
+ecore_evas_gl_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win)
+{
+ ecore_evas_software_x11_extra_event_window_add(ee, win);
+}
+
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
