OwbN800: owb-n800.patch

WebKit/OrigynWebBrowser/OrigynLauncher/main.cpp

@@ -48 +48 @@
-#include "BTLogHelper.h"
-#include "BTDeviceChannel.h"
-#include "BTTextLogFormatter.h"
-CookieJar
+IntRect
-#include "KURL.h"
-#include "wtf/RefPtr.h"
-#ifdef __OWBAL_PLATFORM_MACPORT__
@@ -57 +57 @@
-#endif
-#include <signal.h>
-
+// Include for N800 port
+#include <hildon-widgets/hildon-program.h>
+#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
+#include <SDL/SDL_syswm.h>
+#include <X11/Xlib.h>
+
-/**
- * Signal 11 catcher to prevent process from freezing on segfaults.
- */
@@ -68 +75 @@
-
-using namespace BAL;
-
+static HildonWindow *gtk_window = NULL;
+
+GtkWidget *butt_back = NULL;
+GtkWidget *butt_next = NULL;
+GtkWidget *text_url  = NULL;
+
+
+//static gboolean gtkExited(void* data)
+static void owbQuit()
+{
+    getBIEventLoop()->PushEvent(createBIWindowEvent(BAL::BIWindowEvent::QUIT, false, WebCore::IntRect(), getBIWindowManager()->activeWindow()->widget()));
+}
+
+static void urlBack()
+{
+    getBIWindowManager()->activeWindow()->goBackOrForward(-1);;
+}
+
+static void urlNext()
+{
+    getBIWindowManager()->activeWindow()->goBackOrForward(1);
+}
+
+static void urlGo()
+{
+    KURL url(gtk_entry_get_text(GTK_ENTRY(text_url)));
+    getBIWindowManager()->activeWindow()->setURL(url);
+}
+
-static void handle_event( BIEventLoop& aEventLoop ) {
-    BIEvent* aEvent = NULL;
-    bool isQuitCalled = false;
@@ -78 +114 @@
-            delete aEvent;
-            aEvent = NULL; // otherwise may be freed twice if WaitEvent returns an invalid event
-        }
-
+
+
+
+
+
-        isEventValid = aEventLoop.WaitEvent(aEvent);
-        if (isEventValid) {
-            BIKeyboardEvent* aKeyboardEvent = aEvent->queryIsKeyboardEvent();
@@ -100 +140 @@
-    }
-}
-
+void GtkInitN800(int argc, char *argv[])
+{
+    /* Create needed variables */
+    HildonProgram *program;
+    HildonWindow *window;
+
+    /* Initialize the GTK. */
+    gtk_init(&argc, &argv);
+
+    /* Create the hildon program and setup the title */
+    program = HILDON_PROGRAM(hildon_program_get_instance());
+    g_set_application_name("Origyn Web Browser");
+
+    /* Create HildonWindow and set it to HildonProgram */
+    window = HILDON_WINDOW(hildon_window_new());
+    hildon_program_add_window(program, window);
+
+    butt_back = gtk_button_new_with_label("Back");
+    GtkWidget* img_back = gtk_image_new_from_file("/usr/share/icons/back.png");
+    gtk_button_set_image(GTK_BUTTON(butt_back), img_back);
+    gtk_button_set_relief(GTK_BUTTON(butt_back), GTK_RELIEF_NONE);
+
+    butt_next = gtk_button_new_with_label("Next");
+    GtkWidget* img_next = gtk_image_new_from_file("/usr/share/icons/next.png");
+    gtk_button_set_image(GTK_BUTTON(butt_next), img_next);
+    gtk_button_set_relief(GTK_BUTTON(butt_next), GTK_RELIEF_NONE);
+
+    text_url = gtk_entry_new();
+    gtk_entry_set_width_chars(GTK_ENTRY(text_url), 20);
+
+    GtkContainer *navbar= GTK_CONTAINER(gtk_toolbar_new());
+    gtk_toolbar_append_widget(GTK_TOOLBAR(navbar), butt_back, "go back", "go back");
+    gtk_toolbar_append_widget(GTK_TOOLBAR(navbar), butt_next, "go next", "go next");
+    gtk_toolbar_append_widget(GTK_TOOLBAR(navbar), text_url , "enter url ", "enter url ");
+    hildon_window_add_toolbar(window, GTK_TOOLBAR(navbar));
+
+    g_signal_connect(G_OBJECT(butt_back), "clicked", urlBack, NULL);
+    g_signal_connect(G_OBJECT(butt_next), "clicked", urlNext, NULL);
+    g_signal_connect(G_OBJECT(text_url), "activate", urlGo, NULL);
+    gtk_entry_set_invisible_char(GTK_ENTRY(text_url), 0);
+
+    /* Connect signal to X in the upper corner */
+    g_signal_connect(G_OBJECT(window), "delete_event", owbQuit, NULL);
+
+    /* Begin the main application */
+    gtk_widget_show_all(GTK_WIDGET(window));
+    gtk_window = window;
+}
+
+
-int main(int argc, char *argv[])
-{
-    signal(SIGSEGV, &signalCatcher);
@@ -114 +204 @@
-#endif
-
-    // FIXME first thing to do, because event loop may rely on GraphicsDevice (eg SDL)
-
+
+
-    BIEventLoop* aEventLoop = getBIEventLoop();
-    if( aEventLoop == NULL ) {
-      printf("No event loop\n");
@@ -122 +213 @@
-    }
-
-#if 1
-10, 10, 780, 58
+0, 0, 690, 36
-#else // code below left as example
-    BIWindow *window = getBIWindowManager()->openWindow(10, 10, 385, 
-285);
@@ -138 +229 @@
-    } else {
-        window->setURL("http://www.google.com");
-    }
+
+    SDL_SysWMinfo sdl_info;
+    memset (&sdl_info, 0, sizeof(sdl_info));
+    SDL_VERSION(&sdl_info.version);
+    if (SDL_GetWMInfo(&sdl_info) <= 0 || sdl_info.subsystem != SDL_SYSWM_X11) {
+        fprintf (stderr, "This is not X11\n");
+        memset (&sdl_info, 0, sizeof(sdl_info));
+    }
+
+    Display *sdl_display = sdl_info.info.x11.display;
+    Window sdl_window = sdl_info.info.x11.wmwindow;
+    Window xwin = GDK_WINDOW_XWINDOW(GTK_WIDGET(gtk_window)->window);
+    XReparentWindow(sdl_display, sdl_info.info.x11.wmwindow, xwin, 10, 0);
+    XReparentWindow(sdl_display, sdl_info.info.x11.window, xwin, 10, 0);
+    XSetInputFocus(sdl_display, sdl_info.info.x11.window, RevertToParent, CurrentTime);
+
-    handle_event( *aEventLoop );
-    getBIWindowManager()->closeWindow(window);
-    delete getBIWindowManager();

CMakeLists.txt

@@ -432 +432 @@
-        pthread 
-    )
-
-        ADD_EXECUTABLE (testkjs JavaScriptCore/kjs/testkjs.cpp)
-        TARGET_LINK_LIBRARIES (testkjs
-                jscore
-                bal
-        )
-
-IF (OWBAL_PLATFORM_MACPORT)
-    TARGET_LINK_LIBRARIES (jscore
-        ${LIBICU_LIBS}
@@ -447 +441 @@
-    )
-ENDIF (OWBAL_PLATFORM_MACPORT)
-
-        ADD_CUSTOM_TARGET (kjstests
-                COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/export_test_kjs
-                COMMAND cd KjsTests/mozilla/ && ${PERL_EXECUTABLE} mklistpage.pl > menubody.html
-                COMMAND cd KjsTests/mozilla/ && cat menuhead.html menubody.html menufoot.html > menu.html
-                COMMAND cd KjsTests/mozilla/ && SYMROOTS=${CMAKE_CURRENT_SOURCE_DIR}/JavaScriptCore ./jsDriver.pl -e kjs -s ${CMAKE_CURRENT_BINARY_DIR}/testkjs -f results.html
-                WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        )
-        ADD_DEPENDENCIES (kjstests
-                testkjs
-        )
-
-ELSE (WEBKIT_USE_JS)
-        ADD_LIBRARY (wtf ${jscore_SRC})
-ENDIF (WEBKIT_USE_JS)
@@ -509 +492 @@
-        balglue
-        bal
-        ${ADDONS_LINK}
+        ${GTK_LIBRARIES}
-        ${LIBFREETYPE_LIBS}
-        ${LIBRARIES_TO_LINK}
-)
@@ -526 +510 @@
-##############################
-##############################
-##############################
-#BAL_TEST
-##############################
-##############################
-##############################
-
-INCLUDE_DIRECTORIES (
-    ${CMAKE_CURRENT_SOURCE_DIR}/BAL/Tests/
-    ${CMAKE_CURRENT_SOURCE_DIR}/BAL/Implementations/Widgets/Common/
-)
-
-INCLUDE (BAL/Tests/SourcesCMakeLists.txt)
-ADD_EXECUTABLE (testBAL ${bal_tests_SRC})
-TARGET_LINK_LIBRARIES (testBAL
-    bal
-)
-
-IF (WEBKIT_USE_JS)
-        TARGET_LINK_LIBRARIES (testBAL
-                jscore
-        )
-ELSE (WEBKIT_USE_JS)
-        TARGET_LINK_LIBRARIES (testBAL
-                wtf
-        )
-ENDIF (WEBKIT_USE_JS)
-
-ADD_CUSTOM_TARGET (test
-        COMMAND ${CMAKE_CURRENT_BINARY_DIR}/testBAL -a -p ${CMAKE_CURRENT_SOURCE_DIR}/BAL/Tests/
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-)
-ADD_DEPENDENCIES (test
-        testBAL
-        )
-##############################
-##############################
-##############################
-#DUMP_RENDER_TREE
-##############################
-##############################

BAL/CMakeConf.txt

@@ -334 +334 @@
-
-ENDIF (WEBKIT_USE_XSLT_SUPPORT)
-
+
-#######################################
+#Add Hildon libraries for N800
+#######################################
+
+SET (CMAKE_GTK_CXX_FLAGS "`pkg-config  --cflags gtk+-2.0 hildon-libs`")
+SET(GTK_LIBRARIES "`pkg-config --libs gtk+-2.0 hildon-libs`")
+SET_SOURCE_FILES_PROPERTIES(WebKit/OrigynWebBrowser/OrigynLauncher/main.cpp 
+                PROPERTIES COMPILE_FLAGS "`pkg-config  --cflags gtk+-2.0 hildon-libs` -I${CMAKE_CURRENT_SOURCE_DIR}/WebKit/OrigynWebBrowser/Api/")
+
+#######################################
-#Configuration for font
-#######################################
-