Enlightenment CVS committal
Author : atmosphere
Project : e17
Module : proto
Dir : e17/proto/esmart/test
Modified Files:
esmart_main.c
Log Message:
ran indent, removed some #if 0'd code
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/esmart/test/esmart_main.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- esmart_main.c 6 Jan 2004 18:17:05 -0000 1.8
+++ esmart_main.c 13 Jan 2004 18:08:10 -0000 1.9
@@ -25,196 +25,187 @@
static Ecore_Timer *refresh_timer = NULL;
static int
-fix_bg(void *data)
+fix_bg (void *data)
{
- int x, y, w, h;
- Ecore_Evas *ee = NULL;
- Evas_Object *o = NULL;
-
- if((ee = (Ecore_Evas*)data))
+ int x, y, w, h;
+ Ecore_Evas *ee = NULL;
+ Evas_Object *o = NULL;
+
+ if ((ee = (Ecore_Evas *) data))
{
- ecore_evas_geometry_get(ee, &x, &y, &w, &h);
- if((o = evas_object_name_find(ecore_evas_get(ee), "root_background")))
+ ecore_evas_geometry_get (ee, &x, &y, &w, &h);
+ if ((o =
+ evas_object_name_find (ecore_evas_get (ee), "root_background")))
{
- evas_object_resize(o, w, h);
- esmart_trans_x11_freshen(o, x, y, w, h);
+ evas_object_resize (o, w, h);
+ esmart_trans_x11_freshen (o, x, y, w, h);
}
}
- refresh_timer = NULL;
- return(0);
+ refresh_timer = NULL;
+ return (0);
}
static void
-window_del_cb(Ecore_Evas *ee)
+window_del_cb (Ecore_Evas * ee)
{
- ecore_main_loop_quit();
+ ecore_main_loop_quit ();
}
static void
-window_move_cb(Ecore_Evas *ee)
+window_move_cb (Ecore_Evas * ee)
{
- int x, y, w, h;
- Evas_Object *o = NULL;
+ Evas_Object *o = NULL;
- if(refresh_timer) ecore_timer_del(refresh_timer);
- refresh_timer = ecore_timer_add(MOVE_REFRESH, fix_bg, ee);
+ if (refresh_timer)
+ ecore_timer_del (refresh_timer);
+ refresh_timer = ecore_timer_add (MOVE_REFRESH, fix_bg, ee);
}
static void
-window_resize_cb(Ecore_Evas *ee)
+window_resize_cb (Ecore_Evas * ee)
{
- int x, y, w, h;
- Evas_Object *o = NULL;
-
- ecore_evas_geometry_get(ee, &x, &y, &w, &h);
- if(refresh_timer) ecore_timer_del(refresh_timer);
- refresh_timer = ecore_timer_add(RESIZE_REFRESH, fix_bg, ee);
+ int x, y, w, h;
+ Evas_Object *o = NULL;
- if((o = evas_object_name_find(ecore_evas_get(ee), "background")))
- {
- evas_object_resize(o, w, h);
- }
- if((o = evas_object_name_find(ecore_evas_get(ee), "container")))
- evas_object_resize(o, w, h);
- if((o = evas_object_name_find(ecore_evas_get(ee), "dragger")))
- evas_object_resize(o, w, h);
-#if 0
- if((o = evas_object_name_find(ecore_evas_get(ee), "resizer")))
+ ecore_evas_geometry_get (ee, &x, &y, &w, &h);
+ if (refresh_timer)
+ ecore_timer_del (refresh_timer);
+ refresh_timer = ecore_timer_add (RESIZE_REFRESH, fix_bg, ee);
+
+ if ((o = evas_object_name_find (ecore_evas_get (ee), "background")))
{
- evas_object_move(o, w - 20, h - 20);
+ evas_object_resize (o, w, h);
}
-#endif
+ if ((o = evas_object_name_find (ecore_evas_get (ee), "container")))
+ evas_object_resize (o, w, h);
+ if ((o = evas_object_name_find (ecore_evas_get (ee), "dragger")))
+ evas_object_resize (o, w, h);
}
static int
-exit_cb(void *ev, int ev_type, void *data)
+exit_cb (void *ev, int ev_type, void *data)
{
- ecore_main_loop_quit();
- return(0);
+ ecore_main_loop_quit ();
+ return (0);
}
static void
-bg_down_cb(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+bg_down_cb (void *data, Evas * evas, Evas_Object * obj, void *event_info)
{
Evas_Event_Mouse_Down *event = event_info;
Evas_Object *cont = data;
double x, w;
-
- evas_object_geometry_get(obj, &x, NULL, &w, NULL);
- if (event->canvas.x < x + w/2)
- e_container_scroll_start(cont, -1);
+
+ evas_object_geometry_get (obj, &x, NULL, &w, NULL);
+ if (event->canvas.x < x + w / 2)
+ e_container_scroll_start (cont, -1);
else
- e_container_scroll_start(cont, 1);
+ e_container_scroll_start (cont, 1);
}
static void
-bg_up_cb(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+bg_up_cb (void *data, Evas * evas, Evas_Object * obj, void *event_info)
{
Evas_Event_Mouse_Up *event = event_info;
Evas_Object *cont = data;
- printf("up!\n");
- e_container_scroll_stop(cont);
+ printf ("up!\n");
+ e_container_scroll_stop (cont);
}
int
-main(int argc, char *argv[])
+main (int argc, char *argv[])
{
- Evas *evas = NULL;
- Ecore_Evas *ee = NULL;
- Evas_Object *o = NULL;
- Evas_Object *cont = NULL;
- Evas_Object *image = NULL;
- int iw, ih;
+ Evas *evas = NULL;
+ Ecore_Evas *ee = NULL;
+ Evas_Object *o = NULL;
+ Evas_Object *cont = NULL;
+ Evas_Object *image = NULL;
+ int iw, ih;
- ecore_init();
- ecore_app_args_set(argc, (const char**)argv);
+ ecore_init ();
+ ecore_app_args_set (argc, (const char **) argv);
- ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, exit_cb, NULL);
+ ecore_event_handler_add (ECORE_EVENT_SIGNAL_EXIT, exit_cb, NULL);
- if(ecore_evas_init())
+ if (ecore_evas_init ())
{
- ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 300, 120);
- ecore_evas_title_set(ee, "Enlightenment Thumbnail Test");
- ecore_evas_callback_delete_request_set(ee, window_del_cb);
- ecore_evas_callback_resize_set(ee, window_resize_cb);
- ecore_evas_callback_move_set(ee, window_move_cb);
-
- evas = ecore_evas_get(ee);
- o = esmart_trans_x11_new(evas);
- evas_object_move(o, 0, 0);
- evas_object_resize(o, 300, 120);
- evas_object_layer_set(o, -5);
- evas_object_name_set(o, "root_background");
- evas_object_show(o);
-
- o = evas_object_rectangle_add(evas);
- evas_object_move(o, 0, 0);
- evas_object_resize(o, 300, 120);
- evas_object_layer_set(o, -6);
- evas_object_color_set(o, 255, 255, 255, 0);
- evas_object_name_set(o, "background");
- evas_object_show(o);
-
- o = esmart_draggies_new(ee);
- evas_object_move(o, 0, 0);
- evas_object_resize(o, 300, 120);
- evas_object_layer_set(o, -5);
- evas_object_color_set(o, 255, 255, 255, 0);
- evas_object_name_set(o, "dragger");
- esmart_draggies_button_set(o, 1);
- evas_object_show(o);
-
-#if 0
- o = esmart_draggies_new(ee);
- evas_object_move(o, 280, 100);
- evas_object_resize(o, 20, 20);
- evas_object_layer_set(o, -4);
- evas_object_color_set(o, 255, 255, 255, 128);
- evas_object_name_set(o, "resizer");
- esmart_draggies_type_set(o, DRAGGIES_TYPE_RESIZE_BR);
- esmart_draggies_button_set(o, 1);
- evas_object_show(o);
-#endif
-
- if (argc < 2) {
- image = evas_object_image_add(evas);
- evas_object_image_file_set(image, PACKAGE_DATA_DIR"/esmart.png", NULL);
- evas_object_image_size_get(image, &iw, &ih);
- evas_object_resize(image, iw, ih);
- evas_object_image_fill_set(image, 0.0, 0.0, (Evas_Coord) iw, (Evas_Coord) ih);
- evas_object_layer_set(image, 1000);
- evas_object_pass_events_set(image, 1);
- evas_object_show(image);
- }
-
-
- cont = e_container_new(evas);
- evas_object_move(cont, 0, 0);
- evas_object_resize(cont, 300, 120);
- evas_object_layer_set(cont, 0);
- evas_object_name_set(cont, "container");
- evas_object_show(cont);
- e_container_padding_set(cont, 10, 10, 10, 10);
- e_container_spacing_set(cont, 5);
- e_container_fill_policy_set(cont,
- CONTAINER_FILL_POLICY_FILL_Y |
- CONTAINER_FILL_POLICY_KEEP_ASPECT);
-
- evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, bg_down_cb, cont);
- evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, bg_up_cb, cont);
+ ee = ecore_evas_software_x11_new (NULL, 0, 0, 0, 300, 120);
+ ecore_evas_title_set (ee, "Enlightenment Thumbnail Test");
+ ecore_evas_callback_delete_request_set (ee, window_del_cb);
+ ecore_evas_callback_resize_set (ee, window_resize_cb);
+ ecore_evas_callback_move_set (ee, window_move_cb);
+
+ evas = ecore_evas_get (ee);
+ o = esmart_trans_x11_new (evas);
+ evas_object_move (o, 0, 0);
+ evas_object_resize (o, 300, 120);
+ evas_object_layer_set (o, -5);
+ evas_object_name_set (o, "root_background");
+ evas_object_show (o);
+
+ o = evas_object_rectangle_add (evas);
+ evas_object_move (o, 0, 0);
+ evas_object_resize (o, 300, 120);
+ evas_object_layer_set (o, -6);
+ evas_object_color_set (o, 255, 255, 255, 0);
+ evas_object_name_set (o, "background");
+ evas_object_show (o);
+
+ o = esmart_draggies_new (ee);
+ evas_object_move (o, 0, 0);
+ evas_object_resize (o, 300, 120);
+ evas_object_layer_set (o, 255);
+ evas_object_repeat_events_set(o, 1);
+ evas_object_color_set (o, 255, 255, 255, 0);
+ evas_object_name_set (o, "dragger");
+ esmart_draggies_button_set (o, 1);
+ evas_object_show (o);
+
+
+ if (argc < 2)
+ {
+ image = evas_object_image_add (evas);
+ evas_object_image_file_set (image, PACKAGE_DATA_DIR "/esmart.png",
+ NULL);
+ evas_object_image_size_get (image, &iw, &ih);
+ evas_object_resize (image, iw, ih);
+ evas_object_image_fill_set (image, 0.0, 0.0, (Evas_Coord) iw,
+ (Evas_Coord) ih);
+ evas_object_layer_set (image, 1000);
+ evas_object_pass_events_set (image, 1);
+ evas_object_show (image);
+ }
+
+
+ cont = e_container_new (evas);
+ evas_object_move (cont, 0, 0);
+ evas_object_resize (cont, 300, 120);
+ evas_object_layer_set (cont, 0);
+ evas_object_name_set (cont, "container");
+ evas_object_show (cont);
+ e_container_padding_set (cont, 10, 10, 10, 10);
+ e_container_spacing_set (cont, 5);
+ e_container_fill_policy_set (cont,
+ CONTAINER_FILL_POLICY_FILL_Y |
+ CONTAINER_FILL_POLICY_KEEP_ASPECT);
+
+ evas_object_event_callback_add (o, EVAS_CALLBACK_MOUSE_DOWN, bg_down_cb,
+ cont);
+ evas_object_event_callback_add (o, EVAS_CALLBACK_MOUSE_UP, bg_up_cb,
+ cont);
- while(--argc)
+ while (--argc)
{
- if((o = e_thumb_new(ecore_evas_get(ee), argv[argc])))
+ if ((o = e_thumb_new (ecore_evas_get (ee), argv[argc])))
{
- evas_object_layer_set(o, 2);
- evas_object_show(o);
- e_container_element_append(cont, o);
+ evas_object_layer_set (o, 2);
+ evas_object_show (o);
+ e_container_element_append (cont, o);
}
}
- ecore_evas_show(ee);
- ecore_main_loop_begin();
+ ecore_evas_show (ee);
+ ecore_main_loop_begin ();
}
- return(0);
+ return (0);
}
-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
