From: Enlightenment S. <no-...@en...> - 2010-09-21 19:50:12
|
Log: [Eve] Cleanup: Remove trailing whitespaces. Author: acidx Date: 2010-09-21 12:50:06 -0700 (Tue, 21 Sep 2010) New Revision: 52551 Modified: trunk/eve/src/bin/chrome.c trunk/eve/src/bin/eve_state.c trunk/eve/src/bin/main.c Modified: trunk/eve/src/bin/chrome.c =================================================================== --- trunk/eve/src/bin/chrome.c 2010-09-21 18:55:32 UTC (rev 52550) +++ trunk/eve/src/bin/chrome.c 2010-09-21 19:50:06 UTC (rev 52551) @@ -1386,7 +1386,7 @@ Evas_Object *entry; const char *(*conf_get)(Config *); void (*conf_set)(Config *, const char *); - + if (!(conf_get = mmc->conf_get) || !(conf_set = mmc->conf_set)) return; notify = elm_notify_add(parent); Modified: trunk/eve/src/bin/eve_state.c =================================================================== --- trunk/eve/src/bin/eve_state.c 2010-09-21 18:55:32 UTC (rev 52550) +++ trunk/eve/src/bin/eve_state.c 2010-09-21 19:50:06 UTC (rev 52551) @@ -87,9 +87,9 @@ _config_init(void) { Eet_Data_Descriptor_Class eddc; - + if (_config_descriptor) return; - + EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, Config); _config_descriptor = eet_data_descriptor_stream_new(&eddc); @@ -119,7 +119,7 @@ config_new(unsigned char allow_popup, unsigned char enable_auto_load_images, unsigned char enable_auto_shrink_images, unsigned char enable_javascript, unsigned char enable_mouse_cursor, unsigned char enable_plugins, unsigned char enable_private_mode, unsigned char enable_touch_interface, const char * home_page, const char * proxy, unsigned char restore_state, const char * user_agent) { Config *config = calloc(1, sizeof(Config)); - + if (!config) { fprintf(stderr, "ERROR: could not calloc Config\n"); @@ -317,7 +317,7 @@ fprintf(stderr, "ERROR: could not open '%s' for read\n", filename); return NULL; } - + config = eet_data_read(ef, _config_descriptor, CONFIG_ENTRY); if (!config) goto end; config->__eet_filename = eina_stringshare_add(filename); @@ -332,7 +332,7 @@ { Eet_File *ef; Eina_Bool ret; - + if (filename) config->__eet_filename = eina_stringshare_add(filename); else if (config->__eet_filename) filename = config->__eet_filename; else return EINA_FALSE; @@ -346,7 +346,7 @@ ret = !!eet_data_write(ef, _config_descriptor, CONFIG_ENTRY, config, EINA_TRUE); eet_close(ef); - + return ret; } @@ -354,9 +354,9 @@ _hist_item_init(void) { Eet_Data_Descriptor_Class eddc; - + if (_hist_item_descriptor) return; - + EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, Hist_Item); _hist_item_descriptor = eet_data_descriptor_stream_new(&eddc); @@ -378,7 +378,7 @@ hist_item_new(const char * title, const char * url, unsigned int visit_count, double last_visit) { Hist_Item *hist_item = calloc(1, sizeof(Hist_Item)); - + if (!hist_item) { fprintf(stderr, "ERROR: could not calloc Hist_Item\n"); @@ -458,9 +458,9 @@ _hist_init(void) { Eet_Data_Descriptor_Class eddc; - + if (_hist_descriptor) return; - + EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, Hist); _hist_descriptor = eet_data_descriptor_stream_new(&eddc); @@ -479,7 +479,7 @@ hist_new() { Hist *hist = calloc(1, sizeof(Hist)); - + if (!hist) { fprintf(stderr, "ERROR: could not calloc Hist\n"); @@ -543,7 +543,7 @@ fprintf(stderr, "ERROR: could not open '%s' for read\n", filename); return NULL; } - + hist = eet_data_read(ef, _hist_descriptor, HIST_ENTRY); if (!hist) goto end; hist->__eet_filename = eina_stringshare_add(filename); @@ -560,7 +560,7 @@ { Eet_File *ef; Eina_Bool ret; - + if (filename) hist->__eet_filename = eina_stringshare_add(filename); else if (hist->__eet_filename) filename = hist->__eet_filename; else return EINA_FALSE; @@ -574,7 +574,7 @@ ret = !!eet_data_write(ef, _hist_descriptor, HIST_ENTRY, hist, EINA_TRUE); eet_close(ef); - + return ret; } @@ -582,9 +582,9 @@ _fav_item_init(void) { Eet_Data_Descriptor_Class eddc; - + if (_fav_item_descriptor) return; - + EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, Fav_Item); _fav_item_descriptor = eet_data_descriptor_stream_new(&eddc); @@ -605,7 +605,7 @@ fav_item_new(const char * url, const char * title, unsigned int visit_count) { Fav_Item *fav_item = calloc(1, sizeof(Fav_Item)); - + if (!fav_item) { fprintf(stderr, "ERROR: could not calloc Fav_Item\n"); @@ -671,9 +671,9 @@ _fav_init(void) { Eet_Data_Descriptor_Class eddc; - + if (_fav_descriptor) return; - + EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, Fav); _fav_descriptor = eet_data_descriptor_stream_new(&eddc); @@ -692,7 +692,7 @@ fav_new() { Fav *fav = calloc(1, sizeof(Fav)); - + if (!fav) { fprintf(stderr, "ERROR: could not calloc Fav\n"); @@ -756,7 +756,7 @@ fprintf(stderr, "ERROR: could not open '%s' for read\n", filename); return NULL; } - + fav = eet_data_read(ef, _fav_descriptor, FAV_ENTRY); if (!fav) goto end; fav->__eet_filename = eina_stringshare_add(filename); @@ -773,7 +773,7 @@ { Eet_File *ef; Eina_Bool ret; - + if (filename) fav->__eet_filename = eina_stringshare_add(filename); else if (fav->__eet_filename) filename = fav->__eet_filename; else return EINA_FALSE; @@ -787,7 +787,7 @@ ret = !!eet_data_write(ef, _fav_descriptor, FAV_ENTRY, fav, EINA_TRUE); eet_close(ef); - + return ret; } @@ -795,9 +795,9 @@ _session_item_init(void) { Eet_Data_Descriptor_Class eddc; - + if (_session_item_descriptor) return; - + EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, Session_Item); _session_item_descriptor = eet_data_descriptor_stream_new(&eddc); @@ -819,7 +819,7 @@ session_item_new(const char * url, unsigned char focused, int scroll_x, int scroll_y) { Session_Item *session_item = calloc(1, sizeof(Session_Item)); - + if (!session_item) { fprintf(stderr, "ERROR: could not calloc Session_Item\n"); @@ -898,9 +898,9 @@ _session_window_init(void) { Eet_Data_Descriptor_Class eddc; - + if (_session_window_descriptor) return; - + EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, Session_Window); _session_window_descriptor = eet_data_descriptor_stream_new(&eddc); @@ -920,7 +920,7 @@ session_window_new(Eina_List * tabs, unsigned char focused) { Session_Window *session_window = calloc(1, sizeof(Session_Window)); - + if (!session_window) { fprintf(stderr, "ERROR: could not calloc Session_Window\n"); @@ -1013,9 +1013,9 @@ _session_init(void) { Eet_Data_Descriptor_Class eddc; - + if (_session_descriptor) return; - + EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, Session); _session_descriptor = eet_data_descriptor_stream_new(&eddc); @@ -1034,7 +1034,7 @@ session_new(Eina_List * windows) { Session *session = calloc(1, sizeof(Session)); - + if (!session) { fprintf(stderr, "ERROR: could not calloc Session\n"); @@ -1118,7 +1118,7 @@ fprintf(stderr, "ERROR: could not open '%s' for read\n", filename); return NULL; } - + session = eet_data_read(ef, _session_descriptor, SESSION_ENTRY); if (!session) goto end; session->__eet_filename = eina_stringshare_add(filename); @@ -1133,7 +1133,7 @@ { Eet_File *ef; Eina_Bool ret; - + if (filename) session->__eet_filename = eina_stringshare_add(filename); else if (session->__eet_filename) filename = session->__eet_filename; else return EINA_FALSE; @@ -1147,7 +1147,7 @@ ret = !!eet_data_write(ef, _session_descriptor, SESSION_ENTRY, session, EINA_TRUE); eet_close(ef); - + return ret; } Modified: trunk/eve/src/bin/main.c =================================================================== --- trunk/eve/src/bin/main.c 2010-09-21 18:55:32 UTC (rev 52550) +++ trunk/eve/src/bin/main.c 2010-09-21 19:50:06 UTC (rev 52551) @@ -560,7 +560,7 @@ * user doesn't look like a good alternative either. */ continue; - + session_restore_delayed_scroll(win->current_view, item); if (session_item_focused_get(item)) focused_chrome = win->current_chrome; @@ -743,7 +743,7 @@ goto end_hist; } } - + fav = fav_load(path); if (!fav) { |
From: Enlightenment S. <no-...@en...> - 2010-09-21 19:50:15
|
Log: [Eve] Cleanup: initialize Gengrid_Item_Class only once. Author: acidx Date: 2010-09-21 12:50:08 -0700 (Tue, 21 Sep 2010) New Revision: 52552 Modified: trunk/eve/src/bin/chrome.c Modified: trunk/eve/src/bin/chrome.c =================================================================== --- trunk/eve/src/bin/chrome.c 2010-09-21 19:50:06 UTC (rev 52551) +++ trunk/eve/src/bin/chrome.c 2010-09-21 19:50:08 UTC (rev 52552) @@ -37,6 +37,11 @@ static void on_more_item_click(void *data, Evas_Object *obj, void *event_info __UNUSED__); static void on_more_item_back_click(void *data, Evas_Object *edje, const char *emission __UNUSED__, const char *source __UNUSED__); +static char *tab_grid_label_get(const void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__); +static Evas_Object *tab_grid_icon_get(const void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__); +static Eina_Bool tab_grid_state_get(const void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__); +static void tab_grid_del(const void *data __UNUSED__, Evas_Object *obj __UNUSED__); + typedef enum { ITEM_TYPE_LAST, ITEM_TYPE_STATIC_FOLDER, @@ -262,7 +267,14 @@ { ITEM_TYPE_LAST, NULL, NULL, NULL, ITEM_FLAG_NONE } }; -static Elm_Gengrid_Item_Class gic_default; +static const Elm_Gengrid_Item_Class gic_default = { + .func = { + .label_get = tab_grid_label_get, + .icon_get = tab_grid_icon_get, + .state_get = tab_grid_state_get, + .del = tab_grid_del + } +}; static Eina_List * _eina_hash_sorted_keys_get(Eina_Hash *hash, Eina_Compare_Cb compare_func) @@ -1961,11 +1973,6 @@ evas_object_smart_callback_add(tab_grid, "realized", on_tab_gengrid_item_realized, win); - gic_default.func.label_get = tab_grid_label_get; - gic_default.func.icon_get = tab_grid_icon_get; - gic_default.func.state_get = tab_grid_state_get; - gic_default.func.del = tab_grid_del; - edje_object_signal_callback_add(ed, "action,back", "back", on_action_back, view); edje_object_signal_callback_add(ed, "action,forward", "forward", on_action_forward, view); |
From: Enlightenment S. <no-...@en...> - 2010-09-21 19:50:17
|
Log: [Eve] Cleanup: on static callback names, s/^cb_/_cb_/g. Author: acidx Date: 2010-09-21 12:50:11 -0700 (Tue, 21 Sep 2010) New Revision: 52553 Modified: trunk/eve/src/bin/main.c Modified: trunk/eve/src/bin/main.c =================================================================== --- trunk/eve/src/bin/main.c 2010-09-21 19:50:08 UTC (rev 52552) +++ trunk/eve/src/bin/main.c 2010-09-21 19:50:11 UTC (rev 52553) @@ -437,7 +437,7 @@ } static Eina_Bool -cb_session_save(void *data __UNUSED__) +_cb_session_save(void *data __UNUSED__) { Browser_Window *win; Eina_List *chrome_iter, *win_iter; @@ -501,7 +501,7 @@ }; static Eina_Bool -cb_session_scroll_restore(void *data) +_cb_session_scroll_restore(void *data) { struct _Session_Restore_Scroll *srs = data; if (--srs->tries && ewk_frame_scroll_set(srs->frame, srs->sx, srs->sy)) @@ -522,7 +522,7 @@ srs->sx = session_item_scroll_x_get(item); srs->sy = session_item_scroll_y_get(item); srs->tries = 10; - ecore_timer_loop_add(1, cb_session_scroll_restore, srs); + ecore_timer_loop_add(1, _cb_session_scroll_restore, srs); } } @@ -765,7 +765,7 @@ goto end_session; } } - session_save_timer = ecore_timer_loop_add(15, cb_session_save, NULL); + session_save_timer = ecore_timer_loop_add(15, _cb_session_save, NULL); if (!session_save_timer) { r = -1; @@ -837,7 +837,7 @@ fav_save(fav, NULL); fav_free(fav); end_fav: - cb_session_save(session); + _cb_session_save(session); session_free(session); end_session: if (conn) e_dbus_connection_close(conn); |
From: Enlightenment S. <no-...@en...> - 2010-09-21 19:50:20
|
Log: [Eve] Cleanup: Fix compilation warnings. Author: acidx Date: 2010-09-21 12:50:14 -0700 (Tue, 21 Sep 2010) New Revision: 52554 Modified: trunk/eve/src/bin/chrome.c Modified: trunk/eve/src/bin/chrome.c =================================================================== --- trunk/eve/src/bin/chrome.c 2010-09-21 19:50:11 UTC (rev 52553) +++ trunk/eve/src/bin/chrome.c 2010-09-21 19:50:14 UTC (rev 52554) @@ -37,10 +37,10 @@ static void on_more_item_click(void *data, Evas_Object *obj, void *event_info __UNUSED__); static void on_more_item_back_click(void *data, Evas_Object *edje, const char *emission __UNUSED__, const char *source __UNUSED__); -static char *tab_grid_label_get(const void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__); -static Evas_Object *tab_grid_icon_get(const void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__); -static Eina_Bool tab_grid_state_get(const void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__); -static void tab_grid_del(const void *data __UNUSED__, Evas_Object *obj __UNUSED__); +static char *tab_grid_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__); +static Evas_Object *tab_grid_icon_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__); +static Eina_Bool tab_grid_state_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__); +static void tab_grid_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__); typedef enum { ITEM_TYPE_LAST, @@ -1856,7 +1856,7 @@ } static char * -tab_grid_label_get(const void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) +tab_grid_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) { if (data) { @@ -1868,7 +1868,7 @@ } static Evas_Object * -tab_grid_icon_get(const void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) +tab_grid_icon_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) { if (data) { @@ -1881,13 +1881,13 @@ } static Eina_Bool -tab_grid_state_get(const void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) +tab_grid_state_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__) { return EINA_FALSE; } static void -tab_grid_del(const void *data __UNUSED__, Evas_Object *obj __UNUSED__) +tab_grid_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__) { } |
From: Enlightenment S. <no-...@en...> - 2010-09-29 20:30:38
|
Log: [Eve] Set the URL after applying the preferences on a newly-created Ewk_View. This prevents requests to be sent with the wrong user agent. Bug spotted by Antognolli. Author: acidx Date: 2010-09-29 13:30:31 -0700 (Wed, 29 Sep 2010) New Revision: 52904 Modified: trunk/eve/src/bin/chrome.c Modified: trunk/eve/src/bin/chrome.c =================================================================== --- trunk/eve/src/bin/chrome.c 2010-09-29 19:12:43 UTC (rev 52903) +++ trunk/eve/src/bin/chrome.c 2010-09-29 20:30:31 UTC (rev 52904) @@ -2163,9 +2163,6 @@ evas_object_smart_callback_add(view, "inputmethods,changed", on_inputmethods_changed, win->win); - if (url) - ewk_view_uri_set(view, url); - Evas_Object *text_url = elm_scrolled_entry_add(ed); elm_object_style_set(text_url, "ewebkit/url"); elm_scrolled_entry_single_line_set(text_url, EINA_TRUE); @@ -2243,8 +2240,11 @@ edje_object_signal_emit(ed, "panels,reset,hide", ""); _chrome_state_apply(chrome, view); + chrome_config_apply(chrome); + if (url) + ewk_view_uri_set(view, url); + elm_pager_content_push(win->pager, chrome); - chrome_config_apply(chrome); return chrome; error_session_create: |
From: Enlightenment S. <no-...@en...> - 2010-10-11 17:54:25
|
Log: [Eve] Fix gengrid API breakage. Author: acidx Date: 2010-10-11 10:54:18 -0700 (Mon, 11 Oct 2010) New Revision: 53266 Modified: trunk/eve/src/bin/chrome.c Modified: trunk/eve/src/bin/chrome.c =================================================================== --- trunk/eve/src/bin/chrome.c 2010-10-11 17:18:39 UTC (rev 53265) +++ trunk/eve/src/bin/chrome.c 2010-10-11 17:54:18 UTC (rev 53266) @@ -1055,20 +1055,18 @@ EINA_LIST_FOREACH(win->chromes, chrome_iter, chrome) { Evas_Object *grid = evas_object_data_get(chrome, "tab-grid"); - const Eina_List *others; - Eina_List *others_iter; if (!grid) continue; - if (!(others = elm_gengrid_items_get(grid))) continue; - - EINA_LIST_FOREACH((Eina_List *)others, others_iter, item) - { - if (elm_gengrid_item_data_get(item) == view) - { - elm_gengrid_item_del(item); - break; - } - } + for (item = elm_gengrid_first_item_get(grid); + item; + item = elm_gengrid_item_next_get(item)) + { + if (elm_gengrid_item_data_get(item) == view) + { + elm_gengrid_item_del(item); + break; + } + } } } } |
From: Enlightenment S. <no-...@en...> - 2010-10-18 19:24:24
|
Log: [Eve] Toggle a checkbox when clicking on its label. Patch by Alex Grilo. Author: acidx Date: 2010-10-18 12:24:17 -0700 (Mon, 18 Oct 2010) New Revision: 53582 Modified: trunk/eve/src/bin/chrome.c Modified: trunk/eve/src/bin/chrome.c =================================================================== --- trunk/eve/src/bin/chrome.c 2010-10-18 19:24:14 UTC (rev 53581) +++ trunk/eve/src/bin/chrome.c 2010-10-18 19:24:17 UTC (rev 53582) @@ -1866,10 +1866,21 @@ case ITEM_TYPE_CONFIG: { + More_Menu_Config *conf; + if (!mmi->next) return; - More_Menu_Item *new_root = more_menu_config_create(win->win, mmi, mmi->next); + conf = mmi->next; + if (conf->type == CONFIG_TYPE_CHECKBOX) + { + Evas_Object *end = edje_object_part_swallow_get(elm_genlist_item_object_get(event_info), "elm.swallow.end"); + if (end) elm_toggle_state_set(end, !elm_toggle_state_get(end)); + elm_genlist_item_selected_set(event_info, EINA_FALSE); + return; + } + + More_Menu_Item *new_root = more_menu_config_create(win->win, mmi, conf); if (new_root) { win->list_history_titles = eina_list_prepend(win->list_history_titles, old_text); @@ -2455,7 +2466,6 @@ if (!elm_layout_file_set(chrome, PACKAGE_DATA_DIR "/default.edj", "chrome")) { int err = edje_object_load_error_get(ed); - const char *msg = edje_load_error_str(err); CRITICAL("Could not load chrome theme: %s", msg); |
From: Enlightenment S. <no-...@en...> - 2010-11-10 20:49:41
|
Log: [eve] Fix some styling issues Author: acidx Date: 2010-11-10 12:49:35 -0800 (Wed, 10 Nov 2010) New Revision: 54437 Modified: trunk/eve/src/bin/chrome.c Modified: trunk/eve/src/bin/chrome.c =================================================================== --- trunk/eve/src/bin/chrome.c 2010-11-10 20:49:31 UTC (rev 54436) +++ trunk/eve/src/bin/chrome.c 2010-11-10 20:49:35 UTC (rev 54437) @@ -941,18 +941,16 @@ _is_favorite_check(chrome, url); _history_update(url, title ? title : url); - old_icon = elm_scrolled_entry_icon_unset(text_url); + old_icon = elm_scrolled_entry_icon_unset(text_url); - if (old_icon) - evas_object_del(old_icon); + if (old_icon) evas_object_del(old_icon); + if (url) + { + favicon = ewk_settings_icon_database_icon_object_add(url, canvas); + if (favicon) + elm_scrolled_entry_icon_set(text_url, favicon); + } - if (url) - { - favicon = ewk_settings_icon_database_icon_object_add(url, canvas); - if (favicon) - elm_scrolled_entry_icon_set(text_url, favicon); - } - edje_object_signal_emit(ed, ewk_view_back_possible(view) ? "button,back,enable" : "button,back,disable", ""); edje_object_signal_emit(ed, ewk_view_forward_possible(view) ? "button,forward,enable" : "button,forward,disable", ""); } |
From: Enlightenment S. <no-...@en...> - 2010-11-16 14:55:30
|
Log: eve: added cookies policy configuration options This flag allows to set the cookie policies that eve should respect Author: Marco Trevisan (Trevi?\195?\177o) <ma...@3v...> Author: acidx Date: 2010-11-16 06:55:23 -0800 (Tue, 16 Nov 2010) New Revision: 54591 Modified: trunk/eve/src/bin/chrome.c trunk/eve/src/bin/eve_state.c trunk/eve/src/bin/eve_state.h trunk/eve/src/bin/main.c Modified: trunk/eve/src/bin/chrome.c =================================================================== --- trunk/eve/src/bin/chrome.c 2010-11-16 13:17:30 UTC (rev 54590) +++ trunk/eve/src/bin/chrome.c 2010-11-16 14:55:23 UTC (rev 54591) @@ -97,6 +97,7 @@ EVE_CONFIG_FRAME_FLATTENING, EVE_CONFIG_TEXT_ONLY_ZOOM, EVE_CONFIG_MINIMUM_FONT_SIZE, + EVE_CONFIG_COOKIE_POLICY, EVE_CONFIG_LAST } Eve_Config; @@ -298,6 +299,18 @@ { NULL, NULL } } }}, NULL, ITEM_FLAG_ARROW | ITEM_FLAG_SELECTABLE }, + { ITEM_TYPE_CONFIG, "Cookie policy", + (More_Menu_Config[]) {{ + .type = CONFIG_TYPE_LIST_INT, + .conf = EVE_CONFIG_COOKIE_POLICY, + .conf_get = config_cookie_policy_get, + .conf_set = config_cookie_policy_set, + .data = (More_Menu_Config_List_Int[]) { + { "Accept all cookies", EWK_COOKIE_JAR_ACCEPT_ALWAYS, EINA_FALSE }, + { "Do not accept third-party cookies", EWK_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY, EINA_TRUE }, + { "Never accept", EWK_COOKIE_JAR_ACCEPT_NEVER, EINA_FALSE } + } + }}, NULL, ITEM_FLAG_ARROW | ITEM_FLAG_SELECTABLE }, { ITEM_TYPE_LAST, NULL, NULL, NULL, ITEM_FLAG_NONE }, }, NULL, ITEM_FLAG_ARROW }, { ITEM_TYPE_SEPARATOR, NULL, NULL, NULL, ITEM_FLAG_NONE }, @@ -1284,6 +1297,7 @@ ewk_view_zoom_text_only_set(view, config_text_only_zoom_get(config)); ewk_view_setting_enable_frame_flattening_set(view, config_frame_flattening_get(config)); ewk_view_setting_font_minimum_size_set(view, config_minimum_font_size_get(config)); + ewk_cookies_policy_set(config_cookie_policy_get(config)); } static void @@ -1373,6 +1387,11 @@ } break; } + case EVE_CONFIG_COOKIE_POLICY: + { + ewk_cookies_policy_set((*(Ewk_Cookie_Policy *)new_value)); + break; + } } #undef SET_PREF_TO_ALL_VIEWS Modified: trunk/eve/src/bin/eve_state.c =================================================================== --- trunk/eve/src/bin/eve_state.c 2010-11-16 13:17:30 UTC (rev 54590) +++ trunk/eve/src/bin/eve_state.c 2010-11-16 14:55:23 UTC (rev 54591) @@ -26,6 +26,7 @@ unsigned char text_only_zoom; int minimum_font_size; const char *__eet_filename; + int cookie_policy; }; struct _Hist_Item { @@ -111,6 +112,7 @@ EET_DATA_DESCRIPTOR_ADD_BASIC(_config_descriptor, Config, "frame_flattening", frame_flattening, EET_T_UCHAR); EET_DATA_DESCRIPTOR_ADD_BASIC(_config_descriptor, Config, "text_only_zoom", text_only_zoom, EET_T_UCHAR); EET_DATA_DESCRIPTOR_ADD_BASIC(_config_descriptor, Config, "minimum_font_size", minimum_font_size, EET_T_INT); + EET_DATA_DESCRIPTOR_ADD_BASIC(_config_descriptor, Config, "cookie_policy", cookie_policy, EET_T_INT); } static inline void @@ -122,7 +124,7 @@ } Config * -config_new(unsigned char allow_popup, unsigned char enable_auto_load_images, unsigned char enable_auto_shrink_images, unsigned char enable_javascript, unsigned char enable_mouse_cursor, unsigned char enable_plugins, unsigned char enable_private_mode, unsigned char enable_touch_interface, const char * home_page, const char * proxy, unsigned char restore_state, const char * user_agent, unsigned char frame_flattening, unsigned char text_only_zoom, int minimum_font_size) +config_new(unsigned char allow_popup, unsigned char enable_auto_load_images, unsigned char enable_auto_shrink_images, unsigned char enable_javascript, unsigned char enable_mouse_cursor, unsigned char enable_plugins, unsigned char enable_private_mode, unsigned char enable_touch_interface, const char * home_page, const char * proxy, unsigned char restore_state, const char * user_agent, unsigned char frame_flattening, unsigned char text_only_zoom, int minimum_font_size, int cookie_policy) { Config *config = calloc(1, sizeof(Config)); @@ -147,6 +149,7 @@ config->frame_flattening = frame_flattening; config->text_only_zoom = text_only_zoom; config->minimum_font_size = minimum_font_size; + config->cookie_policy = cookie_policy; return config; } @@ -354,6 +357,19 @@ EINA_SAFETY_ON_NULL_RETURN(config); config->minimum_font_size = minimum_font_size; } + +inline int +config_cookie_policy_get(const Config *config) +{ + return config->cookie_policy; +} + +inline void +config_cookie_policy_set(Config *config, int cookie_policy) +{ + EINA_SAFETY_ON_NULL_RETURN(config); + config->cookie_policy = cookie_policy; +} Config * config_load(const char *filename) Modified: trunk/eve/src/bin/eve_state.h =================================================================== --- trunk/eve/src/bin/eve_state.h 2010-11-16 13:17:30 UTC (rev 54590) +++ trunk/eve/src/bin/eve_state.h 2010-11-16 14:55:23 UTC (rev 54591) @@ -17,7 +17,7 @@ typedef struct _Session Session; /* Config */ -Config *config_new(unsigned char allow_popup, unsigned char enable_auto_load_images, unsigned char enable_auto_shrink_images, unsigned char enable_javascript, unsigned char enable_mouse_cursor, unsigned char enable_plugins, unsigned char enable_private_mode, unsigned char enable_touch_interface, const char * home_page, const char * proxy, unsigned char restore_state, const char * user_agent, unsigned char frame_flattening, unsigned char text_only_zoom, int minimum_font_size); +Config *config_new(unsigned char allow_popup, unsigned char enable_auto_load_images, unsigned char enable_auto_shrink_images, unsigned char enable_javascript, unsigned char enable_mouse_cursor, unsigned char enable_plugins, unsigned char enable_private_mode, unsigned char enable_touch_interface, const char * home_page, const char * proxy, unsigned char restore_state, const char * user_agent, unsigned char frame_flattening, unsigned char text_only_zoom, int minimum_font_size, int cookie_policy); void config_free(Config *config); void config_allow_popup_set(Config *config, unsigned char allow_popup); @@ -50,6 +50,8 @@ unsigned char config_text_only_zoom_get(const Config *config); void config_minimum_font_size_set(Config *config, int minimum_font_size); int config_minimum_font_size_get(const Config *config); +void config_cookie_policy_set(Config *config, int cookie_policy); +int config_cookie_policy_get(const Config *config); Config *config_load(const char *filename); Eina_Bool config_save(Config *config, const char *filename); Modified: trunk/eve/src/bin/main.c =================================================================== --- trunk/eve/src/bin/main.c 2010-11-16 13:17:30 UTC (rev 54590) +++ trunk/eve/src/bin/main.c 2010-11-16 14:55:23 UTC (rev 54591) @@ -726,7 +726,8 @@ user_agent_str, EINA_FALSE /* frame_flattening */, EINA_FALSE /* text_only_zoom */, - 12 /* minimum_font_size */); + 12 /* minimum_font_size */, + ewk_cookies_policy_get()); if (!config_save(config, path)) { r = -1; |
From: Enlightenment S. <no-...@en...> - 2010-11-16 14:55:39
|
Log: eve: EWebKit cookies file support added This allows to keep the saved cookies throught the eve's sessions Author: Marco Trevisan (Trevi?\195?\177o) <ma...@3v...> Author: acidx Date: 2010-11-16 06:55:33 -0800 (Tue, 16 Nov 2010) New Revision: 54592 Modified: trunk/eve/src/bin/main.c Modified: trunk/eve/src/bin/main.c =================================================================== --- trunk/eve/src/bin/main.c 2010-11-16 14:55:23 UTC (rev 54591) +++ trunk/eve/src/bin/main.c 2010-11-16 14:55:33 UTC (rev 54592) @@ -699,6 +699,9 @@ basename++; dirlen++; + eina_strlcpy(basename, "cookies.txt", sizeof(path) - dirlen); + ewk_cookies_file_set(path); + eina_strlcpy(basename, "config.eet", sizeof(path) - dirlen); config = config_load(path); if (!config) |
From: Enlightenment S. <no-...@en...> - 2010-11-16 15:36:26
|
Log: eve: Fix possible segfault on previous commit Author: acidx Date: 2010-11-16 07:36:20 -0800 (Tue, 16 Nov 2010) New Revision: 54594 Modified: trunk/eve/src/bin/chrome.c Modified: trunk/eve/src/bin/chrome.c =================================================================== --- trunk/eve/src/bin/chrome.c 2010-11-16 15:31:44 UTC (rev 54593) +++ trunk/eve/src/bin/chrome.c 2010-11-16 15:36:20 UTC (rev 54594) @@ -308,7 +308,8 @@ .data = (More_Menu_Config_List_Int[]) { { "Accept all cookies", EWK_COOKIE_JAR_ACCEPT_ALWAYS, EINA_FALSE }, { "Do not accept third-party cookies", EWK_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY, EINA_TRUE }, - { "Never accept", EWK_COOKIE_JAR_ACCEPT_NEVER, EINA_FALSE } + { "Never accept", EWK_COOKIE_JAR_ACCEPT_NEVER, EINA_FALSE }, + { NULL, 0, EINA_FALSE }, } }}, NULL, ITEM_FLAG_ARROW | ITEM_FLAG_SELECTABLE }, { ITEM_TYPE_LAST, NULL, NULL, NULL, ITEM_FLAG_NONE }, |
From: Enlightenment S. <no-...@en...> - 2010-11-16 18:24:14
|
Log: eve: Add 'cookie_policy' setting to eve_state.geneet Author: acidx Date: 2010-11-16 10:24:07 -0800 (Tue, 16 Nov 2010) New Revision: 54598 Modified: trunk/eve/src/bin/eve_state.geneet Modified: trunk/eve/src/bin/eve_state.geneet =================================================================== --- trunk/eve/src/bin/eve_state.geneet 2010-11-16 18:11:37 UTC (rev 54597) +++ trunk/eve/src/bin/eve_state.geneet 2010-11-16 18:24:07 UTC (rev 54598) @@ -1,19 +1,20 @@ Config { - allow_popup : uchar; - enable_auto_load_images : uchar; - enable_auto_shrink_images : uchar; - enable_javascript : uchar; - enable_mouse_cursor : uchar; - enable_plugins : uchar; - enable_private_mode : uchar; - enable_touch_interface : uchar; - home_page : str default "http://www.google.com"; - proxy : str; - restore_state : uchar; - user_agent : str default "eve"; - frame_flattening : uchar; - text_only_zoom : uchar; - minimum_font_size : int; + allow_popup : uchar; + enable_auto_load_images : uchar; + enable_auto_shrink_images : uchar; + enable_javascript : uchar; + enable_mouse_cursor : uchar; + enable_plugins : uchar; + enable_private_mode : uchar; + enable_touch_interface : uchar; + home_page : str default "http://www.google.com"; + proxy : str; + restore_state : uchar; + user_agent : str default "eve"; + frame_flattening : uchar; + text_only_zoom : uchar; + minimum_font_size : int; + cookie_policy : int; } Hist_Item { @@ -38,17 +39,17 @@ } Session_Item { - url : str; - focused : uchar; - scroll_x : int; - scroll_y : int; + url : str; + focused : uchar; + scroll_x : int; + scroll_y : int; } Session_Window { - tabs : list of Session_Item; - focused : uchar; + tabs : list of Session_Item; + focused : uchar; } Session { - windows : list of Session_Window; + windows : list of Session_Window; } |
From: Enlightenment S. <no-...@en...> - 2010-11-16 18:24:19
|
Log: eve: sanitize input URIs adding the default http protocol This fix is now applied also to command line parameter and to the homepage config saver Author: Marco Trevisan (Trevi?\195?\177o) <ma...@3v...> Author: acidx Date: 2010-11-16 10:24:10 -0800 (Tue, 16 Nov 2010) New Revision: 54599 Modified: trunk/eve/src/bin/chrome.c trunk/eve/src/bin/main.c trunk/eve/src/bin/private.h Modified: trunk/eve/src/bin/chrome.c =================================================================== --- trunk/eve/src/bin/chrome.c 2010-11-16 18:24:07 UTC (rev 54598) +++ trunk/eve/src/bin/chrome.c 2010-11-16 18:24:10 UTC (rev 54599) @@ -2110,14 +2110,14 @@ Evas_Object *ewk_view = data; const char *entry_data = elm_scrolled_entry_entry_get(view); + char *uri; - char uri[2048]; - - snprintf(uri, 2048, "%s%s", - (strstr(entry_data, "://") ? "" : "http://"), entry_data); - - ewk_view_uri_set(ewk_view, uri); - evas_object_focus_set(ewk_view, EINA_TRUE); + if ((uri = uri_sanitize((char *)entry_data))) + { + ewk_view_uri_set(ewk_view, uri); + evas_object_focus_set(ewk_view, EINA_TRUE); + free(uri); + } } static void Modified: trunk/eve/src/bin/main.c =================================================================== --- trunk/eve/src/bin/main.c 2010-11-16 18:24:07 UTC (rev 54598) +++ trunk/eve/src/bin/main.c 2010-11-16 18:24:10 UTC (rev 54599) @@ -379,12 +379,18 @@ { DBusMessage *reply; Browser_Window *win = eina_list_data_get(app.windows); - char *new_url; + char *tmp_uri; + char *uri; - dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &new_url, DBUS_TYPE_INVALID); - tab_add(win, new_url, NULL); - ecore_x_window_focus(elm_win_xwindow_get(win->win)); + dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &tmp_uri, DBUS_TYPE_INVALID); + if ((uri = uri_sanitize(tmp_uri))) + { + tab_add(win, uri, NULL); + ecore_x_window_focus(elm_win_xwindow_get(win->win)); + free(uri); + } + return dbus_message_new_method_return(msg); } @@ -572,13 +578,24 @@ return !!n_tabs; } +char * +uri_sanitize(char *uri) { + char *fixed_uri; + + if (!uri || !*uri) return NULL; + if (asprintf(&fixed_uri, "%s%s", + (strstr(uri, "://") ? "" : "http://"), uri) > 0) + return fixed_uri; + return NULL; +} + EAPI int elm_main(int argc, char **argv) { int r = 0, args; const char *home; const char *url; - char path[PATH_MAX], *basename; + char path[PATH_MAX], *basename, *tmp_uri; Eina_Bool quit_option = EINA_FALSE; Eina_Bool disable_plugins = 0xff; Eina_Bool disable_mouse_cursor = 0xff; @@ -804,8 +821,12 @@ } } + tmp_uri = NULL; if (args < argc) - url = argv[args]; + { + tmp_uri = uri_sanitize(argv[args]); + url = tmp_uri; + } else url = config_home_page_get(config); @@ -831,6 +852,8 @@ goto end; } + if (tmp_uri) free(tmp_uri); + elm_run(); end: config_save(config, NULL); Modified: trunk/eve/src/bin/private.h =================================================================== --- trunk/eve/src/bin/private.h 2010-11-16 18:24:07 UTC (rev 54598) +++ trunk/eve/src/bin/private.h 2010-11-16 18:24:10 UTC (rev 54599) @@ -103,4 +103,6 @@ Eina_Bool tab_close_view(Browser_Window *win, Evas_Object *view); Eina_Bool tab_close_chrome(Browser_Window *win, Evas_Object *chrome); +char * uri_sanitize(char *uri); + #endif |
From: Enlightenment S. <no-...@en...> - 2010-11-29 15:29:37
|
Log: eve: uri_sanitize also the input homepage Plus some style fixes and set the input as const char Author: Marco Trevisan (Trevi?\195?\177o) <ma...@3v...> Author: acidx Date: 2010-11-29 07:29:31 -0800 (Mon, 29 Nov 2010) New Revision: 55065 Modified: trunk/eve/src/bin/chrome.c trunk/eve/src/bin/eve_state.c trunk/eve/src/bin/main.c trunk/eve/src/bin/private.h Modified: trunk/eve/src/bin/chrome.c =================================================================== --- trunk/eve/src/bin/chrome.c 2010-11-29 15:04:44 UTC (rev 55064) +++ trunk/eve/src/bin/chrome.c 2010-11-29 15:29:31 UTC (rev 55065) @@ -2112,7 +2112,7 @@ const char *entry_data = elm_scrolled_entry_entry_get(view); char *uri; - if ((uri = uri_sanitize((char *)entry_data))) + if ((uri = uri_sanitize(entry_data))) { ewk_view_uri_set(ewk_view, uri); evas_object_focus_set(ewk_view, EINA_TRUE); Modified: trunk/eve/src/bin/eve_state.c =================================================================== --- trunk/eve/src/bin/eve_state.c 2010-11-29 15:04:44 UTC (rev 55064) +++ trunk/eve/src/bin/eve_state.c 2010-11-29 15:29:31 UTC (rev 55065) @@ -277,9 +277,13 @@ config_home_page_set(Config *config, const char *home_page) { EINA_SAFETY_ON_NULL_RETURN(config); - eina_stringshare_replace(&(config->home_page), home_page); + char *tmp_uri; + if ((tmp_uri = uri_sanitize(home_page))) { + eina_stringshare_replace(&(config->home_page), tmp_uri); + free(tmp_uri); + } } - + inline const char * config_proxy_get(const Config *config) { Modified: trunk/eve/src/bin/main.c =================================================================== --- trunk/eve/src/bin/main.c 2010-11-29 15:04:44 UTC (rev 55064) +++ trunk/eve/src/bin/main.c 2010-11-29 15:29:31 UTC (rev 55065) @@ -579,7 +579,7 @@ } char * -uri_sanitize(char *uri) { +uri_sanitize(const char *uri) { char *fixed_uri; if (!uri || !*uri) return NULL; Modified: trunk/eve/src/bin/private.h =================================================================== --- trunk/eve/src/bin/private.h 2010-11-29 15:04:44 UTC (rev 55064) +++ trunk/eve/src/bin/private.h 2010-11-29 15:29:31 UTC (rev 55065) @@ -103,6 +103,6 @@ Eina_Bool tab_close_view(Browser_Window *win, Evas_Object *view); Eina_Bool tab_close_chrome(Browser_Window *win, Evas_Object *chrome); -char * uri_sanitize(char *uri); +char * uri_sanitize(const char *uri); #endif |
From: Enlightenment S. <no-...@en...> - 2010-11-29 15:29:40
|
Log: eve: uri_sanitize function improved, adding file:// protocol support Added also a check to avoid too-long uri schemas. Author: Marco Trevisan (Trevi?\195?\177o) <ma...@3v...> Author: acidx Date: 2010-11-29 07:29:33 -0800 (Mon, 29 Nov 2010) New Revision: 55066 Modified: trunk/eve/src/bin/main.c Modified: trunk/eve/src/bin/main.c =================================================================== --- trunk/eve/src/bin/main.c 2010-11-29 15:29:31 UTC (rev 55065) +++ trunk/eve/src/bin/main.c 2010-11-29 15:29:33 UTC (rev 55066) @@ -581,11 +581,25 @@ char * uri_sanitize(const char *uri) { char *fixed_uri; + char *schema; + char *tmp; if (!uri || !*uri) return NULL; - if (asprintf(&fixed_uri, "%s%s", - (strstr(uri, "://") ? "" : "http://"), uri) > 0) - return fixed_uri; + + tmp = strstr(uri, "://"); + if (!tmp || (tmp == uri) || (tmp > (uri + 15))) + { + if (ecore_file_exists(uri)) + schema = "file"; + else + schema = "http"; + + if (asprintf(&fixed_uri, "%s://%s", schema, uri) > 0) + return fixed_uri; + } + else + return strdup(uri); + return NULL; } |
From: Enlightenment S. <no-...@en...> - 2010-11-30 12:36:31
|
Log: eve: use file realpath for file:// schema Author: Marco Trevisan (Trevi?\195?\177o) <ma...@3v...> Author: acidx Date: 2010-11-30 04:36:24 -0800 (Tue, 30 Nov 2010) New Revision: 55082 Trac: http://trac.enlightenment.org/e/changeset/55082 Modified: trunk/eve/src/bin/main.c Modified: trunk/eve/src/bin/main.c =================================================================== --- trunk/eve/src/bin/main.c 2010-11-30 11:10:22 UTC (rev 55081) +++ trunk/eve/src/bin/main.c 2010-11-30 12:36:24 UTC (rev 55082) @@ -589,13 +589,21 @@ tmp = strstr(uri, "://"); if (!tmp || (tmp == uri) || (tmp > (uri + 15))) { + char *new_uri = NULL; if (ecore_file_exists(uri)) - schema = "file"; + { + schema = "file"; + new_uri = ecore_file_realpath(uri); + } else schema = "http"; - if (asprintf(&fixed_uri, "%s://%s", schema, uri) > 0) - return fixed_uri; + if (asprintf(&fixed_uri, "%s://%s", schema, new_uri ? new_uri : uri) > 0) + { + free(new_uri); + return fixed_uri; + } + free(new_uri); } else return strdup(uri); |
From: Enlightenment S. <no-...@en...> - 2010-11-30 12:36:35
|
Log: eve: Do not mess with eve_state.c It is generated by geneet and changes will be overwritten Author: acidx Date: 2010-11-30 04:36:28 -0800 (Tue, 30 Nov 2010) New Revision: 55083 Trac: http://trac.enlightenment.org/e/changeset/55083 Modified: trunk/eve/src/bin/chrome.c trunk/eve/src/bin/eve_state.c Modified: trunk/eve/src/bin/chrome.c =================================================================== --- trunk/eve/src/bin/chrome.c 2010-11-30 12:36:24 UTC (rev 55082) +++ trunk/eve/src/bin/chrome.c 2010-11-30 12:36:28 UTC (rev 55083) @@ -52,6 +52,8 @@ static Eina_Bool more_state_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__); static void more_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__); +static void proxy_config_home_page_set(Config *config, const char *home_page); + typedef enum { ITEM_TYPE_LAST, ITEM_TYPE_STATIC_FOLDER, @@ -201,7 +203,7 @@ .type = CONFIG_TYPE_STRING, .conf = EVE_CONFIG_HOME_PAGE, .conf_get = config_home_page_get, - .conf_set = config_home_page_set, + .conf_set = proxy_config_home_page_set, }}, NULL, ITEM_FLAG_ARROW }, { ITEM_TYPE_LAST, NULL, NULL, NULL, ITEM_FLAG_NONE }, }, NULL, ITEM_FLAG_ARROW }, @@ -403,6 +405,14 @@ .item_style = "double_label/ewebkit" }; +static void +proxy_config_home_page_set(Config *config, const char *home_page) +{ + char *tmp_uri = uri_sanitize(home_page); + config_home_page_set(config, tmp_uri); + free(tmp_uri); +} + static Eina_List * _eina_hash_sorted_keys_get(Eina_Hash *hash, Eina_Compare_Cb compare_func) { @@ -1085,7 +1095,9 @@ static More_Menu_Item * more_menu_home_page_current_set(Browser_Window *win, More_Menu_Item *mmi __UNUSED__) { - config_home_page_set(config, ewk_view_uri_get(win->current_view)); + char *tmp_uri = uri_sanitize(ewk_view_uri_get(win->current_view)); + config_home_page_set(config, tmp_uri); + free(tmp_uri); return NULL; } Modified: trunk/eve/src/bin/eve_state.c =================================================================== --- trunk/eve/src/bin/eve_state.c 2010-11-30 12:36:24 UTC (rev 55082) +++ trunk/eve/src/bin/eve_state.c 2010-11-30 12:36:28 UTC (rev 55083) @@ -277,11 +277,7 @@ config_home_page_set(Config *config, const char *home_page) { EINA_SAFETY_ON_NULL_RETURN(config); - char *tmp_uri; - if ((tmp_uri = uri_sanitize(home_page))) { - eina_stringshare_replace(&(config->home_page), tmp_uri); - free(tmp_uri); - } + eina_stringshare_replace(&(config->home_page), home_page); } inline const char * |
From: Enlightenment S. <no-...@en...> - 2010-12-02 15:54:38
|
Log: eve: support Android useragent Author: Marco Trevisan (Trevi?\195?\177o) <ma...@3v...> Author: acidx Date: 2010-12-02 07:54:27 -0800 (Thu, 02 Dec 2010) New Revision: 55158 Trac: http://trac.enlightenment.org/e/changeset/55158 Modified: trunk/eve/src/bin/chrome.c trunk/eve/src/bin/main.c Modified: trunk/eve/src/bin/chrome.c =================================================================== --- trunk/eve/src/bin/chrome.c 2010-12-02 10:47:34 UTC (rev 55157) +++ trunk/eve/src/bin/chrome.c 2010-12-02 15:54:27 UTC (rev 55158) @@ -294,6 +294,7 @@ .data = (More_Menu_Config_List[]) { { "Eve", "Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1A543a Safari/419.3 " PACKAGE_NAME "/" PACKAGE_VERSION }, { "iPhone", "Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1A543a Safari/419.3" }, + { "Android", "Mozilla/5.0 (Linux; U; Android 2.1; en-US;) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17" }, { "Safari", "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_3; en-US) AppleWebKit/533.17.8 (KHTML, like Gecko) Version/5.0.1 Safari/533.17.8" }, { "Chrome", "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.7 (KHTML, like Gecko) Chrome/7.0.514.0 Safari/534.7" }, { "Firefox", "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.2) Gecko/20121223 Firefox/3.8" }, Modified: trunk/eve/src/bin/main.c =================================================================== --- trunk/eve/src/bin/main.c 2010-12-02 10:47:34 UTC (rev 55157) +++ trunk/eve/src/bin/main.c 2010-12-02 15:54:27 UTC (rev 55158) @@ -364,7 +364,7 @@ ECORE_GETOPT_STORE_DEF_BOOL('T', "disable-touch-interface", "disable touch interface handling of mouse events", 1), ECORE_GETOPT_STORE_STR('U', "user-agent", - "user agent string to use. Special cases=iphone,safari,chrome,firefox,ie,ie9,ie8,ie7."), + "user agent string to use. Special cases=iphone,safari,chrome,firefox,android,ie,ie9,ie8,ie7."), ECORE_GETOPT_STORE_DEF_UINT('R', "rotate", "Screen Rotation in degrees", 0), ECORE_GETOPT_VERSION('V', "version"), ECORE_GETOPT_COPYRIGHT('C', "copyright"), @@ -685,6 +685,8 @@ user_agent_str = "Mozilla/5.0 (X11; U; Linux x86_64; en-US) AppleWebKit/534.7 (KHTML, like Gecko) Chrome/7.0.514.0 Safari/534.7"; else if (strcasecmp(user_agent_option, "firefox") == 0) user_agent_str = "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.2) Gecko/20121223 Firefox/3.8"; + else if (strcasecmp(user_agent_option, "android") == 0) + user_agent_str = "Mozilla/5.0 (Linux; U; Android 2.1; en-US;) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17"; else if (strcasecmp(user_agent_option, "ie") == 0) /* last */ user_agent_str = "Mozilla/5.0 (Windows; U; MSIE 9.0; Windows NT 9.0; en-US)"; |
From: Enlightenment S. <no-...@en...> - 2010-12-10 16:34:43
|
Log: eve: Add support for Tiled Backing store By enabling the Tiled Backing Store, memory consumption will be smaller, and scrolling and rendering large pages will also receive a substantial boost. The TBS implementation available on WebKit upstream, however, is still buggy -- this is being committed so that Eve is prepared whenever upstream WebKit is on a workable state again. Patch by Alex Grilo <ab...@pr...> Author: acidx Date: 2010-12-10 08:34:36 -0800 (Fri, 10 Dec 2010) New Revision: 55455 Trac: http://trac.enlightenment.org/e/changeset/55455 Modified: trunk/eve/src/bin/chrome.c trunk/eve/src/bin/eve_state.c trunk/eve/src/bin/eve_state.geneet trunk/eve/src/bin/eve_state.h trunk/eve/src/bin/main.c trunk/eve/src/bin/private.h trunk/eve/src/bin/view.c Modified: trunk/eve/src/bin/chrome.c =================================================================== --- trunk/eve/src/bin/chrome.c 2010-12-10 16:05:58 UTC (rev 55454) +++ trunk/eve/src/bin/chrome.c 2010-12-10 16:34:36 UTC (rev 55455) @@ -315,6 +315,18 @@ { NULL, 0, EINA_FALSE }, } }}, NULL, ITEM_FLAG_ARROW | ITEM_FLAG_SELECTABLE }, + { ITEM_TYPE_CONFIG, "Backing Store", + (More_Menu_Config[]) {{ + .type = CONFIG_TYPE_LIST_INT, + .conf = EVE_CONFIG_MINIMUM_FONT_SIZE, + .conf_get = config_backing_store_get, + .conf_set = config_backing_store_set, + .data = (More_Menu_Config_List_Int[]) { + { "Single", BACKING_STORE_SINGLE, EINA_TRUE }, + { "Tiled", BACKING_STORE_TILED, EINA_FALSE }, + { NULL, 0, EINA_FALSE } + } + }}, NULL, ITEM_FLAG_ARROW | ITEM_FLAG_SELECTABLE }, { ITEM_TYPE_LAST, NULL, NULL, NULL, ITEM_FLAG_NONE }, }, NULL, ITEM_FLAG_ARROW }, { ITEM_TYPE_SEPARATOR, NULL, NULL, NULL, ITEM_FLAG_NONE }, @@ -2500,7 +2512,7 @@ return NULL; } - view = view_add(win->win); + view = view_add(win->win, config_backing_store_get(config)); if (!view) { CRITICAL("Could not create view"); Modified: trunk/eve/src/bin/eve_state.c =================================================================== --- trunk/eve/src/bin/eve_state.c 2010-12-10 16:05:58 UTC (rev 55454) +++ trunk/eve/src/bin/eve_state.c 2010-12-10 16:34:36 UTC (rev 55455) @@ -27,6 +27,7 @@ int minimum_font_size; const char *__eet_filename; int cookie_policy; + int backing_store; }; struct _Hist_Item { @@ -113,6 +114,7 @@ EET_DATA_DESCRIPTOR_ADD_BASIC(_config_descriptor, Config, "text_only_zoom", text_only_zoom, EET_T_UCHAR); EET_DATA_DESCRIPTOR_ADD_BASIC(_config_descriptor, Config, "minimum_font_size", minimum_font_size, EET_T_INT); EET_DATA_DESCRIPTOR_ADD_BASIC(_config_descriptor, Config, "cookie_policy", cookie_policy, EET_T_INT); + EET_DATA_DESCRIPTOR_ADD_BASIC(_config_descriptor, Config, "backing_store", backing_store, EET_T_INT); } static inline void @@ -124,7 +126,7 @@ } Config * -config_new(unsigned char allow_popup, unsigned char enable_auto_load_images, unsigned char enable_auto_shrink_images, unsigned char enable_javascript, unsigned char enable_mouse_cursor, unsigned char enable_plugins, unsigned char enable_private_mode, unsigned char enable_touch_interface, const char * home_page, const char * proxy, unsigned char restore_state, const char * user_agent, unsigned char frame_flattening, unsigned char text_only_zoom, int minimum_font_size, int cookie_policy) +config_new(unsigned char allow_popup, unsigned char enable_auto_load_images, unsigned char enable_auto_shrink_images, unsigned char enable_javascript, unsigned char enable_mouse_cursor, unsigned char enable_plugins, unsigned char enable_private_mode, unsigned char enable_touch_interface, const char * home_page, const char * proxy, unsigned char restore_state, const char * user_agent, unsigned char frame_flattening, unsigned char text_only_zoom, int minimum_font_size, int cookie_policy, int backing_store) { Config *config = calloc(1, sizeof(Config)); @@ -150,6 +152,7 @@ config->text_only_zoom = text_only_zoom; config->minimum_font_size = minimum_font_size; config->cookie_policy = cookie_policy; + config->backing_store = backing_store; return config; } @@ -370,6 +373,19 @@ EINA_SAFETY_ON_NULL_RETURN(config); config->cookie_policy = cookie_policy; } + +inline int +config_backing_store_get(const Config *config) +{ + return config->backing_store; +} + +inline void +config_backing_store_set(Config *config, int backing_store) +{ + EINA_SAFETY_ON_NULL_RETURN(config); + config->backing_store = backing_store; +} Config * config_load(const char *filename) Modified: trunk/eve/src/bin/eve_state.geneet =================================================================== --- trunk/eve/src/bin/eve_state.geneet 2010-12-10 16:05:58 UTC (rev 55454) +++ trunk/eve/src/bin/eve_state.geneet 2010-12-10 16:34:36 UTC (rev 55455) @@ -15,6 +15,7 @@ text_only_zoom : uchar; minimum_font_size : int; cookie_policy : int; + backing_store : int; } Hist_Item { Modified: trunk/eve/src/bin/eve_state.h =================================================================== --- trunk/eve/src/bin/eve_state.h 2010-12-10 16:05:58 UTC (rev 55454) +++ trunk/eve/src/bin/eve_state.h 2010-12-10 16:34:36 UTC (rev 55455) @@ -17,7 +17,7 @@ typedef struct _Session Session; /* Config */ -Config *config_new(unsigned char allow_popup, unsigned char enable_auto_load_images, unsigned char enable_auto_shrink_images, unsigned char enable_javascript, unsigned char enable_mouse_cursor, unsigned char enable_plugins, unsigned char enable_private_mode, unsigned char enable_touch_interface, const char * home_page, const char * proxy, unsigned char restore_state, const char * user_agent, unsigned char frame_flattening, unsigned char text_only_zoom, int minimum_font_size, int cookie_policy); +Config *config_new(unsigned char allow_popup, unsigned char enable_auto_load_images, unsigned char enable_auto_shrink_images, unsigned char enable_javascript, unsigned char enable_mouse_cursor, unsigned char enable_plugins, unsigned char enable_private_mode, unsigned char enable_touch_interface, const char * home_page, const char * proxy, unsigned char restore_state, const char * user_agent, unsigned char frame_flattening, unsigned char text_only_zoom, int minimum_font_size, int cookie_policy, int backing_store); void config_free(Config *config); void config_allow_popup_set(Config *config, unsigned char allow_popup); @@ -52,6 +52,8 @@ int config_minimum_font_size_get(const Config *config); void config_cookie_policy_set(Config *config, int cookie_policy); int config_cookie_policy_get(const Config *config); +void config_backing_store_set(Config *config, int backing_store); +int config_backing_store_get(const Config *config); Config *config_load(const char *filename); Eina_Bool config_save(Config *config, const char *filename); Modified: trunk/eve/src/bin/main.c =================================================================== --- trunk/eve/src/bin/main.c 2010-12-10 16:05:58 UTC (rev 55454) +++ trunk/eve/src/bin/main.c 2010-12-10 16:34:36 UTC (rev 55455) @@ -283,7 +283,7 @@ goto error_pager_create; } - elm_object_style_set(win->pager, "ewebkit"); + elm_object_style_set(win->pager, "flip"); evas_object_size_hint_weight_set(win->pager, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win->win, win->pager); @@ -365,6 +365,8 @@ "disable touch interface handling of mouse events", 1), ECORE_GETOPT_STORE_STR('U', "user-agent", "user agent string to use. Special cases=iphone,safari,chrome,firefox,android,ie,ie9,ie8,ie7."), + ECORE_GETOPT_STORE_DEF_STR('B', "backing store", + "backing store to use. single or tiled.", "single"), ECORE_GETOPT_STORE_DEF_UINT('R', "rotate", "Screen Rotation in degrees", 0), ECORE_GETOPT_VERSION('V', "version"), ECORE_GETOPT_COPYRIGHT('C', "copyright"), @@ -624,6 +626,8 @@ Eina_Bool disable_touch_interface = 0xff; char *user_agent_option = NULL; const char *user_agent_str; + char *backing_store_option = NULL; + Backing_Store backing_store_enum; E_DBus_Connection *conn = NULL; size_t dirlen; Ecore_Timer *session_save_timer = NULL; @@ -634,6 +638,7 @@ ECORE_GETOPT_VALUE_BOOL(disable_mouse_cursor), ECORE_GETOPT_VALUE_BOOL(disable_touch_interface), ECORE_GETOPT_VALUE_STR(user_agent_option), + ECORE_GETOPT_VALUE_STR(backing_store_option), ECORE_GETOPT_VALUE_UINT(app.rotate), ECORE_GETOPT_VALUE_BOOL(quit_option), ECORE_GETOPT_VALUE_BOOL(quit_option), @@ -700,6 +705,11 @@ user_agent_str = user_agent_option; } + if (backing_store_option && !strcasecmp(backing_store_option, "tiled")) + backing_store_enum = BACKING_STORE_TILED; + else + backing_store_enum = BACKING_STORE_SINGLE; + elm_theme_extension_add(NULL, PACKAGE_DATA_DIR "/default.edj"); ewk_init(); eve_state_init(); @@ -771,13 +781,16 @@ EINA_FALSE /* frame_flattening */, EINA_FALSE /* text_only_zoom */, 12 /* minimum_font_size */, - ewk_cookies_policy_get()); + ewk_cookies_policy_get(), + backing_store_enum); if (!config_save(config, path)) { r = -1; goto end_config; } } + else + config_backing_store_set(config, backing_store_enum); hist = hist_load(path); if (!hist) Modified: trunk/eve/src/bin/private.h =================================================================== --- trunk/eve/src/bin/private.h 2010-12-10 16:05:58 UTC (rev 55454) +++ trunk/eve/src/bin/private.h 2010-12-10 16:34:36 UTC (rev 55455) @@ -65,6 +65,12 @@ float zoom; }; +typedef enum +{ + BACKING_STORE_SINGLE, + BACKING_STORE_TILED +} Backing_Store; + /** * Create new view object. * @@ -81,7 +87,7 @@ void window_mouse_enabled_set(Evas_Object *win, Eina_Bool setting); void window_title_set(Browser_Window *win, const char *title); -Evas_Object * view_add(Evas_Object *parent); +Evas_Object * view_add(Evas_Object *parent, Backing_Store bs); void view_zoom_reset(Evas_Object *view); void view_zoom_next_up(Evas_Object *view); void view_zoom_next_down(Evas_Object *view); Modified: trunk/eve/src/bin/view.c =================================================================== --- trunk/eve/src/bin/view.c 2010-12-10 16:05:58 UTC (rev 55454) +++ trunk/eve/src/bin/view.c 2010-12-10 16:34:36 UTC (rev 55455) @@ -1500,7 +1500,7 @@ * @return newly added Evas_Object or @c NULL on errors. */ Evas_Object * -view_add(Evas_Object *parent) +view_add(Evas_Object *parent, Backing_Store bs) { static Evas_Smart *smart = NULL; Evas *canvas = evas_object_evas_get(parent); @@ -1509,11 +1509,19 @@ if (!smart) { /* create ewk_view_single subclass, this is done only once! */ - static Ewk_View_Smart_Class api = EWK_VIEW_SMART_CLASS_INIT_NAME_VERSION("EWK_View_Single_Demo"); + static Ewk_View_Smart_Class api = EWK_VIEW_SMART_CLASS_INIT_NAME_VERSION("EWK_View_Demo"); /* set current and parent apis to vanilla ewk_view_single methods */ - ewk_view_single_smart_set(&api); - ewk_view_single_smart_set(&_parent_sc); + if (bs == BACKING_STORE_TILED) + { + ewk_view_tiled_smart_set(&api); + ewk_view_tiled_smart_set(&_parent_sc); + } + else + { + ewk_view_single_smart_set(&api); + ewk_view_single_smart_set(&_parent_sc); + } /* override methods we want custom behavior */ api.sc.add = _view_smart_add; |
From: Enlightenment S. <no-...@en...> - 2010-12-10 16:34:46
|
Log: eve: Cleanup (remove unused vars, static functions). Author: acidx Date: 2010-12-10 08:34:39 -0800 (Fri, 10 Dec 2010) New Revision: 55456 Trac: http://trac.enlightenment.org/e/changeset/55456 Modified: trunk/eve/src/bin/chrome.c trunk/eve/src/bin/main.c trunk/eve/src/bin/view.c Modified: trunk/eve/src/bin/chrome.c =================================================================== --- trunk/eve/src/bin/chrome.c 2010-12-10 16:34:36 UTC (rev 55455) +++ trunk/eve/src/bin/chrome.c 2010-12-10 16:34:39 UTC (rev 55456) @@ -545,7 +545,7 @@ } static More_Menu_Item * -more_menu_history_by_domain(Browser_Window *win __UNUSED__, More_Menu_Item *current_item) +more_menu_history_by_domain(Browser_Window *win __UNUSED__, More_Menu_Item *current_item __UNUSED__) { More_Menu_Item *bm_item; More_Menu_Item *ret = NULL, *new_ret; @@ -696,7 +696,7 @@ } static void -index_selected(void *data, Evas_Object *obj, void *event_info) +index_selected(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { elm_genlist_item_top_bring_in(event_info); } @@ -778,7 +778,7 @@ } static More_Menu_Item * -more_menu_favorites(Browser_Window *win __UNUSED__, More_Menu_Item *current_item) +more_menu_favorites(Browser_Window *win __UNUSED__, More_Menu_Item *current_item __UNUSED__) { More_Menu_Item *bm_item; More_Menu_Item *ret = NULL, *new_ret; @@ -841,15 +841,6 @@ } static void -on_view_mask_visible(void *data, Evas_Object *o __UNUSED__, - const char *emission __UNUSED__, const char *source __UNUSED__) -{ - Browser_Window *win = data; - Evas_Object *ed = elm_layout_edje_get(win->current_chrome); - Evas_Object *url_entry = edje_object_part_swallow_get(ed, "url-entry"); -} - -static void on_view_mask_hidden(void *data, Evas_Object *o __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) { @@ -993,11 +984,10 @@ } static void -on_view_load_progress(void *data, Evas_Object *view, void *event_info) +on_view_load_progress(void *data, Evas_Object *view __UNUSED__, void *event_info) { Evas_Object *chrome = data; Evas_Object *ed = elm_layout_edje_get(chrome); - Session_Item *si; double *progress = event_info; Edje_Message_Float msg = { *progress }; @@ -1100,7 +1090,7 @@ } static void -on_view_popup_delete(void *data, Evas_Object *view, void *event_info) +on_view_popup_delete(void *data, Evas_Object *view __UNUSED__, void *event_info __UNUSED__) { ecore_idler_add(_view_popup_delete, data); } @@ -1162,7 +1152,7 @@ } static void -_popup_item_selected(void *data, Evas_Object *obj, void *event_info) +_popup_item_selected(void *data, Evas_Object *obj, void *event_info __UNUSED__) { Evas_Object *view = data; Elm_List_Item *it = elm_list_selected_item_get(obj); @@ -1183,7 +1173,7 @@ } static void -on_view_popup_new(void *data, Evas_Object *view, void *event_info) +on_view_popup_new(void *data __UNUSED__, Evas_Object *view, void *event_info) { Ewk_Menu *menu = event_info; Ewk_Menu_Item *item; @@ -1261,7 +1251,7 @@ } static void -on_tab_gengrid_item_realized(void *data, Evas_Object *o, void *event_info) +on_tab_gengrid_item_realized(void *data, Evas_Object *o __UNUSED__, void *event_info) { Browser_Window *win = data; Evas_Object *item = (Evas_Object *)elm_gengrid_item_object_get(event_info); @@ -1418,6 +1408,7 @@ ewk_cookies_policy_set((*(Ewk_Cookie_Policy *)new_value)); break; } + default: ; } #undef SET_PREF_TO_ALL_VIEWS @@ -1494,9 +1485,9 @@ return spinner; } + default: + return NULL; } - - return NULL; } static void @@ -1535,7 +1526,6 @@ for (i = 0; params->root[i].type != ITEM_TYPE_LAST; i++) { - Evas_Object *icon = NULL, *end = NULL; Elm_Genlist_Item *item = NULL; switch (params->root[i].type) { case ITEM_TYPE_SEPARATOR: @@ -1660,7 +1650,6 @@ More_Menu_Config *p = i->data; More_Menu_Config_List *l = p->data; void (*conf_set)(Config *, const char *); - const char *title = NULL; int item; for (item = 0; l[item].title; item++) @@ -1683,7 +1672,6 @@ More_Menu_Config *p = i->data; More_Menu_Config_List_Int *l = p->data; void (*conf_set)(Config *, const int); - const char *title = NULL; int item; for (item = 0; l[item].title; item++) @@ -1701,7 +1689,7 @@ } static More_Menu_Item * -more_menu_config_list_create(More_Menu_Item *i, More_Menu_Config *p) +more_menu_config_list_create(More_Menu_Item *i __UNUSED__, More_Menu_Config *p) { More_Menu_Config_List *list = p->data; More_Menu_Item *mmi; @@ -1729,7 +1717,7 @@ } static More_Menu_Item * -more_menu_config_list_int_create(More_Menu_Item *i, More_Menu_Config *p) +more_menu_config_list_int_create(More_Menu_Item *i __UNUSED__, More_Menu_Config *p) { More_Menu_Config_List_Int *list = p->data; More_Menu_Item *mmi; @@ -1757,7 +1745,7 @@ } static void -on_string_ask_ok_click(void *data, Evas_Object *obj, void *event_info) +on_string_ask_ok_click(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Eina_Bool *response = data; *response = EINA_TRUE; @@ -1765,7 +1753,7 @@ } static void -on_string_ask_cancel_click(void *data, Evas_Object *obj, void *event_info) +on_string_ask_cancel_click(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Eina_Bool *response = data; *response = EINA_FALSE; @@ -1855,8 +1843,8 @@ case CONFIG_TYPE_PASSWORD: more_menu_config_string_ask(parent, item, config, EINA_TRUE); break; + default: ; } - return NULL; } @@ -1869,8 +1857,6 @@ More_Menu_Item *mmi = data; Browser_Window *win = evas_object_data_get(chrome, "win"); const char *old_text = edje_object_part_text_get(ed, "more-list-title"); - Evas_Object *list = evas_object_data_get(chrome, "more-list"); - Evas_Object *index = evas_object_data_get(list, "more-index"); if (!mmi) return; @@ -2019,7 +2005,7 @@ } static void -tab_grid_item_click(void *data, Evas_Object *obj, void *event_info) +tab_grid_item_click(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Evas_Object *chrome = data; Browser_Window *win = evas_object_data_get(chrome, "win"); @@ -2064,13 +2050,6 @@ } static void -on_action_tab_hide(void *data, Evas_Object *o __UNUSED__, - const char *emission __UNUSED__, - const char *source __UNUSED__) -{ -} - -static void on_action_more_hide(void *data, Evas_Object *o __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) @@ -2187,7 +2166,7 @@ } static void -on_view_download_request(void *data, Evas_Object *view __UNUSED__, +on_view_download_request(void *data __UNUSED__, Evas_Object *view __UNUSED__, void *event_info) { Ewk_Download *download = event_info; @@ -2433,7 +2412,6 @@ void *(*conf_get)(void *); if ((conf_get = mmc->conf_get)) { - char *selected_value = NULL; if (mmc->type == CONFIG_TYPE_LIST_INT) return strdup(_get_selected_int_value_title(mmc->data, (int)conf_get(config))); else if (mmc->type == CONFIG_TYPE_LIST) @@ -2464,7 +2442,6 @@ else if (mmi->type == ITEM_TYPE_PAGE) { Evas_Object *chrome = evas_object_data_get(obj, "chrome"); - Evas_Object *view = evas_object_data_get(chrome, "view"); Evas *canvas = evas_object_evas_get(chrome); icon = ewk_settings_icon_database_icon_object_add(mmi->next, canvas); } @@ -2601,7 +2578,6 @@ edje_object_signal_callback_add(ed, "action,fav_on", "", on_fav_on, view); edje_object_signal_callback_add(ed, "action,fav_off", "", on_fav_off, view); - edje_object_signal_callback_add(ed, "view,mask,visible", "", on_view_mask_visible, win); edje_object_signal_callback_add(ed, "view,mask,hidden", "", on_view_mask_hidden, win); edje_object_signal_callback_add(ed, "more,show", "", @@ -2610,8 +2586,6 @@ on_action_more_hide, chrome); edje_object_signal_callback_add(ed, "tab,show", "", on_action_tab_show, chrome); - edje_object_signal_callback_add(ed, "tab,hide", "", - on_action_tab_hide, chrome); evas_object_smart_callback_add(view, "load,progress", on_view_load_progress, chrome); evas_object_smart_callback_add(view, "title,changed", on_view_title_changed, Modified: trunk/eve/src/bin/main.c =================================================================== --- trunk/eve/src/bin/main.c 2010-12-10 16:34:36 UTC (rev 55455) +++ trunk/eve/src/bin/main.c 2010-12-10 16:34:39 UTC (rev 55456) @@ -379,7 +379,6 @@ static DBusMessage * _cb_dbus_open_url(E_DBus_Object *obj __UNUSED__, DBusMessage *msg) { - DBusMessage *reply; Browser_Window *win = eina_list_data_get(app.windows); char *tmp_uri; char *uri; @@ -542,7 +541,7 @@ EINA_LIST_FOREACH(windows, window_iter, window) { - Evas_Object *frame, *focused_chrome; + Evas_Object *focused_chrome; Eina_List *items = session_window_tabs_list_get(window); Eina_List *items_iter; Browser_Window *win; Modified: trunk/eve/src/bin/view.c =================================================================== --- trunk/eve/src/bin/view.c 2010-12-10 16:34:36 UTC (rev 55455) +++ trunk/eve/src/bin/view.c 2010-12-10 16:34:39 UTC (rev 55456) @@ -923,7 +923,7 @@ } static void -_view_contextmenu_item_selected(void *data, Evas_Object *li, void *event_info) +_view_contextmenu_item_selected(void *data, Evas_Object *li, void *event_info __UNUSED__) { Ewk_Context_Menu_Item *item = data; Evas_Object *view = evas_object_data_get(li, "view"); @@ -1293,7 +1293,7 @@ * We just print message to stdout */ static void -_view_smart_add_console_message(Ewk_View_Smart_Data *esd, const char *message, unsigned int lineNumber, const char *sourceID) +_view_smart_add_console_message(Ewk_View_Smart_Data *esd __UNUSED__, const char *message, unsigned int lineNumber, const char *sourceID) { printf("BROWSER console: %s @%d: %s\n", sourceID, lineNumber, message); } @@ -1315,7 +1315,7 @@ }; static void -_bt_close(void *data, Evas_Object *obj, void *event_info) +_bt_close(void *data, Evas_Object *obj, void *event_info __UNUSED__) { struct _dialog_data *d = data; @@ -1416,7 +1416,7 @@ * */ static void -_view_smart_run_javascript_alert(Ewk_View_Smart_Data *esd, Evas_Object *frame, const char *message) +_view_smart_run_javascript_alert(Ewk_View_Smart_Data *esd, Evas_Object *frame __UNUSED__, const char *message) { View_Smart_Data *sd = (View_Smart_Data *)esd; Evas_Object *view = sd->base.self; @@ -1428,7 +1428,7 @@ * */ static Eina_Bool -_view_smart_run_javascript_confirm(Ewk_View_Smart_Data *esd, Evas_Object *frame, const char *message) +_view_smart_run_javascript_confirm(Ewk_View_Smart_Data *esd, Evas_Object *frame __UNUSED__, const char *message) { View_Smart_Data *sd = (View_Smart_Data *)esd; Evas_Object *view = sd->base.self; @@ -1440,7 +1440,7 @@ * */ static Eina_Bool -_view_smart_run_javascript_prompt(Ewk_View_Smart_Data *esd, Evas_Object *frame, const char *message, const char *default_value, char **value) +_view_smart_run_javascript_prompt(Ewk_View_Smart_Data *esd, Evas_Object *frame __UNUSED__, const char *message, const char *default_value, char **value) { View_Smart_Data *sd = (View_Smart_Data *)esd; Evas_Object *view = sd->base.self; |
From: Enlightenment S. <no-...@en...> - 2011-10-18 15:21:04
|
Log: eve: Update eve_state.geneet after r64147 Author: acidx Date: 2011-10-18 08:20:53 -0700 (Tue, 18 Oct 2011) New Revision: 64152 Trac: http://trac.enlightenment.org/e/changeset/64152 Modified: trunk/eve/src/bin/eve_state.geneet Modified: trunk/eve/src/bin/eve_state.geneet =================================================================== --- trunk/eve/src/bin/eve_state.geneet 2011-10-18 15:20:08 UTC (rev 64151) +++ trunk/eve/src/bin/eve_state.geneet 2011-10-18 15:20:53 UTC (rev 64152) @@ -12,7 +12,7 @@ restore_state : uchar; user_agent : str default "eve"; frame_flattening : uchar; - text_only_zoom : uchar; + text_zoom : int; minimum_font_size : int; cookie_policy : int; backing_store : int; |
From: Enlightenment S. <no-...@en...> - 2012-01-16 16:10:02
|
Log: adapt to newer webkit-efl API Signed-off-by: Martin Jansa <Mar...@gm...> Author: acidx Date: 2012-01-16 08:09:54 -0800 (Mon, 16 Jan 2012) New Revision: 67243 Trac: http://trac.enlightenment.org/e/changeset/67243 Modified: trunk/eve/src/bin/chrome.c Modified: trunk/eve/src/bin/chrome.c =================================================================== --- trunk/eve/src/bin/chrome.c 2012-01-16 12:34:13 UTC (rev 67242) +++ trunk/eve/src/bin/chrome.c 2012-01-16 16:09:54 UTC (rev 67243) @@ -1318,7 +1318,7 @@ ewk_view_setting_private_browsing_set(view, config_enable_private_mode_get(config)); ewk_view_setting_auto_load_images_set(view, config_enable_auto_load_images_get(config)); ewk_view_setting_auto_shrink_images_set(view, config_enable_auto_shrink_images_get(config)); - ewk_view_setting_scripts_window_open_set(view, config_allow_popup_get(config)); + ewk_view_setting_scripts_can_open_windows_set(view, config_allow_popup_get(config)); view_touch_interface_set(view, config_enable_touch_interface_get(config)); window_mouse_enabled_set(win->win, config_enable_mouse_cursor_get(config)); ewk_view_text_zoom_set(view, config_text_zoom_get(config)); @@ -1377,7 +1377,7 @@ } case EVE_CONFIG_POPUP_ALLOW: { - SET_PREF_TO_ALL_VIEWS(ewk_view_setting_scripts_window_open_set, *((int *)new_value)); + SET_PREF_TO_ALL_VIEWS(ewk_view_setting_scripts_can_open_windows_set, *((int *)new_value)); break; } case EVE_CONFIG_TEXT_ONLY_ZOOM: |
From: Enlightenment S. <no-...@en...> - 2012-01-16 16:10:12
|
Log: eve: don't use deprecated elm_entry_icon_* API, deprecated since r66991 Signed-off-by: Martin Jansa <Mar...@gm...> Author: acidx Date: 2012-01-16 08:10:00 -0800 (Mon, 16 Jan 2012) New Revision: 67244 Trac: http://trac.enlightenment.org/e/changeset/67244 Modified: trunk/eve/src/bin/chrome.c Modified: trunk/eve/src/bin/chrome.c =================================================================== --- trunk/eve/src/bin/chrome.c 2012-01-16 16:09:54 UTC (rev 67243) +++ trunk/eve/src/bin/chrome.c 2012-01-16 16:10:00 UTC (rev 67244) @@ -980,14 +980,14 @@ _is_favorite_check(chrome, url); _history_update(url, title ? title : url); - old_icon = elm_entry_icon_unset(text_url); + old_icon = elm_object_part_content_unset(text_url, "icon"); if (old_icon) evas_object_del(old_icon); if (url) { favicon = ewk_settings_icon_database_icon_object_add(url, canvas); if (favicon) - elm_entry_icon_set(text_url, favicon); + elm_object_part_content_set(text_url, "icon", favicon); } edje_object_signal_emit(ed, ewk_view_back_possible(view) ? "button,back,enable" : "button,back,disable", ""); |
From: Enlightenment S. <no-...@en...> - 2012-01-20 16:19:31
|
Log: eve: use elm_object_part_content_set instead of deprecated elm_entry_end_set Author: Martin Jansa <Mar...@gm...> Author: acidx Date: 2012-01-20 08:19:19 -0800 (Fri, 20 Jan 2012) New Revision: 67395 Trac: http://trac.enlightenment.org/e/changeset/67395 Modified: trunk/eve/src/bin/chrome.c Modified: trunk/eve/src/bin/chrome.c =================================================================== --- trunk/eve/src/bin/chrome.c 2012-01-20 16:08:10 UTC (rev 67394) +++ trunk/eve/src/bin/chrome.c 2012-01-20 16:19:19 UTC (rev 67395) @@ -2549,7 +2549,7 @@ Evas_Object *ic = elm_icon_add(ed); elm_icon_file_set(ic, PACKAGE_DATA_DIR "/default.edj", "clear-button"); - elm_entry_end_set(text_url, ic); + elm_object_part_content_set(text_url, "end", ic); evas_object_smart_callback_add(ic, "clicked", on_action_clear, chrome); Evas_Object *more_list = elm_genlist_add(ed); |
From: Enlightenment S. <no-...@en...> - 2012-07-18 21:46:00
|
Log: eve: Build fix after WebKit r113173 ewk_settings_icon_database_icon_object_add was renamed to ewk_settings_icon_database_icon_object_get in webkit r113173 (see https://bugs.webkit.org/show_bug.cgi?id=82438) Signed-off-by: Martin Jansa <Mar...@gm...> Author: acidx Date: 2012-07-18 14:45:53 -0700 (Wed, 18 Jul 2012) New Revision: 74152 Trac: http://trac.enlightenment.org/e/changeset/74152 Modified: trunk/eve/src/bin/chrome.c Modified: trunk/eve/src/bin/chrome.c =================================================================== --- trunk/eve/src/bin/chrome.c 2012-07-18 21:03:58 UTC (rev 74151) +++ trunk/eve/src/bin/chrome.c 2012-07-18 21:45:53 UTC (rev 74152) @@ -985,7 +985,7 @@ if (old_icon) evas_object_del(old_icon); if (url) { - favicon = ewk_settings_icon_database_icon_object_add(url, canvas); + favicon = ewk_settings_icon_database_icon_object_get(url, canvas); if (favicon) elm_object_part_content_set(text_url, "icon", favicon); } @@ -2456,7 +2456,7 @@ { Evas_Object *chrome = evas_object_data_get(obj, "chrome"); Evas *canvas = evas_object_evas_get(chrome); - icon = ewk_settings_icon_database_icon_object_add(mmi->next, canvas); + icon = ewk_settings_icon_database_icon_object_get(mmi->next, canvas); } return icon; } |