<!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>[172923] 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/172923">172923</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-08-25 06:40:17 -0700 (Mon, 25 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL][WK2] Minibrowser : Enhance application to be able to support history list navigation
https://bugs.webkit.org/show_bug.cgi?id=135795
Patch by Tanay C <tanay.c@samsung.com> on 2014-08-25
Reviewed by Gyuyoung Kim.
* MiniBrowser/efl/main.c: Adding functionality for long press history list navigation
(history_list_hide): Hiding and dereferencing the history list and items
(on_key_down):
(on_mouse_down):
(on_back_button_clicked): Early return for longpress
(on_forward_button_clicked): Early return for longpress
(list_item_label_get): Populate item labels
(on_list_item_select): Navigates on selection from history list
(navigation_button_longpress_process): Populates the history list and displays it
(on_forward_button_longpress):
(on_back_button_longpress):
(window_create): Add the widget for history list</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (172922 => 172923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-08-25 13:39:42 UTC (rev 172922)
+++ trunk/Tools/ChangeLog 2014-08-25 13:40:17 UTC (rev 172923)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-08-25 Tanay C <tanay.c@samsung.com>
+
+ [EFL][WK2] Minibrowser : Enhance application to be able to support history list navigation
+ https://bugs.webkit.org/show_bug.cgi?id=135795
+
+ Reviewed by Gyuyoung Kim.
+
+ * MiniBrowser/efl/main.c: Adding functionality for long press history list navigation
+ (history_list_hide): Hiding and dereferencing the history list and items
+ (on_key_down):
+ (on_mouse_down):
+ (on_back_button_clicked): Early return for longpress
+ (on_forward_button_clicked): Early return for longpress
+ (list_item_label_get): Populate item labels
+ (on_list_item_select): Navigates on selection from history list
+ (navigation_button_longpress_process): Populates the history list and displays it
+ (on_forward_button_longpress):
+ (on_back_button_longpress):
+ (window_create): Add the widget for history list
+
</ins><span class="cx"> 2014-08-25 Carlos Alberto Lopez Perez <clopez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] JHBuild module gst-plugins-base fails to build on x86 with GCC 4.9
</span></span></pre></div>
<a id="trunkToolsMiniBrowsereflmainc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/efl/main.c (172922 => 172923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/efl/main.c 2014-08-25 13:39:42 UTC (rev 172922)
+++ trunk/Tools/MiniBrowser/efl/main.c 2014-08-25 13:40:17 UTC (rev 172923)
</span><span class="lines">@@ -35,6 +35,8 @@
</span><span class="cx"> static const int MAX_SEARCH_COUNT = 100;
</span><span class="cx"> static const int DEFAULT_SEARCH_FLAGS = EWK_FIND_OPTIONS_SHOW_HIGHLIGHT | EWK_FIND_OPTIONS_CASE_INSENSITIVE | EWK_FIND_OPTIONS_WRAP_AROUND;
</span><span class="cx"> static const double TOOLTIP_DELAY_SECONDS = 1.0;
</span><ins>+static const double LONGPRESS_INTERVAL_SECONDS = 1.5;
+static const double LIST_ITEM_HEIGHT = 24.35;
</ins><span class="cx">
</span><span class="cx"> #define info(format, args...) \
</span><span class="cx"> do { \
</span><span class="lines">@@ -56,6 +58,7 @@
</span><span class="cx"> static Eina_Bool touch_events_enabled = EINA_FALSE;
</span><span class="cx"> static Eina_Bool fixed_layout_enabled = EINA_FALSE;
</span><span class="cx"> static Eina_Bool separated_process_enabled = EINA_FALSE;
</span><ins>+static Eina_Bool longpress_enabled = EINA_FALSE;
</ins><span class="cx"> static int window_width = 800;
</span><span class="cx"> static int window_height = 600;
</span><span class="cx"> /* Default value of device_pixel_ratio is '0' so that we don't set custom device
</span><span class="lines">@@ -113,6 +116,11 @@
</span><span class="cx"> Evas_Object *forward_button;
</span><span class="cx"> Evas_Object *close_button;
</span><span class="cx"> } search;
</span><ins>+ struct {
+ Evas_Object *history_box;
+ Evas_Object *history_list;
+ Eina_List *history_list_items;
+ } history;
</ins><span class="cx"> int current_zoom_level;
</span><span class="cx"> Tooltip_Information tooltip;
</span><span class="cx"> Color_Selector color_selector;
</span><span class="lines">@@ -398,6 +406,30 @@
</span><span class="cx"> evas_object_focus_set(window->ewk_view, EINA_TRUE);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void
+history_list_hide(Browser_Window *window)
+{
+ /* Hide history list */
+ evas_object_hide(window->history.history_box);
+ evas_object_hide(window->history.history_list);
+
+ /* Dereference the list items and clear the history list */
+ void *data;
+ EINA_LIST_FREE(window->history.history_list_items, data) {
+ ewk_object_unref(data);
+ }
+
+ elm_genlist_clear(window->history.history_list);
+
+ /* 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);
+
+ /* Reset flags */
+ longpress_enabled = EINA_FALSE;
+}
+
</ins><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><span class="cx"> Eet_File *ef;
</span><span class="lines">@@ -505,6 +537,8 @@
</span><span class="cx"> } else if (!strcmp(ev->key, "Escape")) {
</span><span class="cx"> if (evas_object_visible_get(window->search.search_bar))
</span><span class="cx"> search_box_hide(window);
</span><ins>+ else if (evas_object_visible_get(window->history.history_box))
+ history_list_hide(window);
</ins><span class="cx"> else if (elm_win_fullscreen_get(window->elm_window))
</span><span class="cx"> ewk_view_fullscreen_exit(ewk_view);
</span><span class="cx"> } else if (ctrlPressed && (!strcmp(ev->key, "minus") || !strcmp(ev->key, "KP_Subtract"))) {
</span><span class="lines">@@ -563,6 +597,8 @@
</span><span class="cx"> /* Clear selection from the URL bar */
</span><span class="cx"> elm_entry_select_none(window->url_bar);
</span><span class="cx">
</span><ins>+ if (longpress_enabled)
+ history_list_hide(window);
</ins><span class="cx"> if (ev->button == 1)
</span><span class="cx"> view_focus_set(window, EINA_TRUE);
</span><span class="cx"> else if (ev->button == 2)
</span><span class="lines">@@ -1012,6 +1048,9 @@
</span><span class="cx"> static void
</span><span class="cx"> on_back_button_clicked(void *user_data, Evas_Object *back_button, void *event_info)
</span><span class="cx"> {
</span><ins>+ if (longpress_enabled)
+ return;
+
</ins><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx">
</span><span class="cx"> ewk_view_back(window->ewk_view);
</span><span class="lines">@@ -1022,6 +1061,9 @@
</span><span class="cx"> static void
</span><span class="cx"> on_forward_button_clicked(void *user_data, Evas_Object *forward_button, void *event_info)
</span><span class="cx"> {
</span><ins>+ if (longpress_enabled)
+ return;
+
</ins><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx">
</span><span class="cx"> ewk_view_forward(window->ewk_view);
</span><span class="lines">@@ -1082,7 +1124,111 @@
</span><span class="cx"> ewk_view_stop(window->ewk_view);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static char *
+list_item_label_get(void *data, Evas_Object *obj, const char *part)
+{
+ int len = strlen((char *)data);
+ char *buf = (char *)malloc(sizeof(char) * (len + 1));
+ snprintf(buf, len + 1, "%s", (char *)data);
+ return buf;
+}
+
</ins><span class="cx"> static void
</span><ins>+on_list_item_select(void *user_data, Evas_Object *obj, void *event_info)
+{
+ Browser_Window *window = evas_object_data_get(obj, "Browser_Window");
+ ewk_view_navigate_to(window->ewk_view, user_data);
+ history_list_hide(window);
+ evas_object_data_del(obj, "Browser_Window");
+}
+
+static void
+navigation_button_longpress_process(void *user_data, Eina_Bool forward_navigation_enabled)
+{
+ if (longpress_enabled)
+ return;
+
+ longpress_enabled = EINA_TRUE;
+ Browser_Window *window = (Browser_Window *)user_data;
+
+ Ewk_Back_Forward_List *list = ewk_view_back_forward_list_get(window->ewk_view);
+ const Eina_List *l;
+ void *data;
+ static Elm_Genlist_Item_Class *list_item = NULL;
+ const char *title = NULL;
+ int item_count;
+ int x;
+ int y;
+ int width;
+ int height;
+ size_t index;
+
+ evas_object_data_set(window->history.history_list, "Browser_Window", window);
+
+ if (forward_navigation_enabled)
+ window->history.history_list_items = ewk_back_forward_list_forward_items_copy(list);
+ else
+ window->history.history_list_items = ewk_back_forward_list_back_items_copy(list);
+
+ if (!list_item) {
+ list_item = elm_genlist_item_class_new();
+ list_item->item_style = "default";
+ list_item->func.text_get = list_item_label_get;
+ list_item->func.content_get = NULL;
+ list_item->func.state_get = NULL;
+ list_item->func.del = NULL;
+ }
+
+ item_count = eina_list_count(window->history.history_list_items);
+ info("navigation_button_longpress_process : Item count = %d forward_navigation_enabled = %d", item_count, forward_navigation_enabled);
+
+ EINA_LIST_FOREACH(window->history.history_list_items, l, data) {
+ title = ewk_back_forward_list_item_title_get(data);
+ info(" title = %s", title);
+ elm_genlist_item_append(window->history.history_list, list_item, (void *)(title), NULL, ELM_GENLIST_ITEM_NONE, on_list_item_select, data);
+ }
+
+ if (item_count > 0) {
+ evas_object_geometry_get(window->elm_window, &x, &y, &width, &height);
+ elm_list_go(window->history.history_list);
+ evas_object_resize(window->history.history_box , width / 3 , LIST_ITEM_HEIGHT * item_count);
+
+ if (forward_navigation_enabled) {
+ evas_object_move(window->history.history_box , x + TOOL_BAR_BUTTON_SIZE + 1, y + TOOL_BAR_BUTTON_SIZE);
+ evas_object_move(window->history.history_list , x + TOOL_BAR_BUTTON_SIZE + 1, y + TOOL_BAR_BUTTON_SIZE);
+ } else {
+ evas_object_move(window->history.history_box , x, y + TOOL_BAR_BUTTON_SIZE);
+ evas_object_move(window->history.history_list , x, y + TOOL_BAR_BUTTON_SIZE);
+ }
+
+ elm_genlist_mode_set(window->history.history_list, ELM_LIST_COMPRESS);
+ evas_object_show(window->history.history_box);
+ evas_object_show(window->history.history_list);
+ evas_object_focus_set(window->ewk_view, EINA_FALSE);
+ elm_object_focus_set(window->history.history_list, EINA_TRUE);
+ } else
+ longpress_enabled = EINA_FALSE;
+}
+
+static void
+on_forward_button_longpress(void *user_data, Evas_Object *forward_button, void *event_info)
+{
+ Browser_Window *window = (Browser_Window *)user_data;
+
+ navigation_button_longpress_process(user_data, EINA_TRUE);
+ elm_object_disabled_set(forward_button, !ewk_view_back_possible(window->ewk_view));
+}
+
+static void
+on_back_button_longpress(void *user_data, Evas_Object *back_button, void *event_info)
+{
+ Browser_Window *window = (Browser_Window *)user_data;
+
+ navigation_button_longpress_process(user_data, EINA_FALSE);
+ elm_object_disabled_set(back_button, !ewk_view_back_possible(window->ewk_view));
+}
+
+static void
</ins><span class="cx"> quit_event_loop(void *user_data, Evas_Object *obj, void *event_info)
</span><span class="cx"> {
</span><span class="cx"> ecore_main_loop_quit();
</span><span class="lines">@@ -1813,6 +1959,7 @@
</span><span class="cx"> /* Create Back button */
</span><span class="cx"> window->back_button = create_toolbar_button(window->elm_window, "arrow_left");
</span><span class="cx"> evas_object_smart_callback_add(window->back_button, "clicked", on_back_button_clicked, window);
</span><ins>+ evas_object_smart_callback_add(window->back_button, "repeated", on_back_button_longpress, window);
</ins><span class="cx"> elm_object_disabled_set(window->back_button, EINA_TRUE);
</span><span class="cx"> evas_object_size_hint_weight_set(window->back_button, 0.0, EVAS_HINT_EXPAND);
</span><span class="cx"> evas_object_size_hint_align_set(window->back_button, 0.0, 0.5);
</span><span class="lines">@@ -1822,6 +1969,7 @@
</span><span class="cx"> /* Create Forward button */
</span><span class="cx"> window->forward_button = create_toolbar_button(window->elm_window, "arrow_right");
</span><span class="cx"> evas_object_smart_callback_add(window->forward_button, "clicked", on_forward_button_clicked, window);
</span><ins>+ evas_object_smart_callback_add(window->forward_button, "repeated", on_forward_button_longpress, window);
</ins><span class="cx"> elm_object_disabled_set(window->forward_button, EINA_TRUE);
</span><span class="cx"> evas_object_size_hint_weight_set(window->forward_button, 0.0, EVAS_HINT_EXPAND);
</span><span class="cx"> evas_object_size_hint_align_set(window->forward_button, 0.0, 0.5);
</span><span class="lines">@@ -1923,6 +2071,18 @@
</span><span class="cx"> evas_object_size_hint_min_set(window->search.close_button, SEARCH_BUTTON_SIZE, SEARCH_BUTTON_SIZE);
</span><span class="cx"> elm_box_pack_end(window->search.search_bar, window->search.close_button);
</span><span class="cx">
</span><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);
+
+ /* 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->history.history_list, window->history.history_box);
+ elm_box_pack_end(window->history.history_box, window->history.history_list);
+
</ins><span class="cx"> /* Create ewk_view */
</span><span class="cx"> Ewk_View_Smart_Class *ewkViewClass = miniBrowserViewSmartClass();
</span><span class="cx"> ewkViewClass->run_javascript_alert = on_javascript_alert;
</span><span class="lines">@@ -2015,6 +2175,11 @@
</span><span class="cx"> evas_object_event_callback_add(window->ewk_view, EVAS_CALLBACK_MOUSE_OUT, on_mouse_out, window);
</span><span class="cx"> evas_object_event_callback_add(window->ewk_view, EVAS_CALLBACK_MOUSE_MOVE, on_mouse_move, window);
</span><span class="cx"> evas_object_event_callback_add(window->elm_window, EVAS_CALLBACK_RESIZE, on_window_resize, window);
</span><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><span class="cx"> return window;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>