2007-11-05 Mark Rowe <mrowe@apple.com>

[WebKit-https.git] / WebKitTools / GtkLauncher / main.cpp

diff --git a/WebKitTools/GtkLauncher/main.cpp b/WebKitTools/GtkLauncher/main.cpp
index 2f4fc832ea6df9a0f414df8857c41d022856004c..3d62f4063fa146a901b5293bc9fd9ee5aa4920ad 100644 (file)
--- a/WebKitTools/GtkLauncher/main.cpp
+++ b/WebKitTools/GtkLauncher/main.cpp
@@ -7,25 +7,11 @@
 
 static GtkWidget* gURLBarEntry;
 static GtkWidget* gTopLevelWindow;
-static WebKitGtkPage* gPage;
+static GtkStatusbar* gStatusbar;
+static WebKitPage* gPage;
 static gchar* gTitle;
 static gint gProgress;
-
-static bool stringIsEqual(const char* str1, const char* str2)
-{
-    return 0 == strcmp(str1, str2);
-}
-
-static gchar* autocorrectURL(const gchar* url)
-{
-    if (strncmp("http://", url, 7) != 0 && strncmp("https://", url, 8) != 0 && strncmp("file://", url, 7) != 0 && strncmp("ftp://", url, 6) != 0) {
-        GString* string = g_string_new("http://");
-        g_string_append(string, url);
-        return g_string_free(string, FALSE);
-    }
-    
-    return g_strdup(url);
-}
+static guint gStatusbarContextId;
 
 static void goToURLBarText(GtkWidget* urlBarEntry)
 {
@@ -33,9 +19,7 @@ static void goToURLBarText(GtkWidget* urlBarEntry)
     if (!url || strlen(url) == 0)
         return;
 
-    gchar* parsedURL = autocorrectURL(url);
-    webkit_gtk_page_open(gPage, parsedURL);
-    g_free(parsedURL);
+    webkit_page_open(gPage, url);
 }
 
 static void goButtonClickedCallback(GtkWidget*, GtkWidget* entry)
@@ -57,7 +41,15 @@ static void updateWindowTitle()
     g_free(title);
 }
 
-static void titleChanged(WebKitGtkPage*, const gchar* title, const gchar* url, WebKitGtkPage*)
+static void hoveringOverLink(WebKitPage*, const gchar*, const gchar* link, void*)
+{
+    // underflow is allowed
+    gtk_statusbar_pop(gStatusbar, gStatusbarContextId);
+    if (link)
+        gtk_statusbar_push(gStatusbar, gStatusbarContextId, link);
+}
+
+static void titleChanged(WebKitPage*, const gchar* title, const gchar* url, WebKitPage*)
 {
     gtk_entry_set_text(GTK_ENTRY(gURLBarEntry), url);
 
@@ -67,7 +59,7 @@ static void titleChanged(WebKitGtkPage*, const gchar* title, const gchar* url, W
     updateWindowTitle();
 }
 
-static void progressChanged(WebKitGtkPage*, gint progress, WebKitGtkPage*)
+static void progressChanged(WebKitPage*, gint progress, WebKitPage*)
 {
     gProgress = progress;
     updateWindowTitle();
@@ -81,13 +73,13 @@ static void frameDestroyCallback(GtkWidget*, gpointer)
 static void menuMainBackCallback(gpointer data)
 {
     g_assert(!data);
-    webkit_gtk_page_go_backward(gPage);
+    webkit_page_go_backward(gPage);
 }
 
 static void menuMainForwardCallback(gpointer data)
 {
     g_assert(!data);
-    webkit_gtk_page_go_forward(gPage);
+    webkit_page_go_forward(gPage);
 }
 
 static void menuMainQuitCallback(gpointer)
@@ -95,34 +87,8 @@ static void menuMainQuitCallback(gpointer)
     gtk_main_quit();
 }
 
-int main(int argc, char* argv[]) 
+static GtkWidget* setupMainMenu()
 {
-    gtk_init(&argc, &argv);
-    webkit_gtk_init();
-
-    gchar* url = "http://www.google.com";
-    bool exitAfterLoading = false;
-    bool dumpRenderTree = false;
-    for (int argPos = 1; argPos < argc; ++argPos) {
-        char *currArg = argv[argPos];
-        if (stringIsEqual(currArg, "-exit-after-loading"))
-            exitAfterLoading = true;
-        else if (stringIsEqual(currArg, "-exitafterloading"))
-            exitAfterLoading = true;
-        else if (stringIsEqual(currArg, "-exitafterload"))
-            exitAfterLoading = true;
-        else if (stringIsEqual(currArg, "-exit-after-load"))
-            exitAfterLoading = true;
-        else if (stringIsEqual(currArg, "-drt"))
-            dumpRenderTree = true;
-        else if (stringIsEqual(currArg, "-dump-render-tree"))
-            dumpRenderTree = true;
-        else if (stringIsEqual(currArg, "-dumprendertree"))
-            dumpRenderTree = true;
-        else
-            url = autocorrectURL(currArg);
-    }
-
     GtkWidget* menuMain = gtk_menu_new();
     GtkWidget* menuMainBack = gtk_menu_item_new_with_label("Back");
     gtk_menu_shell_append(GTK_MENU_SHELL(menuMain), menuMainBack);
@@ -142,6 +108,13 @@ int main(int argc, char* argv[])
     GtkWidget* menuMainRoot = gtk_menu_item_new_with_label("Main");
     gtk_widget_show(menuMainRoot);
     gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuMainRoot), menuMain);
+    
+    return menuMainRoot;
+}
+
+static void setupMainWindowUI()
+{
+    GtkWidget* menuMainRoot = setupMainMenu();
 
     GtkWidget* menuBar = gtk_menu_bar_new();
     gtk_menu_shell_append(GTK_MENU_SHELL(menuBar), menuMainRoot);
@@ -169,13 +142,30 @@ int main(int argc, char* argv[])
     GtkWidget* scrolledWindow = gtk_scrolled_window_new(NULL,NULL);
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow),
                                    GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-    gPage = WEBKIT_GTK_PAGE(webkit_gtk_page_new());
+    
+    
+    gPage = WEBKIT_PAGE(webkit_page_new());
     gtk_container_add(GTK_CONTAINER(scrolledWindow), GTK_WIDGET(gPage));
     gtk_box_pack_start(GTK_BOX(vbox), scrolledWindow, TRUE, TRUE, 0);
+
+    gStatusbar = GTK_STATUSBAR(gtk_statusbar_new());
+    gStatusbarContextId = gtk_statusbar_get_context_id(gStatusbar, "Link Hover");
+    gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(gStatusbar), FALSE, FALSE, 0);
     
     g_signal_connect(gPage, "title-changed", G_CALLBACK(titleChanged), gPage);
     g_signal_connect(gPage, "load-progress-changed", G_CALLBACK(progressChanged), gPage);
-    webkit_gtk_page_open(gPage, url);
+    g_signal_connect(gPage, "hovering-over-link", G_CALLBACK(hoveringOverLink), gPage);
+}
+
+int main(int argc, char* argv[]) 
+{
+    gtk_init(&argc, &argv);
+    webkit_init();
+
+    setupMainWindowUI();
+
+    const gchar* url = static_cast<const gchar*>(argc > 1 ? argv[1] : "http://www.google.com");
+    webkit_page_open(gPage, url);
 
     gtk_widget_show_all(gTopLevelWindow);
     gtk_main();