Changeset 58124 in webkit

Timestamp:

Apr 22, 2010 4:00:23 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-22 Leandro Pereira <​leandro@profusion.mobi>

Reviewed by Gustavo Noronha Silva.

Implement findThemePath to locate the correct theme file instead of
relying on a hardcoded location.
​http://webkit.org/b/37996

• efl/EWebLauncher/main.c: (findThemePath): Fix to locate the correct theme files. (main): Use findThemePath() instead of a hardcoded one.

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• efl/EWebLauncher/main.c (modified) (19 diffs)

trunk/WebKit/ChangeLog

@@ +1 @@
+2010-04-22  Leandro Pereira  <leandro@profusion.mobi>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Implement findThemePath to locate the correct theme file instead of
+        relying on a hardcoded location.
+        http://webkit.org/b/37996
+
+        * efl/EWebLauncher/main.c:
+        (findThemePath): Fix to locate the correct theme files.
+        (main): Use findThemePath() instead of a hardcoded one.
+
 2010-04-22  Leandro Pereira  <leandro@profusion.mobi>
 

trunk/WebKit/efl/EWebLauncher/main.c

@@ -32 +32 @@
 #include <ctype.h>
 #include <Ecore.h>
-#include <Ecore_Data.h>
 #include <Ecore_Evas.h>
 #include <Ecore_File.h>
@@ -43 +42 @@
 #include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -54 +54 @@
             printf(format, ##args); \
     } while (0)
-
-#define REL_THEME_PATH "../../../WebKit/efl/DefaultTheme/default.edj"
 
 #define MIN_ZOOM_LEVEL 0
@@ -137 +135 @@
 } ELauncher;
 
-void browserDestroy(Ecore_Evas *ee);
-void closeWindow(Ecore_Evas *ee);
-int browserCreate(const char *url, const char *theme, const char *userAgent, Eina_Rectangle geometry, const char *engine, unsigned char isFullscreen);
-
-void
+static void browserDestroy(Ecore_Evas *ee);
+static void closeWindow(Ecore_Evas *ee);
+static int browserCreate(const char *url, const char *theme, const char *userAgent, Eina_Rectangle geometry, const char *engine, unsigned char isFullscreen);
+
+static void
 print_history(Eina_List *list)
 {
@@ -174 +172 @@
 }
 
-void
+static void
 zoom_level_set(Evas_Object *webview, int level)
 {
@@ -186 +184 @@
 }
 
-char*
-join_path(const char *base, const char *path)
-{
-    char separator[] = "/";
-
-    char tmp[PATH_MAX + 1];
-    char result[PATH_MAX + 1];
-    result[0] = tmp[0] = '\0';
-
-    char *str = strdup(path);
-
-    char *token = NULL;
-    token = strtok(str, separator);
-    int count = 0;
-    do {
-        if (!strcmp(token, ".."))
-            count++;
-        else
-            strcat(tmp, token);
-        token = strtok(NULL, separator);
-        if (!token)
-            break;
-        if (tmp[0])
-            strcat(tmp, separator);
-    } while (EINA_TRUE);
-
-    free(str);
-    str = strdup(base);
-
-    char *base_ptr;
-    while (count--) {
-        base_ptr = strrchr(str, separator[0]);
-        if (!base_ptr) {
-            free(str);
-            return NULL; // couldn't resolve path
-        }
-        *base_ptr = '\0';
-    }
-
-    strcat(result, str);
-    strcat(result, separator);
-    strcat(result, tmp);
-    free(str);
-
-    return strdup(result);
-}
-
 static void
 on_ecore_evas_resize(Ecore_Evas *ee)
@@ -395 +346 @@
 }
 
-void
+static void
 on_mouse_down(void* data, Evas* e, Evas_Object* webview, void* event_info)
 {
@@ -403 +354 @@
 }
 
-void
+static void
 on_focus_out(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
@@ -409 +360 @@
 }
 
-void
+static void
 on_focus_in(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
@@ -415 +366 @@
 }
 
-void
+static void
 on_resized(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
@@ -423 +374 @@
 }
 
-void
+static void
 on_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
@@ -531 +482 @@
 }
 
-void
+static void
 on_browser_del(void *data, Evas *evas, Evas_Object *browser, void *event)
 {
@@ -543 +494 @@
 }
 
-void
+static void
 on_closeWindow(Ecore_Evas *ee)
 {
@@ -549 +500 @@
 }
 
-int
+static int
 quit(Eina_Bool success, const char *msg)
 {
@@ -566 +517 @@
 }
 
-int
+static int
 browserCreate(const char *url, const char *theme, const char *userAgent, Eina_Rectangle geometry, const char *engine, unsigned char isFullscreen)
 {
@@ -654 +605 @@
 }
 
-void
+static void
 browserDestroy(Ecore_Evas *ee)
 {
@@ -662 +613 @@
 }
 
-void
+static void
 closeWindow(Ecore_Evas *ee)
 {
@@ -689 +640 @@
         ecore_main_loop_quit();
     return 1;
+}
+
+static char *
+findThemePath(void)
+{
+    const char **itr, *locations[] = {
+        "./default.edj",
+        "./WebKit/efl/DefaultTheme/default.edj",
+        "../WebKit/efl/DefaultTheme/default.edj",
+        DATA_DIR"/themes/default.edj",
+        NULL
+    };
+
+    for (itr = locations; *itr; itr++) {
+        struct stat st;
+        if (!stat(*itr, &st)) {
+            char path[PATH_MAX];
+            if (realpath(*itr, path))
+                return strdup(path);
+        }
+    }
+
+    return NULL;
 }
 
@@ -751 +725 @@
         strcat(getenv("HOME"), "blah");
 
-    themePath = join_path(argv[0], REL_THEME_PATH);
+    themePath = findThemePath();
 
     ewk_init();