E CVS: libs/ecore raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/bin
Modified Files:
ecore_evas_test_app.c
Log Message:
properly support shaped windows with xrender engine... :)
===
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/bin/ecore_evas_test_app.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ecore_evas_test_app.c 22 May 2005 03:01:59 - 1.7
+++ ecore_evas_test_app.c 3 Oct 2005 06:45:45 - 1.8
@@ -72,6 +72,11 @@
ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 240, 320);
evas = ecore_evas_get(ee);
}
+ else if ((argc > 1) && (!strcmp(argv[1], "-xr")))
+ {
+ ee = ecore_evas_xrender_x11_new(NULL, 0, 0, 0, 240, 320);
+ evas = ecore_evas_get(ee);
+ }
#if HAVE_ECORE_EVAS_GL
else if ((argc > 1) && (!strcmp(argv[1], "-gl")))
{
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore
Modified Files:
configure.in
Log Message:
properly support shaped windows with xrender engine... :)
===
RCS file: /cvsroot/enlightenment/e17/libs/ecore/configure.in,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -3 -r1.110 -r1.111
--- configure.in3 Oct 2005 02:29:54 - 1.110
+++ configure.in3 Oct 2005 06:45:45 - 1.111
@@ -576,6 +576,48 @@
fi
fi
+want_ecore_evas_xrender="yes";
+have_ecore_evas_xrender="no";
+
+AC_MSG_CHECKING(whether ecore_evas xrender support is to be built)
+AC_ARG_ENABLE(ecore-evas-xrender,
+ [ --disable-ecore-evas-xrender disable xrender in the ecore_evas
module],
+ [
+if [ test "$enableval" = "yes" ]; then
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+ want_ecore_evas_xrender="no"
+fi
+ ], [
+AC_MSG_RESULT(yes)
+ ]
+)
+
+dnl Xrender support requires X support, so we should
+dnl handle the case where our user is on crack
+dnl i.e. user disables X but enables Xrender
+PCFLAGS=$CFLAGS
+CFLAGS="$EVAS_CFLAGS $CFLAGS"
+if test "x$want_ecore_evas_xrender" = "xyes" -a "x$have_ecore_x" = "xyes"; then
+ AC_CHECK_HEADER(Evas_Engine_XRender_X11.h,
+[
+ AM_CONDITIONAL(BUILD_ECORE_EVAS_XRENDER, true)
+ AC_DEFINE(BUILD_ECORE_EVAS_XRENDER, 1, [Support for XRender Engine in
Ecore_Evas])
+ have_ecore_evas_xrender="yes";
+], [
+ AM_CONDITIONAL(BUILD_ECORE_EVAS_XRENDER, false)
+], [
+ #include
+]
+ )
+else
+ AM_CONDITIONAL(BUILD_ECORE_EVAS_XRENDER, false)
+ if test "x$want_ecore_evas_xrender" = "xyes"; then
+AC_MSG_WARN(Silly monkey: ecore_evas_xrender requires ecore_x ...
disabling ecore_evas_xrender)
+ fi
+fi
+
want_ecore_evas_fb="yes";
have_ecore_evas_fb="no";
@@ -1052,20 +1094,21 @@
echo
echo "Optional Modules:"
echo
-echo " Ecore_Job...: $have_ecore_job"
-echo " Ecore_Con...: $have_ecore_con (OpenSSL: $use_openssl)"
-echo " Ecore_Txt...: $have_ecore_txt"
-echo " Ecore_X.: $have_ecore_x (Xcursor: $use_Xcursor)
(Xprint: $use_Xprint) (Xinerama: $use_Xinerama) (Xrandr: $use_Xrandr)"
-echo " Ecore_FB: $have_ecore_fb"
-echo " Ecore_Evas..: $have_ecore_evas"
-echo " Ecore_Evas GL Support...: $have_ecore_evas_gl"
-echo " Ecore_Evas FB Support...: $have_ecore_evas_fb"
-echo " Ecore_Buffer: $have_ecore_evas_buffer"
-echo " Ecore_Ipc...: $have_ecore_ipc (OpenSSL: $use_openssl)"
-echo " Ecore_Config: $have_ecore_config"
-echo " Ecore_DBUS..: $have_ecore_dbus"
-#echo " Ecore_File..: $have_ecore_file (Inotify: $use_inotify)
(FAM: $use_fam) (Poll: $use_poll)"
-echo " Ecore_File..: $have_ecore_file (Inotify: $use_inotify)
(Poll: $use_poll) (CURL: $use_curl)"
+echo " Ecore_Job: $have_ecore_job"
+echo " Ecore_Con: $have_ecore_con (OpenSSL: $use_openssl)"
+echo " Ecore_Txt: $have_ecore_txt"
+echo " Ecore_X..: $have_ecore_x (Xcursor: $use_Xcursor)
(Xprint: $use_Xprint) (Xinerama: $use_Xinerama) (Xrandr: $use_Xrandr)"
+echo " Ecore_FB.: $have_ecore_fb"
+echo " Ecore_Evas...: $have_ecore_evas"
+echo " Ecore_Evas GL Support: $have_ecore_evas_gl"
+echo " Ecore_Evas XRender Support...: $have_ecore_evas_xrender"
+echo " Ecore_Evas FB Support: $have_ecore_evas_fb"
+echo " Ecore_Buffer.: $have_ecore_evas_buffer"
+echo " Ecore_Ipc: $have_ecore_ipc (OpenSSL: $use_openssl)"
+echo " Ecore_Config.: $have_ecore_config"
+echo " Ecore_DBUS...: $have_ecore_dbus"
+#echo " Ecore_File...: $have_ecore_file (Inotify:
$use_inotify) (FAM: $use_fam) (Poll: $use_poll)"
+echo " Ecore_File...: $have_ecore_file (Inotify:
$use_inotify) (Poll: $use_poll) (CURL: $use_curl)"
echo
echo "Now type 'make' ('gmake' on some systems) to compile $PACKAGE."
echo
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore raster
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.c ecore_evas_private.h ecore_evas_x.c
Log Message:
properly support shaped windows with xrender engine... :)
===
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/Ecore_Evas.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- Ecore_Evas.h24 Sep 2005 09:00:22 - 1.12
+++ Ecore_Evas.h3 Oct 2005 06:45:45 - 1.13
@@ -53,7 +53,8 @@
ECORE_EVAS_ENGINE_SOFTWARE_X11,
ECORE_EVAS_ENGINE_SOFTWARE_FB,
ECORE_EVAS_ENGINE_GL_X11,
- ECORE_EVAS_ENGINE_SOFTWARE_BUFFER
+ ECORE_EVAS_ENGINE_SOFTWARE_BUFFER,
+ ECORE_EVAS_ENGINE_XRENDER_X11
} Ecore_Evas_Engine_Type;
#ifndef _ECORE_X_H
@@ -88,6 +89,13 @@
EAPI int ecore_evas_gl_x11_direct_resize_get(Ecore_Evas *ee);
EAPI voidecore_evas_gl_x11_extra_event_window_add(Ecore_Evas *ee,
Ecore_X_Window win);
+EAPI Ecore_Evas *ecore_evas_xrender_x11_new(const char *disp_name,
Ecore_X_Window parent, int x, int y, int w, int h);
+EAPI Ecore_X_Window ecore_evas_xrender_x11_window_get(Ecore_Evas *ee);
+EAPI Ecore_X_Window ecore_evas_xrender_x11_subwindow_get(Ecore_Evas *ee);
+EAPI voidecore_evas_xrender_x11_direct_resize_set(Ecore_Evas *ee,
int on);
+EAPI int ecore_evas_xrender_x11_direct_resize_get(Ecore_Evas *ee);
+EAPI voidecore_evas_xrender_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);
EAPI Ecore_Evas *ecore_evas_buffer_new(int w, int h);
===
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/ecore_evas.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- ecore_evas.c29 Jul 2005 21:47:33 - 1.20
+++ ecore_evas.c3 Oct 2005 06:45:45 - 1.21
@@ -42,6 +42,13 @@
return 0;
#endif
break;
+ case ECORE_EVAS_ENGINE_XRENDER_X11:
+#ifdef BUILD_ECORE_EVAS_XRENDER
+ return 1;
+#else
+ return 0;
+#endif
+ break;
case ECORE_EVAS_ENGINE_SOFTWARE_BUFFER:
#ifdef BUILD_ECORE_EVAS_BUFFER
return 1;
===
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_private.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ecore_evas_private.h24 Sep 2005 09:00:22 - 1.16
+++ ecore_evas_private.h3 Oct 2005 06:45:45 - 1.17
@@ -26,6 +26,9 @@
#ifdef BUILD_ECORE_EVAS_GL
#include
#endif
+#ifdef BUILD_ECORE_EVAS_XRENDER
+#include
+#endif
#endif
#ifdef BUILD_ECORE_EVAS_FB
#include
===
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_x.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- ecore_evas_x.c 24 Sep 2005 09:00:22 - 1.57
+++ ecore_evas_x.c 3 Oct 2005 06:45:45 - 1.58
@@ -1048,41 +1048,78 @@
static void
_ecore_evas_x_shaped_set(Ecore_Evas *ee, int shaped)
{
- Evas_Engine_Info_Software_X11 *einfo;
-
- if (((ee->shaped) && (shaped)) ||
- ((!ee->shaped) && (!shaped)))
+ if (((ee->shaped) && (shaped)) || ((!ee->shaped) && (!shaped)))
return;
- if (!strcmp(ee->driver, "gl_x11")) return;
- ee->shaped = shaped;
- einfo = (Evas_Engine_Info_Software_X11 *)evas_engine_info_get(ee->evas);
- if (einfo)
+ if (!strcmp(ee->driver, "software_x11"))
{
- if (ee->shaped)
+ Evas_Engine_Info_Software_X11 *einfo;
+
+ ee->shaped = shaped;
+ einfo = (Evas_Engine_Info_Software_X11 *)evas_engine_info_get(ee->evas);
+ if (einfo)
{
-GC gc;
-XGCValues gcv;
-
-ee->engine.x.mask = ecore_x_pixmap_new(ee->engine.x.win, ee->w,
ee->h, 1);
-gcv.foreground = 0;
-gc = XCreateGC(ecore_x_display_get(), ee->engine.x.mask,
- GCForeground,
- &gcv);
-XFillRectangle(ecore_x_display_get(), ee->engine.x.mask, gc,
- 0, 0, ee->w, ee->h);
-XFreeGC(ecore_x_display_get(), gc);
-einfo->info.mask = ee->engine.x.mask;
-evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
-evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
+if (ee->shaped)
+ {
+ GC gc;
+ XGCValues gcv;
+
+ ee->engine.x.mask = ecore_x_pixmap_new(ee->engine.x.win,
ee->w, ee->h, 1);
E CVS: libs/ewl rbdpngn
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin
Modified Files:
ewl_border_test.c ewl_box_test.c ewl_button_test.c
ewl_dialog_test.c ewl_embed_test.c ewl_entry_test.c
ewl_floater_test.c ewl_iconbox_test.c ewl_image_test.c
ewl_media_test.c ewl_notebook_test.c ewl_paned_test.c
ewl_password_test.c ewl_progressbar_test.c
ewl_selectionbar_test.c ewl_selectionbook_test.c
ewl_simple_test.c ewl_spinner_test.c ewl_statusbar_test.c
ewl_table_test.c ewl_test.c ewl_text_test.c ewl_theme_test.c
ewl_tooltip_test.c ewl_tree_test.c
Log Message:
API Breakage:
Changing constructor conventions, they do not require extra params.
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/bin/ewl_border_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_border_test.c 28 May 2005 20:32:49 - 1.2
+++ ewl_border_test.c 3 Oct 2005 06:43:07 - 1.3
@@ -98,17 +98,20 @@
ewl_container_child_append(EWL_CONTAINER(border_box), avbox);
ewl_widget_show(avbox);
- alabel = ewl_text_new("Tabs Alignment");
+ alabel = ewl_text_new();
+ ewl_text_text_set(EWL_TEXT(alabel), "Tabs Alignment");
ewl_container_child_append(EWL_CONTAINER(avbox), alabel);
ewl_widget_show(alabel);
- button_atop = ewl_radiobutton_new("Top");
+ button_atop = ewl_radiobutton_new();
+ ewl_button_label_set(EWL_BUTTON(button_atop), "Top");
ewl_container_child_append(EWL_CONTAINER(avbox), button_atop);
ewl_callback_append(button_atop, EWL_CALLBACK_VALUE_CHANGED,
__border_change_alignment, border_box);
ewl_widget_show(button_atop);
- button_aleft = ewl_radiobutton_new("Left");
+ button_aleft = ewl_radiobutton_new();
+ ewl_button_label_set(EWL_BUTTON(button_aleft), "Left");
ewl_radiobutton_checked_set(button_aleft, 1);
ewl_container_child_append(EWL_CONTAINER(avbox), button_aleft);
ewl_radiobutton_chain_set(EWL_RADIOBUTTON(button_aleft),
@@ -117,7 +120,8 @@
__border_change_alignment, border_box);
ewl_widget_show(button_aleft);
- button_acenter = ewl_radiobutton_new("Center");
+ button_acenter = ewl_radiobutton_new();
+ ewl_button_label_set(EWL_BUTTON(button_acenter), "Center");
ewl_radiobutton_chain_set(EWL_RADIOBUTTON(button_acenter),
EWL_RADIOBUTTON(button_aleft));
ewl_radiobutton_checked_set(button_acenter, 1);
@@ -126,7 +130,8 @@
__border_change_alignment, border_box);
ewl_widget_show(button_acenter);
- button_aright = ewl_radiobutton_new("Right");
+ button_aright = ewl_radiobutton_new();
+ ewl_button_label_set(EWL_BUTTON(button_aright), "Right");
ewl_radiobutton_chain_set(EWL_RADIOBUTTON(button_aright),
EWL_RADIOBUTTON(button_acenter));
ewl_container_child_append(EWL_CONTAINER(avbox), button_aright);
@@ -134,7 +139,8 @@
__border_change_alignment, border_box);
ewl_widget_show(button_aright);
- button_abottom = ewl_radiobutton_new("Bottom");
+ button_abottom = ewl_radiobutton_new();
+ ewl_button_label_set(EWL_BUTTON(button_abottom), "Bottom");
ewl_radiobutton_chain_set(EWL_RADIOBUTTON(button_abottom),
EWL_RADIOBUTTON(button_aright));
ewl_container_child_append(EWL_CONTAINER(avbox), button_abottom);
@@ -147,17 +153,20 @@
ewl_container_child_append(EWL_CONTAINER(border_box), pvbox);
ewl_widget_show(pvbox);
- plabel = ewl_text_new("Tabs Position");
+ plabel = ewl_text_new();
+ ewl_text_text_set(EWL_TEXT(plabel), "Tabs Position");
ewl_container_child_append(EWL_CONTAINER(pvbox), plabel);
ewl_widget_show(plabel);
- button_pleft = ewl_radiobutton_new("Left");
+ button_pleft = ewl_radiobutton_new();
+ ewl_button_label_set(EWL_BUTTON(button_pleft), "Left");
ewl_container_child_append(EWL_CONTAINER(pvbox), button_pleft);
ewl_callback_append(button_pleft, EWL_CALLBACK_VALUE_CHANGED,
__border_change_position, border_box);
ewl_widget_show(button_pleft);
- button_pright = ewl_radiobutton_new("Right");
+ button_pright = ewl_radiobutton_new();
+ ewl_button_label_set(EWL_BUTTON(button_pright), "Right");
ewl_radiobutton_chain_set(EWL_RADIOBUTTON(button_pright),
EWL_RADIOBUTTON(button_pleft));
ewl_container_child_append(EWL_CONTAINER(pvbox), button_pright);
@@ -165,7 +174,8 @@
__border_change_position, border_box);
ewl_widget_show(b
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/xrender_x11
Modified Files:
evas_engine.c
Log Message:
fix target mask support
===
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/xrender_x11/evas_engine.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_engine.c 3 Oct 2005 05:56:31 - 1.3
+++ evas_engine.c 3 Oct 2005 06:45:43 - 1.4
@@ -243,7 +243,9 @@
if (re->mask)
{
if (re->mask_output) _xr_render_surface_free(re->mask_output);
- re->mask_output = _xr_render_surface_format_adopt(re->xinf, re->win,
e->output.w, e->output.h, re->xinf->fmt1, 1);
+ re->mask_output = _xr_render_surface_format_adopt(re->xinf, re->mask,
+ e->output.w,
e->output.h,
+ re->xinf->fmt1, 1);
}
}
@@ -278,7 +280,9 @@
if (re->mask_output)
{
if (re->mask_output) _xr_render_surface_free(re->mask_output);
- re->mask_output = _xr_render_surface_format_adopt(re->xinf, re->win, w,
h, re->xinf->fmt1, 1);
+ re->mask_output = _xr_render_surface_format_adopt(re->xinf, re->mask,
+ w, h,
+ re->xinf->fmt1, 1);
}
evas_common_tilebuf_free(re->tb);
re->tb = evas_common_tilebuf_new(w, h);
@@ -352,8 +356,14 @@
*x = ux; *y = uy; *w = uw; *h = uh;
*cx = 0; *cy = 0; *cw = uw; *ch = uh;
- if ((re->destination_alpha)|| (re->mask))
- return _xr_render_surface_new(re->xinf, uw, uh, re->xinf->fmt32, 1);
+ if ((re->destination_alpha) || (re->mask))
+ {
+ Xrender_Surface *surface;
+
+ surface = _xr_render_surface_new(re->xinf, uw, uh, re->xinf->fmt32, 1);
+ _xr_render_surface_solid_rectangle_set(surface, 0, 0, 0, 0, 0, 0, uw,
uh);
+ return surface;
+ }
return _xr_render_surface_new(re->xinf, uw, uh, re->xinf->fmt24, 0);
}
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e_utils rbdpngn
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : apps/e_utils
Dir : e17/apps/e_utils/src/bin/eapp_edit
Modified Files:
eapp_edit_main.c
Log Message:
Update to EWL API changes.
===
RCS file:
/cvsroot/enlightenment/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- eapp_edit_main.c5 Sep 2005 16:42:36 - 1.25
+++ eapp_edit_main.c3 Oct 2005 06:43:48 - 1.26
@@ -195,7 +195,8 @@
ewl_box_spacing_set(EWL_BOX(hbox), 5);
ewl_widget_show(hbox);
-o = ewl_button_new("Save");
+o = ewl_button_new();
+ewl_button_label_set(EWL_BUTTON(o), "Save");
ewl_container_child_append(EWL_CONTAINER(hbox), o);
ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(o), EWL_FLAG_ALIGN_CENTER);
@@ -204,7 +205,8 @@
ewl_callback_append(o, EWL_CALLBACK_CLICKED, eapp_cb_save, NULL);
ewl_widget_show(o);
-o = ewl_button_new("Cancel");
+o = ewl_button_new();
+ewl_button_label_set(EWL_BUTTON(o), "Cancel");
ewl_container_child_append(EWL_CONTAINER(hbox), o);
ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(o), EWL_FLAG_ALIGN_CENTER);
@@ -239,7 +241,8 @@
ewl_image_scale_to(EWL_IMAGE(row[0]), 32, 32);
ewl_widget_show(row[0]);
-row[1] = ewl_button_new("Set Icon");
+row[1] = ewl_button_new();
+ewl_button_label_set(EWL_BUTTON(row[1]), "Set Icon");
ewl_callback_append(row[1], EWL_CALLBACK_CLICKED, eapp_cb_fd_show, NULL);
ewl_object_fill_policy_set(EWL_OBJECT(row[1]), EWL_FLAG_FILL_SHRINK);
ewl_widget_show(row[1]);
@@ -249,7 +252,8 @@
/* add all the eet data */
for (i = 0; i < (sizeof(keys) / sizeof(keys[0])); i++)
{
-row[0] = ewl_text_new(NULL);
+row[0] = ewl_text_new();
+ewl_text_text_set(EWL_TEXT(row[0]), NULL);
ewl_text_styles_set(EWL_TEXT(row[0]), EWL_TEXT_STYLE_SOFT_SHADOW);
ewl_text_shadow_color_set(EWL_TEXT(row[0]), 128, 128, 128, 128);
ewl_text_text_set(EWL_TEXT(row[0]), keys[i].name);
@@ -258,7 +262,8 @@
v = eapp_eet_read(ef, keys[i].key, lang);
if (keys[i].checkbox)
{
-row[1] = ewl_checkbutton_new("");
+row[1] = ewl_checkbutton_new();
+ewl_button_label_set(EWL_BUTTON(row[1]), "");
ewl_checkbutton_checked_set(EWL_CHECKBUTTON(row[1]), v[0] == 1);
}
else
@@ -268,7 +273,8 @@
if (winclass) v = winclass;
}
-row[1] = ewl_entry_new(v);
+row[1] = ewl_entry_new();
+ewl_text_text_set(EWL_TEXT(row[1]), v);
}
ewl_widget_name_set(row[1], keys[i].key);
ewl_widget_show(row[1]);
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/xrender_x11
Modified Files:
evas_engine.c
Log Message:
update mask support...
===
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/xrender_x11/evas_engine.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_engine.c 3 Oct 2005 03:34:21 - 1.2
+++ evas_engine.c 3 Oct 2005 05:56:31 - 1.3
@@ -74,10 +74,6 @@
static void evas_engine_xrender_x11_font_cache_set(void *data, int bytes);
static int evas_engine_xrender_x11_font_cache_get(void *data);
-static Visual *evas_engine_xrender_x11_best_visual_get(Display *disp, int
screen);
-static Colormap evas_engine_xrender_x11_best_colormap_get(Display *disp, int
screen);
-static int evas_engine_xrender_x11_best_depth_get(Display *disp, int screen);
-
typedef struct _Render_Engine Render_Engine;
struct _Render_Engine
@@ -188,9 +184,6 @@
info = calloc(1, sizeof(Evas_Engine_Info_XRender_X11));
if (!info) return NULL;
info->magic.magic = rand();
- info->func.best_visual_get = evas_engine_xrender_x11_best_visual_get;
- info->func.best_colormap_get = evas_engine_xrender_x11_best_colormap_get;
- info->func.best_depth_get = evas_engine_xrender_x11_best_depth_get;
return info;
e = NULL;
}
@@ -262,11 +255,11 @@
re = (Render_Engine *)data;
evas_common_font_shutdown();
evas_common_image_shutdown();
- if (re->xinf) _xr_image_info_free(re->xinf);
if (re->tb) evas_common_tilebuf_free(re->tb);
if (re->output) _xr_render_surface_free(re->output);
if (re->mask_output) _xr_render_surface_free(re->mask_output);
if (re->rects) evas_common_tilebuf_free_render_rects(re->rects);
+ if (re->xinf) _xr_image_info_free(re->xinf);
free(re);
}
@@ -1044,34 +1037,3 @@
re = (Render_Engine *)data;
return evas_common_font_cache_get();
}
-
-
-
-
-
-
-
-
-
-/* private engine functions the calling prog can use */
-
-static Visual *
-evas_engine_xrender_x11_best_visual_get(Display *disp, int screen)
-{
- if (!disp) return NULL;
- return DefaultVisual(disp, screen);
-}
-
-static Colormap
-evas_engine_xrender_x11_best_colormap_get(Display *disp, int screen)
-{
- if (!disp) return 0;
- return DefaultColormap(disp, screen);
-}
-
-static int
-evas_engine_xrender_x11_best_depth_get(Display *disp, int screen)
-{
- if (!disp) return 0;
- return DefaultDepth(disp, screen);
-}
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib
Modified Files:
Evas_Engine_XRender_X11.h
Log Message:
update mask support...
===
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/Evas_Engine_XRender_X11.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Evas_Engine_XRender_X11.h 3 Oct 2005 03:34:21 - 1.2
+++ Evas_Engine_XRender_X11.h 3 Oct 2005 05:56:31 - 1.3
@@ -19,13 +19,6 @@
Visual*visual;
unsigned char destination_alpha : 1;
} info;
- /* engine specific function calls to query stuff about the destination */
- /* engine (what visual & colormap & depth to use, performance info etc. */
- struct {
- Visual * (*best_visual_get) (Display *disp, int screen);
- Colormap (*best_colormap_get) (Display *disp, int screen);
- int (*best_depth_get)(Display *disp, int screen);
- } func;
};
#endif
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib
Modified Files:
Evas_Engine_XRender_X11.h
Log Message:
in theory support dest alpha
===
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/Evas_Engine_XRender_X11.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Evas_Engine_XRender_X11.h 2 Oct 2005 15:15:44 - 1.1
+++ Evas_Engine_XRender_X11.h 3 Oct 2005 03:34:21 - 1.2
@@ -13,10 +13,11 @@
/* engine specific data & parameters it needs to set up */
struct {
- Display *display;
- Drawable drawable;
- Pixmapmask;
- Visual *visual;
+ Display *display;
+ Drawable drawable;
+ Pixmap mask;
+ Visual*visual;
+ unsigned char destination_alpha : 1;
} info;
/* engine specific function calls to query stuff about the destination */
/* engine (what visual & colormap & depth to use, performance info etc. */
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/xrender_x11
Modified Files:
evas_engine.c evas_engine.h evas_engine_xrender.c
Log Message:
in theory support dest alpha
===
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/xrender_x11/evas_engine.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_engine.c 2 Oct 2005 15:15:44 - 1.1
+++ evas_engine.c 3 Oct 2005 03:34:21 - 1.2
@@ -86,9 +86,11 @@
Visual *vis;
Drawable win;
Pixmapmask;
+ unsigned char destination_alpha : 1;
Ximage_Info *xinf;
Xrender_Surface *output;
+ Xrender_Surface *mask_output;
Tilebuf *tb;
Tilebuf_Rect *rects;
@@ -238,11 +240,18 @@
re->vis = info->info.visual;
re->win = info->info.drawable;
re->mask = info->info.mask;
+ re->destination_alpha = info->info.destination_alpha;
+
if (re->xinf) _xr_image_info_free(re->xinf);
re->xinf = _xr_image_info_get(re->disp, re->win, re->vis);
if (re->output) _xr_render_surface_free(re->output);
re->output = _xr_render_surface_adopt(re->xinf, re->win, e->output.w,
e->output.h, 0);
+ if (re->mask)
+ {
+ if (re->mask_output) _xr_render_surface_free(re->mask_output);
+ re->mask_output = _xr_render_surface_format_adopt(re->xinf, re->win,
e->output.w, e->output.h, re->xinf->fmt1, 1);
+ }
}
static void
@@ -256,6 +265,7 @@
if (re->xinf) _xr_image_info_free(re->xinf);
if (re->tb) evas_common_tilebuf_free(re->tb);
if (re->output) _xr_render_surface_free(re->output);
+ if (re->mask_output) _xr_render_surface_free(re->mask_output);
if (re->rects) evas_common_tilebuf_free_render_rects(re->rects);
free(re);
}
@@ -272,6 +282,11 @@
if (re->output) _xr_render_surface_free(re->output);
}
re->output = _xr_render_surface_adopt(re->xinf, re->win, w, h, 0);
+ if (re->mask_output)
+ {
+ if (re->mask_output) _xr_render_surface_free(re->mask_output);
+ re->mask_output = _xr_render_surface_format_adopt(re->xinf, re->win, w,
h, re->xinf->fmt1, 1);
+ }
evas_common_tilebuf_free(re->tb);
re->tb = evas_common_tilebuf_new(w, h);
if (re->tb) evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE);
@@ -344,6 +359,8 @@
*x = ux; *y = uy; *w = uw; *h = uh;
*cx = 0; *cy = 0; *cw = uw; *ch = uh;
+ if ((re->destination_alpha)|| (re->mask))
+ return _xr_render_surface_new(re->xinf, uw, uh, re->xinf->fmt32, 1);
return _xr_render_surface_new(re->xinf, uw, uh, re->xinf->fmt24, 0);
}
@@ -353,8 +370,27 @@
Render_Engine *re;
re = (Render_Engine *)data;
- _xr_render_surface_copy((Xrender_Surface *)surface, re->output, 0, 0,
- x, y, w, h);
+ if (re->mask_output)
+ {
+ Xrender_Surface *tsurf;
+
+ _xr_render_surface_copy((Xrender_Surface *)surface, re->output, 0, 0,
+ x, y, w, h);
+ tsurf = _xr_render_surface_new(re->xinf, w, h, re->xinf->fmt1, 1);
+ if (tsurf)
+ {
+_xr_render_surface_copy((Xrender_Surface *)surface, tsurf, 0, 0,
+0, 0, w, h);
+_xr_render_surface_copy(tsurf, re->mask_output, 0, 0,
+x, y, w, h);
+_xr_render_surface_free(tsurf);
+ }
+ }
+ else
+ {
+ _xr_render_surface_copy((Xrender_Surface *)surface, re->output, 0, 0,
+ x, y, w, h);
+ }
_xr_render_surface_free((Xrender_Surface *)surface);
}
===
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/xrender_x11/evas_engine.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_engine.h 2 Oct 2005 15:15:44 - 1.1
+++ evas_engine.h 3 Oct 2005 03:34:21 - 1.2
@@ -68,6 +68,7 @@
/* xrender support calls */
Xrender_Surface *_xr_render_surface_new(Ximage_Info *xinf, int w, int h,
XRenderPictFormat *fmt, int alpha);
Xrender_Surface *_xr_render_surface_adopt(Ximage_Info *xinf, Drawable draw,
int w, int h, int alpha);
+Xrender_Surface *_xr_render_surface_format_adopt(Ximage_Info *xinf, Drawable
draw, int w, int h, XRenderPictFormat *fmt, int alpha);
void _xr_render_surface_free(Xrender_Surface *rs);
void _xr_render_surface_repeat_set(Xrender_Surface *rs, int
repeat);
void _xr_render_surface_solid_rectangle_set(Xrender_Surface *rs,
int r, int g, int b, int a, int x, int y, int w, int h);
===
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/xrend
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/bin
Modified Files:
evas_xrender_x11_test
Log Message:
in theory support dest alpha
===
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/bin/evas_xrender_x11_test,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_xrender_x11_test 2 Oct 2005 16:06:11 - 1.2
+++ evas_xrender_x11_test 3 Oct 2005 03:34:21 - 1.3
@@ -18,7 +18,7 @@
# if CDPATH is set.
if test "${CDPATH+set}" = set; then CDPATH=:; export CDPATH; fi
-relink_command="(cd /home/raster/C/evas/src/bin; { test -z
\"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export
LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH
|| { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z
\"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=;
export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset
LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; };
PATH=\"/home/raster/bin:/home/raster/s:/usr/local/bin:/usr/local/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/games:/sbin:/usr/sbin:/usr/X11R6/lib/xscreensaver:/opt/arm/3.3.2-vfp/bin:/opt/bitkeeper:/opt/java.sun/java.current/bin:.:\";
export PATH; ccache gcc -O2 -march=pentium4 -g -msse -mmmx -pipe -o
\$progdir/\$file evas_test_main.o evas_xrender_x11_main.o
../../src/lib/.libs/libevas.so -lm -L/usr/X11R6/lib -lX11 -lXext
/usr/lib/libXrender.so -Wl,--rpath -Wl,/home/raster/C/evas/src/lib/.libs)"
+relink_command="(cd /home/raster/C/evas/src/bin; { test -z
\"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export
LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH
|| { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z
\"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=;
export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset
LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; };
PATH=\"/home/raster/bin:/home/raster/s:/usr/local/bin:/usr/local/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/games:/sbin:/usr/sbin:/usr/X11R6/lib/xscreensaver:/opt/arm/3.3.2-vfp/bin:/opt/bitkeeper:/opt/java.sun/java.current/bin:.:\";
export PATH; ccache gcc -O2 -march=pentium4 -g -msse -mmmx -pipe -o
\$progdir/\$file evas_xrender_x11_test-evas_test_main.o
evas_xrender_x11_test-evas_xrender_x11_main.o ../../src/lib/.libs/libevas.so
-lm -L/usr/X11R6/lib -lX11 -lXext /usr/lib/libXrender.so -Wl,--rpath
-Wl,/home/ra
ster/C/evas/src/lib/.libs)"
# This environment variable determines our operation mode.
if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas Dir : e17/libs/evas Modified Files: configure.in Log Message: after some quiet on the western front - asparagus. === RCS file: /cvsroot/enlightenment/e17/libs/evas/configure.in,v retrieving revision 1.122 retrieving revision 1.123 diff -u -3 -r1.122 -r1.123 --- configure.in2 Oct 2005 15:15:44 - 1.122 +++ configure.in3 Oct 2005 02:29:54 - 1.123 @@ -5,7 +5,7 @@ AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_ISC_POSIX -AM_INIT_AUTOMAKE(evas, 0.9.9.015) +AM_INIT_AUTOMAKE(evas, 0.9.9.016) AM_CONFIG_HEADER(config.h) AC_C_BIGENDIAN --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/embryo raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/embryo Dir : e17/libs/embryo Modified Files: configure.in Log Message: after some quiet on the western front - asparagus. === RCS file: /cvsroot/enlightenment/e17/libs/embryo/configure.in,v retrieving revision 1.24 retrieving revision 1.25 diff -u -3 -r1.24 -r1.25 --- configure.in25 Sep 2005 05:45:48 - 1.24 +++ configure.in3 Oct 2005 02:29:54 - 1.25 @@ -7,7 +7,7 @@ AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_ISC_POSIX -AM_INIT_AUTOMAKE(embryo, 0.9.1.015) +AM_INIT_AUTOMAKE(embryo, 0.9.1.016) AM_CONFIG_HEADER(config.h) AC_C_BIGENDIAN --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/ecore Dir : e17/libs/ecore Modified Files: configure.in Log Message: after some quiet on the western front - asparagus. === RCS file: /cvsroot/enlightenment/e17/libs/ecore/configure.in,v retrieving revision 1.109 retrieving revision 1.110 diff -u -3 -r1.109 -r1.110 --- configure.in25 Sep 2005 05:45:48 - 1.109 +++ configure.in3 Oct 2005 02:29:54 - 1.110 @@ -4,7 +4,7 @@ AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_ISC_POSIX -AM_INIT_AUTOMAKE(ecore, 0.9.9.015) +AM_INIT_AUTOMAKE(ecore, 0.9.9.016) AM_CONFIG_HEADER(config.h) AC_C_BIGENDIAN --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: configure.in Log Message: after some quiet on the western front - asparagus. === RCS file: /cvsroot/enlightenment/e17/apps/e/configure.in,v retrieving revision 1.88 retrieving revision 1.89 diff -u -3 -r1.88 -r1.89 --- configure.in25 Sep 2005 05:45:48 - 1.88 +++ configure.in3 Oct 2005 02:29:54 - 1.89 @@ -7,7 +7,7 @@ AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_ISC_POSIX -AM_INIT_AUTOMAKE(enlightenment, 0.16.999.015) +AM_INIT_AUTOMAKE(enlightenment, 0.16.999.016) AM_CONFIG_HEADER(config.h) AC_C_BIGENDIAN --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/eet Dir : e17/libs/eet Modified Files: configure.in Log Message: after some quiet on the western front - asparagus. === RCS file: /cvsroot/enlightenment/e17/libs/eet/configure.in,v retrieving revision 1.39 retrieving revision 1.40 diff -u -3 -r1.39 -r1.40 --- configure.in30 Sep 2005 01:37:16 - 1.39 +++ configure.in3 Oct 2005 02:29:54 - 1.40 @@ -7,7 +7,7 @@ AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_ISC_POSIX -AM_INIT_AUTOMAKE(eet, 0.9.10.015) +AM_INIT_AUTOMAKE(eet, 0.9.10.016) AM_CONFIG_HEADER(config.h) AC_PROG_CC --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/edje Dir : e17/libs/edje Modified Files: configure.in Log Message: after some quiet on the western front - asparagus. === RCS file: /cvsroot/enlightenment/e17/libs/edje/configure.in,v retrieving revision 1.45 retrieving revision 1.46 diff -u -3 -r1.45 -r1.46 --- configure.in25 Sep 2005 05:45:48 - 1.45 +++ configure.in3 Oct 2005 02:29:54 - 1.46 @@ -7,7 +7,7 @@ AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_ISC_POSIX -AM_INIT_AUTOMAKE(edje, 0.5.0.015) +AM_INIT_AUTOMAKE(edje, 0.5.0.016) AM_CONFIG_HEADER(config.h) AC_PROG_CC --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/imlib2_loaders raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/imlib2_loaders Dir : e17/libs/imlib2_loaders Modified Files: configure.in Log Message: after some quiet on the western front - asparagus. === RCS file: /cvsroot/enlightenment/e17/libs/imlib2_loaders/configure.in,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- configure.in25 Sep 2005 05:45:48 - 1.36 +++ configure.in3 Oct 2005 02:29:54 - 1.37 @@ -5,7 +5,7 @@ AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_ISC_POSIX -AM_INIT_AUTOMAKE(imlib2_loaders, 1.2.1.006) +AM_INIT_AUTOMAKE(imlib2_loaders, 1.2.1.007) AM_CONFIG_HEADER(config.h) AC_C_BIGENDIAN --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/imlib2 raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2 Modified Files: configure.in Log Message: after some quiet on the western front - asparagus. === RCS file: /cvsroot/enlightenment/e17/libs/imlib2/configure.in,v retrieving revision 1.117 retrieving revision 1.118 diff -u -3 -r1.117 -r1.118 --- configure.in25 Sep 2005 05:45:48 - 1.117 +++ configure.in3 Oct 2005 02:29:54 - 1.118 @@ -5,7 +5,7 @@ AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_ISC_POSIX -AM_INIT_AUTOMAKE(imlib2, 1.2.1.006) +AM_INIT_AUTOMAKE(imlib2, 1.2.1.007) AM_CONFIG_HEADER(config.h) AC_C_BIGENDIAN --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
Re: [E-devel] Re: E CVS: libs/evas raster
On Sun, 2 Oct 2005 11:41:49 -0500 Nathan Ingersoll <[EMAIL PROTECTED]> babbled: > Does the software_x11 engine support anything beyond 1 bit destination alpha > (for generating the shape masks) ? no - it doesnt. at copy to screen time the alpha channel is reduced to 1 bit and copied to the mask bitmap. it could be made to support it though. > On 10/2/05, enlightenment-cvs@lists.sourceforge.net < > enlightenment-cvs@lists.sourceforge.net> wrote: > > > > Enlightenment CVS committal > > > > Author : raster > > Project : e17 > > Module : libs/evas > > > > Dir : e17/libs/evas/src/lib/engines/xrender_x11 > > > > > > Added Files: > > .cvsignore evas_engine.c evas_engine.h evas_engine_font.c > > evas_engine_gradient.c evas_engine_image.c > > evas_engine_ximage.c evas_engine_xrender.c > > > > > > Log Message: > > > > > > an xrender engine. fully complete - but it doesnt support shaped window > > masks > > and destination alpha like software_x11 does so its not a 100% dropin > > replacement... yet > > > > > > > > > > > > --- > > This SF.Net email is sponsored by: > > Power Architecture Resource Center: Free content, downloads, discussions, > > and more. http://solutions.newsforge.com/ibmarch.tmpl > > ___ > > enlightenment-cvs mailing list > > enlightenment-cvs@lists.sourceforge.net > > https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs > > > -- - Codito, ergo sum - "I code, therefore I am" -- The Rasterman (Carsten Haitzler)[EMAIL PROTECTED] 裸好多 [EMAIL PROTECTED] Tokyo, Japan (東京 日本) --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/src/lib Log Message: Directory /cvsroot/enlightenment/e17/proto/etk/src/lib added to the repository --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/data/themes Log Message: Directory /cvsroot/enlightenment/e17/proto/etk/data/themes added to the repository --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/data
Modified Files:
theme.edc
Log Message:
fix a problem when the video is larger than the display (like HD materials)
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/data/theme.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- theme.edc 24 Sep 2005 09:06:30 - 1.4
+++ theme.edc 1 Oct 2005 08:30:34 - 1.5
@@ -445,6 +445,7 @@
name: "video_progress_img";
mouse_events: 0;
clip_to: "panel_clip";
+fixed: 1 1;
description {
state: "default" 0.0;
min: 9 16;
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk Added Files: AUTHORS COPYING ChangeLog Doxyfile INSTALL Makefile.am NEWS README.in TODO autogen.sh configure.in etk-config.in gendoc Log Message: * Etk first commit --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/macros Log Message: Directory /cvsroot/enlightenment/e17/proto/etk/data/themes/default/macros added to the repository --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/gl_common
Modified Files:
evas_gl_font.c
Log Message:
an xrender engine. fully complete - but it doesnt support shaped window masks
and destination alpha like software_x11 does so its not a 100% dropin
replacement... yet
===
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/gl_common/evas_gl_font.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- evas_gl_font.c 5 Sep 2005 08:01:15 - 1.7
+++ evas_gl_font.c 2 Oct 2005 15:15:44 - 1.8
@@ -153,6 +153,7 @@
void
evas_gl_font_texture_free(Evas_GL_Font_Texture *ft)
{
+ if (!ft) return NULL;
if (ft->gc->font_texture == ft->texture)
{
ft->gc->font_texture = 0;
@@ -170,7 +171,7 @@
/* 35 */
ft = fg->ext_dat;
if (!ft) return;
- if (surface == 0)
+// if (surface == 0)
{
int r, g, b, a;
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/images Added Files: background.png border.png border2.png button_down.png button_toggled.png button_toggled.xcf button_up.png checkbox_down.png checkbox_off.png checkbox_on.png dialog_logo.png entry.png entry_focus.png focus.png glint1.png glint2.png glint3.png hhandle.png hhandle_down.png hhandle_thumb.png hscale_bar.png hscrollbar_trough.png images.edc radio_off.png radio_on.png scrollbar_bottom_arrow.png scrollbar_bottom_arrow_down.png scrollbar_left_arrow.png scrollbar_left_arrow_down.png scrollbar_right_arrow.png scrollbar_right_arrow_down.png scrollbar_top_arrow.png scrollbar_top_arrow_down.png tree_asc_arrow.png tree_bg.png tree_desc_arrow.png tree_header_active.png tree_header_inactive.png vhandle.png vhandle_down.png vhandle_thumb.png vscale_bar.png vscrollbar_trough.png Log Message: * Etk first commit --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/doc/img Log Message: Directory /cvsroot/enlightenment/e17/proto/etk/doc/img added to the repository --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/include
Modified Files:
Makefile.am evas_private.h
Added Files:
evas_engine_api_xrender_x11.h
Log Message:
an xrender engine. fully complete - but it doesnt support shaped window masks
and destination alpha like software_x11 does so its not a 100% dropin
replacement... yet
===
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/include/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Makefile.am 20 Sep 2005 17:01:03 - 1.7
+++ Makefile.am 2 Oct 2005 15:15:44 - 1.8
@@ -10,6 +10,7 @@
evas_engine_api_software_qtopia.h \
evas_engine_api_gl_x11.h \
evas_engine_api_cairo_x11.h \
+evas_engine_api_xrender_x11.h \
evas_gl_common.h \
evas_cairo_common.h \
evas_mmx.h \
===
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/include/evas_private.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- evas_private.h 31 Aug 2005 17:33:32 - 1.47
+++ evas_private.h 2 Oct 2005 15:15:44 - 1.48
@@ -19,33 +19,10 @@
#define RENDER_METHOD_GL_X11 0x0007
#define RENDER_METHOD_CAIRO_X11 0x0008
#define RENDER_METHOD_SOFTWARE_XCB 0x0009
+#define RENDER_METHOD_XRENDER_X110x000a
#define RENDER_METHOD_INVALID0x
-typedef enum _Evas_Format_Type
-{
- EVAS_FORMAT_NONE = 0,
- EVAS_FORMAT_FONT,
- EVAS_FORMAT_SIZE,
- EVAS_FORMAT_COLOR,
- EVAS_FORMAT_COLOR2,
- EVAS_FORMAT_COLOR3,
- EVAS_FORMAT_ALIGN,
- EVAS_FORMAT_STYLE,
- EVAS_FORMAT_UNDERLINE,
- EVAS_FORMAT_NEWLINE,
- EVAS_FORMAT_TAB,
- EVAS_FORMAT_L2R,
- EVAS_FORMAT_R2L,
- EVAS_FORMAT_ANCHOR
-} Evas_Format_Type;
-
-typedef enum _Evas_Format_Direction
-{
- EVAS_FORMAT_DIRECTION_VERTICAL = 0,
- EVAS_FORMAT_DIRECTION_HORIZONTAL = 1
-} Evas_Format_Direction;
-
typedef struct _Evas_Layer Evas_Layer;
typedef struct _Evas_Font_Dir Evas_Font_Dir;
typedef struct _Evas_Font Evas_Font;
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/widgets Log Message: Directory /cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets added to the repository --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default Log Message: Directory /cvsroot/enlightenment/e17/proto/etk/data/themes/default added to the repository --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/data Log Message: Directory /cvsroot/enlightenment/e17/proto/etk/data added to the repository --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/data/images Log Message: Directory /cvsroot/enlightenment/e17/proto/etk/data/images added to the repository --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/data
Modified Files:
evas_hash.c
Log Message:
an xrender engine. fully complete - but it doesnt support shaped window masks
and destination alpha like software_x11 does so its not a 100% dropin
replacement... yet
===
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/data/evas_hash.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- evas_hash.c 18 Jun 2005 01:00:30 - 1.11
+++ evas_hash.c 2 Oct 2005 15:15:44 - 1.12
@@ -208,14 +208,8 @@
{
if (l != hash->buckets[hash_num])
{
- /* FIXME: move to front of list without alloc */
hash->buckets[hash_num] =
evas_object_list_remove(hash->buckets[hash_num], el);
hash->buckets[hash_num] =
evas_object_list_prepend(hash->buckets[hash_num], el);
- if (evas_list_alloc_error())
- {
- _evas_hash_alloc_error = 1;
- return el->data;
- }
}
return el->data;
}
@@ -224,6 +218,47 @@
}
/**
+ * Modifies the entry pointer at the specified key and returns the old entry
+ * @param hash The given hash table.
+ * @param key The key string of the entry to modify.
+ * @param data The data to replace the old entry, if it exists.
+ * @return The data pointer for the old stored entry, or @c NULL if not
+ * found. If an existing entry is not found, nothing is added to the
+ * hash.
+ * @ingroup Evas_Hash_Data
+ */
+void *
+evas_hash_modify(Evas_Hash *hash, const char *key, const void *data)
+{
+ int hash_num;
+ Evas_Hash_El *el;
+ Evas_Object_List *l;
+
+ _evas_hash_alloc_error = 0;
+ if (!hash) return NULL;
+ hash_num = evas_hash_gen(key);
+ for (l = hash->buckets[hash_num]; l; l = l->next)
+ {
+ el = (Evas_Hash_El *)l;
+ if (((el->key) && (key) && (!strcmp(el->key, key))) ||
+ ((!el->key) && (!key)))
+ {
+void *old_data;
+
+if (l != hash->buckets[hash_num])
+ {
+ hash->buckets[hash_num] =
evas_object_list_remove(hash->buckets[hash_num], el);
+ hash->buckets[hash_num] =
evas_object_list_prepend(hash->buckets[hash_num], el);
+ }
+old_data = el->data;
+el->data = data;
+return old_data;
+ }
+ }
+ return NULL;
+}
+
+/**
* @defgroup Evas_Hash_General_Group Hash General Functions
*
* Miscellaneous functions that operate on hash objects.
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib/engines Modified Files: Makefile.am Log Message: an xrender engine. fully complete - but it doesnt support shaped window masks and destination alpha like software_x11 does so its not a 100% dropin replacement... yet === RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/engines/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- Makefile.am 20 Mar 2005 23:44:22 - 1.5 +++ Makefile.am 2 Oct 2005 15:15:44 - 1.6 @@ -12,4 +12,5 @@ gl_common \ gl_x11 \ cairo_common \ -cairo_x11 +cairo_x11 \ +xrender_x11 --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/emotion Dir : e17/libs/emotion Modified Files: configure.in Log Message: check for optional gstreamer plugins (if you don't have it, you'll decode nothing :)). Also, i forgot to say that there's a small api breakage === RCS file: /cvsroot/enlightenment/e17/libs/emotion/configure.in,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- configure.in2 Oct 2005 07:34:36 - 1.16 +++ configure.in2 Oct 2005 08:07:56 - 1.17 @@ -150,6 +150,10 @@ gstreamer-$GST_MAJORMINOR >= $GST_REQS, HAVE_GSTREAMER="yes", HAVE_GSTREAMER="no") +PKG_CHECK_MODULES(GSTPLUG, \ + gstreamer-plugins-$GST_MAJORMINOR >= $GSTPLUG_REQS, + HAVE_GSTPLUG="yes", HAVE_GSTPLUG="no") + AC_SUBST(GST_CFLAGS) AC_SUBST(GST_LIBS) @@ -196,6 +200,7 @@ echo " Modules:" echo "Xine...: $HAVE_XINE" echo "Gstreamer..: $HAVE_GSTREAMER" +echo "Gsteamer plugins...: $HAVE_GSTPLUG" echo echo " Compilation..: make" echo --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common
Modified Files:
evas_font_draw.c
Log Message:
an xrender engine. fully complete - but it doesnt support shaped window masks
and destination alpha like software_x11 does so its not a 100% dropin
replacement... yet
===
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_font_draw.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- evas_font_draw.c5 Sep 2005 08:01:15 - 1.15
+++ evas_font_draw.c2 Oct 2005 15:15:44 - 1.16
@@ -147,7 +147,7 @@
fg = evas_common_font_int_cache_glyph_get(fi, index);
if (!fg) continue;
- if ((dc->font_ext.func.gl_new) && (!fg->ext_dat))
+ if (dc->font_ext.func.gl_new)
{
/* extension calls */
fg->ext_dat = dc->font_ext.func.gl_new(dc->font_ext.data, fg);
@@ -179,7 +179,7 @@
{
/* ext glyph draw */
dc->font_ext.func.gl_draw(dc->font_ext.data,
- (void *)c,
+ (void *)dst,
dc, fg,
chr_x,
y - (chr_y - y)
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_entry.c e_entry.h
Log Message:
Fix and expose more of the e_entry api. it works now.
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_entry.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_entry.c 29 Sep 2005 15:01:04 - 1.4
+++ e_entry.c 1 Oct 2005 01:25:07 - 1.5
@@ -91,6 +91,117 @@
return evas_object_smart_add(evas, e_entry_smart);
}
+void
+e_entry_text_set (Evas_Object *entry, const char *text)
+{
+ E_Entry_Smart_Data *e_entry_sd;
+
+ if (!entry || !(e_entry_sd = evas_object_smart_data_get(entry)))
+ return;
+
+ e_editable_text_text_set (e_entry_sd->entry_object, text);
+}
+
+void
+e_entry_text_insert (Evas_Object *entry, const char *text)
+{
+ E_Entry_Smart_Data *e_entry_sd;
+
+ if (!entry || !(e_entry_sd = evas_object_smart_data_get(entry)))
+ return;
+
+ e_editable_text_insert (e_entry_sd->entry_object, text);
+}
+
+void
+e_entry_delete_char_before(Evas_Object *entry)
+{
+ E_Entry_Smart_Data *e_entry_sd;
+
+ if (!entry || !(e_entry_sd = evas_object_smart_data_get(entry)))
+ return;
+
+ e_editable_text_delete_char_before (e_entry_sd->entry_object);
+}
+
+void
+e_entry_delete_char_after(Evas_Object *entry)
+{
+ E_Entry_Smart_Data *e_entry_sd;
+
+ if (!entry || !(e_entry_sd = evas_object_smart_data_get(entry)))
+ return;
+
+ e_editable_text_delete_char_after (e_entry_sd->entry_object);
+}
+
+void
+e_entry_cursor_move_at_start(Evas_Object *entry)
+{
+ E_Entry_Smart_Data *e_entry_sd;
+
+ if (!entry || !(e_entry_sd = evas_object_smart_data_get(entry)))
+ return;
+
+ e_editable_text_cursor_move_at_start (e_entry_sd->entry_object);
+}
+
+void
+e_entry_cursor_move_at_end(Evas_Object *entry)
+{
+ E_Entry_Smart_Data *e_entry_sd;
+
+ if (!entry || !(e_entry_sd = evas_object_smart_data_get(entry)))
+ return;
+
+ e_editable_text_cursor_move_at_end (e_entry_sd->entry_object);
+}
+
+void
+e_entry_cursor_move_left(Evas_Object *entry)
+{
+ E_Entry_Smart_Data *e_entry_sd;
+
+ if (!entry || !(e_entry_sd = evas_object_smart_data_get(entry)))
+ return;
+
+ e_editable_text_cursor_move_left (e_entry_sd->entry_object);
+}
+
+void
+e_entry_cursor_move_right(Evas_Object *entry)
+{
+ E_Entry_Smart_Data *e_entry_sd;
+
+ if (!entry || !(e_entry_sd = evas_object_smart_data_get(entry)))
+ return;
+
+ e_editable_text_cursor_move_right (e_entry_sd->entry_object);
+}
+
+void
+e_entry_cursor_show(Evas_Object *entry)
+{
+ E_Entry_Smart_Data *e_entry_sd;
+
+ if (!entry || !(e_entry_sd = evas_object_smart_data_get(entry)))
+ return;
+
+ e_editable_text_cursor_show (e_entry_sd->entry_object);
+}
+
+void
+e_entry_cursor_hide(Evas_Object *entry)
+{
+ E_Entry_Smart_Data *e_entry_sd;
+
+ if (!entry || !(e_entry_sd = evas_object_smart_data_get(entry)))
+ return;
+
+ e_editable_text_cursor_hide (e_entry_sd->entry_object);
+}
+
+
static void _e_entry_smart_add(Evas_Object *object)
{
Evas *evas;
@@ -122,7 +233,11 @@
E_Entry_Smart_Data *e_entry_sd;
if (!object || !(e_entry_sd = evas_object_smart_data_get(object)))
- return;
+ return;
+
+ evas_object_del (e_entry_sd->entry_object);
+ evas_object_del (e_entry_sd->edje_object);
+ E_FREE (e_entry_sd);
}
static void _e_entry_smart_raise(Evas_Object *object)
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_entry.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_entry.h 25 Sep 2005 03:28:18 - 1.1
+++ e_entry.h 1 Oct 2005 01:25:07 - 1.2
@@ -17,3 +17,16 @@
void e_editable_text_cursor_hide(Evas_Object *object);
Evas_Object *e_entry_add(Evas *evas);
+void e_entry_text_set (Evas_Object *entry, const char *text);
+void e_entry_text_insert (Evas_Object *entry, const char *text);
+void e_entry_delete_char_before(Evas_Object *object);
+void e_entry_delete_char_after(Evas_Object *object);
+void e_entry_cursor_move_at_start(Evas_Object *object);
+void e_entry_cursor_move_at_end(Evas_Object *object);
+void e_entry_cursor_move_left(Evas_Object *object);
+void e_entry_cursor_move_right(Evas_Object *object);
+void e_entry_cursor_show(Evas_Object *object);
+void e_entry_cursor_hide(Evas_Object *object);
+
+
+
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listi
E CVS: libs/ewl rbdpngn
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_embed.c
Log Message:
This mouse movement dispatching seems to match what people expect better.
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_embed.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ewl_embed.c 27 Sep 2005 04:40:09 - 1.8
+++ ewl_embed.c 2 Oct 2005 06:23:48 - 1.9
@@ -473,31 +473,44 @@
void
ewl_embed_mouse_move_feed(Ewl_Embed *embed, int x, int y, unsigned int mods)
{
- Ewl_Widget *widget;
+ Ewl_Widget *widget = NULL;
Ewl_Event_Mouse_Move ev;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("embed", embed);
- widget = ewl_container_child_at_recursive_get(EWL_CONTAINER(embed),
- x, y);
- if (!widget)
- widget = EWL_WIDGET(embed);
-
ev.modifiers = mods;
ev.x = x;
ev.y = y;
/*
-* Defocus all widgets up to the level of a shared parent of old and
-* newly focused widgets.
+* Focus a new widget if the mouse isn't pressed on the currently
+* focused widget.
*/
- while (last_focused && (widget != last_focused) &&
- !ewl_container_parent_of(last_focused, widget)) {
- ewl_object_state_remove(EWL_OBJECT(last_focused),
- EWL_FLAG_STATE_HILITED);
- ewl_callback_call(last_focused, EWL_CALLBACK_FOCUS_OUT);
- last_focused = last_focused->parent;
+ if (!last_focused || !ewl_object_state_has(EWL_OBJECT(last_focused),
EWL_FLAG_STATE_PRESSED)) {
+
+ widget =
ewl_container_child_at_recursive_get(EWL_CONTAINER(embed),
+ x, y);
+ if (!widget)
+ widget = EWL_WIDGET(embed);
+ }
+
+ if (widget) {
+ /*
+* Defocus all widgets up to the level of a shared parent of
+* old and newly focused widgets.
+*/
+ while (last_focused && (widget != last_focused) &&
+ !ewl_container_parent_of(last_focused, widget))
{
+ ewl_object_state_remove(EWL_OBJECT(last_focused),
+ EWL_FLAG_STATE_HILITED);
+ ewl_callback_call(last_focused, EWL_CALLBACK_FOCUS_OUT);
+ last_focused = last_focused->parent;
+ }
+
+ }
+ else {
+ widget = last_focused;
}
/*
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib Modified Files: Evas.h Makefile.am Added Files: Evas_Engine_XRender_X11.h Log Message: an xrender engine. fully complete - but it doesnt support shaped window masks and destination alpha like software_x11 does so its not a 100% dropin replacement... yet === RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/Evas.h,v retrieving revision 1.65 retrieving revision 1.66 diff -u -3 -r1.65 -r1.66 --- Evas.h 11 Sep 2005 03:23:11 - 1.65 +++ Evas.h 2 Oct 2005 15:15:44 - 1.66 @@ -309,6 +309,7 @@ EAPI Evas_Hash*evas_hash_add (Evas_Hash *hash, const char *key, const void*data); EAPI Evas_Hash*evas_hash_del (Evas_Hash *hash, const char *key, const void*data); EAPI void *evas_hash_find(Evas_Hash *hash, const char *key); + EAPI void *evas_hash_modify (Evas_Hash *hash, const char *key, const void*data); EAPI int evas_hash_size(Evas_Hash *hash); EAPI void evas_hash_free(Evas_Hash *hash); EAPI void evas_hash_foreach (Evas_Hash *hash, Evas_Bool (*func) (Evas_Hash *hash, const char *key, void *data, void *fdata), const void *fdata); === RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/Makefile.am,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- Makefile.am 3 Sep 2005 19:42:28 - 1.16 +++ Makefile.am 2 Oct 2005 15:15:44 - 1.17 @@ -20,7 +20,8 @@ Evas_Engine_Software_Win32_GDI.h \ Evas_Engine_Software_Qtopia.h \ Evas_Engine_GL_X11.h \ -Evas_Engine_Cairo_X11.h +Evas_Engine_Cairo_X11.h \ +Evas_Engine_XRender_X11.h if BUILD_ENGINE_SOFTWARE_X11 ENGINE_SOFTWARE_X11 = engines/software_x11/libevas_engine_software_x11.la @@ -102,6 +103,14 @@ ENGINE_CAIRO_X11_INC = endif +if BUILD_ENGINE_XRENDER_X11 +ENGINE_XRENDER_X11 = engines/xrender_x11/libevas_engine_xrender_x11.la +ENGINE_XRENDER_X11_INC = Evas_Engine_XRender_X11.h +else +ENGINE_XRENDER_X11 = +ENGINE_XRENDER_X11_INC = +endif + include_HEADERS = \ Evas.h \ $(ENGINE_SOFTWARE_X11_INC) \ @@ -113,7 +122,8 @@ $(ENGINE_GL_COMMON_INC) \ $(ENGINE_GL_X11_INC) \ $(ENGINE_CAIRO_COMMON_INC) \ -$(ENGINE_CAIRO_X11_INC) +$(ENGINE_CAIRO_X11_INC) \ +$(ENGINE_XRENDER_X11_INC) libevas_la_SOURCES = \ main.c @@ -136,7 +146,8 @@ $(ENGINE_GL_COMMON) \ $(ENGINE_GL_X11) \ $(ENGINE_CAIRO_COMMON) \ - $(ENGINE_CAIRO_X11) + $(ENGINE_CAIRO_X11) \ + $(ENGINE_XRENDER_X11) libevas_la_DEPENDENCIES = \ @@ -155,6 +166,7 @@ $(ENGINE_GL_COMMON) \ $(ENGINE_GL_X11) \ $(ENGINE_CAIRO_COMMON) \ - $(ENGINE_CAIRO_X11) + $(ENGINE_CAIRO_X11) \ + $(ENGINE_XRENDER_X11) libevas_la_LDFLAGS = -version-info 1:0:0 --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/software_xcb
Modified Files:
evas_xcb_buffer.c
Log Message:
forget to test if the shm extension exists
===
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/software_xcb/evas_xcb_buffer.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_xcb_buffer.c 22 May 2005 02:49:49 - 1.3
+++ evas_xcb_buffer.c 2 Oct 2005 12:41:11 - 1.4
@@ -100,53 +100,59 @@
if (try_shm > 0)
{
- xcbob->shm_info = malloc(sizeof(XCBShmSegmentInfo));
- if (xcbob->shm_info)
- {
-xcbob->shm_info->shmseg = XCBShmSEGNew(c);
-xcbob->image = XCBImageSHMCreate(c, depth, ZPixmap, NULL, w, h);
-if (xcbob->image)
- {
- xcbob->shm_info->shmid = shmget(IPC_PRIVATE,
- xcbob->image->bytes_per_line *
- xcbob->image->height,
- IPC_CREAT | 0777);
- if (xcbob->shm_info->shmid >= 0)
- {
- xcbob->shm_info->shmaddr = xcbob->image->data =
-shmat(xcbob->shm_info->shmid, 0, 0);
- if (xcbob->shm_info->shmaddr != NULL)
-{
- /*
- * FIXME: no error mechanism
- */
-
-/* XErrorHandler ph; */
-/* EventHandlers eh; */
-
- XCBSync(c, 0);
- _xcb_err = 0;
-/* ph = XSetErrorHandler((XErrorHandler) */
-/* x_output_tmp_x_err); */
- XCBShmAttach(c,
-xcbob->shm_info->shmseg,
-xcbob->shm_info->shmid, 0);
- XCBSync(c, 0);
-/* XSetErrorHandler((XErrorHandler)ph); */
- if (!_xcb_err)
- {
-return xcbob;
- }
-}
- shmdt(xcbob->shm_info->shmaddr);
- shmctl(xcbob->shm_info->shmid, IPC_RMID, 0);
- }
- if (xcbob->image) XCBImageSHMDestroy(xcbob->image);
- xcbob->image = NULL;
- }
-if (xcbob->shm_info) free(xcbob->shm_info);
-xcbob->shm_info = NULL;
- }
+ XCBQueryExtensionRep *rep;
+
+ rep = XCBGetExtensionData(c, &XCBShmId);
+ if (rep && rep->present)
+ {
+xcbob->shm_info = malloc(sizeof(XCBShmSegmentInfo));
+if (xcbob->shm_info)
+ {
+ xcbob->shm_info->shmseg = XCBShmSEGNew(c);
+ xcbob->image = XCBImageSHMCreate(c, depth, ZPixmap, NULL, w,
h);
+ if (xcbob->image)
+ {
+ xcbob->shm_info->shmid = shmget(IPC_PRIVATE,
+
xcbob->image->bytes_per_line *
+ xcbob->image->height,
+ IPC_CREAT | 0777);
+ if (xcbob->shm_info->shmid >= 0)
+{
+ xcbob->shm_info->shmaddr = xcbob->image->data =
+ shmat(xcbob->shm_info->shmid, 0, 0);
+ if (xcbob->shm_info->shmaddr != NULL)
+ {
+/*
+ * FIXME: no error mechanism
+ */
+
+/* XErrorHandler ph; */
+/* EventHandlers eh; */
+
+XCBSync(c, 0);
+_xcb_err = 0;
+/* ph =
XSetErrorHandler((XErrorHandler) */
+/*
x_output_tmp_x_err); */
+XCBShmAttach(c,
+ xcbob->shm_info->shmseg,
+ xcbob->shm_info->shmid, 0);
+XCBSync(c, 0);
+/*
XSetErrorHandler((XErrorHandler)ph); */
+if (!_xcb_err)
+ {
+
E CVS: e kwo
Enlightenment CVS committal Author : kwo Project : e16 Module : e Dir : e16/e/src Modified Files: eobj.h slideout.c Log Message: No fading on slideouts. === RCS file: /cvsroot/enlightenment/e16/e/src/eobj.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- eobj.h 21 Sep 2005 21:13:45 - 1.13 +++ eobj.h 1 Oct 2005 20:44:47 - 1.14 @@ -96,10 +96,12 @@ #define EoGetShadow(eo) ((eo)->o.shadow) #define EoSetNoRedirect(eo, _x) (eo)->o.noredir = (_x) #define EoGetNoRedirect(eo) ((eo)->o.noredir) +#define EoSetFade(eo, _x) ((eo)->o.fade = (_x)) #else #define EoSetOpacity(eo, _o) #define EoChangeOpacity(eo, _o) #define EoSetShadow(eo, _x) +#define EoSetFade(eo, _x) #endif #define EoSync(eo) EobjSync(EoObj(eo)) === RCS file: /cvsroot/enlightenment/e16/e/src/slideout.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -3 -r1.43 -r1.44 --- slideout.c 18 Sep 2005 06:35:38 - 1.43 +++ slideout.c 1 Oct 2005 20:44:47 - 1.44 @@ -66,6 +66,7 @@ EobjInit(EoObj(s), EOBJ_TYPE_MISC, None, -10, -10, 1, 1, 1, name); s->direction = dir; + EoSetFade(s, 0); ESelectInput(EoGetWin(s), SLIDEOUT_EVENT_MASK); EventCallbackRegister(EoGetWin(s), 0, SlideoutHandleEvent, s); --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/src Log Message: Directory /cvsroot/enlightenment/e17/proto/etk/src added to the repository --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/images Log Message: Directory /cvsroot/enlightenment/e17/proto/etk/data/themes/default/images added to the repository --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/data/fonts Log Message: Directory /cvsroot/enlightenment/e17/proto/etk/data/fonts added to the repository --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/src/bin Log Message: Directory /cvsroot/enlightenment/e17/proto/etk/src/bin added to the repository --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_main.c edje_smart.c
Log Message:
be more paranoid... ?
===
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_main.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- edje_main.c 28 Jul 2005 13:39:23 - 1.43
+++ edje_main.c 1 Oct 2005 04:15:15 - 1.44
@@ -150,6 +150,7 @@
void
_edje_ref(Edje *ed)
{
+ if (ed->references <= 0) return;
ed->references++;
}
@@ -157,5 +158,5 @@
_edje_unref(Edje *ed)
{
ed->references--;
- if (ed->references <= 0) _edje_del(ed);
+ if (ed->references == 0) _edje_del(ed);
}
===
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_smart.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- edje_smart.c30 Sep 2005 04:40:31 - 1.21
+++ edje_smart.c1 Oct 2005 04:15:15 - 1.22
@@ -81,10 +81,9 @@
_edje_block_violate(ed);
ed->delete_me = 1;
_edje_clean_objects(ed);
- _edje_unref(ed);
_edje_edjes = evas_list_remove(_edje_edjes, obj);
- /* ... be paranoid */
evas_object_smart_data_set(obj, NULL);
+ _edje_unref(ed);
}
static void
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib/engines/xrender_x11 Log Message: Directory /cvsroot/enlightenment/e17/libs/evas/src/lib/engines/xrender_x11 added to the repository --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_file
Modified Files:
ecore_file.c
Log Message:
be more lenient and use access() to check
===
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_file/ecore_file.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ecore_file.c30 Sep 2005 08:41:21 - 1.22
+++ ecore_file.c2 Oct 2005 15:44:24 - 1.23
@@ -189,31 +189,9 @@
int
ecore_file_can_exec(const char *file)
{
- static int have_uid = 0;
- static uid_tuid = -1;
- static gid_tgid = -1;
- struct stat st;
- int ok;
- charbuf[PATH_MAX];
-
if (!file) return 0;
- if (!realpath(file, buf)) return 0;
- if (stat(buf, &st) < 0) return 0;
-
- ok = 0;
- if (!have_uid) uid = getuid();
- if (!have_uid) gid = getgid();
- have_uid = 1;
- if (st.st_uid == uid)
- {
- if (st.st_mode & S_IXUSR) ok = 1;
- }
- else if (st.st_gid == gid)
- {
- if (st.st_mode & S_IXGRP) ok = 1;
- }
- if (st.st_mode & S_IXOTH) ok = 1;
- return (ok);
+ if (!access(file, X_OK)) return 1;
+ return 0;
}
char *
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib/engines/gl_common Modified Files: evas_gl_font.c Log Message: fix gl engine - i broke it a bit === RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/engines/gl_common/evas_gl_font.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- evas_gl_font.c 2 Oct 2005 15:15:44 - 1.8 +++ evas_gl_font.c 2 Oct 2005 16:06:11 - 1.9 @@ -14,6 +14,8 @@ int nw; DATA8 *ndata; + if (fg->ext_dat) return fg->ext_dat; + ft = calloc(1, sizeof(Evas_GL_Font_Texture)); if (!ft) return NULL; --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/data/images Added Files: Makefile.am close.png open.png save.png test.png Log Message: * Etk first commit --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_media.c ewl_media.h
Log Message:
update to the new emotion api
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_media.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewl_media.c 5 Sep 2005 14:12:15 - 1.3
+++ ewl_media.c 2 Oct 2005 09:44:21 - 1.4
@@ -12,7 +12,7 @@
* @return Returns a pointer to a new media on success, NULL on failure.
* @brief Allocate a new media widget
*/
-Ewl_Widget *ewl_media_new(char *media)
+Ewl_Widget *ewl_media_new(char *module, char *media)
{
Ewl_Media *m;
@@ -22,7 +22,7 @@
if (!m)
DRETURN_PTR(NULL, DLEVEL_STABLE);
- ewl_media_init(m, media);
+ ewl_media_init(m, module, media);
DRETURN_PTR(EWL_WIDGET(m), DLEVEL_STABLE);
}
@@ -35,7 +35,7 @@
*
* Sets the internal fields and callbacks of a media object to there defaults.
*/
-void ewl_media_init(Ewl_Media *m, char *media)
+void ewl_media_init(Ewl_Media *m, char *module, char *media)
{
Ewl_Widget *w;
@@ -54,13 +54,62 @@
ewl_callback_append(w, EWL_CALLBACK_CONFIGURE,
ewl_media_configure_cb, NULL);
- if (media)
- ewl_media_media_set(m, media);
+ if (module) {
+ ewl_media_module_set(m, module);
+if (media) {
+ewl_media_media_set(m, media);
+}
+
+}
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
/**
+ * @param m: the media area widget to set the module
+ * @param module: the module to set in the media widget @a m
+ * @return Returns 0 if fail to load the module, 1 otherwise.
+ * @brief Set the module of a media widget
+ *
+ * Sets the module of the media widget @a m
+ */
+int ewl_media_module_set(Ewl_Media * m, char *module)
+{
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR_RET("m", m, 0);
+ DCHECK_PARAM_PTR_RET("module", module, 0);
+
+ IF_FREE(m->module);
+ m->module = strdup(module);
+
+ /*
+* Initialize emotion
+*/
+if (!m->module || !emotion_object_init(m->video, m->module))
+DRETURN_INT(FALSE, DLEVEL_STABLE);
+
+ DRETURN_INT(TRUE, DLEVEL_STABLE);
+}
+
+/**
+ * @param m: the media widget to retrieve module contents
+ * @return Returns a copy of the module in @a m on success, NULL on failure.
+ * @brief Retrieve the module of a media widget
+ */
+char *ewl_media_module_get(Ewl_Media * m)
+{
+ char *txt = NULL;
+
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR_RET("m", m, NULL);
+
+ if (m->module)
+ txt = strdup(m->module);
+
+ DRETURN_PTR(txt, DLEVEL_STABLE);
+}
+
+/**
* @param m: the media area widget to set the media
* @param media: the media to set in the media widget @a m
* @return Returns no value.
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_media.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewl_media.h 10 Apr 2005 05:05:18 - 1.3
+++ ewl_media.h 2 Oct 2005 09:44:21 - 1.4
@@ -35,13 +35,16 @@
{
Ewl_Widget widget; /**< Inherit from Ewl_Widget */
Evas_Object*video;/**< Emotion does the actual work */
+ char *module; /**< Path to the module file */
char *media;/**< Path to the media file */
int block_seek; /**< Temporarily prevent seeking */
};
-Ewl_Widget *ewl_media_new(char *media);
-void ewl_media_init(Ewl_Media * m, char *media);
+Ewl_Widget *ewl_media_new(char *module, char *media);
+void ewl_media_init(Ewl_Media * m, char *module, char *media);
+int ewl_media_module_set(Ewl_Media * m, char *module);
+char*ewl_media_module_get(Ewl_Media * m);
void ewl_media_media_set(Ewl_Media * m, char *media);
char*ewl_media_media_get(Ewl_Media * m);
int ewl_media_length_get(Ewl_Media *m);
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/fonts Added Files: Vera.ttf Log Message: * Etk first commit --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/data Added Files: Makefile.am Log Message: * Etk first commit --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/lib
Modified Files:
Emotion.h emotion_smart.c
Log Message:
emotion can use gstreamer, now
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/Emotion.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- Emotion.h 4 Sep 2005 18:58:11 - 1.8
+++ Emotion.h 2 Oct 2005 07:34:36 - 1.9
@@ -3,6 +3,12 @@
#include
+enum _Emotion_Module
+{
+ EMOTION_MODULE_XINE,
+ EMOTION_MODULE_GSTREAMER
+};
+
enum _Emotion_Event
{
EMOTION_EVENT_MENU1, // Escape Menu
@@ -46,6 +52,7 @@
EMOTION_META_INFO_TRACK_DISC_ID
};
+typedef enum _Emotion_ModuleEmotion_Module;
typedef enum _Emotion_Event Emotion_Event;
typedef enum _Emotion_Meta_Info Emotion_Meta_Info;
@@ -58,8 +65,8 @@
/* api calls available */
Evas_Object *emotion_object_add (Evas *evas);
-Evas_Boolemotion_object_init (Evas_Object *obj);
-void emotion_object_file_set (Evas_Object *obj, const
char *file);
+Evas_Boolemotion_object_init (Evas_Object *obj, const
char *module_filename);
+void emotion_object_file_set (Evas_Object *obj, const
char *filename);
const char *emotion_object_file_get (Evas_Object *obj);
void emotion_object_play_set (Evas_Object *obj, Evas_Bool
play);
Evas_Boolemotion_object_play_get (Evas_Object *obj);
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/emotion_smart.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- emotion_smart.c 30 Aug 2005 23:40:34 - 1.16
+++ emotion_smart.c 2 Oct 2005 07:34:36 - 1.17
@@ -35,6 +35,8 @@
Emotion_Video_Module *module;
void *video;
+ char *module_name;
+
char *file;
Evas_Object *obj;
double ratio;
@@ -94,12 +96,15 @@
void *handle;
char buf[4096];
- snprintf(buf, sizeof(buf), "%s/%s", PACKAGE_LIB_DIR"/emotion/", name);
+ snprintf(buf, sizeof(buf), "%s%s", PACKAGE_LIB_DIR"/emotion/",
+ name);
+ printf ("module : %s\n", buf);
handle = dlopen(buf, RTLD_NOW | RTLD_GLOBAL);
if (handle)
{
unsigned char (*func_module_open)(Evas_Object *, Emotion_Video_Module
**, void **);
+ printf ("module opened\n");
func_module_open = dlsym(handle, "module_open");
if (func_module_open)
{
@@ -111,6 +116,12 @@
}
dlclose(handle);
}
+ else
+ {
+ char *err;
+ err = dlerror();
+ printf ("pas de module : %s\n", err);
+ }
return 0;
}
@@ -129,6 +140,9 @@
/***/
/* Externally accessible calls */
/***/
+
+
+
Evas_Object *
emotion_object_add(Evas *evas)
{
@@ -137,7 +151,7 @@
}
Evas_Bool
-emotion_object_init(Evas_Object *obj)
+emotion_object_init(Evas_Object *obj, const char *module_filename)
{
Smart_Data *sd;
@@ -162,10 +176,14 @@
if (!sd->module || !sd->video)
{
-if (!_emotion_module_open("emotion_decoder_xine.so", obj, &sd->module,
&sd->video))
+if (!_emotion_module_open(module_filename, obj, &sd->module,
&sd->video))
return 0;
}
+ if (!sd->module || !sd->video)
+ if (!_emotion_module_open(module_filename, obj, &sd->module, &sd->video))
+ return 0;
+
return 1;
}
@@ -177,27 +195,22 @@
E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
if ((file) && (sd->file) && (!strcmp(file, sd->file))) return;
-
if ((file) && (strlen(file) > 0))
{
int w, h;
-
- if (!emotion_object_init(obj))
- return;
sd->file = strdup(file);
if (sd->module)
{
-sd->module->file_close(sd->video);
-evas_object_image_size_set(sd->obj, 0, 0);
+ sd->module->file_close(sd->video);
+ evas_object_image_size_set(sd->obj, 0, 0);
}
if (!sd->module->file_open(sd->file, obj, sd->video))
- return;
+ return;
sd->module->size_get(sd->video, &w, &h);
evas_object_image_size_set(sd->obj, w, h);
sd->ratio = sd->module->ratio_get(sd->video);
sd->pos = 0.0;
- if (sd->play)
- sd->module->play(sd->video, 0.0);
+ if (sd->play) sd->module->play(sd->video, 0.0);
}
else
{
@@ -238,8 +251,11 @@
{
Smart_Data *sd;
+ printf ("play get\n");
E_SMART_OBJ_GET_RETURN(sd, obj, E_OBJ_NAME, 0);
+ printf ("play get1\n");
if (!sd->video) return 0;
+ printf ("play get2\n");
return sd->play;
}
@@ -810,7 +826,7 @@
Smart_Data *sd;
int iw, ih;
int changed = 0;
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/src/lib Added Files: Etk.h Makefile.am etk_adjustment.c etk_adjustment.h etk_alignment.c etk_alignment.h etk_bin.c etk_bin.h etk_box.c etk_box.h etk_button.c etk_button.h etk_canvas.c etk_canvas.h etk_check_button.c etk_check_button.h etk_colorpicker.c etk_colorpicker.h etk_colorpicker_square.c etk_colorpicker_square.h etk_colorpicker_vertical.c etk_colorpicker_vertical.h etk_container.c etk_container.h etk_editable_text_object.c etk_editable_text_object.h etk_entry.c etk_entry.h etk_hbox.c etk_hbox.h etk_image.c etk_image.h etk_label.c etk_label.h etk_main.c etk_main.h etk_marshallers.c etk_marshallers.h etk_object.c etk_object.h etk_property.c etk_property.h etk_radio_button.c etk_radio_button.h etk_range.c etk_range.h etk_signal.c etk_signal.h etk_signal_callback.c etk_signal_callback.h etk_string.c etk_string.h etk_table.c etk_table.h etk_toggle_button.c etk_toggle_button.h etk_toplevel_widget.c etk_toplevel_widget.h etk_tree.c etk_tree.h etk_type.c etk_type.h etk_types.h etk_utils.c etk_utils.h etk_vbox.c etk_vbox.h etk_widget.c etk_widget.h etk_window.c etk_window.h Log Message: * Etk first commit --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/emotion Dir : e17/libs/emotion/src/modules Modified Files: Makefile.am Added Files: emotion_gstreamer.c emotion_gstreamer.h Log Message: emotion can use gstreamer, now === RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- Makefile.am 3 Sep 2005 19:07:24 - 1.5 +++ Makefile.am 2 Oct 2005 07:34:36 - 1.6 @@ -1,6 +1,13 @@ ## Process this file with automake to produce Makefile.in +if BUILD_XINE_MODULE SUBDIRS = xine +XINE_LIB_NAME=emotion_decoder_xine.la +endif + +if BUILD_GSTREAMER_MODULE +GSTREAMER_LIB_NAME = emotion_decoder_gstreamer.la +endif #AUTOMAKE_OPTIONS = 1.4 foreign @@ -9,15 +16,28 @@ INCLUDES= -I$(top_srcdir) \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @EVAS_CFLAGS@ @ECORE_CFLAGS@ @XINE_CFLAGS@ + @EVAS_CFLAGS@ @ECORE_CFLAGS@ @XINE_CFLAGS@ @GST_CFLAGS@ + +pkgdir = $(libdir)/emotion -pkgdir = $(libdir)/emotion +pkg_LTLIBRARIES = $(XINE_LIB_NAME) $(GSTREAMER_LIB_NAME) -pkg_LTLIBRARIES = emotion_decoder_xine.la -emotion_decoder_xine_la_SOURCES = \ +if BUILD_XINE_MODULE +emotion_decoder_xine_la_SOURCES = \ emotion_xine.c \ emotion_xine.h emotion_decoder_xine_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ @XINE_LIBS@ emotion_decoder_xine_la_LDFLAGS = -module -avoid-version \ -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs emotion_decoder_xine_la_DEPENDENCIES = $(top_builddir)/config.h +endif + +if BUILD_GSTREAMER_MODULE +emotion_decoder_gstreamer_la_SOURCES = \ +emotion_gstreamer.c \ +emotion_gstreamer.h +emotion_decoder_gstreamer_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ @GST_LIBS@ +emotion_decoder_gstreamer_la_LDFLAGS = -module -avoid-version \ + -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs +emotion_decoder_gstreamer_la_DEPENDENCIES = $(top_builddir)/config.h +endif --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl lordchaos
Enlightenment CVS committal
Author : lordchaos
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_iconbox.c ewl_iconbox.h
Log Message:
. Change layer for drag select box
. Add support for background files
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_iconbox.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ewl_iconbox.c 22 Sep 2005 04:14:27 - 1.22
+++ ewl_iconbox.c 2 Oct 2005 00:57:41 - 1.23
@@ -76,6 +76,16 @@
ewl_iconbox_inner_pane_calculate(EWL_ICONBOX(w));
/*ewl_iconbox_icon_arrange(ib); */
ewl_callback_append(EWL_WIDGET(ib), EWL_CALLBACK_CONFIGURE,
configure, NULL);
+
+ /*Handle the background, if any*/
+ if (ib->background) {
+ evas_object_clip_set(ib->background,
EWL_WIDGET(ib)->fx_clip_box);
+ evas_object_move(ib->background, CURRENT_X(ib),
CURRENT_Y(ib));
+ evas_object_layer_set(ib->background, -1000);
+
+ evas_object_image_fill_set(ib->background, 0,0,
CURRENT_W(ib), CURRENT_H(ib));
+ evas_object_resize(ib->background, CURRENT_W(ib),
CURRENT_H(ib));
+ }
}
}
@@ -222,13 +232,13 @@
/* Create the selector / selector floater */
ib->select_floater = ewl_floater_new(ib->ewl_iconbox_pane_inner);
ewl_object_fill_policy_set(EWL_OBJECT(ib->select_floater),
EWL_FLAG_FILL_FILL);
- ib->select =ewl_button_new("");
+ ib->select =ewl_button_new(NULL);
ewl_container_child_append(EWL_CONTAINER(ib->select_floater),
ib->select);
ewl_container_child_append(EWL_CONTAINER(ib->ewl_iconbox_pane_inner),
ib->select_floater);
ewl_object_custom_size_set(EWL_OBJECT(ib->select), 80, 40);
- ewl_widget_layer_set(EWL_WIDGET(ib->select_floater), 1000);
+ ewl_widget_layer_set(EWL_WIDGET(ib->select_floater), -1);
ewl_widget_color_set(EWL_WIDGET(ib->select), 128, 50, 70, 128);
ib->drag_box = 0;
@@ -266,6 +276,9 @@
ewl_object_custom_size_set(EWL_OBJECT(ib->entry_box), 50, 15);
ewl_object_fill_policy_set(EWL_OBJECT(ib->entry_floater),
EWL_FLAG_FILL_SHRINK);
ewl_container_child_append(EWL_CONTAINER(ib->ewl_iconbox_pane_inner),
ib->entry_floater);
+
+
+
/* Bind a callback to keypress on the entry, so we can update the label
*/
@@ -288,6 +301,30 @@
}
+void ewl_iconbox_background_set(Ewl_IconBox* ib, char* file) {
+ /*Add a background image*/
+ {
+ Ewl_Embed *emb;
+ emb = ewl_embed_widget_find(EWL_WIDGET(ib));
+ if (emb) {
+ ib->background = evas_object_image_add(emb->evas);
+ evas_object_image_file_set(ib->background, file, NULL);
+
+ evas_object_clip_set(ib->background,
EWL_WIDGET(ib)->fx_clip_box);
+ evas_object_move(ib->background, CURRENT_X(ib),
CURRENT_Y(ib));
+ evas_object_layer_set(ib->background, -1000);
+
+ evas_object_image_fill_set(ib->background, 0,0,
CURRENT_W(ib), CURRENT_H(ib));
+ evas_object_resize(ib->background, CURRENT_W(ib),
CURRENT_H(ib));
+
+ evas_object_show(ib->background);
+ } else {
+ printf("// Could not find top
level widget\n");
+ }
+ }
+}
+
+
/* --- */
void ewl_iconbox_arrange_cb(Ewl_Widget *w, void *ev_data, void *user_data) {
Ewl_IconBox* ib = EWL_ICONBOX(user_data);
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_iconbox.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ewl_iconbox.h 17 Aug 2005 18:07:52 - 1.7
+++ ewl_iconbox.h 2 Oct 2005 00:57:41 - 1.8
@@ -79,6 +79,9 @@
int xdown, ydown; /* Last icon button down x/y, for
edge resistence */
int dx, dy;/* Drag start x/y */
+ /*Background*/
+ Evas_Object* background;
+
/* Objects for label editing..*/
Ewl_Widget* entry;
Ewl_Widget* entry_floater;
@@ -109,6 +112,7 @@
Ewl_IconBox_Icon* ewl_iconbox_icon_add(Ewl_IconBox* iconbox, char* name, char*
icon_file);
void ewl_iconbox_clear(Ewl_IconBox* iconbox);
void ewl_iconbox_icon_image_set(Ewl_IconBox_Icon* icon, char* filename);
+void ewl_iconbox_background_set(Ewl_IconBox* ib, char* file);
/* Internal callbacks */
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default Added Files: Makefile.am default.edc Log Message: * Etk first commit --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/src/bin Added Files: Makefile.am etk_button_test.c etk_canvas_test.c etk_colorpicker_test.c etk_entry_test.c etk_image_test.c etk_scale_test.c etk_table_test.c etk_test.c etk_test.h etk_tree_test.c Log Message: * Etk first commit --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/data/themes Added Files: Makefile.am Log Message: * Etk first commit --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal
Author : moom16
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_image.c etk_image.h
Log Message:
* You can now load images from an edje file with etk_image_new_from_edje and
etk_image_set_from_edje
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_image.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_image.c 1 Oct 2005 16:29:45 - 1.1
+++ etk_image.c 2 Oct 2005 15:40:28 - 1.2
@@ -1,5 +1,7 @@
/** @file etk_image.c */
#include "etk_image.h"
+#include
+#include
#include
#include
#include "etk_signal.h"
@@ -14,7 +16,10 @@
enum _Etk_Image_Property_Id
{
ETK_IMAGE_FILE_PROPERTY,
- ETK_IMAGE_KEEP_ASPECT_PROPERTY
+ ETK_IMAGE_EDJE_FILE_PROPERTY,
+ ETK_IMAGE_EDJE_GROUP_PROPERTY,
+ ETK_IMAGE_KEEP_ASPECT_PROPERTY,
+ ETK_IMAGE_USE_EDJE_PROPERTY
};
static void _etk_image_constructor(Etk_Image *image);
@@ -24,6 +29,7 @@
static void _etk_image_realize_cb(Etk_Object *object, void *data);
static void _etk_image_move_resize(Etk_Widget *widget, int x, int y, int w,
int h);
static void _etk_image_size_request(Etk_Widget *widget, Etk_Size
*size_requisition);
+static void _etk_image_load(Etk_Image *image);
/**
*
@@ -43,8 +49,11 @@
{
image_type = etk_type_new("Etk_Image", ETK_WIDGET_TYPE,
sizeof(Etk_Image), ETK_CONSTRUCTOR(_etk_image_constructor),
ETK_DESTRUCTOR(_etk_image_destructor), NULL);
- etk_type_property_add(image_type, "file", ETK_IMAGE_FILE_PROPERTY,
ETK_PROPERTY_STRING, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_string(NULL));
- etk_type_property_add(image_type, "keep_aspect",
ETK_IMAGE_KEEP_ASPECT_PROPERTY, ETK_PROPERTY_BOOL,
ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_bool(TRUE));
+ etk_type_property_add(image_type, "image_file", ETK_IMAGE_FILE_PROPERTY,
ETK_PROPERTY_STRING, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_string(NULL));
+ etk_type_property_add(image_type, "edje_file",
ETK_IMAGE_EDJE_FILE_PROPERTY, ETK_PROPERTY_STRING,
ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_string(NULL));
+ etk_type_property_add(image_type, "edje_group",
ETK_IMAGE_EDJE_GROUP_PROPERTY, ETK_PROPERTY_STRING,
ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_string(NULL));
+ etk_type_property_add(image_type, "keep_aspect",
ETK_IMAGE_KEEP_ASPECT_PROPERTY, ETK_PROPERTY_BOOL,
ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_bool(TRUE));
+ etk_type_property_add(image_type, "use_edje",
ETK_IMAGE_USE_EDJE_PROPERTY, ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE,
etk_property_value_bool(FALSE));
image_type->property_set = _etk_image_property_set;
image_type->property_get = _etk_image_property_get;
@@ -69,7 +78,18 @@
*/
Etk_Widget *etk_image_new_from_file(const char *filename)
{
- return etk_widget_new(ETK_IMAGE_TYPE, "file", filename, NULL);
+ return etk_widget_new(ETK_IMAGE_TYPE, "image_file", filename, NULL);
+}
+
+/**
+ * @brief Creates a new image and loads the image from an edje file
+ * @param edje_filename the name of the edje file to load
+ * @param edje_group the name of the edje group to load
+ * @return Returns the new image widget
+ */
+Etk_Widget *etk_image_new_from_edje(const char *edje_filename, const char
*edje_group)
+{
+ return etk_widget_new(ETK_IMAGE_TYPE, "edje_file", edje_filename,
"edje_group", edje_group, NULL);
}
/**
@@ -91,42 +111,28 @@
else
image->filename = NULL;
free(old_filename);
+ etk_object_notify(ETK_OBJECT(image), "image_file");
- if (image->image_object && !image->filename)
+ if (image->edje_group)
{
- etk_widget_member_object_del(widget, image->image_object);
- evas_object_del(image->image_object);
- image->image_object = NULL;
+ free(image->edje_group);
+ image->edje_group = NULL;
+ etk_object_notify(ETK_OBJECT(image), "edje_group");
}
- else if (image->filename)
+ if (image->edje_filename)
{
- int error_code;
-
- if (!image->image_object)
- {
- Evas *evas;
+ free(image->edje_filename);
+ image->edje_filename = NULL;
+ etk_object_notify(ETK_OBJECT(image), "edje_file");
+ }
- if (!(evas = etk_widget_toplevel_evas_get(widget)))
- {
-etk_object_notify(ETK_OBJECT(image), "file");
-etk_widget_resize_queue(widget);
-return;
- }
- image->image_object = evas_object_image_add(evas);
- etk_widget_member_object_add(widget, image->image_object);
- }
- evas_object_image_file_set(image->image_object, image->filename, NULL);
- if ((error_code = evas_object_image_load_error_get(image->image_object)))
- {
- ETK_WARNING("Unable to load image from file \"%s\", error %d",
filename, error_code);
- etk_widget_mem
E CVS: libs/ewl doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_media.c
Log Message:
fixes
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_media.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_media.c 2 Oct 2005 09:44:21 - 1.4
+++ ewl_media.c 2 Oct 2005 12:18:49 - 1.5
@@ -54,13 +54,10 @@
ewl_callback_append(w, EWL_CALLBACK_CONFIGURE,
ewl_media_configure_cb, NULL);
- if (module) {
- ewl_media_module_set(m, module);
-if (media) {
-ewl_media_media_set(m, media);
-}
-
-}
+ if (module)
+ewl_media_module_set(m, module);
+if (media)
+ewl_media_media_set(m, media);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -85,10 +82,10 @@
/*
* Initialize emotion
*/
-if (!m->module || !emotion_object_init(m->video, m->module))
-DRETURN_INT(FALSE, DLEVEL_STABLE);
+if (m->video && m->module && emotion_object_init(m->video, m->module))
+DRETURN_INT(TRUE, DLEVEL_STABLE);
- DRETURN_INT(TRUE, DLEVEL_STABLE);
+ DRETURN_INT(FALSE, DLEVEL_STABLE);
}
/**
@@ -371,7 +368,7 @@
* Create the emotion
*/
m->video = emotion_object_add(emb->evas);
- if (m->media) {
+if (m->module && emotion_object_init(m->video, m->module) && m->media)
{
emotion_object_file_set(m->video, m->media);
ewl_media_size_update(m);
}
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin
Modified Files:
ewl_media_test.c
Log Message:
update to the new emotion api
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/bin/ewl_media_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewl_media_test.c5 Sep 2005 14:12:15 - 1.3
+++ ewl_media_test.c2 Oct 2005 09:44:21 - 1.4
@@ -172,6 +172,7 @@
{
Ewl_Widget *win = NULL, *o = NULL, *b = NULL;
Ewl_Widget *controls = NULL, *time = NULL;
+char * module = NULL;
char * file = NULL;
if (!ewl_init(&argc, argv)) {
@@ -179,8 +180,10 @@
return 1;
}
-if (argc > 1)
- file = argv[1];
+if (argc > 2) {
+module = argv[1];
+file = argv[2];
+}
win = ewl_window_new();
ewl_window_title_set(EWL_WINDOW(win), "EWL Media test");
@@ -202,7 +205,7 @@
time = ewl_text_new("00:00:00");
/* the video */
-video = ewl_media_new(file);
+video = ewl_media_new(module, file);
ewl_container_child_append(EWL_CONTAINER(b), video);
ewl_object_fill_policy_set(EWL_OBJECT(video), EWL_FLAG_FILL_ALL);
ewl_callback_append(video, EWL_CALLBACK_REALIZE, video_realize_cb, NULL);
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/data/fonts Added Files: Makefile.am Vera.COPYING Vera.ttf fonts.alias fonts.dir Log Message: * Etk first commit --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: envision xenith
Enlightenment CVS committal Author : xenith Project : misc Module : envision Dir : misc/envision/src Modified Files: envision.c Log Message: emotion api changes === RCS file: /cvsroot/enlightenment/misc/envision/src/envision.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- envision.c 6 Sep 2005 01:57:05 - 1.18 +++ envision.c 2 Oct 2005 08:35:37 - 1.19 @@ -1,5 +1,5 @@ /* - * $Id: envision.c,v 1.18 2005/09/06 01:57:05 sebastid Exp $ + * $Id: envision.c,v 1.19 2005/10/02 08:35:37 xenith Exp $ * vim:expandtab:ts=3:sts=3:sw=3 */ @@ -74,6 +74,8 @@ // Setup emotion objects e->gui.emotion = emotion_object_add(e->gui.evas); + if (!emotion_object_init(e->gui.emotion, "emotion_decoder_xine.so")) + return (0); emotion_object_file_set(e->gui.emotion, videofile); emotion_object_size_get(e->gui.emotion, &w, &h); evas_object_name_set(e->gui.emotion, "emotion"); --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_main.c evas_object_image.c
Log Message:
an xrender engine. fully complete - but it doesnt support shaped window masks
and destination alpha like software_x11 does so its not a 100% dropin
replacement... yet
===
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_main.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- evas_main.c 19 Jun 2005 13:06:36 - 1.21
+++ evas_main.c 2 Oct 2005 15:15:44 - 1.22
@@ -27,6 +27,9 @@
#ifdef BUILD_ENGINE_CAIRO_X11
#include "evas_engine_api_cairo_x11.h"
#endif
+#ifdef BUILD_ENGINE_XRENDER_X11
+#include "evas_engine_api_xrender_x11.h"
+#endif
static int initcount = 0;
@@ -226,6 +229,11 @@
e->engine.func = &evas_engine_software_x11_func;
else
#endif
+#ifdef BUILD_ENGINE_XRENDER_X11
+ if (e->output.render_method == RENDER_METHOD_XRENDER_X11)
+ e->engine.func = &evas_engine_xrender_x11_func;
+ else
+#endif
#ifdef BUILD_ENGINE_SOFTWARE_XCB
if (e->output.render_method == RENDER_METHOD_SOFTWARE_XCB)
e->engine.func = &evas_engine_software_xcb_func;
@@ -676,6 +684,9 @@
#ifdef BUILD_ENGINE_SOFTWARE_X11
if (!strcmp(name, "software_x11")) return RENDER_METHOD_SOFTWARE_X11;
#endif
+#ifdef BUILD_ENGINE_XRENDER_X11
+ if (!strcmp(name, "xrender_x11")) return RENDER_METHOD_XRENDER_X11;
+#endif
#ifdef BUILD_ENGINE_SOFTWARE_XCB
if (!strcmp(name, "software_xcb")) return RENDER_METHOD_SOFTWARE_XCB;
#endif
@@ -746,6 +757,9 @@
#ifdef BUILD_ENGINE_SOFTWARE_X11
methods = evas_list_append(methods, strdup("software_x11"));
#endif
+#ifdef BUILD_ENGINE_XRENDER_X11
+ methods = evas_list_append(methods, strdup("xrender_x11"));
+#endif
#ifdef BUILD_ENGINE_SOFTWARE_XCB
methods = evas_list_append(methods, strdup("software_xcb"));
#endif
===
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_image.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- evas_object_image.c 18 Jun 2005 01:00:29 - 1.28
+++ evas_object_image.c 2 Oct 2005 15:15:44 - 1.29
@@ -831,7 +831,7 @@
if ((!o->cur.file) ||
(o->pixels_checked_out > 0)) return;
if (o->engine_data)
- o->engine_data =
obj->layer->evas->engine.func->image_dirty_region(obj->layer->evas->engine.data.output,
o->engine_data, 0, 0, 1, 1);
+ o->engine_data =
obj->layer->evas->engine.func->image_dirty_region(obj->layer->evas->engine.data.output,
o->engine_data, 0, 0, o->cur.image.w, o->cur.image.h);
evas_object_image_unload(obj);
/* evas_image_cache_flush(obj->layer->evas);*/
evas_object_image_load(obj);
@@ -1615,6 +1615,8 @@
rr = o->pixel_updates->data;
o->pixel_updates = evas_list_remove(o->pixel_updates, rr);
+
obj->layer->evas->engine.func->image_dirty_region(obj->layer->evas->engine.data.output,
o->engine_data, rr->x, rr->y, rr->w, rr->h);
+
idx = evas_object_image_figure_x_fill(obj, o->cur.fill.x,
o->cur.fill.w, &idw);
idy = evas_object_image_figure_y_fill(obj, o->cur.fill.y,
o->cur.fill.h, &idh);
@@ -1662,6 +1664,7 @@
o->pixel_updates = evas_list_remove(o->pixel_updates, r);
free(r);
}
+
obj->layer->evas->engine.func->image_dirty_region(obj->layer->evas->engine.data.output,
o->engine_data, 0, 0, o->cur.image.w, o->cur.image.h);
updates = evas_object_render_pre_prev_cur_add(updates, obj);
goto done;
}
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin
Modified Files:
ewl_media_test.c
Log Message:
fixes
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/bin/ewl_media_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_media_test.c2 Oct 2005 09:44:21 - 1.4
+++ ewl_media_test.c2 Oct 2005 12:18:50 - 1.5
@@ -180,9 +180,10 @@
return 1;
}
-if (argc > 2) {
+if (argc > 1) {
module = argv[1];
-file = argv[2];
+if (argc > 2)
+file = argv[2];
}
win = ewl_window_new();
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas Dir : e17/libs/evas/data Modified Files: test_pattern.png Log Message: an xrender engine. fully complete - but it doesnt support shaped window masks and destination alpha like software_x11 does so its not a 100% dropin replacement... yet === RCS file: /cvsroot/enlightenment/e17/libs/evas/data/test_pattern.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvs2kBFKs and /tmp/cvs7sGnEn differ --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl rbdpngn
Enlightenment CVS committal Author : rbdpngn Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_scrollbar.c Log Message: Fix the alignment of the draggable portion of the scrollbar. === RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_scrollbar.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- ewl_scrollbar.c 5 Sep 2005 14:12:15 - 1.3 +++ ewl_scrollbar.c 2 Oct 2005 05:50:24 - 1.4 @@ -73,6 +73,7 @@ */ s->seeker = ewl_seeker_new(orientation); ewl_widget_internal_set(s->seeker, TRUE); + ewl_object_alignment_set(EWL_OBJECT(s->seeker), EWL_FLAG_ALIGN_CENTER); ewl_widget_show(s->seeker); /* --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/bin
Modified Files:
Makefile.am evas_test_main.c
Added Files:
evas_xrender_x11_main.c evas_xrender_x11_test
Log Message:
an xrender engine. fully complete - but it doesnt support shaped window masks
and destination alpha like software_x11 does so its not a 100% dropin
replacement... yet
===
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/bin/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- Makefile.am 15 Jun 2005 21:05:54 - 1.14
+++ Makefile.am 2 Oct 2005 15:15:44 - 1.15
@@ -12,7 +12,8 @@
@ENGINE_BUFFER_PRG@ \
@ENGINE_SOFTWARE_QTOPIA_PRG@ \
@ENGINE_GL_X11_PRG@ \
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@
EXTRA_PROGRAMS = \
evas_software_x11_test \
@@ -27,7 +28,8 @@
evas_buffer_test \
evas_software_qtopia_test \
evas_gl_x11_test \
-evas_cairo_x11_test
+evas_cairo_x11_test \
+evas_xrender_x11_test
SUBDIRS = evas_software_win32
@@ -102,4 +104,9 @@
evas_cairo_x11_test_CFLAGS = $(CFLAGS) @x_cflags@ @CAIRO_CFLAGS@
evas_cairo_x11_test_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la
+evas_xrender_x11_test_SOURCES = evas_test_main.h evas_test_main.c
evas_xrender_x11_main.c
+evas_xrender_x11_test_LDADD = $(top_builddir)/src/lib/libevas.la -lm @x_libs@
+evas_xrender_x11_test_CFLAGS = $(CFLAGS) @x_cflags@
+evas_xrender_x11_test_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la
+
EXTRA_DIST = evas_software_qtopia_main.h evas_software_qtopia_main.cpp
moc_evas_software_qtopia_main.cpp
===
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/bin/evas_test_main.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- evas_test_main.c23 Sep 2005 10:12:11 - 1.22
+++ evas_test_main.c2 Oct 2005 15:15:44 - 1.23
@@ -342,7 +342,7 @@
printf("# EVAS BENCH: %3.3f\n", ((double)frames / (t -
time_start)) / 60.0);
printf("#\n");
printf("\n");
-exit(0);
+// exit(0);
for (i = 0; i < 16; i++) evas_object_del(p_s[i]);
for (i = 0; i < 2; i++) evas_object_del(p_i[i]);
for (i = 0; i < 16; i++) evas_object_del(p_t[i]);
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/m4 Log Message: Directory /cvsroot/enlightenment/e17/proto/etk/m4 added to the repository --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib/engines/xrender_x11 Added Files: Makefile.am Log Message: add makefile.am --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion
Modified Files:
configure.in AUTHORS TODO emotion.c.in
Log Message:
emotion can use gstreamer, now
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/configure.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- configure.in3 Sep 2005 19:07:24 - 1.15
+++ configure.in2 Oct 2005 07:34:36 - 1.16
@@ -130,17 +130,40 @@
)
AC_PATH_GENERIC(xine, 1.0.0,
- [ ],
- [ AC_MSG_ERROR(Xine isn't installed)]
+ [HAVE_XINE="yes"],
+ [HAVE_XINE="no"]
)
xine_plugins=`$XINE_CONFIG --plugindir`
AC_SUBST(xine_plugins)
+dnl gstreamer
+gstreamer_cflags=
+gstreamer_libs=
+
+dnl Gstreamer version requirement
+GST_REQS=0.8.10
+GSTPLUG_REQS=0.8.10
+GST_MAJORMINOR=0.8
+
+PKG_CHECK_MODULES(GST, \
+ gstreamer-$GST_MAJORMINOR >= $GST_REQS,
+ HAVE_GSTREAMER="yes", HAVE_GSTREAMER="no")
+
+AC_SUBST(GST_CFLAGS)
+AC_SUBST(GST_LIBS)
+
+if test "${HAVE_XINE}" = "no" && test "${HAVE_GSTREAMER}" = "no" ; then
+ AC_MSG_ERROR([Xine or Gstreamer must be installed to build emotion])
+fi
+
+AM_CONDITIONAL([BUILD_XINE_MODULE], [test "$HAVE_XINE" = yes])
+AM_CONDITIONAL([BUILD_GSTREAMER_MODULE], [test "$HAVE_GSTREAMER" = yes])
+
AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl)
AC_SUBST(dlopen_libs)
-requirements="eet evas ecore edje libxine"
+requirements="eet evas ecore edje libxine gstreamer"
AC_SUBST(requirements)
AC_OUTPUT([
@@ -156,3 +179,31 @@
],[
chmod +x emotion-config
])
+
+
+#
+## Info
+
+echo
+echo
+echo
+echo ""
+echo "$PACKAGE $VERSION"
+echo ""
+echo
+echo "Configuration Options Summary:"
+echo
+echo " Modules:"
+echo "Xine...: $HAVE_XINE"
+echo "Gstreamer..: $HAVE_GSTREAMER"
+echo
+echo " Compilation..: make"
+echo
+echo " Installation.: make install"
+echo
+echo "prefix.: $prefix"
+echo "binaries...: $bindir"
+echo "libraries..: $libdir"
+echo "headers: $includedir"
+echo
+
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/AUTHORS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- AUTHORS 18 Jun 2004 15:38:01 - 1.1
+++ AUTHORS 2 Oct 2005 07:34:36 - 1.2
@@ -1,2 +1,3 @@
The Rasterman (Carsten Haitzler) <[EMAIL PROTECTED]>
-
+doursse (Vincent Torri) <[EMAIL PROTECTED]>
+captainigloo
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/TODO,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- TODO24 Apr 2005 14:23:05 - 1.1
+++ TODO2 Oct 2005 07:34:36 - 1.2
@@ -1,2 +1,17 @@
+
+Emotion smart object
+
+
+
+Xine module
+---
+
* Fix seek and get_pos threads delete bugs (infinite loop)
* Add support of visualizations for audio files (Goom...)
+
+
+Gstreamer module
+
+
+* Add gststreamselector to support multiple video and audio streams.
+* Add support of visualizations for audio files (Goom...)
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/emotion.c.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- emotion.c.in18 Jun 2004 15:38:01 - 1.1
+++ emotion.c.in2 Oct 2005 07:34:36 - 1.2
@@ -9,7 +9,7 @@
@mainpage Emotion Library Documentation
@image html emotion.png
[EMAIL PROTECTED] 0.0.1
[EMAIL PROTECTED] @VERSION@
@author Carsten Haitzler <[EMAIL PROTECTED]>
@date 2003-2004
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/bin
Modified Files:
emotion_test_main.c
Log Message:
emotion can use gstreamer, now
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/bin/emotion_test_main.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- emotion_test_main.c 5 Sep 2005 16:30:09 - 1.10
+++ emotion_test_main.c 2 Oct 2005 07:34:36 - 1.11
@@ -715,7 +715,7 @@
static void
-init_video_object(char *file)
+init_video_object(char *module_filename, char *filename)
{
Evas_Object *o, *oe;
int iw, ih;
@@ -724,8 +724,10 @@
/* basic video object setup */
- o = emotion_object_add(evas);
- emotion_object_file_set(o, file);
+ o = emotion_object_add(evas);
+ if (!emotion_object_init(o, module_filename))
+ return;
+ emotion_object_file_set(o, filename);
emotion_object_play_set(o, 1);
evas_object_move(o, 0, 0);
evas_object_resize(o, 320, 240);
@@ -806,11 +808,14 @@
int
main(int argc, char **argv)
{
+ char *module_filename;
int i;
if (main_start(argc, argv) < 1) return -1;
bg_setup();
+ module_filename = "emotion_decoder_xine.so";
+
for (i = 1; i < argc; i++)
{
if (((!strcmp(argv[i], "-g")) ||
@@ -822,7 +827,7 @@
(!strcmp(argv[i], "--help"
{
printf("Usage:\n");
-printf(" %s [-gl] [-g WxH] \n", argv[0]);
+printf(" %s [-gl] [-g WxH] [-xine] [-gstreamer] filename\n",
argv[0]);
exit(-1);
}
else if (!strcmp(argv[i], "-gl"))
@@ -831,9 +836,18 @@
else if (!strcmp(argv[i], "-fb"))
{
}
- else
+ else if (!strcmp(argv[i], "-xine"))
+ {
+ module_filename = "emotion_decoder_xine.so";
+ }
+ else if (!strcmp(argv[i], "-gstreamer"))
+ {
+ module_filename = "emotion_decoder_gstreamer.so";
+ }
+else
{
-init_video_object(argv[i]);
+ printf ("module : %s\n", module_filename);
+init_video_object(module_filename, argv[i]);
}
}
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/fonts Log Message: Directory /cvsroot/enlightenment/e17/proto/etk/data/themes/default/fonts added to the repository --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk Log Message: Directory /cvsroot/enlightenment/e17/proto/etk added to the repository --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/doc Log Message: Directory /cvsroot/enlightenment/e17/proto/etk/doc added to the repository --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/src Added Files: Makefile.am Log Message: * Etk first commit --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/m4 Added Files: ac_expand_dir.m4 ac_path_generic.m4 pkg.m4 Log Message: * Etk first commit --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/doc Added Files: etk.css foot.html head.html Log Message: * Etk first commit --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/doc/img Added Files: etk_mini.png Log Message: * Etk first commit --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/widgets Added Files: button.edc check_button.edc entry.edc radio_button.edc scale.edc scrollbar.edc toggle_button.edc tree.edc windows.edc Log Message: * Etk first commit --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/macros Added Files: focus_rect.edc Log Message: * Etk first commit --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas
Modified Files:
configure.in
Log Message:
an xrender engine. fully complete - but it doesnt support shaped window masks
and destination alpha like software_x11 does so its not a 100% dropin
replacement... yet
===
RCS file: /cvsroot/enlightenment/e17/libs/evas/configure.in,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -3 -r1.121 -r1.122
--- configure.in25 Sep 2005 05:45:48 - 1.121
+++ configure.in2 Oct 2005 15:15:44 - 1.122
@@ -511,6 +511,60 @@
AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, false)
fi
+###
+## Check if we should build the xrender_x11 engine
+have_evas_xrender_x11="no";
+ENGINE_XRENDER_X11_PRG="";
+## Automatic check...
+AC_CHECK_HEADER(X11/X.h,
+ [ have_evas_xrender_x11="yes" ],
+ [ have_evas_xrender_x11="no" ]
+)
+## Manual override
+AC_MSG_CHECKING(whether xrender x11 backend is to be built)
+AC_ARG_ENABLE(xrender-x11, [ --enable-xrender-x11 enable the
XRender X11 rendering backend], [
+ if [ test "$enableval" = "yes" ]; then
+AC_MSG_RESULT(yes)
+have_evas_xrender_x11="yes"
+ else
+AC_MSG_RESULT(no)
+have_evas_xrender_x11="no"
+ fi
+], [
+ AC_MSG_RESULT($have_evas_xrender_x11)
+ ]
+)
+if test "x$have_evas_xrender_x11" = "xyes"; then
+ AC_PATH_XTRA
+ AC_CHECK_HEADER(X11/X.h,
+[
+ AC_CHECK_HEADER(X11/extensions/Xrender.h,
+[
+ AM_CONDITIONAL(BUILD_ENGINE_XRENDER_X11, true)
+ AC_DEFINE(BUILD_ENGINE_XRENDER_X11, 1, [XRender X11 Rendering
Backend])
+ x_dir=${x_dir:-/usr/X11R6}
+ x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
+ x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext
-lXrender"
+ ENGINE_XRENDER_X11_PRG="evas_xrender_x11_test"
+ ],
+ [
+ AM_CONDITIONAL(BUILD_ENGINE_XRENDER_X11, false)
+ AC_MSG_RESULT(disabling xrender X11 engine)
+ have_evas_xrender_x11="no"
+ ]
+ )
+],
+[
+ AM_CONDITIONAL(BUILD_ENGINE_XRENDER_X11, false)
+ AC_MSG_RESULT(disabling xrender X11 engine)
+ have_evas_xrender_x11="no"
+]
+ )
+else
+ AM_CONDITIONAL(BUILD_ENGINE_XRENDER_X11, false)
+fi
+
+
#
## Image loaders
@@ -1543,6 +1597,7 @@
AC_SUBST(ENGINE_SOFTWARE_QTOPIA_PRG)
AC_SUBST(ENGINE_GL_X11_PRG)
AC_SUBST(ENGINE_CAIRO_X11_PRG)
+AC_SUBST(ENGINE_XRENDER_X11_PRG)
AC_SUBST(altivec_cflags)
@@ -1574,6 +1629,7 @@
src/lib/engines/gl_x11/Makefile
src/lib/engines/cairo_common/Makefile
src/lib/engines/cairo_x11/Makefile
+src/lib/engines/xrender_x11/Makefile
src/lib/include/Makefile
proj/Makefile
proj/win32_gdi/Makefile
@@ -1610,7 +1666,8 @@
echo " Software Memory Buffer..: $have_evas_buffer"
echo " DirectFB: $have_evas_directfb"
echo " OpenGL X11..: $have_evas_gl_x11"
-echo " Cairo X11..: $have_evas_cairo_x11"
+echo " Cairo X11...: $have_evas_cairo_x11"
+echo " XRender X11.: $have_evas_xrender_x11"
# FIXME: opengl engine needs to be fixed and tested lots for all drivers
# FIXME: xrender engine to be written
echo
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/eclair moom16
Enlightenment CVS committal
Author : moom16
Project : e17
Module : apps/eclair
Dir : e17/apps/eclair/src
Modified Files:
eclair.c eclair.h eclair_args.c eclair_types.h eclair_video.c
Log Message:
* Eclair works with the new API of emotion. It still needs some work
when the emotion module can't be open.
===
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- eclair.c10 Jul 2005 19:15:21 - 1.28
+++ eclair.c2 Oct 2005 09:09:11 - 1.29
@@ -58,6 +58,7 @@
eclair->drop_object = ECLAIR_DROP_NONE;
eclair->drop_window = NULL;
eclair->video_engine = ECLAIR_SOFTWARE;
+ eclair->video_module = ECLAIR_VIDEO_XINE;
eclair->start_playing = 0;
if (!eclair_args_parse(eclair, &filenames))
===
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- eclair.h5 Sep 2005 15:27:30 - 1.13
+++ eclair.h2 Oct 2005 09:09:11 - 1.14
@@ -37,6 +37,7 @@
//Video related vars
Eclair_Video video;
Eclair_Engine video_engine;
+ Eclair_Video_Module video_module;
//Gui related vars
Eclair_Window *gui_window;
===
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_args.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- eclair_args.c 10 Jul 2005 19:15:21 - 1.8
+++ eclair_args.c 2 Oct 2005 09:09:11 - 1.9
@@ -17,13 +17,14 @@
{ "theme",required_argument, NULL,'t' },
{ "gui-engine", required_argument, NULL,'g' },
{ "video-engine", required_argument, NULL,'v' },
+ { "video-module", required_argument, NULL,'m' },
{ NULL, 0, NULL,0 }
};
if (!eclair || (argc = *eclair->argc) <= 0 || !(argv = *eclair->argv))
return 0;
- while ((c = getopt_long(argc, argv, "ht:g:v:", long_options, NULL)) != -1)
+ while ((c = getopt_long(argc, argv, "ht:g:v:m:", long_options, NULL)) != -1)
{
switch (c)
{
@@ -59,6 +60,17 @@
return 0;
}
break;
+ case 'm':
+if (strcmp(optarg, "xine") == 0)
+ eclair->video_module = ECLAIR_VIDEO_XINE;
+else if (strcmp(optarg, "gstreamer") == 0)
+ eclair->video_engine = ECLAIR_VIDEO_GSTREAMER;
+else
+{
+ _eclair_args_print_usage();
+ return 0;
+}
+break;
default:
_eclair_args_print_usage();
return 0;
@@ -81,5 +93,6 @@
"-h, --helpPrint this message and exit\n"
"-t, --theme Specify an edj theme file for
eclair\n"
"-g, --gui-engine [software|gl]Specify the gui engine\n"
- "-v, --video-engine [software|gl] Specify the video engine\n");
+ "-v, --video-engine [software|gl] Specify the video engine\n"
+ "-m, --video-module [xine|gstreamer] Specify the video module\n");
}
===
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_types.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- eclair_types.h 13 Jul 2005 21:27:43 - 1.2
+++ eclair_types.h 2 Oct 2005 09:09:11 - 1.3
@@ -2,6 +2,7 @@
#define _ECLAIR_TYPES_H_
typedef enum _Eclair_State Eclair_State;
+typedef enum _Eclair_Video_Module Eclair_Video_Module;
typedef enum _Eclair_Engine Eclair_Engine;
typedef enum _Eclair_Drop_Object Eclair_Drop_Object;
typedef enum _Eclair_Add_File_State Eclair_Add_File_State;
@@ -31,6 +32,12 @@
ECLAIR_GL
};
+enum _Eclair_Video_Module
+{
+ ECLAIR_VIDEO_XINE,
+ ECLAIR_VIDEO_GSTREAMER
+};
+
enum _Eclair_Add_File_State
{
ECLAIR_IDLE = 0,
===
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_video.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- eclair_video.c 10 Jul 2005 19:15:22 - 1.2
+++ eclair_video.c 2 Oct 2005 09:09:11 - 1.3
@@ -80,6 +80,7 @@
Eclair *eclair;
Evas *evas;
Evas_Object *new_video_object;
+ int result = 0;
if (!(video = param) || !(eclair = video->eclair))
return NULL;
@@ -93,7 +94,21 @@
evas_object_layer_set(new_video_object, 1);
evas_object_show(new_video_object);
- emotion_object_init(new_video_object);
+ switch (eclair->video_module)
+ {
+ case ECLAIR_VIDEO_GSTREAMER:
+ result |= emotion_object_init(new_
E CVS: libs/emotion doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/lib
Modified Files:
emotion_smart.c
Log Message:
remove printf
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/emotion_smart.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- emotion_smart.c 2 Oct 2005 07:34:36 - 1.17
+++ emotion_smart.c 2 Oct 2005 12:19:36 - 1.18
@@ -98,13 +98,11 @@
snprintf(buf, sizeof(buf), "%s%s", PACKAGE_LIB_DIR"/emotion/",
name);
- printf ("module : %s\n", buf);
handle = dlopen(buf, RTLD_NOW | RTLD_GLOBAL);
if (handle)
{
unsigned char (*func_module_open)(Evas_Object *, Emotion_Video_Module
**, void **);
- printf ("module opened\n");
func_module_open = dlsym(handle, "module_open");
if (func_module_open)
{
@@ -120,7 +118,7 @@
{
char *err;
err = dlerror();
- printf ("pas de module : %s\n", err);
+ printf ("No module. Error: %s\n", err);
}
return 0;
}
@@ -173,12 +171,6 @@
sd->pos = 0;
sd->seek_pos = 0;
sd->len = 0;
-
- if (!sd->module || !sd->video)
- {
-if (!_emotion_module_open(module_filename, obj, &sd->module,
&sd->video))
- return 0;
- }
if (!sd->module || !sd->video)
if (!_emotion_module_open(module_filename, obj, &sd->module, &sd->video))
@@ -251,11 +243,9 @@
{
Smart_Data *sd;
- printf ("play get\n");
E_SMART_OBJ_GET_RETURN(sd, obj, E_OBJ_NAME, 0);
- printf ("play get1\n");
if (!sd->video) return 0;
- printf ("play get2\n");
+
return sd->play;
}
@@ -826,7 +816,7 @@
Smart_Data *sd;
int iw, ih;
int changed = 0;
- printf ("frame resize %d %d\n", w, h);
+
E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
evas_object_image_size_get(sd->obj, &iw, &ih);
if ((w != iw) || (h != ih))
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl rbdpngn
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_misc.c
Log Message:
Fix engine parameter.
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_misc.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ewl_misc.c 5 Sep 2005 14:12:15 - 1.14
+++ ewl_misc.c 2 Oct 2005 03:11:55 - 1.15
@@ -137,6 +137,30 @@
DRETURN_INT(_ewl_init_count, DLEVEL_STABLE);
}
+#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+ if (use_engine == EWL_ENGINE_SOFTWARE_X11) {
+ IF_FREE(ewl_config.evas.render_method);
+ ewl_config.evas.render_method = strdup("software_x11");
+ }
+ else
+#endif
+#ifdef HAVE_EVAS_ENGINE_GL_X11_H
+ if (use_engine == EWL_ENGINE_GL_X11) {
+ IF_FREE(ewl_config.evas.render_method);
+ ewl_config.evas.render_method = strdup("gl_x11");
+ }
+ else
+#endif
+#ifdef HAVE_EVAS_ENGINE_FB_H
+ if (use_engine == EWL_ENGINE_FB) {
+ IF_FREE(ewl_config.evas.render_method);
+ ewl_config.evas.render_method = strdup("fb");
+ }
+ else
+#endif
+ if (!ewl_config.evas.render_method)
+ ewl_config.evas.render_method = strdup("software_x11");
+
if (print_theme_keys)
ewl_config.theme.print_keys = print_theme_keys;
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl rbdpngn
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_widget.c
Log Message:
Adjust click callback handling to match new mouse move dispatching.
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_widget.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ewl_widget.c28 Sep 2005 20:32:18 - 1.17
+++ ewl_widget.c2 Oct 2005 07:02:27 - 1.18
@@ -1577,9 +1577,20 @@
ewl_widget_state_set(w, state);
if (ewl_object_state_has(EWL_OBJECT(w), EWL_FLAG_STATE_HILITED)) {
+ int x, y;
+
ewl_widget_state_set(w, "mouse,in");
- ewl_callback_call_with_event_data(w, EWL_CALLBACK_CLICKED,
- ev_data);
+ x = e->x - (CURRENT_X(w) - INSET_LEFT(w));
+ y = e->y - (CURRENT_Y(w) - INSET_TOP(w));
+ if ((x > 0) && (x < CURRENT_W(w) + INSET_HORIZONTAL(w)) &&
+ (y > 0) && (y < CURRENT_H(w) + INSET_VERTICAL(w))) {
+ ewl_callback_call_with_event_data(w,
+ EWL_CALLBACK_CLICKED, ev_data);
+ }
+ else {
+ ewl_embed_mouse_move_feed(ewl_embed_widget_find(w),
+ e->x, e->y, e->modifiers);
+ }
} else
ewl_widget_state_set(w, "mouse,out");
DLEAVE_FUNCTION(DLEVEL_STABLE);
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion vapier
Enlightenment CVS committal
Author : vapier
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion
Modified Files:
configure.in
Log Message:
cleanup xine/gstreamer support so users can control their options
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/configure.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- configure.in2 Oct 2005 12:56:17 - 1.18
+++ configure.in2 Oct 2005 19:44:17 - 1.19
@@ -129,42 +129,64 @@
[ AC_MSG_ERROR(Embryo isn't installed)]
)
-AC_PATH_GENERIC(xine, 1.0.0,
- [HAVE_XINE="yes"],
- [HAVE_XINE="no"]
-)
-
-xine_plugins=`$XINE_CONFIG --plugindir`
-AC_SUBST(xine_plugins)
-
-dnl gstreamer
-gstreamer_cflags=
-gstreamer_libs=
-
-dnl Gstreamer version requirement
-GST_REQS=0.8.10
-GSTPLUG_REQS=0.8.10
-GST_MAJORMINOR=0.8
-
-PKG_CHECK_MODULES(GST, \
- gstreamer-$GST_MAJORMINOR >= $GST_REQS,
- HAVE_GSTREAMER="yes", HAVE_GSTREAMER="no")
-
-PKG_CHECK_MODULES(GSTPLUG, \
- gstreamer-plugins-$GST_MAJORMINOR >= $GSTPLUG_REQS,
- HAVE_GSTPLUG="yes", HAVE_GSTPLUG="no")
-
-if test "${HAVE_GSTPLUG}" = "no" ; then
- AC_MSG_WARN([You should install gstreamer plugins and gst-ffmpeg to decode
properly your video and audio files])
- GSTPLUG_MSG="no (you should install gst-plugins and gst-ffmpeg)"
-else
- GSTPLUG_MSG="yes"
+AC_ARG_ENABLE(xine,
+ AC_HELP_STRING([--disable-xine],[disable xine support
@<:@default=auto@:>@]),
+ [enable_xine=$enableval],[enable_xine=auto])
+HAVE_XINE="no"
+if test "$enable_xine" != "no" ; then
+ AC_PATH_GENERIC(xine, 1.0.0, [HAVE_XINE="yes"])
+
+ if test "$HAVE_XINE" = "yes" ; then
+ xine_plugins=`$XINE_CONFIG --plugindir`
+ AC_SUBST(xine_plugins)
+ fi
+fi
+if test "$enable_xine$HAVE_XINE" = "yesno" ; then
+ AC_MSG_ERROR(xine not found)
fi
-AC_SUBST(GST_CFLAGS)
-AC_SUBST(GST_LIBS)
+AC_ARG_ENABLE(gstreamer,
+ AC_HELP_STRING([--disable-gstreamer],[disable gstreamer support
@<:@default=auto@:>@]),
+ [enable_gstreamer=$enableval],[enable_gstreamer=auto])
+HAVE_GSTREAMER="no"
+HAVE_GSTPLUG="no"
+if test "$enable_gstreamer" != "no" ; then
+ gstreamer_cflags=
+ gstreamer_libs=
+
+ dnl Gstreamer version requirement
+ GST_REQS=0.8.10
+ GSTPLUG_REQS=0.8.10
+ GST_MAJORMINOR=0.8
+
+ PKG_CHECK_MODULES(GST, \
+ gstreamer-$GST_MAJORMINOR >= $GST_REQS,
+ HAVE_GSTREAMER="yes", HAVE_GSTREAMER="no")
+ AC_MSG_RESULT($HAVE_GSTREAMER)
+
+ PKG_CHECK_MODULES(GSTPLUG, \
+ gstreamer-plugins-$GST_MAJORMINOR >= $GSTPLUG_REQS,
+ HAVE_GSTPLUG="yes", HAVE_GSTPLUG="no")
+ AC_MSG_RESULT($HAVE_GSTPLUG)
+
+ AC_SUBST(GST_CFLAGS)
+ AC_SUBST(GST_LIBS)
+fi
+if test "$enable_gstreamer$HAVE_GSTREAMER" = "yesno" ; then
+ AC_MSG_ERROR(gstreamer not found)
+fi
+if test "$HAVE_GSTPLUG" = "no" ; then
+ if test "$HAVE_GSTREAMER" = "no" ; then
+ GSTPLUG_MSG="no"
+ else
+ AC_MSG_WARN([You should install gstreamer plugins and
gst-ffmpeg to properly decode your video and audio files])
+ GSTPLUG_MSG="no (you should install gst-plugins and gst-ffmpeg)"
+ fi
+else
+ GSTPLUG_MSG="yes"
+fi
-if test "${HAVE_XINE}" = "no" && test "${HAVE_GSTREAMER}" = "no" ; then
+if test "$HAVE_XINE$HAVE_GSTREAMER" = "nono" ; then
AC_MSG_ERROR([Xine or Gstreamer must be installed to build emotion])
fi
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
ecompmgr.c eobj.c
Log Message:
Fix destroy while fading. Bits and pieces.
===
RCS file: /cvsroot/enlightenment/e16/e/src/ecompmgr.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -3 -r1.67 -r1.68
--- ecompmgr.c 28 Sep 2005 19:10:57 - 1.67
+++ ecompmgr.c 30 Sep 2005 18:56:44 - 1.68
@@ -68,12 +68,13 @@
#define INV_POS 0x01
#define INV_SIZE0x02
-#define INV_OPACITY 0x04
-#define INV_SHADOW 0x08
-#define INV_PIXMAP 0x10
-#define INV_PICTURE 0x20
+#define INV_CLIP0x04
+#define INV_OPACITY 0x08
+#define INV_SHADOW 0x10
+#define INV_PIXMAP 0x20
+#define INV_PICTURE 0x40
#define INV_GEOM(INV_POS | INV_SIZE)
-#define INV_ALL (INV_POS | INV_SIZE | INV_OPACITY | INV_SHADOW |
INV_PIXMAP)
+#define INV_ALL (INV_POS | INV_SIZE | INV_CLIP | INV_OPACITY | INV_SHADOW
| INV_PIXMAP)
typedef struct
{
@@ -94,7 +95,7 @@
Damage damage;
Picture picture;
Picture alphaPict;
- XserverRegion borderSize;
+ XserverRegion shape;
XserverRegion extents;
XserverRegion clip;
#if ENABLE_SHADOWS
@@ -261,17 +262,17 @@
ERegionSubtractOffset(XserverRegion dst, int dx, int dy, XserverRegion src)
{
Display*dpy = disp;
- XserverRegion reg;
+ XserverRegion rgn;
- reg = src;
+ rgn = src;
if (dx != 0 || dy != 0)
{
- reg = ERegionClone(src);
- XFixesTranslateRegion(dpy, reg, dx, dy);
+ rgn = ERegionClone(src);
+ XFixesTranslateRegion(dpy, rgn, dx, dy);
}
- XFixesSubtractRegion(dpy, dst, dst, reg);
- if (reg != src)
- XFixesDestroyRegion(dpy, reg);
+ XFixesSubtractRegion(dpy, dst, dst, rgn);
+ if (rgn != src)
+ XFixesDestroyRegion(dpy, rgn);
}
#if 0 /* Unused (for debug) */
@@ -815,15 +816,13 @@
#endif /* ENABLE_SHADOWS */
-/*
- * Window ops
- */
-
+/* Region of window in screen coordinates, including shadows */
static XserverRegion
win_extents(EObj * eo)
{
ECmWinInfo *cw = eo->cmhook;
XRectangle r;
+ XserverRegion rgn;
if (Mode_compmgr.use_pixmap)
{
@@ -900,14 +899,19 @@
}
#endif
- D2printf("win_extents %#lx %d %d %d %d\n", eo->win, r.x, r.y, r.width,
- r.height);
+ D2printf("extents %#lx %d %d %d %d\n", eo->win, r.x, r.y, r.width,
r.height);
+
+ rgn = XFixesCreateRegion(disp, &r, 1);
- return XFixesCreateRegion(disp, &r, 1);
+ if (EventDebug(EDBUG_TYPE_COMPMGR3))
+ ERegionShow("extents", rgn);
+
+ return rgn;
}
+/* Region of shaped window in screen coordinates */
static XserverRegion
-border_size(EObj * eo)
+win_shape(EObj * eo)
{
ECmWinInfo *cw = eo->cmhook;
XserverRegion border;
@@ -920,9 +924,9 @@
y = eo->y + cw->a.border_width;
XFixesTranslateRegion(disp, border, x, y);
- D2printf("border_size %#lx: %d %d\n", eo->win, x, y);
+ D2printf("shape %#lx: %d %d\n", eo->win, x, y);
if (EventDebug(EDBUG_TYPE_COMPMGR3))
- ERegionShow("borderSize", border);
+ ERegionShow("shape", border);
return border;
}
@@ -962,10 +966,10 @@
what |= INV_PICTURE;
}
- if ((what & INV_GEOM) && cw->borderSize != None)
+ if ((what & INV_GEOM) && cw->shape != None)
{
- XFixesDestroyRegion(dpy, cw->borderSize);
- cw->borderSize = None;
+ XFixesDestroyRegion(dpy, cw->shape);
+ cw->shape = None;
}
if ((what & INV_PICTURE) && cw->picture != None)
@@ -980,13 +984,11 @@
cw->alphaPict = None;
}
-#if 0 /* Recalculating clip every repaint for now. */
- if ((what & INV_SIZE) && cw->clip != None)
+ if ((what & (INV_CLIP | INV_GEOM)) && cw->clip != None)
{
XFixesDestroyRegion(dpy, cw->clip);
cw->clip = None;
}
-#endif
#if ENABLE_SHADOWS
if ((what & (INV_SIZE | INV_OPACITY | INV_SHADOW)) && cw->shadow != None)
@@ -1054,6 +1056,15 @@
}
static void
+ECompMgrWinFadeCancel(EObj * eo)
+{
+ chars[128];
+
+ Esnprintf(s, sizeof(s), "Fade-%#lx", eo->win);
+ RemoveTimerEvent(s);
+}
+
+static void
doECompMgrWinFade(int val, void *data)
{
EObj *eo = data;
@@ -1303,7 +1314,7 @@
cw->pixmap = None;
cw->alphaPict = None;
- cw->borderSize = None;
+ cw->shape = None;
cw->extents = None;
cw->clip = None;
#if ENABLE_SHADOWS
@@ -1447,8 +1458,12 @@
{
ECmWinInfo *cw = eo->cmhook;
+ D1printf("ECompMgrWinChangeStacking %#lx\n", eo->win);
+
+#if 0 /* FIXME - Remove? */
if (Conf_compmgr.shadows.mode == ECM_SHADOWS_OFF)
return;
+#endif
ECompMgrDamageMergeObject(eo, cw->extents, 0);
}
@@ -1463,6 +1478,9 @@
D1pr
E CVS: apps/e vandango
Enlightenment CVS committal
Author : vandango
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/dropshadow
Modified Files:
e_mod_main.c
Log Message:
little trans update
===
RCS file:
/cvsroot/enlightenment/e17/apps/e/src/modules/dropshadow/e_mod_main.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- e_mod_main.c30 Sep 2005 17:34:36 - 1.32
+++ e_mod_main.c30 Sep 2005 17:35:44 - 1.33
@@ -93,7 +93,7 @@
E_Module_Api e_modapi =
{
E_MODULE_API_VERSION,
- _("Dropshadow")
+ "Dropshadow"
};
void *
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib/engines/xrender_x11 Added Files: .cvsignore evas_engine.c evas_engine.h evas_engine_font.c evas_engine_gradient.c evas_engine_image.c evas_engine_ximage.c evas_engine_xrender.c Log Message: an xrender engine. fully complete - but it doesnt support shaped window masks and destination alpha like software_x11 does so its not a 100% dropin replacement... yet --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion
Modified Files:
configure.in
Log Message:
fix typo and add warning
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/configure.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- configure.in2 Oct 2005 08:07:56 - 1.17
+++ configure.in2 Oct 2005 12:56:17 - 1.18
@@ -154,6 +154,13 @@
gstreamer-plugins-$GST_MAJORMINOR >= $GSTPLUG_REQS,
HAVE_GSTPLUG="yes", HAVE_GSTPLUG="no")
+if test "${HAVE_GSTPLUG}" = "no" ; then
+ AC_MSG_WARN([You should install gstreamer plugins and gst-ffmpeg to decode
properly your video and audio files])
+ GSTPLUG_MSG="no (you should install gst-plugins and gst-ffmpeg)"
+else
+ GSTPLUG_MSG="yes"
+fi
+
AC_SUBST(GST_CFLAGS)
AC_SUBST(GST_LIBS)
@@ -200,7 +207,7 @@
echo " Modules:"
echo "Xine...: $HAVE_XINE"
echo "Gstreamer..: $HAVE_GSTREAMER"
-echo "Gsteamer plugins...: $HAVE_GSTPLUG"
+echo "Gstreamer plugins..: $GSTPLUG_MSG"
echo
echo " Compilation..: make"
echo
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/bin
Modified Files:
evas_xrender_x11_test
Log Message:
fix gl engine - i broke it a bit
===
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/bin/evas_xrender_x11_test,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_xrender_x11_test 2 Oct 2005 15:15:44 - 1.1
+++ evas_xrender_x11_test 2 Oct 2005 16:06:11 - 1.2
@@ -18,7 +18,7 @@
# if CDPATH is set.
if test "${CDPATH+set}" = set; then CDPATH=:; export CDPATH; fi
-relink_command="(cd /home/raster/C/evas/src/bin; { test -z
\"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export
LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH
|| { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z
\"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=;
export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset
LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; };
PATH=\"/home/raster/bin:/home/raster/s:/usr/local/bin:/usr/local/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/games:/sbin:/usr/sbin:/usr/X11R6/lib/xscreensaver:/opt/arm/3.3.2-vfp/bin:/opt/bitkeeper:/opt/java.sun/java.current/bin:.:\";
export PATH; ccache gcc -g3 -O0 -ggdb -o \$progdir/\$file evas_test_main.o
evas_xrender_x11_main.o ../../src/lib/.libs/libevas.so -lm -L/usr/X11R6/lib
-lX11 -lXext /usr/lib/libXrender.so -Wl,--rpath
-Wl,/home/raster/C/evas/src/lib/.libs)"
+relink_command="(cd /home/raster/C/evas/src/bin; { test -z
\"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export
LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH
|| { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z
\"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=;
export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset
LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; };
PATH=\"/home/raster/bin:/home/raster/s:/usr/local/bin:/usr/local/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/games:/sbin:/usr/sbin:/usr/X11R6/lib/xscreensaver:/opt/arm/3.3.2-vfp/bin:/opt/bitkeeper:/opt/java.sun/java.current/bin:.:\";
export PATH; ccache gcc -O2 -march=pentium4 -g -msse -mmmx -pipe -o
\$progdir/\$file evas_test_main.o evas_xrender_x11_main.o
../../src/lib/.libs/libevas.so -lm -L/usr/X11R6/lib -lX11 -lXext
/usr/lib/libXrender.so -Wl,--rpath -Wl,/home/raster/C/evas/src/lib/.libs)"
# This environment variable determines our operation mode.
if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
