Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/entice
Dir : e17/apps/entice/src/bin
Modified Files:
buttons.c entice.h event.c fade.c fade.h globals.h handler.c
image.c list.c main.c misc.c panel.c
Log Message:
2nd path from daniel. more ecore SPLIT work..
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/buttons.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- buttons.c 9 Aug 2003 00:50:38 -0000 1.6
+++ buttons.c 11 Aug 2003 13:02:18 -0000 1.7
@@ -188,15 +188,20 @@
if (data) { // not called by timer
+ action = *(enum active_state *)data;
if (!timer) { // we are starting afresh
+ if ((buttons_active == active_force_in && action != active_force_out) ||
+ (buttons_active == active_force_out && action != active_force_in) ||
+ (buttons_active == active_in && action == active_in) ||
+ (buttons_active == active_out && action == active_out))
+ return 0;
start = get_time();
+ buttons_active = active_running;
} else { // there is a slide already going on
start = 2*get_time() - duration - start;
ecore_timer_del(timer);
}
timer = ecore_timer_add(delay, e_slide_buttons, NULL);
- action = *(enum active_state *)data;
- buttons_active = action;
return 1;
} else
val = (get_time() - start) / duration;
@@ -219,6 +224,7 @@
if (val < 0.99) // keep going
return 1;
else { // stick a fork in us, we're done
+ buttons_active = action;
timer = NULL;
return 0;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/entice.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- entice.h 9 Aug 2003 00:50:38 -0000 1.5
+++ entice.h 11 Aug 2003 13:02:18 -0000 1.6
@@ -54,7 +54,8 @@
active_out = 0,
active_in = 1,
active_force_out = 2,
- active_force_in = 3
+ active_force_in = 3,
+ active_running = 4
};
#include "buttons.h"
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/event.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- event.c 9 Aug 2003 00:50:38 -0000 1.15
+++ event.c 11 Aug 2003 13:02:18 -0000 1.16
@@ -58,7 +58,7 @@
2 + ((48 - w) / 2) + icon_x,
2 + ((48 + 2) * (i - 1)) +
((48 - h) / 2) + icon_y);
- evas_object_layer_set(im->o_thumb, 210);
+ evas_object_layer_set(im->o_thumb, 249);
evas_object_show(im->o_thumb);
im->subst = 0;
}
@@ -77,88 +77,6 @@
return 1;
}
-/* legacy code
-int
-e_window_damage(void* data, int ev_type, Ecore_Event * ev)
-{
- Ecore_X_Event_Window_Damage *e;
-
- e = (Ecore_X_Event_Window_Damage *) ev;
- if (e->win != ewin)
- return 1;
- evas_damage_rectangle_add(evas, e->x, e->y, e->w, e->h);
- return 1;
-}
-
-int
-e_mouse_move(void* data, int ev_type, Ecore_Event * ev)
-{
- Ecore_X_Event_Mouse_Move *e;
-
- e = (Ecore_X_Event_Mouse_Move *) ev;
- if (e->win != ewin)
- return 1;
- evas_event_feed_mouse_move(evas, e->x, e->y);
- return 1;
-}
-
-int
-e_mouse_down(void* data, int ev_type, Ecore_Event * ev)
-{
- Ecore_X_Event_Mouse_Button_Down *e;
-
- e = (Ecore_X_Event_Mouse_Button_Down *) ev;
- if (e->win != ewin)
- return 1;
- evas_event_feed_mouse_move(evas, e->x, e->y);
- evas_event_feed_mouse_down(evas, e->button);
- return 1;
-}
-
-int
-e_mouse_up(void* data, int ev_type, Ecore_Event * ev)
-{
- Ecore_X_Event_Mouse_Button_Up *e;
-
- e = (Ecore_X_Event_Mouse_Button_Up *) ev;
- if (e->win != ewin)
- return 1;
- evas_event_feed_mouse_move(evas, e->x, e->y);
- evas_event_feed_mouse_up(evas, e->button);
- return 1;
-}
-
-int
-e_window_configure(void* data, int ev_type, Ecore_Event * ev)
-{
- Ecore_X_Event_Window_Configure *e;
- enum active_state command;
-
- e = (Ecore_X_Event_Window_Configure *) ev;
- if (e->win == main_win)
- {
- win_w = e->w;
- win_h = e->h;
- if (e->from_wm)
- {
- win_x = e->x;
- win_y = e->y;
- }
- ecore_evas_resize(ecore_evas, win_w, win_h);
- evas_output_viewport_set(evas, 0, 0, win_w, win_h);
- evas_output_size_set(evas, win_w, win_h);
- e_handle_resize();
- if (panel_active == active_in) {
- command = active_out;
- e_slide_panel(&command);
- }
- if (buttons_active == active_in)
- command = active_out;
- e_slide_buttons(&command);
- }
- return 1;
-}
-*/
void
e_window_resize(Ecore_Evas *ee)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/fade.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- fade.c 9 Aug 2003 00:50:38 -0000 1.5
+++ fade.c 11 Aug 2003 13:02:18 -0000 1.6
@@ -111,9 +111,51 @@
}
int
+e_fade_scroller(void * data)
+{
+ static double start = 0.0;
+ double duration = 0.5; // soon-to-be-configurable time taken to slide
+ double val = 0.0;
+ double delay = 0.05; // soon-to-be-configurable time between frames
+ static enum active_state action;
+ static Ecore_Timer *timer = NULL;
+
+ if (!o_mini_image)
+ return 0;
+ if (data) { // not called by timer
+ if (!timer) { // we are starting afresh
+ start = get_time();
+ } else { // there is a fade already going on
+ start = 2*get_time() - duration - start;
+ ecore_timer_del(timer);
+ }
+ timer = ecore_timer_add(delay, e_fade_scroller, NULL);
+ action = *(enum active_state *)data;
+ buttons_active = action;
+ return 1;
+ } else
+ val = (get_time() - start) / duration;
+ if (val > 1.0) val = 1.0;
+ if (action == active_in) {
+ evas_object_color_set(o_mini_image, 255, 255, 255, (val * 255));
+ evas_object_color_set(o_mini_select, 255, 255, 255, (val * 255));
+ } else {
+ evas_object_color_set(o_mini_image, 255, 255, 255, ((1.0 - val) * 255));
+ evas_object_color_set(o_mini_select, 255, 255, 255, ((1.0 - val) * 255));
+ }
+
+ if (val < 0.99) // keep going
+ return 1;
+ else { // stick a fork in us, we're done
+ timer = NULL;
+ return 0;
+ }
+}
+/*
+int
e_fade_scroller_in(void *data)
{
- /* int i; */
+ * int i; *
static int v = 0;
static double start = 0.0;
double duration = 0.5;
@@ -145,7 +187,7 @@
int
e_fade_scroller_out(void *data)
{
- /* int i; */
+ * int i; *
static int v = 0;
static double start = 0.0;
double duration = 2.0;
@@ -170,6 +212,21 @@
v = 0;
return 0;
}
+}
+*/
+
+int
+e_fade_scroller_in(void *data) {
+ enum active_state command = active_in;
+ e_fade_scroller(&command);
+ return 1;
+}
+
+int
+e_fade_scroller_out(void *data) {
+ enum active_state command = active_out;
+ e_fade_scroller(&command);
+ return 1;
}
int
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/fade.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- fade.h 9 Aug 2003 00:50:38 -0000 1.4
+++ fade.h 11 Aug 2003 13:02:18 -0000 1.5
@@ -4,6 +4,7 @@
int e_fade_info_in(void *data);
int e_fade_info_out(void *data);
+int e_fade_scroller(void *data);
int e_fade_scroller_in(void *data);
int e_fade_scroller_out(void *data);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/globals.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- globals.h 9 Aug 2003 00:50:38 -0000 1.7
+++ globals.h 11 Aug 2003 13:02:18 -0000 1.8
@@ -48,8 +48,6 @@
extern int win_h;
extern int win_x;
extern int win_y;
-extern Ecore_X_Window main_win;
-extern Ecore_X_Window ewin;
extern int icon_x;
extern int icon_y;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/handler.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- handler.c 9 Aug 2003 00:50:38 -0000 1.6
+++ handler.c 11 Aug 2003 13:02:18 -0000 1.7
@@ -77,7 +77,6 @@
evas_object_move(o_bt_close, win_w + 256, 0);
}
evas_object_move(o_showbuttons, win_w - 288, 0);
- evas_object_resize(o_showbuttons, 288, 32);
evas_object_layer_set(o_showbuttons, 1500);
evas_object_repeat_events_set(o_showbuttons, 1);
evas_object_layer_set(o_bt_close, 1300);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/image.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- image.c 9 Aug 2003 00:50:38 -0000 1.14
+++ image.c 11 Aug 2003 13:02:18 -0000 1.15
@@ -166,7 +166,7 @@
evas_object_move(im->o_thumb, 2, 2 + ((48 + 2) * (i - 1)));
evas_object_resize(im->o_thumb, 48, 48);
evas_object_image_fill_set(im->o_thumb, 0, 0, 48, 48);
- evas_object_layer_set(im->o_thumb, 210);
+ evas_object_layer_set(im->o_thumb, 249);
evas_object_show(im->o_thumb);
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/list.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- list.c 9 Aug 2003 00:50:38 -0000 1.4
+++ list.c 11 Aug 2003 13:02:18 -0000 1.5
@@ -18,10 +18,13 @@
icon_y -= (d / 4);
e_fix_icons();
if (dd > 3) {
- if (v == 0)
+ if (v == 0) {
ecore_timer_add(0.05, e_scroll_list, data);
+ v++;
+ }
return 1;
}
+ v=0;
return 0;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/main.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- main.c 9 Aug 2003 00:50:38 -0000 1.7
+++ main.c 11 Aug 2003 13:02:18 -0000 1.8
@@ -45,8 +45,6 @@
int smoothness = 1;
int win_w = W, win_h = H;
int win_x = 0, win_y = 0;
-Ecore_X_Window main_win;
-Ecore_X_Window ewin;
int icon_x = 0;
int icon_y = 0;
@@ -190,17 +188,13 @@
smoothness = atoi(entice_smooth);
}
/* image list parsing */
- if (!(argc - 1))
+ if (argc == 1)
{
+ /* to be honest, I don't like this behaviour
char *homedir;
- /* CS */
- printf("CS\n");
-
homedir = getenv("HOME");
- /* homedir="/home/omarhawk/tmp/pics"; */
- /* CS */
printf("%s\n", homedir);
if (homedir == NULL)
@@ -210,6 +204,22 @@
}
image_create_list_dir(homedir);
+ */
+ char* dir;
+ /* portability nightmare: this goes in configure. If you don't
+ * like it like this, put it there yourself and send me a patch.
+ */
+#ifdef _GNU_SOURCE
+ dir = get_current_dir_name();
+#else
+ dir = getcwd(NULL, 0);
+#endif
+ if (!dir) {
+ fprintf(stderr, "No file name passed on command line and unable to get the
current directory. Exiting.");
+ return EXIT_FAILURE;
+ }
+ image_create_list_dir(dir);
+
}
else
image_create_list(argc, argv);
@@ -236,6 +246,11 @@
exit(-1);
}
+ /* initialise Ecore */
+ if (!ecore_init()) {
+ printf("Maximal evil: unable to init Ecore!\n");
+ return -1;
+ }
/* find if another entice is running... if it is .. message it. */
//find_current(); // XXX
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/misc.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- misc.c 9 Aug 2003 00:50:38 -0000 1.10
+++ misc.c 11 Aug 2003 13:02:18 -0000 1.11
@@ -32,35 +32,17 @@
Ecore_X_Atom a_entice;
char string[] = "entice";
- /* setup callbacks for events legacy code *
- ecore_event_handler_add(ECORE_X_EVENT_WINDOW_DAMAGE, e_window_damage, NULL);
- ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE, e_mouse_move, NULL);
- ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_DOWN, e_mouse_down, NULL);
- ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_UP, e_mouse_up, NULL);
- ecore_event_handler_add(ECORE_X_EVENT_WINDOW_CONFIGURE,
- e_window_configure, NULL);
- ecore_event_handler_add(ECORE_X_EVENT_KEY_DOWN, e_key_down, NULL);
- ecore_event_handler_add(ECORE_X_EVENT_KEY_UP, e_key_up, NULL);
- */
-/* ecore_event_handler_add(ECORE_X_EVENT_WINDOW_PROPERTY, e_property, NULL);
-
- ecore_event_handler_add(ECORE_X_EVENT_DND_DROP, e_dnd_drop, NULL);
- ecore_event_handler_add(ECORE_X_EVENT_DND_DROP_REQUEST,
- e_dnd_drop_request, NULL);
- */
/* handler for when the event queue goes idle */
ecore_idler_add(e_idle, NULL);
/* create a 400x300 toplevel window */
ecore_evas = ecore_evas_software_x11_new(NULL, 0, 0, 0, win_w, win_h);
ecore_evas_callback_resize_set(ecore_evas, e_window_resize);
// main_win = ecore_evas_software_x11_window_get(ecore_evas);
- // ecore_window_set_events(win, XEV_CONFIGURE | XEV_PROPERTY | XEV_KEY);
ecore_evas_name_class_set(ecore_evas, "Entice", "Main");
ecore_evas_size_min_set(ecore_evas, 256, 128);
ecore_evas_size_max_set(ecore_evas, 8000, 8000);
a_entice = ecore_x_atom_get("_ENTICE_APP_WINDOW");
ecore_evas_title_set(ecore_evas, string);
- /*ecore_window_dnd_advertise(main_win); XXX */
evas = ecore_evas_get(ecore_evas);
evas_output_method_set(evas, render_method);
evas_output_size_set(evas, win_w, win_h);
@@ -68,6 +50,7 @@
evas_font_path_append(evas, FONT_DIRECTORY);
evas_font_cache_set(evas, MAX_FONT_CACHE);
evas_image_cache_set(evas, MAX_IMAGE_CACHE);
+ ecore_evas_show(ecore_evas);
/*
{
Evas_Engine_Info_Software_X11 *einfo;
@@ -90,7 +73,6 @@
evas_engine_info_set(evas, (Evas_Engine_Info *) einfo);
}
*/
- ecore_evas_show(ecore_evas);
/* now... create objects in the evas */
o_bg = e_newim(evas, IM "bg.png");
@@ -123,10 +105,10 @@
evas_object_color_set(o_trash_can, 255, 255, 255, 0);
evas_object_color_set(o_logo, 255, 255, 255, 0);
- evas_object_color_set(o_showpanel, 0, 0, 0, 0);
- evas_object_color_set(o_hidepanel, 0, 0, 0, 0);
- evas_object_color_set(o_showbuttons, 0, 0, 0, 0);
- evas_object_pass_events_set(o_panel, 1);
+ evas_object_color_set(o_showpanel, 0, 0, 255, 0);
+ evas_object_color_set(o_hidepanel, 0, 255, 0, 0);
+ evas_object_color_set(o_showbuttons, 255, 0, 0, 0);
+ // evas_object_pass_events_set(o_panel, 1);
for (j = 0; j < 2; j++)
{
for (i = 0; i < 5; i++)
@@ -150,6 +132,7 @@
evas_object_show(o_panel);
evas_object_show(o_showpanel);
evas_object_show(o_hidepanel);
+ evas_object_resize(o_showbuttons, 288, 32);
evas_object_show(o_showbuttons);
evas_object_show(o_panel_arrow_u);
@@ -167,8 +150,13 @@
evas_object_show(o_trash);
- //e_slide_panel_out(NULL);
- //e_slide_buttons_out(NULL);
+ {
+ enum active_state command = active_out;
+ panel_active = active_in;
+ buttons_active = active_in;
+ e_slide_panel(&command);
+ e_slide_buttons(&command);
+ }
evas_object_event_callback_add(o_showpanel, EVAS_CALLBACK_MOUSE_IN,
show_panel, NULL);
@@ -491,7 +479,6 @@
double w, h;
evas_object_geometry_get(o_image, NULL, NULL, &w, &h);
- //ecore_x_window_resize(main_win, w, h);
ecore_evas_resize(ecore_evas, w, h);
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/panel.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- panel.c 9 Aug 2003 00:50:38 -0000 1.4
+++ panel.c 11 Aug 2003 13:02:18 -0000 1.5
@@ -15,14 +15,19 @@
if (data) { // not called by timer
+ action = *(enum active_state *)data;
if (!timer) { // we are starting afresh
+ if ((panel_active == active_force_in && action != active_force_out) ||
+ (panel_active == active_force_out && action != active_force_in) ||
+ (panel_active == active_in && action == active_in) ||
+ (panel_active == active_out && action == active_out))
+ return 0;
start = get_time();
+ panel_active = active_running;
} else { // there is a slide already going on
start = 2*get_time() - duration - start;
ecore_timer_del(timer);
}
- action = *(enum active_state *)data;
- panel_active = action;
timer = ecore_timer_add(delay, e_slide_panel, NULL);
return 1;
} else
@@ -46,6 +51,7 @@
if (val < 0.99) // keep going
return 1;
else { // stick a fork in us, we're done
+ panel_active = action;
timer = NULL;
return 0;
}
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
