Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
ewl_container.c ewl_embed.c ewl_separator.c ewl_window.c
ewl_window.h
Log Message:
* Documentation changes
* More protections on the engine specific sections
* Change in the fill policy for the separator
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_container.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- ewl_container.c 5 Apr 2004 06:34:54 -0000 1.65
+++ ewl_container.c 28 Apr 2004 13:45:56 -0000 1.66
@@ -185,7 +185,7 @@
* @param pc: the parent container that will hold the child
* @param child: the child to add to the container
* @return Returns no value.
- * @brief Add a child at the end of the container
+ * @brief Add a child at the beginning of the container
*
* Attaches the child to the start of the parent containers child list.
*/
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_embed.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- ewl_embed.c 24 Mar 2004 04:11:09 -0000 1.31
+++ ewl_embed.c 28 Apr 2004 13:45:57 -0000 1.32
@@ -162,7 +162,7 @@
if (w->fx_clip_box) {
evas_object_clip_set(emb->smart, w->fx_clip_box);
- evas_object_repeat_events_set(w->fx_clip_box, TRUE);
+ evas_object_repeat_events_set(w->fx_clip_box, FALSE);
/*
* Catch mouse events processed through the evas
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_separator.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ewl_separator.c 12 Nov 2003 20:07:17 -0000 1.23
+++ ewl_separator.c 28 Apr 2004 13:45:57 -0000 1.24
@@ -37,13 +37,16 @@
w = EWL_WIDGET(s);
- if (o == EWL_ORIENTATION_HORIZONTAL)
+ if (o == EWL_ORIENTATION_HORIZONTAL) {
ewl_widget_init(w, "hseparator");
- else
+ ewl_object_set_fill_policy(EWL_OBJECT(s), EWL_FLAG_FILL_HFILL);
+ }
+ else {
ewl_widget_init(w, "vseparator");
+ ewl_object_set_fill_policy(EWL_OBJECT(s), EWL_FLAG_FILL_VFILL);
+ }
ewl_object_set_alignment(EWL_OBJECT(s), EWL_FLAG_ALIGN_LEFT);
- ewl_object_set_fill_policy(EWL_OBJECT(s), EWL_FLAG_FILL_FILL);
s->orientation = o;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_window.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- ewl_window.c 24 Mar 2004 04:11:09 -0000 1.77
+++ ewl_window.c 28 Apr 2004 13:45:57 -0000 1.78
@@ -104,7 +104,10 @@
if (!REALIZED(win))
return;
- ecore_x_window_prop_title_set((Ecore_X_Window)win->window, title);
+#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+ if (strstr(win->render, "x11"))
+ ecore_x_window_prop_title_set((Ecore_X_Window)win->window, title);
+#endif
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -149,7 +152,11 @@
if (!REALIZED(win))
return;
- ecore_x_window_prop_name_class_set((Ecore_X_Window)win->window, name,
win->name);
+#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+ if (strstr(win->render, "x11"))
+ ecore_x_window_prop_name_class_set((Ecore_X_Window)win->window,
+ name, win->name);
+#endif
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -194,8 +201,11 @@
if (!REALIZED(win))
return;
- ecore_x_window_prop_name_class_set((Ecore_X_Window)win->window, classname,
- win->classname);
+#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+ if (strstr(win->render, "x11"))
+ ecore_x_window_prop_name_class_set((Ecore_X_Window)win->window,
+ classname, win->classname);
+#endif
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -230,8 +240,11 @@
win->flags |= EWL_WINDOW_BORDERLESS;
- if (REALIZED(win))
- ecore_x_window_prop_borderless_set((Ecore_X_Window)win->window, TRUE);
+#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+ if (REALIZED(win) && strstr(win->render, "x11"))
+ ecore_x_window_prop_borderless_set((Ecore_X_Window)win->window,
+ TRUE);
+#endif
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -251,8 +264,12 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("win", win);
- if (REALIZED(win))
+ if (!REALIZED(win))
+ DRETURN(DLEVEL_STABLE);
+#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+ if (strstr(win->render, "x11"))
ecore_x_window_move((Ecore_X_Window)win->window, x, y);
+#endif
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -456,6 +473,8 @@
ewl_object_get_current_h(o));
ewl_embed_set_evas(embed, evas, window->window);
+ window->render = strdup(render);
+ FREE(render);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -474,7 +493,10 @@
ewl_evas_destroy(embed->evas);
embed->evas = NULL;
- ecore_x_window_del((Ecore_X_Window)EWL_WINDOW(embed)->window);
+#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+ if (strstr(EWL_WINDOW(embed)->render, "x11"))
+ ecore_x_window_del((Ecore_X_Window)EWL_WINDOW(embed)->window);
+#endif
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -487,11 +509,16 @@
if (!EWL_WINDOW(w)->window)
DRETURN(DLEVEL_STABLE);
- if (EWL_WINDOW(w)->flags & EWL_WINDOW_BORDERLESS)
-
ecore_x_window_prop_borderless_set((Ecore_X_Window)EWL_WINDOW(w)->window, 1);
+#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+ if (strstr(EWL_WINDOW(w)->render, "x11")) {
+ if (EWL_WINDOW(w)->flags & EWL_WINDOW_BORDERLESS)
+ ecore_x_window_prop_borderless_set((Ecore_X_Window)
+ EWL_WINDOW(w)->window, 1);
- ecore_x_window_show((Ecore_X_Window)EWL_WINDOW(w)->window);
- ecore_x_window_show((Ecore_X_Window)EWL_EMBED(w)->evas_window);
+ ecore_x_window_show((Ecore_X_Window)EWL_WINDOW(w)->window);
+ ecore_x_window_show((Ecore_X_Window)EWL_EMBED(w)->evas_window);
+ }
+#endif
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -501,8 +528,12 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("widget", widget);
- ecore_x_window_hide((Ecore_X_Window)EWL_EMBED(widget)->evas_window);
- ecore_x_window_hide((Ecore_X_Window)EWL_WINDOW(widget)->window);
+#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+ if (strstr(EWL_WINDOW(widget)->render, "x11")) {
+ ecore_x_window_hide((Ecore_X_Window)EWL_EMBED(widget)->evas_window);
+ ecore_x_window_hide((Ecore_X_Window)EWL_WINDOW(widget)->window);
+ }
+#endif
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -516,15 +547,18 @@
win = EWL_WINDOW(w);
- IF_FREE(win->title);
-
- ecore_x_window_hide((Ecore_X_Window)EWL_EMBED(win)->evas_window);
- ecore_x_window_hide((Ecore_X_Window)win->window);
+#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+ if (REALIZED(win) && strstr(win->render, "x11")) {
+ ecore_x_window_hide((Ecore_X_Window)EWL_EMBED(win)->evas_window);
+ ecore_x_window_hide((Ecore_X_Window)win->window);
- ecore_x_window_del((Ecore_X_Window)EWL_EMBED(win)->evas_window);
- ecore_x_window_del((Ecore_X_Window)win->window);
+ ecore_x_window_del((Ecore_X_Window)EWL_EMBED(win)->evas_window);
+ ecore_x_window_del((Ecore_X_Window)win->window);
+ }
+#endif
IF_FREE(win->title);
+ IF_FREE(win->render);
if ((win = ecore_list_goto(ewl_window_list, win)))
ecore_list_remove(ewl_window_list);
@@ -548,12 +582,16 @@
/*
* Adjust the maximum window bounds to match the widget
*/
- ecore_x_window_prop_min_size_set((Ecore_X_Window)win->window,
- ewl_object_get_minimum_w(EWL_OBJECT(w)),
- ewl_object_get_minimum_h(EWL_OBJECT(w)));
- ecore_x_window_prop_max_size_set((Ecore_X_Window)win->window,
- ewl_object_get_maximum_w(EWL_OBJECT(w)),
- ewl_object_get_maximum_h(EWL_OBJECT(w)));
+#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+ if (strstr(win->render, "x11")) {
+ ecore_x_window_prop_min_size_set((Ecore_X_Window)win->window,
+ ewl_object_get_minimum_w(EWL_OBJECT(w)),
+ ewl_object_get_minimum_h(EWL_OBJECT(w)));
+ ecore_x_window_prop_max_size_set((Ecore_X_Window)win->window,
+ ewl_object_get_maximum_w(EWL_OBJECT(w)),
+ ewl_object_get_maximum_h(EWL_OBJECT(w)));
+ }
+#endif
/*
* Find out how much space the widget accepted.
@@ -568,13 +606,22 @@
if (win->flags & EWL_WINDOW_USER_CONFIGURE)
win->flags &= ~EWL_WINDOW_USER_CONFIGURE;
else {
- ecore_x_window_resize((Ecore_X_Window)win->window, width, height);
+#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+ if (strstr(win->render, "x11"))
+ ecore_x_window_resize((Ecore_X_Window)win->window,
+ width, height);
+#endif
}
- if (EWL_EMBED(win)->evas_window != win->window)
- ecore_x_window_resize((Ecore_X_Window)EWL_EMBED(win)->evas_window,
width,
- height);
+ if (EWL_EMBED(win)->evas_window != win->window) {
+#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+ if (strstr(win->render, "x11"))
+ ecore_x_window_resize((Ecore_X_Window)
+ EWL_EMBED(win)->evas_window, width,
+ height);
+#endif
+ }
evas_output_size_set(EWL_EMBED(win)->evas, width, height);
evas_output_viewport_set(EWL_EMBED(win)->evas,
ewl_object_get_current_x(EWL_OBJECT(w)),
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_window.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- ewl_window.h 27 Feb 2004 00:30:58 -0000 1.28
+++ ewl_window.h 28 Apr 2004 13:45:59 -0000 1.29
@@ -47,6 +47,7 @@
int x; /**< Screen relative horizontal position of window */
int y; /**< Screen relative vertical position of window */
+ char *render; /**< The render engine in use */
};
Ewl_Widget *ewl_window_new(void);
-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g.
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
