viking

webkit based web browser for Enlightenment
Log | Files | Refs | LICENSE

commit 434792cf1efeb9f2cfcbc7cb67c891ffed955d1e
parent b1f9cf4cfc64484735cf9f2e16941234f5aa51ce
Author: Kyle Milz <kmilz@ucalgary.ca>
Date:   Tue, 25 Sep 2012 20:15:10 -0600

remove old dependencies on hard coded files

Diffstat:
Msrc/commands.c | 109++++++-------------------------------------------------------------------------
Msrc/main.c | 55++++++++++++++++++++++++++-----------------------------
Msrc/main.h | 2--
Msrc/utilities.c | 6++++--
Msrc/viking.h | 11-----------
5 files changed, 37 insertions(+), 146 deletions(-)

diff --git a/src/commands.c b/src/commands.c @@ -634,32 +634,10 @@ paste(const Arg *arg, void *data) { Eina_Bool tab_quit(const Arg *arg, void *data) { - FILE *f; - char *filename; App_Data *ad = data; - if (!ad->cur_buf->web) - return EINA_TRUE; - - // const char *uri = webkit_web_view_get_uri(webview); - const char *uri = elm_web_uri_get(ad->cur_buf->web); - if (uri != NULL) { - /* write last URL into status file for recreation with "u" */ - filename = strdup_printf(CLOSED_URL_FILENAME); - f = fopen(filename, "w"); - free(filename); - if (f != NULL) { - fprintf(f, "%s", uri); - fclose(f); - } - } + /* TODO: save the session information for revival later */ evas_object_del(ad->cur_buf->web); - // elm_naviframe_item_pop(ad->naviframe); - // Elm_Object_Item *obj_item = elm_naviframe_top_item_get(ad->naviframe); - // if (obj_item) ad->current_web = elm_object_item_widget_get(obj_item); - // if (obj_item) ad->current_web = elm_object_item_part_content_get(obj_item, NULL); - // else quit(NULL, data); - return EINA_TRUE; } @@ -676,26 +654,8 @@ quit(const Arg *arg, void *data) Eina_Bool revive(const Arg *arg, void *data) { - App_Data *ad = data; - - FILE *f; - char *filename; - char buffer[512] = ""; - Arg a = { .i = TargetNew, .s = NULL }; - /* get the URL of the window which has been closed last */ - filename = strdup_printf(CLOSED_URL_FILENAME); - f = fopen(filename, "r"); - free(filename); - if (f != NULL) { - fgets(buffer, 512, f); - fclose(f); - } - if (strlen(buffer) > 0) { - a.s = buffer; - open_arg(&a, data); - return TRUE; - } - return FALSE; + // App_Data *ad = data; + return EINA_FALSE; } Eina_Bool @@ -832,36 +792,7 @@ jsapi_evaluate_script(const gchar *script, gchar **value, gchar **message) { Eina_Bool quickmark(const Arg *a, void *data) { - int i, b; - App_Data *ad = data; - b = atoi(a->s); - char *fn = strdup_printf(QUICKMARK_FILE); - FILE *fp; - fp = fopen(fn, "r"); - free(fn); - fn = NULL; - char buf[100]; - - if (fp != NULL && b < 10) { - for( i=0; i < b; ++i ) { - if (feof(fp)) { - break; - } - fgets(buf, 100, fp); - } - char *ptr = strrchr(buf, '\n'); - *ptr = '\0'; - Arg x = { .s = buf }; - if (strlen(buf)) - return open_arg(&x, data); - else { - x.i = Error; - x.s = strdup_printf("Quickmark %d not defined", b); - echo(&x, data); - free(x.s); - return EINA_FALSE; - } - } else { return EINA_FALSE; } + return EINA_FALSE; } Eina_Bool @@ -1084,35 +1015,7 @@ fake_key_event(const Arg *a, void *data) { Eina_Bool bookmark(const Arg *arg, void *data) { - FILE *f; - char *filename; - App_Data *ad = data; - const char *uri = elm_web_uri_get(ad->cur_buf->web); - const char *title = elm_web_title_get(ad->cur_buf->web); - filename = strdup_printf(BOOKMARKS_STORAGE_FILENAME); - f = fopen(filename, "a"); - free(filename); - if (uri == NULL || strlen(uri) == 0) { - set_error("No URI found to bookmark.", data); - return EINA_FALSE; - } - if (f != NULL) { - fprintf(f, "%s", uri); - if (title != NULL) { - fprintf(f, "%s", " "); - fprintf(f, "%s", title); - } - if (arg->s && strlen(arg->s)) { - build_taglist(arg, f); - } - fprintf(f, "%s", "\n"); - fclose(f); - give_feedback("Bookmark saved", data); - return EINA_TRUE; - } else { - set_error("Bookmarks file not found.", data); - return EINA_FALSE; - } + return EINA_FALSE; } Eina_Bool @@ -1299,6 +1202,7 @@ process_set_line(char *line) { Eina_Bool search_tag(const Arg * a, void *data) { +#if 0 FILE *f; char *filename; App_Data *ad = data; @@ -1361,6 +1265,7 @@ search_tag(const Arg * a, void *data) t--; } } +#endif return EINA_TRUE; } diff --git a/src/main.c b/src/main.c @@ -624,35 +624,33 @@ end: return EINA_FALSE; } - - static const Ecore_Getopt options = { - PACKAGE_NAME, - "%prog [options] [url]", - PACKAGE_VERSION " Revision: ", // VREV, - "(C) 2010 ProFUSION embedded systems", - "LGPL-3", - "WebKit-EFL demo browser for mobile systems with touchscreen.", - EINA_TRUE, - { - // ECORE_GETOPT_STORE_DEF_BOOL('F', "fullscreen", "start in fullscreen.", 1), - ECORE_GETOPT_STORE_DEF_BOOL('P', "disable-plugins", - "disable plugins (flash, etc).", 1), - // ECORE_GETOPT_STORE_DEF_BOOL('M', "disable-mouse", - // "disable mouse (hide it).", 1), - // ECORE_GETOPT_STORE_DEF_BOOL('T', "disable-touch-interface", - // "disable touch interface handling of mouse events", 1), - ECORE_GETOPT_STORE_STR('U', "user-agent", - "user agent string to use. Special cases=iphone,safari,chrome,firefox,android,ie,ie9,ie8,ie7."), - ECORE_GETOPT_STORE_DEF_STR('B', "backing-store", - "backing store to use. single or tiled.", "single"), - // ECORE_GETOPT_STORE_DEF_UINT('R', "rotate", "Screen Rotation in degrees", 0), - ECORE_GETOPT_VERSION('V', "version"), - ECORE_GETOPT_COPYRIGHT('C', "copyright"), - ECORE_GETOPT_LICENSE('L', "license"), - ECORE_GETOPT_HELP('h', "help"), - ECORE_GETOPT_SENTINEL - } + PACKAGE_NAME, + "%prog [options] [url]", + PACKAGE_VERSION " Revision: ", // VREV, + "(C) 2012 Kyle Milz", + "GPL-2", + "WebKit-EFL browser for full keyboard computers.", + EINA_TRUE, + { + // ECORE_GETOPT_STORE_DEF_BOOL('F', "fullscreen", "start in fullscreen.", 1), + ECORE_GETOPT_STORE_DEF_BOOL('P', "disable-plugins", + "disable plugins (flash, etc).", 1), + // ECORE_GETOPT_STORE_DEF_BOOL('M', "disable-mouse", + // "disable mouse (hide it).", 1), + // ECORE_GETOPT_STORE_DEF_BOOL('T', "disable-touch-interface", + // "disable touch interface handling of mouse events", 1), + ECORE_GETOPT_STORE_STR('U', "user-agent", + "user agent string to use. Special cases=iphone,safari,chrome,firefox,android,ie,ie9,ie8,ie7."), + ECORE_GETOPT_STORE_DEF_STR('B', "backing-store", + "backing store to use. single or tiled.", "single"), + // ECORE_GETOPT_STORE_DEF_UINT('R', "rotate", "Screen Rotation in degrees", 0), + ECORE_GETOPT_VERSION('V', "version"), + ECORE_GETOPT_COPYRIGHT('C', "copyright"), + ECORE_GETOPT_LICENSE('L', "license"), + ECORE_GETOPT_HELP('h', "help"), + ECORE_GETOPT_SENTINEL + } }; char * @@ -950,7 +948,6 @@ elm_main(int argc, char *argv[]) /* initialize fields that are non-zero */ ad->keylistroot = make_keyslist(); - ad->config_base = "./"; ad->zoomstep = 0.1f; ad->mode = ModeNormal; ad->echo_active = EINA_TRUE; diff --git a/src/main.h b/src/main.h @@ -36,12 +36,10 @@ typedef struct char *search_handle; Eina_Bool search_direction; Eina_Bool echo_active; - // WebKitWebInspector *inspector; char rememberedURI[1024]; char followTarget[8]; char *error_msg; - char *config_base; Eina_Bool manual_focus; Eina_List *buffer_list; diff --git a/src/utilities.c b/src/utilities.c @@ -27,8 +27,8 @@ #include "jsmn.h" /* these all need to go */ -static Eina_Bool complete_case_sensitive = TRUE; -extern char *config_base; +// static Eina_Bool complete_case_sensitive = TRUE; +// extern char *config_base; static Eina_List *dynamic_searchengines = NULL, *dynamic_uri_handlers = NULL; @@ -589,6 +589,7 @@ give_feedback(const char *feedback, void *data) free(a.s); } +#if 0 Listelement * complete_list(const char *searchfor, const int mode, Listelement *elementlist, void *data) { @@ -669,6 +670,7 @@ complete_list(const char *searchfor, const int mode, Listelement *elementlist, v free(filename); return (elementlist); } +#endif Listelement * add_list(const char *element, Listelement *elementlist) diff --git a/src/viking.h b/src/viking.h @@ -172,17 +172,6 @@ enum ConfigFileError { #define BUFFERSIZE 255 #define MAXTAGSIZE 200 -/* bookmarks */ -#define BOOKMARKS_STORAGE_FILENAME "%s/vimprobable/bookmarks", ad->config_base - -/* quickmarks */ -#define QUICKMARK_FILE "%s/vimprobable/quickmarks", ad->config_base - -/* history */ -#define HISTORY_MAX_ENTRIES 1000 -#define HISTORY_STORAGE_FILENAME "%s/vimprobable/history", ad->config_base -#define CLOSED_URL_FILENAME "%s/vimprobable/closed", ad->config_base - /* Command size */ #define COMMANDSIZE 1024