r2989 - in trunk/src/target/OM-2007.2/applications/openmoko-browser2: . src

zecke at sita.openmoko.org zecke at sita.openmoko.org
Tue Sep 18 03:40:29 CEST 2007


Author: zecke
Date: 2007-09-18 03:40:27 +0200 (Tue, 18 Sep 2007)
New Revision: 2989

Added:
   trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.h
Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-browser2/configure.ac
   trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/Makefile.am
   trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c
Log:
2007-09-16 Holger Hans Peter Freyther <zecke at selfish.org>

        Create the browser skeleton. It compiles but is not
        doing anything useful.

        * configure.ac:
        * src/Makefile.am:
        * src/browser-data.h: Added.
        * src/main.c:
        (main):


Added: trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog	2007-09-18 01:40:26 UTC (rev 2988)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog	2007-09-18 01:40:27 UTC (rev 2989)
@@ -0,0 +1,20 @@
+2007-09-16  Holger Hans Peter Freyther  <zecke at selfish.org>
+
+        Create the browser skeleton. It compiles but is not
+        doing anything useful.
+
+        * configure.ac:
+        * src/Makefile.am:
+        * src/browser-data.h: Added.
+        * src/main.c:
+        (main):
+
+2007-09-16  Holger Hans Peter Freyther  <zecke at selfish.org>
+
+        Ignore certain autogenerated files.
+
+        * .gitignore: Added.
+        * configure.ac:
+        * po/.gitignore: Added.
+        * src/.gitignore: Added.
+

Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/configure.ac	2007-09-18 01:40:26 UTC (rev 2988)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/configure.ac	2007-09-18 01:40:27 UTC (rev 2989)
@@ -39,6 +39,7 @@
 
 # base deps
 PKG_CHECK_MODULES(OPENMOKO,  libmokoui2    >= 0.1.0)
+PKG_CHECK_MODULES(GTHREAD,   gthread-2.0           )
 PKG_CHECK_MODULES(WEBKITGTK, WebKitGdk)
 
 # glib-genmarshal

Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/Makefile.am	2007-09-18 01:40:26 UTC (rev 2988)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/Makefile.am	2007-09-18 01:40:27 UTC (rev 2989)
@@ -0,0 +1,16 @@
+AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" \
+              -DPKGDATADIR=\"$(pkgdatadir)\" \
+              -DBROWSER_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
+
+
+AM_CFLAGS  = -Wall -Werror -std=c99 @OPENMOKO_CFLAGS@ @WEBKITGTK_CFLAGS@ @GTHREAD_CFLAGS@
+
+bin_PROGRAMS = openmoko-browser
+
+#EXTRA_DIST = 
+openmoko_browser_SOURCES = main.c
+openmoko_browser_LDADD = @OPENMOKO_LIBS@ @WEBKITGTK_LIBS@ @GTHREAD_LIBS@
+
+CLEANFILES = $(stamp_files)
+DISTCLEANFILES = $(stamp_files)
+MAINTAINERCLEANFILES = $(stamp_files)

Added: trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.h	2007-09-18 01:40:26 UTC (rev 2988)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.h	2007-09-18 01:40:27 UTC (rev 2989)
@@ -0,0 +1,46 @@
+/*
+ * A simple WebBrowser
+ *
+ *  Copyright (C) 2007 Holger Hans Peter Freyther
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a
+ *  copy of this software and associated documentation files (the "Software"),
+ *  to deal in the Software without restriction, including without limitation
+ *  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ *  and/or sell copies of the Software, and to permit persons to whom the
+ *  Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included
+ *  in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ *  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ *  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ *  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *  OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *  Current Version: $Rev$ ($Date$) [$Author$]
+ */
+
+#ifndef OPENMOKO_BROWSER_DATA_H
+#define OPENMOKO_BROWSER_DATA_H
+
+#include "webkitgtkpage.h"
+
+/*
+ * representation of one page
+ */
+struct BrowserPage {
+    WebKitGtkPage* webKitPage;
+};
+
+/*
+ * The state of the Browser
+ */
+struct BrowserData {
+    GList* browserPages;
+};
+
+#endif

Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c	2007-09-18 01:40:26 UTC (rev 2988)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c	2007-09-18 01:40:27 UTC (rev 2989)
@@ -1,9 +1,72 @@
-2007-09-16  Holger Hans Peter Freyther  <zecke at selfish.org>
+/*
+ * A simple WebBrowser
+ *
+ *  Copyright (C) 2007 Holger Hans Peter Freyther
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a
+ *  copy of this software and associated documentation files (the "Software"),
+ *  to deal in the Software without restriction, including without limitation
+ *  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ *  and/or sell copies of the Software, and to permit persons to whom the
+ *  Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included
+ *  in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ *  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ *  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ *  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *  OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *  Current Version: $Rev$ ($Date$) [$Author$]
+ */
 
-        Ignore certain autogenerated files.
+#include "config.h"
+#include "browser-data.h"
 
-        * .gitignore: Added.
-        * configure.ac:
-        * po/.gitignore: Added.
-        * src/.gitignore: Added.
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
+#include <webkitgtkglobal.h>
+
+#include <moko-finger-scroll.h>
+#include <moko-stock.h>
+
+#include <stdlib.h>
+
+
+static void setup_ui (struct BrowserData*);
+
+int main (int argc, char** argv)
+{
+    g_debug ("openmoko-browser starting up");
+
+    bindtextdomain (GETTEXT_PACKAGE, BROWSER_LOCALE_DIR);
+    bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+    textdomain (GETTEXT_PACKAGE);
+
+    g_thread_init (NULL);
+    gdk_threads_init ();
+    gdk_threads_enter ();
+    gtk_init (&argc, &argv);
+    webkit_gtk_init ();
+    moko_stock_register ();
+    g_set_application_name (_("Browser"));
+
+    struct BrowserData* data = g_new (struct BrowserData, 1);
+    setup_ui (data);
+
+    gtk_main ();
+    gdk_threads_leave ();
+    g_free (data);
+
+    return EXIT_SUCCESS;
+}
+
+
+static void setup_ui (struct BrowserData* data)
+{
+}





More information about the commitlog mailing list