Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_container.c e_container.h e_error.c e_pointer.c e_pointer.h
Log Message:
rename pointer images, different edje group names (better namespace i guess),
rationalise pointer usage down to 1 for init, 1 for everything else.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_container.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- e_container.c 17 Aug 2005 01:35:48 -0000 1.77
+++ e_container.c 24 Aug 2005 04:22:52 -0000 1.78
@@ -123,7 +123,6 @@
evas_object_show(o);
con->pointer.root = e_pointer_window_set(con->manager->root);
- con->pointer.win = e_pointer_window_set(con->win);
con->num = container_num;
container_num++;
@@ -892,7 +891,6 @@
int i;
if (con->pointer.root) e_object_del(E_OBJECT(con->pointer.root));
- if (con->pointer.win) e_object_del(E_OBJECT(con->pointer.win));
ecore_x_window_del(con->event_win);
if (con->gadman) e_object_del(E_OBJECT(con->gadman));
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_container.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- e_container.h 17 Aug 2005 01:35:48 -0000 1.28
+++ e_container.h 24 Aug 2005 04:22:52 -0000 1.29
@@ -57,7 +57,6 @@
struct {
E_Pointer *root;
- E_Pointer *win;
} pointer;
};
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_error.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- e_error.c 17 Aug 2005 01:35:48 -0000 1.24
+++ e_error.c 24 Aug 2005 04:22:52 -0000 1.25
@@ -61,7 +61,6 @@
Evas_Coord maxw, maxh;
E_Container *con;
Ecore_X_Window win;
- E_Pointer *p;
int x, y;
char *s;
@@ -94,8 +93,6 @@
ecore_evas_title_set(ee, "Enlightenment: Low Level Dialog");
// ecore_evas_avoid_damage_set(ee, 1);
e = ecore_evas_get(ee);
- p = e_pointer_window_set(win);
- ecore_evas_data_set(ee, "pointer", p);
o = edje_object_add(e);
if (!e_theme_edje_object_set(o, "base/theme/error", "error/main"))
@@ -423,17 +420,12 @@
{
Ecore_Evas *ee;
Evas_List *shapelist, *l;
- E_Pointer *p;
ee = data;
shapelist = ecore_evas_data_get(ee, "shapes");
- for (l = shapelist; l; l = l->next)
- e_object_del(E_OBJECT(l->data));
+ for (l = shapelist; l; l = l->next) e_object_del(E_OBJECT(l->data));
evas_list_free(shapelist);
- p = ecore_evas_data_get(ee, "pointer");
- e_object_del(E_OBJECT(p));
-
e_canvas_del(ee);
ecore_evas_free(ee);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_pointer.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_pointer.c 21 Aug 2005 23:37:28 -0000 1.7
+++ e_pointer.c 24 Aug 2005 04:22:52 -0000 1.8
@@ -56,28 +56,19 @@
{
if (!e_theme_edje_object_set(o,
"base/theme/pointer",
- "pointer/enlightenment/default"))
- {
- /* error */
- printf("ERROR: No default theme for pointer!\n");
- if (!e_theme_edje_object_set(o,
- "base/theme/pointer",
- "pointer/enlightenment/mono"))
- {
- /* error */
- printf("ERROR: No mono theme for pointer!\n");
- }
- }
+ "pointer/enlightenment/default/color"))
+ e_theme_edje_object_set(o,
+ "base/theme/pointer",
+ "pointer/enlightenment/default/mono");
}
else
{
if (!e_theme_edje_object_set(o,
"base/theme/pointer",
- "pointer/enlightenment/mono"))
- {
- /* error */
- printf("ERROR: No mono theme for pointer!\n");
- }
+ "pointer/enlightenment/default/mono"))
+ e_theme_edje_object_set(o,
+ "base/theme/pointer",
+ "pointer/enlightenment/default/color");
}
/* Create the hotspot object */
@@ -109,15 +100,15 @@
p = l->data;
updates = evas_render_updates(p->evas);
- if (updates)
+ if ((updates) || (p->hot.update))
{
Ecore_X_Cursor cur;
cur = ecore_x_cursor_new(p->win, p->pixels, p->w, p->h, p->hot.x,
p->hot.y);
ecore_x_window_cursor_set(p->win, cur);
ecore_x_cursor_free(cur);
-
evas_render_updates_free(updates);
+ p->hot.update = 0;
}
}
}
@@ -131,8 +122,12 @@
p = data;
evas_object_geometry_get(p->hot_object, &x, &y, NULL, NULL);
- p->hot.x = x;
- p->hot.y = y;
+ if ((p->hot.x != x) || (p->hot.y != y))
+ {
+ p->hot.x = x;
+ p->hot.y = y;
+ p->hot.update = 1;
+ }
}
static void
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_pointer.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_pointer.h 21 Aug 2005 23:37:28 -0000 1.6
+++ e_pointer.h 24 Aug 2005 04:22:52 -0000 1.7
@@ -13,20 +13,18 @@
struct _E_Pointer
{
- E_Object e_obj_inherit;
-
- Evas *evas;
- Evas_Object *pointer_object;
- Evas_Object *hot_object;
- int *pixels;
-
- Ecore_X_Window win;
-
- int w, h;
-
- struct {
- int x, y;
- } hot;
+ E_Object e_obj_inherit;
+
+ Evas *evas;
+ Evas_Object *pointer_object;
+ Evas_Object *hot_object;
+ int *pixels;
+ Ecore_X_Window win;
+ int w, h;
+ struct {
+ int x, y;
+ unsigned char update : 1;
+ } hot;
};
EAPI E_Pointer *e_pointer_window_set(Ecore_X_Window win);
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
