formatting

SVN revision: 72850
This commit is contained in:
Mike Blumenkrantz 2012-06-26 07:01:52 +00:00
parent f14d0a0ea6
commit ded80790e8
1 changed files with 244 additions and 227 deletions

View File

@ -1,6 +1,6 @@
#ifdef E_TYPEDEFS
#define E_CONFIG_LIMIT(v, min, max) {if (v >= max) v = max; else if (v <= min) v = min;}
#define E_CONFIG_LIMIT(v, min, max) {if (v >= max) v = max; else if (v <= min) v = min; }
typedef struct _E_Config E_Config;
typedef struct _E_Config_Module E_Config_Module;
@ -64,7 +64,7 @@ struct _E_Config
int zone_desks_y_count; // GUI
int show_desktop_icons; // GUI
int edge_flip_dragging; // GUI
int use_composite; // GUI
int use_composite; // GUI
const char *language; // GUI
Eina_List *modules; // GUI
Eina_List *font_fallbacks; // GUI
@ -147,135 +147,140 @@ struct _E_Config
int menu_autoscroll_margin; // GUI
int menu_autoscroll_cursor_margin; // GUI
const char *input_method; // GUI
struct {
int move; // GUI
int resize; // GUI
int raise; // GUI
int lower; // GUI
int layer; // GUI
int desktop; // GUI
int iconify; // GUI
struct
{
int move; // GUI
int resize; // GUI
int raise; // GUI
int lower; // GUI
int layer; // GUI
int desktop; // GUI
int iconify; // GUI
} transient;
int modal_windows;
int menu_eap_name_show; // GUI
int menu_eap_generic_show; // GUI
int menu_eap_comment_show; // GUI
int menu_favorites_show; // GUI
int menu_apps_show; // GUI
int menu_gadcon_client_toplevel; // GUI
int fullscreen_policy; // GUI
const char *exebuf_term_cmd; // GUI
Eina_List *color_classes; // GUI
int use_app_icon; // GUI
int cnfmdlg_disabled; // GUI
int cfgdlg_auto_apply; // GUI
int cfgdlg_default_mode; // GUI
Eina_List *gadcons; // GUI
Eina_List *shelves; // GUI
int font_hinting; // GUI
int modal_windows;
int menu_eap_name_show; // GUI
int menu_eap_generic_show; // GUI
int menu_eap_comment_show; // GUI
int menu_favorites_show; // GUI
int menu_apps_show; // GUI
int menu_gadcon_client_toplevel; // GUI
int fullscreen_policy; // GUI
const char *exebuf_term_cmd; // GUI
Eina_List *color_classes; // GUI
int use_app_icon; // GUI
int cnfmdlg_disabled; // GUI
int cfgdlg_auto_apply; // GUI
int cfgdlg_default_mode; // GUI
Eina_List *gadcons; // GUI
Eina_List *shelves; // GUI
int font_hinting; // GUI
const char *desklock_personal_passwd; // GUI
const char *desklock_background; // GUI
int desklock_auth_method; // GUI
int desklock_login_box_zone; // GUI
int desklock_start_locked; // GUI
int desklock_on_suspend; // GUI
int desklock_autolock_screensaver; // GUI
double desklock_post_screensaver_time; // GUI
int desklock_autolock_idle; // GUI
double desklock_autolock_idle_timeout; // GUI
int desklock_use_custom_desklock; // GUI
const char *desklock_custom_desklock_cmd; // GUI
unsigned char desklock_ask_presentation; // GUI
double desklock_ask_presentation_timeout; // GUI
const char *desklock_personal_passwd; // GUI
const char *desklock_background; // GUI
int desklock_auth_method; // GUI
int desklock_login_box_zone; // GUI
int desklock_start_locked; // GUI
int desklock_on_suspend; // GUI
int desklock_autolock_screensaver; // GUI
double desklock_post_screensaver_time; // GUI
int desklock_autolock_idle; // GUI
double desklock_autolock_idle_timeout; // GUI
int desklock_use_custom_desklock; // GUI
const char *desklock_custom_desklock_cmd; // GUI
unsigned char desklock_ask_presentation; // GUI
double desklock_ask_presentation_timeout; // GUI
int screensaver_enable; // GUI
int screensaver_timeout; // GUI
int screensaver_interval; // GUI
int screensaver_blanking; // GUI
int screensaver_expose; // GUI
unsigned char screensaver_ask_presentation; // GUI
double screensaver_ask_presentation_timeout; // GUI
int screensaver_enable; // GUI
int screensaver_timeout; // GUI
int screensaver_interval; // GUI
int screensaver_blanking; // GUI
int screensaver_expose; // GUI
unsigned char screensaver_ask_presentation; // GUI
double screensaver_ask_presentation_timeout; // GUI
unsigned char screensaver_suspend; // GUI
unsigned char screensaver_suspend_on_ac; // GUI
double screensaver_suspend_delay; // GUI
unsigned char screensaver_suspend; // GUI
unsigned char screensaver_suspend_on_ac; // GUI
double screensaver_suspend_delay; // GUI
int dpms_enable; // GUI
int dpms_standby_enable; // GUI
int dpms_standby_timeout; // GUI
int dpms_suspend_enable; // GUI
int dpms_suspend_timeout; // GUI
int dpms_off_enable; // GUI
int dpms_off_timeout; // GUI
int dpms_enable; // GUI
int dpms_standby_enable; // GUI
int dpms_standby_timeout; // GUI
int dpms_suspend_enable; // GUI
int dpms_suspend_timeout; // GUI
int dpms_off_enable; // GUI
int dpms_off_timeout; // GUI
int clientlist_group_by; // GUI
int clientlist_include_all_zones; // GUI
int clientlist_separate_with; // GUI
int clientlist_sort_by; // GUI
int clientlist_separate_iconified_apps; // GUI
int clientlist_warp_to_iconified_desktop; // GUI
int clientlist_limit_caption_len; // GUI
int clientlist_max_caption_len; // GUI
int clientlist_group_by; // GUI
int clientlist_include_all_zones; // GUI
int clientlist_separate_with; // GUI
int clientlist_sort_by; // GUI
int clientlist_separate_iconified_apps; // GUI
int clientlist_warp_to_iconified_desktop; // GUI
int clientlist_limit_caption_len; // GUI
int clientlist_max_caption_len; // GUI
int mouse_hand; //GUI
int mouse_accel_numerator; // GUI
int mouse_accel_denominator; // GUI
int mouse_accel_threshold; // GUI
int mouse_hand; //GUI
int mouse_accel_numerator; // GUI
int mouse_accel_denominator; // GUI
int mouse_accel_threshold; // GUI
E_Randr_Serialized_Setup *randr_serialized_setup; // GUI
E_Randr_Serialized_Setup *randr_serialized_setup; // GUI
int border_raise_on_mouse_action; // GUI
int border_raise_on_focus; // GUI
int desk_flip_wrap; // GUI
int fullscreen_flip; // GUI
int border_raise_on_mouse_action; // GUI
int border_raise_on_focus; // GUI
int desk_flip_wrap; // GUI
int fullscreen_flip; // GUI
const char *icon_theme; // GUI
unsigned char icon_theme_overrides; // GUI
const char *icon_theme; // GUI
unsigned char icon_theme_overrides; // GUI
int desk_flip_animate_mode; // GUI
int desk_flip_animate_interpolation; // GUI
double desk_flip_animate_time; // GUI
int desk_flip_animate_mode; // GUI
int desk_flip_animate_interpolation; // GUI
double desk_flip_animate_time; // GUI
const char *wallpaper_import_last_dev; // INTERNAL
const char *wallpaper_import_last_path; // INTERNAL
const char *wallpaper_import_last_dev; // INTERNAL
const char *wallpaper_import_last_path; // INTERNAL
const char *theme_default_border_style; // GUI
const char *theme_default_border_style; // GUI
Eina_List *mime_icons; // GUI
int desk_auto_switch; // GUI;
Eina_List *mime_icons; // GUI
int desk_auto_switch; // GUI;
int thumb_nice;
int thumb_nice;
int ping_clients_interval; // GUI
int cache_flush_poll_interval; // GUI
int ping_clients_interval; // GUI
int cache_flush_poll_interval; // GUI
int thumbscroll_enable; // GUI
int thumbscroll_threshhold; // GUI
double thumbscroll_momentum_threshhold; // GUI
double thumbscroll_friction; // GUI
int thumbscroll_enable; // GUI
int thumbscroll_threshhold; // GUI
double thumbscroll_momentum_threshhold; // GUI
double thumbscroll_friction; // GUI
int device_desktop; // GUI
int device_auto_mount; // GUI
int device_auto_open; // GUI
int device_desktop; // GUI
int device_auto_mount; // GUI
int device_auto_open; // GUI
struct {
struct
{
double timeout; // GUI
struct {
unsigned char dx; // GUI
unsigned char dy; // GUI
struct
{
unsigned char dx; // GUI
unsigned char dy; // GUI
} move;
struct {
unsigned char dx; // GUI
unsigned char dy; // GUI
struct
{
unsigned char dx; // GUI
unsigned char dy; // GUI
} resize;
} border_keyboard;
struct {
double min; // GUI
double max; // GUI
double factor; // GUI
int base_dpi; // GUI
struct
{
double min; // GUI
double max; // GUI
double factor; // GUI
int base_dpi; // GUI
unsigned char use_dpi; // GUI
unsigned char use_custom; // GUI
} scale;
@ -283,25 +288,29 @@ struct _E_Config
unsigned char show_cursor; // GUI
unsigned char idle_cursor; // GUI
const char *default_system_menu; // GUI
const char *default_system_menu; // GUI
unsigned char cfgdlg_normal_wins; // GUI
struct {
struct {
int icon_size; // GUI
struct
{
struct
{
int icon_size; // GUI
} main, secondary, extra;
double timeout; // GUI
unsigned char do_input; // GUI
Eina_List *actions;
double timeout; // GUI
unsigned char do_input; // GUI
Eina_List *actions;
} syscon;
struct {
struct
{
unsigned char presentation; // INTERNAL
unsigned char offline; // INTERNAL
} mode;
struct {
struct
{
double expire_timeout;
unsigned char show_run_dialog;
unsigned char show_exit_dialog;
@ -309,52 +318,58 @@ struct _E_Config
unsigned char null_container_win; // HYPER-ADVANCED-ONLY - TURNING ON KILLS DESKTOP BG
Eina_List *env_vars; // GUI
Eina_List *env_vars; // GUI
struct {
double normal; // GUI
double dim; // GUI
double transition; // GUI
struct
{
double normal; // GUI
double dim; // GUI
double transition; // GUI
unsigned char idle_dim; // GUI
double timer; // GUI
double timer; // GUI
} backlight;
struct {
double none;
double low;
double medium;
double high;
double extreme;
struct
{
double none;
double low;
double medium;
double high;
double extreme;
E_Powersave_Mode min;
E_Powersave_Mode max;
} powersave;
struct {
struct
{
unsigned char load_xrdb; // GUI
unsigned char load_xmodmap; // GUI
unsigned char load_gnome; // GUI
unsigned char load_kde; // GUI
} deskenv;
struct {
unsigned char enabled; // GUI
unsigned char match_e17_theme; // GUI
unsigned char match_e17_icon_theme; // GUI
int xft_antialias;
int xft_hinting;
const char *xft_hint_style;
const char *xft_rgba;
const char *net_theme_name; // GUI
const char *net_icon_theme_name; // GUI
const char *gtk_font_name;
struct
{
unsigned char enabled; // GUI
unsigned char match_e17_theme; // GUI
unsigned char match_e17_icon_theme; // GUI
int xft_antialias;
int xft_hinting;
const char *xft_hint_style;
const char *xft_rgba;
const char *net_theme_name; // GUI
const char *net_icon_theme_name; // GUI
const char *gtk_font_name;
} xsettings;
struct {
struct
{
unsigned char check; // INTERNAL
unsigned char later; // INTERNAL
} update;
struct {
struct
{
Eina_List *used_layouts;
Eina_List *used_options;
int only_label;
@ -364,8 +379,8 @@ struct _E_Config
struct _E_Config_Env_Var
{
const char *var;
const char *val;
const char *var;
const char *val;
unsigned char unset;
};
@ -380,93 +395,93 @@ struct _E_Config_Syscon_Action
struct _E_Config_Module
{
const char *name;
unsigned char enabled;
unsigned char delayed;
int priority;
const char *name;
unsigned char enabled;
unsigned char delayed;
int priority;
};
struct _E_Config_Theme
{
const char *category;
const char *file;
const char *category;
const char *file;
};
struct _E_Config_Binding_Mouse
{
int context;
int modifiers;
const char *action;
const char *params;
unsigned char button;
unsigned char any_mod;
int context;
int modifiers;
const char *action;
const char *params;
unsigned char button;
unsigned char any_mod;
};
struct _E_Config_Binding_Key
{
int context;
unsigned int modifiers;
const char *key;
const char *action;
const char *params;
unsigned char any_mod;
int context;
unsigned int modifiers;
const char *key;
const char *action;
const char *params;
unsigned char any_mod;
};
struct _E_Config_Binding_Edge
{
int context;
int modifiers;
float delay;
const char *action;
const char *params;
unsigned char edge;
unsigned char any_mod;
int context;
int modifiers;
float delay;
const char *action;
const char *params;
unsigned char edge;
unsigned char any_mod;
};
struct _E_Config_Binding_Signal
{
int context;
const char *signal;
const char *source;
int modifiers;
unsigned char any_mod;
const char *action;
const char *params;
int context;
const char *signal;
const char *source;
int modifiers;
unsigned char any_mod;
const char *action;
const char *params;
};
struct _E_Config_Binding_Wheel
{
int context;
int direction;
int z;
int modifiers;
unsigned char any_mod;
const char *action;
const char *params;
int context;
int direction;
int z;
int modifiers;
unsigned char any_mod;
const char *action;
const char *params;
};
struct _E_Config_Binding_Acpi
{
int context, type, status;
int context, type, status;
const char *action, *params;
};
struct _E_Config_Desktop_Background
{
int container;
int zone;
int desk_x;
int desk_y;
const char *file;
int container;
int zone;
int desk_x;
int desk_y;
const char *file;
};
struct _E_Config_Desktop_Name
{
int container;
int zone;
int desk_x;
int desk_y;
const char *name;
int container;
int zone;
int desk_x;
int desk_y;
const char *name;
};
struct _E_Config_Gadcon
@ -479,20 +494,22 @@ struct _E_Config_Gadcon
struct _E_Config_Gadcon_Client
{
const char *name;
const char *id;
struct {
int pos, size, res; //gadcon
const char *name;
const char *id;
struct
{
int pos, size, res; //gadcon
double pos_x, pos_y, size_w, size_h; //gadman
} geom;
struct {
struct
{
int seq, flags;
} state_info;
const char *style;
int orient;
unsigned char autoscroll;
unsigned char resizable;
const char *theme;
const char *style;
int orient;
unsigned char autoscroll;
unsigned char resizable;
const char *theme;
};
struct _E_Config_Shelf
@ -508,11 +525,11 @@ struct _E_Config_Shelf
const char *style;
int size;
int overlap;
int autohide;
int autohide;
int autohide_show_action;
float hide_timeout;
float hide_duration;
int desk_show_mode;
float hide_timeout;
float hide_duration;
int desk_show_mode;
Eina_List *desk_list;
};
@ -544,29 +561,29 @@ struct _E_Config_XKB_Option
const char *name;
};
EINTERN int e_config_init(void);
EINTERN int e_config_shutdown(void);
EINTERN int e_config_init(void);
EINTERN int e_config_shutdown(void);
EAPI void e_config_load(void);
EAPI void e_config_load(void);
EAPI int e_config_save(void);
EAPI void e_config_save_flush(void);
EAPI void e_config_save_queue(void);
EAPI int e_config_save(void);
EAPI void e_config_save_flush(void);
EAPI void e_config_save_queue(void);
EAPI const char*e_config_profile_get(void);
EAPI char *e_config_profile_dir_get(const char *prof);
EAPI void e_config_profile_set(const char *prof);
EAPI Eina_List *e_config_profile_list(void);
EAPI void e_config_profile_add(const char *prof);
EAPI void e_config_profile_del(const char *prof);
EAPI const char *e_config_profile_get(void);
EAPI char *e_config_profile_dir_get(const char *prof);
EAPI void e_config_profile_set(const char *prof);
EAPI Eina_List *e_config_profile_list(void);
EAPI void e_config_profile_add(const char *prof);
EAPI void e_config_profile_del(const char *prof);
EAPI void e_config_save_block_set(int block);
EAPI int e_config_save_block_get(void);
EAPI void e_config_save_block_set(int block);
EAPI int e_config_save_block_get(void);
EAPI void *e_config_domain_load(const char *domain, E_Config_DD *edd);
EAPI void *e_config_domain_system_load(const char *domain, E_Config_DD *edd);
EAPI int e_config_profile_save(void);
EAPI int e_config_domain_save(const char *domain, E_Config_DD *edd, const void *data);
EAPI void *e_config_domain_load(const char *domain, E_Config_DD *edd);
EAPI void *e_config_domain_system_load(const char *domain, E_Config_DD *edd);
EAPI int e_config_profile_save(void);
EAPI int e_config_domain_save(const char *domain, E_Config_DD *edd, const void *data);
EAPI E_Config_Binding_Mouse *e_config_binding_mouse_match(E_Config_Binding_Mouse *eb_in);
EAPI E_Config_Binding_Key *e_config_binding_key_match(E_Config_Binding_Key *eb_in);
@ -576,7 +593,7 @@ EAPI E_Config_Binding_Wheel *e_config_binding_wheel_match(E_Config_Binding_Whee
EAPI E_Config_Binding_Acpi *e_config_binding_acpi_match(E_Config_Binding_Acpi *eb_in);
EAPI void e_config_mode_changed(void);
extern EAPI E_Config *e_config;
extern EAPI E_Config * e_config;
extern EAPI int E_EVENT_CONFIG_ICON_THEME;
extern EAPI int E_EVENT_CONFIG_MODE_CHANGED;