From: <enl...@li...> - 2004-02-06 07:11:08
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/elicit Dir : e17/apps/elicit/data/src/macros Removed Files: Makefile.am button.inc color.inc Log Message: EMPTY |
From: <enl...@li...> - 2004-02-06 07:11:08
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/elicit Dir : e17/apps/elicit/data/src/fonts Removed Files: Makefile.am Vera.ttf Log Message: EMPTY |
From: <enl...@li...> - 2004-02-06 07:13:02
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/elicit Dir : e17/apps/elicit/data/font Removed Files: Vera.ttf Log Message: more EMPTY |
From: <enl...@li...> - 2004-02-06 07:13:02
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/elicit Dir : e17/apps/elicit/data/themes Removed Files: elicit.eet original.eet winter.eet Log Message: more EMPTY |
From: <enl...@li...> - 2004-02-06 07:15:35
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/elicit Dir : e17/apps/elicit Removed Files: Makefile Log Message: ok. that should be about it |
From: <enl...@li...> - 2004-02-06 07:15:35
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/elicit Dir : e17/apps/elicit/src Removed Files: build elicit.h Log Message: ok. that should be about it |
From: <enl...@li...> - 2004-02-06 07:25:00
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/elicit Dir : e17/apps/elicit/src Modified Files: callbacks.c util.c Log Message: quite down the jabbering =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/callbacks.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- callbacks.c 6 Feb 2004 06:32:58 -0000 1.1 +++ callbacks.c 6 Feb 2004 07:22:14 -0000 1.2 @@ -35,7 +35,6 @@ if (!strcmp(sig, "elicit,pick,start")) { - printf("pick!\n"); el->flags.picking = 1; } else if (!strcmp(sig, "elicit,pick,stop")) @@ -64,7 +63,6 @@ if (!strcmp(sig, "elicit,shoot,start")) { - printf("shoot!\n"); el->flags.shooting = 1; } else if (!strcmp(sig, "elicit,shoot,stop")) @@ -79,10 +77,8 @@ double x, y, w, h; evas_object_geometry_get(el->shot, NULL, NULL, &sw, &sh); - printf("sw/h: %.2f, %.2f\n", sw, sh); w = sw * (1 / el->zoom); h = sh * (1 / el->zoom); - printf("w/h: %.2f, %.2f\n", w, h); elicit_action_shoot(el->shot, (int)w, (int)h); } } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/util.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- util.c 6 Feb 2004 06:32:58 -0000 1.1 +++ util.c 6 Feb 2004 07:22:14 -0000 1.2 @@ -26,7 +26,6 @@ imlib_context_set_image(im); imlib_image_query_pixel(0, 0, &col); - //printf("(%d, %d, %d)\n", col.red, col.green, col.blue); //evas_object_color_set(swatch.obj, col.red, col.green, col.blue, 255); /* set the color values */ if (r) *r = col.red; @@ -57,7 +56,6 @@ XQueryPointer(ecore_x_display_get(), RootWindow(ecore_x_display_get(),0), &tr, &tr, &tr, &tr, &px, &py, &tr); - printf("shooting (%d x %d)!\n", w, h); x = px - .5 * w; y = py - .5 * h; @@ -145,7 +143,6 @@ if (ss) *ss = s; if (vv) *vv = v; - //printf("%i %i %i %f %f %f\n", r, g, b, hue, saturation, value); } void |
From: <enl...@li...> - 2004-02-06 07:25:00
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/elicit Dir : e17/apps/elicit Removed Files: config.h Log Message: quite down the jabbering |
From: <enl...@li...> - 2004-02-06 19:16:27
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/elicit Dir : e17/apps/elicit/src Modified Files: Elicit.h Makefile.am config.h.in elicit.c util.c Log Message: The start of some conf stuff using ecore_config. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/Elicit.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Elicit.h 6 Feb 2004 06:38:00 -0000 1.2 +++ Elicit.h 6 Feb 2004 19:13:32 -0000 1.3 @@ -1,18 +1,28 @@ +#ifndef ELICIT_H +#define ELICIT_H + #include <Evas.h> #include <Ecore.h> #include <Ecore_X.h> #include <Ecore_Evas.h> +#include <Ecore_Config.h> #include <Edje.h> #include <X11/Xlib.h> #include <Imlib2.h> +#include <stdlib.h> +#include <stdio.h> +#include <limits.h> +#include <sys/stat.h> #include "config.h" -#define DATADIR PACKAGE_DATA_DIR +#define DATADIR PACKAGE_DATA_DIR"/data" + +typedef struct _Elicit Elicit; #include "callbacks.h" #include "util.h" +#include "conf.h" -typedef struct _Elicit Elicit; struct _Elicit { @@ -42,4 +52,5 @@ }; +#endif =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 6 Feb 2004 06:32:58 -0000 1.1 +++ Makefile.am 6 Feb 2004 19:13:32 -0000 1.2 @@ -8,7 +8,8 @@ elicit_SOURCES = \ elicit.c Elicit.h \ callbacks.c callbacks.h \ - util.c util.h + util.c util.h \ + conf.c conf.h elicit_LDADD = @edje_libs@ @ecore_libs@ @edb_libs@ @evas_libs@ \ @esmart_libs@ =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/config.h.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- config.h.in 6 Feb 2004 06:32:58 -0000 1.1 +++ config.h.in 6 Feb 2004 19:13:32 -0000 1.2 @@ -1,56 +1,76 @@ -/* src/config.h.in. Generated automatically from configure.in by autoheader. */ +/* src/config.h.in. Generated from configure.in by autoheader. */ -/* Define to empty if the keyword does not work. */ -#undef const +/* Define to 1 if you have the <dlfcn.h> header file. */ +#undef HAVE_DLFCN_H -/* Define if you have the ANSI C header files. */ -#undef STDC_HEADERS +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H -/* Define if you have the <dlfcn.h> header file. */ -#undef HAVE_DLFCN_H +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H -/* Name of package */ -#undef PACKAGE +/* Define to 1 if you have the <stdint.h> header file. */ +#undef HAVE_STDINT_H -/* Version number of package */ -#undef VERSION +/* Define to 1 if you have the <stdlib.h> header file. */ +#undef HAVE_STDLIB_H -/* Define if using the dmalloc debugging malloc package */ -#undef WITH_DMALLOC +/* Define to 1 if you have the <strings.h> header file. */ +#undef HAVE_STRINGS_H -/* Locale-specific data directory */ -#undef PACKAGE_LOCALE_DIR +/* Define to 1 if you have the <string.h> header file. */ +#undef HAVE_STRING_H -/* Locale-specific data directory */ -#undef PACKAGE_LOCALE_DIR +/* Define to 1 if you have the <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H -/* Shared data directory */ -#undef PACKAGE_DATA_DIR +/* Define to 1 if you have the <sys/types.h> header file. */ +#undef HAVE_SYS_TYPES_H -/* Shared data directory */ -#undef PACKAGE_DATA_DIR +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H -/* Shared data directory */ -#undef PACKAGE_DATA_DIR +/* Name of package */ +#undef PACKAGE /* Installation directory for user executables */ #undef PACKAGE_BIN_DIR -/* Installation directory for user executables */ -#undef PACKAGE_BIN_DIR +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT -/* Installation directory for user executables */ -#undef PACKAGE_BIN_DIR +/* Shared data directory */ +#undef PACKAGE_DATA_DIR /* Installation directory for libraries */ #undef PACKAGE_LIB_DIR -/* Installation directory for libraries */ -#undef PACKAGE_LIB_DIR +/* Locale-specific data directory */ +#undef PACKAGE_LOCALE_DIR -/* Installation directory for libraries */ -#undef PACKAGE_LIB_DIR +/* Define to the full name of this package. */ +#undef PACKAGE_NAME /* Source code directory */ #undef PACKAGE_SOURCE_DIR +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Version number of package */ +#undef VERSION + +/* Define if using the dmalloc debugging malloc package */ +#undef WITH_DMALLOC + +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/elicit.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- elicit.c 6 Feb 2004 06:32:58 -0000 1.4 +++ elicit.c 6 Feb 2004 19:13:32 -0000 1.5 @@ -6,6 +6,7 @@ void pick_color(); void shoot(); void elicit_ui_update_text(Elicit *el); +void elicit_ui_theme_set(Elicit *el, char *name); int timer_color(void *data); /* variables */ @@ -72,6 +73,7 @@ ecore_main_loop_begin(); /* shutdown the subsystems (when event loop exits, app is done) */ + elicit_config_shutdown(el); ecore_evas_shutdown(); ecore_shutdown(); edje_shutdown(); @@ -89,26 +91,16 @@ Evas_Object *o; double mw, mh; + elicit_config_init(el); + ecore_evas_borderless_set(el->ee, 1); ecore_evas_shaped_set(el->ee, 1); el->gui = edje_object_add(el->evas); - if (!edje_object_file_set(el->gui, DATADIR"/themes/winter.eet", "elicit")) - { - fprintf(stderr, "can't load theme eet: %s, %s\n", DATADIR"/themes/elicit.eet", "elicit"); - return 0; - } evas_object_name_set(el->gui, "gui"); evas_object_move(el->gui, 0, 0); evas_object_show(el->gui); - - edje_object_size_min_get(el->gui, &mw, &mh); - ecore_evas_size_min_set(el->ee, mw, mh); - ecore_evas_resize(el->ee, mw, mh); - evas_object_resize(el->gui, mw, mh); - - /* create the swatch and shot objects */ el->shot = evas_object_image_add(el->evas); evas_object_name_set(el->shot, "shot"); @@ -119,6 +111,18 @@ evas_object_name_set(el->swatch, "swatch"); evas_object_show(el->swatch); + elicit_ui_theme_set(el, elicit_config_theme_get(el)); +#if 0 + if (!edje_object_file_set(el->gui, DATADIR"/themes/winter.eet", "elicit")) + { + fprintf(stderr, "can't load theme eet: %s, %s\n", DATADIR"/themes/elicit.eet", "elicit"); + return 0; + } + edje_object_size_min_get(el->gui, &mw, &mh); + ecore_evas_size_min_set(el->ee, mw, mh); + ecore_evas_resize(el->ee, mw, mh); + evas_object_resize(el->gui, mw, mh); + /* swallow them */ edje_object_part_swallow(el->gui, "shot", el->shot); edje_object_part_swallow(el->gui, "swatch", el->swatch); @@ -131,7 +135,8 @@ edje_object_signal_callback_add(el->gui, "elicit,quit", "*", elicit_cb_exit, el); edje_object_signal_callback_add(el->gui, "elicit,color,*", "*", elicit_cb_colors, el); edje_object_signal_callback_add(el->gui, "elicit,zoom,*", "*", elicit_cb_colors, el); - +#endif + /* some defaults */ /* FIXME: use a config db */ el->zoom = 4; @@ -141,6 +146,48 @@ return 0; } +void +elicit_ui_theme_set(Elicit *el, char *theme) +{ + double mw, mh; + + /* set the theme */ + if (!edje_object_file_set(el->gui, elicit_theme_find(theme), "elicit")) + { + printf("Error: can't set theme to %s\n", theme); + return; + } + + /* set the default window size */ + edje_object_size_min_get(el->gui, &mw, &mh); + ecore_evas_size_min_set(el->ee, mw, mh); + if (mw != 0 && mh != 0) + { + evas_object_resize(el->gui, mw, mh); + ecore_evas_resize(el->ee, mw, mh); + } + else + { + /* arbitrary default size if theme doesn't set a min size */ + evas_object_resize(el->gui, 255, 255); + ecore_evas_resize(el->ee, 255, 255); + } + + /* swallow and update */ + edje_object_part_swallow(el->gui, "shot", el->shot); + edje_object_part_swallow(el->gui, "swatch", el->swatch); + elicit_ui_update_text(el); + + /* set up edje callbacks */ + edje_object_signal_callback_add(el->gui, "elicit,pick,*", "*", elicit_cb_pick, el); + edje_object_signal_callback_add(el->gui, "mouse,move", "*", elicit_cb_pick, el); + edje_object_signal_callback_add(el->gui, "mouse,move", "*", elicit_cb_shoot, el); + edje_object_signal_callback_add(el->gui, "elicit,shoot,*", "*", elicit_cb_shoot, el); + edje_object_signal_callback_add(el->gui, "elicit,quit", "*", elicit_cb_exit, el); + edje_object_signal_callback_add(el->gui, "elicit,color,*", "*", elicit_cb_colors, el); + edje_object_signal_callback_add(el->gui, "elicit,zoom,*", "*", elicit_cb_colors, el); + +} void elicit_ui_update_text(Elicit *el) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/util.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- util.c 6 Feb 2004 07:22:14 -0000 1.2 +++ util.c 6 Feb 2004 19:13:32 -0000 1.3 @@ -226,3 +226,20 @@ return 0; } +char * +elicit_theme_find(const char *name) +{ + static char eet[PATH_MAX + 1]; + struct stat st; + + snprintf(eet, sizeof(eet), + "%s/.e/apps/"PACKAGE"/""themes/%s.eet", + getenv("HOME"), name); + + if (!stat(eet, &st)) + return eet; + + snprintf(eet, sizeof(eet), DATADIR"/themes/%s.eet", name); + + return stat(eet, &st) ? NULL : eet; +} |
From: <enl...@li...> - 2004-02-07 19:57:49
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/elicit Dir : e17/apps/elicit/src Added Files: conf.c conf.h Log Message: And add these... |
From: <enl...@li...> - 2004-02-07 20:30:23
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/elicit Dir : e17/apps/elicit/src Modified Files: Elicit.h Makefile.am callbacks.c conf.c config.h.in elicit.c util.c util.h Log Message: compiles now. cleanup some compiler warnings. set ecore args. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/Elicit.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Elicit.h 6 Feb 2004 19:13:32 -0000 1.3 +++ Elicit.h 7 Feb 2004 20:27:27 -0000 1.4 @@ -13,9 +13,10 @@ #include <stdio.h> #include <limits.h> #include <sys/stat.h> +#include <fnmatch.h> #include "config.h" -#define DATADIR PACKAGE_DATA_DIR"/data" +#define DATADIR PACKAGE_DATA_DIR typedef struct _Elicit Elicit; @@ -51,6 +52,8 @@ char *change_sig; }; +void elicit_ui_update_text(Elicit *el); +void elicit_ui_theme_set(Elicit *el, char *name); #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 6 Feb 2004 19:13:32 -0000 1.2 +++ Makefile.am 7 Feb 2004 20:27:27 -0000 1.3 @@ -12,5 +12,5 @@ conf.c conf.h elicit_LDADD = @edje_libs@ @ecore_libs@ @edb_libs@ @evas_libs@ \ -@esmart_libs@ +@esmart_libs@ =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/callbacks.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- callbacks.c 6 Feb 2004 07:22:14 -0000 1.2 +++ callbacks.c 7 Feb 2004 20:27:27 -0000 1.3 @@ -12,7 +12,7 @@ void elicit_cb_resize(Ecore_Evas *ee) { - int x,y,w, h; + int w, h; double sw, sh; Evas_Object *gui, *shot; @@ -45,7 +45,7 @@ { if (el->flags.picking == 1) { - elicit_action_color_get(&(el->color.r), &(el->color.g), &(el->color.b)); + elicit_util_color_get(&(el->color.r), &(el->color.g), &(el->color.b)); evas_object_color_set(el->swatch, el->color.r, el->color.g, el->color.b, 255); elicit_color_rgb_to_hsv(el->color.r, el->color.g, el->color.b, &(el->color.h), &(el->color.s), &(el->color.v)); @@ -74,12 +74,12 @@ if (el->flags.shooting == 1) { double sw, sh; - double x, y, w, h; + double w, h; evas_object_geometry_get(el->shot, NULL, NULL, &sw, &sh); w = sw * (1 / el->zoom); h = sh * (1 / el->zoom); - elicit_action_shoot(el->shot, (int)w, (int)h); + elicit_util_shoot(el->shot, (int)w, (int)h); } } } @@ -108,7 +108,6 @@ static double start = 0.0; double duration = 2.0; double r, d, dir; - int w; /* we're done */ if (!el->flags.changing) @@ -219,13 +218,9 @@ el->flags.changed = 1; - /* if changing, keep on calling it */ - if (el->flags.changing) - { - /* we want the time to wait to depend on how far along it is... */ - el->change_timer = ecore_timer_add(.16 - .15*r, elicit_timer_color, el); - return 0; - } + /* we want the time to wait to depend on how far along it is... */ + el->change_timer = ecore_timer_add(.16 - .15*r, elicit_timer_color, el); + return 0; } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/conf.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- conf.c 7 Feb 2004 19:54:56 -0000 1.1 +++ conf.c 7 Feb 2004 20:27:27 -0000 1.2 @@ -9,6 +9,7 @@ elicit_config_load(el); ecore_config_listen("theme", "/settings/theme", elicit_config_listener, 0, el); + return 1; } void @@ -42,7 +43,7 @@ void elicit_config_shutdown() { - elicit_config_save(el); + elicit_config_save(); ecore_config_exit(); } @@ -51,7 +52,6 @@ { char *theme = ecore_config_get_string("/settings/theme"); - printf("theme: %s\n", theme); return theme ? theme : "winter"; } @@ -71,8 +71,8 @@ void elicit_config_size_set(int w, int h) { - ecore_config_set_int("/window/w"); - ecore_config_set_int("/window/h"); + ecore_config_set_int("/window/w", w); + ecore_config_set_int("/window/h", h); } void @@ -86,9 +86,9 @@ void elicit_config_color_set(int r, int g, int b) { - ecore_config_set_int("/color/r"); - ecore_config_set_int("/color/g"); - ecore_config_set_int("/color/b"); + ecore_config_set_int("/color/r", r); + ecore_config_set_int("/color/g", g); + ecore_config_set_int("/color/b", b); } static int @@ -99,7 +99,10 @@ { case ELICIT_CONF_TAG_THEME: if (el->gui) + { elicit_ui_theme_set(el, ecore_config_get_string(key)); + } break; } + return 1; } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/config.h.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- config.h.in 6 Feb 2004 19:13:32 -0000 1.2 +++ config.h.in 7 Feb 2004 20:27:27 -0000 1.3 @@ -1,76 +1,56 @@ -/* src/config.h.in. Generated from configure.in by autoheader. */ +/* src/config.h.in. Generated automatically from configure.in by autoheader. */ -/* Define to 1 if you have the <dlfcn.h> header file. */ -#undef HAVE_DLFCN_H +/* Define to empty if the keyword does not work. */ +#undef const -/* Define to 1 if you have the <inttypes.h> header file. */ -#undef HAVE_INTTYPES_H +/* Define if you have the ANSI C header files. */ +#undef STDC_HEADERS -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H +/* Define if you have the <dlfcn.h> header file. */ +#undef HAVE_DLFCN_H -/* Define to 1 if you have the <stdint.h> header file. */ -#undef HAVE_STDINT_H +/* Name of package */ +#undef PACKAGE -/* Define to 1 if you have the <stdlib.h> header file. */ -#undef HAVE_STDLIB_H +/* Version number of package */ +#undef VERSION -/* Define to 1 if you have the <strings.h> header file. */ -#undef HAVE_STRINGS_H +/* Define if using the dmalloc debugging malloc package */ +#undef WITH_DMALLOC -/* Define to 1 if you have the <string.h> header file. */ -#undef HAVE_STRING_H +/* Locale-specific data directory */ +#undef PACKAGE_LOCALE_DIR -/* Define to 1 if you have the <sys/stat.h> header file. */ -#undef HAVE_SYS_STAT_H +/* Locale-specific data directory */ +#undef PACKAGE_LOCALE_DIR -/* Define to 1 if you have the <sys/types.h> header file. */ -#undef HAVE_SYS_TYPES_H +/* Shared data directory */ +#undef PACKAGE_DATA_DIR -/* Define to 1 if you have the <unistd.h> header file. */ -#undef HAVE_UNISTD_H +/* Shared data directory */ +#undef PACKAGE_DATA_DIR -/* Name of package */ -#undef PACKAGE +/* Shared data directory */ +#undef PACKAGE_DATA_DIR /* Installation directory for user executables */ #undef PACKAGE_BIN_DIR -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT +/* Installation directory for user executables */ +#undef PACKAGE_BIN_DIR -/* Shared data directory */ -#undef PACKAGE_DATA_DIR +/* Installation directory for user executables */ +#undef PACKAGE_BIN_DIR /* Installation directory for libraries */ #undef PACKAGE_LIB_DIR -/* Locale-specific data directory */ -#undef PACKAGE_LOCALE_DIR +/* Installation directory for libraries */ +#undef PACKAGE_LIB_DIR -/* Define to the full name of this package. */ -#undef PACKAGE_NAME +/* Installation directory for libraries */ +#undef PACKAGE_LIB_DIR /* Source code directory */ #undef PACKAGE_SOURCE_DIR -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Version number of package */ -#undef VERSION - -/* Define if using the dmalloc debugging malloc package */ -#undef WITH_DMALLOC - -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/elicit.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- elicit.c 6 Feb 2004 19:13:32 -0000 1.5 +++ elicit.c 7 Feb 2004 20:27:27 -0000 1.6 @@ -5,9 +5,6 @@ int setup(int argc, char **argv, Elicit *el); void pick_color(); void shoot(); -void elicit_ui_update_text(Elicit *el); -void elicit_ui_theme_set(Elicit *el, char *name); -int timer_color(void *data); /* variables */ @@ -22,6 +19,7 @@ printf("ERROR: can't initialize Ecore.\n"); return 1; } + ecore_app_args_set(argc, (const char **)argv); if (!ecore_evas_init()) { @@ -88,9 +86,6 @@ int setup(int argc, char **argv, Elicit *el) { - Evas_Object *o; - double mw, mh; - elicit_config_init(el); ecore_evas_borderless_set(el->ee, 1); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/util.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- util.c 6 Feb 2004 19:13:32 -0000 1.3 +++ util.c 7 Feb 2004 20:27:27 -0000 1.4 @@ -4,17 +4,16 @@ #include "util.h" void -elicit_action_color_get(int *r, int *g, int *b) +elicit_util_color_get(int *r, int *g, int *b) { Imlib_Image *im; Imlib_Color col; - int red, green, blue; - int h, s, v; int x, y; int tr; + Window dummy; /* where are we pointing? */ - XQueryPointer(ecore_x_display_get(), RootWindow(ecore_x_display_get(),0), &tr, &tr, &tr, &tr, &x, &y, &tr); + XQueryPointer(ecore_x_display_get(), RootWindow(ecore_x_display_get(),0), &dummy, &dummy, &tr, &tr, &x, &y, &tr); /* setup the imlib context */ imlib_context_set_display(ecore_x_display_get()); @@ -45,7 +44,7 @@ } void -elicit_action_shoot(Evas_Object *shot, int w, int h) +elicit_util_shoot(Evas_Object *shot, int w, int h) { Imlib_Image *im; int x, y; @@ -53,8 +52,9 @@ int dw, dh; int tr; double sw, sh; + Window dummy; - XQueryPointer(ecore_x_display_get(), RootWindow(ecore_x_display_get(),0), &tr, &tr, &tr, &tr, &px, &py, &tr); + XQueryPointer(ecore_x_display_get(), RootWindow(ecore_x_display_get(),0), &dummy, &dummy, &tr, &tr, &px, &py, &tr); x = px - .5 * w; y = py - .5 * h; @@ -101,7 +101,7 @@ int r, g, b; int f; float i,j,k,max,min,d; - float h, s, v; + float h = 0, s = 0, v = 0; r = rr; g = gg; @@ -150,7 +150,7 @@ { int i,p,q,t; float vs,vsf; - int r, g, b; + int r = 0, g = 0, b = 0; float h, s, v; h = hh; @@ -212,14 +212,14 @@ char * elicit_color_rgb_to_hex(int rr, int gg, int bb) { - char buf[8]; + char buf[10]; - sprintf(buf, "#%.2x%.2x%.2x\0", rr, gg, bb); + snprintf(buf, 10, "#%.2x%.2x%.2x", rr, gg, bb); return (char *)strdup(buf); } int -elicit_glob_match(char *str, char *glob) +elicit_glob_match(const char *str, const char *glob) { if (!strcmp(glob, "*")) return 1; if (!fnmatch(glob, str, 0)) return 1; @@ -240,6 +240,5 @@ return eet; snprintf(eet, sizeof(eet), DATADIR"/themes/%s.eet", name); - return stat(eet, &st) ? NULL : eet; } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/util.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- util.h 6 Feb 2004 06:32:58 -0000 1.1 +++ util.h 7 Feb 2004 20:27:27 -0000 1.2 @@ -4,9 +4,11 @@ void elicit_color_rgb_to_hsv(int rr, int gg, int bb, double *hh, double *ss, double *vv); void elicit_color_hsv_to_rgb(double hh, double ss, double vv, int *rr, int *gg, int *bb); char * elicit_color_rgb_to_hex(int rr, int gg, int bb); -int elicit_glob_match(char *str, char *glob); +int elicit_glob_match(const char *str, const char *glob); void elicit_util_color_get(int *r, int *g, int *b); void elicit_util_shoot(Evas_Object *shot, int w, int h); +char *elicit_theme_find(const char *name); + #endif |
From: <enl...@li...> - 2004-02-08 04:05:05
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/elicit Dir : e17/apps/elicit/data/themes/winter/programs Modified Files: colors.edc Log Message: save the zoom and color out to the config.db (and use them next time) new signal: elicit,copy,hex sets the primary selection to the hex val update winter theme to use this signal (click on the hex val) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/data/themes/winter/programs/colors.edc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- colors.edc 6 Feb 2004 06:56:30 -0000 1.1 +++ colors.edc 8 Feb 2004 04:02:09 -0000 1.2 @@ -5,3 +5,25 @@ COLOR_PROG("sat", "color,s") COLOR_PROG("val", "color,v") COLOR_PROG("zoom", "zoom") + +program { + name, "hex-copy"; + signal, "mouse,clicked,1"; + source, "hex-val"; + action, SIGNAL_EMIT "elicit,copy,hex" ""; + after, "hex-pulse"; +} + +program { + name, "hex-pulse"; + action, STATE_SET "off" 0.0; + target, "hex-clip"; + after, "hex-pulse-2"; +} + +program { + name, "hex-pulse-2"; + action, STATE_SET "default" 0.0; + transition, DECELERATE 0.5; + target, "hex-clip"; +} |
From: <enl...@li...> - 2004-02-08 04:05:06
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/elicit Dir : e17/apps/elicit/src Modified Files: callbacks.c callbacks.h conf.c conf.h elicit.c util.c util.h Log Message: save the zoom and color out to the config.db (and use them next time) new signal: elicit,copy,hex sets the primary selection to the hex val update winter theme to use this signal (click on the hex val) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/callbacks.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- callbacks.c 7 Feb 2004 20:27:27 -0000 1.3 +++ callbacks.c 8 Feb 2004 04:02:09 -0000 1.4 @@ -45,12 +45,9 @@ { if (el->flags.picking == 1) { - elicit_util_color_get(&(el->color.r), &(el->color.g), &(el->color.b)); + elicit_util_color_at_pointer_get(&(el->color.r), &(el->color.g), &(el->color.b)); evas_object_color_set(el->swatch, el->color.r, el->color.g, el->color.b, 255); - elicit_color_rgb_to_hsv(el->color.r, el->color.g, el->color.b, - &(el->color.h), &(el->color.s), &(el->color.v)); - if (el->color.hex) free (el->color.hex); - el->color.hex = elicit_color_rgb_to_hex(el->color.r, el->color.g, el->color.b); + elicit_util_colors_set_from_rgb(el); elicit_ui_update_text(el); } } @@ -101,6 +98,15 @@ } } +void +elicit_cb_copy(void *data, Evas_Object *o, const char *sig, const char *src) +{ + Elicit *el = data; + Ecore_X_Window win = ecore_evas_software_x11_window_get(el->ee); + + ecore_x_selection_primary_set(win, el->color.hex, strlen(el->color.hex)); +} + static int elicit_timer_color(void *data) { @@ -141,10 +147,7 @@ if (el->color.r > 255) el->color.r = 255; if (el->color.r < 0) el->color.r = 0; - elicit_color_rgb_to_hsv(el->color.r, el->color.g, el->color.b, - &(el->color.h), &(el->color.s), &(el->color.v)); - if (el->color.hex) free (el->color.hex); - el->color.hex = elicit_color_rgb_to_hex(el->color.r, el->color.g, el->color.b); + elicit_util_colors_set_from_rgb(el); } else if (elicit_glob_match(el->change_sig, "*,g,*")) @@ -153,10 +156,7 @@ if (el->color.g > 255) el->color.g = 255; if (el->color.g < 0) el->color.g = 0; - elicit_color_rgb_to_hsv(el->color.r, el->color.g, el->color.b, - &(el->color.h), &(el->color.s), &(el->color.v)); - if (el->color.hex) free (el->color.hex); - el->color.hex = elicit_color_rgb_to_hex(el->color.r, el->color.g, el->color.b); + elicit_util_colors_set_from_rgb(el); } else if (elicit_glob_match(el->change_sig, "*,b,*")) @@ -165,10 +165,7 @@ if (el->color.b > 255) el->color.b = 255; if (el->color.b < 0) el->color.b = 0; - elicit_color_rgb_to_hsv(el->color.r, el->color.g, el->color.b, - &(el->color.h), &(el->color.s), &(el->color.v)); - if (el->color.hex) free (el->color.hex); - el->color.hex = elicit_color_rgb_to_hex(el->color.r, el->color.g, el->color.b); + elicit_util_colors_set_from_rgb(el); } else if (elicit_glob_match(el->change_sig, "*,h,*")) @@ -177,10 +174,7 @@ if (el->color.h > 360) el->color.h = 360; if (el->color.h < 0) el->color.h = 0; - elicit_color_hsv_to_rgb(el->color.h, el->color.s, el->color.v, - &(el->color.r), &(el->color.g), &(el->color.b)); - if (el->color.hex) free (el->color.hex); - el->color.hex = elicit_color_rgb_to_hex(el->color.r, el->color.g, el->color.b); + elicit_util_colors_set_from_hsv(el); } else if (elicit_glob_match(el->change_sig, "*,s,*")) @@ -189,10 +183,7 @@ if (el->color.s > 1) el->color.s = 1; if (el->color.s < 0) el->color.s = 0; - elicit_color_hsv_to_rgb(el->color.h, el->color.s, el->color.v, - &(el->color.r), &(el->color.g), &(el->color.b)); - if (el->color.hex) free (el->color.hex); - el->color.hex = elicit_color_rgb_to_hex(el->color.r, el->color.g, el->color.b); + elicit_util_colors_set_from_hsv(el); } else if (elicit_glob_match(el->change_sig, "*,v,*")) @@ -201,10 +192,7 @@ if (el->color.v > 1) el->color.v = 1; if (el->color.v < 0) el->color.v = 0; - elicit_color_hsv_to_rgb(el->color.h, el->color.s, el->color.v, - &(el->color.r), &(el->color.g), &(el->color.b)); - if (el->color.hex) free (el->color.hex); - el->color.hex = elicit_color_rgb_to_hex(el->color.r, el->color.g, el->color.b); + elicit_util_colors_set_from_hsv(el); } else if (elicit_glob_match(el->change_sig, "*,zoom,*")) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/callbacks.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- callbacks.h 6 Feb 2004 06:32:58 -0000 1.1 +++ callbacks.h 8 Feb 2004 04:02:09 -0000 1.2 @@ -8,5 +8,6 @@ void elicit_cb_pick(void *data, Evas_Object *o, const char *sig, const char *src); void elicit_cb_shoot(void *data, Evas_Object *o, const char *sig, const char *src); void elicit_cb_colors(void *data, Evas_Object *o, const char *sig, const char *src); +void elicit_cb_copy(void *data, Evas_Object *o, const char *sig, const char *src); #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/conf.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- conf.c 7 Feb 2004 20:27:27 -0000 1.2 +++ conf.c 8 Feb 2004 04:02:09 -0000 1.3 @@ -25,10 +25,16 @@ snprintf(buf, sizeof(buf), "%s/.e/apps/%s/config.db", getenv("HOME"), __app_name); if (stat(buf, &st)) { - printf("set default and save\n"); + /* + ecore_config_set_int("/color/r", 255); + ecore_config_set_int("/color/g", 255); + ecore_config_set_int("/color/b", 255); ecore_config_set_string("/settings/theme", "winter"); + */ + elicit_config_color_set(255, 255, 255); + elicit_config_zoom_set(4.0); + elicit_config_theme_set("winter"); ecore_config_save(); -// ecore_config_save_file("test.db"); } else ecore_config_load(); @@ -62,17 +68,15 @@ } void -elicit_config_size_get(int *w, int *h) +elicit_config_zoom_set(double zoom) { - if (w) *w = ecore_config_get_int("/window/w"); - if (h) *h = ecore_config_get_int("/window/h"); + ecore_config_set_float("/settings/zoom", (float)zoom); } -void -elicit_config_size_set(int w, int h) +double +elicit_config_zoom_get() { - ecore_config_set_int("/window/w", w); - ecore_config_set_int("/window/h", h); + return (double)ecore_config_get_float("/settings/zoom"); } void =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/conf.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- conf.h 7 Feb 2004 19:54:56 -0000 1.1 +++ conf.h 8 Feb 2004 04:02:09 -0000 1.2 @@ -17,5 +17,11 @@ char *elicit_config_theme_get(); void elicit_config_theme_set(char *name); +void elicit_config_color_get(int *r, int *g, int *b); +void elicit_config_color_set(int r, int g, int b); + +void elicit_config_zoom_set(double zoom); +double elicit_config_zoom_get(); + #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/elicit.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- elicit.c 7 Feb 2004 20:27:27 -0000 1.6 +++ elicit.c 8 Feb 2004 04:02:09 -0000 1.7 @@ -71,6 +71,8 @@ ecore_main_loop_begin(); /* shutdown the subsystems (when event loop exits, app is done) */ + elicit_config_zoom_set(el->zoom); + elicit_config_color_set(el->color.r, el->color.g, el->color.b); elicit_config_shutdown(el); ecore_evas_shutdown(); ecore_shutdown(); @@ -96,47 +98,21 @@ evas_object_move(el->gui, 0, 0); evas_object_show(el->gui); + elicit_config_color_get(&el->color.r, &el->color.g, &el->color.b); + elicit_util_colors_set_from_rgb(el); + el->zoom = elicit_config_zoom_get(); + /* create the swatch and shot objects */ el->shot = evas_object_image_add(el->evas); evas_object_name_set(el->shot, "shot"); evas_object_show(el->shot); el->swatch = evas_object_rectangle_add(el->evas); - evas_object_color_set(el->swatch, 0, 0, 0, 255); + evas_object_color_set(el->swatch, el->color.r, el->color.g, el->color.b, 255); evas_object_name_set(el->swatch, "swatch"); evas_object_show(el->swatch); elicit_ui_theme_set(el, elicit_config_theme_get(el)); -#if 0 - if (!edje_object_file_set(el->gui, DATADIR"/themes/winter.eet", "elicit")) - { - fprintf(stderr, "can't load theme eet: %s, %s\n", DATADIR"/themes/elicit.eet", "elicit"); - return 0; - } - edje_object_size_min_get(el->gui, &mw, &mh); - ecore_evas_size_min_set(el->ee, mw, mh); - ecore_evas_resize(el->ee, mw, mh); - evas_object_resize(el->gui, mw, mh); - - /* swallow them */ - edje_object_part_swallow(el->gui, "shot", el->shot); - edje_object_part_swallow(el->gui, "swatch", el->swatch); - - /* set up edje callbacks */ - edje_object_signal_callback_add(el->gui, "elicit,pick,*", "*", elicit_cb_pick, el); - edje_object_signal_callback_add(el->gui, "mouse,move", "*", elicit_cb_pick, el); - edje_object_signal_callback_add(el->gui, "mouse,move", "*", elicit_cb_shoot, el); - edje_object_signal_callback_add(el->gui, "elicit,shoot,*", "*", elicit_cb_shoot, el); - edje_object_signal_callback_add(el->gui, "elicit,quit", "*", elicit_cb_exit, el); - edje_object_signal_callback_add(el->gui, "elicit,color,*", "*", elicit_cb_colors, el); - edje_object_signal_callback_add(el->gui, "elicit,zoom,*", "*", elicit_cb_colors, el); -#endif - - /* some defaults */ - /* FIXME: use a config db */ - el->zoom = 4; - el->color.hex = strdup("#000000"); - elicit_ui_update_text(el); return 0; } @@ -181,6 +157,7 @@ edje_object_signal_callback_add(el->gui, "elicit,quit", "*", elicit_cb_exit, el); edje_object_signal_callback_add(el->gui, "elicit,color,*", "*", elicit_cb_colors, el); edje_object_signal_callback_add(el->gui, "elicit,zoom,*", "*", elicit_cb_colors, el); + edje_object_signal_callback_add(el->gui, "elicit,copy,*", "*", elicit_cb_copy, el); } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/util.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- util.c 7 Feb 2004 20:27:27 -0000 1.4 +++ util.c 8 Feb 2004 04:02:09 -0000 1.5 @@ -3,8 +3,12 @@ #include "Elicit.h" #include "util.h" +void elicit_color_rgb_to_hsv(int rr, int gg, int bb, double *hh, double *ss, double *vv); +void elicit_color_hsv_to_rgb(double hh, double ss, double vv, int *rr, int *gg, int *bb); +char * elicit_color_rgb_to_hex(int rr, int gg, int bb); + void -elicit_util_color_get(int *r, int *g, int *b) +elicit_util_color_at_pointer_get(int *r, int *g, int *b) { Imlib_Image *im; Imlib_Color col; @@ -92,8 +96,23 @@ imlib_free_image(); } +void +elicit_util_colors_set_from_rgb(Elicit *el) +{ + elicit_color_rgb_to_hsv(el->color.r, el->color.g, el->color.b, + &(el->color.h), &(el->color.s), &(el->color.v)); + if (el->color.hex) free (el->color.hex); + el->color.hex = elicit_color_rgb_to_hex(el->color.r, el->color.g, el->color.b); +} - +void +elicit_util_colors_set_from_hsv(Elicit *el) +{ + elicit_color_hsv_to_rgb(el->color.h, el->color.s, el->color.v, + &(el->color.r), &(el->color.g), &(el->color.b)); + if (el->color.hex) free (el->color.hex); + el->color.hex = elicit_color_rgb_to_hex(el->color.r, el->color.g, el->color.b); +} void elicit_color_rgb_to_hsv(int rr, int gg, int bb, double *hh, double *ss, double *vv) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/util.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- util.h 7 Feb 2004 20:27:27 -0000 1.2 +++ util.h 8 Feb 2004 04:02:09 -0000 1.3 @@ -1,12 +1,12 @@ #ifndef ELICIT_UTIL_H #define ELICIT_UTIL_H -void elicit_color_rgb_to_hsv(int rr, int gg, int bb, double *hh, double *ss, double *vv); -void elicit_color_hsv_to_rgb(double hh, double ss, double vv, int *rr, int *gg, int *bb); -char * elicit_color_rgb_to_hex(int rr, int gg, int bb); +void elicit_util_colors_set_from_hsv(Elicit *el); +void elicit_util_colors_set_from_rgb(Elicit *el); + int elicit_glob_match(const char *str, const char *glob); -void elicit_util_color_get(int *r, int *g, int *b); +void elicit_util_color_at_pointer_get(int *r, int *g, int *b); void elicit_util_shoot(Evas_Object *shot, int w, int h); char *elicit_theme_find(const char *name); |
From: <enl...@li...> - 2004-02-08 04:05:40
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/elicit Dir : e17/apps/elicit/data Modified Files: README.theme Log Message: save the zoom and color out to the config.db (and use them next time) new signal: elicit,copy,hex sets the primary selection to the hex val update winter theme to use this signal (click on the hex val) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/data/README.theme,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- README.theme 6 Feb 2004 06:32:58 -0000 1.1 +++ README.theme 8 Feb 2004 04:02:08 -0000 1.2 @@ -20,4 +20,5 @@ elicit,zoom,up,start elicit,zoom,down,start +elicit,copy,hex |
From: <enl...@li...> - 2004-02-08 04:05:40
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/elicit Dir : e17/apps/elicit/data/themes/winter/parts Modified Files: colors.edc Log Message: save the zoom and color out to the config.db (and use them next time) new signal: elicit,copy,hex sets the primary selection to the hex val update winter theme to use this signal (click on the hex val) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/data/themes/winter/parts/colors.edc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- colors.edc 6 Feb 2004 06:56:30 -0000 1.1 +++ colors.edc 8 Feb 2004 04:02:09 -0000 1.2 @@ -7,8 +7,21 @@ COLOR("zoom", "Z:", 0 93, 50 103) part { - name, "hex-val"; + name, "hex-clip"; clip_to, "left-clip"; + type, RECT; + description { + state, "default" 0.0; + color, 0 0 0 255; + } + description { + state, "off" 0.0; + color, 0 0 0 0; + } + } + part { + name, "hex-val"; + clip_to, "hex-clip"; type, TEXT; effect, NONE; description { |
From: <enl...@li...> - 2004-02-08 09:29:07
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/elicit Dir : e17/apps/elicit/src Modified Files: Elicit.h callbacks.c callbacks.h conf.c elicit.c Log Message: add a signal to allow resizing. (needs to be a bit more robust) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/Elicit.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Elicit.h 7 Feb 2004 20:27:27 -0000 1.4 +++ Elicit.h 8 Feb 2004 09:25:59 -0000 1.5 @@ -53,7 +53,7 @@ }; void elicit_ui_update_text(Elicit *el); -void elicit_ui_theme_set(Elicit *el, char *name); +void elicit_ui_theme_set(Elicit *el, char *name, char *group); #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/callbacks.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- callbacks.c 8 Feb 2004 04:02:09 -0000 1.4 +++ callbacks.c 8 Feb 2004 09:25:59 -0000 1.5 @@ -99,6 +99,77 @@ } void +elicit_cb_switch(void *data, Evas_Object *o, const char *sig, const char *src) +{ + Elicit *el = data; + /* FIXME: i may need to free something here... */ + char *theme = elicit_config_theme_get(); + char *file = elicit_theme_find(theme); + char group[PATH_MAX]; + Evas_List *groups = edje_file_collection_list(file); + Evas_List *l; + + sscanf(sig, "elicit,switch,%s", group); + + printf("switch group to: %s\n", group); + + for (l = groups; l; l = l->next) + { + char *gp = l->data; + if (!strcmp(gp, group)) + { + elicit_ui_theme_set(el, theme, group); + return; + } + } + printf("Error: group %s does not exist in file %s\n", group, file); +} + +void +elicit_cb_resize_sig(void *data, Evas_Object *o, const char *sig, const char *src) +{ + Elicit *el = data; + int ow = 0, oh = 0; + int w = 0, h = 0; + int dw = 0, dh = 0; + char arg[PATH_MAX]; + char *wstr, *hstr, *sub; + int ret; + int woff = 0, hoff = 0; + + ecore_evas_geometry_get(el->ee, NULL, NULL, &ow, &oh); + + /* if we have an arg */ + if (sscanf(sig, "elicit,resize,%s,%s", arg)) + { + wstr = arg; + sub = strstr(arg, ","); + printf("arg: %s :: sub: %s\n", arg, sub); + sub[0] = '\0'; + hstr = sub + 1; + + if (wstr[0] == '+') woff = 1; + else if (wstr[0] == '-') woff = -1; + if (hstr[0] == '+') hoff = 1; + else if (hstr[0] == '-') hoff = -1; + + printf("h: %s, w: %s off:(%d,%d)\n", hstr, wstr, hoff, woff); + if (woff != 0) wstr = wstr + 1; + if (hoff != 0) hstr = hstr + 1; + printf("h: %s, w: %s off:(%d,%d)\n", hstr, wstr, hoff, woff); + w = atoi(wstr); + h = atoi(hstr); + + printf("resize: (%d, %d) (%d, %d)\n", w, h, woff, hoff); + ecore_evas_resize(el->ee, + woff ? ow + w * woff : w, + hoff ? oh + h * hoff : h); + } + + +} + +void elicit_cb_copy(void *data, Evas_Object *o, const char *sig, const char *src) { Elicit *el = data; @@ -118,7 +189,7 @@ /* we're done */ if (!el->flags.changing) { - if (0 && el->change_timer) + if (el->change_timer) { ecore_timer_del(el->change_timer); el->change_timer = NULL; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/callbacks.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- callbacks.h 8 Feb 2004 04:02:09 -0000 1.2 +++ callbacks.h 8 Feb 2004 09:25:59 -0000 1.3 @@ -8,6 +8,8 @@ void elicit_cb_pick(void *data, Evas_Object *o, const char *sig, const char *src); void elicit_cb_shoot(void *data, Evas_Object *o, const char *sig, const char *src); void elicit_cb_colors(void *data, Evas_Object *o, const char *sig, const char *src); +void elicit_cb_switch(void *data, Evas_Object *o, const char *sig, const char *src); void elicit_cb_copy(void *data, Evas_Object *o, const char *sig, const char *src); +void elicit_cb_resize_sig(void *data, Evas_Object *o, const char *sig, const char *src); #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/conf.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- conf.c 8 Feb 2004 04:02:09 -0000 1.3 +++ conf.c 8 Feb 2004 09:25:59 -0000 1.4 @@ -57,8 +57,7 @@ elicit_config_theme_get() { char *theme = ecore_config_get_string("/settings/theme"); - - return theme ? theme : "winter"; + return theme; } void @@ -104,7 +103,7 @@ case ELICIT_CONF_TAG_THEME: if (el->gui) { - elicit_ui_theme_set(el, ecore_config_get_string(key)); + elicit_ui_theme_set(el, ecore_config_get_string(key), "elicit"); } break; } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/elicit.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- elicit.c 8 Feb 2004 04:02:09 -0000 1.7 +++ elicit.c 8 Feb 2004 09:25:59 -0000 1.8 @@ -112,28 +112,31 @@ evas_object_name_set(el->swatch, "swatch"); evas_object_show(el->swatch); - elicit_ui_theme_set(el, elicit_config_theme_get(el)); + elicit_ui_theme_set(el, elicit_config_theme_get(el), "elicit"); elicit_ui_update_text(el); return 0; } void -elicit_ui_theme_set(Elicit *el, char *theme) +elicit_ui_theme_set(Elicit *el, char *theme, char *group) { double mw, mh; /* set the theme */ - if (!edje_object_file_set(el->gui, elicit_theme_find(theme), "elicit")) + if (!edje_object_file_set(el->gui, elicit_theme_find(theme), group)) { printf("Error: can't set theme to %s\n", theme); return; } + printf("theme set\n"); + /* set the default window size */ edje_object_size_min_get(el->gui, &mw, &mh); ecore_evas_size_min_set(el->ee, mw, mh); if (mw != 0 && mh != 0) { + printf("resize to: %.2f x %.2f\n", mw, mh); evas_object_resize(el->gui, mw, mh); ecore_evas_resize(el->ee, mw, mh); } @@ -157,8 +160,12 @@ edje_object_signal_callback_add(el->gui, "elicit,quit", "*", elicit_cb_exit, el); edje_object_signal_callback_add(el->gui, "elicit,color,*", "*", elicit_cb_colors, el); edje_object_signal_callback_add(el->gui, "elicit,zoom,*", "*", elicit_cb_colors, el); + edje_object_signal_callback_add(el->gui, "elicit,switch,*", "*", elicit_cb_switch, el); edje_object_signal_callback_add(el->gui, "elicit,copy,*", "*", elicit_cb_copy, el); + edje_object_signal_callback_add(el->gui, "elicit,resize,*", "*", elicit_cb_resize_sig, el); + evas_object_hide(el->gui); + evas_object_show(el->gui); } void |
From: <enl...@li...> - 2004-02-08 09:30:23
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/elicit Dir : e17/apps/elicit/data/themes/spring Log Message: Directory /cvsroot/enlightenment/e17/apps/elicit/data/themes/spring added to the repository |
From: <enl...@li...> - 2004-02-08 09:30:55
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/elicit Dir : e17/apps/elicit/data/themes/spring/img Log Message: Directory /cvsroot/enlightenment/e17/apps/elicit/data/themes/spring/img added to the repository |
From: <enl...@li...> - 2004-02-08 09:30:55
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/elicit Dir : e17/apps/elicit/data/themes/spring/macros Log Message: Directory /cvsroot/enlightenment/e17/apps/elicit/data/themes/spring/macros added to the repository |
From: <enl...@li...> - 2004-02-08 09:30:55
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/elicit Dir : e17/apps/elicit/data/themes/spring/programs Log Message: Directory /cvsroot/enlightenment/e17/apps/elicit/data/themes/spring/programs added to the repository |
From: <enl...@li...> - 2004-02-08 09:30:55
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/elicit Dir : e17/apps/elicit/data/themes/spring/fonts Log Message: Directory /cvsroot/enlightenment/e17/apps/elicit/data/themes/spring/fonts added to the repository |
From: <enl...@li...> - 2004-02-08 09:30:55
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/elicit Dir : e17/apps/elicit/data/themes/spring/parts Log Message: Directory /cvsroot/enlightenment/e17/apps/elicit/data/themes/spring/parts added to the repository |
From: <enl...@li...> - 2004-02-08 09:34:14
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/elicit Dir : e17/apps/elicit/data/themes/spring/fonts Added Files: Makefile.am georgiai.ttf Log Message: stick the beginnings of spring into cvs |
From: <enl...@li...> - 2004-02-08 09:34:14
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/elicit Dir : e17/apps/elicit/data/themes/spring/img Added Files: Makefile.am dropper1.png dropper2.png elicit-spring.png inset-bg.png inset-border.png inset.png lt-green.png main.png minus1.png minus2.png plus1.png plus2.png rgb-dots.png target.png target1.png target2.png tl.png x1.png x2.png Log Message: stick the beginnings of spring into cvs |
From: <enl...@li...> - 2004-02-08 09:34:14
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/elicit Dir : e17/apps/elicit/data/themes/spring Added Files: Makefile.am spring.edc Log Message: stick the beginnings of spring into cvs |