E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
main.c pager.c setup.c
Log Message:
Fix pager drags to/from nested E.
===
RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -3 -r1.127 -r1.128
--- main.c 14 May 2005 19:40:34 - 1.127
+++ main.c 28 May 2005 06:23:51 - 1.128
@@ -266,6 +266,9 @@
ExtInitWinKill();
#endif
+ if (Mode.wm.window)
+ EMapWindow(VRoot.win);
+
/* sync just to make sure */
ESync();
===
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -3 -r1.145 -r1.146
--- pager.c 26 May 2005 22:38:28 - 1.145
+++ pager.c 28 May 2005 06:23:51 - 1.146
@@ -1042,7 +1042,7 @@
EoMoveResize(phi, px + wx, py + wy, ww, wh);
ESetWindowBackgroundPixmap(EoGetWin(phi), ewin->mini_pmm.pmap);
EoMap(phi, 0);
- GrabPointerSet(EoGetWin(phi), ECSR_ACT_MOVE, 1);
+ GrabPointerSet(EoGetWin(phi), ECSR_ACT_MOVE, !Mode.wm.window);
phi->ewin = ewin;
phi->p = p;
Mode.mode = MODE_PAGER_DRAG_PENDING;
@@ -1843,6 +1843,8 @@
#endif
break;
case LeaveNotify:
+ if (Mode.mode != MODE_NONE)
+ break;
PagerHandleMotion(p, ev->xany.window, ev->xcrossing.x, ev->xcrossing.y,
PAGER_EVENT_MOUSE_OUT);
break;
===
RCS file: /cvsroot/enlightenment/e16/e/src/setup.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -3 -r1.160 -r1.161
--- setup.c 7 May 2005 11:20:00 - 1.160
+++ setup.c 28 May 2005 06:23:51 - 1.161
@@ -232,8 +232,6 @@
HintsSetWindowName(VRoot.win, "Enlightenment");
HintsSetWindowClass(VRoot.win, "Virtual-Root", "Enlightenment");
- EMapWindow(VRoot.win);
-
/* Enable eesh and edox to pix up the virtual root */
Esnprintf(buf, sizeof(buf), "%#lx", VRoot.win);
Esetenv("ENL_WM_ROOT", buf, 1);
---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_place.c
Log Message:
optimised setup... should be a bit faster - but the main chekc is still the
problem
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_place.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_place.c 28 May 2005 05:03:27 - 1.7
+++ e_place.c 28 May 2005 06:04:11 - 1.8
@@ -56,11 +56,19 @@
}
}
+static int
+_e_place_cb_sort_cmp(const void *v1, const void *v2)
+{
+ return (*((int *)v1)) - (*((int *)v2));
+}
+
int
e_place_zone_region_smart(E_Zone *zone, Evas_List *skiplist, int x, int y, int
w, int h, int *rx, int *ry)
{
- int a_w = 0, a_h = 0;
+ int a_w = 0, a_h = 0, a_alloc_w = 0, a_alloc_h = 0;
int*a_x = NULL, *a_y = NULL;
+ int zw, zh;
+ char *u_x = NULL, *u_y = NULL;
Evas_List *ll;
E_Border_List *bl;
E_Border *bd;
@@ -81,15 +89,22 @@
x -= zone->x;
y -= zone->y;
+ zw = zone->w;
+ zh = zone->h;
+
+ u_x = calloc(zw + 1, sizeof(char));
+ u_y = calloc(zh + 1, sizeof(char));
+
a_x[0] = 0;
- a_x[1] = zone->w;
+ a_x[1] = zw;
a_y[0] = 0;
- a_y[1] = zone->h;
+ a_y[1] = zh;
bl = e_container_border_list_first(zone->container);
while ((bd = e_container_border_list_next(bl)))
{
int ok;
+ int bx, by, bw, bh;
ok = 1;
for (ll = skiplist; ll; ll = ll->next)
@@ -100,105 +115,66 @@
break;
}
}
- if ((ok) && (bd->visible))
+ if ((!ok) || (!bd->visible)) continue;
+
+ bx = bd->x - zone->x;
+ by = bd->y - zone->y;
+ bw = bd->w;
+ bh = bd->h;
+
+ if (E_INTERSECTS(bx, by, bw, bh, 0, 0, zw, zh))
{
-if (E_INTERSECTS((bd->x - zone->x), (bd->y - zone->y),
- bd->w, bd->h, 0, 0, zone->w, zone->h))
+if ((bx > 0) && (bx <= zw) && (!u_x[bx]))
{
- int i, j;
-
- for (i = 0; i < a_w; i++)
+ a_w++;
+ if (a_w > a_alloc_w)
{
- int ok = 1;
-
- if ((bd->x - zone->x) > 0)
-{
- if (a_x[i] == (bd->x - zone->x))
- ok = 0;
- else if (a_x[i] > (bd->x - zone->x))
- {
-a_w++;
-E_REALLOC(a_x, int, a_w);
-
-for (j = a_w - 1; j > i; j--)
- a_x[j] = a_x[j - 1];
-a_x[i] = (bd->x - zone->x);
-ok = 0;
- }
-}
- if (!ok)
- break;
+ a_alloc_w += 32;
+ E_REALLOC(a_x, int, a_alloc_w);
}
- for (i = 0; i < a_w; i++)
+ a_x[a_w - 1] = bx;
+ u_x[bx] = 1;
+ }
+if (((bx + bw) > 0) && ((bx + bw) <= zw) && (!u_x[bx + bw]))
+ {
+ a_w++;
+ if (a_w > a_alloc_w)
{
- int ok = 1;
-
- if ((bd->x - zone->x) + bd->w < zone->w)
-{
- if (a_x[i] == (bd->x - zone->x) + bd->w)
- ok = 0;
- else if (a_x[i] > (bd->x - zone->x) + bd->w)
- {
-a_w++;
-E_REALLOC(a_x, int, a_w);
-
-for (j = a_w - 1; j > i; j--)
- a_x[j] = a_x[j - 1];
-a_x[i] = (bd->x - zone->x) + bd->w;
-ok = 0;
- }
-}
- if (!ok)
- break;
+ a_alloc_w += 32;
+ E_REALLOC(a_x, int, a_alloc_w);
}
- for (i = 0; i < a_h; i++)
+ a_x[a_w - 1] = bx + bw;
+ u_x[bx + bw] = 1;
+ }
+if ((by > 0) && (by <= zh) && (!u_y[by]))
+ {
+ a_h++;
+ if (a_h > a_alloc_h)
{
- int ok = 1;
-
- if ((bd->y - zone->y) > 0)
-{
- if (a_y[i] == (bd->y - zone->y))
-
E CVS: libs/ewl rbdpngn
Enlightenment CVS committal Author : rbdpngn Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/sketch/bits/images Log Message: Directory /cvsroot/enlightenment/e17/libs/ewl/data/themes/sketch/bits/images added to the repository --- This SF.Net email is sponsored by Yahoo. Introducing Yahoo! Search Developer Network - Create apps using Yahoo! Search APIs Find out how you can build Yahoo! directly into your own Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl rbdpngn
Enlightenment CVS committal Author : rbdpngn Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/sketch/fonts Log Message: Directory /cvsroot/enlightenment/e17/libs/ewl/data/themes/sketch/fonts added to the repository --- This SF.Net email is sponsored by Yahoo. Introducing Yahoo! Search Developer Network - Create apps using Yahoo! Search APIs Find out how you can build Yahoo! directly into your own Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl rbdpngn
Enlightenment CVS committal Author : rbdpngn Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/sketch/bits Log Message: Directory /cvsroot/enlightenment/e17/libs/ewl/data/themes/sketch/bits added to the repository --- This SF.Net email is sponsored by Yahoo. Introducing Yahoo! Search Developer Network - Create apps using Yahoo! Search APIs Find out how you can build Yahoo! directly into your own Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl rbdpngn
Enlightenment CVS committal Author : rbdpngn Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/sketch Log Message: Directory /cvsroot/enlightenment/e17/libs/ewl/data/themes/sketch added to the repository --- This SF.Net email is sponsored by Yahoo. Introducing Yahoo! Search Developer Network - Create apps using Yahoo! Search APIs Find out how you can build Yahoo! directly into your own Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_intl.c e_main.c e_place.c
Log Message:
was wrokign on intl stuff but got distracted by optimising. will come back to
intl. optimised some code paths. e_place.c is evil. the smart place function
NEEDS speeding up. this may mean a re-think of how it works. not sure.
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -3 -r1.226 -r1.227
--- e_border.c 26 May 2005 12:38:53 - 1.226
+++ e_border.c 28 May 2005 05:03:25 - 1.227
@@ -109,9 +109,12 @@
static int _e_border_cb_focus_fix(void *data);
+static char *_e_border_winid_str_get(Ecore_X_Window win);
+
/* local subsystem globals */
static Evas_List *handlers = NULL;
static Evas_List *borders = NULL;
+static Evas_Hash *borders_hash = NULL;
static E_Border *focused = NULL;
static E_Border*resize = NULL;
@@ -354,7 +357,9 @@
bd->desk = e_desk_current_get(bd->zone);
e_container_border_add(bd);
borders = evas_list_append(borders, bd);
-
+ borders_hash = evas_hash_add(borders_hash,
_e_border_winid_str_get(bd->client.win), bd);
+ borders_hash = evas_hash_add(borders_hash,
_e_border_winid_str_get(bd->bg_win), bd);
+ borders_hash = evas_hash_add(borders_hash,
_e_border_winid_str_get(bd->win), bd);
managed = 1;
ecore_x_window_prop_card32_set(win, E_ATOM_MANAGED, &managed, 1);
ecore_x_window_prop_card32_set(win, E_ATOM_CONTAINER,
&bd->zone->container->num, 1);
@@ -1138,58 +1143,24 @@
E_Border *
e_border_find_by_client_window(Ecore_X_Window win)
{
- Evas_List *l;
-
- for (l = borders; l; l = l->next)
- {
- E_Border *bd;
-
- bd = l->data;
- if (bd->client.win == win)
- {
-if (!e_object_is_del(E_OBJECT(bd)))
- return bd;
- }
- }
+ E_Border *bd;
+
+ bd = evas_hash_find(borders_hash, _e_border_winid_str_get(win));
+ if ((bd) && (!e_object_is_del(E_OBJECT(bd
+ return bd;
return NULL;
}
E_Border *
e_border_find_by_frame_window(Ecore_X_Window win)
{
- Evas_List *l;
-
- for (l = borders; l; l = l->next)
- {
- E_Border *bd;
-
- bd = l->data;
- if (bd->bg_win == win)
- {
-if (!e_object_is_del(E_OBJECT(bd)))
- return bd;
- }
- }
- return NULL;
+ return e_border_find_by_client_window(win);
}
E_Border *
e_border_find_by_window(Ecore_X_Window win)
{
- Evas_List *l;
-
- for (l = borders; l; l = l->next)
- {
- E_Border *bd;
-
- bd = l->data;
- if (bd->win == win)
- {
-if (!e_object_is_del(E_OBJECT(bd)))
- return bd;
- }
- }
- return NULL;
+ return e_border_find_by_client_window(win);
}
E_Border *
@@ -1484,6 +1455,9 @@
ecore_x_window_del(bd->win);
e_container_border_remove(bd);
+ borders_hash = evas_hash_del(borders_hash,
_e_border_winid_str_get(bd->client.win), bd);
+ borders_hash = evas_hash_del(borders_hash,
_e_border_winid_str_get(bd->bg_win), bd);
+ borders_hash = evas_hash_del(borders_hash,
_e_border_winid_str_get(bd->win), bd);
borders = evas_list_remove(borders, bd);
free(bd);
@@ -4351,3 +4325,23 @@
}
return 1;
}
+
+static char *
+_e_border_winid_str_get(Ecore_X_Window win)
+{
+ const char *vals = "qWeRtYuIoP5-$&<~";
+ static char id[9];
+ unsigned int val;
+
+ val = (unsigned int)win;
+ id[0] = vals[(val >> 28) & 0xf];
+ id[1] = vals[(val >> 24) & 0xf];
+ id[2] = vals[(val >> 20) & 0xf];
+ id[3] = vals[(val >> 16) & 0xf];
+ id[4] = vals[(val >> 12) & 0xf];
+ id[5] = vals[(val >> 8) & 0xf];
+ id[6] = vals[(val >> 4) & 0xf];
+ id[7] = vals[(val ) & 0xf];
+ id[8] = 0;
+ return id;
+}
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_intl.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- e_intl.c19 May 2005 09:23:54 - 1.29
+++ e_intl.c28 May 2005 05:03:26 - 1.30
@@ -71,9 +71,32 @@
return 1;
}
+/* FIXME: finish this */
+static Evas_List *
+_e_intl_dir_scan(char *dir)
+{
+ Ecore_List *files;
+ char *file;
+
+ files = ecore_file_ls(dir);
+ if (!files) return NULL;
+
+ ecore_list_goto_first(files);
+ while ((file = ecore_list_current(files)))
+ {
+ free(file);
+ ecore_list_remove(files);
+ ecore_list_next(files);
+ }
+ return NULL;
+}
+
void
e_intl_language_set(const char *lang)
{
+ /* 1 list ~/.e/e/locale contents */
+ /* 2 list LOCALE_DIR contents */
+
/* FIXME: determine if in user or system locale dir */
if (_e_intl_language) free(_e_intl_language);
if (!lang) lang = getenv("LANG");
===
E CVS: libs/ecore raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore
Modified Files:
ecore_events.c ecore_private.h
Log Message:
optimise ecore and ecore_evas. makes e look better in benchmarks... and
well.. it does make it faster for certain situations/scenarios... and well..
in general too.
===
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_events.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ecore_events.c 2 Mar 2005 07:06:32 - 1.15
+++ ecore_events.c 28 May 2005 03:57:17 - 1.16
@@ -4,8 +4,10 @@
static int events_num = 0;
static Ecore_Event *events = NULL;
-static Ecore_Event_Handler *event_handlers = NULL;
-static int event_handlers_delete_me = 0;
+static Ecore_Event_Handler **event_handlers = NULL;
+static int event_handlers_num = 0;
+static int event_handlers_alloc_num = 0;
+static Ecore_Oldlist_Data *event_handlers_delete_list = NULL;
static Ecore_Event_Filter *event_filters = NULL;
static int event_filters_delete_me = 0;
@@ -51,7 +53,30 @@
eh->type = type;
eh->func = func;
eh->data = (void *)data;
- event_handlers = _ecore_list_append(event_handlers, eh);
+ if (type >= (event_handlers_num - 1))
+ {
+ int p_alloc_num;
+
+ p_alloc_num = event_handlers_alloc_num;
+ event_handlers_num = type + 1;
+ if (event_handlers_num > event_handlers_alloc_num)
+ {
+Ecore_Event_Handler **new_handlers;
+int i;
+
+event_handlers_alloc_num = ((event_handlers_num + 16) / 16) * 16;
+new_handlers = realloc(event_handlers, event_handlers_alloc_num *
sizeof(Ecore_Event_Handler *));
+if (!new_handlers)
+ {
+ free(eh);
+ return NULL;
+ }
+event_handlers = new_handlers;
+for (i = p_alloc_num; i < event_handlers_alloc_num; i++)
+ event_handlers[i] = NULL;
+ }
+ }
+ event_handlers[type] = _ecore_list_append(event_handlers[type], eh);
return eh;
}
@@ -68,6 +93,8 @@
void *
ecore_event_handler_del(Ecore_Event_Handler *event_handler)
{
+ Ecore_Oldlist_Data *node;
+
if (!ECORE_MAGIC_CHECK(event_handler, ECORE_MAGIC_EVENT_HANDLER))
{
ECORE_MAGIC_FAIL(event_handler, ECORE_MAGIC_EVENT_HANDLER,
@@ -75,7 +102,9 @@
return NULL;
}
event_handler->delete_me = 1;
- event_handlers_delete_me = 1;
+ node = calloc(1, sizeof(Ecore_Oldlist_Data));
+ node->data = event_handler;
+ event_handlers_delete_list = _ecore_list_append(event_handlers_delete_list,
node);
return event_handler->data;
}
@@ -256,17 +285,33 @@
void
_ecore_event_shutdown(void)
{
+ int i;
+
while (events) _ecore_event_del(events);
- while (event_handlers)
+ for (i = 0; i < event_handlers_num; i++)
{
- Ecore_Event_Handler *eh;
+ while (event_handlers[i])
+ {
+Ecore_Event_Handler *eh;
+
+eh = event_handlers[i];
+event_handlers[i] = _ecore_list_remove(event_handlers[i], eh);
+ECORE_MAGIC_SET(eh, ECORE_MAGIC_NONE);
+free(eh);
+ }
+ }
+ while (event_handlers_delete_list)
+ {
+ Ecore_Oldlist_Data *ehd;
- eh = event_handlers;
- event_handlers = _ecore_list_remove(event_handlers, eh);
- ECORE_MAGIC_SET(eh, ECORE_MAGIC_NONE);
- free(eh);
+ ehd = event_handlers_delete_list;
+ event_handlers_delete_list =
_ecore_list_remove(event_handlers_delete_list, ehd);
+ free(ehd);
}
- event_handlers_delete_me = 0;
+ if (event_handlers) free(event_handlers);
+ event_handlers = NULL;
+ event_handlers_num = 0;
+ event_handlers_alloc_num = 0;
while (event_filters)
{
Ecore_Event_Filter *ef;
@@ -320,17 +365,18 @@
void
_ecore_event_call(void)
{
- Ecore_Oldlist *l;
+ Ecore_Oldlist *l, *ll;
+ Ecore_Event *e;
+ Ecore_Event_Filter *ef;
+ Ecore_Event_Handler *eh;
+ Ecore_Oldlist_Data *ehd;
+ int handle_count;
for (l = (Ecore_Oldlist *)event_filters; l; l = l->next)
{
- Ecore_Event_Filter *ef;
-
ef = (Ecore_Event_Filter *)l;
if (!ef->delete_me)
{
-Ecore_Oldlist *ll;
-
if (ef->func_start)
ef->loop_data = ef->func_start(ef->data);
for (ll = (Ecore_Oldlist *)events; ll; ll = ll->next)
@@ -353,8 +399,6 @@
{
for (l = (Ecore_Oldlist *)event_filters; l;)
{
-Ecore_Event_Filter *ef;
-
ef = (Ecore_Event_Filter *)l;
l = l->next;
if (ef->delete_me)
@@ -369,57 +413,43 @@
//
E CVS: libs/ecore raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_evas
Modified Files:
ecore_evas_x.c
Log Message:
optimise ecore and ecore_evas. makes e look better in benchmarks... and
well.. it does make it faster for certain situations/scenarios... and well..
in general too.
===
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_x.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- ecore_evas_x.c 3 May 2005 17:35:50 - 1.37
+++ ecore_evas_x.c 28 May 2005 03:57:17 - 1.38
@@ -13,6 +13,7 @@
static int _ecore_evas_fps_debug = 0;
static Ecore_Evas *ecore_evases = NULL;
+static Evas_Hash *ecore_evases_hash = NULL;
static Ecore_Event_Handler *ecore_evas_event_handlers[16];
static Ecore_Idle_Enterer *ecore_evas_idle_enterer = NULL;
@@ -51,24 +52,30 @@
evas_event_feed_mouse_move(ee->evas, y, ee->w - x - 1, NULL);
}
+static char *
+_ecore_evas_x_winid_str_get(Ecore_X_Window win)
+{
+ const char *vals = "qWeRtYuIoP5-$&<~";
+ static char id[9];
+ unsigned int val;
+
+ val = (unsigned int)win;
+ id[0] = vals[(val >> 28) & 0xf];
+ id[1] = vals[(val >> 24) & 0xf];
+ id[2] = vals[(val >> 20) & 0xf];
+ id[3] = vals[(val >> 16) & 0xf];
+ id[4] = vals[(val >> 12) & 0xf];
+ id[5] = vals[(val >> 8) & 0xf];
+ id[6] = vals[(val >> 4) & 0xf];
+ id[7] = vals[(val ) & 0xf];
+ id[8] = 0;
+ return id;
+}
+
static Ecore_Evas *
_ecore_evas_x_match(Ecore_X_Window win)
{
- Ecore_Oldlist *l;
-
- for (l = (Ecore_Oldlist *)ecore_evases; l; l = l->next)
- {
- Ecore_Evas *ee;
-
- ee = (Ecore_Evas *)l;
- if ((ee->engine.x.win == win) || (ee->engine.x.win_container == win))
- {
-ecore_evases = _ecore_list_remove(ecore_evases, ee);
-ecore_evases = _ecore_list_prepend(ecore_evases, ee);
-return ee;
- }
- }
- return NULL;
+ return evas_hash_find(ecore_evases_hash, _ecore_evas_x_winid_str_get(win));
}
static void
@@ -664,6 +671,8 @@
ee->engine.x.mask = 0;
ee->engine.x.gc = 0;
ee->engine.x.damages = 0;
+ ecore_evases_hash = evas_hash_del(ecore_evases_hash,
_ecore_evas_x_winid_str_get(ee->engine.x.win), ee);
+ ecore_evases_hash = evas_hash_del(ecore_evases_hash,
_ecore_evas_x_winid_str_get(ee->engine.x.win_container), ee);
ecore_evases = _ecore_list_remove(ecore_evases, ee);
_ecore_evas_x_shutdown();
ecore_x_shutdown();
@@ -1064,6 +1073,7 @@
ecore_x_window_hide(ee->engine.x.win);
ecore_x_window_reparent(ee->engine.x.win, ee->engine.x.win_root, 0, 0);
ecore_x_window_del(ee->engine.x.win_container);
+ ecore_evases_hash = evas_hash_del(ecore_evases_hash,
_ecore_evas_x_winid_str_get(ee->engine.x.win_container), ee);
if (on)
ee->engine.x.win_container =
ecore_x_window_override_new(ee->engine.x.win_root, ee->x, ee->y, ee->w, ee->h);
else
@@ -1083,6 +1093,7 @@
ecore_x_window_prop_sticky_set(ee->engine.x.win_container,
ee->prop.sticky);
}
+ ecore_evases_hash = evas_hash_add(ecore_evases_hash,
_ecore_evas_x_winid_str_get(ee->engine.x.win_container), ee);
ecore_x_window_reparent(ee->engine.x.win, ee->engine.x.win_container, 0,
0);
ecore_x_window_show(ee->engine.x.win);
if (ee->visible) ecore_x_window_show(ee->engine.x.win_container);
@@ -1364,6 +1375,8 @@
evas_key_lock_add(ee->evas, "Scroll_Lock");
ecore_evases = _ecore_list_prepend(ecore_evases, ee);
+ ecore_evases_hash = evas_hash_add(ecore_evases_hash,
_ecore_evas_x_winid_str_get(ee->engine.x.win), ee);
+ ecore_evases_hash = evas_hash_add(ecore_evases_hash,
_ecore_evas_x_winid_str_get(ee->engine.x.win_container), ee);
return ee;
#else
return NULL;
@@ -1556,6 +1569,8 @@
evas_key_lock_add(ee->evas, "Scroll_Lock");
ecore_evases = _ecore_list_prepend(ecore_evases, ee);
+ ecore_evases_hash = evas_hash_add(ecore_evases_hash,
_ecore_evas_x_winid_str_get(ee->engine.x.win), ee);
+ ecore_evases_hash = evas_hash_add(ecore_evases_hash,
_ecore_evas_x_winid_str_get(ee->engine.x.win_container), ee);
return ee;
#else
return NULL;
---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e_utils rbdpngn
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : apps/e_utils
Dir : e17/apps/e_utils/data/entangle/default
Modified Files:
add_dir_box.edc
Log Message:
Remove space from macro so it works on OS X.
===
RCS file:
/cvsroot/enlightenment/e17/apps/e_utils/data/entangle/default/add_dir_box.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- add_dir_box.edc 26 May 2005 00:34:19 - 1.2
+++ add_dir_box.edc 28 May 2005 00:55:10 - 1.3
@@ -17,7 +17,7 @@
}
}
}
-ITEM_OVERLAY("entry_bg", "h");
+ITEM_OVERLAY("entry_bg","h");
part {
name, "entry";
---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/eclair moom16
Enlightenment CVS committal
Author : moom16
Project : e17
Module : apps/eclair
Dir : e17/apps/eclair/src
Modified Files:
eclair_dialogs.c eclair_private.h
Log Message:
* Do not use anymore GtkFileChooserDialog with glade since it seems to be
unsupported with libglade <= 2.4
I hope it will fix the open bug
===
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_dialogs.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- eclair_dialogs.c27 May 2005 20:28:22 - 1.6
+++ eclair_dialogs.c27 May 2005 21:31:49 - 1.7
@@ -61,7 +61,7 @@
if (!dialogs_manager)
return;
- if (dialogs_manager->eclair &&dialogs_manager->file_chooser_dialog &&
(last_location_path =
gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_dialog
+ if (dialogs_manager->eclair &&dialogs_manager->file_chooser_dialog &&
(last_location_path =
gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget
{
eclair_config_set_prop_string(&dialogs_manager->eclair->config,
"last_location", "path", last_location_path);
g_free(last_location_path);
@@ -179,6 +179,7 @@
{
char *last_location_path;
Eclair *eclair;
+ GtkWidget *file_chooser_alignment;
if (!dialogs_manager || !(eclair = dialogs_manager->eclair) || fc_type ==
ECLAIR_FC_NONE)
return;
@@ -187,6 +188,11 @@
{
dialogs_manager->file_chooser_xml = glade_xml_new(PACKAGE_DATA_DIR
"/glade/eclair.glade", "file_chooser_dialog", NULL);
dialogs_manager->file_chooser_dialog =
glade_xml_get_widget(dialogs_manager->file_chooser_xml, "file_chooser_dialog");
+ gtk_widget_hide(dialogs_manager->file_chooser_dialog);
+ file_chooser_alignment =
glade_xml_get_widget(dialogs_manager->file_chooser_xml,
"file_chooser_alignment");
+ dialogs_manager->file_chooser_widget =
gtk_file_chooser_widget_new(GTK_FILE_CHOOSER_ACTION_OPEN);
+ gtk_container_add(GTK_CONTAINER(file_chooser_alignment),
dialogs_manager->file_chooser_widget);
+ gtk_widget_show(dialogs_manager->file_chooser_widget);
dialogs_manager->file_chooser_all_button =
glade_xml_get_widget(dialogs_manager->file_chooser_xml, "select_all_button");
dialogs_manager->file_chooser_none_button =
glade_xml_get_widget(dialogs_manager->file_chooser_xml, "select_none_button");
dialogs_manager->file_chooser_save_playlist_button =
glade_xml_get_widget(dialogs_manager->file_chooser_xml, "save_playlist_button");
@@ -196,11 +202,11 @@
//TODO:
//gtk_window_set_wmclass(GTK_WINDOW(dialogs_manager->file_chooser_dialog),
"eclair", "eclair");
-
gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_dialog),
TRUE);
+
gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget),
TRUE);
if (eclair_config_get_prop_string(&eclair->config, "last_location",
"path", &last_location_path))
{
if (strlen(last_location_path) > 0)
-
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_dialog),
last_location_path);
+
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget),
last_location_path);
free(last_location_path);
}
@@ -215,8 +221,8 @@
if (fc_type == ECLAIR_FC_ADD_FILES)
{
-
gtk_file_chooser_set_action(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_dialog),
GTK_FILE_CHOOSER_ACTION_OPEN);
-
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_dialog),
TRUE);
+
gtk_file_chooser_set_action(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget),
GTK_FILE_CHOOSER_ACTION_OPEN);
+
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget),
TRUE);
gtk_window_set_title(GTK_WINDOW(dialogs_manager->file_chooser_dialog),
"Add Files");
gtk_widget_show(dialogs_manager->file_chooser_all_button);
gtk_widget_show(dialogs_manager->file_chooser_none_button);
@@ -227,8 +233,8 @@
}
else if (fc_type == ECLAIR_FC_LOAD_PLAYLIST)
{
-
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_dialog),
FALSE);
-
gtk_file_chooser_set_action(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_dialog),
GTK_FILE_CHOOSER_ACTION_OPEN);
+
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget),
FALSE);
+
gtk_file_chooser_set_action(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget),
GTK_FILE_CHOOSER_ACTION_OPEN);
gtk_window_set_title(GTK_WINDOW(dialogs_manager->file_chooser_dialog),
"Load Playlist");
gtk_widget_hide(dialogs_manager->file_chooser_all_button);
gtk_widget_hide(dialogs_manager->file_chooser_none_button);
@@ -239,8 +245,8 @
E CVS: apps/eclair moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : apps/eclair Dir : e17/apps/eclair/data/glade Modified Files: eclair.glade Log Message: * Do not use anymore GtkFileChooserDialog with glade since it seems to be unsupported with libglade <= 2.4 I hope it will fix the open bug === RCS file: /cvsroot/enlightenment/e17/apps/eclair/data/glade/eclair.glade,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eclair.glade21 May 2005 10:18:11 - 1.1 +++ eclair.glade27 May 2005 21:31:48 - 1.2 @@ -255,13 +255,9 @@ - + True - GTK_FILE_CHOOSER_ACTION_OPEN - True - False - False - Add Files + Open Files GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -273,12 +269,13 @@ GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST True + False True False - 24 + 2 @@ -742,6 +739,29 @@ GTK_PACK_END + + + + True + 0.5 + 0.5 + 1 + 1 + 8 + 8 + 8 + 8 + + + + + + + 0 + True + True + + --- This SF.Net email is sponsored by Yahoo. Introducing Yahoo! Search Developer Network - Create apps using Yahoo! Search APIs Find out how you can build Yahoo! directly into your own Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/eclair moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : apps/eclair Dir : e17/apps/eclair Modified Files: TODO Log Message: * Add a "scroll to" animation when we change the current media file * Display more infos (bitrate, samplerate) on the gui (depending on the theme used) * Fix segv that happened when we removed media files if these media files haven't been scanned for meta tags or cover * Code cleanup === RCS file: /cvsroot/enlightenment/e17/apps/eclair/TODO,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- TODO22 May 2005 15:21:51 - 1.16 +++ TODO27 May 2005 20:28:22 - 1.17 @@ -9,12 +9,10 @@ * Allow vertical or horizontal progressbar, volumebar, ... * Support different encodings for subtitles * Why is it so slow to scan id3 tag? -* FIX segv: When removing a media file from the playlist, remove it also from the cover and meta_tag files to treat list [In Progress] -* FIX default theme bug: +* FIX default theme bug which happens if we open the playlist panel at startup: "EDJE ERROR: Circular dependency when calculating part "playlist_background" Already calculating XY [03] axes Need to calculate XY [03] axes" -* Automatically scroll to the current entry in the playlist container [In Progress] * Allow themes to have separated playlist, non shaded window, or to "swallow" the video object * Make a converter to convert Winamp2 themes to edj [In Progress] --- This SF.Net email is sponsored by Yahoo. Introducing Yahoo! Search Developer Network - Create apps using Yahoo! Search APIs Find out how you can build Yahoo! directly into your own Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/include
Modified Files:
evas_mmx.h
Log Message:
maybe gcc4 is happy now?
===
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/include/evas_mmx.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas_mmx.h 9 Apr 2005 00:09:34 - 1.4
+++ evas_mmx.h 27 May 2005 13:33:03 - 1.5
@@ -111,11 +111,11 @@
#definemmx_m2r(op, mem, reg) \
__asm__ __volatile__ (#op " %0, %%" #reg \
: /* nothing */ \
- : "X" (mem))
+ : "m" (mem))
#definemmx_r2m(op, reg, mem) \
__asm__ __volatile__ (#op " %%" #reg ", %0" \
- : "=X" (mem) \
+ : "=m" (mem) \
: /* nothing */ )
#definemmx_r2r(op, regs, regd) \
@@ -125,8 +125,8 @@
__asm__ __volatile__ ("movq %0, %%mm0\n\t" \
#op " %1, %%mm0\n\t" \
"movq %%mm0, %0" \
- : "=X" (memd) \
- : "X" (mems))
+ : "=m" (memd) \
+ : "m" (mems))
/* 1x64 MOVe Quadword
(this is both a load and a store...
@@ -138,8 +138,8 @@
#definemovq(vars, vard) \
__asm__ __volatile__ ("movq %1, %%mm0\n\t" \
"movq %%mm0, %0" \
- : "=X" (vard) \
- : "X" (vars))
+ : "=m" (vard) \
+ : "m" (vars))
#definemovntq_r2m(reg, var) mmx_r2m(movntq, reg, var)
@@ -154,8 +154,8 @@
#definemovd(vars, vard) \
__asm__ __volatile__ ("movd %1, %%mm0\n\t" \
"movd %%mm0, %0" \
- : "=X" (vard) \
- : "X" (vars))
+ : "=m" (vard) \
+ : "m" (vars))
/* 2x32, 4x16, and 8x8 Parallel ADDs
---
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/data/init
Modified Files:
init.edc
Log Message:
init splans has a checkbutton to disable it in the future... and e respects
the config value
===
RCS file: /cvsroot/enlightenment/e17/apps/e/data/init/init.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- init.edc27 Mar 2005 11:30:49 - 1.4
+++ init.edc27 May 2005 10:04:37 - 1.5
@@ -64,6 +64,8 @@
image: "brushed.png" COMP;
image: SM"shadow.png" LOSSY 70;
image: SM"reflection_overlay.png" LOSSY 70;
+ image: "check1.png" COMP;
+ image: "check2.png" COMP;
#ifdef ALLFRAMES
image: SM"start_eintro_001.png" FRAME;
@@ -500,6 +502,7 @@
part {
name: "background";
type: RECT;
+ mouse_events: 0;
description {
state: "default" 0.0;
color: 255 255 255 255;
@@ -507,6 +510,7 @@
}
part {
name: "background_image";
+ mouse_events: 0;
description {
state: "default" 0.0;
image {
@@ -522,6 +526,7 @@
}
part {
name: "reflection_overlay";
+ mouse_events: 0;
description {
state: "default" 0.0;
image {
@@ -533,6 +538,7 @@
name: "title";
type: TEXT;
effect: SOFT_SHADOW;
+ mouse_events: 0;
description {
state: "default" 0.0;
align: 0.5 0.0;
@@ -587,6 +593,7 @@
name: "status";
type: TEXT;
effect: SHADOW;
+ mouse_events: 0;
description {
state: "default" 0.0;
align: 0.5 0.0;
@@ -612,8 +619,114 @@
}
}
part {
+ name: "disable_text";
+ type: TEXT;
+ effect: SHADOW;
+ mouse_events: 0;
+ description {
+ state: "default" 0.0;
+ align: 0.0 0.5;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 5 5;
+ }
+ rel2 {
+ relative: 0.0 0.0;
+ offset: 5 20;
+ }
+ color: 0 0 0 128;
+ color3: 255 255 255 128;
+ text {
+ text: "Disable this splash screen in future.";
+ font: "Edje Vera";
+ size: SSIZE;
+ min: 1 1;
+ align: 0.0 0.5;
+ }
+ }
+}
+ part {
+ name: "disable_check";
+ mouse_events: 0;
+ description {
+ state: "default" 0.0;
+ min: 16 16;
+ max: 16 16;
+ align: 0.0 0.5;
+ rel1 {
+ relative: 1.0 0.0;
+ offset: 5 0;
+ to: "disable_text";
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: 5 -1;
+ to: "disable_text";
+ }
+ image {
+ normal: "check1.png";
+ }
+ }
+ description {
+ state: "active" 0.0;
+ inherit: "default" 0.0;
+ image {
+ normal: "check2.png";
+ }
+ }
+}
+part {
+ name: "enable_event";
+ type: RECT;
+ description {
+ state: "default" 0.0;
+ visible: 0;
+ color: 0 0 0 0;
+ rel1 {
+ to: "disable_text";
+ relative: 0.0 0.0;
+ offset: -5 -5;
+ }
+ rel2 {
+ to: "disable_check";
+ relative: 1.0 1.0;
+ offset: 4 4;
+ }
+ }
+ description {
+ state: "active" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+}
+part {
+ name: "disable_event";
+ type: RECT;
+ description {
+ state: "default" 0.0;
+ visible: 1;
+ color: 0 0 0 0;
+ rel1 {
+ to: "disable_text";
+ relative: 0.0 0.0;
+ offset: -5 -5;
+ }
+ rel2 {
+ to: "disable_check";
+ relative: 1.0 1.0;
+ offset: 4 4;
+ }
+ }
+ description {
+ state: "active" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
+ }
+}
+ part {
name: "icons";
type: SWALLOW;
+ mouse_events: 0;
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/data/init/images Modified Files: Makefile.am Added Files: check1.png check2.png Log Message: init splans has a checkbutton to disable it in the future... and e respects the config value === RCS file: /cvsroot/enlightenment/e17/apps/e/data/init/images/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 25 Nov 2004 03:37:34 - 1.1 +++ Makefile.am 27 May 2005 10:04:38 - 1.2 @@ -1,6 +1,8 @@ MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = \ brushed.png \ +check1.png \ +check2.png \ loop_eintro_121.png \ loop_eintro_122.png \ loop_eintro_123.png \ --- This SF.Net email is sponsored by Yahoo. Introducing Yahoo! Search Developer Network - Create apps using Yahoo! Search APIs Find out how you can build Yahoo! directly into your own Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_config.c e_config.h e_init.c e_main.c
Log Message:
init splans has a checkbutton to disable it in the future... and e respects
the config value
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- e_config.c 26 May 2005 12:38:53 - 1.55
+++ e_config.c 27 May 2005 10:04:38 - 1.56
@@ -109,6 +109,7 @@
#define D _e_config_edd
/**/ /* == already configurable via ipc */
E_CONFIG_VAL(D, T, config_version, INT); /**/
+ E_CONFIG_VAL(D, T, show_splash, INT); /**/
E_CONFIG_VAL(D, T, desktop_default_background, STR); /**/
E_CONFIG_VAL(D, T, menus_scroll_speed, DOUBLE); /**/
E_CONFIG_VAL(D, T, menus_fast_mouse_move_threshhold, DOUBLE); /**/
@@ -182,6 +183,7 @@
/* DEFAULT CONFIG */
e_config = E_NEW(E_Config, 1);
e_config->config_version = E_CONFIG_FILE_VERSION;
+ e_config->show_splash = 1;
e_config->desktop_default_background =
strdup(PACKAGE_DATA_DIR"/data/themes/default.edj");
e_config->menus_scroll_speed = 1000.0;
e_config->menus_fast_mouse_move_threshhold = 300.0;
@@ -674,6 +676,7 @@
// e_config->evas_engine_container = E_EVAS_ENGINE_GL_X11;
E_CONFIG_LIMIT(e_config->menus_scroll_speed, 1.0, 2.0);
+ E_CONFIG_LIMIT(e_config->show_splash, 0, 1);
E_CONFIG_LIMIT(e_config->menus_fast_mouse_move_threshhold, 1.0, 2000.0);
E_CONFIG_LIMIT(e_config->menus_click_drag_timeout, 0.0, 10.0);
E_CONFIG_LIMIT(e_config->border_shade_animate, 0, 1);
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- e_config.h 21 May 2005 02:49:47 - 1.27
+++ e_config.h 27 May 2005 10:04:53 - 1.28
@@ -46,7 +46,7 @@
* defaults for e to work - started at 100 when we introduced this config
* versioning feature
*/
-#define E_CONFIG_FILE_VERSION 106
+#define E_CONFIG_FILE_VERSION 107
#define E_EVAS_ENGINE_DEFAULT 0
#define E_EVAS_ENGINE_SOFTWARE_X11 1
@@ -55,6 +55,7 @@
struct _E_Config
{
int config_version;
+ int show_splash;
char *desktop_default_background;
double menus_scroll_speed;
double menus_fast_mouse_move_threshhold;
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_init.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_init.c25 May 2005 08:08:44 - 1.21
+++ e_init.c27 May 2005 10:04:53 - 1.22
@@ -4,6 +4,7 @@
#include "e.h"
static void _e_init_icons_del(void);
+static void _e_init_cb_signal_disable(void *data, Evas_Object *obj, const char
*emission, const char *source);
/* local subsystem globals */
static Ecore_X_Window _e_init_win = 0;
@@ -105,7 +106,10 @@
evas_object_resize(o, w, h);
evas_object_show(o);
}
-
+ edje_object_part_text_set(_e_init_object, "disable_text",
+_("Disable this splash screen in the future?"));
+ edje_object_signal_callback_add(_e_init_object, "disable_state", "*",
+ _e_init_cb_signal_disable, NULL);
free(roots);
return 1;
}
@@ -235,3 +239,11 @@
evas_object_del(_e_init_icon_box);
_e_init_icon_box = NULL;
}
+
+static void
+_e_init_cb_signal_disable(void *data, Evas_Object *obj, const char *emission,
const char *source)
+{
+ if (!strcmp(source, "disable")) e_config->show_splash = 0;
+ else e_config->show_splash = 1;
+ e_config_save_queue();
+}
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -3 -r1.85 -r1.86
--- e_main.c26 May 2005 15:30:10 - 1.85
+++ e_main.c27 May 2005 10:04:53 - 1.86
@@ -57,7 +57,6 @@
{
int ipc_failed = 0;
int i;
- int nosplash = 0;
int nostartup = 0;
int after_restart = 0;
char buf[1024];
@@ -90,7 +89,6 @@
/* for debugging by redirecting stdout of e to a log file to tail */
setvbuf(stdout, NULL, _IONBF, 0);
- if (getenv("NOSPLASH")) nosplash = 1;
if (getenv("NOSTARTUP")) nostartup = 1;
if (getenv("RESTART")) after_restart = 1;
@@ -337,14 +335,17 @@
e_font_apply();
e_canvas_recache();
- /* setup init status window/screen */
- if (!e_init_init())
+ if (!((!e_config->show_splash) || (after_restart)))
{
- e_error_message_show(_("Enlightenment cannot set up init screen.\n"
- "Perhaps you are out of memory?"));
- _e_main
