E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: configure.in Log Message: build! fix breaks! === RCS file: /cvs/e/e17/apps/e/configure.in,v retrieving revision 1.212 retrieving revision 1.213 diff -u -3 -r1.212 -r1.213 --- configure.in13 Aug 2008 19:22:01 - 1.212 +++ configure.in14 Aug 2008 01:16:26 - 1.213 @@ -209,14 +209,24 @@ ecore-txt ], [ have_temp=yes - # This test will succeed as these modules are also checked before + have_bat=yes +], [ have_temp=no]) + +AM_CONDITIONAL(HAVE_TEMPERATURE, test x$have_temp = xyes) +if test x$have_temp = xyes; then PKG_CHECK_MODULES(TEMPERATURE, [ ecore ecore-file ]) -], [ have_temp=no]) -AM_CONDITIONAL(HAVE_TEMPERATURE, test x$have_temp = xyes) +fi AM_CONDITIONAL(HAVE_BATTERY, test x$have_bat = xyes) +if test x$have_bat = xyes; then + PKG_CHECK_MODULES(BATTERY, [ +ecore +ecore-file +ecore-con + ]) +fi PKG_CHECK_MODULES(E_DBUS, edbus, have_edbus=yes, have_edbus=no) PKG_CHECK_MODULES(E_HAL, ehal, have_ehal=yes, have_ehal=no) @@ -232,8 +242,8 @@ fi fi -e_libs=$E_LIBS $LIBINTL $fnmatch_libs -e_cflags=-DUSE_E_CONFIG_H $define_e_dbus $E_CFLAGS $E_DBUS_CFLAGS +e_libs=$E_LIBS $LIBINTL $fnmatch_libs $ECORE_IMF_LIBS +e_cflags=-DUSE_E_CONFIG_H $define_e_dbus $E_CFLAGS $E_DBUS_CFLAGS $ECORE_IMF_CFLAGS e_configflags=-DUSE_E_CONFIG_H $define_e_dbus AC_SUBST(e_libs) - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ 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_main.c Log Message: build! fix breaks! === RCS file: /cvs/e/e17/apps/e/src/bin/e_main.c,v retrieving revision 1.244 retrieving revision 1.245 diff -u -3 -r1.244 -r1.245 --- e_main.c13 Aug 2008 19:22:01 - 1.244 +++ e_main.c14 Aug 2008 01:16:27 - 1.245 @@ -3,7 +3,9 @@ */ #include e.h +#ifdef HAVE_ECORE_IMF #include Ecore_IMF.h +#endif EAPI int e_precache_end = 0; - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ 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_theme Modified Files: e_int_config_theme.c Log Message: and use the right func.. that exists! === RCS file: /cvs/e/e17/apps/e/src/modules/conf_theme/e_int_config_theme.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- e_int_config_theme.c13 Aug 2008 18:31:15 - 1.14 +++ e_int_config_theme.c14 Aug 2008 01:29:02 - 1.15 @@ -264,7 +264,7 @@ cfdata = data1; if (cfdata-dia_web) - e_dialog_raise(cfdata-dia_web); + e_win_raise(cfdata-dia_web-win); else cfdata-dia_web = e_int_config_theme_web(cfdata-cfd); } - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ 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_actions.c e_border.c e_desk.c e_int_menus.c
Log Message:
and respect focus lock out flag more
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -3 -r1.118 -r1.119
--- e_actions.c 8 Jul 2008 14:00:53 - 1.118
+++ e_actions.c 11 Aug 2008 01:22:33 - 1.119
@@ -984,7 +984,8 @@
e_zone_desk_flip_by(bd-zone, to_x - dx, to_y - dy);
/* send the border to the required desktop. */
e_border_desk_set(bd, desk);
-e_border_focus_set(bd, 1, 1);
+if (!bd-lock_focus_out)
+ e_border_focus_set(bd, 1, 1);
}
}
}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.653
retrieving revision 1.654
diff -u -3 -r1.653 -r1.654
--- e_border.c 7 Aug 2008 07:08:16 - 1.653
+++ e_border.c 11 Aug 2008 01:22:33 - 1.654
@@ -1371,7 +1371,8 @@
// printf( 2accept:%i take:%i\n, bd-client.icccm.accepts_focus,
bd-client.icccm.take_focus);
if ((!bd-client.icccm.accepts_focus)
(!bd-client.icccm.take_focus)) return;
-
+ if (bd-lock_focus_out) return;
+
/* Try to grab the pointer to make sure it's not in use */
if (!ecore_x_pointer_grab(bd-zone-container-win))
return;
@@ -1412,6 +1413,7 @@
if ((!bd-client.icccm.accepts_focus)
(!bd-client.icccm.take_focus))
return;
+ if ((set) (focus) (bd-lock_focus_out)) return;
/* dont focus an iconified window. that's silly! */
if ((focus) (bd-iconic))
return;
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_desk.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- e_desk.c7 Jul 2008 01:03:33 - 1.73
+++ e_desk.c11 Aug 2008 01:22:33 - 1.74
@@ -367,7 +367,8 @@
if ((!bd-iconic) (bd-visible) (bd-desk == desk))
{
/* this was the window last focused in this desktop */
-e_border_focus_set(bd, 1, 1);
+ if (!bd-lock_focus_out)
+ e_border_focus_set(bd, 1, 1);
break;
}
}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -3 -r1.233 -r1.234
--- e_int_menus.c 25 Mar 2008 16:48:14 - 1.233
+++ e_int_menus.c 11 Aug 2008 01:22:33 - 1.234
@@ -1461,7 +1461,8 @@
e_border_move(bd, bd-zone-x + ((bd-zone-w - bd-w) / 2),
bd-zone-y + ((bd-zone-h - bd-h) / 2));
e_border_raise(bd);
- e_border_focus_set(bd, 1, 1);
+ if (!bd-lock_focus_out)
+ e_border_focus_set(bd, 1, 1);
}
static void
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
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
Log Message:
add debugging... nasty focus issue to find...
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.649
retrieving revision 1.650
diff -u -3 -r1.649 -r1.650
--- e_border.c 7 Aug 2008 05:11:45 - 1.649
+++ e_border.c 7 Aug 2008 06:00:09 - 1.650
@@ -1410,17 +1410,27 @@
// printf( accept:%i take:%i\n, bd-client.icccm.accepts_focus,
bd-client.icccm.take_focus);
// if (!bd-client.icccm.accepts_focus) return;
if ((!bd-client.icccm.accepts_focus)
- (!bd-client.icccm.take_focus)) return;
+ (!bd-client.icccm.take_focus))
+ {
+printf( - SKIP I F %p %i %i\n, bd, focus, set);
+ return;
+ }
/* dont focus an iconified window. that's silly! */
- if ((focus) (bd-iconic)) return;
+ if ((focus) (bd-iconic))
+ {
+printf( - SKIP H F %p %i %i\n, bd, focus, set);
+ return;
+ }
if ((bd-modal) (bd-modal != bd))
{
e_border_focus_set(bd-modal, focus, set);
+printf( - SKIP G F %p %i %i\n, bd, focus, set);
return;
}
else if ((bd-leader) (bd-leader-modal) (bd-leader-modal != bd))
{
e_border_focus_set(bd-leader-modal, focus, set);
+printf( - SKIP F F %p %i %i\n, bd, focus, set);
return;
}
@@ -1434,9 +1444,11 @@
e_border_focus_latest_set(bd);
bd-want_focus = 1;
bd-changed = 1;
+printf( - SKIP E F %p %i %i\n, bd, focus, set);
return;
}
e_grabinput_focus(bd-client.win, E_FOCUS_METHOD_LOCALLY_ACTIVE);
+printf( - SKIP D F %p %i %i\n, bd, focus, set);
return;
}
else if ((!bd-client.icccm.accepts_focus)
@@ -1447,9 +1459,11 @@
e_border_focus_latest_set(bd);
bd-want_focus = 1;
bd-changed = 1;
+printf( - SKIP C F %p %i %i\n, bd, focus, set);
return;
}
e_grabinput_focus(bd-client.win, E_FOCUS_METHOD_GLOBALLY_ACTIVE);
+printf( - SKIP B F %p %i %i\n, bd, focus, set);
return;
}
}
@@ -1466,6 +1480,7 @@
e_border_focus_latest_set(bd);
bd-want_focus = 1;
bd-changed = 1;
+printf( - SKIP A F %p %i %i\n, bd, focus, set);
return;
}
// if (bd-visible)
@@ -1497,6 +1512,9 @@
bd-raise_timer = NULL;
}
}
+ if (bd-want_focus)
+ {
+ }
if (((bd-focused) (!focus)) || ((!bd-focused) (focus)))
focus_changed = 1;
bd-focused = focus;
@@ -1538,7 +1556,7 @@
{
E_Event_Border_Focus_Out *ev;
-// printf(unfocus previous\n);
+ printf(unfocus previous\n);
edje_object_signal_emit(focused-bg_object,
e,state,unfocused, e);
if (focused-icon_object)
edje_object_signal_emit(focused-icon_object,
e,state,unfocused, e);
@@ -1550,6 +1568,7 @@
ecore_event_add(E_EVENT_BORDER_FOCUS_OUT, ev,
_e_border_event_border_focus_out_free, NULL);
+printf(FOUT %s\n, bd-client.netwm.name);
/* FIXME: Sometimes we should leave the window fullscreen! */
// if (focused-fullscreen) e_border_unfullscreen(focused);
@@ -1560,6 +1579,7 @@
ecore_timer_del(focused-raise_timer);
focused-raise_timer = NULL;
}
+ focused = NULL;
}
}
e_hints_active_window_set(bd-zone-container-manager, bd);
@@ -1568,6 +1588,7 @@
#if 0
/* i'm pretty sure this case is handled above -- this was resulting in the
passive
* event getting sent twice when going from a window to the desktop.
--rephorm */
+/*
else if ((!bd-focused) (focused == bd))
{
if (focused)
@@ -1577,7 +1598,7 @@
if (focused-icon_object)
edje_object_signal_emit(focused-icon_object,
e,state,unfocused, e);
e_focus_event_focus_out(focused);
-/* FIXME: Sometimes we should leave the window fullscreen! */
+// FIXME: Sometimes we should leave the window fullscreen!
if (focused-fullscreen) e_border_unfullscreen(focused);
focused-focused = 0;
// e_border_focus_set(focused, 0, 0);
@@ -1589,14 +1610,16 @@
}
e_hints_active_window_set(bd-zone-container-manager, NULL);
}
+ */
#endif
- printf(- F=%i, S=%i V=%i\n, focus, set, bd-visible);
+ printf(- F=%i, S=%i V=%i,
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
Log Message:
try this...
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.650
retrieving revision 1.651
diff -u -3 -r1.650 -r1.651
--- e_border.c 7 Aug 2008 06:00:09 - 1.650
+++ e_border.c 7 Aug 2008 06:16:35 - 1.651
@@ -1473,6 +1473,14 @@
if ((bd-want_focus) (set) (!focus))
bd-want_focus = 0;
}
+ if (!bd-visible)
+ {
+ e_border_focus_latest_set(bd);
+ bd-want_focus = 1;
+ bd-changed = 1;
+ printf( - SKIP AA F %p %i %i\n, bd, focus, set);
+ return;
+ }
if ((focus) (!bd-focused))
{
if ((bd-visible) (bd-changes.visible))
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
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
Log Message:
oops. missed case.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.651
retrieving revision 1.652
diff -u -3 -r1.651 -r1.652
--- e_border.c 7 Aug 2008 06:16:35 - 1.651
+++ e_border.c 7 Aug 2008 06:45:02 - 1.652
@@ -1473,7 +1473,7 @@
if ((bd-want_focus) (set) (!focus))
bd-want_focus = 0;
}
- if (!bd-visible)
+ if ((!bd-visible) (focus))
{
e_border_focus_latest_set(bd);
bd-want_focus = 1;
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
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
Log Message:
remove debugging! works!
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.652
retrieving revision 1.653
diff -u -3 -r1.652 -r1.653
--- e_border.c 7 Aug 2008 06:45:02 - 1.652
+++ e_border.c 7 Aug 2008 07:08:16 - 1.653
@@ -1411,26 +1411,18 @@
// if (!bd-client.icccm.accepts_focus) return;
if ((!bd-client.icccm.accepts_focus)
(!bd-client.icccm.take_focus))
- {
-printf( - SKIP I F %p %i %i\n, bd, focus, set);
return;
- }
/* dont focus an iconified window. that's silly! */
if ((focus) (bd-iconic))
- {
-printf( - SKIP H F %p %i %i\n, bd, focus, set);
- return;
- }
+ return;
if ((bd-modal) (bd-modal != bd))
{
e_border_focus_set(bd-modal, focus, set);
-printf( - SKIP G F %p %i %i\n, bd, focus, set);
return;
}
else if ((bd-leader) (bd-leader-modal) (bd-leader-modal != bd))
{
e_border_focus_set(bd-leader-modal, focus, set);
-printf( - SKIP F F %p %i %i\n, bd, focus, set);
return;
}
@@ -1444,11 +1436,9 @@
e_border_focus_latest_set(bd);
bd-want_focus = 1;
bd-changed = 1;
-printf( - SKIP E F %p %i %i\n, bd, focus, set);
return;
}
e_grabinput_focus(bd-client.win, E_FOCUS_METHOD_LOCALLY_ACTIVE);
-printf( - SKIP D F %p %i %i\n, bd, focus, set);
return;
}
else if ((!bd-client.icccm.accepts_focus)
@@ -1459,11 +1449,9 @@
e_border_focus_latest_set(bd);
bd-want_focus = 1;
bd-changed = 1;
-printf( - SKIP C F %p %i %i\n, bd, focus, set);
return;
}
e_grabinput_focus(bd-client.win, E_FOCUS_METHOD_GLOBALLY_ACTIVE);
-printf( - SKIP B F %p %i %i\n, bd, focus, set);
return;
}
}
@@ -1478,7 +1466,6 @@
e_border_focus_latest_set(bd);
bd-want_focus = 1;
bd-changed = 1;
- printf( - SKIP AA F %p %i %i\n, bd, focus, set);
return;
}
if ((focus) (!bd-focused))
@@ -1488,7 +1475,6 @@
e_border_focus_latest_set(bd);
bd-want_focus = 1;
bd-changed = 1;
-printf( - SKIP A F %p %i %i\n, bd, focus, set);
return;
}
// if (bd-visible)
@@ -1564,7 +1550,6 @@
{
E_Event_Border_Focus_Out *ev;
- printf(unfocus previous\n);
edje_object_signal_emit(focused-bg_object,
e,state,unfocused, e);
if (focused-icon_object)
edje_object_signal_emit(focused-icon_object,
e,state,unfocused, e);
@@ -1576,7 +1561,6 @@
ecore_event_add(E_EVENT_BORDER_FOCUS_OUT, ev,
_e_border_event_border_focus_out_free, NULL);
-printf(FOUT %s\n, bd-client.netwm.name);
/* FIXME: Sometimes we should leave the window fullscreen! */
// if (focused-fullscreen) e_border_unfullscreen(focused);
@@ -1620,14 +1604,12 @@
}
*/
#endif
- printf(- F=%i, S=%i V=%i, W=%i\n, focus, set, bd-visible,
bd-want_focus);
if (focus_changed)
{
if (bd-focused)
{
E_Event_Border_Focus_In *ev;
-printf( - focused = %p\n, focused);
focused = bd;
//printf(set focused to %p\n, focused);
@@ -1639,7 +1621,6 @@
ecore_event_add(E_EVENT_BORDER_FOCUS_IN, ev,
_e_border_event_border_focus_in_free, NULL);
-printf(FIN %s\n, bd-client.netwm.name);
}
else
{
@@ -1656,7 +1637,6 @@
ecore_event_add(E_EVENT_BORDER_FOCUS_OUT, ev,
_e_border_event_border_focus_out_free, NULL);
-printf(FOUT %s\n, bd-client.netwm.name);
}
}
}
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/battery
Modified Files:
batget.c
Log Message:
handle other states for state - not charging is an... interesting one...
(as a replacement for discharging)
===
RCS file: /cvs/e/e17/apps/e/src/modules/battery/batget.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- batget.c19 Jun 2008 12:18:59 - 1.13
+++ batget.c7 Aug 2008 23:37:14 - 1.14
@@ -712,6 +712,8 @@
{
full = 0;
if (!strncasecmp(discharging, tmp, 11)) charging = 0;
+ else if (!strncasecmp(unknown, tmp, 7)) charging = 0;
+ else if (!strncasecmp(not charging, tmp, 12)) charging = 0;
else if (!strncasecmp(charging, tmp, 8)) charging = 1;
else if (!strncasecmp(full, tmp, 4))
{
@@ -1058,7 +1060,7 @@
tmp = str_get(buf);
if (tmp)
{
- if (!strcmp(tmp, yes)) have_battery = 1;
+ if (!strcasecmp(tmp, yes)) have_battery = 1;
free(tmp);
}
/* capacity state: ok/? */
@@ -1070,7 +1072,7 @@
{
if (have_power == 0)
{
- if (!strcmp(tmp, charging)) have_power = 1;
+ if (!strcasecmp(tmp, charging)) have_power = 1;
}
free(tmp);
}
@@ -1079,7 +1081,7 @@
tmp = str_get(buf);
if (tmp)
{
- if (strcmp(tmp, unknown)) rate += atoi(tmp);
+ if (strcasecmp(tmp, unknown)) rate += atoi(tmp);
free(tmp);
}
/* remaining capacity: NNN */
@@ -1087,7 +1089,7 @@
tmp = str_get(buf);
if (tmp)
{
- if (strcmp(tmp, unknown)) capacity += atoi(tmp);
+ if (strcasecmp(tmp, unknown)) capacity += atoi(tmp);
free(tmp);
}
fclose(f);
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
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
Log Message:
handle bizarre focus properties. ie take_focus - but a window that never
actually takes focus...
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.643
retrieving revision 1.644
diff -u -3 -r1.643 -r1.644
--- e_border.c 3 Aug 2008 21:54:49 - 1.643
+++ e_border.c 6 Aug 2008 22:57:37 - 1.644
@@ -1410,7 +1410,6 @@
(!bd-client.icccm.take_focus)) return;
/* dont focus an iconified window. that's silly! */
if ((focus) (bd-iconic)) return;
-
if ((bd-modal) (bd-modal != bd))
{
e_border_focus_set(bd-modal, focus, set);
@@ -1421,6 +1420,37 @@
e_border_focus_set(bd-leader-modal, focus, set);
return;
}
+
+ if ((focus) (set) (!bd-focused))
+ {
+ if ((bd-client.icccm.accepts_focus)
+ (bd-client.icccm.take_focus))
+ {
+if ((bd-visible) (bd-changes.visible))
+ {
+ e_border_focus_latest_set(bd);
+ bd-want_focus = 1;
+ bd-changed = 1;
+ return;
+ }
+e_grabinput_focus(bd-client.win, E_FOCUS_METHOD_LOCALLY_ACTIVE);
+return;
+ }
+ else if ((!bd-client.icccm.accepts_focus)
+(bd-client.icccm.take_focus))
+ {
+if ((bd-visible) (bd-changes.visible))
+ {
+ e_border_focus_latest_set(bd);
+ bd-want_focus = 1;
+ bd-changed = 1;
+ return;
+ }
+e_grabinput_focus(bd-client.win, E_FOCUS_METHOD_GLOBALLY_ACTIVE);
+return;
+ }
+ }
+
if ((bd-visible) (bd-changes.visible))
{
if ((bd-want_focus) (set) (!focus))
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
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
Log Message:
testing...
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.644
retrieving revision 1.645
diff -u -3 -r1.644 -r1.645
--- e_border.c 6 Aug 2008 22:57:37 - 1.644
+++ e_border.c 7 Aug 2008 03:09:46 - 1.645
@@ -1406,8 +1406,9 @@
/* be strict about accepting focus hint */
// printf(e_border_focus_set(%p, %s, %i %i);\n, bd, bd-client.icccm.name,
focus, set);
// printf( accept:%i take:%i\n, bd-client.icccm.accepts_focus,
bd-client.icccm.take_focus);
- if ((!bd-client.icccm.accepts_focus)
- (!bd-client.icccm.take_focus)) return;
+ if (!bd-client.icccm.accepts_focus) return;
+// if ((!bd-client.icccm.accepts_focus)
+// (!bd-client.icccm.take_focus)) return;
/* dont focus an iconified window. that's silly! */
if ((focus) (bd-iconic)) return;
if ((bd-modal) (bd-modal != bd))
@@ -1420,7 +1421,7 @@
e_border_focus_set(bd-leader-modal, focus, set);
return;
}
-
+/*
if ((focus) (set) (!bd-focused))
{
if ((bd-client.icccm.accepts_focus)
@@ -1450,7 +1451,7 @@
return;
}
}
-
+ */
if ((bd-visible) (bd-changes.visible))
{
if ((bd-want_focus) (set) (!focus))
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
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
Log Message:
ok - try this instead.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.645
retrieving revision 1.646
diff -u -3 -r1.645 -r1.646
--- e_border.c 7 Aug 2008 03:09:46 - 1.645
+++ e_border.c 7 Aug 2008 04:16:21 - 1.646
@@ -1398,6 +1398,8 @@
EAPI void
e_border_focus_set(E_Border *bd, int focus, int set)
{
+ int focus_changed = 0;
+
E_OBJECT_CHECK(bd);
E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
/* note: this is here as it seems there are enough apps that do not even
@@ -1406,9 +1408,9 @@
/* be strict about accepting focus hint */
// printf(e_border_focus_set(%p, %s, %i %i);\n, bd, bd-client.icccm.name,
focus, set);
// printf( accept:%i take:%i\n, bd-client.icccm.accepts_focus,
bd-client.icccm.take_focus);
- if (!bd-client.icccm.accepts_focus) return;
-// if ((!bd-client.icccm.accepts_focus)
-// (!bd-client.icccm.take_focus)) return;
+// if (!bd-client.icccm.accepts_focus) return;
+ if ((!bd-client.icccm.accepts_focus)
+ (!bd-client.icccm.take_focus)) return;
/* dont focus an iconified window. that's silly! */
if ((focus) (bd-iconic)) return;
if ((bd-modal) (bd-modal != bd))
@@ -1421,7 +1423,7 @@
e_border_focus_set(bd-leader-modal, focus, set);
return;
}
-/*
+
if ((focus) (set) (!bd-focused))
{
if ((bd-client.icccm.accepts_focus)
@@ -1451,7 +1453,7 @@
return;
}
}
- */
+
if ((bd-visible) (bd-changes.visible))
{
if ((bd-want_focus) (set) (!focus))
@@ -1495,6 +1497,8 @@
bd-raise_timer = NULL;
}
}
+ if (((bd-focused) (!focus)) || ((!bd-focused) (focus)))
+ focus_changed = 1;
bd-focused = focus;
if (set)
{
@@ -1586,15 +1590,15 @@
e_hints_active_window_set(bd-zone-container-manager, NULL);
}
#endif
- if (bd-focused)
+ if (focus_changed)
{
- E_Event_Border_Focus_In *ev;
-
- focused = bd;
- //printf(set focused to %p\n, focused);
-
- if (focus set)
- {
+ if (bd-focused)
+ {
+E_Event_Border_Focus_In *ev;
+
+focused = bd;
+//printf(set focused to %p\n, focused);
+
// Let send the focus event iff the focus is set explicitly,
// not via callback
ev = calloc(1, sizeof(E_Event_Border_Focus_In));
@@ -1604,16 +1608,13 @@
ecore_event_add(E_EVENT_BORDER_FOCUS_IN, ev,
_e_border_event_border_focus_in_free, NULL);
}
- }
- else if ((!bd-focused) (focused == bd))
- {
- E_Event_Border_Focus_Out *ev;
+ else
+ {
+E_Event_Border_Focus_Out *ev;
- focused = NULL;
- //printf(set focused to %p\n, focused);
+focused = NULL;
+//printf(set focused to %p\n, focused);
- if (set)
- {
// Let send the focus event iff the focus is set explicitly,
// not via callback
ev = calloc(1, sizeof(E_Event_Border_Focus_Out));
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
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
Log Message:
try this now...
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.646
retrieving revision 1.647
diff -u -3 -r1.646 -r1.647
--- e_border.c 7 Aug 2008 04:16:21 - 1.646
+++ e_border.c 7 Aug 2008 04:30:02 - 1.647
@@ -1607,6 +1607,7 @@
ecore_event_add(E_EVENT_BORDER_FOCUS_IN, ev,
_e_border_event_border_focus_in_free, NULL);
+printf(FIN %s\n, bd-client.netwm.name);
}
else
{
@@ -1623,6 +1624,7 @@
ecore_event_add(E_EVENT_BORDER_FOCUS_OUT, ev,
_e_border_event_border_focus_out_free, NULL);
+printf(FOUT %s\n, bd-client.netwm.name);
}
}
}
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
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
Log Message:
debugging...
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.647
retrieving revision 1.648
diff -u -3 -r1.647 -r1.648
--- e_border.c 7 Aug 2008 04:30:02 - 1.647
+++ e_border.c 7 Aug 2008 04:57:23 - 1.648
@@ -1590,6 +1590,7 @@
e_hints_active_window_set(bd-zone-container-manager, NULL);
}
#endif
+ printf(- F=%i, SET=%i\n, focus, set);
if (focus_changed)
{
if (bd-focused)
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
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
Log Message:
more testing...
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.648
retrieving revision 1.649
diff -u -3 -r1.648 -r1.649
--- e_border.c 7 Aug 2008 04:57:23 - 1.648
+++ e_border.c 7 Aug 2008 05:11:45 - 1.649
@@ -1590,7 +1590,7 @@
e_hints_active_window_set(bd-zone-container-manager, NULL);
}
#endif
- printf(- F=%i, SET=%i\n, focus, set);
+ printf(- F=%i, S=%i V=%i\n, focus, set, bd-visible);
if (focus_changed)
{
if (bd-focused)
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
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/po Modified Files: bg.po ca.po de.po eo.po es.po fi.po fr.po fr_CH.po hu.po it.po ja.po ko.po pt_BR.po ru.po sl.po zh_CN.po zh_TW.po Log Message: actually include images in tarball - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ 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/themes/images Modified Files: Makefile.am Log Message: actually include images in tarball === RCS file: /cvs/e/e17/apps/e/data/themes/images/Makefile.am,v retrieving revision 1.106 retrieving revision 1.107 diff -u -3 -r1.106 -r1.107 --- Makefile.am 6 May 2008 09:30:20 - 1.106 +++ Makefile.am 6 Aug 2008 05:19:24 - 1.107 @@ -558,5 +558,14 @@ e17_whitev.png \ e17_wiz_b1.png \ e17_wiz_b2.png \ -e17_icon_window_remembers.png +e17_icon_window_remembers.png \ +e17_mixer_base.png \ +e17_mixer_left_high.png \ +e17_mixer_left_low.png \ +e17_mixer_left_medium.png \ +e17_mixer_module_icon.png \ +e17_mixer_mute.png \ +e17_mixer_right_high.png \ +e17_mixer_right_low.png \ +e17_mixer_right_medium.png - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ 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
Modified Files:
configure.in enlightenment.pc.in
Log Message:
fix pc file to not inlcude dbus verbatim includes. just -D's for config
===
RCS file: /cvs/e/e17/apps/e/configure.in,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -3 -r1.210 -r1.211
--- configure.in5 Aug 2008 13:52:00 - 1.210
+++ configure.in6 Aug 2008 05:42:53 - 1.211
@@ -231,8 +231,11 @@
e_libs=$E_LIBS $LIBINTL $fnmatch_libs
e_cflags=-DUSE_E_CONFIG_H $define_e_dbus $E_CFLAGS $E_DBUS_CFLAGS
+e_configflags=-DUSE_E_CONFIG_H $define_e_dbus
+
AC_SUBST(e_libs)
AC_SUBST(e_cflags)
+AC_SUBST(e_configflags)
profile=SLOW_PC
AC_ARG_WITH(profile,
===
RCS file: /cvs/e/e17/apps/e/enlightenment.pc.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- enlightenment.pc.in 5 Aug 2008 13:52:00 - 1.4
+++ enlightenment.pc.in 6 Aug 2008 05:42:53 - 1.5
@@ -8,4 +8,4 @@
Version: @VERSION@
Libs: -L${libdir}
Libs.private:
-Cflags: -I${includedir} @e_cflags@
+Cflags: -I${includedir} @e_configflags@
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
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 Log Message: fix java app focus. === RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v retrieving revision 1.642 retrieving revision 1.643 diff -u -3 -r1.642 -r1.643 --- e_border.c 25 Jul 2008 02:09:27 - 1.642 +++ e_border.c 3 Aug 2008 21:54:49 - 1.643 @@ -1369,7 +1369,8 @@ * focus as we do - so simply abort any focuse set on such windows */ /* be strict about accepting focus hint */ // printf( 2accept:%i take:%i\n, bd-client.icccm.accepts_focus, bd-client.icccm.take_focus); - if (!bd-client.icccm.accepts_focus) return; + if ((!bd-client.icccm.accepts_focus) + (!bd-client.icccm.take_focus)) return; /* Try to grab the pointer to make sure it's not in use */ if (!ecore_x_pointer_grab(bd-zone-container-win)) @@ -1405,7 +1406,8 @@ /* be strict about accepting focus hint */ // printf(e_border_focus_set(%p, %s, %i %i);\n, bd, bd-client.icccm.name, focus, set); // printf( accept:%i take:%i\n, bd-client.icccm.accepts_focus, bd-client.icccm.take_focus); - if (!bd-client.icccm.accepts_focus) return; + if ((!bd-client.icccm.accepts_focus) + (!bd-client.icccm.take_focus)) return; /* dont focus an iconified window. that's silly! */ if ((focus) (bd-iconic)) return; - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ 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_canvas.c e_config.c
Log Message:
actually build! bad k-s! :)
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_canvas.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_canvas.c 1 Aug 2008 02:21:38 - 1.20
+++ e_canvas.c 1 Aug 2008 06:24:18 - 1.21
@@ -56,14 +56,14 @@
/* if engine is software-16 - do we support it? */
if (engine == E_EVAS_ENGINE_SOFTWARE_X11_16)
{
- if
(!ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_SOFTWARE_X11_16))
+ if
(!ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_SOFTWARE_16_X11))
engine = E_EVAS_ENGINE_SOFTWARE_X11;
}
/* if engine is gl - do we support it? */
if (engine == E_EVAS_ENGINE_GL_X11)
{
/* if we dont - fall back to software x11 */
- if (!ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_GL_X11))
+ if (!ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_X11))
engine = E_EVAS_ENGINE_SOFTWARE_X11;
}
/* support xrender? */
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -3 -r1.286 -r1.287
--- e_config.c 1 Aug 2008 02:21:38 - 1.286
+++ e_config.c 1 Aug 2008 06:24:18 - 1.287
@@ -1801,7 +1801,7 @@
#endif
if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_XRENDER_X11))
l = evas_list_append(l, strdup(XRENDER));
- if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_SOFTWARE_X11_16))
+ if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_SOFTWARE_16_X11))
l = evas_list_append(l, strdup(SOFTWARE_16));
return l;
}
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
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_exec.c
Log Message:
add new ecore_Exe control calls (interrupt and quit) and dont ertror dialog
on all exits of apps (sigint/quit/.term can be ignored i think).
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_exec.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_exec.c12 Mar 2008 07:31:13 - 1.13
+++ e_exec.c29 Jul 2008 22:07:19 - 1.14
@@ -331,10 +331,20 @@
/* Let's hope that everything returns this properly. */
else if (!((ev-exited) (ev-exit_code == EXIT_SUCCESS)))
{
- /* Show the error dialog with details from the exe. */
- _e_exec_error_dialog(inst-desktop, ecore_exe_cmd_get(ev-exe), ev,
-ecore_exe_event_data_get(ev-exe,
ECORE_EXE_PIPE_ERROR),
-ecore_exe_event_data_get(ev-exe,
ECORE_EXE_PIPE_READ));
+ /* filter out common exits via signals - int/term/quit. not really
+* worth popping up a dialog for */
+ if (!
+ ((ev-signalled)
+((ev-exit_signal == SIGINT) ||
+ (ev-exit_signal == SIGQUIT) ||
+ (ev-exit_signal == SIGTERM)))
+ )
+ {
+/* Show the error dialog with details from the exe. */
+_e_exec_error_dialog(inst-desktop, ecore_exe_cmd_get(ev-exe), ev,
+ ecore_exe_event_data_get(ev-exe,
ECORE_EXE_PIPE_ERROR),
+ ecore_exe_event_data_get(ev-exe,
ECORE_EXE_PIPE_READ));
+ }
}
if (inst-desktop)
{
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
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_border.h e_hints.c e_hints.h
Log Message:
use ecore_x vkbd wrappers now.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.641
retrieving revision 1.642
diff -u -3 -r1.641 -r1.642
--- e_border.c 23 Jul 2008 22:10:10 - 1.641
+++ e_border.c 25 Jul 2008 02:09:27 - 1.642
@@ -425,9 +425,9 @@
else if (atoms[i] == _QTOPIA_SOFT_MENUS)
bd-client.qtopia.fetch.soft_menus = 1;
/* loop to check for vkbd atoms */
- else if (atoms[i] == _E_VIRTUAL_KEYBOARD_STATE)
+ else if (atoms[i] == ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE)
bd-client.vkbd.fetch.state = 1;
- else if (atoms[i] == _E_VIRTUAL_KEYBOARD)
+ else if (atoms[i] == ECORE_X_ATOM_E_VIRTUAL_KEYBOARD)
bd-client.vkbd.fetch.vkbd = 1;
}
free(atoms);
@@ -3999,12 +3999,12 @@
bd-client.qtopia.fetch.soft_menus = 1;
bd-changed = 1;
}
- else if (e-atom == _E_VIRTUAL_KEYBOARD_STATE)
+ else if (e-atom == ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE)
{
bd-client.vkbd.fetch.state = 1;
bd-changed = 1;
}
- else if (e-atom == _E_VIRTUAL_KEYBOARD)
+ else if (e-atom == ECORE_X_ATOM_E_VIRTUAL_KEYBOARD)
{
bd-client.vkbd.fetch.vkbd = 1;
bd-changed = 1;
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.h,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -3 -r1.174 -r1.175
--- e_border.h 17 Jul 2008 14:01:36 - 1.174
+++ e_border.h 25 Jul 2008 02:09:27 - 1.175
@@ -353,7 +353,7 @@
unsigned char state : 1;
unsigned char vkbd : 1;
} fetch;
-Ecore_X_Atom state;
+Ecore_X_Virtual_Keyboard_State state;
unsigned char vkbd : 1;
} vkbd;
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_hints.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -3 -r1.102 -r1.103
--- e_hints.c 23 Jul 2008 21:54:42 - 1.102
+++ e_hints.c 25 Jul 2008 02:09:27 - 1.103
@@ -5,12 +5,6 @@
EAPI Ecore_X_Atom _QTOPIA_SOFT_MENU = 0;
EAPI Ecore_X_Atom _QTOPIA_SOFT_MENUS = 0;
-EAPI Ecore_X_Atom _E_VIRTUAL_KEYBOARD = 0;
-EAPI Ecore_X_Atom _E_VIRTUAL_KEYBOARD_STATE = 0;
-EAPI Ecore_X_Atom _E_VIRTUAL_KEYBOARD_OFF = 0;
-EAPI Ecore_X_Atom _E_VIRTUAL_KEYBOARD_ON = 0;
-EAPI Ecore_X_Atom _E_VIRTUAL_KEYBOARD_ALPHA = 0;
-EAPI Ecore_X_Atom _E_VIRTUAL_KEYBOARD_NUMERIC = 0;
static Ecore_X_Atom gnome_atom = 0;
static Ecore_X_Atom enlightenment_comms = 0;
@@ -27,27 +21,15 @@
GNOME_SM_PROXY,
ENLIGHTENMENT_COMMS,
ENLIGHTENMENT_VERSION,
- _E_VIRTUAL_KEYBOARD,
- _E_VIRTUAL_KEYBOARD_STATE,
- _E_VIRTUAL_KEYBOARD_OFF,
- _E_VIRTUAL_KEYBOARD_ON,
- _E_VIRTUAL_KEYBOARD_ALPHA,
- _E_VIRTUAL_KEYBOARD_NUMERIC
};
- Ecore_X_Atom atoms[11];
+ Ecore_X_Atom atoms[5];
- ecore_x_atoms_get(atom_names, 11, atoms);
+ 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];
- _E_VIRTUAL_KEYBOARD = atoms[5];
- _E_VIRTUAL_KEYBOARD_STATE = atoms[6];
- _E_VIRTUAL_KEYBOARD_OFF = atoms[7];
- _E_VIRTUAL_KEYBOARD_ON = atoms[8];
- _E_VIRTUAL_KEYBOARD_ALPHA = atoms[9];
- _E_VIRTUAL_KEYBOARD_NUMERIC = atoms[10];
roots = ecore_x_window_root_list(num);
if (roots)
@@ -1406,20 +1388,13 @@
EAPI void
e_hints_window_virtual_keyboard_state_get(E_Border *bd)
{
- if (!ecore_x_window_prop_atom_get(bd-client.win, _E_VIRTUAL_KEYBOARD_STATE,
-(bd-client.vkbd.state), 1))
- bd-client.vkbd.state = 0;
+ bd-client.vkbd.state =
ecore_x_e_virtual_keyboard_state_get(bd-client.win);
}
EAPI void
e_hints_window_virtual_keyboard_get(E_Border *bd)
{
- unsigned int val;
-
- if (ecore_x_window_prop_card32_get(bd-client.win, _E_VIRTUAL_KEYBOARD,
val, 1))
- bd-client.vkbd.vkbd = val;
- else
- bd-client.vkbd.vkbd = 0;
+ bd-client.vkbd.vkbd = ecore_x_e_virtual_keyboard_get(bd-client.win);
}
EAPI void
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_hints.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- e_hints.h 16 Jul 2008 17:06:23 - 1.25
+++ e_hints.h 25 Jul 2008 02:09:28 - 1.26
@@ -56,12 +56,6 @@
extern EAPI Ecore_X_Atom _QTOPIA_SOFT_MENU;
extern EAPI Ecore_X_Atom _QTOPIA_SOFT_MENUS;
-extern EAPI
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_hints.c
Log Message:
skip unknown types for netwmtypes (as primary type)
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_hints.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -3 -r1.101 -r1.102
--- e_hints.c 16 Jul 2008 17:06:23 - 1.101
+++ e_hints.c 23 Jul 2008 21:54:42 - 1.102
@@ -698,7 +698,7 @@
e_hints_window_type_get(E_Border *bd)
{
Ecore_X_Window_Type *types = NULL;
- int num, i;
+ int num, i, j;
num = ecore_x_netwm_window_types_get(bd-client.win, types);
if (bd-client.netwm.extra_types)
@@ -708,21 +708,27 @@
bd-client.netwm.extra_types_num = 0;
}
if (num == 0)
- {
- bd-client.netwm.type = ECORE_X_WINDOW_TYPE_UNKNOWN;
- }
+ bd-client.netwm.type = ECORE_X_WINDOW_TYPE_UNKNOWN;
else
{
- bd-client.netwm.type = types[0];
- if (num 1)
+ j = 0;
+ bd-client.netwm.type = types[j];
+ j++;
+ while ((j num)
+ (bd-client.netwm.type == ECORE_X_WINDOW_TYPE_UNKNOWN))
+ {
+j++;
+bd-client.netwm.type = types[j];
+ }
+ if (num j)
{
bd-client.netwm.extra_types =
- malloc((num - 1) * sizeof(Ecore_X_Window_Type));
+ malloc((num - j) * sizeof(Ecore_X_Window_Type));
if (bd-client.netwm.extra_types)
{
- for (i = 1; i num; i++)
- bd-client.netwm.extra_types[i - 1] = types[i];
- bd-client.netwm.extra_types_num = num - 1;
+ for (i = j + 1; i num; i++)
+ bd-client.netwm.extra_types[i - (j + 1)] = types[i];
+ bd-client.netwm.extra_types_num = num - j;
}
}
free(types);
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
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
Log Message:
fix propery event for windows.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.640
retrieving revision 1.641
diff -u -3 -r1.640 -r1.641
--- e_border.c 20 Jul 2008 20:21:03 - 1.640
+++ e_border.c 23 Jul 2008 22:10:10 - 1.641
@@ -6456,7 +6456,6 @@
bd-changes.pos = 0;
bd-changes.size = 0;
rem_change = 1;
- send_event = 0;
}
else if (bd-changes.pos)
{
@@ -6478,7 +6477,6 @@
e_container_shape_move(bd-shape, bd-x + bd-fx.x, bd-y + bd-fx.y);
bd-changes.pos = 0;
rem_change = 1;
- send_event = 0;
}
else if (bd-changes.size)
{
@@ -6586,7 +6584,6 @@
}
bd-changes.size = 0;
rem_change = 1;
- send_event = 0;
}
if (bd-changes.reset_gravity)
@@ -6903,7 +6900,8 @@
if ((bd-remember) (rem_change))
e_remember_update(bd-remember, bd);
- if (send_event)
+ if (send_event) // FIXME: send only if a property changed - above need to
+ // check on that. for now - always send.
{
event = calloc(1, sizeof(E_Event_Border_Property));
event-border = bd;
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
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_icon.c e_icon.h
Log Message:
add scale_up flag to limit upscaling beyond icon native size
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_icon.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_icon.c8 Feb 2008 23:03:28 - 1.20
+++ e_icon.c19 Jul 2008 14:09:46 - 1.21
@@ -10,7 +10,8 @@
Evas_Coord x, y, w, h;
Evas_Object *obj;
int size;
- char fill_inside : 1;
+ unsigned char fill_inside : 1;
+ unsigned char scale_up : 1;
};
/* local subsystem functions */
@@ -193,6 +194,29 @@
_e_icon_smart_reconfigure(sd);
}
+EAPI int
+e_icon_scale_up_get(Evas_Object *obj)
+{
+ E_Smart_Data *sd;
+
+ sd = evas_object_smart_data_get(obj);
+ if (sd-scale_up) return 1;
+ return 0;
+}
+
+EAPI void
+e_icon_scale_up_set(Evas_Object *obj, int scale_up)
+{
+ E_Smart_Data *sd;
+
+ sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
+ if (((sd-scale_up) (scale_up)) ||
+ ((!sd-scale_up) (!scale_up))) return;
+ sd-scale_up = scale_up;
+ _e_icon_smart_reconfigure(sd);
+}
+
EAPI void
e_icon_data_set(Evas_Object *obj, void *data, int w, int h)
{
@@ -287,6 +311,14 @@
w = ((double)iw * h) / (double)ih;
}
}
+ if (!sd-scale_up)
+ {
+if ((w iw) || (h ih))
+ {
+ w = iw;
+ h = ih;
+ }
+ }
x = sd-x + ((sd-w - w) / 2);
y = sd-y + ((sd-h - h) / 2);
evas_object_move(sd-obj, x, y);
@@ -332,6 +364,7 @@
sd-w = 0;
sd-h = 0;
sd-fill_inside = 1;
+ sd-scale_up = 1;
sd-size = 64;
evas_object_smart_member_add(sd-obj, obj);
evas_object_smart_data_set(obj, sd);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_icon.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_icon.h5 Feb 2008 12:00:19 - 1.11
+++ e_icon.h19 Jul 2008 14:09:46 - 1.12
@@ -19,6 +19,8 @@
EAPI void e_icon_size_get (Evas_Object *obj, int *w, int *h);
EAPI int e_icon_fill_inside_get (Evas_Object *obj);
EAPI void e_icon_fill_inside_set (Evas_Object *obj, int fill_inside);
+EAPI int e_icon_scale_up_get (Evas_Object *obj);
+EAPI void e_icon_scale_up_set (Evas_Object *obj, int scale_up);
EAPI void e_icon_data_set (Evas_Object *obj, void *data, int
w, int h);
EAPI void*e_icon_data_get (Evas_Object *obj, int *w, int *h);
EAPI void e_icon_scale_size_set (Evas_Object *obj, int size);
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
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_border.h e_win.c e_win.h
Log Message:
add a way to force e to not remember a window of its own .
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.637
retrieving revision 1.638
diff -u -3 -r1.637 -r1.638
--- e_border.c 16 Jul 2008 17:06:23 - 1.637
+++ e_border.c 17 Jul 2008 14:01:36 - 1.638
@@ -6232,7 +6232,9 @@
bd-placed = 1;
}
- if ((bd-internal) (!bd-remember)
(e_config-remember_internal_windows))
+ if ((bd-internal) (!bd-remember)
+ (e_config-remember_internal_windows)
+ (!bd-internal_no_remember))
{
E_Remember *rem;
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.h,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -3 -r1.173 -r1.174
--- e_border.h 16 Jul 2008 17:06:23 - 1.173
+++ e_border.h 17 Jul 2008 14:01:36 - 1.174
@@ -418,6 +418,7 @@
unsigned intlock_life : 1; /*DONE*/
unsigned intinternal : 1;
+ unsigned intinternal_no_remember : 1;
unsigned intstolen : 1;
Ecore_Evas *internal_ecore_evas;
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_win.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- e_win.c 10 Sep 2007 21:50:54 - 1.24
+++ e_win.c 17 Jul 2008 14:01:36 - 1.25
@@ -94,6 +94,7 @@
win-border-re_manage = 0;
win-border-internal = 1;
win-border-internal_ecore_evas = win-ecore_evas;
+ if (win-state.no_remember) win-border-internal_no_remember = 1;
}
_e_win_prop_update(win);
e_border_show(win-border);
@@ -348,6 +349,14 @@
win-state.dialog = 1;
_e_win_prop_update(win);
}
+}
+
+EAPI void
+e_win_no_remember_set(E_Win *win, int no_remember)
+{
+ E_OBJECT_CHECK(win);
+ E_OBJECT_TYPE_CHECK(win, E_WIN_TYPE);
+ win-state.no_remember = no_remember;
}
EAPI E_Win *
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_win.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_win.h 10 Sep 2007 21:50:54 - 1.11
+++ e_win.h 17 Jul 2008 14:01:36 - 1.12
@@ -34,6 +34,7 @@
struct {
unsigned char centered : 1;
unsigned char dialog : 1;
+ unsigned char no_remember : 1;
} state;
E_Pointer *pointer;
@@ -69,6 +70,7 @@
EAPI void e_win_border_icon_key_set(E_Win *win, const char *key);
EAPI void e_win_centered_set (E_Win *win, int centered);
EAPI void e_win_dialog_set (E_Win *win, int dialog);
+EAPI void e_win_no_remember_set(E_Win *win, int no_remember);
EAPI E_Win *e_win_evas_object_win_get(Evas_Object *obj);
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
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_border.h e_hints.c e_hints.h e_init.c
Log Message:
vkbd hints...
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.636
retrieving revision 1.637
diff -u -3 -r1.636 -r1.637
--- e_border.c 8 Jul 2008 19:41:42 - 1.636
+++ e_border.c 16 Jul 2008 17:06:23 - 1.637
@@ -411,21 +411,24 @@
bd-client.netwm.fetch.state = 1;
}
}
-/* loop to check for own atoms */
+/* other misc atoms */
for (i = 0; i at_num; i++)
{
+ /* loop to check for own atoms */
if (atoms[i] == E_ATOM_WINDOW_STATE)
{
bd-client.e.fetch.state = 1;
}
- }
-/* loop to check for qtopia atoms */
-for (i = 0; i at_num; i++)
- {
+ /* loop to check for qtopia atoms */
if (atoms[i] == _QTOPIA_SOFT_MENU)
bd-client.qtopia.fetch.soft_menu = 1;
else if (atoms[i] == _QTOPIA_SOFT_MENUS)
bd-client.qtopia.fetch.soft_menus = 1;
+ /* loop to check for vkbd atoms */
+ else if (atoms[i] == _E_VIRTUAL_KEYBOARD_STATE)
+ bd-client.vkbd.fetch.state = 1;
+ else if (atoms[i] == _E_VIRTUAL_KEYBOARD)
+ bd-client.vkbd.fetch.vkbd = 1;
}
free(atoms);
}
@@ -3998,6 +4001,16 @@
bd-client.qtopia.fetch.soft_menus = 1;
bd-changed = 1;
}
+ else if (e-atom == _E_VIRTUAL_KEYBOARD_STATE)
+ {
+ bd-client.vkbd.fetch.state = 1;
+ bd-changed = 1;
+ }
+ else if (e-atom == _E_VIRTUAL_KEYBOARD)
+ {
+ bd-client.vkbd.fetch.vkbd = 1;
+ bd-changed = 1;
+ }
/*
else if (e-atom == ECORE_X_ATOM_NET_WM_USER_TIME)
{
@@ -5492,6 +5505,18 @@
bd-client.qtopia.fetch.soft_menus = 0;
rem_change = 1;
}
+ if (bd-client.vkbd.fetch.state)
+ {
+ e_hints_window_virtual_keyboard_state_get(bd);
+ bd-client.vkbd.fetch.state = 0;
+ rem_change = 1;
+ }
+ if (bd-client.vkbd.fetch.vkbd)
+ {
+ e_hints_window_virtual_keyboard_get(bd);
+ bd-client.vkbd.fetch.vkbd = 0;
+ rem_change = 1;
+ }
if (bd-changes.shape)
{
Ecore_X_Rectangle *rects;
@@ -5856,6 +5881,7 @@
}
}
+ _e_border_hook_call(E_BORDER_HOOK_EVAL_PRE_POST_FETCH, bd);
_e_border_hook_call(E_BORDER_HOOK_EVAL_POST_FETCH, bd);
_e_border_hook_call(E_BORDER_HOOK_EVAL_PRE_BORDER_ASSIGN, bd);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.h,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -3 -r1.172 -r1.173
--- e_border.h 21 May 2008 22:37:00 - 1.172
+++ e_border.h 16 Jul 2008 17:06:23 - 1.173
@@ -81,6 +81,7 @@
typedef enum _E_Border_Hook_Point
{
E_BORDER_HOOK_EVAL_PRE_FETCH,
+ E_BORDER_HOOK_EVAL_PRE_POST_FETCH,
E_BORDER_HOOK_EVAL_POST_FETCH,
E_BORDER_HOOK_EVAL_PRE_BORDER_ASSIGN,
E_BORDER_HOOK_EVAL_POST_BORDER_ASSIGN,
@@ -347,6 +348,14 @@
unsigned char soft_menu : 1;
unsigned char soft_menus : 1;
} qtopia;
+ struct {
+struct {
+ unsigned char state : 1;
+ unsigned char vkbd : 1;
+} fetch;
+Ecore_X_Atom state;
+unsigned char vkbd : 1;
+ } vkbd;
Ecore_X_Window_Attributes initial_attributes;
} client;
@@ -407,7 +416,9 @@
unsigned intlock_focus_in : 1; /*DONE*/
unsigned intlock_focus_out : 1; /*DONE*/
unsigned intlock_life : 1; /*DONE*/
+
unsigned intinternal : 1;
+ unsigned intstolen : 1;
Ecore_Evas *internal_ecore_evas;
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_hints.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -3 -r1.100 -r1.101
--- e_hints.c 9 Jul 2008 15:25:20 - 1.100
+++ e_hints.c 16 Jul 2008 17:06:23 - 1.101
@@ -3,8 +3,14 @@
*/
#include e.h
-Ecore_X_Atom _QTOPIA_SOFT_MENU = 0;
-Ecore_X_Atom _QTOPIA_SOFT_MENUS = 0;
+EAPI Ecore_X_Atom _QTOPIA_SOFT_MENU = 0;
+EAPI Ecore_X_Atom _QTOPIA_SOFT_MENUS = 0;
+EAPI Ecore_X_Atom _E_VIRTUAL_KEYBOARD = 0;
+EAPI Ecore_X_Atom _E_VIRTUAL_KEYBOARD_STATE = 0;
+EAPI Ecore_X_Atom _E_VIRTUAL_KEYBOARD_OFF = 0;
+EAPI Ecore_X_Atom _E_VIRTUAL_KEYBOARD_ON = 0;
+EAPI Ecore_X_Atom _E_VIRTUAL_KEYBOARD_ALPHA = 0;
+EAPI Ecore_X_Atom _E_VIRTUAL_KEYBOARD_NUMERIC = 0;
static Ecore_X_Atom gnome_atom = 0;
static Ecore_X_Atom enlightenment_comms = 0;
@@
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: 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/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_actions.c
Log Message:
add now versions of actions
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -3 -r1.116 -r1.117
--- e_actions.c 19 Jun 2008 11:59:25 - 1.116
+++ e_actions.c 8 Jul 2008 12:02:09 - 1.117
@@ -1579,6 +1579,11 @@
ACT_FN_GO(exit)
{
+ if ((params) (!strcmp(params, now)))
+ {
+ e_sys_action_do(E_SYS_EXIT, NULL);
+ return;
+ }
if (exit_dialog) e_object_del(E_OBJECT(exit_dialog));
if (e_config-cnfmdlg_disabled)
@@ -1650,6 +1655,11 @@
ACT_FN_GO(logout)
{
+ if ((params) (!strcmp(params, now)))
+ {
+ e_sys_action_do(E_SYS_LOGOUT, NULL);
+ return;
+ }
if (logout_dialog) e_object_del(E_OBJECT(logout_dialog));
if (e_config-cnfmdlg_disabled)
@@ -1709,6 +1719,11 @@
ACT_FN_GO(halt)
{
+ if ((params) (!strcmp(params, now)))
+ {
+ e_sys_action_do(E_SYS_HALT, NULL);
+ return;
+ }
if (halt_dialog) e_object_del(E_OBJECT(halt_dialog));
if (e_config-cnfmdlg_disabled)
@@ -1768,6 +1783,11 @@
ACT_FN_GO(reboot)
{
+ if ((params) (!strcmp(params, now)))
+ {
+ e_sys_action_do(E_SYS_REBOOT, NULL);
+ return;
+ }
if (reboot_dialog) e_object_del(E_OBJECT(reboot_dialog));
if (e_config-cnfmdlg_disabled)
@@ -1827,6 +1847,11 @@
ACT_FN_GO(suspend)
{
+ if ((params) (!strcmp(params, now)))
+ {
+ e_sys_action_do(E_SYS_SUSPEND, NULL);
+ return;
+ }
if (suspend_dialog) e_object_del(E_OBJECT(suspend_dialog));
if (e_config-cnfmdlg_disabled)
@@ -1886,6 +1911,11 @@
ACT_FN_GO(hibernate)
{
+ if ((params) (!strcmp(params, now)))
+ {
+ e_sys_action_do(E_SYS_HIBERNATE, NULL);
+ return;
+ }
if (hibernate_dialog) e_object_del(E_OBJECT(hibernate_dialog));
if (e_config-cnfmdlg_disabled)
-
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/bin
Modified Files:
e_actions.c e_sys.c e_sys.h
Log Message:
add a halt_now that bypasses logout
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -3 -r1.117 -r1.118
--- e_actions.c 8 Jul 2008 12:02:09 - 1.117
+++ e_actions.c 8 Jul 2008 14:00:53 - 1.118
@@ -1624,6 +1624,12 @@
}
/***/
+ACT_FN_GO(halt_now)
+{
+ e_sys_action_do(E_SYS_HALT_NOW, NULL);
+}
+
+/***/
static E_Dialog *logout_dialog = NULL;
static void
@@ -2574,6 +2580,10 @@
ACT_GO(exit_now);
e_action_predef_name_set(_(Enlightenment), _(Exit Immediately),
exit_now, NULL, NULL, 0);
+
+ ACT_GO(halt_now);
+ e_action_predef_name_set(_(Enlightenment), _(Shut Down Immediately),
+ halt_now, NULL, NULL, 0);
ACT_GO(halt);
e_action_predef_name_set(_(System), _(Shut Down), halt,
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_sys.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_sys.c 24 Sep 2007 10:53:44 - 1.11
+++ e_sys.c 8 Jul 2008 14:00:53 - 1.12
@@ -72,6 +72,8 @@
return 0;
case E_SYS_HALT:
return _e_sys_can_halt;
+ case E_SYS_HALT_NOW:
+ return _e_sys_can_halt;
case E_SYS_REBOOT:
return _e_sys_can_reboot;
case E_SYS_SUSPEND:
@@ -102,6 +104,7 @@
case E_SYS_LOGOUT:
case E_SYS_SUSPEND:
case E_SYS_HIBERNATE:
+ case E_SYS_HALT_NOW:
ret = _e_sys_action_do(a, param);
break;
case E_SYS_HALT:
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_sys.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_sys.h 9 Sep 2006 07:00:14 - 1.2
+++ e_sys.h 8 Jul 2008 14:00:53 - 1.3
@@ -13,6 +13,7 @@
E_SYS_EXIT_NOW,
E_SYS_LOGOUT,
E_SYS_HALT,
+ E_SYS_HALT_NOW,
E_SYS_REBOOT,
E_SYS_SUSPEND,
E_SYS_HIBERNATE
-
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/bin
Modified Files:
e_sys.c
Log Message:
finish halt_now
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_sys.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_sys.c 8 Jul 2008 14:00:53 - 1.12
+++ e_sys.c 8 Jul 2008 15:48:39 - 1.13
@@ -71,7 +71,6 @@
case E_SYS_LOGOUT:
return 0;
case E_SYS_HALT:
- return _e_sys_can_halt;
case E_SYS_HALT_NOW:
return _e_sys_can_halt;
case E_SYS_REBOOT:
@@ -150,6 +149,7 @@
{
if (ev-exit_code != 0) _e_sys_action_failed();
if (((_e_sys_action_current != E_SYS_HALT)
+(_e_sys_action_current != E_SYS_HALT_NOW)
(_e_sys_action_current != E_SYS_REBOOT)) ||
(ev-exit_code != 0))
{
@@ -364,6 +364,7 @@
);
break;
case E_SYS_HALT:
+ case E_SYS_HALT_NOW:
e_dialog_text_set(dia,
_(Enlightenment is shutting the system down.br
You cannot do any other system actionsbr
@@ -417,6 +418,7 @@
switch (_e_sys_action_current)
{
case E_SYS_HALT:
+ case E_SYS_HALT_NOW:
e_dialog_text_set(dia,
_(Shutting down of your system failed.)
);
@@ -470,6 +472,7 @@
_e_sys_logout_begin(E_SYS_EXIT);
break;
case E_SYS_HALT:
+ case E_SYS_HALT_NOW:
/* shutdown -h now */
if (e_util_immortal_check()) return 0;
snprintf(buf, sizeof(buf), %s/enlightenment_sys halt,
-
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/bin
Modified Files:
e_about.c e_border.c e_obj_dialog.c e_theme_about.c
Log Message:
handle forced resized in about dialogs
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_about.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e_about.c 4 May 2007 16:21:53 - 1.19
+++ e_about.c 8 Jul 2008 19:41:42 - 1.20
@@ -7,6 +7,7 @@
static void _e_about_free(E_About *about);
static void _e_about_cb_delete(E_Win *win);
static void _e_about_cb_close(void *data, Evas_Object *obj, const char
*emission, const char *source);
+static void _e_about_cb_resize(E_Win *win);
static E_About *_e_about = NULL;
@@ -60,6 +61,7 @@
return NULL;
}
e_win_delete_callback_set(about-win, _e_about_cb_delete);
+ e_win_resize_callback_set(about-win, _e_about_cb_resize);
about-win-data = about;
e_win_dialog_set(about-win, 1);
e_win_name_class_set(about-win, E, _about);
@@ -200,4 +202,13 @@
about = data;
if (!about) return;
e_util_defer_object_del(E_OBJECT(about));
+}
+
+static void
+_e_about_cb_resize(E_Win *win)
+{
+ E_About *about;
+
+ about = win-data;
+ evas_object_resize(about-bg_object, about-win-w, about-win-h);
}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.635
retrieving revision 1.636
diff -u -3 -r1.635 -r1.636
--- e_border.c 19 May 2008 04:15:47 - 1.635
+++ e_border.c 8 Jul 2008 19:41:42 - 1.636
@@ -1376,7 +1376,8 @@
{
if (e_border_under_pointer_get(bd-desk, bd))
{
-if (!e_border_pointer_warp_to_center(bd))
+// FIXME: make this config. this is just annoying to warp all the time here!
+// if (!e_border_pointer_warp_to_center(bd))
e_border_focus_set(bd, 1, 1);
}
else
@@ -1385,7 +1386,8 @@
else if (e_config-focus_policy == E_FOCUS_CLICK)
e_border_focus_set(bd, 1, 1);
else
- if (!e_border_pointer_warp_to_center(bd))
+// FIXME: make this config. this is just annoying to warp all the time here!
+// if (!e_border_pointer_warp_to_center(bd))
e_border_focus_set(bd, 1, 1);
ecore_x_pointer_ungrab();
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_obj_dialog.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_obj_dialog.c 4 May 2007 16:21:53 - 1.4
+++ e_obj_dialog.c 8 Jul 2008 19:41:42 - 1.5
@@ -7,6 +7,7 @@
static void _e_obj_dialog_free(E_Obj_Dialog *od);
static void _e_obj_dialog_cb_delete(E_Win *win);
static void _e_obj_dialog_cb_close(void *data, Evas_Object *obj, const char
*emission, const char *source);
+static void _e_obj_dialog_cb_resize(E_Win *win);
/* local subsystem globals */
@@ -36,6 +37,7 @@
return NULL;
}
e_win_delete_callback_set(od-win, _e_obj_dialog_cb_delete);
+ e_win_resize_callback_set(od-win, _e_obj_dialog_cb_resize);
od-win-data = od;
e_win_dialog_set(od-win, 1);
e_win_name_class_set(od-win, class_name, class_class);
@@ -137,4 +139,13 @@
if (od-cb_delete)
od-cb_delete(od);
e_util_defer_object_del(E_OBJECT(od));
+}
+
+static void
+_e_obj_dialog_cb_resize(E_Win *win)
+{
+ E_Obj_Dialog *od;
+
+ od = win-data;
+ evas_object_resize(od-bg_object, od-win-w, od-win-h);
}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_theme_about.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_theme_about.c 4 May 2007 16:21:53 - 1.10
+++ e_theme_about.c 8 Jul 2008 19:41:42 - 1.11
@@ -7,6 +7,7 @@
static void _e_theme_about_free(E_Theme_About *about);
static void _e_theme_about_cb_delete(E_Win *win);
static void _e_theme_about_cb_close(void *data, Evas_Object *obj, const char
*emission, const char *source);
+static void _e_theme_about_cb_resize(E_Win *win);
static E_Theme_About *_e_theme_about = NULL;
@@ -60,6 +61,7 @@
return NULL;
}
e_win_delete_callback_set(about-win, _e_theme_about_cb_delete);
+ e_win_resize_callback_set(about-win, _e_theme_about_cb_resize);
about-win-data = about;
e_win_dialog_set(about-win, 1);
e_win_name_class_set(about-win, E, _theme_about);
@@ -129,4 +131,13 @@
about = data;
if (!about) return;
e_util_defer_object_del(E_OBJECT(about));
+}
+
+static void
+_e_theme_about_cb_resize(E_Win *win)
+{
+ E_Theme_About *about;
+
+ about = win-data;
+ evas_object_resize(about-bg_object, about-win-w, about-win-h);
}
-
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_desklock.c
Log Message:
beber desklock patches.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_desklock.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- e_desklock.c11 Jan 2008 07:33:55 - 1.45
+++ e_desklock.c7 Jul 2008 21:28:22 - 1.46
@@ -72,6 +72,7 @@
static int _e_desklock_cb_custom_desklock_exit(void *data, int type, void
*event);
static int _e_desklock_cb_idle_poller(void *data);
+static void _e_desklock_null(void);
static void _e_desklock_passwd_update(void);
static void _e_desklock_backspace(void);
static void _e_desklock_delete(void);
@@ -423,6 +424,8 @@
_e_desklock_backspace();
else if (!strcmp(ev-keysymbol, Delete))
_e_desklock_delete();
+ else if (!strcmp(ev-keysymbol, u) (ev-modifiers
ECORE_X_MODIFIER_CTRL))
+ _e_desklock_null();
else
{
/* here we have to grab a password */
@@ -506,6 +509,13 @@
}
static void
+_e_desklock_null(void)
+{
+ memset(edd-passwd, 0, sizeof(char) * PASSWD_LEN);
+ _e_desklock_passwd_update();
+}
+
+static void
_e_desklock_backspace(void)
{
int len, val, pos;
@@ -578,8 +588,7 @@
#endif
/* password is definitely wrong */
_e_desklock_state_set(E_DESKLOCK_STATE_INVALID);
- memset(edd-passwd, 0, sizeof(char) * PASSWD_LEN);
- _e_desklock_passwd_update();
+ _e_desklock_null();
return 0;
}
@@ -647,8 +656,7 @@
{
_e_desklock_state_set(E_DESKLOCK_STATE_INVALID);
/* security - null out passwd string once we are done with it */
-memset(edd-passwd, 0, sizeof(char) * PASSWD_LEN);
-_e_desklock_passwd_update();
+_e_desklock_null();
}
ecore_event_handler_del(_e_desklock_exit_handler);
_e_desklock_exit_handler = NULL;
-
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/bin
Modified Files:
e_ipc_handlers.h
Log Message:
update ipc to match actual gui engine stuff
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_ipc_handlers.h,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -3 -r1.151 -r1.152
--- e_ipc_handlers.h11 Jan 2008 07:33:55 - 1.151
+++ e_ipc_handlers.h2 Jul 2008 01:05:31 - 1.152
@@ -6749,7 +6749,7 @@
//
#define HDL E_IPC_OP_DEFAULT_ENGINE_SET
#if (TYPE == E_REMOTE_OPTIONS)
- OP(-default-engine-set, 1, Set the default rendering engine to OPT1
(SOFTWARE or XRENDER), 0, HDL)
+ OP(-default-engine-set, 1, Set the default rendering engine to OPT1
(SOFTWARE or XRENDER or /usr/local/bin/enlightenment_start), 0, HDL)
#elif (TYPE == E_REMOTE_OUT)
REQ_INT_START(HDL)
int value = 0;
@@ -6761,6 +6761,7 @@
exit(-1);
}
else if (!strcmp(params[0], XRENDER)) value = E_EVAS_ENGINE_XRENDER_X11;
+ else if (!strcmp(params[0], SOFTWARE_16)) value =
E_EVAS_ENGINE_SOFTWARE_X11_16;
else
{
printf(engine must be SOFTWARE or XRENDER\n);
@@ -6802,6 +6803,8 @@
printf(REPLY: GL\n);
else if (engine == E_EVAS_ENGINE_XRENDER_X11)
printf(REPLY: XRENDER\n);
+ else if (engine == E_EVAS_ENGINE_SOFTWARE_X11_16)
+ printf(REPLY: SOFTWARE_16\n);
else
printf(REPLY: UNKNOWN ENGINE: %d\n, engine);
END_INT
@@ -6875,6 +6878,7 @@
exit(-1);
}
else if (!strcmp(params[1], XRENDER)) engine = E_EVAS_ENGINE_XRENDER_X11;
+ else if (!strcmp(params[1], SOFTWARE_16)) engine =
E_EVAS_ENGINE_SOFTWARE_X11_16;
else
{
printf(engine must be DEFAULT, SOFTWARE or XRENDER\n);
@@ -6998,6 +7002,8 @@
printf(REPLY: GL\n);
else if (engine == E_EVAS_ENGINE_XRENDER_X11)
printf(REPLY: XRENDER\n);
+ else if (engine == E_EVAS_ENGINE_SOFTWARE_X11_16)
+ printf(REPLY: SOFTWARE_16\n);
else
printf(REPLY: UNKNOWN ENGINE: %d\n, engine);
END_INT;
-
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/winlist
Modified Files:
e_winlist.c
Log Message:
handle any_mod
===
RCS file: /cvs/e/e17/apps/e/src/modules/winlist/e_winlist.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_winlist.c 30 May 2008 22:30:56 - 1.7
+++ e_winlist.c 2 Jul 2008 05:26:54 - 1.8
@@ -803,7 +803,8 @@
if (ev-modifiers ECORE_X_MODIFIER_ALT) mod |=
E_BINDING_MODIFIER_ALT;
if (ev-modifiers ECORE_X_MODIFIER_WIN) mod |=
E_BINDING_MODIFIER_WIN;
-if (bind-key (!strcmp(bind-key, ev-keyname))
((bind-modifiers == mod)))
+if (bind-key (!strcmp(bind-key, ev-keyname))
+((bind-modifiers == mod) || (bind-any_mod)))
{
act = e_action_find(bind-action);
@@ -868,7 +869,8 @@
if (ev-modifiers ECORE_X_MODIFIER_ALT) mod |= E_BINDING_MODIFIER_ALT;
if (ev-modifiers ECORE_X_MODIFIER_WIN) mod |= E_BINDING_MODIFIER_WIN;
- if (bind-key (!strcmp(bind-key, ev-keyname)) ((bind-modifiers
== mod)))
+ if (bind-key (!strcmp(bind-key, ev-keyname))
+ ((bind-modifiers == mod) || (bind-any_mod)))
{
act = e_action_find(bind-action);
-
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/battery
Modified Files:
e_mod_main.c
Log Message:
fix battery module sizing and handle netwm activate messages.
===
RCS file: /cvs/e/e17/apps/e/src/modules/battery/e_mod_main.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -3 -r1.121 -r1.122
--- e_mod_main.c19 Jun 2008 12:18:59 - 1.121
+++ e_mod_main.c30 Jun 2008 08:48:29 - 1.122
@@ -110,16 +110,18 @@
_gc_orient(E_Gadcon_Client *gcc)
{
Instance *inst;
- Evas_Coord mw, mh;
+ Evas_Coord mw, mh, mxw, mxh;
inst = gcc-data;
mw = 0, mh = 0;
edje_object_size_min_get(inst-o_battery, mw, mh);
+ edje_object_size_max_get(inst-o_battery, mxw, mxh);
if ((mw 1) || (mh 1))
edje_object_size_min_calc(inst-o_battery, mw, mh);
if (mw 4) mw = 4;
if (mh 4) mh = 4;
- e_gadcon_client_aspect_set(gcc, mw, mh);
+ if ((mxw 0) (mxh 0))
+ e_gadcon_client_aspect_set(gcc, mxw, mxh);
e_gadcon_client_min_size_set(gcc, mw, mh);
}
-
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
___
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_hints.c e_manager.c
Log Message:
fix battery module sizing and handle netwm activate messages.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_hints.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -3 -r1.97 -r1.98
--- e_hints.c 13 Mar 2008 19:09:15 - 1.97
+++ e_hints.c 30 Jun 2008 08:48:29 - 1.98
@@ -259,6 +259,7 @@
E_Border_List *bl;
E_Border *b;
Ecore_X_Window *clients = NULL;
+ Ecore_X_Window *clients_focus = NULL;
/* Get client count by adding client lists on all containers */
for (ml = e_manager_list(); ml; ml = ml-next)
@@ -281,6 +282,7 @@
for (ml = e_manager_list(); ml; ml = ml-next)
{
m = ml-data;
+i = 0;
for (cl = m-containers; cl; cl = cl-next)
{
c = cl-data;
@@ -289,12 +291,16 @@
clients[i++] = b-client.win;
e_container_border_list_free(bl);
}
- }
- for (ml = e_manager_list(); ml; ml = ml-next)
- {
-m = ml-data;
-ecore_x_netwm_client_list_set(m-root, clients, num);
-ecore_x_netwm_client_list_stacking_set(m-root, clients, num);
+if (i 0)
+ {
+ ecore_x_netwm_client_list_stacking_set(m-root, clients, i);
+ ecore_x_netwm_client_list_set(m-root, clients, i);
+ }
+else
+ {
+ ecore_x_netwm_client_list_set(m-root, NULL, 0);
+ ecore_x_netwm_client_list_stacking_set(m-root, NULL, 0);
+ }
}
}
else
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_manager.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- e_manager.c 19 Jun 2008 11:56:09 - 1.70
+++ e_manager.c 30 Jun 2008 08:48:29 - 1.71
@@ -13,6 +13,7 @@
static int _e_manager_cb_frame_extents_request(void *data, int ev_type, void
*ev);
static int _e_manager_cb_ping(void *data, int ev_type, void *ev);
static int _e_manager_cb_screensaver_notify(void *data, int ev_type, void *ev);
+static int _e_manager_cb_client_message(void *data, int ev_type, void *ev);
static Evas_Bool _e_manager_frame_extents_free_cb(const Evas_Hash *hash
__UNUSED__,
const char *key __UNUSED__,
@@ -142,6 +143,8 @@
if (h) man-handlers = evas_list_append(man-handlers, h);
h = ecore_event_handler_add(ECORE_X_EVENT_SCREENSAVER_NOTIFY,
_e_manager_cb_screensaver_notify, man);
if (h) man-handlers = evas_list_append(man-handlers, h);
+ h = ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE,
_e_manager_cb_client_message, man);
+ if (h) man-handlers = evas_list_append(man-handlers, h);
man-pointer = e_pointer_window_new(man-root, 1);
@@ -785,6 +788,51 @@
return 1;
}
+static int
+_e_manager_cb_client_message(void *data, int ev_type, void *ev)
+{
+ E_Manager *man;
+ Ecore_X_Event_Client_Message *e;
+ E_Border *bd;
+
+ man = data;
+ e = ev;
+
+ if (e-message_type == ECORE_X_ATOM_NET_ACTIVE_WINDOW)
+ {
+ bd = e_border_find_by_client_window(e-win);
+ if ((bd) (!bd-focused))
+ {
+if (bd-iconic)
+ {
+ if (e_config-clientlist_warp_to_iconified_desktop == 1)
+ e_desk_show(bd-desk);
+
+ if (!bd-lock_user_iconify)
+ e_border_uniconify(bd);
+ }
+if (!bd-iconic) e_desk_show(bd-desk);
+if (!bd-lock_user_stacking) e_border_raise(bd);
+if (!bd-lock_focus_out)
+ {
+ if (e_config-focus_policy != E_FOCUS_CLICK)
+ ecore_x_pointer_warp(bd-zone-container-win,
+bd-x + (bd-w / 2), bd-y + (bd-h /
2));
+ e_border_focus_set(bd, 1, 1);
+ }
+#if 0 /* notes */
+if (e-data.l[0] == 0 /* 0 == old, 1 == client, 2 == pager */)
+ {
+ }
+timestamp = e-data.l[1];
+requestor_id e-data.l[2];
+#endif
+ }
+ }
+
+ return 1;
+}
+
static Evas_Bool
_e_manager_frame_extents_free_cb(const Evas_Hash *hash __UNUSED__, const char
*key __UNUSED__,
void *data, void *fdata __UNUSED__)
@@ -823,5 +871,4 @@
static int _e_manager_cb_window_property(void *data, int ev_type, void
*ev){return 1;}
static int _e_manager_cb_window_colormap(void *data, int ev_type, void
*ev){return 1;}
static int _e_manager_cb_window_shape(void *data, int ev_type, void
*ev){return 1;}
-static int
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_actions.c e_manager.c
Log Message:
delayed action binding - makies use of key ups (abd button ups)
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -3 -r1.114 -r1.115
--- e_actions.c 3 Apr 2008 18:47:13 - 1.114
+++ e_actions.c 18 Jun 2008 11:38:29 - 1.115
@@ -1964,6 +1964,238 @@
e_desklock_show();
}
+/***/
+
+typedef struct _Delayed_Action Delayed_Action;
+
+struct _Delayed_Action
+{
+ int mouse;
+ int button;
+ const char *keyname;
+ E_Object*obj;
+ Ecore_Timer *timer;
+ struct {
+ const char *action;
+ const char *params;
+ } def, delayed;
+};
+
+static Evas_List *_delayed_actions = NULL;
+
+static void
+_delayed_action_free(Delayed_Action *da)
+{
+ if (da-obj) e_object_unref(da-obj);
+ if (da-keyname) evas_stringshare_del(da-keyname);
+ if (da-timer) ecore_timer_del(da-timer);
+ if (da-def.action) evas_stringshare_del(da-def.action);
+ if (da-def.params) evas_stringshare_del(da-def.params);
+ if (da-delayed.action) evas_stringshare_del(da-delayed.action);
+ if (da-delayed.params) evas_stringshare_del(da-delayed.params);
+ free(da);
+}
+
+static int
+_delayed_action_cb_timer(void *data)
+{
+ Delayed_Action *da;
+ E_Action *act;
+
+ da = data;
+ da-timer = NULL;
+ act = e_action_find(da-delayed.action);
+ if (act)
+ {
+ if (act-func.go) act-func.go(da-obj, da-delayed.params);
+ }
+ _delayed_actions = evas_list_remove(_delayed_actions, da);
+ _delayed_action_free(da);
+ return 0;
+}
+
+static void
+_delayed_action_do(Delayed_Action *da)
+{
+ E_Action *act;
+
+ act = e_action_find(da-def.action);
+ if (act)
+ {
+ if (act-func.go) act-func.go(da-obj, da-def.params);
+ }
+}
+
+static void
+_delayed_action_list_parse_action(const char *str, double *delay, const char
**action, const char **params)
+{
+ char fbuf[16];
+ char buf[1024];
+ const char *p;
+
+ buf[0] = 0;
+ sscanf(str, %10s %1000s, fbuf, buf);
+ *action = evas_stringshare_add(buf);
+ *delay = atof(fbuf);
+ p = strchr(str, ' ');
+ if (p)
+ {
+ p++;
+ p = strchr(p, ' ');
+ if (p)
+ {
+p++;
+*params = evas_stringshare_add(p);
+ }
+ }
+}
+
+static int
+_delayed_action_list_parse(Delayed_Action *da, const char *params)
+{
+ double delay = 2.0;
+ const char *p,
+ *a1start = NULL, *a1stop = NULL,
+ *a2start = NULL, *a2stop = NULL;
+
+ // FORMAT: [0.0 default_action param1 param2] [x.x action2 param1 param2]
+ p = params;
+ while (*p)
+ {
+ if ((*p == '[') ((p == params) || ((p params) (p[-1] !=
'\\' {a1start = p + 1; break;}
+ p++;
+ }
+ while (*p)
+ {
+ if ((*p == ']') ((p == params) || ((p params) (p[-1] !=
'\\' {a1stop = p; break;}
+ p++;
+ }
+ while (*p)
+ {
+ if ((*p == '[') ((p == params) || ((p params) (p[-1] !=
'\\' {a2start = p + 1; break;}
+ p++;
+ }
+ while (*p)
+ {
+ if ((*p == ']') ((p == params) || ((p params) (p[-1] !=
'\\' {a2stop = p; break;}
+ p++;
+ }
+ if ((a1start) (a2start) (a1stop) (a2stop))
+ {
+ char *a1, *a2;
+ const char *action, *params;
+
+ a1 = alloca(a1stop - a1start + 1);
+ strncpy(a1, a1start, a1stop - a1start);
+ a1[a1stop - a1start] = 0;
+ action = NULL;
+ params = NULL;
+ _delayed_action_list_parse_action(a1, delay, da-def.action,
da-def.params);
+
+ a2 = alloca(a1stop - a1start + 1);
+ strncpy(a2, a2start, a2stop - a2start);
+ a2[a2stop - a2start] = 0;
+ _delayed_action_list_parse_action(a2, delay, da-delayed.action,
da-delayed.params);
+ }
+ da-timer = ecore_timer_add(delay, _delayed_action_cb_timer, da);
+}
+
+static void
+_delayed_action_key_add(E_Object *obj, const char *params,
Ecore_X_Event_Key_Down *ev)
+{
+ Delayed_Action *da;
+
+ da = E_NEW(Delayed_Action, 1);
+ if (!da) return;
+ if (obj)
+ {
+ da-obj = obj;
+ e_object_ref(da-obj);
+ }
+ da-mouse = 0;
+ da-keyname = evas_stringshare_add(ev-keyname);
+ if (params) _delayed_action_list_parse(da, params);
+ _delayed_actions = evas_list_append(_delayed_actions, da);
+}
+
+static void
+_delayed_action_key_del(E_Object *obj, const char *params,
Ecore_X_Event_Key_Up *ev)
+{
+ Evas_List *l;
+
+ for (l = _delayed_actions; l; l = l-next)
+ {
+ Delayed_Action *da;
+
+ da = l-data;
+ if ((da-obj == obj) (!da-mouse)
+ (!strcmp(da-keyname, ev-keyname)))
+ {
+
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_gadcon_config.c e_msgbus.c Log Message: typo === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_gadcon_config.c,v retrieving revision 1.48 retrieving revision 1.49 diff -u -3 -r1.48 -r1.49 --- e_int_gadcon_config.c 13 Feb 2008 04:51:01 - 1.48 +++ e_int_gadcon_config.c 11 Jun 2008 07:02:05 - 1.49 @@ -327,6 +327,7 @@ if (strcmp(name, cgc-name)) continue; e_gadcon_client_config_del(cfdata-gc-cf, cgc); update = 1; +break; } } if (update) === RCS file: /cvs/e/e17/apps/e/src/bin/e_msgbus.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_msgbus.c 13 Feb 2008 04:51:01 - 1.4 +++ e_msgbus.c 11 Jun 2008 07:02:05 - 1.5 @@ -40,7 +40,7 @@ printf(WARNING: Cannot get DBUS_BUS_SESSION\n); return 0; } - e_dbus_request_name(_e_msgbus_data-conn, org.enlighenment.wm.service, 0, _e_msgbus_request_name_cb, NULL); + e_dbus_request_name(_e_msgbus_data-conn, org.enlightenment.wm.service, 0, _e_msgbus_request_name_cb, NULL); _e_msgbus_data-obj = e_dbus_object_add(_e_msgbus_data-conn, /org/enlightenment/wm/RemoteObject, NULL); iface = e_dbus_interface_new(org.enlightenment.wm.Core); - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ 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/gadman Modified Files: e_mod_gadman.c Log Message: remove a pixmap! :) === RCS file: /cvs/e/e17/apps/e/src/modules/gadman/e_mod_gadman.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_mod_gadman.c 19 May 2008 10:03:10 - 1.4 +++ e_mod_gadman.c 1 Jun 2008 00:40:30 - 1.5 @@ -352,7 +352,8 @@ else ecore_evas_shaped_set(Man-top_ee, 1); -ecore_evas_avoid_damage_set(Man-top_ee, 1); //?? +// this isn't needed - we don't want to keep a pixmap of the whole canvas around! +//ecore_evas_avoid_damage_set(Man-top_ee, 1); //?? e_canvas_add(Man-top_ee); //?? e_container_window_raise(Man-container, Man-top_win, 250); - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ 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_configure.c e_configure.h e_main.c
Log Message:
e can now find any system config .desktops.. and put them automatically in
its config panel. the requirments: must be BOTH in category System and
Settings. if so - it will go in the config panel.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -3 -r1.116 -r1.117
--- e_configure.c 30 Apr 2008 12:01:32 - 1.116
+++ e_configure.c 23 May 2008 08:29:45 - 1.117
@@ -1,16 +1,156 @@
#include e.h
+static void _e_configure_efreet_desktop_update(void);
+static int _e_configure_cb_efreet_desktop_list_change(void *data, int type,
void *event);
+static int _e_configure_cb_efreet_desktop_change(void *data, int type, void
*event);
+static void _e_configure_registry_item_full_add(const char *path, int pri,
const char *label, const char *icon_file, const char *icon, E_Config_Dialog
*(*func) (E_Container *con, const char *params), void (*generic_func)
(E_Container *con, const char *params), Efreet_Desktop *desktop);
+
Evas_List *e_configure_registry = NULL;
+static Evas_List *handlers = NULL;
+
EAPI void
e_configure_init(void)
{
e_configure_registry_category_add(extensions, 90, _(Extensions), NULL,
enlightenment/extensions);
e_configure_registry_item_add(extensions/modules, 10, _(Modules), NULL,
enlightenment/modules, e_int_config_modules);
+
+ handlers = evas_list_append
+ (handlers, ecore_event_handler_add
+ (EFREET_EVENT_DESKTOP_LIST_CHANGE,
_e_configure_cb_efreet_desktop_list_change, NULL));
+ handlers = evas_list_append
+ (handlers, ecore_event_handler_add
+ (EFREET_EVENT_DESKTOP_CHANGE, _e_configure_cb_efreet_desktop_change,
NULL));
+// _e_configure_efreet_desktop_update();
+}
+
+static void
+_e_configure_efreet_desktop_update(void)
+{
+ Ecore_List *settings_desktops, *system_desktops;
+ Efreet_Desktop *desktop;
+ Evas_List *l, *ll, *remove_items = NULL, *remove_cats = NULL;
+ char buf[1024];
+
+ /* remove anything with a desktop entry */
+ for (l = e_configure_registry; l; l = l-next)
+ {
+ E_Configure_Cat *ecat;
+
+ ecat = l-data;
+ for (ll = ecat-items; ll; ll = ll-next)
+ {
+E_Configure_It *eci;
+
+eci = ll-data;
+if (eci-desktop)
+ {
+ snprintf(buf, sizeof(buf), %s/%s, ecat-cat, eci-item);
+ remove_items = evas_list_append(remove_items, strdup(buf));
+ remove_cats = evas_list_append(remove_cats,
strdup(ecat-cat));
+ }
+ }
+ }
+ while (remove_items)
+ {
+ e_configure_registry_item_del(remove_items-data);
+ free(remove_items-data);
+ remove_items = evas_list_remove_list(remove_items, remove_items);
+ }
+ while (remove_cats)
+ {
+ e_configure_registry_category_del(remove_cats-data);
+ free(remove_cats-data);
+ remove_cats = evas_list_remove_list(remove_cats, remove_cats);
+ }
+
+ /* get desktops */
+ settings_desktops = efreet_util_desktop_category_list(Settings);
+ system_desktops = efreet_util_desktop_category_list(System);
+ if ((!settings_desktops) || (!system_desktops)) return;
+
+ /* get ones in BOTH lists */
+ ecore_list_first_goto(settings_desktops);
+ while ((desktop = ecore_list_next(settings_desktops)))
+ {
+ char *s;
+ char *cfg_cat_item;
+ char *cfg_cat;
+ char *cfg_cat_cfg;
+ char *cfg_icon;
+ char *label;
+ int cfg_pri;
+
+ if (!ecore_list_goto(system_desktops, desktop)) continue;
+ cfg_cat = NULL;
+ cfg_icon = NULL;
+ cfg_cat_cfg = NULL;
+ cfg_pri = 1000;
+ label = NULL;
+ if (desktop-x)
+ {
+cfg_cat_cfg = ecore_hash_get(desktop-x,
X-Enlightenment-Config-Category);
+s = ecore_hash_get(desktop-x, X-Enlightenment-Config-Priority);
+if (s) cfg_pri = atoi(s);
+ }
+ if (desktop-icon)
+ {
+if (desktop-icon[0] == '/')
+ cfg_icon = strdup(desktop-icon);
+else
+ cfg_icon = efreet_icon_path_find(e_config-icon_theme,
+ desktop-icon, 64x64);
+ }
+ if (desktop-name) label = desktop-name;
+ else if (desktop-generic_name) label = desktop-generic_name;
+ else label = ???;
+ if (!cfg_cat_cfg)
+ {
+snprintf(buf, sizeof(buf), system/%s, label);
+cfg_cat_cfg = buf;
+e_configure_registry_category_add(system,
+ 1000, _(System),
+ NULL,
+
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_configure.c e_configure.h
Log Message:
and allow a custom launch callback
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -3 -r1.117 -r1.118
--- e_configure.c 23 May 2008 08:29:45 - 1.117
+++ e_configure.c 23 May 2008 08:51:22 - 1.118
@@ -380,6 +380,12 @@
}
+EAPI void
+e_configure_registry_custom_desktop_exec_callback_set(void (*func) (const void
*data, E_Container *con, const char *params, Efreet_Desktop *desktop), const
void *data)
+{
+ custom_desktop_exec.func = func;
+ custom_desktop_exec.data = data;
+}
EAPI int
e_configure_registry_exists(const char *path)
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_configure.h 23 May 2008 08:29:45 - 1.12
+++ e_configure.h 23 May 2008 08:51:22 - 1.13
@@ -36,7 +36,7 @@
EAPI void e_configure_registry_category_del(const char *path);
EAPI void e_configure_registry_call(const char *path, E_Container *con, const
char *params);
EAPI int e_configure_registry_exists(const char *path);
-EAPI void e_configure_registry_custom_desktop_exec_callback_set(void (func)
(), const void *data);
+EAPI void e_configure_registry_custom_desktop_exec_callback_set(void (*func)
(const void *data, E_Container *con, const char *params, Efreet_Desktop
*desktop), const void *data);
EAPI void e_configure_init(void);
EAPI Evas_List *e_configure_registry;
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
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_configure.c
Log Message:
handle more properties for .desktop fiels in config panel
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -3 -r1.118 -r1.119
--- e_configure.c 23 May 2008 08:51:22 - 1.118
+++ e_configure.c 23 May 2008 14:40:51 - 1.119
@@ -75,6 +75,8 @@
{
char *s;
char *cfg_cat_item;
+ char *cfg_cat_name;
+ char *cfg_cat_icon;
char *cfg_cat;
char *cfg_cat_cfg;
char *cfg_icon;
@@ -86,12 +88,24 @@
cfg_icon = NULL;
cfg_cat_cfg = NULL;
cfg_pri = 1000;
+ cfg_cat_name = NULL;
+ cfg_cat_icon = NULL;
label = NULL;
if (desktop-x)
{
cfg_cat_cfg = ecore_hash_get(desktop-x,
X-Enlightenment-Config-Category);
s = ecore_hash_get(desktop-x, X-Enlightenment-Config-Priority);
if (s) cfg_pri = atoi(s);
+cfg_cat_name = ecore_hash_get(desktop-x,
X-Enlightenment-Config-Category-Name);
+cfg_cat_icon = ecore_hash_get(desktop-x,
X-Enlightenment-Config-Category-Icon);
+if (cfg_cat_icon)
+ {
+ if (cfg_cat_icon[0] == '/')
+ cfg_cat_icon = strdup(cfg_cat_icon);
+ else
+ cfg_cat_icon = efreet_icon_path_find(e_config-icon_theme,
+cfg_cat_icon, 64x64);
+ }
}
if (desktop-icon)
{
@@ -106,12 +120,16 @@
else label = ???;
if (!cfg_cat_cfg)
{
+char *ic;
+
snprintf(buf, sizeof(buf), system/%s, label);
cfg_cat_cfg = buf;
+ic = cfg_cat_icon;
+if (!ic) ic = enlightenment/system;
e_configure_registry_category_add(system,
1000, _(System),
NULL,
- enlightenment/system); //
FIXME: another icon?
+ ic);
}
else
{
@@ -119,10 +137,12 @@
if (!cfg_cat) cfg_cat = strdup(cfg_cat_cfg);
if (cfg_cat)
{
+ if (!cfg_cat_name)
+ cfg_cat_name = cfg_cat;
e_configure_registry_category_add(cfg_cat,
- 1000, cfg_cat,
+ 1000, cfg_cat_name,
NULL,
- NULL); // FIXME: icon?
+ cfg_cat_icon);
free(cfg_cat);
cfg_cat = NULL;
}
@@ -132,6 +152,7 @@
NULL, NULL,
desktop);
if (cfg_icon) free(cfg_icon);
+ if (cfg_cat_icon) free(cfg_cat_icon);
}
}
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
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/po Modified Files: fr.po Log Message: fr.po - must maintain %s/%i order!!! - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/battery Modified Files: e-module-battery.edj Log Message: 1. updated battery module .edj - we need to update a lot of .edj's due to eet upgrades 2. dont need resize callback. pan handles it :) causes valgrind bitches if left too. === RCS file: /cvs/e/e17/apps/e/src/modules/battery/e-module-battery.edj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsBNqFom and /tmp/cvsltXCUX differ - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ 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_widget_flist.c
Log Message:
1. updated battery module .edj - we need to update a lot of .edj's due to eet
upgrades
2. dont need resize callback. pan handles it :) causes valgrind bitches if
left too.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_flist.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_widget_flist.c12 May 2008 20:38:27 - 1.1
+++ e_widget_flist.c22 May 2008 08:23:57 - 1.2
@@ -11,7 +11,6 @@
static void _e_wid_del_hook(Evas_Object *obj);
static void _e_wid_focus_hook(Evas_Object *obj);
static void _e_wid_focus_steal(void *data, Evas *evas, Evas_Object *obj, void
*event);
-static void _e_wid_cb_scroll_resize(void *data, Evas *evas, Evas_Object *obj,
void *event);
static void _e_wid_cb_selected(void *data, Evas_Object *obj, void *event);
static void _e_wid_cb_dir_changed(void *data, Evas_Object *obj, void *event);
static void _e_wid_cb_changed(void *data, Evas_Object *obj, void *event);
@@ -70,9 +69,6 @@
evas_object_smart_callback_add(wd-o_fm, files_deleted,
_e_wid_cb_file_deleted, obj);
- evas_object_event_callback_add(wd-o_scroll, EVAS_CALLBACK_RESIZE,
- _e_wid_cb_scroll_resize, wd-o_fm);
-
e_scrollframe_child_set(wd-o_scroll, o);
e_scrollframe_extern_pan_set(wd-o_scroll, o, e_fm2_pan_set,
e_fm2_pan_get, e_fm2_pan_max_get,
@@ -205,19 +201,6 @@
_e_wid_focus_steal(void *data, Evas *evas, Evas_Object *obj, void *event)
{
e_widget_focus_steal(data);
-}
-
-static void
-_e_wid_cb_scroll_resize(void *data, Evas *evas, Evas_Object *obj, void *event)
-{
- int vw, vh, mw, mh, w, h;
-
- e_scrollframe_child_viewport_size_get(obj, vw, vh);
- evas_object_geometry_get(obj, NULL, NULL, mw, h);
- if (vw = mw)
- {
-if (w != vw) evas_object_resize(data, vw, h);
- }
}
static void
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
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
Log Message:
focus stack broken in focus new window and click to focus. fix.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.633
retrieving revision 1.634
diff -u -3 -r1.633 -r1.634
--- e_border.c 28 Apr 2008 16:10:05 - 1.633
+++ e_border.c 18 May 2008 14:17:39 - 1.634
@@ -1425,14 +1425,17 @@
{
if ((bd-visible) (bd-changes.visible))
{
+e_border_focus_latest_set(bd);
bd-want_focus = 1;
bd-changed = 1;
return;
}
- if (bd-visible)
+// if (bd-visible)
{
if (focus_track_frozen == 0)
- e_border_focus_latest_set(bd);
+ {
+ e_border_focus_latest_set(bd);
+ }
}
// printf(EMIT 0x%x activeve\n, bd-client.win);
edje_object_signal_emit(bd-bg_object, e,state,focused, e);
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
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 Modified Files: configure.in Log Message: pass make distcheck and a snapshot asparagus release - been a while === RCS file: /cvs/e/e17/apps/e/configure.in,v retrieving revision 1.206 retrieving revision 1.207 diff -u -3 -r1.206 -r1.207 --- configure.in6 May 2008 09:30:10 - 1.206 +++ configure.in19 May 2008 00:07:05 - 1.207 @@ -1,7 +1,7 @@ # get rid of that stupid cache mechanism rm -f config.cache -AC_INIT(enlightenment, 0.16.999.042, [EMAIL PROTECTED]) +AC_INIT(enlightenment, 0.16.999.043, [EMAIL PROTECTED]) AC_PREREQ(2.52) AC_CONFIG_SRCDIR(configure.in) AC_CANONICAL_BUILD @@ -191,7 +191,7 @@ ecore-imf ecore-imf-evas edje - eet + eet = 1.0.1 embryo efreet efreet-mime - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ 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/po Modified Files: POTFILES.in bg.po ca.po de.po eo.po es.po fi.po fr.po fr_CH.po hu.po it.po ja.po ko.po pt_BR.po ru.po sl.po zh_CN.po zh_TW.po Log Message: pass make distcheck and a snapshot asparagus release - been a while === RCS file: /cvs/e/e17/apps/e/po/POTFILES.in,v retrieving revision 1.37 retrieving revision 1.38 diff -u -3 -r1.37 -r1.38 --- POTFILES.in 12 May 2008 18:03:59 - 1.37 +++ POTFILES.in 19 May 2008 00:07:05 - 1.38 @@ -230,7 +230,6 @@ src/modules/ibar/e_mod_main.c src/modules/ibox/e_mod_config.c src/modules/ibox/e_mod_main.c -src/modules/layout/e_mod_main.c src/modules/pager/e_mod_config.c src/modules/pager/e_mod_main.c src/modules/start/e_mod_main.c - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ 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_container.c e_utils.c
Log Message:
use the cancel and turn off fakes... leave code - just complain.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.634
retrieving revision 1.635
diff -u -3 -r1.634 -r1.635
--- e_border.c 18 May 2008 14:17:39 - 1.634
+++ e_border.c 19 May 2008 04:15:47 - 1.635
@@ -4714,6 +4714,8 @@
#endif
bd-mouse.current.mx = ev-root.x;
bd-mouse.current.my = ev-root.y;
+ if (ev-mode == ECORE_X_EVENT_MODE_GRAB)
+ evas_event_feed_mouse_cancel(bd-bg_evas, ev-time, NULL);
evas_event_feed_mouse_out(bd-bg_evas, ev-time, NULL);
return 1;
}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_container.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -3 -r1.122 -r1.123
--- e_container.c 11 May 2008 21:42:38 - 1.122
+++ e_container.c 19 May 2008 04:15:47 - 1.123
@@ -1063,6 +1063,8 @@
if (con)
{
_e_container_modifiers_update(con-bg_evas, ev-modifiers);
+ if (ev-mode == ECORE_X_EVENT_MODE_GRAB)
+ evas_event_feed_mouse_cancel(con-bg_evas, ev-time, NULL);
evas_event_feed_mouse_out(con-bg_evas, ev-time, NULL);
}
return 1;
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_utils.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -3 -r1.81 -r1.82
--- e_utils.c 7 Mar 2008 10:35:58 - 1.81
+++ e_utils.c 19 May 2008 04:15:47 - 1.82
@@ -41,6 +41,7 @@
E_OBJECT_CHECK(con);
E_OBJECT_TYPE_CHECK(con, E_CONTAINER_TYPE);
+ printf(FIXME: NO MORE CONTAINER FAKE UP! MUST REMOVE CODE\n);
e_util_evas_fake_mouse_up_later(con-bg_evas, button);
}
@@ -60,6 +61,8 @@
{
E_Util_Fake_Mouse_Up_Info *info;
+ printf(FIXME: NO MORE FAKE UP! MUST REMOVE CODE\n);
+ return;
info = calloc(1, sizeof(E_Util_Fake_Mouse_Up_Info));
if (info)
{
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
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/gadman Added Files: Makefile.am e-module-gadman.edj e_mod_config.c e_mod_config.h e_mod_gadman.c e_mod_gadman.h e_mod_main.c e_mod_main.h module.desktop.in Log Message: add in gadman for desktop. happy dave! :) - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ 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/themes
Modified Files:
default_gadman.edc
Log Message:
add in gadman for desktop. happy dave! :)
===
RCS file: /cvs/e/e17/apps/e/data/themes/default_gadman.edc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- default_gadman.edc 20 Aug 2007 18:50:19 - 1.9
+++ default_gadman.edc 19 May 2008 04:37:34 - 1.10
@@ -1426,3 +1426,208 @@
}
}
}
+
+group {
+ name: e/gadman/full_bg;
+ parts {
+ part{
+name: bg;
+type: RECT;
+mouse_events: 1;
+description {
+ state:default 0.0;
+ color: 255 255 255 200;
+}
+description {
+ state:hidden 0.0;
+ color: 255 255 255 0;
+ }
+ }
+ }
+ programs {
+ program {
+name:hide;
+signal: e,state,visibility,hide;
+source: e;
+action: STATE_SET hidden 0.0;
+transition: LINEAR 0.4;
+target: bg;
+ }
+ program {
+name:show;
+signal: e,state,visibility,show;
+source: e;
+action: STATE_SET default 0.0;
+transition: LINEAR 0.4;
+target: bg;
+ }
+ }
+}
+
+group {
+ name: e/gadman/frame;
+ parts {
+ part{
+name: bg_clip;
+type: RECT;
+mouse_events: 0;
+description {
+ state:default 0.0;
+ color: 255 255 255 255;
+ rel1 {
+ to: overlay;
+ }
+ rel2 {
+ to: overlay;
+ }
+}
+description {
+ state:plain 0.0;
+ color: 255 255 255 255;
+ rel1 {
+ relative: 0.0 0.0;
+ }
+ rel2 {
+ relative: 0.0 0.0;
+ }
+}
+ }
+ part {
+name: background;
+mouse_events: 1;
+clip_to: bg_clip;
+description {
+ state:default 0.0;
+ rel1 {
+ to: overlay;
+ }
+ rel2 {
+ to: overlay;
+ }
+ image {
+ normal: e17_ibar_bg_h.png;
+ border: 6 6 6 6;
+ }
+ fill {
+ smooth: 0;
+ }
+}
+description {
+ state:hidden 0.0;
+ inherit: default 0.0;
+ color: 255 255 255 0;
+}
+ }
+ part {
+name: items_clip;
+type: RECT;
+mouse_events: 0;
+description {
+ state:default 0.0;
+ rel1 {
+ to: background;
+ offset: 44;
+ }
+ rel2 {
+ to: background;
+ offset: -5-5;
+ }
+ color: 255 255 255 255;
+}
+description {
+ state:hidden 0.0;
+ inherit: default 0.0;
+ color: 255 255 255 0;
+}
+ }
+ part {
+name: e.swallow.content;
+type: SWALLOW;
+clip_to: items_clip;
+description {
+ state:default 0.0;
+ rel1 {
+ offset: 44;
+ }
+ rel2 {
+ offset: -5-5;
+ }
+}
+description {
+ state:hidden 0.0;
+ color: 255 255 255 0;
+ rel1 {
+ relative: 0.5 0.5;
+ }
+ rel2 {
+ relative: 0.5 0.5;
+ }
+}
+ }
+ part {
+name: overlay;
+mouse_events: 0;
+clip_to: bg_clip;
+description {
+ state:default 0.0;
+ image {
+ normal: e17_ibar_over_h.png;
+ border: 13 13 13 13;
+ middle: 0;
+ }
+ fill {
+ smooth: 0;
+ }
+}
+description {
+ state:hidden 0.0;
+ inherit: default 0.0;
+ color: 255 255 255 0;
+ rel1 {
+ relative: 0.5 0.5;
+ }
+ rel2 {
+ relative: 0.5 0.5;
+ }
+}
+ }
+ }
+ programs {
+ program {
+name:inset;
+signal: e,state,visibility,inset;
+source: e;
+action: STATE_SET default 0.0;
+target: bg_clip;
+ }
+ program {
+name:plain;
+signal: e,state,visibility,plain;
+source: e;
+action: STATE_SET plain 0.0;
+target: bg_clip;
+ }
+ program {
+name:hide;
+signal: e,state,visibility,hide;
+source: e;
+action: STATE_SET hidden 0.0;
+
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/modules Modified Files: Makefile.am Log Message: add in gadman for desktop. happy dave! :) === RCS file: /cvs/e/e17/apps/e/src/modules/Makefile.am,v retrieving revision 1.45 retrieving revision 1.46 diff -u -3 -r1.45 -r1.46 --- Makefile.am 6 May 2008 09:30:21 - 1.45 +++ Makefile.am 19 May 2008 04:37:34 - 1.46 @@ -50,6 +50,7 @@ conf_paths \ conf_mime \ conf_interaction \ +gadman \ conf_window_remembers if HAVE_TEMPERATURE - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ 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 Modified Files: configure.in Log Message: add in gadman for desktop. happy dave! :) === RCS file: /cvs/e/e17/apps/e/configure.in,v retrieving revision 1.207 retrieving revision 1.208 diff -u -3 -r1.207 -r1.208 --- configure.in19 May 2008 00:07:05 - 1.207 +++ configure.in19 May 2008 04:37:34 - 1.208 @@ -373,6 +373,8 @@ src/modules/conf_mime/module.desktop src/modules/conf_interaction/Makefile src/modules/conf_interaction/module.desktop +src/modules/gadman/Makefile +src/modules/gadman/module.desktop src/preload/Makefile data/Makefile data/fonts/Makefile - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ 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_bindings.c e_bindings.h e_config.c e_config.h e_gadcon.c
e_gadcon.h e_gadcon_popup.c e_module.c e_module.h e_shelf.c
e_toolbar.c
Log Message:
add in gadman for desktop. happy dave! :)
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_bindings.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- e_bindings.c3 Apr 2008 18:47:13 - 1.36
+++ e_bindings.c19 May 2008 04:37:34 - 1.37
@@ -324,6 +324,22 @@
key_bindings = evas_list_append(key_bindings, bind);
}
+EAPI E_Binding_Key *
+e_bindings_key_get(const char *action)
+{
+ Evas_List *l;
+
+ for (l = key_bindings; l; l = l-next)
+ {
+ E_Binding_Key *bind;
+
+ bind = l-data;
+ if (bind-action action !strcmp(action, bind-action))
+ return bind;
+ }
+ return NULL;
+}
+
EAPI void
e_bindings_key_del(E_Binding_Context ctxt, const char *key, E_Binding_Modifier
mod, int any_mod, const char *action, const char *params)
{
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_bindings.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_bindings.h21 Aug 2006 16:25:57 - 1.14
+++ e_bindings.h19 May 2008 04:37:34 - 1.15
@@ -95,6 +95,7 @@
EAPI voide_bindings_key_add(E_Binding_Context ctxt, const char *key,
E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
EAPI voide_bindings_key_del(E_Binding_Context ctxt, const char *key,
E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
+EAPI E_Binding_Key *e_bindings_key_get(const char *action);
EAPI voide_bindings_key_grab(E_Binding_Context ctxt, Ecore_X_Window
win);
EAPI voide_bindings_key_ungrab(E_Binding_Context ctxt, Ecore_X_Window
win);
EAPI E_Action *e_bindings_key_down_event_handle(E_Binding_Context ctxt,
E_Object *obj, Ecore_X_Event_Key_Down *ev);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -3 -r1.283 -r1.284
--- e_config.c 31 Mar 2008 15:49:19 - 1.283
+++ e_config.c 19 May 2008 04:37:34 - 1.284
@@ -96,6 +96,10 @@
E_CONFIG_VAL(D, T, geom.pos, INT);
E_CONFIG_VAL(D, T, geom.size, INT);
E_CONFIG_VAL(D, T, geom.res, INT);
+ E_CONFIG_VAL(D, T, geom.pos_x, DOUBLE);
+ E_CONFIG_VAL(D, T, geom.pos_y, DOUBLE);
+ E_CONFIG_VAL(D, T, geom.size_w, DOUBLE);
+ E_CONFIG_VAL(D, T, geom.size_h, DOUBLE);
E_CONFIG_VAL(D, T, state_info.seq, INT);
E_CONFIG_VAL(D, T, state_info.flags, INT);
E_CONFIG_VAL(D, T, style, STR);
@@ -188,6 +192,7 @@
E_CONFIG_VAL(D, T, name, STR);
E_CONFIG_VAL(D, T, enabled, UCHAR);
E_CONFIG_VAL(D, T, delayed, UCHAR);
+ E_CONFIG_VAL(D, T, priority, INT);
_e_config_font_default_edd = E_CONFIG_DD_NEW(E_Font_Default,
E_Font_Default);
@@ -761,62 +766,64 @@
{
E_Config_Module *em;
-#define CFG_MODULE(_name, _enabled, _delayed) \
+#define CFG_MODULE(_name, _enabled, _delayed, _priority) \
em = E_NEW(E_Config_Module, 1); \
em-name = evas_stringshare_add(_name); \
em-enabled = _enabled; \
em-delayed = _delayed; \
+ em-priority = _priority; \
e_config-modules = evas_list_append(e_config-modules, em)
- CFG_MODULE(start, 1, 0);
- CFG_MODULE(ibar, 1, 0);
- CFG_MODULE(ibox, 1, 0);
- CFG_MODULE(dropshadow, 1, 0);
- CFG_MODULE(clock, 1, 0);
- CFG_MODULE(battery, 1, 0);
- CFG_MODULE(cpufreq, 1, 0);
- CFG_MODULE(temperature, 1, 0);
- CFG_MODULE(pager, 1, 0);
- CFG_MODULE(exebuf, 1, 1);
- CFG_MODULE(winlist, 1, 1);
- CFG_MODULE(conf, 1, 1);
- CFG_MODULE(conf_applications, 1, 1);
- CFG_MODULE(conf_borders, 1, 1);
- CFG_MODULE(conf_clientlist, 1, 1);
- CFG_MODULE(conf_colors, 1, 1);
- CFG_MODULE(conf_desk, 1, 1);
- CFG_MODULE(conf_desklock, 1, 1);
- CFG_MODULE(conf_desks, 1, 1);
- CFG_MODULE(conf_dialogs, 1, 1);
- CFG_MODULE(conf_display, 1, 1);
- CFG_MODULE(conf_dpms, 1, 1);
- CFG_MODULE(conf_exebuf, 1, 1);
- CFG_MODULE(conf_fonts, 1, 1);
- CFG_MODULE(conf_icon_theme, 1, 1);
- CFG_MODULE(conf_imc, 1, 1);
- CFG_MODULE(conf_intl, 1, 1);
- CFG_MODULE(conf_keybindings, 1, 1);
- CFG_MODULE(conf_menus, 1, 1);
- CFG_MODULE(conf_mime, 1, 1);
- CFG_MODULE(conf_mouse, 1, 1);
- CFG_MODULE(conf_mousebindings, 1, 1);
- CFG_MODULE(conf_mouse_cursor, 1, 1);
- CFG_MODULE(conf_paths, 1, 1);
- CFG_MODULE(conf_performance,
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_init_main.c
Log Message:
init splash missing software-x16 support
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_init_main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_init_main.c 24 Sep 2007 10:53:44 - 1.2
+++ e_init_main.c 15 May 2008 06:02:41 - 1.3
@@ -460,6 +460,13 @@
ecore_evas_xrender_x11_direct_resize_set(ee, 1);
*winret = ecore_evas_xrender_x11_window_get(ee);
}
+ else if (engine == 4)
+ {
+ee = ecore_evas_software_x11_16_new(NULL, root, 0, 0, w, h);
+ ecore_evas_override_set(ee, 1);
+ ecore_evas_software_x11_16_direct_resize_set(ee, 1);
+ *winret = ecore_evas_software_x11_16_window_get(ee);
+ }
e = ecore_evas_get(ee);
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
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_gadcon.c
Log Message:
since no icon is dragged - disable dnd gadgets off a gadcon for now.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -3 -r1.105 -r1.106
--- e_gadcon.c 6 May 2008 10:20:53 - 1.105
+++ e_gadcon.c 13 May 2008 05:31:20 - 1.106
@@ -1762,12 +1762,12 @@
_e_gadcon_client_current_position_sync(gcc);
if (e_gadcon_layout_orientation_get(gcc-gadcon-o_container))
{
- if (abs(cy - gcc-drag.y) e_config-drag_resist)
+/* if (abs(cy - gcc-drag.y) e_config-drag_resist)
{
_e_gadcon_client_drag_begin(gcc, cx, cy);
return;
}
- else if (x 0)
+ else*/ if (x 0)
{
if (gcc-state_info.state != E_LAYOUT_ITEM_STATE_POS_INC)
gcc-state_info.resist = 0;
@@ -1782,12 +1782,12 @@
}
else
{
- if (abs(cx - gcc-drag.x) e_config-drag_resist)
+/* if (abs(cx - gcc-drag.x) e_config-drag_resist)
{
_e_gadcon_client_drag_begin(gcc, cx, cy);
return;
}
- else if (y 0)
+ else*/ if (y 0)
{
if (gcc-state_info.state != E_LAYOUT_ITEM_STATE_POS_INC)
gcc-state_info.resist = 0;
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/battery
Modified Files:
batget.c
Log Message:
remove ! apm exists check.
===
RCS file: /cvs/e/e17/apps/e/src/modules/battery/batget.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- batget.c4 May 2008 06:13:26 - 1.11
+++ batget.c11 May 2008 16:21:21 - 1.12
@@ -1399,8 +1399,7 @@
darwin_init();
#else
if ((ecore_file_is_dir(/sys/class/power_supply))
- (dir_has_contents(/sys/class/power_supply))
- (!ecore_file_exists(/proc/apm))) /* = 2.6.24 */
+ (dir_has_contents(/sys/class/power_supply)))
{
mode = CHECK_SYS_CLASS_POWER_SUPPLY;
linux_sys_class_power_supply_init();
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
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_gadcon.c e_gadcon.h
Log Message:
instant edit is on a delay timer of 1 sec
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -3 -r1.104 -r1.105
--- e_gadcon.c 7 Mar 2008 19:13:53 - 1.104
+++ e_gadcon.c 6 May 2008 10:20:53 - 1.105
@@ -1328,6 +1328,11 @@
static void
_e_gadcon_client_free(E_Gadcon_Client *gcc)
{
+ if (gcc-instant_edit_timer)
+ {
+ ecore_timer_del(gcc-instant_edit_timer);
+ gcc-instant_edit_timer = NULL;
+ }
if (gcc-o_base)
evas_object_event_callback_del(gcc-o_base,
EVAS_CALLBACK_DEL,
@@ -2229,6 +2234,18 @@
gcc-menu = NULL;
}
+static int
+_e_gadcon_client_cb_instant_edit_timer(void *data)
+{
+ E_Gadcon_Client *gcc;
+
+ gcc = data;
+ e_gadcon_client_edit_begin(gcc);
+ _e_gadcon_client_move_start(gcc);
+ gcc-instant_edit_timer = NULL;
+ return 0;
+}
+
static void
_e_gadcon_client_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void
*event_info)
{
@@ -2265,9 +2282,10 @@
{
if ((!gcc-o_control) (gcc-gadcon-instant_edit))
{
-printf(EDIT\n);
-e_gadcon_client_edit_begin(gcc);
-_e_gadcon_client_move_start(gcc);
+if (gcc-instant_edit_timer)
ecore_timer_del(gcc-instant_edit_timer);
+gcc-instant_edit_timer =
+ ecore_timer_add(1.0, _e_gadcon_client_cb_instant_edit_timer,
+ gcc);
}
}
}
@@ -2283,6 +2301,11 @@
if ((ev-button == 1) (gcc-gadcon-instant_edit))
{
+ if (gcc-instant_edit_timer)
+ {
+ecore_timer_del(gcc-instant_edit_timer);
+gcc-instant_edit_timer = NULL;
+ }
if (gcc-o_control)
{
printf(EDIT END\n);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- e_gadcon.h 5 Mar 2008 12:39:55 - 1.45
+++ e_gadcon.h 6 May 2008 10:20:53 - 1.46
@@ -151,6 +151,7 @@
Evas_Coordw, h;
} pad, min, aspect;
Ecore_Timer *scroll_timer;
+ Ecore_Timer *instant_edit_timer;
Ecore_Animator*scroll_animator;
double scroll_pos;
double scroll_wanted;
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/battery
Modified Files:
batget.c
Log Message:
suspend/resume brokeon power class - lost event file node and never got it
back. now try get them all back if they get lost.
===
RCS file: /cvs/e/e17/apps/e/src/modules/battery/batget.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- batget.c30 Apr 2008 05:33:44 - 1.10
+++ batget.c4 May 2008 06:13:26 - 1.11
@@ -442,6 +442,33 @@
return 0;
}
+static Ecore_Timer *re_init_timer = NULL;
+
+static int
+linux_sys_class_powe_supply_cb_re_init(void *data)
+{
+ Sys_Class_Power_Supply_Uevent *sysev;
+
+ if (events)
+ {
+ while ((sysev = ecore_list_first_goto(events)))
+ {
+ecore_list_remove(events);
+
+if (sysev-fd_handler)
+ ecore_main_fd_handler_del(sysev-fd_handler);
+if (sysev-fd = 0) close(sysev-fd);
+free(sysev-name);
+free(sysev);
+ }
+ ecore_list_destroy(events);
+ events = NULL;
+ }
+ linux_sys_class_power_supply_init();
+ re_init_timer = NULL;
+ return 0;
+}
+
static int
linux_sys_class_power_supply_cb_event_fd_active(void *data, Ecore_Fd_Handler
*fd_handler)
{
@@ -477,6 +504,9 @@
if (sysev-fd = 0) close(sysev-fd);
free(sysev-name);
free(sysev);
+
+if (re_init_timer) ecore_timer_del(re_init_timer);
+re_init_timer = ecore_timer_add(1.0,
linux_sys_class_powe_supply_cb_re_init, NULL);
}
else
{
@@ -633,6 +663,7 @@
Sys_Class_Power_Supply_Uevent *sysev;
int total_pwr_now;
int total_pwr_max;
+ int nofull = 0;
total_pwr_now = 0;
total_pwr_max = 0;
@@ -694,6 +725,7 @@
* wrong. that's a buggy battery or driver */
if (!full)
{
+ nofull++;
if (charging)
{
snprintf(buf, sizeof(buf),
/sys/class/power_supply/%s/time_to_full_now, name);
@@ -764,12 +796,13 @@
}
}
}
-
total_pwr_now += pwr_now - pwr_empty;
total_pwr_max += pwr_full - pwr_empty;
}
if (total_pwr_max 0)
battery_full = ((long long)total_pwr_now * 100) / total_pwr_max;
+ if (nofull == 0)
+ time_left = -1;
}
}
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
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_dialog.h e_configure.c e_configure.h
Log Message:
add generic cfg call
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_config_dialog.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_config_dialog.h 30 Nov 2006 10:01:01 - 1.16
+++ e_config_dialog.h 30 Apr 2008 12:01:32 - 1.17
@@ -6,7 +6,8 @@
typedef enum _E_Config_Dialog_CFData_Type
{
E_CONFIG_DIALOG_CFDATA_TYPE_BASIC,
- E_CONFIG_DIALOG_CFDATA_TYPE_ADVANCED
+ E_CONFIG_DIALOG_CFDATA_TYPE_ADVANCED,
+ E_CONFIG_DIALOG_CFDATA_TYPE_NORMAL_WINDOW
} E_Config_Dialog_CFData_Type;
typedef struct _E_Config_Dialog E_Config_Dialog;
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -3 -r1.115 -r1.116
--- e_configure.c 1 Nov 2007 20:35:08 - 1.115
+++ e_configure.c 30 Apr 2008 12:01:32 - 1.116
@@ -9,8 +9,8 @@
e_configure_registry_item_add(extensions/modules, 10, _(Modules), NULL,
enlightenment/modules, e_int_config_modules);
}
-EAPI void
-e_configure_registry_item_add(const char *path, int pri, const char *label,
const char *icon_file, const char *icon, E_Config_Dialog *(*func) (E_Container
*con, const char *params))
+static void
+_e_configure_registry_item_full_add(const char *path, int pri, const char
*label, const char *icon_file, const char *icon, E_Config_Dialog *(*func)
(E_Container *con, const char *params), void (*generic_func) (E_Container *con,
const char *params))
{
Evas_List *l;
char *cat;
@@ -30,6 +30,7 @@
if (icon_file) eci-icon_file = evas_stringshare_add(icon_file);
if (icon) eci-icon = evas_stringshare_add(icon);
eci-func = func;
+ eci-generic_func = generic_func;
for (l = e_configure_registry; l; l = l-next)
{
@@ -60,6 +61,18 @@
}
EAPI void
+e_configure_registry_item_add(const char *path, int pri, const char *label,
const char *icon_file, const char *icon, E_Config_Dialog *(*func) (E_Container
*con, const char *params))
+{
+ _e_configure_registry_item_full_add(path, pri, label, icon_file, icon,
func, NULL);
+}
+
+EAPI void
+e_configure_registry_generic_item_add(const char *path, int pri, const char
*label, const char *icon_file, const char *icon, void (*generic_func)
(E_Container *con, const char *params))
+{
+ _e_configure_registry_item_full_add(path, pri, label, icon_file, icon,
NULL, generic_func);
+}
+
+EAPI void
e_configure_registry_item_del(const char *path)
{
Evas_List *l;
@@ -187,6 +200,7 @@
if (!strcmp(item, eci-item))
{
if (eci-func) eci-func(con, params);
+ else if (eci-generic_func) eci-generic_func(con,
params);
goto done;
}
}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_configure.h 5 Aug 2007 08:07:39 - 1.10
+++ e_configure.h 30 Apr 2008 12:01:32 - 1.11
@@ -25,9 +25,11 @@
const char*icon_file;
const char*icon;
E_Config_Dialog *(*func) (E_Container *con, const char *params);
+ void (*generic_func) (E_Container *con, const char *params);
};
EAPI void e_configure_registry_item_add(const char *path, int pri, const char
*label, const char *icon_file, const char *icon, E_Config_Dialog *(*func)
(E_Container *con, const char *params));
+EAPI void e_configure_registry_generic_item_add(const char *path, int pri,
const char *label, const char *icon_file, const char *icon, void
(*generic_func) (E_Container *con, const char *params));
EAPI void e_configure_registry_item_del(const char *path);
EAPI void e_configure_registry_category_add(const char *path, int pri, const
char *label, const char *icon_file, const char *icon);
EAPI void e_configure_registry_category_del(const char *path);
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/battery
Modified Files:
batget.c
Log Message:
better detection of apm vs powerclass... as i have no seen a system with BOTH
of them active! argh!
===
RCS file: /cvs/e/e17/apps/e/src/modules/battery/batget.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- batget.c28 Apr 2008 11:12:25 - 1.9
+++ batget.c30 Apr 2008 05:33:44 - 1.10
@@ -1317,6 +1317,23 @@
+static int
+dir_has_contents(const char *dir)
+{
+ Ecore_List *bats;
+ char *name;
+
+ bats = ecore_file_ls(dir);
+ if (bats)
+ {
+ int count;
+
+ count = ecore_list_count(bats);
+ ecore_list_destroy(bats);
+ if (count 0) return 1;
+ }
+ return 0;
+}
static void
init(void)
@@ -1349,6 +1366,7 @@
darwin_init();
#else
if ((ecore_file_is_dir(/sys/class/power_supply))
+ (dir_has_contents(/sys/class/power_supply))
(!ecore_file_exists(/proc/apm))) /* = 2.6.24 */
{
mode = CHECK_SYS_CLASS_POWER_SUPPLY;
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
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_fm.c e_fm.h
Log Message:
put in some place markers in efm for categories in a fm widget - nothing
there currently but the entry, and fix focus of iconified windows. broke it
before.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.631
retrieving revision 1.632
diff -u -3 -r1.631 -r1.632
--- e_border.c 26 Apr 2008 06:41:48 - 1.631
+++ e_border.c 28 Apr 2008 10:50:35 - 1.632
@@ -1404,7 +1404,7 @@
// printf( accept:%i take:%i\n, bd-client.icccm.accepts_focus,
bd-client.icccm.take_focus);
if (!bd-client.icccm.accepts_focus) return;
/* dont focus an iconified window. that's silly! */
- if (bd-iconic) return;
+ if ((focus) (bd-iconic))return;
if ((bd-modal) (bd-modal != bd))
{
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -3 -r1.240 -r1.241
--- e_fm.c 17 Apr 2008 02:51:26 - 1.240
+++ e_fm.c 28 Apr 2008 10:50:36 - 1.241
@@ -3377,6 +3377,7 @@
if (ic-info.icon) evas_stringshare_del(ic-info.icon);
if (ic-info.link) evas_stringshare_del(ic-info.link);
if (ic-info.real_link) evas_stringshare_del(ic-info.real_link);
+ if (ic-info.category) evas_stringshare_del(ic-info.category);
ic-info.mime = NULL;
ic-info.label = NULL;
ic-info.comment = NULL;
@@ -3649,6 +3650,7 @@
if (ic-info.icon) evas_stringshare_del(ic-info.icon);
if (ic-info.link) evas_stringshare_del(ic-info.link);
if (ic-info.real_link) evas_stringshare_del(ic-info.real_link);
+ if (ic-info.category) evas_stringshare_del(ic-info.category);
free(ic);
}
@@ -3925,6 +3927,8 @@
}
}
}
+ /* FIXME: get category */
+ ic-info.category = NULL;
efreet_desktop_free(desktop);
return 1;
@@ -3934,11 +3938,13 @@
if (ic-info.generic) evas_stringshare_del(ic-info.generic);
if (ic-info.icon) evas_stringshare_del(ic-info.icon);
if (ic-info.link) evas_stringshare_del(ic-info.link);
+ if (ic-info.category) evas_stringshare_del(ic-info.category);
ic-info.label = NULL;
ic-info.comment = NULL;
ic-info.generic = NULL;
ic-info.icon = NULL;
ic-info.link = NULL;
+ ic-info.category = NULL;
//Hack
if (!strncmp(ic-info.file, |storage_, 9)) ecore_file_unlink(buf);
return 0;
@@ -5807,10 +5813,17 @@
{
char buf1[4096], buf2[4096], *p;
- strncpy(buf1, l1, sizeof(buf1) - 2);
- strncpy(buf2, l2, sizeof(buf2) - 2);
- buf1[sizeof(buf1) - 1] = 0;
- buf2[sizeof(buf2) - 1] = 0;
+/* if (ic1-sd-config-list.sort.category)
+ {
+ * FIXME: implement category sorting
+ }
+ else
+*/ {
+strncpy(buf1, l1, sizeof(buf1) - 2);
+strncpy(buf2, l2, sizeof(buf2) - 2);
+buf1[sizeof(buf1) - 1] = 0;
+buf2[sizeof(buf2) - 1] = 0;
+ }
p = buf1;
while (*p)
{
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- e_fm.h 14 Dec 2007 20:44:59 - 1.55
+++ e_fm.h 28 Apr 2008 10:50:36 - 1.56
@@ -106,6 +106,7 @@
const char *icon;
const char *link;
const char *real_link;
+ const char *category;
struct stat statinfo;
unsigned char icon_type;
unsigned char mount : 1;
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/battery
Modified Files:
batget.c
Log Message:
if we have apm as well on a new kernel - use that as it will probably take
preference to power_supply class stuff
===
RCS file: /cvs/e/e17/apps/e/src/modules/battery/batget.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- batget.c15 Apr 2008 15:20:59 - 1.8
+++ batget.c28 Apr 2008 11:12:25 - 1.9
@@ -1348,7 +1348,8 @@
#elif defined(HAVE_CFBASE_H) /* OS X */
darwin_init();
#else
- if (ecore_file_is_dir(/sys/class/power_supply)) /* = 2.6.24 */
+ if ((ecore_file_is_dir(/sys/class/power_supply))
+ (!ecore_file_exists(/proc/apm))) /* = 2.6.24 */
{
mode = CHECK_SYS_CLASS_POWER_SUPPLY;
linux_sys_class_power_supply_init();
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
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_slidecore.c e_slidecore.h
Log Message:
slidecode now jumps to items
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_slidecore.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_slidecore.c 26 Feb 2008 09:47:50 - 1.4
+++ e_slidecore.c 27 Apr 2008 07:52:09 - 1.5
@@ -17,7 +17,9 @@
Evas_Object *event_obj;
Evas_Object *o1, *o2;
Evas_List *items;
- Evas_Coord dist, pos;
+ double slide_time, slide_start;
+ Ecore_Animator *slide_animator;
+ Evas_Coord dist, pos, slide_pos, slide_start_pos;
int p1, p2, pn;
unsigned char down : 1;
};
@@ -31,6 +33,7 @@
};
/* local subsystem functions */
+static int _e_smart_cb_slide_animator(void *data);
static void _e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj,
void *event_info);
static void _e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj,
void *event_info);
static void _e_smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj,
void *event_info);
@@ -86,12 +89,48 @@
e_slidecore_jump(Evas_Object *obj, int num)
{
API_ENTRY return;
- _e_smart_reconfigure(sd);
+
+ sd-slide_start_pos = sd-pos;
+ sd-slide_pos = num * sd-dist;
+ if (!sd-slide_animator)
+ sd-slide_animator = ecore_animator_add(_e_smart_cb_slide_animator,
+sd);
+ sd-slide_start = ecore_time_get();
+}
+
+EAPI void
+e_slidecore_slide_time_set(Evas_Object *obj, double t)
+{
+ API_ENTRY return;
+ sd-slide_time = t;
}
/* local subsystem functions */
+static int
+_e_smart_cb_slide_animator(void *data)
+{
+ E_Smart_Data *sd;
+ double t;
+
+ sd = data;
+ t = (ecore_time_get() - sd-slide_start) / sd-slide_time;
+ if (t 1.0) t = 1.0;
+ t = 1.0 - t;
+ t = 1.0 - (t * t * t * t); /* more t's - more curve */
+ if (t 1.0) t = 1.0;
+ sd-pos = sd-slide_start_pos + (t * (sd-slide_pos - sd-slide_start_pos));
+ _e_smart_reconfigure(sd);
+
+ if (t = 1.0)
+ {
+ sd-slide_animator = NULL;
+ return 0;
+ }
+ return 1;
+}
+
static void
_e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj, void
*event_info)
{
@@ -101,6 +140,11 @@
sd = data;
ev = event_info;
if (ev-button == 1) sd-down = 1;
+ if (sd-slide_animator)
+ {
+ ecore_animator_del(sd-slide_animator);
+ sd-slide_animator = NULL;
+ }
}
static void
@@ -111,7 +155,23 @@
sd = data;
ev = event_info;
- if (ev-button == 1) sd-down = 0;
+ if (ev-button == 1)
+ {
+ int gop = 0;
+ int n;
+
+ sd-down = 0;
+ n = evas_list_count(sd-items);
+
+ gop = sd-pos - (sd-p1 * sd-dist);
+ gop = ((gop / sd-dist) * sd-dist) + (sd-p1 * sd-dist);
+ sd-slide_start_pos = sd-pos;
+ sd-slide_pos = gop;
+ if (!sd-slide_animator)
+ sd-slide_animator = ecore_animator_add(_e_smart_cb_slide_animator,
+ sd);
+ sd-slide_start = ecore_time_get();
+ }
}
static void
@@ -156,7 +216,6 @@
{
E_Smart_Item *it1, *it2;
- /* FIXME: delete old o1, o2, create new o1, o2 */
sd-pn = n;
if (n 0)
{
@@ -250,12 +309,15 @@
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_MOVE,
_e_smart_event_mouse_move, sd);
evas_object_smart_member_add(o, obj);
evas_object_repeat_events_set(o, 1);
+
+ sd-slide_time = 0.5;
}
static void
_e_smart_del(Evas_Object *obj)
{
INTERNAL_ENTRY;
+ if (sd-slide_animator) ecore_animator_del(sd-slide_animator);
while (sd-items)
{
E_Smart_Item *it;
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_slidecore.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_slidecore.h 2 Feb 2008 05:26:07 - 1.1
+++ e_slidecore.h 27 Apr 2008 07:52:09 - 1.2
@@ -10,6 +10,7 @@
EAPI void e_slidecore_item_distance_set(Evas_Object *obj, Evas_Coord
dist);
EAPI void e_slidecore_item_add (Evas_Object *obj, const char
*label, const char *icon, void (*func) (void *data), void *data);
EAPI void e_slidecore_jump (Evas_Object *obj, int num);
+EAPI void e_slidecore_slide_time_set (Evas_Object *obj, double t);
#endif
#endif
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
enlightenment-cvs mailing list
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
Log Message:
dont focus iconified windows! that's just silly!
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.630
retrieving revision 1.631
diff -u -3 -r1.630 -r1.631
--- e_border.c 9 Mar 2008 16:43:58 - 1.630
+++ e_border.c 26 Apr 2008 06:41:48 - 1.631
@@ -1403,6 +1403,8 @@
// printf(e_border_focus_set(%p, %s, %i %i);\n, bd, bd-client.icccm.name,
focus, set);
// printf( accept:%i take:%i\n, bd-client.icccm.accepts_focus,
bd-client.icccm.take_focus);
if (!bd-client.icccm.accepts_focus) return;
+ /* dont focus an iconified window. that's silly! */
+ if (bd-iconic) return;
if ((bd-modal) (bd-modal != bd))
{
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/temperature Modified Files: Makefile.am Log Message: fix install of slave tools. === RCS file: /cvs/e/e17/apps/e/src/modules/temperature/Makefile.am,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- Makefile.am 20 Jan 2008 19:42:38 - 1.15 +++ Makefile.am 23 Apr 2008 03:50:21 - 1.16 @@ -26,14 +26,8 @@ module_la_DEPENDENCIES = $(top_builddir)/config.h tempgetdir = $(pkgdir) -tempget_DATA = \ -tempget$(EXEEXT) -x_mode = a=rx,u+x -install-data-hook: - @chmod $(x_mode) $(DESTDIR)$(tempgetdir)/tempget$(EXEEXT) || true - -noinst_PROGRAMS= tempget +tempget_PROGRAMS = tempget tempget_SOURCES= tempget.c tempget_LDFLAGS= @TEMPERATURE_LIBS@ - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ 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 Modified Files: Makefile.am Log Message: fix install of slave tools. === RCS file: /cvs/e/e17/apps/e/src/modules/Makefile.am,v retrieving revision 1.43 retrieving revision 1.44 diff -u -3 -r1.43 -r1.44 --- Makefile.am 23 Jan 2008 09:04:55 - 1.43 +++ Makefile.am 23 Apr 2008 03:50:21 - 1.44 @@ -8,7 +8,6 @@ cpufreq \ ibox \ start \ -layout \ exebuf \ winlist \ fileman \ - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/battery Modified Files: Makefile.am Log Message: fix install of slave tools. === RCS file: /cvs/e/e17/apps/e/src/modules/battery/Makefile.am,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- Makefile.am 3 Mar 2008 09:48:37 - 1.14 +++ Makefile.am 23 Apr 2008 03:50:21 - 1.15 @@ -27,14 +27,8 @@ module_la_DEPENDENCIES = $(top_builddir)/config.h batgetdir = $(pkgdir) -batget_DATA = \ -batget$(EXEEXT) -x_mode = a=rx,u+x -install-data-hook: - @chmod $(x_mode) $(DESTDIR)$(batgetdir)/batget$(EXEEXT) || true - -noinst_PROGRAMS= batget +batget_PROGRAMS= batget batget_SOURCES = batget.c batget_LDFLAGS = @BATTERY_LIBS@ - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/cpufreq Modified Files: Makefile.am Log Message: fix install of slave tools. === RCS file: /cvs/e/e17/apps/e/src/modules/cpufreq/Makefile.am,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- Makefile.am 24 Mar 2007 09:23:09 - 1.18 +++ Makefile.am 23 Apr 2008 03:50:21 - 1.19 @@ -25,14 +25,14 @@ module_la_DEPENDENCIES = $(top_builddir)/config.h freqsetdir = $(pkgdir) -freqset_DATA = \ -freqset$(EXEEXT) setuid_root_mode = a=rx,u+xs +setuid_root_user = root install-data-hook: + @chown $(setuid_root_user) $(DESTDIR)$(freqsetdir)/freqset$(EXEEXT) || true @chmod $(setuid_root_mode) $(DESTDIR)$(freqsetdir)/freqset$(EXEEXT) || true -noinst_PROGRAMS= freqset +freqset_PROGRAMS = freqset freqset_SOURCES= freqset.c uninstall: - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ 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 Modified Files: configure.in Log Message: fix install of slave tools. === RCS file: /cvs/e/e17/apps/e/configure.in,v retrieving revision 1.204 retrieving revision 1.205 diff -u -3 -r1.204 -r1.205 --- configure.in28 Mar 2008 20:53:26 - 1.204 +++ configure.in23 Apr 2008 03:50:21 - 1.205 @@ -287,8 +287,6 @@ src/modules/ibox/module.desktop src/modules/start/Makefile src/modules/start/module.desktop -src/modules/layout/Makefile -src/modules/layout/module.desktop src/modules/exebuf/Makefile src/modules/exebuf/module.desktop src/modules/winlist/Makefile - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/battery Modified Files: batget.c Log Message: fix batget infinie spin === RCS file: /cvs/e/e17/apps/e/src/modules/battery/batget.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- batget.c13 Mar 2008 19:13:36 - 1.7 +++ batget.c15 Apr 2008 15:20:59 - 1.8 @@ -462,8 +462,9 @@ (errno == EBADF) || (errno == EPIPE) || (errno == EINVAL) || - (errno == ENOSPC)); - if (num == 0) break; + (errno == ENOSPC) || + (errno == ENODEV)); + if (num = 0) break; } } if (lost) - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ 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_wallpaper
Modified Files:
e_int_config_wallpaper_web.c
Log Message:
revert wallpaper changes. crashies
===
RCS file:
/cvs/e/e17/apps/e/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_int_config_wallpaper_web.c11 Apr 2008 23:03:08 - 1.13
+++ e_int_config_wallpaper_web.c14 Apr 2008 10:26:33 - 1.14
@@ -2,9 +2,7 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
*/
-/* TODO
- * notify user if the Flickr query doesn't return any result
-*/
+// Da usare per importare l'immagine : e_int_config_wallpaper_import(NULL);
#include e.h
#include e_mod_main.h
@@ -13,7 +11,6 @@
#defineMAGIC_IMPORT 0x427781cb
#define TEMPLATE /tmp/wallpXX
-#define FLICKR_QUERY
http://api.flickr.com/services/feeds/photos_public.gne?tags=%sformat=rss_200_enc;
typedef struct _Import Import;
@@ -33,25 +30,11 @@
Ecore_Con_Url *ecu;
Ecore_Event_Handler *hdata, *hcomplete;
FILE *feed;
- int ready_for_media, pending_downloads, busy;
- char *media, *ol_val, *tmpdir, *flickr_query;
+ int ready_for_edj, pending_downloads, busy;
+ char *edj, *ol_val, *tmpdir;
const char *source;
};
-enum parser_states
-{
- PS_QUIET = -1,
- PS_RSS_TAG_START,
- PS_RSS_TAG_END,
- PS_RSS_TAG_FOUND,
- PS_GENERATOR_FOUND,
- PS_ITEM_FOUND,
- PS_XSM_LINK_FOUND,
- PS_XSM_ENCLOSURE_FOUND,
- PS_MEDIA_CONTENT_FOUND,
- PS_MEDIA_THUMB_FOUND
-};
-
static void _file_double_click_cb(void *data, Evas_Object *obj, void *ev_info);
static void _file_click_cb(void *data, Evas_Object *obj, void *ev_info);
static int _feed_complete(void *data, int type, void *event);
@@ -69,7 +52,6 @@
static void _download_media(Import *import);
static int _download_media_progress_cb(void *data, const char *file, long int
dltotal, long int dlnow, long int ultotal, long int ulnow);
static void _download_media_complete_cb(void *data, const char *file, int
status);
-static void _get_flickr_images(void *data, void *data2);
EAPI E_Dialog *
e_int_config_wallpaper_web(E_Config_Dialog *parent)
@@ -78,7 +60,7 @@
E_Dialog *dia;
Import *import;
E_Config_Dialog_Data *cfdata;
- Evas_Object *o, *ol, *of, *ofm, *osfm, *ee, *b;
+ Evas_Object *o, *ol, *of, *ofm, *osfm;
Evas_Coord mw, mh;
E_Fm2_Config fmc;
@@ -104,7 +86,7 @@
cfdata-ecu = ecore_con_url_new(http://fake.url;);
- cfdata-ready_for_media = 0;
+ cfdata-ready_for_edj = 0;
cfdata-pending_downloads = 0;
cfdata-busy = 0;
import-cfdata = cfdata;
@@ -122,8 +104,8 @@
ecore_list_free_cb_set(cfdata-names, free);
cfdata-medias = ecore_list_new();
ecore_list_free_cb_set(cfdata-medias, free);
- //of = e_widget_framelist_add(evas, Sources, 1);
- of = e_widget_frametable_add(evas, _(Sources), 0);
+
+ of = e_widget_framelist_add(evas, Sources, 1);
ol = e_widget_ilist_add(evas, 24, 24, cfdata-ol_val);
cfdata-ol = ol;
e_widget_ilist_append(ol, NULL, _(get-e.org - Static),
@@ -135,24 +117,14 @@
/*e_widget_ilist_append(ol, NULL, _(get-e.org - Local copy),
_source_sel_cb, import,
http://localhost/get_e_feed.xml;);*/
- /*e_widget_ilist_append(ol, NULL, Raster on Flickr,
+ /*e_widget_ilist_append(ol, NULL, Flickr test,
_source_sel_cb, import,
-
http://api.flickr.com/services/feeds/photos_public.gne?tags=rastermanlang=it-itformat=rss_200_enc;);*/
+
http://api.flickr.com/services/feeds/photos_public.gne?tags=birrolang=it-itformat=rss_200_enc;);*/
e_widget_ilist_go(ol);
-
e_widget_min_size_get(ol, mw, NULL);
e_widget_min_size_set(ol, mw, 320);
-
- //e_widget_framelist_object_append(of, ol);
- e_widget_frametable_object_append(of, ol, 0, 0, 3, 1, 1, 1, 1, 1);
-
- cfdata-flickr_query = strdup(_(Enter text here));
- ee = e_widget_entry_add(evas, (cfdata-flickr_query), NULL, NULL, NULL);
- b = e_widget_button_add(evas, _(Query Flickr), NULL, _get_flickr_images,
import, NULL);
- e_widget_frametable_object_append(of, ee, 0, 1, 2, 1, 1, 1, 1, 0);
- e_widget_frametable_object_append(of, b, 2, 1, 1, 1, 0, 1, 0, 0);
-
- e_widget_list_object_append(o, of, 1, 1, 0.5);
+ e_widget_framelist_object_append(of, ol);
+ e_widget_list_object_append(o, of, 1, 0, 0.5);
ofm = e_fm2_add(evas);
memset(fmc, 0, sizeof(E_Fm2_Config));
@@ -192,6 +164,7 @@
e_widget_list_object_append(cfdata-o, cfdata-osfm, 1, 1, 0.5);
e_widget_min_size_set(osfm, 320, 320);
+// e_widget_min_size_set(o, 580, 370);
e_widget_min_size_get(o, NULL, mh);
e_dialog_content_set(dia, o, 480, mh);
@@ -277,7 +250,6 @@
{
asprintf(title, _([%s]
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/conf_wallpaper
Modified Files:
e_int_config_wallpaper_web.c
Log Message:
massimiliano's updates
===
RCS file:
/cvs/e/e17/apps/e/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_int_config_wallpaper_web.c27 Mar 2008 08:03:27 - 1.12
+++ e_int_config_wallpaper_web.c11 Apr 2008 23:03:08 - 1.13
@@ -2,7 +2,9 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
*/
-// Da usare per importare l'immagine : e_int_config_wallpaper_import(NULL);
+/* TODO
+ * notify user if the Flickr query doesn't return any result
+*/
#include e.h
#include e_mod_main.h
@@ -11,6 +13,7 @@
#defineMAGIC_IMPORT 0x427781cb
#define TEMPLATE /tmp/wallpXX
+#define FLICKR_QUERY
http://api.flickr.com/services/feeds/photos_public.gne?tags=%sformat=rss_200_enc;
typedef struct _Import Import;
@@ -30,11 +33,25 @@
Ecore_Con_Url *ecu;
Ecore_Event_Handler *hdata, *hcomplete;
FILE *feed;
- int ready_for_edj, pending_downloads, busy;
- char *edj, *ol_val, *tmpdir;
+ int ready_for_media, pending_downloads, busy;
+ char *media, *ol_val, *tmpdir, *flickr_query;
const char *source;
};
+enum parser_states
+{
+ PS_QUIET = -1,
+ PS_RSS_TAG_START,
+ PS_RSS_TAG_END,
+ PS_RSS_TAG_FOUND,
+ PS_GENERATOR_FOUND,
+ PS_ITEM_FOUND,
+ PS_XSM_LINK_FOUND,
+ PS_XSM_ENCLOSURE_FOUND,
+ PS_MEDIA_CONTENT_FOUND,
+ PS_MEDIA_THUMB_FOUND
+};
+
static void _file_double_click_cb(void *data, Evas_Object *obj, void *ev_info);
static void _file_click_cb(void *data, Evas_Object *obj, void *ev_info);
static int _feed_complete(void *data, int type, void *event);
@@ -52,6 +69,7 @@
static void _download_media(Import *import);
static int _download_media_progress_cb(void *data, const char *file, long int
dltotal, long int dlnow, long int ultotal, long int ulnow);
static void _download_media_complete_cb(void *data, const char *file, int
status);
+static void _get_flickr_images(void *data, void *data2);
EAPI E_Dialog *
e_int_config_wallpaper_web(E_Config_Dialog *parent)
@@ -60,7 +78,7 @@
E_Dialog *dia;
Import *import;
E_Config_Dialog_Data *cfdata;
- Evas_Object *o, *ol, *of, *ofm, *osfm;
+ Evas_Object *o, *ol, *of, *ofm, *osfm, *ee, *b;
Evas_Coord mw, mh;
E_Fm2_Config fmc;
@@ -86,7 +104,7 @@
cfdata-ecu = ecore_con_url_new(http://fake.url;);
- cfdata-ready_for_edj = 0;
+ cfdata-ready_for_media = 0;
cfdata-pending_downloads = 0;
cfdata-busy = 0;
import-cfdata = cfdata;
@@ -104,8 +122,8 @@
ecore_list_free_cb_set(cfdata-names, free);
cfdata-medias = ecore_list_new();
ecore_list_free_cb_set(cfdata-medias, free);
-
- of = e_widget_framelist_add(evas, Sources, 1);
+ //of = e_widget_framelist_add(evas, Sources, 1);
+ of = e_widget_frametable_add(evas, _(Sources), 0);
ol = e_widget_ilist_add(evas, 24, 24, cfdata-ol_val);
cfdata-ol = ol;
e_widget_ilist_append(ol, NULL, _(get-e.org - Static),
@@ -117,14 +135,24 @@
/*e_widget_ilist_append(ol, NULL, _(get-e.org - Local copy),
_source_sel_cb, import,
http://localhost/get_e_feed.xml;);*/
- /*e_widget_ilist_append(ol, NULL, Flickr test,
+ /*e_widget_ilist_append(ol, NULL, Raster on Flickr,
_source_sel_cb, import,
-
http://api.flickr.com/services/feeds/photos_public.gne?tags=birrolang=it-itformat=rss_200_enc;);*/
+
http://api.flickr.com/services/feeds/photos_public.gne?tags=rastermanlang=it-itformat=rss_200_enc;);*/
e_widget_ilist_go(ol);
+
e_widget_min_size_get(ol, mw, NULL);
e_widget_min_size_set(ol, mw, 320);
- e_widget_framelist_object_append(of, ol);
- e_widget_list_object_append(o, of, 1, 0, 0.5);
+
+ //e_widget_framelist_object_append(of, ol);
+ e_widget_frametable_object_append(of, ol, 0, 0, 3, 1, 1, 1, 1, 1);
+
+ cfdata-flickr_query = strdup(_(Enter text here));
+ ee = e_widget_entry_add(evas, (cfdata-flickr_query), NULL, NULL, NULL);
+ b = e_widget_button_add(evas, _(Query Flickr), NULL, _get_flickr_images,
import, NULL);
+ e_widget_frametable_object_append(of, ee, 0, 1, 2, 1, 1, 1, 1, 0);
+ e_widget_frametable_object_append(of, b, 2, 1, 1, 1, 0, 1, 0, 0);
+
+ e_widget_list_object_append(o, of, 1, 1, 0.5);
ofm = e_fm2_add(evas);
memset(fmc, 0, sizeof(E_Fm2_Config));
@@ -164,7 +192,6 @@
e_widget_list_object_append(cfdata-o, cfdata-osfm, 1, 1, 0.5);
e_widget_min_size_set(osfm, 320, 320);
-// e_widget_min_size_set(o, 580, 370);
e_widget_min_size_get(o, NULL, mh);
e_dialog_content_set(dia, o, 480, mh);
@@ -250,6 +277,7 @@
{
asprintf(title, _([%s] Getting feed...
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/fileman
Modified Files:
e_fwin.c
Log Message:
fedor's custom command fix patch
===
RCS file: /cvs/e/e17/apps/e/src/modules/fileman/e_fwin.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- e_fwin.c7 Mar 2008 19:13:54 - 1.25
+++ e_fwin.c6 Apr 2008 02:08:09 - 1.26
@@ -831,21 +831,33 @@
}
}
evas_list_free(selected);
+
+// Create a fake .desktop for custom command.
+if (!desktop)
+ {
+ desktop = efreet_desktop_empty_new();
+ desktop-exec = strdup(fad-exec_cmd);
+ }
+
if (fad-fwin-win)
{
if (desktop)
- e_exec(fad-fwin-win-border-zone, desktop, NULL, files,
fwin);
- else
- e_exec(fad-fwin-win-border-zone, NULL, fad-exec_cmd,
files, fwin);
+e_exec(fad-fwin-win-border-zone, desktop, NULL, files,
+ fwin);
}
else if (fad-fwin-zone)
{
if (desktop)
- e_exec(fad-fwin-zone, desktop, NULL, files, fwin);
- else
- e_exec(fad-fwin-zone, NULL, fad-exec_cmd, files, fwin);
+e_exec(fad-fwin-zone, desktop, NULL, files, fwin);
+ }
+
+// Free fake .desktop
+if (!strcmp(fad-exec_cmd, ))
+ {
+ efreet_desktop_free(desktop);
}
-ecore_list_destroy(files);
+
+ecore_list_destroy(files);
}
chdir(pcwd);
}
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Register now and save $200. Hurry, offer ends at 11:59 p.m.,
Monday, April 7! Use priority code J8TLD2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
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_actions.c e_bindings.c
Log Message:
deps lists/ debugging too...
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -3 -r1.113 -r1.114
--- e_actions.c 12 Mar 2008 10:05:19 - 1.113
+++ e_actions.c 3 Apr 2008 18:47:13 - 1.114
@@ -1925,7 +1925,8 @@
bd = (E_Border *)obj;
if ((bd-lock_user_size) || (bd-shaded) || (bd-shading) ||
(bd-fullscreen) ||
- ((bd-maximized == E_MAXIMIZE_FULLSCREEN)
(!e_config-allow_manip)))
+ ((bd-maximized == E_MAXIMIZE_FULLSCREEN)
+(!e_config-allow_manip)))
return;
if (bd-zone)
man = bd-zone-container-manager;
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_bindings.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- e_bindings.c14 Dec 2006 23:38:33 - 1.35
+++ e_bindings.c3 Apr 2008 18:47:13 - 1.36
@@ -59,6 +59,7 @@
{
char params[32];
snprintf(params, sizeof(params), resize_%s, eb-params);
+printf(## ADD mouse,in + mouse,out\n);
e_bindings_signal_add(eb-context, mouse,in, eb-source,
eb-modifiers,
eb-any_mod, pointer_resize_push, params);
e_bindings_signal_add(eb-context, mouse,out, eb-source,
eb-modifiers,
-
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
___
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 Modified Files: README Log Message: deps lists/ debugging too... === RCS file: /cvs/e/e17/apps/e/README,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- README 19 Apr 2007 18:51:21 - 1.15 +++ README 3 Apr 2008 18:47:13 - 1.16 @@ -1,5 +1,18 @@ Enlightenment 0.17.0 - IN DEVELOPMENT... not a RELEASE. +Requirements: +- + +Must: + libc libm libX11 libXext evas ecore ecoreevas ecore-file ecore-ipc ecore-con + ecore-job ecore-imf ecore-img-evas edje eet embryo efreet efreet-mime + edbus ecore-txt + [png loader in evas, jpeg loader in evas, eet loader in evas, software_x11 + engine in evas, buffer engine in evas] + +Recommended: + libpam [xrender engine in evas] + NOTE: Users of DR16 will need to rename the $prefix/bin/enlightenment file prior to installing DR17 or it will be overwritten. @@ -9,16 +22,6 @@ ./configure --prefix=/usr/local/e17 You will, as usual need to add the subsequent bin dir to your $PATH etc. - -PREREQUISITES: - -The following Enlightenment Foundation Libraries are required by e17: - * eet - * evas - * ecore - * embryo - * edje - * efreet NOTES: - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ 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.h
Log Message:
add some macros for usefulness
===
RCS file: /cvs/e/e17/apps/e/src/bin/e.h,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- e.h 25 Sep 2007 14:26:36 - 1.72
+++ e.h 1 Apr 2008 20:51:04 - 1.73
@@ -140,6 +140,32 @@
while (0)
#define E_CLAMP(x, min, max) (x min ? min : (x max ? max : x))
+#define E_RECTS_CLIP_TO_RECT(_x, _y, _w, _h, _cx, _cy, _cw, _ch) \
+ { \
+ if (E_INTERSECTS(_x, _y, _w, _h, _cx, _cy, _cw, _ch)) \
+ { \
+ if (_x (_cx)) \
+{ \
+ _w += _x - (_cx); \
+ _x = (_cx); \
+ if (_w 0) _w = 0; \
+} \
+ if ((_x + _w) ((_cx) + (_cw))) \
+_w = (_cx) + (_cw) - _x; \
+ if (_y (_cy)) \
+{ \
+ _h += _y - (_cy); \
+ _y = (_cy); \
+ if (_h 0) _h = 0; \
+} \
+ if ((_y + _h) ((_cy) + (_ch))) \
+_h = (_cy) + (_ch) - _y; \
+ } \
+ else \
+ { \
+ _w = 0; _h = 0; \
+ } \
+ }
#define E_REMOTE_OPTIONS 1
#define E_REMOTE_OUT 2
-
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
___
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 Modified Files: enlightenment.pc.in Log Message: use @PACKAGE@ === RCS file: /cvs/e/e17/apps/e/enlightenment.pc.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- enlightenment.pc.in 28 Mar 2008 21:33:51 - 1.2 +++ enlightenment.pc.in 31 Mar 2008 14:35:23 - 1.3 @@ -1,7 +1,7 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@/@PACKAGE@ Name: enlightenment Description: Enlightenmnt Window Manager - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ 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
Log Message:
patch from zecke to support a perliminary hacky system config... :)
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -3 -r1.282 -r1.283
--- e_config.c 20 Feb 2008 04:12:58 - 1.282
+++ e_config.c 31 Mar 2008 15:49:19 - 1.283
@@ -1827,7 +1827,22 @@
{
data = eet_data_read(ef, edd, config);
eet_close(ef);
+return data;
}
+
+ /* fallback to a system directory
+* FIXME proper $PATH like handling might be wanted
+*/
+ snprintf(buf, sizeof(buf), %s/data/config/%s/%s.cfg,
+ e_prefix_data_get(), _e_config_profile, domain);
+ ef = eet_open(buf, EET_FILE_MODE_READ);
+ if (ef)
+ {
+ data = eet_data_read(ef, edd, config);
+ eet_close(ef);
+return data;
+ }
+
return data;
}
-
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
___
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_scrollframe.c
Log Message:
feed hold event
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_scrollframe.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_scrollframe.c 26 Feb 2008 09:47:50 - 1.21
+++ e_scrollframe.c 31 Mar 2008 21:52:50 - 1.22
@@ -543,6 +543,7 @@
sd-down.sy = y;
}
}
+ evas_event_feed_hold(e, 0, ev-timestamp, ev-data);
}
sd-down.dragged = 0;
sd-down.now = 0;
@@ -598,6 +599,8 @@
(e_config-thumbscroll_threshhold *
e_config-thumbscroll_threshhold)))
{
+ if (!sd-down.dragged)
+ evas_event_feed_hold(e, 1, ev-timestamp, ev-data);
ev-event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
sd-down.dragged = 1;
}
-
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
___
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_fm_hal.c e_slidesel.c
Log Message:
add pkgconfig supprot to e17 itself.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_hal.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_fm_hal.c 24 Mar 2008 14:27:50 - 1.6
+++ e_fm_hal.c 28 Mar 2008 20:53:26 - 1.7
@@ -130,6 +130,7 @@
if ((!v-mount_point) || (v-mount_point[0] == 0))
{
if (v-mount_point) free(v-mount_point);
+ v-mount_point = NULL;
v-mount_point = e_fm2_hal_volume_mountpoint_get(v);
if ((!v-mount_point) || (v-mount_point[0] == 0))
{
@@ -137,6 +138,7 @@
char *id;
if (v-mount_point) free(v-mount_point);
+v-mount_point = NULL;
id = disk;
if ((v-uuid) (v-uuid[0])) id = v-uuid;
if (ecore_file_is_dir(/media))
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_slidesel.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_slidesel.c26 Feb 2008 09:47:50 - 1.4
+++ e_slidesel.c28 Mar 2008 20:53:26 - 1.5
@@ -155,7 +155,7 @@
if (sd-cur)
{
/* get rid of accidental release and presses */
- if ((t - sd-down_time) 0.2)
+//if ((t - sd-down_time) 0.2)
{
edje_object_signal_emit(sd-edje_obj,
e,action,select, e);
if (sd-cur-func) sd-cur-func(sd-cur-data);
-
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
___
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 Modified Files: Makefile.am configure.in Added Files: enlightenment.pc.in Log Message: add pkgconfig supprot to e17 itself. === RCS file: /cvs/e/e17/apps/e/Makefile.am,v retrieving revision 1.34 retrieving revision 1.35 diff -u -3 -r1.34 -r1.35 --- Makefile.am 7 Nov 2007 22:56:01 - 1.34 +++ Makefile.am 28 Mar 2008 20:53:26 - 1.35 @@ -4,14 +4,17 @@ config.h.in config.sub configure install-sh \ ltconfig ltmain.sh missing mkinstalldirs \ stamp-h.in acconfig.h \ - enlightenment.spec + enlightenment.spec enlightenment.pc bin_SCRIPTS = enlightenment-config EXTRA_DIST = config.rpath README AUTHORS COPYING COPYING-PLAIN \ - enlightenment.spec.in enlightenment.spec + enlightenment.spec.in enlightenment.spec enlightenment.pc filesdir = $(datadir)/enlightenment/ files_DATA = AUTHORS COPYING ACLOCAL_AMFLAGS = -I m4 + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = enlightenment.pc === RCS file: /cvs/e/e17/apps/e/configure.in,v retrieving revision 1.203 retrieving revision 1.204 diff -u -3 -r1.203 -r1.204 --- configure.in3 Mar 2008 10:30:30 - 1.203 +++ configure.in28 Mar 2008 20:53:26 - 1.204 @@ -265,6 +265,7 @@ AC_OUTPUT([ Makefile enlightenment.spec +enlightenment.pc src/Makefile src/bin/Makefile src/modules/Makefile - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ 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
Modified Files:
enlightenment.pc.in
Log Message:
set libs to be modules dir - we wont use it anyway.
===
RCS file: /cvs/e/e17/apps/e/enlightenment.pc.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- enlightenment.pc.in 28 Mar 2008 20:53:26 - 1.1
+++ enlightenment.pc.in 28 Mar 2008 21:33:51 - 1.2
@@ -6,7 +6,6 @@
Name: enlightenment
Description: Enlightenmnt Window Manager
Version: @VERSION@
-Libs:
+Libs: @libdir@/@PACKAGE@/modules
Libs.private:
Cflags: -I${includedir}
-
-
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
___
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_actions.c e_exec.c
Log Message:
use e_exec in action for exec. debugging printfs tew.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -3 -r1.111 -r1.112
--- e_actions.c 21 Jan 2008 01:22:00 - 1.111
+++ e_actions.c 12 Mar 2008 07:31:13 - 1.112
@@ -1478,15 +1478,15 @@
/***/
ACT_FN_GO(exec)
{
- if (params)
+ E_Zone *zone;
+
+ zone = _e_actions_zone_get(obj);
+ if (zone)
{
- Ecore_Exe *exe;
-
- e_util_library_path_strip();
- exe = ecore_exe_run(params, NULL);
- e_util_library_path_restore();
- e_exehist_add(action/exec, params);
- if (exe) ecore_exe_free(exe);
+ if (params)
+ {
+e_exec(zone, NULL, params, NULL, action/exec);
+ }
}
}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_exec.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_exec.c20 Feb 2008 04:12:58 - 1.12
+++ e_exec.c12 Mar 2008 07:31:13 - 1.13
@@ -266,7 +266,7 @@
{
if (launch-launch_method) evas_stringshare_del(launch-launch_method);
if (launch-zone) e_object_unref(E_OBJECT(launch-zone));
- free(launch);
+ free(launch);
}
return inst;
}
@@ -290,12 +290,17 @@
E_Exec_Instance *inst;
ev = event;
+ printf(child exit...\n);
if (!ev-exe) return 1;
+ if (ecore_exe_tag_get(ev-exe)) printf( tag %s\n,
ecore_exe_tag_get(ev-exe));
if (!(ecore_exe_tag_get(ev-exe)
(!strcmp(ecore_exe_tag_get(ev-exe), E/exec return 1;
inst = ecore_exe_data_get(ev-exe);
+ printf( inst = %p\n, inst);
if (!inst) return 1;
+ printf( inst exec line -- '%s'\n, ecore_exe_cmd_get(inst-exe));
+
/* /bin/sh uses this if cmd not found */
if ((ev-exited)
((ev-exit_code == 127) || (ev-exit_code == 255)))
@@ -331,14 +336,17 @@
ecore_exe_event_data_get(ev-exe,
ECORE_EXE_PIPE_ERROR),
ecore_exe_event_data_get(ev-exe,
ECORE_EXE_PIPE_READ));
}
- instances = evas_hash_find(e_exec_instances, inst-desktop-orig_path);
- if (instances)
+ if (inst-desktop)
{
- instances = evas_list_remove(instances, inst);
+ instances = evas_hash_find(e_exec_instances, inst-desktop-orig_path);
if (instances)
- evas_hash_modify(e_exec_instances, inst-desktop-orig_path,
instances);
- else
- e_exec_instances = evas_hash_del(e_exec_instances,
inst-desktop-orig_path, NULL);
+ {
+instances = evas_list_remove(instances, inst);
+if (instances)
+ evas_hash_modify(e_exec_instances, inst-desktop-orig_path,
instances);
+else
+ e_exec_instances = evas_hash_del(e_exec_instances,
inst-desktop-orig_path, NULL);
+ }
}
e_exec_start_pending = evas_list_remove(e_exec_start_pending,
inst-desktop);
if (inst-expire_timer) ecore_timer_del(inst-expire_timer);
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/battery
Modified Files:
e_mod_main.c
Log Message:
batery module now playes with e's powersave api :)
===
RCS file: /cvs/e/e17/apps/e/src/modules/battery/e_mod_main.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -3 -r1.113 -r1.114
--- e_mod_main.c10 Mar 2008 06:45:05 - 1.113
+++ e_mod_main.c12 Mar 2008 05:43:36 - 1.114
@@ -414,7 +414,20 @@
edje_object_part_text_set(inst-o_battery,
e.text.time, buf);
}
}
+ if (!have_battery)
+e_powersave_mode_set(E_POWERSAVE_MODE_LOW);
+ else
+{
+ if ((have_power) || (full 95))
+ e_powersave_mode_set(E_POWERSAVE_MODE_LOW);
+ else if (full 30)
+ e_powersave_mode_set(E_POWERSAVE_MODE_HIGH);
+ else
+ e_powersave_mode_set(E_POWERSAVE_MODE_EXTREME);
+}
}
+ else
+ e_powersave_mode_set(E_POWERSAVE_MODE_LOW);
battery_config-full = full;
battery_config-time_left = time_left;
battery_config-have_battery = have_battery;
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
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_actions.h e_pointer.c e_powersave.c
Log Message:
batery module now playes with e's powersave api :)
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_actions.h 27 Jun 2007 10:57:54 - 1.14
+++ e_actions.h 12 Mar 2008 05:43:36 - 1.15
@@ -54,7 +54,7 @@
EAPI void e_action_del(const char *name);
EAPI E_Action *e_action_find(const char *name);
-EAPI void e_action_predef_name_set(const char *act_grp, const char
*act_name, const char *act_cmd, const char *act_params, const char
*param_example, int editable);
+EAPI void e_action_predef_name_set(const char *act_grp, const char
*act_name, const char *act_cmd, const char *act_params, const char
*param_example, int editable);
EAPI void e_action_predef_name_del(const char *act_grp, const char
*act_name);
EAPI void e_action_predef_name_all_del(void);
EAPI Evas_List *e_action_groups_get(void);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_pointer.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- e_pointer.c 11 Jan 2008 07:33:55 - 1.35
+++ e_pointer.c 12 Mar 2008 05:43:36 - 1.36
@@ -490,6 +490,7 @@
edje_object_signal_emit(p-pointer_object, e,state,mouse,active,
e);
p-idle = 0;
}
+ if (e_powersave_mode_get() = E_POWERSAVE_MODE_MEDIUM) return;
/* and scedule a pre-idle check in 1 second if no more events happen */
p-idle_timer = ecore_timer_add(1.0, _e_pointer_cb_idle_timer_pre, p);
}
@@ -506,8 +507,11 @@
{
p = l-data;
_e_pointer_active_handle(p);
- if (p-pointer_object)
- edje_object_signal_emit(p-pointer_object, e,action,mouse,down,
e);
+ if (e_powersave_mode_get() E_POWERSAVE_MODE_EXTREME)
+ {
+if (p-pointer_object)
+ edje_object_signal_emit(p-pointer_object,
e,action,mouse,down, e);
+ }
}
return 1;
}
@@ -524,8 +528,11 @@
{
p = l-data;
_e_pointer_active_handle(p);
- if (p-pointer_object)
- edje_object_signal_emit(p-pointer_object, e,action,mouse,up, e);
+ if (e_powersave_mode_get() E_POWERSAVE_MODE_EXTREME)
+ {
+if (p-pointer_object)
+ edje_object_signal_emit(p-pointer_object, e,action,mouse,up,
e);
+ }
}
return 1;
}
@@ -542,8 +549,11 @@
{
p = l-data;
_e_pointer_active_handle(p);
- if (p-pointer_object)
- edje_object_signal_emit(p-pointer_object, e,action,mouse,move,
e);
+ if (e_powersave_mode_get() E_POWERSAVE_MODE_HIGH)
+ {
+if (p-pointer_object)
+ edje_object_signal_emit(p-pointer_object,
e,action,mouse,move, e);
+ }
}
return 1;
}
@@ -560,8 +570,11 @@
{
p = l-data;
_e_pointer_active_handle(p);
- if (p-pointer_object)
- edje_object_signal_emit(p-pointer_object, e,action,mouse,wheel,
e);
+ if (e_powersave_mode_get() E_POWERSAVE_MODE_EXTREME)
+ {
+if (p-pointer_object)
+ edje_object_signal_emit(p-pointer_object,
e,action,mouse,wheel, e);
+ }
}
return 1;
}
@@ -586,6 +599,14 @@
E_Pointer *p;
p = data;
+ if (e_powersave_mode_get() = E_POWERSAVE_MODE_MEDIUM)
+ {
+ if (p-idle_poller)
+ ecore_poller_del(p-idle_poller);
+ p-idle_poller = NULL;
+ p-idle_timer = NULL;
+ return 0;
+ }
if (!p-idle_poller)
p-idle_poller = ecore_poller_add(ECORE_POLLER_CORE, 64,
_e_pointer_cb_idle_poller, p);
@@ -600,6 +621,11 @@
int x, y;
p = data;
+ if (e_powersave_mode_get() = E_POWERSAVE_MODE_MEDIUM)
+ {
+ p-idle_poller = NULL;
+ return 0;
+ }
/* check if pointer actually moved since the 1 second post-mouse move idle
* pre-timer that fetches the position */
ecore_x_pointer_xy_get(p-win, x, y);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_powersave.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_powersave.c 11 Jan 2008 07:33:55 - 1.1
+++ e_powersave.c 12 Mar 2008 05:43:36 - 1.2
@@ -96,6 +96,8 @@
{
if (mode powersave_mode_min) mode = powersave_mode_min;
else if (mode powersave_mode_max) mode = powersave_mode_max;
+ if (powersave_mode == mode) return;
+ printf(CHANGE PW SAVE MODE TO %i / %i\n, (int)mode,
E_POWERSAVE_MODE_EXTREME);
powersave_mode = mode;
_e_powersave_mode_eval();
}
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/temperature
Modified Files:
e_mod_main.c
Log Message:
use new exe flag to make children die! die! die! kill the children... KILL!
...
child processes that is.
:)
===
RCS file: /cvs/e/e17/apps/e/src/modules/temperature/e_mod_main.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -3 -r1.92 -r1.93
--- e_mod_main.c12 Feb 2008 06:14:27 - 1.92
+++ e_mod_main.c10 Mar 2008 06:45:05 - 1.93
@@ -91,16 +91,7 @@
inst-o_temp = o;
inst-module = temperature_config-module;
inst-have_temp = -1;
- snprintf(buf, sizeof(buf),
- %s/%s/tempget %i \%s\ %i,
- e_module_dir_get(temperature_config-module), MODULE_ARCH,
- inst-sensor_type,
- (inst-sensor_name != NULL ? inst-sensor_name : -null-),
- inst-poll_interval);
- inst-tempget_exe = ecore_exe_pipe_run(buf,
- ECORE_EXE_PIPE_READ |
- ECORE_EXE_PIPE_READ_LINE_BUFFERED,
- inst);
+
inst-tempget_data_handler =
ecore_event_handler_add(ECORE_EXE_EVENT_DATA,
_temperature_cb_exe_data,
@@ -110,6 +101,8 @@
_temperature_cb_exe_del,
inst);
+ temperature_face_update_config(inst);
+
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_temperature_face_cb_mouse_down, inst);
return gcc;
@@ -390,10 +383,13 @@
temperature_face_update_config(Config_Face *inst)
{
char buf[PATH_MAX];
-
- ecore_exe_terminate(inst-tempget_exe);
- ecore_exe_free(inst-tempget_exe);
- inst-tempget_exe = NULL;
+
+ if (inst-tempget_exe)
+ {
+ ecore_exe_terminate(inst-tempget_exe);
+ ecore_exe_free(inst-tempget_exe);
+ inst-tempget_exe = NULL;
+ }
snprintf(buf, sizeof(buf),
%s/%s/tempget %i \%s\ %i,
e_module_dir_get(temperature_config-module), MODULE_ARCH,
@@ -402,7 +398,8 @@
inst-poll_interval);
inst-tempget_exe = ecore_exe_pipe_run(buf,
ECORE_EXE_PIPE_READ |
- ECORE_EXE_PIPE_READ_LINE_BUFFERED,
+ ECORE_EXE_PIPE_READ_LINE_BUFFERED |
+ ECORE_EXE_NOT_LEADER,
inst);
}
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/battery Modified Files: e_mod_main.c Log Message: use new exe flag to make children die! die! die! kill the children... KILL! ... child processes that is. :) === RCS file: /cvs/e/e17/apps/e/src/modules/battery/e_mod_main.c,v retrieving revision 1.112 retrieving revision 1.113 diff -u -3 -r1.112 -r1.113 --- e_mod_main.c9 Mar 2008 17:31:12 - 1.112 +++ e_mod_main.c10 Mar 2008 06:45:05 - 1.113 @@ -218,7 +218,8 @@ battery_config-poll_interval); battery_config-batget_exe = ecore_exe_pipe_run(buf, ECORE_EXE_PIPE_READ | - ECORE_EXE_PIPE_READ_LINE_BUFFERED, + ECORE_EXE_PIPE_READ_LINE_BUFFERED | + ECORE_EXE_NOT_LEADER, NULL); } - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ 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_wallpaper
Modified Files:
e_int_config_wallpaper_web.c
Log Message:
cedrics for web
===
RCS file:
/cvs/e/e17/apps/e/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_int_config_wallpaper_web.c5 Mar 2008 06:03:49 - 1.1
+++ e_int_config_wallpaper_web.c9 Mar 2008 16:43:58 - 1.2
@@ -8,12 +8,16 @@
#include e_mod_main.h
#define D(x) do {printf(### DBG line %d ### , __LINE__); printf x;
fflush(stdout);} while (0)
+#defineMAGIC_IMPORT0x427781cb
+
typedef struct _Import Import;
struct _Import {
- E_Config_Dialog *parent;
+ int magic;
+
+ E_Config_Dialog *parent;
E_Config_Dialog_Data *cfdata;
- E_Dialog *dia;
+ E_Dialog*dia;
};
struct _E_Config_Dialog_Data
@@ -73,6 +77,8 @@
if (!import)
return NULL;
+ import-magic = MAGIC_IMPORT;
+
dia = e_dialog_new (parent-con, E, _wallpaper_web_dialog);
if (!dia)
{
@@ -89,6 +95,8 @@
cfdata = E_NEW (E_Config_Dialog_Data, 1);
ecore_con_url_init ();
+ ecore_file_download_init ();
+
cfdata-ecu = ecore_con_url_new (http://fake.url;);
cfdata-ready_for_edj = 0;
@@ -206,6 +214,7 @@
{
ecore_event_handler_del (cfdata-hcomplete);
}
+ ecore_file_download_shutdown();
ecore_con_url_shutdown ();
if (cfdata-tmpdir)
@@ -233,8 +242,13 @@
euc = (Ecore_Con_Event_Url_Complete *)event;
import = data;
+ if (import-magic != MAGIC_IMPORT) return 1;
+
cfdata = import-cfdata;
+ if (cfdata-ecu != euc-url_con) return 1;
+
fclose (cfdata-feed);
+ cfdata-feed = NULL;
ecore_event_handler_del (cfdata-hdata);
ecore_event_handler_del (cfdata-hcomplete);
cfdata-hdata = NULL;
@@ -262,7 +276,12 @@
eud = (Ecore_Con_Event_Url_Data *)event;
import = data;
+ if (import-magic != MAGIC_IMPORT) return 1;
+
cfdata = import-cfdata;
+
+ if (cfdata-ecu != eud-url_con) return 1;
+
fwrite (eud-data, sizeof(unsigned char), eud-size, cfdata-feed);
return 0;
}
@@ -597,6 +616,10 @@
cfdata-tmpdir = mkdtemp (strdup (tmpdir_tpl));
ecore_con_url_url_set (cfdata-ecu, url);
+ ecore_file_download_abort_all ();
+ if (cfdata-hdata) ecore_event_handler_del (cfdata-hdata);
+ if (cfdata-hcomplete) ecore_event_handler_del (cfdata-hcomplete);
+ if (cfdata-feed) fclose (cfdata-feed);
cfdata-hdata = ecore_event_handler_add (ECORE_CON_EVENT_URL_DATA,
_feed_data,
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
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_int_border_menu.c e_int_border_remember.c
e_remember.c e_remember.h
Log Message:
cedrics for web
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.629
retrieving revision 1.630
diff -u -3 -r1.629 -r1.630
--- e_border.c 7 Mar 2008 11:51:31 - 1.629
+++ e_border.c 9 Mar 2008 16:43:58 - 1.630
@@ -5204,7 +5204,6 @@
if (bd-client.netwm.type == ECORE_X_WINDOW_TYPE_DOCK)
{
-/* TODO: Make this user options */
if (!bd-client.netwm.state.skip_pager)
{
bd-client.netwm.state.skip_pager = 1;
@@ -5837,6 +5836,10 @@
}
if (rem-apply E_REMEMBER_APPLY_SKIP_WINLIST)
bd-user_skip_winlist = rem-prop.skip_winlist;
+if (rem-apply E_REMEMBER_APPLY_SKIP_PAGER)
+ bd-client.netwm.state.skip_pager = rem-prop.skip_pager;
+if (rem-apply E_REMEMBER_APPLY_SKIP_TASKBAR)
+ bd-client.netwm.state.skip_taskbar = rem-prop.skip_taskbar;
if (rem-apply E_REMEMBER_APPLY_ICON_PREF)
bd-icon_preference = rem-prop.icon_preference;
if (rem-apply E_REMEMBER_SET_FOCUS_ON_START)
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_menu.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -3 -r1.78 -r1.79
--- e_int_border_menu.c 12 Jan 2008 07:58:18 - 1.78
+++ e_int_border_menu.c 9 Mar 2008 16:43:58 - 1.79
@@ -24,6 +24,7 @@
static void _e_border_menu_cb_fullscreen(void *data, E_Menu *m, E_Menu_Item
*mi);
static void _e_border_menu_cb_skip_winlist(void *data, E_Menu *m, E_Menu_Item
*mi);
static void _e_border_menu_cb_skip_pager(void *data, E_Menu *m, E_Menu_Item
*mi);
+static void _e_border_menu_cb_skip_taskbar(void *data, E_Menu *m, E_Menu_Item
*mi);
static void _e_border_menu_cb_sendto_pre(void *data, E_Menu *m, E_Menu_Item
*mi);
static void _e_border_menu_cb_sendto(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_pin(void *data, E_Menu *m, E_Menu_Item *mi);
@@ -660,6 +661,7 @@
bd-user_skip_winlist = e_menu_item_toggle_get(mi);
else
bd-user_skip_winlist = 0;
+ bd-changed = 1;
if (bd-remember) e_remember_update(bd-remember, bd);
}
@@ -680,6 +682,22 @@
}
static void
+_e_border_menu_cb_skip_taskbar(void *data, E_Menu *m, E_Menu_Item *mi)
+{
+ E_Border *bd;
+
+ bd = data;
+ if (!bd) return;
+
+ if ((bd-client.icccm.accepts_focus) || (bd-client.icccm.take_focus))
+ bd-client.netwm.state.skip_taskbar = e_menu_item_toggle_get(mi);
+ else
+ bd-client.netwm.state.skip_taskbar = 0;
+ bd-changed = 1;
+ if (bd-remember) e_remember_update(bd-remember, bd);
+}
+
+static void
_e_border_menu_cb_sendto_pre(void *data, E_Menu *m, E_Menu_Item *mi)
{
E_Menu *subm;
@@ -985,6 +1003,16 @@
e_theme_edje_file_get(base/theme/borders,
e/widgets/border/default/skip_pager),
e/widgets/border/default/skip_pager);
+
+ submi = e_menu_item_new(subm);
+ e_menu_item_label_set(submi, _(Taskbar));
+ e_menu_item_check_set(submi, 1);
+ e_menu_item_toggle_set(submi, bd-client.netwm.state.skip_taskbar);
+ e_menu_item_callback_set(submi, _e_border_menu_cb_skip_taskbar, bd);
+ e_menu_item_icon_edje_set(submi,
+e_theme_edje_file_get(base/theme/borders,
+
e/widgets/border/default/skip_taskbar),
+e/widgets/border/default/skip_taskbar);
}
static void
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_remember.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_int_border_remember.c 28 Dec 2007 03:18:37 - 1.17
+++ e_int_border_remember.c 9 Mar 2008 16:43:58 - 1.18
@@ -42,6 +42,8 @@
int apply_shade;
int apply_zone;
int apply_skip_winlist;
+ int apply_skip_pager;
+ int apply_skip_taskbar;
int apply_run;
int apply_icon_pref;
int set_focus_on_start;
@@ -99,6 +101,8 @@
if (cfdata-border-remember-apply E_REMEMBER_APPLY_SHADE)
cfdata-remember.apply_shade = 1;
if (cfdata-border-remember-apply E_REMEMBER_APPLY_ZONE)
cfdata-remember.apply_zone = 1;
if (cfdata-border-remember-apply E_REMEMBER_APPLY_SKIP_WINLIST)
cfdata-remember.apply_skip_winlist = 1;
+ if (cfdata-border-remember-apply E_REMEMBER_APPLY_SKIP_PAGER)
cfdata-remember.apply_skip_pager = 1;
+ if (cfdata-border-remember-apply
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/battery Modified Files: e_mod_main.c Log Message: fix batget restart on shelf re-config so it displays right === RCS file: /cvs/e/e17/apps/e/src/modules/battery/e_mod_main.c,v retrieving revision 1.111 retrieving revision 1.112 diff -u -3 -r1.111 -r1.112 --- e_mod_main.c5 Mar 2008 06:00:25 - 1.111 +++ e_mod_main.c9 Mar 2008 17:31:12 - 1.112 @@ -56,6 +56,11 @@ E_Gadcon_Client *gcc; Instance *inst; + battery_config-full = -2; + battery_config-time_left = -2; + battery_config-have_battery = -2; + battery_config-have_power = -2; + inst = E_NEW(Instance, 1); o = edje_object_add(gc-evas); - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ 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_border.h e_hints.c e_utils.c
Log Message:
revert patch. never tested by submiter.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.627
retrieving revision 1.628
diff -u -3 -r1.627 -r1.628
--- e_border.c 6 Mar 2008 10:17:39 - 1.627
+++ e_border.c 7 Mar 2008 10:35:57 - 1.628
@@ -3266,6 +3266,8 @@
free(bd-client.netwm.icons[i].data);
free(bd-client.netwm.icons);
}
+ if (bd-client.netwm.extra_types)
+ free(bd-client.netwm.extra_types);
if (bd-client.border.name) evas_stringshare_del(bd-client.border.name);
if (bd-bordername) evas_stringshare_del(bd-bordername);
if (bd-client.icccm.title) free(bd-client.icccm.title);
@@ -5054,6 +5056,7 @@
int rem_change = 0;
int send_event = 1;
+ _e_border_hook_call(E_BORDER_HOOK_EVAL_PRE_FETCH, bd);
/* fetch any info queued to be fetched */
if (bd-client.icccm.fetch.client_leader)
{
@@ -5812,6 +5815,7 @@
}
_e_border_hook_call(E_BORDER_HOOK_EVAL_POST_FETCH, bd);
+ _e_border_hook_call(E_BORDER_HOOK_EVAL_PRE_BORDER_ASSIGN, bd);
if ((bd-client.border.changed) (!bd-shaded)
(!(((bd-maximized E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN
@@ -5990,6 +5994,9 @@
bd-need_reparent = 0;
}
+ _e_border_hook_call(E_BORDER_HOOK_EVAL_POST_BORDER_ASSIGN, bd);
+ _e_border_hook_call(E_BORDER_HOOK_EVAL_PRE_NEW_BORDER, bd);
+
if (bd-new_client)
{
// printf(##- NEW CLIENT SETUP 0x%x\n, bd-client.win);
@@ -6209,6 +6216,8 @@
e_border_zone_set(bd, zone);
}
}
+
+ _e_border_hook_call(E_BORDER_HOOK_EVAL_POST_NEW_BORDER, bd);
/* effect changes to the window border itself */
if ((bd-changes.shading))
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.h,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -3 -r1.169 -r1.170
--- e_border.h 11 Jan 2008 07:33:55 - 1.169
+++ e_border.h 7 Mar 2008 10:35:58 - 1.170
@@ -80,7 +80,12 @@
typedef enum _E_Border_Hook_Point
{
- E_BORDER_HOOK_EVAL_POST_FETCH
+ E_BORDER_HOOK_EVAL_PRE_FETCH,
+ E_BORDER_HOOK_EVAL_POST_FETCH,
+ E_BORDER_HOOK_EVAL_PRE_BORDER_ASSIGN,
+ E_BORDER_HOOK_EVAL_POST_BORDER_ASSIGN,
+ E_BORDER_HOOK_EVAL_PRE_NEW_BORDER,
+ E_BORDER_HOOK_EVAL_POST_NEW_BORDER,
} E_Border_Hook_Point;
typedef struct _E_Border E_Border;
@@ -296,6 +301,8 @@
} action;
Ecore_X_Window_Type type;
+Ecore_X_Window_Type *extra_types;
+int extra_types_num;
int startup_id;
struct {
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_hints.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -3 -r1.94 -r1.95
--- e_hints.c 25 Mar 2007 22:44:59 - 1.94
+++ e_hints.c 7 Mar 2008 10:35:58 - 1.95
@@ -656,7 +656,36 @@
EAPI void
e_hints_window_type_get(E_Border *bd)
{
- ecore_x_netwm_window_type_get(bd-client.win, bd-client.netwm.type);
+ Ecore_X_Window_Type *types = NULL;
+ int num, i;
+
+ num = ecore_x_netwm_window_types_get(bd-client.win, types);
+ if (bd-client.netwm.extra_types)
+ {
+ free(bd-client.netwm.extra_types);
+ bd-client.netwm.extra_types = NULL;
+ bd-client.netwm.extra_types_num = 0;
+ }
+ if (num == 0)
+ {
+ bd-client.netwm.type = ECORE_X_WINDOW_TYPE_UNKNOWN;
+ }
+ else
+ {
+ bd-client.netwm.type = types[0];
+ if (num 1)
+ {
+bd-client.netwm.extra_types =
+ malloc((num - 1) * sizeof(Ecore_X_Window_Type));
+if (bd-client.netwm.extra_types)
+ {
+ for (i = 1; i num; i++)
+ bd-client.netwm.extra_types[i - 1] = types[i];
+ bd-client.netwm.extra_types_num = num - 1;
+ }
+ }
+ free(types);
+ }
}
EAPI void
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_utils.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -3 -r1.80 -r1.81
--- e_utils.c 5 Mar 2008 04:00:17 - 1.80
+++ e_utils.c 7 Mar 2008 10:35:58 - 1.81
@@ -592,24 +592,15 @@
while (*p)
{
if ((q - buf) 4090) return NULL;
- if (*p == '\'')
- {
-*q= '\'';
-q++;
-*q = '\\';
-q++;
-*q= '\'';
-q++;
- }
- else if (
+ if (
(*p == ' ') || (*p == '\t') || (*p == '\n') ||
- (*p == '\\') || (*p == '\') || (*p == '\?') ||
+ (*p == '\\') || (*p == '\'') || (*p ==
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_border.h e_hints.c e_hints.h
Log Message:
support qtopia hint flags and also multiple netwm types
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.628
retrieving revision 1.629
diff -u -3 -r1.628 -r1.629
--- e_border.c 7 Mar 2008 10:35:57 - 1.628
+++ e_border.c 7 Mar 2008 11:51:31 - 1.629
@@ -419,6 +419,14 @@
bd-client.e.fetch.state = 1;
}
}
+/* loop to check for qtopia atoms */
+for (i = 0; i at_num; i++)
+ {
+ if (atoms[i] == _QTOPIA_SOFT_MENU)
+ bd-client.qtopia.fetch.soft_menu = 1;
+ else if (atoms[i] == _QTOPIA_SOFT_MENUS)
+ bd-client.qtopia.fetch.soft_menus = 1;
+ }
free(atoms);
}
}
@@ -3973,6 +3981,16 @@
bd-client.netwm.fetch.icon = 1;
bd-changed = 1;
}
+ else if (e-atom == _QTOPIA_SOFT_MENU)
+ {
+ bd-client.qtopia.fetch.soft_menu = 1;
+ bd-changed = 1;
+ }
+ else if (e-atom == _QTOPIA_SOFT_MENUS)
+ {
+ bd-client.qtopia.fetch.soft_menus = 1;
+ bd-changed = 1;
+ }
/*
else if (e-atom == ECORE_X_ATOM_NET_WM_USER_TIME)
{
@@ -5454,6 +5472,18 @@
}
bd-client.netwm.fetch.strut = 0;
}
+ if (bd-client.qtopia.fetch.soft_menu)
+ {
+ e_hints_window_qtopia_soft_menu_get(bd);
+ bd-client.qtopia.fetch.soft_menu = 0;
+ rem_change = 1;
+ }
+ if (bd-client.qtopia.fetch.soft_menus)
+ {
+ e_hints_window_qtopia_soft_menus_get(bd);
+ bd-client.qtopia.fetch.soft_menus = 0;
+ rem_change = 1;
+ }
if (bd-changes.shape)
{
Ecore_X_Rectangle *rects;
@@ -6842,6 +6872,7 @@
e_object_ref(E_OBJECT(bd));
ecore_event_add(E_EVENT_BORDER_PROPERTY, event,
_e_border_event_border_property_free, NULL);
}
+ _e_border_hook_call(E_BORDER_HOOK_EVAL_END, bd);
}
static void
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.h,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -3 -r1.170 -r1.171
--- e_border.h 7 Mar 2008 10:35:58 - 1.170
+++ e_border.h 7 Mar 2008 11:51:31 - 1.171
@@ -86,6 +86,7 @@
E_BORDER_HOOK_EVAL_POST_BORDER_ASSIGN,
E_BORDER_HOOK_EVAL_PRE_NEW_BORDER,
E_BORDER_HOOK_EVAL_POST_NEW_BORDER,
+ E_BORDER_HOOK_EVAL_END,
} E_Border_Hook_Point;
typedef struct _E_Border E_Border;
@@ -336,6 +337,16 @@
unsigned char state : 1;
} fetch;
} e;
+
+ struct {
+struct {
+ unsigned char soft_menu : 1;
+ unsigned char soft_menus : 1;
+} fetch;
+
+unsigned char soft_menu : 1;
+unsigned char soft_menus : 1;
+ } qtopia;
Ecore_X_Window_Attributes initial_attributes;
} client;
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_hints.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -3 -r1.95 -r1.96
--- e_hints.c 7 Mar 2008 10:35:58 - 1.95
+++ e_hints.c 7 Mar 2008 11:51:31 - 1.96
@@ -3,12 +3,17 @@
*/
#include e.h
+Ecore_X_Atom _QTOPIA_SOFT_MENU = 0;
+Ecore_X_Atom _QTOPIA_SOFT_MENUS = 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);
roots = ecore_x_window_root_list(num);
if (roots)
{
@@ -1335,6 +1340,28 @@
}
EAPI void
+e_hints_window_qtopia_soft_menu_get(E_Border *bd)
+{
+ int val;
+
+ if (ecore_x_window_prop_card32_get(bd-client.win, _QTOPIA_SOFT_MENU, val,
1))
+ bd-client.qtopia.soft_menu = val;
+ else
+ bd-client.qtopia.soft_menu = 0;
+}
+
+EAPI void
+e_hints_window_qtopia_soft_menus_get(E_Border *bd)
+{
+ int val;
+
+ if (ecore_x_window_prop_card32_get(bd-client.win, _QTOPIA_SOFT_MENUS,
val, 1))
+ bd-client.qtopia.soft_menus = val;
+ else
+ bd-client.qtopia.soft_menus = 0;
+}
+
+EAPI void
e_hints_openoffice_gnome_fake(Ecore_X_Window root)
{
Ecore_X_Atom gnome_atom, string_atom;
@@ -1354,3 +1381,4 @@
win2 = ecore_x_window_new(root, -20, -20, 1, 1);
ecore_x_netwm_wm_identify(root, win2, KWin);
}
+
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_hints.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- e_hints.h 7 Jun 2006 21:42:13 - 1.23
+++ e_hints.h 7 Mar 2008 11:51:31 - 1.24
@@ -45,8 +45,14 @@
EAPI void
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/fileman
Modified Files:
e_fwin.c
Log Message:
fix 3 valgrind issues i found.
===
RCS file: /cvs/e/e17/apps/e/src/modules/fileman/e_fwin.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- e_fwin.c12 Feb 2008 05:59:01 - 1.24
+++ e_fwin.c7 Mar 2008 19:13:54 - 1.25
@@ -443,12 +443,6 @@
_e_fwin_free(E_Fwin *fwin)
{
if (!fwin) return; //safety
- if (fwin-fad)
- {
- e_object_del(E_OBJECT(fwin-fad-dia));
- fwin-fad = NULL;
- }
- if (fwin-win) e_object_del(E_OBJECT(fwin-win));
if (fwin-fm_obj) evas_object_del(fwin-fm_obj);
if (fwin-tbar) e_object_del(E_OBJECT(fwin-tbar));
if (fwin-scrollframe_obj) evas_object_del(fwin-scrollframe_obj);
@@ -469,6 +463,12 @@
if (fwin-overlay_file) evas_stringshare_del(fwin-overlay_file);
if (fwin-scrollframe_file) evas_stringshare_del(fwin-scrollframe_file);
if (fwin-theme_file) evas_stringshare_del(fwin-theme_file);
+ if (fwin-fad)
+ {
+ e_object_del(E_OBJECT(fwin-fad-dia));
+ fwin-fad = NULL;
+ }
+ if (fwin-win) e_object_del(E_OBJECT(fwin-win));
free(fwin);
}
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
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_fm.c e_gadcon.c Log Message: fix 3 valgrind issues i found. === RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v retrieving revision 1.238 retrieving revision 1.239 diff -u -3 -r1.238 -r1.239 --- e_fm.c 22 Feb 2008 00:59:42 - 1.238 +++ e_fm.c 7 Mar 2008 19:13:53 - 1.239 @@ -5978,6 +5978,7 @@ sd = evas_object_smart_data_get(obj); if (!sd) return; + _e_fm2_client_monitor_list_end(obj); if (sd-realpath) _e_fm2_client_monitor_del(sd-id, sd-realpath); _e_fm2_live_process_end(obj); _e_fm2_queue_free(obj); === RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v retrieving revision 1.103 retrieving revision 1.104 diff -u -3 -r1.103 -r1.104 --- e_gadcon.c 5 Mar 2008 12:39:55 - 1.103 +++ e_gadcon.c 7 Mar 2008 19:13:53 - 1.104 @@ -764,9 +764,10 @@ gcc-name = evas_stringshare_add(name); gcc-gadcon = gc; gcc-o_base = base_obj; + if (gc-clients) + gcc-id = E_GADCON_CLIENT(evas_list_data(evas_list_last(gc-clients)))-id + 1; gc-clients = evas_list_append(gc-clients, gcc); /* This must only be unique during runtime */ - gcc-id = E_GADCON_CLIENT(evas_list_last(gc-clients))-id + 1; if (gcc-o_base) evas_object_event_callback_add(gcc-o_base, EVAS_CALLBACK_DEL, _e_gadcon_client_del_hook, gcc); - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ 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
Log Message:
focus - deny entirely in any visual and technical way, if asked.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.626
retrieving revision 1.627
diff -u -3 -r1.626 -r1.627
--- e_border.c 5 Mar 2008 02:54:30 - 1.626
+++ e_border.c 6 Mar 2008 10:17:39 - 1.627
@@ -1353,6 +1353,13 @@
EAPI void
e_border_focus_set_with_pointer(E_Border *bd)
{
+ /* note: this is here as it seems there are enough apps that do not even
+* expect us to emulate a look of focus but not actually set x input
+* focus as we do - so simply abort any focuse set on such windows */
+ /* be strict about accepting focus hint */
+// printf( 2accept:%i take:%i\n, bd-client.icccm.accepts_focus,
bd-client.icccm.take_focus);
+ if (!bd-client.icccm.accepts_focus) return;
+
/* Try to grab the pointer to make sure it's not in use */
if (!ecore_x_pointer_grab(bd-zone-container-win))
return;
@@ -1381,7 +1388,14 @@
{
E_OBJECT_CHECK(bd);
E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
- //printf(e_border_focus_set(%p, %i %i);\n, bd, focus, set);
+ /* note: this is here as it seems there are enough apps that do not even
+* expect us to emulate a look of focus but not actually set x input
+* focus as we do - so simply abort any focuse set on such windows */
+ /* be strict about accepting focus hint */
+// printf(e_border_focus_set(%p, %s, %i %i);\n, bd, bd-client.icccm.name,
focus, set);
+// printf( accept:%i take:%i\n, bd-client.icccm.accepts_focus,
bd-client.icccm.take_focus);
+ if (!bd-client.icccm.accepts_focus) return;
+
if ((bd-modal) (bd-modal != bd))
{
e_border_focus_set(bd-modal, focus, set);
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
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_fm_hal.c
Log Message:
somewhere along the way the ability to handle empty mount point defines was
kiled. bring it back so it works!
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_hal.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_fm_hal.c 31 Oct 2007 19:51:14 - 1.3
+++ e_fm_hal.c 6 Mar 2008 16:58:38 - 1.4
@@ -127,8 +127,29 @@
v-mount_point,
v-parent);
- if (!v-mount_point)
- v-mount_point = e_fm2_hal_volume_mountpoint_get(v);
+ if ((!v-mount_point) || (v-mount_point[0] == 0))
+ {
+ if (v-mount_point) free(v-mount_point);
+ v-mount_point = e_fm2_hal_volume_mountpoint_get(v);
+ if ((!v-mount_point) || (v-mount_point[0] == 0))
+ {
+char buf[PATH_MAX];
+char *id;
+
+if (v-mount_point) free(v-mount_point);
+id = disk;
+if ((v-uuid) (v-uuid[0])) id = v-uuid;
+if (ecore_file_is_dir(/media))
+ snprintf(buf, sizeof(buf), /media/%s, id);
+else if (ecore_file_is_dir(/mnt))
+ snprintf(buf, sizeof(buf), /mnt/%s, id);
+else if (ecore_file_is_dir(/tmp))
+ snprintf(buf, sizeof(buf), /tmp/%s, id);
+else
+ snprintf(buf, sizeof(buf), );
+v-mount_point = strdup(buf);
+ }
+ }
if ((s = e_fm2_hal_storage_find(v-parent)))
{
@@ -198,25 +219,26 @@
}
/* Choose the label */
- if (v-label)
+ if ((v-label) (v-label[0]))
snprintf(label, sizeof(label), %s, v-label);
- else if (v-partition_label)
+ else if ((v-partition_label) (v-partition_label[0]))
snprintf(label, sizeof(label) - 1, %s, v-partition_label);
- else if (v-storage-vendor v-storage-model)
+ else if (((v-storage-vendor) (v-storage-vendor[0]))
+((v-storage-model) (v-storage-model[0])))
{
if (size[0] != '\0')
snprintf(label, sizeof(label) - 1, %s %s - %s,
v-storage-vendor, v-storage-model, size);
else
snprintf(label, sizeof(label) - 1, %s %s, v-storage-vendor,
v-storage-model);
}
- else if (v-storage-model)
+ else if ((v-storage-model) (v-storage-model[0]))
{
if (size[0] != '\0')
snprintf(label, sizeof(label) - 1, %s - %s, v-storage-model,
size);
else
snprintf(label, sizeof(label) - 1, %s, v-storage-model);
}
- else if (v-storage-vendor)
+ else if ((v-storage-vendor) (v-storage-vendor[0]))
{
if (size[0] != '\0')
snprintf(label, sizeof(label) - 1, %s - %s,
v-storage-vendor, size);
@@ -416,7 +438,7 @@
v-mounts = evas_list_prepend(v-mounts, m);
- printf(BEGIN MOUNT %p %s\n, m, v-mount_point);
+ printf(BEGIN MOUNT %p '%s'\n, m, v-mount_point);
if (!v-mounted)
{
@@ -453,7 +475,7 @@
m-timeout = NULL;
}
if (m-mount_ok) m-mount_ok(m-data);
- printf(MOUNT OK %s\n, m-mount_point);
+ printf(MOUNT OK '%s'\n, m-mount_point);
}
static int
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
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_gadcon.c e_gadcon.h
Log Message:
instant edit! werd! :)
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -3 -r1.102 -r1.103
--- e_gadcon.c 4 Mar 2008 13:33:18 - 1.102
+++ e_gadcon.c 5 Mar 2008 12:39:55 - 1.103
@@ -29,6 +29,10 @@
static void _e_gadcon_cb_client_move(void *data, Evas *evas, Evas_Object *obj,
void *event_info);
static void _e_gadcon_cb_client_resize(void *data, Evas *evas, Evas_Object
*obj, void *event_info);
+static void _e_gadcon_client_move_start(E_Gadcon_Client *gcc);
+static void _e_gadcon_client_move_stop(E_Gadcon_Client *gcc);
+static void _e_gadcon_client_move_go(E_Gadcon_Client *gcc);
+
static void _e_gadcon_cb_signal_move_start(void *data, Evas_Object *obj, const
char *emission, const char *source);
static void _e_gadcon_cb_signal_move_stop(void *data, Evas_Object *obj, const
char *emission, const char *source);
static void _e_gadcon_cb_signal_move_go(void *data, Evas_Object *obj, const
char *emission, const char *source);
@@ -47,6 +51,8 @@
static int _e_gadcon_client_class_feature_check(E_Gadcon_Client_Class *cc,
const char *name, void *feature);
static void _e_gadcon_client_cb_menu_post(void *data, E_Menu *m);
static void _e_gadcon_client_cb_mouse_down(void *data, Evas *e, Evas_Object
*obj, void *event_info);
+static void _e_gadcon_client_cb_mouse_up(void *data, Evas *e, Evas_Object
*obj, void *event_info);
+static void _e_gadcon_client_cb_mouse_move(void *data, Evas *e, Evas_Object
*obj, void *event_info);
static void _e_gadcon_client_cb_menu_style_plain(void *data, E_Menu *m,
E_Menu_Item *mi);
static void _e_gadcon_client_cb_menu_style_inset(void *data, E_Menu *m,
E_Menu_Item *mi);
static void _e_gadcon_client_cb_menu_autoscroll(void *data, E_Menu *m,
E_Menu_Item *mi);
@@ -414,6 +420,8 @@
_e_gadcon_client_save(gcc);
if (gc-editing) e_gadcon_client_edit_begin(gcc);
+ if (gc-instant_edit)
+ e_gadcon_client_util_menu_attach(gcc);
}
}
}
@@ -481,6 +489,8 @@
_e_gadcon_client_save(gcc);
if (gc-editing) e_gadcon_client_edit_begin(gcc);
+ if (gc-instant_edit)
+ e_gadcon_client_util_menu_attach(gcc);
}
}
}
@@ -1248,9 +1258,17 @@
E_OBJECT_CHECK(gcc);
E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
if (gcc-o_frame)
- evas_object_event_callback_add(gcc-o_frame, EVAS_CALLBACK_MOUSE_DOWN,
_e_gadcon_client_cb_mouse_down, gcc);
+ {
+ evas_object_event_callback_add(gcc-o_frame, EVAS_CALLBACK_MOUSE_DOWN,
_e_gadcon_client_cb_mouse_down, gcc);
+ evas_object_event_callback_add(gcc-o_frame, EVAS_CALLBACK_MOUSE_UP,
_e_gadcon_client_cb_mouse_up, gcc);
+ evas_object_event_callback_add(gcc-o_frame, EVAS_CALLBACK_MOUSE_MOVE,
_e_gadcon_client_cb_mouse_move, gcc);
+ }
else if (gcc-o_base)
- evas_object_event_callback_add(gcc-o_base, EVAS_CALLBACK_MOUSE_DOWN,
_e_gadcon_client_cb_mouse_down, gcc);
+ {
+ evas_object_event_callback_add(gcc-o_base, EVAS_CALLBACK_MOUSE_DOWN,
_e_gadcon_client_cb_mouse_down, gcc);
+ evas_object_event_callback_add(gcc-o_base, EVAS_CALLBACK_MOUSE_UP,
_e_gadcon_client_cb_mouse_up, gcc);
+ evas_object_event_callback_add(gcc-o_base, EVAS_CALLBACK_MOUSE_MOVE,
_e_gadcon_client_cb_mouse_move, gcc);
+ }
}
/*
@@ -1702,11 +1720,8 @@
}
static void
-_e_gadcon_cb_signal_move_start(void *data, Evas_Object *obj, const char
*emission, const char *source)
+_e_gadcon_client_move_start(E_Gadcon_Client *gcc)
{
- E_Gadcon_Client *gcc;
-
- gcc = data;
evas_object_raise(gcc-o_event);
evas_object_stack_below(gcc-o_control, gcc-o_event);
gcc-moving = 1;
@@ -1717,11 +1732,8 @@
}
static void
-_e_gadcon_cb_signal_move_stop(void *data, Evas_Object *obj, const char
*emission, const char *source)
+_e_gadcon_client_move_stop(E_Gadcon_Client *gcc)
{
- E_Gadcon_Client *gcc;
-
- gcc = data;
gcc-moving = 0;
gcc-state_info.state = E_LAYOUT_ITEM_STATE_NONE;
@@ -1730,13 +1742,11 @@
}
static void
-_e_gadcon_cb_signal_move_go(void *data, Evas_Object *obj, const char
*emission, const char *source)
+_e_gadcon_client_move_go(E_Gadcon_Client *gcc)
{
- E_Gadcon_Client *gcc;
Evas_Coord x, y, w, h;
intcx, cy;
- gcc = data;
if (!gcc-moving) return;
evas_pointer_canvas_xy_get(gcc-gadcon-evas, cx, cy);
x = cx - gcc-dx;
@@ -1818,6 +1828,24 @@
}
static void
+_e_gadcon_cb_signal_move_start(void *data, Evas_Object *obj, const char
*emission, const char *source)
+{
+ _e_gadcon_client_move_start(data);
+}
+
+static void
