Uncrustify eve
Exceptions: - auto-generated files by geneet (favorite.[ch] and history.[ch]) Config not used: - *_closebrace_comment in uncrustify config SVN revision: 51682
This commit is contained in:
Lucas De Marchi
parent
50f87c6bcb
commit
fce46e4793
212
src/bin/chrome.c
212
src/bin/chrome.c
|
|
@ -13,15 +13,15 @@
|
|||
|
||||
typedef struct _Bookmark_Menu_Item Bookmark_Menu_Item;
|
||||
typedef struct _Bookmark_Menu_Filter_Context Bookmark_Menu_Filter_Context;
|
||||
typedef Bookmark_Menu_Item *(*Bookmark_Menu_Callback)(Bookmark_Menu_Item *current_item);
|
||||
typedef Bookmark_Menu_Item *(* Bookmark_Menu_Callback)(Bookmark_Menu_Item *current_item);
|
||||
|
||||
static Bookmark_Menu_Item *bookmark_menu_favorites(Bookmark_Menu_Item*);
|
||||
static Bookmark_Menu_Item *bookmark_menu_history_today(Bookmark_Menu_Item*);
|
||||
static Bookmark_Menu_Item *bookmark_menu_history_yesterday(Bookmark_Menu_Item*);
|
||||
static Bookmark_Menu_Item *bookmark_menu_history_this_week(Bookmark_Menu_Item*);
|
||||
static Bookmark_Menu_Item *bookmark_menu_history_most_visited(Bookmark_Menu_Item*);
|
||||
static Bookmark_Menu_Item *bookmark_menu_history_least_visited(Bookmark_Menu_Item*);
|
||||
static Bookmark_Menu_Item *bookmark_menu_history_by_domain(Bookmark_Menu_Item*);
|
||||
static Bookmark_Menu_Item * bookmark_menu_favorites(Bookmark_Menu_Item *);
|
||||
static Bookmark_Menu_Item * bookmark_menu_history_today(Bookmark_Menu_Item *);
|
||||
static Bookmark_Menu_Item * bookmark_menu_history_yesterday(Bookmark_Menu_Item *);
|
||||
static Bookmark_Menu_Item * bookmark_menu_history_this_week(Bookmark_Menu_Item *);
|
||||
static Bookmark_Menu_Item * bookmark_menu_history_most_visited(Bookmark_Menu_Item *);
|
||||
static Bookmark_Menu_Item * bookmark_menu_history_least_visited(Bookmark_Menu_Item *);
|
||||
static Bookmark_Menu_Item * bookmark_menu_history_by_domain(Bookmark_Menu_Item *);
|
||||
|
||||
static Elm_Gengrid_Item_Class gic_default, gic_new_page;
|
||||
|
||||
|
|
@ -34,14 +34,16 @@ typedef enum {
|
|||
ITEM_TYPE_SEPARATOR,
|
||||
} Bookmark_Menu_Item_Type;
|
||||
|
||||
struct _Bookmark_Menu_Item {
|
||||
struct _Bookmark_Menu_Item
|
||||
{
|
||||
Bookmark_Menu_Item_Type type;
|
||||
const char *text;
|
||||
void *next;
|
||||
Eina_Bool dynamic : 1;
|
||||
};
|
||||
|
||||
struct _Bookmark_Menu_Filter_Context {
|
||||
struct _Bookmark_Menu_Filter_Context
|
||||
{
|
||||
Bookmark_Menu_Item *current_bookmark_item;
|
||||
double time;
|
||||
};
|
||||
|
|
@ -74,8 +76,7 @@ static Bookmark_Menu_Item bookmark_menu_root[] =
|
|||
{ ITEM_TYPE_LAST, NULL, NULL, EINA_FALSE }
|
||||
};
|
||||
|
||||
|
||||
static Eina_List*
|
||||
static Eina_List *
|
||||
_eina_hash_sorted_keys_get(Eina_Hash *hash, Eina_Compare_Cb compare_func)
|
||||
{
|
||||
Eina_List *keyvals = NULL, *keys = NULL, *keyvals_iter;
|
||||
|
|
@ -93,7 +94,8 @@ _eina_hash_sorted_keys_get(Eina_Hash *hash, Eina_Compare_Cb compare_func)
|
|||
|
||||
return keys;
|
||||
}
|
||||
static Bookmark_Menu_Item*
|
||||
|
||||
static Bookmark_Menu_Item *
|
||||
_bookmark_menu_history(Eina_Iterator *items, Bookmark_Menu_Item *current_item, Eina_Bool (*filter)(Bookmark_Menu_Filter_Context *ctx, Hist_Item *item))
|
||||
{
|
||||
Bookmark_Menu_Item *bm_item;
|
||||
|
|
@ -109,7 +111,8 @@ _bookmark_menu_history(Eina_Iterator *items, Bookmark_Menu_Item *current_item, E
|
|||
{
|
||||
Hist_Item *item = hist_items_get(hist, url);
|
||||
|
||||
if (!filter(&ctx, item)) continue;
|
||||
if (!filter(&ctx, item))
|
||||
continue;
|
||||
|
||||
bm_item = calloc(1, sizeof(Bookmark_Menu_Item));
|
||||
bm_item->type = ITEM_TYPE_PAGE;
|
||||
|
|
@ -122,8 +125,10 @@ _bookmark_menu_history(Eina_Iterator *items, Bookmark_Menu_Item *current_item, E
|
|||
else if (n_items % BOOKMARK_MENU_PREALLOC_SIZE == 0)
|
||||
{
|
||||
new_ret = realloc(ret, (BOOKMARK_MENU_PREALLOC_SIZE * n_items * sizeof(*ret)));
|
||||
if (new_ret) ret = new_ret;
|
||||
else goto realloc_error;
|
||||
if (new_ret)
|
||||
ret = new_ret;
|
||||
else
|
||||
goto realloc_error;
|
||||
}
|
||||
|
||||
memcpy(&ret[n_items], bm_item, sizeof(*ret));
|
||||
|
|
@ -134,7 +139,8 @@ _bookmark_menu_history(Eina_Iterator *items, Bookmark_Menu_Item *current_item, E
|
|||
|
||||
realloc_error:
|
||||
|
||||
if (!n_items) return NULL;
|
||||
if (!n_items)
|
||||
return NULL;
|
||||
|
||||
bm_item = calloc(1, sizeof(Bookmark_Menu_Item));
|
||||
bm_item->type = ITEM_TYPE_LAST;
|
||||
|
|
@ -145,6 +151,7 @@ realloc_error:
|
|||
free(ret);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ret = new_ret;
|
||||
memcpy(&ret[n_items], bm_item, sizeof(*ret));
|
||||
free(bm_item);
|
||||
|
|
@ -162,10 +169,11 @@ _domain_filter(Bookmark_Menu_Filter_Context *ctx, Hist_Item *item)
|
|||
domain += 3;
|
||||
return !strncmp(domain, filtered_domain, strlen(filtered_domain));
|
||||
}
|
||||
|
||||
return EINA_FALSE;
|
||||
}
|
||||
|
||||
static Bookmark_Menu_Item*
|
||||
static Bookmark_Menu_Item *
|
||||
_bookmark_menu_history_by_domain(Bookmark_Menu_Item *current_item)
|
||||
{
|
||||
Bookmark_Menu_Item *ret;
|
||||
|
|
@ -177,7 +185,7 @@ _bookmark_menu_history_by_domain(Bookmark_Menu_Item *current_item)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static Bookmark_Menu_Item*
|
||||
static Bookmark_Menu_Item *
|
||||
bookmark_menu_history_by_domain(Bookmark_Menu_Item *current_item)
|
||||
{
|
||||
Bookmark_Menu_Item *bm_item;
|
||||
|
|
@ -192,15 +200,19 @@ bookmark_menu_history_by_domain(Bookmark_Menu_Item *current_item)
|
|||
char *urlcopy = strdup(url);
|
||||
char *domain, *end;
|
||||
|
||||
if ((domain = strcasestr(urlcopy, "http://"))) domain += 7;
|
||||
else if ((domain = strcasestr(urlcopy, "https://"))) domain += 8;
|
||||
else goto unknown_schema;
|
||||
if ((domain = strcasestr(urlcopy, "http://")))
|
||||
domain += 7;
|
||||
else if ((domain = strcasestr(urlcopy, "https://")))
|
||||
domain += 8;
|
||||
else
|
||||
goto unknown_schema;
|
||||
|
||||
if ((end = strchr(domain, '/')))
|
||||
{
|
||||
*end = '\0';
|
||||
eina_hash_set(domains, strdup(domain), (void *)1);
|
||||
}
|
||||
|
||||
unknown_schema:
|
||||
free(urlcopy);
|
||||
}
|
||||
|
|
@ -220,8 +232,10 @@ unknown_schema:
|
|||
else if (n_items % BOOKMARK_MENU_PREALLOC_SIZE == 0)
|
||||
{
|
||||
new_ret = realloc(ret, (BOOKMARK_MENU_PREALLOC_SIZE * n_items * sizeof(*ret)));
|
||||
if (new_ret) ret = new_ret;
|
||||
else goto realloc_error;
|
||||
if (new_ret)
|
||||
ret = new_ret;
|
||||
else
|
||||
goto realloc_error;
|
||||
}
|
||||
|
||||
memcpy(&ret[n_items], bm_item, sizeof(*ret));
|
||||
|
|
@ -233,7 +247,8 @@ realloc_error:
|
|||
eina_iterator_free(items);
|
||||
eina_hash_free(domains);
|
||||
|
||||
if (!n_items) return NULL;
|
||||
if (!n_items)
|
||||
return NULL;
|
||||
|
||||
bm_item = calloc(1, sizeof(Bookmark_Menu_Item));
|
||||
bm_item->type = ITEM_TYPE_LAST;
|
||||
|
|
@ -244,6 +259,7 @@ realloc_error:
|
|||
free(ret);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ret = new_ret;
|
||||
memcpy(&ret[n_items], bm_item, sizeof(*ret));
|
||||
free(bm_item);
|
||||
|
|
@ -267,7 +283,6 @@ _today_filter(Bookmark_Menu_Filter_Context *ctx, Hist_Item *item)
|
|||
return (now - item_time) <= 24 * 3600;
|
||||
}
|
||||
|
||||
|
||||
static Eina_Bool
|
||||
_yesterday_filter(Bookmark_Menu_Filter_Context *ctx, Hist_Item *item)
|
||||
{
|
||||
|
|
@ -276,7 +291,7 @@ _yesterday_filter(Bookmark_Menu_Filter_Context *ctx, Hist_Item *item)
|
|||
return (now - item_time) > 24 * 3600 && (now - item_time) <= 48 * 3600;
|
||||
}
|
||||
|
||||
static Bookmark_Menu_Item*
|
||||
static Bookmark_Menu_Item *
|
||||
bookmark_menu_history_today(Bookmark_Menu_Item *current_item)
|
||||
{
|
||||
Eina_Iterator *iter = eina_hash_iterator_key_new(hist_items_hash_get(hist));
|
||||
|
|
@ -285,7 +300,7 @@ bookmark_menu_history_today(Bookmark_Menu_Item *current_item)
|
|||
return items;
|
||||
}
|
||||
|
||||
static Bookmark_Menu_Item*
|
||||
static Bookmark_Menu_Item *
|
||||
bookmark_menu_history_yesterday(Bookmark_Menu_Item *current_item)
|
||||
{
|
||||
Eina_Iterator *iter = eina_hash_iterator_key_new(hist_items_hash_get(hist));
|
||||
|
|
@ -294,7 +309,7 @@ bookmark_menu_history_yesterday(Bookmark_Menu_Item *current_item)
|
|||
return items;
|
||||
}
|
||||
|
||||
static Bookmark_Menu_Item*
|
||||
static Bookmark_Menu_Item *
|
||||
bookmark_menu_history_this_week(Bookmark_Menu_Item *current_item)
|
||||
{
|
||||
Eina_Iterator *iter = eina_hash_iterator_key_new(hist_items_hash_get(hist));
|
||||
|
|
@ -321,7 +336,7 @@ _cb_compare_hist_visit_count_incr(const void *data1, const void *data2)
|
|||
return hist_item_visit_count_get(f1) - hist_item_visit_count_get(f2);
|
||||
}
|
||||
|
||||
static Bookmark_Menu_Item*
|
||||
static Bookmark_Menu_Item *
|
||||
bookmark_menu_history_least_visited(Bookmark_Menu_Item *current_item)
|
||||
{
|
||||
Eina_List *keys = _eina_hash_sorted_keys_get(hist_items_hash_get(hist), _cb_compare_hist_visit_count_incr);
|
||||
|
|
@ -332,7 +347,7 @@ bookmark_menu_history_least_visited(Bookmark_Menu_Item *current_item)
|
|||
return items;
|
||||
}
|
||||
|
||||
static Bookmark_Menu_Item*
|
||||
static Bookmark_Menu_Item *
|
||||
bookmark_menu_history_most_visited(Bookmark_Menu_Item *current_item)
|
||||
{
|
||||
Eina_List *keys = _eina_hash_sorted_keys_get(hist_items_hash_get(hist), _cb_compare_hist_visit_count_decr);
|
||||
|
|
@ -343,7 +358,7 @@ bookmark_menu_history_most_visited(Bookmark_Menu_Item *current_item)
|
|||
return items;
|
||||
}
|
||||
|
||||
static Bookmark_Menu_Item*
|
||||
static Bookmark_Menu_Item *
|
||||
bookmark_menu_favorites(Bookmark_Menu_Item *current_item)
|
||||
{
|
||||
Bookmark_Menu_Item *bm_item;
|
||||
|
|
@ -367,8 +382,10 @@ bookmark_menu_favorites(Bookmark_Menu_Item *current_item)
|
|||
else if (n_items % BOOKMARK_MENU_PREALLOC_SIZE == 0)
|
||||
{
|
||||
new_ret = realloc(ret, (BOOKMARK_MENU_PREALLOC_SIZE * n_items * sizeof(*ret)));
|
||||
if (new_ret) ret = new_ret;
|
||||
else goto realloc_error;
|
||||
if (new_ret)
|
||||
ret = new_ret;
|
||||
else
|
||||
goto realloc_error;
|
||||
}
|
||||
|
||||
memcpy(&ret[n_items], bm_item, sizeof(*ret));
|
||||
|
|
@ -394,6 +411,7 @@ realloc_error:
|
|||
free(ret);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ret = new_ret;
|
||||
memcpy(&ret[n_items], bm_item, sizeof(*ret));
|
||||
free(bm_item);
|
||||
|
|
@ -402,7 +420,7 @@ realloc_error:
|
|||
}
|
||||
|
||||
static void
|
||||
on_view_mask_visible(void *data, Evas_Object * o __UNUSED__,
|
||||
on_view_mask_visible(void *data, Evas_Object *o __UNUSED__,
|
||||
const char *emission __UNUSED__, const char *source __UNUSED__)
|
||||
{
|
||||
Browser_Window *win = data;
|
||||
|
|
@ -415,7 +433,7 @@ on_view_mask_visible(void *data, Evas_Object * o __UNUSED__,
|
|||
}
|
||||
|
||||
static void
|
||||
on_view_mask_hidden(void *data, Evas_Object * o __UNUSED__,
|
||||
on_view_mask_hidden(void *data, Evas_Object *o __UNUSED__,
|
||||
const char *emission __UNUSED__, const char *source __UNUSED__)
|
||||
{
|
||||
Browser_Window *win = data;
|
||||
|
|
@ -424,7 +442,7 @@ on_view_mask_hidden(void *data, Evas_Object * o __UNUSED__,
|
|||
}
|
||||
|
||||
static void
|
||||
on_fav_on(void *data, Evas_Object * o __UNUSED__,
|
||||
on_fav_on(void *data, Evas_Object *o __UNUSED__,
|
||||
const char *emission __UNUSED__, const char *source __UNUSED__)
|
||||
{
|
||||
Evas_Object *view = data;
|
||||
|
|
@ -438,13 +456,14 @@ on_fav_on(void *data, Evas_Object * o __UNUSED__,
|
|||
}
|
||||
|
||||
static void
|
||||
on_fav_off(void *data, Evas_Object * o __UNUSED__,
|
||||
on_fav_off(void *data, Evas_Object *o __UNUSED__,
|
||||
const char *emission __UNUSED__, const char *source __UNUSED__)
|
||||
{
|
||||
Evas_Object *view = data;
|
||||
const char *url = ewk_view_uri_get(view);
|
||||
|
||||
if (url) fav_items_del(fav, url);
|
||||
if (url)
|
||||
fav_items_del(fav, url);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -467,7 +486,8 @@ _history_update(const char *url, const char *title)
|
|||
{
|
||||
Hist_Item *item;
|
||||
|
||||
if (!url) return;
|
||||
if (!url)
|
||||
return;
|
||||
|
||||
if ((item = hist_items_get(hist, url)))
|
||||
{
|
||||
|
|
@ -480,7 +500,7 @@ _history_update(const char *url, const char *title)
|
|||
}
|
||||
|
||||
static void
|
||||
_chrome_state_apply(Evas_Object * chrome, Evas_Object * view)
|
||||
_chrome_state_apply(Evas_Object *chrome, Evas_Object *view)
|
||||
{
|
||||
const char *url = ewk_view_uri_get(view);
|
||||
const char *title = ewk_view_title_get(view);
|
||||
|
|
@ -489,6 +509,7 @@ _chrome_state_apply(Evas_Object * chrome, Evas_Object * view)
|
|||
|
||||
if (!title)
|
||||
title = url;
|
||||
|
||||
edje_object_part_text_set(ed, "text.title", title ? title : "");
|
||||
|
||||
text_url = edje_object_part_swallow_get(ed, "url-entry");
|
||||
|
|
@ -500,7 +521,7 @@ _chrome_state_apply(Evas_Object * chrome, Evas_Object * view)
|
|||
}
|
||||
|
||||
static void
|
||||
on_view_load_progress(void *data, Evas_Object * view __UNUSED__,
|
||||
on_view_load_progress(void *data, Evas_Object *view __UNUSED__,
|
||||
void *event_info)
|
||||
{
|
||||
Evas_Object *chrome = data;
|
||||
|
|
@ -512,7 +533,7 @@ on_view_load_progress(void *data, Evas_Object * view __UNUSED__,
|
|||
}
|
||||
|
||||
static void
|
||||
on_view_title_changed(void *data, Evas_Object * view,
|
||||
on_view_title_changed(void *data, Evas_Object *view,
|
||||
void *event_info __UNUSED__)
|
||||
{
|
||||
Evas_Object *chrome = data;
|
||||
|
|
@ -521,7 +542,7 @@ on_view_title_changed(void *data, Evas_Object * view,
|
|||
}
|
||||
|
||||
static void
|
||||
on_view_uri_changed(void *data, Evas_Object * view, void *event_info __UNUSED__)
|
||||
on_view_uri_changed(void *data, Evas_Object *view, void *event_info __UNUSED__)
|
||||
{
|
||||
Evas_Object *chrome = data;
|
||||
|
||||
|
|
@ -529,7 +550,7 @@ on_view_uri_changed(void *data, Evas_Object * view, void *event_info __UNUSED__)
|
|||
}
|
||||
|
||||
static void
|
||||
on_view_zoom_interactive(void *data, Evas_Object * view __UNUSED__,
|
||||
on_view_zoom_interactive(void *data, Evas_Object *view __UNUSED__,
|
||||
void *event_info)
|
||||
{
|
||||
Evas_Object *chrome = data;
|
||||
|
|
@ -544,7 +565,7 @@ on_view_zoom_interactive(void *data, Evas_Object * view __UNUSED__,
|
|||
}
|
||||
|
||||
static void
|
||||
on_view_zoom_interactive_start(void *data, Evas_Object * view __UNUSED__,
|
||||
on_view_zoom_interactive_start(void *data, Evas_Object *view __UNUSED__,
|
||||
void *event_info __UNUSED__)
|
||||
{
|
||||
Evas_Object *chrome = data;
|
||||
|
|
@ -554,7 +575,7 @@ on_view_zoom_interactive_start(void *data, Evas_Object * view __UNUSED__,
|
|||
}
|
||||
|
||||
static void
|
||||
on_view_zoom_interactive_end(void *data, Evas_Object * view __UNUSED__,
|
||||
on_view_zoom_interactive_end(void *data, Evas_Object *view __UNUSED__,
|
||||
void *event_info __UNUSED__)
|
||||
{
|
||||
Evas_Object *chrome = data;
|
||||
|
|
@ -564,7 +585,7 @@ on_view_zoom_interactive_end(void *data, Evas_Object * view __UNUSED__,
|
|||
}
|
||||
|
||||
static void
|
||||
on_view_statusbar_text_set(void *data, Evas_Object * view __UNUSED__,
|
||||
on_view_statusbar_text_set(void *data, Evas_Object *view __UNUSED__,
|
||||
void *event_info)
|
||||
{
|
||||
Evas_Object *chrome = data;
|
||||
|
|
@ -576,7 +597,7 @@ on_view_statusbar_text_set(void *data, Evas_Object * view __UNUSED__,
|
|||
}
|
||||
|
||||
static void
|
||||
on_view_link_hover_in(void *data, Evas_Object * view __UNUSED__,
|
||||
on_view_link_hover_in(void *data, Evas_Object *view __UNUSED__,
|
||||
void *event_info)
|
||||
{
|
||||
Evas_Object *chrome = data;
|
||||
|
|
@ -588,7 +609,7 @@ on_view_link_hover_in(void *data, Evas_Object * view __UNUSED__,
|
|||
}
|
||||
|
||||
static void
|
||||
on_view_link_hover_out(void *data, Evas_Object * view __UNUSED__,
|
||||
on_view_link_hover_out(void *data, Evas_Object *view __UNUSED__,
|
||||
void *event_info __UNUSED__)
|
||||
{
|
||||
Evas_Object *chrome = data;
|
||||
|
|
@ -605,13 +626,13 @@ _view_popup_delete(void *notify)
|
|||
}
|
||||
|
||||
static void
|
||||
on_view_popup_delete(void *data, Evas_Object * view, void *event_info)
|
||||
on_view_popup_delete(void *data, Evas_Object *view, void *event_info)
|
||||
{
|
||||
ecore_idler_add(_view_popup_delete, data);
|
||||
}
|
||||
|
||||
static void
|
||||
_popup_item_selected(void *data, Evas_Object * obj, void *event_info)
|
||||
_popup_item_selected(void *data, Evas_Object *obj, void *event_info)
|
||||
{
|
||||
Evas_Object *view = data;
|
||||
Elm_List_Item *it = elm_list_selected_item_get(obj);
|
||||
|
|
@ -623,6 +644,7 @@ _popup_item_selected(void *data, Evas_Object * obj, void *event_info)
|
|||
{
|
||||
if (d == it)
|
||||
break;
|
||||
|
||||
i++;
|
||||
}
|
||||
|
||||
|
|
@ -631,7 +653,7 @@ _popup_item_selected(void *data, Evas_Object * obj, void *event_info)
|
|||
}
|
||||
|
||||
static void
|
||||
on_view_popup_new(void *data, Evas_Object * view, void *event_info)
|
||||
on_view_popup_new(void *data, Evas_Object *view, void *event_info)
|
||||
{
|
||||
Ewk_Menu *menu = event_info;
|
||||
Ewk_Menu_Item *item;
|
||||
|
|
@ -666,7 +688,7 @@ on_view_popup_new(void *data, Evas_Object * view, void *event_info)
|
|||
}
|
||||
|
||||
static void
|
||||
on_tab_close(void *data, Evas_Object * o,
|
||||
on_tab_close(void *data, Evas_Object *o,
|
||||
const char *emission __UNUSED__, const char *source __UNUSED__)
|
||||
{
|
||||
Browser_Window *win = evas_object_data_get(o, "win");
|
||||
|
|
@ -682,10 +704,10 @@ on_tab_close(void *data, Evas_Object * o,
|
|||
}
|
||||
|
||||
static void
|
||||
on_tab_gengrid_item_realized(void *data, Evas_Object * o, void *event_info)
|
||||
on_tab_gengrid_item_realized(void *data, Evas_Object *o, void *event_info)
|
||||
{
|
||||
Browser_Window *win = data;
|
||||
Evas_Object *item = (Evas_Object *) elm_gengrid_item_object_get(event_info);
|
||||
Evas_Object *item = (Evas_Object *)elm_gengrid_item_object_get(event_info);
|
||||
|
||||
evas_object_data_set(item, "item", event_info);
|
||||
evas_object_data_set(item, "win", win);
|
||||
|
|
@ -694,7 +716,7 @@ on_tab_gengrid_item_realized(void *data, Evas_Object * o, void *event_info)
|
|||
}
|
||||
|
||||
static void
|
||||
on_action_back(void *data, Evas_Object * o __UNUSED__,
|
||||
on_action_back(void *data, Evas_Object *o __UNUSED__,
|
||||
const char *emission __UNUSED__, const char *source __UNUSED__)
|
||||
{
|
||||
Evas_Object *view = data;
|
||||
|
|
@ -703,7 +725,7 @@ on_action_back(void *data, Evas_Object * o __UNUSED__,
|
|||
}
|
||||
|
||||
static void
|
||||
on_action_forward(void *data, Evas_Object * o __UNUSED__,
|
||||
on_action_forward(void *data, Evas_Object *o __UNUSED__,
|
||||
const char *emission __UNUSED__,
|
||||
const char *source __UNUSED__)
|
||||
{
|
||||
|
|
@ -712,7 +734,7 @@ on_action_forward(void *data, Evas_Object * o __UNUSED__,
|
|||
ewk_view_forward(view);
|
||||
}
|
||||
|
||||
static void on_bookmark_item_click(void *data, Evas_Object * obj, void *event_info __UNUSED__);
|
||||
static void on_bookmark_item_click(void *data, Evas_Object *obj, void *event_info __UNUSED__);
|
||||
static void on_bookmark_item_back_click(void *data, Evas_Object *edje, const char *emission __UNUSED__, const char *source __UNUSED__);
|
||||
|
||||
static void
|
||||
|
|
@ -781,6 +803,7 @@ on_bookmark_item_back_click(void *data, Evas_Object *edje,
|
|||
eina_stringshare_del(bmi->text);
|
||||
free(bmi);
|
||||
}
|
||||
|
||||
win->list_history = eina_list_remove_list(win->list_history, win->list_history);
|
||||
win->list_history_titles = eina_list_remove_list(win->list_history_titles, win->list_history_titles);
|
||||
|
||||
|
|
@ -791,7 +814,7 @@ on_bookmark_item_back_click(void *data, Evas_Object *edje,
|
|||
}
|
||||
|
||||
static void
|
||||
on_bookmark_item_click(void *data, Evas_Object * obj,
|
||||
on_bookmark_item_click(void *data, Evas_Object *obj,
|
||||
void *event_info __UNUSED__)
|
||||
{
|
||||
Evas_Object *chrome = evas_object_data_get(obj, "chrome");
|
||||
|
|
@ -800,7 +823,8 @@ on_bookmark_item_click(void *data, Evas_Object * obj,
|
|||
Browser_Window *win = evas_object_data_get(chrome, "win");
|
||||
const char *old_text = edje_object_part_text_get(ed, "bookmark-list-title");
|
||||
|
||||
if (!bmi) return;
|
||||
if (!bmi)
|
||||
return;
|
||||
|
||||
switch (bmi->type) {
|
||||
case ITEM_TYPE_STATIC_FOLDER:
|
||||
|
|
@ -809,10 +833,13 @@ on_bookmark_item_click(void *data, Evas_Object * obj,
|
|||
edje_object_part_text_set(ed, "bookmark-list-title", bmi->text);
|
||||
bookmark_menu_set(chrome, obj, bmi->next, old_text);
|
||||
break;
|
||||
|
||||
case ITEM_TYPE_DYNAMIC_FOLDER:
|
||||
{
|
||||
Bookmark_Menu_Callback callback = bmi->next;
|
||||
if (!callback) return;
|
||||
if (!callback)
|
||||
return;
|
||||
|
||||
Bookmark_Menu_Item *new_root = callback(bmi);
|
||||
if (new_root)
|
||||
{
|
||||
|
|
@ -823,22 +850,29 @@ on_bookmark_item_click(void *data, Evas_Object * obj,
|
|||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case ITEM_TYPE_LAST:
|
||||
case ITEM_TYPE_SEPARATOR:
|
||||
break;
|
||||
|
||||
case ITEM_TYPE_CALLBACK:
|
||||
{
|
||||
Bookmark_Menu_Callback callback = bmi->next;
|
||||
Evas_Object *ed = elm_layout_edje_get(chrome);
|
||||
if (callback) callback(bmi);
|
||||
if (callback)
|
||||
callback(bmi);
|
||||
|
||||
edje_object_signal_emit(ed, "bookmark,item,clicked", "");
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
{
|
||||
Browser_Window *win = evas_object_data_get(chrome, "win");
|
||||
Evas_Object *ed = elm_layout_edje_get(chrome);
|
||||
if (win) ewk_view_uri_set(win->current_view, bmi->next);
|
||||
if (win)
|
||||
ewk_view_uri_set(win->current_view, bmi->next);
|
||||
|
||||
edje_object_signal_emit(ed, "bookmark,item,clicked", "");
|
||||
}
|
||||
break;
|
||||
|
|
@ -858,8 +892,8 @@ view_screenshot_add(Evas *evas, const Evas_Object *view)
|
|||
int stride;
|
||||
void *pixels, *dest;
|
||||
|
||||
sd = (Ewk_View_Smart_Data *) evas_object_smart_data_get(view);
|
||||
priv = (Ewk_View_Private_Data *) sd->_priv;
|
||||
sd = (Ewk_View_Smart_Data *)evas_object_smart_data_get(view);
|
||||
priv = (Ewk_View_Private_Data *)sd->_priv;
|
||||
|
||||
/* assuming colorspace is EVAS_COLORSPACE_ARGB8888 */
|
||||
stride = rect.w * 4;
|
||||
|
|
@ -894,9 +928,9 @@ view_screenshot_add(Evas *evas, const Evas_Object *view)
|
|||
evas_object_image_data_set(img, dest);
|
||||
}
|
||||
|
||||
error_cairo_create:
|
||||
error_cairo_create:
|
||||
cairo_destroy(cairo);
|
||||
error_cairo_surface_create:
|
||||
error_cairo_surface_create:
|
||||
cairo_surface_destroy(surface);
|
||||
|
||||
return img;
|
||||
|
|
@ -925,7 +959,7 @@ tab_grid_new_tab_click(void *data, Evas_Object *obj, void *event_info)
|
|||
}
|
||||
|
||||
static void
|
||||
on_action_tab_show(void *data, Evas_Object * o __UNUSED__,
|
||||
on_action_tab_show(void *data, Evas_Object *o __UNUSED__,
|
||||
const char *emission __UNUSED__,
|
||||
const char *source __UNUSED__)
|
||||
{
|
||||
|
|
@ -947,14 +981,14 @@ on_action_tab_show(void *data, Evas_Object * o __UNUSED__,
|
|||
}
|
||||
|
||||
static void
|
||||
on_action_tab_hide(void *data, Evas_Object * o __UNUSED__,
|
||||
on_action_tab_hide(void *data, Evas_Object *o __UNUSED__,
|
||||
const char *emission __UNUSED__,
|
||||
const char *source __UNUSED__)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
on_action_bookmark_hide(void *data, Evas_Object * o __UNUSED__,
|
||||
on_action_bookmark_hide(void *data, Evas_Object *o __UNUSED__,
|
||||
const char *emission __UNUSED__,
|
||||
const char *source __UNUSED__)
|
||||
{
|
||||
|
|
@ -969,6 +1003,7 @@ on_action_bookmark_hide(void *data, Evas_Object * o __UNUSED__,
|
|||
eina_stringshare_del(bmi->text);
|
||||
free(bmi);
|
||||
}
|
||||
|
||||
eina_stringshare_del(edje_object_part_text_get(edje, "bookmark-list-back-button-text"));
|
||||
eina_list_free(win->list_history_titles);
|
||||
win->list_history = NULL;
|
||||
|
|
@ -976,7 +1011,7 @@ on_action_bookmark_hide(void *data, Evas_Object * o __UNUSED__,
|
|||
}
|
||||
|
||||
static void
|
||||
on_action_bookmark_show(void *data, Evas_Object * o __UNUSED__,
|
||||
on_action_bookmark_show(void *data, Evas_Object *o __UNUSED__,
|
||||
const char *emission __UNUSED__,
|
||||
const char *source __UNUSED__)
|
||||
{
|
||||
|
|
@ -987,7 +1022,7 @@ on_action_bookmark_show(void *data, Evas_Object * o __UNUSED__,
|
|||
}
|
||||
|
||||
static void
|
||||
on_action_pause(void *data, Evas_Object * o __UNUSED__,
|
||||
on_action_pause(void *data, Evas_Object *o __UNUSED__,
|
||||
const char *emission __UNUSED__, const char *source __UNUSED__)
|
||||
{
|
||||
Evas_Object *view = data;
|
||||
|
|
@ -996,7 +1031,7 @@ on_action_pause(void *data, Evas_Object * o __UNUSED__,
|
|||
}
|
||||
|
||||
static void
|
||||
on_action_reload(void *data, Evas_Object * o __UNUSED__,
|
||||
on_action_reload(void *data, Evas_Object *o __UNUSED__,
|
||||
const char *emission __UNUSED__, const char *source __UNUSED__)
|
||||
{
|
||||
Evas_Object *view = data;
|
||||
|
|
@ -1005,7 +1040,7 @@ on_action_reload(void *data, Evas_Object * o __UNUSED__,
|
|||
}
|
||||
|
||||
static void
|
||||
on_action_home(void *data, Evas_Object * o __UNUSED__,
|
||||
on_action_home(void *data, Evas_Object *o __UNUSED__,
|
||||
const char *emission __UNUSED__, const char *source __UNUSED__)
|
||||
{
|
||||
Evas_Object *view = data;
|
||||
|
|
@ -1014,7 +1049,7 @@ on_action_home(void *data, Evas_Object * o __UNUSED__,
|
|||
}
|
||||
|
||||
static void
|
||||
on_action_load_page(void *data, Evas_Object * view, void *event_info __UNUSED__)
|
||||
on_action_load_page(void *data, Evas_Object *view, void *event_info __UNUSED__)
|
||||
{
|
||||
Evas_Object *ewk_view = data;
|
||||
|
||||
|
|
@ -1030,7 +1065,7 @@ on_action_load_page(void *data, Evas_Object * view, void *event_info __UNUSED__)
|
|||
}
|
||||
|
||||
static void
|
||||
on_view_load_error(void *data __UNUSED__, Evas_Object * view __UNUSED__,
|
||||
on_view_load_error(void *data __UNUSED__, Evas_Object *view __UNUSED__,
|
||||
void *event_info)
|
||||
{
|
||||
const Ewk_Frame_Load_Error *error = event_info;
|
||||
|
|
@ -1051,6 +1086,7 @@ on_view_load_error(void *data __UNUSED__, Evas_Object * view __UNUSED__,
|
|||
|
||||
if (error->is_cancellation)
|
||||
return;
|
||||
|
||||
if (!frame)
|
||||
{
|
||||
ERR("error loading '%s': %s", error->failing_url, error->description);
|
||||
|
|
@ -1070,7 +1106,7 @@ on_view_load_error(void *data __UNUSED__, Evas_Object * view __UNUSED__,
|
|||
}
|
||||
|
||||
static void
|
||||
on_view_download_request(void *data, Evas_Object * view __UNUSED__,
|
||||
on_view_download_request(void *data, Evas_Object *view __UNUSED__,
|
||||
void *event_info)
|
||||
{
|
||||
Ewk_Download *download = event_info;
|
||||
|
|
@ -1079,7 +1115,7 @@ on_view_download_request(void *data, Evas_Object * view __UNUSED__,
|
|||
}
|
||||
|
||||
static void
|
||||
on_inputmethods_changed(void *data, Evas_Object* view, void *event_info)
|
||||
on_inputmethods_changed(void *data, Evas_Object *view, void *event_info)
|
||||
{
|
||||
Eina_Bool active = (Eina_Bool)(long)event_info;
|
||||
Evas_Object *win = data;
|
||||
|
|
@ -1102,6 +1138,7 @@ on_inputmethods_changed(void *data, Evas_Object* view, void *event_info)
|
|||
elm_win_keyboard_mode_set(win, ELM_WIN_KEYBOARD_URL);
|
||||
else if (imh & EWK_IMH_PASSWORD)
|
||||
elm_win_keyboard_mode_set(win, ELM_WIN_KEYBOARD_PASSWORD);
|
||||
|
||||
#if 0
|
||||
else if (imh & EWK_IMH_EMAIL)
|
||||
elm_win_keyboard_mode_set(win, ELM_WIN_KEYBOARD_
|
||||
|
|
@ -1112,7 +1149,7 @@ on_inputmethods_changed(void *data, Evas_Object* view, void *event_info)
|
|||
|
||||
#if 0
|
||||
static void
|
||||
win_title_set(Browser_Window * win)
|
||||
win_title_set(Browser_Window *win)
|
||||
{
|
||||
const char *view_title = ewk_view_title_get(win->view);
|
||||
int p = ewk_view_load_progress_get(win->view) * 100;
|
||||
|
|
@ -1132,7 +1169,7 @@ win_title_set(Browser_Window * win)
|
|||
}
|
||||
|
||||
static void
|
||||
on_view_load_progress(void *data, Evas_Object * view __UNUSED__,
|
||||
on_view_load_progress(void *data, Evas_Object *view __UNUSED__,
|
||||
void *event_info __UNUSED__)
|
||||
{
|
||||
Browser_Window *win = data;
|
||||
|
|
@ -1141,18 +1178,18 @@ on_view_load_progress(void *data, Evas_Object * view __UNUSED__,
|
|||
}
|
||||
|
||||
static void
|
||||
on_view_title_changed(void *data, Evas_Object * view __UNUSED__,
|
||||
on_view_title_changed(void *data, Evas_Object *view __UNUSED__,
|
||||
void *event_info __UNUSED__)
|
||||
{
|
||||
Browser_Window *win = data;
|
||||
|
||||
win_title_set(win);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
static void
|
||||
on_key_down(void *data, Evas * e __UNUSED__, Evas_Object * o __UNUSED__,
|
||||
on_key_down(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__,
|
||||
void *event_info)
|
||||
{
|
||||
Browser_Window *win = data;
|
||||
|
|
@ -1221,7 +1258,7 @@ tab_grid_del(const void *data, Evas_Object *obj)
|
|||
}
|
||||
|
||||
Evas_Object *
|
||||
chrome_add(Browser_Window * win, const char *url)
|
||||
chrome_add(Browser_Window *win, const char *url)
|
||||
{
|
||||
Evas_Object *chrome = elm_layout_add(win->win);
|
||||
Evas_Object *ed = elm_layout_edje_get(chrome);
|
||||
|
|
@ -1244,6 +1281,7 @@ chrome_add(Browser_Window * win, const char *url)
|
|||
CRITICAL("Could not create view");
|
||||
goto error_view_create;
|
||||
}
|
||||
|
||||
evas_object_focus_set(view, 1);
|
||||
elm_layout_content_set(chrome, "view", view);
|
||||
|
||||
|
|
@ -1257,6 +1295,7 @@ chrome_add(Browser_Window * win, const char *url)
|
|||
INF("using custom user agent string: %s\n", win->app->user_agent);
|
||||
ewk_view_setting_user_agent_set(view, win->app->user_agent);
|
||||
}
|
||||
|
||||
ewk_view_setting_enable_plugins_set(view, !win->app->disable_plugins);
|
||||
|
||||
evas_object_event_callback_add(view, EVAS_CALLBACK_KEY_DOWN, on_key_down,
|
||||
|
|
@ -1363,7 +1402,8 @@ chrome_add(Browser_Window * win, const char *url)
|
|||
elm_pager_content_push(win->pager, chrome);
|
||||
return chrome;
|
||||
|
||||
error_view_create:
|
||||
error_view_create:
|
||||
evas_object_del(chrome);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -30,10 +30,10 @@
|
|||
textdomain(), and is useful for libraries. */
|
||||
# ifdef DEFAULT_TEXT_DOMAIN
|
||||
# undef gettext
|
||||
# define gettext(Msgid) \
|
||||
# define gettext(Msgid)\
|
||||
dgettext (DEFAULT_TEXT_DOMAIN, Msgid)
|
||||
# undef ngettext
|
||||
# define ngettext(Msgid1, Msgid2, N) \
|
||||
# define ngettext(Msgid1, Msgid2, N)\
|
||||
dngettext (DEFAULT_TEXT_DOMAIN, Msgid1, Msgid2, N)
|
||||
# endif
|
||||
|
||||
|
|
@ -61,23 +61,23 @@
|
|||
for invalid uses of the value returned from these functions.
|
||||
On pre-ANSI systems without 'const', the config.h file is supposed to
|
||||
contain "#define const". */
|
||||
# define gettext(Msgid) ((const char *) (Msgid))
|
||||
# define dgettext(Domainname, Msgid) ((void) (Domainname), gettext (Msgid))
|
||||
# define dcgettext(Domainname, Msgid, Category) \
|
||||
((void) (Category), dgettext (Domainname, Msgid))
|
||||
# define ngettext(Msgid1, Msgid2, N) \
|
||||
((N) == 1 \
|
||||
? ((void) (Msgid2), (const char *) (Msgid1)) \
|
||||
: ((void) (Msgid1), (const char *) (Msgid2)))
|
||||
# define dngettext(Domainname, Msgid1, Msgid2, N) \
|
||||
((void) (Domainname), ngettext (Msgid1, Msgid2, N))
|
||||
# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
|
||||
((void) (Category), dngettext(Domainname, Msgid1, Msgid2, N))
|
||||
# define textdomain(Domainname) ((const char *) (Domainname))
|
||||
# define bindtextdomain(Domainname, Dirname) \
|
||||
((void) (Domainname), (const char *) (Dirname))
|
||||
# define bind_textdomain_codeset(Domainname, Codeset) \
|
||||
((void) (Domainname), (const char *) (Codeset))
|
||||
# define gettext(Msgid) ((const char *)(Msgid))
|
||||
# define dgettext(Domainname, Msgid) ((void)(Domainname), gettext (Msgid))
|
||||
# define dcgettext(Domainname, Msgid, Category)\
|
||||
((void)(Category), dgettext (Domainname, Msgid))
|
||||
# define ngettext(Msgid1, Msgid2, N)\
|
||||
((N) == 1\
|
||||
? ((void)(Msgid2), (const char *)(Msgid1))\
|
||||
: ((void)(Msgid1), (const char *)(Msgid2)))
|
||||
# define dngettext(Domainname, Msgid1, Msgid2, N)\
|
||||
((void)(Domainname), ngettext (Msgid1, Msgid2, N))
|
||||
# define dcngettext(Domainname, Msgid1, Msgid2, N, Category)\
|
||||
((void)(Category), dngettext(Domainname, Msgid1, Msgid2, N))
|
||||
# define textdomain(Domainname) ((const char *)(Domainname))
|
||||
# define bindtextdomain(Domainname, Dirname)\
|
||||
((void)(Domainname), (const char *)(Dirname))
|
||||
# define bind_textdomain_codeset(Domainname, Codeset)\
|
||||
((void)(Domainname), (const char *)(Codeset))
|
||||
|
||||
#endif
|
||||
|
||||
|
|
@ -98,26 +98,26 @@
|
|||
short and rarely need to change.
|
||||
The letter 'p' stands for 'particular' or 'special'. */
|
||||
#ifdef DEFAULT_TEXT_DOMAIN
|
||||
# define pgettext(Msgctxt, Msgid) \
|
||||
# define pgettext(Msgctxt, Msgid)\
|
||||
pgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
|
||||
#else
|
||||
# define pgettext(Msgctxt, Msgid) \
|
||||
# define pgettext(Msgctxt, Msgid)\
|
||||
pgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
|
||||
#endif
|
||||
#define dpgettext(Domainname, Msgctxt, Msgid) \
|
||||
#define dpgettext(Domainname, Msgctxt, Msgid)\
|
||||
pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
|
||||
#define dcpgettext(Domainname, Msgctxt, Msgid, Category) \
|
||||
#define dcpgettext(Domainname, Msgctxt, Msgid, Category)\
|
||||
pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, Category)
|
||||
#ifdef DEFAULT_TEXT_DOMAIN
|
||||
# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
|
||||
# define npgettext(Msgctxt, Msgid, MsgidPlural, N)\
|
||||
npgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
|
||||
#else
|
||||
# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
|
||||
# define npgettext(Msgctxt, Msgid, MsgidPlural, N)\
|
||||
npgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
|
||||
#endif
|
||||
#define dnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
|
||||
#define dnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N)\
|
||||
npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
|
||||
#define dcnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N, Category) \
|
||||
#define dcnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N, Category)\
|
||||
npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, Category)
|
||||
|
||||
#ifdef __GNUC__
|
||||
|
|
@ -166,17 +166,17 @@ npgettext_aux (const char *domain,
|
|||
|
||||
#include <string.h>
|
||||
|
||||
#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \
|
||||
(((__GNUC__ >= 3 || __GNUG__ >= 2) && !__STRICT_ANSI__) \
|
||||
/* || __STDC_VERSION__ >= 199901L */ )
|
||||
#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS\
|
||||
(((__GNUC__ >= 3 || __GNUG__ >= 2) && !__STRICT_ANSI__)\
|
||||
/* || __STDC_VERSION__ >= 199901L */)
|
||||
|
||||
#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
|
||||
#include <stdlib.h>
|
||||
#endif
|
||||
|
||||
#define pgettext_expr(Msgctxt, Msgid) \
|
||||
#define pgettext_expr(Msgctxt, Msgid)\
|
||||
dcpgettext_expr (NULL, Msgctxt, Msgid, LC_MESSAGES)
|
||||
#define dpgettext_expr(Domainname, Msgctxt, Msgid) \
|
||||
#define dpgettext_expr(Domainname, Msgctxt, Msgid)\
|
||||
dcpgettext_expr (Domainname, Msgctxt, Msgid, LC_MESSAGES)
|
||||
|
||||
#ifdef __GNUC__
|
||||
|
|
@ -201,7 +201,7 @@ dcpgettext_expr (const char *domain,
|
|||
char *msg_ctxt_id =
|
||||
(msgctxt_len + msgid_len <= sizeof (buf)
|
||||
? buf
|
||||
: (char *) malloc (msgctxt_len + msgid_len));
|
||||
: (char *)malloc (msgctxt_len + msgid_len));
|
||||
if (msg_ctxt_id)
|
||||
#endif
|
||||
{
|
||||
|
|
@ -212,16 +212,18 @@ dcpgettext_expr (const char *domain,
|
|||
#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
|
||||
if (msg_ctxt_id != buf)
|
||||
free (msg_ctxt_id);
|
||||
|
||||
#endif
|
||||
if (translation != msg_ctxt_id)
|
||||
return translation;
|
||||
}
|
||||
|
||||
return msgid;
|
||||
}
|
||||
|
||||
#define npgettext_expr(Msgctxt, Msgid, MsgidPlural, N) \
|
||||
#define npgettext_expr(Msgctxt, Msgid, MsgidPlural, N)\
|
||||
dcnpgettext_expr (NULL, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
|
||||
#define dnpgettext_expr(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
|
||||
#define dnpgettext_expr(Domainname, Msgctxt, Msgid, MsgidPlural, N)\
|
||||
dcnpgettext_expr (Domainname, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
|
||||
|
||||
#ifdef __GNUC__
|
||||
|
|
@ -247,7 +249,7 @@ dcnpgettext_expr (const char *domain,
|
|||
char *msg_ctxt_id =
|
||||
(msgctxt_len + msgid_len <= sizeof (buf)
|
||||
? buf
|
||||
: (char *) malloc (msgctxt_len + msgid_len));
|
||||
: (char *)malloc (msgctxt_len + msgid_len));
|
||||
if (msg_ctxt_id)
|
||||
#endif
|
||||
{
|
||||
|
|
@ -258,10 +260,12 @@ dcnpgettext_expr (const char *domain,
|
|||
#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
|
||||
if (msg_ctxt_id != buf)
|
||||
free (msg_ctxt_id);
|
||||
|
||||
#endif
|
||||
if (!(translation == msg_ctxt_id || translation == msgid_plural))
|
||||
return translation;
|
||||
}
|
||||
|
||||
return (n == 1 ? msgid : msgid_plural);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ Hist *hist = NULL;
|
|||
App app;
|
||||
|
||||
static void
|
||||
del_win(App * app, Evas_Object * win)
|
||||
del_win(App *app, Evas_Object *win)
|
||||
{
|
||||
Browser_Window *win_data;
|
||||
Eina_List *l;
|
||||
|
|
@ -42,14 +42,14 @@ del_win(App * app, Evas_Object * win)
|
|||
}
|
||||
|
||||
static void
|
||||
on_win_del_req(void *data, Evas_Object * win, void *event_info __UNUSED__)
|
||||
on_win_del_req(void *data, Evas_Object *win, void *event_info __UNUSED__)
|
||||
{
|
||||
del_win(data, win);
|
||||
}
|
||||
|
||||
/* this should be in elm_win... */
|
||||
static void
|
||||
win_mouse_disable(Evas_Object * win)
|
||||
win_mouse_disable(Evas_Object *win)
|
||||
{
|
||||
Evas *e = evas_object_evas_get(win);
|
||||
Ecore_Evas *ee = evas_data_attach_get(e);
|
||||
|
|
@ -61,7 +61,7 @@ win_mouse_disable(Evas_Object * win)
|
|||
}
|
||||
|
||||
Eina_Bool
|
||||
tab_add(Browser_Window * win, const char *url)
|
||||
tab_add(Browser_Window *win, const char *url)
|
||||
{
|
||||
Evas_Object *chrome = chrome_add(win, url);
|
||||
|
||||
|
|
@ -70,6 +70,7 @@ tab_add(Browser_Window * win, const char *url)
|
|||
CRITICAL("Could not create chrome.");
|
||||
goto error_chrome_create;
|
||||
}
|
||||
|
||||
evas_object_size_hint_weight_set(chrome, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_show(chrome);
|
||||
|
||||
|
|
@ -80,14 +81,14 @@ tab_add(Browser_Window * win, const char *url)
|
|||
|
||||
return EINA_TRUE;
|
||||
|
||||
error_chrome_create:
|
||||
error_chrome_create:
|
||||
evas_object_del(evas_object_data_get(chrome, "view"));
|
||||
|
||||
return EINA_FALSE;
|
||||
}
|
||||
|
||||
Eina_Bool
|
||||
tab_focus_chrome(Browser_Window * win, Evas_Object * chrome)
|
||||
tab_focus_chrome(Browser_Window *win, Evas_Object *chrome)
|
||||
{
|
||||
Eina_List *itr;
|
||||
int n;
|
||||
|
|
@ -95,7 +96,7 @@ tab_focus_chrome(Browser_Window * win, Evas_Object * chrome)
|
|||
if (!chrome)
|
||||
return EINA_FALSE;
|
||||
|
||||
for (n = 0, itr = win->chromes; itr->data != chrome; n++, itr = itr->next);
|
||||
for (n = 0, itr = win->chromes; itr->data != chrome; n++, itr = itr->next) ;
|
||||
|
||||
evas_object_hide(win->current_chrome);
|
||||
|
||||
|
|
@ -111,31 +112,33 @@ tab_focus_chrome(Browser_Window * win, Evas_Object * chrome)
|
|||
}
|
||||
|
||||
Eina_Bool
|
||||
tab_focus_nth(Browser_Window * win, unsigned int n)
|
||||
tab_focus_nth(Browser_Window *win, unsigned int n)
|
||||
{
|
||||
return tab_focus_chrome(win, eina_list_nth(win->chromes, n));
|
||||
}
|
||||
|
||||
Eina_Bool
|
||||
tab_focus_next(Browser_Window * win)
|
||||
tab_focus_next(Browser_Window *win)
|
||||
{
|
||||
unsigned int n_tabs = eina_list_count(win->chromes);
|
||||
|
||||
if (win->current_tab > n_tabs)
|
||||
return EINA_FALSE;
|
||||
|
||||
return tab_focus_nth(win, win->current_tab + 1);
|
||||
}
|
||||
|
||||
Eina_Bool
|
||||
tab_focus_prev(Browser_Window * win)
|
||||
tab_focus_prev(Browser_Window *win)
|
||||
{
|
||||
if (win->current_tab == 0)
|
||||
return EINA_FALSE;
|
||||
|
||||
return tab_focus_nth(win, win->current_tab - 1);
|
||||
}
|
||||
|
||||
Eina_Bool
|
||||
tab_close_chrome(Browser_Window * win, Evas_Object * chrome)
|
||||
tab_close_chrome(Browser_Window *win, Evas_Object *chrome)
|
||||
{
|
||||
Evas_Object *edje;
|
||||
|
||||
|
|
@ -160,19 +163,19 @@ tab_close_chrome(Browser_Window * win, Evas_Object * chrome)
|
|||
}
|
||||
|
||||
Eina_Bool
|
||||
tab_close_nth(Browser_Window * win, int n)
|
||||
tab_close_nth(Browser_Window *win, int n)
|
||||
{
|
||||
return tab_close_chrome(win, eina_list_nth(win->chromes, n));
|
||||
}
|
||||
|
||||
Eina_Bool
|
||||
tab_close_view(Browser_Window * win, Evas_Object *view)
|
||||
tab_close_view(Browser_Window *win, Evas_Object *view)
|
||||
{
|
||||
return tab_close_chrome(win, evas_object_data_get(view, "chrome"));
|
||||
}
|
||||
|
||||
static Browser_Window *
|
||||
add_win(App * app, const char *url)
|
||||
add_win(App *app, const char *url)
|
||||
{
|
||||
Browser_Window *win = malloc(sizeof(*win));
|
||||
|
||||
|
|
@ -209,6 +212,7 @@ add_win(App * app, const char *url)
|
|||
CRITICAL("Could not create background.");
|
||||
goto error_bg_create;
|
||||
}
|
||||
|
||||
if (!edje_object_file_set(win->bg, PACKAGE_DATA_DIR "/default.edj", "bg"))
|
||||
{
|
||||
int err = edje_object_load_error_get(win->bg);
|
||||
|
|
@ -218,6 +222,7 @@ add_win(App * app, const char *url)
|
|||
CRITICAL("Could not load background theme: %s", msg);
|
||||
goto error_bg_theme_set;
|
||||
}
|
||||
|
||||
evas_object_size_hint_weight_set(win->bg, EVAS_HINT_EXPAND,
|
||||
EVAS_HINT_EXPAND);
|
||||
elm_win_resize_object_add(win->win, win->bg);
|
||||
|
|
@ -230,6 +235,7 @@ add_win(App * app, const char *url)
|
|||
CRITICAL("Could not create pager");
|
||||
goto error_pager_create;
|
||||
}
|
||||
|
||||
elm_object_style_set(win->pager, "ewebkit");
|
||||
evas_object_size_hint_weight_set(win->pager, EVAS_HINT_EXPAND,
|
||||
EVAS_HINT_EXPAND);
|
||||
|
|
@ -248,15 +254,15 @@ add_win(App * app, const char *url)
|
|||
|
||||
return win;
|
||||
|
||||
error_bg_theme_set:
|
||||
error_bg_theme_set:
|
||||
evas_object_del(win->bg);
|
||||
error_bg_create:
|
||||
error_bg_create:
|
||||
evas_object_del(win->win);
|
||||
error_win_create:
|
||||
error_win_create:
|
||||
free(win);
|
||||
error_win_data:
|
||||
error_tab_add:
|
||||
error_pager_create:
|
||||
error_win_data:
|
||||
error_tab_add:
|
||||
error_pager_create:
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
@ -298,7 +304,8 @@ static const Ecore_Getopt options = {
|
|||
ECORE_GETOPT_COPYRIGHT('C', "copyright"),
|
||||
ECORE_GETOPT_LICENSE('L', "license"),
|
||||
ECORE_GETOPT_HELP('h', "help"),
|
||||
ECORE_GETOPT_SENTINEL}
|
||||
ECORE_GETOPT_SENTINEL
|
||||
}
|
||||
};
|
||||
|
||||
EAPI int
|
||||
|
|
@ -382,6 +389,7 @@ elm_main(int argc, char **argv)
|
|||
r = -1;
|
||||
goto end;
|
||||
}
|
||||
|
||||
if (!ewk_settings_icon_database_path_set(path))
|
||||
{
|
||||
ERR("Could not set icon database path to %s", path);
|
||||
|
|
@ -412,7 +420,7 @@ elm_main(int argc, char **argv)
|
|||
}
|
||||
|
||||
elm_run();
|
||||
end:
|
||||
end:
|
||||
fav_save(fav, NULL);
|
||||
fav_free(fav);
|
||||
|
||||
|
|
@ -429,5 +437,6 @@ elm_main(int argc, char **argv)
|
|||
history_shutdown();
|
||||
return r;
|
||||
}
|
||||
|
||||
#endif
|
||||
ELM_MAIN()
|
||||
|
|
|
|||
|
|
@ -77,23 +77,23 @@ struct _View_Zoom_Interactive
|
|||
* * "zoom,interactive,end" void: report zoom interactive is finished.
|
||||
*/
|
||||
|
||||
Evas_Object *window_create();
|
||||
Evas_Object *view_add(Evas_Object *parent);
|
||||
Evas_Object * window_create();
|
||||
Evas_Object * view_add(Evas_Object *parent);
|
||||
void view_zoom_next_up(Evas_Object *view);
|
||||
void view_zoom_next_down(Evas_Object *view);
|
||||
Eina_Bool view_context_menu_set(Evas_Object *view, Evas_Object *widget, Ewk_Context_Menu *menu);
|
||||
Evas_Object *view_context_menu_widget_get(Evas_Object *view);
|
||||
Ewk_Context_Menu *view_context_menu_get(Evas_Object *view);
|
||||
Evas_Object * view_context_menu_widget_get(Evas_Object *view);
|
||||
Ewk_Context_Menu * view_context_menu_get(Evas_Object *view);
|
||||
|
||||
Evas_Object *chrome_add(Browser_Window *win, const char *url);
|
||||
Evas_Object * chrome_add(Browser_Window *win, const char *url);
|
||||
|
||||
Eina_Bool tab_add(Browser_Window *win, const char *url);
|
||||
Eina_Bool tab_focus_nth(Browser_Window *win, unsigned int n);
|
||||
Eina_Bool tab_focus_chrome(Browser_Window * win, Evas_Object * chrome);
|
||||
Eina_Bool tab_focus_chrome(Browser_Window *win, Evas_Object *chrome);
|
||||
Eina_Bool tab_focus_next(Browser_Window *win);
|
||||
Eina_Bool tab_focus_prev(Browser_Window *win);
|
||||
Eina_Bool tab_close_nth(Browser_Window *win, int n);
|
||||
Eina_Bool tab_close_view(Browser_Window *win, Evas_Object * view);
|
||||
Eina_Bool tab_close_chrome(Browser_Window * win, Evas_Object * chrome);
|
||||
Eina_Bool tab_close_view(Browser_Window *win, Evas_Object *view);
|
||||
Eina_Bool tab_close_chrome(Browser_Window *win, Evas_Object *chrome);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ static const double LONG_CALCULATE_TIMEOUT = 0.6;
|
|||
#include <X11/Xlib.h>
|
||||
#endif
|
||||
|
||||
|
||||
/* value to consider as double/float error, differences smaller than
|
||||
* this are ignored
|
||||
*/
|
||||
|
|
@ -24,8 +23,6 @@ static const double KINETIC_FRICTION = 1.0;
|
|||
/* Minimum value to consider velocity worth doing kinetic animation */
|
||||
static const Evas_Coord KINETIC_VELOCITY_THRESHOLD = 20;
|
||||
|
||||
|
||||
|
||||
/* How long the auto zoom animation should take, in seconds */
|
||||
static const double ZOOM_AUTO_ANIMATION_DURATION = 0.5;
|
||||
|
||||
|
|
@ -39,7 +36,6 @@ static const float ZOOM_AUTO_MIN = 0.3;
|
|||
static const float ZOOM_AUTO_MAX = 4.0;
|
||||
static const float ZOOM_AUTO_MIN_DIFFERENCE = 0.01;
|
||||
|
||||
|
||||
/* How long the interactive zoom animation should take, in seconds */
|
||||
static const double ZOOM_STEP_ANIMATION_DURATION = 0.8;
|
||||
|
||||
|
|
@ -48,7 +44,7 @@ static const Evas_Coord ZOOM_STEP_THRESHOLD = 50;
|
|||
static const float ZOOM_STEPS[] = {
|
||||
0.3, 0.5, 0.67, 0.8, 0.9, 1.0, 1.1, 1.2, 1.33, 1.5, 1.7, 2.0, 2.4, 3.0,
|
||||
};
|
||||
static const unsigned int ZOOM_STEPS_LAST = sizeof(ZOOM_STEPS)/sizeof(ZOOM_STEPS[0]);
|
||||
static const unsigned int ZOOM_STEPS_LAST = sizeof(ZOOM_STEPS) / sizeof(ZOOM_STEPS[0]);
|
||||
|
||||
/*
|
||||
* Structure filled by ewk_view_single_smart_set() from
|
||||
|
|
@ -60,22 +56,22 @@ static Ewk_View_Smart_Class _parent_sc = EWK_VIEW_SMART_CLASS_INIT_NULL;
|
|||
|
||||
typedef struct _View_Smart_Data View_Smart_Data;
|
||||
|
||||
#define VIEW_SD_GET_OR_RETURN(o, sd, ...) \
|
||||
View_Smart_Data *sd = evas_object_smart_data_get(o); \
|
||||
if (!sd) \
|
||||
{ \
|
||||
CRITICAL("no smart data for object %p [%s]", \
|
||||
o, evas_object_type_get(o)); \
|
||||
return __VA_ARGS__; \
|
||||
#define VIEW_SD_GET_OR_RETURN(o, sd, ...)\
|
||||
View_Smart_Data * sd = evas_object_smart_data_get(o);\
|
||||
if (!sd)\
|
||||
{\
|
||||
CRITICAL("no smart data for object %p [%s]",\
|
||||
o, evas_object_type_get(o));\
|
||||
return __VA_ARGS__;\
|
||||
}
|
||||
|
||||
#define EWK_VIEW_SD_GET_OR_RETURN(o, sd, ...) \
|
||||
Ewk_View_Smart_Data *sd = evas_object_smart_data_get(o); \
|
||||
if (!sd) \
|
||||
{ \
|
||||
CRITICAL("no smart data for object %p [%s]", \
|
||||
o, evas_object_type_get(o)); \
|
||||
return __VA_ARGS__; \
|
||||
#define EWK_VIEW_SD_GET_OR_RETURN(o, sd, ...)\
|
||||
Ewk_View_Smart_Data * sd = evas_object_smart_data_get(o);\
|
||||
if (!sd)\
|
||||
{\
|
||||
CRITICAL("no smart data for object %p [%s]",\
|
||||
o, evas_object_type_get(o));\
|
||||
return __VA_ARGS__;\
|
||||
}
|
||||
|
||||
struct point_history
|
||||
|
|
@ -141,7 +137,7 @@ struct _View_Smart_Data
|
|||
|
||||
float min_zoom;
|
||||
|
||||
Eina_Bool interactive:1;
|
||||
Eina_Bool interactive : 1;
|
||||
} zoom;
|
||||
|
||||
/* context used during kinetic animator */
|
||||
|
|
@ -163,22 +159,21 @@ struct _View_Smart_Data
|
|||
/* flags to state we ended animation in those axis */
|
||||
struct
|
||||
{
|
||||
Eina_Bool x:1;
|
||||
Eina_Bool y:1;
|
||||
Eina_Bool x : 1;
|
||||
Eina_Bool y : 1;
|
||||
} done;
|
||||
} kinetic;
|
||||
|
||||
/* general flags */
|
||||
struct
|
||||
{
|
||||
Eina_Bool first_calculate:1;
|
||||
Eina_Bool animated_zoom:1;
|
||||
Eina_Bool first_calculate : 1;
|
||||
Eina_Bool animated_zoom : 1;
|
||||
} flags;
|
||||
|
||||
Evas_Object *context_menu;
|
||||
};
|
||||
|
||||
|
||||
/***********************************************************************
|
||||
* Helper functions *
|
||||
**********************************************************************/
|
||||
|
|
@ -239,11 +234,13 @@ _view_zoom_fits_hit(View_Smart_Data *sd, const Ewk_Hit_Test *hit_test)
|
|||
*/
|
||||
if (vw1 > ZOOM_AUTO_PADDING)
|
||||
vw1 -= ZOOM_AUTO_PADDING;
|
||||
|
||||
if (vw2 > ZOOM_AUTO_PADDING)
|
||||
vw2 -= ZOOM_AUTO_PADDING;
|
||||
|
||||
if (vh1 > ZOOM_AUTO_PADDING)
|
||||
vh1 -= ZOOM_AUTO_PADDING;
|
||||
|
||||
if (vh2 > ZOOM_AUTO_PADDING)
|
||||
vh2 -= ZOOM_AUTO_PADDING;
|
||||
|
||||
|
|
@ -431,6 +428,7 @@ _view_pan_pre_render(View_Smart_Data *sd, Evas_Coord dx, Evas_Coord dy)
|
|||
|
||||
if (dx > 0)
|
||||
px -= (pw - w);
|
||||
|
||||
if (dy > 0)
|
||||
py -= (ph - h);
|
||||
|
||||
|
|
@ -505,7 +503,7 @@ _view_animator_kinetic(void *data)
|
|||
/* check if new displacement fit in scroll area */
|
||||
if (sx + x < 0)
|
||||
{
|
||||
x = - sx;
|
||||
x = -sx;
|
||||
sd->kinetic.done.x = EINA_TRUE;
|
||||
}
|
||||
else if (sx + x >= sw)
|
||||
|
|
@ -527,7 +525,7 @@ _view_animator_kinetic(void *data)
|
|||
/* check if new displacement fit in scroll area */
|
||||
if (sy + y < 0)
|
||||
{
|
||||
y = - sy;
|
||||
y = -sy;
|
||||
sd->kinetic.done.y = EINA_TRUE;
|
||||
}
|
||||
else if (sy + y >= sh)
|
||||
|
|
@ -551,7 +549,7 @@ _view_animator_kinetic(void *data)
|
|||
return ECORE_CALLBACK_CANCEL;
|
||||
}
|
||||
|
||||
end:
|
||||
end:
|
||||
return ECORE_CALLBACK_RENEW; /* keep running until we finish */
|
||||
}
|
||||
|
||||
|
|
@ -589,7 +587,7 @@ _view_animator_pan(void *data)
|
|||
sd->pan.last_move.y = y;
|
||||
sd->pan.last_move.timestamp = timestamp;
|
||||
|
||||
end:
|
||||
end:
|
||||
return ECORE_CALLBACK_RENEW; /* keep running until something else remove */
|
||||
}
|
||||
|
||||
|
|
@ -805,7 +803,7 @@ _view_animator_zoom(void *data)
|
|||
ewk_view_zoom_weak_set(o, zoom, sd->zoom.start.x, sd->zoom.start.y);
|
||||
}
|
||||
|
||||
end:
|
||||
end:
|
||||
return ECORE_CALLBACK_RENEW; /* keep running until something else remove */
|
||||
}
|
||||
|
||||
|
|
@ -903,6 +901,7 @@ _view_zoom_stop(View_Smart_Data *sd, const Evas_Event_Mouse_Up *ev __UNUSED__)
|
|||
ewk_view_zoom_animated_set
|
||||
(view, zoom, ZOOM_AUTO_ANIMATION_DURATION, x, y);
|
||||
}
|
||||
|
||||
return EINA_TRUE;
|
||||
}
|
||||
|
||||
|
|
@ -1004,7 +1003,6 @@ on_view_contextmenu_freed(void *data, Evas_Object *view, void *event_info)
|
|||
ecore_idler_add(_view_contextmenu_free, notify);
|
||||
}
|
||||
|
||||
|
||||
/***********************************************************************
|
||||
* Smart Class Methods: *
|
||||
* *
|
||||
|
|
@ -1061,10 +1059,13 @@ _view_smart_del(Evas_Object *o)
|
|||
*/
|
||||
if (sd->animator.pan)
|
||||
ecore_animator_del(sd->animator.pan);
|
||||
|
||||
if (sd->animator.zoom)
|
||||
ecore_animator_del(sd->animator.zoom);
|
||||
|
||||
if (sd->animator.kinetic)
|
||||
ecore_animator_del(sd->animator.kinetic);
|
||||
|
||||
if (sd->idler_close_window)
|
||||
ecore_idler_del(sd->idler_close_window);
|
||||
|
||||
|
|
@ -1108,6 +1109,7 @@ _view_smart_calculate(Evas_Object *o)
|
|||
elapsed, LONG_CALCULATE_TIMEOUT);
|
||||
XSync(dpy, True); /* throw away events received during this timeout */
|
||||
}
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
@ -1141,6 +1143,7 @@ _view_smart_mouse_down(Ewk_View_Smart_Data *esd, const Evas_Event_Mouse_Down *ev
|
|||
/* we just want to start pan on button 1 (left) and not triple click */
|
||||
if (ev->button != 1)
|
||||
goto forward_event;
|
||||
|
||||
if (ev->flags & EVAS_BUTTON_TRIPLE_CLICK)
|
||||
goto forward_event;
|
||||
|
||||
|
|
@ -1156,6 +1159,7 @@ _view_smart_mouse_down(Ewk_View_Smart_Data *esd, const Evas_Event_Mouse_Down *ev
|
|||
if (skip && !(ev->flags & EVAS_BUTTON_DOUBLE_CLICK))
|
||||
goto forward_event;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/* cancel previous animators, if any (there should be none) */
|
||||
|
|
@ -1164,6 +1168,7 @@ _view_smart_mouse_down(Ewk_View_Smart_Data *esd, const Evas_Event_Mouse_Down *ev
|
|||
ecore_animator_del(sd->animator.pan);
|
||||
sd->animator.pan = NULL;
|
||||
}
|
||||
|
||||
if (sd->animator.zoom)
|
||||
{
|
||||
ecore_animator_del(sd->animator.zoom);
|
||||
|
|
@ -1181,9 +1186,10 @@ _view_smart_mouse_down(Ewk_View_Smart_Data *esd, const Evas_Event_Mouse_Down *ev
|
|||
|
||||
return EINA_TRUE;
|
||||
|
||||
forward_event:
|
||||
forward_event:
|
||||
if (ev->button == 3) // forward of context menu event is special
|
||||
return ewk_view_context_menu_forward_event(sd->base.self, ev);
|
||||
|
||||
/* If we should forward/feed event using parent class method, then
|
||||
* just do it and do NOT create an animator. See _view_smart_mouse_up().
|
||||
*/
|
||||
|
|
@ -1347,6 +1353,7 @@ _run_dialog(Evas_Object *parent, enum dialog_type type, const char *message, con
|
|||
elm_box_pack_end(bx_v, dialog_data->entry);
|
||||
evas_object_show(dialog_data->entry);
|
||||
}
|
||||
|
||||
if (type == DIALOG_PROMPT || type == DIALOG_CONFIRM)
|
||||
{
|
||||
Evas_Object *bx_h = elm_box_add(bx_v);
|
||||
|
|
@ -1513,6 +1520,7 @@ view_add(Evas_Object *parent)
|
|||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
view = evas_object_smart_add(canvas, smart);
|
||||
if (!view)
|
||||
{
|
||||
|
|
@ -1531,8 +1539,10 @@ void view_zoom_next_up(Evas_Object *view)
|
|||
Evas_Coord w, h;
|
||||
if (sd->flags.animated_zoom || sd->animator.pan || sd->animator.zoom)
|
||||
return;
|
||||
|
||||
if (idx + 1 >= ZOOM_STEPS_LAST)
|
||||
return;
|
||||
|
||||
if (sd->animator.kinetic)
|
||||
{
|
||||
ecore_animator_del(sd->animator.kinetic);
|
||||
|
|
@ -1556,13 +1566,16 @@ void view_zoom_next_down(Evas_Object *view)
|
|||
Evas_Coord w, h;
|
||||
if (sd->flags.animated_zoom || sd->animator.pan || sd->animator.zoom)
|
||||
return;
|
||||
|
||||
if (idx == 0)
|
||||
return;
|
||||
|
||||
if (sd->animator.kinetic)
|
||||
{
|
||||
ecore_animator_del(sd->animator.kinetic);
|
||||
sd->animator.kinetic = NULL;
|
||||
}
|
||||
|
||||
idx--;
|
||||
zoom = ZOOM_STEPS[idx];
|
||||
sd->flags.animated_zoom = EINA_TRUE;
|
||||
|
|
@ -1600,3 +1613,4 @@ Ewk_Context_Menu *view_context_menu_get(Evas_Object *view)
|
|||
{
|
||||
return evas_object_data_get(view, "context-menu");
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue