From 1fa9578da25d142b0b27f46f6d359fec515b2ff9 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Mon, 25 Jan 2010 12:53:43 +0000 Subject: [PATCH] update config with new fields/versions, add texture form pixmap option to gl compositor SVN revision: 45549 --- config/default/e.src | 5 +- config/illume-home/e.src | 435 ++++++++++++++++---------------- config/illume/e.src | 5 +- config/minimalist/e.src | 5 +- config/netbook/e.src | 5 +- config/scaleable/e.src | 5 +- config/standard/e.src | 5 +- src/modules/comp/e_mod_comp.c | 11 +- src/modules/comp/e_mod_config.c | 13 +- src/modules/comp/e_mod_main.c | 2 + src/modules/comp/e_mod_main.h | 1 + 11 files changed, 263 insertions(+), 229 deletions(-) diff --git a/config/default/e.src b/config/default/e.src index db4f828ab..33588540a 100644 --- a/config/default/e.src +++ b/config/default/e.src @@ -1,5 +1,5 @@ group "E_Config" struct { - value "config_version" int: 65842; + value "config_version" int: 65844; value "show_splash" int: 0; value "init_default_theme" string: "default.edj"; value "desktop_default_name" string: "Desktop %i, %i"; @@ -534,4 +534,7 @@ group "E_Config" struct { value "syscon.do_input" uchar: 0; value "mode.presentation" uchar: 0; value "mode.offline" uchar: 0; + value "exec.expire_timeout" double: 30.0; + value "exec.show_run_dialog" uchar: 1; + value "exec.show_exit_dialog" uchar: 1; } diff --git a/config/illume-home/e.src b/config/illume-home/e.src index 2acb3c0eb..cc7a4dd9d 100644 --- a/config/illume-home/e.src +++ b/config/illume-home/e.src @@ -1,4 +1,220 @@ group "E_Config" struct { + value "config_version" int: 65844; + value "show_splash" int: 1; + value "init_default_theme" string: "default.edj"; + value "desktop_default_name" string: "Desktop %i, %i"; + value "menus_scroll_speed" double: 1000.0000000000000000000000000; + value "menus_fast_mouse_move_threshhold" double: 300.0000000000000000000000000; + value "menus_click_drag_timeout" double: 0.2500000000000000000000000; + value "border_shade_animate" int: 1; + value "border_shade_transition" int: 1; + value "border_shade_speed" double: 1800.0000000000000000000000000; + value "framerate" double: 60.0000000000000000000000000; + value "priority" int: 1; + value "image_cache" int: 4096; + value "font_cache" int: 512; + value "edje_cache" int: 32; + value "edje_collection_cache" int: 64; + value "zone_desks_x_count" int: 1; + value "zone_desks_y_count" int: 1; + value "use_virtual_roots" int: 0; + value "show_desktop_icons" int: 1; + value "edge_flip_dragging" int: 1; + value "evas_engine_default" int: 1; + value "evas_engine_container" int: 0; + value "evas_engine_init" int: 0; + value "evas_engine_menus" int: 0; + value "evas_engine_borders" int: 0; + value "evas_engine_errors" int: 0; + value "evas_engine_popups" int: 0; + value "evas_engine_drag" int: 0; + value "evas_engine_win" int: 0; + value "evas_engine_zone" int: 0; + value "use_composite" int: 0; + value "language" string: "en_US.UTF-8"; + value "window_placement_policy" int: 0; + value "focus_policy" int: 0; + value "focus_setting" int: 1; + value "pass_click_on" int: 1; + value "always_click_to_raise" int: 0; + value "always_click_to_focus" int: 1; + value "use_auto_raise" int: 0; + value "auto_raise_delay" double: 0.5000000000000000000000000; + value "use_resist" int: 1; + value "drag_resist" int: 16; + value "desk_resist" int: 32; + value "window_resist" int: 12; + value "gadget_resist" int: 32; + value "winlist_warp_while_selecting" int: 1; + value "winlist_warp_at_end" int: 1; + value "winlist_warp_speed" double: 0.1000000000000000055511151; + value "winlist_scroll_animate" int: 1; + value "winlist_scroll_speed" double: 0.1000000000000000055511151; + value "winlist_list_show_iconified" int: 1; + value "winlist_list_show_other_desk_iconified" int: 1; + value "winlist_list_show_other_screen_iconified" int: 0; + value "winlist_list_show_other_desk_windows" int: 0; + value "winlist_list_show_other_screen_windows" int: 0; + value "winlist_list_uncover_while_selecting" int: 0; + value "winlist_list_jump_desk_while_selecting" int: 0; + value "winlist_list_focus_while_selecting" int: 1; + value "winlist_list_raise_while_selecting" int: 1; + value "winlist_pos_align_x" double: 0.5000000000000000000000000; + value "winlist_pos_align_y" double: 0.5000000000000000000000000; + value "winlist_pos_size_w" double: 0.5000000000000000000000000; + value "winlist_pos_size_h" double: 0.5000000000000000000000000; + value "winlist_pos_min_w" int: 0; + value "winlist_pos_min_h" int: 0; + value "winlist_pos_max_w" int: 320; + value "winlist_pos_max_h" int: 320; + value "maximize_policy" int: 50; + value "allow_manip" int: 0; + value "border_fix_on_shelf_toggle" int: 0; + value "allow_above_fullscreen" int: 0; + value "kill_if_close_not_possible" int: 1; + value "kill_process" int: 1; + value "kill_timer_wait" double: 10.0000000000000000000000000; + value "ping_clients" int: 1; + value "transition_desk" string: "vswipe"; + value "transition_change" string: "crossfade"; + value "remember_internal_windows" int: 0; + value "move_info_follows" int: 1; + value "resize_info_follows" int: 1; + value "move_info_visible" int: 0; + value "resize_info_visible" int: 0; + value "focus_last_focused_per_desktop" int: 1; + value "focus_revert_on_hide_or_close" int: 1; + value "pointer_slide" int: 0; + value "use_e_cursor" int: 1; + value "cursor_size" int: 32; + value "menu_autoscroll_margin" int: 0; + value "menu_autoscroll_cursor_margin" int: 1; + value "transient.move" int: 1; + value "transient.resize" int: 0; + value "transient.raise" int: 1; + value "transient.lower" int: 1; + value "transient.layer" int: 1; + value "transient.desktop" int: 1; + value "transient.iconify" int: 1; + value "modal_windows" int: 1; + value "menu_eap_name_show" int: 1; + value "menu_eap_generic_show" int: 0; + value "menu_eap_comment_show" int: 0; + value "fullscreen_policy" int: 0; + value "exebuf_max_exe_list" int: 20; + value "exebuf_max_eap_list" int: 20; + value "exebuf_max_hist_list" int: 20; + value "exebuf_scroll_animate" int: 1; + value "exebuf_scroll_speed" double: 0.1000000000000000055511151; + value "exebuf_pos_align_x" double: 0.5000000000000000000000000; + value "exebuf_pos_align_y" double: 0.5000000000000000000000000; + value "exebuf_pos_size_w" double: 0.7500000000000000000000000; + value "exebuf_pos_size_h" double: 0.2500000000000000000000000; + value "exebuf_pos_min_w" int: 200; + value "exebuf_pos_min_h" int: 160; + value "exebuf_pos_max_w" int: 400; + value "exebuf_pos_max_h" int: 320; + value "exebuf_term_cmd" string: "xterm -hold -e"; + value "use_app_icon" int: 0; + value "cnfmdlg_disabled" int: 0; + value "cfgdlg_auto_apply" int: 0; + value "cfgdlg_default_mode" int: 0; + value "font_hinting" int: 0; + value "desklock_auth_method" int: 0; + value "desklock_login_box_zone" int: -1; + value "desklock_start_locked" int: 0; + value "desklock_autolock_screensaver" int: 0; + value "desklock_post_screensaver_time" double: 0.0000000000000000000000000; + value "desklock_autolock_idle" int: 0; + value "desklock_autolock_idle_timeout" double: 300.0000000000000000000000000; + value "desklock_use_custom_desklock" int: 0; + value "desklock_ask_presentation" uchar: 1; + value "desklock_ask_presentation_timeout" double: 30.0000000000000000000000000; + value "display_res_restore" int: 0; + value "display_res_width" int: 1; + value "display_res_height" int: 1; + value "display_res_hz" int: 0; + value "display_res_rotation" int: 0; + value "screensaver_enable" int: 0; + value "screensaver_timeout" int: 0; + value "screensaver_interval" int: 5; + value "screensaver_blanking" int: 2; + value "screensaver_expose" int: 2; + value "screensaver_ask_presentation" uchar: 1; + value "screensaver_ask_presentation_timeout" double: 30.0000000000000000000000000; + value "dpms_enable" int: 0; + value "dpms_standby_enable" int: 0; + value "dpms_suspend_enable" int: 0; + value "dpms_off_enable" int: 0; + value "dpms_standby_timeout" int: 1; + value "dpms_suspend_timeout" int: 1; + value "dpms_off_timeout" int: 1; + value "clientlist_group_by" int: 0; + value "clientlist_include_all_zones" int: 0; + value "clientlist_separate_with" int: 0; + value "clientlist_sort_by" int: 0; + value "clientlist_separate_iconified_apps" int: 0; + value "clientlist_warp_to_iconified_desktop" int: 0; + value "clientlist_limit_caption_len" int: 0; + value "clientlist_max_caption_len" int: 2; + value "mouse_hand" int: 1; + value "mouse_accel_numerator" int: 2; + value "mouse_accel_denominator" int: 1; + value "mouse_accel_threshold" int: 4; + value "border_raise_on_mouse_action" int: 1; + value "border_raise_on_focus" int: 1; + value "desk_flip_wrap" int: 0; + value "fullscreen_flip" int: 1; + value "icon_theme" string: "Tango"; + value "icon_theme_overrides" uchar: 0; + value "desk_flip_animate_mode" int: 1; + value "desk_flip_animate_interpolation" int: 0; + value "desk_flip_animate_time" double: 0.5000000000000000000000000; + value "desk_flip_pan_bg" uchar: 0; + value "desk_flip_pan_x_axis_factor" double: 0.0000000000000000000000000; + value "desk_flip_pan_y_axis_factor" double: 0.0000000000000000000000000; + value "wallpaper_import_last_dev" string: "~/"; + value "wallpaper_import_last_path" string: "/"; + value "wallpaper_grad_c1_r" int: 0; + value "wallpaper_grad_c1_g" int: 0; + value "wallpaper_grad_c1_b" int: 0; + value "wallpaper_grad_c2_r" int: 255; + value "wallpaper_grad_c2_g" int: 255; + value "wallpaper_grad_c2_b" int: 255; + value "theme_default_border_style" string: "default"; + value "desk_auto_switch" int: 0; + value "thumb_nice" int: 0; + value "menu_favorites_show" int: 0; + value "menu_apps_show" int: 1; + value "ping_clients_interval" int: 128; + value "cache_flush_poll_interval" int: 512; + value "thumbscroll_enable" int: 0; + value "thumbscroll_threshhold" int: 8; + value "thumbscroll_momentum_threshhold" double: 100.0000000000000000000000000; + value "thumbscroll_friction" double: 1.0000000000000000000000000; + value "hal_desktop" int: 1; + value "hal_auto_mount" int: 0; + value "hal_auto_open" int: 0; + value "border_keyboard.timeout" double: 5.0000000000000000000000000; + value "border_keyboard.move.dx" uchar: 5; + value "border_keyboard.move.dy" uchar: 5; + value "border_keyboard.resize.dx" uchar: 5; + value "border_keyboard.resize.dy" uchar: 5; + value "scale.min" double: 1.0000000000000000000000000; + value "scale.max" double: 3.0000000000000000000000000; + value "scale.factor" double: 1.0000000000000000000000000; + value "scale.base_dpi" int: 142; + value "scale.use_dpi" uchar: 0; + value "scale.use_custom" uchar: 0; + value "show_cursor" uchar: 1; + value "idle_cursor" uchar: 1; + value "default_system_menu" string: "/etc/xdg/menus/gnome-applications.menu"; + value "cfgdlg_normal_wins" uchar: 0; + value "syscon.main.icon_size" int: 64; + value "syscon.secondary.icon_size" int: 48; + value "syscon.extra.icon_size" int: 48; + value "syscon.timeout" double: 5.0000000000000000000000000; + value "syscon.do_input" uchar: 1; group "syscon.actions" list { group "E_Config_Syscon_Action" struct { value "action" string: "halt"; @@ -1141,222 +1357,9 @@ group "E_Config" struct { value "priority" int: 0; } } - value "config_version" int: 65843; - value "show_splash" int: 1; - value "init_default_theme" string: "default.edj"; - value "desktop_default_name" string: "Desktop %i, %i"; - value "menus_scroll_speed" double: 1000.0000000000000000000000000; - value "menus_fast_mouse_move_threshhold" double: 300.0000000000000000000000000; - value "menus_click_drag_timeout" double: 0.2500000000000000000000000; - value "border_shade_animate" int: 1; - value "border_shade_transition" int: 1; - value "border_shade_speed" double: 1800.0000000000000000000000000; - value "framerate" double: 60.0000000000000000000000000; - value "priority" int: 1; - value "image_cache" int: 4096; - value "font_cache" int: 512; - value "edje_cache" int: 32; - value "edje_collection_cache" int: 64; - value "zone_desks_x_count" int: 1; - value "zone_desks_y_count" int: 1; - value "use_virtual_roots" int: 0; - value "show_desktop_icons" int: 1; - value "edge_flip_dragging" int: 1; - value "evas_engine_default" int: 1; - value "evas_engine_container" int: 0; - value "evas_engine_init" int: 0; - value "evas_engine_menus" int: 0; - value "evas_engine_borders" int: 0; - value "evas_engine_errors" int: 0; - value "evas_engine_popups" int: 0; - value "evas_engine_drag" int: 0; - value "evas_engine_win" int: 0; - value "evas_engine_zone" int: 0; - value "use_composite" int: 0; - value "language" string: "en_US.UTF-8"; - value "window_placement_policy" int: 0; - value "focus_policy" int: 0; - value "focus_setting" int: 1; - value "pass_click_on" int: 1; - value "always_click_to_raise" int: 0; - value "always_click_to_focus" int: 1; - value "use_auto_raise" int: 0; - value "auto_raise_delay" double: 0.5000000000000000000000000; - value "use_resist" int: 1; - value "drag_resist" int: 16; - value "desk_resist" int: 32; - value "window_resist" int: 12; - value "gadget_resist" int: 32; - value "winlist_warp_while_selecting" int: 1; - value "winlist_warp_at_end" int: 1; - value "winlist_warp_speed" double: 0.1000000000000000055511151; - value "winlist_scroll_animate" int: 1; - value "winlist_scroll_speed" double: 0.1000000000000000055511151; - value "winlist_list_show_iconified" int: 1; - value "winlist_list_show_other_desk_iconified" int: 1; - value "winlist_list_show_other_screen_iconified" int: 0; - value "winlist_list_show_other_desk_windows" int: 0; - value "winlist_list_show_other_screen_windows" int: 0; - value "winlist_list_uncover_while_selecting" int: 0; - value "winlist_list_jump_desk_while_selecting" int: 0; - value "winlist_list_focus_while_selecting" int: 1; - value "winlist_list_raise_while_selecting" int: 1; - value "winlist_pos_align_x" double: 0.5000000000000000000000000; - value "winlist_pos_align_y" double: 0.5000000000000000000000000; - value "winlist_pos_size_w" double: 0.5000000000000000000000000; - value "winlist_pos_size_h" double: 0.5000000000000000000000000; - value "winlist_pos_min_w" int: 0; - value "winlist_pos_min_h" int: 0; - value "winlist_pos_max_w" int: 320; - value "winlist_pos_max_h" int: 320; - value "maximize_policy" int: 50; - value "allow_manip" int: 0; - value "border_fix_on_shelf_toggle" int: 0; - value "allow_above_fullscreen" int: 0; - value "kill_if_close_not_possible" int: 1; - value "kill_process" int: 1; - value "kill_timer_wait" double: 10.0000000000000000000000000; - value "ping_clients" int: 1; - value "transition_desk" string: "vswipe"; - value "transition_change" string: "crossfade"; - value "remember_internal_windows" int: 0; - value "move_info_follows" int: 1; - value "resize_info_follows" int: 1; - value "move_info_visible" int: 0; - value "resize_info_visible" int: 0; - value "focus_last_focused_per_desktop" int: 1; - value "focus_revert_on_hide_or_close" int: 1; - value "pointer_slide" int: 0; - value "use_e_cursor" int: 1; - value "cursor_size" int: 32; - value "menu_autoscroll_margin" int: 0; - value "menu_autoscroll_cursor_margin" int: 1; - value "transient.move" int: 1; - value "transient.resize" int: 0; - value "transient.raise" int: 1; - value "transient.lower" int: 1; - value "transient.layer" int: 1; - value "transient.desktop" int: 1; - value "transient.iconify" int: 1; - value "modal_windows" int: 1; - value "menu_eap_name_show" int: 1; - value "menu_eap_generic_show" int: 0; - value "menu_eap_comment_show" int: 0; - value "fullscreen_policy" int: 0; - value "exebuf_max_exe_list" int: 20; - value "exebuf_max_eap_list" int: 20; - value "exebuf_max_hist_list" int: 20; - value "exebuf_scroll_animate" int: 1; - value "exebuf_scroll_speed" double: 0.1000000000000000055511151; - value "exebuf_pos_align_x" double: 0.5000000000000000000000000; - value "exebuf_pos_align_y" double: 0.5000000000000000000000000; - value "exebuf_pos_size_w" double: 0.7500000000000000000000000; - value "exebuf_pos_size_h" double: 0.2500000000000000000000000; - value "exebuf_pos_min_w" int: 200; - value "exebuf_pos_min_h" int: 160; - value "exebuf_pos_max_w" int: 400; - value "exebuf_pos_max_h" int: 320; - value "exebuf_term_cmd" string: "xterm -hold -e"; - value "use_app_icon" int: 0; - value "cnfmdlg_disabled" int: 0; - value "cfgdlg_auto_apply" int: 0; - value "cfgdlg_default_mode" int: 0; - value "font_hinting" int: 0; - value "desklock_auth_method" int: 0; - value "desklock_login_box_zone" int: -1; - value "desklock_start_locked" int: 0; - value "desklock_autolock_screensaver" int: 0; - value "desklock_post_screensaver_time" double: 0.0000000000000000000000000; - value "desklock_autolock_idle" int: 0; - value "desklock_autolock_idle_timeout" double: 300.0000000000000000000000000; - value "desklock_use_custom_desklock" int: 0; - value "desklock_ask_presentation" uchar: 1; - value "desklock_ask_presentation_timeout" double: 30.0000000000000000000000000; - value "display_res_restore" int: 0; - value "display_res_width" int: 1; - value "display_res_height" int: 1; - value "display_res_hz" int: 0; - value "display_res_rotation" int: 0; - value "screensaver_enable" int: 0; - value "screensaver_timeout" int: 0; - value "screensaver_interval" int: 5; - value "screensaver_blanking" int: 2; - value "screensaver_expose" int: 2; - value "screensaver_ask_presentation" uchar: 1; - value "screensaver_ask_presentation_timeout" double: 30.0000000000000000000000000; - value "dpms_enable" int: 0; - value "dpms_standby_enable" int: 0; - value "dpms_suspend_enable" int: 0; - value "dpms_off_enable" int: 0; - value "dpms_standby_timeout" int: 1; - value "dpms_suspend_timeout" int: 1; - value "dpms_off_timeout" int: 1; - value "clientlist_group_by" int: 0; - value "clientlist_include_all_zones" int: 0; - value "clientlist_separate_with" int: 0; - value "clientlist_sort_by" int: 0; - value "clientlist_separate_iconified_apps" int: 0; - value "clientlist_warp_to_iconified_desktop" int: 0; - value "clientlist_limit_caption_len" int: 0; - value "clientlist_max_caption_len" int: 2; - value "mouse_hand" int: 1; - value "mouse_accel_numerator" int: 2; - value "mouse_accel_denominator" int: 1; - value "mouse_accel_threshold" int: 4; - value "border_raise_on_mouse_action" int: 1; - value "border_raise_on_focus" int: 1; - value "desk_flip_wrap" int: 0; - value "fullscreen_flip" int: 1; - value "icon_theme" string: "Tango"; - value "icon_theme_overrides" uchar: 0; - value "desk_flip_animate_mode" int: 1; - value "desk_flip_animate_interpolation" int: 0; - value "desk_flip_animate_time" double: 0.5000000000000000000000000; - value "desk_flip_pan_bg" uchar: 0; - value "desk_flip_pan_x_axis_factor" double: 0.0000000000000000000000000; - value "desk_flip_pan_y_axis_factor" double: 0.0000000000000000000000000; - value "wallpaper_import_last_dev" string: "~/"; - value "wallpaper_import_last_path" string: "/"; - value "wallpaper_grad_c1_r" int: 0; - value "wallpaper_grad_c1_g" int: 0; - value "wallpaper_grad_c1_b" int: 0; - value "wallpaper_grad_c2_r" int: 255; - value "wallpaper_grad_c2_g" int: 255; - value "wallpaper_grad_c2_b" int: 255; - value "theme_default_border_style" string: "default"; - value "desk_auto_switch" int: 0; - value "thumb_nice" int: 0; - value "menu_favorites_show" int: 0; - value "menu_apps_show" int: 1; - value "ping_clients_interval" int: 128; - value "cache_flush_poll_interval" int: 512; - value "thumbscroll_enable" int: 0; - value "thumbscroll_threshhold" int: 8; - value "thumbscroll_momentum_threshhold" double: 100.0000000000000000000000000; - value "thumbscroll_friction" double: 1.0000000000000000000000000; - value "hal_desktop" int: 1; - value "hal_auto_mount" int: 0; - value "hal_auto_open" int: 0; - value "border_keyboard.timeout" double: 5.0000000000000000000000000; - value "border_keyboard.move.dx" uchar: 5; - value "border_keyboard.move.dy" uchar: 5; - value "border_keyboard.resize.dx" uchar: 5; - value "border_keyboard.resize.dy" uchar: 5; - value "scale.min" double: 1.0000000000000000000000000; - value "scale.max" double: 3.0000000000000000000000000; - value "scale.factor" double: 1.0000000000000000000000000; - value "scale.base_dpi" int: 142; - value "scale.use_dpi" uchar: 0; - value "scale.use_custom" uchar: 0; - value "show_cursor" uchar: 1; - value "idle_cursor" uchar: 1; - value "default_system_menu" string: "/etc/xdg/menus/gnome-applications.menu"; - value "cfgdlg_normal_wins" uchar: 0; - value "syscon.main.icon_size" int: 64; - value "syscon.secondary.icon_size" int: 48; - value "syscon.extra.icon_size" int: 48; - value "syscon.timeout" double: 5.0000000000000000000000000; - value "syscon.do_input" uchar: 1; value "mode.presentation" uchar: 0; value "mode.offline" uchar: 0; + value "exec.expire_timeout" double: 60.0; + value "exec.show_run_dialog" uchar: 0; + value "exec.show_exit_dialog" uchar: 0; } diff --git a/config/illume/e.src b/config/illume/e.src index f0d577a0a..17586f9ab 100644 --- a/config/illume/e.src +++ b/config/illume/e.src @@ -1,5 +1,5 @@ group "E_Config" struct { - value "config_version" int: 65842; + value "config_version" int: 65844; value "show_splash" int: 1; value "init_default_theme" string: "default.edj"; value "desktop_default_name" string: "Desktop %i, %i"; @@ -824,4 +824,7 @@ group "E_Config" struct { } value "mode.presentation" uchar: 0; value "mode.offline" uchar: 0; + value "exec.expire_timeout" double: 60.0; + value "exec.show_run_dialog" uchar: 1; + value "exec.show_exit_dialog" uchar: 1; } diff --git a/config/minimalist/e.src b/config/minimalist/e.src index 01c59f772..6a27eb943 100644 --- a/config/minimalist/e.src +++ b/config/minimalist/e.src @@ -1,5 +1,5 @@ group "E_Config" struct { - value "config_version" int: 65842; + value "config_version" int: 65844; value "show_splash" int: 1; value "init_default_theme" string: "default.edj"; value "desktop_default_background" string: "Light_Gradient.edj"; @@ -2056,4 +2056,7 @@ group "E_Config" struct { } value "mode.presentation" uchar: 0; value "mode.offline" uchar: 0; + value "exec.expire_timeout" double: 30.0; + value "exec.show_run_dialog" uchar: 1; + value "exec.show_exit_dialog" uchar: 1; } diff --git a/config/netbook/e.src b/config/netbook/e.src index bbeeb3843..c7894bdf2 100644 --- a/config/netbook/e.src +++ b/config/netbook/e.src @@ -1,5 +1,5 @@ group "E_Config" struct { - value "config_version" int: 65842; + value "config_version" int: 65844; value "show_splash" int: 1; value "init_default_theme" string: "default.edj"; value "desktop_default_background" string: "Dark_Gradient.edj"; @@ -2120,4 +2120,7 @@ group "E_Config" struct { } value "mode.presentation" uchar: 0; value "mode.offline" uchar: 0; + value "exec.expire_timeout" double: 30.0; + value "exec.show_run_dialog" uchar: 1; + value "exec.show_exit_dialog" uchar: 1; } diff --git a/config/scaleable/e.src b/config/scaleable/e.src index 459ff7c5d..827b54b9f 100644 --- a/config/scaleable/e.src +++ b/config/scaleable/e.src @@ -1,5 +1,5 @@ group "E_Config" struct { - value "config_version" int: 65842; + value "config_version" int: 65844; value "show_splash" int: 1; value "init_default_theme" string: "default.edj"; value "desktop_default_name" string: "Desktop %i, %i"; @@ -2143,4 +2143,7 @@ group "E_Config" struct { } value "mode.presentation" uchar: 0; value "mode.offline" uchar: 0; + value "exec.expire_timeout" double: 30.0; + value "exec.show_run_dialog" uchar: 1; + value "exec.show_exit_dialog" uchar: 1; } diff --git a/config/standard/e.src b/config/standard/e.src index 2c9b7f776..65e6367f6 100644 --- a/config/standard/e.src +++ b/config/standard/e.src @@ -1,5 +1,5 @@ group "E_Config" struct { - value "config_version" int: 65842; + value "config_version" int: 65844; value "show_splash" int: 1; value "init_default_theme" string: "default.edj"; value "desktop_default_name" string: "Desktop %i, %i"; @@ -2161,4 +2161,7 @@ group "E_Config" struct { } value "mode.presentation" uchar: 0; value "mode.offline" uchar: 0; + value "exec.expire_timeout" double: 30.0; + value "exec.show_run_dialog" uchar: 1; + value "exec.show_exit_dialog" uchar: 1; } diff --git a/src/modules/comp/e_mod_comp.c b/src/modules/comp/e_mod_comp.c index e006653f1..a5ae0714f 100644 --- a/src/modules/comp/e_mod_comp.c +++ b/src/modules/comp/e_mod_comp.c @@ -227,7 +227,8 @@ _e_mod_comp_win_update(E_Comp_Win *cw) } e_mod_comp_update_resize(cw->up, cw->pw, cw->ph); - if ((cw->c->gl) && (!cw->shaped) && (!cw->shape_changed)) + if ((cw->c->gl) && (_comp_mod->conf->texture_from_pixmap) && + (!cw->shaped) && (!cw->shape_changed)) { if (new_pixmap) e_mod_comp_update_add(cw->up, 0, 0, cw->pw, cw->ph); @@ -310,7 +311,7 @@ _e_mod_comp_pre_swap(void *data, Evas *e) { E_Comp *c = data; - ecore_x_ungrab(); +// ecore_x_ungrab(); c->grabbed = 0; } @@ -322,8 +323,8 @@ _e_mod_comp_cb_animator(void *data) Eina_List *new_updates = NULL; // for failed pixmap fetches - get them next frame c->render_animator = NULL; - ecore_x_grab(); - ecore_x_sync(); +// ecore_x_grab(); +// ecore_x_sync(); c->grabbed = 1; EINA_LIST_FREE(c->updates, cw) { @@ -335,7 +336,7 @@ _e_mod_comp_cb_animator(void *data) if (c->grabbed) { c->grabbed = 0; - ecore_x_ungrab(); +// ecore_x_ungrab(); } if (new_updates) _e_mod_comp_render_queue(c); c->updates = new_updates; diff --git a/src/modules/comp/e_mod_config.c b/src/modules/comp/e_mod_config.c index e8dd57e9b..7edeebbfb 100644 --- a/src/modules/comp/e_mod_config.c +++ b/src/modules/comp/e_mod_config.c @@ -8,6 +8,7 @@ struct _E_Config_Dialog_Data { int use_shadow; int engine; + int texture_from_pixmap; }; /* Protos */ @@ -54,7 +55,7 @@ _create_data(E_Config_Dialog *cfd) if ((cfdata->engine != E_EVAS_ENGINE_SOFTWARE_X11) && (cfdata->engine != E_EVAS_ENGINE_GL_X11)) cfdata->engine = E_EVAS_ENGINE_SOFTWARE_X11; - + cfdata->texture_from_pixmap = _comp_mod->conf->texture_from_pixmap; return cfdata; } @@ -99,6 +100,12 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf e_widget_table_object_append(ot, of, 0, 1, 1, 1, 1, 1, 1, 1); + of = e_widget_framelist_add(evas, _("GL Options"), 0); + e_widget_framelist_content_align_set(of, 0.5, 0.0); + ob = e_widget_check_add(evas, _("Texture from Pixmap"), &(cfdata->texture_from_pixmap)); + e_widget_framelist_object_append(of, ob); + e_widget_table_object_append(ot, of, 0, 2, 1, 1, 1, 1, 1, 1); + e_widget_list_object_append(o, ot, 1, 1, 0.5); return o; @@ -112,9 +119,11 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) _comp_mod->conf->use_shadow = cfdata->use_shadow; e_mod_comp_shadow_set(); } - if (_comp_mod->conf->engine != cfdata->engine) + if ((_comp_mod->conf->engine != cfdata->engine) || + (cfdata->texture_from_pixmap != _comp_mod->conf->texture_from_pixmap)) { _comp_mod->conf->engine = cfdata->engine; + _comp_mod->conf->texture_from_pixmap = cfdata->texture_from_pixmap; e_mod_comp_shutdown(); e_mod_comp_init(); } diff --git a/src/modules/comp/e_mod_main.c b/src/modules/comp/e_mod_main.c index 984c6a740..1474fc46e 100644 --- a/src/modules/comp/e_mod_main.c +++ b/src/modules/comp/e_mod_main.c @@ -33,6 +33,7 @@ e_modapi_init(E_Module *m) E_CONFIG_VAL(D, T, use_shadow, UCHAR); E_CONFIG_VAL(D, T, shadow_file, STR); E_CONFIG_VAL(D, T, engine, INT); + E_CONFIG_VAL(D, T, texture_from_pixmap, UCHAR); mod->conf = e_config_domain_load("module.comp", mod->conf_edd); if (!mod->conf) @@ -41,6 +42,7 @@ e_modapi_init(E_Module *m) mod->conf->use_shadow = 1; mod->conf->shadow_file = NULL; mod->conf->engine = E_EVAS_ENGINE_SOFTWARE_X11; + mod->conf->texture_from_pixmap = 0; } _comp_mod = mod; diff --git a/src/modules/comp/e_mod_main.h b/src/modules/comp/e_mod_main.h index c32a9134f..d668d3519 100644 --- a/src/modules/comp/e_mod_main.h +++ b/src/modules/comp/e_mod_main.h @@ -10,6 +10,7 @@ struct _Config unsigned char use_shadow; const char *shadow_file; int engine; + unsigned char texture_from_pixmap; }; struct _Mod