E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibar
Modified Files:
e_mod_main.c
Log Message:
start of some shelf config - START only... deal with it. debugging printfs
galore.
===
RCS file: /cvs/e/e17/apps/e/src/modules/ibar/e_mod_main.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -3 -r1.112 -r1.113
--- e_mod_main.c21 Apr 2006 15:54:11 - 1.112
+++ e_mod_main.c23 Apr 2006 06:56:22 - 1.113
@@ -184,7 +184,8 @@
case E_GADCON_ORIENT_CORNER_TR:
case E_GADCON_ORIENT_CORNER_BL:
case E_GADCON_ORIENT_CORNER_BR:
- e_gadcon_client_aspect_set(gcc, evas_list_count(inst->ibar->icons), 1);
+ _ibar_orient_set(inst->ibar, 1);
+ e_gadcon_client_aspect_set(gcc, evas_list_count(inst->ibar->icons) *
16, 16);
break;
case E_GADCON_ORIENT_VERT:
case E_GADCON_ORIENT_LEFT:
@@ -193,13 +194,14 @@
case E_GADCON_ORIENT_CORNER_RT:
case E_GADCON_ORIENT_CORNER_LB:
case E_GADCON_ORIENT_CORNER_RB:
- e_gadcon_client_aspect_set(gcc, 1, evas_list_count(inst->ibar->icons));
+ _ibar_orient_set(inst->ibar, 0);
+ e_gadcon_client_aspect_set(gcc, 16, evas_list_count(inst->ibar->icons)
* 16);
break;
default:
break;
}
if (evas_list_count(inst->ibar->icons) < 1)
- e_gadcon_client_aspect_set(gcc, 1, 1);
+ e_gadcon_client_aspect_set(gcc, 16, 16);
e_gadcon_client_min_size_set(gcc, 16, 16);
}
/**/
@@ -294,11 +296,13 @@
Evas_Coord w, h;
evas_object_geometry_get(b->o_box, NULL, NULL, &w, &h);
+ printf("BOX %ix%i\n", w, h);
if (e_box_orientation_get(b->o_box))
w = h;
else
h = w;
e_box_freeze(b->o_box);
+ printf("RESIZNE %i %i\n", w, h);
for (l = b->icons; l; l = l->next)
{
ic = l->data;
---
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
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:
Makefile.am e_gadcon.c e_includes.h e_int_border_border.c
e_shelf.c e_shelf.h
Added Files:
e_int_shelf_config.c e_int_shelf_config.h
Log Message:
start of some shelf config - START only... deal with it. debugging printfs
galore.
===
RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -3 -r1.117 -r1.118
--- Makefile.am 9 Apr 2006 11:55:18 - 1.117
+++ Makefile.am 23 Apr 2006 06:56:22 - 1.118
@@ -151,7 +151,8 @@
e_gadcon.h \
e_shelf.h \
e_widget_preview.h \
-e_int_config_paths.h
+e_int_config_paths.h \
+e_int_shelf_config.h
enlightenment_src = \
e_user.c \
@@ -284,6 +285,7 @@
e_shelf.c \
e_widget_preview.c \
e_int_config_paths.c \
+e_int_shelf_config.c \
$(ENLIGHTENMENTHEADERS)
enlightenment_SOURCES = \
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e_gadcon.c 20 Apr 2006 14:59:53 - 1.19
+++ e_gadcon.c 23 Apr 2006 06:56:22 - 1.20
@@ -319,43 +319,46 @@
e_gadcon_orient(E_Gadcon *gc, E_Gadcon_Orient orient)
{
Evas_List *l;
+ int horiz = 0;
E_OBJECT_CHECK(gc);
E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE);
if (gc->orient == orient) return;
gc->orient = orient;
e_gadcon_layout_freeze(gc->o_container);
+ switch (gc->orient)
+ {
+ case E_GADCON_ORIENT_FLOAT:
+ case E_GADCON_ORIENT_HORIZ:
+ case E_GADCON_ORIENT_TOP:
+ case E_GADCON_ORIENT_BOTTOM:
+ case E_GADCON_ORIENT_CORNER_TL:
+ case E_GADCON_ORIENT_CORNER_TR:
+ case E_GADCON_ORIENT_CORNER_BL:
+ case E_GADCON_ORIENT_CORNER_BR:
+ horiz = 1;
+ break;
+ case E_GADCON_ORIENT_VERT:
+ case E_GADCON_ORIENT_LEFT:
+ case E_GADCON_ORIENT_RIGHT:
+ case E_GADCON_ORIENT_CORNER_LT:
+ case E_GADCON_ORIENT_CORNER_RT:
+ case E_GADCON_ORIENT_CORNER_LB:
+ case E_GADCON_ORIENT_CORNER_RB:
+ horiz = 0;
+ break;
+ default:
+ break;
+ }
+ e_gadcon_layout_orientation_set(gc->o_container, horiz);
for (l = gc->clients; l; l = l->next)
{
E_Gadcon_Client *gcc;
gcc = l->data;
+ e_box_orientation_set(gcc->o_box, horiz);
if (gcc->client_class->func.orient)
gcc->client_class->func.orient(gcc);
- switch (gcc->gadcon->orient)
- {
- case E_GADCON_ORIENT_FLOAT:
- case E_GADCON_ORIENT_HORIZ:
- case E_GADCON_ORIENT_TOP:
- case E_GADCON_ORIENT_BOTTOM:
- case E_GADCON_ORIENT_CORNER_TL:
- case E_GADCON_ORIENT_CORNER_TR:
- case E_GADCON_ORIENT_CORNER_BL:
- case E_GADCON_ORIENT_CORNER_BR:
-e_box_orientation_set(gcc->o_box, 1);
-break;
- case E_GADCON_ORIENT_VERT:
- case E_GADCON_ORIENT_LEFT:
- case E_GADCON_ORIENT_RIGHT:
- case E_GADCON_ORIENT_CORNER_LT:
- case E_GADCON_ORIENT_CORNER_RT:
- case E_GADCON_ORIENT_CORNER_LB:
- case E_GADCON_ORIENT_CORNER_RB:
-e_box_orientation_set(gcc->o_box, 0);
-break;
- default:
-break;
- }
}
e_gadcon_layout_thaw(gc->o_container);
}
@@ -720,6 +723,7 @@
E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
gcc->aspect.w = w;
gcc->aspect.h = h;
+ printf("ASPECt: %i %i\n", w, h);
if ((!gcc->autoscroll) && (!gcc->resizable))
{
if (gcc->o_frame)
@@ -1873,7 +1877,8 @@
x = sd->x; y = sd->y; w = sd->w; h = sd->h;
min = mino = cur = 0;
-
+
+ printf("HORIZ: %i\n", sd->horizontal);
for (l = sd->items; l; l = l->next)
{
E_Gadcon_Layout_Item *bi;
@@ -2000,6 +2005,61 @@
}
else
{
+ if (cur <= h)
+ {
+/* all is fine - it should all fit */
+ }
+ else
+ {
+int sub, give, num, given, i;
+
+sub = cur - h; /* we need to find "sub" extra pixels */
+if (min <= h)
+ {
+ printf("blum\n");
+ for (l = sd->items; l; l = l->next)
+ {
+ E_Gadcon_Layout_Item *bi;
+ Evas_Object *obj;
+
+ obj = l->data;
+ bi = evas_object_data_get(obj, "e_gadcon_layout_data");
+ give = bi->ask.size - bi->min.h; // how much give does
this have?
+ if (give < sub) give = sub;
+ bi->ask.size2 = bi->ask.size - give;
+ sub -= give;
+ printf("GIVE: %i\n", give);
+
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_shelf.edc
Log Message:
start of some shelf config - START only... deal with it. debugging printfs
galore.
===
RCS file: /cvs/e/e17/apps/e/data/themes/default_shelf.edc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- default_shelf.edc 6 Apr 2006 07:26:11 - 1.7
+++ default_shelf.edc 23 Apr 2006 06:56:22 - 1.8
@@ -39,46 +39,81 @@
}
part {
name: "base";
-clip_to: "base_clip";
mouse_events: 0;
description {
state:"default" 0.0;
- rel1 {
- relative: 0.0 0.0;
- offset: 0 -6;
- }
- rel2 {
- relative: 1.0 1.0;
- offset: -1 0;
- }
image {
normal: "e17_shelf_bg_h.png";
border: 19 19 9 9;
}
+ fill {
+ origin {
+ offset: 0 -6;
+ }
+ size {
+ offset: 0 6;
+ }
+ }
}
description {
- state:"bottom" 0.0;
- rel1 {
- relative: 0.0 0.0;
- offset: 0 0;
+ state:"top_left" 0.0;
+ inherit: "default" 0.0;
+ fill {
+ origin {
+ offset: -16 -6;
+ }
+ size {
+ offset: 16 6;
+ }
}
- rel2 {
- relative: 1.0 1.0;
- offset: -1 7;
+}
+description {
+ state:"top_right" 0.0;
+ inherit: "default" 0.0;
+ fill {
+ origin {
+ offset: 0 -6;
+ }
+ size {
+ offset: 16 6;
+ }
}
- image {
- normal: "e17_shelf_bg_h.png";
- border: 19 19 9 9;
+}
+description {
+ state:"bottom" 0.0;
+ inherit: "default" 0.0;
+ fill {
+ origin {
+ offset: 0 0;
+ }
+ size {
+ offset: 0 6;
+ }
}
}
- }
- part {
-name: "base_clip";
-type: RECT;
-mouse_events: 0;
description {
- state:"default" 0.0;
- color:255 255 255 255;
+ state:"bottom_left" 0.0;
+inherit: "default" 0.0;
+ fill {
+ origin {
+ offset: -16 0;
+ }
+ size {
+ offset: 16 6;
+ }
+ }
+}
+description {
+ state:"bottom_right" 0.0;
+inherit: "default" 0.0;
+ fill {
+ origin {
+ offset: 0 0;
+ }
+ size {
+ offset: 16 6;
+ }
+ }
}
}
part {
@@ -96,6 +131,61 @@
offset: -19 -3;
}
}
+description {
+ state:"top_left" 0.0;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 22;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -19 -3;
+ }
+}
+description {
+ state:"top_right" 0.0;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 18 2;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -3 -3;
+ }
+}
+description {
+ state:"bottom" 0.0;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 18 2;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -19 -3;
+ }
+}
+description {
+ state:"bottom_left" 0.0;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 2 2;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -19 -3;
+ }
+}
+description {
+ state:"bottom_right" 0.0;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 18 2;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -3 -3;
+ }
+}
}
}
programs {
@@ -105,13 +195,47 @@
source: "top";
action: STATE_SET "default" 0.0;
target: "base";
+target: "items";
}
program {
name:"orient2";
signal: "set_orientation";
+source: "top_left";
+
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/start Modified Files: e_mod_main.c Log Message: start of some shelf config - START only... deal with it. debugging printfs galore. === RCS file: /cvs/e/e17/apps/e/src/modules/start/e_mod_main.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- e_mod_main.c21 Apr 2006 15:54:11 - 1.23 +++ e_mod_main.c23 Apr 2006 06:56:22 - 1.24 @@ -137,11 +137,33 @@ case E_GADCON_ORIENT_RIGHT: dir = E_MENU_POP_DIRECTION_LEFT; break; - case E_GADCON_ORIENT_FLOAT: case E_GADCON_ORIENT_CORNER_TL: + dir = E_MENU_POP_DIRECTION_DOWN; + break; case E_GADCON_ORIENT_CORNER_TR: + dir = E_MENU_POP_DIRECTION_DOWN; + break; case E_GADCON_ORIENT_CORNER_BL: + dir = E_MENU_POP_DIRECTION_UP; + break; case E_GADCON_ORIENT_CORNER_BR: + dir = E_MENU_POP_DIRECTION_UP; + break; + case E_GADCON_ORIENT_CORNER_LT: + dir = E_MENU_POP_DIRECTION_RIGHT; + break; + case E_GADCON_ORIENT_CORNER_RT: + dir = E_MENU_POP_DIRECTION_LEFT; + break; + case E_GADCON_ORIENT_CORNER_LB: + dir = E_MENU_POP_DIRECTION_RIGHT; + break; + case E_GADCON_ORIENT_CORNER_RB: + dir = E_MENU_POP_DIRECTION_LEFT; + break; + case E_GADCON_ORIENT_FLOAT: + case E_GADCON_ORIENT_HORIZ: + case E_GADCON_ORIENT_VERT: default: dir = E_MENU_POP_DIRECTION_AUTO; break; --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mekius raster
Enlightenment CVS committal Author : raster Project : devs Module : mekius Dir : devs/mekius Modified Files: id_dsa.pub Log Message: try this again. === RCS file: /cvs/e/devs/mekius/id_dsa.pub,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- id_dsa.pub 2 Apr 2006 21:05:32 - 1.2 +++ id_dsa.pub 23 Apr 2006 06:22:52 - 1.3 @@ -1 +1 @@ -ssh-dss B3NzaC1kc3MAAACBAJzifj8sj/RyF4NHAKOYqru8X1bhXfdbxNm17+qKGnDv+Qg1AmOPQ79rtsUdJrFQhEtcM0ar8gKfg147HTzOoc8ALI4uEsBwEnz41ZSZsDPS3WK+QhK2U4ENovASdGfAozufSD2NUoS428+XKbQmhuLrJdmdYQjkByrYN6QIGjnrFQCr04qyQ+qftQWayQ2AUspHHdbmcwAAAIAxTz93Dqurh+g8JtmHmZ9DFYvXxKQWoNNtNbOmU9Yr3gsfVV50JXF3pJPYPJASG+iaCYK7NwpLcurHi92nNyAj5Y+xs8SyW2BMBHmRU2vTw3KeIiapR2EkMLd6s5SL4odV9rHu4eQNu9aPbp77VXPlfBsRUZYZOIvCsY2NnDy0EwAAAIA0ssmnU4mIjGk3fidu6uQI2/6spiJZX/WxP6FQpcYXX4ZbnnBHBDJq1XQ3lNzP6KrPsjRh9b+JFfEvmV1gGG9ikhz60aQVEoI6gKf9gkWL432yEwuZ1/1CkfsGKDselqS/poTfAjaey8rq0IVZjnJ/oeM9CYhzOJj0M2Pxu3nQnA== [EMAIL PROTECTED] +ssh-dss B3NzaC1kc3MAAACBAP8DZn4VwtFURnc4lg4UkuOqa2Af+ZhLlpVmJVl54x23iiJRevU7YFGJDJ48y5ATqssLq6rqbwOxcCkDswV4Gigzh7v++Y2hbftr/7vyuoQx42bgLsdCjANh/863nh1lgkxygp5TpZ5GN3fi5oIs595+q2O3Q3OKMCXb2f+LRzYXFQDKSMsjAuLJhTN/pzzIPY2+HmDqlwAAAIEAlaGQXpaiZGqB/D4aHrVCPsEqrjWnZecqJQSkfEzRAoT3OCOFuFp8ndv9vvst6LlhV+VRUXmP7C6yLbBp6Q5IGXQYRM3Z99phNc8fQHdXJye44IUkiaJyQ2HGwxmM3krKVmPTBMOTN6gnsk71b6ZYjkWUlaWuoFjJFpbz+uAfCZwAAACBALlZlwf1cQt+JTBFw9HLMQH/ld0gHBPsvjghvvn40W5q7xvPEZIbCdS8jQsVJML4L8dZYlc/BM66CyklpjypYw4vf4zVCPYYQsDRKSvWBHyhk6pipXaMMM5ZHNwZRe7DivgciKHoJeo+w/f0Whwmqkeu4KCxGjKyk2ATd9r0TGsv [EMAIL PROTECTED] --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h Makefile.am arrange.c ewin-ops.c ipc.c menus.c screen.c
setup.c size.c warp.c
Added Files:
screen.h
Log Message:
Add feature to subdivide screen (xinerama style).
===
RCS file: /cvs/e/e16/e/src/E.h,v
retrieving revision 1.548
retrieving revision 1.549
diff -u -3 -r1.548 -r1.549
--- E.h 21 Apr 2006 22:52:58 - 1.548
+++ E.h 22 Apr 2006 22:00:01 - 1.549
@@ -795,18 +795,6 @@
/* regex.c */
int matchregexp(const char *rx, const char *s);
-/* screen.c */
-voidScreenInit(void);
-voidScreenShowInfo(void);
-int ScreenGetGeometry(int x, int y, int *px, int *py,
- int *pw, int *ph);
-int ScreenGetAvailableArea(int x, int y, int *px, int *py,
- int *pw, int *ph);
-int GetPointerScreenGeometry(int *px, int *py,
-int *pw, int *ph);
-int GetPointerScreenAvailableArea(int *px, int *py,
- int *pw, int *ph);
-
/* settings.c */
voidSettingsMoveResize(void);
voidSettingsPlacement(void);
===
RCS file: /cvs/e/e16/e/src/Makefile.am,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- Makefile.am 19 Apr 2006 19:13:46 - 1.71
+++ Makefile.am 22 Apr 2006 22:00:01 - 1.72
@@ -96,6 +96,7 @@
progress.c \
regex.c \
screen.c\
+ screen.h\
session.c \
session.h \
settings.c \
===
RCS file: /cvs/e/e16/e/src/arrange.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -3 -r1.87 -r1.88
--- arrange.c 18 Feb 2006 08:30:03 - 1.87
+++ arrange.c 22 Apr 2006 22:00:01 - 1.88
@@ -26,6 +26,7 @@
#include "desktops.h"
#include "ewins.h"
#include "groups.h"
+#include "screen.h"
static int
ArrangeAddToList(int **array, int current_size, int value)
===
RCS file: /cvs/e/e16/e/src/ewin-ops.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -3 -r1.95 -r1.96
--- ewin-ops.c 15 Apr 2006 18:32:54 - 1.95
+++ ewin-ops.c 22 Apr 2006 22:00:01 - 1.96
@@ -31,6 +31,7 @@
#include "groups.h"
#include "hints.h"
#include "iclass.h"/* FIXME - Should not be here */
+#include "screen.h"
#include "snaps.h"
#include "xwin.h"
===
RCS file: /cvs/e/e16/e/src/ipc.c,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -3 -r1.264 -r1.265
--- ipc.c 19 Apr 2006 19:13:46 - 1.264
+++ ipc.c 22 Apr 2006 22:00:02 - 1.265
@@ -30,6 +30,7 @@
#include "ewins.h"
#include "ewin-ops.h"
#include "hints.h" /* FIXME - Should not be here */
+#include "screen.h"
#include "session.h"
#include "snaps.h"
#include "timers.h"
@@ -133,9 +134,36 @@
/* The IPC functions */
static void
-IPC_Screen(const char *params __UNUSED__, Client * c __UNUSED__)
+IPC_Screen(const char *params, Client * c __UNUSED__)
{
- ScreenShowInfo();
+ charparam[1024];
+ int l;
+ const char *p;
+
+ p = params;
+ if (p)
+ {
+ l = 0;
+ sscanf(p, "%1000s %n", param, &l);
+ p += l;
+ }
+
+ if (!p || !strncmp(param, "list", 2))
+ {
+ ScreenShowInfo(p);
+ }
+ else if (!strcmp(param, "split"))
+ {
+ int i, j, nx, ny;
+
+ nx = 2;
+ ny = 1;
+ sscanf(p, "%i %i\n", &nx, &ny);
+ for (i = 0; i < nx; i++)
+ for (j = 0; j < ny; j++)
+ ScreenAdd(1, VRoot.scr, i * VRoot.w / nx, j * VRoot.h / ny,
+ VRoot.w / nx, VRoot.h / ny);
+ }
}
static void
===
RCS file: /cvs/e/e16/e/src/menus.c,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -3 -r1.238 -r1.239
--- menus.c 21 Apr 2006 22:52:59 - 1.238
+++ menus.c 22 Apr 2006 22:00:02 - 1.239
@@ -32,6 +32,7 @@
#include "hints.h"
#include "iclass.h"
#include "menus.h"
+#include "screen.h"
#include "tclass.h"
#include "timers.h"
#include "tooltips.h"
===
RCS file: /cvs/e/e16/e/src/screen.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- screen.c22 Apr 2006 14:33:07 - 1.15
+++ screen.
E CVS: libs/ecore doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_config Modified Files: Ecore_Config.h Log Message: q-- === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_config/Ecore_Config.h,v retrieving revision 1.51 retrieving revision 1.52 diff -u -3 -r1.51 -r1.52 --- Ecore_Config.h 22 Apr 2006 14:59:18 - 1.51 +++ Ecore_Config.h 22 Apr 2006 19:12:53 - 1.52 @@ -191,7 +191,7 @@ EAPI int ecore_config_struct_float_add(const char *key, const char *name, float val); EAPI int ecore_config_struct_string_add(const char *key, const char *name, char* val); EAPI int ecore_config_struct_theme_add(const char *key, const char *name, char* val); - EAPI int ecore_config_struct_argb_add(const char *key, const char *name, int a, int r, int g, int b);q + EAPI int ecore_config_struct_argb_add(const char *key, const char *name, int a, int r, int g, int b); EAPI int ecore_config_struct_boolean_add(const char *key, const char *name, int val); EAPI int ecore_config_struct_get(const char *key, void *data); --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: ethemes kwo
Enlightenment CVS committal Author : kwo Project : e16 Module : ethemes Dir : e16/ethemes/winter/data Modified Files: fonts.cfg Log Message: Add default font alias. === RCS file: /cvs/e/e16/ethemes/winter/data/fonts.cfg,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- fonts.cfg 17 Jul 2005 21:39:57 - 1.3 +++ fonts.cfg 22 Apr 2006 16:00:32 - 1.4 @@ -2,6 +2,8 @@ __E_CFG_VERSION 1 __FONTS __BGN +font-default "VeraBd/7" + font-border"VeraBd/7" font-coords"VeraBd/7" --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: ethemes kwo
Enlightenment CVS committal Author : kwo Project : e16 Module : ethemes Dir : e16/ethemes/winter/data/init Modified Files: init.cfg Log Message: Fix progress bar images. === RCS file: /cvs/e/e16/ethemes/winter/data/init/init.cfg,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- init.cfg17 Jul 2005 21:39:58 - 1.2 +++ init.cfg22 Apr 2006 15:59:26 - 1.3 @@ -18,15 +18,15 @@ __ICLASS __BGN __NAME PROGRESS_BAR /* normal used for text background */ - __NORMAL "init/images/text_bg.png" - __EDGE_SCALING 6 22 1 1 + __NORMAL "init/images/progress.png" + __EDGE_SCALING 2 2 2 2 /* used for numeric bg */ - __CLICKED "init/images/text_bg.png" - __EDGE_SCALING 6 22 1 1 + __CLICKED "init/images/progress.png" + __EDGE_SCALING 2 2 2 2 /* used for bar itself */ __NORMAL_ACTIVE "init/images/progress_bar.png" - __EDGE_SCALING 6 22 1 1 - __PADDING6 22 1 1 + __EDGE_SCALING 2 2 2 2 + __PADDING2 2 2 2 __END /* text class for text above progress bar */ --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: ethemes kwo
Enlightenment CVS committal Author : kwo Project : e16 Module : ethemes Dir : e16/ethemes/winter/data/init/images Modified Files: progress_bar.png Added Files: progress.png Removed Files: text_bg.png Log Message: Fix progress bar images. === RCS file: /cvs/e/e16/ethemes/winter/data/init/images/progress_bar.png,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -3 -r1.1.1.1 -r1.2 Binary files /tmp/cvs0nbZkO and /tmp/cvswgHser differ --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore handyande
Enlightenment CVS committal Author : handyande Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_config Modified Files: Ecore_Config.h Log Message: oops, missed this one === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_config/Ecore_Config.h,v retrieving revision 1.50 retrieving revision 1.51 diff -u -3 -r1.50 -r1.51 --- Ecore_Config.h 22 Apr 2006 14:55:39 - 1.50 +++ Ecore_Config.h 22 Apr 2006 14:59:18 - 1.51 @@ -191,6 +191,7 @@ EAPI int ecore_config_struct_float_add(const char *key, const char *name, float val); EAPI int ecore_config_struct_string_add(const char *key, const char *name, char* val); EAPI int ecore_config_struct_theme_add(const char *key, const char *name, char* val); + EAPI int ecore_config_struct_argb_add(const char *key, const char *name, int a, int r, int g, int b);q EAPI int ecore_config_struct_boolean_add(const char *key, const char *name, int val); EAPI int ecore_config_struct_get(const char *key, void *data); --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore handyande
Enlightenment CVS committal
Author : handyande
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_config
Modified Files:
Ecore_Config.h ecore_config.c ecore_config_db.c
ecore_config_ipc_ecore.c
Log Message:
First pass for some ecore_config struct code. Works fine on my x86 machine, but
raster reckons it will not if the architecture 'packs' structs.
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_config/Ecore_Config.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- Ecore_Config.h 31 Jan 2006 11:05:47 - 1.49
+++ Ecore_Config.h 22 Apr 2006 14:55:39 - 1.50
@@ -52,6 +52,7 @@
ECORE_CONFIG_RGB = 4, /**< Colour property type. */
ECORE_CONFIG_THM = 5, /**< Theme property type. */
ECORE_CONFIG_BLN = 6, /**< Boolean property type. */
+ ECORE_CONFIG_SCT = 7, /**< Structure property type */
} Ecore_Config_Type;
typedef enum Ecore_Config_Flag
@@ -97,6 +98,7 @@
Ecore_Config_Flag flags; /// < Configuration flags.
Ecore_Config_Listener_List *listeners; /* List of change listeners. */
void *data; /// < Stores extra data for the property.
+ struct Ecore_Config_Prop *parent; /* if we are in a struct we have a parent
to notify of changes etc */
struct Ecore_Config_Prop *next; /* Pointer to the next property in the
list. */
} Ecore_Config_Prop;
@@ -184,6 +186,13 @@
EAPI int ecore_config_argbint_default(const char *key, long
argb);
EAPI int ecore_config_argbstr_default(const char *key, char
*val);
EAPI int ecore_config_theme_default(const char *key, char
*val);
+ EAPI int ecore_config_struct_default(const char *key);
+ EAPI int ecore_config_struct_int_add(const char *key, const
char *name, int val);
+ EAPI int ecore_config_struct_float_add(const char *key,
const char *name, float val);
+ EAPI int ecore_config_struct_string_add(const char *key,
const char *name, char* val);
+ EAPI int ecore_config_struct_theme_add(const char *key,
const char *name, char* val);
+ EAPI int ecore_config_struct_boolean_add(const char *key,
const char *name, int val);
+ EAPI int ecore_config_struct_get(const char *key, void
*data);
EAPI int ecore_config_listen(const char *name, const char
*key,
Ecore_Config_Listener listener,
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_config/ecore_config.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -3 -r1.75 -r1.76
--- ecore_config.c 31 Jan 2006 11:11:21 - 1.75
+++ ecore_config.c 22 Apr 2006 14:55:39 - 1.76
@@ -31,7 +31,7 @@
static inline void *__ecore_argbstr_to_long(char *argb, long *v);
static const char *_ecore_config_type[] =
- { "undefined", "integer", "float", "string", "colour", "theme", "boolean" };
+ { "undefined", "integer", "float", "string", "colour", "theme", "boolean",
"structure" };
/**
* @defgroup Ecore_Config_Property_Group Ecore Config Property Functions
@@ -355,6 +355,8 @@
case ECORE_CONFIG_THM:
esprintf(&val, "\"%s\"", _ecore_config_theme_get(e));
break;
+case ECORE_CONFIG_SCT:
+ break;
default:
esprintf(&r, "%s:unknown_type", key);
break;
@@ -470,7 +472,7 @@
if (!e)
return ECORE_CONFIG_ERR_NODATA;
- if (!(val) && type != ECORE_CONFIG_NIL)
+ if (!(val) && (type != ECORE_CONFIG_NIL && type != ECORE_CONFIG_SCT))
e->ptr = NULL;
else
{
@@ -496,10 +498,14 @@
e->val = (long) ((*((float *)val)) * ECORE_CONFIG_FLOAT_PRECISION);
e->type = ECORE_CONFIG_FLT;
}
+ else if (type == ECORE_CONFIG_SCT)
+ {
+e->type = ECORE_CONFIG_SCT;
+ }
else
-{
+ {
e->type = ECORE_CONFIG_NIL;
-}
+ }
ecore_config_bound(e);
e->flags |= ECORE_CONFIG_FLAG_MODIFIED;
@@ -620,6 +626,18 @@
return ECORE_CONFIG_ERR_SUCC;
}
+static void
+_ecore_config_listener_fire(Ecore_Config_Prop *prop)
+{
+ Ecore_Config_Listener_List *l;
+ for (l = prop->listeners; l; l = l->next)
+ l->listener(prop->key, prop->type, l->tag, l->data);
+
+ /* fire change listeners for the generic struct container etc */
+ if (prop->parent)
+ _ecore_config_listener_fire(prop->parent);
+}
+
/**
* Sets the indicated property to the given value and type.
* @param key The property key.
@@ -632,7 +650,6 @@
ecore_config_typed_set(const char *key, const void *val, int type)
{
E CVS: e kwo
Enlightenment CVS committal Author : kwo Project : e16 Module : e Dir : e16/e/src Modified Files: screen.c Log Message: Fix badness when showing screen info and xinerama is active. === RCS file: /cvs/e/e16/e/src/screen.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- screen.c19 Mar 2006 14:59:48 - 1.14 +++ screen.c22 Apr 2006 14:33:07 - 1.15 @@ -66,7 +66,7 @@ scrns[i].x_org, scrns[i].y_org, scrns[i].width, scrns[i].height); } - XFree(screens); + XFree(scrns); return; } else --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
ecompmgr.c ecompmgr.h eobj.c eobj.h progress.c
Log Message:
Fix progress bars with composite enabled.
===
RCS file: /cvs/e/e16/e/src/ecompmgr.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -3 -r1.113 -r1.114
--- ecompmgr.c 21 Apr 2006 22:52:58 - 1.113
+++ ecompmgr.c 22 Apr 2006 13:57:54 - 1.114
@@ -1569,6 +1569,15 @@
}
}
+void
+ECompMgrWinDamageArea(EObj * eo, int x __UNUSED__, int y __UNUSED__,
+ int w __UNUSED__, int h __UNUSED__)
+{
+ ECmWinInfo *cw = eo->cmhook;
+
+ ECompMgrDamageMergeObject(eo, cw->shape, 0);
+}
+
static void
ECompMgrWinConfigure(EObj * eo, XEvent * ev)
{
===
RCS file: /cvs/e/e16/e/src/ecompmgr.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- ecompmgr.h 6 Apr 2006 21:20:16 - 1.28
+++ ecompmgr.h 22 Apr 2006 13:57:54 - 1.29
@@ -48,6 +48,8 @@
voidECompMgrWinUnmap(EObj * eo);
voidECompMgrWinMoveResize(EObj * eo, int change_xy,
int change_wh, int change_bw);
+voidECompMgrWinDamageArea(EObj * eo, int x, int y, int w,
+ int h);
voidECompMgrWinReparent(EObj * eo, Desk * dsk, int change_xy);
voidECompMgrWinRaise(EObj * eo);
voidECompMgrWinLower(EObj * eo);
===
RCS file: /cvs/e/e16/e/src/eobj.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- eobj.c 18 Apr 2006 17:57:58 - 1.70
+++ eobj.c 22 Apr 2006 13:57:54 - 1.71
@@ -410,6 +410,15 @@
}
void
+EobjDamage(EObj * eo)
+{
+#if USE_COMPOSITE
+ if (eo->cmhook)
+ ECompMgrWinDamageArea(eo, 0, 0, eo->w, eo->h);
+#endif
+}
+
+void
EobjReparent(EObj * eo, EObj * dst, int x, int y)
{
int move;
===
RCS file: /cvs/e/e16/e/src/eobj.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- eobj.h 18 Apr 2006 16:26:51 - 1.26
+++ eobj.h 22 Apr 2006 13:57:54 - 1.27
@@ -143,6 +143,7 @@
voidEobjMove(EObj * eo, int x, int y);
voidEobjResize(EObj * eo, int w, int h);
voidEobjMoveResize(EObj * eo, int x, int y, int w, int h);
+voidEobjDamage(EObj * eo);
voidEobjReparent(EObj * eo, EObj * dst, int x, int y);
int EobjRaise(EObj * eo);
int EobjLower(EObj * eo);
===
RCS file: /cvs/e/e16/e/src/progress.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- progress.c 22 Apr 2006 13:24:51 - 1.31
+++ progress.c 22 Apr 2006 13:57:54 - 1.32
@@ -67,6 +67,9 @@
ProgressbarDestroy(p);
return NULL;
}
+ p->win->fade = 0;
+ p->n_win->fade = 0;
+ p->p_win->fade = 0;
p->ic = ImageclassFind("PROGRESS_BAR", 1);
if (p->ic)
@@ -96,6 +99,8 @@
{
int i, j, dy;
+ ProgressbarHide(p);
+
dy = 2 * p->h;
EobjWindowDestroy(p->win);
EobjWindowDestroy(p->n_win);
@@ -175,8 +180,10 @@
pad->left, pad->top, p->h * 5 - (pad->left + pad->right),
p->h - (pad->top + pad->bottom), p->h - (pad->top + pad->bottom),
TextclassGetJustification(p->tnc));
+ /* Hack - We may not be running in the event loop here */
+ EobjDamage(p->n_win);
- EFlush();
+ EobjsRepaint();
}
void
@@ -201,7 +208,7 @@
p->h - (pad->top + pad->bottom), p->h - (pad->top + pad->bottom),
TextclassGetJustification(p->tnc));
- EFlush();
+ EobjsRepaint();
}
void
---
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: debian kaethorn
Enlightenment CVS committal Author : kaethorn Project : e_modules Module : debian Dir : e_modules/debian Removed Files: emodule-calendar.substvars emodule-cpu.substvars emodule-emu.substvars emodule-evolume.substvars emodule-flame.substvars emodule-mbar.substvars emodule-mem.substvars emodule-mount.substvars emodule-net.substvars emodule-rain.substvars emodule-screenshot.substvars emodule-slideshow.substvars emodule-snow.substvars emodule-tclock.substvars emodule-uptime.substvars emodule-weather.substvars emodule-wlan.substvars Log Message: remove substvars. --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: debian kaethorn
Enlightenment CVS committal
Author : kaethorn
Project : e_modules
Module : debian
Dir : e_modules/debian
Modified Files:
control
Log Message:
more dependency cleanups.
===
RCS file: /cvs/e/e_modules/debian/control,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- control 21 Apr 2006 13:00:14 - 1.4
+++ control 22 Apr 2006 13:28:08 - 1.5
@@ -7,7 +7,7 @@
Package: emodules0-all
Architecture: any
-Depends: ${shlibs:Depends}, enlightenment, libesmart, libedje,
emodule0-calendar, emodule0-cpu, emodule0-devian, emodule0-emu,
emodule0-evolume, emodule0-flame, emodule0-mbar, emodule0-mem, emodule0-mount,
emodule0-net, emodule0-rain, emodule0-screenshot, emodule0-slideshow,
emodule0-snow, emodule0-tclock, emodule0-uptime, emodule0-weather,
emodule0-wlan, emodules0-data
+Depends: ${shlibs:Depends}, enlightenment, libesmart, libedje,
emodule0-calendar, emodule0-cpu, emodule0-devian, emodule0-emu,
emodule0-evolume, emodule0-flame, emodule0-mbar, emodule0-mem, emodule0-mount,
emodule0-net, emodule0-rain, emodule0-screenshot, emodule0-slideshow,
emodule0-snow, emodule0-tclock, emodule0-uptime, emodule0-weather, emodule0-wlan
Conflicts: emodules-extra, evolume
Provides: emodules-all
Description: A dummy package for installing all modules for E17
@@ -36,7 +36,7 @@
Package: emodule0-calendar
Architecture: any
-Depends: ${shlibs:Depends}, enlightenment, libesmart, libedje, emodules0-data
+Depends: ${shlibs:Depends}, enlightenment, libesmart, libedje
Provides: emodule-calendar
Description: Draws a nice calendar on your E17 desktop
An E17 module which displays a highly configurable calendar on the
@@ -49,7 +49,7 @@
Package: emodule0-cpu
Architecture: any
-Depends: ${shlibs:Depends}, enlightenment, libesmart, libedje, emodules0-data
+Depends: ${shlibs:Depends}, enlightenment, libesmart, libedje
Provides: emodule-cpu
Description: E17 monitor module for the CPU load
An E17 module which displays the current CPU load. Features are:
@@ -58,14 +58,14 @@
Package: emodule0-devian
Architecture: any
-Depends: ${shlibs:Depends}, enlightenment, libeet, libembryo, libesmart,
libedje, emodules0-data
+Depends: ${shlibs:Depends}, enlightenment, libeet, libembryo, libesmart,
libedje
Provides: emodule-devian
Description: E17 monitor module for displaying images and rss feeds
An E17 module which displays images and rss feeds.
Package: emodule0-emu
Architecture: any
-Depends: ${shlibs:Depends}, enlightenment, libesmart, libedje, emodules0-data
+Depends: ${shlibs:Depends}, enlightenment, libesmart, libedje
Provides: emodule-emu
Description: An E17 module front end
An E17 module which works as a front end that runs arbitrary back
@@ -75,7 +75,7 @@
Package: emodule0-evolume
Architecture: any
-Depends: ${shlibs:Depends}, enlightenment, libesmart, libedje, emodules0-data
+Depends: ${shlibs:Depends}, enlightenment, libesmart, libedje
Provides: emodule-evolume
Description: An E17 audio mixer module
Evolume is an E17 module which allows the user to adjust the sound
@@ -83,7 +83,7 @@
Package: emodule0-flame
Architecture: any
-Depends: ${shlibs:Depends}, enlightenment, libesmart, libedje, emodules0-data
+Depends: ${shlibs:Depends}, enlightenment, libesmart, libedje
Provides: emodule-flame
Description: An E17 module that draws flames on the desktop
Eflame is an E17 module which draws flames of configurable colors on
@@ -91,7 +91,7 @@
Package: emodule0-mbar
Architecture: any
-Depends: ${shlibs:Depends}, enlightenment, libesmart, libedje, emodules0-data
+Depends: ${shlibs:Depends}, enlightenment, libesmart, libedje
Provides: emodule-mbar
Description: An E17 mount bar module
Mbar is an E17 module which displays a list of devices which can be
@@ -99,7 +99,7 @@
Package: emodule0-mem
Architecture: any
-Depends: ${shlibs:Depends}, enlightenment, libesmart, libedje, emodules0-data
+Depends: ${shlibs:Depends}, enlightenment, libesmart, libedje
Provides: emodule-mem
Description: An E17 memory monitoring module
An E17 module which monitors the RAM usage. It features the following:
@@ -110,7 +110,7 @@
Package: emodule0-mount
Architecture: any
-Depends: ${shlibs:Depends}, enlightenment, libesmart, libedje, emodules0-data
+Depends: ${shlibs:Depends}, enlightenment, libesmart, libedje
Provides: emodule-mount
Description: An E17 mount module
An E17 module which allows easy mounting/unmounting of devices
@@ -118,7 +118,7 @@
Package: emodule0-net
Architecture: any
-Depends: ${shlibs:Depends}, enlightenment, libesmart, libedje, emodules0-data
+Depends: ${shlibs:Depends}, enlightenment, libesmart, libedje
Provides: emodule-net
Description: An E17 network interface monitor module
An E17 module which monitors TX and RX events of a specified
@@ -129,7 +129,7 @@
Package: emodule0-rain
Architecture: any
-Depends: ${shlibs:Depends}, enlighte
E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
dialog.c progress.c tclass.c tclass.h warp.c
Log Message:
Eliminate TextclassApply().
===
RCS file: /cvs/e/e16/e/src/dialog.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -3 -r1.148 -r1.149
--- dialog.c17 Apr 2006 08:43:09 - 1.148
+++ dialog.c22 Apr 2006 13:24:51 - 1.149
@@ -517,8 +517,14 @@
if (d->text)
{
- TextclassApply(d->iclass, d->pmap, d->w, d->h, 0, 0, STATE_NORMAL,
- d->tclass, d->text);
+ EImageBorder *pad;
+
+ pad = ImageclassGetPadding(d->iclass);
+ TextDraw(d->tclass, d->pmap, 0, 0, STATE_NORMAL, d->text,
+pad->left, pad->top, d->w - (pad->left + pad->right),
+d->h - (pad->top + pad->bottom),
+d->h - (pad->top + pad->bottom),
+TextclassGetJustification(d->tclass));
}
else if (d->item)
{
===
RCS file: /cvs/e/e16/e/src/progress.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- progress.c 19 Apr 2006 17:23:34 - 1.30
+++ progress.c 22 Apr 2006 13:24:51 - 1.31
@@ -117,7 +117,6 @@
EobjMove(pp->p_win, pp->p_win->x, pp->p_win->y - dy);
}
break;
-
}
if (p->ic)
@@ -152,6 +151,7 @@
{
int w;
chars[64];
+ EImageBorder *pad;
if (progress == p->value)
return;
@@ -164,12 +164,17 @@
w = p->w;
Esnprintf(s, sizeof(s), "%i%%", p->value);
- TextclassApply(p->inc, p->n_win->win, p->h * 5, p->h, 0, 0, STATE_CLICKED,
- p->tnc, s);
+ EobjResize(p->p_win, w, p->h);
ImageclassApply(p->inc, p->p_win->win, w, p->h, 1, 0, STATE_NORMAL,
ST_SOLID);
+ EobjShapeUpdate(p->p_win, 0);
- EobjResize(p->p_win, w, p->h);
+ pad = ImageclassGetPadding(p->inc);
+ EClearWindow(p->n_win->win);
+ TextDraw(p->tnc, p->n_win->win, 0, 0, STATE_CLICKED, s,
+ pad->left, pad->top, p->h * 5 - (pad->left + pad->right),
+ p->h - (pad->top + pad->bottom), p->h - (pad->top + pad->bottom),
+ TextclassGetJustification(p->tnc));
EFlush();
}
@@ -177,27 +182,26 @@
void
ProgressbarShow(Progressbar * p)
{
- int w;
-
- w = (p->value * p->w) / 100;
- if (w < 1)
- w = 1;
- if (w > p->w)
- w = p->w;
+ EImageBorder *pad;
ImageclassApply(p->ic, p->win->win, p->w - (p->h * 5), p->h, 0, 0,
STATE_NORMAL, ST_SOLID);
ImageclassApply(p->inc, p->n_win->win, (p->h * 5), p->h, 0, 0,
STATE_CLICKED,
ST_SOLID);
- ImageclassApply(p->ipc, p->p_win->win, w, p->h, 1, 0, STATE_NORMAL,
+ ImageclassApply(p->ipc, p->p_win->win, 1, p->h, 1, 0, STATE_NORMAL,
ST_SOLID);
EobjMap(p->win, 0);
EobjMap(p->n_win, 0);
EobjMap(p->p_win, 0);
- ESync();
- TextclassApply(p->ic, p->win->win, p->w - (p->h * 5), p->h, 0, 0,
- STATE_NORMAL, p->tc, p->win->name);
+
+ pad = ImageclassGetPadding(p->inc);
+ TextDraw(p->tc, p->win->win, 0, 0, STATE_NORMAL, p->win->name,
+ pad->left, pad->top, p->w - (p->h * 5) - (pad->left + pad->right),
+ p->h - (pad->top + pad->bottom), p->h - (pad->top + pad->bottom),
+ TextclassGetJustification(p->tnc));
+
+ EFlush();
}
void
===
RCS file: /cvs/e/e16/e/src/tclass.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- tclass.c21 Apr 2006 22:52:59 - 1.43
+++ tclass.c22 Apr 2006 13:24:51 - 1.44
@@ -470,25 +470,6 @@
return err;
}
-void
-TextclassApply(ImageClass * iclass, Window win, int w, int h,
- int active, int sticky, int state,
- TextClass * tclass, const char *text)
-{
- EImageBorder *pad;
-
- if ((!iclass) || (!tclass) || (!text) || (!win) || (w < 1) || (h < 1))
- return;
-
- XClearWindow(disp, win);
-
- pad = ImageclassGetPadding(iclass);
- TextDraw(tclass, win, active, sticky, state, text,
- pad->left, pad->top, w - (pad->left + pad->right),
- h - (pad->top + pad->bottom), h - (pad->top + pad->bottom),
- tclass->justification);
-}
-
/*
* Textclass Module
*/
===
RCS file: /cvs/e/e16/e/src/tclass.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- tclass.h16 Apr 2006 22:27:06 - 1.6
+++ tclass.h22 Apr 2006 13:24:51 - 1.7
@@ -78,9 +78,6 @@
int TextclassGetJustification(TextClass * tc);
voidTextclassSetJustification(TextClass * tc, int just);
Tex
E CVS: libs/emotion kaethorn
Enlightenment CVS committal
Author : kaethorn
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/debian
Modified Files:
control libemotion0-dev.install libemotion0.install rules
Log Message:
several packaging fixes:
- move rules to CDBS.
- update Standards.
- update package descriptions.
- update Maintainer.
- .so symlink belongs to -dev.
===
RCS file: /cvs/e/e17/libs/emotion/debian/control,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- control 20 Apr 2006 14:41:13 - 1.8
+++ control 22 Apr 2006 12:49:12 - 1.9
@@ -1,6 +1,6 @@
Source: emotion
Priority: optional
-Maintainer: Sytse Wielinga <[EMAIL PROTECTED]>
+Maintainer: E17 Debian Team <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 4.0.0), libeet-dev, libevas-dev, libedje-dev,
libecore-dev, libembryo-dev, libxine-dev (>=1.1.0), automake1.9 | automaken,
libtool, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev,
gstreamer0.10-ffmpeg, gstreamer0.10-plugins-good, gstreamer0.10-tools
Standards-Version: 3.6.2.2
@@ -12,6 +12,8 @@
Description: Video playback library used in Enlightenment DR0.17
This is the emotion library, a wrapper library used in the next-generation
Enlightenment suite for video playback.
+ .
+ This package contains the shared libraries.
Package: libemotion0-dev
Section: libdevel
@@ -21,6 +23,9 @@
Description: Headers, static libraries and documentation for Emotion
This package contains development files for the Emotion library, a wrapper
library used in the next-generation Enlightenment suite for video playback.
+ .
+ This package contains headers and static libraries for development with
+ libemotion.
Package: libemotion0-xine
Section: libs
@@ -50,4 +55,7 @@
Depends: ${shlibs:Depends}
Provides: emotion-bin
Description: Test programs for Emotion
+ This is the emotion library, a wrapper library used in the next-generation
+ Enlightenment suite for video playback.
+ .
This package contains test programs for the Emotion library.
===
RCS file: /cvs/e/e17/libs/emotion/debian/libemotion0-dev.install,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- libemotion0-dev.install 20 Apr 2006 14:41:13 - 1.1
+++ libemotion0-dev.install 22 Apr 2006 12:49:12 - 1.2
@@ -2,6 +2,7 @@
debian/tmp/usr/lib/lib*.a
debian/tmp/usr/lib/pkgconfig/*
debian/tmp/usr/lib/*.la
+debian/tmp/usr/lib/*.so
debian/tmp/usr/bin/emotion-config
debian/tmp/usr/lib/emotion/*.a
debian/tmp/usr/lib/emotion/*.la
===
RCS file: /cvs/e/e17/libs/emotion/debian/libemotion0.install,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- libemotion0.install 20 Apr 2006 14:41:13 - 1.1
+++ libemotion0.install 22 Apr 2006 12:49:12 - 1.2
@@ -1 +1 @@
-debian/tmp/usr/lib/libemotion.so*
+debian/tmp/usr/lib/libemotion.so.*
===
RCS file: /cvs/e/e17/libs/emotion/debian/rules,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- rules 2 Apr 2006 07:38:05 - 1.2
+++ rules 22 Apr 2006 12:49:12 - 1.3
@@ -1,94 +1,11 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# Rewrote debian/rules to use cdbs.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+DEB_MAKE_CLEAN_TARGET := clean
-# This is the debhelper compatability version to use.
-export DH_COMPAT=4
-
-
-CFLAGS ?= -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-INSTALL=/usr/bin/install -p
-CONFIGUREOPTS = --prefix=/usr --build=$(DEB_BUILD_GNU_TYPE)
--host=$(DEB_HOST_GNU_TYPE)
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
-
- test -x autogen.sh && ./autogen.sh $(CONFIGUREOPTS) || ./configure
$(CONFIGUREOPTS)
-
- touch configure-stamp
-
-build: configure build-stamp
-build-stamp:
- dh_testdir
-
- $(MAKE)
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- -mv debian/changelog debian/changelog.saved
- -$(MAKE) distclean
- -mv debian/changelog.saved debian/changelog
-
- dh_c
E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
pager.c
Log Message:
Fix pager shrinkage.
===
RCS file: /cvs/e/e16/e/src/pager.c,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -3 -r1.207 -r1.208
--- pager.c 21 Apr 2006 22:52:59 - 1.207
+++ pager.c 22 Apr 2006 12:11:12 - 1.208
@@ -487,7 +487,7 @@
{
w = (int)(ax * VRoot.w / p->scale + .5);
h = (int)(ay * VRoot.h / p->scale + .5);
- EwinResize(p->ewin, w, h);
+ EwinResize(p->ewin, w + (dx * ax) / 2, h + (dy * ay) / 2);
EwinReposition(p->ewin);
}
}
---
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas shorne
Enlightenment CVS committal
Author : shorne
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_font_dir.c
Log Message:
Add font charmap caching
* TODO: store cache on disc, for faster cache loading (this requires EET to
support arrays)
===
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_font_dir.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- evas_font_dir.c 9 Apr 2006 02:42:21 - 1.20
+++ evas_font_dir.c 22 Apr 2006 11:08:01 - 1.21
@@ -616,7 +616,7 @@
Evas_Font_Alias *fa;
/* skip comments */
- if ((fdef[0] == '!') || (fdef[0] == '#')) continue;
+ if ((fname[0] == '!') || (fname[0] == '#')) continue;
fa = calloc(1, sizeof(Evas_Font_Alias));
if (fa)
{
---
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas shorne
Enlightenment CVS committal Author : shorne Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib/data Modified Files: evas_hash.c Log Message: Add font charmap caching * TODO: store cache on disc, for faster cache loading (this requires EET to support arrays) === RCS file: /cvs/e/e17/libs/evas/src/lib/data/evas_hash.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- evas_hash.c 16 Jan 2006 03:37:33 - 1.19 +++ evas_hash.c 22 Apr 2006 11:08:01 - 1.20 @@ -403,7 +403,7 @@ * * This function goes through every entry in the hash table @p hash and calls * the function @p func on each member. The function should NOT modify the - * hash table contents if it reeturns 1. IF the hash table contents are + * hash table contents if it returns 1. IF the hash table contents are * modified by this function or the function wishes to stop processing it must * return 0, otherwise return 1 to keep processing. * --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas shorne
Enlightenment CVS committal
Author : shorne
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common
Modified Files:
Makefile.am evas_font_draw.c evas_font_load.c
Added Files:
evas_array_hash.c
Log Message:
Add font charmap caching
* TODO: store cache on disc, for faster cache loading (this requires EET to
support arrays)
===
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- Makefile.am 17 Jan 2006 03:47:35 - 1.16
+++ Makefile.am 22 Apr 2006 11:08:01 - 1.17
@@ -53,6 +53,7 @@
evas_scale_smooth.c \
evas_tiler.c \
evas_regionbuf.c \
+evas_array_hash.c \
evas_blend_ops.h
EXTRA_DIST = \
===
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_font_draw.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- evas_font_draw.c17 Apr 2006 01:57:11 - 1.24
+++ evas_font_draw.c22 Apr 2006 11:08:01 - 1.25
@@ -62,20 +62,67 @@
{
RGBA_Font_Int *fi;
int index;
-
+
fi = l->data;
- if (!fi->ft.size)
+
+ if (fi->src->charmap) /* Charmap loaded, FI/FS blank */
{
-if (!fi->src->ft.face)
- evas_common_font_source_load_complete(fi->src);
-evas_common_font_int_load_complete(fi);
+index = evas_common_array_hash_search(fi->src->charmap, gl);
+if (index != 0)
+ {
+ evas_common_font_source_load_complete(fi->src);
+ evas_common_font_int_load_complete(fi);
+
+ evas_common_array_hash_free(fi->src->charmap);
+ fi->src->charmap = NULL;
+
+ *fi_ret = fi;
+ return index;
+ }
+ }
+ else if (!fi->src->ft.face) /* Charmap not loaded, FI/FS blank */
+ {
+if (evas_common_font_source_load_complete(fi->src));
+ return 0;
+
+index = FT_Get_Char_Index(fi->src->ft.face, gl);
+if (index == 0)
+ {
+ /* Load Hash */
+ FT_ULong charcode;
+ FT_UInt gindex;
+
+ fi->src->charmap = evas_common_array_hash_new();
+ charcode = FT_Get_First_Char(fi->src->ft.face, &gindex );
+ while ( gindex != 0 )
+ {
+ evas_common_array_hash_add(fi->src->charmap, charcode,
gindex);
+ charcode = FT_Get_Next_Char(fi->src->ft.face, charcode,
&gindex );
+ }
+
+ /* Free face */
+ FT_Done_Face(fi->src->ft.face);
+ fi->src->ft.face = NULL;
+ }
+else
+ {
+ evas_common_font_int_load_complete(fi);
+
+ *fi_ret = fi;
+ return index;
+ }
}
-
-index = FT_Get_Char_Index(fi->src->ft.face, gl);
- if (index != 0)
+ else /* Charmap not loaded, FS loaded */
{
-*fi_ret = fi;
-return index;
+index = FT_Get_Char_Index(fi->src->ft.face, gl);
+if (index != 0)
+ {
+ if (!fi->ft.size)
+ evas_common_font_int_load_complete(fi);
+
+ *fi_ret = fi;
+ return index;
+ }
}
}
return 0;
===
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_font_load.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- evas_font_load.c9 Apr 2006 02:36:03 - 1.34
+++ evas_font_load.c22 Apr 2006 11:08:01 - 1.35
@@ -64,8 +64,8 @@
evas_common_font_source_load_complete(RGBA_Font_Source *fs)
{
int error;
-
- error = FT_New_Face(evas_ft_lib, fs->name, 0, &(fs->ft.face));
+
+ error = FT_New_Face(evas_ft_lib, fs->file, 0, &(fs->ft.face));
if (error) return error;
error = FT_Select_Charmap(fs->ft.face, ft_encoding_unicode);
@@ -105,6 +105,7 @@
fonts_src = evas_object_list_remove(fonts_src, fs);
FT_Done_Face(fs->ft.face);
+ if (fs->charmap) evas_common_array_hash_free(fs->charmap);
if (fs->name) evas_stringshare_del(fs->name);
free(fs);
}
@@ -546,3 +547,4 @@
}
return NULL;
}
+
---
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid
E CVS: libs/evas shorne
Enlightenment CVS committal
Author : shorne
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/include
Modified Files:
evas_common.h
Log Message:
Add font charmap caching
* TODO: store cache on disc, for faster cache loading (this requires EET to
support arrays)
===
RCS file: /cvs/e/e17/libs/evas/src/lib/include/evas_common.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- evas_common.h 9 Apr 2006 00:02:47 - 1.57
+++ evas_common.h 22 Apr 2006 11:08:01 - 1.58
@@ -109,6 +109,9 @@
typedef struct _Tilebuf Tilebuf;
typedef struct _Tilebuf_Tile Tilebuf_Tile;
typedef struct _Tilebuf_Rect Tilebuf_Rect;
+
+typedef struct _Evas_Array_Hash Evas_Array_Hash;
+
/*
typedef struct _Regionbuf Regionbuf;
typedef struct _RegionspanRegionspan;
@@ -341,7 +344,8 @@
int data_size;
int current_size;
-
+ Evas_Array_Hash *charmap;
+
struct {
int orig_upem;
FT_Face face;
@@ -964,6 +968,11 @@
Gfx_Func_Blend_Src_Dst evas_common_draw_func_copy_get(int
pixels, int reverse);
void evas_font_dir_cache_free(void);
+
+Evas_Array_Hash*evas_common_array_hash_new (void);
+voidevas_common_array_hash_free(Evas_Array_Hash *hash);
+voidevas_common_array_hash_add (Evas_Array_Hash *hash, int
key, int data);
+int evas_common_array_hash_search (Evas_Array_Hash *hash, int
key);
/*/
---
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/modules
Modified Files:
emotion_gstreamer.c emotion_gstreamer.h
Log Message:
EOS signal. Easier than expected :)
===
RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_gstreamer.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- emotion_gstreamer.c 20 Apr 2006 18:23:48 - 1.9
+++ emotion_gstreamer.c 22 Apr 2006 10:12:03 - 1.10
@@ -41,6 +41,8 @@
gbooleanlast,
gpointeruser_data);
+/* Callbacks to get the eos */
+static int _eos_timer_fct (void *data);
GstElement *
make_queue ()
@@ -300,8 +302,8 @@
if (!ev->pipeline)
goto failure_pipeline;
- ev->bus = gst_pipeline_get_bus (GST_PIPELINE (ev->pipeline));
- if (!ev->bus)
+ ev->eos_bus = gst_pipeline_get_bus (GST_PIPELINE (ev->pipeline));
+ if (!ev->eos_bus)
goto failure_bus;
/* We allocate the sinks lists */
@@ -344,7 +346,7 @@
failure_audio_sinks:
ecore_list_destroy (ev->video_sinks);
failure_video_sinks:
- gst_object_unref (GST_OBJECT (ev->bus));
+ gst_object_unref (GST_OBJECT (ev->eos_bus));
failure_bus:
/* this call is not really necessary */
gst_element_set_state (ev->pipeline, GST_STATE_NULL);
@@ -368,7 +370,7 @@
gst_element_set_state (ev->pipeline, GST_STATE_NULL);
gst_object_unref (GST_OBJECT (ev->pipeline));
- gst_object_unref (GST_OBJECT (ev->bus));
+ gst_object_unref (GST_OBJECT (ev->eos_bus));
gst_deinit ();
ecore_list_destroy (ev->video_sinks);
@@ -393,7 +395,6 @@
Emotion_Gstreamer_Video *ev;
ev = (Emotion_Gstreamer_Video *)video;
- printf ("Open file gstreamer... %s\n", file);
/* Evas Object */
ev->obj = obj;
@@ -501,6 +502,12 @@
/* we clear the sink lists */
ecore_list_clear (ev->video_sinks);
ecore_list_clear (ev->audio_sinks);
+
+ /* shutdown eos */
+ if (ev->eos_timer) {
+ ecore_timer_del (ev->eos_timer);
+ ev->eos_timer = NULL;
+ }
}
static void
@@ -512,6 +519,9 @@
ev = (Emotion_Gstreamer_Video *)video;
gst_element_set_state (ev->pipeline, GST_STATE_PLAYING);
ev->play = 1;
+
+ /* eos */
+ ev->eos_timer = ecore_timer_add (0.1, _eos_timer_fct, ev);
}
static void
@@ -523,6 +533,12 @@
gst_element_set_state (ev->pipeline, GST_STATE_PAUSED);
ev->play = 0;
+
+ /* shutdown eos */
+ if (ev->eos_timer) {
+ ecore_timer_del (ev->eos_timer);
+ ev->eos_timer = NULL;
+ }
}
static void
@@ -1311,7 +1327,6 @@
ev = (Emotion_Gstreamer_Video *)user_data;
caps = gst_pad_get_caps (new_pad);
str = gst_caps_to_string (caps);
-/*g_print ("New pad : %s\n", str); */
/* video stream */
if (g_str_has_prefix (str, "video/")) {
Emotion_Video_Sink *vsink;
@@ -1643,39 +1658,6 @@
return bin;
}
-static gboolean
-_bus_call (GstBus *bus,
- GstMessage *msg,
- gpointerdata)
-{
- Emotion_Gstreamer_Video *ev;
-
- ev = (Emotion_Gstreamer_Video *)data;
- if (!ev) return 0;
-
- switch (GST_MESSAGE_TYPE (msg)) {
- case GST_MESSAGE_EOS:
- g_print ("End-of-stream\n");
- break;
- case GST_MESSAGE_ERROR: {
- gchar *debug;
- GError *err;
-
- gst_message_parse_error (msg, &err, &debug);
- g_free (debug);
-
- g_print ("Error: %s\n", err->message);
- g_error_free (err);
-
- break;
- }
- default:
- break;
- }
-
- return TRUE;
-}
-
static int
_cdda_pipeline_build (void *video, const char * device, unsigned int track)
{
@@ -1873,7 +1855,6 @@
gint64 time;
gst_query_parse_duration (query, NULL, &time);
- g_print (" duration : %" GST_TIME_FORMAT "\n\n",
GST_TIME_ARGS (time));
asink->length_time = (double)time / (double)GST_SECOND;
}
gst_query_unref (query);
@@ -1893,7 +1874,6 @@
GstElement *visbin;
g_snprintf (buf, 128, "visbin%d", index);
- g_print ("vis : %s\n", buf);
visbin = gst_bin_get_by_name (GST_BIN (ev->pipeline), buf);
if (visbin) {
GstPad *srcpad;
@@ -1930,8 +1910,6 @@
G_CALLBACK (cb_handoff), ev);
}
}
-
- gst_bus_add_watch (ev->bus, _bus_call, ev);
return 1;
@@ -1945,4 +1923,42 @@
gst_object_unref (GST_OBJECT (filesrc));
return 0;
+}
+
+int _eos_timer_fct (void *data)
+{
+ Emotion_Gstreamer_Video *ev;
+ GstMessage *msg;
+
+ ev = (Emotion_Gstreamer_Video *)data;
+ while ((msg = gst_bus_poll (ev->eos_bus, GST_MESSAGE_ERROR |
GST_MESSAGE_EOS, 0))) {
+ switch (GST_MESSAGE_TYPE(msg)) {
+ case GST_MESSAGE_ERROR: {
+ gchar *debug;
+ GError *err;
+
+ gst_message_parse_error
E CVS: gevas2 monkeyiq
Enlightenment CVS committal Author : monkeyiq Project : misc Module : gevas2 Dir : misc/gevas2 Modified Files: Makefile.am configure.in Added Files: gevas.pc.in Log Message: mainly build cleanups === RCS file: /cvs/e/misc/gevas2/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 10 Jan 2003 13:13:03 - 1.2 +++ Makefile.am 22 Apr 2006 10:05:56 - 1.3 @@ -12,4 +12,7 @@ SUBDIRS = src media demo -EXTRA_DIST = README AUTHORS COPYING TODO acconfig.h INSTALL gevas.spec +EXTRA_DIST = README AUTHORS COPYING TODO acconfig.h INSTALL gevas.spec gevas.pc.in gevas.pc + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = gevas.pc === RCS file: /cvs/e/misc/gevas2/configure.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- configure.in4 Aug 2005 04:12:15 - 1.7 +++ configure.in22 Apr 2006 10:05:56 - 1.8 @@ -1,6 +1,7 @@ AC_INIT(src/gevas.h) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(gevas, 2.2.1) +VERSION=2.2.1 +AM_INIT_AUTOMAKE(gevas, $VERSION ) AM_PATH_GTK_2_0( 2.2.0 ) @@ -38,7 +39,7 @@ have_edje=no -PKG_CHECK_MODULES(EDJE, edje >= 0.5.0, +PKG_CHECK_MODULES(EDJE, edje >= 0.4.9 ecore >= 0.9.9, [ have_edje=yes ], @@ -99,9 +100,13 @@ AC_SUBST(evas_cflags) AC_SUBST(evas_libs) +REQUIREMENTS="edje >= 0.4.9 ecore >= 0.9.9 " +AC_SUBST(REQUIREMENTS) + AC_OUTPUT([ Makefile src/Makefile media/Makefile demo/Makefile +gevas.pc ]) --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: gevas2 monkeyiq
Enlightenment CVS committal
Author : monkeyiq
Project : misc
Module : gevas2
Dir : misc/gevas2/src
Modified Files:
Makefile.am gevasedje.c gevasobj.c
Log Message:
mainly build cleanups
===
RCS file: /cvs/e/misc/gevas2/src/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Makefile.am 19 Nov 2004 15:13:12 - 1.5
+++ Makefile.am 22 Apr 2006 10:05:56 - 1.6
@@ -5,7 +5,7 @@
# A list of all the files in the current directory which can be regenerated
MAINTAINERCLEANFILES = Makefile.in
-LIBS_EVAS = @evas_ldflags@
+LIBS_EVAS = @evas_libs@
LIBS_EXTRA= -L/usr/local/lib @edb_libs@ @EDJE_LIBS@
===
RCS file: /cvs/e/misc/gevas2/src/gevasedje.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- gevasedje.c 4 Aug 2005 04:12:16 - 1.3
+++ gevasedje.c 22 Apr 2006 10:05:56 - 1.4
@@ -184,9 +184,9 @@
ev = GTK_GEVASEDJE(object);
-
-
- /* Chain up */
+//fprintf( stderr, "m_edje:%lx eobj:%lx \n", ev->m_edje, EVASO( ev ) );
+
+/* Chain up */
if (GTK_OBJECT_CLASS(parent_class)->destroy)
(*GTK_OBJECT_CLASS(parent_class)->destroy) (object);
}
===
RCS file: /cvs/e/misc/gevas2/src/gevasobj.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- gevasobj.c 4 Aug 2005 04:12:16 - 1.10
+++ gevasobj.c 22 Apr 2006 10:05:56 - 1.11
@@ -610,11 +610,13 @@
static void gevasobj_destroy(GtkObject * object)
{
+
GtkgEvasObj *ev;
g_return_if_fail(object != NULL);
g_return_if_fail(GTK_IS_GEVASOBJ(object));
ev = GTK_GEVASOBJ(object);
+
/* printf(" gevasobj_destroy() refc:%d\n", object->ref_count); */
_gevasobj_ensure_obj_free(object);
GEVAS(ev) = NULL;
---
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: gevas2 monkeyiq
Enlightenment CVS committal Author : monkeyiq Project : misc Module : gevas2 Dir : misc/gevas2/demo Modified Files: Makefile.am Log Message: mainly build cleanups === RCS file: /cvs/e/misc/gevas2/demo/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- Makefile.am 29 Apr 2005 05:20:29 - 1.7 +++ Makefile.am 22 Apr 2006 10:05:56 - 1.8 @@ -32,24 +32,24 @@ bin_PROGRAMS = $(TESTS) testgevas_SOURCES = testgevas.c -testgevas_LDADD = @evas_libs@ ../src/libgevas.la -lm @GTK_LIBS@ +testgevas_LDADD = @evas_libs@ ../src/libgevas.la -lm @GTK_LIBS@ @EDJE_LIBS@ gwinmaptest_SOURCES = gwinmaptest.c -gwinmaptest_LDADD = @evas_libs@ ../src/libgevas.la -lm @GTK_LIBS@ +gwinmaptest_LDADD = @evas_libs@ ../src/libgevas.la -lm @GTK_LIBS@ @EDJE_LIBS@ imagesize_SOURCES = imagesize.c -imagesize_LDADD = @evas_libs@ ../src/libgevas.la -lm @GTK_LIBS@ +imagesize_LDADD = @evas_libs@ ../src/libgevas.la -lm @GTK_LIBS@ @EDJE_LIBS@ rawimage_SOURCES = rawimage.c -rawimage_LDADD = @evas_libs@ ../src/libgevas.la -lm @GTK_LIBS@ +rawimage_LDADD = @evas_libs@ ../src/libgevas.la -lm @GTK_LIBS@ @EDJE_LIBS@ gevasanim_SOURCES = gevasanim.c -gevasanim_LDADD = @evas_libs@ ../src/libgevas.la -lm @GTK_LIBS@ +gevasanim_LDADD = @evas_libs@ ../src/libgevas.la -lm @GTK_LIBS@ @EDJE_LIBS@ signalconnect_SOURCES = signalconnect.c -signalconnect_LDADD = @evas_libs@ ../src/libgevas.la -lm @GTK_LIBS@ +signalconnect_LDADD = @evas_libs@ ../src/libgevas.la -lm @GTK_LIBS@ @EDJE_LIBS@ gevasedje_SOURCES = gevasedje.c -gevasedje_LDADD = @evas_libs@ ../src/libgevas.la -lm @GTK_LIBS@ +gevasedje_LDADD = @evas_libs@ ../src/libgevas.la -lm @GTK_LIBS@ @EDJE_LIBS@ --- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
