#define MINIMAP_WIDTH 120
#define MINIMAP_HEIGHT 200
+
+#define USE_MAX_TUC_20MB
+
+#ifdef USE_MAX_TUC_20MB
+#define MAX_TUC 1024*1024*20
+#else
#define MAX_TUC 1024*1024*10
+#endif
#define MAX_URI 512
#define MOBILE_DEFAULT_ZOOM_RATIO 1.5f
#define DEFAULT_LAYOUT_WIDTH 1024
#define MIN_ZOOM_RATIO 0.09f
#define MAX_ZOOM_RATIO 4.0f
+#define ZOOM_OUT_BOUNCING 0.85f
+#define ZOOM_IN_BOUNCING 1.25f
+#define BOUNCING_DISTANCE 400
// "<!--<body bgcolor=#4c4c4c text=white text-align=left>-->"
#define NOT_FOUND_PAGE_HEADER "<html>" \
Ewk_View_Smart_Data base; //default data
Evas_Object* widget;
+ Ecore_Job *move_calc_job;
+ Ecore_Job *resize_calc_job;
Eina_Hash* mime_func_hash;
int locked_dx;
int locked_dy;
Eina_Bool (*ewk_view_zoom_cairo_scaling_get)(const Evas_Object *);
Eina_Bool (*ewk_view_zoom_cairo_scaling_set)(Evas_Object *, Eina_Bool);
void (*ewk_view_viewport_get)(Evas_Object *, int *, int *, float *, float *, float *, Eina_Bool *);
- void (*ewk_view_zoom_range_set)(Evas_Object *, float, float);
+ Eina_Bool (*ewk_view_zoom_range_set)(Evas_Object *, float, float);
void (*ewk_view_user_scalable_set)(Evas_Object *, Eina_Bool);
Eina_Bool (*ewk_view_pre_render_region)(Evas_Object *, Evas_Coord, Evas_Coord, Evas_Coord, Evas_Coord, float);
void (*ewk_view_pre_render_cancel)(Evas_Object *);
Eina_Bool (*ewk_frame_scroll_add)(Evas_Object *, int, int);
unsigned int (*ewk_view_imh_get)(Evas_Object *);
Ecore_IMF_Context* (*ewk_view_core_imContext_get)(Evas_Object *);
+ void (*ewk_set_show_geolocation_permission_dialog_callback)(ewk_show_geolocation_permission_dialog_callback);
+ void (*ewk_set_geolocation_sharing_allowed)(void *, Eina_Bool);
/* cairo functions */
cairo_t * (*cairo_create)(cairo_surface_t *);
void* touch_obj;
Ecore_Idler *flush_and_pre_render_idler;
+ Eina_Bool use_zoom_bouncing;
};
/* local subsystem functions */
+static void _resize_calc_job(void *data);
+static void _move_calc_job(void *data);
static void _smart_show(Evas_Object* obj);
static void _smart_hide(Evas_Object* obj);
static void _smart_resize(Evas_Object* obj, Evas_Coord w, Evas_Coord h);
static void _smart_move(Evas_Object* obj, Evas_Coord x, Evas_Coord y);
+#ifdef DEBUG
static void _smart_calculate(Evas_Object* obj);
+#endif
static Eina_Bool _smart_mouse_down(Ewk_View_Smart_Data *esd, const Evas_Event_Mouse_Down* ev);
static Eina_Bool _smart_mouse_up(Ewk_View_Smart_Data *esd, const Evas_Event_Mouse_Up* ev);
static Eina_Bool _smart_mouse_move(Ewk_View_Smart_Data *esd, const Evas_Event_Mouse_Move* ev);
static void _smart_viewport_changed(void* data, Evas_Object* webview, void* arg);
static void _smart_input_method_changed(void* data, Evas_Object* webview, void* arg);
static void _smart_page_layout_info_set(Smart_Data *sd, float init_zoom_rate, float min_zoom_rate, float max_zoom_rate, Eina_Bool scalable);
+static void _smart_contents_size_changed(void* data, Evas_Object* frame, void* arg);
static void _smart_load_nonemptylayout_finished(void* data, Evas_Object* frame, void* arg);
static void _smart_cb_view_created(void* data, Evas_Object* webview, void* arg);
static void _smart_add(Evas_Object* obj);
static void _unzoom_position(Evas_Object* webview, int x, int y, int* ux, int* uy);
static void _coords_evas_to_ewk(Evas_Object* webview, int x, int y, int* ux, int* uy);
static void _coords_ewk_to_evas(Evas_Object* webview, int x, int y, int* ux, int* uy);
+static void _update_min_zoom_rate(Evas_Object *obj);
+static void _geolocation_permission_callback(void *geolocation_obj, const char* url);
/* local subsystem globals */
static Evas_Smart *_smart = NULL;
static void *ewk_handle;
static void *cairo_handle;
+static Ewk_Tile_Unused_Cache *ewk_tile_cache = NULL;
+static ewk_tile_cache_ref_count = 0;
+
+static Evas_Object *obj = NULL;
+
/* externally accessible functions */
Evas_Object*
_elm_smart_webview_add(Evas *evas, Eina_Bool tiled)
ERR("could not create smart object for webview");
return NULL;
}
+ obj = webview;
// set tiled and unused cache
Smart_Data* sd = evas_object_smart_data_get(webview);
sd->tiled = tiled;
if (sd->tiled)
{
- static Ewk_Tile_Unused_Cache *ewk_tile_cache;
- if (ewk_tile_cache == NULL)
+ if (ewk_tile_cache_ref_count == 0)
{
if (!sd->ewk_view_tiled_unused_cache_get)
sd->ewk_view_tiled_unused_cache_get = (Ewk_Tile_Unused_Cache *(*)(const Evas_Object *))dlsym(ewk_handle, "ewk_view_tiled_unused_cache_get");
sd->ewk_view_tiled_unused_cache_set = (void (*)(Evas_Object *, Ewk_Tile_Unused_Cache *))dlsym(ewk_handle, "ewk_view_tiled_unused_cache_set");
sd->ewk_view_tiled_unused_cache_set(webview, ewk_tile_cache);
}
+ ++ewk_tile_cache_ref_count;
//size_t mem = ewk_tile_unused_cache_used_get(ewk_tile_cache);
//DBG("%s: Used cache: %d (%dkB)", __func__, mem, (mem/1024));
}
eina_hash_add(sd->mime_func_hash, mime, func);
}
+void
+_elm_smart_webview_default_layout_width_set(Evas_Object *obj, int width)
+{
+ API_ENTRY return;
+ sd->layout.default_w = width;
+}
+
int
_flush_and_pre_render(void *data)
{
DBG("%s\n", __func__);
INTERNAL_ENTRY;
+ Evas_Coord ow, oh;
+ evas_object_geometry_get(obj, NULL, NULL, &ow, &oh);
+ if ((ow == w) && (oh == h)) return;
+ if (sd->resize_calc_job) ecore_job_del(sd->resize_calc_job);
+ sd->resize_calc_job = ecore_job_add(_resize_calc_job, obj);
+}
+
+static void
+_resize_calc_job(void *data)
+{
+ Evas_Object *obj = data;
+ INTERNAL_ENTRY;
+
int object_w, object_h;
evas_object_geometry_get(obj, NULL, NULL, &object_w, &object_h);
object_w = (object_w % 10) ? (object_w / 10 * 10 + 10) : object_w;
if (sd->is_mobile_page)
{
+ int old_layout_w = sd->layout.w;
sd->layout.w = object_w / sd->zoom.init_zoom_rate;
sd->layout.h = object_h / sd->zoom.init_zoom_rate;
- if (!sd->ewk_view_fixed_layout_size_set)
- sd->ewk_view_fixed_layout_size_set = (void (*)(Evas_Object *, Evas_Coord, Evas_Coord))dlsym(ewk_handle, "ewk_view_fixed_layout_size_set");
- sd->ewk_view_fixed_layout_size_set(obj, sd->layout.w, sd->layout.h);
+ if (old_layout_w != sd->layout.w)
+ {
+ if (!sd->ewk_view_fixed_layout_size_set)
+ sd->ewk_view_fixed_layout_size_set = (void (*)(Evas_Object *, Evas_Coord, Evas_Coord))dlsym(ewk_handle, "ewk_view_fixed_layout_size_set");
+ sd->ewk_view_fixed_layout_size_set(obj, sd->layout.w, sd->layout.h);
+ }
}
else
{
if (!sd->ewk_view_zoom_set)
sd->ewk_view_zoom_set = (Eina_Bool (*)(Evas_Object *, float, Evas_Coord, Evas_Coord))dlsym(ewk_handle, "ewk_view_zoom_set");
- // update min zoom rate
- if (!sd->ewk_frame_contents_size_get)
- sd->ewk_frame_contents_size_get = (Eina_Bool (*)(const Evas_Object *, Evas_Coord *, Evas_Coord *))dlsym(ewk_handle, "ewk_frame_contents_size_get");
- int content_w;
- sd->ewk_frame_contents_size_get(sd->ewk_view_frame_main_get(obj), &content_w, NULL);
- if (content_w)
- sd->zoom.min_zoom_rate = (float)object_w / (float)content_w;
+ _update_min_zoom_rate(obj);
// set zoom
if (sd->ewk_view_zoom_get(obj) < sd->zoom.min_zoom_rate)
sd->flush_and_pre_render_idler = ecore_idler_add(_flush_and_pre_render, obj);
}
- _parent_sc.sc.resize(obj, w, h);
+ sd->resize_calc_job = NULL;
+ _parent_sc.sc.resize(obj, object_w, object_h);
+}
+
+static void
+_move_calc_job(void *data)
+{
+ Evas_Object *obj = data;
+ INTERNAL_ENTRY;
+ int x, y;
+ evas_object_geometry_get(obj, &x, &y, NULL, NULL);
+ sd->move_calc_job = NULL;
+ _parent_sc.sc.move(obj, x, y);
}
static void
DBG("%s\n", __func__);
INTERNAL_ENTRY;
- _parent_sc.sc.move(obj, x, y);
+ if (sd->move_calc_job) ecore_job_del(sd->move_calc_job);
+ sd->move_calc_job = ecore_job_add(_move_calc_job, obj);
}
-//TODO: Is it required? I just add to test
+#ifdef DEBUG
static void
_smart_calculate(Evas_Object* obj)
{
- DBG("%s\n", __func__);
_parent_sc.sc.calculate(obj);
- DBG("%s end\n", __func__);
}
+#endif
static Eina_Bool
_smart_mouse_down(Ewk_View_Smart_Data *esd, const Evas_Event_Mouse_Down* ev)
{
- DBG("%s is called\n", __func__);
+ DBG("[NATIVE]%s is called\n", __func__);
Smart_Data *sd = (Smart_Data *)esd;
sd->mouse_down_copy = *ev;
- sd->mouse_clicked = EINA_TRUE;
- if (sd->events_feed) _parent_sc.mouse_down(esd, ev);
+ if (sd->events_feed)
+ {
+ _suspend_all(sd, EINA_FALSE);
+ sd->mouse_clicked = EINA_TRUE;
+ return _parent_sc.mouse_down(esd, ev);
+ }
else return EINA_TRUE;
}
static Eina_Bool
_smart_mouse_up(Ewk_View_Smart_Data *esd, const Evas_Event_Mouse_Up* ev)
{
- DBG("%s is called\n", __func__);
+ DBG("[NATIVE]%s is called\n", __func__);
Smart_Data *sd = (Smart_Data *)esd;
sd->mouse_up_copy = *ev;
- sd->mouse_clicked = EINA_FALSE;
if (sd->events_feed)
{
+ _resume_all(sd, EINA_FALSE);
//check if user hold touch
if (ev && (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD))
{
return EINA_TRUE;
}
- _parent_sc.mouse_up(esd, ev);
+ Eina_Bool ret = _parent_sc.mouse_up(esd, ev);
+ sd->mouse_clicked = EINA_FALSE;
+ return ret;
}
else
return EINA_TRUE;
snprintf(szBuffer, 2048, NOT_FOUND_PAGE_HEADER "\"?%s?%s\"" NOT_FOUND_PAGE_FOOTER, error->failing_url, error->description);
//sd->ewk_frame_contents_set(sd->ewk_view_frame_main_get(webview), szStrBuffer, 0, NULL, NULL, NULL);
- sd->ewk_frame_contents_set(sd->ewk_view_frame_main_get(webview), szBuffer, 0, NULL, NULL, NULL);
+ sd->ewk_frame_contents_set(error->frame, szBuffer, 0, NULL, NULL, NULL);
return;
}
}
object_w = (object_w % 10) ? (object_w / 10 * 10 + 10) : object_w;
// if layout width is bigger than object width, we regard current page to not the mobile page
+ // for bbc.co.uk
if (layout_w > object_w)
{
sd->layout.w = layout_w;
return;
}
- // if there is no layout_w, it is the desktop site.
- if (layout_w <= 0) return;
+ // if there is no layout_w and url does not have mobile keyword, it is the desktop site.
+ if (layout_w <= 0)
+ {
+ if (!sd->ewk_view_uri_get)
+ sd->ewk_view_uri_get = (const char * (*)(const Evas_Object *))dlsym(ewk_handle, "ewk_view_uri_get");
+ const char *url = sd->ewk_view_uri_get(webview);
+ if ((url && (strstr(url, "://m.") != NULL
+ || strstr(url, "://wap.") != NULL
+ || strstr(url, ".m.") != NULL
+ || strstr(url, "/mobile/i") != NULL))) // For www.bbc.co.uk/mobile/i site
+ {
+ min_zoom_rate = MIN_ZOOM_RATIO;
+ max_zoom_rate = MAX_ZOOM_RATIO;
+ scalable = 1;
+ }
+ else
+ {
+ return;
+ }
+ }
// set data for mobile page
sd->is_mobile_page = EINA_TRUE;
default: ecore_imf_context_input_panel_layout_set(imContext, ECORE_IMF_INPUT_PANEL_LAYOUT_NORMAL);
}
DBG("ecore_imf_context_input_panel_show");
+ ecore_imf_context_focus_in(imContext);
+ ecore_imf_context_client_canvas_set(imContext, evas_object_evas_get(sd->base.self));
ecore_imf_context_input_panel_show (imContext);
}
}
}
static void
+_smart_contents_size_changed(void* data, Evas_Object* frame, void* arg)
+{
+ Smart_Data* sd = (Smart_Data *)data;
+ if (!sd) return;
+
+ Evas_Object* webview = sd->base.self;
+
+ Evas_Coord* size = (Evas_Coord*)arg;
+ if (!size || size[0] == 0)
+ return;
+
+ _update_min_zoom_rate(sd->base.self);
+}
+
+static void
_smart_load_nonemptylayout_finished(void* data, Evas_Object* frame, void* arg)
{
DBG("%s is called\n", __func__);
if (!sd->ewk_view_user_scalable_set)
sd->ewk_view_user_scalable_set = (void (*)(Evas_Object *, Eina_Bool))dlsym(ewk_handle, "ewk_view_user_scalable_set");
if (!sd->ewk_view_zoom_range_set)
- sd->ewk_view_zoom_range_set = (void (*)(Evas_Object *, float, float))dlsym(ewk_handle, "ewk_view_zoom_range_set");
+ sd->ewk_view_zoom_range_set = (Eina_Bool (*)(Evas_Object *, float, float))dlsym(ewk_handle, "ewk_view_zoom_range_set");
if (!sd->ewk_view_fixed_layout_size_set)
sd->ewk_view_fixed_layout_size_set = (void (*)(Evas_Object *, Evas_Coord, Evas_Coord))dlsym(ewk_handle, "ewk_view_fixed_layout_size_set");
+
sd->ewk_view_zoom_range_set(webview, MIN_ZOOM_RATIO, MAX_ZOOM_RATIO);
// set default layout size
{
// set page layout info, zoom and layout again
_smart_page_layout_info_set(sd, 1.0f, sd->zoom.min_zoom_rate, sd->zoom.max_zoom_rate, sd->zoom.scalable);
+ sd->ewk_view_zoom_range_set(webview, MIN_ZOOM_RATIO, MAX_ZOOM_RATIO);
sd->ewk_view_zoom_set(webview, sd->zoom.init_zoom_rate, 0, 0);
sd->ewk_view_fixed_layout_size_set(webview, sd->layout.w, sd->layout.h);
}
- sd->ewk_view_zoom_range_set(webview, sd->zoom.min_zoom_rate, sd->zoom.max_zoom_rate);
+ if (sd->use_zoom_bouncing)
+ {
+ float min_zoom_rate = sd->zoom.min_zoom_rate * ZOOM_OUT_BOUNCING;
+ if (min_zoom_rate <= 0) min_zoom_rate = MIN_ZOOM_RATIO;
+ float max_zoom_rate = sd->zoom.max_zoom_rate * ZOOM_IN_BOUNCING;
+ sd->ewk_view_zoom_range_set(webview, min_zoom_rate, max_zoom_rate);
+ }
+ else
+ {
+ sd->ewk_view_zoom_range_set(webview, sd->zoom.min_zoom_rate, sd->zoom.max_zoom_rate);
+ }
} else {
sd->zoom.min_zoom_rate = MIN_ZOOM_RATIO;
sd->zoom.max_zoom_rate = MAX_ZOOM_RATIO;
- sd->ewk_view_zoom_range_set(webview, sd->zoom.min_zoom_rate, sd->zoom.max_zoom_rate);
- sd->layout.w = DEFAULT_LAYOUT_WIDTH;
+ if (sd->layout.w <= 0) sd->layout.w = sd->layout.default_w;
sd->layout.h = object_h;
if (!sd->ewk_view_zoom_set)
sd->ewk_view_zoom_set(webview, sd->zoom.init_zoom_rate, 0, 0);
sd->ewk_view_fixed_layout_size_set(webview, sd->layout.w, sd->layout.h);
- // update min zoom rate
- if (!sd->ewk_frame_contents_size_get)
- sd->ewk_frame_contents_size_get = (Eina_Bool (*)(const Evas_Object *, Evas_Coord *, Evas_Coord *))dlsym(ewk_handle, "ewk_frame_contents_size_get");
- int content_w;
- sd->ewk_frame_contents_size_get(sd->ewk_view_frame_main_get(webview), &content_w, NULL);
- if (content_w)
- sd->zoom.min_zoom_rate = (float)object_w / (float)content_w;
+ _update_min_zoom_rate(webview);
}
sd->ewk_view_user_scalable_set(webview, sd->zoom.scalable);
evas_object_smart_data_set(obj, sd);
_parent_sc.sc.add(obj);
+ sd->resize_calc_job = NULL;
+ sd->move_calc_job = NULL;
sd->thumbnail = NULL;
sd->minimap.eo = NULL;
sd->dropdown.options = NULL;
sd->ewk_view_theme_set = (void (*)(Evas_Object *, const char *))dlsym(ewk_handle, "ewk_view_theme_set");
sd->ewk_view_theme_set(obj, WEBKIT_EDJ);
+ // set geolocation callback
+ sd->ewk_set_show_geolocation_permission_dialog_callback = (void (*)(ewk_show_geolocation_permission_dialog_callback))dlsym(ewk_handle, "ewk_set_show_geolocation_permission_dialog_callback");
+ sd->ewk_set_show_geolocation_permission_dialog_callback(_geolocation_permission_callback);
+
sd->ewk_view_zoom_text_only_set = (Eina_Bool (*)(Evas_Object *, Eina_Bool))dlsym(ewk_handle, "ewk_view_zoom_text_only_set");
sd->ewk_view_zoom_text_only_set(obj, EINA_FALSE);
sd->ewk_view_zoom_cairo_scaling_set = (Eina_Bool (*)(Evas_Object *, Eina_Bool))dlsym(ewk_handle, "ewk_view_zoom_cairo_scaling_set");
sd->ewk_view_zoom_cairo_scaling_set(obj, EINA_TRUE);
sd->flush_and_pre_render_idler = NULL;
+ sd->use_zoom_bouncing = EINA_TRUE;
#ifdef NEED_TO_REMOVE
// TODO: temporary add the mouse callbacks until the webkit engine can receive mouse events
if (!(sd->ewk_view_frame_main_get))
sd->ewk_view_frame_main_get = (Evas_Object *(*)(const Evas_Object *))dlsym(ewk_handle, "ewk_view_frame_main_get");
+ evas_object_smart_callback_add(sd->ewk_view_frame_main_get(obj), "contents,size,changed",
+ _smart_contents_size_changed, sd);
evas_object_smart_callback_add(sd->ewk_view_frame_main_get(obj), "load,nonemptylayout,finished",
_smart_load_nonemptylayout_finished, sd);
}
_parent_sc.sc.del(obj);
+
+ if (--ewk_tile_cache_ref_count == 0)
+ ewk_tile_cache = NULL;
}
static void
typedef enum { up, down, left, right, up_left, up_right, down_left, down_right, undefined } Directions;
Directions direction = undefined;
+#ifdef USE_MAX_TUC_20MB
+ if (!sd->ewk_view_zoom_get)
+ sd->ewk_view_zoom_get = (float (*)(const Evas_Object *))dlsym(ewk_handle, "ewk_view_zoom_get");
+ float zoom = sd->ewk_view_zoom_get(obj);
+#endif
+
if (dx == 0 && dy < 0) direction = down;
if (dx > 0 && dy < 0) direction = down_left;
if (dx > 0 && dy == 0) direction = left;
if (dx < 0 && dy == 0) direction = right;
if (dx < 0 && dy < 0) direction = down_right;
+#ifdef USE_MAX_TUC_20MB
+ const float DIRECTION_PLAIN_CX = 2.0/zoom;
+ const float DIRECTION_CROSS_CX = 1.0/zoom;
+ const float DIRECTION_UNDEFINED_CX_LEVEL_1 = 0.5/zoom;
+ const float DIRECTION_UNDEFINED_CX_LEVEL_2 = 0.8/zoom;
+#else
const float DIRECTION_PLAIN_CX = 1.5;
const float DIRECTION_CROSS_CX = 0.7;
const float DIRECTION_UNDEFINED_CX_LEVEL_1 = 0.3;
const float DIRECTION_UNDEFINED_CX_LEVEL_2 = 0.6;
const float DIRECTION_UNDEFINED_CX_LEVEL_3 = 0.8;
+#endif
+
int p_x = x, p_y = y, p_w = w, p_h = h;
switch (direction) {
DBG("Shouldn't happen!!");
}
+#ifndef USE_MAX_TUC_20MB
if (!sd->ewk_view_zoom_get)
sd->ewk_view_zoom_get = (float (*)(const Evas_Object *))dlsym(ewk_handle, "ewk_view_zoom_get");
float zoom = sd->ewk_view_zoom_get(obj);
+#endif
// cancel the previously scheduled pre-rendering
// This makes sense especilaly for zooming operation - when user
//dbg_draw_scaled_area(obj, 0, 0, 0, 0, 0);
}
+#ifdef USE_MAX_TUC_20MB
+ int content_w=0, content_h=0;
+ int center_x=0,center_y=0;
+ int tmp_h=0;
+
+ if (!sd->ewk_frame_contents_size_get)
+ sd->ewk_frame_contents_size_get = (Eina_Bool (*)(const Evas_Object *, Evas_Coord *, Evas_Coord *))dlsym(ewk_handle, "ewk_frame_contents_size_get");
+ sd->ewk_frame_contents_size_get(sd->ewk_view_frame_main_get(obj), &content_w, &content_h);
+
+ p_w = content_w;
+ p_h = content_h;
+
+ size_t size = (size_t)roundf(p_w * zoom * p_h * zoom * 4);
+ Eina_Bool toggle = EINA_FALSE;
+
+ while(size > (MAX_TUC*0.8))
+ {
+ if(toggle)
+ {
+ p_h = p_h -32;
+ }
+ else
+ {
+ p_w = p_w - 32;
+ if(p_w < w)
+ {
+ p_w = w;
+ toggle = EINA_TRUE;
+ }
+ }
+ size = (size_t)roundf(p_w * zoom * p_h * zoom * 4);
+ }
+
+ center_x = (int)roundf(x + w/2);
+ center_y = (int)roundf(y + h/2);
+
+ tmp_h = p_h* DIRECTION_UNDEFINED_CX_LEVEL_1;
+ p_x = center_x - (int)roundf(p_w/2);
+ p_y = center_y - (int)roundf(tmp_h/2);
+ if(p_x < 0) p_x = 0;
+ if(p_y < 0) p_y = 0;
+ sd->ewk_view_pre_render_region(obj, p_x, p_y, p_w, tmp_h, zoom);
+
+ tmp_h = p_h* DIRECTION_UNDEFINED_CX_LEVEL_2;
+ p_x = center_x - (int)roundf(p_w/2);
+ p_y = center_y - (int)roundf(tmp_h/2);
+ if(p_x < 0) p_x = 0;
+ if(p_y < 0) p_y = 0;
+ sd->ewk_view_pre_render_region(obj, p_x, p_y, p_w, tmp_h, zoom);
+
+ p_x = center_x - (int)roundf(p_w/2);
+ p_y = center_y - (int)roundf(p_h/2);
+ if(p_x < 0) p_x = 0;
+ if(p_y < 0) p_y = 0;
+ sd->ewk_view_pre_render_region(obj, p_x, p_y, p_w, p_h, zoom);
+#else
/* Queue tiles in a small rectangle around the viewport */
p_x = x - w * DIRECTION_UNDEFINED_CX_LEVEL_1;
p_y = y - h * DIRECTION_UNDEFINED_CX_LEVEL_1;
DBG("pre rendering - large - content: (%d, %d, %d, %d), zoom %.3f", p_x, p_y, p_w, p_h, zoom);
sd->ewk_view_pre_render_region(obj, p_x, p_y, p_w, p_h, zoom);
//dbg_draw_scaled_area(obj, 3, p_x, p_y, p_w, p_h);
+#endif
/* Log some statistics */
/*
if (sd->use_text_selection == EINA_TRUE && sd->text_selection_on == EINA_TRUE) return;
+#ifdef NEED_TO_REMOVE
evas_object_focus_set(webview, EINA_TRUE);
if (!sd->ewk_view_frame_main_get)
sd->ewk_view_frame_main_get = (Evas_Object *(*)(const Evas_Object *))dlsym(ewk_handle, "ewk_view_frame_main_get");
if (!sd->ewk_frame_feed_focus_in)
sd->ewk_frame_feed_focus_in = (Eina_Bool (*)(Evas_Object *))dlsym(ewk_handle, "ewk_frame_feed_focus_in");
sd->ewk_frame_feed_focus_in(sd->ewk_view_frame_main_get(webview));
- _parent_sc.mouse_down((Ewk_View_Smart_Data*)sd, &sd->mouse_down_copy);
+#endif
+
+ sd->mouse_clicked = EINA_TRUE;
+ Evas_Event_Mouse_Down mouse_down = sd->mouse_down_copy;
+ Evas_Point* point = (Evas_Point*)ev;
+ mouse_down.canvas.x = point->x;
+ mouse_down.canvas.y = point->y;
+ _parent_sc.mouse_down((Ewk_View_Smart_Data*)sd, &mouse_down);
+#if 0 // comment out below code until it is completed
if (sd->bounce_horiz)
elm_widget_drag_lock_x_set(sd->widget, EINA_TRUE);
if (sd->bounce_vert)
elm_widget_drag_lock_y_set(sd->widget, EINA_TRUE);
+#endif
}
static void
Evas* evas;
evas = evas_object_evas_get(webview);
- // show discpicker
+ // TODO: we have to show list instead of discpicker
+ /* below code is deprecated
Evas_Object* discpicker = elm_discpicker_add(webview);
if (discpicker)
{
evas_object_move(discpicker, 0, 400);
evas_object_show(discpicker);
}
+ */
}
if (sd->use_text_selection == EINA_TRUE && sd->text_selection_on == EINA_TRUE)
return;
}
- _parent_sc.mouse_up((Ewk_View_Smart_Data*)sd, &sd->mouse_up_copy);
+ Evas_Event_Mouse_Up mouse_up = sd->mouse_up_copy;
+ mouse_up.canvas.x = point->x;
+ mouse_up.canvas.y = point->y;
+ _parent_sc.mouse_up((Ewk_View_Smart_Data*)sd, &mouse_up);
+ sd->mouse_clicked = EINA_FALSE;
}
static void
if (!sd) return;
Evas_Point* point = (Evas_Point*)ev;
- if (sd->events_feed == EINA_TRUE) return;
+ if (sd->events_feed == EINA_TRUE)
+ {
+ Evas* evas = evas_object_evas_get(webview);
+ Evas_Modifier *modifiers = (Evas_Modifier *)evas_key_modifier_get(evas);
+ Evas_Lock *locks = (Evas_Lock *)evas_key_lock_get(evas);
+
+ Evas_Event_Mouse_Move event_move;
+ event_move.buttons = 1;
+ event_move.cur.output.x = point->x;
+ event_move.cur.output.y = point->y;
+ event_move.cur.canvas.x = point->x;
+ event_move.cur.canvas.y = point->y;
+ event_move.data = NULL;
+ event_move.modifiers = modifiers;
+ event_move.locks = locks;
+ event_move.timestamp = ecore_loop_time_get();
+ event_move.event_flags = EVAS_EVENT_FLAG_NONE;
+ event_move.dev = NULL;
+
+ _parent_sc.mouse_move((Ewk_View_Smart_Data*)sd, &event_move);
+ return;
+ }
if (sd->on_panning == EINA_FALSE) return;
if (sd->use_text_selection == EINA_TRUE && sd->text_selection_on == EINA_TRUE)
content_h *= zoom;
DBG("<< ========content [%d, %d] new pos [%d, %d] >>\n", content_w, content_h, old_x + dx, old_y + dy);
-#if 0
- if ((old_x + dx) >= 0 && (old_x + dx) <= content_w && !elm_widget_drag_lock_x_get(sd->widget))
- elm_widget_drag_lock_x_set(sd->widget, EINA_TRUE);
- if ((old_y + dy) >= 0 && (old_y + dy) <= content_h && !elm_widget_drag_lock_y_get(sd->widget))
- elm_widget_drag_lock_y_set(sd->widget, EINA_TRUE);
-
- Eina_Bool locked = EINA_FALSE;
- if (!elm_widget_drag_lock_x_get(sd->widget))
- {
- if ((sd->locked_dx > 0 && (sd->locked_dx + dx) <= 0)
- || (sd->locked_dx < 0 && (sd->locked_dx + dx) >= 0))
- {
- elm_widget_drag_lock_x_set(sd->widget, EINA_TRUE);
- DBG("===============<< widget x lock >>\n");
- dx += sd->locked_dx;
-
- }
- else
- {
- sd->locked_dx += dx;
- locked = EINA_TRUE;
- }
- }
-
- if (!elm_widget_drag_lock_y_get(sd->widget))
- {
- if ((sd->locked_dy > 0 && (sd->locked_dy + dy) <= 0)
- || (sd->locked_dy < 0 && (sd->locked_dy + dy) >= 0))
- {
- elm_widget_drag_lock_y_set(sd->widget, EINA_TRUE);
- DBG("===============<< widget y lock >>\n");
- dy += sd->locked_dy;
-
- }
- else
- {
- sd->locked_dy += dy;
- locked = EINA_TRUE;
- }
- }
-#else
+#if 0 // comment out below code until it is completed
Eina_Bool locked = EINA_FALSE;
if (!elm_widget_drag_lock_x_get(sd->widget))
{
locked = EINA_TRUE;
}
}
-#endif
if (locked) return;
+#endif
if (!sd->ewk_view_frame_main_get)
sd->ewk_view_frame_main_get = (Evas_Object *(*)(const Evas_Object *))dlsym(ewk_handle, "ewk_view_frame_main_get");
if (sd->use_text_selection == EINA_TRUE && sd->text_selection_on == EINA_TRUE)
_text_selection_move_by(sd, old_x - new_x, old_y - new_y);
+#if 0 // comment out below code until it is completed
if (!sd->bounce_horiz &&
(dx && elm_widget_drag_lock_x_get(sd->widget) && (old_x == new_x)))
{
elm_widget_drag_lock_y_set(sd->widget, EINA_FALSE);
DBG("===============<< widget y unlock >>\n");
}
+#endif
}
static void
Evas_Point* point = (Evas_Point*)ev;
sd->on_panning = EINA_FALSE;
- _resume_all(sd, EINA_FALSE);
-
if (sd->use_text_selection == EINA_TRUE && sd->text_selection_on == EINA_TRUE)
{
if (sd->text_selection.front_handle_moving == EINA_TRUE
sd->text_selection.back_handle_moving = EINA_FALSE;
}
+ _resume_all(sd, EINA_FALSE);
+
if (sd->tiled)
{
if (!sd->ewk_view_tiled_unused_cache_get)
(sd->mouse_down_copy.canvas.x - point->x), (sd->mouse_down_copy.canvas.y - point->y));
}
+#if 0 // comment out below code until it is completed
if (!sd->bounce_horiz && elm_widget_drag_lock_x_get(sd->widget))
{
DBG("==============<< widget x unlock >>\n");
DBG("==============<< widget y unlock >>\n");
elm_widget_drag_lock_y_set(sd->widget, EINA_FALSE);
}
+#endif
}
static void
if (!sd->ewk_view_zoom_get)
sd->ewk_view_zoom_get = (float (*)(const Evas_Object *))dlsym(ewk_handle, "ewk_view_zoom_get");
sd->zoom.zoom_rate_at_start = sd->ewk_view_zoom_get(sd->base.self);
+ sd->zoom.zooming_rate = sd->zoom.zoom_rate_at_start;
_suspend_all(sd, EINA_TRUE);
if (zoom_distance != sd->zoom.zooming_level)
{
- sd->zoom.zooming_level = zoom_distance;
- float zoom_ratio = sd->zoom.zoom_rate_at_start + sd->zoom.zooming_level * ZOOM_STEP_PER_PIXEL;
+ float zoom_ratio;
- if (zoom_ratio < sd->zoom.min_zoom_rate)
- zoom_ratio = sd->zoom.min_zoom_rate;
- if (zoom_ratio > MAX_ZOOM_RATIO)
- zoom_ratio = MAX_ZOOM_RATIO;
+ if (sd->use_zoom_bouncing)
+ {
+ float min_zoom_rate = sd->zoom.min_zoom_rate * ZOOM_OUT_BOUNCING;
+ if (min_zoom_rate <= 0) min_zoom_rate = MIN_ZOOM_RATIO;
+ float max_zoom_rate = sd->zoom.max_zoom_rate * ZOOM_IN_BOUNCING;
+
+ if (sd->zoom.zooming_rate < sd->zoom.min_zoom_rate)
+ {
+ float step = (sd->zoom.min_zoom_rate - min_zoom_rate) / (float)BOUNCING_DISTANCE;
+ zoom_ratio = sd->zoom.zooming_rate + (zoom_distance - sd->zoom.zooming_level) * step;
+ }
+ else if (sd->zoom.zooming_rate > sd->zoom.max_zoom_rate)
+ {
+ float step = (max_zoom_rate - sd->zoom.max_zoom_rate) / (float)BOUNCING_DISTANCE;
+ zoom_ratio = sd->zoom.zooming_rate + (zoom_distance - sd->zoom.zooming_level) * step;
+ }
+ else
+ {
+ zoom_ratio = sd->zoom.zoom_rate_at_start + zoom_distance * ZOOM_STEP_PER_PIXEL;
+ }
+
+ if (zoom_ratio < min_zoom_rate)
+ zoom_ratio = min_zoom_rate;
+ if (zoom_ratio > max_zoom_rate)
+ zoom_ratio = max_zoom_rate;
+ }
+ else
+ {
+ zoom_ratio = sd->zoom.zoom_rate_at_start + zoom_distance * ZOOM_STEP_PER_PIXEL;
+ if (zoom_ratio < sd->zoom.min_zoom_rate)
+ zoom_ratio = sd->zoom.min_zoom_rate;
+ if (zoom_ratio > sd->zoom.max_zoom_rate)
+ zoom_ratio = sd->zoom.max_zoom_rate;
+ }
+ sd->zoom.zooming_level = zoom_distance;
sd->zoom.zooming_rate = zoom_ratio;
//printf("new zoom : %f, (%d, %d)\n", zoom_ratio, centerX, centerY);
if (!sd->ewk_view_zoom_weak_set)
sd->ewk_view_zoom_weak_set = (Eina_Bool (*)(Evas_Object *, float, Evas_Coord, Evas_Coord))dlsym(ewk_handle, "ewk_view_zoom_weak_set");
sd->ewk_view_zoom_weak_set(sd->base.self, zoom_ratio, sd->zoom.basis.x, sd->zoom.basis.y);
+ DBG("<< zoom weak set [%f] >>\n", zoom_ratio);
}
}
DBG("%s ( %d )\n", __func__, sd->zoom.zooming_level);
if (sd->zoom.zooming_level == 0) return;
- if (!sd->ewk_view_zoom_set)
- sd->ewk_view_zoom_set = (Eina_Bool (*)(Evas_Object *, float, Evas_Coord, Evas_Coord))dlsym(ewk_handle, "ewk_view_zoom_set");
- sd->ewk_view_zoom_set(sd->base.self, sd->zoom.zooming_rate, sd->zoom.basis.x, sd->zoom.basis.y);
+ sd->zoom.zoom_rate_to_set = sd->zoom.zooming_rate;
+ if (sd->zoom.zoom_rate_to_set < sd->zoom.min_zoom_rate)
+ sd->zoom.zoom_rate_to_set = sd->zoom.min_zoom_rate;
+ if (sd->zoom.zoom_rate_to_set > sd->zoom.max_zoom_rate)
+ sd->zoom.zoom_rate_to_set = sd->zoom.max_zoom_rate;
+ if (sd->use_zoom_bouncing
+ && (sd->zoom.zoom_rate_to_set != sd->zoom.zooming_rate))
+ {
+ sd->zoom.zoom_rate_at_start = sd->zoom.zooming_rate;
+ smart_zoom_index = N_COSINE - 1;
+ ecore_animator_frametime_set(1.0 / ZOOM_FRAMERATE);
+ sd->smart_zoom_animator = ecore_animator_add(_smart_zoom_animator, sd);
+ }
+ else
+ {
+ if (!sd->ewk_view_zoom_set)
+ sd->ewk_view_zoom_set = (Eina_Bool (*)(Evas_Object *, float, Evas_Coord, Evas_Coord))dlsym(ewk_handle, "ewk_view_zoom_set");
+ sd->ewk_view_zoom_set(sd->base.self, sd->zoom.zoom_rate_to_set, sd->zoom.basis.x, sd->zoom.basis.y);
+ }
+ DBG("<< zoom set [%f] >>\n", sd->zoom.zooming_rate);
_resume_all(sd, EINA_FALSE);
+ ((sd->zoom.zoom_rate_to_set - sd->zoom.zoom_rate_at_start) * cosine[smart_zoom_index]);
if (!sd->ewk_view_zoom_weak_set)
sd->ewk_view_zoom_weak_set = (Eina_Bool (*)(Evas_Object *, float, Evas_Coord, Evas_Coord))dlsym(ewk_handle, "ewk_view_zoom_weak_set");
- sd->ewk_view_zoom_weak_set(sd->base.self, zoom_rate, sd->zoom.basis.x, sd->zoom.basis.y);
+ if (zoom_rate <= sd->zoom.min_zoom_rate)
+ {
+ if (!sd->ewk_frame_scroll_pos_get)
+ sd->ewk_frame_scroll_pos_get = (Eina_Bool (*)(const Evas_Object *, int *, int *))dlsym(ewk_handle, "ewk_frame_scroll_pos_get");
+ if (!sd->ewk_view_zoom_get)
+ sd->ewk_view_zoom_get = (float (*)(const Evas_Object *))dlsym(ewk_handle, "ewk_view_zoom_get");
+ int scroll_x, scroll_y;
+ sd->ewk_frame_scroll_pos_get(sd->ewk_view_frame_main_get(sd->base.self), &scroll_x, &scroll_y);
+ float current_zoom_rate = sd->ewk_view_zoom_get(sd->base.self);
+ int center_x = (scroll_x * sd->zoom.zoom_rate_to_set * current_zoom_rate)
+ / (current_zoom_rate - sd->zoom.zoom_rate_to_set);
+ int center_y = (scroll_y * sd->zoom.zoom_rate_to_set * current_zoom_rate)
+ / (current_zoom_rate - sd->zoom.zoom_rate_to_set);
+
+ int basis_x = sd->zoom.basis.x + (center_x - sd->zoom.basis.x) * cosine[smart_zoom_index];
+ int basis_y = sd->zoom.basis.y + (center_y - sd->zoom.basis.y) * cosine[smart_zoom_index];
+ sd->ewk_view_zoom_weak_set(sd->base.self, zoom_rate, basis_x, basis_y);
+ smart_zoom_index--; // in order to make zoom bouncing more faster
+ }
+ if (zoom_rate >= sd->zoom.max_zoom_rate)
+ {
+ sd->ewk_view_zoom_weak_set(sd->base.self, zoom_rate, sd->zoom.basis.x, sd->zoom.basis.y);
+ smart_zoom_index--; // in order to make zoom bouncing more faster
+ }
+ else
+ {
+ sd->ewk_view_zoom_weak_set(sd->base.self, zoom_rate, sd->zoom.basis.x, sd->zoom.basis.y);
+ }
} else {
if (!sd->ewk_frame_scroll_pos_get)
sd->ewk_frame_scroll_pos_get = (Eina_Bool (*)(const Evas_Object *, int *, int *))dlsym(ewk_handle, "ewk_frame_scroll_pos_get");
rect_center_y = point->y;
}
// check zoom rate
- if (zoom_rate < (float)MIN_ZOOM_RATIO)
- zoom_rate = (float)MIN_ZOOM_RATIO;
if (zoom_rate < sd->zoom.min_zoom_rate)
zoom_rate = sd->zoom.min_zoom_rate;
- if (zoom_rate > (float)MAX_ZOOM_RATIO)
- zoom_rate = (float)MAX_ZOOM_RATIO;
+ if (zoom_rate > sd->zoom.max_zoom_rate)
+ zoom_rate = sd->zoom.max_zoom_rate;
if (zoom_rate == current_zoom_rate)
zoom_rate = sd->zoom.min_zoom_rate;
} else {
*ux = x - scrollX;
*uy = y - scrollY + viewY;
}
+static void
+_update_min_zoom_rate(Evas_Object *obj)
+{
+ INTERNAL_ENTRY;
+
+ if (!sd->ewk_view_frame_main_get)
+ sd->ewk_view_frame_main_get = (Evas_Object *(*)(const Evas_Object *))dlsym(ewk_handle, "ewk_view_frame_main_get");
+ if (!sd->ewk_frame_contents_size_get)
+ sd->ewk_frame_contents_size_get = (Eina_Bool (*)(const Evas_Object *, Evas_Coord *, Evas_Coord *))dlsym(ewk_handle, "ewk_frame_contents_size_get");
+ if (!sd->ewk_view_zoom_range_set)
+ sd->ewk_view_zoom_range_set = (Eina_Bool (*)(Evas_Object *, float, float))dlsym(ewk_handle, "ewk_view_zoom_range_set");
+
+ int content_w, object_w;
+ evas_object_geometry_get(obj, NULL, NULL, &object_w, NULL);
+ sd->ewk_frame_contents_size_get(sd->ewk_view_frame_main_get(obj), &content_w, NULL);
+ if (content_w)
+ sd->zoom.min_zoom_rate = (float)object_w / (float)content_w;
+
+ if (sd->use_zoom_bouncing)
+ {
+ float min_zoom_rate = sd->zoom.min_zoom_rate * ZOOM_OUT_BOUNCING;
+ if (min_zoom_rate <= 0) min_zoom_rate = MIN_ZOOM_RATIO;
+ float max_zoom_rate = sd->zoom.max_zoom_rate * ZOOM_IN_BOUNCING;
+ sd->ewk_view_zoom_range_set(obj, min_zoom_rate, max_zoom_rate);
+ }
+ else
+ {
+ sd->ewk_view_zoom_range_set(obj, sd->zoom.min_zoom_rate, sd->zoom.max_zoom_rate);
+ }
+}
+static void
+_geolocation_permission_callback(void *geolocation_obj, const char* url)
+{
+ printf("\n\n<< %s >>\n\n", __func__);
+ INTERNAL_ENTRY;
+
+ Evas_Object *popup;
+ int length;
+ char msg1[] = "The page at ";
+ char msg2[] = "<br>wants to know where you are.<br>Do you want to share location?";
+ char *msg = NULL;
+ int result;
+
+ length = strlen(msg1) + strlen(url) + strlen(msg2);
+ msg = calloc(length + 1, sizeof(char));
+ strncpy(msg, msg1, strlen(msg1));
+ strncat(msg, url, strlen(url));
+ strncat(msg, msg2, strlen(msg2));
+ msg[length] = '\0';
+
+ popup = elm_popup_add(obj);
+ evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ elm_popup_desc_set(popup, msg);
+ elm_popup_buttons_add(popup, 2, "Share", ELM_POPUP_RESPONSE_OK,
+ "Don't Share", ELM_POPUP_RESPONSE_CANCEL, NULL);
+ result = elm_popup_run(popup); // modal dialog
+ switch (result)
+ {
+ case ELM_POPUP_RESPONSE_OK:
+ if (!sd->ewk_set_geolocation_sharing_allowed)
+ sd->ewk_set_geolocation_sharing_allowed = (void (*)(void *, Eina_Bool))dlsym(ewk_handle, "ewk_set_geolocation_sharing_allowed");
+ sd->ewk_set_geolocation_sharing_allowed(geolocation_obj, EINA_TRUE);
+ break;
+
+ case ELM_POPUP_RESPONSE_CANCEL:
+ if (!sd->ewk_set_geolocation_sharing_allowed)
+ sd->ewk_set_geolocation_sharing_allowed = (void (*)(void *, Eina_Bool))dlsym(ewk_handle, "ewk_set_geolocation_sharing_allowed");
+ sd->ewk_set_geolocation_sharing_allowed(geolocation_obj, EINA_FALSE);
+ break;
+
+ default:
+ break;
+ }
+ if (msg)
+ free(msg);
+}
#endif
projects / framework / uifw / elementary.git / blobdiff