<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[206077] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/206077">206077</a></dd>
<dt>Author</dt> <dd>gyuyoung.kim@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-18 06:13:47 -0700 (Sun, 18 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL] Adjust EFL coding style to EFL MiniBrowser
https://bugs.webkit.org/show_bug.cgi?id=162119
Reviewed by Michael Catanzaro.
Apply EFL coding style to main.c for MiniBrowser.
- Use _foo_cb instead of on_foo for callback function
- Use 3 spaces and use 2 spaces in keywords.
- EFL coding style.
https://phab.enlightenment.org/w/coding_convention/
Additionally this patch adds an exception rule that style checker doesn't
check indentation rule in EFL MiniBrowser.
* MiniBrowser/efl/main.c:
(miniBrowserViewSmartClass):
(window_find_with_ewk_view):
(_tooltip_show):
(window_tooltip_hide):
(window_tooltip_update):
(_mouse_in_cb):
(_mouse_move_cb):
(_mouse_out_cb):
(_mouse_wheel_cb):
(_window_resize_cb):
(update_view_favicon):
(_icon_changed_cb):
(window_free):
(window_close):
(search_icon_show):
(search_box_show):
(search_box_hide):
(history_list_hide):
(save_page_contents_callback):
(script_execute_callback):
(toggle_window_fullscreen):
(_key_down_cb):
(_mouse_down_cb):
(_title_changed_cb):
(_url_changed_cb):
(_back_forward_list_changed_cb):
(_progress_cb):
(_error_cb):
(_download_request_cb):
(close_file_picker):
(_filepicker_parent_deletion_cb):
(_filepicker_deletion_cb):
(_fileselector_done_cb):
(_file_chooser_request_cb):
(_download_finished_cb):
(_download_failed_cb):
(_color_changed_cb):
(_color_item_selected_cb):
(_color_picker_ok_clicked_cb):
(_color_picker_cancel_clicked_cb):
(_color_picker_dismiss_cb):
(_color_picker_request_cb):
(_url_bar_activated_cb):
(_url_bar_clicked_cb):
(_search_field_aborted_cb):
(_search_field_activated_cb):
(_search_field_clicked_cb):
(_back_button_clicked_cb):
(_forward_button_clicked_cb):
(_search_backward_button_clicked_cb):
(_search_forward_button_clicked_cb):
(_search_case_option_changed):
(_search_word_start_option_changed_cb):
(_search_close_button_clicked_cb):
(_refresh_button_clicked_cb):
(_stop_button_clicked_cb):
(_list_item_select_cb):
(navigation_button_longpress_process):
(_forward_button_longpress_cb):
(_back_button_longpress_cb):
(_ok_clicked_cb):
(_file_entry_dialog_show):
(_javascript_alert_cb):
(_javascript_confirm_cb):
(_javascript_prompt_cb):
(_javascript_before_unload_confirm_cb):
(_popup_menu_item_clicked_cb):
(popup_menu_populate):
(_popup_menu_show):
(_popup_menu_hide):
(_window_geometry_get):
(_window_geometry_set):
(_fullscreen_accept_cb):
(_fullscreen_deny_cb):
(_fullscreen_enter_cb):
(_fullscreen_exit_cb):
(_window_create_cb):
(_window_close_cb):
(_context_menu_item_selected_cb):
(context_menu_populate):
(_context_menu_show):
(_context_menu_hide):
(auth_popup_close):
(_auth_cancel_cb):
(_auth_ok_cb):
(_authentication_request_cb):
(_search_text_found_cb):
(_tooltip_text_set):
(_tooltip_text_unset):
(_navigation_policy_decision_cb):
(_home_button_clicked_cb):
(_window_deletion_cb):
(create_toolbar_button):
(window_create):
(configuration):
(parse_cookies_policy):
(parse_window_size):
(elm_main):
(on_tooltip_show): Deleted.
(on_mouse_in): Deleted.
(on_mouse_move): Deleted.
(on_mouse_out): Deleted.
(on_mouse_wheel): Deleted.
(on_window_resize): Deleted.
(on_icon_changed_cb): Deleted.
(on_key_down): Deleted.
(on_mouse_down): Deleted.
(on_title_changed): Deleted.
(on_url_changed): Deleted.
(on_back_forward_list_changed): Deleted.
(on_progress): Deleted.
(on_error): Deleted.
(on_download_request): Deleted.
(on_filepicker_parent_deletion): Deleted.
(on_filepicker_deletion): Deleted.
(on_fileselector_done): Deleted.
(on_file_chooser_request): Deleted.
(on_download_finished): Deleted.
(on_download_failed): Deleted.
(on_color_changed): Deleted.
(on_color_item_selected): Deleted.
(on_color_picker_ok_clicked): Deleted.
(on_color_picker_cancel_clicked): Deleted.
(on_color_picker_dismiss): Deleted.
(on_color_picker_request): Deleted.
(on_url_bar_activated): Deleted.
(on_url_bar_clicked): Deleted.
(on_search_field_aborted): Deleted.
(on_search_field_activated): Deleted.
(on_search_field_clicked): Deleted.
(on_back_button_clicked): Deleted.
(on_forward_button_clicked): Deleted.
(on_search_backward_button_clicked): Deleted.
(on_search_forward_button_clicked): Deleted.
(on_search_case_option_changed): Deleted.
(on_search_word_start_option_changed): Deleted.
(on_search_close_button_clicked): Deleted.
(on_refresh_button_clicked): Deleted.
(on_stop_button_clicked): Deleted.
(on_list_item_select): Deleted.
(on_forward_button_longpress): Deleted.
(on_back_button_longpress): Deleted.
(on_ok_clicked): Deleted.
(show_file_entry_dialog): Deleted.
(on_javascript_alert): Deleted.
(on_javascript_confirm): Deleted.
(on_javascript_prompt): Deleted.
(on_javascript_before_unload_confirm): Deleted.
(on_popup_menu_item_clicked): Deleted.
(on_popup_menu_show): Deleted.
(on_popup_menu_hide): Deleted.
(on_window_geometry_get): Deleted.
(on_window_geometry_set): Deleted.
(on_fullscreen_accept): Deleted.
(on_fullscreen_deny): Deleted.
(on_fullscreen_enter): Deleted.
(on_fullscreen_exit): Deleted.
(on_window_create): Deleted.
(on_window_close): Deleted.
(context_menu_item_selected_cb): Deleted.
(on_context_menu_show): Deleted.
(on_context_menu_hide): Deleted.
(on_auth_cancel): Deleted.
(on_auth_ok): Deleted.
(on_authentication_request): Deleted.
(on_search_text_found): Deleted.
(on_tooltip_text_set): Deleted.
(on_tooltip_text_unset): Deleted.
(on_navigation_policy_decision): Deleted.
(on_home_button_clicked): Deleted.
(on_window_deletion): Deleted.
* Scripts/webkitpy/style/checker.py:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsereflmainc">trunk/Tools/MiniBrowser/efl/main.c</a></li>
<li><a href="#trunkToolsScriptswebkitpystylecheckerpy">trunk/Tools/Scripts/webkitpy/style/checker.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (206076 => 206077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-18 08:01:11 UTC (rev 206076)
+++ trunk/Tools/ChangeLog 2016-09-18 13:13:47 UTC (rev 206077)
</span><span class="lines">@@ -1,3 +1,194 @@
</span><ins>+2016-09-18 Gyuyoung Kim <gyuyoung.kim@webkit.org>
+
+ [EFL] Adjust EFL coding style to EFL MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=162119
+
+ Reviewed by Michael Catanzaro.
+
+ Apply EFL coding style to main.c for MiniBrowser.
+ - Use _foo_cb instead of on_foo for callback function
+ - Use 3 spaces and use 2 spaces in keywords.
+
+ - EFL coding style.
+ https://phab.enlightenment.org/w/coding_convention/
+
+ Additionally this patch adds an exception rule that style checker doesn't
+ check indentation rule in EFL MiniBrowser.
+
+ * MiniBrowser/efl/main.c:
+ (miniBrowserViewSmartClass):
+ (window_find_with_ewk_view):
+ (_tooltip_show):
+ (window_tooltip_hide):
+ (window_tooltip_update):
+ (_mouse_in_cb):
+ (_mouse_move_cb):
+ (_mouse_out_cb):
+ (_mouse_wheel_cb):
+ (_window_resize_cb):
+ (update_view_favicon):
+ (_icon_changed_cb):
+ (window_free):
+ (window_close):
+ (search_icon_show):
+ (search_box_show):
+ (search_box_hide):
+ (history_list_hide):
+ (save_page_contents_callback):
+ (script_execute_callback):
+ (toggle_window_fullscreen):
+ (_key_down_cb):
+ (_mouse_down_cb):
+ (_title_changed_cb):
+ (_url_changed_cb):
+ (_back_forward_list_changed_cb):
+ (_progress_cb):
+ (_error_cb):
+ (_download_request_cb):
+ (close_file_picker):
+ (_filepicker_parent_deletion_cb):
+ (_filepicker_deletion_cb):
+ (_fileselector_done_cb):
+ (_file_chooser_request_cb):
+ (_download_finished_cb):
+ (_download_failed_cb):
+ (_color_changed_cb):
+ (_color_item_selected_cb):
+ (_color_picker_ok_clicked_cb):
+ (_color_picker_cancel_clicked_cb):
+ (_color_picker_dismiss_cb):
+ (_color_picker_request_cb):
+ (_url_bar_activated_cb):
+ (_url_bar_clicked_cb):
+ (_search_field_aborted_cb):
+ (_search_field_activated_cb):
+ (_search_field_clicked_cb):
+ (_back_button_clicked_cb):
+ (_forward_button_clicked_cb):
+ (_search_backward_button_clicked_cb):
+ (_search_forward_button_clicked_cb):
+ (_search_case_option_changed):
+ (_search_word_start_option_changed_cb):
+ (_search_close_button_clicked_cb):
+ (_refresh_button_clicked_cb):
+ (_stop_button_clicked_cb):
+ (_list_item_select_cb):
+ (navigation_button_longpress_process):
+ (_forward_button_longpress_cb):
+ (_back_button_longpress_cb):
+ (_ok_clicked_cb):
+ (_file_entry_dialog_show):
+ (_javascript_alert_cb):
+ (_javascript_confirm_cb):
+ (_javascript_prompt_cb):
+ (_javascript_before_unload_confirm_cb):
+ (_popup_menu_item_clicked_cb):
+ (popup_menu_populate):
+ (_popup_menu_show):
+ (_popup_menu_hide):
+ (_window_geometry_get):
+ (_window_geometry_set):
+ (_fullscreen_accept_cb):
+ (_fullscreen_deny_cb):
+ (_fullscreen_enter_cb):
+ (_fullscreen_exit_cb):
+ (_window_create_cb):
+ (_window_close_cb):
+ (_context_menu_item_selected_cb):
+ (context_menu_populate):
+ (_context_menu_show):
+ (_context_menu_hide):
+ (auth_popup_close):
+ (_auth_cancel_cb):
+ (_auth_ok_cb):
+ (_authentication_request_cb):
+ (_search_text_found_cb):
+ (_tooltip_text_set):
+ (_tooltip_text_unset):
+ (_navigation_policy_decision_cb):
+ (_home_button_clicked_cb):
+ (_window_deletion_cb):
+ (create_toolbar_button):
+ (window_create):
+ (configuration):
+ (parse_cookies_policy):
+ (parse_window_size):
+ (elm_main):
+ (on_tooltip_show): Deleted.
+ (on_mouse_in): Deleted.
+ (on_mouse_move): Deleted.
+ (on_mouse_out): Deleted.
+ (on_mouse_wheel): Deleted.
+ (on_window_resize): Deleted.
+ (on_icon_changed_cb): Deleted.
+ (on_key_down): Deleted.
+ (on_mouse_down): Deleted.
+ (on_title_changed): Deleted.
+ (on_url_changed): Deleted.
+ (on_back_forward_list_changed): Deleted.
+ (on_progress): Deleted.
+ (on_error): Deleted.
+ (on_download_request): Deleted.
+ (on_filepicker_parent_deletion): Deleted.
+ (on_filepicker_deletion): Deleted.
+ (on_fileselector_done): Deleted.
+ (on_file_chooser_request): Deleted.
+ (on_download_finished): Deleted.
+ (on_download_failed): Deleted.
+ (on_color_changed): Deleted.
+ (on_color_item_selected): Deleted.
+ (on_color_picker_ok_clicked): Deleted.
+ (on_color_picker_cancel_clicked): Deleted.
+ (on_color_picker_dismiss): Deleted.
+ (on_color_picker_request): Deleted.
+ (on_url_bar_activated): Deleted.
+ (on_url_bar_clicked): Deleted.
+ (on_search_field_aborted): Deleted.
+ (on_search_field_activated): Deleted.
+ (on_search_field_clicked): Deleted.
+ (on_back_button_clicked): Deleted.
+ (on_forward_button_clicked): Deleted.
+ (on_search_backward_button_clicked): Deleted.
+ (on_search_forward_button_clicked): Deleted.
+ (on_search_case_option_changed): Deleted.
+ (on_search_word_start_option_changed): Deleted.
+ (on_search_close_button_clicked): Deleted.
+ (on_refresh_button_clicked): Deleted.
+ (on_stop_button_clicked): Deleted.
+ (on_list_item_select): Deleted.
+ (on_forward_button_longpress): Deleted.
+ (on_back_button_longpress): Deleted.
+ (on_ok_clicked): Deleted.
+ (show_file_entry_dialog): Deleted.
+ (on_javascript_alert): Deleted.
+ (on_javascript_confirm): Deleted.
+ (on_javascript_prompt): Deleted.
+ (on_javascript_before_unload_confirm): Deleted.
+ (on_popup_menu_item_clicked): Deleted.
+ (on_popup_menu_show): Deleted.
+ (on_popup_menu_hide): Deleted.
+ (on_window_geometry_get): Deleted.
+ (on_window_geometry_set): Deleted.
+ (on_fullscreen_accept): Deleted.
+ (on_fullscreen_deny): Deleted.
+ (on_fullscreen_enter): Deleted.
+ (on_fullscreen_exit): Deleted.
+ (on_window_create): Deleted.
+ (on_window_close): Deleted.
+ (context_menu_item_selected_cb): Deleted.
+ (on_context_menu_show): Deleted.
+ (on_context_menu_hide): Deleted.
+ (on_auth_cancel): Deleted.
+ (on_auth_ok): Deleted.
+ (on_authentication_request): Deleted.
+ (on_search_text_found): Deleted.
+ (on_tooltip_text_set): Deleted.
+ (on_tooltip_text_unset): Deleted.
+ (on_navigation_policy_decision): Deleted.
+ (on_home_button_clicked): Deleted.
+ (on_window_deletion): Deleted.
+ * Scripts/webkitpy/style/checker.py:
+
</ins><span class="cx"> 2016-09-16 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSS Parser] Get CSSPropertyParserHelpers.cpp compiling
</span></span></pre></div>
<a id="trunkToolsMiniBrowsereflmainc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/efl/main.c (206076 => 206077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/efl/main.c 2016-09-18 08:01:11 UTC (rev 206076)
+++ trunk/Tools/MiniBrowser/efl/main.c 2016-09-18 13:13:47 UTC (rev 206077)
</span><span class="lines">@@ -77,588 +77,588 @@
</span><span class="cx"> static Eina_Bool
</span><span class="cx"> zoom_level_set(Evas_Object *webview, int level)
</span><span class="cx"> {
</span><del>- if (level < 0 || level >= sizeof(zoomLevels) / sizeof(float))
- return EINA_FALSE;
</del><ins>+ if (level < 0 || level >= sizeof(zoomLevels) / sizeof(float))
+ return EINA_FALSE;
</ins><span class="cx">
</span><del>- return ewk_view_page_zoom_set(webview, zoomLevels[level]);
</del><ins>+ return ewk_view_page_zoom_set(webview, zoomLevels[level]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Ewk_View_Smart_Class *miniBrowserViewSmartClass()
</span><span class="cx"> {
</span><del>- static Ewk_View_Smart_Class ewkViewClass = EWK_VIEW_SMART_CLASS_INIT_NAME_VERSION("MiniBrowser_View");
- return &ewkViewClass;
</del><ins>+ static Ewk_View_Smart_Class ewkViewClass = EWK_VIEW_SMART_CLASS_INIT_NAME_VERSION("MiniBrowser_View");
+ return &ewkViewClass;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> typedef struct _Tooltip_Information {
</span><del>- Ecore_Timer *show_timer;
- Eina_Bool activated;
- Eina_Bool text_set;
- Eina_Bool shown;
</del><ins>+ Ecore_Timer *show_timer;
+ Eina_Bool activated;
+ Eina_Bool text_set;
+ Eina_Bool shown;
</ins><span class="cx"> } Tooltip_Information;
</span><span class="cx">
</span><span class="cx"> typedef struct _Color_Selector {
</span><del>- Ewk_Color_Picker *ewk_picker;
- Evas_Object *elm_selector;
- Evas_Object *elm_selector_window;
</del><ins>+ Ewk_Color_Picker *ewk_picker;
+ Evas_Object *elm_selector;
+ Evas_Object *elm_selector_window;
</ins><span class="cx"> } Color_Selector;
</span><span class="cx">
</span><span class="cx"> typedef struct _Browser_Window {
</span><del>- Evas_Object *elm_window;
- Evas_Object *ewk_view;
- Evas_Object *horizontal_layout;
- Evas_Object *vertical_layout;
- Evas_Object *url_bar;
- Evas_Object *back_button;
- Evas_Object *forward_button;
- struct {
- Evas_Object *elm_menu;
- Ewk_Popup_Menu *ewk_menu;
</del><ins>+ Evas_Object *elm_window;
+ Evas_Object *ewk_view;
+ Evas_Object *horizontal_layout;
+ Evas_Object *vertical_layout;
+ Evas_Object *url_bar;
+ Evas_Object *back_button;
+ Evas_Object *forward_button;
+ struct {
+ Evas_Object *elm_menu;
+ Ewk_Popup_Menu *ewk_menu;
</ins><span class="cx"> } popup;
</span><del>- struct {
- Evas_Object *search_bar;
- Evas_Object *search_field;
- Evas_Object *search_field_count;
- Evas_Object *backward_button;
- Evas_Object *forward_button;
- Evas_Object *search_case_check_box;
- Evas_Object *search_word_start_check_box;
- Evas_Object *close_button;
- } search;
- struct {
- Evas_Object *history_box;
- Evas_Object *history_list;
- Eina_List *history_list_items;
- } history;
- int current_zoom_level;
- Tooltip_Information tooltip;
- Color_Selector color_selector;
- struct {
- Evas_Object *elm_menu;
- Ewk_Context_Menu *ewk_menu;
- } context_menu;
</del><ins>+ struct {
+ Evas_Object *search_bar;
+ Evas_Object *search_field;
+ Evas_Object *search_field_count;
+ Evas_Object *backward_button;
+ Evas_Object *forward_button;
+ Evas_Object *search_case_check_box;
+ Evas_Object *search_word_start_check_box;
+ Evas_Object *close_button;
+ } search;
+ struct {
+ Evas_Object *history_box;
+ Evas_Object *history_list;
+ Eina_List *history_list_items;
+ } history;
+ int current_zoom_level;
+ Tooltip_Information tooltip;
+ Color_Selector color_selector;
+ struct {
+ Evas_Object *elm_menu;
+ Ewk_Context_Menu *ewk_menu;
+ } context_menu;
</ins><span class="cx"> } Browser_Window;
</span><span class="cx">
</span><span class="cx"> typedef struct _File_Selector_Data {
</span><del>- Browser_Window* parent;
- Evas_Object *elm_window;
- Ewk_File_Chooser_Request *request;
</del><ins>+ Browser_Window* parent;
+ Evas_Object *elm_window;
+ Ewk_File_Chooser_Request *request;
</ins><span class="cx"> } File_Selector_Data;
</span><span class="cx">
</span><span class="cx"> typedef struct _Auth_Data {
</span><del>- Evas_Object *popup;
- Ewk_Auth_Request *request;
- Evas_Object *username_entry;
- Evas_Object *password_entry;
</del><ins>+ Evas_Object *popup;
+ Ewk_Auth_Request *request;
+ Evas_Object *username_entry;
+ Evas_Object *password_entry;
</ins><span class="cx"> } Auth_Data;
</span><span class="cx">
</span><span class="cx"> static const Ecore_Getopt options = {
</span><del>- "MiniBrowser",
- "%prog [options] [url]",
- "0.0.1",
- "(C)2012 Samsung Electronics\n (C)2012 Intel Corporation\n",
- "",
- "Test Web Browser using the Enlightenment Foundation Libraries (EFL) port of WebKit2",
- EINA_TRUE, {
- ECORE_GETOPT_STORE_STR
- ('e', "engine", "Ecore-evas engine to use."),
- ECORE_GETOPT_STORE_STR
- ('s', "window-size", "Window size in following format (width)x(height)."),
- ECORE_GETOPT_STORE_STR
- ('u', "user-agent", "User agent to set."),
- ECORE_GETOPT_STORE_STR
- ('x', "extensions-path", "The path which extensions are stored."),
- ECORE_GETOPT_STORE_DOUBLE
- ('r', "device-pixel-ratio", "Ratio between the CSS units and device pixels."),
- ECORE_GETOPT_CALLBACK_NOARGS
- ('E', "list-engines", "List ecore-evas engines.",
- ecore_getopt_callback_ecore_evas_list_engines, NULL),
- ECORE_GETOPT_STORE_DEF_BOOL
- ('c', "encoding-detector", "Enable/disable encoding detector.", EINA_FALSE),
- ECORE_GETOPT_STORE_STR
- ('C', "background-color", "Background color of page. ex) -C=255:255:255:255"),
- ECORE_GETOPT_STORE_DEF_BOOL
- ('f', "flattening", "Enable/disable frame flattening.", EINA_FALSE),
- ECORE_GETOPT_STORE_DEF_BOOL
- ('l', "local-storage", "Enable/disable HTML5 local storage.", EINA_TRUE),
- ECORE_GETOPT_STORE_DEF_BOOL
- ('o', "offline-web-application-cache", "Enable/disable offline web application cache.", EINA_TRUE),
- ECORE_GETOPT_STORE_DEF_BOOL
- ('F', "full-screen", "Start in full-screen.", EINA_FALSE),
- ECORE_GETOPT_STORE_DEF_BOOL
- ('t', "text-checking", "Enable/disable text spell checking.", EINA_FALSE),
- ECORE_GETOPT_STORE_DEF_BOOL
- ('T', "touch-events", "Enable/disable touch events.", EINA_FALSE),
- ECORE_GETOPT_STORE_DEF_BOOL
- ('L', "fixed-layout", "Enable/disable fixed layout.", EINA_TRUE),
- ECORE_GETOPT_STORE_DEF_STR
- ('p', "policy-cookies", "Cookies policy:\n always - always accept,\n never - never accept,\n no-third-party - don't accept third-party cookies.", "no-third-party"),
- ECORE_GETOPT_STORE_DEF_BOOL
- ('w', "web-security", "enable/disable web security.", EINA_TRUE),
- ECORE_GETOPT_STORE_DEF_BOOL
- ('S', "separate-process", "Create new window in separated web process.", EINA_FALSE),
- ECORE_GETOPT_VERSION
- ('V', "version"),
- ECORE_GETOPT_COPYRIGHT
- ('R', "copyright"),
- ECORE_GETOPT_HELP
- ('h', "help"),
- ECORE_GETOPT_SENTINEL
- }
</del><ins>+ "MiniBrowser",
+ "%prog [options] [url]",
+ "0.0.1",
+ "(C)2012 Samsung Electronics\n (C)2012 Intel Corporation\n",
+ "",
+ "Test Web Browser using the Enlightenment Foundation Libraries (EFL) port of WebKit2",
+ EINA_TRUE, {
+ ECORE_GETOPT_STORE_STR
+ ('e', "engine", "Ecore-evas engine to use."),
+ ECORE_GETOPT_STORE_STR
+ ('s', "window-size", "Window size in following format (width)x(height)."),
+ ECORE_GETOPT_STORE_STR
+ ('u', "user-agent", "User agent to set."),
+ ECORE_GETOPT_STORE_STR
+ ('x', "extensions-path", "The path which extensions are stored."),
+ ECORE_GETOPT_STORE_DOUBLE
+ ('r', "device-pixel-ratio", "Ratio between the CSS units and device pixels."),
+ ECORE_GETOPT_CALLBACK_NOARGS
+ ('E', "list-engines", "List ecore-evas engines.",
+ ecore_getopt_callback_ecore_evas_list_engines, NULL),
+ ECORE_GETOPT_STORE_DEF_BOOL
+ ('c', "encoding-detector", "Enable/disable encoding detector.", EINA_FALSE),
+ ECORE_GETOPT_STORE_STR
+ ('C', "background-color", "Background color of page. ex) -C=255:255:255:255"),
+ ECORE_GETOPT_STORE_DEF_BOOL
+ ('f', "flattening", "Enable/disable frame flattening.", EINA_FALSE),
+ ECORE_GETOPT_STORE_DEF_BOOL
+ ('l', "local-storage", "Enable/disable HTML5 local storage.", EINA_TRUE),
+ ECORE_GETOPT_STORE_DEF_BOOL
+ ('o', "offline-web-application-cache", "Enable/disable offline web application cache.", EINA_TRUE),
+ ECORE_GETOPT_STORE_DEF_BOOL
+ ('F', "full-screen", "Start in full-screen.", EINA_FALSE),
+ ECORE_GETOPT_STORE_DEF_BOOL
+ ('t', "text-checking", "Enable/disable text spell checking.", EINA_FALSE),
+ ECORE_GETOPT_STORE_DEF_BOOL
+ ('T', "touch-events", "Enable/disable touch events.", EINA_FALSE),
+ ECORE_GETOPT_STORE_DEF_BOOL
+ ('L', "fixed-layout", "Enable/disable fixed layout.", EINA_TRUE),
+ ECORE_GETOPT_STORE_DEF_STR
+ ('p', "policy-cookies", "Cookies policy:\n always - always accept,\n never - never accept,\n no-third-party - don't accept third-party cookies.", "no-third-party"),
+ ECORE_GETOPT_STORE_DEF_BOOL
+ ('w', "web-security", "enable/disable web security.", EINA_TRUE),
+ ECORE_GETOPT_STORE_DEF_BOOL
+ ('S', "separate-process", "Create new window in separated web process.", EINA_FALSE),
+ ECORE_GETOPT_VERSION
+ ('V', "version"),
+ ECORE_GETOPT_COPYRIGHT
+ ('R', "copyright"),
+ ECORE_GETOPT_HELP
+ ('h', "help"),
+ ECORE_GETOPT_SENTINEL
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-static Eina_Stringshare *show_file_entry_dialog(Browser_Window *window, const char *label_tag, const char *default_text);
</del><ins>+static Eina_Stringshare *_file_entry_dialog_show(Browser_Window *window, const char *label_tag, const char *default_text);
</ins><span class="cx"> static Browser_Window *window_create(Ewk_View_Configuration* configuration, int width, int height);
</span><span class="cx"> static Ewk_View_Configuration* configuration();
</span><span class="cx">
</span><span class="cx"> static Browser_Window *window_find_with_elm_window(Evas_Object *elm_window)
</span><span class="cx"> {
</span><del>- Eina_List *l;
- void *data;
</del><ins>+ Eina_List *l;
+ void *data;
</ins><span class="cx">
</span><del>- if (!elm_window)
- return NULL;
</del><ins>+ if (!elm_window)
+ return NULL;
</ins><span class="cx">
</span><del>- EINA_LIST_FOREACH(windows, l, data) {
- Browser_Window *window = (Browser_Window *)data;
- if (window->elm_window == elm_window)
- return window;
- }
- return NULL;
</del><ins>+ EINA_LIST_FOREACH(windows, l, data) {
+ Browser_Window *window = (Browser_Window *)data;
+ if (window->elm_window == elm_window)
+ return window;
+ }
+ return NULL;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Browser_Window *window_find_with_ewk_view(Evas_Object *ewk_view)
</span><span class="cx"> {
</span><del>- Eina_List *l;
- void *data;
</del><ins>+ Eina_List *l;
+ void *data;
</ins><span class="cx">
</span><del>- if (!ewk_view)
- return NULL;
</del><ins>+ if (!ewk_view)
+ return NULL;
</ins><span class="cx">
</span><del>- EINA_LIST_FOREACH(windows, l, data) {
- Browser_Window *window = (Browser_Window *)data;
- if (window->ewk_view == ewk_view)
- return window;
- }
- return NULL;
</del><ins>+ EINA_LIST_FOREACH(windows, l, data) {
+ Browser_Window *window = (Browser_Window *)data;
+ if (window->ewk_view == ewk_view)
+ return window;
+ }
+ return NULL;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Eina_Bool
</span><del>-on_tooltip_show(void *user_data)
</del><ins>+_tooltip_show(void *user_data)
</ins><span class="cx"> {
</span><del>- Browser_Window *window = (Browser_Window *)user_data;
</del><ins>+ Browser_Window *window = (Browser_Window *)user_data;
</ins><span class="cx">
</span><del>- window->tooltip.show_timer = NULL;
- elm_object_tooltip_show(window->elm_window);
- window->tooltip.shown = EINA_TRUE;
- return ECORE_CALLBACK_CANCEL;
</del><ins>+ window->tooltip.show_timer = NULL;
+ elm_object_tooltip_show(window->elm_window);
+ window->tooltip.shown = EINA_TRUE;
+ return ECORE_CALLBACK_CANCEL;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><span class="cx"> window_tooltip_hide(Browser_Window *window)
</span><span class="cx"> {
</span><del>- if (window->tooltip.show_timer) {
- ecore_timer_del(window->tooltip.show_timer);
- window->tooltip.show_timer = NULL;
- }
</del><ins>+ if (window->tooltip.show_timer) {
+ ecore_timer_del(window->tooltip.show_timer);
+ window->tooltip.show_timer = NULL;
+ }
</ins><span class="cx">
</span><del>- if (window->tooltip.shown) {
- elm_object_tooltip_hide(window->elm_window);
- window->tooltip.shown = EINA_FALSE;
- }
</del><ins>+ if (window->tooltip.shown) {
+ elm_object_tooltip_hide(window->elm_window);
+ window->tooltip.shown = EINA_FALSE;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><span class="cx"> window_tooltip_update(Browser_Window *window)
</span><span class="cx"> {
</span><del>- window_tooltip_hide(window);
</del><ins>+ window_tooltip_hide(window);
</ins><span class="cx">
</span><del>- if (window->tooltip.activated && window->tooltip.text_set)
- window->tooltip.show_timer = ecore_timer_add(TOOLTIP_DELAY_SECONDS, on_tooltip_show, window);
</del><ins>+ if (window->tooltip.activated && window->tooltip.text_set)
+ window->tooltip.show_timer = ecore_timer_add(TOOLTIP_DELAY_SECONDS, _tooltip_show, window);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_mouse_in(void *user_data, Evas *e, Evas_Object *ewk_view, void *event_info)
</del><ins>+_mouse_in_cb(void *user_data, Evas *e, Evas_Object *ewk_view, void *event_info)
</ins><span class="cx"> {
</span><del>- Browser_Window *window = (Browser_Window *)user_data;
</del><ins>+ Browser_Window *window = (Browser_Window *)user_data;
</ins><span class="cx">
</span><del>- window->tooltip.activated = EINA_TRUE;
- window_tooltip_update(window);
</del><ins>+ window->tooltip.activated = EINA_TRUE;
+ window_tooltip_update(window);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_mouse_move(void *user_data, Evas *e, Evas_Object *ewk_view, void *event_info)
</del><ins>+_mouse_move_cb(void *user_data, Evas *e, Evas_Object *ewk_view, void *event_info)
</ins><span class="cx"> {
</span><del>- window_tooltip_update((Browser_Window *)user_data);
</del><ins>+ window_tooltip_update((Browser_Window *)user_data);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_mouse_out(void *user_data, Evas *e, Evas_Object *ewk_view, void *event_info)
</del><ins>+_mouse_out_cb(void *user_data, Evas *e, Evas_Object *ewk_view, void *event_info)
</ins><span class="cx"> {
</span><del>- Browser_Window *window = (Browser_Window *)user_data;
</del><ins>+ Browser_Window *window = (Browser_Window *)user_data;
</ins><span class="cx">
</span><del>- window->tooltip.activated = EINA_FALSE;
- window_tooltip_update(window);
</del><ins>+ window->tooltip.activated = EINA_FALSE;
+ window_tooltip_update(window);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_mouse_wheel(void *user_data, Evas *e, Evas_Object *ewk_view, void *event_info)
</del><ins>+_mouse_wheel_cb(void *user_data, Evas *e, Evas_Object *ewk_view, void *event_info)
</ins><span class="cx"> {
</span><del>- Browser_Window *window = (Browser_Window *)user_data;
- const Evas_Modifier *mod = evas_key_modifier_get(e);
- Evas_Event_Mouse_Wheel *ev = (Evas_Event_Mouse_Wheel *)event_info;
- Eina_Bool shiftPressed = evas_key_modifier_is_set(mod, "Shift");
- Eina_Bool ctrlPressed = evas_key_modifier_is_set(mod, "Control");
</del><ins>+ Browser_Window *window = (Browser_Window *)user_data;
+ const Evas_Modifier *mod = evas_key_modifier_get(e);
+ Evas_Event_Mouse_Wheel *ev = (Evas_Event_Mouse_Wheel *)event_info;
+ Eina_Bool shiftPressed = evas_key_modifier_is_set(mod, "Shift");
+ Eina_Bool ctrlPressed = evas_key_modifier_is_set(mod, "Control");
</ins><span class="cx">
</span><del>- if (!shiftPressed && !ctrlPressed)
- return;
</del><ins>+ if (!shiftPressed && !ctrlPressed)
+ return;
</ins><span class="cx">
</span><del>- /* navigate history or zoom web page based on mouse wheel scroll action with shift or control key */
- if (shiftPressed) {
- if (ev->z == -1 && ewk_view_forward_possible(ewk_view)) {
- ewk_view_forward(ewk_view);
- elm_object_disabled_set(window->forward_button, !ewk_view_forward_possible(ewk_view));
- } else if (ev->z == 1 && ewk_view_back_possible(ewk_view)) {
- ewk_view_back(ewk_view);
- elm_object_disabled_set(window->back_button, !ewk_view_back_possible(ewk_view));
- }
- } else if (ctrlPressed) {
- if (ev->z == -1 && zoom_level_set(ewk_view, window->current_zoom_level + 1)) {
- window->current_zoom_level++;
- INFO("Zoom in (Ctrl + 'scroll up') was pressed, zoom level became %.2f", zoomLevels[window->current_zoom_level]);
- } else if (ev->z == 1 && zoom_level_set(ewk_view, window->current_zoom_level - 1)) {
- window->current_zoom_level--;
- INFO("Zoom out (Ctrl + 'scroll down') was pressed, zoom level became %.2f", zoomLevels[window->current_zoom_level]);
- }
- }
</del><ins>+ /* navigate history or zoom web page based on mouse wheel scroll action with shift or control key */
+ if (shiftPressed) {
+ if (ev->z == -1 && ewk_view_forward_possible(ewk_view)) {
+ ewk_view_forward(ewk_view);
+ elm_object_disabled_set(window->forward_button, !ewk_view_forward_possible(ewk_view));
+ } else if (ev->z == 1 && ewk_view_back_possible(ewk_view)) {
+ ewk_view_back(ewk_view);
+ elm_object_disabled_set(window->back_button, !ewk_view_back_possible(ewk_view));
+ }
+ } else if (ctrlPressed) {
+ if (ev->z == -1 && zoom_level_set(ewk_view, window->current_zoom_level + 1)) {
+ window->current_zoom_level++;
+ INFO("Zoom in (Ctrl + 'scroll up') was pressed, zoom level became %.2f", zoomLevels[window->current_zoom_level]);
+ } else if (ev->z == 1 && zoom_level_set(ewk_view, window->current_zoom_level - 1)) {
+ window->current_zoom_level--;
+ INFO("Zoom out (Ctrl + 'scroll down') was pressed, zoom level became %.2f", zoomLevels[window->current_zoom_level]);
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_window_resize(void *user_data, Evas *e, Evas_Object *elm_window, void *event_info)
</del><ins>+_window_resize_cb(void *user_data, Evas *e, Evas_Object *elm_window, void *event_info)
</ins><span class="cx"> {
</span><del>- Browser_Window *window = (Browser_Window *)user_data;
</del><ins>+ Browser_Window *window = (Browser_Window *)user_data;
</ins><span class="cx">
</span><del>- if (!window) {
- ERROR("Window is NULL.");
- return;
- }
</del><ins>+ if (!window) {
+ ERROR("Window is NULL.");
+ return;
+ }
</ins><span class="cx">
</span><del>- if (window->context_menu.ewk_menu)
- ewk_context_menu_hide(window->context_menu.ewk_menu);
- if (window->popup.ewk_menu)
- ewk_popup_menu_close(window->popup.ewk_menu);
- if (window->popup.elm_menu)
- elm_menu_close(window->popup.elm_menu);
</del><ins>+ if (window->context_menu.ewk_menu)
+ ewk_context_menu_hide(window->context_menu.ewk_menu);
+ if (window->popup.ewk_menu)
+ ewk_popup_menu_close(window->popup.ewk_menu);
+ if (window->popup.elm_menu)
+ elm_menu_close(window->popup.elm_menu);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><span class="cx"> update_view_favicon(Browser_Window *window, Evas_Object *icon)
</span><span class="cx"> {
</span><del>- /* Remove previous icon from URL bar */
- Evas_Object *old_icon = elm_object_part_content_unset(window->url_bar, "icon");
- if (old_icon) {
- evas_object_unref(old_icon);
- evas_object_del(old_icon);
- }
</del><ins>+ /* Remove previous icon from URL bar */
+ Evas_Object *old_icon = elm_object_part_content_unset(window->url_bar, "icon");
+ if (old_icon) {
+ evas_object_unref(old_icon);
+ evas_object_del(old_icon);
+ }
</ins><span class="cx">
</span><del>- /* Show new icon in URL bar */
- if (icon) {
- evas_object_size_hint_min_set(icon, 32, 32);
- elm_object_part_content_set(window->url_bar, "icon", icon);
- evas_object_ref(icon);
- }
</del><ins>+ /* Show new icon in URL bar */
+ if (icon) {
+ evas_object_size_hint_min_set(icon, 32, 32);
+ elm_object_part_content_set(window->url_bar, "icon", icon);
+ evas_object_ref(icon);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_icon_changed_cb(Ewk_Favicon_Database *database, const char *url, void *user_data)
</del><ins>+_icon_changed_cb(Ewk_Favicon_Database *database, const char *url, void *user_data)
</ins><span class="cx"> {
</span><del>- Browser_Window *window = (Browser_Window *)user_data;
- Evas_Object *ewk_view = window->ewk_view;
</del><ins>+ Browser_Window *window = (Browser_Window *)user_data;
+ Evas_Object *ewk_view = window->ewk_view;
</ins><span class="cx">
</span><del>- if (strcmp(url, ewk_view_url_get(ewk_view)))
- return;
</del><ins>+ if (strcmp(url, ewk_view_url_get(ewk_view)))
+ return;
</ins><span class="cx">
</span><del>- Evas_Object *favicon = ewk_favicon_database_icon_get(database, url, evas_object_evas_get(ewk_view));
- update_view_favicon(window, favicon);
</del><ins>+ Evas_Object *favicon = ewk_favicon_database_icon_get(database, url, evas_object_evas_get(ewk_view));
+ update_view_favicon(window, favicon);
</ins><span class="cx">
</span><del>- if (favicon)
- evas_object_unref(favicon);
</del><ins>+ if (favicon)
+ evas_object_unref(favicon);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void window_free(Browser_Window *window)
</span><span class="cx"> {
</span><del>- evas_object_event_callback_del(window->ewk_view, EVAS_CALLBACK_MOUSE_IN, on_mouse_in);
- evas_object_event_callback_del(window->ewk_view, EVAS_CALLBACK_MOUSE_OUT, on_mouse_out);
- evas_object_event_callback_del(window->ewk_view, EVAS_CALLBACK_MOUSE_MOVE, on_mouse_move);
- evas_object_event_callback_del(window->ewk_view, EVAS_CALLBACK_MOUSE_WHEEL, on_mouse_wheel);
</del><ins>+ evas_object_event_callback_del(window->ewk_view, EVAS_CALLBACK_MOUSE_IN, _mouse_in_cb);
+ evas_object_event_callback_del(window->ewk_view, EVAS_CALLBACK_MOUSE_OUT, _mouse_out_cb);
+ evas_object_event_callback_del(window->ewk_view, EVAS_CALLBACK_MOUSE_MOVE, _mouse_move_cb);
+ evas_object_event_callback_del(window->ewk_view, EVAS_CALLBACK_MOUSE_WHEEL, _mouse_wheel_cb);
</ins><span class="cx">
</span><del>- evas_object_event_callback_del(window->elm_window, EVAS_CALLBACK_RESIZE, on_window_resize);
</del><ins>+ evas_object_event_callback_del(window->elm_window, EVAS_CALLBACK_RESIZE, _window_resize_cb);
</ins><span class="cx">
</span><del>- ewk_favicon_database_icon_change_callback_del(ewk_context_favicon_database_get(ewk_view_context_get(window->ewk_view)), on_icon_changed_cb);
</del><ins>+ ewk_favicon_database_icon_change_callback_del(ewk_context_favicon_database_get(ewk_view_context_get(window->ewk_view)), _icon_changed_cb);
</ins><span class="cx">
</span><del>- evas_object_del(window->ewk_view);
- /* The elm_win will take care of freeing its children */
- evas_object_del(window->elm_window);
</del><ins>+ evas_object_del(window->ewk_view);
+ /* The elm_win will take care of freeing its children */
+ evas_object_del(window->elm_window);
</ins><span class="cx">
</span><del>- if (window->tooltip.show_timer)
- ecore_timer_del(window->tooltip.show_timer);
</del><ins>+ if (window->tooltip.show_timer)
+ ecore_timer_del(window->tooltip.show_timer);
</ins><span class="cx">
</span><del>- if (window->color_selector.elm_selector_window)
- evas_object_del(window->color_selector.elm_selector_window);
</del><ins>+ if (window->color_selector.elm_selector_window)
+ evas_object_del(window->color_selector.elm_selector_window);
</ins><span class="cx">
</span><del>- free(window);
</del><ins>+ free(window);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void window_close(Browser_Window *window)
</span><span class="cx"> {
</span><del>- windows = eina_list_remove(windows, window);
- window_free(window);
</del><ins>+ windows = eina_list_remove(windows, window);
+ window_free(window);
</ins><span class="cx">
</span><del>- if (!windows)
- elm_exit();
</del><ins>+ if (!windows)
+ elm_exit();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><span class="cx"> search_icon_show(Browser_Window *window)
</span><span class="cx"> {
</span><del>- Evas_Object *icon = elm_icon_add(window->elm_window);
- elm_icon_standard_set(icon, "edit-find");
- elm_object_part_content_set(window->search.search_field, "icon", icon);
- evas_object_size_hint_min_set(icon, 20, 20);
- evas_object_size_hint_max_set(icon, 20, 20);
- elm_entry_icon_visible_set(window->search.search_field, EINA_TRUE);
- evas_object_show(icon);
</del><ins>+ Evas_Object *icon = elm_icon_add(window->elm_window);
+ elm_icon_standard_set(icon, "edit-find");
+ elm_object_part_content_set(window->search.search_field, "icon", icon);
+ evas_object_size_hint_min_set(icon, 20, 20);
+ evas_object_size_hint_max_set(icon, 20, 20);
+ elm_entry_icon_visible_set(window->search.search_field, EINA_TRUE);
+ evas_object_show(icon);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><span class="cx"> search_box_show(Browser_Window *window)
</span><span class="cx"> {
</span><del>- evas_object_size_hint_min_set(window->search.search_bar, SEARCH_FIELD_SIZE + 2 * SEARCH_BUTTON_SIZE, SEARCH_BUTTON_SIZE);
</del><ins>+ evas_object_size_hint_min_set(window->search.search_bar, SEARCH_FIELD_SIZE + 2 * SEARCH_BUTTON_SIZE, SEARCH_BUTTON_SIZE);
</ins><span class="cx">
</span><del>- search_icon_show(window);
- evas_object_show(window->search.search_bar);
- evas_object_show(window->search.search_field);
- evas_object_show(window->search.search_field_count);
- evas_object_show(window->search.backward_button);
- evas_object_show(window->search.forward_button);
- evas_object_show(window->search.search_case_check_box);
- evas_object_show(window->search.search_word_start_check_box);
- evas_object_show(window->search.close_button);
</del><ins>+ search_icon_show(window);
+ evas_object_show(window->search.search_bar);
+ evas_object_show(window->search.search_field);
+ evas_object_show(window->search.search_field_count);
+ evas_object_show(window->search.backward_button);
+ evas_object_show(window->search.forward_button);
+ evas_object_show(window->search.search_case_check_box);
+ evas_object_show(window->search.search_word_start_check_box);
+ evas_object_show(window->search.close_button);
</ins><span class="cx">
</span><del>- /* Grab focus from the view */
- evas_object_focus_set(window->ewk_view, EINA_FALSE);
- elm_object_focus_set(window->search.search_field, EINA_TRUE);
</del><ins>+ /* Grab focus from the view */
+ evas_object_focus_set(window->ewk_view, EINA_FALSE);
+ elm_object_focus_set(window->search.search_field, EINA_TRUE);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><span class="cx"> search_box_hide(Browser_Window *window)
</span><span class="cx"> {
</span><del>- ewk_view_text_find_highlight_clear(window->ewk_view);
</del><ins>+ ewk_view_text_find_highlight_clear(window->ewk_view);
</ins><span class="cx">
</span><del>- evas_object_size_hint_min_set(window->search.search_bar, SEARCH_FIELD_SIZE + 2 * SEARCH_BUTTON_SIZE, 0);
- evas_object_hide(window->search.search_bar);
- evas_object_hide(window->search.search_field);
- evas_object_hide(window->search.search_field_count);
- evas_object_hide(window->search.backward_button);
- evas_object_hide(window->search.forward_button);
- evas_object_hide(window->search.search_case_check_box);
- evas_object_hide(window->search.search_word_start_check_box);
- evas_object_hide(window->search.close_button);
</del><ins>+ evas_object_size_hint_min_set(window->search.search_bar, SEARCH_FIELD_SIZE + 2 * SEARCH_BUTTON_SIZE, 0);
+ evas_object_hide(window->search.search_bar);
+ evas_object_hide(window->search.search_field);
+ evas_object_hide(window->search.search_field_count);
+ evas_object_hide(window->search.backward_button);
+ evas_object_hide(window->search.forward_button);
+ evas_object_hide(window->search.search_case_check_box);
+ evas_object_hide(window->search.search_word_start_check_box);
+ evas_object_hide(window->search.close_button);
</ins><span class="cx">
</span><del>- /* Give focus back to the view */
- elm_object_focus_set(window->search.search_field, EINA_FALSE);
- evas_object_focus_set(window->ewk_view, EINA_TRUE);
</del><ins>+ /* Give focus back to the view */
+ elm_object_focus_set(window->search.search_field, EINA_FALSE);
+ evas_object_focus_set(window->ewk_view, EINA_TRUE);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><span class="cx"> history_list_hide(Browser_Window *window)
</span><span class="cx"> {
</span><del>- /* Hide history list */
- evas_object_hide(window->history.history_box);
- evas_object_hide(window->history.history_list);
</del><ins>+ /* Hide history list */
+ evas_object_hide(window->history.history_box);
+ evas_object_hide(window->history.history_list);
</ins><span class="cx">
</span><del>- /* Dereference the list items and clear the history list */
- void *data;
- EINA_LIST_FREE(window->history.history_list_items, data) {
- ewk_object_unref(data);
- }
</del><ins>+ /* Dereference the list items and clear the history list */
+ void *data;
+ EINA_LIST_FREE(window->history.history_list_items, data) {
+ ewk_object_unref(data);
+ }
</ins><span class="cx">
</span><del>- elm_genlist_clear(window->history.history_list);
</del><ins>+ elm_genlist_clear(window->history.history_list);
</ins><span class="cx">
</span><del>- /* Give focus back to the view */
- elm_object_focus_set(window->history.history_box, EINA_FALSE);
- elm_object_focus_set(window->history.history_list, EINA_FALSE);
- evas_object_focus_set(window->ewk_view, EINA_TRUE);
</del><ins>+ /* Give focus back to the view */
+ elm_object_focus_set(window->history.history_box, EINA_FALSE);
+ elm_object_focus_set(window->history.history_list, EINA_FALSE);
+ evas_object_focus_set(window->ewk_view, EINA_TRUE);
</ins><span class="cx">
</span><del>- /* Reset flags */
- longpress_enabled = EINA_FALSE;
</del><ins>+ /* Reset flags */
+ longpress_enabled = EINA_FALSE;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void save_page_contents_callback(Ewk_Page_Contents_Type type, const char *data, void *user_data)
</span><span class="cx"> {
</span><del>- Eet_File *ef;
- Eina_Stringshare *fileName = (Eina_Stringshare *)user_data;
</del><ins>+ Eet_File *ef;
+ Eina_Stringshare *fileName = (Eina_Stringshare *)user_data;
</ins><span class="cx">
</span><del>- if (!eina_str_has_extension(fileName, ".mht")) {
- Eina_Strbuf *fileNameWithMht = eina_strbuf_new();
- eina_strbuf_append_printf(fileNameWithMht, "%s.mht", fileName);
- ef = eet_open(eina_strbuf_string_get(fileNameWithMht), EET_FILE_MODE_WRITE);
- INFO("Saving file to: %s", eina_strbuf_string_get(fileNameWithMht));
- eina_strbuf_free(fileNameWithMht);
- } else {
- ef = eet_open(fileName, EET_FILE_MODE_WRITE);
- INFO("Saving file to: %s", fileName);
- }
</del><ins>+ if (!eina_str_has_extension(fileName, ".mht")) {
+ Eina_Strbuf *fileNameWithMht = eina_strbuf_new();
+ eina_strbuf_append_printf(fileNameWithMht, "%s.mht", fileName);
+ ef = eet_open(eina_strbuf_string_get(fileNameWithMht), EET_FILE_MODE_WRITE);
+ INFO("Saving file to: %s", eina_strbuf_string_get(fileNameWithMht));
+ eina_strbuf_free(fileNameWithMht);
+ } else {
+ ef = eet_open(fileName, EET_FILE_MODE_WRITE);
+ INFO("Saving file to: %s", fileName);
+ }
</ins><span class="cx">
</span><del>- if (!ef) {
- ERROR("Could not create File");
- return;
- }
</del><ins>+ if (!ef) {
+ ERROR("Could not create File");
+ return;
+ }
</ins><span class="cx">
</span><del>- eet_write(ef, "MHTML data", data, strlen(data), 0 /* compress */);
- eet_close(ef);
- INFO("SUCCESS: saved.");
</del><ins>+ eet_write(ef, "MHTML data", data, strlen(data), 0 /* compress */);
+ eet_close(ef);
+ INFO("SUCCESS: saved.");
</ins><span class="cx">
</span><del>- eina_stringshare_del(fileName);
</del><ins>+ eina_stringshare_del(fileName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><span class="cx"> script_execute_callback(Evas_Object *ewk_view, const char *return_value, void *user_data)
</span><span class="cx"> {
</span><del>- Browser_Window *window = (Browser_Window *)user_data;
</del><ins>+ Browser_Window *window = (Browser_Window *)user_data;
</ins><span class="cx">
</span><del>- Eina_Strbuf *text_buffer = eina_strbuf_new();
</del><ins>+ Eina_Strbuf *text_buffer = eina_strbuf_new();
</ins><span class="cx">
</span><del>- if (return_value) {
- eina_strbuf_append(text_buffer, return_value);
- INFO("selected text is: %s", eina_strbuf_string_get(text_buffer));
- elm_entry_entry_set(window->search.search_field, eina_strbuf_string_get(text_buffer));
- }
- eina_strbuf_free(text_buffer);
- search_box_show(window);
</del><ins>+ if (return_value) {
+ eina_strbuf_append(text_buffer, return_value);
+ INFO("selected text is: %s", eina_strbuf_string_get(text_buffer));
+ elm_entry_entry_set(window->search.search_field, eina_strbuf_string_get(text_buffer));
+ }
+ eina_strbuf_free(text_buffer);
+ search_box_show(window);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><span class="cx"> toggle_window_fullscreen(Browser_Window *window, Eina_Bool isFullScreen)
</span><span class="cx"> {
</span><del>- if (isFullScreen) {
- evas_object_hide(window->horizontal_layout);
- elm_box_unpack(window->vertical_layout, window->horizontal_layout);
- elm_win_fullscreen_set(window->elm_window, EINA_TRUE);
- } else {
- elm_win_fullscreen_set(window->elm_window, EINA_FALSE);
- elm_box_pack_start(window->vertical_layout, window->horizontal_layout);
- evas_object_show(window->horizontal_layout);
- }
</del><ins>+ if (isFullScreen) {
+ evas_object_hide(window->horizontal_layout);
+ elm_box_unpack(window->vertical_layout, window->horizontal_layout);
+ elm_win_fullscreen_set(window->elm_window, EINA_TRUE);
+ } else {
+ elm_win_fullscreen_set(window->elm_window, EINA_FALSE);
+ elm_box_pack_start(window->vertical_layout, window->horizontal_layout);
+ evas_object_show(window->horizontal_layout);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_key_down(void *user_data, Evas *e, Evas_Object *ewk_view, void *event_info)
</del><ins>+_key_down_cb(void *user_data, Evas *e, Evas_Object *ewk_view, void *event_info)
</ins><span class="cx"> {
</span><del>- Browser_Window *window = (Browser_Window *)user_data;
- Evas_Event_Key_Down *ev = (Evas_Event_Key_Down*) event_info;
</del><ins>+ Browser_Window *window = (Browser_Window *)user_data;
+ Evas_Event_Key_Down *ev = (Evas_Event_Key_Down*) event_info;
</ins><span class="cx">
</span><del>- static const char *encodings[] = {
- "ISO-8859-1",
- "UTF-8",
- NULL
- };
- static int currentEncoding = -1;
- const Evas_Modifier *mod = evas_key_modifier_get(e);
- Eina_Bool ctrlPressed = evas_key_modifier_is_set(mod, "Control");
- Eina_Bool altPressed = evas_key_modifier_is_set(mod, "Alt");
- Eina_Bool shiftPressed = evas_key_modifier_is_set(mod, "Shift");
</del><ins>+ static const char *encodings[] = {
+ "ISO-8859-1",
+ "UTF-8",
+ NULL
+ };
+ static int currentEncoding = -1;
+ const Evas_Modifier *mod = evas_key_modifier_get(e);
+ Eina_Bool ctrlPressed = evas_key_modifier_is_set(mod, "Control");
+ Eina_Bool altPressed = evas_key_modifier_is_set(mod, "Alt");
+ Eina_Bool shiftPressed = evas_key_modifier_is_set(mod, "Shift");
</ins><span class="cx">
</span><del>- if (!strcmp(ev->key, "Left") && altPressed) {
- INFO("Back (Alt+Left) was pressed");
- if (!ewk_view_back(ewk_view))
- INFO("Back ignored: No back history");
- } else if (!strcmp(ev->key, "Right") && altPressed) {
- INFO("Forward (Alt+Right) was pressed");
- if (!ewk_view_forward(ewk_view))
- INFO("Forward ignored: No forward history");
- } else if (!strcmp(ev->key, "Home") && altPressed) {
- INFO("Home (Alt+Home) was pressed");
- ewk_view_url_set(window->ewk_view, DEFAULT_URL);
- } else if (!strcmp(ev->key, "F3")) {
- currentEncoding = (currentEncoding + 1) % (sizeof(encodings) / sizeof(encodings[0]));
- INFO("Set encoding (F3) pressed. New encoding to %s", encodings[currentEncoding]);
- ewk_view_custom_encoding_set(ewk_view, encodings[currentEncoding]);
- } else if ((!strcmp(ev->key, "F5") && ctrlPressed) || (!strcmp(ev->key, "r") && (shiftPressed & ctrlPressed))) {
- INFO("Reload ignoring cache (Ctrl+F5 or Ctrl+Shift+r) was pressed, reloading and bypassing cache...");
- ewk_view_reload_bypass_cache(ewk_view);
- } else if (!strcmp(ev->key, "F5") || (!strcmp(ev->key, "r") && ctrlPressed)) {
- INFO("Reload (F5 or Ctrl+r) was pressed, reloading...");
- ewk_view_reload(ewk_view);
- } else if (!strcmp(ev->key, "F6")) {
- INFO("Stop (F6) was pressed, stop loading.");
- ewk_view_stop(ewk_view);
- } else if (!strcmp(ev->key, "F7")) {
- Ewk_Pagination_Mode mode = ewk_view_pagination_mode_get(ewk_view);
- mode = (mode + 1) % (EWK_PAGINATION_MODE_BOTTOM_TO_TOP + 1);
- if (ewk_view_pagination_mode_set(ewk_view, mode))
- INFO("Change Pagination Mode (F7) was pressed, changed to: %d", mode);
- else
- INFO("Change Pagination Mode (F7) was pressed, but NOT changed!");
- } else if (!strcmp(ev->key, "F11")) {
- INFO("Fullscreen (F11) was pressed, toggling window/fullscreen.");
- toggle_window_fullscreen(window, !elm_win_fullscreen_get(window->elm_window));
- } else if (!strcmp(ev->key, "n") && ctrlPressed) {
- INFO("Create new window (Ctrl+n) was pressed.");
- Browser_Window *window = window_create(configuration(), 0, 0);
- ewk_view_url_set(window->ewk_view, DEFAULT_URL);
- // 0 equals default width and height.
- windows = eina_list_append(windows, window);
- } else if (!strcmp(ev->key, "i") && ctrlPressed) {
- INFO("Show Inspector (Ctrl+i) was pressed.");
- ewk_view_inspector_show(ewk_view);
- } else if (!strcmp(ev->key, "f") && ctrlPressed) {
- INFO("Show Search Box (Ctrl+f) was pressed.");
- const char get_data_script[] = "window.getSelection().toString();";
- ewk_view_script_execute(ewk_view, get_data_script, script_execute_callback, (void*)(window));
- } else if (!strcmp(ev->key, "Escape")) {
- if (evas_object_visible_get(window->search.search_bar))
- search_box_hide(window);
- else if (evas_object_visible_get(window->history.history_box))
- history_list_hide(window);
- else if (elm_win_fullscreen_get(window->elm_window))
- ewk_view_fullscreen_exit(ewk_view);
- else
- ewk_view_stop(ewk_view);
- } else if (ctrlPressed && (!strcmp(ev->key, "minus") || !strcmp(ev->key, "KP_Subtract"))) {
- if (zoom_level_set(ewk_view, window->current_zoom_level - 1))
- window->current_zoom_level--;
- INFO("Zoom out (Ctrl + '-') was pressed, zoom level became %.2f", zoomLevels[window->current_zoom_level]);
- } else if (ctrlPressed && (!strcmp(ev->key, "equal") || !strcmp(ev->key, "KP_Add"))) {
- if (zoom_level_set(ewk_view, window->current_zoom_level + 1))
- window->current_zoom_level++;
- INFO("Zoom in (Ctrl + '+') was pressed, zoom level became %.2f", zoomLevels[window->current_zoom_level]);
- } else if (ctrlPressed && !strcmp(ev->key, "0")) {
- if (zoom_level_set(ewk_view, DEFAULT_ZOOM_LEVEL))
- window->current_zoom_level = DEFAULT_ZOOM_LEVEL;
- INFO("Zoom to default (Ctrl + '0') was pressed, zoom level became %.2f", zoomLevels[window->current_zoom_level]);
- } else if (ctrlPressed && !strcmp(ev->key, "s")) {
- Eina_Strbuf *default_file = eina_strbuf_new();
- const char *home_path = getenv("HOME");
- const char *title = ewk_view_title_get(window->ewk_view);
- eina_strbuf_append_printf(default_file, "%s/%s.mht", home_path ? home_path : "/home", title ? title : "title");
- INFO("Pressed (CTRL + S) : Saving Current Page.");
- Eina_Stringshare *save_file_name = show_file_entry_dialog(window, "SAVE", eina_strbuf_string_get(default_file));
- if (!save_file_name)
- return;
- ewk_view_page_contents_get(ewk_view, EWK_PAGE_CONTENTS_TYPE_MHTML, save_page_contents_callback, (void *)save_file_name);
- eina_strbuf_free(default_file);
- } else if (ctrlPressed && !strcmp(ev->key, "l")) {
- const char *home_path = getenv("HOME");
- Eina_Stringshare *open_file_name = show_file_entry_dialog(window, "LOAD", home_path ? home_path : "/home");
- if (!open_file_name)
- return;
- Eina_Strbuf *uri_path = eina_strbuf_new();
- eina_strbuf_append_printf(uri_path, "%s%s", FILE_SCHEME, open_file_name);
- INFO("pressed (CTRL + L) : Loading Page %s", eina_strbuf_string_get(uri_path));
- ewk_view_url_set(ewk_view, eina_strbuf_string_get(uri_path));
- eina_strbuf_free(uri_path);
- eina_stringshare_del(open_file_name);
- }
</del><ins>+ if (!strcmp(ev->key, "Left") && altPressed) {
+ INFO("Back (Alt+Left) was pressed");
+ if (!ewk_view_back(ewk_view))
+ INFO("Back ignored: No back history");
+ } else if (!strcmp(ev->key, "Right") && altPressed) {
+ INFO("Forward (Alt+Right) was pressed");
+ if (!ewk_view_forward(ewk_view))
+ INFO("Forward ignored: No forward history");
+ } else if (!strcmp(ev->key, "Home") && altPressed) {
+ INFO("Home (Alt+Home) was pressed");
+ ewk_view_url_set(window->ewk_view, DEFAULT_URL);
+ } else if (!strcmp(ev->key, "F3")) {
+ currentEncoding = (currentEncoding + 1) % (sizeof(encodings) / sizeof(encodings[0]));
+ INFO("Set encoding (F3) pressed. New encoding to %s", encodings[currentEncoding]);
+ ewk_view_custom_encoding_set(ewk_view, encodings[currentEncoding]);
+ } else if ((!strcmp(ev->key, "F5") && ctrlPressed) || (!strcmp(ev->key, "r") && (shiftPressed & ctrlPressed))) {
+ INFO("Reload ignoring cache (Ctrl+F5 or Ctrl+Shift+r) was pressed, reloading and bypassing cache...");
+ ewk_view_reload_bypass_cache(ewk_view);
+ } else if (!strcmp(ev->key, "F5") || (!strcmp(ev->key, "r") && ctrlPressed)) {
+ INFO("Reload (F5 or Ctrl+r) was pressed, reloading...");
+ ewk_view_reload(ewk_view);
+ } else if (!strcmp(ev->key, "F6")) {
+ INFO("Stop (F6) was pressed, stop loading.");
+ ewk_view_stop(ewk_view);
+ } else if (!strcmp(ev->key, "F7")) {
+ Ewk_Pagination_Mode mode = ewk_view_pagination_mode_get(ewk_view);
+ mode = (mode + 1) % (EWK_PAGINATION_MODE_BOTTOM_TO_TOP + 1);
+ if (ewk_view_pagination_mode_set(ewk_view, mode))
+ INFO("Change Pagination Mode (F7) was pressed, changed to: %d", mode);
+ else
+ INFO("Change Pagination Mode (F7) was pressed, but NOT changed!");
+ } else if (!strcmp(ev->key, "F11")) {
+ INFO("Fullscreen (F11) was pressed, toggling window/fullscreen.");
+ toggle_window_fullscreen(window, !elm_win_fullscreen_get(window->elm_window));
+ } else if (!strcmp(ev->key, "n") && ctrlPressed) {
+ INFO("Create new window (Ctrl+n) was pressed.");
+ Browser_Window *window = window_create(configuration(), 0, 0);
+ ewk_view_url_set(window->ewk_view, DEFAULT_URL);
+ // 0 equals default width and height.
+ windows = eina_list_append(windows, window);
+ } else if (!strcmp(ev->key, "i") && ctrlPressed) {
+ INFO("Show Inspector (Ctrl+i) was pressed.");
+ ewk_view_inspector_show(ewk_view);
+ } else if (!strcmp(ev->key, "f") && ctrlPressed) {
+ INFO("Show Search Box (Ctrl+f) was pressed.");
+ const char get_data_script[] = "window.getSelection().toString();";
+ ewk_view_script_execute(ewk_view, get_data_script, script_execute_callback, (void*)(window));
+ } else if (!strcmp(ev->key, "Escape")) {
+ if (evas_object_visible_get(window->search.search_bar))
+ search_box_hide(window);
+ else if (evas_object_visible_get(window->history.history_box))
+ history_list_hide(window);
+ else if (elm_win_fullscreen_get(window->elm_window))
+ ewk_view_fullscreen_exit(ewk_view);
+ else
+ ewk_view_stop(ewk_view);
+ } else if (ctrlPressed && (!strcmp(ev->key, "minus") || !strcmp(ev->key, "KP_Subtract"))) {
+ if (zoom_level_set(ewk_view, window->current_zoom_level - 1))
+ window->current_zoom_level--;
+ INFO("Zoom out (Ctrl + '-') was pressed, zoom level became %.2f", zoomLevels[window->current_zoom_level]);
+ } else if (ctrlPressed && (!strcmp(ev->key, "equal") || !strcmp(ev->key, "KP_Add"))) {
+ if (zoom_level_set(ewk_view, window->current_zoom_level + 1))
+ window->current_zoom_level++;
+ INFO("Zoom in (Ctrl + '+') was pressed, zoom level became %.2f", zoomLevels[window->current_zoom_level]);
+ } else if (ctrlPressed && !strcmp(ev->key, "0")) {
+ if (zoom_level_set(ewk_view, DEFAULT_ZOOM_LEVEL))
+ window->current_zoom_level = DEFAULT_ZOOM_LEVEL;
+ INFO("Zoom to default (Ctrl + '0') was pressed, zoom level became %.2f", zoomLevels[window->current_zoom_level]);
+ } else if (ctrlPressed && !strcmp(ev->key, "s")) {
+ Eina_Strbuf *default_file = eina_strbuf_new();
+ const char *home_path = getenv("HOME");
+ const char *title = ewk_view_title_get(window->ewk_view);
+ eina_strbuf_append_printf(default_file, "%s/%s.mht", home_path ? home_path : "/home", title ? title : "title");
+ INFO("Pressed (CTRL + S) : Saving Current Page.");
+ Eina_Stringshare *save_file_name = _file_entry_dialog_show(window, "SAVE", eina_strbuf_string_get(default_file));
+ if (!save_file_name)
+ return;
+ ewk_view_page_contents_get(ewk_view, EWK_PAGE_CONTENTS_TYPE_MHTML, save_page_contents_callback, (void *)save_file_name);
+ eina_strbuf_free(default_file);
+ } else if (ctrlPressed && !strcmp(ev->key, "l")) {
+ const char *home_path = getenv("HOME");
+ Eina_Stringshare *open_file_name = _file_entry_dialog_show(window, "LOAD", home_path ? home_path : "/home");
+ if (!open_file_name)
+ return;
+ Eina_Strbuf *uri_path = eina_strbuf_new();
+ eina_strbuf_append_printf(uri_path, "%s%s", FILE_SCHEME, open_file_name);
+ INFO("pressed (CTRL + L) : Loading Page %s", eina_strbuf_string_get(uri_path));
+ ewk_view_url_set(ewk_view, eina_strbuf_string_get(uri_path));
+ eina_strbuf_free(uri_path);
+ eina_stringshare_del(open_file_name);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><span class="lines">@@ -672,7 +672,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_mouse_down(void *user_data, Evas *e, Evas_Object *ewk_view, void *event_info)
</del><ins>+_mouse_down_cb(void *user_data, Evas *e, Evas_Object *ewk_view, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx"> Evas_Event_Mouse_Down *ev = (Evas_Event_Mouse_Down *)event_info;
</span><span class="lines">@@ -709,7 +709,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_title_changed(void *user_data, Evas_Object *ewk_view, void *event_info)
</del><ins>+_title_changed_cb(void *user_data, Evas_Object *ewk_view, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx"> const char *title = (const char *)event_info;
</span><span class="lines">@@ -718,7 +718,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_url_changed(void *user_data, Evas_Object *ewk_view, void *event_info)
</del><ins>+_url_changed_cb(void *user_data, Evas_Object *ewk_view, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx"> const char *url = ewk_view_url_get(window->ewk_view);
</span><span class="lines">@@ -725,7 +725,7 @@
</span><span class="cx"> char *converted_url = elm_entry_utf8_to_markup(url);
</span><span class="cx"> elm_entry_entry_set(window->url_bar, converted_url);
</span><span class="cx">
</span><del>- on_icon_changed_cb(ewk_context_favicon_database_get(ewk_view_context_get(ewk_view)), url, user_data);
</del><ins>+ _icon_changed_cb(ewk_context_favicon_database_get(ewk_view_context_get(ewk_view)), url, user_data);
</ins><span class="cx">
</span><span class="cx"> free(converted_url);
</span><span class="cx">
</span><span class="lines">@@ -733,7 +733,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_back_forward_list_changed(void *user_data, Evas_Object *ewk_view, void *event_info)
</del><ins>+_back_forward_list_changed_cb(void *user_data, Evas_Object *ewk_view, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx">
</span><span class="lines">@@ -743,7 +743,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_progress(void *user_data, Evas_Object *ewk_view, void *event_info)
</del><ins>+_progress_cb(void *user_data, Evas_Object *ewk_view, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx"> double progress = *(double *)event_info;
</span><span class="lines">@@ -752,7 +752,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_error(void *user_data, Evas_Object *ewk_view, void *event_info)
</del><ins>+_error_cb(void *user_data, Evas_Object *ewk_view, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> Eina_Strbuf *buffer;
</span><span class="cx"> const Ewk_Error *error = (const Ewk_Error *)event_info;
</span><span class="lines">@@ -771,7 +771,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_download_request(Ewk_Download_Job *download, void *user_data)
</del><ins>+_download_request_cb(Ewk_Download_Job *download, void *user_data)
</ins><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx">
</span><span class="lines">@@ -778,7 +778,7 @@
</span><span class="cx"> Eina_Strbuf *destination_path = eina_strbuf_new();
</span><span class="cx">
</span><span class="cx"> const char *home_path = getenv("HOME");
</span><del>- Eina_Stringshare *save_file_path = show_file_entry_dialog(window, "DOWNLOAD", home_path ? home_path : "/tmp");
</del><ins>+ Eina_Stringshare *save_file_path = _file_entry_dialog_show(window, "DOWNLOAD", home_path ? home_path : "/tmp");
</ins><span class="cx">
</span><span class="cx"> if (save_file_path)
</span><span class="cx"> eina_strbuf_append_printf(destination_path, "%s", save_file_path);
</span><span class="lines">@@ -806,11 +806,11 @@
</span><span class="cx"> eina_stringshare_del(save_file_path);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void on_filepicker_parent_deletion(void *user_data, Evas *evas, Evas_Object *elm_window, void *event);
</del><ins>+static void _filepicker_parent_deletion_cb(void *user_data, Evas *evas, Evas_Object *elm_window, void *event);
</ins><span class="cx">
</span><span class="cx"> static void close_file_picker(File_Selector_Data *fs_data)
</span><span class="cx"> {
</span><del>- evas_object_event_callback_del(fs_data->parent->elm_window, EVAS_CALLBACK_DEL, on_filepicker_parent_deletion);
</del><ins>+ evas_object_event_callback_del(fs_data->parent->elm_window, EVAS_CALLBACK_DEL, _filepicker_parent_deletion_cb);
</ins><span class="cx"> evas_object_del(fs_data->elm_window);
</span><span class="cx"> ewk_object_unref(fs_data->request);
</span><span class="cx"> free(fs_data);
</span><span class="lines">@@ -817,19 +817,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_filepicker_parent_deletion(void *user_data, Evas *evas, Evas_Object *elm_window, void *event)
</del><ins>+_filepicker_parent_deletion_cb(void *user_data, Evas *evas, Evas_Object *elm_window, void *event)
</ins><span class="cx"> {
</span><span class="cx"> close_file_picker((File_Selector_Data *)user_data);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_filepicker_deletion(void *user_data, Evas_Object *elm_window, void *event_info)
</del><ins>+_filepicker_deletion_cb(void *user_data, Evas_Object *elm_window, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> close_file_picker((File_Selector_Data *)user_data);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_fileselector_done(void *user_data, Evas_Object *file_selector, void *event_info)
</del><ins>+_fileselector_done_cb(void *user_data, Evas_Object *file_selector, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> File_Selector_Data *fs_data = (File_Selector_Data *)user_data;
</span><span class="cx">
</span><span class="lines">@@ -841,7 +841,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_file_chooser_request(void *user_data, Evas_Object *ewk_view, void *event_info)
</del><ins>+_file_chooser_request_cb(void *user_data, Evas_Object *ewk_view, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> Evas_Object *bg;
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="lines">@@ -862,8 +862,8 @@
</span><span class="cx"> fs_data->parent = window;
</span><span class="cx"> fs_data->elm_window = elm_window;
</span><span class="cx"> fs_data->request = ewk_object_ref(request);
</span><del>- evas_object_smart_callback_add(elm_window, "delete,request", on_filepicker_deletion, fs_data);
- evas_object_event_callback_add(window->elm_window, EVAS_CALLBACK_DEL, on_filepicker_parent_deletion, fs_data);
</del><ins>+ evas_object_smart_callback_add(elm_window, "delete,request", _filepicker_deletion_cb, fs_data);
+ evas_object_event_callback_add(window->elm_window, EVAS_CALLBACK_DEL, _filepicker_parent_deletion_cb, fs_data);
</ins><span class="cx">
</span><span class="cx"> Evas_Object *file_selector = elm_fileselector_add(elm_window);
</span><span class="cx"> const char *home_path = getenv("HOME");
</span><span class="lines">@@ -872,7 +872,7 @@
</span><span class="cx"> elm_win_resize_object_add(elm_window, file_selector);
</span><span class="cx"> evas_object_show(file_selector);
</span><span class="cx">
</span><del>- evas_object_smart_callback_add(file_selector, "done", on_fileselector_done, fs_data);
</del><ins>+ evas_object_smart_callback_add(file_selector, "done", _fileselector_done_cb, fs_data);
</ins><span class="cx">
</span><span class="cx"> evas_object_resize(elm_window, 400, 400);
</span><span class="cx"> elm_win_center(elm_window, EINA_TRUE, EINA_TRUE);
</span><span class="lines">@@ -880,13 +880,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_download_finished(Ewk_Download_Job *download, void *user_data)
</del><ins>+_download_finished_cb(Ewk_Download_Job *download, void *user_data)
</ins><span class="cx"> {
</span><span class="cx"> INFO("Download finished: %s", ewk_download_job_destination_get(download));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_download_failed(Ewk_Download_Job_Error *download_error, void *user_data)
</del><ins>+_download_failed_cb(Ewk_Download_Job_Error *download_error, void *user_data)
</ins><span class="cx"> {
</span><span class="cx"> Ewk_Error *error = download_error->error;
</span><span class="cx">
</span><span class="lines">@@ -894,7 +894,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_color_changed(void *data, Evas_Object *obj, void *event_info)
</del><ins>+_color_changed_cb(void *data, Evas_Object *obj, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> int r, g, b, a;
</span><span class="cx">
</span><span class="lines">@@ -903,7 +903,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_color_item_selected(void *data, Evas_Object *obj, void *event_info)
</del><ins>+_color_item_selected_cb(void *data, Evas_Object *obj, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> int r, g, b, a;
</span><span class="cx"> Elm_Object_Item *color_item = (Elm_Object_Item *)event_info;
</span><span class="lines">@@ -913,7 +913,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_color_picker_ok_clicked(void *data, Evas_Object *obj, void *event_info)
</del><ins>+_color_picker_ok_clicked_cb(void *data, Evas_Object *obj, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> int r, g, b, a;
</span><span class="cx"> Color_Selector *color_selector = (Color_Selector *)data;
</span><span class="lines">@@ -923,7 +923,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_color_picker_cancel_clicked(void *data, Evas_Object *obj, void *event_info)
</del><ins>+_color_picker_cancel_clicked_cb(void *data, Evas_Object *obj, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> int r, g, b, a;
</span><span class="cx">
</span><span class="lines">@@ -932,7 +932,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Eina_Bool
</span><del>-on_color_picker_dismiss(Ewk_View_Smart_Data *sd)
</del><ins>+_color_picker_dismiss_cb(Ewk_View_Smart_Data *sd)
</ins><span class="cx"> {
</span><span class="cx"> Browser_Window *window = window_find_with_ewk_view(sd->self);
</span><span class="cx">
</span><span class="lines">@@ -943,7 +943,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Eina_Bool
</span><del>-on_color_picker_request(Ewk_View_Smart_Data *sd, Ewk_Color_Picker *color_picker)
</del><ins>+_color_picker_request_cb(Ewk_View_Smart_Data *sd, Ewk_Color_Picker *color_picker)
</ins><span class="cx"> {
</span><span class="cx"> int r, g, b, a;
</span><span class="cx"> Evas_Object *background, *rect, *box, *button_box, *rect_frame, *cs_frame, *ok_button, *cancel_button;
</span><span class="lines">@@ -1007,13 +1007,13 @@
</span><span class="cx"> elm_box_pack_end(button_box, cancel_button);
</span><span class="cx"> evas_object_show(cancel_button);
</span><span class="cx">
</span><del>- evas_object_smart_callback_add(ok_button, "clicked", on_color_picker_ok_clicked, &(window->color_selector));
- evas_object_smart_callback_add(cancel_button, "clicked", on_color_picker_cancel_clicked,
</del><ins>+ evas_object_smart_callback_add(ok_button, "clicked", _color_picker_ok_clicked_cb, &(window->color_selector));
+ evas_object_smart_callback_add(cancel_button, "clicked", _color_picker_cancel_clicked_cb,
</ins><span class="cx"> window->color_selector.ewk_picker);
</span><span class="cx"> evas_object_smart_callback_add(window->color_selector.elm_selector_window, "delete,request",
</span><del>- on_color_picker_cancel_clicked, window->color_selector.ewk_picker);
- evas_object_smart_callback_add(window->color_selector.elm_selector, "changed", on_color_changed, rect);
- evas_object_smart_callback_add(window->color_selector.elm_selector, "color,item,selected", on_color_item_selected,
</del><ins>+ _color_picker_cancel_clicked_cb, window->color_selector.ewk_picker);
+ evas_object_smart_callback_add(window->color_selector.elm_selector, "changed", _color_changed_cb, rect);
+ evas_object_smart_callback_add(window->color_selector.elm_selector, "color,item,selected", _color_item_selected_cb,
</ins><span class="cx"> rect);
</span><span class="cx">
</span><span class="cx"> elm_win_center(window->color_selector.elm_selector_window, EINA_TRUE, EINA_TRUE);
</span><span class="lines">@@ -1085,7 +1085,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_url_bar_activated(void *user_data, Evas_Object *url_bar, void *event_info)
</del><ins>+_url_bar_activated_cb(void *user_data, Evas_Object *url_bar, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx">
</span><span class="lines">@@ -1102,7 +1102,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_url_bar_clicked(void *user_data, Evas_Object *url_bar, void *event_info)
</del><ins>+_url_bar_clicked_cb(void *user_data, Evas_Object *url_bar, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx">
</span><span class="lines">@@ -1112,7 +1112,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_search_field_aborted(void *user_data, Evas_Object *search_field, void *event_info)
</del><ins>+_search_field_aborted_cb(void *user_data, Evas_Object *search_field, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx"> search_box_hide(window);
</span><span class="lines">@@ -1122,7 +1122,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_search_field_activated(void *user_data, Evas_Object *search_field, void *event_info)
</del><ins>+_search_field_activated_cb(void *user_data, Evas_Object *search_field, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx">
</span><span class="lines">@@ -1137,7 +1137,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_search_field_clicked(void *user_data, Evas_Object *search_field, void *event_info)
</del><ins>+_search_field_clicked_cb(void *user_data, Evas_Object *search_field, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx">
</span><span class="lines">@@ -1147,7 +1147,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_back_button_clicked(void *user_data, Evas_Object *back_button, void *event_info)
</del><ins>+_back_button_clicked_cb(void *user_data, Evas_Object *back_button, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> if (longpress_enabled)
</span><span class="cx"> return;
</span><span class="lines">@@ -1160,7 +1160,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_forward_button_clicked(void *user_data, Evas_Object *forward_button, void *event_info)
</del><ins>+_forward_button_clicked_cb(void *user_data, Evas_Object *forward_button, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> if (longpress_enabled)
</span><span class="cx"> return;
</span><span class="lines">@@ -1173,7 +1173,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_search_backward_button_clicked(void *user_data, Evas_Object *search_backward_button, void *event_info)
</del><ins>+_search_backward_button_clicked_cb(void *user_data, Evas_Object *search_backward_button, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx">
</span><span class="lines">@@ -1183,7 +1183,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_search_forward_button_clicked(void *user_data, Evas_Object *search_forward_button, void *event_info)
</del><ins>+_search_forward_button_clicked_cb(void *user_data, Evas_Object *search_forward_button, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx">
</span><span class="lines">@@ -1193,7 +1193,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_search_case_option_changed(void *user_data, Evas_Object *search_case_check_box, void *event_info)
</del><ins>+_search_case_option_changed(void *user_data, Evas_Object *search_case_check_box, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx"> char *text = elm_entry_markup_to_utf8(elm_entry_entry_get(window->search.search_field));
</span><span class="lines">@@ -1206,7 +1206,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_search_word_start_option_changed(void *user_data, Evas_Object *search_word_start_check_box, void *event_info)
</del><ins>+_search_word_start_option_changed_cb(void *user_data, Evas_Object *search_word_start_check_box, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx"> char *text = elm_entry_markup_to_utf8(elm_entry_entry_get(window->search.search_field));
</span><span class="lines">@@ -1219,7 +1219,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_search_close_button_clicked(void *user_data, Evas_Object *search_close_button, void *event_info)
</del><ins>+_search_close_button_clicked_cb(void *user_data, Evas_Object *search_close_button, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx">
</span><span class="lines">@@ -1227,7 +1227,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_refresh_button_clicked(void *user_data, Evas_Object *refresh_button, void *event_info)
</del><ins>+_refresh_button_clicked_cb(void *user_data, Evas_Object *refresh_button, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx">
</span><span class="lines">@@ -1243,7 +1243,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_stop_button_clicked(void *user_data, Evas_Object *stop_button, void *event_info)
</del><ins>+_stop_button_clicked_cb(void *user_data, Evas_Object *stop_button, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx">
</span><span class="lines">@@ -1261,7 +1261,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_list_item_select(void *user_data, Evas_Object *obj, void *event_info)
</del><ins>+_list_item_select_cb(void *user_data, Evas_Object *obj, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> Browser_Window *window = evas_object_data_get(obj, "Browser_Window");
</span><span class="cx"> ewk_view_navigate_to(window->ewk_view, user_data);
</span><span class="lines">@@ -1312,7 +1312,7 @@
</span><span class="cx"> EINA_LIST_FOREACH(window->history.history_list_items, l, data) {
</span><span class="cx"> title = ewk_back_forward_list_item_title_get(data);
</span><span class="cx"> INFO(" title = %s", title);
</span><del>- elm_genlist_item_append(window->history.history_list, list_item, (void *)(title), NULL, ELM_GENLIST_ITEM_NONE, on_list_item_select, data);
</del><ins>+ elm_genlist_item_append(window->history.history_list, list_item, (void *)(title), NULL, ELM_GENLIST_ITEM_NONE, _list_item_select_cb, data);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (item_count > 0) {
</span><span class="lines">@@ -1338,7 +1338,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_forward_button_longpress(void *user_data, Evas_Object *forward_button, void *event_info)
</del><ins>+_forward_button_longpress_cb(void *user_data, Evas_Object *forward_button, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx">
</span><span class="lines">@@ -1347,7 +1347,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_back_button_longpress(void *user_data, Evas_Object *back_button, void *event_info)
</del><ins>+_back_button_longpress_cb(void *user_data, Evas_Object *back_button, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx">
</span><span class="lines">@@ -1362,7 +1362,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_ok_clicked(void *user_data, Evas_Object *obj, void *event_info)
</del><ins>+_ok_clicked_cb(void *user_data, Evas_Object *obj, void *event_info)
</ins><span class="cx"> {
</span><span class="cx"> Eina_Bool *confirmed = (Eina_Bool *)user_data;
</span><span class="cx"> *confirmed = EINA_TRUE;
</span><span class="lines">@@ -1371,7 +1371,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Eina_Stringshare *
</span><del>-show_file_entry_dialog(Browser_Window *window, const char *label_tag, const char *default_text)
</del><ins>+_file_entry_dialog_show(Browser_Window *window, const char *label_tag, const char *default_text)
</ins><span class="cx"> {
</span><span class="cx"> Evas_Object *file_popup = elm_popup_add(window->elm_window);
</span><span class="cx"> evas_object_size_hint_weight_set(file_popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
</span><span class="lines">@@ -1409,7 +1409,7 @@
</span><span class="cx"> Eina_Bool ok = EINA_FALSE;
</span><span class="cx"> Evas_Object *ok_button = elm_button_add(file_popup);
</span><span class="cx"> elm_object_text_set(ok_button, "OK");
</span><del>- evas_object_smart_callback_add(ok_button, "clicked", on_ok_clicked, &ok);
</del><ins>+ evas_object_smart_callback_add(ok_button, "clicked", _ok_clicked_cb, &ok);
</ins><span class="cx"> elm_box_pack_end(hbox, ok_button);
</span><span class="cx"> evas_object_show(ok_button);
</span><span class="cx">
</span><span class="lines">@@ -1427,933 +1427,936 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_javascript_alert(Ewk_View_Smart_Data *smartData, const char *message)
</del><ins>+_javascript_alert_cb(Ewk_View_Smart_Data *smartData, const char *message)
</ins><span class="cx"> {
</span><del>- Browser_Window *window = window_find_with_ewk_view(smartData->self);
</del><ins>+ Browser_Window *window = window_find_with_ewk_view(smartData->self);
</ins><span class="cx">
</span><del>- Evas_Object *alert_popup = elm_popup_add(window->elm_window);
- evas_object_size_hint_weight_set(alert_popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_object_text_set(alert_popup, message);
- elm_object_part_text_set(alert_popup, "title,text", "Alert");
</del><ins>+ Evas_Object *alert_popup = elm_popup_add(window->elm_window);
+ evas_object_size_hint_weight_set(alert_popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ elm_object_text_set(alert_popup, message);
+ elm_object_part_text_set(alert_popup, "title,text", "Alert");
</ins><span class="cx">
</span><del>- /* Popup buttons */
- Evas_Object *button = elm_button_add(alert_popup);
- elm_object_text_set(button, "OK");
- elm_object_part_content_set(alert_popup, "button1", button);
- evas_object_smart_callback_add(button, "clicked", quit_event_loop, NULL);
- elm_object_focus_set(button, EINA_TRUE);
- evas_object_show(alert_popup);
</del><ins>+ /* Popup buttons */
+ Evas_Object *button = elm_button_add(alert_popup);
+ elm_object_text_set(button, "OK");
+ elm_object_part_content_set(alert_popup, "button1", button);
+ evas_object_smart_callback_add(button, "clicked", quit_event_loop, NULL);
+ elm_object_focus_set(button, EINA_TRUE);
+ evas_object_show(alert_popup);
</ins><span class="cx">
</span><del>- /* Make modal */
- ecore_main_loop_begin();
</del><ins>+ /* Make modal */
+ ecore_main_loop_begin();
</ins><span class="cx">
</span><del>- evas_object_del(alert_popup);
</del><ins>+ evas_object_del(alert_popup);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Eina_Bool
</span><del>-on_javascript_confirm(Ewk_View_Smart_Data *smartData, const char *message)
</del><ins>+_javascript_confirm_cb(Ewk_View_Smart_Data *smartData, const char *message)
</ins><span class="cx"> {
</span><del>- Browser_Window *window = window_find_with_ewk_view(smartData->self);
</del><ins>+ Browser_Window *window = window_find_with_ewk_view(smartData->self);
</ins><span class="cx">
</span><del>- Eina_Bool ok = EINA_FALSE;
</del><ins>+ Eina_Bool ok = EINA_FALSE;
</ins><span class="cx">
</span><del>- Evas_Object *confirm_popup = elm_popup_add(window->elm_window);
- evas_object_size_hint_weight_set(confirm_popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_object_text_set(confirm_popup, message);
- elm_object_part_text_set(confirm_popup, "title,text", "Confirmation");
</del><ins>+ Evas_Object *confirm_popup = elm_popup_add(window->elm_window);
+ evas_object_size_hint_weight_set(confirm_popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ elm_object_text_set(confirm_popup, message);
+ elm_object_part_text_set(confirm_popup, "title,text", "Confirmation");
</ins><span class="cx">
</span><del>- /* Popup buttons */
- Evas_Object *cancel_button = elm_button_add(confirm_popup);
- elm_object_text_set(cancel_button, "Cancel");
- elm_object_part_content_set(confirm_popup, "button1", cancel_button);
- evas_object_smart_callback_add(cancel_button, "clicked", quit_event_loop, NULL);
- Evas_Object *ok_button = elm_button_add(confirm_popup);
- elm_object_text_set(ok_button, "OK");
- elm_object_part_content_set(confirm_popup, "button2", ok_button);
- evas_object_smart_callback_add(ok_button, "clicked", on_ok_clicked, &ok);
- elm_object_focus_set(ok_button, EINA_TRUE);
- evas_object_show(confirm_popup);
</del><ins>+ /* Popup buttons */
+ Evas_Object *cancel_button = elm_button_add(confirm_popup);
+ elm_object_text_set(cancel_button, "Cancel");
+ elm_object_part_content_set(confirm_popup, "button1", cancel_button);
+ evas_object_smart_callback_add(cancel_button, "clicked", quit_event_loop, NULL);
+ Evas_Object *ok_button = elm_button_add(confirm_popup);
+ elm_object_text_set(ok_button, "OK");
+ elm_object_part_content_set(confirm_popup, "button2", ok_button);
+ evas_object_smart_callback_add(ok_button, "clicked", _ok_clicked_cb, &ok);
+ elm_object_focus_set(ok_button, EINA_TRUE);
+ evas_object_show(confirm_popup);
</ins><span class="cx">
</span><del>- /* Make modal */
- ecore_main_loop_begin();
</del><ins>+ /* Make modal */
+ ecore_main_loop_begin();
</ins><span class="cx">
</span><del>- evas_object_del(confirm_popup);
</del><ins>+ evas_object_del(confirm_popup);
</ins><span class="cx">
</span><del>- return ok;
</del><ins>+ return ok;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static const char *
</span><del>-on_javascript_prompt(Ewk_View_Smart_Data *smartData, const char *message, const char *default_value)
</del><ins>+_javascript_prompt_cb(Ewk_View_Smart_Data *smartData, const char *message, const char *default_value)
</ins><span class="cx"> {
</span><del>- Browser_Window *window = window_find_with_ewk_view(smartData->self);
</del><ins>+ Browser_Window *window = window_find_with_ewk_view(smartData->self);
</ins><span class="cx">
</span><del>- Eina_Bool ok = EINA_FALSE;
</del><ins>+ Eina_Bool ok = EINA_FALSE;
</ins><span class="cx">
</span><del>- Evas_Object *prompt_popup = elm_popup_add(window->elm_window);
- evas_object_size_hint_weight_set(prompt_popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_object_part_text_set(prompt_popup, "title,text", "Prompt");
</del><ins>+ Evas_Object *prompt_popup = elm_popup_add(window->elm_window);
+ evas_object_size_hint_weight_set(prompt_popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ elm_object_part_text_set(prompt_popup, "title,text", "Prompt");
</ins><span class="cx">
</span><del>- /* Popup Content */
- Evas_Object *box = elm_box_add(window->elm_window);
- elm_box_padding_set(box, 0, 4);
- evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_show(box);
</del><ins>+ /* Popup Content */
+ Evas_Object *box = elm_box_add(window->elm_window);
+ elm_box_padding_set(box, 0, 4);
+ evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ evas_object_show(box);
</ins><span class="cx">
</span><del>- Evas_Object *prompt = elm_label_add(window->elm_window);
- elm_object_text_set(prompt, message);
- evas_object_size_hint_weight_set(prompt, EVAS_HINT_EXPAND, 0.0);
- evas_object_size_hint_align_set(prompt, EVAS_HINT_FILL, 0.5);
- elm_box_pack_end(box, prompt);
- evas_object_show(prompt);
</del><ins>+ Evas_Object *prompt = elm_label_add(window->elm_window);
+ elm_object_text_set(prompt, message);
+ evas_object_size_hint_weight_set(prompt, EVAS_HINT_EXPAND, 0.0);
+ evas_object_size_hint_align_set(prompt, EVAS_HINT_FILL, 0.5);
+ elm_box_pack_end(box, prompt);
+ evas_object_show(prompt);
</ins><span class="cx">
</span><del>- Evas_Object *entry = elm_entry_add(window->elm_window);
- elm_entry_scrollable_set(entry, EINA_TRUE);
- elm_entry_single_line_set(entry, EINA_TRUE);
- elm_entry_text_style_user_push(entry, "DEFAULT='font_size=18'");
- elm_entry_entry_set(entry, default_value ? default_value : "");
- elm_entry_select_all(entry);
- evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, 0.0);
- evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, 0.5);
- elm_box_pack_end(box, entry);
- elm_object_focus_set(entry, EINA_TRUE);
- evas_object_show(entry);
</del><ins>+ Evas_Object *entry = elm_entry_add(window->elm_window);
+ elm_entry_scrollable_set(entry, EINA_TRUE);
+ elm_entry_single_line_set(entry, EINA_TRUE);
+ elm_entry_text_style_user_push(entry, "DEFAULT='font_size=18'");
+ elm_entry_entry_set(entry, default_value ? default_value : "");
+ elm_entry_select_all(entry);
+ evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, 0.0);
+ evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, 0.5);
+ elm_box_pack_end(box, entry);
+ elm_object_focus_set(entry, EINA_TRUE);
+ evas_object_show(entry);
</ins><span class="cx">
</span><del>- elm_object_content_set(prompt_popup, box);
</del><ins>+ elm_object_content_set(prompt_popup, box);
</ins><span class="cx">
</span><del>- /* Popup buttons */
- Evas_Object *cancel_button = elm_button_add(prompt_popup);
- elm_object_text_set(cancel_button, "Cancel");
- elm_object_part_content_set(prompt_popup, "button1", cancel_button);
- evas_object_smart_callback_add(cancel_button, "clicked", quit_event_loop, NULL);
- Evas_Object *ok_button = elm_button_add(prompt_popup);
- elm_object_text_set(ok_button, "OK");
- elm_object_part_content_set(prompt_popup, "button2", ok_button);
- evas_object_smart_callback_add(ok_button, "clicked", on_ok_clicked, &ok);
- evas_object_show(prompt_popup);
</del><ins>+ /* Popup buttons */
+ Evas_Object *cancel_button = elm_button_add(prompt_popup);
+ elm_object_text_set(cancel_button, "Cancel");
+ elm_object_part_content_set(prompt_popup, "button1", cancel_button);
+ evas_object_smart_callback_add(cancel_button, "clicked", quit_event_loop, NULL);
+ Evas_Object *ok_button = elm_button_add(prompt_popup);
+ elm_object_text_set(ok_button, "OK");
+ elm_object_part_content_set(prompt_popup, "button2", ok_button);
+ evas_object_smart_callback_add(ok_button, "clicked", _ok_clicked_cb, &ok);
+ evas_object_show(prompt_popup);
</ins><span class="cx">
</span><del>- /* Make modal */
- ecore_main_loop_begin();
</del><ins>+ /* Make modal */
+ ecore_main_loop_begin();
</ins><span class="cx">
</span><del>- /* The return string need to be stringshared */
- const char *prompt_text = ok ? eina_stringshare_add(elm_entry_entry_get(entry)) : NULL;
- evas_object_del(prompt_popup);
</del><ins>+ /* The return string need to be stringshared */
+ const char *prompt_text = ok ? eina_stringshare_add(elm_entry_entry_get(entry)) : NULL;
+ evas_object_del(prompt_popup);
</ins><span class="cx">
</span><del>- return prompt_text;
</del><ins>+ return prompt_text;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Eina_Bool
</span><del>-on_javascript_before_unload_confirm(Ewk_View_Smart_Data *smartData, const char *message)
</del><ins>+_javascript_before_unload_confirm_cb(Ewk_View_Smart_Data *smartData, const char *message)
</ins><span class="cx"> {
</span><del>- return on_javascript_confirm(smartData, "Will you leave this page?");
</del><ins>+ return _javascript_confirm_cb(smartData, "Will you leave this page?");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_popup_menu_item_clicked(void *user_data, Evas_Object *obj, void *event_info)
</del><ins>+_popup_menu_item_clicked_cb(void *user_data, Evas_Object *obj, void *event_info)
</ins><span class="cx"> {
</span><del>- Browser_Window *window = (Browser_Window *)user_data;
- Elm_Object_Item *item = (Elm_Object_Item *)event_info;
</del><ins>+ Browser_Window *window = (Browser_Window *)user_data;
+ Elm_Object_Item *item = (Elm_Object_Item *)event_info;
</ins><span class="cx">
</span><del>- INFO("Selected popup menu index: %u", elm_menu_item_index_get(item));
- ewk_popup_menu_selected_index_set(window->popup.ewk_menu, elm_menu_item_index_get(item));
</del><ins>+ INFO("Selected popup menu index: %u", elm_menu_item_index_get(item));
+ ewk_popup_menu_selected_index_set(window->popup.ewk_menu, elm_menu_item_index_get(item));
</ins><span class="cx">
</span><del>- // Close popup menu.
- ewk_popup_menu_close(window->popup.ewk_menu);
</del><ins>+ // Close popup menu.
+ ewk_popup_menu_close(window->popup.ewk_menu);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><span class="cx"> popup_menu_populate(Evas_Object *elm_menu, Ewk_Popup_Menu *ewk_menu, void *user_data)
</span><span class="cx"> {
</span><del>- const Eina_List* ewk_items = ewk_popup_menu_items_get(ewk_menu);
</del><ins>+ const Eina_List* ewk_items = ewk_popup_menu_items_get(ewk_menu);
</ins><span class="cx">
</span><del>- void *data;
- const Eina_List *l;
- EINA_LIST_FOREACH(ewk_items, l, data) {
- Ewk_Popup_Menu_Item *ewk_item = (Ewk_Popup_Menu_Item *)data;
- switch (ewk_popup_menu_item_type_get(ewk_item)) {
- case EWK_POPUP_MENU_SEPARATOR:
- elm_menu_item_separator_add(elm_menu, NULL);
- break;
- case EWK_POPUP_MENU_ITEM:
- if (ewk_popup_menu_item_is_label_get(ewk_item)) {
- Elm_Object_Item *item = elm_menu_item_add(elm_menu, NULL, NULL, ewk_popup_menu_item_text_get(ewk_item), NULL, NULL);
- elm_object_item_disabled_set(item, EINA_TRUE);
- } else {
- Elm_Object_Item *item = elm_menu_item_add(elm_menu, NULL, NULL, ewk_popup_menu_item_text_get(ewk_item), on_popup_menu_item_clicked, user_data);
- const char *tooltip_text = ewk_popup_menu_item_tooltip_get(ewk_item);
- if (tooltip_text && tooltip_text[0] != '\0')
- elm_object_item_tooltip_text_set(item, tooltip_text);
- elm_object_item_disabled_set(item, !ewk_popup_menu_item_enabled_get(ewk_item));
- elm_menu_item_selected_set(item, ewk_popup_menu_item_selected_get(ewk_item));
- }
- break;
- default:
- INFO("Unrecognized popup menu item type!");
- break;
- }
- }
</del><ins>+ void *data;
+ const Eina_List *l;
+ EINA_LIST_FOREACH(ewk_items, l, data) {
+ Ewk_Popup_Menu_Item *ewk_item = (Ewk_Popup_Menu_Item *)data;
+ switch (ewk_popup_menu_item_type_get(ewk_item)) {
+ case EWK_POPUP_MENU_SEPARATOR:
+ elm_menu_item_separator_add(elm_menu, NULL);
+ break;
+ case EWK_POPUP_MENU_ITEM:
+ if (ewk_popup_menu_item_is_label_get(ewk_item)) {
+ Elm_Object_Item *item = elm_menu_item_add(elm_menu, NULL, NULL, ewk_popup_menu_item_text_get(ewk_item), NULL, NULL);
+ elm_object_item_disabled_set(item, EINA_TRUE);
+ } else {
+ Elm_Object_Item *item = elm_menu_item_add(elm_menu, NULL, NULL, ewk_popup_menu_item_text_get(ewk_item), _popup_menu_item_clicked_cb, user_data);
+ const char *tooltip_text = ewk_popup_menu_item_tooltip_get(ewk_item);
+ if (tooltip_text && tooltip_text[0] != '\0')
+ elm_object_item_tooltip_text_set(item, tooltip_text);
+ elm_object_item_disabled_set(item, !ewk_popup_menu_item_enabled_get(ewk_item));
+ elm_menu_item_selected_set(item, ewk_popup_menu_item_selected_get(ewk_item));
+ }
+ break;
+ default:
+ INFO("Unrecognized popup menu item type!");
+ break;
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Eina_Bool
</span><del>-on_popup_menu_show(Ewk_View_Smart_Data *smartData, Eina_Rectangle rect, Ewk_Text_Direction text_direction, double page_scale_factor, Ewk_Popup_Menu *ewk_menu)
</del><ins>+_popup_menu_show(Ewk_View_Smart_Data *smartData, Eina_Rectangle rect, Ewk_Text_Direction text_direction, double page_scale_factor, Ewk_Popup_Menu *ewk_menu)
</ins><span class="cx"> {
</span><del>- Browser_Window *window = window_find_with_ewk_view(smartData->self);
</del><ins>+ Browser_Window *window = window_find_with_ewk_view(smartData->self);
</ins><span class="cx">
</span><del>- if (window->popup.elm_menu)
- evas_object_del(window->popup.elm_menu);
</del><ins>+ if (window->popup.elm_menu)
+ evas_object_del(window->popup.elm_menu);
</ins><span class="cx">
</span><del>- window->popup.elm_menu = elm_menu_add(window->elm_window);
- window->popup.ewk_menu = ewk_menu;
</del><ins>+ window->popup.elm_menu = elm_menu_add(window->elm_window);
+ window->popup.ewk_menu = ewk_menu;
</ins><span class="cx">
</span><del>- popup_menu_populate(window->popup.elm_menu, ewk_menu, window);
</del><ins>+ popup_menu_populate(window->popup.elm_menu, ewk_menu, window);
</ins><span class="cx">
</span><del>- INFO("Showing popup menu at (%d, %d)", rect.x, rect.y);
- elm_menu_move(window->popup.elm_menu, rect.x, rect.y);
- evas_object_show(window->popup.elm_menu);
</del><ins>+ INFO("Showing popup menu at (%d, %d)", rect.x, rect.y);
+ elm_menu_move(window->popup.elm_menu, rect.x, rect.y);
+ evas_object_show(window->popup.elm_menu);
</ins><span class="cx">
</span><del>- return EINA_TRUE;
</del><ins>+ return EINA_TRUE;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Eina_Bool
</span><del>-on_popup_menu_hide(Ewk_View_Smart_Data *smartData)
</del><ins>+_popup_menu_hide(Ewk_View_Smart_Data *smartData)
</ins><span class="cx"> {
</span><del>- Browser_Window *window = window_find_with_ewk_view(smartData->self);
</del><ins>+ Browser_Window *window = window_find_with_ewk_view(smartData->self);
</ins><span class="cx">
</span><del>- if (!window->popup.elm_menu)
- return EINA_FALSE;
</del><ins>+ if (!window->popup.elm_menu)
+ return EINA_FALSE;
</ins><span class="cx">
</span><del>- elm_menu_close(window->popup.elm_menu);
- window->popup.ewk_menu = NULL;
</del><ins>+ elm_menu_close(window->popup.elm_menu);
+ window->popup.ewk_menu = NULL;
</ins><span class="cx">
</span><del>- return EINA_TRUE;
</del><ins>+ return EINA_TRUE;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Eina_Bool on_window_geometry_get(Ewk_View_Smart_Data *sd, Evas_Coord *x, Evas_Coord *y, Evas_Coord *width, Evas_Coord *height)
</del><ins>+static Eina_Bool
+_window_geometry_get(Ewk_View_Smart_Data *sd, Evas_Coord *x, Evas_Coord *y, Evas_Coord *width, Evas_Coord *height)
</ins><span class="cx"> {
</span><del>- Browser_Window *window = window_find_with_ewk_view(sd->self);
</del><ins>+ Browser_Window *window = window_find_with_ewk_view(sd->self);
</ins><span class="cx">
</span><del>- evas_object_geometry_get(window->elm_window, x, y, width, height);
</del><ins>+ evas_object_geometry_get(window->elm_window, x, y, width, height);
</ins><span class="cx">
</span><del>- return EINA_TRUE;
</del><ins>+ return EINA_TRUE;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Eina_Bool on_window_geometry_set(Ewk_View_Smart_Data *sd, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height)
</del><ins>+static Eina_Bool
+_window_geometry_set(Ewk_View_Smart_Data *sd, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height)
</ins><span class="cx"> {
</span><del>- Browser_Window *window = window_find_with_ewk_view(sd->self);
</del><ins>+ Browser_Window *window = window_find_with_ewk_view(sd->self);
</ins><span class="cx">
</span><del>- evas_object_move(window->elm_window, x, y);
- evas_object_resize(window->elm_window, width, height);
</del><ins>+ evas_object_move(window->elm_window, x, y);
+ evas_object_resize(window->elm_window, width, height);
</ins><span class="cx">
</span><del>- return EINA_TRUE;
</del><ins>+ return EINA_TRUE;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> typedef struct {
</span><del>- Evas_Object *ewk_view;
- Evas_Object *permission_popup;
</del><ins>+ Evas_Object *ewk_view;
+ Evas_Object *permission_popup;
</ins><span class="cx"> } PermissionData;
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_fullscreen_accept(void *user_data, Evas_Object *obj, void *event_info)
</del><ins>+_fullscreen_accept_cb(void *user_data, Evas_Object *obj, void *event_info)
</ins><span class="cx"> {
</span><del>- PermissionData *permission_data = (PermissionData *)user_data;
- Browser_Window *window = window_find_with_ewk_view(permission_data->ewk_view);
</del><ins>+ PermissionData *permission_data = (PermissionData *)user_data;
+ Browser_Window *window = window_find_with_ewk_view(permission_data->ewk_view);
</ins><span class="cx">
</span><del>- elm_win_resize_object_del(window->elm_window, permission_data->permission_popup);
- evas_object_del(permission_data->permission_popup);
- evas_object_focus_set(permission_data->ewk_view, EINA_TRUE);
- free(permission_data);
</del><ins>+ elm_win_resize_object_del(window->elm_window, permission_data->permission_popup);
+ evas_object_del(permission_data->permission_popup);
+ evas_object_focus_set(permission_data->ewk_view, EINA_TRUE);
+ free(permission_data);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_fullscreen_deny(void *user_data, Evas_Object *obj, void *event_info)
</del><ins>+_fullscreen_deny_cb(void *user_data, Evas_Object *obj, void *event_info)
</ins><span class="cx"> {
</span><del>- PermissionData *permission_data = (PermissionData *)user_data;
- Browser_Window *window = window_find_with_ewk_view(permission_data->ewk_view);
</del><ins>+ PermissionData *permission_data = (PermissionData *)user_data;
+ Browser_Window *window = window_find_with_ewk_view(permission_data->ewk_view);
</ins><span class="cx">
</span><del>- ewk_view_fullscreen_exit(permission_data->ewk_view);
- elm_win_resize_object_del(window->elm_window, permission_data->permission_popup);
- evas_object_del(permission_data->permission_popup);
- evas_object_focus_set(permission_data->ewk_view, EINA_TRUE);
- free(permission_data);
</del><ins>+ ewk_view_fullscreen_exit(permission_data->ewk_view);
+ elm_win_resize_object_del(window->elm_window, permission_data->permission_popup);
+ evas_object_del(permission_data->permission_popup);
+ evas_object_focus_set(permission_data->ewk_view, EINA_TRUE);
+ free(permission_data);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Eina_Bool on_fullscreen_enter(Ewk_View_Smart_Data *sd, Ewk_Security_Origin *origin)
</del><ins>+static Eina_Bool
+_fullscreen_enter_cb(Ewk_View_Smart_Data *sd, Ewk_Security_Origin *origin)
</ins><span class="cx"> {
</span><del>- Browser_Window *window = window_find_with_ewk_view(sd->self);
</del><ins>+ Browser_Window *window = window_find_with_ewk_view(sd->self);
</ins><span class="cx">
</span><del>- /* Go fullscreen */
- toggle_window_fullscreen(window, EINA_TRUE);
</del><ins>+ /* Go fullscreen */
+ toggle_window_fullscreen(window, EINA_TRUE);
</ins><span class="cx">
</span><del>- /* Show user popup */
- Evas_Object *permission_popup = elm_popup_add(window->elm_window);
- evas_object_size_hint_weight_set(permission_popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
</del><ins>+ /* Show user popup */
+ Evas_Object *permission_popup = elm_popup_add(window->elm_window);
+ evas_object_size_hint_weight_set(permission_popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
</ins><span class="cx">
</span><del>- Eina_Strbuf *message = eina_strbuf_new();
- eina_strbuf_append_printf(message, "%s is now fullscreen.<br>Press ESC at any time to exit fullscreen.<br>Allow fullscreen?", ewk_security_origin_host_get(origin));
- elm_object_text_set(permission_popup, eina_strbuf_string_get(message));
- eina_strbuf_free(message);
- elm_object_part_text_set(permission_popup, "title,text", "Fullscreen Permission");
</del><ins>+ Eina_Strbuf *message = eina_strbuf_new();
+ eina_strbuf_append_printf(message, "%s is now fullscreen.<br>Press ESC at any time to exit fullscreen.<br>Allow fullscreen?", ewk_security_origin_host_get(origin));
+ elm_object_text_set(permission_popup, eina_strbuf_string_get(message));
+ eina_strbuf_free(message);
+ elm_object_part_text_set(permission_popup, "title,text", "Fullscreen Permission");
</ins><span class="cx">
</span><del>- /* Popup buttons */
- PermissionData *permission_data = (PermissionData *)malloc(sizeof(PermissionData));
- permission_data->ewk_view = window->ewk_view;
- permission_data->permission_popup = permission_popup;
- Evas_Object *accept_button = elm_button_add(permission_popup);
- elm_object_text_set(accept_button, "Accept");
- elm_object_part_content_set(permission_popup, "button1", accept_button);
- evas_object_smart_callback_add(accept_button, "clicked", on_fullscreen_accept, permission_data);
</del><ins>+ /* Popup buttons */
+ PermissionData *permission_data = (PermissionData *)malloc(sizeof(PermissionData));
+ permission_data->ewk_view = window->ewk_view;
+ permission_data->permission_popup = permission_popup;
+ Evas_Object *accept_button = elm_button_add(permission_popup);
+ elm_object_text_set(accept_button, "Accept");
+ elm_object_part_content_set(permission_popup, "button1", accept_button);
+ evas_object_smart_callback_add(accept_button, "clicked", _fullscreen_accept_cb, permission_data);
</ins><span class="cx">
</span><del>- Evas_Object *deny_button = elm_button_add(permission_popup);
- elm_object_text_set(deny_button, "Deny");
- elm_object_part_content_set(permission_popup, "button2", deny_button);
- evas_object_smart_callback_add(deny_button, "clicked", on_fullscreen_deny, permission_data);
- elm_win_resize_object_add(window->elm_window, permission_popup);
- evas_object_show(permission_popup);
</del><ins>+ Evas_Object *deny_button = elm_button_add(permission_popup);
+ elm_object_text_set(deny_button, "Deny");
+ elm_object_part_content_set(permission_popup, "button2", deny_button);
+ evas_object_smart_callback_add(deny_button, "clicked", _fullscreen_deny_cb, permission_data);
+ elm_win_resize_object_add(window->elm_window, permission_popup);
+ evas_object_show(permission_popup);
</ins><span class="cx">
</span><del>- return EINA_TRUE;
</del><ins>+ return EINA_TRUE;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Eina_Bool on_fullscreen_exit(Ewk_View_Smart_Data *sd)
</del><ins>+static Eina_Bool _fullscreen_exit_cb(Ewk_View_Smart_Data *sd)
</ins><span class="cx"> {
</span><del>- Browser_Window *window = window_find_with_ewk_view(sd->self);
</del><ins>+ Browser_Window *window = window_find_with_ewk_view(sd->self);
</ins><span class="cx">
</span><del>- toggle_window_fullscreen(window, EINA_FALSE);
</del><ins>+ toggle_window_fullscreen(window, EINA_FALSE);
</ins><span class="cx">
</span><del>- return EINA_TRUE;
</del><ins>+ return EINA_TRUE;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Evas_Object *
</span><del>-on_window_create(Ewk_View_Smart_Data *smartData, Ewk_View_Configuration* configuration, const Ewk_Window_Features *window_features)
</del><ins>+_window_create_cb(Ewk_View_Smart_Data *smartData, Ewk_View_Configuration* configuration, const Ewk_Window_Features *window_features)
</ins><span class="cx"> {
</span><del>- int x = 0;
- int y = 0;
- int width = 0;
- int height = 0;
</del><ins>+ int x = 0;
+ int y = 0;
+ int width = 0;
+ int height = 0;
</ins><span class="cx">
</span><del>- ewk_window_features_geometry_get(window_features, &x, &y, &width, &height);
</del><ins>+ ewk_window_features_geometry_get(window_features, &x, &y, &width, &height);
</ins><span class="cx">
</span><del>- if (!width)
- width = window_width;
</del><ins>+ if (!width)
+ width = window_width;
</ins><span class="cx">
</span><del>- if (!height)
- height = window_height;
</del><ins>+ if (!height)
+ height = window_height;
</ins><span class="cx">
</span><del>- Browser_Window *window = window_create(configuration, width, height);
- Evas_Object *new_view = window->ewk_view;
</del><ins>+ Browser_Window *window = window_create(configuration, width, height);
+ Evas_Object *new_view = window->ewk_view;
</ins><span class="cx">
</span><del>- windows = eina_list_append(windows, window);
</del><ins>+ windows = eina_list_append(windows, window);
</ins><span class="cx">
</span><del>- INFO("minibrowser: location(%d,%d) size=(%d,%d)", x, y, width, height);
</del><ins>+ INFO("minibrowser: location(%d,%d) size=(%d,%d)", x, y, width, height);
</ins><span class="cx">
</span><del>- return new_view;
</del><ins>+ return new_view;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_window_close(Ewk_View_Smart_Data *smartData)
</del><ins>+_window_close_cb(Ewk_View_Smart_Data *smartData)
</ins><span class="cx"> {
</span><del>- Browser_Window *window = window_find_with_ewk_view(smartData->self);
- window_close(window);
</del><ins>+ Browser_Window *window = window_find_with_ewk_view(smartData->self);
+ window_close(window);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-context_menu_item_selected_cb(void *data, Evas_Object *obj, void *event_info)
</del><ins>+_context_menu_item_selected_cb(void *data, Evas_Object *obj, void *event_info)
</ins><span class="cx"> {
</span><del>- if (!data) {
- ERROR("Context menu callback data is NULL.");
- return;
- }
</del><ins>+ if (!data) {
+ ERROR("Context menu callback data is NULL.");
+ return;
+ }
</ins><span class="cx">
</span><del>- Ewk_Context_Menu_Item *ewk_item = (Ewk_Context_Menu_Item *)data;
- INFO("Selected context menu item: %s.", ewk_context_menu_item_title_get(ewk_item));
- ewk_context_menu_item_select(ewk_context_menu_item_parent_menu_get(ewk_item), ewk_item);
- ewk_context_menu_hide(ewk_context_menu_item_parent_menu_get(ewk_item));
</del><ins>+ Ewk_Context_Menu_Item *ewk_item = (Ewk_Context_Menu_Item *)data;
+ INFO("Selected context menu item: %s.", ewk_context_menu_item_title_get(ewk_item));
+ ewk_context_menu_item_select(ewk_context_menu_item_parent_menu_get(ewk_item), ewk_item);
+ ewk_context_menu_hide(ewk_context_menu_item_parent_menu_get(ewk_item));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><span class="cx"> context_menu_populate(Evas_Object* context_menu, Ewk_Context_Menu *ewk_menu, Elm_Object_Item *parent_item)
</span><span class="cx"> {
</span><del>- if (!context_menu || !ewk_menu) {
- ERROR("Necessary objects are NULL.");
- return;
- }
</del><ins>+ if (!context_menu || !ewk_menu) {
+ ERROR("Necessary objects are NULL.");
+ return;
+ }
</ins><span class="cx">
</span><del>- const Eina_List *list = ewk_context_menu_items_get(ewk_menu);
- const Eina_List *l;
- void *data;
</del><ins>+ const Eina_List *list = ewk_context_menu_items_get(ewk_menu);
+ const Eina_List *l;
+ void *data;
</ins><span class="cx">
</span><del>- Ewk_Context_Menu_Item *ewk_item;
- Elm_Object_Item *elm_menu_item;
- Evas_Object *elm_check_item;
</del><ins>+ Ewk_Context_Menu_Item *ewk_item;
+ Elm_Object_Item *elm_menu_item;
+ Evas_Object *elm_check_item;
</ins><span class="cx">
</span><del>- EINA_LIST_FOREACH(list, l, data) {
- ewk_item = (Ewk_Context_Menu_Item *)data;
- switch (ewk_context_menu_item_type_get(ewk_item)) {
- case EWK_ACTION_TYPE:
- elm_menu_item = elm_menu_item_add(context_menu, parent_item, NULL, ewk_context_menu_item_title_get(ewk_item), context_menu_item_selected_cb, ewk_item);
- break;
- case EWK_CHECKABLE_ACTION_TYPE:
- elm_check_item = elm_check_add(context_menu);
- elm_menu_item = elm_menu_item_add(context_menu, parent_item, NULL, ewk_context_menu_item_title_get(ewk_item), context_menu_item_selected_cb, ewk_item);
- elm_object_item_content_set(elm_menu_item, elm_check_item);
- elm_check_state_set(elm_check_item, ewk_context_menu_item_checked_get(ewk_item));
- break;
- case EWK_SUBMENU_TYPE:
- elm_menu_item = elm_menu_item_add(context_menu, parent_item, NULL, ewk_context_menu_item_title_get(ewk_item), NULL, ewk_item);
- if (elm_menu_item)
- context_menu_populate(context_menu, ewk_context_menu_item_submenu_get(ewk_item), elm_menu_item);
- break;
- default:
- continue;
- }
- elm_object_item_disabled_set(elm_menu_item, !ewk_context_menu_item_enabled_get(ewk_item));
- }
</del><ins>+ EINA_LIST_FOREACH(list, l, data) {
+ ewk_item = (Ewk_Context_Menu_Item *)data;
+ switch (ewk_context_menu_item_type_get(ewk_item)) {
+ case EWK_ACTION_TYPE:
+ elm_menu_item = elm_menu_item_add(context_menu, parent_item, NULL, ewk_context_menu_item_title_get(ewk_item), _context_menu_item_selected_cb, ewk_item);
+ break;
+ case EWK_CHECKABLE_ACTION_TYPE:
+ elm_check_item = elm_check_add(context_menu);
+ elm_menu_item = elm_menu_item_add(context_menu, parent_item, NULL, ewk_context_menu_item_title_get(ewk_item), _context_menu_item_selected_cb, ewk_item);
+ elm_object_item_content_set(elm_menu_item, elm_check_item);
+ elm_check_state_set(elm_check_item, ewk_context_menu_item_checked_get(ewk_item));
+ break;
+ case EWK_SUBMENU_TYPE:
+ elm_menu_item = elm_menu_item_add(context_menu, parent_item, NULL, ewk_context_menu_item_title_get(ewk_item), NULL, ewk_item);
+ if (elm_menu_item)
+ context_menu_populate(context_menu, ewk_context_menu_item_submenu_get(ewk_item), elm_menu_item);
+ break;
+ default:
+ continue;
+ }
+ elm_object_item_disabled_set(elm_menu_item, !ewk_context_menu_item_enabled_get(ewk_item));
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Eina_Bool
</span><del>-on_context_menu_show(Ewk_View_Smart_Data *sd, Evas_Coord x, Evas_Coord y, Ewk_Context_Menu *menu)
</del><ins>+_context_menu_show(Ewk_View_Smart_Data *sd, Evas_Coord x, Evas_Coord y, Ewk_Context_Menu *menu)
</ins><span class="cx"> {
</span><del>- Browser_Window *window = window_find_with_ewk_view(sd->self);
</del><ins>+ Browser_Window *window = window_find_with_ewk_view(sd->self);
</ins><span class="cx">
</span><del>- if (!window || !menu) {
- ERROR("Necessary objects are NULL.");
- return EINA_FALSE;
- }
</del><ins>+ if (!window || !menu) {
+ ERROR("Necessary objects are NULL.");
+ return EINA_FALSE;
+ }
</ins><span class="cx">
</span><del>- window->context_menu.elm_menu = elm_menu_add(window->elm_window);
</del><ins>+ window->context_menu.elm_menu = elm_menu_add(window->elm_window);
</ins><span class="cx">
</span><del>- if (!window->context_menu.elm_menu) {
- ERROR("Could not create menu widget.");
- return EINA_FALSE;
- }
</del><ins>+ if (!window->context_menu.elm_menu) {
+ ERROR("Could not create menu widget.");
+ return EINA_FALSE;
+ }
</ins><span class="cx">
</span><del>- window->context_menu.ewk_menu = menu;
</del><ins>+ window->context_menu.ewk_menu = menu;
</ins><span class="cx">
</span><del>- context_menu_populate(window->context_menu.elm_menu, menu, NULL);
</del><ins>+ context_menu_populate(window->context_menu.elm_menu, menu, NULL);
</ins><span class="cx">
</span><del>- INFO("Showing context menu at (%d, %d).", x, y);
- elm_menu_move(window->context_menu.elm_menu, x, y);
- evas_object_show(window->context_menu.elm_menu);
</del><ins>+ INFO("Showing context menu at (%d, %d).", x, y);
+ elm_menu_move(window->context_menu.elm_menu, x, y);
+ evas_object_show(window->context_menu.elm_menu);
</ins><span class="cx">
</span><del>- return EINA_TRUE;
</del><ins>+ return EINA_TRUE;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Eina_Bool
</span><del>-on_context_menu_hide(Ewk_View_Smart_Data *sd)
</del><ins>+_context_menu_hide(Ewk_View_Smart_Data *sd)
</ins><span class="cx"> {
</span><del>- Browser_Window *window = window_find_with_ewk_view(sd->self);
</del><ins>+ Browser_Window *window = window_find_with_ewk_view(sd->self);
</ins><span class="cx">
</span><del>- if (!window || !window->context_menu.elm_menu) {
- ERROR("Necessary objects are NULL.");
- return EINA_FALSE;
- }
</del><ins>+ if (!window || !window->context_menu.elm_menu) {
+ ERROR("Necessary objects are NULL.");
+ return EINA_FALSE;
+ }
</ins><span class="cx">
</span><del>- elm_menu_close(window->context_menu.elm_menu);
- evas_object_del(window->context_menu.elm_menu);
- window->context_menu.elm_menu = NULL;
- window->context_menu.ewk_menu = NULL;
</del><ins>+ elm_menu_close(window->context_menu.elm_menu);
+ evas_object_del(window->context_menu.elm_menu);
+ window->context_menu.elm_menu = NULL;
+ window->context_menu.ewk_menu = NULL;
</ins><span class="cx">
</span><del>- return EINA_TRUE;
</del><ins>+ return EINA_TRUE;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><span class="cx"> auth_popup_close(Auth_Data *auth_data)
</span><span class="cx"> {
</span><del>- ewk_object_unref(auth_data->request);
- evas_object_del(auth_data->popup);
- free(auth_data);
</del><ins>+ ewk_object_unref(auth_data->request);
+ evas_object_del(auth_data->popup);
+ free(auth_data);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_auth_cancel(void *user_data, Evas_Object *obj, void *event_info)
</del><ins>+_auth_cancel_cb(void *user_data, Evas_Object *obj, void *event_info)
</ins><span class="cx"> {
</span><del>- Auth_Data *auth_data = (Auth_Data *)user_data;
</del><ins>+ Auth_Data *auth_data = (Auth_Data *)user_data;
</ins><span class="cx">
</span><del>- ewk_auth_request_cancel(auth_data->request);
</del><ins>+ ewk_auth_request_cancel(auth_data->request);
</ins><span class="cx">
</span><del>- auth_popup_close(auth_data);
</del><ins>+ auth_popup_close(auth_data);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_auth_ok(void *user_data, Evas_Object *obj, void *event_info)
</del><ins>+_auth_ok_cb(void *user_data, Evas_Object *obj, void *event_info)
</ins><span class="cx"> {
</span><del>- Auth_Data *auth_data = (Auth_Data *)user_data;
</del><ins>+ Auth_Data *auth_data = (Auth_Data *)user_data;
</ins><span class="cx">
</span><del>- const char *username = elm_entry_entry_get(auth_data->username_entry);
- const char *password = elm_entry_entry_get(auth_data->password_entry);
- ewk_auth_request_authenticate(auth_data->request, username, password);
</del><ins>+ const char *username = elm_entry_entry_get(auth_data->username_entry);
+ const char *password = elm_entry_entry_get(auth_data->password_entry);
+ ewk_auth_request_authenticate(auth_data->request, username, password);
</ins><span class="cx">
</span><del>- auth_popup_close(auth_data);
</del><ins>+ auth_popup_close(auth_data);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_authentication_request(void *user_data, Evas_Object *obj, void *event_info)
</del><ins>+_authentication_request_cb(void *user_data, Evas_Object *obj, void *event_info)
</ins><span class="cx"> {
</span><del>- Browser_Window *window = (Browser_Window *)user_data;
- Ewk_Auth_Request *request = ewk_object_ref((Ewk_Auth_Request *)event_info);
</del><ins>+ Browser_Window *window = (Browser_Window *)user_data;
+ Ewk_Auth_Request *request = ewk_object_ref((Ewk_Auth_Request *)event_info);
</ins><span class="cx">
</span><del>- Auth_Data *auth_data = (Auth_Data *)malloc(sizeof(Auth_Data));
- auth_data->request = request;
</del><ins>+ Auth_Data *auth_data = (Auth_Data *)malloc(sizeof(Auth_Data));
+ auth_data->request = request;
</ins><span class="cx">
</span><del>- Evas_Object *auth_popup = elm_popup_add(window->elm_window);
- auth_data->popup = auth_popup;
- evas_object_size_hint_weight_set(auth_popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_object_part_text_set(auth_popup, "title,text", "Authentication Required");
</del><ins>+ Evas_Object *auth_popup = elm_popup_add(window->elm_window);
+ auth_data->popup = auth_popup;
+ evas_object_size_hint_weight_set(auth_popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ elm_object_part_text_set(auth_popup, "title,text", "Authentication Required");
</ins><span class="cx">
</span><del>- /* Popup Content */
- Evas_Object *vbox = elm_box_add(auth_popup);
- elm_box_padding_set(vbox, 0, 4);
- evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(vbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
- elm_object_content_set(auth_popup, vbox);
- evas_object_show(vbox);
</del><ins>+ /* Popup Content */
+ Evas_Object *vbox = elm_box_add(auth_popup);
+ elm_box_padding_set(vbox, 0, 4);
+ evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(vbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_object_content_set(auth_popup, vbox);
+ evas_object_show(vbox);
</ins><span class="cx">
</span><del>- /* Authentication message */
- Evas_Object *label = elm_label_add(auth_popup);
- elm_label_line_wrap_set(label, ELM_WRAP_WORD);
- Eina_Strbuf *auth_text = eina_strbuf_new();
- const char *host = ewk_auth_request_host_get(request);
- const char *realm = ewk_auth_request_realm_get(request);
- eina_strbuf_append_printf(auth_text, "A username and password are being requested by %s. The site says: \"%s\"", host, realm ? realm : "");
- elm_object_text_set(label, eina_strbuf_string_get(auth_text));
- eina_strbuf_free(auth_text);
- evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
- elm_box_pack_end(vbox, label);
- evas_object_show(label);
</del><ins>+ /* Authentication message */
+ Evas_Object *label = elm_label_add(auth_popup);
+ elm_label_line_wrap_set(label, ELM_WRAP_WORD);
+ Eina_Strbuf *auth_text = eina_strbuf_new();
+ const char *host = ewk_auth_request_host_get(request);
+ const char *realm = ewk_auth_request_realm_get(request);
+ eina_strbuf_append_printf(auth_text, "A username and password are being requested by %s. The site says: \"%s\"", host, realm ? realm : "");
+ elm_object_text_set(label, eina_strbuf_string_get(auth_text));
+ eina_strbuf_free(auth_text);
+ evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_box_pack_end(vbox, label);
+ evas_object_show(label);
</ins><span class="cx">
</span><del>- /* Credential table */
- Evas_Object *table = elm_table_add(auth_popup);
- elm_table_padding_set(table, 2, 2);
- elm_table_homogeneous_set(table, EINA_TRUE);
- evas_object_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(table, EVAS_HINT_FILL, EVAS_HINT_FILL);
- elm_box_pack_end(vbox, table);
- evas_object_show(table);
</del><ins>+ /* Credential table */
+ Evas_Object *table = elm_table_add(auth_popup);
+ elm_table_padding_set(table, 2, 2);
+ elm_table_homogeneous_set(table, EINA_TRUE);
+ evas_object_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(table, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_box_pack_end(vbox, table);
+ evas_object_show(table);
</ins><span class="cx">
</span><del>- /* Username row */
- Evas_Object *username_label = elm_label_add(auth_popup);
- elm_object_text_set(username_label, "Username:");
- evas_object_size_hint_weight_set(username_label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(username_label, 1, EVAS_HINT_FILL);
- elm_table_pack(table, username_label, 0, 0, 1, 1);
- evas_object_show(username_label);
</del><ins>+ /* Username row */
+ Evas_Object *username_label = elm_label_add(auth_popup);
+ elm_object_text_set(username_label, "Username:");
+ evas_object_size_hint_weight_set(username_label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(username_label, 1, EVAS_HINT_FILL);
+ elm_table_pack(table, username_label, 0, 0, 1, 1);
+ evas_object_show(username_label);
</ins><span class="cx">
</span><del>- Evas_Object *username_entry = elm_entry_add(auth_popup);
- auth_data->username_entry = username_entry;
- elm_entry_scrollable_set(username_entry, EINA_TRUE);
- elm_entry_single_line_set(username_entry, EINA_TRUE);
- elm_entry_text_style_user_push(username_entry, "DEFAULT='font_size=18'");
- const char *suggested_username = ewk_auth_request_suggested_username_get(request);
- elm_entry_entry_set(username_entry, suggested_username ? suggested_username : "");
- evas_object_size_hint_weight_set(username_entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(username_entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
- elm_table_pack(table, username_entry, 1, 0, 2, 1);
- elm_object_focus_set(username_entry, EINA_TRUE);
- evas_object_show(username_entry);
</del><ins>+ Evas_Object *username_entry = elm_entry_add(auth_popup);
+ auth_data->username_entry = username_entry;
+ elm_entry_scrollable_set(username_entry, EINA_TRUE);
+ elm_entry_single_line_set(username_entry, EINA_TRUE);
+ elm_entry_text_style_user_push(username_entry, "DEFAULT='font_size=18'");
+ const char *suggested_username = ewk_auth_request_suggested_username_get(request);
+ elm_entry_entry_set(username_entry, suggested_username ? suggested_username : "");
+ evas_object_size_hint_weight_set(username_entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(username_entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_table_pack(table, username_entry, 1, 0, 2, 1);
+ elm_object_focus_set(username_entry, EINA_TRUE);
+ evas_object_show(username_entry);
</ins><span class="cx">
</span><del>- /* Password row */
- Evas_Object *password_label = elm_label_add(auth_popup);
- elm_object_text_set(password_label, "Password:");
- evas_object_size_hint_weight_set(password_label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(password_label, 1, EVAS_HINT_FILL);
- elm_table_pack(table, password_label, 0, 1, 1, 1);
- evas_object_show(password_label);
</del><ins>+ /* Password row */
+ Evas_Object *password_label = elm_label_add(auth_popup);
+ elm_object_text_set(password_label, "Password:");
+ evas_object_size_hint_weight_set(password_label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(password_label, 1, EVAS_HINT_FILL);
+ elm_table_pack(table, password_label, 0, 1, 1, 1);
+ evas_object_show(password_label);
</ins><span class="cx">
</span><del>- Evas_Object *password_entry = elm_entry_add(auth_popup);
- auth_data->password_entry = password_entry;
- elm_entry_scrollable_set(password_entry, EINA_TRUE);
- elm_entry_single_line_set(password_entry, EINA_TRUE);
- elm_entry_password_set(password_entry, EINA_TRUE);
- elm_entry_text_style_user_push(password_entry, "DEFAULT='font_size=18'");
- evas_object_size_hint_weight_set(password_entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(password_entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
- elm_table_pack(table, password_entry, 1, 1, 2, 1);
- evas_object_show(password_entry);
</del><ins>+ Evas_Object *password_entry = elm_entry_add(auth_popup);
+ auth_data->password_entry = password_entry;
+ elm_entry_scrollable_set(password_entry, EINA_TRUE);
+ elm_entry_single_line_set(password_entry, EINA_TRUE);
+ elm_entry_password_set(password_entry, EINA_TRUE);
+ elm_entry_text_style_user_push(password_entry, "DEFAULT='font_size=18'");
+ evas_object_size_hint_weight_set(password_entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(password_entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_table_pack(table, password_entry, 1, 1, 2, 1);
+ evas_object_show(password_entry);
</ins><span class="cx">
</span><del>- /* Popup buttons */
- Evas_Object *cancel_button = elm_button_add(auth_popup);
- elm_object_text_set(cancel_button, "Cancel");
- elm_object_part_content_set(auth_popup, "button1", cancel_button);
- evas_object_smart_callback_add(cancel_button, "clicked", on_auth_cancel, auth_data);
- Evas_Object *ok_button = elm_button_add(auth_popup);
- elm_object_text_set(ok_button, "OK");
- elm_object_part_content_set(auth_popup, "button2", ok_button);
- evas_object_smart_callback_add(ok_button, "clicked", on_auth_ok, auth_data);
- evas_object_show(auth_popup);
</del><ins>+ /* Popup buttons */
+ Evas_Object *cancel_button = elm_button_add(auth_popup);
+ elm_object_text_set(cancel_button, "Cancel");
+ elm_object_part_content_set(auth_popup, "button1", cancel_button);
+ evas_object_smart_callback_add(cancel_button, "clicked", _auth_cancel_cb, auth_data);
+ Evas_Object *ok_button = elm_button_add(auth_popup);
+ elm_object_text_set(ok_button, "OK");
+ elm_object_part_content_set(auth_popup, "button2", ok_button);
+ evas_object_smart_callback_add(ok_button, "clicked", _auth_ok_cb, auth_data);
+ evas_object_show(auth_popup);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_search_text_found(void *user_data, Evas_Object *obj, void *event_info)
</del><ins>+_search_text_found_cb(void *user_data, Evas_Object *obj, void *event_info)
</ins><span class="cx"> {
</span><del>- Browser_Window *window = (Browser_Window *)user_data;
</del><ins>+ Browser_Window *window = (Browser_Window *)user_data;
</ins><span class="cx">
</span><del>- const int *match_count = (const int *)(event_info);
</del><ins>+ const int *match_count = (const int *)(event_info);
</ins><span class="cx">
</span><del>- if (*match_count) {
- Eina_Strbuf *search_text = eina_strbuf_new();
- eina_strbuf_append_printf(search_text, " %d Matches Found " , *match_count);
- elm_object_text_set(window->search.search_field_count, eina_strbuf_string_get(search_text));
- eina_strbuf_free(search_text);
- } else
- elm_object_text_set(window->search.search_field_count, " No Matches Found");
</del><ins>+ if (*match_count) {
+ Eina_Strbuf *search_text = eina_strbuf_new();
+ eina_strbuf_append_printf(search_text, " %d Matches Found " , *match_count);
+ elm_object_text_set(window->search.search_field_count, eina_strbuf_string_get(search_text));
+ eina_strbuf_free(search_text);
+ } else
+ elm_object_text_set(window->search.search_field_count, " No Matches Found");
</ins><span class="cx">
</span><del>- evas_object_focus_set(window->ewk_view, EINA_FALSE);
- elm_object_focus_set(window->search.search_field_count, EINA_FALSE);
- elm_object_focus_set(window->search.search_field, EINA_TRUE);
</del><ins>+ evas_object_focus_set(window->ewk_view, EINA_FALSE);
+ elm_object_focus_set(window->search.search_field_count, EINA_FALSE);
+ elm_object_focus_set(window->search.search_field, EINA_TRUE);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_tooltip_text_set(void *user_data, Evas_Object *obj, void *event_info)
</del><ins>+_tooltip_text_set(void *user_data, Evas_Object *obj, void *event_info)
</ins><span class="cx"> {
</span><del>- Browser_Window *window = (Browser_Window *)user_data;
- const char *message = (const char*)event_info;
</del><ins>+ Browser_Window *window = (Browser_Window *)user_data;
+ const char *message = (const char*)event_info;
</ins><span class="cx">
</span><del>- elm_object_tooltip_text_set(window->elm_window, message);
- window->tooltip.text_set = EINA_TRUE;
- window_tooltip_update(window);
</del><ins>+ elm_object_tooltip_text_set(window->elm_window, message);
+ window->tooltip.text_set = EINA_TRUE;
+ window_tooltip_update(window);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_tooltip_text_unset(void *user_data, Evas_Object *obj, void *event_info)
</del><ins>+_tooltip_text_unset(void *user_data, Evas_Object *obj, void *event_info)
</ins><span class="cx"> {
</span><del>- Browser_Window *window = (Browser_Window *)user_data;
</del><ins>+ Browser_Window *window = (Browser_Window *)user_data;
</ins><span class="cx">
</span><del>- window_tooltip_hide(window);
- elm_object_tooltip_unset(window->elm_window);
- window->tooltip.text_set = EINA_FALSE;
</del><ins>+ window_tooltip_hide(window);
+ elm_object_tooltip_unset(window->elm_window);
+ window->tooltip.text_set = EINA_FALSE;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_navigation_policy_decision(void *user_data, Evas_Object *obj, void *event_info)
</del><ins>+_navigation_policy_decision_cb(void *user_data, Evas_Object *obj, void *event_info)
</ins><span class="cx"> {
</span><del>- Ewk_Navigation_Policy_Decision *decision = (Ewk_Navigation_Policy_Decision *)event_info;
</del><ins>+ Ewk_Navigation_Policy_Decision *decision = (Ewk_Navigation_Policy_Decision *)event_info;
</ins><span class="cx">
</span><del>- if (ewk_navigation_policy_mouse_button_get(decision) == EWK_EVENT_MOUSE_BUTTON_MIDDLE) {
- Browser_Window *window = window_create(NULL, 0, 0);
- ewk_view_url_set(window->ewk_view, ewk_url_request_url_get(ewk_navigation_policy_request_get(decision)));
- windows = eina_list_append(windows, window);
- INFO("Mouse middle button pressed, open link in new window");
</del><ins>+ if (ewk_navigation_policy_mouse_button_get(decision) == EWK_EVENT_MOUSE_BUTTON_MIDDLE) {
+ Browser_Window *window = window_create(NULL, 0, 0);
+ ewk_view_url_set(window->ewk_view, ewk_url_request_url_get(ewk_navigation_policy_request_get(decision)));
+ windows = eina_list_append(windows, window);
+ INFO("Mouse middle button pressed, open link in new window");
</ins><span class="cx">
</span><del>- ewk_navigation_policy_decision_reject(decision);
- }
</del><ins>+ ewk_navigation_policy_decision_reject(decision);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_home_button_clicked(void *user_data, Evas_Object *home_button, void *event_info)
</del><ins>+_home_button_clicked_cb(void *user_data, Evas_Object *home_button, void *event_info)
</ins><span class="cx"> {
</span><del>- Browser_Window *window = (Browser_Window *)user_data;
</del><ins>+ Browser_Window *window = (Browser_Window *)user_data;
</ins><span class="cx">
</span><del>- ewk_view_url_set(window->ewk_view, DEFAULT_URL);
</del><ins>+ ewk_view_url_set(window->ewk_view, DEFAULT_URL);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><del>-on_window_deletion(void *user_data, Evas_Object *elm_window, void *event_info)
</del><ins>+_window_deletion_cb(void *user_data, Evas_Object *elm_window, void *event_info)
</ins><span class="cx"> {
</span><del>- Browser_Window *window = (Browser_Window *)user_data;
- ewk_view_try_close(window->ewk_view);
</del><ins>+ Browser_Window *window = (Browser_Window *)user_data;
+ ewk_view_try_close(window->ewk_view);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Evas_Object *
</span><span class="cx"> create_toolbar_button(Evas_Object *elm_window, const char *icon_name)
</span><span class="cx"> {
</span><del>- Evas_Object *button = elm_button_add(elm_window);
</del><ins>+ Evas_Object *button = elm_button_add(elm_window);
</ins><span class="cx">
</span><del>- Evas_Object *icon = elm_icon_add(elm_window);
- elm_icon_standard_set(icon, icon_name);
- evas_object_size_hint_max_set(icon, TOOL_BAR_ICON_SIZE, TOOL_BAR_ICON_SIZE);
- evas_object_color_set(icon, 44, 44, 102, 128);
- evas_object_show(icon);
- elm_object_part_content_set(button, "icon", icon);
- evas_object_size_hint_min_set(button, TOOL_BAR_BUTTON_SIZE, TOOL_BAR_BUTTON_SIZE);
</del><ins>+ Evas_Object *icon = elm_icon_add(elm_window);
+ elm_icon_standard_set(icon, icon_name);
+ evas_object_size_hint_max_set(icon, TOOL_BAR_ICON_SIZE, TOOL_BAR_ICON_SIZE);
+ evas_object_color_set(icon, 44, 44, 102, 128);
+ evas_object_show(icon);
+ elm_object_part_content_set(button, "icon", icon);
+ evas_object_size_hint_min_set(button, TOOL_BAR_BUTTON_SIZE, TOOL_BAR_BUTTON_SIZE);
</ins><span class="cx">
</span><del>- return button;
</del><ins>+ return button;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Browser_Window *window_create(Ewk_View_Configuration* configuration, int width, int height)
</span><span class="cx"> {
</span><del>- Browser_Window *window = calloc(1, sizeof(Browser_Window));
- if (!window) {
- ERROR("Could not create browser window.");
- return NULL;
- }
</del><ins>+ Browser_Window *window = calloc(1, sizeof(Browser_Window));
+ if (!window) {
+ ERROR("Could not create browser window.");
+ return NULL;
+ }
</ins><span class="cx">
</span><del>- /* Initialize tooltip information */
- window->tooltip.show_timer = NULL;
- window->tooltip.activated = EINA_FALSE;
- window->tooltip.text_set = EINA_FALSE;
- window->tooltip.shown = EINA_FALSE;
</del><ins>+ /* Initialize tooltip information */
+ window->tooltip.show_timer = NULL;
+ window->tooltip.activated = EINA_FALSE;
+ window->tooltip.text_set = EINA_FALSE;
+ window->tooltip.shown = EINA_FALSE;
</ins><span class="cx">
</span><del>- /* Create window */
- window->elm_window = elm_win_add(NULL, "minibrowser-window", ELM_WIN_BASIC);
- elm_win_title_set(window->elm_window, APP_NAME);
- evas_object_smart_callback_add(window->elm_window, "delete,request", on_window_deletion, window);
</del><ins>+ /* Create window */
+ window->elm_window = elm_win_add(NULL, "minibrowser-window", ELM_WIN_BASIC);
+ elm_win_title_set(window->elm_window, APP_NAME);
+ evas_object_smart_callback_add(window->elm_window, "delete,request", _window_deletion_cb, window);
</ins><span class="cx">
</span><del>- /* Create window background */
- Evas_Object *bg = elm_bg_add(window->elm_window);
- elm_bg_color_set(bg, 193, 192, 191);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(window->elm_window, bg);
- evas_object_show(bg);
</del><ins>+ /* Create window background */
+ Evas_Object *bg = elm_bg_add(window->elm_window);
+ elm_bg_color_set(bg, 193, 192, 191);
+ evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ elm_win_resize_object_add(window->elm_window, bg);
+ evas_object_show(bg);
</ins><span class="cx">
</span><del>- /* Create conformant widget. */
- Evas_Object *conformant = elm_conformant_add(window->elm_window);
- evas_object_size_hint_weight_set(conformant, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(window->elm_window, conformant);
- evas_object_show(conformant);
</del><ins>+ /* Create conformant widget. */
+ Evas_Object *conformant = elm_conformant_add(window->elm_window);
+ evas_object_size_hint_weight_set(conformant, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ elm_win_resize_object_add(window->elm_window, conformant);
+ evas_object_show(conformant);
</ins><span class="cx">
</span><del>- /* Create vertical layout */
- window->vertical_layout = elm_box_add(window->elm_window);
- elm_object_content_set(conformant, window->vertical_layout);
- elm_box_padding_set(window->vertical_layout, 0, 2);
- evas_object_size_hint_weight_set(window->vertical_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(window->vertical_layout);
</del><ins>+ /* Create vertical layout */
+ window->vertical_layout = elm_box_add(window->elm_window);
+ elm_object_content_set(conformant, window->vertical_layout);
+ elm_box_padding_set(window->vertical_layout, 0, 2);
+ evas_object_size_hint_weight_set(window->vertical_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_show(window->vertical_layout);
</ins><span class="cx">
</span><del>- /* Create horizontal layout for top bar */
- window->horizontal_layout = elm_box_add(window->elm_window);
- elm_box_horizontal_set(window->horizontal_layout, EINA_TRUE);
- evas_object_size_hint_weight_set(window->horizontal_layout, EVAS_HINT_EXPAND, 0.0);
- evas_object_size_hint_align_set(window->horizontal_layout, EVAS_HINT_FILL, 0.0);
- elm_box_pack_end(window->vertical_layout, window->horizontal_layout);
- evas_object_show(window->horizontal_layout);
</del><ins>+ /* Create horizontal layout for top bar */
+ window->horizontal_layout = elm_box_add(window->elm_window);
+ elm_box_horizontal_set(window->horizontal_layout, EINA_TRUE);
+ evas_object_size_hint_weight_set(window->horizontal_layout, EVAS_HINT_EXPAND, 0.0);
+ evas_object_size_hint_align_set(window->horizontal_layout, EVAS_HINT_FILL, 0.0);
+ elm_box_pack_end(window->vertical_layout, window->horizontal_layout);
+ evas_object_show(window->horizontal_layout);
</ins><span class="cx">
</span><del>- /* Create Back button */
- window->back_button = create_toolbar_button(window->elm_window, "arrow_left");
- evas_object_smart_callback_add(window->back_button, "clicked", on_back_button_clicked, window);
- evas_object_smart_callback_add(window->back_button, "repeated", on_back_button_longpress, window);
- elm_object_tooltip_text_set(window->back_button, "Click to go back, longpress to see session history");
- elm_object_tooltip_window_mode_set(window->back_button, EINA_TRUE);
- elm_object_disabled_set(window->back_button, EINA_TRUE);
- evas_object_size_hint_weight_set(window->back_button, 0.0, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(window->back_button, 0.0, 0.5);
- elm_box_pack_end(window->horizontal_layout, window->back_button);
- evas_object_show(window->back_button);
</del><ins>+ /* Create Back button */
+ window->back_button = create_toolbar_button(window->elm_window, "arrow_left");
+ evas_object_smart_callback_add(window->back_button, "clicked", _back_button_clicked_cb, window);
+ evas_object_smart_callback_add(window->back_button, "repeated", _back_button_longpress_cb, window);
+ elm_object_tooltip_text_set(window->back_button, "Click to go back, longpress to see session history");
+ elm_object_tooltip_window_mode_set(window->back_button, EINA_TRUE);
+ elm_object_disabled_set(window->back_button, EINA_TRUE);
+ evas_object_size_hint_weight_set(window->back_button, 0.0, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(window->back_button, 0.0, 0.5);
+ elm_box_pack_end(window->horizontal_layout, window->back_button);
+ evas_object_show(window->back_button);
</ins><span class="cx">
</span><del>- /* Create Forward button */
- window->forward_button = create_toolbar_button(window->elm_window, "arrow_right");
- evas_object_smart_callback_add(window->forward_button, "clicked", on_forward_button_clicked, window);
- evas_object_smart_callback_add(window->forward_button, "repeated", on_forward_button_longpress, window);
- elm_object_tooltip_text_set(window->forward_button, "Click to go forward, longpress to see session history");
- elm_object_tooltip_window_mode_set(window->forward_button, EINA_TRUE);
- elm_object_disabled_set(window->forward_button, EINA_TRUE);
- evas_object_size_hint_weight_set(window->forward_button, 0.0, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(window->forward_button, 0.0, 0.5);
- elm_box_pack_end(window->horizontal_layout, window->forward_button);
- evas_object_show(window->forward_button);
</del><ins>+ /* Create Forward button */
+ window->forward_button = create_toolbar_button(window->elm_window, "arrow_right");
+ evas_object_smart_callback_add(window->forward_button, "clicked", _forward_button_clicked_cb, window);
+ evas_object_smart_callback_add(window->forward_button, "repeated", _forward_button_longpress_cb, window);
+ elm_object_tooltip_text_set(window->forward_button, "Click to go forward, longpress to see session history");
+ elm_object_tooltip_window_mode_set(window->forward_button, EINA_TRUE);
+ elm_object_disabled_set(window->forward_button, EINA_TRUE);
+ evas_object_size_hint_weight_set(window->forward_button, 0.0, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(window->forward_button, 0.0, 0.5);
+ elm_box_pack_end(window->horizontal_layout, window->forward_button);
+ evas_object_show(window->forward_button);
</ins><span class="cx">
</span><del>- /* Create URL bar */
- window->url_bar = elm_entry_add(window->elm_window);
- elm_entry_scrollable_set(window->url_bar, EINA_TRUE);
- elm_scroller_policy_set(window->url_bar, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
- elm_entry_single_line_set(window->url_bar, EINA_TRUE);
- elm_entry_cnp_mode_set(window->url_bar, ELM_CNP_MODE_PLAINTEXT);
- elm_entry_text_style_user_push(window->url_bar, "DEFAULT='font_size=18'");
- evas_object_smart_callback_add(window->url_bar, "activated", on_url_bar_activated, window);
- evas_object_smart_callback_add(window->url_bar, "clicked", on_url_bar_clicked, window);
- evas_object_size_hint_weight_set(window->url_bar, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(window->url_bar, EVAS_HINT_FILL, EVAS_HINT_FILL);
- elm_box_pack_end(window->horizontal_layout, window->url_bar);
- evas_object_show(window->url_bar);
</del><ins>+ /* Create URL bar */
+ window->url_bar = elm_entry_add(window->elm_window);
+ elm_entry_scrollable_set(window->url_bar, EINA_TRUE);
+ elm_scroller_policy_set(window->url_bar, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
+ elm_entry_single_line_set(window->url_bar, EINA_TRUE);
+ elm_entry_cnp_mode_set(window->url_bar, ELM_CNP_MODE_PLAINTEXT);
+ elm_entry_text_style_user_push(window->url_bar, "DEFAULT='font_size=18'");
+ evas_object_smart_callback_add(window->url_bar, "activated", _url_bar_activated_cb, window);
+ evas_object_smart_callback_add(window->url_bar, "clicked", _url_bar_clicked_cb, window);
+ evas_object_size_hint_weight_set(window->url_bar, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(window->url_bar, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_box_pack_end(window->horizontal_layout, window->url_bar);
+ evas_object_show(window->url_bar);
</ins><span class="cx">
</span><del>- /* Create Refresh button */
- Evas_Object *refresh_button = create_toolbar_button(window->elm_window, "refresh");
- evas_object_smart_callback_add(refresh_button, "clicked", on_refresh_button_clicked, window);
- elm_object_tooltip_text_set(refresh_button, "Reload page");
- elm_object_tooltip_window_mode_set(refresh_button, EINA_TRUE);
- evas_object_size_hint_weight_set(refresh_button, 0.0, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(refresh_button, 1.0, 0.5);
- elm_box_pack_end(window->horizontal_layout, refresh_button);
- evas_object_show(refresh_button);
</del><ins>+ /* Create Refresh button */
+ Evas_Object *refresh_button = create_toolbar_button(window->elm_window, "refresh");
+ evas_object_smart_callback_add(refresh_button, "clicked", _refresh_button_clicked_cb, window);
+ elm_object_tooltip_text_set(refresh_button, "Reload page");
+ elm_object_tooltip_window_mode_set(refresh_button, EINA_TRUE);
+ evas_object_size_hint_weight_set(refresh_button, 0.0, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(refresh_button, 1.0, 0.5);
+ elm_box_pack_end(window->horizontal_layout, refresh_button);
+ evas_object_show(refresh_button);
</ins><span class="cx">
</span><del>- /* Create Stop button */
- Evas_Object *stop_button = create_toolbar_button(window->elm_window, "close");
- evas_object_smart_callback_add(stop_button, "clicked", on_stop_button_clicked, window);
- elm_object_tooltip_text_set(stop_button, "Stop page load");
- elm_object_tooltip_window_mode_set(stop_button, EINA_TRUE);
- evas_object_size_hint_weight_set(stop_button, 0.0, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(stop_button, 1.0, 0.5);
- elm_box_pack_end(window->horizontal_layout, stop_button);
- evas_object_show(stop_button);
</del><ins>+ /* Create Stop button */
+ Evas_Object *stop_button = create_toolbar_button(window->elm_window, "close");
+ evas_object_smart_callback_add(stop_button, "clicked", _stop_button_clicked_cb, window);
+ elm_object_tooltip_text_set(stop_button, "Stop page load");
+ elm_object_tooltip_window_mode_set(stop_button, EINA_TRUE);
+ evas_object_size_hint_weight_set(stop_button, 0.0, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(stop_button, 1.0, 0.5);
+ elm_box_pack_end(window->horizontal_layout, stop_button);
+ evas_object_show(stop_button);
</ins><span class="cx">
</span><del>- /* Create Home button */
- Evas_Object *home_button = create_toolbar_button(window->elm_window, "home");
- evas_object_smart_callback_add(home_button, "clicked", on_home_button_clicked, window);
- elm_object_tooltip_text_set(home_button, "Home page");
- elm_object_tooltip_window_mode_set(home_button, EINA_TRUE);
- evas_object_size_hint_weight_set(home_button, 0.0, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(home_button, 1.0, 0.5);
- elm_box_pack_end(window->horizontal_layout, home_button);
- evas_object_show(home_button);
</del><ins>+ /* Create Home button */
+ Evas_Object *home_button = create_toolbar_button(window->elm_window, "home");
+ evas_object_smart_callback_add(home_button, "clicked", _home_button_clicked_cb, window);
+ elm_object_tooltip_text_set(home_button, "Home page");
+ elm_object_tooltip_window_mode_set(home_button, EINA_TRUE);
+ evas_object_size_hint_weight_set(home_button, 0.0, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(home_button, 1.0, 0.5);
+ elm_box_pack_end(window->horizontal_layout, home_button);
+ evas_object_show(home_button);
</ins><span class="cx">
</span><del>- /* Create Search bar */
- window->search.search_bar = elm_box_add(window->elm_window);
- elm_box_horizontal_set(window->search.search_bar, EINA_TRUE);
- evas_object_size_hint_min_set(window->search.search_bar, SEARCH_FIELD_SIZE + 2 * SEARCH_BUTTON_SIZE, 0);
- evas_object_size_hint_align_set(window->search.search_bar, EVAS_HINT_FILL, EVAS_HINT_FILL);
- elm_box_pack_end(window->vertical_layout, window->search.search_bar);
</del><ins>+ /* Create Search bar */
+ window->search.search_bar = elm_box_add(window->elm_window);
+ elm_box_horizontal_set(window->search.search_bar, EINA_TRUE);
+ evas_object_size_hint_min_set(window->search.search_bar, SEARCH_FIELD_SIZE + 2 * SEARCH_BUTTON_SIZE, 0);
+ evas_object_size_hint_align_set(window->search.search_bar, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_box_pack_end(window->vertical_layout, window->search.search_bar);
</ins><span class="cx">
</span><del>- /* Create Search field */
- window->search.search_field = elm_entry_add(window->elm_window);
- elm_entry_scrollable_set(window->search.search_field, EINA_TRUE);
- elm_scroller_policy_set(window->search.search_field, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
- elm_entry_single_line_set(window->search.search_field, EINA_TRUE);
- elm_entry_cnp_mode_set(window->search.search_field, ELM_CNP_MODE_PLAINTEXT);
- elm_entry_text_style_user_push(window->search.search_field, "DEFAULT='font_size=14'");
- evas_object_smart_callback_add(window->search.search_field, "activated", on_search_field_activated, window);
- evas_object_smart_callback_add(window->search.search_field, "changed", on_search_field_activated, window);
- evas_object_smart_callback_add(window->search.search_field, "aborted", on_search_field_aborted, window);
- evas_object_smart_callback_add(window->search.search_field, "clicked", on_search_field_clicked, window);
- evas_object_size_hint_weight_set(window->search.search_field, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(window->search.search_field, EVAS_HINT_FILL, EVAS_HINT_FILL);
- elm_box_pack_end(window->search.search_bar, window->search.search_field);
</del><ins>+ /* Create Search field */
+ window->search.search_field = elm_entry_add(window->elm_window);
+ elm_entry_scrollable_set(window->search.search_field, EINA_TRUE);
+ elm_scroller_policy_set(window->search.search_field, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
+ elm_entry_single_line_set(window->search.search_field, EINA_TRUE);
+ elm_entry_cnp_mode_set(window->search.search_field, ELM_CNP_MODE_PLAINTEXT);
+ elm_entry_text_style_user_push(window->search.search_field, "DEFAULT='font_size=14'");
+ evas_object_smart_callback_add(window->search.search_field, "activated", _search_field_activated_cb, window);
+ evas_object_smart_callback_add(window->search.search_field, "changed", _search_field_activated_cb, window);
+ evas_object_smart_callback_add(window->search.search_field, "aborted", _search_field_aborted_cb, window);
+ evas_object_smart_callback_add(window->search.search_field, "clicked", _search_field_clicked_cb, window);
+ evas_object_size_hint_weight_set(window->search.search_field, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(window->search.search_field, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_box_pack_end(window->search.search_bar, window->search.search_field);
</ins><span class="cx">
</span><del>- /* Create Search backward button */
- window->search.backward_button = create_toolbar_button(window->elm_window, "arrow_up");
- evas_object_smart_callback_add(window->search.backward_button, "clicked", on_search_backward_button_clicked, window);
- elm_object_disabled_set(window->search.backward_button, EINA_FALSE);
- evas_object_size_hint_weight_set(window->search.backward_button, 0.0, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(window->search.backward_button, 1.0, 0.5);
- evas_object_size_hint_min_set(window->search.backward_button, SEARCH_BUTTON_SIZE, SEARCH_BUTTON_SIZE);
- elm_box_pack_end(window->search.search_bar, window->search.backward_button);
</del><ins>+ /* Create Search backward button */
+ window->search.backward_button = create_toolbar_button(window->elm_window, "arrow_up");
+ evas_object_smart_callback_add(window->search.backward_button, "clicked", _search_backward_button_clicked_cb, window);
+ elm_object_disabled_set(window->search.backward_button, EINA_FALSE);
+ evas_object_size_hint_weight_set(window->search.backward_button, 0.0, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(window->search.backward_button, 1.0, 0.5);
+ evas_object_size_hint_min_set(window->search.backward_button, SEARCH_BUTTON_SIZE, SEARCH_BUTTON_SIZE);
+ elm_box_pack_end(window->search.search_bar, window->search.backward_button);
</ins><span class="cx">
</span><del>- /* Create Search forwardward button */
- window->search.forward_button = create_toolbar_button(window->elm_window, "arrow_down");
- evas_object_smart_callback_add(window->search.forward_button, "clicked", on_search_forward_button_clicked, window);
- elm_object_disabled_set(window->search.forward_button, EINA_FALSE);
- evas_object_size_hint_weight_set(window->search.forward_button, 0.0, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(window->search.forward_button, 1.0, 0.5);
- evas_object_size_hint_min_set(window->search.forward_button, SEARCH_BUTTON_SIZE, SEARCH_BUTTON_SIZE);
- elm_box_pack_end(window->search.search_bar, window->search.forward_button);
</del><ins>+ /* Create Search forwardward button */
+ window->search.forward_button = create_toolbar_button(window->elm_window, "arrow_down");
+ evas_object_smart_callback_add(window->search.forward_button, "clicked", _search_forward_button_clicked_cb, window);
+ elm_object_disabled_set(window->search.forward_button, EINA_FALSE);
+ evas_object_size_hint_weight_set(window->search.forward_button, 0.0, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(window->search.forward_button, 1.0, 0.5);
+ evas_object_size_hint_min_set(window->search.forward_button, SEARCH_BUTTON_SIZE, SEARCH_BUTTON_SIZE);
+ elm_box_pack_end(window->search.search_bar, window->search.forward_button);
</ins><span class="cx">
</span><del>- /* Create Search count field */
- window->search.search_field_count = elm_label_add(window->elm_window);
- evas_object_size_hint_weight_set(window->search.search_field_count, 0.0, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(window->search.search_field_count, EVAS_HINT_FILL, EVAS_HINT_FILL);
- elm_object_text_set(window->search.search_field_count, "");
- elm_box_pack_end(window->search.search_bar, window->search.search_field_count);
</del><ins>+ /* Create Search count field */
+ window->search.search_field_count = elm_label_add(window->elm_window);
+ evas_object_size_hint_weight_set(window->search.search_field_count, 0.0, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(window->search.search_field_count, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_object_text_set(window->search.search_field_count, "");
+ elm_box_pack_end(window->search.search_bar, window->search.search_field_count);
</ins><span class="cx">
</span><del>- /* Create Search Case Sensitive Option check box */
- window->search.search_case_check_box = elm_check_add(window->elm_window);
- elm_object_text_set(window->search.search_case_check_box, "Case Sensitive");
- evas_object_smart_callback_add(window->search.search_case_check_box, "changed", on_search_case_option_changed, window);
- elm_box_pack_end(window->search.search_bar, window->search.search_case_check_box);
</del><ins>+ /* Create Search Case Sensitive Option check box */
+ window->search.search_case_check_box = elm_check_add(window->elm_window);
+ elm_object_text_set(window->search.search_case_check_box, "Case Sensitive");
+ evas_object_smart_callback_add(window->search.search_case_check_box, "changed", _search_case_option_changed, window);
+ elm_box_pack_end(window->search.search_bar, window->search.search_case_check_box);
</ins><span class="cx">
</span><del>- /* Create Search Word Start Option check box */
- window->search.search_word_start_check_box = elm_check_add(window->elm_window);
- elm_object_text_set(window->search.search_word_start_check_box, "Only Word Start");
- evas_object_smart_callback_add(window->search.search_word_start_check_box, "changed", on_search_word_start_option_changed, window);
- elm_box_pack_end(window->search.search_bar, window->search.search_word_start_check_box);
</del><ins>+ /* Create Search Word Start Option check box */
+ window->search.search_word_start_check_box = elm_check_add(window->elm_window);
+ elm_object_text_set(window->search.search_word_start_check_box, "Only Word Start");
+ evas_object_smart_callback_add(window->search.search_word_start_check_box, "changed", _search_word_start_option_changed_cb, window);
+ elm_box_pack_end(window->search.search_bar, window->search.search_word_start_check_box);
</ins><span class="cx">
</span><del>- /* Create Search close button */
- window->search.close_button = create_toolbar_button(window->elm_window, "close");
- evas_object_smart_callback_add(window->search.close_button, "clicked", on_search_close_button_clicked, window);
- elm_object_disabled_set(window->search.close_button, EINA_FALSE);
- evas_object_size_hint_weight_set(window->search.close_button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(window->search.close_button, 1.0, 0.5);
- evas_object_size_hint_min_set(window->search.close_button, SEARCH_BUTTON_SIZE, SEARCH_BUTTON_SIZE);
- elm_box_pack_end(window->search.search_bar, window->search.close_button);
</del><ins>+ /* Create Search close button */
+ window->search.close_button = create_toolbar_button(window->elm_window, "close");
+ evas_object_smart_callback_add(window->search.close_button, "clicked", _search_close_button_clicked_cb, window);
+ elm_object_disabled_set(window->search.close_button, EINA_FALSE);
+ evas_object_size_hint_weight_set(window->search.close_button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(window->search.close_button, 1.0, 0.5);
+ evas_object_size_hint_min_set(window->search.close_button, SEARCH_BUTTON_SIZE, SEARCH_BUTTON_SIZE);
+ elm_box_pack_end(window->search.search_bar, window->search.close_button);
</ins><span class="cx">
</span><del>- /* Create history box */
- window->history.history_box = elm_box_add(window->elm_window);
- evas_object_size_hint_aspect_set(window->history.history_box, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
- evas_object_size_hint_weight_set(window->history.history_box, EVAS_HINT_EXPAND , EVAS_HINT_EXPAND);
</del><ins>+ /* Create history box */
+ window->history.history_box = elm_box_add(window->elm_window);
+ evas_object_size_hint_aspect_set(window->history.history_box, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
+ evas_object_size_hint_weight_set(window->history.history_box, EVAS_HINT_EXPAND , EVAS_HINT_EXPAND);
</ins><span class="cx">
</span><del>- /* Create history list */
- window->history.history_list = elm_genlist_add(window->elm_window);
- evas_object_size_hint_weight_set(window->history.history_list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(window->history.history_list, EVAS_HINT_FILL, EVAS_HINT_FILL);
- elm_win_resize_object_add(window->elm_window, window->history.history_box);
- elm_box_pack_end(window->history.history_box, window->history.history_list);
</del><ins>+ /* Create history list */
+ window->history.history_list = elm_genlist_add(window->elm_window);
+ evas_object_size_hint_weight_set(window->history.history_list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(window->history.history_list, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_win_resize_object_add(window->elm_window, window->history.history_box);
+ elm_box_pack_end(window->history.history_box, window->history.history_list);
</ins><span class="cx">
</span><del>- /* Create ewk_view */
- Ewk_View_Smart_Class *ewkViewClass = miniBrowserViewSmartClass();
- ewkViewClass->run_javascript_alert = on_javascript_alert;
- ewkViewClass->run_javascript_confirm = on_javascript_confirm;
- ewkViewClass->run_javascript_prompt = on_javascript_prompt;
- ewkViewClass->run_javascript_before_unload_confirm = on_javascript_before_unload_confirm;
- ewkViewClass->window_geometry_get = on_window_geometry_get;
- ewkViewClass->window_geometry_set = on_window_geometry_set;
- ewkViewClass->fullscreen_enter = on_fullscreen_enter;
- ewkViewClass->fullscreen_exit = on_fullscreen_exit;
- ewkViewClass->window_create = on_window_create;
- ewkViewClass->window_close = on_window_close;
- ewkViewClass->popup_menu_show = on_popup_menu_show;
- ewkViewClass->popup_menu_hide = on_popup_menu_hide;
- ewkViewClass->context_menu_show = on_context_menu_show;
- ewkViewClass->context_menu_hide = on_context_menu_hide;
- ewkViewClass->input_picker_color_request = on_color_picker_request;
- ewkViewClass->input_picker_color_dismiss = on_color_picker_dismiss;
</del><ins>+ /* Create ewk_view */
+ Ewk_View_Smart_Class *ewkViewClass = miniBrowserViewSmartClass();
+ ewkViewClass->run_javascript_alert = _javascript_alert_cb;
+ ewkViewClass->run_javascript_confirm = _javascript_confirm_cb;
+ ewkViewClass->run_javascript_prompt = _javascript_prompt_cb;
+ ewkViewClass->run_javascript_before_unload_confirm = _javascript_before_unload_confirm_cb;
+ ewkViewClass->window_geometry_get = _window_geometry_get;
+ ewkViewClass->window_geometry_set = _window_geometry_set;
+ ewkViewClass->fullscreen_enter = _fullscreen_enter_cb;
+ ewkViewClass->fullscreen_exit = _fullscreen_exit_cb;
+ ewkViewClass->window_create = _window_create_cb;
+ ewkViewClass->window_close = _window_close_cb;
+ ewkViewClass->popup_menu_show = _popup_menu_show;
+ ewkViewClass->popup_menu_hide = _popup_menu_hide;
+ ewkViewClass->context_menu_show = _context_menu_show;
+ ewkViewClass->context_menu_hide = _context_menu_hide;
+ ewkViewClass->input_picker_color_request = _color_picker_request_cb;
+ ewkViewClass->input_picker_color_dismiss = _color_picker_dismiss_cb;
</ins><span class="cx">
</span><del>- Evas *evas = evas_object_evas_get(window->elm_window);
- Evas_Smart *smart = evas_smart_class_new(&ewkViewClass->sc);
- window->ewk_view = ewk_view_add_with_configuration(evas, smart, configuration);
</del><ins>+ Evas *evas = evas_object_evas_get(window->elm_window);
+ Evas_Smart *smart = evas_smart_class_new(&ewkViewClass->sc);
+ window->ewk_view = ewk_view_add_with_configuration(evas, smart, configuration);
</ins><span class="cx">
</span><del>- Ewk_Context *context = ewk_view_context_get(window->ewk_view);
- ewk_favicon_database_icon_change_callback_add(ewk_context_favicon_database_get(context), on_icon_changed_cb, window);
</del><ins>+ Ewk_Context *context = ewk_view_context_get(window->ewk_view);
+ ewk_favicon_database_icon_change_callback_add(ewk_context_favicon_database_get(context), _icon_changed_cb, window);
</ins><span class="cx">
</span><del>- ewk_view_theme_set(window->ewk_view, DEFAULT_THEME_DIR "/default.edj");
- if (device_pixel_ratio)
- ewk_view_device_pixel_ratio_set(window->ewk_view, (float)device_pixel_ratio);
- ewk_view_user_agent_set(window->ewk_view, user_agent_string);
- ewk_view_layout_fixed_set(window->ewk_view, fixed_layout_enabled);
</del><ins>+ ewk_view_theme_set(window->ewk_view, DEFAULT_THEME_DIR "/default.edj");
+ if (device_pixel_ratio)
+ ewk_view_device_pixel_ratio_set(window->ewk_view, (float)device_pixel_ratio);
+ ewk_view_user_agent_set(window->ewk_view, user_agent_string);
+ ewk_view_layout_fixed_set(window->ewk_view, fixed_layout_enabled);
</ins><span class="cx">
</span><del>- if (touch_events_enabled) {
- ewk_view_touch_events_enabled_set(window->ewk_view, EINA_TRUE);
- ewk_view_mouse_events_enabled_set(window->ewk_view, EINA_FALSE);
- }
</del><ins>+ if (touch_events_enabled) {
+ ewk_view_touch_events_enabled_set(window->ewk_view, EINA_TRUE);
+ ewk_view_mouse_events_enabled_set(window->ewk_view, EINA_FALSE);
+ }
</ins><span class="cx">
</span><del>- if (background_color_string) {
- int red, green, blue, alpha;
</del><ins>+ if (background_color_string) {
+ int red, green, blue, alpha;
</ins><span class="cx">
</span><del>- if (sscanf(background_color_string, "%d:%d:%d:%d", &red, &green, &blue, &alpha))
- ewk_view_bg_color_set(window->ewk_view, red, green, blue, alpha);
- }
</del><ins>+ if (sscanf(background_color_string, "%d:%d:%d:%d", &red, &green, &blue, &alpha))
+ ewk_view_bg_color_set(window->ewk_view, red, green, blue, alpha);
+ }
</ins><span class="cx">
</span><del>- /* Set the zoom level to default */
- window->current_zoom_level = DEFAULT_ZOOM_LEVEL;
</del><ins>+ /* Set the zoom level to default */
+ window->current_zoom_level = DEFAULT_ZOOM_LEVEL;
</ins><span class="cx">
</span><del>- elm_win_fullscreen_set(window->elm_window, fullscreen_enabled);
</del><ins>+ elm_win_fullscreen_set(window->elm_window, fullscreen_enabled);
</ins><span class="cx">
</span><del>- evas_object_smart_callback_add(window->ewk_view, "authentication,request", on_authentication_request, window);
- evas_object_smart_callback_add(window->ewk_view, "file,chooser,request", on_file_chooser_request, window);
- evas_object_smart_callback_add(window->ewk_view, "load,error", on_error, window);
- evas_object_smart_callback_add(window->ewk_view, "load,provisional,failed", on_error, window);
- evas_object_smart_callback_add(window->ewk_view, "load,progress", on_progress, window);
- evas_object_smart_callback_add(window->ewk_view, "title,changed", on_title_changed, window);
- evas_object_smart_callback_add(window->ewk_view, "url,changed", on_url_changed, window);
- evas_object_smart_callback_add(window->ewk_view, "back,forward,list,changed", on_back_forward_list_changed, window);
- evas_object_smart_callback_add(window->ewk_view, "text,found", on_search_text_found, window);
- evas_object_smart_callback_add(window->ewk_view, "tooltip,text,set", on_tooltip_text_set, window);
- evas_object_smart_callback_add(window->ewk_view, "tooltip,text,unset", on_tooltip_text_unset, window);
- evas_object_smart_callback_add(window->ewk_view, "policy,decision,navigation", on_navigation_policy_decision, window);
</del><ins>+ evas_object_smart_callback_add(window->ewk_view, "authentication,request", _authentication_request_cb, window);
+ evas_object_smart_callback_add(window->ewk_view, "file,chooser,request", _file_chooser_request_cb, window);
+ evas_object_smart_callback_add(window->ewk_view, "load,error", _error_cb, window);
+ evas_object_smart_callback_add(window->ewk_view, "load,provisional,failed", _error_cb, window);
+ evas_object_smart_callback_add(window->ewk_view, "load,progress", _progress_cb, window);
+ evas_object_smart_callback_add(window->ewk_view, "title,changed", _title_changed_cb, window);
+ evas_object_smart_callback_add(window->ewk_view, "url,changed", _url_changed_cb, window);
+ evas_object_smart_callback_add(window->ewk_view, "back,forward,list,changed", _back_forward_list_changed_cb, window);
+ evas_object_smart_callback_add(window->ewk_view, "text,found", _search_text_found_cb, window);
+ evas_object_smart_callback_add(window->ewk_view, "tooltip,text,set", _tooltip_text_set, window);
+ evas_object_smart_callback_add(window->ewk_view, "tooltip,text,unset", _tooltip_text_unset, window);
+ evas_object_smart_callback_add(window->ewk_view, "policy,decision,navigation", _navigation_policy_decision_cb, window);
</ins><span class="cx">
</span><del>- evas_object_event_callback_add(window->ewk_view, EVAS_CALLBACK_KEY_DOWN, on_key_down, window);
- evas_object_event_callback_add(window->ewk_view, EVAS_CALLBACK_MOUSE_DOWN, on_mouse_down, window);
</del><ins>+ evas_object_event_callback_add(window->ewk_view, EVAS_CALLBACK_KEY_DOWN, _key_down_cb, window);
+ evas_object_event_callback_add(window->ewk_view, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down_cb, window);
</ins><span class="cx">
</span><del>- evas_object_size_hint_weight_set(window->ewk_view, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(window->ewk_view, EVAS_HINT_FILL, EVAS_HINT_FILL);
- elm_box_pack_before(window->vertical_layout, window->ewk_view, window->search.search_bar);
- evas_object_show(window->ewk_view);
</del><ins>+ evas_object_size_hint_weight_set(window->ewk_view, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(window->ewk_view, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_box_pack_before(window->vertical_layout, window->ewk_view, window->search.search_bar);
+ evas_object_show(window->ewk_view);
</ins><span class="cx">
</span><del>- evas_object_resize(window->elm_window, width ? width : window_width, height ? height : window_height);
- evas_object_show(window->elm_window);
- search_box_hide(window);
</del><ins>+ evas_object_resize(window->elm_window, width ? width : window_width, height ? height : window_height);
+ evas_object_show(window->elm_window);
+ search_box_hide(window);
</ins><span class="cx">
</span><del>- view_focus_set(window, EINA_TRUE);
- // Prevent window from stealing web view's focus on start up.
- elm_object_focus_allow_set(window->elm_window, EINA_FALSE);
</del><ins>+ view_focus_set(window, EINA_TRUE);
+ // Prevent window from stealing web view's focus on start up.
+ elm_object_focus_allow_set(window->elm_window, EINA_FALSE);
</ins><span class="cx">
</span><del>- evas_object_event_callback_add(window->ewk_view, EVAS_CALLBACK_MOUSE_IN, on_mouse_in, window);
- evas_object_event_callback_add(window->ewk_view, EVAS_CALLBACK_MOUSE_OUT, on_mouse_out, window);
- evas_object_event_callback_add(window->ewk_view, EVAS_CALLBACK_MOUSE_MOVE, on_mouse_move, window);
- evas_object_event_callback_add(window->ewk_view, EVAS_CALLBACK_MOUSE_WHEEL, on_mouse_wheel, window);
- evas_object_event_callback_add(window->elm_window, EVAS_CALLBACK_RESIZE, on_window_resize, window);
</del><ins>+ evas_object_event_callback_add(window->ewk_view, EVAS_CALLBACK_MOUSE_IN, _mouse_in_cb, window);
+ evas_object_event_callback_add(window->ewk_view, EVAS_CALLBACK_MOUSE_OUT, _mouse_out_cb, window);
+ evas_object_event_callback_add(window->ewk_view, EVAS_CALLBACK_MOUSE_MOVE, _mouse_move_cb, window);
+ evas_object_event_callback_add(window->ewk_view, EVAS_CALLBACK_MOUSE_WHEEL, _mouse_wheel_cb, window);
+ evas_object_event_callback_add(window->elm_window, EVAS_CALLBACK_RESIZE, _window_resize_cb, window);
</ins><span class="cx">
</span><del>- elm_button_autorepeat_set(window->back_button, EINA_TRUE);
- elm_button_autorepeat_set(window->forward_button, EINA_TRUE);
- elm_button_autorepeat_initial_timeout_set(window->back_button, LONGPRESS_INTERVAL_SECONDS);
- elm_button_autorepeat_initial_timeout_set(window->forward_button, LONGPRESS_INTERVAL_SECONDS);
</del><ins>+ elm_button_autorepeat_set(window->back_button, EINA_TRUE);
+ elm_button_autorepeat_set(window->forward_button, EINA_TRUE);
+ elm_button_autorepeat_initial_timeout_set(window->back_button, LONGPRESS_INTERVAL_SECONDS);
+ elm_button_autorepeat_initial_timeout_set(window->forward_button, LONGPRESS_INTERVAL_SECONDS);
</ins><span class="cx">
</span><del>- return window;
</del><ins>+ return window;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Ewk_View_Configuration* configuration()
</span><span class="lines">@@ -2361,7 +2364,7 @@
</span><span class="cx"> static Ewk_View_Configuration* default_configuration = 0;
</span><span class="cx">
</span><span class="cx"> if (default_configuration)
</span><del>- return default_configuration;
</del><ins>+ return default_configuration;
</ins><span class="cx">
</span><span class="cx"> default_configuration = ewk_view_configuration_new();
</span><span class="cx">
</span><span class="lines">@@ -2383,145 +2386,145 @@
</span><span class="cx"> static Ewk_Cookie_Accept_Policy
</span><span class="cx"> parse_cookies_policy(const char *input_string)
</span><span class="cx"> {
</span><del>- if (!strcmp(input_string, "always"))
- return EWK_COOKIE_ACCEPT_POLICY_ALWAYS;
- if (!strcmp(input_string, "never"))
- return EWK_COOKIE_ACCEPT_POLICY_NEVER;
- if (strcmp(input_string, "no-third-party"))
- INFO("Unrecognized type for cookies policy: %s.", input_string);
- return EWK_COOKIE_ACCEPT_POLICY_NO_THIRD_PARTY;
</del><ins>+ if (!strcmp(input_string, "always"))
+ return EWK_COOKIE_ACCEPT_POLICY_ALWAYS;
+ if (!strcmp(input_string, "never"))
+ return EWK_COOKIE_ACCEPT_POLICY_NEVER;
+ if (strcmp(input_string, "no-third-party"))
+ INFO("Unrecognized type for cookies policy: %s.", input_string);
+ return EWK_COOKIE_ACCEPT_POLICY_NO_THIRD_PARTY;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><span class="cx"> parse_window_size(const char *input_string, int *width, int *height)
</span><span class="cx"> {
</span><del>- static const unsigned max_length = 4;
- int parsed_width;
- int parsed_height;
- char **arr;
- unsigned elements;
</del><ins>+ static const unsigned max_length = 4;
+ int parsed_width;
+ int parsed_height;
+ char **arr;
+ unsigned elements;
</ins><span class="cx">
</span><del>- arr = eina_str_split_full(input_string, "x", 0, &elements);
</del><ins>+ arr = eina_str_split_full(input_string, "x", 0, &elements);
</ins><span class="cx">
</span><del>- if (elements == 2 && (strlen(arr[0]) <= max_length) && (strlen(arr[1]) <= max_length)) {
- parsed_width = atoi(arr[0]);
- if (width && parsed_width)
- *width = parsed_width;
</del><ins>+ if (elements == 2 && (strlen(arr[0]) <= max_length) && (strlen(arr[1]) <= max_length)) {
+ parsed_width = atoi(arr[0]);
+ if (width && parsed_width)
+ *width = parsed_width;
</ins><span class="cx">
</span><del>- parsed_height = atoi(arr[1]);
- if (height && parsed_height)
- *height = parsed_height;
- }
</del><ins>+ parsed_height = atoi(arr[1]);
+ if (height && parsed_height)
+ *height = parsed_height;
+ }
</ins><span class="cx">
</span><del>- free(arr[0]);
- free(arr);
</del><ins>+ free(arr[0]);
+ free(arr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EAPI_MAIN int
</span><span class="cx"> elm_main(int argc, char *argv[])
</span><span class="cx"> {
</span><del>- int args = 1;
- unsigned char quitOption = 0;
- Browser_Window *window;
- char *window_size_string = NULL;
- char *cookies_policy_string = NULL;
</del><ins>+ int args = 1;
+ unsigned char quitOption = 0;
+ Browser_Window *window;
+ char *window_size_string = NULL;
+ char *cookies_policy_string = NULL;
</ins><span class="cx">
</span><del>- Ecore_Getopt_Value values[] = {
- ECORE_GETOPT_VALUE_STR(evas_engine_name),
- ECORE_GETOPT_VALUE_STR(window_size_string),
- ECORE_GETOPT_VALUE_STR(user_agent_string),
- ECORE_GETOPT_VALUE_STR(extensions_path),
- ECORE_GETOPT_VALUE_DOUBLE(device_pixel_ratio),
- ECORE_GETOPT_VALUE_BOOL(quitOption),
- ECORE_GETOPT_VALUE_BOOL(encoding_detector_enabled),
- ECORE_GETOPT_VALUE_STR(background_color_string),
- ECORE_GETOPT_VALUE_BOOL(frame_flattening_enabled),
- ECORE_GETOPT_VALUE_BOOL(local_storage_enabled),
- ECORE_GETOPT_VALUE_BOOL(offline_web_application_cache_enabled),
- ECORE_GETOPT_VALUE_BOOL(fullscreen_enabled),
- ECORE_GETOPT_VALUE_BOOL(spell_checking_enabled),
- ECORE_GETOPT_VALUE_BOOL(touch_events_enabled),
- ECORE_GETOPT_VALUE_BOOL(fixed_layout_enabled),
- ECORE_GETOPT_VALUE_STR(cookies_policy_string),
- ECORE_GETOPT_VALUE_BOOL(web_security_enabled),
- ECORE_GETOPT_VALUE_BOOL(separated_process_enabled),
- ECORE_GETOPT_VALUE_BOOL(quitOption),
- ECORE_GETOPT_VALUE_BOOL(quitOption),
- ECORE_GETOPT_VALUE_BOOL(quitOption),
- ECORE_GETOPT_VALUE_NONE
- };
</del><ins>+ Ecore_Getopt_Value values[] = {
+ ECORE_GETOPT_VALUE_STR(evas_engine_name),
+ ECORE_GETOPT_VALUE_STR(window_size_string),
+ ECORE_GETOPT_VALUE_STR(user_agent_string),
+ ECORE_GETOPT_VALUE_STR(extensions_path),
+ ECORE_GETOPT_VALUE_DOUBLE(device_pixel_ratio),
+ ECORE_GETOPT_VALUE_BOOL(quitOption),
+ ECORE_GETOPT_VALUE_BOOL(encoding_detector_enabled),
+ ECORE_GETOPT_VALUE_STR(background_color_string),
+ ECORE_GETOPT_VALUE_BOOL(frame_flattening_enabled),
+ ECORE_GETOPT_VALUE_BOOL(local_storage_enabled),
+ ECORE_GETOPT_VALUE_BOOL(offline_web_application_cache_enabled),
+ ECORE_GETOPT_VALUE_BOOL(fullscreen_enabled),
+ ECORE_GETOPT_VALUE_BOOL(spell_checking_enabled),
+ ECORE_GETOPT_VALUE_BOOL(touch_events_enabled),
+ ECORE_GETOPT_VALUE_BOOL(fixed_layout_enabled),
+ ECORE_GETOPT_VALUE_STR(cookies_policy_string),
+ ECORE_GETOPT_VALUE_BOOL(web_security_enabled),
+ ECORE_GETOPT_VALUE_BOOL(separated_process_enabled),
+ ECORE_GETOPT_VALUE_BOOL(quitOption),
+ ECORE_GETOPT_VALUE_BOOL(quitOption),
+ ECORE_GETOPT_VALUE_BOOL(quitOption),
+ ECORE_GETOPT_VALUE_NONE
+ };
</ins><span class="cx">
</span><del>- efreet_cache_update = 0;
</del><ins>+ efreet_cache_update = 0;
</ins><span class="cx">
</span><del>- if (!ewk_init())
- return EXIT_FAILURE;
</del><ins>+ if (!ewk_init())
+ return EXIT_FAILURE;
</ins><span class="cx">
</span><del>- _log_domain_id = eina_log_domain_register("minibrowser", EINA_COLOR_YELLOW);
</del><ins>+ _log_domain_id = eina_log_domain_register("minibrowser", EINA_COLOR_YELLOW);
</ins><span class="cx">
</span><del>- ewk_view_smart_class_set(miniBrowserViewSmartClass());
</del><ins>+ ewk_view_smart_class_set(miniBrowserViewSmartClass());
</ins><span class="cx">
</span><del>- ecore_app_args_set(argc, (const char **) argv);
- args = ecore_getopt_parse(&options, values, argc, argv);
</del><ins>+ ecore_app_args_set(argc, (const char **) argv);
+ args = ecore_getopt_parse(&options, values, argc, argv);
</ins><span class="cx">
</span><del>- if (args < 0)
- return quit(EINA_FALSE, "Could not parse options.");
</del><ins>+ if (args < 0)
+ return quit(EINA_FALSE, "Could not parse options.");
</ins><span class="cx">
</span><del>- if (quitOption)
- return quit(EINA_TRUE, NULL);
</del><ins>+ if (quitOption)
+ return quit(EINA_TRUE, NULL);
</ins><span class="cx">
</span><del>- if (evas_engine_name)
- elm_config_accel_preference_set(evas_engine_name);
- else {
- evas_engine_name = "opengl:depth24:stencil8";
- elm_config_accel_preference_set(evas_engine_name);
- }
</del><ins>+ if (evas_engine_name)
+ elm_config_accel_preference_set(evas_engine_name);
+ else {
+ evas_engine_name = "opengl:depth24:stencil8";
+ elm_config_accel_preference_set(evas_engine_name);
+ }
</ins><span class="cx">
</span><del>- Ewk_Context *context = ewk_context_default_get();
</del><ins>+ Ewk_Context *context = ewk_context_default_get();
</ins><span class="cx">
</span><del>- if (separated_process_enabled)
- ewk_context_web_process_count_limit_set(context, 0);
</del><ins>+ if (separated_process_enabled)
+ ewk_context_web_process_count_limit_set(context, 0);
</ins><span class="cx">
</span><del>- // Enable favicon database.
- ewk_context_favicon_database_directory_set(context, NULL);
</del><ins>+ // Enable favicon database.
+ ewk_context_favicon_database_directory_set(context, NULL);
</ins><span class="cx">
</span><del>- // Use a proper cache model.
- ewk_context_cache_model_set(context, EWK_CACHE_MODEL_PRIMARY_WEBBROWSER);
</del><ins>+ // Use a proper cache model.
+ ewk_context_cache_model_set(context, EWK_CACHE_MODEL_PRIMARY_WEBBROWSER);
</ins><span class="cx">
</span><del>- if (cookies_policy_string) {
- Ewk_Cookie_Accept_Policy cookie_policy = parse_cookies_policy(cookies_policy_string);
- ewk_cookie_manager_accept_policy_set(ewk_context_cookie_manager_get(context), cookie_policy);
</del><ins>+ if (cookies_policy_string) {
+ Ewk_Cookie_Accept_Policy cookie_policy = parse_cookies_policy(cookies_policy_string);
+ ewk_cookie_manager_accept_policy_set(ewk_context_cookie_manager_get(context), cookie_policy);
</ins><span class="cx">
</span><del>- if (cookie_policy == EWK_COOKIE_ACCEPT_POLICY_ALWAYS) {
- const char cookie_storage_directory[] = "/tmp/ewebkit2_minibrowser_cookie/";
- mkdir(cookie_storage_directory, S_IRWXU);
- char storage_name[64];
- snprintf(storage_name, sizeof(storage_name), "%stxt-cookie", cookie_storage_directory);
- ewk_cookie_manager_persistent_storage_set(ewk_context_cookie_manager_get(context), storage_name, EWK_COOKIE_PERSISTENT_STORAGE_TEXT);
- }
- }
</del><ins>+ if (cookie_policy == EWK_COOKIE_ACCEPT_POLICY_ALWAYS) {
+ const char cookie_storage_directory[] = "/tmp/ewebkit2_minibrowser_cookie/";
+ mkdir(cookie_storage_directory, S_IRWXU);
+ char storage_name[64];
+ snprintf(storage_name, sizeof(storage_name), "%stxt-cookie", cookie_storage_directory);
+ ewk_cookie_manager_persistent_storage_set(ewk_context_cookie_manager_get(context), storage_name, EWK_COOKIE_PERSISTENT_STORAGE_TEXT);
+ }
+ }
</ins><span class="cx">
</span><del>- if (window_size_string)
- parse_window_size(window_size_string, &window_width, &window_height);
</del><ins>+ if (window_size_string)
+ parse_window_size(window_size_string, &window_width, &window_height);
</ins><span class="cx">
</span><del>- window = window_create(configuration(), 0, 0);
- if (!window)
- return quit(EINA_FALSE, "Could not create browser window.");
</del><ins>+ window = window_create(configuration(), 0, 0);
+ if (!window)
+ return quit(EINA_FALSE, "Could not create browser window.");
</ins><span class="cx">
</span><del>- // Set callbacks for download events.
- ewk_context_download_callbacks_set(context, on_download_request, on_download_failed, 0, on_download_finished, window);
</del><ins>+ // Set callbacks for download events.
+ ewk_context_download_callbacks_set(context, _download_request_cb, _download_failed_cb, 0, _download_finished_cb, window);
</ins><span class="cx">
</span><del>- if (args < argc) {
- char *url = url_from_user_input(argv[args]);
- url_load_from_user_input(window->ewk_view, url);
- free(url);
- } else
- ewk_view_url_set(window->ewk_view, DEFAULT_URL);
</del><ins>+ if (args < argc) {
+ char *url = url_from_user_input(argv[args]);
+ url_load_from_user_input(window->ewk_view, url);
+ free(url);
+ } else
+ ewk_view_url_set(window->ewk_view, DEFAULT_URL);
</ins><span class="cx">
</span><del>- windows = eina_list_append(windows, window);
</del><ins>+ windows = eina_list_append(windows, window);
</ins><span class="cx">
</span><del>- elm_run();
</del><ins>+ elm_run();
</ins><span class="cx">
</span><del>- return quit(EINA_TRUE, NULL);
</del><ins>+ return quit(EINA_TRUE, NULL);
</ins><span class="cx"> }
</span><span class="cx"> ELM_MAIN()
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checker.py (206076 => 206077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checker.py 2016-09-18 08:01:11 UTC (rev 206076)
+++ trunk/Tools/Scripts/webkitpy/style/checker.py 2016-09-18 13:13:47 UTC (rev 206077)
</span><span class="lines">@@ -184,6 +184,7 @@
</span><span class="cx"> "-readability/parameter_name",
</span><span class="cx"> "-runtime/ctype_function",
</span><span class="cx"> "-whitespace/declaration",
</span><ins>+ "-whitespace/indent",
</ins><span class="cx"> "-build/include_order"]),
</span><span class="cx">
</span><span class="cx"> # WebKit2 rules:
</span></span></pre>
</div>
</div>
</body>
</html>