parent
bc3d8d18e2
commit
6134584e47
1736
src/bin/e_border.c
1736
src/bin/e_border.c
File diff suppressed because it is too large
Load Diff
|
@ -1756,7 +1756,7 @@ e_config_profile_save(void)
|
|||
}
|
||||
|
||||
/**
|
||||
* Saves configurations to file located in the working profile
|
||||
* Saves configurations to file located in the working profile
|
||||
* The configurations are read from a struct declated by the
|
||||
* macros E_CONFIG_DD_NEW and E_CONFIG_<b>TYPE</b>
|
||||
*
|
||||
|
|
|
@ -19,51 +19,51 @@ struct _Main_Data
|
|||
};
|
||||
|
||||
/* local subsystem functions */
|
||||
static void _e_int_menus_main_del_hook(void *obj);
|
||||
static void _e_int_menus_main_about(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_main_del_hook(void *obj);
|
||||
static void _e_int_menus_main_about(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
//static void _e_int_menus_fwin_favorites_item_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_apps_scan(E_Menu *m, Efreet_Menu *menu);
|
||||
static void _e_int_menus_apps_start(void *data, E_Menu *m);
|
||||
static void _e_int_menus_apps_free_hook2(void *obj);
|
||||
static void _e_int_menus_apps_run(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_apps_drag(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_config_pre_cb(void *data, E_Menu *m);
|
||||
static void _e_int_menus_config_free_hook(void *obj);
|
||||
static void _e_int_menus_clients_pre_cb(void *data, E_Menu *m);
|
||||
static void _e_int_menus_clients_item_create(E_Border *bd, E_Menu *m);
|
||||
static void _e_int_menus_clients_free_hook(void *obj);
|
||||
static void _e_int_menus_clients_item_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_clients_icon_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_clients_cleanup_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static int _e_int_menus_clients_group_desk_cb(const void *d1, const void *d2);
|
||||
static int _e_int_menus_clients_group_class_cb(const void *d1, const void *d2);
|
||||
static int _e_int_menus_clients_sort_alpha_cb(const void *d1, const void *d2);
|
||||
static int _e_int_menus_clients_sort_z_order_cb(const void *d1, const void *d2);
|
||||
static void _e_int_menus_clients_add_by_class(Eina_List *borders, E_Menu *m);
|
||||
static void _e_int_menus_clients_add_by_desk(E_Desk *curr_desk, Eina_List *borders, E_Menu *m);
|
||||
static void _e_int_menus_clients_add_by_none(Eina_List *borders, E_Menu *m);
|
||||
static void _e_int_menus_clients_menu_add_iconified(Eina_List *borders, E_Menu *m);
|
||||
static const char *_e_int_menus_clients_title_abbrv(const char *title);
|
||||
static void _e_int_menus_virtuals_pre_cb(void *data, E_Menu *m);
|
||||
static void _e_int_menus_virtuals_item_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_virtuals_icon_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_themes_about(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_lost_clients_pre_cb(void *data, E_Menu *m);
|
||||
static void _e_int_menus_lost_clients_free_hook(void *obj);
|
||||
static void _e_int_menus_lost_clients_item_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_augmentation_add(E_Menu *m, Eina_List *augmentation);
|
||||
static void _e_int_menus_augmentation_del(E_Menu *m, Eina_List *augmentation);
|
||||
static void _e_int_menus_shelves_pre_cb(void *data, E_Menu *m);
|
||||
static void _e_int_menus_shelves_item_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_shelves_add_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_shelves_del_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_config_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_main_showhide(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_main_restart(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_main_exit(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_desktops_free_hook(void *obj);
|
||||
static void _e_int_menus_desk_item_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_item_label_set(Efreet_Menu *entry, E_Menu_Item *mi);
|
||||
static void _e_int_menus_apps_scan(E_Menu *m, Efreet_Menu *menu);
|
||||
static void _e_int_menus_apps_start(void *data, E_Menu *m);
|
||||
static void _e_int_menus_apps_free_hook2(void *obj);
|
||||
static void _e_int_menus_apps_run(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_apps_drag(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_config_pre_cb(void *data, E_Menu *m);
|
||||
static void _e_int_menus_config_free_hook(void *obj);
|
||||
static void _e_int_menus_clients_pre_cb(void *data, E_Menu *m);
|
||||
static void _e_int_menus_clients_item_create(E_Border *bd, E_Menu *m);
|
||||
static void _e_int_menus_clients_free_hook(void *obj);
|
||||
static void _e_int_menus_clients_item_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_clients_icon_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_clients_cleanup_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static int _e_int_menus_clients_group_desk_cb(const void *d1, const void *d2);
|
||||
static int _e_int_menus_clients_group_class_cb(const void *d1, const void *d2);
|
||||
static int _e_int_menus_clients_sort_alpha_cb(const void *d1, const void *d2);
|
||||
static int _e_int_menus_clients_sort_z_order_cb(const void *d1, const void *d2);
|
||||
static void _e_int_menus_clients_add_by_class(Eina_List *borders, E_Menu *m);
|
||||
static void _e_int_menus_clients_add_by_desk(E_Desk *curr_desk, Eina_List *borders, E_Menu *m);
|
||||
static void _e_int_menus_clients_add_by_none(Eina_List *borders, E_Menu *m);
|
||||
static void _e_int_menus_clients_menu_add_iconified(Eina_List *borders, E_Menu *m);
|
||||
static const char *_e_int_menus_clients_title_abbrv(const char *title);
|
||||
static void _e_int_menus_virtuals_pre_cb(void *data, E_Menu *m);
|
||||
static void _e_int_menus_virtuals_item_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_virtuals_icon_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_themes_about(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_lost_clients_pre_cb(void *data, E_Menu *m);
|
||||
static void _e_int_menus_lost_clients_free_hook(void *obj);
|
||||
static void _e_int_menus_lost_clients_item_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_augmentation_add(E_Menu *m, Eina_List *augmentation);
|
||||
static void _e_int_menus_augmentation_del(E_Menu *m, Eina_List *augmentation);
|
||||
static void _e_int_menus_shelves_pre_cb(void *data, E_Menu *m);
|
||||
static void _e_int_menus_shelves_item_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_shelves_add_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_shelves_del_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_config_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_main_showhide(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_main_restart(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_main_exit(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_desktops_free_hook(void *obj);
|
||||
static void _e_int_menus_desk_item_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_int_menus_item_label_set(Efreet_Menu *entry, E_Menu_Item *mi);
|
||||
static Efreet_Menu *_e_int_menus_apps_thread_new(E_Menu *m, const char *dir);
|
||||
//static void _e_int_menus_apps_drag_finished(E_Drag *drag, int dropped __UNUSED__);
|
||||
|
||||
|
@ -270,7 +270,7 @@ e_int_menus_apps_new(const char *dir)
|
|||
E_Menu *m;
|
||||
|
||||
m = e_menu_new();
|
||||
if (dir) e_object_data_set(E_OBJECT(m), (void*)eina_stringshare_add(dir));
|
||||
if (dir) e_object_data_set(E_OBJECT(m), (void *)eina_stringshare_add(dir));
|
||||
e_menu_pre_activate_callback_set(m, _e_int_menus_apps_start, NULL);
|
||||
return m;
|
||||
}
|
||||
|
@ -728,7 +728,7 @@ _e_int_menus_apps_thread_new(E_Menu *m, const char *dir)
|
|||
if (_e_int_menus_app_menus)
|
||||
menu = eina_hash_find(_e_int_menus_app_menus, dir);
|
||||
else
|
||||
_e_int_menus_app_menus = eina_hash_string_superfast_new((void*)efreet_menu_free);
|
||||
_e_int_menus_app_menus = eina_hash_string_superfast_new((void *)efreet_menu_free);
|
||||
}
|
||||
else
|
||||
menu = _e_int_menus_app_menu_default;
|
||||
|
@ -792,7 +792,7 @@ _e_int_menus_apps_free_hook2(void *obj)
|
|||
m = obj;
|
||||
// XXX TODO: this should be automatic in e_menu, just get references right!
|
||||
// XXX TODO: fix references and remove me!!!
|
||||
EINA_LIST_FOREACH_SAFE(m->items, l, l_next, mi)
|
||||
EINA_LIST_FOREACH_SAFE (m->items, l, l_next, mi)
|
||||
{
|
||||
if (mi->submenu)
|
||||
e_object_del(E_OBJECT(mi->submenu));
|
||||
|
|
|
@ -1,28 +1,28 @@
|
|||
#include "e.h"
|
||||
|
||||
static void *_create_data(E_Config_Dialog *cfd);
|
||||
static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
||||
static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
||||
static int _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
||||
static void *_create_data(E_Config_Dialog *cfd);
|
||||
static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
||||
static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
||||
static int _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
||||
static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
|
||||
static void _cb_disable_check(void *data, Evas_Object *obj);
|
||||
static void _cb_disable_check_list(void *data, Evas_Object *obj);
|
||||
static void _cb_disable_check(void *data, Evas_Object *obj);
|
||||
static void _cb_disable_check_list(void *data, Evas_Object *obj);
|
||||
|
||||
struct _E_Config_Dialog_Data
|
||||
{
|
||||
int move_info_visible;
|
||||
int move_info_follows;
|
||||
int resize_info_visible;
|
||||
int resize_info_follows;
|
||||
int border_shade_animate;
|
||||
int border_shade_transition;
|
||||
double border_shade_speed;
|
||||
int use_app_icon;
|
||||
int window_placement_policy;
|
||||
int window_grouping;
|
||||
int desk_auto_switch;
|
||||
int window_out_of_vscreen_limits;
|
||||
int window_out_of_vscreen_limits_partly;
|
||||
int move_info_visible;
|
||||
int move_info_follows;
|
||||
int resize_info_visible;
|
||||
int resize_info_follows;
|
||||
int border_shade_animate;
|
||||
int border_shade_transition;
|
||||
double border_shade_speed;
|
||||
int use_app_icon;
|
||||
int window_placement_policy;
|
||||
int window_grouping;
|
||||
int desk_auto_switch;
|
||||
int window_out_of_vscreen_limits;
|
||||
int window_out_of_vscreen_limits_partly;
|
||||
|
||||
Eina_List *shading_list;
|
||||
};
|
||||
|
@ -46,8 +46,8 @@ e_int_config_window_display(E_Container *con, const char *params __UNUSED__)
|
|||
|
||||
/* create config diaolg for NULL object/data */
|
||||
cfd = e_config_dialog_new(con, _("Window Display"),
|
||||
"E", "windows/window_display",
|
||||
"preferences-system-windows", 0, v, NULL);
|
||||
"E", "windows/window_display",
|
||||
"preferences-system-windows", 0, v, NULL);
|
||||
return cfd;
|
||||
}
|
||||
|
||||
|
@ -111,19 +111,19 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
|||
static int
|
||||
_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
return ((e_config->window_placement_policy != cfdata->window_placement_policy) ||
|
||||
(e_config->window_grouping != cfdata->window_grouping) ||
|
||||
(e_config->move_info_visible != cfdata->move_info_visible) ||
|
||||
(e_config->move_info_follows != cfdata->move_info_follows) ||
|
||||
(e_config->resize_info_visible != cfdata->resize_info_visible) ||
|
||||
(e_config->resize_info_follows != cfdata->resize_info_follows) ||
|
||||
(e_config->border_shade_animate != cfdata->border_shade_animate) ||
|
||||
(e_config->border_shade_transition != cfdata->border_shade_transition) ||
|
||||
(e_config->border_shade_speed != cfdata->border_shade_speed) ||
|
||||
(e_config->use_app_icon != cfdata->use_app_icon) ||
|
||||
(e_config->desk_auto_switch != cfdata->desk_auto_switch) ||
|
||||
return (e_config->window_placement_policy != cfdata->window_placement_policy) ||
|
||||
(e_config->window_grouping != cfdata->window_grouping) ||
|
||||
(e_config->move_info_visible != cfdata->move_info_visible) ||
|
||||
(e_config->move_info_follows != cfdata->move_info_follows) ||
|
||||
(e_config->resize_info_visible != cfdata->resize_info_visible) ||
|
||||
(e_config->resize_info_follows != cfdata->resize_info_follows) ||
|
||||
(e_config->border_shade_animate != cfdata->border_shade_animate) ||
|
||||
(e_config->border_shade_transition != cfdata->border_shade_transition) ||
|
||||
(e_config->border_shade_speed != cfdata->border_shade_speed) ||
|
||||
(e_config->use_app_icon != cfdata->use_app_icon) ||
|
||||
(e_config->desk_auto_switch != cfdata->desk_auto_switch) ||
|
||||
(e_config->window_out_of_vscreen_limits != cfdata->window_out_of_vscreen_limits) ||
|
||||
(e_config->window_out_of_vscreen_limits_partly != cfdata->window_out_of_vscreen_limits_partly));
|
||||
(e_config->window_out_of_vscreen_limits_partly != cfdata->window_out_of_vscreen_limits_partly);
|
||||
}
|
||||
|
||||
static Evas_Object *
|
||||
|
@ -291,5 +291,6 @@ _cb_disable_check_list(void *data, Evas_Object *obj)
|
|||
Eina_Bool disable = !e_widget_check_checked_get(obj);
|
||||
|
||||
EINA_LIST_FOREACH(list, l, o)
|
||||
e_widget_disabled_set(o, disable);
|
||||
e_widget_disabled_set(o, disable);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue