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.h Ecore_X_Atoms.h Makefile.am ecore_x.c ecore_x_dnd.c ecore_x_e.c ecore_x_icccm.c ecore_x_mwm.c ecore_x_netwm.c ecore_x_private.h ecore_xcb_atom.c Added Files: ecore_x_atoms.c ecore_x_atoms_decl.h Log Message: moe all atom fetching to 1 round trip instead of 200 of them... and mrge into 1 bit of code to do it. === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/Ecore_X.h,v retrieving revision 1.199 retrieving revision 1.200 diff -u -3 -r1.199 -r1.200 --- Ecore_X.h 30 Jun 2008 08:39:36 - 1.199 +++ Ecore_X.h 9 Jul 2008 15:18:55 - 1.200 @@ -1274,7 +1274,8 @@ EAPI voidecore_x_atom_get_prefetch(const char *name); EAPI voidecore_x_atom_get_fetch(void); EAPI Ecore_X_Atomecore_x_atom_get(const char *name); - +EAPI voidecore_x_atoms_get(const char **names, int num, Ecore_X_Atom *atoms); + EAPI voidecore_x_icccm_init(void); === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/Ecore_X_Atoms.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- Ecore_X_Atoms.h 8 Apr 2007 20:52:54 - 1.16 +++ Ecore_X_Atoms.h 9 Jul 2008 15:18:55 - 1.17 @@ -9,88 +9,114 @@ * @brief Ecore X atoms */ -/* General */ -EAPI extern Ecore_X_Atom ECORE_X_ATOM_UTF8_STRING; +/* generic atoms */ +EAPI extern Ecore_X_Atom ECORE_X_ATOM_ATOM; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_CARDINAL; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_COMPOUND_TEXT; EAPI extern Ecore_X_Atom ECORE_X_ATOM_FILE_NAME; EAPI extern Ecore_X_Atom ECORE_X_ATOM_STRING; EAPI extern Ecore_X_Atom ECORE_X_ATOM_TEXT; -EAPI extern Ecore_X_Atom ECORE_X_ATOM_COMPOUND_TEXT; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_UTF8_STRING; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_WINDOW; -/* ICCCM */ -EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_STATE; -EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_DELETE_WINDOW; -EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_TAKE_FOCUS; -EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_PROTOCOLS; -EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_CLASS; +/* dnd atoms */ +EAPI extern Ecore_X_Atom ECORE_X_ATOM_SELECTION_XDND; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_SELECTION_PROP_XDND; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_AWARE; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_ENTER; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_TYPE_LIST; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_POSITION; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_COPY; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_MOVE; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_PRIVATE; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_ASK; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_LIST; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_LINK; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_ACTION_DESCRIPTION; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_PROXY; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_STATUS; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_LEAVE; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_DROP; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_XDND_FINISHED; + +/* dnd atoms that need to be exposed to the application interface */ +EAPI extern Ecore_X_Atom ECORE_X_DND_ACTION_COPY; +EAPI extern Ecore_X_Atom ECORE_X_DND_ACTION_MOVE; +EAPI extern Ecore_X_Atom ECORE_X_DND_ACTION_LINK; +EAPI extern Ecore_X_Atom ECORE_X_DND_ACTION_ASK; +EAPI extern Ecore_X_Atom ECORE_X_DND_ACTION_PRIVATE; + +/* old E atom */ +EAPI extern Ecore_X_Atom ECORE_X_ATOM_E_FRAME_SIZE; + +/* old Gnome atom */ +EAPI extern Ecore_X_Atom ECORE_X_ATOM_WIN_LAYER; + +/* ICCCM: client properties */ EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_NAME; -EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_COMMAND; EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_ICON_NAME; -EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_CLIENT_MACHINE; -EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_CHANGE_STATE; -EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_COLORMAP_WINDOWS; -EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_WINDOW_ROLE; -EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_HINTS; EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_NORMAL_HINTS; -EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_CLIENT_LEADER; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_SIZE_HINTS; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_HINTS; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_CLASS; EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_TRANSIENT_FOR; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_PROTOCOLS; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_COLORMAP_WINDOWS; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_COMMAND; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_CLIENT_MACHINE; + +/* ICCCM: window manager properties */ +EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_STATE; +EAPI extern Ecore_X_Atom ECORE_X_ATOM_WM_ICON_SIZE;
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_atoms.c e_hints.c e_manager.c
Log Message:
get hints in batches
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_atoms.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_atoms.c 7 Jan 2006 10:39:45 - 1.14
+++ e_atoms.c 9 Jul 2008 15:25:20 - 1.15
@@ -19,17 +19,31 @@
EAPI int
e_atoms_init(void)
{
- E_ATOM_MANAGED = ecore_x_atom_get(__E_WINDOW_MANAGED);
- E_ATOM_CONTAINER = ecore_x_atom_get(__E_WINDOW_CONTAINER);
- E_ATOM_ZONE = ecore_x_atom_get(__E_WINDOW_ZONE);
- E_ATOM_DESK = ecore_x_atom_get(__E_WINDOW_DESK);
- E_ATOM_MAPPED = ecore_x_atom_get(__E_WINDOW_MAPPED);
- E_ATOM_SHADE_DIRECTION = ecore_x_atom_get(__E_WINDOW_SHADE_DIRECTION);
- E_ATOM_HIDDEN = ecore_x_atom_get(__E_WINDOW_HIDDEN);
- E_ATOM_BORDER_SIZE = ecore_x_atom_get(__E_WINDOW_BORDER_SIZE);
- E_ATOM_WINDOW_STATE = ecore_x_atom_get(__E_ATOM_WINDOW_STATE);
- E_ATOM_WINDOW_STATE_CENTERED =
ecore_x_atom_get(__E_ATOM_WINDOW_STATE_CENTERED);
-
+ const char *atom_names[] = {
+ __E_WINDOW_MANAGED,
+ __E_WINDOW_CONTAINER,
+ __E_WINDOW_ZONE,
+ __E_WINDOW_DESK,
+ __E_WINDOW_MAPPED,
+ __E_WINDOW_SHADE_DIRECTION,
+ __E_WINDOW_HIDDEN,
+ __E_WINDOW_BORDER_SIZE,
+ __E_ATOM_WINDOW_STATE,
+ __E_ATOM_WINDOW_STATE_CENTERED
+ };
+ Ecore_X_Atom atoms[10];
+
+ ecore_x_atoms_get(atom_names, 10, atoms);
+ E_ATOM_MANAGED = atoms[0];
+ E_ATOM_CONTAINER = atoms[1];
+ E_ATOM_ZONE = atoms[2];
+ E_ATOM_DESK = atoms[3];
+ E_ATOM_MAPPED = atoms[4];
+ E_ATOM_SHADE_DIRECTION = atoms[5];
+ E_ATOM_HIDDEN = atoms[6];
+ E_ATOM_BORDER_SIZE = atoms[7];
+ E_ATOM_WINDOW_STATE = atoms[8];
+ E_ATOM_WINDOW_STATE_CENTERED = atoms[9];
return 1;
}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_hints.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -3 -r1.99 -r1.100
--- e_hints.c 5 Jul 2008 09:22:14 - 1.99
+++ e_hints.c 9 Jul 2008 15:25:20 - 1.100
@@ -6,14 +6,31 @@
Ecore_X_Atom _QTOPIA_SOFT_MENU = 0;
Ecore_X_Atom _QTOPIA_SOFT_MENUS = 0;
+static Ecore_X_Atom gnome_atom = 0;
+static Ecore_X_Atom enlightenment_comms = 0;
+static Ecore_X_Atom enlightenment_version = 0;
+
EAPI void
e_hints_init(void)
{
Ecore_X_Window *roots = NULL;
int num;
-
- _QTOPIA_SOFT_MENU = ecore_x_atom_get(_QTOPIA_SOFT_MENU);
- _QTOPIA_SOFT_MENUS = ecore_x_atom_get(_QTOPIA_SOFT_MENUS);
+ const char *atom_names[] = {
+ _QTOPIA_SOFT_MENU,
+ _QTOPIA_SOFT_MENUS,
+ GNOME_SM_PROXY,
+ ENLIGHTENMENT_COMMS,
+ ENLIGHTENMENT_VERSION
+ };
+ Ecore_X_Atom atoms[5];
+
+ ecore_x_atoms_get(atom_names, 5, atoms);
+ _QTOPIA_SOFT_MENU = atoms[0];
+ _QTOPIA_SOFT_MENUS = atoms[1];
+ gnome_atom = atoms[2];
+ enlightenment_comms = atoms[3];
+ enlightenment_version = atoms[4];
+
roots = ecore_x_window_root_list(num);
if (roots)
{
@@ -173,24 +190,19 @@
e_hints_e16_comms_pretend(E_Manager *man)
{
Ecore_X_Window win;
- Ecore_X_Atom enlightenment_comms, enlightenment_version, string;
char buf[256];
- enlightenment_comms = ecore_x_atom_get(ENLIGHTENMENT_COMMS);
- enlightenment_version = ecore_x_atom_get(ENLIGHTENMENT_VERSION);
- string = ecore_x_atom_get(STRING);
-
win = ecore_x_window_input_new(man-root, -100, -100, 1, 1);
/* to help detect this is NOT e16 */
snprintf(buf, sizeof(buf), Enlightenment %s, VERSION);
- ecore_x_window_prop_property_set(win, enlightenment_version, string, 8,
buf, strlen(buf));
- ecore_x_window_prop_property_set(man-root, enlightenment_version, string,
8, buf, strlen(buf));
+ ecore_x_window_prop_property_set(win, enlightenment_version,
ECORE_X_ATOM_STRING, 8, buf, strlen(buf));
+ ecore_x_window_prop_property_set(man-root, enlightenment_version,
ECORE_X_ATOM_STRING, 8, buf, strlen(buf));
snprintf(buf, sizeof(buf), WINID %8x, (int)win);
- ecore_x_window_prop_property_set(win, enlightenment_comms, string, 8, buf,
14);
+ ecore_x_window_prop_property_set(win, enlightenment_comms,
ECORE_X_ATOM_STRING, 8, buf, 14);
- ecore_x_window_prop_property_set(man-root, enlightenment_comms, string, 8,
buf, 14);
+ ecore_x_window_prop_property_set(man-root, enlightenment_comms,
ECORE_X_ATOM_STRING, 8, buf, 14);
}
EAPI void
@@ -1370,12 +1382,9 @@
EAPI void
e_hints_openoffice_gnome_fake(Ecore_X_Window root)
{
- Ecore_X_Atom gnome_atom, string_atom;
const char *string = GNOME_SM_PROXY;
- gnome_atom = ecore_x_atom_get(GNOME_SM_PROXY);
- string_atom = ecore_x_atom_get(STRING);
- ecore_x_window_prop_property_set(root, gnome_atom, string_atom,
+ ecore_x_window_prop_property_set(root, gnome_atom,
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_atoms.c
Log Message:
and fix mwm hint
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_atoms.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ecore_x_atoms.c 9 Jul 2008 15:18:55 - 1.1
+++ ecore_x_atoms.c 9 Jul 2008 15:28:10 - 1.2
@@ -86,7 +86,7 @@
{ WM_CLIENT_LEADER, ECORE_X_ATOM_WM_CLIENT_LEADER },
{ WM_WINDOW_ROLE, ECORE_X_ATOM_WM_WINDOW_ROLE },
- { MOTIF_WM_HINTS, ECORE_X_ATOM_MOTIF_WM_HINTS },
+ { _MOTIF_WM_HINTS, ECORE_X_ATOM_MOTIF_WM_HINTS },
{ _NET_SUPPORTED, ECORE_X_ATOM_NET_SUPPORTED },
{ _NET_CLIENT_LIST, ECORE_X_ATOM_NET_CLIENT_LIST },
-
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/include
Modified Files:
evas_common.h
Log Message:
* move _Evas_Object_List and _Evas_Hash structures to Evas_Data.h
* move Evas_Array_Hash and Evas_Object_List declarations to Evas_Data.h
* move evas_array_hash.c from engines/common/ to data/
* remove Evas_Array_Double_Hash declaration (not used)
===
RCS file: /cvs/e/e17/libs/evas/src/lib/include/evas_common.h,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -3 -r1.105 -r1.106
--- evas_common.h 2 Jul 2008 04:44:38 - 1.105
+++ evas_common.h 9 Jul 2008 16:50:33 - 1.106
@@ -130,8 +130,6 @@
typedef unsigned short DATA16;
typedef unsigned char DATA8;
-typedef struct _Evas_Object_ListEvas_Object_List;
-
typedef struct _Image_Entry Image_Entry;
typedef struct _Image_Entry_Flags Image_Entry_Flags;
typedef struct _Engine_Image_Entry Engine_Image_Entry;
@@ -163,9 +161,6 @@
typedef struct _Tilebuf_TileTilebuf_Tile;
typedef struct _Tilebuf_Rect Tilebuf_Rect;
-typedef struct _Evas_Array_HashEvas_Array_Hash;
-typedef struct _Evas_Array_Hash Evas_Array_Double_Hash;
-
/*
typedef struct _Regionbuf Regionbuf;
typedef struct _RegionspanRegionspan;
@@ -240,18 +235,6 @@
/*/
-struct _Evas_Object_List
-{
- Evas_Object_List *next, *prev;
- Evas_Object_List *last;
-};
-
-struct _Evas_Hash
-{
- int population;
- Evas_Object_List *buckets[256];
-};
-
struct _RGBA_Image_Loadopts
{
int scale_down_by; // if 1 then use this
@@ -1275,14 +1258,6 @@
EAPI void evas_common_pipe_image_draw(RGBA_Image *src, RGBA_Image *dst,
RGBA_Draw_Context *dc, int smooth, int src_region_x, int src_region_y, int
src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int
dst_region_w, int dst_region_h);
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);
-
-void evas_stringshare_init(void);
-void evas_stringshare_shutdown(void);
//
EAPI Evas_Cache_Image* evas_cache_image_init(const
Evas_Cache_Image_Func *cb);
-
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib
Modified Files:
Evas_Data.h
Log Message:
* move _Evas_Object_List and _Evas_Hash structures to Evas_Data.h
* move Evas_Array_Hash and Evas_Object_List declarations to Evas_Data.h
* move evas_array_hash.c from engines/common/ to data/
* remove Evas_Array_Double_Hash declaration (not used)
===
RCS file: /cvs/e/e17/libs/evas/src/lib/Evas_Data.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Evas_Data.h 2 Jul 2008 04:44:37 - 1.1
+++ Evas_Data.h 9 Jul 2008 16:50:32 - 1.2
@@ -34,9 +34,12 @@
typedef unsigned char Evas_Bool;
-typedef struct _Evas_ArrayEvas_Array;/** A generic vector */
-typedef struct _Evas_Hash Evas_Hash; /** A Hash table handle
*/
-typedef struct _Evas_List Evas_List; /** A generic linked
list node handle */
+typedef struct _Evas_Array Evas_Array; /** A generic vector
*/
+typedef struct _Evas_Array_Hash Evas_Array_Hash;
+typedef struct _Evas_HashEvas_Hash; /** A Hash table
handle */
+typedef struct _Evas_ListEvas_List; /** A generic linked
list node handle */
+typedef struct _Evas_Object_List Evas_Object_List;
+
struct _Evas_Array /** An array of data */
{
@@ -46,6 +49,12 @@
unsigned int step; /** How much must we grow the vector When it
is full */
};
+struct _Evas_Hash
+{
+ int population;
+ Evas_Object_List *buckets[256];
+};
+
struct _Evas_List /** A linked list node */
{
void *data; /** Pointer to list element
payload */
@@ -54,6 +63,12 @@
struct _Evas_List_Accounting *accounting; /** Private list accounting
info - don't touch */
};
+struct _Evas_Object_List
+{
+ Evas_Object_List *next, *prev;
+ Evas_Object_List *last;
+};
+
#ifdef __cplusplus
extern C {
@@ -74,6 +89,16 @@
/*
+ * Evas Array functions
+ */
+
+ EAPI Evas_Array_Hash *evas_array_hash_new(void);
+ EAPI void evas_array_hash_free (Evas_Array_Hash *hash);
+ EAPI void evas_array_hash_add(Evas_Array_Hash *hash,
int key, int data);
+ EAPI int evas_array_hash_search (Evas_Array_Hash *hash,
int key);
+
+
+ /*
* Evas Hash functions
*/
@@ -126,6 +151,8 @@
* Evas Stringshare functions
*/
+ EAPI voidevas_stringshare_init (void); /* not
implemented */
+ EAPI voidevas_stringshare_shutdown (void); /* not
implemented */
EAPI const char *evas_stringshare_add(const char *str);
EAPI voidevas_stringshare_del(const char *str);
-
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib/engines/common Modified Files: Makefile.am Removed Files: evas_array_hash.c Log Message: * move _Evas_Object_List and _Evas_Hash structures to Evas_Data.h * move Evas_Array_Hash and Evas_Object_List declarations to Evas_Data.h * move evas_array_hash.c from engines/common/ to data/ * remove Evas_Array_Double_Hash declaration (not used) === RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/Makefile.am,v retrieving revision 1.28 retrieving revision 1.29 diff -u -3 -r1.28 -r1.29 --- Makefile.am 19 May 2008 03:13:16 - 1.28 +++ Makefile.am 9 Jul 2008 16:50:32 - 1.29 @@ -59,7 +59,6 @@ evas_scale_span.c \ evas_tiler.c \ evas_regionbuf.c \ -evas_array_hash.c \ evas_pipe.c EXTRA_DIST = \ - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib/data Modified Files: Makefile.am Added Files: evas_array_hash.c Log Message: * move _Evas_Object_List and _Evas_Hash structures to Evas_Data.h * move Evas_Array_Hash and Evas_Object_List declarations to Evas_Data.h * move evas_array_hash.c from engines/common/ to data/ * remove Evas_Array_Double_Hash declaration (not used) === RCS file: /cvs/e/e17/libs/evas/src/lib/data/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- Makefile.am 26 May 2008 13:17:12 - 1.11 +++ Makefile.am 9 Jul 2008 16:50:32 - 1.12 @@ -15,6 +15,7 @@ evas_list.c \ evas_array.c \ evas_object_list.c \ -evas_stringshare.c +evas_stringshare.c \ +evas_array_hash.c libevas_data_la_DEPENDENCIES = $(top_builddir)/config.h - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib Modified Files: Evas_Data.h Log Message: fix comment === RCS file: /cvs/e/e17/libs/evas/src/lib/Evas_Data.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Evas_Data.h 9 Jul 2008 16:50:32 - 1.2 +++ Evas_Data.h 9 Jul 2008 16:56:33 - 1.3 @@ -89,7 +89,7 @@ /* - * Evas Array functions + * Evas Array Hash functions */ EAPI Evas_Array_Hash *evas_array_hash_new(void); - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ 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/conf_borders
Modified Files:
e_int_config_borders.c
Log Message:
atrocity! fix!
===
RCS file: /cvs/e/e17/apps/e/src/modules/conf_borders/e_int_config_borders.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_int_config_borders.c 16 Jan 2008 19:14:05 - 1.4
+++ e_int_config_borders.c 9 Jul 2008 19:38:35 - 1.5
@@ -139,18 +139,18 @@
}
if (cfdata-remember_border)
{
- if (!cfdata-border-remember)
+ if (!cfdata-border-remember)
+ {
cfdata-border-remember = e_remember_new();
- {
if (cfdata-border-remember)
- e_remember_use(cfdata-border-remember);
- }
- if (cfdata-border-remember)
- {
+ e_remember_use(cfdata-border-remember);
+ }
+ if (cfdata-border-remember)
+ {
cfdata-border-remember-apply |= E_REMEMBER_APPLY_BORDER;
cfdata-border-remember-match =
e_remember_default_match(cfdata-border);
e_remember_update(cfdata-border-remember, cfdata-border);
- }
+ }
}
else
{
-
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/exquisite raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/exquisite Dir : e17/apps/exquisite Modified Files: configure.in Log Message: don't link to what you don't need. === RCS file: /cvs/e/e17/apps/exquisite/configure.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- configure.in2 Nov 2007 06:21:08 - 1.1 +++ configure.in9 Jul 2008 20:49:47 - 1.2 @@ -104,10 +104,7 @@ PKG_CHECK_MODULES([ECORE], [ ecore-con ecore-evas - ecore-ipc - ecore-job - ecore-txt - ecore-file]) + ecore-ipc]) AC_ARG_WITH(edje-cc, [ --with-edje-cc=PATH specify a specific path to edje_cc], - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl jethomas
Enlightenment CVS committal
Author : jethomas
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/data/themes/e17/groups
Modified Files:
text.edc
Log Message:
Add small padding
===
RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/groups/text.edc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- text.edc13 Jun 2008 18:47:37 - 1.6
+++ text.edc9 Jul 2008 21:45:57 - 1.7
@@ -14,6 +14,7 @@
{
item: inset 2;
item: inset/left 6;
+ item: pad 1;
}
parts
-
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
___
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/bin/tests/object
Modified Files:
ewl_object_test.c
Log Message:
add unit test for the returned values of preferred_size_get()
===
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/object/ewl_object_test.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ewl_object_test.c 11 Jun 2008 23:04:43 - 1.12
+++ ewl_object_test.c 9 Jul 2008 22:56:59 - 1.13
@@ -27,6 +27,7 @@
static int position_size_test_set_get(char *buf, int len);
static int preferred_inner_size_test_set_get(char *buf, int len);
static int preferred_size_test_set_get(char *buf, int len);
+static int preferred_size_test_get(char *buf, int len);
static int minimum_size_test_set_get(char *buf, int len);
static int maximum_size_test_set_get(char *buf, int len);
static int minimum_size_test_set_request(char *buf, int len);
@@ -50,6 +51,7 @@
{position size set/get, position_size_test_set_get, NULL,
-1, 0},
{preferred inner size set/get,
preferred_inner_size_test_set_get, NULL, -1, 0},
{preferred size set/get, preferred_size_test_set_get, NULL,
-1, 0},
+{preferred size get, preferred_size_test_get, NULL, -1, 0},
{minimum size set/get, minimum_size_test_set_get, NULL, -1,
0},
{maximum size set/get, maximum_size_test_set_get, NULL, -1,
0},
{minimum size set/request, minimum_size_test_set_request,
NULL, -1, 0},
@@ -459,6 +461,97 @@
width, height);
ewl_widget_destroy(w);
+
+return ret;
+}
+
+/*
+ * Set different sizes (minimum, maximum, preferred) and fill policies
+ * and test if it returns the right size
+ */
+static int
+preferred_size_test_get(char *buf, int len)
+{
+Ewl_Object *o;
+int width, height;
+int ret = 0;
+const int small_w = 13;
+const int medium_w = 20;
+const int large_w = 30;
+const int small_h = 7;
+const int medium_h = 30;
+const int large_h = 32;
+
+o = EWL_OBJECT(ewl_widget_new());
+
+ewl_object_preferred_inner_size_set(o, medium_w, medium_h);
+
+ewl_object_preferred_size_get(o, width, height);
+if (width != medium_w height != medium_h)
+{
+LOG_FAILURE(buf, len,
+Preferred size differs from the set value
+set: %dx%d get: %dx%d,
+medium_w, medium_h, width, height);
+goto DONE;
+}
+
+/* now set a minimum size that is larger then the preferred size */
+ewl_object_minimum_size_set(o, large_w, large_h);
+ewl_object_preferred_size_get(o, width, height);
+if (width != large_w || height != large_h)
+{
+LOG_FAILURE(buf, len,
+Preferred size differs from the minimum size
+expect: %dx%d get: %dx%d,
+large_w, large_h, width, height);
+goto DONE;
+}
+/* reset the minimum size */
+ewl_object_minimum_size_set(o, 0, 0);
+
+/* set a maximum size that is smaller then the preferred size */
+ewl_object_maximum_size_set(o, small_w, small_h);
+ewl_object_preferred_size_get(o, width, height);
+if (width != small_w || height != small_h)
+{
+LOG_FAILURE(buf, len,
+Preferred size differs from the maximum size
+expect: %dx%d get: %dx%d,
+small_w, small_h, width, height);
+goto DONE;
+}
+/* reset the minimum size */
+ewl_object_maximum_size_set(o, 0, 0);
+
+/* set a smaller minimum size, but set the fill policy to shrink */
+ewl_object_minimum_size_set(o, small_w, small_h);
+ewl_object_fill_policy_set(o, EWL_FLAG_FILL_SHRINK);
+ewl_object_preferred_size_get(o, width, height);
+if (width != small_w || height != small_h)
+{
+LOG_FAILURE(buf, len,
+Preferred size differs from the minimum size
+expect: %dx%d get: %dx%d,
+small_w, small_h, width, height);
+goto DONE;
+}
+
+/* do the same but this time with a larger minimum size */
+ewl_object_minimum_size_set(o, large_w, large_h);
+ewl_object_preferred_size_get(o, width, height);
+if (width != large_w || height != large_h)
+{
+LOG_FAILURE(buf, len,
+Preferred size differs from the minimum size
+
E CVS: libs/ewl pfritz
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/doc/tutorials Modified Files: fill_policies.dox Log Message: update docs to reflect the fill policy changes done some days ago === RCS file: /cvs/e/e17/libs/ewl/doc/tutorials/fill_policies.dox,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- fill_policies.dox 26 Apr 2008 17:41:07 - 1.2 +++ fill_policies.dox 9 Jul 2008 23:06:12 - 1.3 @@ -1,14 +1,21 @@ /** * @page fill_policies Fill Policies -As widgets are packed together their fill policies kick in and -adjust the widget sizes as needed to make everything fit. The fill -policies of Ewl can be a bit confusing for the first time user, hell, -I still have problems at times. +Ewl is a container-based widget library, this means that the container will +care to place its children. As point of reference the preferred size of the +child is used. In the case (and these cases are not rare) that the container +has more free space or less free space to distribute the fill policies of the +children kick in and adjust the widget sizes as needed to make everything fit. +Thus you can give the container hints if the child is stick to its preferred +size or if it can grow and/or shrink. The fill policies of Ewl can be a bit +confusing for the first time user. But once you understood the concept, +it gives you the power to arrange the widget as you like without being a worry +to the underlying calculations, which are fortunately done by the container. @section fill_users Using the fill policy The basis for how fill policies fit together is shown the following image. [EMAIL PROTECTED] Update this image @image html object_sizing.png @@ -18,29 +25,55 @@ - maximum size As the name implies the widget wants to be set to its [EMAIL PROTECTED] preferred size whenever possible. If the fill policy allows, the -widget can also shrink or grow within the bounds of its @e minimum and [EMAIL PROTECTED] maximum sizes. - [EMAIL PROTECTED] -Fill Policy | Effect - -EWL_FLAG_FILL_NONE| Do not fill or shrink in any direction -EWL_FLAG_FILL_VSHRINK | Vertically shrink -EWL_FLAG_FILL_HSHRINK | Horizontally shrink -EWL_FLAG_FILL_SHRINK | Shrink both horizontally and vertically -EWL_FLAG_FILL_VFILL | Vertically fill -EWL_FLAG_FILL_HFILL | Horizontally fill -EWL_FLAG_FILL_FILL| Fill both horizontally and vertically -EWL_FLAG_FILL_ALL | Shrink or fill as needed [EMAIL PROTECTED] [EMAIL PROTECTED] preferred size whenever possible. If the fill policy allows, the widget can +also shrink or grow within the bounds of its @e minimum and @e maximum sizes. + [EMAIL PROTECTED] @c EWL_FLAG_FILL_NONE +Do not fill or shrink in any direction [EMAIL PROTECTED] @c EWL_FLAG_FILL_VSHRINKABLE +Vertically shrinkable [EMAIL PROTECTED] @c EWL_FLAG_FILL_HSHRINKABLE +Horizontally shrinkable [EMAIL PROTECTED] @c EWL_FLAG_FILL_SHRINKABLE +Shrinkable both horizontally and vertically [EMAIL PROTECTED] @c EWL_FLAG_FILL_VSHRINK +Vertically shrink [EMAIL PROTECTED] @c EWL_FLAG_FILL_HSHRINK +Horizontally shrink [EMAIL PROTECTED] @c EWL_FLAG_FILL_SHRINK +Shrink both horizontally and vertically [EMAIL PROTECTED] @c EWL_FLAG_FILL_VFILL +Vertically fill [EMAIL PROTECTED] @c EWL_FLAG_FILL_HFILL +Horizontally fill [EMAIL PROTECTED] @c EWL_FLAG_FILL_FILL +Fill both horizontally and vertically [EMAIL PROTECTED] @c EWL_FLAG_FILL_ALL +Shrink or fill as needed + +You can combine any combination of fill policies with a binary OR. For example [EMAIL PROTECTED] EWL_FLAG_FILL_VSHRINK | @c EWL_FLAG_FILL_HSHRINK is the same like [EMAIL PROTECTED] EWL_FLAG_FILL_SHRINK. + [EMAIL PROTECTED] shrink_or_shrinkable The difference between shrink and shrinkable +But what is the difference between the 'shrink' and the 'shrinkable' fill policy? +The 'shrink' fill policy is used if the widget really wants to be shrunk, i.e. +it prefers its minimum size over its actual set preferred size. Hence the +container will only consider the minimum size of the child to calculate the +preferred size. This fill policy is useful in cases, where you do not really +want that the widget is shown in its full size. For example you do not want +to show all items in a scrollpane, because if you'd want that you wouldn't use +a scrollpane. So for a vertical scrollpane you can use @c VSHRINK, for example. +The scrollpane will not show the whole list of the items, but it will make the +scrollpane width enough, therefor each child fits into it and you don't need +a horizontal scrollbar. @section fill_guide Guidelines for container authors As you have seen in the previous section fill policies and the three different sizes are very
E CVS: libs/ewl jethomas
Enlightenment CVS committal
Author : jethomas
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_entry.c
Log Message:
Check the proper type.
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_entry.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -3 -r1.90 -r1.91
--- ewl_entry.c 6 Jul 2008 04:32:42 - 1.90
+++ ewl_entry.c 9 Jul 2008 23:29:35 - 1.91
@@ -283,7 +283,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR(w);
-DCHECK_TYPE(w, EWL_WIDGET_TYPE);
+DCHECK_TYPE(w, EWL_ENTRY_TYPE);
e = EWL_ENTRY(w);
if (!e-editable)
@@ -326,7 +326,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR(w);
-DCHECK_TYPE(w, EWL_WIDGET_TYPE);
+DCHECK_TYPE(w, EWL_ENTRY_TYPE);
entry = EWL_ENTRY(w);
if (entry-editable !VISIBLE(entry-cursor))
@@ -351,7 +351,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR(w);
-DCHECK_TYPE(w, EWL_WIDGET_TYPE);
+DCHECK_TYPE(w, EWL_ENTRY_TYPE);
entry = EWL_ENTRY(w);
if (entry-editable VISIBLE(entry-cursor))
@@ -376,7 +376,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR(w);
-DCHECK_TYPE(w, EWL_WIDGET_TYPE);
+DCHECK_TYPE(w, EWL_ENTRY_TYPE);
event = ev;
e = EWL_ENTRY(w);
@@ -468,7 +468,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR(w);
-DCHECK_TYPE(w, EWL_WIDGET_TYPE);
+DCHECK_TYPE(w, EWL_ENTRY_TYPE);
event = ev;
e = EWL_ENTRY(w);
@@ -500,7 +500,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR(w);
-DCHECK_TYPE(w, EWL_WIDGET_TYPE);
+DCHECK_TYPE(w, EWL_ENTRY_TYPE);
e = EWL_ENTRY(w);
@@ -523,7 +523,7 @@
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR(w);
-DCHECK_TYPE(w, EWL_WIDGET_TYPE);
+DCHECK_TYPE(w, EWL_ENTRY_TYPE);
ewl_entry_editable_set(EWL_ENTRY(w), FALSE);
@@ -543,7 +543,7 @@
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR(w);
-DCHECK_TYPE(w, EWL_WIDGET_TYPE);
+DCHECK_TYPE(w, EWL_ENTRY_TYPE);
ewl_entry_editable_set(EWL_ENTRY(w), TRUE);
@@ -567,7 +567,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR(w);
-DCHECK_TYPE(w, EWL_WIDGET_TYPE);
+DCHECK_TYPE(w, EWL_ENTRY_TYPE);
event = ev;
idx = ewl_text_coord_index_map(EWL_TEXT(w), event-x, event-y);
@@ -595,7 +595,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR(w);
DCHECK_PARAM_PTR(ev);
-DCHECK_TYPE(w, EWL_WIDGET_TYPE);
+DCHECK_TYPE(w, EWL_ENTRY_TYPE);
event = ev;
txt = EWL_TEXT(w);
@@ -627,7 +627,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR(w);
DCHECK_PARAM_PTR(ev);
-DCHECK_TYPE(w, EWL_WIDGET_TYPE);
+DCHECK_TYPE(w, EWL_ENTRY_TYPE);
event = ev;
txt = EWL_TEXT(w);
-
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
