E CVS: apps/e onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: xnest.sh Log Message: No need to edit the file to choose different debugging methods, you can pass an argument now. For those that use a GUI, open the GUI in your main X. Defaults to using gdb, and will print help text if it doesn't understand the argument. === RCS file: /cvs/e/e17/apps/e/xnest.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- xnest.sh12 Sep 2006 06:48:30 - 1.3 +++ xnest.sh1 Oct 2006 06:35:25 - 1.4 @@ -1,16 +1,42 @@ #!/bin/sh #export REDRAW_DEBUG=1# To cause redraw- to happen slovly and obviously. -#export ECORE_ERROR_ABORT=1 # To cause ecore to abort on errers. +#export ECORE_ERROR_ABORT=1 # To cause ecore to abort on errors. + +main=$DISPLAY +display=" -display :1" + +case "$@" in + "-d") action="ddd -display $main" ; display="" ;; + "-e") action="" ;; + "-g") action="gdb -x gdb.txt" ; main=":1" ; display="" ;; + "") action="gdb -x gdb.txt" ; main=":1" ; display="" ;; + "-l") action="valgrind --tool=memcheck --leak-check=yes --show-reachable=yes --log-file=valgrind_log" ;; + "-m") action="valgrind --tool=memcheck --log-file=valgrind_log" ;; + "-p") action="memprof --display=$main" ; main=":1" ; display="" ;; + "-r") action="memprof_raster --display=$main" ; main=":1" ; display="" ;; + "-v") action="valkyrie -display $main" ; main=":1" ; display="" ;; + *) echo -e "Usage : xnest.sh [option]" + echo -e "\tdefault option is -g" + echo -e "\t-d use the GUI debugger\t\t\tddd" + echo -e "\t-e enlightenment with no debugging" + echo -e "\t-g use text debugger\t\t\tgdb" + echo -e "\t-l leak check\t\t\t\tvalgrind" + echo -e "\t-m memory check\t\t\t\tvalgrind" + echo -e "\t-p memory profiling\t\t\tmemprof" + echo -e "\t-r raster's memory profiling\t\tmemprof_raster" + echo -e "\t-v GUI memory check\t\t\tvalkyrie" + echo -e "" + echo -e "You need to add \"-display :1\" as the run arguments for the GUI debugger." + echo -e "When you have finished with the text debugger, use the q command to quit." + echo -e "The valgrind options will leave a log file with a name beginning with valgrind_log" + exit + ;; +esac + Xnest :1 -ac & sleep 2 # Someone reported that it starts E before X has started properly. -# Comment out all but one of these. -#DISPLAY=:1 ; enlightenment # Just run it. -#DISPLAY=:1 ; xterm -e gdb -x gdb.txt enlightenment # Run it with the text based debugger. -DISPLAY=:1 ; gdb -x gdb.txt enlightenment # Run it with the text based debugger. -#DISPLAY=:1 ; ddd -geometry 550x450+5+25 enlightenment & # Run it with the GUI debugger. -#DISPLAY=:1 ; valgrind --tool=memcheck --log-file=valgrind_log enlightenment # Run it with valgrind. -#DISPLAY=:1 ; valgrind --tool=memcheck --leak-check=yes --show-reachable=yes --log-file=valgrind_log enlightenment# Run it with valgrind and leak checking. +DISPLAY=$main; $action enlightenment $display - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : proto
Dir : e17/proto/edvi/src/lib
Modified Files:
etk_dvi.c ewl_dvi.c
Log Message:
make the background os the etk and ewl widgets white, and the foreground black
===
RCS file: /cvs/e/e17/proto/edvi/src/lib/etk_dvi.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_dvi.c 11 Sep 2006 07:22:08 - 1.2
+++ etk_dvi.c 1 Oct 2006 06:12:30 - 1.3
@@ -513,7 +513,24 @@
edvi_page_delete (dvi->dvi_page);
if (dvi->dvi_object)
{
+ unsigned int *m;
+ int w;
+ int h;
+
dvi->dvi_page = edvi_page_new (dvi->dvi_document, dvi->page);
+
+ w = edvi_page_width_get (dvi->dvi_page);
+ h = edvi_page_height_get (dvi->dvi_page);
+ evas_object_image_size_set (dvi->dvi_object, w, h);
+ evas_object_image_fill_set (dvi->dvi_object, 0, 0, w, h);
+ m = (unsigned int *)evas_object_image_data_get (dvi->dvi_object, 1);
+ if (!m)
+return;
+
+ memset(m, (255 << 24) | (255 << 16) | (255 << 8) | 255, w * h * 4);
+ evas_object_image_data_update_add (dvi->dvi_object, 0, 0, w, h);
+ evas_object_resize (dvi->dvi_object, w, h);
+
edvi_page_render (dvi->dvi_page, dvi->dvi_device, dvi->dvi_object);
}
evas_object_show(dvi->dvi_object);
===
RCS file: /cvs/e/e17/proto/edvi/src/lib/ewl_dvi.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_dvi.c 30 Sep 2006 22:58:56 - 1.2
+++ ewl_dvi.c 1 Oct 2006 06:12:30 - 1.3
@@ -432,9 +432,26 @@
DRETURN(DLEVEL_STABLE);
if (dvi->dvi_document) {
+ unsigned int *m;
+ int w;
+ int h;
+
if (dvi->dvi_page)
edvi_page_delete (dvi->dvi_page);
dvi->dvi_page = edvi_page_new (dvi->dvi_document, dvi->page);
+
+ w = edvi_page_width_get (dvi->dvi_page);
+ h = edvi_page_height_get (dvi->dvi_page);
+ evas_object_image_size_set (dvi->image, w, h);
+ evas_object_image_fill_set (dvi->image, 0, 0, w, h);
+ m = (unsigned int *)evas_object_image_data_get (dvi->image, 1);
+if (!m)
+ DRETURN(DLEVEL_STABLE);
+
+ memset(m, (255 << 24) | (255 << 16) | (255 << 8) | 255, w * h *
4);
+ evas_object_image_data_update_add (dvi->image, 0, 0, w, h);
+ evas_object_resize (dvi->image, w, h);
+
edvi_page_render (dvi->dvi_page, dvi->dvi_device, dvi->image);
}
evas_object_image_size_get(dvi->image, &dvi->ow, &dvi->oh);
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src Modified Files: ephoto_viewer.c Log Message: Center images in the image viewer. === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- ephoto_viewer.c 1 Oct 2006 00:31:06 - 1.11 +++ ephoto_viewer.c 1 Oct 2006 05:31:58 - 1.12 @@ -21,7 +21,7 @@ ewl_container_child_append(EWL_CONTAINER(ibox), image_view); ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE); ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK); - ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_LEFT); + ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_CENTER); ewl_widget_show(image_view); ewl_widget_configure(ibox); @@ -64,7 +64,7 @@ ewl_container_child_append(EWL_CONTAINER(ibox), image_view); ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE); ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK); - ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_LEFT); + ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_CENTER); ewl_widget_show(image_view); ewl_widget_configure(ibox); @@ -128,7 +128,7 @@ ewl_container_child_append(EWL_CONTAINER(ibox), image_view); ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE); ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK); - ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_LEFT); + ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_CENTER); ewl_widget_show(image_view); hbox = ewl_hbox_new(); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : proto Dir : e17/proto/ephoto/data Added Files: .cvsignore Log Message: .cvsignore++ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : proto Dir : e17/proto/ephoto/data/images Added Files: .cvsignore Log Message: .cvsignore++ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl ningerso
Enlightenment CVS committal Author : ningerso Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/engines/evas_buffer Modified Files: ewl_engine_evas_buffer.c Log Message: Set the destination buffer row byte count. === RCS file: /cvs/e/e17/libs/ewl/src/engines/evas_buffer/ewl_engine_evas_buffer.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ewl_engine_evas_buffer.c30 Sep 2006 20:53:30 - 1.1 +++ ewl_engine_evas_buffer.c1 Oct 2006 01:19:09 - 1.2 @@ -108,6 +108,7 @@ bufinfo->info.depth_type = EVAS_ENGINE_BUFFER_DEPTH_ARGB32; bufinfo->info.dest_buffer = NULL; + bufinfo->info.dest_buffer_row_bytes = 0; bufinfo->info.use_color_key = 0; bufinfo->info.alpha_threshold = 0; bufinfo->info.func.new_update_region = NULL; @@ -151,8 +152,9 @@ o = EWL_OBJECT(emb); bufinfo = (Evas_Engine_Info_Buffer *)info; + bufinfo->info.dest_buffer_row_bytes = sizeof(int) * width; bufinfo->info.dest_buffer = realloc(bufinfo->info.dest_buffer, - width * height * 4 * sizeof(char)); + bufinfo->info.dest_buffer_row_bytes * height); evas_engine_info_set(evas, info); evas_output_size_set(evas, width, height); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src Modified Files: ephoto_callbacks.c Log Message: A few more bug fixes on ephoto === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_callbacks.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- ephoto_callbacks.c 24 Sep 2006 23:30:19 - 1.29 +++ ephoto_callbacks.c 1 Oct 2006 00:38:45 - 1.30 @@ -64,6 +64,7 @@ ewl_callback_append(row, EWL_CALLBACK_CLICKED, populate_images, NULL); ewl_widget_name_set(row, full_path); } + ewl_widget_configure(m->albums); } void populate_browser(Ewl_Widget *w, void *event, void *data) @@ -130,6 +131,7 @@ ewl_callback_append(row, EWL_CALLBACK_CLICKED, populate_images, NULL); ewl_widget_name_set(row, file); } + ewl_widget_configure(m->browser); } void populate_images(Ewl_Widget *w, void *event, void *data) @@ -224,6 +226,8 @@ ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_CENTER); ewl_widget_show(image); } + ewl_widget_configure(m->viewer_freebox); + ewl_widget_configure(m->viewer); ecore_list_destroy(ls); ecore_list_destroy(images); } - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src Modified Files: ephoto_viewer.c Log Message: Fix one of the issues === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- ephoto_viewer.c 1 Oct 2006 00:26:15 - 1.10 +++ ephoto_viewer.c 1 Oct 2006 00:31:06 - 1.11 @@ -23,6 +23,8 @@ ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK); ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_LEFT); ewl_widget_show(image_view); + + ewl_widget_configure(ibox); } void zoom_in(Ewl_Widget *w, void *event, void *data) @@ -33,6 +35,8 @@ ewl_image_size_set(EWL_IMAGE(image_view), ow*1.5, oh*1.5); ewl_widget_reparent(image_view); + + ewl_widget_configure(ibox); } void zoom_out(Ewl_Widget *w, void *event, void *data) @@ -43,6 +47,8 @@ ewl_image_size_set(EWL_IMAGE(image_view), ow/1.5, oh/1.5); ewl_widget_reparent(image_view); + + ewl_widget_configure(ibox); } void original_size(Ewl_Widget *w, void *event, void *data) @@ -60,6 +66,8 @@ ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK); ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_LEFT); ewl_widget_show(image_view); + + ewl_widget_configure(ibox); } void view_images(Ewl_Widget *w, void *event, void *data) - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto_viewer.c
Log Message:
Much better zooming. Much less buggy.
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ephoto_viewer.c 1 Oct 2006 00:05:41 - 1.9
+++ ephoto_viewer.c 1 Oct 2006 00:26:15 - 1.10
@@ -1,6 +1,5 @@
#include "ephoto.h"
Ewl_Widget *vwin;
-Ewl_Widget *vbox;
Ewl_Widget *ibox;
Ewl_Widget *image_view;
@@ -15,76 +14,35 @@
path = data;
- ewl_widget_destroy(ibox);
ewl_widget_destroy(image_view);
- ibox = ewl_scrollpane_new();
- ewl_object_fill_policy_set(EWL_OBJECT(ibox), EWL_FLAG_FILL_ALL);
- ewl_object_alignment_set(EWL_OBJECT(ibox), EWL_FLAG_ALIGN_CENTER);
- ewl_container_child_append(EWL_CONTAINER(vbox), ibox);
- ewl_widget_show(ibox);
-
image_view = ewl_image_new();
ewl_image_file_set(EWL_IMAGE(image_view), path, NULL);
ewl_container_child_append(EWL_CONTAINER(ibox), image_view);
ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE);
ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_LEFT);
- ewl_widget_show(image_view);
+ ewl_widget_show(image_view);
}
void zoom_in(Ewl_Widget *w, void *event, void *data)
{
- const char *path;
int ow, oh;
- path = ewl_image_file_path_get(EWL_IMAGE(image_view));
ewl_object_current_size_get(EWL_OBJECT(image_view), &ow, &oh);
- ewl_widget_destroy(ibox);
- ewl_widget_destroy(image_view);
-
- ibox = ewl_scrollpane_new();
- ewl_object_fill_policy_set(EWL_OBJECT(ibox), EWL_FLAG_FILL_ALL);
- ewl_object_alignment_set(EWL_OBJECT(ibox), EWL_FLAG_ALIGN_CENTER);
- ewl_container_child_append(EWL_CONTAINER(vbox), ibox);
- ewl_widget_show(ibox);
-
- image_view = ewl_image_new();
- ewl_image_file_set(EWL_IMAGE(image_view), path, NULL);
- ewl_container_child_append(EWL_CONTAINER(ibox), image_view);
- ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE);
ewl_image_size_set(EWL_IMAGE(image_view), ow*1.5, oh*1.5);
- ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK);
- ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_LEFT);
- ewl_widget_show(image_view);
+ ewl_widget_reparent(image_view);
}
void zoom_out(Ewl_Widget *w, void *event, void *data)
{
- const char *path;
int ow, oh;
- path = ewl_image_file_path_get(EWL_IMAGE(image_view));
ewl_object_current_size_get(EWL_OBJECT(image_view), &ow, &oh);
- ewl_widget_destroy(ibox);
- ewl_widget_destroy(image_view);
-
- ibox = ewl_scrollpane_new();
- ewl_object_fill_policy_set(EWL_OBJECT(ibox), EWL_FLAG_FILL_ALL);
- ewl_object_alignment_set(EWL_OBJECT(ibox), EWL_FLAG_ALIGN_CENTER);
- ewl_container_child_append(EWL_CONTAINER(vbox), ibox);
- ewl_widget_show(ibox);
-
- image_view = ewl_image_new();
- ewl_image_file_set(EWL_IMAGE(image_view), path, NULL);
- ewl_container_child_append(EWL_CONTAINER(ibox), image_view);
- ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE);
ewl_image_size_set(EWL_IMAGE(image_view), ow/1.5, oh/1.5);
- ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK);
- ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_LEFT);
- ewl_widget_show(image_view);
+ ewl_widget_reparent(image_view);
}
void original_size(Ewl_Widget *w, void *event, void *data)
@@ -93,28 +51,22 @@
path = ewl_image_file_path_get(EWL_IMAGE(image_view));
- ewl_widget_destroy(ibox);
ewl_widget_destroy(image_view);
- ibox = ewl_scrollpane_new();
- ewl_object_fill_policy_set(EWL_OBJECT(ibox), EWL_FLAG_FILL_ALL);
- ewl_object_alignment_set(EWL_OBJECT(ibox), EWL_FLAG_ALIGN_CENTER);
- ewl_container_child_append(EWL_CONTAINER(vbox), ibox);
- ewl_widget_show(ibox);
-
image_view = ewl_image_new();
ewl_image_file_set(EWL_IMAGE(image_view), path, NULL);
ewl_container_child_append(EWL_CONTAINER(ibox), image_view);
ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE);
ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_LEFT);
- ewl_widget_show(image_view);
+ ewl_widget_show(image_view);
}
void view_images(Ewl_Widget *w, void *event, void *data)
{
char *current_image;
Ewl_Widget *button;
+ Ewl_Widget *vbox;
Ewl_Widget *scrollpane;
Ewl_Widget *freebox;
Ewl_Widget *icon;
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enli
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto_viewer.c
Log Message:
Zooms work now! Zoom in, Zoom out, and Zoom original currently.
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ephoto_viewer.c 30 Sep 2006 21:26:29 - 1.8
+++ ephoto_viewer.c 1 Oct 2006 00:05:41 - 1.9
@@ -1,5 +1,7 @@
#include "ephoto.h"
Ewl_Widget *vwin;
+Ewl_Widget *vbox;
+Ewl_Widget *ibox;
Ewl_Widget *image_view;
void destroy_vwin(Ewl_Widget *w, void *event, void *data)
@@ -12,9 +14,101 @@
char *path;
path = data;
+
+ ewl_widget_destroy(ibox);
+ ewl_widget_destroy(image_view);
+
+ ibox = ewl_scrollpane_new();
+ ewl_object_fill_policy_set(EWL_OBJECT(ibox), EWL_FLAG_FILL_ALL);
+ ewl_object_alignment_set(EWL_OBJECT(ibox), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(vbox), ibox);
+ ewl_widget_show(ibox);
+
+ image_view = ewl_image_new();
+ ewl_image_file_set(EWL_IMAGE(image_view), path, NULL);
+ ewl_container_child_append(EWL_CONTAINER(ibox), image_view);
+ ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE);
+ ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK);
+ ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_LEFT);
+ ewl_widget_show(image_view);
+}
+
+void zoom_in(Ewl_Widget *w, void *event, void *data)
+{
+ const char *path;
+ int ow, oh;
- ewl_container_reset(EWL_CONTAINER(image_view));
- ewl_image_file_set(EWL_IMAGE(image_view), path, NULL);
+ path = ewl_image_file_path_get(EWL_IMAGE(image_view));
+ ewl_object_current_size_get(EWL_OBJECT(image_view), &ow, &oh);
+
+ ewl_widget_destroy(ibox);
+ ewl_widget_destroy(image_view);
+
+ ibox = ewl_scrollpane_new();
+ ewl_object_fill_policy_set(EWL_OBJECT(ibox), EWL_FLAG_FILL_ALL);
+ ewl_object_alignment_set(EWL_OBJECT(ibox), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(vbox), ibox);
+ ewl_widget_show(ibox);
+
+ image_view = ewl_image_new();
+ ewl_image_file_set(EWL_IMAGE(image_view), path, NULL);
+ ewl_container_child_append(EWL_CONTAINER(ibox), image_view);
+ ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE);
+ ewl_image_size_set(EWL_IMAGE(image_view), ow*1.5, oh*1.5);
+ ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK);
+ ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_LEFT);
+ ewl_widget_show(image_view);
+}
+
+void zoom_out(Ewl_Widget *w, void *event, void *data)
+{
+ const char *path;
+ int ow, oh;
+
+ path = ewl_image_file_path_get(EWL_IMAGE(image_view));
+ ewl_object_current_size_get(EWL_OBJECT(image_view), &ow, &oh);
+
+ ewl_widget_destroy(ibox);
+ ewl_widget_destroy(image_view);
+
+ ibox = ewl_scrollpane_new();
+ ewl_object_fill_policy_set(EWL_OBJECT(ibox), EWL_FLAG_FILL_ALL);
+ ewl_object_alignment_set(EWL_OBJECT(ibox), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(vbox), ibox);
+ ewl_widget_show(ibox);
+
+ image_view = ewl_image_new();
+ ewl_image_file_set(EWL_IMAGE(image_view), path, NULL);
+ ewl_container_child_append(EWL_CONTAINER(ibox), image_view);
+ ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE);
+ ewl_image_size_set(EWL_IMAGE(image_view), ow/1.5, oh/1.5);
+ ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK);
+ ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_LEFT);
+ ewl_widget_show(image_view);
+}
+
+void original_size(Ewl_Widget *w, void *event, void *data)
+{
+ const char *path;
+
+ path = ewl_image_file_path_get(EWL_IMAGE(image_view));
+
+ ewl_widget_destroy(ibox);
+ ewl_widget_destroy(image_view);
+
+ ibox = ewl_scrollpane_new();
+ ewl_object_fill_policy_set(EWL_OBJECT(ibox), EWL_FLAG_FILL_ALL);
+ ewl_object_alignment_set(EWL_OBJECT(ibox), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(vbox), ibox);
+ ewl_widget_show(ibox);
+
+ image_view = ewl_image_new();
+ ewl_image_file_set(EWL_IMAGE(image_view), path, NULL);
+ ewl_container_child_append(EWL_CONTAINER(ibox), image_view);
+ ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE);
+ ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK);
+ ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_LEFT);
+ ewl_widget_show(image_view);
}
void view_images(Ewl_Widget *w, void *event, void *data)
@@ -25,8 +119,6 @@
Ewl_Widget *freebox;
Ewl_Widget *icon;
Ewl_Widget *image;
- Ewl_Widget *vbox;
- Ewl_Widget *ibox;
Ewl_Widget *hbox;
Ewl_Widget *cell;
Ecore_List *view_thumbs;
@@ -66,19 +158,17 @@
ewl_object_maximum_size_set(EWL_OBJECT(freebox), 9, 75);
ewl_widget_show(freebox);
- ibox = ewl_cell_new();
+ ibox = ewl_scrollpane_new();
ewl_object_fill_policy_set(EWL_OBJECT(ibox), EWL_FLAG_FILL_ALL);
ewl_object_alignment_set(EWL_OBJECT(ibox), EWL_FLAG_ALIGN_C
E CVS: proto doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : proto
Dir : e17/proto/epdf/src/lib
Modified Files:
ewl_pdf.c ewl_pdf.h
Log Message:
The widget does not inherit from Ewl_Image, but from Ewl_Widget directly
===
RCS file: /cvs/e/e17/proto/epdf/src/lib/ewl_pdf.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ewl_pdf.c 3 Jun 2006 10:11:38 - 1.7
+++ ewl_pdf.c 30 Sep 2006 23:01:43 - 1.8
@@ -45,37 +45,39 @@
* @return Returns no value.
* @brief Initialize an pdf widget to default values and callbacks
*
- * Sets the fields and callbacks of @a i to their default values.
+ * Sets the fields and callbacks of @a pdf to their default values.
*/
int
ewl_pdf_init(Ewl_Pdf *pdf)
{
Ewl_Widget *w;
- Ewl_Image *i;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("pdf", pdf, FALSE);
w = EWL_WIDGET(pdf);
- i = EWL_IMAGE(pdf);
- if (!ewl_image_init(i))
+ if (!ewl_widget_init(w))
DRETURN_INT(FALSE, DLEVEL_STABLE);
- ewl_widget_appearance_set(w, "pdf");
- ewl_widget_inherit(w, "pdf");
+ ewl_widget_appearance_set(w, EWL_PDF_TYPE);
+ ewl_widget_inherit(w, EWL_PDF_TYPE);
+
+ ewl_object_fill_policy_set(EWL_OBJECT(w), EWL_FLAG_FILL_NONE);
/*
* Append necessary callbacks.
*/
+ ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, ewl_pdf_configure_cb,
+ NULL);
ewl_callback_append(w, EWL_CALLBACK_REVEAL, ewl_pdf_reveal_cb,
NULL);
+ ewl_callback_append(w, EWL_CALLBACK_OBSCURE, ewl_pdf_obscure_cb,
+ NULL);
ewl_callback_prepend(w, EWL_CALLBACK_DESTROY, ewl_pdf_destroy_cb,
NULL);
- i->type = EWL_IMAGE_TYPE_NORMAL;
-
- i->path = NULL;
+ pdf->filename = NULL;
pdf->page = 0;
pdf->page_length = 10;
@@ -107,18 +109,18 @@
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("pdf", pdf, 0);
- DCHECK_TYPE_RET("pdf", pdf, "pdf", 0);
+ DCHECK_TYPE_RET("pdf", pdf, EWL_PDF_TYPE, 0);
DRETURN_INT(pdf->page, DLEVEL_STABLE);
}
/**
* @param pdf: the pdf widget to change the displayed pdf
- * @param filename: the path to the new pdf to be displayed by @a pdf
+ * @param filename: the filename to the new pdf to be displayed by @a pdf
* @return Returns no value.
* @brief Change the pdf file displayed by an pdf widget
*
- * Set the pdf displayed by @a pdf to the one found at the path @a im. If an
+ * Set the pdf displayed by @a pdf to the one found at the filename @a
filename. If an
* edje is used, a minimum size should be specified in the edje or the code.
*/
void
@@ -129,12 +131,17 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("pdf", pdf);
- DCHECK_TYPE("pdf", pdf, "pdf");
+ DCHECK_TYPE("pdf", pdf, EWL_PDF_TYPE);
w = EWL_WIDGET(pdf);
emb = ewl_embed_widget_find(w);
- ewl_image_file_set(EWL_IMAGE(pdf), filename, NULL);
+ if (pdf->filename != filename) {
+ IF_FREE(pdf->filename);
+ }
+ if (filename) {
+ pdf->filename = strdup(filename);
+ }
if (pdf->pdf_document) {
if (pdf->pdf_page)
@@ -178,7 +185,7 @@
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("pdf", pdf);
- DCHECK_TYPE("pdf", pdf, "pdf");
+ DCHECK_TYPE("pdf", pdf, EWL_PDF_TYPE);
if (!pdf->pdf_document ||
(page >= epdf_document_page_count_get (pdf->pdf_document)) ||
@@ -199,8 +206,8 @@
Epdf_Document *ewl_pdf_pdf_document_get (Ewl_Pdf *pdf)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("pdf", pdf, 0);
- DCHECK_TYPE_RET("pdf", pdf, "pdf", 0);
+ DCHECK_PARAM_PTR_RET("pdf", pdf, NULL);
+ DCHECK_TYPE_RET("pdf", pdf, EWL_PDF_TYPE, NULL);
DRETURN_PTR(pdf->pdf_document, DLEVEL_STABLE);
}
@@ -213,8 +220,8 @@
Epdf_Page *ewl_pdf_pdf_page_get (Ewl_Pdf *pdf)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("pdf", pdf, 0);
- DCHECK_TYPE_RET("pdf", pdf, "pdf", 0);
+ DCHECK_PARAM_PTR_RET("pdf", pdf, NULL);
+ DCHECK_TYPE_RET("pdf", pdf, EWL_PDF_TYPE, NULL);
DRETURN_PTR(pdf->pdf_page, DLEVEL_STABLE);
}
@@ -227,8 +234,8 @@
Ecore_List *ewl_pdf_pdf_index_get (Ewl_Pdf *pdf)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("pdf", pdf, 0);
- DCHECK_TYPE_RET("pdf", pdf, "pdf", 0);
+ DCHECK_PARAM_PTR_RET("pdf", pdf, NULL);
+ DCHECK_TYPE_RET("pdf", pdf, EWL_PDF_TYPE, NULL);
DRETURN_PTR(pdf->pdf_index, DLEVEL_STABLE);
}
@@ -244,7 +251,7 @@
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("pdf", pdf);
- DCHECK_TYPE("pdf", pdf, "pdf");
E CVS: proto doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : proto
Dir : e17/proto/edvi/src/lib
Modified Files:
ewl_dvi.c ewl_dvi.h
Log Message:
make ewl widget work. the widget does not inherit from Ewl_Image, but from
Ewl_Widget directly
===
RCS file: /cvs/e/e17/proto/edvi/src/lib/ewl_dvi.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ewl_dvi.c 16 Jul 2006 20:51:17 - 1.1
+++ ewl_dvi.c 30 Sep 2006 22:58:56 - 1.2
@@ -45,37 +45,37 @@
* @return Returns no value.
* @brief Initialize an dvi widget to default values and callbacks
*
- * Sets the fields and callbacks of @a i to their default values.
+ * Sets the fields and callbacks of @a dvi to their default values.
*/
int
ewl_dvi_init(Ewl_Dvi *dvi)
{
Ewl_Widget *w;
- Ewl_Image *i;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("dvi", dvi, FALSE);
w = EWL_WIDGET(dvi);
- i = EWL_IMAGE(dvi);
- if (!ewl_image_init(i))
+ if (!ewl_widget_init(w))
DRETURN_INT(FALSE, DLEVEL_STABLE);
- ewl_widget_appearance_set(w, "dvi");
- ewl_widget_inherit(w, "dvi");
+ ewl_widget_appearance_set(w, EWL_DVI_TYPE);
+ ewl_widget_inherit(w, EWL_DVI_TYPE);
/*
* Append necessary callbacks.
*/
+ ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, ewl_dvi_configure_cb,
+ NULL);
ewl_callback_append(w, EWL_CALLBACK_REVEAL, ewl_dvi_reveal_cb,
NULL);
+ ewl_callback_append(w, EWL_CALLBACK_OBSCURE, ewl_dvi_obscure_cb,
+ NULL);
ewl_callback_prepend(w, EWL_CALLBACK_DESTROY, ewl_dvi_destroy_cb,
NULL);
- i->type = EWL_IMAGE_TYPE_NORMAL;
-
- i->path = NULL;
+ dvi->filename = NULL;
dvi->page = 0;
dvi->page_length = 10;
@@ -102,7 +102,7 @@
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("dvi", dvi, 0);
- DCHECK_TYPE_RET("dvi", dvi, "dvi", 0);
+ DCHECK_TYPE_RET("dvi", dvi, EWL_DVI_TYPE, 0);
DRETURN_INT(dvi->page, DLEVEL_STABLE);
}
@@ -113,7 +113,7 @@
* @return Returns no value.
* @brief Change the dvi file displayed by an dvi widget
*
- * Set the dvi displayed by @a dvi to the one found at the path @a im. If an
+ * Set the dvi displayed by @a dvi to the one found at the path @a filename.
If an
* edje is used, a minimum size should be specified in the edje or the code.
*/
void
@@ -124,12 +124,17 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("dvi", dvi);
- DCHECK_TYPE("dvi", dvi, "dvi");
+ DCHECK_TYPE("dvi", dvi, EWL_DVI_TYPE);
w = EWL_WIDGET(dvi);
emb = ewl_embed_widget_find(w);
- ewl_image_file_set(EWL_IMAGE(dvi), filename, NULL);
+ if (dvi->filename != filename) {
+ IF_FREE(dvi->filename);
+ }
+ if (filename) {
+ dvi->filename = strdup(filename);
+ }
if (dvi->dvi_document) {
if (dvi->dvi_page)
@@ -163,7 +168,7 @@
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("dvi", dvi);
- DCHECK_TYPE("dvi", dvi, "dvi");
+ DCHECK_TYPE("dvi", dvi, EWL_DVI_TYPE);
if (!dvi->dvi_document ||
(page >= edvi_document_page_count_get (dvi->dvi_document)) ||
@@ -184,8 +189,8 @@
Edvi_Document *ewl_dvi_dvi_document_get (Ewl_Dvi *dvi)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("dvi", dvi, 0);
- DCHECK_TYPE_RET("dvi", dvi, "dvi", 0);
+ DCHECK_PARAM_PTR_RET("dvi", dvi, NULL);
+ DCHECK_TYPE_RET("dvi", dvi, EWL_DVI_TYPE, NULL);
DRETURN_PTR(dvi->dvi_document, DLEVEL_STABLE);
}
@@ -198,8 +203,8 @@
Edvi_Page *ewl_dvi_dvi_page_get (Ewl_Dvi *dvi)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("dvi", dvi, 0);
- DCHECK_TYPE_RET("dvi", dvi, "dvi", 0);
+ DCHECK_PARAM_PTR_RET("dvi", dvi, NULL);
+ DCHECK_TYPE_RET("dvi", dvi, EWL_DVI_TYPE, NULL);
DRETURN_PTR(dvi->dvi_page, DLEVEL_STABLE);
}
@@ -215,7 +220,7 @@
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("dvi", dvi);
- DCHECK_TYPE("dvi", dvi, "dvi");
+ DCHECK_TYPE("dvi", dvi, EWL_DVI_TYPE);
if (!dvi) {
if (width) *width = 0;
@@ -234,7 +239,7 @@
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("dvi", dvi);
- DCHECK_TYPE("dvi", dvi, "dvi");
+ DCHECK_TYPE("dvi", dvi, EWL_DVI_TYPE);
if (!dvi || !dvi->dvi_page || (dvi->orientation == o))
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -249,8 +254,8 @@
ewl_dvi_orientation_get (Ewl_Dvi *dvi)
{
DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("dvi", dvi, FALSE);
- DCHECK_TYPE_RET("dvi", dvi, "dvi", 0);
+
E CVS: libs/ewl dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data Modified Files: Makefile.am Log Message: - move away from ecore_config to our own system for configuration. - reads a global config file from @PACKAGE_DATA_DIR@/config/ewl.cfg and a user config from ~/.ewl/config/ewl.cfg. Simple key=value pairs. - can be used for application configuration as well. App configs will be in @PACKAGE_DATA_DIR@/config/apps/app_name.cfg or ~/.ewl/config/apps/app_name.cfg. - saving isn't implemented yet but you can edit the .cfg files to set your defaults and user overrides. === RCS file: /cvs/e/e17/libs/ewl/data/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Makefile.am 18 Oct 2005 16:06:32 - 1.4 +++ Makefile.am 30 Sep 2006 22:31:36 - 1.5 @@ -1,2 +1,2 @@ -SUBDIRS = themes images +SUBDIRS = themes images config MAINTAINERCLEANFILES = Makefile.in - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin/tests
Modified Files:
ewl_theme.c
Log Message:
- move away from ecore_config to our own system for configuration.
- reads a global config file from @PACKAGE_DATA_DIR@/config/ewl.cfg and a
user config from ~/.ewl/config/ewl.cfg. Simple key=value pairs.
- can be used for application configuration as well. App configs will be in
@PACKAGE_DATA_DIR@/config/apps/app_name.cfg or
~/.ewl/config/apps/app_name.cfg.
- saving isn't implemented yet but you can edit the .cfg files to set your
defaults and user overrides.
===
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/ewl_theme.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_theme.c 14 Aug 2006 14:56:55 - 1.6
+++ ewl_theme.c 30 Sep 2006 22:31:36 - 1.7
@@ -76,13 +76,11 @@
static void
cb_select_theme(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__, void *data)
{
- Ewl_Widget *n;
char theme_filename[PATH_MAX];
- n = ewl_widget_name_find("notebook");
snprintf(theme_filename, sizeof(theme_filename),
PACKAGE_DATA_DIR "/themes/%s", (char *)data);
- ewl_theme_data_str_set(n, "/file", theme_filename);
+ ewl_theme_theme_set(theme_filename);
}
static Ewl_Widget *
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl
Modified Files:
configure.in ewl-config.in
Log Message:
- move away from ecore_config to our own system for configuration.
- reads a global config file from @PACKAGE_DATA_DIR@/config/ewl.cfg and a
user config from ~/.ewl/config/ewl.cfg. Simple key=value pairs.
- can be used for application configuration as well. App configs will be in
@PACKAGE_DATA_DIR@/config/apps/app_name.cfg or
~/.ewl/config/apps/app_name.cfg.
- saving isn't implemented yet but you can edit the .cfg files to set your
defaults and user overrides.
===
RCS file: /cvs/e/e17/libs/ewl/configure.in,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -3 -r1.80 -r1.81
--- configure.in30 Sep 2006 20:53:30 - 1.80
+++ configure.in30 Sep 2006 22:31:36 - 1.81
@@ -277,6 +277,7 @@
src/engines/evas_fb/Makefile
src/engines/evas_buffer/Makefile
data/Makefile
+data/config/Makefile
data/images/Makefile
data/themes/Makefile
debian/changelog
===
RCS file: /cvs/e/e17/libs/ewl/ewl-config.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ewl-config.in 11 Jun 2006 22:37:24 - 1.13
+++ ewl-config.in 30 Sep 2006 22:31:36 - 1.14
@@ -5,7 +5,7 @@
exec_prefix_set=no
usage="\
-Usage: ewl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs]
[--cflags] [--test-lib-dir] [--test-src-dir]"
+Usage: ewl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs]
[--cflags] [--test-lib-dir] [--test-src-dir] [--app-config-dir]"
if test $# -eq 0; then
echo "${usage}" 1>&2
@@ -53,6 +53,9 @@
;;
--test-src-dir)
echo @prefix@/share/ewl/examples
+ ;;
+--app-config-dir)
+ echo @prefix@/share/ewl/config/apps
;;
*)
echo "${usage}" 1>&2
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/config Added Files: .cvsignore Makefile.am ewl.cfg Log Message: - move away from ecore_config to our own system for configuration. - reads a global config file from @PACKAGE_DATA_DIR@/config/ewl.cfg and a user config from ~/.ewl/config/ewl.cfg. Simple key=value pairs. - can be used for application configuration as well. App configs will be in @PACKAGE_DATA_DIR@/config/apps/app_name.cfg or ~/.ewl/config/apps/app_name.cfg. - saving isn't implemented yet but you can edit the .cfg files to set your defaults and user overrides. - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin/tests
Modified Files:
ewl_histogram.c ewl_io_manager.c ewl_text_editor.c ewl_tree2.c
Log Message:
- fix warnings
===
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/ewl_histogram.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_histogram.c 13 Sep 2006 06:52:21 - 1.2
+++ ewl_histogram.c 30 Sep 2006 22:07:45 - 1.3
@@ -68,7 +68,8 @@
}
static void
-ewl_histogram_test_cb_configure(Ewl_Widget *w, void *event, void *data)
+ewl_histogram_test_cb_configure(Ewl_Widget *w, void *event __UNUSED__,
+ void *data __UNUSED__)
{
Ewl_Widget *child;
Ewl_Container *c = EWL_CONTAINER(w);
@@ -79,3 +80,4 @@
CURRENT_W(c), CURRENT_H(c));
}
}
+
===
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/ewl_io_manager.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_io_manager.c29 Sep 2006 19:45:30 - 1.6
+++ ewl_io_manager.c30 Sep 2006 22:07:45 - 1.7
@@ -4,21 +4,11 @@
#include "ewl_test_private.h"
static int create_test(Ewl_Container *box);
-static int ext_to_icon_name_test(char *buf, int len);
-static int mime_to_icon_name_test(char *buf, int len);
-static int uri_mime_type_get_test(char *buf, int len);
static void cb_clicked(Ewl_Widget *w, void *ev, void *data);
static void cb_open(Ewl_Widget *w, void *ev, void *data);
static void cb_fd_delete(Ewl_Widget *w, void *ev, void *data);
-static Ewl_Unit_Test io_manager_unit_tests[] = {
- {"extension to icon name mapping", ext_to_icon_name_test},
- {"mime type to icon name mapping", mime_to_icon_name_test},
- {"uri mime type get", uri_mime_type_get_test},
- {NULL, NULL}
- };
-
void
test_info(Ewl_Test *test)
{
@@ -27,7 +17,6 @@
test->filename = __FILE__;
test->func = create_test;
test->type = EWL_TEST_TYPE_SIMPLE;
- test->unit_tests = io_manager_unit_tests;
}
static int
@@ -51,7 +40,8 @@
}
static void
-cb_clicked(Ewl_Widget *w, void *ev, void *data)
+cb_clicked(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__,
+ void *data __UNUSED__)
{
Ewl_Widget *fd;
@@ -65,13 +55,13 @@
}
static void
-cb_fd_delete(Ewl_Widget *w, void *ev, void *data)
+cb_fd_delete(Ewl_Widget *w, void *ev __UNUSED__, void *data __UNUSED__)
{
ewl_widget_destroy(w);
}
static void
-cb_open(Ewl_Widget *w, void *ev, void *data)
+cb_open(Ewl_Widget *w, void *ev, void *data __UNUSED__)
{
Ewl_Dialog_Event *e;
Ewl_Filedialog *fd;
@@ -101,24 +91,6 @@
}
ewl_container_child_append(EWL_CONTAINER(scroll), t);
ewl_widget_show(t);
-}
-
-static int
-ext_to_icon_name_test(char *buf, int len)
-{
- return 1;
-}
-
-static int
-mime_to_icon_name_test(char *buf, int len)
-{
- return 1;
-}
-
-static int
-uri_mime_type_get_test(char *buf, int len)
-{
- return 1;
}
===
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/ewl_text_editor.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ewl_text_editor.c 24 Sep 2006 20:26:50 - 1.17
+++ ewl_text_editor.c 30 Sep 2006 22:07:45 - 1.18
@@ -92,7 +92,7 @@
{EWL_ICON_FORMAT_TEXT_ITALIC, "Italic", ete_cb_italic},
{EWL_ICON_FORMAT_TEXT_UNDERLINE, "Underline",
ete_cb_underline},
{EWL_ICON_FORMAT_TEXT_STRIKETHROUGH, "Strikethrough",
ete_cb_strikethrough},
- {NULL, NULL}
+ {NULL, NULL, NULL}
};
styles = ecore_list_new();
@@ -281,7 +281,8 @@
}
static void
-ete_cb_strikethrough(Ewl_Widget *w, void *ev, void *data)
+ete_cb_strikethrough(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__,
+ void *data __UNUSED__)
{
Ewl_Widget *entry;
@@ -290,7 +291,8 @@
}
static void
-ete_cb_underline(Ewl_Widget *w, void *ev, void *data)
+ete_cb_underline(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__,
+ void *data __UNUSED__)
{
Ewl_Widget *entry;
===
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/ewl_tree2.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ewl_tree2.c 25 Sep 2006 18:03:42 - 1.15
+++ ewl_tree2.c 30 Sep 2006 22:07:45 - 1.16
@@ -334,7 +334,8 @@
}
static void
-ewl_tree2_cb_set_rows_clicked(Ewl_Widget *w, void *ev, void *data
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_spectrum.c
Log Message:
- fix warning
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_spectrum.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- ewl_spectrum.c 29 Sep 2006 14:30:22 - 1.28
+++ ewl_spectrum.c 30 Sep 2006 22:02:40 - 1.29
@@ -414,7 +414,8 @@
}
void
-ewl_spectrum_canvas_cb_reveal(Ewl_Widget *w, void *ev, void *data)
+ewl_spectrum_canvas_cb_reveal(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__,
+ void *data)
{
Ewl_Spectrum *sp;
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_colorpicker.c
Log Message:
- fix warning
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_colorpicker.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- ewl_colorpicker.c 30 Sep 2006 01:21:25 - 1.31
+++ ewl_colorpicker.c 30 Sep 2006 22:00:48 - 1.32
@@ -743,7 +743,7 @@
ewl_colorpicker_cb_dnd_data(Ewl_Widget *w, void *ev,
void *data __UNUSED__)
{
- int i;
+ unsigned int i;
unsigned int curcolors[4];
Ewl_Colorpicker *cp = EWL_COLORPICKER(w);
Ewl_Event_Dnd_Data *event = ev;
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/engines/evas_buffer Modified Files: .cvsignore Log Message: - missed those === RCS file: /cvs/e/e17/libs/ewl/src/engines/evas_buffer/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- .cvsignore 30 Sep 2006 21:36:21 - 1.1 +++ .cvsignore 30 Sep 2006 21:38:27 - 1.2 @@ -2,3 +2,5 @@ Makefile.in *.la *.lo +.deps +.libs - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/engines/evas_buffer Added Files: .cvsignore Log Message: - ignore - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/data/images Removed Files: Makefile Makefile.in Log Message: Get this trash out - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/data/images
Modified Files:
Makefile Makefile.am Makefile.in
Added Files:
add.png emblem-photos.png redo.png remove.png search.png
undo.png
Log Message:
New images and make ephoto use these images
===
RCS file: /cvs/e/e17/proto/ephoto/data/images/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile23 Sep 2006 14:19:02 - 1.1
+++ Makefile30 Sep 2006 21:26:29 - 1.2
@@ -145,14 +145,20 @@
sysconfdir = ${prefix}/etc
target_alias =
MAINTAINERCLEANFILES = Makefile.in
-FILES = folder.png \
+FILES = add.png \
+ emblem-favorite.png \
+ emblem-photos.png \
+ exit.png \
+ folder.png \
go-up.png \
go-home.png \
image.png \
- emblem-favorite.png \
- x-office-presentation.png \
preferences-system.png \
- exit.png
+ redo.png \
+ remove.png \
+ search.png \
+ undo.png \
+ x-office-presentation.png
imagedir = $(pkgdatadir)/images
image_DATA = $(FILES)
===
RCS file: /cvs/e/e17/proto/ephoto/data/images/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Makefile.am 23 Sep 2006 14:19:02 - 1.5
+++ Makefile.am 30 Sep 2006 21:26:29 - 1.6
@@ -1,12 +1,18 @@
MAINTAINERCLEANFILES = Makefile.in
-FILES = folder.png \
+FILES = add.png \
+ emblem-favorite.png \
+ emblem-photos.png \
+ exit.png \
+ folder.png \
go-up.png \
go-home.png \
image.png \
- emblem-favorite.png \
- x-office-presentation.png \
preferences-system.png \
- exit.png
+ redo.png \
+ remove.png \
+ search.png \
+ undo.png \
+ x-office-presentation.png
imagedir = $(pkgdatadir)/images
image_DATA = $(FILES)
EXTRA_DIST = $(FILES)
===
RCS file: /cvs/e/e17/proto/ephoto/data/images/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.in 23 Sep 2006 14:19:02 - 1.1
+++ Makefile.in 30 Sep 2006 21:26:29 - 1.2
@@ -145,14 +145,20 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
MAINTAINERCLEANFILES = Makefile.in
-FILES = folder.png \
+FILES = add.png \
+ emblem-favorite.png \
+ emblem-photos.png \
+ exit.png \
+ folder.png \
go-up.png \
go-home.png \
image.png \
- emblem-favorite.png \
- x-office-presentation.png \
preferences-system.png \
- exit.png
+ redo.png \
+ remove.png \
+ search.png \
+ undo.png \
+ x-office-presentation.png
imagedir = $(pkgdatadir)/images
image_DATA = $(FILES)
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src Modified Files: ephoto.c ephoto_viewer.c Log Message: New images and make ephoto use these images === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.c,v retrieving revision 1.83 retrieving revision 1.84 diff -u -3 -r1.83 -r1.84 --- ephoto.c24 Sep 2006 23:30:19 - 1.83 +++ ephoto.c30 Sep 2006 21:26:29 - 1.84 @@ -62,12 +62,39 @@ ewl_widget_show(menu); menu_item = ewl_menu_item_new(); + ewl_button_image_set(EWL_BUTTON(menu_item), + PACKAGE_DATA_DIR "/images/add.png", NULL); ewl_button_label_set(EWL_BUTTON(menu_item), "Add Album"); ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER); ewl_container_child_append(EWL_CONTAINER(menu), menu_item); ewl_object_fill_policy_set(EWL_OBJECT(menu_item), EWL_FLAG_FILL_ALL); ewl_widget_show(menu_item); + + menu_item = ewl_menu_item_new(); + ewl_button_image_set(EWL_BUTTON(menu_item), + PACKAGE_DATA_DIR "/images/remove.png", NULL); + ewl_button_label_set(EWL_BUTTON(menu_item), "Remove Album"); + ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER); + ewl_container_child_append(EWL_CONTAINER(menu), menu_item); + ewl_object_fill_policy_set(EWL_OBJECT(menu_item), EWL_FLAG_FILL_ALL); + ewl_widget_show(menu_item); + + menu = ewl_menu_new(); + ewl_button_label_set(EWL_BUTTON(menu), "Viewer"); + ewl_container_child_append(EWL_CONTAINER(menubar), menu); + ewl_object_fill_policy_set(EWL_OBJECT(menu), EWL_FLAG_FILL_NONE); + ewl_widget_show(menu); + menu_item = ewl_menu_item_new(); + ewl_button_image_set(EWL_BUTTON(menu_item), + PACKAGE_DATA_DIR "/images/emblem-photos.png", NULL); + ewl_button_label_set(EWL_BUTTON(menu_item), "Image Viewer"); + ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER); + ewl_container_child_append(EWL_CONTAINER(menu), menu_item); + ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, view_images, NULL); + ewl_object_fill_policy_set(EWL_OBJECT(menu_item), EWL_FLAG_FILL_ALL); + ewl_widget_show(menu_item); + menu = ewl_menu_new(); ewl_button_label_set(EWL_BUTTON(menu), "Slideshow"); ewl_container_child_append(EWL_CONTAINER(menubar), menu); @@ -84,7 +111,6 @@ ewl_object_fill_policy_set(EWL_OBJECT(menu_item), EWL_FLAG_FILL_ALL); ewl_widget_show(menu_item); - menu_item = ewl_menu_item_new(); ewl_button_image_set(EWL_BUTTON(menu_item), PACKAGE_DATA_DIR "/images/x-office-presentation.png", NULL); === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- ephoto_viewer.c 30 Sep 2006 19:38:07 - 1.7 +++ ephoto_viewer.c 30 Sep 2006 21:26:29 - 1.8 @@ -73,12 +73,65 @@ ewl_widget_show(ibox); image_view = ewl_image_new(); + ewl_theme_data_str_set(image_view, "/image/group", + ewl_theme_data_str_get(m->entry, "group")); ewl_container_child_append(EWL_CONTAINER(ibox), image_view); ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE); ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK); ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_CENTER); ewl_widget_show(image_view); + + hbox = ewl_hbox_new(); + ewl_container_child_append(EWL_CONTAINER(vbox), hbox); + ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_SHRINK); + ewl_object_alignment_set(EWL_OBJECT(hbox), EWL_FLAG_ALIGN_CENTER); + ewl_widget_show(hbox); + + button = ewl_button_new(); + ewl_button_image_set(EWL_BUTTON(button), + PACKAGE_DATA_DIR "/images/search.png", NULL); + ewl_button_label_set(EWL_BUTTON(button), "In"); + ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_SHRINK); + ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER); + ewl_container_child_append(EWL_CONTAINER(hbox), button); + ewl_widget_show(button); + button = ewl_button_new(); + ewl_button_image_set(EWL_BUTTON(button), + PACKAGE_DATA_DIR "/images/search.png", NULL); + ewl_button_label_set(EWL_BUTTON(button), "Out"); + ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_SHRINK); + ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER); + ewl_container_child_append(EWL_CONTAINER(hbox), button); + ewl_widget_show(button); + + button = ewl_button_new(); + ewl_button_image_set(EWL_BUTTON(button), + PACKAGE_DATA_DIR "/images/search.png", NULL); + ewl_button_label_set(EWL_BUTTON(button), "1:1"); + ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_SHRINK); + ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER); + ewl_container_child_append(EWL_CONTAINER(hbox), button); + ewl_widget
E CVS: libs/ewl ningerso
Enlightenment CVS committal Author : ningerso Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/engines Modified Files: Makefile.am Log Message: Abstracted canvas output size setup to the engines. Changed some fb engine copy and paste errors. Add initial evas buffer engine. === RCS file: /cvs/e/e17/libs/ewl/src/engines/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Makefile.am 21 Aug 2006 07:39:57 - 1.4 +++ Makefile.am 30 Sep 2006 20:53:30 - 1.5 @@ -1,3 +1,4 @@ MAINTAINERCLEANFILES = Makefile Makefile.in -SUBDIRS = x11 evas evas_software_x11 evas_xrender_x11 evas_gl_x11 evas_fb +SUBDIRS = x11 evas evas_software_x11 evas_xrender_x11 evas_gl_x11 evas_fb \ + evas_buffer - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl ningerso
Enlightenment CVS committal
Author : ningerso
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/engines/evas_fb
Modified Files:
ewl_engine_evas_fb.c
Log Message:
Abstracted canvas output size setup to the engines.
Changed some fb engine copy and paste errors.
Add initial evas buffer engine.
===
RCS file: /cvs/e/e17/libs/ewl/src/engines/evas_fb/ewl_engine_evas_fb.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ewl_engine_evas_fb.c12 Jul 2006 22:39:37 - 1.7
+++ ewl_engine_evas_fb.c30 Sep 2006 20:53:30 - 1.8
@@ -4,15 +4,6 @@
#include "ewl_private.h"
#include "ewl_debug.h"
-/*
- * In general all of the X event handlers should find their matching window
- * with ewl_window_window_find, and not ewl_embed_evas_window_find. If the
- * embed function is used, then we get duplicate events for apps that setup
- * their own handlers and embed EWL. The exception to this is selection events
- * such as copy/paste and DND. These events need to be handled for embedded
- * EWL, but have no equivalent in the Evas callback namespace.
- */
-
static int ewl_ev_fb_key_down(void *data, int type, void *_ev);
static int ewl_ev_fb_key_up(void *data, int type, void *_ev);
static int ewl_ev_fb_mouse_down(void *data, int type, void *_ev);
@@ -112,7 +103,7 @@
DRETURN_INT(FALSE, DLEVEL_STABLE);
}
- engine->name = strdup("evas_software_x11");
+ engine->name = strdup("evas_fb");
engine->functions = &engine_funcs;
DRETURN_INT(TRUE, DLEVEL_STABLE);
@@ -163,7 +154,7 @@
DCHECK_TYPE("win", win, EWL_WINDOW_TYPE);
evas = evas_new();
- evas_output_method_set(evas, evas_render_method_lookup("gl_x11"));
+ evas_output_method_set(evas, evas_render_method_lookup("fb"));
info = evas_engine_info_get(evas);
if (!info)
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl ningerso
Enlightenment CVS committal
Author : ningerso
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_engines.c ewl_engines.h ewl_window.c
Log Message:
Abstracted canvas output size setup to the engines.
Changed some fb engine copy and paste errors.
Add initial evas buffer engine.
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_engines.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ewl_engines.c 8 Sep 2006 01:05:17 - 1.12
+++ ewl_engines.c 30 Sep 2006 20:53:30 - 1.13
@@ -853,6 +853,28 @@
}
/**
+ * @param win: the window to work with
+ * @return Returns no value
+ * @brief Sets up the canvas
+ */
+void
+ewl_engine_canvas_output_set(Ewl_Embed *emb, int x, int y, int width, int
height)
+{
+ Ewl_Engine_Cb_Canvas_Output_Set canvas_output_set;
+
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR("emb", emb);
+ DCHECK_TYPE("emb", emb, EWL_EMBED_TYPE);
+
+ canvas_output_set = ewl_engine_hook_get(emb,
+ EWL_ENGINE_CANVAS_OUTPUT_SET);
+ if (canvas_output_set)
+ canvas_output_set(emb, x, y, width, height);
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+/**
* @param win: the embed to work with
* @return Returns no value
* @brief Renders the canvas
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_engines.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ewl_engines.h 8 Sep 2006 01:05:17 - 1.10
+++ ewl_engines.h 30 Sep 2006 20:53:30 - 1.11
@@ -43,6 +43,7 @@
EWL_ENGINE_EMBED_DND_AWARE_SET, /**< Set the window
dnd aware */
EWL_ENGINE_CANVAS_SETUP, /**< Setup the render canvas */
+ EWL_ENGINE_CANVAS_OUTPUT_SET, /**< Set the canvas size */
EWL_ENGINE_CANVAS_RENDER,
EWL_ENGINE_CANVAS_FREEZE,
@@ -150,6 +151,8 @@
voidewl_engine_embed_dnd_aware_set(Ewl_Embed *embed);
voidewl_engine_canvas_setup(Ewl_Window *win, int debug);
+voidewl_engine_canvas_output_set(Ewl_Embed *emb, int x, int y,
+ int width, int height);
voidewl_engine_canvas_render(Ewl_Embed *embed);
voidewl_engine_canvas_freeze(Ewl_Embed *embed);
voidewl_engine_canvas_thaw(Ewl_Embed *embed);
@@ -199,6 +202,8 @@
dnd aware */
typedef void (*Ewl_Engine_Cb_Canvas_Setup)(Ewl_Window *win, int debug); /**<
Setup the
render canvas */
+typedef void (*Ewl_Engine_Cb_Canvas_Output_Set)(Ewl_Embed *emb, int x, int y,
+int width, int height);
typedef void (*Ewl_Engine_Cb_Canvas_Render)(Ewl_Embed *embed);
typedef void (*Ewl_Engine_Cb_Canvas_Freeze)(Ewl_Embed *embed);
typedef void (*Ewl_Engine_Cb_Canvas_Thaw)(Ewl_Embed *embed);
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_window.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- ewl_window.c30 Sep 2006 18:41:02 - 1.60
+++ ewl_window.c30 Sep 2006 20:53:30 - 1.61
@@ -924,11 +924,11 @@
else
ewl_engine_window_resize(win);
- evas_output_size_set(EWL_EMBED(win)->evas, width, height);
- evas_output_viewport_set(EWL_EMBED(win)->evas,
-ewl_object_current_x_get(EWL_OBJECT(w)),
-ewl_object_current_y_get(EWL_OBJECT(w)),
-width, height);
+ ewl_engine_canvas_output_set(EWL_EMBED(win),
+ ewl_object_current_x_get(EWL_OBJECT(win)),
+ ewl_object_current_y_get(EWL_OBJECT(win)),
+ ewl_object_current_w_get(EWL_OBJECT(win)),
+ ewl_object_current_h_get(EWL_OBJECT(win)));
/*
* Adjust the minimum and maximum window bounds to match the widget.
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl ningerso
Enlightenment CVS committal Author : ningerso Project : e17 Module : libs/ewl Dir : e17/libs/ewl Modified Files: configure.in Log Message: Abstracted canvas output size setup to the engines. Changed some fb engine copy and paste errors. Add initial evas buffer engine. === RCS file: /cvs/e/e17/libs/ewl/configure.in,v retrieving revision 1.79 retrieving revision 1.80 diff -u -3 -r1.79 -r1.80 --- configure.in29 Sep 2006 20:32:23 - 1.79 +++ configure.in30 Sep 2006 20:53:30 - 1.80 @@ -186,6 +186,22 @@ fi fi +AC_ARG_ENABLE(buffer, + [AC_HELP_STRING([--enable-buffer],[enable opengl X11 support])], + [enable_buffer=$enableval], [enable_buffer="auto"]) +if test "x$enable_buffer" != "xno" ; then + have_buffer=no + AC_CHECK_HEADERS(Evas_Engine_Buffer.h, + [have_buffer=yes], + [], [#include ]) + if test "x$have_buffer" = "xyes" ; then + AC_DEFINE(ENABLE_EWL_BUFFER, 1, [Enable Buffer]) + elif test "x$enable_buffer" = "xyes" ; then + AC_MSG_ERROR(buffer requested but no evas support found) + fi +fi +AM_CONDITIONAL(EWL_ENABLE_EVAS_BUFFER, test "x$have_buffer" = xyes) + AC_PATH_GENERIC(edje, 0.5.0, [ ], [ @@ -259,6 +275,7 @@ src/engines/evas_xrender_x11/Makefile src/engines/evas_gl_x11/Makefile src/engines/evas_fb/Makefile +src/engines/evas_buffer/Makefile data/Makefile data/images/Makefile data/themes/Makefile - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl ningerso
Enlightenment CVS committal
Author : ningerso
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/engines/evas
Modified Files:
ewl_engine_evas.c
Log Message:
Abstracted canvas output size setup to the engines.
Changed some fb engine copy and paste errors.
Add initial evas buffer engine.
===
RCS file: /cvs/e/e17/libs/ewl/src/engines/evas/ewl_engine_evas.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_engine_evas.c 5 Sep 2006 02:14:24 - 1.4
+++ ewl_engine_evas.c 30 Sep 2006 20:53:30 - 1.5
@@ -7,6 +7,8 @@
static Evas_Smart *widget_smart = NULL;
static int ee_init(Ewl_Engine *engine);
+static void ee_canvas_output_set(Ewl_Embed *embed, int x, int y, int width,
+ int height);
static void ee_canvas_render(Ewl_Embed *embed);
static void ee_canvas_freeze(Ewl_Embed *embed);
static void ee_canvas_thaw(Ewl_Embed *embed);
@@ -28,6 +30,7 @@
NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
+ ee_canvas_output_set,
ee_canvas_render,
ee_canvas_freeze,
ee_canvas_thaw,
@@ -91,6 +94,13 @@
engine->functions = &engine_funcs;
DRETURN_INT(TRUE, DLEVEL_STABLE);
+}
+
+void
+ee_canvas_output_set(Ewl_Embed *embed, int x, int y, int width, int height)
+{
+ evas_output_size_set(embed->evas, width, height);
+ evas_output_viewport_set(embed->evas, x, y, width, height);
}
static void
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl ningerso
Enlightenment CVS committal Author : ningerso Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/engines/evas_buffer Added Files: Ewl_Engine_Evas_Buffer.h Makefile.am ewl_engine_evas_buffer.c Log Message: Abstracted canvas output size setup to the engines. Changed some fb engine copy and paste errors. Add initial evas buffer engine. - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl ningerso
Enlightenment CVS committal Author : ningerso Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/engines/evas_buffer Log Message: Directory /cvs/e/e17/libs/ewl/src/engines/evas_buffer added to the repository - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl ningerso
Enlightenment CVS committal
Author : ningerso
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_image.c
Log Message:
Remove some unnecessary embed lookups.
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_image.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- ewl_image.c 30 Sep 2006 18:41:01 - 1.45
+++ ewl_image.c 30 Sep 2006 20:11:21 - 1.46
@@ -184,14 +184,12 @@
{
int old_type;
Ewl_Widget *w;
- Ewl_Embed *emb;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("i", i);
DCHECK_TYPE("i", i, EWL_IMAGE_TYPE);
w = EWL_WIDGET(i);
- emb = ewl_embed_widget_find(w);
if (i->path != im) {
IF_FREE(i->path);
@@ -818,7 +816,6 @@
void *user_data __UNUSED__)
{
Ewl_Image *i;
- Ewl_Embed *emb;
int ww, hh;
int dx = 0, dy = 0;
@@ -829,8 +826,6 @@
i = EWL_IMAGE(w);
if (!i->image)
DRETURN(DLEVEL_STABLE);
-
- emb = ewl_embed_widget_find(w);
ww = CURRENT_W(w);
hh = CURRENT_H(w);
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src Modified Files: ephoto_slideshow.c ephoto_viewer.c Log Message: Asthetics++ (sp?) hehe === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_slideshow.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- ephoto_slideshow.c 30 Sep 2006 19:23:02 - 1.15 +++ ephoto_slideshow.c 30 Sep 2006 19:38:07 - 1.16 @@ -142,8 +142,6 @@ ewl_object_fill_policy_set(EWL_OBJECT(image), EWL_FLAG_FILL_SHRINK); if (sc->keep_aspect) ewl_image_proportional_set(EWL_IMAGE(image), TRUE); - ewl_theme_data_str_set(image, "/image/group", - ewl_theme_data_str_get(m->entry, "group")); ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_CENTER); ewl_container_child_append(EWL_CONTAINER(cell), image); ewl_widget_show(image); === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- ephoto_viewer.c 30 Sep 2006 18:42:50 - 1.6 +++ ephoto_viewer.c 30 Sep 2006 19:38:07 - 1.7 @@ -74,8 +74,6 @@ image_view = ewl_image_new(); ewl_container_child_append(EWL_CONTAINER(ibox), image_view); - ewl_theme_data_str_set(image_view, "/image/group", - ewl_theme_data_str_get(m->entry, "group")); ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE); ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK); ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_CENTER); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto_slideshow.c
Log Message:
Slideshow is now nice and right where i want it. It sizes itself very nicely
with the way it is configured now.
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_slideshow.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ephoto_slideshow.c 30 Sep 2006 19:01:40 - 1.14
+++ ephoto_slideshow.c 30 Sep 2006 19:23:02 - 1.15
@@ -57,6 +57,7 @@
image_path = ecore_dlist_current(current_thumbs);
if(image_path)
{
+ ewl_container_reset(EWL_CONTAINER(sc->image));
ewl_image_file_set(EWL_IMAGE(sc->image), image_path, NULL);
}
else
@@ -67,6 +68,7 @@
image_path = ecore_dlist_current(current_thumbs);
if(image_path)
{
+ewl_container_reset(EWL_CONTAINER(sc->image));
ewl_image_file_set(EWL_IMAGE(sc->image), image_path, NULL);
}
else
@@ -90,7 +92,8 @@
sc = data;
image_path = ecore_dlist_goto_first(current_thumbs);
- ewl_image_file_set(EWL_IMAGE(w), image_path, NULL);
+ ewl_container_reset(EWL_CONTAINER(sc->image));
+ ewl_image_file_set(EWL_IMAGE(sc->image), image_path, NULL);
timer = ecore_timer_add(sc->length, change_picture, sc);
}
@@ -98,6 +101,7 @@
void start_slideshow(Ewl_Widget *w, void *event, void *data)
{
Ewl_Widget *window;
+ Ewl_Widget *vbox;
Ewl_Widget *cell;
Ewl_Widget *image;
Slide_Config *sc;
@@ -119,18 +123,27 @@
ewl_window_dialog_set(EWL_WINDOW(window), 1);
ewl_widget_show(window);
+ vbox = ewl_vbox_new();
+ ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_ALL);
+ ewl_object_alignment_set(EWL_OBJECT(vbox), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(window), vbox);
+ ewl_widget_show(vbox);
+
cell = ewl_cell_new();
ewl_object_fill_policy_set(EWL_OBJECT(cell), EWL_FLAG_FILL_ALL);
- ewl_container_child_append(EWL_CONTAINER(window), cell);
+ ewl_object_alignment_set(EWL_OBJECT(cell), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(vbox), cell);
ewl_widget_show(cell);
image = ewl_image_new();
if (sc->zoom)
ewl_object_fill_policy_set(EWL_OBJECT(image), EWL_FLAG_FILL_ALL);
- else
+ if (!sc->zoom)
ewl_object_fill_policy_set(EWL_OBJECT(image), EWL_FLAG_FILL_SHRINK);
if (sc->keep_aspect)
ewl_image_proportional_set(EWL_IMAGE(image), TRUE);
+ ewl_theme_data_str_set(image, "/image/group",
+ ewl_theme_data_str_get(m->entry, "group"));
ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(cell), image);
ewl_widget_show(image);
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl pfritz
Enlightenment CVS committal
Author : pfritz
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_embed.c
Log Message:
more renamed callbacks
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -3 -r1.84 -r1.85
--- ewl_embed.c 30 Sep 2006 18:41:01 - 1.84
+++ ewl_embed.c 30 Sep 2006 19:21:05 - 1.85
@@ -7,16 +7,16 @@
static Evas_Smart *embedded_smart = NULL;
static Ewl_Embed *ewl_embed_active_embed = NULL;
-static void ewl_embed_smart_add_cb(Evas_Object *obj);
-static void ewl_embed_smart_del_cb(Evas_Object *obj);
-static void ewl_embed_smart_move_cb(Evas_Object *obj, Evas_Coord x,
+static void ewl_embed_smart_cb_add(Evas_Object *obj);
+static void ewl_embed_smart_cb_del(Evas_Object *obj);
+static void ewl_embed_smart_cb_move(Evas_Object *obj, Evas_Coord x,
Evas_Coord y);
-static void ewl_embed_smart_resize_cb(Evas_Object *obj, Evas_Coord w,
+static void ewl_embed_smart_cb_resize(Evas_Object *obj, Evas_Coord w,
Evas_Coord h);
-static void ewl_embed_smart_show_cb(Evas_Object *obj);
-static void ewl_embed_smart_hide_cb(Evas_Object *obj);
-static void ewl_embed_smart_clip_set_cb(Evas_Object *obj, Evas_Object *clip);
-static void ewl_embed_smart_clip_unset_cb(Evas_Object *obj);
+static void ewl_embed_smart_cb_show(Evas_Object *obj);
+static void ewl_embed_smart_cb_hide(Evas_Object *obj);
+static void ewl_embed_smart_cb_clip_set(Evas_Object *obj, Evas_Object *clip);
+static void ewl_embed_smart_cb_clip_unset(Evas_Object *obj);
static void ewl_embed_tab_order_change(Ewl_Embed *e,
void *(*change)(Ecore_DList *list),
@@ -25,23 +25,23 @@
/*
* Catch mouse events processed through the evas
*/
-static void ewl_embed_evas_mouse_out_cb(void *data, Evas *e, Evas_Object *obj,
+static void ewl_embed_evas_cb_mouse_out(void *data, Evas *e, Evas_Object *obj,
void *event_info);
-static void ewl_embed_evas_mouse_down_cb(void *data, Evas *e, Evas_Object *obj,
+static void ewl_embed_evas_cb_mouse_down(void *data, Evas *e, Evas_Object *obj,
void *event_info);
-static void ewl_embed_evas_mouse_up_cb(void *data, Evas *e, Evas_Object *obj,
+static void ewl_embed_evas_cb_mouse_up(void *data, Evas *e, Evas_Object *obj,
void *event_info);
-static void ewl_embed_evas_mouse_move_cb(void *data, Evas *e, Evas_Object *obj,
+static void ewl_embed_evas_cb_mouse_move(void *data, Evas *e, Evas_Object *obj,
void *event_info);
-static void ewl_embed_evas_mouse_wheel_cb(void *data, Evas *e, Evas_Object
*obj,
+static void ewl_embed_evas_cb_mouse_wheel(void *data, Evas *e, Evas_Object
*obj,
void *event_info);
/*
* Catch key events processed through the evas
*/
-static void ewl_embed_evas_key_down_cb(void *data, Evas *e, Evas_Object *obj,
+static void ewl_embed_evas_cb_key_down(void *data, Evas *e, Evas_Object *obj,
void *event_info);
-static void ewl_embed_evas_key_up_cb(void *data, Evas *e, Evas_Object *obj,
+static void ewl_embed_evas_cb_key_up(void *data, Evas *e, Evas_Object *obj,
void *event_info);
/**
@@ -164,16 +164,16 @@
if (!embedded_smart) {
embedded_smart = evas_smart_new(name,
- ewl_embed_smart_add_cb,
- ewl_embed_smart_del_cb,
+ ewl_embed_smart_cb_add,
+ ewl_embed_smart_cb_del,
NULL, NULL, NULL, NULL, NULL,
- ewl_embed_smart_move_cb,
- ewl_embed_smart_resize_cb,
- ewl_embed_smart_show_cb,
- ewl_embed_smart_hide_cb,
+ ewl_embed_smart_cb_move,
+ ewl_embed_smart_cb_resize,
+ ewl_embed_smart_cb_show,
+ ewl_embed_smart_cb_hide,
NULL,
- ewl_embed_smart_clip_set_cb,
- ewl_embed_smart_clip_unset_cb, NULL);
+ ewl_embed_smart_cb_clip_set,
+ ewl_embed_smart_cb_clip_unset, NULL);
}
if (emb->smart) {
@@ -1673,28 +1673,28 @@
*/
evas_object_event_callback_add(emb->smart,
EVAS_CALLBACK_MOUSE_OUT,
- ewl_embed_evas_mouse_out_cb, emb);
+ ewl_embed_evas_cb_mouse_out, emb);
evas_object_event_callback_add(emb->smart,
EVAS_CALLBACK_MOUSE_DOWN,
-
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto_slideshow.c
Log Message:
Make slideshow configure and size nicely.
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_slideshow.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ephoto_slideshow.c 25 Sep 2006 00:06:30 - 1.13
+++ ephoto_slideshow.c 30 Sep 2006 19:01:40 - 1.14
@@ -82,20 +82,28 @@
}
}
}
+
+void show_first_image(Ewl_Widget *w, void *event, void *data)
+{
+ char *image_path;
+ Slide_Config *sc;
+
+ sc = data;
+ image_path = ecore_dlist_goto_first(current_thumbs);
+ ewl_image_file_set(EWL_IMAGE(w), image_path, NULL);
+
+ timer = ecore_timer_add(sc->length, change_picture, sc);
+}
void start_slideshow(Ewl_Widget *w, void *event, void *data)
{
Ewl_Widget *window;
Ewl_Widget *cell;
Ewl_Widget *image;
- char *image_path;
Slide_Config *sc;
int ew, eh;
sc = parse_slideshow_config();
- image_path = ecore_dlist_goto_first(current_thumbs);
-
- if (!image_path) return;
srand((unsigned int)time((time_t *)NULL));
@@ -105,8 +113,7 @@
if (sc->full_size)
ewl_window_fullscreen_set(EWL_WINDOW(window), 1);
if (sc->custom_size)
- ewl_object_maximum_size_set(EWL_OBJECT(window), sc->w_size, sc->h_size);
- ewl_object_minimum_size_set(EWL_OBJECT(window), sc->w_size, sc->h_size);
+ ewl_object_size_request(EWL_OBJECT(window), sc->w_size, sc->h_size);
ewl_callback_append(window, EWL_CALLBACK_DELETE_WINDOW, destroy_slideshow,
NULL);
ewl_callback_append(window, EWL_CALLBACK_CLICKED, destroy_slideshow, NULL);
ewl_window_dialog_set(EWL_WINDOW(window), 1);
@@ -117,23 +124,19 @@
ewl_container_child_append(EWL_CONTAINER(window), cell);
ewl_widget_show(cell);
- ewl_object_current_size_get(EWL_OBJECT(window), &ew, &eh);
-
image = ewl_image_new();
- ewl_image_file_set(EWL_IMAGE(image), image_path, NULL);
if (sc->zoom)
ewl_object_fill_policy_set(EWL_OBJECT(image), EWL_FLAG_FILL_ALL);
else
ewl_object_fill_policy_set(EWL_OBJECT(image), EWL_FLAG_FILL_SHRINK);
if (sc->keep_aspect)
ewl_image_proportional_set(EWL_IMAGE(image), TRUE);
- ewl_image_size_set(EWL_IMAGE(image), ew, eh);
ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(cell), image);
ewl_widget_show(image);
sc->image = image;
- timer = ecore_timer_add(sc->length, change_picture, sc);
+ ewl_callback_append(image, EWL_CALLBACK_SHOW, show_first_image, sc);
}
void initial_config()
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e urandom
Enlightenment CVS committal
Author : urandom
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_winlist.edc
Log Message:
todo--
===
RCS file: /cvs/e/e17/apps/e/data/themes/default_winlist.edc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- default_winlist.edc 23 Aug 2006 03:39:01 - 1.11
+++ default_winlist.edc 30 Sep 2006 18:59:14 - 1.12
@@ -768,6 +768,27 @@
}
}
}
+ part {
+name: "e.event.winlist.item";
+type: RECT;
+mouse_events: 1;
+description {
+ state:"default" 0.0;
+ min: 14 14;
+ visible: 1;
+ color: 0 0 0 0;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 00;
+ to: "title_outline";
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -1 -1;
+ to: "title_outline";
+ }
+}
+ }
}
programs {
program {
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e urandom
Enlightenment CVS committal Author : urandom Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: todo-- === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.451 retrieving revision 1.452 diff -u -3 -r1.451 -r1.452 --- TODO25 Sep 2006 10:37:14 - 1.451 +++ TODO30 Sep 2006 18:59:14 - 1.452 @@ -101,7 +101,6 @@ * make fdo .desktop support work on debian & ubuntu * full fm2 support as an icon fm needs work - beyond fsel needs and for icons on the desktop etc. etc. -* winlist can let the mouse select items * up arrow in exebuf with empty buf goes into history mode and up/down let u browse command history * switch to desktop of a new window if it opens on another desktop than the - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e urandom
Enlightenment CVS committal
Author : urandom
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_winlist.c
Log Message:
todo--
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_winlist.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- e_winlist.c 23 Aug 2006 03:39:02 - 1.45
+++ e_winlist.c 30 Sep 2006 18:59:14 - 1.46
@@ -29,9 +29,12 @@
static int _e_winlist_cb_mouse_down(void *data, int type, void *event);
static int _e_winlist_cb_mouse_up(void *data, int type, void *event);
static int _e_winlist_cb_mouse_wheel(void *data, int type, void *event);
+static int _e_winlist_cb_mouse_move(void *data, int type, void *event);
static int _e_winlist_scroll_timer(void *data);
static int _e_winlist_warp_timer(void *data);
static int _e_winlist_animator(void *data);
+static void _e_winlist_cb_item_mouse_in(void *data, Evas *evas,
+ Evas_Object *obj, void *event_info);
/* local subsystem globals */
static E_Popup *winlist = NULL;
@@ -108,6 +111,7 @@
winlist = e_popup_new(zone, x, y, w, h);
if (!winlist) return 0;
+ evas_event_feed_mouse_in(winlist->evas, ecore_x_current_time_get(), NULL);
evas_event_feed_mouse_move(winlist->evas, -100, -100,
ecore_x_current_time_get(), NULL);
e_popup_layer_set(winlist, 255);
@@ -178,6 +182,9 @@
handlers = evas_list_append
(handlers, ecore_event_handler_add
(ECORE_X_EVENT_MOUSE_WHEEL, _e_winlist_cb_mouse_wheel, NULL));
+ handlers = evas_list_append
+ (handlers, ecore_event_handler_add
+ (ECORE_X_EVENT_MOUSE_MOVE, _e_winlist_cb_mouse_move, NULL));
e_popup_show(winlist);
return 1;
@@ -430,6 +437,9 @@
e_theme_edje_object_set(o, "base/theme/winlist",
"e/widgets/winlist/item");
edje_object_part_text_set(o, "e.text.label",
e_border_name_get(ww->border));
+ if (!e_config->winlist_warp_while_selecting)
+ evas_object_event_callback_add(ww->bg_object, EVAS_CALLBACK_MOUSE_IN,
+ _e_winlist_cb_item_mouse_in, ww);
evas_object_show(o);
if (edje_object_part_exists(ww->bg_object, "e.swallow.icon"))
{
@@ -834,6 +844,20 @@
return 1;
}
+static int
+_e_winlist_cb_mouse_move(void *data, int type, void *event)
+{
+ Ecore_X_Event_Mouse_Move *ev;
+
+ ev = event;
+ if (ev->win != input_window) return 1;
+
+ evas_event_feed_mouse_move(winlist->evas, ev->x - winlist->x +
+winlist->zone->x, ev->y - winlist->y + winlist->zone->y, ev->time,
NULL);
+
+ return 1;
+}
+
static int
_e_winlist_scroll_timer(void *data)
{
@@ -905,3 +929,23 @@
animator = NULL;
return 0;
}
+
+static void
+_e_winlist_cb_item_mouse_in(void *data, Evas *evas, Evas_Object *obj,
+ void *event_info)
+{
+ E_Winlist_Win *ww;
+ Evas_List *l;
+
+ if (!(ww = data)) return;
+ if (!wins) return;
+ for (l = wins; l; l = l->next)
+ {
+ if (l->data == ww) break;
+ }
+ _e_winlist_deactivate();
+ win_selected = l;
+ _e_winlist_show_active();
+ _e_winlist_activate();
+}
+
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet pfritz
Enlightenment CVS committal
Author : pfritz
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
Eet.h
Log Message:
this example would never compile
===
RCS file: /cvs/e/e17/libs/eet/src/lib/Eet.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- Eet.h 13 Jun 2006 10:20:22 - 1.34
+++ Eet.h 30 Sep 2006 18:42:57 - 1.35
@@ -153,6 +153,7 @@
* Example:
* @code
* #include
+* #include
*
* int
* main(int argc, char **argv)
@@ -163,13 +164,13 @@
*
* strcpy(buf, "Here is a string of data to save!");
*
-* ef = eet_open("/tmp/my_file.eet, EET_FILE_MODE_WRITE);
+* ef = eet_open("/tmp/my_file.eet", EET_FILE_MODE_WRITE);
* if (!ef) return -1;
* if (!eet_write(ef, "/key/to_store/at", buf, 1024, 1))
-* fprintf("Error writing data!\n");
+* fprintf(stderr, "Error writing data!\n");
* eet_close(ef);
*
-* ef = eet_open("/tmp/my_file.eet, EET_FILE_MODE_READ);
+* ef = eet_open("/tmp/my_file.eet", EET_FILE_MODE_READ);
* if (!ef) return -1;
* list = eet_list(ef, "*", &num);
* if (list)
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto_viewer.c
Log Message:
Image viewer just got perfect!
===
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ephoto_viewer.c 24 Sep 2006 23:30:19 - 1.5
+++ ephoto_viewer.c 30 Sep 2006 18:42:50 - 1.6
@@ -1,7 +1,6 @@
#include "ephoto.h"
Ewl_Widget *vwin;
Ewl_Widget *image_view;
-Ewl_Widget *image_vbox;
void destroy_vwin(Ewl_Widget *w, void *event, void *data)
{
@@ -14,26 +13,21 @@
path = data;
- ewl_widget_destroy(image_view);
-
- image_view = ewl_image_new();
- ewl_image_file_set(EWL_IMAGE(image_view), (char *)data, NULL);
- ewl_container_child_append(EWL_CONTAINER(image_vbox), image_view);
- ewl_image_size_set(EWL_IMAGE(image_view), 400, 200);
- ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE);
- ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_ALL);
- ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_CENTER);
- ewl_widget_show(image_view);
+ ewl_container_reset(EWL_CONTAINER(image_view));
+ ewl_image_file_set(EWL_IMAGE(image_view), path, NULL);
}
void view_images(Ewl_Widget *w, void *event, void *data)
{
char *current_image;
+ Ewl_Widget *button;
Ewl_Widget *scrollpane;
Ewl_Widget *freebox;
Ewl_Widget *icon;
Ewl_Widget *image;
Ewl_Widget *vbox;
+ Ewl_Widget *ibox;
+ Ewl_Widget *hbox;
Ewl_Widget *cell;
Ecore_List *view_thumbs;
@@ -71,20 +65,19 @@
ewl_object_fill_policy_set(EWL_OBJECT(freebox), EWL_FLAG_FILL_ALL);
ewl_object_maximum_size_set(EWL_OBJECT(freebox), 9, 75);
ewl_widget_show(freebox);
-
- image_vbox = ewl_vbox_new();
- ewl_theme_data_str_set(image_vbox, "/image/group",
-ewl_theme_data_str_get(m->entry, "group"));
- ewl_container_child_append(EWL_CONTAINER(vbox), image_vbox);
- ewl_object_fill_policy_set(EWL_OBJECT(image_vbox), EWL_FLAG_FILL_ALL);
- ewl_widget_show(image_vbox);
+
+ ibox = ewl_cell_new();
+ ewl_object_fill_policy_set(EWL_OBJECT(ibox), EWL_FLAG_FILL_ALL);
+ ewl_object_alignment_set(EWL_OBJECT(ibox), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(vbox), ibox);
+ ewl_widget_show(ibox);
image_view = ewl_image_new();
- ewl_image_file_set(EWL_IMAGE(image_view), (char *)data, NULL);
- ewl_container_child_append(EWL_CONTAINER(image_vbox), image_view);
- ewl_image_size_set(EWL_IMAGE(image_view), 400, 200);
+ ewl_container_child_append(EWL_CONTAINER(ibox), image_view);
+ ewl_theme_data_str_set(image_view, "/image/group",
+ ewl_theme_data_str_get(m->entry, "group"));
ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE);
- ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_ALL);
+ ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_CENTER);
ewl_widget_show(image_view);
@@ -112,4 +105,5 @@
ecore_dlist_next(view_thumbs);
}
+ ewl_callback_append(vbox, EWL_CALLBACK_SHOW, change_image, data);
}
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: screenshot devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Modified Files: module.edj Log Message: Update the module icon for premul. === RCS file: /cvs/e/e_modules/screenshot/module.edj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsWm4ekj and /tmp/cvskypeyO differ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps.c
Log Message:
*Only put the E_App in the hash after it has passed all tests.
Thanks to metrics for helping to debug this.
*It's not a white space argument between raster and I, it's an arguement
between our respective editors. His is the only editor that can handle
odd number of spaces indentation, mine keeps trying to convert it to 4
or 8 character tabs. Sorry for the noisy white space stuff in this commit.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -3 -r1.208 -r1.209
--- e_apps.c30 Sep 2006 10:16:23 - 1.208
+++ e_apps.c30 Sep 2006 16:59:17 - 1.209
@@ -320,6 +320,7 @@
E_App *a;
struct stat st;
int stated = 0;
+ int new_app = 0;
char buf[PATH_MAX];
if (!path) return NULL;
@@ -350,52 +351,54 @@
if ((!a) && (ecore_file_exists(path)))
{
-/* Create it and add it to the cache. */
+/* Create it. */
a = e_app_empty_new(path);
- if (a)
- _e_apps_every_app = evas_hash_direct_add(_e_apps_every_app, a->path,
a);
+ new_app = 1;
}
if ((a) && (a->path))
- {
- if (ecore_file_is_dir(a->path))
- {
-if (!a->filled)
- {
- snprintf(buf, sizeof(buf), "%s/.directory.eap", path);
- if (ecore_file_exists(buf))
- e_app_fields_fill(a, buf);
- else
- {
- a->name =
evas_stringshare_add(ecore_file_get_file(a->path));
- a->filled = 1;
- }
- }
-if (!a->filled) goto error;
-if (scan_subdirs)
- {
- if (stated)
- _e_app_subdir_rescan(a);
- else
- e_app_subdir_scan(a, scan_subdirs);
- }
-
-/* Don't monitor the all directory, all changes to that must go
through e_app. */
-if ((!stated) && (strcmp(_e_apps_path_all, a->path) != 0))
- a->monitor = ecore_file_monitor_add(a->path, _e_app_cb_monitor,
a);
- }
- else if (_e_app_is_eapp(a->path))
- {
-if (!a->filled)
- e_app_fields_fill(a, a->path);
-_e_apps_hash_cb_init(_e_apps_every_app, a->path, a, NULL);
-
+ {
+ if (ecore_file_is_dir(a->path))
+ {
+ if (!a->filled)
+{
+ snprintf(buf, sizeof(buf), "%s/.directory.eap", path);
+ if (ecore_file_exists(buf))
+ e_app_fields_fill(a, buf);
+ else
+ {
+a->name =
evas_stringshare_add(ecore_file_get_file(a->path));
+a->filled = 1;
+ }
+}
+ if (!a->filled) goto error;
+ if (scan_subdirs)
+ {
+if (stated)
+ _e_app_subdir_rescan(a);
+else
+ e_app_subdir_scan(a, scan_subdirs);
+ }
+
+ /* Don't monitor the all directory, all changes to that must go
through e_app. */
+ if ((!stated) && (strcmp(_e_apps_path_all, a->path) != 0))
+ a->monitor = ecore_file_monitor_add(a->path,
_e_app_cb_monitor, a);
+ }
+else if (_e_app_is_eapp(a->path))
+ {
+ if (!a->filled)
+ e_app_fields_fill(a, a->path);
+_e_apps_hash_cb_init(_e_apps_every_app, a->path, a, NULL);
+
/* no exe field.. not valid. drop it */
// if (!_e_app_exe_valid_get(a->exe))
// goto error;
}
else
goto error;
+
+ if (new_app)
+ _e_apps_every_app = evas_hash_direct_add(_e_apps_every_app, a->path,
a);
/* Timestamp the cache, and no need to stat the file twice if the cache
was stale. */
if ((stated) || (stat(a->path, &st) >= 0))
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore onefang
Enlightenment CVS committal
Author : onefang
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_desktop
Modified Files:
ecore_desktop.c
Log Message:
If icon_class ends up being blank, then free and null it.
Thanks to jeffdameth for pointing out the problem.
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- ecore_desktop.c 29 Sep 2006 12:25:39 - 1.54
+++ ecore_desktop.c 30 Sep 2006 16:45:26 - 1.55
@@ -413,6 +413,11 @@
*p = tolower(*p);
p++;
}
+ if (result->icon_class[0] == '\0')
+{
+ free(result->icon_class);
+ result->icon_class = NULL;
+}
}
}
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e maxerba
Enlightenment CVS committal
Author : maxerba
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_exebuf.c
Log Message:
one string in ibar that needs to be translated, and two strings in exebuf to
avoid duplicated entries in pot file
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_exebuf.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_int_config_exebuf.c 19 Sep 2006 13:58:04 - 1.5
+++ e_int_config_exebuf.c 30 Sep 2006 12:02:11 - 1.6
@@ -154,11 +154,11 @@
ot = e_widget_table_add(evas, 0);
of = e_widget_framelist_add(evas, _("General Settings"), 0);
- ob = e_widget_label_add(evas, _("Maximum Number Of Matched Eaps To List"));
+ ob = e_widget_label_add(evas, _("Maximum Number of Matched Eaps to List"));
e_widget_framelist_object_append(of, ob);
ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 10, 50, 5, 0, NULL,
&(cfdata->max_eap_list), 200);
e_widget_framelist_object_append(of, ob);
- ob = e_widget_label_add(evas, _("Maximum Number Of Matched Exes To List"));
+ ob = e_widget_label_add(evas, _("Maximum Number of Matched Exes to List"));
e_widget_framelist_object_append(of, ob);
ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 10, 50, 5, 0, NULL,
&(cfdata->max_exe_list), 200);
e_widget_framelist_object_append(of, ob);
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e maxerba
Enlightenment CVS committal
Author : maxerba
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibar
Modified Files:
e_mod_main.c
Log Message:
one string in ibar that needs to be translated, and two strings in exebuf to
avoid duplicated entries in pot file
===
RCS file: /cvs/e/e17/apps/e/src/modules/ibar/e_mod_main.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -3 -r1.150 -r1.151
--- e_mod_main.c30 Sep 2006 04:42:30 - 1.150
+++ e_mod_main.c30 Sep 2006 12:02:11 - 1.151
@@ -836,7 +836,7 @@
IBar *b;
b = data;
- e_int_config_apps_once(b->inst->gcc->gadcon->zone->container, "Add to
IBar", _ibar_cb_menu_add_application_cb, b);
+ e_int_config_apps_once(b->inst->gcc->gadcon->zone->container, _("Add to
IBar"), _ibar_cb_menu_add_application_cb, b);
}
static void
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mail maxerba
Enlightenment CVS committal Author : maxerba Project : e_modules Module : mail Dir : e_modules/mail/po Modified Files: it.po Log Message: === RCS file: /cvs/e/e_modules/mail/po/it.po,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- it.po 17 Sep 2006 08:50:21 - 1.2 +++ it.po 30 Sep 2006 12:00:21 - 1.3 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Mail\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-09-16 13:29+0200\n" +"POT-Creation-Date: 2006-09-30 08:29+0200\n" "PO-Revision-Date: 2006-08-26 21:07+0200\n" "Last-Translator: Massimo Maiurana <[EMAIL PROTECTED]>\n" "Language-Team: none\n" @@ -39,98 +39,102 @@ msgid "Configure..." msgstr "Configura..." -#: e_mod_config_box.c:61 +#: e_mod_config_box.c:64 msgid "Mailbox Configuration" msgstr "Configurazione casella di posta" -#: e_mod_config_box.c:143 +#: e_mod_config_box.c:148 msgid "Start Program When New Mail Arrives" msgstr "Avvia programma all'arrivo di nuova posta" -#: e_mod_config_box.c:148 +#: e_mod_config_box.c:153 msgid "Program:" msgstr "Programma:" -#: e_mod_config_box.c:160 +#: e_mod_config_box.c:165 msgid "Mailbox Type" msgstr "Tipo di casella" -#: e_mod_config_box.c:162 +#: e_mod_config_box.c:167 msgid "Pop3" msgstr "Pop3" -#: e_mod_config_box.c:165 +#: e_mod_config_box.c:170 msgid "Imap" msgstr "Imap" -#: e_mod_config_box.c:168 +#: e_mod_config_box.c:173 msgid "Maildir" msgstr "Maildir" -#: e_mod_config_box.c:171 +#: e_mod_config_box.c:176 msgid "Mbox" msgstr "Mbox" -#: e_mod_config_box.c:176 +#: e_mod_config_box.c:179 +msgid "Monitor Mbox file permanently" +msgstr "Monitorizza file Mbox permanentemente" + +#: e_mod_config_box.c:196 msgid "Port Settings" msgstr "Impostazioni porta" -#: e_mod_config_box.c:178 +#: e_mod_config_box.c:198 msgid "Use SSL:" msgstr "Usa SSL:" -#: e_mod_config_box.c:184 +#: e_mod_config_box.c:204 msgid "Port:" msgstr "Porta:" -#: e_mod_config_box.c:190 +#: e_mod_config_box.c:210 msgid "Local:" msgstr "Locale:" -#: e_mod_config_box.c:196 +#: e_mod_config_box.c:216 msgid "Mailbox Settings" msgstr "Impostazioni account" -#: e_mod_config_box.c:197 +#: e_mod_config_box.c:217 msgid "Name:" msgstr "Nome:" -#: e_mod_config_box.c:202 +#: e_mod_config_box.c:222 msgid "Mail Host:" msgstr "Server remoto:" -#: e_mod_config_box.c:207 +#: e_mod_config_box.c:227 msgid "Username:" msgstr "Nome utente:" -#: e_mod_config_box.c:212 +#: e_mod_config_box.c:232 msgid "Password:" msgstr "Password:" -#: e_mod_config_box.c:217 +#: e_mod_config_box.c:237 msgid "New Mail Path:" msgstr "Percorso nuova posta:" -#: e_mod_config_box.c:229 +#: e_mod_config_box.c:249 msgid "Current Mail Path:" msgstr "Percorso posta corrente:" -#: e_mod_config_box.c:367 +#: e_mod_config_box.c:404 msgid "Inbox" msgstr "Posta in arrivo" -#: e_mod_main.c:180 +#: e_mod_main.c:187 msgid "Mail" msgstr "Posta" -#: e_mod_main.c:226 +#: e_mod_main.c:233 msgid "Mailboxes" msgstr "Caselle postali" -#: e_mod_main.c:508 +#: e_mod_main.c:516 msgid "Enlightenment Mail Module" msgstr "Modulo Mail di Enlightenment" -#: e_mod_main.c:509 +#: e_mod_main.c:517 msgid "This is a module to notify when you have new mail." msgstr "Questo è un modulo per notificare l'arrivo di nuova posta" - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV___ enlightenment-cvs mailing list 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/modules/loaders/tiff
Modified Files:
evas_image_load_tiff.c
Log Message:
more commit
===
RCS file: /cvs/e/e17/libs/evas/src/modules/loaders/tiff/evas_image_load_tiff.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas_image_load_tiff.c 6 Sep 2006 07:28:46 - 1.4
+++ evas_image_load_tiff.c 30 Sep 2006 10:21:23 - 1.5
@@ -97,11 +97,11 @@
r = TIFFGetR(pixel_value);
g = TIFFGetG(pixel_value);
b = TIFFGetB(pixel_value);
-if ((a > 0) && (a < 255) && (alpha_premult))
+if (!alpha_premult && (a < 255))
{
- r = (r * 255) / a;
- g = (g * 255) / a;
- b = (b * 255) / a;
+ r = (r * (a + 1)) >> 8;
+ g = (g * (a + 1)) >> 8;
+ b = (b * (a + 1)) >> 8;
}
(*(buffer_pixel++)) = (a << 24) | (r << 16) | (g << 8) | b;
}
@@ -313,6 +313,7 @@
TIFFClose(tif);
+ evas_common_image_set_alpha_sparse(im);
return 1;
}
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
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/modules/savers/tiff
Modified Files:
evas_image_save_tiff.c
Log Message:
more commit
===
RCS file: /cvs/e/e17/libs/evas/src/modules/savers/tiff/evas_image_save_tiff.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_image_save_tiff.c 6 Sep 2006 07:28:46 - 1.2
+++ evas_image_save_tiff.c 30 Sep 2006 10:21:23 - 1.3
@@ -79,14 +79,7 @@
g = (pixel >> 8) & 0xff;
b = pixel & 0xff;
if (has_alpha)
- {
- /* TIFF makes you pre-mutiply the rgb components by alpha */
- a = (pixel >> 24) & 0xff;
- alpha_factor = ((double)a / 255.0);
- r *= alpha_factor;
- g *= alpha_factor;
- b *= alpha_factor;
- }
+a = (pixel >> 24) & 0xff;
/* This might be endian dependent */
buf[i++] = r;
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
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/modules/savers/png
Modified Files:
evas_image_save_png.c
Log Message:
more commit
===
RCS file: /cvs/e/e17/libs/evas/src/modules/savers/png/evas_image_save_png.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_image_save_png.c 6 Sep 2006 07:28:46 - 1.3
+++ evas_image_save_png.c 30 Sep 2006 10:21:23 - 1.4
@@ -18,9 +18,9 @@
FILE *f;
png_structp png_ptr;
png_infop info_ptr;
- DATA32 *ptr;
+ DATA32 *ptr, *data;
int x, y, j;
- png_bytep row_ptr, data = NULL;
+ png_bytep row_ptr, png_data = NULL;
png_color_8 sig_bit;
int num_passes = 1, pass;
@@ -59,10 +59,19 @@
#endif
}
- png_init_io(png_ptr, f);
-
if (im->flags & RGBA_IMAGE_HAS_ALPHA)
{
+ data = malloc(im->image->w * im->image->h * sizeof(DATA32));
+ if (!data)
+ {
+ fclose(f);
+ png_destroy_write_struct(&png_ptr, (png_infopp) & info_ptr);
+ png_destroy_info_struct(png_ptr, (png_infopp) & info_ptr);
+ return 0;
+ }
+ memcpy(data, im->image->data, im->image->w * im->image->h *
sizeof(DATA32));
+ evas_common_convert_argb_unpremul(data, im->image->w * im->image->h);
+ png_init_io(png_ptr, f);
png_set_IHDR(png_ptr, info_ptr, im->image->w, im->image->h, 8,
PNG_COLOR_TYPE_RGB_ALPHA, png_ptr->interlaced,
PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
@@ -74,10 +83,12 @@
}
else
{
+ data = im->image->data;
+ png_init_io(png_ptr, f);
png_set_IHDR(png_ptr, info_ptr, im->image->w, im->image->h, 8,
PNG_COLOR_TYPE_RGB, png_ptr->interlaced,
PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
- data = alloca(im->image->w * 3 * sizeof(char));
+ png_data = alloca(im->image->w * 3 * sizeof(char));
}
sig_bit.red = 8;
sig_bit.green = 8;
@@ -92,7 +103,7 @@
for (pass = 0; pass < num_passes; pass++)
{
- ptr = im->image->data;
+ ptr = data;
for (y = 0; y < im->image->h; y++)
{
@@ -102,11 +113,11 @@
{
for (j = 0, x = 0; x < im->image->w; x++)
{
- data[j++] = (ptr[x] >> 16) & 0xff;
- data[j++] = (ptr[x] >> 8) & 0xff;
- data[j++] = (ptr[x]) & 0xff;
+ png_data[j++] = (ptr[x] >> 16) & 0xff;
+ png_data[j++] = (ptr[x] >> 8) & 0xff;
+ png_data[j++] = (ptr[x]) & 0xff;
}
- row_ptr = (png_bytep) data;
+ row_ptr = (png_bytep) png_data;
}
png_write_rows(png_ptr, &row_ptr, 1);
ptr += im->image->w;
@@ -116,6 +127,8 @@
png_destroy_write_struct(&png_ptr, (png_infopp) & info_ptr);
png_destroy_info_struct(png_ptr, (png_infopp) & info_ptr);
+ if (im->flags & RGBA_IMAGE_HAS_ALPHA)
+ free(data);
fclose(f);
return 1;
}
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
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/modules/savers/eet
Modified Files:
evas_image_save_eet.c
Log Message:
more commit
===
RCS file: /cvs/e/e17/libs/evas/src/modules/savers/eet/evas_image_save_eet.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_image_save_eet.c 6 Sep 2006 07:28:46 - 1.3
+++ evas_image_save_eet.c 30 Sep 2006 10:21:23 - 1.4
@@ -16,6 +16,7 @@
{
Eet_File*ef;
int alpha = 0, lossy = 0, ok = 0;
+ DATA32 *data;
if (!im || !im->image || !im->image->data || !file)
return 0;
@@ -25,9 +26,24 @@
if (!ef) return 0;
if ((quality <= 100) || (compress < 0)) lossy = 1;
if (im->flags & RGBA_IMAGE_HAS_ALPHA) alpha = 1;
- ok = eet_data_image_write(ef, (char *)key, im->image->data,
+ if (alpha)
+ {
+ data = malloc(im->image->w * im->image->h * sizeof(DATA32));
+ if (!data)
+{
+ eet_close(ef);
+ return 0;
+}
+ memcpy(data, im->image->data, im->image->w * im->image->h *
sizeof(DATA32));
+ evas_common_convert_argb_unpremul(data, im->image->w * im->image->h);
+ }
+ else
+ data = im->image->data;
+ ok = eet_data_image_write(ef, (char *)key, data,
im->image->w, im->image->h, alpha, compress,
quality, lossy);
+ if (alpha)
+ free(data);
eet_close(ef);
return ok;
}
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto raster
Enlightenment CVS committal Author : raster Project : e17 Module : proto Dir : e17/proto/exhibit/src/bin Modified Files: exhibit_file.c Log Message: more commit === RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_file.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- exhibit_file.c 8 Sep 2006 16:54:30 - 1.14 +++ exhibit_file.c 30 Sep 2006 10:21:23 - 1.15 @@ -16,6 +16,7 @@ ".edj", ".svg", ".svgz", + ".xpm", NULL }; - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list 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/modules/loaders/svg
Modified Files:
evas_image_load_svg.c
Log Message:
same as previous commit.
===
RCS file: /cvs/e/e17/libs/evas/src/modules/loaders/svg/evas_image_load_svg.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- evas_image_load_svg.c 24 Sep 2006 13:32:25 - 1.8
+++ evas_image_load_svg.c 30 Sep 2006 10:18:37 - 1.9
@@ -213,9 +213,8 @@
/* need to check if this is required... */
cairo_destroy(cr);
rsvg_handle_free(rsvg);
- /* un-premul the im data */
- svg_loader_unpremul_data(im->image->data, w * h);
chdir(pcwd);
+ evas_common_image_set_alpha_sparse(im);
return 1;
}
@@ -232,6 +231,7 @@
EAPI void
module_close(void)
{
+ if (!rsvg_initialized) return;
rsvg_term();
rsvg_initialized = 0;
}
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
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/modules/engines/xrender_xcb
Modified Files:
evas_engine.c evas_engine.h evas_engine_gradient.c
Log Message:
same as previous commit.
===
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/xrender_xcb/evas_engine.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- evas_engine.c 9 Sep 2006 08:10:24 - 1.8
+++ evas_engine.c 30 Sep 2006 10:18:36 - 1.9
@@ -52,22 +52,33 @@
static void *eng_output_redraws_next_update_get(void *data, int *x, int *y,
int *w, int *h, int *cx, int *cy, int *cw, int *ch);
static void eng_output_redraws_next_update_push(void *data, void *surface, int
x, int y, int w, int h);
static void eng_output_flush(void *data);
+
static void eng_rectangle_draw(void *data, void *context, void *surface, int
x, int y, int w, int h);
+
static void eng_line_draw(void *data, void *context, void *surface, int x1,
int y1, int x2, int y2);
+
static void eng_polygon_draw(void *data, void *context, void *surface, void
*polygon);
-static void *eng_gradient_color_add(void *data, void *context, void *gradient,
int r, int g, int b, int a, int distance);
-static void *eng_gradient_colors_clear(void *data, void *context, void
*gradient);
-static void *eng_gradient_data_set(void *data, void *context, void *gradient,
void *map, int len, int has_alpha);
-static void *eng_gradient_data_unset(void *data, void *context, void
*gradient);
+
+static void *eng_gradient_new(void *data);
static void eng_gradient_free(void *data, void *gradient);
+static void eng_gradient_color_stop_add(void *data, void *gradient, int r, int
g, int b, int a, int delta);
+static void eng_gradient_alpha_stop_add(void *data, void *gradient, int a, int
delta);
+static void eng_gradient_color_data_set(void *data, void *gradient, void *map,
int len, int has_alpha);
+static void eng_gradient_alpha_data_set(void *data, void *gradient, void
*alpha_map, int len);
+static void eng_gradient_clear(void *data, void *gradient);
static void eng_gradient_fill_set(void *data, void *gradient, int x, int y,
int w, int h);
-static void eng_gradient_range_offset_set(void *data, void *gradient, float
offset);
-static void eng_gradient_type_set(void *data, void *gradient, char *name);
-static void eng_gradient_type_params_set(void *data, void *gradient, char
*params);
-static void *eng_gradient_geometry_init(void *data, void *gradient, int
spread);
-static int eng_gradient_alpha_get(void *data, void *gradient, int spread, int
op);
-static void eng_gradient_map(void *data, void *context, void *gradient, int
spread);
-static void eng_gradient_draw(void *data, void *context, void *surface, void
*gradient, int x, int y, int w, int h, double angle, int spread);
+static void eng_gradient_fill_angle_set(void *data, void *gradient, double
angle);
+static void eng_gradient_fill_spread_set(void *data, void *gradient, int
spread);
+static void eng_gradient_angle_set(void *data, void *gradient, double angle);
+static void eng_gradient_offset_set(void *data, void *gradient, float offset);
+static void eng_gradient_direction_set(void *data, void *gradient, int
direction);
+static void eng_gradient_type_set(void *data, void *gradient, char *name, char
*params);
+static int eng_gradient_is_opaque(void *data, void *context, void *gradient,
int x, int y, int w, int h);
+static int eng_gradient_is_visible(void *data, void *context, void *gradient,
int x, int y, int w, int h);
+static void eng_gradient_render_pre(void *data, void *context, void *gradient);
+static void eng_gradient_render_post(void *data, void *gradient);
+static void eng_gradient_draw(void *data, void *context, void *surface, void
*gradient, int x, int y, int w, int h);
+
static void *eng_image_load(void *data, const char *file, const char *key, int
*error, Evas_Image_Load_Opts *lo);
static void *eng_image_new_from_data(void *data, int w, int h, DATA32
*image_data);
static void *eng_image_new_from_copied_data(void *data, int w, int h, DATA32
*image_data);
@@ -87,6 +98,7 @@
static void eng_image_cache_flush(void *data);
static void eng_image_cache_set(void *data, int bytes);
static int eng_image_cache_get(void *data);
+
static void eng_font_draw(void *data, void *context, void *surface, void
*font, int x, int y, int w, int h, int ow, int oh, const char *text);
/* internal engine routines */
@@ -397,97 +409,134 @@
}
static void *
-eng_gradient_color_add(void *data, void *context, void *gradient, int r, int
g, int b, int a, int distance)
+eng_gradient_new(void *data)
{
- Render_Engine *re;
+ Render_Engine *re = (Render_Engine *)data;
- re = (Render_Engine *)data;
- return _xre_gradient_color_add(re->xcbinf, (XR_Gradient *)gradient, r, g,
b, a, distance);
+ return _xre_gradient_new(re->xcbinf);
}
-static void *
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/loaders/gif
Modified Files:
evas_image_load_gif.c
Log Message:
same as previous commit.
===
RCS file: /cvs/e/e17/libs/evas/src/modules/loaders/gif/evas_image_load_gif.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_image_load_gif.c 6 Sep 2006 07:28:45 - 1.2
+++ evas_image_load_gif.c 30 Sep 2006 10:18:36 - 1.3
@@ -286,6 +286,7 @@
per += per_inc;
}
}
+ evas_common_image_premul(im);
DGifCloseFile(gif);
for (i = 0; i < h; i++)
{
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
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/modules/engines/xrender_x11
Modified Files:
evas_engine.c evas_engine.h evas_engine_font.c
evas_engine_gradient.c evas_engine_xrender.c
Log Message:
same as previous commit.
===
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/xrender_x11/evas_engine.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- evas_engine.c 6 Sep 2006 07:28:45 - 1.12
+++ evas_engine.c 30 Sep 2006 10:18:36 - 1.13
@@ -49,22 +49,33 @@
static void *eng_output_redraws_next_update_get(void *data, int *x, int *y,
int *w, int *h, int *cx, int *cy, int *cw, int *ch);
static void eng_output_redraws_next_update_push(void *data, void *surface, int
x, int y, int w, int h);
static void eng_output_flush(void *data);
+
static void eng_rectangle_draw(void *data, void *context, void *surface, int
x, int y, int w, int h);
+
static void eng_line_draw(void *data, void *context, void *surface, int x1,
int y1, int x2, int y2);
+
static void eng_polygon_draw(void *data, void *context, void *surface, void
*polygon);
-static void *eng_gradient_color_add(void *data, void *context, void *gradient,
int r, int g, int b, int a, int distance);
-static void *eng_gradient_colors_clear(void *data, void *context, void
*gradient);
-static void *eng_gradient_data_set(void *data, void *context, void *gradient,
void *map, int len, int has_alpha);
-static void *eng_gradient_data_unset(void *data, void *context, void
*gradient);
+
+static void *eng_gradient_new(void *data);
static void eng_gradient_free(void *data, void *gradient);
+static void eng_gradient_color_stop_add(void *data, void *gradient, int r, int
g, int b, int a, int delta);
+static void eng_gradient_alpha_stop_add(void *data, void *gradient, int a, int
delta);
+static void eng_gradient_color_data_set(void *data, void *gradient, void *map,
int len, int has_alpha);
+static void eng_gradient_alpha_data_set(void *data, void *gradient, void
*alpha_map, int len);
+static void eng_gradient_clear(void *data, void *gradient);
static void eng_gradient_fill_set(void *data, void *gradient, int x, int y,
int w, int h);
-static void eng_gradient_range_offset_set(void *data, void *gradient, float
offset);
-static void eng_gradient_type_set(void *data, void *gradient, char *name);
-static void eng_gradient_type_params_set(void *data, void *gradient, char
*params);
-static void *eng_gradient_geometry_init(void *data, void *gradient, int
spread);
-static int eng_gradient_alpha_get(void *data, void *gradient, int spread, int
op);
-static void eng_gradient_map(void *data, void *context, void *gradient, int
spread);
-static void eng_gradient_draw(void *data, void *context, void *surface, void
*gradient, int x, int y, int w, int h, double angle, int spread);
+static void eng_gradient_fill_angle_set(void *data, void *gradient, double
angle);
+static void eng_gradient_fill_spread_set(void *data, void *gradient, int
spread);
+static void eng_gradient_angle_set(void *data, void *gradient, double angle);
+static void eng_gradient_offset_set(void *data, void *gradient, float offset);
+static void eng_gradient_direction_set(void *data, void *gradient, int
direction);
+static void eng_gradient_type_set(void *data, void *gradient, char *name, char
*params);
+static int eng_gradient_is_opaque(void *data, void *context, void *gradient,
int x, int y, int w, int h);
+static int eng_gradient_is_visible(void *data, void *context, void *gradient,
int x, int y, int w, int h);
+static void eng_gradient_render_pre(void *data, void *context, void *gradient);
+static void eng_gradient_render_post(void *data, void *gradient);
+static void eng_gradient_draw(void *data, void *context, void *surface, void
*gradient, int x, int y, int w, int h);
+
static void *eng_image_load(void *data, const char *file, const char *key, int
*error, Evas_Image_Load_Opts *lo);
static void *eng_image_new_from_data(void *data, int w, int h, DATA32
*image_data);
static void *eng_image_new_from_copied_data(void *data, int w, int h, DATA32
*image_data);
@@ -84,6 +95,7 @@
static void eng_image_cache_flush(void *data);
static void eng_image_cache_set(void *data, int bytes);
static int eng_image_cache_get(void *data);
+
static void eng_font_draw(void *data, void *context, void *surface, void
*font, int x, int y, int w, int h, int ow, int oh, const char *text);
/* internal engine routines */
@@ -382,97 +394,134 @@
}
static void *
-eng_gradient_color_add(void *data, void *context, void *gradient, int r, int
g, int b, int a, int distance)
+eng_gradient_new(void *data)
{
- Render_Engine *re;
+ Render_Engine *re = (Render_Engine *)data;
- re = (Render_Engine *)data;
- return _xre_gradient_color_add(re->xinf, (XR_Gradient *)gradient, r, g, b,
a, distance);
+ ret
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/engines/software_x11
Modified Files:
evas_outbuf.c
Log Message:
same as previous commit.
===
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/software_x11/evas_outbuf.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evas_outbuf.c 10 Sep 2006 16:06:51 - 1.5
+++ evas_outbuf.c 30 Sep 2006 10:18:35 - 1.6
@@ -449,6 +449,7 @@
bpl /
((evas_software_x11_x_output_buffer_depth(obr->xob) /
8)) - obr->w, obr->w, obr->h, x, y, NULL);
+#if 0
/* FIXME: this is evil - but it makes ARGB targets look correct */
if ((buf->priv.destination_alpha) && (!obr->mxob) &&
(evas_software_x11_x_output_buffer_depth(obr->xob) == 32))
@@ -470,6 +471,7 @@
}
}
}
+#endif
}
if (obr->mxob)
{
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
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/modules/engines/software_xcb
Modified Files:
evas_outbuf.c
Log Message:
same as previous commit.
===
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/software_xcb/evas_outbuf.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- evas_outbuf.c 10 Sep 2006 16:06:51 - 1.8
+++ evas_outbuf.c 30 Sep 2006 10:18:36 - 1.9
@@ -516,6 +516,7 @@
bpl /
((evas_software_xcb_x_output_buffer_depth(obr->xcbob) / 8))
- obr->w,
obr->w, obr->h, x, y, NULL);
+#if 0
/* FIXME: this is evil - but it makes ARGB targets look correct */
if ((buf->priv.destination_alpha) && (!obr->mxcbob) &&
(evas_software_xcb_x_output_buffer_depth(obr->xcbob) == 32))
@@ -537,6 +538,7 @@
}
}
}
+#endif
}
if (obr->mxcbob)
{
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
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/modules/loaders/edb Modified Files: evas_image_load_edb.c Log Message: same as previous commit. === RCS file: /cvs/e/e17/libs/evas/src/modules/loaders/edb/evas_image_load_edb.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- evas_image_load_edb.c 6 Sep 2006 07:28:45 - 1.2 +++ evas_image_load_edb.c 30 Sep 2006 10:18:36 - 1.3 @@ -188,6 +188,7 @@ } #endif } + evas_common_image_premul(im); free(ret); e_db_close(db); return 1; - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list 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/modules/loaders/png Modified Files: evas_image_load_png.c Log Message: same as previous commit. === RCS file: /cvs/e/e17/libs/evas/src/modules/loaders/png/evas_image_load_png.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- evas_image_load_png.c 6 Sep 2006 07:28:46 - 1.2 +++ evas_image_load_png.c 30 Sep 2006 10:18:37 - 1.3 @@ -198,6 +198,7 @@ png_read_end(png_ptr, info_ptr); png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL); fclose(f); + evas_common_image_premul(im); return 1; key = 0; } - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list 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/modules/engines/gl_x11 Modified Files: evas_engine.c Log Message: same as previous commit. === RCS file: /cvs/e/e17/libs/evas/src/modules/engines/gl_x11/evas_engine.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- evas_engine.c 6 Sep 2006 07:28:44 - 1.15 +++ evas_engine.c 30 Sep 2006 10:18:34 - 1.16 @@ -21,6 +21,7 @@ static void *eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch); static void eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int w, int h); static void eng_output_flush(void *data); + static void *eng_context_new(void *data); static void eng_context_free(void *data, void *context); static void eng_context_clip_set(void *data, void *context, int x, int y, int w, int h); @@ -40,24 +41,35 @@ static int eng_context_color_interpolation_get(void *data, void *context); static void eng_context_render_op_set(void *data, void *context, int op); static int eng_context_render_op_get(void *data, void *context); + static void eng_rectangle_draw(void *data, void *context, void *surface, int x, int y, int w, int h); + static void eng_line_draw(void *data, void *context, void *surface, int x1, int y1, int x2, int y2); + static void *eng_polygon_point_add(void *data, void *context, void *polygon, int x, int y); static void *eng_polygon_points_clear(void *data, void *context, void *polygon); static void eng_polygon_draw(void *data, void *context, void *surface, void *polygon); -static void *eng_gradient_color_add(void *data, void *context, void *gradient, int r, int g, int b, int a, int distance); -static void *eng_gradient_colors_clear(void *data, void *context, void *gradient); -static void *eng_gradient_data_set(void *data, void *context, void *gradient, void *map, int len, int has_alpha); -static void *eng_gradient_data_unset(void *data, void *context, void *gradient); + +static void *eng_gradient_new(void *data); static void eng_gradient_free(void *data, void *gradient); +static void eng_gradient_color_stop_add(void *data, void *gradient, int r, int g, int b, int a, int delta); +static void eng_gradient_alpha_stop_add(void *data, void *gradient, int a, int delta); +static void eng_gradient_color_data_set(void *data, void *gradient, void *map, int len, int has_alpha); +static void eng_gradient_alpha_data_set(void *data, void *gradient, void *alpha_map, int len); +static void eng_gradient_clear(void *data, void *gradient); static void eng_gradient_fill_set(void *data, void *gradient, int x, int y, int w, int h); -static void eng_gradient_range_offset_set(void *data, void *gradient, float offset); -static void eng_gradient_type_set(void *data, void *gradient, char *name); -static void eng_gradient_type_params_set(void *data, void *gradient, char *params); -static void *eng_gradient_geometry_init(void *data, void *gradient, int spread); -static int eng_gradient_alpha_get(void *data, void *gradient, int spread, int op); -static void eng_gradient_map(void *data, void *context, void *gradient, int spread); -static void eng_gradient_draw(void *data, void *context, void *surface, void *gradient, int x, int y, int w, int h, double angle, int spread); +static void eng_gradient_fill_angle_set(void *data, void *gradient, double angle); +static void eng_gradient_fill_spread_set(void *data, void *gradient, int spread); +static void eng_gradient_angle_set(void *data, void *gradient, double angle); +static void eng_gradient_offset_set(void *data, void *gradient, float offset); +static void eng_gradient_direction_set(void *data, void *gradient, int direction); +static void eng_gradient_type_set(void *data, void *gradient, char *name, char *params); +static int eng_gradient_is_opaque(void *data, void *context, void *gradient, int x, int y, int w, int h); +static int eng_gradient_is_visible(void *data, void *context, void *gradient, int x, int y, int w, int h); +static void eng_gradient_render_pre(void *data, void *context, void *gradient); +static void eng_gradient_render_post(void *data, void *gradient); +static void eng_gradient_draw(void *data, void *context, void *surface, void *gradient, int x, int y, int w, int h); + static void *eng_image_load(void *data, char *file, char *key, int *error, Evas_Image_Load_Opts *lo); static void *eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data); static void *eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data); @@ -77,6 +89,7 @@ static void eng_image_cache_flush(void *data); static void eng_image_cache_set(void *data, int bytes); static int eng_image_cache_get(void *data); + static void *eng_font_load(void *data, char *name, int size); static vo
E CVS: libs/evas raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas Dir : e17/libs/evas/src/modules/loaders/eet Modified Files: evas_image_load_eet.c Log Message: same as previous commit. === RCS file: /cvs/e/e17/libs/evas/src/modules/loaders/eet/evas_image_load_eet.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- evas_image_load_eet.c 6 Sep 2006 07:28:45 - 1.2 +++ evas_image_load_eet.c 30 Sep 2006 10:18:36 - 1.3 @@ -89,6 +89,8 @@ im->image->h = h; im->image->data = body; im->image->no_free = 0; +// result is already premultiplied now if u compile with edje +// evas_common_image_premul(im); eet_close(ef); return 1; } - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list 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/modules/engines/software_generic
Modified Files:
evas_engine.c
Log Message:
same as previous commit.
===
RCS file:
/cvs/e/e17/libs/evas/src/modules/engines/software_generic/evas_engine.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- evas_engine.c 6 Sep 2006 07:28:44 - 1.7
+++ evas_engine.c 30 Sep 2006 10:18:34 - 1.8
@@ -171,40 +171,45 @@
}
static void *
-eng_gradient_color_add(void *data, void *context, void *gradient, int r, int
g, int b, int a, int distance)
+eng_gradient_new(void *data)
{
- if (!gradient) gradient = evas_common_gradient_new();
- evas_common_gradient_color_add(gradient, r, g, b, a, distance);
- return gradient;
+ return evas_common_gradient_new();
}
-static void *
-eng_gradient_colors_clear(void *data, void *context, void *gradient)
+static void
+eng_gradient_free(void *data, void *gradient)
{
- evas_common_gradient_colors_clear(gradient);
- return gradient;
+ evas_common_gradient_free(gradient);
}
-static void *
-eng_gradient_data_set(void *data, void *context, void *gradient, void *map,
int len, int has_alpha)
+static void
+eng_gradient_color_stop_add(void *data, void *gradient, int r, int g, int b,
int a, int delta)
{
- if (!gradient)
- gradient = evas_common_gradient_new();
- evas_common_gradient_data_set(gradient, map, len, has_alpha);
- return gradient;
+ evas_common_gradient_color_stop_add(gradient, r, g, b, a, delta);
}
-static void *
-eng_gradient_data_unset(void *data, void *context, void *gradient)
+static void
+eng_gradient_alpha_stop_add(void *data, void *gradient, int a, int delta)
{
- evas_common_gradient_data_unset(gradient);
- return gradient;
+ evas_common_gradient_alpha_stop_add(gradient, a, delta);
}
static void
-eng_gradient_free(void *data, void *gradient)
+eng_gradient_color_data_set(void *data, void *gradient, void *map, int len,
int has_alpha)
{
- evas_common_gradient_free(gradient);
+ evas_common_gradient_color_data_set(gradient, map, len, has_alpha);
+}
+
+static void
+eng_gradient_alpha_data_set(void *data, void *gradient, void *alpha_map, int
len)
+{
+ evas_common_gradient_alpha_data_set(gradient, alpha_map, len);
+}
+
+static void
+eng_gradient_clear(void *data, void *gradient)
+{
+ evas_common_gradient_clear(gradient);
}
static void
@@ -214,46 +219,83 @@
}
static void
-eng_gradient_range_offset_set(void *data, void *gradient, float offset)
+eng_gradient_fill_angle_set(void *data, void *gradient, double angle)
{
- evas_common_gradient_range_offset_set(gradient, offset);
+ evas_common_gradient_fill_angle_set(gradient, angle);
}
static void
-eng_gradient_type_set(void *data, void *gradient, char *name)
+eng_gradient_fill_spread_set(void *data, void *gradient, int spread)
{
- evas_common_gradient_type_set(gradient, name);
+ evas_common_gradient_fill_spread_set(gradient, spread);
}
static void
-eng_gradient_type_params_set(void *data, void *gradient, char *params)
+eng_gradient_angle_set(void *data, void *gradient, double angle)
{
- evas_common_gradient_type_params_set(gradient, params);
+ evas_common_gradient_map_angle_set(gradient, angle);
}
-static void *
-eng_gradient_geometry_init(void *data, void *gradient, int spread)
+static void
+eng_gradient_offset_set(void *data, void *gradient, float offset)
{
- gradient = evas_common_gradient_geometry_init(gradient, spread);
- return gradient;
+ evas_common_gradient_map_offset_set(gradient, offset);
+}
+
+static void
+eng_gradient_direction_set(void *data, void *gradient, int direction)
+{
+ evas_common_gradient_map_direction_set(gradient, direction);
+}
+
+static void
+eng_gradient_type_set(void *data, void *gradient, char *name, char *params)
+{
+ evas_common_gradient_type_set(gradient, name, params);
}
static int
-eng_gradient_alpha_get(void *data, void *gradient, int spread, int op)
+eng_gradient_is_opaque(void *data, void *context, void *gradient, int x, int
y, int w, int h)
{
- return evas_common_gradient_has_alpha(gradient, spread, op);
+ RGBA_Draw_Context *dc = (RGBA_Draw_Context *)context;
+ RGBA_Gradient *gr = (RGBA_Gradient *)gradient;
+
+ if (!dc || !gr || !gr->type.geometer) return 0;
+ return !(gr->type.geometer->has_alpha(gr, dc->render_op) |
+ gr->type.geometer->has_mask(gr, dc->render_op));
+}
+
+static int
+eng_gradient_is_visible(void *data, void *context, void *gradient, int x, int
y, int w, int h)
+{
+ RGBA_Draw_Context *dc = (RGBA_Draw_Context *)context;
+
+ if (!dc || !gradient) return 0;
+ return 1;
+}
+
+static void
+eng_gradient_render_pre(void *data, void *context, void *gradient)
+{
+ RGBA_Draw_Context *dc = (RGBA_Draw_Context *)context;
+ RGBA_Gradient *gr = (RGBA_Gradient *)gradient;
+
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/engines/directfb
Modified Files:
evas_engine_dfb.c evas_engine_dfb.h
Log Message:
same as previous commit.
===
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/directfb/evas_engine_dfb.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evas_engine_dfb.c 6 Sep 2006 07:23:37 - 1.5
+++ evas_engine_dfb.c 30 Sep 2006 10:18:34 - 1.6
@@ -44,18 +44,24 @@
evas_engine_directfb_polygon_points_clear,
evas_engine_directfb_polygon_draw,
/* gardient draw funcs */
- evas_engine_directfb_gradient_color_add,
- evas_engine_directfb_gradient_colors_clear,
- evas_engine_directfb_gradient_data_set,
- evas_engine_directfb_gradient_data_unset,
+ evas_engine_directfb_gradient_new,
evas_engine_directfb_gradient_free,
+ evas_engine_directfb_gradient_color_stop_add,
+ evas_engine_directfb_gradient_alpha_stop_add,
+ evas_engine_directfb_gradient_color_data_set,
+ evas_engine_directfb_gradient_alpha_data_set,
+ evas_engine_directfb_gradient_clear,
evas_engine_directfb_gradient_fill_set,
- evas_engine_directfb_gradient_range_offset_set,
+ evas_engine_directfb_gradient_fill_angle_set,
+ evas_engine_directfb_gradient_fill_spread_set,
+ evas_engine_directfb_gradient_angle_set,
+ evas_engine_directfb_gradient_offset_set,
+ evas_engine_directfb_gradient_direction_set,
evas_engine_directfb_gradient_type_set,
- evas_engine_directfb_gradient_type_params_set,
- evas_engine_directfb_gradient_geometry_init,
- evas_engine_directfb_gradient_alpha_get,
- evas_engine_directfb_gradient_map,
+ evas_engine_directfb_gradient_is_opaque,
+ evas_engine_directfb_gradient_is_visible,
+ evas_engine_directfb_gradient_render_pre,
+ evas_engine_directfb_gradient_render_post,
evas_engine_directfb_gradient_draw,
/* image draw funcs */
evas_engine_directfb_image_load,
@@ -765,60 +771,68 @@
*
* */
void *
-evas_engine_directfb_gradient_color_add(void *data, void *context, void
*gradient, int r, int g, int b, int a, int distance)
+eng_gradient_new(void *data)
+{
+ return evas_common_gradient_new();
+}
+
+void
+evas_engine_directfb_gradient_free(void *data, void *gradient)
+{
+ Render_Engine *re;
+
+ re = (Render_Engine *)data;
+ evas_common_gradient_free(gradient);
+}
+
+void
+evas_engine_directfb_gradient_color_stop_add(void *data, void *gradient, int
r, int g, int b, int a, int delta)
{
Render_Engine *re;
re = (Render_Engine *)data;
- if (!gradient)
- gradient = evas_common_gradient_new();
- evas_common_gradient_color_add(gradient, r, g, b, a, distance);
- return gradient;
+ evas_common_gradient_color_stop_add(gradient, r, g, b, a, delta);
context = NULL;
}
-void *
-evas_engine_directfb_gradient_colors_clear(void *data, void *context, void
*gradient)
+void
+evas_engine_directfb_gradient_alpha_stop_add(void *data, void *gradient, int
a, int delta)
{
Render_Engine *re;
re = (Render_Engine *)data;
- evas_common_gradient_colors_clear(gradient);
- return gradient;
+ evas_common_gradient_alpha_stop_add(gradient, a, delta);
context = NULL;
}
-void *
-evas_engine_directfb_gradient_data_set(void *data, void *context, void
*gradient, void *map, int len, int has_alpha)
+void
+evas_engine_directfb_gradient_color_data_set(void *data, void *gradient, void
*map, int len, int has_alpha)
{
Render_Engine *re;
re = (Render_Engine *)data;
- if (!gradient)
- gradient = evas_common_gradient_new();
- evas_common_gradient_data_set(gradient, map, len, has_alpha);
- return gradient;
+ evas_common_gradient_color_data_set(gradient, map, len, has_alpha);
context = NULL;
}
-void *
-evas_engine_directfb_gradient_data_unset(void *data, void *context, void
*gradient)
+void
+evas_engine_directfb_gradient_alpha_data_set(void *data, void *gradient, void
*alpha_map, int len)
{
Render_Engine *re;
re = (Render_Engine *)data;
- evas_common_gradient_data_unset(gradient);
- return gradient;
+ evas_common_gradient_alpha_data_set(gradient, alpha_map, len);
context = NULL;
}
void
-evas_engine_directfb_gradient_free(void *data, void *gradient)
+evas_engine_directfb_gradient_clear(void *data, void *gradient)
{
Render_Engine *re;
re = (Render_Engine *)data;
- evas_common_gradient_free(gradient);
+ evas_common_gradient_clear(gradient);
+ context = NULL;
}
void
@@ -831,63 +845,101 @@
}
void
-evas_engine_directfb_gradient_range_offset_set(void *data, void *gradient,
float offset)
+evas_engine_directfb_gradient_fill_angle_set(void *data, void *gradient,
double angle)
{
- Render_Engine *re;
+Render_Engine *re;
re = (Render_Engine *)data;
- evas_common_gradient_range_offset_set(gradient, offset);
+ evas_common_gradient_fill
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_object_gradient.c evas_object_image.c evas_object_text.c
evas_object_textblock.c
Log Message:
same as previous commit.
===
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_object_gradient.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- evas_object_gradient.c 7 Jun 2006 23:30:14 - 1.13
+++ evas_object_gradient.c 30 Sep 2006 10:18:32 - 1.14
@@ -12,11 +12,15 @@
DATA32magic;
struct {
+ struct {
Evas_Angle angle;
- intspread;
- float range_offset;
+ float offset;
+ intdirection;
+ } map;
struct {
Evas_Coord x, y, w, h;
+ Evas_Angle angle;
+ int spread;
} fill;
struct {
char *name;
@@ -27,7 +31,7 @@
unsigned char changed : 1;
unsigned char gradient_changed : 1;
- unsigned char imported_data : 1;
+ unsigned char type_changed : 1;
void *engine_data;
};
@@ -89,30 +93,36 @@
obj = evas_object_new();
evas_object_gradient_init(obj);
evas_object_inject(obj, e);
+ if (obj->object_data)
+ {
+ Evas_Object_Gradient *o = (Evas_Object_Gradient *)(obj->object_data);
+
+ o->engine_data = e->engine.func->gradient_new(e->engine.data.output);
+ }
return obj;
}
/**
- * Adds a colour to the given evas gradient object.
+ * Adds a color stop to the given evas gradient object.
*
- * The @p distance parameter determines the proportion of the gradient
- * object that is to be set to this colour. For instance, if red is
- * added with @p distance set to 2, and green is added with @p
- * distance set to 1, two-thirds will be red or reddish and one-third
+ * The @p delta parameter determines the proportion of the gradient
+ * object that is to be set to the color. For instance, if red is
+ * added with @p delta set to 2, and green is added with @p
+ * delta set to 1, two-thirds will be red or reddish and one-third
* will be green or greenish.
*
- * Colours are added from the top downwards.
+ * Colors are added from the top downwards.
*
* @param obj The given evas gradient object.
- * @param rRed component of the given colour.
- * @param gGreen component of the given colour.
- * @param bBlue component of the given colour.
- * @param aAlpha component of the given colour.
- * @param distance Proportion of the gradient object that is this colour.
+ * @param rRed component of the given color.
+ * @param gGreen component of the given color.
+ * @param bBlue component of the given color.
+ * @param aAlpha component of the given color.
+ * @param deltaProportion of the gradient object that is this color.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI void
-evas_object_gradient_color_add(Evas_Object *obj, int r, int g, int b, int a,
int distance)
+evas_object_gradient_color_stop_add(Evas_Object *obj, int r, int g, int b, int
a, int delta)
{
Evas_Object_Gradient *o;
@@ -123,24 +133,30 @@
MAGIC_CHECK(o, Evas_Object_Gradient, MAGIC_OBJ_GRADIENT);
return;
MAGIC_CHECK_END();
- if (o->imported_data) return;
- o->engine_data =
obj->layer->evas->engine.func->gradient_color_add(obj->layer->evas->engine.data.output,
-
obj->layer->evas->engine.data.context,
-
o->engine_data,
- r, g, b,
a,
- distance);
+ if (o->engine_data)
+
obj->layer->evas->engine.func->gradient_color_stop_add(obj->layer->evas->engine.data.output,
+o->engine_data,
+r, g, b, a, delta);
o->gradient_changed = 1;
o->changed = 1;
evas_object_change(obj);
}
/**
- * Deletes all colours set for the given evas gradient object.
- * @param obj The given evas gradient object.
+ * Adds an alpha stop to the given evas gradient object.
+ *
+ * The @p delta parameter determines the proportion of the gradient
+ * object that is to be set to the alpha value.
+ *
+ * Alphas are added from the top downwards.
+ *
+ * @param obj The given evas gradient object.
+ * @param aAlpha value.
+ * @param deltaProportion of the gradient object that is this alpha.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI void
-evas_object_gradient_colors_clear(Evas_Object *obj)
+evas_object_gradient_alpha_s
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common/evas_op_mul
Modified Files:
op_mul_color_.c op_mul_color_i386.c op_mul_mask_color_.c
op_mul_mask_color_i386.c op_mul_pixel_.c op_mul_pixel_color_.c
op_mul_pixel_color_i386.c op_mul_pixel_i386.c
op_mul_pixel_mask_.c op_mul_pixel_mask_i386.c
Log Message:
same as previous commit.
===
RCS file:
/cvs/e/e17/libs/evas/src/lib/engines/common/evas_op_mul/op_mul_color_.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- op_mul_color_.c 2 May 2006 07:28:48 - 1.1
+++ op_mul_color_.c 30 Sep 2006 10:18:33 - 1.2
@@ -11,50 +11,19 @@
}
static void
-_op_mul_can_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l){
- DATA32 *e = d + l;
- for (; d < e; d++) {
- *d = (*d & 0xff00) + MUL3_SYM(c, *d);
- }
-}
-
-static void
_op_mul_caa_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
c = 1 + (c >> 24);
for (; d < e; d++) {
- *d = MUL_A_256(c, *d) + (*d & 0x00ff);
+ *d = MUL_256(c, *d);
}
}
-static void
-_op_mul_c_dpan(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
- DATA32 *e = d + l;
- for (; d < e; d++) {
- *d = (c & 0xff00) + MUL3_SYM(c, *d);
- }
-}
+#define _op_mul_can_dp _op_mul_c_dp
-static void
-_op_mul_can_dpan(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l){
- DATA32 *e = d + l;
- for (; d < e; d++) {
- *d = 0xff00 + MUL3_SYM(c, *d);
- }
-}
-
-static void
-_op_mul_caa_dpan(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
- DATA32 *e = d + l;
- c &= 0xff00;
- for (; d < e; d++) {
- *d = c + (*d & 0x00ff);
- }
-}
-
-#define _op_mul_c_dpas _op_mul_c_dp
-#define _op_mul_can_dpas _op_mul_can_dp
-#define _op_mul_caa_dpas _op_mul_caa_dp
+#define _op_mul_c_dpan _op_mul_c_dp
+#define _op_mul_can_dpan _op_mul_can_dp
+#define _op_mul_caa_dpan _op_mul_caa_dp
static void
init_mul_color_span_funcs_c(void)
@@ -66,47 +35,21 @@
op_mul_span_funcs[SP_N][SM_N][SC][DP_AN][CPU_C] = _op_mul_c_dpan;
op_mul_span_funcs[SP_N][SM_N][SC_AN][DP_AN][CPU_C] = _op_mul_can_dpan;
op_mul_span_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_mul_caa_dpan;
-
- op_mul_span_funcs[SP_N][SM_N][SC][DP_AS][CPU_C] = _op_mul_c_dpas;
- op_mul_span_funcs[SP_N][SM_N][SC_AN][DP_AS][CPU_C] = _op_mul_can_dpas;
- op_mul_span_funcs[SP_N][SM_N][SC_AA][DP_AS][CPU_C] = _op_mul_caa_dpas;
}
#endif
#ifdef BUILD_C
static void
_op_mul_pt_c_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- *d = MUL4_SYM(c, *d);
+ *d = MUL4_SYM(c, *d);
}
-static void
-_op_mul_pt_can_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d){
- *d = (*d & 0xff00) + MUL3_SYM(c, *d);
-}
+#define _op_mul_pt_can_dp _op_mul_pt_c_dp
+#define _op_mul_pt_caa_dp _op_mul_pt_c_dp
-static void
-_op_mul_pt_caa_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- *d = MUL_A_SYM(c >> 24, *d) + (*d & 0x00ff);
-}
-
-static void
-_op_mul_pt_c_dpan(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- *d = (c & 0xff00) + MUL3_SYM(c, *d);
-}
-
-static void
-_op_mul_pt_can_dpan(DATA32 s, DATA8 m, DATA32 c, DATA32 *d){
- *d = 0xff00 + MUL3_SYM(c, *d);
-}
-
-static void
-_op_mul_pt_caa_dpan(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- *d = (c & 0xff00) + (*d & 0x00ff);
-}
-
-#define _op_mul_pt_c_dpas _op_mul_pt_c_dp
-#define _op_mul_pt_can_dpas _op_mul_pt_can_dp
-#define _op_mul_pt_caa_dpas _op_mul_pt_caa_dp
+#define _op_mul_pt_c_dpan _op_mul_pt_c_dp
+#define _op_mul_pt_can_dpan _op_mul_pt_can_dp
+#define _op_mul_pt_caa_dpan _op_mul_pt_caa_dp
static void
init_mul_color_pt_funcs_c(void)
@@ -118,10 +61,6 @@
op_mul_pt_funcs[SP_N][SM_N][SC][DP_AN][CPU_C] = _op_mul_pt_c_dpan;
op_mul_pt_funcs[SP_N][SM_N][SC_AN][DP_AN][CPU_C] = _op_mul_pt_can_dpan;
op_mul_pt_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_mul_pt_caa_dpan;
-
- op_mul_pt_funcs[SP_N][SM_N][SC][DP_AS][CPU_C] = _op_mul_pt_c_dpas;
- op_mul_pt_funcs[SP_N][SM_N][SC_AN][DP_AS][CPU_C] = _op_mul_pt_can_dpas;
- op_mul_pt_funcs[SP_N][SM_N][SC_AA][DP_AS][CPU_C] = _op_mul_pt_caa_dpas;
}
#endif
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
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/modules/engines/gl_common
Modified Files:
evas_gl_common.h evas_gl_context.c evas_gl_font.c
evas_gl_gradient.c evas_gl_image.c evas_gl_line.c
evas_gl_polygon.c evas_gl_rectangle.c
Log Message:
same as previous commit.
===
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/gl_common/evas_gl_common.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas_gl_common.h19 Aug 2006 11:58:07 - 1.4
+++ evas_gl_common.h30 Sep 2006 10:18:34 - 1.5
@@ -83,6 +83,8 @@
Evas_List *images;
Evas_List *tex_pool;
+
+ RGBA_Draw_Context *dc;
};
struct _Evas_GL_Texture
@@ -130,6 +132,8 @@
{
RGBA_Gradient *grad;
Evas_GL_Texture *tex;
+ int tw, th;
+ unsigned charchanged : 1;
};
struct _Evas_GL_Font_Texture
@@ -187,27 +191,33 @@
Evas_GL_Polygon *evas_gl_common_poly_point_add(Evas_GL_Polygon *poly, int x,
int y);
Evas_GL_Polygon *evas_gl_common_poly_points_clear(Evas_GL_Polygon *poly);
-Evas_GL_Gradient *evas_gl_common_gradient_color_add(Evas_GL_Gradient *gr, int
r, int g, int b, int a, int distance);
-Evas_GL_Gradient *evas_gl_common_gradient_colors_clear(Evas_GL_Gradient *gr);
-Evas_GL_Gradient *evas_gl_common_gradient_data_set(Evas_GL_Gradient *gr, void
*data, int len, int has_alpha);
-Evas_GL_Gradient *evas_gl_common_gradient_data_unset(Evas_GL_Gradient *gr);
+Evas_GL_Gradient *evas_gl_common_gradient_new(void);
void evas_gl_common_gradient_free(Evas_GL_Gradient *gr);
+void evas_gl_common_gradient_color_stop_add(Evas_GL_Gradient *gr,
int r, int g, int b, int a, int delta);
+void evas_gl_common_gradient_alpha_stop_add(Evas_GL_Gradient *gr,
int a, int delta);
+void evas_gl_common_gradient_color_data_set(Evas_GL_Gradient *gr,
void *data, int len, int has_alpha);
+void evas_gl_common_gradient_alpha_data_set(Evas_GL_Gradient *gr,
void *alpha_data, int len);
+void evas_gl_common_gradient_clear(Evas_GL_Gradient *gr);
void evas_gl_common_gradient_fill_set(Evas_GL_Gradient *gr, int
x, int y, int w, int h);
-void evas_gl_common_gradient_range_offset_set(Evas_GL_Gradient
*gr, float offset);
-void evas_gl_common_gradient_type_set(Evas_GL_Gradient *gr, char
*name);
-void evas_gl_common_gradient_type_params_set(Evas_GL_Gradient
*gr, char *params);
-void *evas_gl_common_gradient_geometry_init(Evas_GL_Gradient *gr,
int spread);
-int evas_gl_common_gradient_alpha_get(Evas_GL_Gradient *gr, int
spread, int op);
-
-void evas_gl_common_gradient_map(RGBA_Draw_Context *dc,
Evas_GL_Gradient *gr, int spread);
+void evas_gl_common_gradient_fill_angle_set(Evas_GL_Gradient *gr,
double angle);
+void evas_gl_common_gradient_fill_spread_set(Evas_GL_Gradient
*gr, int spread);
+void evas_gl_common_gradient_angle_set(Evas_GL_Gradient *gr,
double angle);
+void evas_gl_common_gradient_offset_set(Evas_GL_Gradient *gr,
float offset);
+void evas_gl_common_gradient_direction_set(Evas_GL_Gradient *gr,
int direction);
+void evas_gl_common_gradient_type_set(Evas_GL_Gradient *gr, char
*name, char *params);
+int evas_gl_common_gradient_is_opaque(Evas_GL_Context *gc,
Evas_GL_Gradient *gr, int x, int y, int w, int h);
+int evas_gl_common_gradient_is_visible(Evas_GL_Context *gc,
Evas_GL_Gradient *gr, int x, int y, int w, int h);
+void evas_gl_common_gradient_render_pre(Evas_GL_Context *gc,
Evas_GL_Gradient *gr);
+void evas_gl_common_gradient_render_post(Evas_GL_Gradient *gr);
+void evas_gl_common_gradient_draw(Evas_GL_Context *gc,
Evas_GL_Gradient *gr,
+ int x, int y, int w, int h);
void evas_gl_common_swap_rect(Evas_GL_Context *gc, int x, int y,
int w, int h);
-void evas_gl_common_rect_draw(Evas_GL_Context *gc,
RGBA_Draw_Context *dc, int x, int y, int w, int h);
-void evas_gl_common_image_draw(Evas_GL_Context *gc,
RGBA_Draw_Context *dc, Evas_GL_Image *im, int sx, int sy, int sw, int sh, int
dx, int dy, int dw, int dh, int smooth);
-void evas_gl_common_line_draw(Evas_GL_Context *gc,
RGBA_Draw_Context *dc, int x1, int y1, int x2, int y2);
-void evas_gl_common_poly_draw(Evas_GL_Context *gc,
RGBA_Draw_Context *dc, Evas_GL_Polygon *poly);
-void evas_gl_common_gradient_draw(Evas_GL_Context *gc,
RGBA_Draw_Context *dc, Evas_GL_Gradient *gr, int x, int y, int w, int h, double
angle, int spread);
+void evas_gl_common_rect_draw(Evas_GL_Context *gc, int x, int y,
int w, int h);
+voi
E CVS: libs/evas raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas Dir : e17/libs/evas/src/modules/engines/cairo_x11 Modified Files: evas_engine.c Log Message: same as previous commit. === RCS file: /cvs/e/e17/libs/evas/src/modules/engines/cairo_x11/evas_engine.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- evas_engine.c 6 Sep 2006 07:28:44 - 1.8 +++ evas_engine.c 30 Sep 2006 10:18:34 - 1.9 @@ -21,6 +21,7 @@ static void *eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, int *cx, int *cy, int *cw, int *ch); static void eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int w, int h); static void eng_output_flush(void *data); + static void *eng_context_new(void *data); static void eng_context_free(void *data, void *context); static void eng_context_clip_set(void *data, void *context, int x, int y, int w, int h); @@ -40,24 +41,35 @@ static int eng_context_color_interpolation_get(void *data, void *context); static void eng_context_render_op_set(void *data, void *context, int op); static int eng_context_render_op_get(void *data, void *context); + static void eng_rectangle_draw(void *data, void *context, void *surface, int x, int y, int w, int h); + static void eng_line_draw(void *data, void *context, void *surface, int x1, int y1, int x2, int y2); + static void *eng_polygon_point_add(void *data, void *context, void *polygon, int x, int y); static void *eng_polygon_points_clear(void *data, void *context, void *polygon); static void eng_polygon_draw(void *data, void *context, void *surface, void *polygon); -static void *eng_gradient_color_add(void *data, void *context, void *gradient, int r, int g, int b, int a, int distance); -static void *eng_gradient_colors_clear(void *data, void *context, void *gradient); -static void *eng_gradient_data_set(void *data, void *context, void *gradient, void *map, int len, int has_alpha); -static void *eng_gradient_data_unset(void *data, void *context, void *gradient); + +static void *eng_gradient_new(void *data); static void eng_gradient_free(void *data, void *gradient); +static void eng_gradient_color_stop_add(void *data, void *gradient, int r, int g, int b, int a, int delta); +static void eng_gradient_alpha_stop_add(void *data, void *gradient, int a, int delta); +static void eng_gradient_color_data_set(void *data, void *gradient, void *map, int len, int has_alpha); +static void eng_gradient_alpha_data_set(void *data, void *gradient, void *alpha_map, int len); +static void eng_gradient_clear(void *data, void *gradient); static void eng_gradient_fill_set(void *data, void *gradient, int x, int y, int w, int h); -static void eng_gradient_range_offset_set(void *data, void *gradient, float offset); -static void eng_gradient_type_set(void *data, void *gradient, char *name); -static void eng_gradient_type_params_set(void *data, void *gradient, char *params); -static void *eng_gradient_geometry_init(void *data, void *gradient, int spread); -static int eng_gradient_alpha_get(void *data, void *gradient, int spread, int op); -static void eng_gradient_map(void *data, void *context, void *gradient, int spread); -static void eng_gradient_draw(void *data, void *context, void *surface, void *gradient, int x, int y, int w, int h, double angle, int spread); +static void eng_gradient_fill_angle_set(void *data, void *gradient, double angle); +static void eng_gradient_fill_spread_set(void *data, void *gradient, int spread); +static void eng_gradient_angle_set(void *data, void *gradient, double angle); +static void eng_gradient_offset_set(void *data, void *gradient, float offset); +static void eng_gradient_direction_set(void *data, void *gradient, int direction); +static void eng_gradient_type_set(void *data, void *gradient, char *name, char *params); +static int eng_gradient_is_opaque(void *data, void *context, void *gradient, int x, int y, int w, int h); +static int eng_gradient_is_visible(void *data, void *context, void *gradient, int x, int y, int w, int h); +static void eng_gradient_render_pre(void *data, void *context, void *gradient); +static void eng_gradient_render_post(void *data, void *gradient); +static void eng_gradient_draw(void *data, void *context, void *surface, void *gradient, int x, int y, int w, int h); + static void *eng_image_load(void *data, char *file, char *key, int *error, Evas_Image_Load_Opts *lo); static void *eng_image_new_from_data(void *data, int w, int h, DATA32 *image_data); static void *eng_image_new_from_copied_data(void *data, int w, int h, DATA32 *image_data); @@ -77,6 +89,7 @@ static void eng_image_cache_flush(void *data); static void eng_image_cache_set(void *data, int bytes); static int eng_image_cache_get(void *data); + static void *eng_font_load(void *data, char *name, int size); static vo
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/include
Modified Files:
evas_blend_ops.h evas_common.h evas_private.h
Log Message:
same as previous commit.
===
RCS file: /cvs/e/e17/libs/evas/src/lib/include/evas_blend_ops.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_blend_ops.h2 May 2006 07:28:48 - 1.1
+++ evas_blend_ops.h30 Sep 2006 10:18:33 - 1.2
@@ -39,7 +39,7 @@
#define SC 1
/* color is rgb (ie. 0xffrrggbb) */
#define SC_AN 2
-/* color is 'alpha' (ie. 0xaaff) */
+/* color is 'alpha' (ie. 0x) */
#define SC_AA 3
/* src color flags count */
#define SC_LAST 4
@@ -50,13 +50,8 @@
#define DP 0
/* pixels are rgb (ie. alphas == 255) */
#define DP_AN 1
-/* pixels alpha sparse */
-#define DP_AS 2
/* dst pixels flags count */
-#define DP_LAST 3
-
-/* dst flags count */
-#define DP_LAST 3
+#define DP_LAST 2
/* cpu types flags */
@@ -76,15 +71,8 @@
/* some useful constants */
-extern const DATA32 PIX_WHITE;
-extern const DATA32 PIX_BLACK;
-//extern const DATA32 PIX_HALF;
+extern const DATA32 ALPHA_255;
extern const DATA32 ALPHA_256;
-extern const DATA32 ALPHA_ONE;
-
-extern const DATA16 _evas_const_c1[4];
-
-extern const DATA8 _evas_pow_lut[65536];
/* some useful C macros */
@@ -140,286 +128,6 @@
( (((c0) >> 8) & 0xff) - (((c1) >> 8) & 0xff)) * (a)) \
+ ((c1) & 0xff00)) & 0xff00) )
-#define BLEND_RGB_256(a, c0, c1) \
- ( (((c0) >> 8) & 0xff) - (((c1) >> 8) & 0xff)) * (a)) \
- + ((c1) & 0xff00ff00)) & 0xff00ff00) + \
- (((c0) & 0xff00ff) - ((c1) & 0xff00ff)) * (a)) >> 8) \
- + ((c1) & 0xff00ff)) & 0xff00ff) )
-
-#define BLEND_ARGB_256(a, aa, c0, c1) \
- ( 0xff - (((c1) >> 8) & 0xff)) * (a)) \
- + ((c1) & 0xff00)) & 0xff00) + \
- (((c0) >> 8) & 0xff) - (((c1) >> 8) & 0xff)) * (aa)) \
- + ((c1) & 0xff00)) & 0xff00) + \
- (((c0) & 0xff00ff) - ((c1) & 0xff00ff)) * (aa)) >> 8) \
- + ((c1) & 0xff00ff)) & 0xff00ff) )
-
-#define ADD_REL(s, d, res) \
- { \
- DATA32 rb; \
- int t, g; \
-\
- rb = ((s) & 0xff00ff) + ((d) & 0xff00ff); \
- t = ((rb & 0x) >> 8) - (((d) >> 16) & 0xff00); \
- t = ((t & (~(t >> 8))) & 0xff00) << 8; \
-\
- g = (rb & 0x) - ((d) >> 24); \
- rb -= t + ((g & (~(g >> 8))) & 0xff); \
-\
- g = ((s) & 0xff00) + ((d) & 0xff00); \
- t = g - (((d) >> 16) & 0xff00); \
- g -= ((t & (~(t >> 8))) & 0xff00); \
-\
- res = ((d) & 0xff00) + rb + g; \
- }
-
-#define MUL_ADD_REL_SYM(a, s, d, res) \
- { \
- DATA32 rb; \
- int t, g; \
-\
- rb = (a)*((s) & 0xff00ff)) + 0xff00ff) >> 8) & 0xff00ff) + ((d) &
0xff00ff); \
-\
- t = ((rb & 0x) >> 8) - (((d) >> 16) & 0xff00); \
- t = ((t & (~(t >> 8))) & 0xff00) << 8; \
-\
- g = (rb & 0x) - ((d) >> 24); \
- rb -= t + ((g & (~(g >> 8))) & 0xff); \
-\
- g = (a)*((s) & 0xff00)) + 0xff00) >> 8) & 0xff00) + ((d) & 0xff00);
\
- t = g - (((d) >> 16) & 0xff00); \
- g -= ((t & (~(t >> 8))) & 0xff00); \
-\
- res = ((d) & 0xff00) + rb + g; \
- }
-
-#define MUL_ADD_REL_256(a, s, d, res) \
- { \
- DATA32 rb; \
- int t, g; \
-\
- rb = a)*((s) & 0xff00ff)) >> 8) & 0xff00ff) + ((d) & 0xff00ff); \
- t = ((rb & 0x) >> 8) - (((d) >> 16) & 0xff00); \
- t = ((t & (~(t >> 8))) & 0xff00) << 8; \
-\
- g = (rb & 0x) - ((d) >> 24); \
- rb -= t + ((g & (~(g >> 8))) & 0xff); \
-\
- g = a)*((s) & 0xff00)) >> 8) & 0xff00) + ((d) & 0xff00); \
- t = g - (((d) >> 16) & 0xff00); \
- g -= ((t & (~(t >> 8))) & 0xff00); \
-\
- res = ((d) & 0xff00) + rb + g; \
- }
-
-#define ADD(s, d, res) \
- { \
- DATA32 rb, g; \
-\
- rb = ((s) & 0xff00ff) + ((d) & 0xff00ff); \
- rb = (rb | (0x1000100 - ((rb >> 8) & 0xff00ff))) & 0xff00ff; \
-\
- g = ((s) & 0xff00) + ((d) & 0xff00); \
- res = 0xff00 + rb + ((g | (0x1 - ((g >> 8) & 0xff00))) &
0xff00); \
- }
-
-#define MUL_ADD_SYM(a, s, d, res) \
- { \
- DATA32 rb, g; \
-\
- rb = (a)*((s) & 0xff00ff)) + 0xff00ff) >> 8) & 0xff00ff) + ((d) &
0xff00ff); \
- rb = (rb | (0x1000100 - ((rb >> 8) & 0xff00ff))) & 0xff00ff; \
- g = (a)*((s) & 0xff00)) + 0xff00) >> 8) & 0xff00) + ((d) & 0xff00);
\
- res = 0xff00 + rb + ((g | (0x1 - ((g >> 8) & 0xff00))) &
0xff00); \
- }
-
-#define MUL_ADD_256(a, s, d, res) \
- { \
- DATA32 rb, g; \
-\
- rb = a)*((s) & 0xff00ff)) >> 8) & 0xff00ff) + ((d) & 0xff00ff); \
- rb = (rb | (0x1000100 - ((rb >> 8) & 0xff00ff))) & 0xff00ff; \
- g = a)*((s) & 0xff00)) >> 8) & 0xff00) + ((d) & 0xff00); \
- res = 0xff00 + rb +
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/engines/cairo_common
Modified Files:
evas_cairo_common.h
Log Message:
same as previous commit.
===
RCS file:
/cvs/e/e17/libs/evas/src/modules/engines/cairo_common/evas_cairo_common.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_cairo_common.h 25 Apr 2006 04:00:20 - 1.1
+++ evas_cairo_common.h 30 Sep 2006 10:18:34 - 1.2
@@ -23,7 +23,6 @@
typedef struct _Evas_Cairo_Image Evas_Cairo_Image;
typedef struct _Evas_Cairo_Polygon Evas_Cairo_Polygon;
typedef struct _Evas_Cairo_Polygon_Point Evas_Cairo_Polygon_Point;
-typedef struct _Evas_Cairo_Gradient Evas_Cairo_Gradient;
struct _Evas_Cairo_Context
{
@@ -45,11 +44,6 @@
DATA32 *mulpix;
cairo_surface_t*surface;
cairo_pattern_t*pattern;
-#if 0
- Evas_Cairo_Context *cc;
- chardirty : 1;
- charcached : 1;
-#endif
};
struct _Evas_Cairo_Polygon
@@ -61,109 +55,5 @@
{
int x, y;
};
-
-#if 0
-struct _Evas_Cairo_Context
-{
- unsigned char r, g, b, a;
-
- struct {
- char size : 1;
- char dither : 1;
- char blend : 1;
- char color : 1;
- char texture : 1;
- char clip : 1;
- char buf : 1;
- char other : 1;
- } change;
-
- struct {
- char active : 1;
- int x, y, w, h;
- } clip;
-
- struct {
- int checked : 1;
- int sgis_generate_mipmap : 1;
- int nv_texture_rectangle : 1;
- } ext;
-
- int references;
-
- Evas_List *images;
-};
-
-struct _Evas_Cairo_Image
-{
- Evas_Cairo_Context *cc;
- RGBA_Image *im;
- cairo_surface_t*surf;
- DATA32 *mulpix;
- int references;
- chardirty : 1;
- charcached : 1;
-};
-
-struct _Evas_Cairo_Polygon
-{
- Evas_List *points;
-};
-
-struct _Evas_Cairo_Polygon_Point
-{
- int x, y;
-};
-
-struct _Evas_Cairo_Gradient
-{
- RGBA_Gradient *grad;
-};
-#endif
-
-/*
-Evas_GL_Context *evas_gl_common_context_new(void);
-void evas_gl_common_context_free(Evas_GL_Context *gc);
-void evas_gl_common_context_use(Evas_GL_Context *gc);
-void evas_gl_common_context_resize(Evas_GL_Context *gc, int w,
int h);
-void evas_gl_common_context_color_set(Evas_GL_Context *gc, int r,
int g, int b, int a);
-void evas_gl_common_context_blend_set(Evas_GL_Context *gc, int
blend);
-void evas_gl_common_context_dither_set(Evas_GL_Context *gc, int
dither);
-void evas_gl_common_context_texture_set(Evas_GL_Context *gc,
Evas_GL_Texture *tex, int smooth, int w, int h);
-void evas_gl_common_context_font_texture_set(Evas_GL_Context *gc,
Evas_GL_Font_Texture *ft);
-void evas_gl_common_context_clip_set(Evas_GL_Context *gc, int on,
int x, int y, int w, int h);
-void evas_gl_common_context_read_buf_set(Evas_GL_Context *gc,
GLenum buf);
-void evas_gl_common_context_write_buf_set(Evas_GL_Context *gc,
GLenum buf);
-
-Evas_GL_Texture *evas_gl_common_texture_new(Evas_GL_Context *gc, RGBA_Image
*im, int smooth);
-void evas_gl_common_texture_update(Evas_GL_Texture *tex,
RGBA_Image *im, int smooth);
-void evas_gl_common_texture_free(Evas_GL_Texture *tex);
-void evas_gl_common_texture_mipmaps_build(Evas_GL_Texture *tex,
RGBA_Image *im, int smooth);
-
-Evas_GL_Image*evas_gl_common_image_load(Evas_GL_Context *gc, char *file,
char *key);
-Evas_GL_Image*evas_gl_common_image_new_from_data(Evas_GL_Context *gc, int
w, int h, int *data);
-Evas_GL_Image*evas_gl_common_image_new_from_copied_data(Evas_GL_Context
*gc, int w, int h, int *data);
-Evas_GL_Image*evas_gl_common_image_new(Evas_GL_Context *gc, int w, int h);
-void evas_gl_common_image_free(Evas_GL_Image *im);
-void evas_gl_common_image_dirty(Evas_GL_Image *im);
-
-Evas_GL_Polygon *evas_gl_common_poly_point_add(Evas_GL_Polygon *poly, int x,
int y);
-Evas_GL_Polygon *evas_gl_common_poly_points_clear(Evas_GL_Polygon *poly);
-
-Evas_GL_Gradient *evas_gl_common_gradient_color_add(Evas_GL_Gradient *gr, int
r, int g, int b, int a, int distance);
-Evas_GL_Gradient *evas_gl_common_gradient_colors_clear(Evas_GL_Gradient *gr);
-
-void evas_gl_common_swap_rect(Evas_GL_Context *gc, int x, int y,
int w, int h);
-
-void evas_gl_common_rect_draw(Evas_GL_Context *gc,
RGBA_Draw_Context *dc, int x, int y, int w, int h);
-void evas_gl_common_image_draw(Evas_GL_Context *gc,
RGBA_Draw_Context *dc, Evas_GL_Image *im, int sx, int sy, in
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common/evas_op_sub
Modified Files:
op_sub_color_.c op_sub_mask_color_.c op_sub_pixel_.c
op_sub_pixel_color_.c op_sub_pixel_mask_.c
Log Message:
same as previous commit.
===
RCS file:
/cvs/e/e17/libs/evas/src/lib/engines/common/evas_op_sub/op_sub_color_.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- op_sub_color_.c 2 May 2006 07:28:48 - 1.1
+++ op_sub_color_.c 30 Sep 2006 10:18:33 - 1.2
@@ -3,134 +3,15 @@
#ifdef BUILD_C
static void
-_op_sub_cn_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
- DATA32 *e = d + l;
- while (d < e)
- *d++ = 0x;
-}
-
-static void
-_op_sub_c_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
- DATA32 *e = d + l;
- while (d < e)
- {
- DATA32 caa = 1 + _evas_pow_lut[((c >> 16) & 0xff00) + (*d >> 24)];
- DATA32 daa = 1 + _evas_pow_lut[((*d >> 16) & 0xff00) + (c >> 24)];
- MUL2_SUB_256(caa, daa, c, *d, *d++)
- }
-}
-
-static void
-_op_sub_can_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
- DATA32 *e = d + l;
- while (d < e)
- MUL_SUB_REV_SYM(*d >> 24, *d, c, *d++)
-}
-
-static void
-_op_sub_c_dpan(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
- DATA32 *e = d + l, ca = 1 + (c >> 24);
- c &= 0x00ff;
- c = MUL_256(ca, c);
- while (d < e)
- SUB(c, *d, *d++)
-}
-
-static void
-_op_sub_can_dpan(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
- DATA32 *e = d + l;
- while (d < e)
- SUB(c, *d, *d++)
-}
-
-#define _op_sub_caa_dp _op_sub_c_dp
-
-#define _op_sub_cn_dpan _op_sub_cn_dp
-#define _op_sub_caa_dpan _op_sub_c_dpan
-
-#define _op_sub_c_dpas _op_sub_c_dp
-#define _op_sub_cn_dpas _op_sub_cn_dp
-#define _op_sub_can_dpas _op_sub_can_dp
-#define _op_sub_caa_dpas _op_sub_caa_dp
-
-static void
init_sub_color_span_funcs_c(void)
{
- op_sub_span_funcs[SP_N][SM_N][SC][DP][CPU_C] = _op_sub_c_dp;
- op_sub_span_funcs[SP_N][SM_N][SC_N][DP][CPU_C] = _op_sub_cn_dp;
- op_sub_span_funcs[SP_N][SM_N][SC_AN][DP][CPU_C] = _op_sub_can_dp;
- op_sub_span_funcs[SP_N][SM_N][SC_AA][DP][CPU_C] = _op_sub_caa_dp;
-
- op_sub_span_funcs[SP_N][SM_N][SC][DP_AN][CPU_C] = _op_sub_c_dpan;
- op_sub_span_funcs[SP_N][SM_N][SC_N][DP_AN][CPU_C] = _op_sub_cn_dpan;
- op_sub_span_funcs[SP_N][SM_N][SC_AN][DP_AN][CPU_C] = _op_sub_can_dpan;
- op_sub_span_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_sub_caa_dpan;
-
- op_sub_span_funcs[SP_N][SM_N][SC][DP_AS][CPU_C] = _op_sub_c_dpas;
- op_sub_span_funcs[SP_N][SM_N][SC_N][DP_AS][CPU_C] = _op_sub_cn_dpas;
- op_sub_span_funcs[SP_N][SM_N][SC_AN][DP_AS][CPU_C] = _op_sub_can_dpas;
- op_sub_span_funcs[SP_N][SM_N][SC_AA][DP_AS][CPU_C] = _op_sub_caa_dpas;
}
#endif
#ifdef BUILD_C
static void
-_op_sub_pt_cn_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- *d = 0x;
-}
-
-static void
-_op_sub_pt_c_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- DATA32 caa = 1 + _evas_pow_lut[((c >> 16) & 0xff00) + (*d >> 24)];
- DATA32 daa = 1 + _evas_pow_lut[((*d >> 16) & 0xff00) + (c >> 24)];
- MUL2_SUB_256(caa, daa, c, *d, *d)
-}
-
-static void
-_op_sub_pt_can_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- MUL_SUB_REV_SYM(*d >> 24, *d, c, *d)
-}
-
-static void
-_op_sub_pt_c_dpan(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- s = 1 + (c >> 24);
- c &= 0x00ff;
- c = MUL_256(s, c);
- SUB(c, *d, *d)
-}
-
-static void
-_op_sub_pt_can_dpan(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- SUB(c, *d, *d)
-}
-
-#define _op_sub_pt_caa_dp _op_sub_pt_c_dp
-
-#define _op_sub_pt_cn_dpan _op_sub_pt_cn_dp
-#define _op_sub_pt_caa_dpan _op_sub_pt_c_dpan
-
-#define _op_sub_pt_c_dpas _op_sub_pt_c_dp
-#define _op_sub_pt_cn_dpas _op_sub_pt_cn_dp
-#define _op_sub_pt_can_dpas _op_sub_pt_can_dp
-#define _op_sub_pt_caa_dpas _op_sub_pt_caa_dp
-
-static void
init_sub_color_pt_funcs_c(void)
{
- op_sub_pt_funcs[SP_N][SM_N][SC][DP][CPU_C] = _op_sub_pt_c_dp;
- op_sub_pt_funcs[SP_N][SM_N][SC_N][DP][CPU_C] = _op_sub_pt_cn_dp;
- op_sub_pt_funcs[SP_N][SM_N][SC_AN][DP][CPU_C] = _op_sub_pt_can_dp;
- op_sub_pt_funcs[SP_N][SM_N][SC_AA][DP][CPU_C] = _op_sub_pt_caa_dp;
-
- op_sub_pt_funcs[SP_N][SM_N][SC][DP_AN][CPU_C] = _op_sub_pt_c_dpan;
- op_sub_pt_funcs[SP_N][SM_N][SC_N][DP_AN][CPU_C] = _op_sub_pt_cn_dpan;
- op_sub_pt_funcs[SP_N][SM_N][SC_AN][DP_AN][CPU_C] = _op_sub_pt_can_dpan;
- op_sub_pt_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_sub_pt_caa_dpan;
-
- op_sub_pt_funcs[SP_N][SM_N][SC][DP_AS][CPU_C] = _op_sub_pt_c_dpas;
- op_sub_pt_funcs[SP_N][SM_N][SC_N][DP_AS][CPU_C] = _op_sub_pt_cn_dpas;
- op_sub_pt_funcs[SP_N][SM_N][SC_AN][DP_AS][CPU_C] = _op_sub_pt_can_dpas;
- op_sub_pt_funcs[SP_N][SM_N][SC_AA][DP_AS][CPU_C] = _op_sub_pt_caa_dpas;
}
#endif
@@ -140,10
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common/evas_op_add
Modified Files:
op_add_color_.c op_add_mask_color_.c op_add_pixel_.c
op_add_pixel_color_.c op_add_pixel_mask_.c
Log Message:
same as previous commit.
===
RCS file:
/cvs/e/e17/libs/evas/src/lib/engines/common/evas_op_add/op_add_color_.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- op_add_color_.c 2 May 2006 07:28:47 - 1.1
+++ op_add_color_.c 30 Sep 2006 10:18:32 - 1.2
@@ -3,134 +3,15 @@
#ifdef BUILD_C
static void
-_op_add_cn_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
- DATA32 *e = d + l;
- while (d < e)
- *d++ = 0x;
-}
-
-static void
-_op_add_c_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
- DATA32 *e = d + l;
- while (d < e)
- {
- DATA32 caa = 1 + _evas_pow_lut[((c >> 16) & 0xff00) + (*d >> 24)];
- DATA32 daa = 1 + _evas_pow_lut[((*d >> 16) & 0xff00) + (c >> 24)];
- MUL2_ADD_256(caa, daa, c, *d, *d++)
- }
-}
-
-static void
-_op_add_can_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
- DATA32 *e = d + l;
- while (d < e)
- MUL_ADD_SYM(*d >> 24, *d, c, *d++)
-}
-
-static void
-_op_add_c_dpan(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
- DATA32 *e = d + l, ca = 1 + (c >> 24);
- c &= 0x00ff;
- c = MUL_256(ca, c);
- while (d < e)
- ADD(c, *d, *d++)
-}
-
-static void
-_op_add_can_dpan(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
- DATA32 *e = d + l;
- while (d < e)
- ADD(c, *d, *d++)
-}
-
-#define _op_add_caa_dp _op_add_c_dp
-
-#define _op_add_cn_dpan _op_add_cn_dp
-#define _op_add_caa_dpan _op_add_c_dpan
-
-#define _op_add_c_dpas _op_add_c_dp
-#define _op_add_cn_dpas _op_add_cn_dp
-#define _op_add_can_dpas _op_add_can_dp
-#define _op_add_caa_dpas _op_add_caa_dp
-
-static void
init_add_color_span_funcs_c(void)
{
- op_add_span_funcs[SP_N][SM_N][SC][DP][CPU_C] = _op_add_c_dp;
- op_add_span_funcs[SP_N][SM_N][SC_N][DP][CPU_C] = _op_add_cn_dp;
- op_add_span_funcs[SP_N][SM_N][SC_AN][DP][CPU_C] = _op_add_can_dp;
- op_add_span_funcs[SP_N][SM_N][SC_AA][DP][CPU_C] = _op_add_caa_dp;
-
- op_add_span_funcs[SP_N][SM_N][SC][DP_AN][CPU_C] = _op_add_c_dpan;
- op_add_span_funcs[SP_N][SM_N][SC_N][DP_AN][CPU_C] = _op_add_cn_dpan;
- op_add_span_funcs[SP_N][SM_N][SC_AN][DP_AN][CPU_C] = _op_add_can_dpan;
- op_add_span_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_add_caa_dpan;
-
- op_add_span_funcs[SP_N][SM_N][SC][DP_AS][CPU_C] = _op_add_c_dpas;
- op_add_span_funcs[SP_N][SM_N][SC_N][DP_AS][CPU_C] = _op_add_cn_dpas;
- op_add_span_funcs[SP_N][SM_N][SC_AN][DP_AS][CPU_C] = _op_add_can_dpas;
- op_add_span_funcs[SP_N][SM_N][SC_AA][DP_AS][CPU_C] = _op_add_caa_dpas;
}
#endif
#ifdef BUILD_C
static void
-_op_add_pt_cn_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- *d = 0x;
-}
-
-static void
-_op_add_pt_c_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- DATA32 caa = 1 + _evas_pow_lut[((c >> 16) & 0xff00) + (*d >> 24)];
- DATA32 daa = 1 + _evas_pow_lut[((*d >> 16) & 0xff00) + (c >> 24)];
- MUL2_ADD_256(caa, daa, c, *d, *d)
-}
-
-static void
-_op_add_pt_can_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- MUL_ADD_SYM(*d >> 24, *d, c, *d)
-}
-
-static void
-_op_add_pt_c_dpan(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- s = 1 + (c >> 24);
- c &= 0x00ff;
- c = MUL_256(s, c);
- ADD(c, *d, *d)
-}
-
-static void
-_op_add_pt_can_dpan(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- ADD(c, *d, *d)
-}
-
-#define _op_add_pt_caa_dp _op_add_pt_c_dp
-
-#define _op_add_pt_cn_dpan _op_add_pt_cn_dp
-#define _op_add_pt_caa_dpan _op_add_pt_c_dpan
-
-#define _op_add_pt_c_dpas _op_add_pt_c_dp
-#define _op_add_pt_cn_dpas _op_add_pt_cn_dp
-#define _op_add_pt_can_dpas _op_add_pt_can_dp
-#define _op_add_pt_caa_dpas _op_add_pt_caa_dp
-
-static void
init_add_color_pt_funcs_c(void)
{
- op_add_pt_funcs[SP_N][SM_N][SC][DP][CPU_C] = _op_add_pt_c_dp;
- op_add_pt_funcs[SP_N][SM_N][SC_N][DP][CPU_C] = _op_add_pt_cn_dp;
- op_add_pt_funcs[SP_N][SM_N][SC_AN][DP][CPU_C] = _op_add_pt_can_dp;
- op_add_pt_funcs[SP_N][SM_N][SC_AA][DP][CPU_C] = _op_add_pt_caa_dp;
-
- op_add_pt_funcs[SP_N][SM_N][SC][DP_AN][CPU_C] = _op_add_pt_c_dpan;
- op_add_pt_funcs[SP_N][SM_N][SC_N][DP_AN][CPU_C] = _op_add_pt_cn_dpan;
- op_add_pt_funcs[SP_N][SM_N][SC_AN][DP_AN][CPU_C] = _op_add_pt_can_dpan;
- op_add_pt_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_add_pt_caa_dpan;
-
- op_add_pt_funcs[SP_N][SM_N][SC][DP_AS][CPU_C] = _op_add_pt_c_dpas;
- op_add_pt_funcs[SP_N][SM_N][SC_N][DP_AS][CPU_C] = _op_add_pt_cn_dpas;
- op_add_pt_funcs[SP_N][SM_N][SC_AN][DP_AS][CPU_C] = _op_add_pt_can_dpas;
- op_add_pt_funcs[SP_N][SM_N][SC_AA][DP_AS][CPU_C] = _op_add_pt_caa_dpas;
}
#endif
@@ -140,107 +21,14
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common/evas_op_mask
Modified Files:
op_mask_color_.c op_mask_color_i386.c op_mask_mask_color_.c
op_mask_pixel_.c op_mask_pixel_color_.c op_mask_pixel_i386.c
op_mask_pixel_mask_.c
Log Message:
same as previous commit.
===
RCS file:
/cvs/e/e17/libs/evas/src/lib/engines/common/evas_op_mask/op_mask_color_.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- op_mask_color_.c2 May 2006 07:28:47 - 1.1
+++ op_mask_color_.c30 Sep 2006 10:18:33 - 1.2
@@ -4,98 +4,48 @@
#ifdef BUILD_C
static void
-_op_mask_c_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l)
-{
+_op_mask_c_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
c = 1 + (c >> 24);
for (; d < e; d++) {
- *d = MUL_A_256(c, *d) + (*d & 0x00ff);
+ *d = MUL_256(c, *d);
}
}
-static void
-_op_mask_c_dpan(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l)
-{
- DATA32 *e = d + l;
- c |= 0x00ff;
- for (; d < e; d++) {
- *d &= c;
- }
-}
-
-#define _op_mask_cn_dp NULL
-#define _op_mask_can_dp _op_mask_cn_dp
#define _op_mask_caa_dp _op_mask_c_dp
-#define _op_mask_cn_dpan _op_mask_cn_dp
-#define _op_mask_can_dpan _op_mask_can_dp
-#define _op_mask_caa_dpan _op_mask_c_dpan
-
-#define _op_mask_c_dpas _op_mask_c_dp
-#define _op_mask_cn_dpas _op_mask_cn_dp
-#define _op_mask_can_dpas _op_mask_can_dp
-#define _op_mask_caa_dpas _op_mask_caa_dp
+#define _op_mask_c_dpan _op_mask_c_dp
+#define _op_mask_caa_dpan _op_mask_caa_dp
static void
init_mask_color_span_funcs_c(void)
{
- op_mask_span_funcs[SP_N][SM_N][SC_N][DP][CPU_C] = _op_mask_cn_dp;
op_mask_span_funcs[SP_N][SM_N][SC][DP][CPU_C] = _op_mask_c_dp;
- op_mask_span_funcs[SP_N][SM_N][SC_AN][DP][CPU_C] = _op_mask_can_dp;
op_mask_span_funcs[SP_N][SM_N][SC_AA][DP][CPU_C] = _op_mask_caa_dp;
- op_mask_span_funcs[SP_N][SM_N][SC_N][DP_AN][CPU_C] = _op_mask_cn_dpan;
op_mask_span_funcs[SP_N][SM_N][SC][DP_AN][CPU_C] = _op_mask_c_dpan;
- op_mask_span_funcs[SP_N][SM_N][SC_AN][DP_AN][CPU_C] = _op_mask_can_dpan;
op_mask_span_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_mask_caa_dpan;
-
- op_mask_span_funcs[SP_N][SM_N][SC_N][DP_AS][CPU_C] = _op_mask_cn_dpas;
- op_mask_span_funcs[SP_N][SM_N][SC][DP_AS][CPU_C] = _op_mask_c_dpas;
- op_mask_span_funcs[SP_N][SM_N][SC_AN][DP_AS][CPU_C] = _op_mask_can_dpas;
- op_mask_span_funcs[SP_N][SM_N][SC_AA][DP_AS][CPU_C] = _op_mask_caa_dpas;
}
#endif
#ifdef BUILD_C
static void
_op_mask_pt_c_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- *d = MUL_A_SYM(c >> 24, *d) + (*d & 0x00ff);
-}
-
-static void
-_op_mask_pt_c_dpan(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- *d &= (c | 0x00ff);
+ *d = MUL_SYM(c >> 24, *d);
}
-#define _op_mask_pt_cn_dp NULL
-#define _op_mask_pt_can_dp _op_mask_pt_cn_dp
#define _op_mask_pt_caa_dp _op_mask_pt_c_dp
-#define _op_mask_pt_cn_dpan _op_mask_pt_cn_dp
-#define _op_mask_pt_can_dpan _op_mask_pt_can_dp
-#define _op_mask_pt_caa_dpan _op_mask_pt_c_dpan
-
-#define _op_mask_pt_c_dpas _op_mask_pt_c_dp
-#define _op_mask_pt_cn_dpas _op_mask_pt_cn_dp
-#define _op_mask_pt_can_dpas _op_mask_pt_can_dp
-#define _op_mask_pt_caa_dpas _op_mask_pt_caa_dp
+#define _op_mask_pt_c_dpan _op_mask_pt_c_dp
+#define _op_mask_pt_caa_dpan _op_mask_pt_caa_dp
static void
init_mask_color_pt_funcs_c(void)
{
- op_mask_pt_funcs[SP_N][SM_N][SC_N][DP][CPU_C] = _op_mask_pt_cn_dp;
op_mask_pt_funcs[SP_N][SM_N][SC][DP][CPU_C] = _op_mask_pt_c_dp;
- op_mask_pt_funcs[SP_N][SM_N][SC_AN][DP][CPU_C] = _op_mask_pt_can_dp;
op_mask_pt_funcs[SP_N][SM_N][SC_AA][DP][CPU_C] = _op_mask_pt_caa_dp;
- op_mask_pt_funcs[SP_N][SM_N][SC_N][DP_AN][CPU_C] = _op_mask_pt_cn_dpan;
op_mask_pt_funcs[SP_N][SM_N][SC][DP_AN][CPU_C] = _op_mask_pt_c_dpan;
- op_mask_pt_funcs[SP_N][SM_N][SC_AN][DP_AN][CPU_C] = _op_mask_pt_can_dpan;
op_mask_pt_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_mask_pt_caa_dpan;
-
- op_mask_pt_funcs[SP_N][SM_N][SC_N][DP_AS][CPU_C] = _op_mask_pt_cn_dpas;
- op_mask_pt_funcs[SP_N][SM_N][SC][DP_AS][CPU_C] = _op_mask_pt_c_dpas;
- op_mask_pt_funcs[SP_N][SM_N][SC_AN][DP_AS][CPU_C] = _op_mask_pt_can_dpas;
- op_mask_pt_funcs[SP_N][SM_N][SC_AA][DP_AS][CPU_C] = _op_mask_pt_caa_dpas;
}
#endif
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/bin
Modified Files:
evas_test_main.c
Log Message:
same as previous commit.
===
RCS file: /cvs/e/e17/libs/evas/src/bin/evas_test_main.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- evas_test_main.c17 May 2006 08:04:59 - 1.32
+++ evas_test_main.c30 Sep 2006 10:18:31 - 1.33
@@ -82,25 +82,24 @@
static Evas_Object *p_t[16];
static unsigned int grad_map[128] = {
-0xfe5a7271, 0xfe576f6f, 0xfe566f6f, 0xfe526c6c, 0xfe4f6868, 0xfe4e,
0xfe4d6565, 0xfe4d6665,
-0xfe4d6665, 0xfe4d6665, 0xfe4e6667, 0xfe4d6566, 0xfe4b6363, 0xfe4a6161,
0xfe486060, 0xfe485f60,
-0xfe455d5d, 0xfe445c5d, 0xfe445c5d, 0xfe455d5f, 0xfe496163, 0xfe506969,
0xfe546c6e, 0xfe546c6e,
-0xfe526c6e, 0xfe4b6367, 0xfe455d61, 0xfe425a5e, 0xfe3f575b, 0xfe3c5458,
0xfe3a5256, 0xfe385154,
-0xfe364f52, 0xfe344e51, 0xfe334d50, 0xfe324c4f, 0xfe314b4f, 0xfe334c50,
0xfe344d51, 0xfe344e51,
-0xfe354e51, 0xfe375054, 0xfe395054, 0xfe3c545a, 0xfe3c545a, 0xfe3a5358,
0xfe395358, 0xfe395357,
-0xfe395258, 0xfe395358, 0xfe3a545a, 0xfe3c555a, 0xfe3c555a, 0xfe3a5459,
0xfe3a5459, 0xfe3b545a,
-0xfe3d565c, 0xfe3d575c, 0xfe3c565b, 0xfe3d565b, 0xfe3c565b, 0xfe3b545a,
0xfe395358, 0xfe395358,
-0xfe3a5458, 0xfe3c555a, 0xfe405a5e, 0xfe425b60, 0xfe425b5e, 0xfe425c60,
0xfe455d60, 0xfe486063,
-0xfe4b6366, 0xfe4e6667, 0xfe4f6969, 0xfe546c6c, 0xfe59706e, 0xfe5f7572,
0xfe667b78, 0xfe677d78,
-0xfe798b83, 0xfe8fa095, 0xfe8fa096, 0xfeacbbad, 0xfeb2c1b3, 0xfeb0bfb1,
0xfea6b5a7, 0xfe8d9e92,
-0xfe8a9b92, 0xfe88998f, 0xfe92a298, 0xfe9aaa9f, 0xfe8c9e94, 0xfe7d9189,
0xfe778b84, 0xfe7b8e86,
-0xfe7d8f86, 0xfe728780, 0xfe687e79, 0xfe677c77, 0xfe637974, 0xfe5d736f,
0xfe576f6c, 0xfe576f6c,
-0xfe5a716d, 0xfe576f6c, 0xfe627873, 0xfe6c817a, 0xfe6e837d, 0xfe6b807c,
0xfe667d78, 0xfe5e7672,
-0xfe58716e, 0xfe576f6c, 0xfe546c69, 0xfe526b68, 0xfe4e6966, 0xfe4c6663,
0xfe4b6363, 0xfe4a6363,
-0xfe4b6563, 0xfe4c6664, 0xfe4b6463, 0xfe4d, 0xfe516b69, 0xfe516b6a,
0xfe556f6d, 0xfe5d7573
+0xfe597170, 0xfe566e6e, 0xfe556e6e, 0xfe516b6b, 0xfe4e6767, 0xfe4d6565,
0xfe4c6464, 0xfe4c6564,
+0xfe4c6564, 0xfe4c6564, 0xfe4d6566, 0xfe4c6465, 0xfe4a6262, 0xfe496060,
0xfe475f5f, 0xfe475e5f,
+0xfe445c5c, 0xfe435b5c, 0xfe435b5c, 0xfe445c5e, 0xfe486062, 0xfe4f6868,
0xfe536b6d, 0xfe536b6d,
+0xfe516b6d, 0xfe4a6266, 0xfe445c60, 0xfe41595d, 0xfe3e565a, 0xfe3b5357,
0xfe395155, 0xfe375053,
+0xfe354e51, 0xfe334d50, 0xfe324c4f, 0xfe314b4e, 0xfe304a4e, 0xfe324b4f,
0xfe334c50, 0xfe334d50,
+0xfe344d50, 0xfe364f53, 0xfe384f53, 0xfe3b5359, 0xfe3b5359, 0xfe395257,
0xfe385257, 0xfe385256,
+0xfe385157, 0xfe385257, 0xfe395359, 0xfe3b5459, 0xfe3b5459, 0xfe395358,
0xfe395358, 0xfe3a5359,
+0xfe3c555b, 0xfe3c565b, 0xfe3b555a, 0xfe3c555a, 0xfe3b555a, 0xfe3a5359,
0xfe385257, 0xfe385257,
+0xfe395357, 0xfe3b5459, 0xfe3f595d, 0xfe415a5f, 0xfe415a5d, 0xfe415b5f,
0xfe445c5f, 0xfe475f62,
+0xfe4a6265, 0xfe4d6566, 0xfe4e6868, 0xfe536b6b, 0xfe586f6d, 0xfe5e7471,
0xfe657a77, 0xfe667c77,
+0xfe788a82, 0xfe8e9f94, 0xfe8e9f95, 0xfeabbaac, 0xfeb1c0b2, 0xfeafbeb0,
0xfea5b4a6, 0xfe8c9d91,
+0xfe899a91, 0xfe87988e, 0xfe91a197, 0xfe99a99e, 0xfe8b9d93, 0xfe7c9088,
0xfe768a83, 0xfe7a8d85,
+0xfe7c8e85, 0xfe71867f, 0xfe677d78, 0xfe667b76, 0xfe627873, 0xfe5c726e,
0xfe566e6b, 0xfe566e6b,
+0xfe59706c, 0xfe566e6b, 0xfe617772, 0xfe6b8079, 0xfe6d827c, 0xfe6a7f7b,
0xfe657c77, 0xfe5d7571,
+0xfe57706d, 0xfe566e6b, 0xfe536b68, 0xfe516a67, 0xfe4d6865, 0xfe4b6562,
0xfe4a6262, 0xfe496262,
+0xfe4a6462, 0xfe4b6563, 0xfe4a6362, 0xfe4c6565, 0xfe506a68, 0xfe506a69,
0xfe546e6c, 0xfe5c7472
};
-
void
loop(void)
{
@@ -200,13 +199,13 @@
}
else if (t <= (6.0))
{
+ int a = (int)(255 * (((6.0) - t) / 4.0));
+
evas_object_move(panel, 0, win_h - 240);
evas_object_move(panel_clip, 0, win_h - 240);
evas_object_move(panel_top, 0, win_h - 240 - 10);
evas_object_move(panel_shadow, 0, win_h - 240);
- evas_object_color_set(evas_logo, 255, 255, 255,
- (int)(255 * (((6.0) - t) / 4.0))
- );
+ evas_object_color_set(evas_logo, a, a, a, a);
}
else if (t <= 26.0)
{
@@ -267,9 +266,10 @@
for (i = 0; i < 8; i++)
{
Evas_Object*ob;
+ inta = i * 32;
ob = evas_object_rectangle_add(evas);
- evas_object_color_set(ob, 100 + (i * 16), 255 - (i * 16), i *
64, i * 32);
+ evas_object_color_set(ob, (a * (100 + (i * 16))) / 255 , (a *
(255 - (i * 16))) / 255, (a * i * 64) / 255, a);
evas_object_layer_set(ob, 5);
evas_object_clip_set(ob, panel_clip);
evas_object_show(ob);
@@ -878,7 +878,7 @@
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/engines/buffer
Modified Files:
evas_outbuf.c
Log Message:
same as previous commit.
===
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/buffer/evas_outbuf.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- evas_outbuf.c 31 May 2006 18:33:46 - 1.9
+++ evas_outbuf.c 30 Sep 2006 10:18:33 - 1.10
@@ -81,22 +81,20 @@
{
RGBA_Image *im;
DATA32 *ptr;
- int xx, yy;
if (buf->priv.back_buf)
{
*cx = x; *cy = y; *cw = w; *ch = h;
if (buf->priv.back_buf->flags & RGBA_IMAGE_HAS_ALPHA)
{
-for (yy = 0; yy < h; yy++)
+int ww = w;
+ptr = buf->priv.back_buf->image->data + (y *
buf->priv.back_buf->image->w) + x;
+while (h--)
{
- ptr = buf->priv.back_buf->image->data +
- ((y + yy) * buf->priv.back_buf->image->w) + x;
- for (xx = 0; xx < w; xx++)
- {
- A_VAL(ptr) = 0;
- ptr++;
- }
+ while (w--)
+ *ptr++ = 0;
+ w = ww;
+ ptr += (buf->priv.back_buf->image->w - w);
}
}
return buf->priv.back_buf;
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
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/evas_op_copy
Modified Files:
op_copy_color_.c op_copy_color_i386.c op_copy_mask_color_.c
op_copy_mask_color_i386.c op_copy_pixel_.c
op_copy_pixel_color_.c op_copy_pixel_color_i386.c
op_copy_pixel_i386.c op_copy_pixel_mask_.c
op_copy_pixel_mask_i386.c
Log Message:
same as previous commit.
===
RCS file:
/cvs/e/e17/libs/evas/src/lib/engines/common/evas_op_copy/op_copy_color_.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- op_copy_color_.c2 May 2006 07:28:47 - 1.1
+++ op_copy_color_.c30 Sep 2006 10:18:33 - 1.2
@@ -19,11 +19,6 @@
#define _op_copy_can_dpan _op_copy_c_dp
#define _op_copy_caa_dpan _op_copy_c_dp
-#define _op_copy_c_dpas _op_copy_c_dp
-#define _op_copy_cn_dpas _op_copy_c_dp
-#define _op_copy_can_dpas _op_copy_c_dp
-#define _op_copy_caa_dpas _op_copy_c_dp
-
static void
init_copy_color_span_funcs_c(void)
{
@@ -36,11 +31,6 @@
op_copy_span_funcs[SP_N][SM_N][SC][DP_AN][CPU_C] = _op_copy_c_dpan;
op_copy_span_funcs[SP_N][SM_N][SC_AN][DP_AN][CPU_C] = _op_copy_can_dpan;
op_copy_span_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_copy_caa_dpan;
-
- op_copy_span_funcs[SP_N][SM_N][SC_N][DP_AS][CPU_C] = _op_copy_cn_dpas;
- op_copy_span_funcs[SP_N][SM_N][SC][DP_AS][CPU_C] = _op_copy_c_dpas;
- op_copy_span_funcs[SP_N][SM_N][SC_AN][DP_AS][CPU_C] = _op_copy_can_dpas;
- op_copy_span_funcs[SP_N][SM_N][SC_AA][DP_AS][CPU_C] = _op_copy_caa_dpas;
}
#endif
@@ -59,11 +49,6 @@
#define _op_copy_pt_can_dpan _op_copy_pt_c_dp
#define _op_copy_pt_caa_dpan _op_copy_pt_c_dp
-#define _op_copy_pt_c_dpas _op_copy_pt_c_dp
-#define _op_copy_pt_cn_dpas _op_copy_pt_c_dp
-#define _op_copy_pt_can_dpas _op_copy_pt_c_dp
-#define _op_copy_pt_caa_dpas _op_copy_pt_c_dp
-
static void
init_copy_color_pt_funcs_c(void)
{
@@ -76,11 +61,6 @@
op_copy_pt_funcs[SP_N][SM_N][SC][DP_AN][CPU_C] = _op_copy_pt_c_dpan;
op_copy_pt_funcs[SP_N][SM_N][SC_AN][DP_AN][CPU_C] = _op_copy_pt_can_dpan;
op_copy_pt_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_copy_pt_caa_dpan;
-
- op_copy_pt_funcs[SP_N][SM_N][SC_N][DP_AS][CPU_C] = _op_copy_pt_cn_dpas;
- op_copy_pt_funcs[SP_N][SM_N][SC][DP_AS][CPU_C] = _op_copy_pt_c_dpas;
- op_copy_pt_funcs[SP_N][SM_N][SC_AN][DP_AS][CPU_C] = _op_copy_pt_can_dpas;
- op_copy_pt_funcs[SP_N][SM_N][SC_AA][DP_AS][CPU_C] = _op_copy_pt_caa_dpas;
}
#endif
@@ -91,31 +71,15 @@
#ifdef BUILD_C
static void
_op_copy_rel_c_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
- DATA32 *e = d + l, ca = 1 + (c >> 24);
- c &= 0x00ff;
- for (; d < e; d++) {
- *d = MUL_A_256(ca, *d) + c;
- }
-}
-
-static void
-_op_copy_rel_cn_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
for (; d < e; d++) {
- *d = (*d | 0x00ff);
- }
-}
-
-static void
-_op_copy_rel_can_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
- DATA32 *e = d + l;
- c &= 0x00ff;
- for (; d < e; d++) {
- *d = (*d & 0xff00) + c;
+ *d = MUL_SYM(*d >> 24, c);
}
}
+#define _op_copy_rel_cn_dp _op_copy_rel_c_dp
+#define _op_copy_rel_can_dp _op_copy_rel_c_dp
#define _op_copy_rel_caa_dp _op_copy_rel_c_dp
#define _op_copy_rel_c_dpan _op_copy_c_dp
@@ -123,11 +87,6 @@
#define _op_copy_rel_can_dpan _op_copy_can_dp
#define _op_copy_rel_caa_dpan _op_copy_caa_dp
-#define _op_copy_rel_c_dpas _op_copy_rel_c_dp
-#define _op_copy_rel_cn_dpas _op_copy_rel_cn_dp
-#define _op_copy_rel_can_dpas _op_copy_rel_can_dp
-#define _op_copy_rel_caa_dpas _op_copy_rel_caa_dp
-
static void
init_copy_rel_color_span_funcs_c(void)
{
@@ -140,31 +99,19 @@
op_copy_rel_span_funcs[SP_N][SM_N][SC][DP_AN][CPU_C] = _op_copy_rel_c_dpan;
op_copy_rel_span_funcs[SP_N][SM_N][SC_AN][DP_AN][CPU_C] =
_op_copy_rel_can_dpan;
op_copy_rel_span_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] =
_op_copy_rel_caa_dpan;
-
- op_copy_rel_span_funcs[SP_N][SM_N][SC_N][DP_AS][CPU_C] =
_op_copy_rel_cn_dpas;
- op_copy_rel_span_funcs[SP_N][SM_N][SC][DP_AS][CPU_C] = _op_copy_rel_c_dpas;
- op_copy_rel_span_funcs[SP_N][SM_N][SC_AN][DP_AS][CPU_C] =
_op_copy_rel_can_dpas;
- op_copy_rel_span_funcs[SP_N][SM_N][SC_AA][DP_AS][CPU_C] =
_op_copy_rel_caa_dpas;
}
#endif
#ifdef BUILD_C
static void
_op_copy_rel_pt_c_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- *d = MUL_A_SYM(c, *d) + (c & 0x00ff);
-}
-
-static void
-_op_copy_rel_pt_cn_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- *d = (*d | 0x00ff);
-}
-
-static void
-_op_copy_rel_pt_can_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- *d = (*d & 0xff00) + (c & 0x00ff);
+ s = 1 + (*d >> 24);
+ *d = MUL_256(s, c);
}
+#define _op_copy_rel_pt_cn_dp _op_copy_rel_pt_c_dp
+#define _op_copy_rel_pt_can
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common/evas_op_blend
Modified Files:
op_blend_color_.c op_blend_color_i386.c op_blend_mask_color_.c
op_blend_mask_color_i386.c op_blend_pixel_.c
op_blend_pixel_color_.c op_blend_pixel_color_i386.c
op_blend_pixel_i386.c op_blend_pixel_mask_.c
op_blend_pixel_mask_i386.c
Log Message:
same as previous commit.
===
RCS file:
/cvs/e/e17/libs/evas/src/lib/engines/common/evas_op_blend/op_blend_color_.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- op_blend_color_.c 2 May 2006 07:28:47 - 1.1
+++ op_blend_color_.c 30 Sep 2006 10:18:32 - 1.2
@@ -4,29 +4,16 @@
#ifdef BUILD_C
static void
_op_blend_c_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
- DATA32 *e = d + l, ca = 1 + (c >> 24);
+ DATA32 *e = d + l, a = 256 - (c >> 24);
while (d < e)
- {
- DATA32 da = *d >> 24;
- da = 1 + _evas_pow_lut[((ca - 1) << 8) + da];
- *d++ = BLEND_ARGB_256(ca, da, c, *d);
- }
-}
-
-static void
-_op_blend_c_dpan(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
- DATA32 *e = d + l, ca = 1 + (c >> 24);
- while (d < e)
- *d++ = BLEND_RGB_256(ca, c, *d);
+ *d++ = c + MUL_256(a, *d);
}
#define _op_blend_caa_dp _op_blend_c_dp
+#define _op_blend_c_dpan _op_blend_c_dp
#define _op_blend_caa_dpan _op_blend_c_dpan
-#define _op_blend_c_dpas _op_blend_c_dp
-#define _op_blend_caa_dpas _op_blend_c_dp
-
static void
init_blend_color_span_funcs_c(void)
{
@@ -35,27 +22,19 @@
op_blend_span_funcs[SP_N][SM_N][SC][DP_AN][CPU_C] = _op_blend_c_dpan;
op_blend_span_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_blend_caa_dpan;
-
- op_blend_span_funcs[SP_N][SM_N][SC][DP_AS][CPU_C] = _op_blend_c_dpas;
- op_blend_span_funcs[SP_N][SM_N][SC_AA][DP_AS][CPU_C] = _op_blend_caa_dpas;
}
#endif
#ifdef BUILD_C
static void
_op_blend_pt_c_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- DATA32 da = *d >> 24;
- da = 1 + _evas_pow_lut[((c >> 16) & 0xff00) + da];
- *d = BLEND_ARGB_256(1 + (c >> 24), da, c, *d);
-}
-
-static void
-_op_blend_pt_c_dpan(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
- *d = BLEND_RGB_256(1 + (c >> 24), c, *d);
+ s = 256 - (c >> 24);
+ *d = c + MUL_256(s, *d);
}
#define _op_blend_pt_caa_dp _op_blend_pt_c_dp
+#define _op_blend_pt_c_dpan _op_blend_pt_c_dp
#define _op_blend_pt_caa_dpan _op_blend_pt_c_dpan
#define _op_blend_pt_c_dpas _op_blend_pt_c_dp
@@ -69,9 +48,6 @@
op_blend_pt_funcs[SP_N][SM_N][SC][DP_AN][CPU_C] = _op_blend_pt_c_dpan;
op_blend_pt_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] = _op_blend_pt_caa_dpan;
-
- op_blend_pt_funcs[SP_N][SM_N][SC][DP_AS][CPU_C] = _op_blend_pt_c_dpas;
- op_blend_pt_funcs[SP_N][SM_N][SC_AA][DP_AS][CPU_C] = _op_blend_pt_caa_dpas;
}
#endif
@@ -80,15 +56,19 @@
/* blend_rel color -> dst */
#ifdef BUILD_C
-#define _op_blend_rel_c_dp _op_blend_c_dpan
-#define _op_blend_rel_caa_dp _op_blend_caa_dpan
+static void
+_op_blend_rel_c_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
+ DATA32 *e = d + l;
+ l = 256 - (c >> 24);
+ while (d < e)
+ *d++ = MUL_SYM(*d >> 24, c) + MUL_256(l, *d);
+}
+
+#define _op_blend_rel_caa_dp _op_blend_rel_c_dp
#define _op_blend_rel_c_dpan _op_blend_c_dpan
#define _op_blend_rel_caa_dpan _op_blend_caa_dpan
-#define _op_blend_rel_c_dpas _op_blend_rel_c_dp
-#define _op_blend_rel_caa_dpas _op_blend_rel_caa_dp
-
static void
init_blend_rel_color_span_funcs_c(void)
{
@@ -97,22 +77,21 @@
op_blend_rel_span_funcs[SP_N][SM_N][SC][DP_AN][CPU_C] =
_op_blend_rel_c_dpan;
op_blend_rel_span_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] =
_op_blend_rel_caa_dpan;
-
- op_blend_rel_span_funcs[SP_N][SM_N][SC][DP_AS][CPU_C] =
_op_blend_rel_c_dpas;
- op_blend_rel_span_funcs[SP_N][SM_N][SC_AA][DP_AS][CPU_C] =
_op_blend_rel_caa_dpas;
}
#endif
#ifdef BUILD_C
-#define _op_blend_rel_pt_c_dp _op_blend_pt_c_dpan
-#define _op_blend_rel_pt_caa_dp _op_blend_pt_caa_dpan
+static void
+_op_blend_rel_pt_c_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
+ s = *d >> 24;
+ *d = MUL_SYM(s, c) + MUL_256(256 - (c >> 24), *d);
+}
+
+#define _op_blend_rel_pt_caa_dp _op_blend_rel_pt_c_dp
#define _op_blend_rel_pt_c_dpan _op_blend_pt_c_dpan
#define _op_blend_rel_pt_caa_dpan _op_blend_pt_caa_dpan
-#define _op_blend_rel_pt_c_dpas _op_blend_rel_pt_c_dp
-#define _op_blend_rel_pt_caa_dpas _op_blend_rel_pt_caa_dp
-
static void
init_blend_rel_color_pt_funcs_c(void)
{
@@ -121,8 +100,5 @@
op_blend_rel_pt_funcs[SP_N][SM_N][SC][DP_AN][CPU_C] =
_op_blend_rel_pt_c_dpan;
op_blend_rel_pt_funcs[SP_N][SM_N][SC_AA][DP_AN][CPU_C] =
_op_blend_rel_pt_caa_dpan;
-
- op_blend_rel_pt_funcs[SP_N][SM_N][SC][DP_AS][CPU_C] =
_op_blend_rel_pt_c_dpas;
- op_blend_rel_pt_
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: Makefile.am evas_blend_main.c evas_blit_main.c evas_convert_color.c evas_convert_rgb_24.c evas_convert_rgb_32.c evas_convert_yuv.c evas_draw_main.c evas_gradient_angular.c evas_gradient_linear.c evas_gradient_main.c evas_gradient_radial.c evas_gradient_rectangular.c evas_gradient_sinusoidal.c evas_image_main.c evas_op_blend_main_.c evas_op_copy_main_.c evas_scale_smooth.c evas_scale_smooth_scaler.c evas_scale_smooth_scaler_up.c Added Files: evas_scale_span.c Log Message: same as previous commit. === RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/Makefile.am,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- Makefile.am 2 May 2006 07:28:47 - 1.20 +++ Makefile.am 30 Sep 2006 10:18:32 - 1.21 @@ -51,6 +51,7 @@ evas_scale_main.c \ evas_scale_sample.c \ evas_scale_smooth.c \ +evas_scale_span.c \ evas_tiler.c \ evas_regionbuf.c \ evas_array_hash.c - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/emotion Dir : e17/libs/emotion/src/bin Modified Files: emotion_test_main.c Log Message: same as previous commit. === RCS file: /cvs/e/e17/libs/emotion/src/bin/emotion_test_main.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- emotion_test_main.c 20 Oct 2005 05:05:52 - 1.13 +++ emotion_test_main.c 30 Sep 2006 10:18:31 - 1.14 @@ -392,7 +392,7 @@ Evas_Event_Mouse_Down *e; e = event_info; - evas_object_color_set(obj, 255, 50, 40, 200); + evas_object_color_set(obj, 200, 50, 40, 200); evas_object_raise(obj); } @@ -402,7 +402,7 @@ Evas_Event_Mouse_Up *e; e = event_info; - evas_object_color_set(obj, 255, 255, 255, 100); + evas_object_color_set(obj, 100, 100, 100, 100); } static void @@ -641,7 +641,7 @@ ov = data; edje_object_part_drag_value_get(o, source, &x, &y); spd = 255 * y; - evas_object_color_set(ov, 255, 255, 255, spd); + evas_object_color_set(ov, spd, spd, spd, spd); snprintf(buf, sizeof(buf), "%.0f", spd); edje_object_part_text_set(o, "video_speed_txt", buf); } - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list 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 Log Message: same as previous commit. === RCS file: /cvs/e/e17/libs/evas/src/lib/Evas.h,v retrieving revision 1.91 retrieving revision 1.92 diff -u -3 -r1.91 -r1.92 --- Evas.h 18 Aug 2006 14:45:24 - 1.91 +++ Evas.h 30 Sep 2006 10:18:32 - 1.92 @@ -397,33 +397,42 @@ EAPI void evas_render_updates_free (Evas_List *updates); EAPI void evas_render (Evas *e); +/* rectangle objects */ EAPI Evas_Object *evas_object_rectangle_add (Evas *e); +/* line objects */ EAPI Evas_Object *evas_object_line_add (Evas *e); EAPI void evas_object_line_xy_set (Evas_Object *obj, Evas_Coord x1, Evas_Coord y1, Evas_Coord x2, Evas_Coord y2); EAPI void evas_object_line_xy_get (Evas_Object *obj, Evas_Coord *x1, Evas_Coord *y1, Evas_Coord *x2, Evas_Coord *y2); - EAPI Evas_Object *evas_object_gradient_add (Evas *e); - EAPI void evas_object_gradient_color_add(Evas_Object *obj, int r, int g, int b, int a, int distance); - EAPI void evas_object_gradient_colors_clear (Evas_Object *obj); - EAPI void evas_object_gradient_data_set (Evas_Object *obj, void *data, int len, int alpha); - EAPI void evas_object_gradient_data_unset (Evas_Object *obj); - EAPI void evas_object_gradient_angle_set(Evas_Object *obj, Evas_Angle angle); - EAPI Evas_Angleevas_object_gradient_angle_get(Evas_Object *obj); - EAPI void evas_object_gradient_type_set (Evas_Object *obj, const char *type, const char *instance_params); +/* gradient objects */ + EAPI Evas_Object *evas_object_gradient_add(Evas *e); + EAPI void evas_object_gradient_color_stop_add (Evas_Object *obj, int r, int g, int b, int a, int delta); + EAPI void evas_object_gradient_alpha_stop_add (Evas_Object *obj, int a, int delta); + EAPI void evas_object_gradient_color_data_set (Evas_Object *obj, void *color_data, int len, Evas_Bool has_alpha); + EAPI void evas_object_gradient_alpha_data_set (Evas_Object *obj, void *alpha_data, int len); + EAPI void evas_object_gradient_clear (Evas_Object *obj); + EAPI void evas_object_gradient_type_set (Evas_Object *obj, const char *type, const char *instance_params); EAPI void evas_object_gradient_type_get (Evas_Object *obj, char **type, char **instance_params); EAPI void evas_object_gradient_fill_set (Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h); EAPI void evas_object_gradient_fill_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); - EAPI void evas_object_gradient_range_offset_set (Evas_Object *obj, float offset); - EAPI float evas_object_gradient_range_offset_get (Evas_Object *obj); - EAPI void evas_object_gradient_spread_set (Evas_Object *obj, int -tile_mode); - EAPI int evas_object_gradient_spread_get (Evas_Object *obj); + EAPI void evas_object_gradient_fill_angle_set(Evas_Object *obj, Evas_Angle angle); + EAPI Evas_Angleevas_object_gradient_fill_angle_get(Evas_Object *obj); + EAPI void evas_object_gradient_fill_spread_set (Evas_Object *obj, int tile_mode); + EAPI int evas_object_gradient_fill_spread_get (Evas_Object *obj); + EAPI void evas_object_gradient_angle_set (Evas_Object *obj, Evas_Angle angle); + EAPI Evas_Angleevas_object_gradient_angle_get (Evas_Object *obj); + EAPI void evas_object_gradient_direction_set (Evas_Object *obj, int direction); + EAPI int evas_object_gradient_direction_get (Evas_Object *obj); + EAPI void evas_object_gradient_offset_set(Evas_Object *obj, float offset); + EAPI float evas_object_gradient_offset_get(Evas_Object *obj); +/* polygon objects */ EAPI Evas_Object *evas_object_polygon_add (Evas *e); EAPI void evas_object_polygon_point_add (Evas_Object *obj, Evas_Coord x, Evas_Coord y); EAPI void evas_object_polygon_points_clear (Evas_Object *obj); +/* image objects */ EAPI Evas_Object *evas_object_image_add (Evas *e); EAPI void evas_object_image_file_set(Evas_Object *obj, const char *file, const char *key); EAPI void evas_object_image_file_get(Evas_Object *obj, const char **
E CVS: libs/edje raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_calc.c edje_text.c
Log Message:
same as previous commit.
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- edje_calc.c 25 Sep 2006 23:05:30 - 1.89
+++ edje_calc.c 30 Sep 2006 10:18:31 - 1.90
@@ -1198,7 +1198,11 @@
{
evas_object_move(ep->object, ed->x + p3.x, ed->y + p3.y);
evas_object_resize(ep->object, p3.w, p3.h);
-evas_object_color_set(ep->object, p3.color.r, p3.color.g,
p3.color.b, p3.color.a);
+evas_object_color_set(ep->object,
+ (p3.color.r * p3.color.a) / 255,
+ (p3.color.g * p3.color.a) / 255,
+ (p3.color.b * p3.color.a) / 255,
+ p3.color.a);
if (p3.visible) evas_object_show(ep->object);
else evas_object_hide(ep->object);
}
@@ -1267,7 +1271,11 @@
printf("Error type: EVAS_LOAD_ERROR_UNKNOWN_FORMAT\n");
}
}
-evas_object_color_set(ep->object, p3.color.r, p3.color.g,
p3.color.b, p3.color.a);
+evas_object_color_set(ep->object,
+ (p3.color.r * p3.color.a) / 255,
+ (p3.color.g * p3.color.a) / 255,
+ (p3.color.b * p3.color.a) / 255,
+ p3.color.a);
if (p3.visible) evas_object_show(ep->object);
else evas_object_hide(ep->object);
}
@@ -1285,12 +1293,16 @@
{
evas_object_move(ep->object, ed->x + p3.x, ed->y + p3.y);
evas_object_resize(ep->object, p3.w, p3.h);
-evas_object_color_set(ep->object, p3.color.r, p3.color.g,
p3.color.b, p3.color.a);
+evas_object_color_set(ep->object,
+ (p3.color.r * p3.color.a) / 255,
+ (p3.color.g * p3.color.a) / 255,
+ (p3.color.b * p3.color.a) / 255,
+ p3.color.a);
if (p3.visible) evas_object_show(ep->object);
else evas_object_hide(ep->object);
evas_object_gradient_angle_set(ep->object, p3.fill.angle);
-evas_object_gradient_spread_set(ep->object, p3.fill.spread);
+evas_object_gradient_fill_spread_set(ep->object, p3.fill.spread);
evas_object_gradient_fill_set(ep->object, p3.fill.x, p3.fill.y,
p3.fill.w, p3.fill.h);
if (p3.gradient.type && p3.gradient.type[0])
@@ -1305,11 +1317,15 @@
if (se)
{
// XXX only do this if we NEED to (e.g. gradient changed)
- evas_object_gradient_colors_clear(ep->object);
+ evas_object_gradient_clear(ep->object);
for (l = se->color_list; l; l = l->next)
{
Edje_Spectrum_Color *sc = l->data;
- evas_object_gradient_color_add(ep->object, sc->r,
sc->g, sc->b, sc->a, sc->d);
+ evas_object_gradient_color_stop_add(ep->object,
+ (sc->r * sc->a)
/ 255,
+ (sc->g * sc->a)
/ 255,
+ (sc->b * sc->a)
/ 255,
+ sc->a, sc->d);
}
}
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
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/bin Modified Files: edje_main.c Log Message: same as previous commit. === RCS file: /cvs/e/e17/libs/edje/src/bin/edje_main.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -3 -r1.62 -r1.63 --- edje_main.c 10 Jul 2006 18:55:23 - 1.62 +++ edje_main.c 30 Sep 2006 10:18:31 - 1.63 @@ -491,7 +491,7 @@ snprintf(buf, sizeof(buf), "%s/data/test/images/item_normal.png", e_prefix_data_get()); evas_object_image_file_set(co->bg, buf, NULL); test_setup(co->file, co->part); - evas_object_color_set(co->bg, 255, 255, 255, 128); + evas_object_color_set(co->bg, 128, 128, 128, 128); evas_object_color_set(co->text, 0, 0, 0, 128); evas_object_pass_events_set(co->bg, 1); } @@ -745,7 +745,7 @@ evas_object_show(o); o = evas_object_rectangle_add(evas); - evas_object_color_set(o, 255, 255, 255, 0); + evas_object_color_set(o, 0, 0, 0, 0); evas_object_move(o, xx, yy); evas_object_resize(o, ww, 20); evas_object_show(o); @@ -755,7 +755,7 @@ de->top = o; o = evas_object_rectangle_add(evas); - evas_object_color_set(o, 255, 255, 255, 0); + evas_object_color_set(o, 0, 0, 0, 0); evas_object_move(o, xx, yy + hh - 10); evas_object_resize(o, ww, 10); evas_object_show(o); @@ -765,7 +765,7 @@ de->bottom = o; o = evas_object_rectangle_add(evas); - evas_object_color_set(o, 255, 255, 255, 0); + evas_object_color_set(o, 0, 0, 0, 0); evas_object_move(o, xx, yy + 20); evas_object_resize(o, 10, hh - 20 - 10); evas_object_show(o); @@ -775,7 +775,7 @@ de->left = o; o = evas_object_rectangle_add(evas); - evas_object_color_set(o, 255, 255, 255, 0); + evas_object_color_set(o, 0, 0, 0, 0); evas_object_move(o, xx + ww - 10, yy + 20); evas_object_resize(o, 10, hh - 20 - 10); evas_object_show(o); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list 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_x
Modified Files:
ecore_x.c ecore_x_netwm.c
Log Message:
same as previous commit.
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -3 -r1.115 -r1.116
--- ecore_x.c 29 Sep 2006 04:27:39 - 1.115
+++ ecore_x.c 30 Sep 2006 10:18:31 - 1.116
@@ -1182,13 +1182,14 @@
xci->delay = 0;
for (i = 0; i < (w * h); i++)
{
- int r, g, b, a;
-
- a = (pixels[i] >> 24) & 0xff;
- r = (((pixels[i] >> 16) & 0xff) * a) / 0xff;
- g = (((pixels[i] >> 8 ) & 0xff) * a) / 0xff;
- b = (((pixels[i] ) & 0xff) * a) / 0xff;
- xci->pixels[i] = (a << 24) | (r << 16) | (g << 8) | (b);
+// int r, g, b, a;
+//
+// a = (pixels[i] >> 24) & 0xff;
+// r = (((pixels[i] >> 16) & 0xff) * a) / 0xff;
+// g = (((pixels[i] >> 8 ) & 0xff) * a) / 0xff;
+// b = (((pixels[i] ) & 0xff) * a) / 0xff;
+ xci->pixels[i] = pixels[i];
+// (a << 24) | (r << 16) | (g << 8) | (b);
}
c = XcursorImageLoadCursor(_ecore_x_disp, xci);
XcursorImageDestroy(xci);
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
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/src/modules/dropshadow
Modified Files:
e_mod_main.c module.edj
Removed Files:
module.eap
Log Message:
1. jose's premul patches for evas
2. fixes to patches to re-enable smooth scale again
3. fixes to make txtblock colors work
4. fixes to edje for premul + grad api changes
5. fixes to ecore to work in premul space
6. fixes to e17 for premul space
7. fixes to emotion for premul
8. rebuild of .edj files as premul requires themes to be rebuilt
9. removed unused fils from cvs (eap and old img files)
===
RCS file: /cvs/e/e17/apps/e/src/modules/dropshadow/e_mod_main.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- e_mod_main.c2 Jul 2006 18:55:32 - 1.44
+++ e_mod_main.c30 Sep 2006 10:16:24 - 1.45
@@ -379,7 +379,7 @@
evas_object_move(sh->object[i], 0, 0);
evas_object_resize(sh->object[i], 0, 0);
evas_object_color_set(sh->object[i],
- 255, 255, 255,
+ 0, 0, 0,
255 * sh->ds->conf->shadow_darkness);
if (sh->visible)
evas_object_show(sh->object[i]);
@@ -412,7 +412,7 @@
evas_object_move(o, r->x, r->y);
evas_object_resize(o, r->w, r->h);
evas_object_color_set(o,
- 255, 255, 255,
+ 0, 0, 0,
255 * sh->ds->conf->shadow_darkness);
if (sh->visible)
evas_object_show(o);
@@ -1055,7 +1055,7 @@
so = ll->data;
evas_object_color_set(so->obj,
- 255, 255, 255,
+ 0, 0, 0,
255 * ds->conf->shadow_darkness);
}
}
@@ -1063,7 +1063,7 @@
{
for (i = 0; i < 4; i++)
evas_object_color_set(sh->object[i],
-255, 255, 255,
+0, 0, 0,
255 * ds->conf->shadow_darkness);
}
}
===
RCS file: /cvs/e/e17/apps/e/src/modules/dropshadow/module.edj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvs03Syvu and /tmp/cvsw0O0Tm differ
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
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/src/bin
Modified Files:
e_apps.c e_border.c e_editable.c e_fwin.c e_spectrum.c
e_widget_color_well.c e_widget_cslider.c e_zone.c
Log Message:
1. jose's premul patches for evas
2. fixes to patches to re-enable smooth scale again
3. fixes to make txtblock colors work
4. fixes to edje for premul + grad api changes
5. fixes to ecore to work in premul space
6. fixes to e17 for premul space
7. fixes to emotion for premul
8. rebuild of .edj files as premul requires themes to be rebuilt
9. removed unused fils from cvs (eap and old img files)
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -3 -r1.207 -r1.208
--- e_apps.c30 Sep 2006 09:09:18 - 1.207
+++ e_apps.c30 Sep 2006 10:16:23 - 1.208
@@ -2171,7 +2171,7 @@
* and so u have a nasty dangling pointer to garbage memory
*/
if (_e_apps_all)
- _e_apps_all->subapps = evas_list_remove_list(_e_apps_all->subapps, a);
+ _e_apps_all->subapps = evas_list_remove(_e_apps_all->subapps, a);
/* END FIXME */
while (evas_list_find(_e_apps_start_pending, a))
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.547
retrieving revision 1.548
diff -u -3 -r1.547 -r1.548
--- e_border.c 23 Sep 2006 08:39:41 - 1.547
+++ e_border.c 30 Sep 2006 10:16:23 - 1.548
@@ -5753,6 +5753,22 @@
bd->placed = 1;
}
+ /* always remember internal windows - config */
+ if ((bd->internal) && (!bd->remember) && (1)) /* FIXME: config value */
+ {
+E_Remember *rem;
+
+rem = e_remember_new();
+if (rem)
+ {
+ rem->match = E_REMEMBER_MATCH_NAME | E_REMEMBER_MATCH_CLASS |
E_REMEMBER_MATCH_ROLE | E_REMEMBER_MATCH_TYPE | E_REMEMBER_MATCH_TRANSIENT;
+ rem->apply = E_REMEMBER_APPLY_POS | E_REMEMBER_APPLY_SIZE |
E_REMEMBER_APPLY_BORDER;
+ bd->remember = rem;
+ e_remember_use(rem);
+ e_remember_update(rem, bd);
+ }
+ }
+
if (bd->internal_ecore_evas)
ecore_evas_managed_move(bd->internal_ecore_evas,
bd->x + bd->fx.x + bd->client_inset.l,
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_editable.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- e_editable.c21 Sep 2006 19:53:38 - 1.15
+++ e_editable.c30 Sep 2006 10:16:23 - 1.16
@@ -1144,7 +1144,7 @@
evas_object_smart_member_add(sd->clip_object, object);
sd->event_object = evas_object_rectangle_add(evas);
- evas_object_color_set(sd->event_object, 255, 255, 255, 0);
+ evas_object_color_set(sd->event_object, 0, 0, 0, 0);
evas_object_clip_set(sd->event_object, sd->clip_object);
evas_object_move(sd->event_object, ox, oy);
evas_object_smart_member_add(sd->event_object, object);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fwin.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_fwin.c29 Sep 2006 06:49:35 - 1.1
+++ e_fwin.c30 Sep 2006 10:16:23 - 1.2
@@ -35,7 +35,7 @@
e_fwin_new(E_Container *con, const char *dev, const char *path)
{
E_Fwin *fwin;
- char buf[4096];
+ char buf[4096], *file;
Evas_Object *o;
E_Fm2_Config fmc;
@@ -53,11 +53,10 @@
fwin->win->data = fwin;
/* fm issues: */
- /* FIXME: need a way of going to parent dir */
- /* FIXME: need to handle change-in-place and new window per dir */
- /* FIXME: drop on file on another dir doesnt do drop all */
- /* FIXME: on shift-click then drag - don't deselect */
- /* FIXME: drag multiple files doesnt work */
+ /* FIXME: need a way of going to parent dir (menu extn.) */
+ /* FIXME: bug: drop on file on another dir doesnt do drop all */
+ /* FIXME: bug: on shift-click then drag - don't deselect */
+ /* FIXME: bug: drag multiple files doesnt work */
/* FIXME: temporary - a white bg until we have a proper fm specific
* scrollframe etc.
@@ -71,7 +70,7 @@
fwin->fm_obj = o;
memset(&fmc, 0, sizeof(E_Fm2_Config));
fmc.view.mode = E_FM2_VIEW_MODE_LIST;
- fmc.view.open_dirs_in_place = 1;
+ fmc.view.open_dirs_in_place = 0;
fmc.view.selector = 0;
fmc.view.single_click = 0;
fmc.view.no_subdir_jump = 0;
@@ -109,13 +108,14 @@
e_widget_focus_set(fwin->scrollframe_obj, 1);
- if (dev)
- snprintf(buf, sizeof(buf), "_fwin::/%s/::/%s", dev, path);
- else
- snprintf(buf, sizeof(buf), "_fwin:/%s", path)
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/start Modified Files: module.edj Removed Files: module.eap Log Message: 1. jose's premul patches for evas 2. fixes to patches to re-enable smooth scale again 3. fixes to make txtblock colors work 4. fixes to edje for premul + grad api changes 5. fixes to ecore to work in premul space 6. fixes to e17 for premul space 7. fixes to emotion for premul 8. rebuild of .edj files as premul requires themes to be rebuilt 9. removed unused fils from cvs (eap and old img files) === RCS file: /cvs/e/e17/apps/e/src/modules/start/module.edj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsBa1wv0 and /tmp/cvsYXC1LT differ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list 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/src/modules/pager Modified Files: module.edj Removed Files: module.eap Log Message: 1. jose's premul patches for evas 2. fixes to patches to re-enable smooth scale again 3. fixes to make txtblock colors work 4. fixes to edje for premul + grad api changes 5. fixes to ecore to work in premul space 6. fixes to e17 for premul space 7. fixes to emotion for premul 8. rebuild of .edj files as premul requires themes to be rebuilt 9. removed unused fils from cvs (eap and old img files) === RCS file: /cvs/e/e17/apps/e/src/modules/pager/module.edj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsz86KdU and /tmp/cvssNJhgN differ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list 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/src/modules/ibar Modified Files: module.edj Removed Files: module.eap Log Message: 1. jose's premul patches for evas 2. fixes to patches to re-enable smooth scale again 3. fixes to make txtblock colors work 4. fixes to edje for premul + grad api changes 5. fixes to ecore to work in premul space 6. fixes to e17 for premul space 7. fixes to emotion for premul 8. rebuild of .edj files as premul requires themes to be rebuilt 9. removed unused fils from cvs (eap and old img files) === RCS file: /cvs/e/e17/apps/e/src/modules/ibar/module.edj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsXvN60D and /tmp/cvssdeEEw differ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list 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/src/modules/ibox Modified Files: module.edj Removed Files: module.eap Log Message: 1. jose's premul patches for evas 2. fixes to patches to re-enable smooth scale again 3. fixes to make txtblock colors work 4. fixes to edje for premul + grad api changes 5. fixes to ecore to work in premul space 6. fixes to e17 for premul space 7. fixes to emotion for premul 8. rebuild of .edj files as premul requires themes to be rebuilt 9. removed unused fils from cvs (eap and old img files) === RCS file: /cvs/e/e17/apps/e/src/modules/ibox/module.edj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsaYfoeL and /tmp/cvsUWUb3D differ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list 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/src/modules/cpufreq Modified Files: module.edj Removed Files: module.eap Log Message: 1. jose's premul patches for evas 2. fixes to patches to re-enable smooth scale again 3. fixes to make txtblock colors work 4. fixes to edje for premul + grad api changes 5. fixes to ecore to work in premul space 6. fixes to e17 for premul space 7. fixes to emotion for premul 8. rebuild of .edj files as premul requires themes to be rebuilt 9. removed unused fils from cvs (eap and old img files) === RCS file: /cvs/e/e17/apps/e/src/modules/cpufreq/module.edj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvscQtILh and /tmp/cvse1KuQ9 differ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list 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/src/modules/clock Modified Files: module.edj Removed Files: module.eap Log Message: 1. jose's premul patches for evas 2. fixes to patches to re-enable smooth scale again 3. fixes to make txtblock colors work 4. fixes to edje for premul + grad api changes 5. fixes to ecore to work in premul space 6. fixes to e17 for premul space 7. fixes to emotion for premul 8. rebuild of .edj files as premul requires themes to be rebuilt 9. removed unused fils from cvs (eap and old img files) === RCS file: /cvs/e/e17/apps/e/src/modules/clock/module.edj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsXmbtDc and /tmp/cvskR2YD4 differ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list 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/src/modules/battery Modified Files: module.edj Removed Files: module.eap Log Message: 1. jose's premul patches for evas 2. fixes to patches to re-enable smooth scale again 3. fixes to make txtblock colors work 4. fixes to edje for premul + grad api changes 5. fixes to ecore to work in premul space 6. fixes to e17 for premul space 7. fixes to emotion for premul 8. rebuild of .edj files as premul requires themes to be rebuilt 9. removed unused fils from cvs (eap and old img files) === RCS file: /cvs/e/e17/apps/e/src/modules/battery/module.edj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsJibJpb and /tmp/cvsNjTG62 differ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list 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/data/backgrounds Modified Files: Blue_Sky_Tree.edj Cracked_Earth.edj Ivy_Wall.edj Ladybug.edj Log Message: 1. jose's premul patches for evas 2. fixes to patches to re-enable smooth scale again 3. fixes to make txtblock colors work 4. fixes to edje for premul + grad api changes 5. fixes to ecore to work in premul space 6. fixes to e17 for premul space 7. fixes to emotion for premul 8. rebuild of .edj files as premul requires themes to be rebuilt 9. removed unused fils from cvs (eap and old img files) === RCS file: /cvs/e/e17/apps/e/data/backgrounds/Blue_Sky_Tree.edj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 Binary files /tmp/cvsEzfzZj and /tmp/cvsRSvlsa differ === RCS file: /cvs/e/e17/apps/e/data/backgrounds/Cracked_Earth.edj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 Binary files /tmp/cvsR4paWo and /tmp/cvsdC5hCf differ === RCS file: /cvs/e/e17/apps/e/data/backgrounds/Ivy_Wall.edj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 Binary files /tmp/cvsDeLNoB and /tmp/cvsnlnfjs differ === RCS file: /cvs/e/e17/apps/e/data/backgrounds/Ladybug.edj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 Binary files /tmp/cvszigR6H and /tmp/cvsBhwF8y differ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list 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/data/images Modified Files: Makefile.am test.edj Removed Files: button_in.png button_out.png e.png error_bg.png Log Message: 1. jose's premul patches for evas 2. fixes to patches to re-enable smooth scale again 3. fixes to make txtblock colors work 4. fixes to edje for premul + grad api changes 5. fixes to ecore to work in premul space 6. fixes to e17 for premul space 7. fixes to emotion for premul 8. rebuild of .edj files as premul requires themes to be rebuilt 9. removed unused fils from cvs (eap and old img files) === RCS file: /cvs/e/e17/apps/e/data/images/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Makefile.am 23 Jan 2006 15:52:47 - 1.4 +++ Makefile.am 30 Sep 2006 10:16:23 - 1.5 @@ -1,10 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in filesdir = $(datadir)/enlightenment/data/images files_DATA = \ -button_in.png \ -button_out.png \ -e.png \ -error_bg.png \ test.png \ test.jpg \ test.edj === RCS file: /cvs/e/e17/apps/e/data/images/test.edj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 Binary files /tmp/cvsJoFEnC and /tmp/cvsB1nRat differ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list 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/src/modules/temperature Modified Files: module.edj Removed Files: module.eap Log Message: 1. jose's premul patches for evas 2. fixes to patches to re-enable smooth scale again 3. fixes to make txtblock colors work 4. fixes to edje for premul + grad api changes 5. fixes to ecore to work in premul space 6. fixes to e17 for premul space 7. fixes to emotion for premul 8. rebuild of .edj files as premul requires themes to be rebuilt 9. removed unused fils from cvs (eap and old img files) === RCS file: /cvs/e/e17/apps/e/src/modules/temperature/module.edj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvs2u8WAb and /tmp/cvsPFy5Hb differ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e kaethorn
Enlightenment CVS committal
Author : kaethorn
Project : e17
Module : apps/e
Dir : e17/apps/e/debian
Modified Files:
rules
Log Message:
setuid root freqset. Thanks David.
===
RCS file: /cvs/e/e17/apps/e/debian/rules,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- rules 3 Sep 2006 18:58:31 - 1.13
+++ rules 30 Sep 2006 09:18:56 - 1.14
@@ -1,5 +1,4 @@
#!/usr/bin/make -f
-# Rewrote debian/rules to use cdbs.
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
@@ -9,6 +8,7 @@
install/enlightenment::
mkdir debian/enlightenment/etc
mv debian/tmp/usr/etc/enlightenment debian/enlightenment/etc/
+ find debian/tmp/usr/lib/enlightenment/modules/cpufreq/ -name 'freqset'
-exec chmod 4755 {} \;
clean::
if [ -f $(CURDIR)/../../snapshot ]; then ./autogen.sh --prefix=/usr; fi
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e manowarrior
Enlightenment CVS committal Author : manowarrior Project : e17 Module : apps/e Dir : e17/apps/e/data/themes/images Modified Files: e17_icon_e_exit.png e17_icon_e_reset.png e17_icon_logout.png Log Message: Restart, Exit and Logout icons. Just like raster's old ones, but better, imho. I did a lot of variants of theese and seems that this is the best solution. If someone have better idea, share it witht me ;) === RCS file: /cvs/e/e17/apps/e/data/themes/images/e17_icon_e_exit.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsMIETac and /tmp/cvst2Tpaz differ === RCS file: /cvs/e/e17/apps/e/data/themes/images/e17_icon_e_reset.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsgtnfyd and /tmp/cvsRKp9zA differ === RCS file: /cvs/e/e17/apps/e/data/themes/images/e17_icon_logout.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsYeea1g and /tmp/cvsRM5C4D differ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list 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/src/bin
Modified Files:
e_apps.c
Log Message:
hunting a nasty bug - FIXME in there with comments. this fixes it so e starts
anyway
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -3 -r1.206 -r1.207
--- e_apps.c30 Sep 2006 07:46:55 - 1.206
+++ e_apps.c30 Sep 2006 09:09:18 - 1.207
@@ -146,15 +146,15 @@
if (_e_apps_all_filenames)
{
const char *file;
-
+
while ((file = ecore_list_next(_e_apps_all_filenames)))
{
E_App *app;
-
- snprintf(buf, PATH_MAX, "%s/%s", _e_apps_path_all, file);
+
+ snprintf(buf, sizeof(buf), "%s/%s", _e_apps_path_all, file);
app = e_app_empty_new(buf);
if ((app) && (app->path))
-_e_apps_every_app = evas_hash_direct_add(_e_apps_every_app,
app->path, app);
+ _e_apps_every_app = evas_hash_direct_add(_e_apps_every_app,
app->path, app);
}
ecore_list_destroy(_e_apps_all_filenames);
}
@@ -218,6 +218,7 @@
if (!a->filled)
{
e_app_fields_fill(a, a->path);
+ if (!a->filled) return 1;
idler->all_done = 0;
return 0;
}
@@ -327,99 +328,100 @@
/* Is it a virtual path from inside a .order file? */
if ((!a) && (!ecore_file_exists(path)))
{
- snprintf(buf, sizeof(buf), "%s/%s", _e_apps_path_all,
ecore_file_get_file(path));
- if (ecore_file_exists(path))
- {
- path = buf;
- a = e_app_path_find(path);
- }
+ snprintf(buf, sizeof(buf), "%s/%s", _e_apps_path_all,
ecore_file_get_file(path));
+ if (ecore_file_exists(path))
+ {
+path = buf;
+a = e_app_path_find(path);
+ }
}
/* Check if the cache is still valid. */
if (a)
- {
- if (stat(a->path, &st) >= 0)
- {
- stated = 1;
- if (st.st_mtime > a->mtime)
- e_app_fields_empty(a);
- }
- e_object_ref(E_OBJECT(a));
- }
-
+ {
+ if (stat(a->path, &st) >= 0)
+ {
+stated = 1;
+if (st.st_mtime > a->mtime)
+ e_app_fields_empty(a);
+ }
+ e_object_ref(E_OBJECT(a));
+ }
+
if ((!a) && (ecore_file_exists(path)))
{
/* Create it and add it to the cache. */
a = e_app_empty_new(path);
if (a)
- _e_apps_every_app = evas_hash_direct_add(_e_apps_every_app,
a->path, a);
+ _e_apps_every_app = evas_hash_direct_add(_e_apps_every_app, a->path,
a);
}
if ((a) && (a->path))
- {
- if (ecore_file_is_dir(a->path))
- {
- if (!a->filled)
-{
- snprintf(buf, sizeof(buf), "%s/.directory.eap", path);
- if (ecore_file_exists(buf))
- e_app_fields_fill(a, buf);
- else
- {
-a->name =
evas_stringshare_add(ecore_file_get_file(a->path));
-a->filled = 1;
- }
-}
- if (scan_subdirs)
- {
-if (stated)
- _e_app_subdir_rescan(a);
-else
- e_app_subdir_scan(a, scan_subdirs);
- }
-
- /* Don't monitor the all directory, all changes to that must go
through e_app. */
- if ((!stated) && (strcmp(_e_apps_path_all, a->path) != 0))
- a->monitor = ecore_file_monitor_add(a->path,
_e_app_cb_monitor, a);
- }
-else if (_e_app_is_eapp(a->path))
- {
- if (!a->filled)
- e_app_fields_fill(a, a->path);
-_e_apps_hash_cb_init(_e_apps_every_app, a->path, a, NULL);
-
+ {
+ if (ecore_file_is_dir(a->path))
+ {
+if (!a->filled)
+ {
+ snprintf(buf, sizeof(buf), "%s/.directory.eap", path);
+ if (ecore_file_exists(buf))
+ e_app_fields_fill(a, buf);
+ else
+ {
+ a->name =
evas_stringshare_add(ecore_file_get_file(a->path));
+ a->filled = 1;
+ }
+ }
+if (!a->filled) goto error;
+if (scan_subdirs)
+ {
+ if (stated)
+ _e_app_subdir_rescan(a);
+ else
+ e_app_subdir_scan(a, scan_subdirs);
+ }
+
+/* Don't monitor the all directory, all changes to that must go
thr
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: ASPARA! === RCS file: /cvs/e/e17/libs/imlib2_loaders/configure.in,v retrieving revision 1.44 retrieving revision 1.45 diff -u -3 -r1.44 -r1.45 --- configure.in11 Jun 2006 10:23:48 - 1.44 +++ configure.in30 Sep 2006 08:22:12 - 1.45 @@ -5,7 +5,7 @@ AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_ISC_POSIX -AM_INIT_AUTOMAKE(imlib2_loaders, 1.2.2.001) +AM_INIT_AUTOMAKE(imlib2_loaders, 1.3.0) AM_CONFIG_HEADER(config.h) AC_C_BIGENDIAN - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list 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: asparagus - forgot to commit === RCS file: /cvs/e/e17/libs/imlib2/configure.in,v retrieving revision 1.131 retrieving revision 1.132 diff -u -3 -r1.131 -r1.132 --- configure.in2 Sep 2006 11:08:57 - 1.131 +++ configure.in30 Sep 2006 08:15:32 - 1.132 @@ -5,7 +5,7 @@ AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_ISC_POSIX -AM_INIT_AUTOMAKE(imlib2, 1.2.2.001) +AM_INIT_AUTOMAKE(imlib2, 1.3.0) AM_CONFIG_HEADER(config.h) AC_C_BIGENDIAN - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
