*/
#include "EWebKit2.h"
+#include "url_utils.h"
#include <Ecore.h>
#include <Ecore_Evas.h>
#include <Eina.h>
+#include <Elementary.h>
#include <Evas.h>
static const int DEFAULT_WIDTH = 800;
static const int DEFAULT_HEIGHT = 600;
static const char DEFAULT_URL[] = "http://www.google.com/";
static const char APP_NAME[] = "EFL MiniBrowser";
+static const int TOOL_BAR_ICON_SIZE = 24;
+static const int TOOL_BAR_BUTTON_SIZE = 32;
#define info(format, args...) \
do { \
printf(format, ##args); \
} while (0)
-static int verbose = 0;
+static int verbose = 1;
+static Eina_List *windows = NULL;
+static char *evas_engine_name = NULL;
+static Eina_Bool frame_flattening_enabled = EINA_FALSE;
+static Eina_Bool fullscreen_enabled = EINA_FALSE;
+static Eina_Bool toolbar_enabled = EINA_TRUE;
-typedef struct _MiniBrowser {
- Ecore_Evas *ee;
- Evas *evas;
- Evas_Object *bg;
- Evas_Object *browser;
-} MiniBrowser;
+typedef struct _Browser_Window {
+ Evas_Object *window;
+ Evas_Object *webview;
+ Evas_Object *url_bar;
+ Evas_Object *back_button;
+ Evas_Object *forward_button;
+} Browser_Window;
+
+static const Ecore_Getopt options = {
+ "MiniBrowser",
+ "%prog [options] [url]",
+ "0.0.1",
+ "(C)2012 Samsung Electronics\n",
+ "",
+ "Test Web Browser using the Enlightenment Foundation Libraries of WebKit2",
+ EINA_TRUE, {
+ ECORE_GETOPT_STORE_STR
+ ('e', "engine", "ecore-evas engine to use."),
+ ECORE_GETOPT_CALLBACK_NOARGS
+ ('E', "list-engines", "list ecore-evas engines.",
+ ecore_getopt_callback_ecore_evas_list_engines, NULL),
+ ECORE_GETOPT_STORE_DEF_BOOL
+ ('f', "flattening", "frame flattening.", EINA_FALSE),
+ ECORE_GETOPT_STORE_DEF_BOOL
+ ('F', "full-screen", "start in full-screen.", EINA_FALSE),
+ ECORE_GETOPT_STORE_DEF_BOOL
+ ('T', "toolbar", "enable toolbar.", EINA_TRUE),
+ ECORE_GETOPT_VERSION
+ ('V', "version"),
+ ECORE_GETOPT_COPYRIGHT
+ ('R', "copyright"),
+ ECORE_GETOPT_HELP
+ ('h', "help"),
+ ECORE_GETOPT_SENTINEL
+ }
+};
-static Eina_Bool main_signal_exit(void *data, int ev_type, void *ev)
+static Browser_Window *window_create(const char *url);
+
+static Browser_Window *browser_window_find(Evas_Object *window)
{
- ecore_main_loop_quit();
- return EINA_TRUE;
+ Eina_List *l;
+ void *data;
+
+ if (!window)
+ return NULL;
+
+ EINA_LIST_FOREACH(windows, l, data) {
+ Browser_Window *browser_window = (Browser_Window *)data;
+ if (browser_window->window == window)
+ return browser_window;
+ }
+ return NULL;
}
-static void closeWindow(Ecore_Evas *ee)
+static void window_free(Browser_Window *window)
{
- ecore_main_loop_quit();
+ evas_object_del(window->webview);
+ /* The elm_win will take care of freeing its children */
+ evas_object_del(window->window);
+ free(window);
}
-static void on_ecore_evas_resize(Ecore_Evas *ee)
+static void window_close(Browser_Window *window)
{
- Evas_Object *webview;
- Evas_Object *bg;
- int w, h;
+ windows = eina_list_remove(windows, window);
+ window_free(window);
- ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
-
- bg = evas_object_name_find(ecore_evas_get(ee), "bg");
- evas_object_move(bg, 0, 0);
- evas_object_resize(bg, w, h);
-
- webview = evas_object_name_find(ecore_evas_get(ee), "browser");
- evas_object_move(webview, 0, 0);
- evas_object_resize(webview, w, h);
+ if (!windows)
+ elm_exit();
}
static void
NULL
};
static int currentEncoding = -1;
+ Eina_Bool ctrlPressed = evas_key_modifier_is_set(evas_key_modifier_get(e), "Control");
+
if (!strcmp(ev->key, "F1")) {
info("Back (F1) was pressed\n");
if (!ewk_view_back(obj))
info("Set encoding (F3) pressed. New encoding to %s", encodings[currentEncoding]);
ewk_view_custom_encoding_set(obj, encodings[currentEncoding]);
} else if (!strcmp(ev->key, "F5")) {
- info("Reload (F5) was pressed, reloading.\n");
- ewk_view_reload(obj);
+ info("Reload (F5) was pressed, reloading.\n");
+ ewk_view_reload(obj);
} else if (!strcmp(ev->key, "F6")) {
- info("Stop (F6) was pressed, stop loading.\n");
- ewk_view_stop(obj);
+ info("Stop (F6) was pressed, stop loading.\n");
+ ewk_view_stop(obj);
+ } else if (!strcmp(ev->key, "n") && ctrlPressed) {
+ info("Create new window (Ctrl+n) was pressed.\n");
+ Browser_Window *window = window_create(DEFAULT_URL);
+ windows = eina_list_append(windows, window);
}
}
static void
-title_set(Ecore_Evas *ee, const char *title, int progress)
+view_focus_set(Browser_Window *window, Eina_Bool focus)
{
- Eina_Strbuf* buffer;
+ /* We steal focus away from elm's focus model and start to do things
+ * manually here, so elm now has no clue what's up. Tell elm that its
+ * toplevel widget is to be unfocused so elm gives up the focus */
+ elm_object_focus_set(elm_object_top_widget_get(window->window), EINA_FALSE);
+ evas_object_focus_set(window->webview, focus);
+}
+
+static void
+on_mouse_down(void *user_data, Evas *e, Evas_Object *webview, void *event_info)
+{
+ Browser_Window *window = (Browser_Window *)user_data;
+ Evas_Event_Mouse_Down *ev = (Evas_Event_Mouse_Down *)event_info;
+
+ /* Clear selection from the URL bar */
+ if (window->url_bar)
+ elm_entry_select_none(window->url_bar);
+
+ if (ev->button == 1)
+ view_focus_set(window, EINA_TRUE);
+ else if (ev->button == 2)
+ view_focus_set(window, !evas_object_focus_get(webview));
+}
+
+static void
+title_set(Evas_Object *window, const char *title, int progress)
+{
+ Eina_Strbuf *buffer;
if (!title || !*title) {
- ecore_evas_title_set(ee, APP_NAME);
+ elm_win_title_set(window, APP_NAME);
return;
}
else
eina_strbuf_append_printf(buffer, "%s - %s", title, APP_NAME);
- ecore_evas_title_set(ee, eina_strbuf_string_get(buffer));
+ elm_win_title_set(window, eina_strbuf_string_get(buffer));
eina_strbuf_free(buffer);
}
static void
on_title_changed(void *user_data, Evas_Object *webview, void *event_info)
{
- MiniBrowser *app = (MiniBrowser *)user_data;
+ Browser_Window *window = (Browser_Window *)user_data;
const char *title = (const char *)event_info;
- title_set(app->ee, title, 100);
+ title_set(window->window, title, 100);
+}
+
+static void
+on_url_changed(void *user_data, Evas_Object *webview, void *event_info)
+{
+ Browser_Window *window = (Browser_Window *)user_data;
+ if (window->url_bar)
+ elm_entry_entry_set(window->url_bar, ewk_view_url_get(window->webview));
+}
+
+static void
+on_back_forward_list_changed(void *user_data, Evas_Object *webview, void *event_info)
+{
+ Browser_Window *window = (Browser_Window *)user_data;
+
+ /* Update navigation buttons state */
+ if (window->back_button)
+ elm_object_disabled_set(window->back_button, !ewk_view_back_possible(webview));
+ if (window->forward_button)
+ elm_object_disabled_set(window->forward_button, !ewk_view_forward_possible(webview));
+}
+
+static void
+on_new_window(void *user_data, Evas_Object *webview, void *event_info)
+{
+ Evas_Object **new_view = (Evas_Object **)event_info;
+ Browser_Window *window = window_create(NULL);
+ *new_view = window->webview;
+ windows = eina_list_append(windows, window);
+}
+
+static void
+on_close_window(void *user_data, Evas_Object *webview, void *event_info)
+{
+ window_close((Browser_Window *)user_data);
}
static void
on_progress(void *user_data, Evas_Object *webview, void *event_info)
{
- MiniBrowser *app = (MiniBrowser *)user_data;
+ Browser_Window *window = (Browser_Window *)user_data;
double progress = *(double *)event_info;
- title_set(app->ee, ewk_view_title_get(app->browser), progress * 100);
+ title_set(window->window, ewk_view_title_get(window->webview), progress * 100);
}
static void
on_error(void *user_data, Evas_Object *webview, void *event_info)
{
Eina_Strbuf* buffer;
- const Ewk_Web_Error *error = (const Ewk_Web_Error *)event_info;
+ const Ewk_Error *error = (const Ewk_Error *)event_info;
+
+ /* This is a cancellation, do not display the error page */
+ if (ewk_error_cancellation_get(error))
+ return;
buffer = eina_strbuf_new();
eina_strbuf_append_printf(buffer, "<html><body><div style=\"color:#ff0000\">ERROR!</div><br><div>Code: %d<br>Description: %s<br>URL: %s</div></body</html>",
- ewk_web_error_code_get(error), ewk_web_error_description_get(error), ewk_web_error_url_get(error));
+ ewk_error_code_get(error), ewk_error_description_get(error), ewk_error_url_get(error));
- ewk_view_html_string_load(webview, eina_strbuf_string_get(buffer), 0, ewk_web_error_url_get(error));
+ ewk_view_html_string_load(webview, eina_strbuf_string_get(buffer), 0, ewk_error_url_get(error));
eina_strbuf_free(buffer);
}
-static MiniBrowser *browserCreate(const char *url)
+static void
+on_download_request(void *user_data, Evas_Object *webview, void *event_info)
{
- MiniBrowser *app = malloc(sizeof(MiniBrowser));
+ Ewk_Download_Job *download = (Ewk_Download_Job *)event_info;
+
+ // FIXME: The destination folder should be selected by the user but we set it to '/tmp' for now.
+ Eina_Strbuf *destination_path = eina_strbuf_new();
+
+ const char *suggested_name = ewk_download_job_suggested_filename_get(download);
+ if (suggested_name && *suggested_name)
+ eina_strbuf_append_printf(destination_path, "/tmp/%s", suggested_name);
+ else {
+ // Generate a unique file name since no name was suggested.
+ char unique_path[] = "/tmp/downloaded-file.XXXXXX";
+ // change from org distribution
+ eina_strbuf_append(destination_path, mktemp(unique_path));
+ }
- app->ee = ecore_evas_new(0, 0, 0, DEFAULT_WIDTH, DEFAULT_HEIGHT, 0);
+ ewk_download_job_destination_set(download, eina_strbuf_string_get(destination_path));
+ info("Downloading: %s\n", eina_strbuf_string_get(destination_path));
+ eina_strbuf_free(destination_path);
+}
- ecore_evas_title_set(app->ee, APP_NAME);
- ecore_evas_callback_resize_set(app->ee, on_ecore_evas_resize);
- ecore_evas_borderless_set(app->ee, 0);
- ecore_evas_show(app->ee);
- ecore_evas_callback_delete_request_set(app->ee, closeWindow);
+static void
+on_download_finished(void *user_data, Evas_Object *webview, void *event_info)
+{
+ Ewk_Download_Job *download = (Ewk_Download_Job *)event_info;
+ info("Download finished: %s\n", ewk_download_job_destination_get(download));
+}
- app->evas = ecore_evas_get(app->ee);
+static void
+on_download_failed(void *user_data, Evas_Object *webview, void *event_info)
+{
+ info("Download failed!\n");
+}
- app->bg = evas_object_rectangle_add(app->evas);
- evas_object_name_set(app->bg, "bg");
- evas_object_size_hint_weight_set(app->bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+static int
+quit(Eina_Bool success, const char *msg)
+{
+ ewk_shutdown();
+ elm_shutdown();
- evas_object_move(app->bg, 0, 0);
- evas_object_resize(app->bg, DEFAULT_WIDTH, DEFAULT_HEIGHT);
- evas_object_color_set(app->bg, 255, 150, 150, 255);
- evas_object_show(app->bg);
+ if (msg)
+ fputs(msg, (success) ? stdout : stderr);
- /* Create webview */
- app->browser = ewk_view_add(app->evas);
- ewk_view_theme_set(app->browser, THEME_DIR"/default.edj");
- evas_object_name_set(app->browser, "browser");
+ if (!success)
+ return EXIT_FAILURE;
+
+ return EXIT_SUCCESS;
+}
+
+static void
+on_url_bar_activated(void *user_data, Evas_Object *url_bar, void *event_info)
+{
+ Browser_Window *app_data = (Browser_Window *)user_data;
+
+ const char *user_url = elm_entry_entry_get(url_bar);
+ char *url = url_from_user_input(user_url);
+ ewk_view_url_set(app_data->webview, url);
+ free(url);
+
+ /* Give focus back to the view */
+ view_focus_set(app_data, EINA_TRUE);
+}
+
+static void
+on_url_bar_clicked(void *user_data, Evas_Object *url_bar, void *event_info)
+{
+ Browser_Window *app_data = (Browser_Window *)user_data;
+
+ /* Grab focus from the view */
+ evas_object_focus_set(app_data->webview, EINA_FALSE);
+ elm_object_focus_set(url_bar, EINA_TRUE);
+}
+
+static void
+on_back_button_clicked(void *user_data, Evas_Object *back_button, void *event_info)
+{
+ Browser_Window *app_data = (Browser_Window *)user_data;
+
+ ewk_view_back(app_data->webview);
+ /* Update back button state */
+ elm_object_disabled_set(back_button, !ewk_view_back_possible(app_data->webview));
+}
+
+static void
+on_forward_button_clicked(void *user_data, Evas_Object *forward_button, void *event_info)
+{
+ Browser_Window *app_data = (Browser_Window *)user_data;
+
+ ewk_view_forward(app_data->webview);
+ /* Update forward button state */
+ elm_object_disabled_set(forward_button, !ewk_view_forward_possible(app_data->webview));
+}
- evas_object_smart_callback_add(app->browser, "load,error", on_error, app);
- evas_object_smart_callback_add(app->browser, "load,progress", on_progress, app);
- evas_object_smart_callback_add(app->browser, "title,changed", on_title_changed, app);
+static void
+on_refresh_button_clicked(void *user_data, Evas_Object *refresh_button, void *event_info)
+{
+ Browser_Window *app_data = (Browser_Window *)user_data;
+
+ Evas *evas = evas_object_evas_get(refresh_button);
+ Eina_Bool ctrlPressed = evas_key_modifier_is_set(evas_key_modifier_get(evas), "Control");
+ if (ctrlPressed) {
+ info("Reloading and bypassing cache...\n");
+ ewk_view_reload_bypass_cache(app_data->webview);
+ } else {
+ info("Reloading...\n");
+ ewk_view_reload(app_data->webview);
+ }
+}
- evas_object_event_callback_add(app->browser, EVAS_CALLBACK_KEY_DOWN, on_key_down, app);
+static void
+on_home_button_clicked(void *user_data, Evas_Object *home_button, void *event_info)
+{
+ Browser_Window *app_data = (Browser_Window *)user_data;
- evas_object_size_hint_weight_set(app->browser, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_resize(app->browser, DEFAULT_WIDTH, DEFAULT_HEIGHT);
- evas_object_show(app->browser);
- evas_object_focus_set(app->browser, EINA_TRUE);
+ ewk_view_url_set(app_data->webview, DEFAULT_URL);
+}
+
+static void
+on_window_deletion(void *user_data, Evas_Object *window, void *event_info)
+{
+ window_close(browser_window_find(window));
+}
+
+static Evas_Object *
+create_toolbar_button(Evas_Object *window, const char *icon_name)
+{
+ Evas_Object *button = elm_button_add(window);
- ewk_view_url_set(app->browser, url);
+ Evas_Object *icon = elm_icon_add(window);
+ elm_icon_standard_set(icon, icon_name);
+ evas_object_size_hint_max_set(icon, TOOL_BAR_ICON_SIZE, TOOL_BAR_ICON_SIZE);
+ evas_object_color_set(icon, 44, 44, 102, 128);
+ evas_object_show(icon);
+ elm_object_part_content_set(button, "icon", icon);
+ evas_object_size_hint_min_set(button, TOOL_BAR_BUTTON_SIZE, TOOL_BAR_BUTTON_SIZE);
- return app;
+ return button;
}
-int main(int argc, char *argv[])
+static Browser_Window *window_create(const char *url)
+{
+ Browser_Window *app_data = malloc(sizeof(Browser_Window));
+ if (!app_data) {
+ info("ERROR: could not create browser window.\n");
+ return NULL;
+ }
+
+ /* Create window */
+ app_data->window = elm_win_add(NULL, "minibrowser-window", ELM_WIN_BASIC);
+ elm_win_title_set(app_data->window, APP_NAME);
+ evas_object_smart_callback_add(app_data->window, "delete,request", on_window_deletion, &app_data);
+
+ /* Create window background */
+ Evas_Object *bg = elm_bg_add(app_data->window);
+ elm_bg_color_set(bg, 193, 192, 191);
+ evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ elm_win_resize_object_add(app_data->window, bg);
+ evas_object_show(bg);
+
+ /* Create vertical layout */
+ Evas_Object *vertical_layout = elm_box_add(app_data->window);
+ elm_box_padding_set(vertical_layout, 0, 2);
+ evas_object_size_hint_weight_set(vertical_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ elm_win_resize_object_add(app_data->window, vertical_layout);
+ evas_object_show(vertical_layout);
+
+ if (toolbar_enabled) {
+ /* Create horizontal layout for top bar */
+ Evas_Object *horizontal_layout = elm_box_add(app_data->window);
+ elm_box_horizontal_set(horizontal_layout, EINA_TRUE);
+ evas_object_size_hint_weight_set(horizontal_layout, EVAS_HINT_EXPAND, 0.0);
+ evas_object_size_hint_align_set(horizontal_layout, EVAS_HINT_FILL, 0.0);
+ elm_box_pack_end(vertical_layout, horizontal_layout);
+ evas_object_show(horizontal_layout);
+
+ /* Create Back button */
+ app_data->back_button = create_toolbar_button(app_data->window, "arrow_left");
+ evas_object_smart_callback_add(app_data->back_button, "clicked", on_back_button_clicked, app_data);
+ elm_object_disabled_set(app_data->back_button, EINA_TRUE);
+ evas_object_size_hint_weight_set(app_data->back_button, 0.0, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(app_data->back_button, 0.0, 0.5);
+ elm_box_pack_end(horizontal_layout, app_data->back_button);
+ evas_object_show(app_data->back_button);
+
+ /* Create Forward button */
+ app_data->forward_button = create_toolbar_button(app_data->window, "arrow_right");
+ evas_object_smart_callback_add(app_data->forward_button, "clicked", on_forward_button_clicked, app_data);
+ elm_object_disabled_set(app_data->forward_button, EINA_TRUE);
+ evas_object_size_hint_weight_set(app_data->forward_button, 0.0, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(app_data->forward_button, 0.0, 0.5);
+ elm_box_pack_end(horizontal_layout, app_data->forward_button);
+ evas_object_show(app_data->forward_button);
+
+ /* Create URL bar */
+ app_data->url_bar = elm_entry_add(app_data->window);
+ elm_entry_scrollable_set(app_data->url_bar, EINA_TRUE);
+ elm_entry_single_line_set(app_data->url_bar, EINA_TRUE);
+ elm_entry_cnp_mode_set(app_data->url_bar, ELM_CNP_MODE_PLAINTEXT);
+ elm_entry_text_style_user_push(app_data->url_bar, "DEFAULT='font_size=18'");
+ evas_object_smart_callback_add(app_data->url_bar, "activated", on_url_bar_activated, app_data);
+ evas_object_smart_callback_add(app_data->url_bar, "clicked", on_url_bar_clicked, app_data);
+ evas_object_size_hint_weight_set(app_data->url_bar, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(app_data->url_bar, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_box_pack_end(horizontal_layout, app_data->url_bar);
+ evas_object_show(app_data->url_bar);
+
+ /* Create Refresh button */
+ Evas_Object *refresh_button = create_toolbar_button(app_data->window, "refresh");
+ evas_object_smart_callback_add(refresh_button, "clicked", on_refresh_button_clicked, app_data);
+ evas_object_size_hint_weight_set(refresh_button, 0.0, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(refresh_button, 1.0, 0.5);
+ elm_box_pack_end(horizontal_layout, refresh_button);
+ evas_object_show(refresh_button);
+
+ /* Create Home button */
+ Evas_Object *home_button = create_toolbar_button(app_data->window, "home");
+ evas_object_smart_callback_add(home_button, "clicked", on_home_button_clicked, app_data);
+ evas_object_size_hint_weight_set(home_button, 0.0, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(home_button, 1.0, 0.5);
+ elm_box_pack_end(horizontal_layout, home_button);
+ evas_object_show(home_button);
+ }
+
+ /* Create webview */
+ Evas *evas = evas_object_evas_get(app_data->window);
+ app_data->webview = ewk_view_add(evas);
+ ewk_view_theme_set(app_data->webview, THEME_DIR "/default.edj");
+
+ /* set a file containing certificates for recognized SSL Certificate Authorities */
+ ewk_context_certificate_file_set(ewk_context_default_get(), "/var/lib/ca-certificates/ca-bundle.pem");
+
+// Ewk_Settings *settings = ewk_view_settings_get(app_data->webview);
+// ewk_settings_file_access_from_file_urls_allowed_set(settings, EINA_TRUE);
+// ewk_settings_enable_frame_flattening_set(settings, frame_flattening_enabled);
+ elm_win_fullscreen_set(app_data->window, fullscreen_enabled);
+
+ evas_object_smart_callback_add(app_data->webview, "close,window", on_close_window, app_data);
+ evas_object_smart_callback_add(app_data->webview, "create,window", on_new_window, app_data);
+ evas_object_smart_callback_add(app_data->webview, "download,failed", on_download_failed, app_data);
+ evas_object_smart_callback_add(app_data->webview, "download,finished", on_download_finished, app_data);
+ evas_object_smart_callback_add(app_data->webview, "download,request", on_download_request, app_data);
+ evas_object_smart_callback_add(app_data->webview, "load,error", on_error, app_data);
+ evas_object_smart_callback_add(app_data->webview, "load,progress", on_progress, app_data);
+ evas_object_smart_callback_add(app_data->webview, "title,changed", on_title_changed, app_data);
+ evas_object_smart_callback_add(app_data->webview, "url,changed", on_url_changed, app_data);
+ evas_object_smart_callback_add(app_data->webview, "back,forward,list,changed", on_back_forward_list_changed, app_data);
+
+ evas_object_event_callback_add(app_data->webview, EVAS_CALLBACK_KEY_DOWN, on_key_down, app_data);
+ evas_object_event_callback_add(app_data->webview, EVAS_CALLBACK_MOUSE_DOWN, on_mouse_down, app_data);
+
+ evas_object_size_hint_weight_set(app_data->webview, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(app_data->webview, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_box_pack_end(vertical_layout, app_data->webview);
+ evas_object_show(app_data->webview);
+
+ if (url)
+ ewk_view_url_set(app_data->webview, url);
+
+ evas_object_resize(app_data->window, DEFAULT_WIDTH, DEFAULT_HEIGHT);
+ elm_win_center(app_data->window, EINA_TRUE, EINA_TRUE);
+ evas_object_show(app_data->window);
+
+ view_focus_set(app_data, EINA_TRUE);
+
+ return app_data;
+}
+
+EAPI_MAIN int
+elm_main(int argc, char *argv[])
{
- const char *url;
int args = 1;
+ unsigned char quitOption = 0;
+ Browser_Window *window;
+
+ Ecore_Getopt_Value values[] = {
+ ECORE_GETOPT_VALUE_STR(evas_engine_name),
+ ECORE_GETOPT_VALUE_BOOL(quitOption),
+ ECORE_GETOPT_VALUE_BOOL(frame_flattening_enabled),
+ ECORE_GETOPT_VALUE_BOOL(fullscreen_enabled),
+ ECORE_GETOPT_VALUE_BOOL(toolbar_enabled),
+ ECORE_GETOPT_VALUE_BOOL(quitOption),
+ ECORE_GETOPT_VALUE_BOOL(quitOption),
+ ECORE_GETOPT_VALUE_BOOL(quitOption),
+ ECORE_GETOPT_VALUE_NONE
+ };
if (!ewk_init())
return EXIT_FAILURE;
- if (args < argc)
- url = argv[args];
- else
- url = DEFAULT_URL;
+ ecore_app_args_set(argc, (const char **) argv);
+ args = ecore_getopt_parse(&options, values, argc, argv);
- MiniBrowser *browser = browserCreate(url);
+ if (args < 0)
+ return quit(EINA_FALSE, "ERROR: could not parse options.\n");
- Ecore_Event_Handler *handle = ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, main_signal_exit, 0);
+ if (quitOption)
+ return quit(EINA_TRUE, NULL);
- ecore_main_loop_begin();
+ if (args < argc) {
+ char *url = url_from_user_input(argv[args]);
+ window = window_create(url);
+ free(url);
+ } else
+ window = window_create(DEFAULT_URL);
- ecore_event_handler_del(handle);
- ecore_evas_free(browser->ee);
- free(browser);
+ if (!window)
+ return quit(EINA_FALSE, "ERROR: could not create browser window.\n");
- ewk_shutdown();
+ windows = eina_list_append(windows, window);
+
+ elm_run();
- return 0;
+ return quit(EINA_TRUE, NULL);
}
+ELM_MAIN()
projects / platform / framework / web / webkit-efl.git / blobdiff