diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 65290f5b9..f450102ef 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -125,6 +125,7 @@ e_int_config_theme.h \ e_int_config_menus.h \ e_int_config_general.h \ e_int_config_performance.h \ +e_int_config_winlist.h \ e_deskpreview.h \ e_exebuf.h \ e_int_config_modules.h \ @@ -234,6 +235,7 @@ e_int_config_theme.c \ e_int_config_menus.c \ e_int_config_general.c \ e_int_config_performance.c \ +e_int_config_winlist.c \ e_deskpreview.c \ e_exebuf.c \ e_int_config_modules.c \ diff --git a/src/bin/e_config.h b/src/bin/e_config.h index e1c62b56c..b635af11a 100644 --- a/src/bin/e_config.h +++ b/src/bin/e_config.h @@ -83,7 +83,7 @@ struct _E_Config int font_cache; //GUI int edje_cache; //GUI int edje_collection_cache; //GUI - double cache_flush_interval; + double cache_flush_interval; //GUI int zone_desks_x_count; int zone_desks_y_count; int use_virtual_roots; @@ -131,26 +131,26 @@ struct _E_Config int desk_resist; // GUI int window_resist; // GUI int gadget_resist; // GUI - int winlist_warp_while_selecting; - int winlist_warp_at_end; - double winlist_warp_speed; - int winlist_scroll_animate; - double winlist_scroll_speed; - int winlist_list_show_iconified; - int winlist_list_show_other_desk_windows; - int winlist_list_show_other_screen_windows; - int winlist_list_uncover_while_selecting; - int winlist_list_jump_desk_while_selecting; - int winlist_list_focus_while_selecting; - int winlist_list_raise_while_selecting; - double winlist_pos_align_x; - double winlist_pos_align_y; - double winlist_pos_size_w; - double winlist_pos_size_h; - int winlist_pos_min_w; - int winlist_pos_min_h; - int winlist_pos_max_w; - int winlist_pos_max_h; + int winlist_warp_while_selecting; // GUI + int winlist_warp_at_end; // GUI + double winlist_warp_speed; // GUI + int winlist_scroll_animate; // GUI + double winlist_scroll_speed; // GUI + int winlist_list_show_iconified; // GUI + int winlist_list_show_other_desk_windows; // GUI + int winlist_list_show_other_screen_windows; // GUI + int winlist_list_uncover_while_selecting; // GUI + int winlist_list_jump_desk_while_selecting; // GUI + int winlist_list_focus_while_selecting; // GUI + int winlist_list_raise_while_selecting; // GUI + double winlist_pos_align_x; // GUI + double winlist_pos_align_y; // GUI + double winlist_pos_size_w; // GUI + double winlist_pos_size_h; // GUI + int winlist_pos_min_w; // GUI + int winlist_pos_min_h; // GUI + int winlist_pos_max_w; // GUI + int winlist_pos_max_h; // GUI int maximize_policy; // GUI int kill_if_close_not_possible; int kill_process; diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c index d6c1d0c7f..9c0ec7a19 100644 --- a/src/bin/e_configure.c +++ b/src/bin/e_configure.c @@ -69,6 +69,7 @@ e_configure_show(E_Container *con) e_configure_standard_item_add(eco, "enlightenment/e", _("Focus Settings"), e_int_config_focus); e_configure_standard_item_add(eco, "enlightenment/favorites", _("Menu Settings"), e_int_config_menus); e_configure_standard_item_add(eco, "enlightenment/configuration", _("Performance Settings"), e_int_config_performance); + e_configure_standard_item_add(eco, "enlightenment/windows", _("Window List Settings"), e_int_config_winlist); e_configure_standard_item_add(eco, "enlightenment/windows", _("Window Display"), e_int_config_window_display); e_configure_standard_item_add(eco, "enlightenment/windows", _("Window Manipulation"), e_int_config_window_manipulation); diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h index 2e8487535..7e044de51 100644 --- a/src/bin/e_includes.h +++ b/src/bin/e_includes.h @@ -105,6 +105,7 @@ #include "e_int_config_menus.h" #include "e_int_config_general.h" #include "e_int_config_performance.h" +#include "e_int_config_winlist.h" #include "e_deskpreview.h" #include "e_exebuf.h" #include "e_int_config_modules.h" diff --git a/src/bin/e_int_config_winlist.c b/src/bin/e_int_config_winlist.c new file mode 100644 index 000000000..2ff6670f3 --- /dev/null +++ b/src/bin/e_int_config_winlist.c @@ -0,0 +1,238 @@ +#include "e.h" + +/* TODO: Implement Pos Settings */ + +typedef struct _CFData CFData; + +static void *_create_data(E_Config_Dialog *cfd); +static void _free_data(E_Config_Dialog *cfd, CFData *cfdata); +static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata); +static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); +static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata); +static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); + +struct _CFData +{ + int warp_while_selecting; + int warp_at_end; + int scroll_animate; + + int list_show_iconified; + int list_show_other_desk_windows; + int list_show_other_screen_windows; + int list_uncover_while_selecting; + int list_jump_desk_while_selecting; + int list_focus_while_selecting; + int list_raise_while_selecting; + + /* Advanced */ + double scroll_speed; + double warp_speed; + + /* TODO */ + double pos_align_x; + double pos_align_y; + double pos_size_w; + double pos_size_h; + int pos_min_w; + int pos_min_h; + int pos_max_w; + int pos_max_h; +}; + +E_Config_Dialog * +e_int_config_winlist(E_Container *con) +{ + E_Config_Dialog *cfd; + E_Config_Dialog_View v; + + v.create_cfdata = _create_data; + v.free_cfdata = _free_data; + v.basic.apply_cfdata = _basic_apply_data; + v.basic.create_widgets = _basic_create_widgets; + v.advanced.apply_cfdata = _advanced_apply_data; + v.advanced.create_widgets = _advanced_create_widgets; + + cfd = e_config_dialog_new(con, _("Window List Settings"), NULL, 0, &v, NULL); + return cfd; +} + +static void +_fill_data(CFData *cfdata) +{ + cfdata->warp_while_selecting = e_config->winlist_warp_while_selecting; + cfdata->warp_at_end = e_config->winlist_warp_at_end; + cfdata->warp_speed = e_config->winlist_warp_speed; + cfdata->scroll_animate = e_config->winlist_scroll_animate; + cfdata->scroll_speed = e_config->winlist_scroll_speed; + cfdata->list_show_iconified = e_config->winlist_list_show_iconified; + cfdata->list_show_other_desk_windows = e_config->winlist_list_show_other_desk_windows; + cfdata->list_show_other_screen_windows = e_config->winlist_list_show_other_screen_windows; + cfdata->list_uncover_while_selecting = e_config->winlist_list_uncover_while_selecting; + cfdata->list_jump_desk_while_selecting = e_config->winlist_list_jump_desk_while_selecting; + cfdata->list_focus_while_selecting = e_config->winlist_list_focus_while_selecting; + cfdata->list_raise_while_selecting = e_config->winlist_list_raise_while_selecting; + cfdata->pos_align_x = e_config->winlist_pos_align_x; + cfdata->pos_align_y = e_config->winlist_pos_align_y; + cfdata->pos_size_w = e_config->winlist_pos_size_w; + cfdata->pos_size_h = e_config->winlist_pos_size_h; + cfdata->pos_min_w = e_config->winlist_pos_min_w; + cfdata->pos_min_h = e_config->winlist_pos_min_h; + cfdata->pos_max_w = e_config->winlist_pos_max_w; + cfdata->pos_max_h = e_config->winlist_pos_max_h; +} + +static void * +_create_data(E_Config_Dialog *cfd) +{ + CFData *cfdata; + + cfdata = E_NEW(CFData, 1); + return cfdata; +} + +static void +_free_data(E_Config_Dialog *cfd, CFData *cfdata) +{ + free(cfdata); +} + +static int +_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) +{ + e_border_button_bindings_ungrab_all(); + e_config->winlist_list_show_iconified = cfdata->list_show_iconified; + e_config->winlist_list_show_other_desk_windows = cfdata->list_show_other_desk_windows; + e_config->winlist_list_show_other_screen_windows = cfdata->list_show_other_screen_windows; + e_config->winlist_list_uncover_while_selecting = cfdata->list_uncover_while_selecting; + e_config->winlist_list_jump_desk_while_selecting = cfdata->list_jump_desk_while_selecting; + e_config->winlist_warp_while_selecting = cfdata->warp_while_selecting; + e_config->winlist_warp_at_end = cfdata->warp_at_end; + e_config->winlist_scroll_animate = cfdata->scroll_animate; + e_config->winlist_list_focus_while_selecting = cfdata->list_focus_while_selecting; + e_config->winlist_list_raise_while_selecting = cfdata->list_raise_while_selecting; + e_border_button_bindings_grab_all(); + e_config_save_queue(); + + return 1; +} + +static Evas_Object * +_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) +{ + Evas_Object *o, *of, *ob; + + _fill_data(cfdata); + + o = e_widget_list_add(evas, 0, 0); + + of = e_widget_framelist_add(evas, _("General Settings"), 0); + ob = e_widget_check_add(evas, _("Show iconified windows"), &(cfdata->list_show_iconified)); + e_widget_framelist_object_append(of, ob); + ob = e_widget_check_add(evas, _("Show windows from other desks"), &(cfdata->list_show_other_desk_windows)); + e_widget_framelist_object_append(of, ob); + ob = e_widget_check_add(evas, _("Show windows from other screens"), &(cfdata->list_show_other_screen_windows)); + e_widget_framelist_object_append(of, ob); + e_widget_list_object_append(o, of, 1, 1, 0.5); + + of = e_widget_framelist_add(evas, _("Selection Settings"), 0); + ob = e_widget_check_add(evas, _("Focus window while selecting"), &(cfdata->list_focus_while_selecting)); + e_widget_framelist_object_append(of, ob); + ob = e_widget_check_add(evas, _("Raise window while selecting"), &(cfdata->list_raise_while_selecting)); + e_widget_framelist_object_append(of, ob); + ob = e_widget_check_add(evas, _("Warp mouse to window while selecting"), &(cfdata->warp_while_selecting)); + e_widget_framelist_object_append(of, ob); + ob = e_widget_check_add(evas, _("Uncover windows while selecting"), &(cfdata->list_uncover_while_selecting)); + e_widget_framelist_object_append(of, ob); + ob = e_widget_check_add(evas, _("Jump to desk while selecting"), &(cfdata->list_jump_desk_while_selecting)); + e_widget_framelist_object_append(of, ob); + e_widget_list_object_append(o, of, 1, 1, 0.5); + + of = e_widget_framelist_add(evas, _("Warp Settings"), 0); + ob = e_widget_check_add(evas, _("Warp At End"), &(cfdata->warp_at_end)); + e_widget_framelist_object_append(of, ob); + e_widget_list_object_append(o, of, 1, 1, 0.5); + + of = e_widget_framelist_add(evas, _("Scroll Settings"), 0); + ob = e_widget_check_add(evas, _("Scroll Animate"), &(cfdata->scroll_animate)); + e_widget_framelist_object_append(of, ob); + e_widget_list_object_append(o, of, 1, 1, 0.5); + + return o; +} + +static int +_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) +{ + e_border_button_bindings_ungrab_all(); + e_config->winlist_list_show_iconified = cfdata->list_show_iconified; + e_config->winlist_list_show_other_desk_windows = cfdata->list_show_other_desk_windows; + e_config->winlist_list_show_other_screen_windows = cfdata->list_show_other_screen_windows; + e_config->winlist_list_uncover_while_selecting = cfdata->list_uncover_while_selecting; + e_config->winlist_list_jump_desk_while_selecting = cfdata->list_jump_desk_while_selecting; + e_config->winlist_warp_while_selecting = cfdata->warp_while_selecting; + e_config->winlist_warp_at_end = cfdata->warp_at_end; + e_config->winlist_scroll_animate = cfdata->scroll_animate; + e_config->winlist_list_focus_while_selecting = cfdata->list_focus_while_selecting; + e_config->winlist_list_raise_while_selecting = cfdata->list_raise_while_selecting; + e_config->winlist_warp_speed = cfdata->warp_speed; + e_config->winlist_scroll_speed = cfdata->scroll_speed; + e_border_button_bindings_grab_all(); + e_config_save_queue(); + + return 1; +} + +static Evas_Object * +_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) +{ + Evas_Object *o, *of, *ob; + + _fill_data(cfdata); + + o = e_widget_list_add(evas, 0, 0); + + of = e_widget_framelist_add(evas, _("General Settings"), 0); + ob = e_widget_check_add(evas, _("Show iconified windows"), &(cfdata->list_show_iconified)); + e_widget_framelist_object_append(of, ob); + ob = e_widget_check_add(evas, _("Show windows from other desks"), &(cfdata->list_show_other_desk_windows)); + e_widget_framelist_object_append(of, ob); + ob = e_widget_check_add(evas, _("Show windows from other screens"), &(cfdata->list_show_other_screen_windows)); + e_widget_framelist_object_append(of, ob); + e_widget_list_object_append(o, of, 1, 1, 0.5); + + of = e_widget_framelist_add(evas, _("Selection Settings"), 0); + ob = e_widget_check_add(evas, _("Focus window while selecting"), &(cfdata->list_focus_while_selecting)); + e_widget_framelist_object_append(of, ob); + ob = e_widget_check_add(evas, _("Raise window while selecting"), &(cfdata->list_raise_while_selecting)); + e_widget_framelist_object_append(of, ob); + ob = e_widget_check_add(evas, _("Warp mouse to window while selecting"), &(cfdata->warp_while_selecting)); + e_widget_framelist_object_append(of, ob); + ob = e_widget_check_add(evas, _("Uncover windows while selecting"), &(cfdata->list_uncover_while_selecting)); + e_widget_framelist_object_append(of, ob); + ob = e_widget_check_add(evas, _("Jump to desk while selecting"), &(cfdata->list_jump_desk_while_selecting)); + e_widget_framelist_object_append(of, ob); + e_widget_list_object_append(o, of, 1, 1, 0.5); + + of = e_widget_framelist_add(evas, _("Warp Settings"), 0); + ob = e_widget_check_add(evas, _("Warp At End"), &(cfdata->warp_at_end)); + e_widget_framelist_object_append(of, ob); + ob = e_widget_label_add(evas, _("Warp Speed")); + e_widget_framelist_object_append(of, ob); + ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.0, 1.0, 0.01, 0, &(cfdata->warp_speed), NULL, 200); + e_widget_framelist_object_append(of, ob); + e_widget_list_object_append(o, of, 1, 1, 0.5); + + of = e_widget_framelist_add(evas, _("Scroll Settings"), 0); + ob = e_widget_check_add(evas, _("Scroll Animate"), &(cfdata->scroll_animate)); + e_widget_framelist_object_append(of, ob); + ob = e_widget_label_add(evas, _("Scroll Speed")); + e_widget_framelist_object_append(of, ob); + ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.0, 1.0, 0.01, 0, &(cfdata->scroll_speed), NULL, 200); + e_widget_framelist_object_append(of, ob); + + e_widget_list_object_append(o, of, 1, 1, 0.5); + + /* TODO: Implement pos settings */ + return o; +} diff --git a/src/bin/e_int_config_winlist.h b/src/bin/e_int_config_winlist.h new file mode 100644 index 000000000..f271f2553 --- /dev/null +++ b/src/bin/e_int_config_winlist.h @@ -0,0 +1,9 @@ +#ifdef E_TYPEDEFS +#else +#ifndef E_INT_CONFIG_WINLIST_H +#define E_INT_CONFIG_WINLIST_H + +EAPI E_Config_Dialog *e_int_config_winlist(E_Container *con); + +#endif +#endif