[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash Makefile.am configure.ac ChangeLog gui/Ma...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash Makefile.am configure.ac ChangeLog gui/Ma... |
|
Date: |
Thu, 22 Nov 2007 16:19:57 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 07/11/22 16:19:57
Modified files:
. : Makefile.am configure.ac ChangeLog
gui : Makefile.am gtk.cpp gtksup.h gnash.in
Added files:
macros : alp.m4 hildon.m4
Log message:
* Makefile.am: Add dumpconfig prints for ALP and Hildon.
* configure.ac: Add support for the ALP and Hildon GUI
frameworks,
both of which are built on GTK+. Add initial support for the
Launcher extension, which doesn't exist yet.
* macros/alp.m4: Find Hildon headers and libraries.
* macros/hildon.m4: Find Hildon headers and libraries.
* gui/Makefile.am: Add support for the Hildon GUI framework,
which
is built on GTK+.
* gui/gtk.cpp, gtksup.h: Add support for the Hildon GUI
framework,
which is built on GTK+. Move CreateMenu.
* gui/gnash.in: Add ALP and Hildon.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/alp.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/hildon.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.92&r2=1.93
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.439&r2=1.440
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4919&r2=1.4920
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.109&r2=1.110
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.121&r2=1.122
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtksup.h?cvsroot=gnash&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.in?cvsroot=gnash&r1=1.6&r2=1.7
Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- Makefile.am 22 Oct 2007 15:58:40 -0000 1.92
+++ Makefile.am 22 Nov 2007 16:19:56 -0000 1.93
@@ -15,7 +15,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-# $Id: Makefile.am,v 1.92 2007/10/22 15:58:40 rsavoye Exp $
+# $Id: Makefile.am,v 1.93 2007/11/22 16:19:56 rsavoye Exp $
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.6.0
@@ -143,6 +143,14 @@
@echo " ATK_CFLAGS is $(ATK_CFLAGS)"
@echo " ATK_LIBS is $(ATK_LIBS)"
endif
+if BUILD_HILDON_GUI
+ @echo " HILDON_CFLAGS is $(HILDON_CFLAGS)"
+ @echo " HILDON_LIBS is $(HILDON_LIBS)"
+endif
+if BUILD_ALP_GUI
+ @echo " ALP_CFLAGS is $(ALP_CFLAGS)"
+ @echo " ALP_LIBS is $(ALP_LIBS)"
+endif
@echo " X11_CFLAGS is $(X11_CFLAGS)"
@echo " X11_LIBS is $(X11_LIBS)"
@echo "Support libraries..."
@@ -226,6 +234,12 @@
if BUILD_GTK_GUI
@echo " Supported GUI: GTK"
endif
+if BUILD_HILDON_GUI
+ @echo " Supported GUI: HILDON"
+endif
+if BUILD_ALP_GUI
+ @echo " Supported GUI: ALP/Hiker"
+endif
if BUILD_KDE_GUI
@echo " Supported GUI: KDE"
endif
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -b -r1.439 -r1.440
--- configure.ac 17 Nov 2007 23:44:45 -0000 1.439
+++ configure.ac 22 Nov 2007 16:19:56 -0000 1.440
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.439 2007/11/17 23:44:45 nihilus Exp $
+dnl $Id: configure.ac,v 1.440 2007/11/22 16:19:56 rsavoye Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -126,7 +126,7 @@
dnl This is primarily used when compiling for a similar architecture,
dnl like pentium->geode, which can use the same compiler, but have
dnl different development
-AC_ARG_WITH(top_level, AC_HELP_STRING([--with-top-level], [top level directory
for cross compiling files]), with_top_level=${withval})
+AC_ARG_WITH(top_level, AC_HELP_STRING([--with-top-level], [top level directory
for cross compiling files]), with_top_level=${withval} ; cross_compiling=yes)
AC_ARG_ENABLE(debugger,
AC_HELP_STRING([--enable-debugger],[Enable the Flash debugger]),
@@ -248,6 +248,8 @@
build_sdl=no
build_riscos=no
build_aqua=no
+build_hildon=no
+build_alp=no
AC_ARG_ENABLE(gui,
AC_HELP_STRING([--enable-gui=], [Use the specified GUI toolkit
(default=gtk,kde)]),
if test -n ${enableval}; then
@@ -256,7 +258,20 @@
while test -n "${enableval}" ; do
val=`echo ${enableval} | cut -d ' ' -f 1`
[case "${val}" in
+ hildon|HILDON|hildon2|HILDON2)
+ build_hildon=yes
+ AC_DEFINE(USE_HILDON, [1], [Use the Hildon mobile framework])
+ build_gtk=yes
+ AC_DEFINE(USE_GTK, [1], [Use the GTK GUI])
+ ;;
+ alp|ALP|alp|ALP)
+ build_alp=yes
+ AC_DEFINE(USE_ALP, [1], [Use the ALP framework])
+ build_gtk=yes
+ AC_DEFINE(USE_GTK, [1], [Use the GTK GUI])
+ ;;
gtk|GTK|gtk2|GTK2)
+ AC_DEFINE(USE_GTK, [1], [Use the GTK GUI])
build_gtk=yes
;;
kde|KDE)
@@ -286,9 +301,11 @@
build_kde=yes
build_gtk=yes
build_sdl=yes
+ build_hildon=yes
+dnl build_alp=yes
dnl build_riscos=yes
;;
- *) AC_MSG_ERROR([invalid gui ${enableval} given (accept:
gtk|kde|fltk|sdl|riscos|aqua|fb)])
+ *) AC_MSG_ERROR([invalid gui ${enableval} given (accept:
gtk|kde|fltk|sdl|riscos|aqua|fb|hildon|alp)])
;;
esac]
enableval=`echo ${enableval} | cut -d ' ' -f 2-6`
@@ -496,6 +513,7 @@
ext_dbus=no
ext_metome=no
ext_all=no
+ext_launcher=no
AC_ARG_WITH(extensions,
AC_HELP_STRING([--with-extensions=], [Specify which extensions to build]),
if test -n ${withval}; then
@@ -535,6 +553,11 @@
ext_gtk=yes
nextensions=$((nextensions+1))
;;
+ launcher|LAUNCHER)
+ AC_DEFINE(USE_LAUNCHER_EXT, [1], [Build the Launcher extension])
+ ext_launcher=yes
+ nextensions=$((nextensions+1))
+ ;;
lirc|LIRC)
AC_DEFINE(USE_LIRC_EXT, [1], [Build the LIRC extension])
ext_lirc=yes
@@ -559,8 +582,9 @@
ext_lirc=yes
ext_dbus=yes
ext_metome=yes
+ ext_launcher=yes
ext_all=yes
- nextensions=8
+ nextensions=9
;;
*) AC_MSG_ERROR([invalid extension specified: ${withval} given (accept:
MYSQL|DEJAGNU|FILEIO|GTK|LIRC|DBUS|METOME|ALL)])
;;
@@ -580,6 +604,7 @@
AM_CONDITIONAL(BUILD_DEJAGNU_EXT, [ test x$ext_dejagnu = xyes ])
AM_CONDITIONAL(BUILD_FILEIO_EXT, [ test x$ext_fileio = xyes ])
AM_CONDITIONAL(BUILD_MYSQL_EXT, [ test x$ext_mysql = xyes ])
+AM_CONDITIONAL(BUILD_LAUNCHER_EXT, [ test x$ext_launcher = xyes ])
AM_CONDITIONAL(BUILD_GTK_EXT, [ test x$ext_gtk = xyes ])
AM_CONDITIONAL(BUILD_LIRC_EXT, [ test x$ext_lirc = xyes ])
AM_CONDITIONAL(BUILD_DBUS_EXT, [ test x$ext_dbus = xyes ])
@@ -668,6 +693,23 @@
dnl Check for PKG_CONFIG before any GNASH_PATH call
PKG_PROG_PKG_CONFIG
+dnl Look for scratchbox
+sbox=no
+if test x"${SBOX_REDIRECT_FROM_DIRS}" != x; then
+ sbox=yes
+fi
+if test x"${build_alp}" = xyes; then
+ GNASH_PATH_ALP
+ if test x"${have_alp}" = x"yes"; then
+ AC_DEFINE([HAVE_ALP], [], [Access Linux Platform framework])
+ fi
+ cross_compiling=yes
+ build_gtk=yes
+ build_kde=no
+ build_ogl=no
+ build_agg=yes
+fi
+
dnl !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
dnl !!
dnl !! IMPORTANT NOTICE
@@ -706,7 +748,13 @@
AC_MSG_WARN(["Disabling GTK GUI, no GTK development tools found"])
fi
fi
-
+if test x$build_hildon = xyes; then
+ GNASH_PATH_HILDON
+ build_gtk=yes
+ build_kde=no
+dnl build_ogl=no
+dnl build_agg=yes
+fi
dnl TODO: add checks for all other GUIs
@@ -1091,6 +1139,8 @@
AC_MSG_WARN(["Enabled KPARTS plugin, but you aren't building a KDE based
GUI!"])
fi
+AM_CONDITIONAL(BUILD_ALP_GUI, [ test x$build_alp = xyes ])
+AM_CONDITIONAL(BUILD_HILDON_GUI, [ test x$build_hildon = xyes ])
AM_CONDITIONAL(BUILD_GTK_GUI, [ test x$build_gtk = xyes ])
AM_CONDITIONAL(BUILD_KDE_GUI, [ test x$build_kde = xyes ])
dnl AM_CONDITIONAL(BUILD_QT_GUI, [ test x$build_qt = xyes ])
@@ -1787,6 +1837,24 @@
fi
fi
+
+if test x$build_hildon = xyes; then #{
+ if test x"$HILDON_LIBS" != x; then
+ if test x"$HILDON_CFLAGS" != x; then
+ echo " HILDON flags are: $HILDON_CFLAGS"
+ else
+ echo " HILDON flags are: default include path"
+ fi
+ echo " HILDON libs are: $HILDON_LIBS"
+ else
+ echo " ERROR: No HILDON development package installed!"
+ echo " Install it from http://gtk.org";
+ echo " or .deb users: apt-get install libhildon.0-dev"
+ echo " or .rpm users: yum install hildon-devel"
+dnl nogo=true
+ fi
+fi
+
if test x$build_gtk = xyes; then #{
if test x"$GTK2_LIBS" != x; then
if test x"$GTK2_CFLAGS" != x; then
@@ -2254,11 +2322,21 @@
fi
fi
+dnl Access Linux Platform
+if test x"${build_alp}" = xyes; then
+ if test x"${ALP_CFLAGS}" != x; then
+ echo " ALP flags are: $ALP_CFLAGS"
+ echo " ALP libs are: $ALP_LIBS"
+ else
+ echo " ERROR: No ALP development package is installed."
+ fi
+fi
+
if test x$cross_compiling = xyes; then
AC_MSG_NOTICE([This build is setup for cross compiling])
fi
-# If anything critical is missing, don't bother to continue
+dnl If anything critical is missing, don't bother to continue
if test x"$nogo" = x"true"; then
echo ""
AC_MSG_ERROR([Please install required packages])
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4919
retrieving revision 1.4920
diff -u -b -r1.4919 -r1.4920
--- ChangeLog 22 Nov 2007 14:29:38 -0000 1.4919
+++ ChangeLog 22 Nov 2007 16:19:56 -0000 1.4920
@@ -1,3 +1,17 @@
+2007-11-22 Rob Savoye <address@hidden>
+
+ * Makefile.am: Add dumpconfig prints for ALP and Hildon.
+ * configure.ac: Add support for the ALP and Hildon GUI frameworks,
+ both of which are built on GTK+. Add initial support for the
+ Launcher extension, which doesn't exist yet.
+ * macros/alp.m4: Find Hildon headers and libraries.
+ * macros/hildon.m4: Find Hildon headers and libraries.
+ * gui/Makefile.am: Add support for the Hildon GUI framework, which
+ is built on GTK+.
+ * gui/gtk.cpp, gtksup.h: Add support for the Hildon GUI framework,
+ which is built on GTK+. Move CreateMenu.
+ * gui/gnash.in: Add ALP and Hildon.
+
2007-11-22 Sandro Santilli <address@hidden>
* testsuite/actionscript.all/: getvariable.as, targetPath.as:
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- gui/Makefile.am 28 Oct 2007 22:01:32 -0000 1.109
+++ gui/Makefile.am 22 Nov 2007 16:19:57 -0000 1.110
@@ -328,11 +328,6 @@
gtk.cpp gtksup.h gtk_glue.h
gtk_gnash_LDADD = $(top_builddir)/backend/libgnashagg.la \
$(GNASH_LIBS) $(GTK_LIBS) $(AGG_LIBS)
-# if ALP # Access Linux Platform
-# gtk_gnash_LDFLAGS += "-shared -Xlinker -z -Xlinker defs $(GTK2_LIBS)"
-# gtk_gnash_LDADD += $(ALP_LIBS)
-# endif
-
endif # BUILD_AGG_RENDERER
if BUILD_CAIRO_RENDERER
gtk_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
@@ -344,6 +339,41 @@
endif # BUILD_GTK_GUI
#
+# Build the GTK/HILDON gui
+#
+if BUILD_HILDON_GUI
+bin_PROGRAMS += hildon-gnash
+hildon_gnash_SOURCES = $(GUI_SRCS) gui_gtk.cpp
+hildon_gnash_CPPFLAGS = -DGUI_GTK -DGUI_HILDON -DGUI_CONFIG=\"HILDON\" \
+ $(AM_CPPFLAGS) $(GTK_CFLAGS) $(HILDON_CFLAGS)
+hildon_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
+#gtk_gnash_DEPENDENCIES = .configline
+
+if BUILD_OGL_RENDERER
+hildon_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
+hildon_gnash_SOURCES += gtk_glue_gtkglext.cpp gtk_glue_gtkglext.h \
+ gtk.cpp gtksup.h gtk_glue.h
+hildon_gnash_LDADD = $(top_builddir)/backend/libgnashogl.la \
+ $(GNASH_LIBS) $(GTK_LIBS) $(OPENGL_LIBS) $(HILDON_LIBS)
+endif # BUILD_OGL_RENDERER
+if BUILD_AGG_RENDERER
+hildon_gnash_CPPFLAGS += $(AGG_CFLAGS) $(HILDON_CFLAGS)
+hildon_gnash_SOURCES += gtk_glue_agg.cpp gtk_glue_agg.h \
+ gtk.cpp gtksup.h gtk_glue.h
+hildon_gnash_LDADD = $(top_builddir)/backend/libgnashagg.la \
+ $(GNASH_LIBS) $(GTK_LIBS) $(AGG_LIBS) $(HILDON_LIBS)
+
+endif # BUILD_AGG_RENDERER
+if BUILD_CAIRO_RENDERER
+hildon_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
+hildon_gnash_SOURCES += gtk_glue_cairo.cpp gtk_glue_cairo.h \
+ gtk.cpp gtksup.h gtk_glue.h
+hildon_gnash_LDADD = $(top_builddir)/backend/libgnashcairo.la \
+ $(GNASH_LIBS) $(GTK_LIBS) $(CAIRO_LIBS) $(HILDON_LIBS)
+endif # BUILD_CAIRO_RENDERER
+endif # BUILD_GTK_HILDON
+
+#
# Build the FB gui
#
if BUILD_FB_GUI
@@ -428,17 +458,3 @@
# done
# endif
-# if ALP
-# alpdir = build
-# install-alp: libgnashalp.la
-# $(mkinstalldirs) build
-# ${CP} $(srcdir)/Manifest.xml build/
-# $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG)
$(alp_LTLIBRARIES) build
-# ${RM} build/*.a build/*.T build/*.0
-
-# alp_LTLIBRARIES = libgnashalp.la
-
-# libgnashalp_la_SOURCES = $(gtk_gnash_SOURCES)
-# libgnashalp_la_LDFLAGS = -module -avoid-version
-
-# endif
Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- gui/gtk.cpp 3 Oct 2007 14:15:22 -0000 1.121
+++ gui/gtk.cpp 22 Nov 2007 16:19:57 -0000 1.122
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: gtk.cpp,v 1.121 2007/10/03 14:15:22 bwy Exp $ */
+/* $Id: gtk.cpp,v 1.122 2007/11/22 16:19:57 rsavoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -54,6 +54,10 @@
#include "gtk_glue_agg.h"
#endif
+#ifdef GUI_HILDON
+# include <hildon/hildon.h>
+#endif
+
using namespace std;
namespace gnash
@@ -87,6 +91,10 @@
gtk_init (&argc, argv);
+#ifdef GUI_HILDON
+ _hildon_program = hildon_program_get_instance();
+#endif
+
// TODO: don't rely on a macro to select renderer
#ifdef RENDERER_CAIRO
_glue.reset(new GtkCairoGlue);
@@ -103,7 +111,12 @@
_window = gtk_plug_new(_xid);
log_msg (_("Created XEmbedded window"));
} else {
+#ifdef GUI_HILDON
+ _window = hildon_window_new();
+ hildon_program_add_window(_hildon_program, HILDON_WINDOW(_window));
+#else
_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+#endif
log_msg (_("Created top level window"));
}
@@ -135,7 +148,7 @@
_vbox = gtk_vbox_new(FALSE, 0);
gtk_widget_show(_vbox);
gtk_container_add(GTK_CONTAINER(_window), _vbox);
-#ifdef USE_MENUS
+#if defined(USE_MENUS) && !defined(GUI_HILDON)
createMenuBar();
#endif
gtk_box_pack_start(GTK_BOX(_vbox), _drawing_area, TRUE, TRUE, 0);
@@ -172,7 +185,13 @@
{
_menubar = gtk_menu_bar_new();
gtk_widget_show(_menubar);
+#ifdef GUI_HILDON
+// _hildon_toolbar = create_hildon_toolbar(_hildon_program);
+// hildon_window_add_toolbar(HILDON_WINDOW(_window),
+// GTK_TOOLBAR(_hildon_toolbar));
+#else
gtk_box_pack_start(GTK_BOX (_vbox), _menubar, FALSE, FALSE, 0);
+#endif
createFileMenu(_menubar);
createEditMenu(_menubar);
@@ -183,6 +202,56 @@
return true;
}
+
+bool
+GtkGui::createMenu()
+{
+ //GNASH_REPORT_FUNCTION;
+
+ _popup_menu = GTK_MENU(gtk_menu_new());
+// GtkAccelGroup *accel_group = gtk_accel_group_new();;
+// gtk_window_add_accel_group (GTK_WINDOW (_popup_menu), accel_group);
+
+#ifdef USE_MENUS
+ createFileMenu(GTK_WIDGET(_popup_menu));
+ createEditMenu(GTK_WIDGET(_popup_menu));
+ createViewMenu(GTK_WIDGET(_popup_menu));
+ createControlMenu(GTK_WIDGET(_popup_menu));
+#endif
+ createHelpMenu(GTK_WIDGET(_popup_menu));
+
+// GtkMenuItem *menuitem_prefs =
+// GTK_MENU_ITEM(gtk_menu_item_new_with_label("Preferences..."));
+// gtk_menu_append(_popup_menu, GTK_WIDGET(menuitem_prefs));
+// gtk_widget_show(GTK_WIDGET(menuitem_prefs));
+
+ if (get_sound_handler()) {
+ GtkMenuItem *menuitem_sound =
+ GTK_MENU_ITEM(gtk_menu_item_new_with_label("Toggle Sound"));
+// gtk_widget_add_accelerator (GTK_WIDGET(menuitem_sound), "activate",
accel_group,
+// GDK_s, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+ gtk_menu_append(_popup_menu, GTK_WIDGET(menuitem_sound));
+ gtk_widget_show(GTK_WIDGET(menuitem_sound));
+ g_signal_connect(GTK_OBJECT(menuitem_sound), "activate",
+ G_CALLBACK(&menuitem_sound_callback), this);
+ }
+
+ GtkMenuItem *menuitem_quit =
+ GTK_MENU_ITEM(gtk_menu_item_new_with_label("Quit Gnash"));
+ gtk_menu_append(_popup_menu, GTK_WIDGET(menuitem_quit));
+ gtk_widget_show(GTK_WIDGET(menuitem_quit));
+ g_signal_connect(GTK_OBJECT(menuitem_quit), "activate",
+ G_CALLBACK(&menuitem_quit_callback), this);
+
+#ifdef GUI_HILDON
+ hildon_window_set_menu(HILDON_WINDOW(_window),
+ GTK_MENU(_popup_menu));
+ gtk_widget_show_all(GTK_WIDGET(_popup_menu));
+#endif
+
+ return true;
+}
+
bool
GtkGui::createWindow(const char *title, int width, int height)
{
@@ -347,9 +416,7 @@
_drawbounds.clear();
- for (unsigned rno=0; rno<ranges.size(); rno++)
- {
-
+ for (unsigned rno=0; rno<ranges.size(); rno++) {
geometry::Range2d<int> bounds = Intersection(
_renderer->world_to_pixel(ranges.getRange(rno)),
_validbounds);
@@ -429,51 +496,6 @@
return true;
}
-bool
-GtkGui::createMenu()
-{
- //GNASH_REPORT_FUNCTION;
-
- _popup_menu = GTK_MENU(gtk_menu_new());
-// GtkAccelGroup *accel_group = gtk_accel_group_new();;
-// gtk_window_add_accel_group (GTK_WINDOW (_popup_menu), accel_group);
-
-#ifdef USE_MENUS
- createFileMenu(GTK_WIDGET(_popup_menu));
- createEditMenu(GTK_WIDGET(_popup_menu));
- createViewMenu(GTK_WIDGET(_popup_menu));
- createControlMenu(GTK_WIDGET(_popup_menu));
-#endif
- createHelpMenu(GTK_WIDGET(_popup_menu));
-
-// GtkMenuItem *menuitem_prefs =
-// GTK_MENU_ITEM(gtk_menu_item_new_with_label("Preferences..."));
-// gtk_menu_append(_popup_menu, GTK_WIDGET(menuitem_prefs));
-// gtk_widget_show(GTK_WIDGET(menuitem_prefs));
-
- if (get_sound_handler()) {
- GtkMenuItem *menuitem_sound =
- GTK_MENU_ITEM(gtk_menu_item_new_with_label("Toggle Sound"));
-// gtk_widget_add_accelerator (GTK_WIDGET(menuitem_sound), "activate",
accel_group,
-// GDK_s, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
- gtk_menu_append(_popup_menu, GTK_WIDGET(menuitem_sound));
- gtk_widget_show(GTK_WIDGET(menuitem_sound));
- g_signal_connect(GTK_OBJECT(menuitem_sound), "activate",
- G_CALLBACK(&menuitem_sound_callback), this);
- }
-
- GtkMenuItem *menuitem_quit =
- GTK_MENU_ITEM(gtk_menu_item_new_with_label("Quit Gnash"));
- gtk_menu_append(_popup_menu, GTK_WIDGET(menuitem_quit));
- gtk_widget_show(GTK_WIDGET(menuitem_quit));
- g_signal_connect(GTK_OBJECT(menuitem_quit), "activate",
- G_CALLBACK(&menuitem_quit_callback), this);
-
- return true;
-}
-
-
-
/// This method is called when the "OK" button is clicked in the open file
/// dialog. For GTK <= 2.4.0, this is a callback called by GTK itself.
void GtkGui::open_file (GtkWidget *widget, gpointer /* user_data */)
@@ -1804,7 +1826,7 @@
lirc_handler(void*, int, void* data)
{
GNASH_REPORT_FUNCTION;
- int* fd = static_cast<int*>(data);
+// int* fd = static_cast<int*>(data);
// want to remove this handler. You may want to close fd.
log_msg("%s\n", lirc->getButton());
Index: gui/gtksup.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gtksup.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- gui/gtksup.h 27 Sep 2007 19:26:04 -0000 1.52
+++ gui/gtksup.h 22 Nov 2007 16:19:57 -0000 1.53
@@ -15,9 +15,6 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-//
-
#ifndef __GTKSUP_H__
#define __GTKSUP_H__
@@ -32,6 +29,15 @@
#include <gdk/gdkx.h>
#include <gtk/gtk.h>
+#ifdef GUI_HILDON
+extern "C" {
+# include <hildon/hildon.h>
+}
+#endif
+
+#ifdef USE_ALP
+# include <alp/bundlemgr.h>
+#endif
namespace gnash
{
@@ -157,6 +163,9 @@
GtkWidget *getWindow() { return _window; };
private:
+#ifdef GUI_HILDON
+ HildonProgram *_hildon_program;
+#endif
GtkWidget *_window;
GdkPixbuf *_window_icon_pixbuf;
GtkWidget *_drawing_area;
Index: gui/gnash.in
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gui/gnash.in 12 Nov 2007 13:11:45 -0000 1.6
+++ gui/gnash.in 22 Nov 2007 16:19:57 -0000 1.7
@@ -30,7 +30,7 @@
#!/bin/sh
-GUIS="gtk kde sdl fltk aqua riscos fb"
+GUIS="gtk kde sdl fltk aqua riscos fb alp hildon"
THIS_DIR="`dirname $0`"
if test "$1" = "-G"; then
Index: macros/alp.m4
===================================================================
RCS file: macros/alp.m4
diff -N macros/alp.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ macros/alp.m4 22 Nov 2007 16:19:56 -0000 1.1
@@ -0,0 +1,80 @@
+ dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 3 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+AC_DEFUN([GNASH_PATH_ALP],
+[
+
+ dnl See if we're running under scratchbox, specifically ALP
+ BARTENDER=
+ ALP_CFLAGS=
+ ALP_LIBS=
+ have_alp=no
+
+ if test x"$sbox" = xyes; then
+ dnl Look for Alp
+ for i in $incllist; do
+ if test -f $i/alp/bundlemgr.h; then
+ ac_cv_path_alp_incl="-I$i"
+ alp=yes
+ break
+ fi
+ done
+
+ ac_cv_path_alp_lib=""
+ newlist="/opt/alp/lib /opt/alp/lib/tmp ${incllist}"
+ for i in $newlist; do
+ if test -f $i/libalp_bundlemgr.a -o -f $i/libalp_bundlemgr.${shlibext};
then
+ ac_cv_path_alp_lib="-L$i -lalp_bundlemgr ${ac_cv_path_alp_lib}"
+ break
+ fi
+ done
+ for i in $newlist; do
+ if test -f $i/libalp_appmgr.a -o -f $i/libalp_appmgr.${shlibext}; then
+ ac_cv_path_alp_lib="${ac_cv_path_alp_lib} -lalp_appmgr"
+ break
+ fi
+ done
+ for i in $newlist; do
+ if test -f $i/alp_max.a -o -f $i/alp_max.${shlibext}; then
+ ac_cv_path_alp_lib="${ac_cv_path_alp_lib} -lalp_max"
+ break
+ fi
+ done
+ fi
+
+ if test -f ${_SBOX_DIR}/tools/bin/bartender; then
+ BARTENDER=${_SBOX_DIR}/tools/bin/bartender
+ fi
+
+ if test x"${ac_cv_path_alp_incl}" != x; then
+ ALP_CFLAGS="${ac_cv_path_alp_incl}"
+ fi
+
+ if test x"${ac_cv_path_alp_lib}" != x; then
+ ALP_LIBS="${ac_cv_path_alp_lib}"
+ have_alp=yes
+ fi
+
+ AC_SUBST(BARTENDER)
+ AC_SUBST(ALP_CFLAGS)
+ AC_SUBST(ALP_LIBS)
+])
+
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:
Index: macros/hildon.m4
===================================================================
RCS file: macros/hildon.m4
diff -N macros/hildon.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ macros/hildon.m4 22 Nov 2007 16:19:56 -0000 1.1
@@ -0,0 +1,143 @@
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 3 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+dnl $Id: hildon.m4,v 1.1 2007/11/22 16:19:56 rsavoye Exp $
+
+AC_DEFUN([GNASH_PATH_HILDON],
+[
+
+ dnl Look for the header
+ AC_ARG_WITH(hildon_incl, AC_HELP_STRING([--with-hildon-incl], [directory
where libhildon header is]), with_hildon_incl=${withval})
+ AC_CACHE_VAL(ac_cv_path_hildon_incl,[
+ if test x"${with_hildon_incl}" != x ; then
+ if test -f ${with_hildon_incl}/hildon/hildon-program.h ; then
+ ac_cv_path_hildon_incl=-I`(cd ${with_hildon_incl}; pwd)`
+ else
+ AC_MSG_ERROR([${with_hildon_incl} directory doesn't contain
hildon/hildon.h])
+ fi
+ fi
+ ])
+
+ if test x$cross_compiling = xno; then
+ if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_hildon_incl}" = x; then
+ $PKG_CONFIG --exists hildon-1 && ac_cv_path_hildon_incl=`$PKG_CONFIG
--cflags-only-I hildon-1 | cut -d ' ' -f 1`
+ fi
+ fi
+
+ dnl Attempt to find the top level directory, which unfortunately has a
+ dnl version number attached. At least on Debain based systems, this
+ dnl doesn't seem to get a directory that is unversioned.
+
+ AC_MSG_CHECKING([for the Hildon Version])
+
+ if test x$cross_compiling = xno; then
+ if test x"$PKG_CONFIG" != x; then
+ $PKG_CONFIG --exists hildon-1 && gnash_hildon_version=`$PKG_CONFIG
--modversion hildon-1 | cut -d '.'-f 1'`
+ fi
+ fi
+
+ if test x"${gnash_hildon_version}" = x; then
+ gnash_hildon_topdir=""
+ gnash_hildon_version=""
+ for i in $incllist; do
+ for j in `ls -dr $i/hildon-[[0-9]] 2>/dev/null`; do
+ if test -f $j/hildon/hildon-program.h; then
+ gnash_hildon_topdir=`basename $j`
+ gnash_hildon_version=`echo ${gnash_hildon_topdir} | sed -e
's:hildon-::'`
+ ac_cv_path_hildon_incl="-I$i/${gnash_hildon_topdir}"
+ break
+ fi
+ done
+ if test x$gnash_hildon_version != x; then
+ break;
+ fi
+ done
+ fi
+
+ if test x"${gnash_hildon_version}" = x; then
+ AC_MSG_RESULT(none)
+ else
+ AC_MSG_RESULT([${gnash_hildon_version}])
+ fi
+
+ AC_MSG_CHECKING([for libhildon header])
+ AC_MSG_RESULT(${ac_cv_path_hildon_incl})
+
+ dnl Look for the library
+ AC_ARG_WITH(hildon_lib, AC_HELP_STRING([--with-hildon-lib], [directory where
hildon library is]), with_hildon_lib=${withval})
+ AC_CACHE_VAL(ac_cv_path_hildon_lib,[
+ if test x"${with_hildon_lib}" != x ; then
+ if test -f ${with_hildon_lib}/libhildon-${gnash_hildon_version}.a -o -f
${with_hildon_lib}/libhildon-${gnash_hildon_version}.${shlibext}; then
+ ac_cv_path_hildon_lib=-L`(cd ${with_hildon_lib}; pwd)`
+ else
+ AC_MSG_ERROR([${with_hildon_lib} directory doesn't contain
libhildonhildon.])
+ fi
+ fi
+ ])
+
+ if test x$cross_compiling = xno; then
+ if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_hildon_lib}" = x; then
+ $PKG_CONFIG --exists hildon-1 && ac_cv_path_hildon_lib=`$PKG_CONFIG
--libs-only-l hildon-1 | cut -d ' ' -f 1`
+ fi
+ fi
+
+ if test x"${ac_cv_path_hildon_lib}" = x; then
+ for i in $libslist; do
+ if test -f $i/libhildon-${gnash_hildon_version}.a -o -f
$i/libhildon-${gnash_hildon_version}.${shlibext}; then
+ if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
+ ac_cv_path_hildon_lib="-L$i -lhildon-${gnash_hildon_version}"
+ break
+ else
+ ac_cv_path_hildon_lib="-lhildon-${gnash_hildon_version}"
+ break
+ fi
+ fi
+ done
+ else
+ hildon_lib_path=`$PKG_CONFIG --libs-only-L hildon-1`
+ if test ! $hildon_lib_path = "-L/usr/lib" -o $hildon_lib_path =
"-L/usr/lib64"; then
+ ac_cv_path_hildon_lib="${hildon_lib_path} ${ac_cv_path_hildon_lib}"
+ fi
+ fi
+
+ AC_MSG_CHECKING([for libhildon library])
+ AC_MSG_RESULT(${ac_cv_path_hildon_lib})
+
+ if test x"${ac_cv_path_hildon_lib}" = x; then
+ AC_CHECK_LIB(hildon-${gnash_hildon_version},
hildon_engine_shape_class_init,
[ac_cv_path_hildon_lib="-lhildon-${gnash_hildon_version}"])
+ fi
+
+ if test x"${ac_cv_path_hildon_incl}" != x; then
+ HILDON_CFLAGS="${ac_cv_path_hildon_incl}"
+ else
+ HILDON_CFLAGS=""
+ fi
+
+ if test x"${ac_cv_path_hildon_lib}" != x; then
+ HILDON_LIBS="${ac_cv_path_hildon_lib}"
+ else
+ HILDON_LIBS=""
+ fi
+
+ AC_SUBST(HILDON_CFLAGS)
+ AC_SUBST(HILDON_LIBS)
+])
+
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:
- [Gnash-commit] gnash Makefile.am configure.ac ChangeLog gui/Ma...,
Rob Savoye <=