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.c 3 Apr 2008 18:47:13 -0000 1.36 +++ e_bindings.c 19 May 2008 04:37:34 -0000 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.h 21 Aug 2006 16:25:57 -0000 1.14 +++ e_bindings.h 19 May 2008 04:37:34 -0000 1.15 @@ -95,6 +95,7 @@ EAPI void e_bindings_key_add(E_Binding_Context ctxt, const char *key, E_Binding_Modifier mod, int any_mod, const char *action, const char *params); 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); +EAPI E_Binding_Key *e_bindings_key_get(const char *action); EAPI void e_bindings_key_grab(E_Binding_Context ctxt, Ecore_X_Window win); EAPI void e_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 -0000 1.283 +++ e_config.c 19 May 2008 04:37:34 -0000 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", 1, 1); - CFG_MODULE("conf_profiles", 1, 1); - CFG_MODULE("conf_screensaver", 1, 1); - CFG_MODULE("conf_shelves", 1, 1); - CFG_MODULE("conf_startup", 1, 1); - CFG_MODULE("conf_theme", 1, 1); - CFG_MODULE("conf_transitions", 1, 1); - CFG_MODULE("conf_wallpaper", 1, 1); - CFG_MODULE("conf_window_display", 1, 1); - CFG_MODULE("conf_window_focus", 1, 1); - CFG_MODULE("conf_window_manipulation", 1, 1); - CFG_MODULE("conf_winlist", 1, 1); - CFG_MODULE("conf_engine", 1, 1); - CFG_MODULE("fileman", 1, 1); - CFG_MODULE("conf_interaction", 1, 1); + CFG_MODULE("start", 1, 0, 0); + CFG_MODULE("ibar", 1, 0, 0); + CFG_MODULE("ibox", 1, 0, 0); + CFG_MODULE("dropshadow", 1, 0, 0); + CFG_MODULE("clock", 1, 0, 0); + CFG_MODULE("battery", 1, 0, 0); + CFG_MODULE("cpufreq", 1, 0, 0); + CFG_MODULE("temperature", 1, 0, 0); + CFG_MODULE("gadman", 1, 0, -100); + CFG_MODULE("pager", 1, 0, 0); + CFG_MODULE("exebuf", 1, 1, 0); + CFG_MODULE("winlist", 1, 1, 0); + CFG_MODULE("conf", 1, 1, 0); + CFG_MODULE("conf_applications", 1, 1, 0); + CFG_MODULE("conf_borders", 1, 1, 0); + CFG_MODULE("conf_clientlist", 1, 1, 0); + CFG_MODULE("conf_colors", 1, 1, 0); + CFG_MODULE("conf_desk", 1, 1, 0); + CFG_MODULE("conf_desklock", 1, 1, 0); + CFG_MODULE("conf_desks", 1, 1, 0); + CFG_MODULE("conf_dialogs", 1, 1, 0); + CFG_MODULE("conf_display", 1, 1, 0); + CFG_MODULE("conf_dpms", 1, 1, 0); + CFG_MODULE("conf_exebuf", 1, 1, 0); + CFG_MODULE("conf_fonts", 1, 1, 0); + CFG_MODULE("conf_icon_theme", 1, 1, 0); + CFG_MODULE("conf_imc", 1, 1, 0); + CFG_MODULE("conf_intl", 1, 1, 0); + CFG_MODULE("conf_keybindings", 1, 1, 0); + CFG_MODULE("conf_menus", 1, 1, 0); + CFG_MODULE("conf_mime", 1, 1, 0); + CFG_MODULE("conf_mouse", 1, 1, 0); + CFG_MODULE("conf_mousebindings", 1, 1, 0); + CFG_MODULE("conf_mouse_cursor", 1, 1, 0); + CFG_MODULE("conf_paths", 1, 1, 0); + CFG_MODULE("conf_performance", 1, 1, 0); + CFG_MODULE("conf_profiles", 1, 1, 0); + CFG_MODULE("conf_screensaver", 1, 1, 0); + CFG_MODULE("conf_shelves", 1, 1, 0); + CFG_MODULE("conf_startup", 1, 1, 0); + CFG_MODULE("conf_theme", 1, 1, 0); + CFG_MODULE("conf_transitions", 1, 1, 0); + CFG_MODULE("conf_wallpaper", 1, 1, 0); + CFG_MODULE("conf_window_display", 1, 1, 0); + CFG_MODULE("conf_window_focus", 1, 1, 0); + CFG_MODULE("conf_window_manipulation", 1, 1, 0); + CFG_MODULE("conf_winlist", 1, 1, 0); + CFG_MODULE("conf_engine", 1, 1, 0); + CFG_MODULE("fileman", 1, 1, 0); + CFG_MODULE("conf_interaction", 1, 1, 0); } #if 0 { =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_config.h,v retrieving revision 1.169 retrieving revision 1.170 diff -u -3 -r1.169 -r1.170 --- e_config.h 20 Feb 2008 04:12:58 -0000 1.169 +++ e_config.h 19 May 2008 04:37:34 -0000 1.170 @@ -293,6 +293,7 @@ const char *name; unsigned char enabled; unsigned char delayed; + int priority; }; struct _E_Config_Theme @@ -373,7 +374,8 @@ const char *name; const char *id; struct { - int pos, size, res; + int pos, size, res; //gadcon + double pos_x, pos_y, size_w, size_h; //gadman } geom; struct { int seq, flags; =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v retrieving revision 1.106 retrieving revision 1.107 diff -u -3 -r1.106 -r1.107 --- e_gadcon.c 13 May 2008 05:31:20 -0000 1.106 +++ e_gadcon.c 19 May 2008 04:37:34 -0000 1.107 @@ -654,7 +654,7 @@ EAPI void e_gadcon_util_menu_attach_func_set(E_Gadcon *gc, - void (*func) (void *data, E_Menu *menu), + void (*func) (void *data, E_Gadcon_Client *gcc, E_Menu *menu), void *data) { E_OBJECT_CHECK(gc); @@ -1187,7 +1187,7 @@ gcc->menu = menu; */ - if (!gcc->gadcon->toolbar) + if (gcc->gadcon->shelf) { mn = e_menu_new(); mi = e_menu_item_new(mn); @@ -1214,42 +1214,44 @@ e_menu_item_submenu_set(mi, mn); e_object_del(E_OBJECT(mn)); } - mi = e_menu_item_new(menu); - e_menu_item_label_set(mi, _("Automatically scroll contents")); - e_util_menu_item_edje_icon_set(mi, "enlightenment/autoscroll"); - e_menu_item_check_set(mi, 1); - if (gcc->autoscroll) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_autoscroll, gcc); - - mi = e_menu_item_new(menu); - e_menu_item_label_set(mi, _("Able to be resized")); - e_util_menu_item_edje_icon_set(mi, "enlightenment/resizable"); - e_menu_item_check_set(mi, 1); - if (gcc->resizable) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_resizable, gcc); - - mi = e_menu_item_new(menu); - e_menu_item_separator_set(mi, 1); - - if (!gcc->o_control) + if (gcc->gadcon->shelf || gcc->gadcon->toolbar) { mi = e_menu_item_new(menu); - e_menu_item_label_set(mi, _("Begin move/resize this gadget")); - e_util_menu_item_edje_icon_set(mi, "enlightenment/edit"); - e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_edit, gcc); - } + e_menu_item_label_set(mi, _("Automatically scroll contents")); + e_util_menu_item_edje_icon_set(mi, "enlightenment/autoscroll"); + e_menu_item_check_set(mi, 1); + if (gcc->autoscroll) e_menu_item_toggle_set(mi, 1); + e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_autoscroll, gcc); - mi = e_menu_item_new(menu); - e_menu_item_label_set(mi, _("Remove this gadget")); - e_util_menu_item_edje_icon_set(mi, "enlightenment/remove"); - e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_remove, gcc); + mi = e_menu_item_new(menu); + e_menu_item_label_set(mi, _("Able to be resized")); + e_util_menu_item_edje_icon_set(mi, "enlightenment/resizable"); + e_menu_item_check_set(mi, 1); + if (gcc->resizable) e_menu_item_toggle_set(mi, 1); + e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_resizable, gcc); + mi = e_menu_item_new(menu); + e_menu_item_separator_set(mi, 1); + + if (!gcc->o_control) + { + mi = e_menu_item_new(menu); + e_menu_item_label_set(mi, _("Begin move/resize this gadget")); + e_util_menu_item_edje_icon_set(mi, "enlightenment/edit"); + e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_edit, gcc); + } + + mi = e_menu_item_new(menu); + e_menu_item_label_set(mi, _("Remove this gadget")); + e_util_menu_item_edje_icon_set(mi, "enlightenment/remove"); + e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_remove, gcc); + } if (gcc->gadcon->menu_attach.func) { mi = e_menu_item_new(menu); e_menu_item_separator_set(mi, 1); - gcc->gadcon->menu_attach.func(gcc->gadcon->menu_attach.data, menu); + gcc->gadcon->menu_attach.func(gcc->gadcon->menu_attach.data, gcc, menu); } } @@ -1454,6 +1456,10 @@ gcc->cf->geom.pos = gcc->config.pos; gcc->cf->geom.size = gcc->config.size; gcc->cf->geom.res = gcc->config.res; + gcc->cf->geom.pos_x = gcc->config.pos_x; + gcc->cf->geom.pos_y = gcc->config.pos_y; + gcc->cf->geom.size_w = gcc->config.size_w; + gcc->cf->geom.size_h = gcc->config.size_h; gcc->cf->state_info.seq = gcc->state_info.seq; gcc->cf->state_info.flags = gcc->state_info.flags; gcc->cf->autoscroll = gcc->autoscroll; @@ -1652,7 +1658,7 @@ mi = e_menu_item_new(mn); e_menu_item_separator_set(mi, 1); - gcc->gadcon->menu_attach.func(gcc->gadcon->menu_attach.data, mn); + gcc->gadcon->menu_attach.func(gcc->gadcon->menu_attach.data, gcc, mn); } if (gcc->gadcon->toolbar) =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.h,v retrieving revision 1.46 retrieving revision 1.47 diff -u -3 -r1.46 -r1.47 --- e_gadcon.h 6 May 2008 10:20:53 -0000 1.46 +++ e_gadcon.h 19 May 2008 04:37:34 -0000 1.47 @@ -80,7 +80,7 @@ } frame_request; struct { - void (*func) (void *data, E_Menu *menu); + void (*func) (void *data, E_Gadcon_Client *gcc, E_Menu *menu); void *data; } menu_attach; @@ -135,7 +135,8 @@ void *data; struct { - int pos, size, res; + int pos, size, res; //gadcon + double pos_x, pos_y, size_w, size_h; //gadman } config; struct @@ -203,7 +204,7 @@ EAPI E_Zone *e_gadcon_zone_get(E_Gadcon *gc); EAPI void e_gadcon_ecore_evas_set(E_Gadcon *gc, Ecore_Evas *ee); EAPI int e_gadcon_canvas_zone_geometry_get(E_Gadcon *gc, int *x, int *y, int *w, int *h); -EAPI void e_gadcon_util_menu_attach_func_set(E_Gadcon *gc, void (*func) (void *data, E_Menu *menu), void *data); +EAPI void e_gadcon_util_menu_attach_func_set(E_Gadcon *gc, void (*func) (void *data, E_Gadcon_Client *gcc, E_Menu *menu), void *data); EAPI void e_gadcon_dnd_window_set(E_Gadcon *gc, Ecore_X_Window win); EAPI Ecore_X_Window e_gadcon_dnd_window_get(E_Gadcon *gc); EAPI void e_gadcon_shelf_set(E_Gadcon *gc, E_Shelf *shelf); =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon_popup.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- e_gadcon_popup.c 5 Feb 2008 16:39:22 -0000 1.11 +++ e_gadcon_popup.c 19 May 2008 04:37:34 -0000 1.12 @@ -133,6 +133,17 @@ else if (px < zx) px = zx; break; + case E_GADCON_ORIENT_FLOAT: + px = (gx + (gw / 2)) - (pop->w / 2); + if (gy >= zh / 2) + py = gy - pop->h; + else + py = gy + gh; + if (px + pop->w >= zw) + px = zw - pop->w; + else if (px < zx) + px = zx; + break; default: e_popup_move_resize(pop->win, 50, 50, pop->w, pop->h); return; =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_module.c,v retrieving revision 1.88 retrieving revision 1.89 diff -u -3 -r1.88 -r1.89 --- e_module.c 4 Mar 2008 12:20:50 -0000 1.88 +++ e_module.c 19 May 2008 04:37:34 -0000 1.89 @@ -16,6 +16,7 @@ static void _e_module_cb_dialog_disable(void *data, E_Dialog *dia); static void _e_module_event_update_free(void *data, void *event); static int _e_module_cb_idler(void *data); +static int _e_module_sort_priority(void *d1, void *d2); /* local subsystem globals */ static Evas_List *_e_modules = NULL; @@ -43,7 +44,8 @@ */ VALGRIND_DO_LEAK_CHECK #endif - + + _e_modules = evas_list_reverse(_e_modules); for (l = _e_modules; l; l = l->next) { E_Module *m; @@ -70,7 +72,9 @@ e_module_all_load(void) { Evas_List *l; - + e_config->modules = evas_list_sort(e_config->modules, + evas_list_count(e_config->modules), + _e_module_sort_priority); for (l = e_config->modules; l; l = l->next) { E_Config_Module *em; @@ -445,6 +449,31 @@ } } +EAPI void +e_module_priority_set(E_Module *m, int priority) +{ + /* Set the loading order for a module. + More priority means load earlier */ + Evas_List *l; + + for (l = e_config->modules; l; l = l->next) + { + E_Config_Module *em; + + em = l->data; + if (!em) continue; + if (!e_util_strcmp(m->name, em->name)) + { + if (em->priority != priority) + { + em->priority = priority; + e_config_save_queue(); + } + break; + } + } +} + /* local subsystem functions */ static void @@ -541,4 +570,14 @@ if (_e_modules_delayed) return 1; _e_module_idler = NULL; return 0; +} + +static int +_e_module_sort_priority(void *d1, void *d2) +{ + E_Config_Module *m1, *m2; + + m1 = d1; + m2 = d2; + return (m2->priority - m1->priority); } =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_module.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- e_module.h 2 Nov 2007 12:07:09 -0000 1.21 +++ e_module.h 19 May 2008 04:37:34 -0000 1.22 @@ -68,6 +68,7 @@ EAPI Evas_List *e_module_list(void); EAPI void e_module_dialog_show(E_Module *m, const char *title, const char *body); EAPI void e_module_delayed_set(E_Module *m, int delayed); +EAPI void e_module_priority_set(E_Module *m, int priority); #endif #endif =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v retrieving revision 1.91 retrieving revision 1.92 diff -u -3 -r1.91 -r1.92 --- e_shelf.c 19 Jan 2008 11:41:42 -0000 1.91 +++ e_shelf.c 19 May 2008 04:37:34 -0000 1.92 @@ -15,7 +15,7 @@ static void _e_shelf_cb_confirm_dialog_yes(void *data); static void _e_shelf_cb_menu_delete(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_shelf_menu_append(E_Shelf *es, E_Menu *mn); -static void _e_shelf_cb_menu_items_append(void *data, E_Menu *mn); +static void _e_shelf_cb_menu_items_append(void *data, E_Gadcon_Client *gcc, E_Menu *mn); static void _e_shelf_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info); static int _e_shelf_cb_mouse_in(void *data, int type, void *event); static int _e_shelf_cb_mouse_out(void *data, int type, void *event); @@ -1079,7 +1079,7 @@ } static void -_e_shelf_cb_menu_items_append(void *data, E_Menu *mn) +_e_shelf_cb_menu_items_append(void *data, E_Gadcon_Client *gcc, E_Menu *mn) { E_Shelf *es; =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_toolbar.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- e_toolbar.c 4 Jan 2008 20:59:10 -0000 1.12 +++ e_toolbar.c 19 May 2008 04:37:34 -0000 1.13 @@ -18,7 +18,7 @@ static void _e_toolbar_fm2_files_deleted(void *data, Evas_Object *obj, void *event_info); static void _e_toolbar_fm2_selected(void *data, Evas_Object *obj, void *event_info); static void _e_toolbar_fm2_selection_changed(void *data, Evas_Object *obj, void *event_info); -static void _e_toolbar_menu_items_append(void *data, E_Menu *mn); +static void _e_toolbar_menu_items_append(void *data, E_Gadcon_Client *gcc, E_Menu *mn); /* local vars */ static Evas_List *toolbars = NULL; @@ -336,7 +336,7 @@ } static void -_e_toolbar_menu_items_append(void *data, E_Menu *mn) +_e_toolbar_menu_items_append(void *data, E_Gadcon_Client *gcc, E_Menu *mn) { E_Toolbar *tbar; ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs