Enlightenment CVS committal

Author  : raster
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        Makefile.am e.h e_config.c e_config.h e_desk.c e_includes.h 
        e_main.c e_theme.c e_zone.c e_zone.h 
Added Files:
        e_bg.c e_bg.h 


Log Message:


bg now allows transitions when changing the bg. also a first step to allow
different bg's per desk - not implemented yet tho, but some infrastructure
for it

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- Makefile.am 20 Jun 2005 08:56:54 -0000      1.36
+++ Makefile.am 29 Jun 2005 14:28:45 -0000      1.37
@@ -62,7 +62,8 @@
 e_winlist.h \
 e_alert.h \
 e_maximize.h \
-e_grabinput.h
+e_grabinput.h \
+e_bg.h
 
 enlightenment_SOURCES = \
 e_main.c \
@@ -115,6 +116,7 @@
 e_alert.c \
 e_maximize.c \
 e_grabinput.c \
+e_bg.c \
 $(ENLIGHTENMENTHEADERS)
 
 enlightenment_LDFLAGS = -export-dynamic @e_libs@ @x_libs@ @dlopen_libs@
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- e.h 19 Jun 2005 12:35:05 -0000      1.23
+++ e.h 29 Jun 2005 14:28:45 -0000      1.24
@@ -15,6 +15,7 @@
 #include <sys/time.h>
 #include <sys/param.h>
 #include <dlfcn.h>
+#include <math.h>
 
 #include <Evas.h>
 #include <Ecore.h>
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -3 -r1.67 -r1.68
--- e_config.c  29 Jun 2005 08:49:54 -0000      1.67
+++ e_config.c  29 Jun 2005 14:28:45 -0000      1.68
@@ -175,6 +175,12 @@
    E_CONFIG_VAL(D, T, kill_timer_wait, DOUBLE);
    E_CONFIG_VAL(D, T, ping_clients, INT);
    E_CONFIG_VAL(D, T, ping_clients_wait, DOUBLE);
+   E_CONFIG_VAL(D, T, desktop_bg_start_transition, INT);
+   E_CONFIG_VAL(D, T, desktop_bg_start_transition_time, DOUBLE);
+   E_CONFIG_VAL(D, T, desktop_bg_desk_transition, INT);
+   E_CONFIG_VAL(D, T, desktop_bg_desk_transition_time, DOUBLE);
+   E_CONFIG_VAL(D, T, desktop_bg_change_transition, INT);
+   E_CONFIG_VAL(D, T, desktop_bg_change_transition_time, DOUBLE);
    
    e_config = e_config_domain_load("e", _e_config_edd);
    if (e_config)
@@ -213,7 +219,7 @@
        e_config = E_NEW(E_Config, 1);
        e_config->config_version = E_CONFIG_FILE_VERSION;
        e_config->show_splash = 1;
-       e_config->desktop_default_background = 
strdup(PACKAGE_DATA_DIR"/data/themes/default.edj");
+       e_config->desktop_default_background = strdup("");
        e_config->menus_scroll_speed = 1000.0;
        e_config->menus_fast_mouse_move_threshhold = 300.0;
        e_config->menus_click_drag_timeout = DEF_MENUCLICK;
@@ -272,6 +278,12 @@
        e_config->kill_timer_wait = 10.0;
        e_config->ping_clients = 1;
        e_config->ping_clients_wait = 10.0;
+       e_config->desktop_bg_start_transition = E_BG_TRANSITION_MODE_NONE;
+       e_config->desktop_bg_start_transition_time = 1.0;
+       e_config->desktop_bg_desk_transition = 
E_BG_TRANSITION_MODE_SINUSOUDAL_FADE;
+       e_config->desktop_bg_desk_transition_time = 0.5;
+       e_config->desktop_bg_change_transition = 
E_BG_TRANSITION_MODE_SINUSOUDAL_FADE;
+       e_config->desktop_bg_change_transition_time = 1.0;
        
          {
             E_Config_Module *em;
@@ -802,6 +814,12 @@
    E_CONFIG_LIMIT(e_config->kill_timer_wait, 0.0, 120.0);
    E_CONFIG_LIMIT(e_config->ping_clients, 0, 1);
    E_CONFIG_LIMIT(e_config->ping_clients_wait, 0.0, 120.0);
+   E_CONFIG_LIMIT(e_config->desktop_bg_start_transition, 
E_BG_TRANSITION_MODE_NONE, E_BG_TRANSITION_MODE_LAST);
+   E_CONFIG_LIMIT(e_config->desktop_bg_start_transition_time, 0.01, 60.0);
+   E_CONFIG_LIMIT(e_config->desktop_bg_desk_transition, 
E_BG_TRANSITION_MODE_NONE, E_BG_TRANSITION_MODE_LAST);
+   E_CONFIG_LIMIT(e_config->desktop_bg_desk_transition_time, 0.01, 60.0);
+   E_CONFIG_LIMIT(e_config->desktop_bg_change_transition, 
E_BG_TRANSITION_MODE_NONE, E_BG_TRANSITION_MODE_LAST);
+   E_CONFIG_LIMIT(e_config->desktop_bg_change_transition_time, 0.01, 60.0);
 
    /* apply lang config - exception because config is loaded after intl setup 
*/
    
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- e_config.h  29 Jun 2005 08:49:54 -0000      1.34
+++ e_config.h  29 Jun 2005 14:28:46 -0000      1.35
@@ -46,7 +46,7 @@
  * defaults for e to work - started at 100 when we introduced this config
  * versioning feature
  */
-#define E_CONFIG_FILE_VERSION 115
+#define E_CONFIG_FILE_VERSION 116
 
 #define E_EVAS_ENGINE_DEFAULT      0
 #define E_EVAS_ENGINE_SOFTWARE_X11 1
@@ -129,9 +129,14 @@
    double      kill_timer_wait;
    int         ping_clients;
    double      ping_clients_wait;
+   int         desktop_bg_start_transition;
+   double      desktop_bg_start_transition_time;
+   int         desktop_bg_desk_transition;
+   double      desktop_bg_desk_transition_time;
+   int         desktop_bg_change_transition;
+   double      desktop_bg_change_transition_time;
 };
 
-/* FIXME: all of thsie needs to become eet lumps for enmcode/decode */
 struct _E_Config_Module
 {
    char          *name;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_desk.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- e_desk.c    24 Jun 2005 08:20:26 -0000      1.37
+++ e_desk.c    29 Jun 2005 14:28:46 -0000      1.38
@@ -71,7 +71,7 @@
 e_desk_show(E_Desk *desk)
 {
    E_Border_List     *bl;
-   int                x, y;
+   int                x, y, was_zone = 0;
    E_Event_Desk_Show *ev;
    E_Border *bd;
 
@@ -80,6 +80,7 @@
    if (desk->visible) return;
    
    bl = e_container_border_list_first(desk->zone->container);
+   if (desk->zone->bg_object) was_zone = 1;
    while ((bd = e_container_border_list_next(bl)))
      {
        if ((bd->desk->zone == desk->zone) && (!bd->iconic))
@@ -114,10 +115,16 @@
      evas_object_show(desk->bg_black_object);
    desk->visible = 1;
 
+   if (was_zone)
+     e_bg_zone_update(desk->zone, E_BG_TRANSITION_CHANGE);
+   else
+     e_bg_zone_update(desk->zone, E_BG_TRANSITION_START);
+   
    ev = E_NEW(E_Event_Desk_Show, 1);
    ev->desk = desk;
    e_object_ref(E_OBJECT(desk));
    ecore_event_add(E_EVENT_DESK_SHOW, ev, _e_border_event_desk_show_free, 
NULL);
+   
 }
 
 void
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- e_includes.h        20 Jun 2005 08:56:54 -0000      1.25
+++ e_includes.h        29 Jun 2005 14:28:46 -0000      1.26
@@ -50,3 +50,4 @@
 #include "e_alert.h"
 #include "e_maximize.h"
 #include "e_grabinput.h"
+#include "e_bg.h"
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -3 -r1.105 -r1.106
--- e_main.c    26 Jun 2005 04:41:29 -0000      1.105
+++ e_main.c    29 Jun 2005 14:28:46 -0000      1.106
@@ -379,6 +379,13 @@
        _e_main_shutdown(-1);
      }
    _e_main_shutdown_push(e_app_shutdown);
+   /* init theme system */
+   if (!e_theme_init())
+     {
+       e_error_message_show(_("Enlightenment cannot set up its theme 
system."));
+       _e_main_shutdown(-1);
+     }
+   _e_main_shutdown_push(e_theme_shutdown);
    /* manage the root window */
    if (!_e_main_screens_init())
      {
@@ -390,13 +397,6 @@
    e_container_all_freeze();
    
    _e_main_shutdown_push(_e_main_screens_shutdown);
-   /* init theme system */
-   if (!e_theme_init())
-     {
-       e_error_message_show(_("Enlightenment cannot set up its theme 
system."));
-       _e_main_shutdown(-1);
-     }
-   _e_main_shutdown_push(e_theme_shutdown);
 
    
    /* tell the error system that it can use gui dialogs now */
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_theme.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_theme.c   25 May 2005 08:08:44 -0000      1.9
+++ e_theme.c   29 Jun 2005 14:28:47 -0000      1.10
@@ -49,6 +49,7 @@
  * 
  * other possible categories...
  *  e_theme_file_set("base/theme/borders", "default.edj");
+ *  e_theme_file_set("base/theme/background", "default.edj");
  *  e_theme_file_set("base/theme/menus", "default.edj");
  *  e_theme_file_set("base/theme/error", "default.edj");
  *  e_theme_file_set("base/theme/gadman", "default.edj");
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_zone.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- e_zone.c    28 Jun 2005 04:00:17 -0000      1.59
+++ e_zone.c    29 Jun 2005 14:28:47 -0000      1.60
@@ -47,6 +47,7 @@
 {
    E_Zone *zone;
    char    name[40];
+   Evas_Object *o;
 
    zone = E_OBJECT_ALLOC(E_Zone, E_ZONE_TYPE, _e_zone_free);
    if (!zone) return NULL;
@@ -80,44 +81,24 @@
 
    con->zones = evas_list_append(con->zones, zone);
    
-   if (1)
-     {
-       char name[40];
-       Evas_Object *o;
+   o = evas_object_rectangle_add(con->bg_evas);
+   zone->bg_clip_object = o;
+   evas_object_move(o, x, y);
+   evas_object_resize(o, w, h);
+   evas_object_color_set(o, 255, 255, 255, 255);
+   evas_object_repeat_events_set(o, 1);
+   evas_object_show(o);
 
-       o = evas_object_rectangle_add(con->bg_evas);
-       zone->bg_clip_object = o;
-       evas_object_move(o, x, y);
-       evas_object_resize(o, w, h);
-       evas_object_color_set(o, 255, 255, 255, 255);
-       evas_object_repeat_events_set(o, 1);
-       evas_object_show(o);
-       
-       o = edje_object_add(con->bg_evas);
-       zone->bg_object = o;
-       evas_object_layer_set(o, -1);
-       snprintf(name, sizeof(name), "desktop/background/%d", zone->num);
-       evas_object_name_set(o, name);
-       evas_object_data_set(o, "e_zone", zone);
-       evas_object_move(o, x, y);
-       evas_object_resize(o, w, h);
-       edje_object_file_set(o,
-                            e_config->desktop_default_background,
-                            "desktop/background");
-       evas_object_clip_set(o, zone->bg_clip_object);
-       evas_object_show(o);
-
-       o = evas_object_rectangle_add(con->bg_evas);
-       zone->bg_event_object = o;
-       evas_object_clip_set(o, zone->bg_clip_object);
-       evas_object_move(o, x, y);
-       evas_object_resize(o, w, h);
-       evas_object_color_set(o, 255, 255, 255, 0);
-       evas_object_show(o);
-       evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, 
_e_zone_cb_bg_mouse_down, zone);
-       evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP,   
_e_zone_cb_bg_mouse_up, zone);
-       evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_MOVE, 
_e_zone_cb_bg_mouse_move, zone);
-     }
+   o = evas_object_rectangle_add(con->bg_evas);
+   zone->bg_event_object = o;
+   evas_object_clip_set(o, zone->bg_clip_object);
+   evas_object_move(o, x, y);
+   evas_object_resize(o, w, h);
+   evas_object_color_set(o, 255, 255, 255, 0);
+   evas_object_show(o);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, 
_e_zone_cb_bg_mouse_down, zone);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP,   
_e_zone_cb_bg_mouse_up, zone);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_MOVE, 
_e_zone_cb_bg_mouse_move, zone);
 
    zone->desk_x_count = 0;
    zone->desk_y_count = 0;
@@ -239,17 +220,9 @@
 void
 e_zone_bg_reconfigure(E_Zone *zone)
 {
-   Evas_Object *o;
-   
    E_OBJECT_CHECK(zone);
    E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
-   o = zone->bg_object;
-   evas_object_hide(o);
-   edje_object_file_set(o,
-                       e_config->desktop_default_background,
-                       "desktop/background");
-   evas_object_layer_set(o, -1);
-   evas_object_show(o);
+   e_bg_zone_update(zone, E_BG_TRANSITION_CHANGE);
 }
 
 void
@@ -569,6 +542,8 @@
    evas_object_del(zone->bg_event_object);
    evas_object_del(zone->bg_clip_object);
    evas_object_del(zone->bg_object);
+   if (zone->prev_bg_object) evas_object_del(zone->prev_bg_object);
+   if (zone->bg_animator) ecore_animator_del(zone->bg_animator);
    /* free desks */
    for (x = 0; x < zone->desk_x_count; x++)
      {
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_zone.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- e_zone.h    8 Jun 2005 14:06:28 -0000       1.26
+++ e_zone.h    29 Jun 2005 14:28:47 -0000      1.27
@@ -28,6 +28,11 @@
    Evas_Object         *bg_object;
    Evas_Object         *bg_event_object;
    Evas_Object         *bg_clip_object;
+   Evas_Object         *prev_bg_object;
+   Ecore_Animator      *bg_animator;
+   double               bg_set_time;
+   double               bg_transition_time;
+   E_Bg_Transition_Mode bg_transition_mode;
    
    int                  desk_x_count, desk_y_count;
    int                  desk_x_current, desk_y_current;




-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to