[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-291-ga32ab90 |
|
Date: |
Fri, 18 Mar 2011 15:24:02 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via a32ab90e488b59adff1335379d444f67ffc3e47a (commit)
from a9b9b9810cc50475d9607ef46cf391a4ebb6075e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=a32ab90e488b59adff1335379d444f67ffc3e47a
commit a32ab90e488b59adff1335379d444f67ffc3e47a
Author: Benjamin Wolsey <address@hidden>
Date: Fri Mar 18 15:27:37 2011 +0100
Drop riscos and xpcom.
diff --git a/configure.ac b/configure.ac
index d55f4af..602fd0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -561,7 +561,6 @@ build_gtk=no
build_fb=no dnl Raw framebuffer
build_fltk=no
build_sdl=no
-build_riscos=no dnl Native OS2 GUI
build_aqua=no dnl Native MacOSX
build_hildon=no dnl Native LIMO
build_alp=no dnl Acess Linux Platform using Hiker
@@ -595,9 +594,6 @@ AC_ARG_ENABLE(gui,
aqua|AQUA|Aqua)
build_aqua=yes
;;
- riscos|RISCOS|RiscOS)
- build_riscos=yes
- ;;
fltk|FLTK|fltk2|FLTK2)
build_fltk=yes
;;
@@ -625,7 +621,7 @@ AC_ARG_ENABLE(gui,
build_sdl=yes
build_gtk=yes
;;
- *) AC_MSG_ERROR([invalid gui ${enableval} given (accept:
gtk|kde3|kde4|fltk|sdl|riscos|aqua|fb|qtopia3|qtopia4|dump|aos4|haiku)])
+ *) AC_MSG_ERROR([invalid gui ${enableval} given (accept:
gtk|kde3|kde4|fltk|sdl|aqua|fb|qtopia3|qtopia4|dump|aos4|haiku)])
;;
esac
enableval=`echo ${enableval} | cut -d ' ' -f 2-6`
@@ -2376,7 +2372,6 @@ AM_CONDITIONAL(BUILD_SDL_GUI, [ test x$build_sdl =
xyes ])
AM_CONDITIONAL(BUILD_FB_GUI, [ test x$build_fb = xyes ])
AM_CONDITIONAL(BUILD_AQUA_GUI, [ test x$build_aqua = xyes ])
AM_CONDITIONAL(ALLSTATIC, [ test x$build_aqua = xyes ]) dnl the
Aqua-binary is always static.
-AM_CONDITIONAL(BUILD_RISCOS_GUI, [ test x$build_riscos = xyes ])
AM_CONDITIONAL(BUILD_DUMP_GUI, [ test x$build_dump = xyes ])
AM_CONDITIONAL(BUILD_AMIGAOS4_GUI, [ test x$build_aos4 = xyes ])
AM_CONDITIONAL(BUILD_HAIKU_GUI, [ test x$build_haiku = xyes ])
@@ -2789,9 +2784,6 @@ fi
if test x$build_sdl = xyes; then
SUPPORTED_GUIS="${SUPPORTED_GUIS},sdl"
fi
-if test x$build_riscos = xyes; then
- SUPPORTED_GUIS="${SUPPORTED_GUIS},riscos"
-fi
if test x$build_aqua = xyes; then
SUPPORTED_GUIS="${SUPPORTED_GUIS},aqua"
fi
diff --git a/gui/Makefile.am b/gui/Makefile.am
index a2ecfbe..3be4e83 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -17,7 +17,7 @@
#
# build gtk-gnash, kde-gnash, sdl-gnash, fltk-gnash, aqua-gnash, fb-gnash,
-# riscos-gnash, haiku-gnash and dump-gnash
+# haiku-gnash and dump-gnash
#
AUTOMAKE_OPTIONS = -Wno-portability
@@ -242,11 +242,6 @@ if BUILD_GTK_GUI
include $(srcdir)/gtk/gtk.am
endif
-# Build the RISCOS gui
-if BUILD_RISCOS_GUI
-include $(srcdir)/riscos/riscos.am
-endif
-
CLEANFILES = klash3.moc Kde4Gui.moc Kde4Glue.moc gnash
bundle: Info.plist aqua-gnash
diff --git a/gui/gnash.in b/gui/gnash.in
index ca0f16d..0ca37be 100755
--- a/gui/gnash.in
+++ b/gui/gnash.in
@@ -27,7 +27,7 @@
#!/bin/sh
-GUIS="gtk kde kde4 sdl fltk aqua riscos fb alp hildon haiku"
+GUIS="gtk kde kde4 sdl fltk aqua fb haiku"
THIS_DIR="`dirname $0`"
if test "$1" = "-G"; then
diff --git a/gui/riscos/gui_riscos.cpp b/gui/riscos/gui_riscos.cpp
deleted file mode 100644
index f7ddb26..0000000
--- a/gui/riscos/gui_riscos.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-// Foundation, Inc
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
-#endif
-
-#include "gui.h"
-#include "GnashException.h"
-
-#ifdef GUI_RISCOS
-#include "riscossup.h"
-#endif
-
-namespace gnash {
-
-#ifdef GUI_RISCOS
-std::auto_ptr<Gui> createRISCOSGui(unsigned long windowid, float scale, bool
do_loop, RunResources& r)
-{
- return std::auto_ptr<Gui>(new RiscosGui(windowid, scale, do_loop, r));
-}
-#else // ! GUI_RISCOS
-std::auto_ptr<Gui> createRISCOSGui(unsigned long , float, bool,
RunResourcesfloat , bool , unsigned int )
-{
- throw GnashException("Support for RISCOS gui was not compiled in");
-}
-#endif // ! GUI_RISCOS
-
-} // namespace gnash
-
diff --git a/gui/riscos/riscos.am b/gui/riscos/riscos.am
deleted file mode 100644
index 7408750..0000000
--- a/gui/riscos/riscos.am
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-
-#
-# Build the RISCOS gui
-#
-if BUILD_RISCOS_GUI
-bin_PROGRAMS += riscos-gnash
-riscos_gnash_SOURCES = $(GUI_SRCS) riscos/gui_riscos.cpp riscos/riscos.cpp
riscos/riscos_glue.h riscos/riscossup.h
-riscos_gnash_CPPFLAGS = -DGUI_FB -DGUI_CONFIG=\"FB\" \
- $(AM_CPPFLAGS)
-riscos_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
-#riscos_gnash_DEPENDENCIES = .configline
-
-if BUILD_AGG_RENDERER
-riscos_gnash_CPPFLAGS += $(AGG_CFLAGS)
-riscos_gnash_SOURCES += riscos/riscos_glue_agg.cpp riscos/riscos_glue_agg.h
-riscos_gnash_LDADD = $(top_builddir)/librender/libgnashagg.la \
- $(GNASH_LIBS) $(AGG_LIBS)
-endif # BUILD_AGG_RENDERER
-endif # BUILD_FB_GUI
diff --git a/gui/riscos/riscos.cpp b/gui/riscos/riscos.cpp
deleted file mode 100644
index 0d30f49..0000000
--- a/gui/riscos/riscos.cpp
+++ /dev/null
@@ -1,399 +0,0 @@
-//
-// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-// Foundation, Inc
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
-#endif
-
-#include "gnash.h"
-//#include "movie_definition.h"
-#include "gui.h"
-#include "rc.h"
-#include "riscossup.h"
-#include "Renderer.h"
-#include "log.h"
-
-#include "RunResources.h"
-
-//#include <iostream>
-
-namespace gnash
-{
-
-RiscosGui::~RiscosGui()
-{
- if (_task)
- wimp_close_down(_task);
-}
-
-RiscosGui::RiscosGui(unsigned long xid, float scale, bool loop, RunResources&
r)
- : Gui(xid, scale, loop, r), _task((wimp_t)0), _window((wimp_w)0),
- _quit(false), _timeout(0), m_draw_minx(0), m_draw_miny(0),
- m_draw_maxx(0), m_draw_maxy(0), _screen_height(480), _screen_width(640)
-{
-}
-
-
-bool
-RiscosGui::init(int argc, char **argv[])
-{
- GNASH_REPORT_FUNCTION;
-
-/* wimp_MESSAGE_LIST(4) messages = { { message_MODE_CHANGE,
- message_DATA_LOAD,
- message_DATA_OPEN,
- message_QUIT } };*/
- os_error *error;
-
- glue.init(argc, argv);
-
- error = xwimp_initialise(wimp_VERSION_RO38, "Gnash",
- (wimp_message_list *)0/*&messages*/,
- 0, &_task);
- if (error) {
- log_debug("%s\n", error->errmess);
- return false;
- }
-
- if (!create_window())
- return false;
-
-#ifdef RENDERER_AGG
- os_VDU_VAR_LIST(2) vduvars = { { os_VDUVAR_SCREEN_START,
- os_VDUVAR_END_LIST} };
- int vduvals[2];
- error = xos_read_vdu_variables((const os_vdu_var_list *)&vduvars,
- vduvals);
- if (error) {
- log_debug("%s\n", error->errmess);
- return false;
- }
-
- os_mode mode;
- os_mode_selector *mode_block;
-
- /* read current screenmode details */
- error = xosscreenmode_current(&mode);
- if (error) {
- log_debug("%s", error->errmess);
- return false;
- }
-
- if ((unsigned int)mode >= 256) {
- mode_block = (os_mode_selector *)mode;
- _screen_width = mode_block->xres;
- _screen_height = mode_block->yres;
- }
-
- /** \todo Mode specifiers */
-
- log_debug("Framebuffer address: %p\n", (void *)vduvals[0]);
- log_debug("Screen Res: %d x %d\n", _screen_width, _screen_height);
-
- glue.prepFramebuffer((void *)vduvals[0], _screen_width, _screen_height);
-#endif
-
- _renderer.reset(glue.createRenderHandler());
- //set_Renderer(_renderer);
- _runResources.setRenderer(boost::shared_ptr<Renderer>(_renderer));
- // hack?
- _renderer->set_scale(1.0f, 1.0f);
-
- return true;
-}
-
-
-bool
-RiscosGui::createWindow(const char *title, int width, int height,
- int xPosition, int yPosition)
-{
-//First call the old createWindow function and then set the title.
-//In case there's some need to not setting the title.
- title = title; // TODO: set title string
-
- bool ret = createWindow(width, height);
- wimp_window_state state;
- os_error *error;
-
- state.w = _window;
- error = xwimp_get_window_state(&state);
- if (error) {
- log_debug("%s\n", error->errmess);
- return false;
- }
-
- state.visible.x1 = state.visible.x0 + (width * 2);
- state.visible.y1 = state.visible.y0 + (height * 2);
-
- error = xwimp_open_window((wimp_open *)&state);
- if (error) {
- log_debug("%s\n", error->errmess);
- return false;
- }
-
- return ret;
-}
-
-bool
-RiscosGui::createWindow(int width, int height)
-{
- GNASH_REPORT_FUNCTION;
- _width = width;
- _height = height;
-
- glue.setRenderHandlerSize(width, height);
-
- return true;
-}
-
-void
-RiscosGui::renderBuffer()
-{
- // bounding box is window-relative
- wimp_window_state state;
- os_error *error;
-
- state.w = _window;
- error = xwimp_get_window_state(&state);
- if (error) {
- log_debug("%s\n", error->errmess);
- }
-
- glue.render(state.visible.x0 / 2,
- _screen_height - (state.visible.y1 / 2),
- m_draw_minx, m_draw_miny, m_draw_maxx, m_draw_maxy);
-}
-
-void
-RiscosGui::setTimeout(unsigned int timeout)
-{
- _timeout = os_read_monotonic_time() + timeout / 10;
-}
-
-void
-RiscosGui::setInterval(unsigned int interval)
-{
- _interval = interval;
-}
-
-void
-RiscosGui::setInvalidatedRegion(const SWFRect& bounds)
-{
- // Note: Bounds coordinates are in TWIPS
-
-#ifdef RENDERER_AGG
- // forward to renderer
- _renderer->set_invalidated_region(bounds);
-
- if (bounds.width() > 1e10f) {
- // Region is entire screen. Don't convert to integer as this will
- // overflow.
-
- m_draw_minx = 0;
- m_draw_miny = 0;
- m_draw_maxx = _width - 1;
- m_draw_maxy = _height - 1;
- } else {
- // remember for renderBuffer()
- _renderer->world_to_pixel(&m_draw_minx, &m_draw_miny,
- bounds.get_x_min(), bounds.get_y_min());
- _renderer->world_to_pixel(&m_draw_maxx, &m_draw_maxy,
- bounds.get_x_max(), bounds.get_y_max());
-
- // add two pixels because of anti-aliasing...
- m_draw_minx = valid_coord(m_draw_minx - 2, _width);
- m_draw_miny = valid_coord(m_draw_miny - 2, _height);
- m_draw_maxx = valid_coord(m_draw_maxx + 2, _width);
- m_draw_maxy = valid_coord(m_draw_maxy + 2, _height);
- }
-
-// log_debug("DrawRect: (%i, %i), (%i, %i)\n",
-// m_draw_minx, m_draw_miny, m_draw_maxx, m_draw_maxy);
-#endif
-}
-
-bool
-RiscosGui::run()
-{
- GNASH_REPORT_FUNCTION;
-
- os_t t, now;
- wimp_block block;
- wimp_event_no event;
- osbool more;
- os_error *error;
-
- t = os_read_monotonic_time();
-
- while (!_quit) {
- error = xwimp_poll_idle(wimp_SAVE_FP, &block, t, NULL, &event);
- if (error) {
- log_debug("%s\n", error->errmess);
- return false;
- }
-
- switch (event) {
- case wimp_NULL_REASON_CODE:
- now = os_read_monotonic_time();
- if (now > t) {
- if (_timeout > now) {
- _quit = true;
- } else {
- // TODO: pay attention to interval
-// if ((os_t)_interval <= (now - t) * 10) {
- advance_movie(this);
-// }
- now = os_read_monotonic_time();
- t = now + 10;
- }
- }
- break;
- case wimp_REDRAW_WINDOW_REQUEST:
- error = xwimp_redraw_window(&block.redraw, &more);
- if (error) {
- log_debug("%s\n", error->errmess);
- return false;
- }
- while (more) {
-// SWFRect bounds(block.redraw.clip.x0 / 2, block.redraw.clip.y0 / 2,
-// block.redraw.clip.x1 / 2, block.redraw.clip.y1 / 2);
-// log_debug("Clip SWFRect: (%d, %d)(%d, %d)\n",
-// block.redraw.clip.x0 / 2, block.redraw.clip.y0 / 2,
-// block.redraw.clip.x1 / 2, block.redraw.clip.y1 / 2);
- // TODO: Make this use the clipping rectangle (convert to TWIPS)
- SWFRect bounds(-1e10f, -1e10f, 1e10f, 1e10f);
-#ifdef RENDERER_AGG
- setInvalidatedRegion(bounds);
-#endif
- renderBuffer();
- error = xwimp_get_rectangle(&block.redraw, &more);
- if (error) {
- log_debug("%s\n", error->errmess);
- return false;
- }
- }
- break;
- case wimp_OPEN_WINDOW_REQUEST:
- error = xwimp_open_window(&block.open);
- if (error)
- log_debug("%s\n", error->errmess);
- break;
- case wimp_CLOSE_WINDOW_REQUEST:
- _quit = true;
- break;
- case wimp_POINTER_LEAVING_WINDOW:
- break;
- case wimp_POINTER_ENTERING_WINDOW:
- break;
- case wimp_MOUSE_CLICK:
- break;
- case wimp_USER_DRAG_BOX:
- break;
- case wimp_MENU_SELECTION:
- break;
- case wimp_SCROLL_REQUEST:
- break;
- case wimp_LOSE_CARET:
- break;
- case wimp_GAIN_CARET:
- break;
- case wimp_POLLWORD_NON_ZERO:
- break;
- case wimp_USER_MESSAGE:
- case wimp_USER_MESSAGE_RECORDED:
- case wimp_USER_MESSAGE_ACKNOWLEDGE:
- switch (block.message.action) {
- case message_QUIT:
- _quit = true;
- break;
- default:
-// user_message(event, &(block.message));
- break;
- }
- break;
- }
- }
-
- return true;
-}
-
-bool
-RiscosGui::createMenu()
-{
- GNASH_REPORT_FUNCTION;
-
- return true;
-}
-
-bool
-RiscosGui::setupEvents()
-{
- GNASH_REPORT_FUNCTION;
-
- return true;
-}
-
-/**
- * Creates a window
- *
- * \return true on success, false otherwise
- */
-bool RiscosGui::create_window()
-{
- wimp_WINDOW(0) window = {
- { 400, 400, 800, 800 },
- 0, 0,
- wimp_TOP,
- wimp_WINDOW_MOVEABLE | wimp_WINDOW_BACK_ICON |
- wimp_WINDOW_CLOSE_ICON | wimp_WINDOW_TITLE_ICON |
- wimp_WINDOW_NEW_FORMAT,
- wimp_COLOUR_BLACK, wimp_COLOUR_LIGHT_GREY,
- wimp_COLOUR_BLACK, wimp_COLOUR_WHITE,
- wimp_COLOUR_DARK_GREY, wimp_COLOUR_DARK_GREY,
- wimp_COLOUR_CREAM,
- 0,
- { 0, -81928, 1300, 0 },
- wimp_ICON_TEXT | wimp_ICON_HCENTRED,
- 0,
- 0,
- 2, 1,
- { "Gnash" },
- 0
- };
- os_error *error;
-
- error = xwimp_create_window((wimp_window *)&window, &_window);
- if (error) {
- log_debug("%s\n", error->errmess);
- return false;
- }
-
- return true;
-}
-
-int
-RiscosGui::valid_coord(int coord, int max)
-{
- if (coord<0) return 0;
- else if (coord>=max) return max;
- return coord;
-}
-
-// end of namespace gnash
-}
diff --git a/gui/riscos/riscos_glue.h b/gui/riscos/riscos_glue.h
deleted file mode 100644
index 36f6c08..0000000
--- a/gui/riscos/riscos_glue.h
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-// Foundation, Inc
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-namespace gnash {
-
-class RiscosGlue
-{
- public:
- virtual ~RiscosGlue() { };
- virtual bool init(int argc, char **argv[]) = 0;
-
- virtual void prepFramebuffer(void *framebuffer, int width, int height) = 0;
- virtual Renderer* createRenderHandler() = 0;
- virtual void setRenderHandlerSize(int /*width*/, int /*height*/) { };
- virtual void render(int /* x */, int /* y */) = 0;
- virtual void render(int x, int y, int /*minx*/, int /*miny*/, int
/*maxx*/, int /*maxy*/)
- { render(x, y); };
-// virtual void configure(GtkWidget *const widget,
-// GdkEventConfigure *const event) = 0;
- protected:
- void *_framebuffer;
- int _fbwidth;
- int _fbheight;
-};
-
-} // namespace gnash
diff --git a/gui/riscos/riscos_glue_agg.cpp b/gui/riscos/riscos_glue_agg.cpp
deleted file mode 100644
index 5dca913..0000000
--- a/gui/riscos/riscos_glue_agg.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-//
-// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-// Foundation, Inc
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-#include <cstdio>
-#include <cerrno>
-#include <cstring>
-
-#include "gnash.h"
-#include "log.h"
-#include "Renderer.h"
-#include "Renderer_agg.h"
-#include "riscos_glue_agg.h"
-
-namespace gnash
-{
-
-RiscosAggGlue::RiscosAggGlue() :
- _offscreenbuf(NULL),
- _offscreenbuf_size(0),
- _agg_renderer(NULL),
- _width(0),
- _height(0),
- _bpp(0)
-{
-}
-
-RiscosAggGlue::~RiscosAggGlue()
-{
- free(_offscreenbuf);
-}
-
-bool
-RiscosAggGlue::init(int /*argc*/, char **/*argv*/[])
-{
- // We only support 32bpp modes
- _bpp = 24;
-
- return true;
-}
-
-void
-RiscosAggGlue::prepFramebuffer(void *framebuffer, int width, int height)
-{
- _framebuffer = framebuffer;
- _fbwidth = width;
- _fbheight = height;
-}
-
-Renderer*
-RiscosAggGlue::createRenderHandler()
-{
- _agg_renderer = create_Renderer_agg("RGB24");
- if (! _agg_renderer) {
- throw GnashException(_("Could not create AGG renderer with pixelformat
RGB24"));
- }
- return _agg_renderer;
-}
-
-void
-RiscosAggGlue::setRenderHandlerSize(int width, int height)
-{
- assert(width>0);
- assert(height>0);
- assert(_agg_renderer!=NULL);
-
-#define CHUNK_SIZE (100*100*(_bpp/8))
-
- if (width == _width && height == _height)
- return;
-
- int new_bufsize = width*height*((_bpp+7)/8);
-
- // TODO: At the moment we only increase the buffer and never decrease it.
- // Should be changed sometime.
- if (new_bufsize > _offscreenbuf_size) {
- new_bufsize = static_cast<int>(new_bufsize / CHUNK_SIZE + 1) * CHUNK_SIZE;
- // TODO: C++ conform alternative to realloc?
- _offscreenbuf = static_cast<unsigned char *>( realloc(_offscreenbuf,
new_bufsize) );
-
- if (!_offscreenbuf) {
- log_debug("Could not allocate %i bytes for offscreen buffer: %s\n",
- new_bufsize, strerror(errno) );
- return;
- }
-
- log_debug("RISC OS-AGG: %i bytes offscreen buffer allocated\n",
new_bufsize);
-
- _offscreenbuf_size = new_bufsize;
- memset(_offscreenbuf, 0, new_bufsize);
- }
-
- _width = width;
- _height = height;
-
- // Only the AGG renderer has the function init_buffer, which is *not* part
- // of the renderer api. It allows us to change the renderers movie size
- // (and buffer address) during run-time.
- static_cast<Renderer_agg_base *>(_agg_renderer)->init_buffer(
- _offscreenbuf,
- _offscreenbuf_size,
- _width,
- _height,
- _width*((_bpp+7)/8));
-}
-
-void
-RiscosAggGlue::render(int x, int y)
-{
- // Update the entire screen
- render(x, y, 0, 0, _width, _height);
-}
-
-void
-RiscosAggGlue::render(int x, int y, int minx, int miny, int maxx, int maxy)
-{
- // Update only the invalidated rectangle
- unsigned char *fb = (unsigned char *)_framebuffer;
- int fbw = _fbwidth * 4; // (((_bpp / 8) + 3) & ~3);
- int osw = _width * (_bpp / 8);
-
- for (int row = miny; row < maxy; row++) {
-// int fbr = row * (((_bpp / 8) + 3) & ~3);
-// int osr = row * (_bpp / 8);
-
- for (int col = minx; col < maxx; col++) {
- int fbc = (col + x) * 4; // (((_bpp / 8) + 3) & ~3);
- int osc = col * (_bpp / 8);
-
- fb[(row + y) * fbw + fbc + 0] = _offscreenbuf[row * osw + osc + 0];
- fb[(row + y) * fbw + fbc + 1] = _offscreenbuf[row * osw + osc + 1];
- fb[(row + y) * fbw + fbc + 2] = _offscreenbuf[row * osw + osc + 2];
- fb[(row + y) * fbw + fbc + 3] = 0;
- }
- }
-
-}
-
-#if 0
-void
-RiscosAggGlue::configure(GtkWidget *const /*widget*/, GdkEventConfigure *const
event)
-{
- if (_agg_renderer)
- setRenderHandlerSize(event->width, event->height);
-}
-#endif
-
-} // namespace gnash
-
diff --git a/gui/riscos/riscos_glue_agg.h b/gui/riscos/riscos_glue_agg.h
deleted file mode 100644
index 29a4ae8..0000000
--- a/gui/riscos/riscos_glue_agg.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-// Foundation, Inc
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-#include "riscos_glue.h"
-
-namespace gnash
-{
-
-class RiscosAggGlue : public RiscosGlue
-{
- public:
- RiscosAggGlue();
- ~RiscosAggGlue();
-
- bool init(int argc, char **argv[]);
- void prepFramebuffer(void *framebuffer, int width, int height);
- Renderer* createRenderHandler();
- void setRenderHandlerSize(int width, int height);
- void render(int x, int y);
- void render(int x, int y, int minx, int miny, int maxx, int maxy);
-// void configure(GtkWidget *const widget, GdkEventConfigure *const event);
-
- private:
- unsigned char *_offscreenbuf;
- int _offscreenbuf_size;
- Renderer *_agg_renderer;
- int _width, _height, _bpp;
-};
-
-} // namespace gnash
diff --git a/gui/riscos/riscossup.h b/gui/riscos/riscossup.h
deleted file mode 100644
index 404a0e3..0000000
--- a/gui/riscos/riscossup.h
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-// Foundation, Inc
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-#ifndef __ROSUP_H__
-#define __ROSUP_H__
-
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
-#endif
-
-#include "gnash.h"
-
-#include "oslib/colourtrans.h"
-#include "oslib/wimp.h"
-
-#ifdef RENDERER_AGG
-#include "riscos_glue_agg.h"
-#endif
-
-#include "gui.h"
-
-namespace gnash
-{
-
-class RiscosGui : public Gui
-{
- public:
- RiscosGui(unsigned long xid, float scale, bool loop, RunResources& r);
- virtual ~RiscosGui();
- virtual bool init(int argc, char **argv[]);
- virtual bool createWindow(int width, int height);
- virtual bool createWindow(const char *title, int width, int height,
- int xPosition = 0, int yPosition = 0);
- virtual bool run();
- virtual bool createMenu();
- virtual bool setupEvents();
- virtual void renderBuffer();
- virtual void setInterval(unsigned int interval);
- virtual void setTimeout(unsigned int timeout);
- virtual void setInvalidatedRegion(const SWFRect& bounds);
-
-
- private:
- bool create_window();
- int valid_coord(int coord, int max);
-
- wimp_t _task;
- wimp_w _window;
- bool _quit;
- os_t _timeout;
-
- int m_draw_minx;
- int m_draw_miny;
- int m_draw_maxx;
- int m_draw_maxy;
-
- int _screen_height;
- int _screen_width;
-
-#ifdef RENDERER_AGG
- RiscosAggGlue glue;
-#endif
-};
-
-}
-
-#endif
diff --git a/plugin/xpcom/GnashComponent.cpp b/plugin/xpcom/GnashComponent.cpp
deleted file mode 100644
index ecc3c97..0000000
--- a/plugin/xpcom/GnashComponent.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-#include "GnashComponent.h"
-
-NS_IMPL_ISUPPORTS1(GnashComponent, iGnashComponent)
-
-GnashComponent::GnashComponent()
-{
- /* member initializers and constructor code */
-}
-
-
-GnashComponent::~GnashComponent()
-{
- /* destructor code */
-}
-
-/* long Add (in long a, in long b); */
-NS_IMETHODIMP
-GnashComponent::Add(PRInt32 a, PRInt32 b, PRInt32 *_retval)
-{
- *_retval = a + b;
- return NS_OK;
-}
diff --git a/plugin/xpcom/GnashComponent.h b/plugin/xpcom/GnashComponent.h
deleted file mode 100644
index 0d69854..0000000
--- a/plugin/xpcom/GnashComponent.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-// Foundation, Inc
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-#ifndef GNASH_COMPONENT_H
-#define GNASH_COMPONENT_H
-
-#include "iGnashComponent.h"
-#include "nsStringAPI.h"
-
-#define GNASH_COMPONENT_CONTRACTID "@getgnash.org/updates/GnashComponent;1"
-// 2b70f2b1-fc72-4734-bb81-4eb2a7713e49
-#define GNASH_COMPONENT_CID {0x2b70f2b1, 0xfc72, 0xbb81, { 0x4e, 0xb2, 0xa7,
0x71, 0x3e, 0x49 }}
-
-class GnashComponent : public iGnashComponent
-{
-public:
- NS_DECL_ISUPPORTS
- NS_DECL_IGNASHCOMPONENT
-
- GnashComponent();
- // additional members
- virtual ~GnashComponent();
-};
-
-#endif
diff --git a/plugin/xpcom/GnashComponentModule.cpp
b/plugin/xpcom/GnashComponentModule.cpp
deleted file mode 100644
index 31fd873..0000000
--- a/plugin/xpcom/GnashComponentModule.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-#include "nsIGenericFactory.h"
-#include "GnashComponent.h"
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(GnashComponent)
-NS_COM_GLUE nsresult
-NS_NewGenericModule2(nsModuleInfo const *info, nsIModule* *result);
-
-static nsModuleComponentInfo components[] =
-{
- {
- "GnashComponent",
- GNASH_COMPONENT_CID,
- GNASH_COMPONENT_CONTRACTID,
- GnashComponentConstructor,
- }
-};
-
-NS_IMPL_NSGETMODULE("GnashComponentsModule", components)
-
diff --git a/plugin/xpcom/Makefile.am b/plugin/xpcom/Makefile.am
deleted file mode 100644
index bb2e11f..0000000
--- a/plugin/xpcom/Makefile.am
+++ /dev/null
@@ -1,71 +0,0 @@
-## Process this file with automake to generate Makefile.in
-#
-# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-AUTOMAKE_OPTIONS =
-
-IDL_OUTPUT = \
- iGnashComponent.xpt \
- iGnashComponent.h
-
-EXTRA_DIST = iGnashComponent.idl
-
-INCLUDES = \
- -DLOCALEDIR=\"$(localedir)\" \
- $(XPCOM_CFLAGS)
-
-AM_LDFLAGS = \
- $(XPCOM_LIBS)
-
-AM_CXXFLAGS=-fshort-wchar
-
-#GECKO_INCLUDES = -I/usr/include/xulrunner-sdk-1.9/stable -I/usr/include/nspr4
-I/usr/include/xulrunner-sdk-1.9/
-
-#GECKO_LDFLAGS = -L/usr/lib/xulrunner-sdk-1.9/sdk/lib -lxpcomglue \
- -lnspr4 \
- -lplds4
-
-BUILT_SOURCES = $(IDL_OUTPUT)
-
-pkglib_LTLIBRARIES = libgnashcomponent.la
-libgnashcomponent_la_SOURCES = GnashComponent.cpp GnashComponentModule.cpp
-libgnashcomponent_la_CFLAGS = -DXPCOM_GLUE -fno-rtti -fno-exceptions
-libgnashcomponent_la_LDFLAGS = -avoid-version -module -no-undefined \
- $(XPCOM_LIBS)
-
-noinst_HEADERS = GnashComponent.h
-
-CLEANFILES = \
- $(IDL_OUTPUT) \
- *.loT
-
-# Build the output files from the IDL file
-SUFFIXES = idl xpt
-.idl.h:
- $(XPIDL) -m header -v $(XPCOM_IDL_CFLAGS) $<
-.idl.xpt:
- $(XPIDL) -m typelib -v $(XPCOM_IDL_CFLAGS) $<
-
-EXT_DIR = "`dirname
$(FIREFOX_PLUGINS)/extensions/{2b70f2b1-fc72-4734-bb81-4eb2a7713e49}`"
-
-install-pkglib: iGnashComponent.h $(pkglib_LTLIBRARIES)
- @test -d "$(DESTDIR)$(EXT_DIR)" || $(mkinstalldirs)
"$(DESTDIR)$(EXT_DIR)"
- @if test -d .libs; then \
- cp -f .libs/libgnashcomponent.so*
$(DESTDIR)$(EXT_DIR)/libgnashcomponent.so; \
- cp -f iGnashComponent.xpt $(DESTDIR)$(EXT_DIR)/iGnashComponent.xpt; \
- fi
-
-force:
diff --git a/plugin/xpcom/README.txt b/plugin/xpcom/README.txt
deleted file mode 100644
index 6ed73ed..0000000
--- a/plugin/xpcom/README.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-The sample code from which this was derived came from:
-http://www.iosart.com/firefox/xpcom/ written by Alex Sirota.
-
diff --git a/plugin/xpcom/iGnashComponent.idl b/plugin/xpcom/iGnashComponent.idl
deleted file mode 100644
index 253d243..0000000
--- a/plugin/xpcom/iGnashComponent.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-#include "nsISupports.idl"
-
-[scriptable, uuid(2b70f2b1-fc72-4734-bb81-4eb2a7713e49)]
-interface iGnashComponent : nsISupports
-{
- // attribute AString name;
- long Add(in long a, in long b);
-};
-
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 10 +-
gui/Makefile.am | 7 +-
gui/gnash.in | 2 +-
gui/riscos/gui_riscos.cpp | 47 ----
gui/riscos/riscos.am | 35 ---
gui/riscos/riscos.cpp | 399 ---------------------------------
gui/riscos/riscos_glue.h | 42 ----
gui/riscos/riscos_glue_agg.cpp | 164 --------------
gui/riscos/riscos_glue_agg.h | 46 ----
gui/riscos/riscossup.h | 83 -------
plugin/xpcom/GnashComponent.cpp | 40 ----
plugin/xpcom/GnashComponent.h | 40 ----
plugin/xpcom/GnashComponentModule.cpp | 37 ---
plugin/xpcom/Makefile.am | 71 ------
plugin/xpcom/README.txt | 3 -
plugin/xpcom/iGnashComponent.idl | 26 ---
16 files changed, 3 insertions(+), 1049 deletions(-)
delete mode 100644 gui/riscos/gui_riscos.cpp
delete mode 100644 gui/riscos/riscos.am
delete mode 100644 gui/riscos/riscos.cpp
delete mode 100644 gui/riscos/riscos_glue.h
delete mode 100644 gui/riscos/riscos_glue_agg.cpp
delete mode 100644 gui/riscos/riscos_glue_agg.h
delete mode 100644 gui/riscos/riscossup.h
delete mode 100644 plugin/xpcom/GnashComponent.cpp
delete mode 100644 plugin/xpcom/GnashComponent.h
delete mode 100644 plugin/xpcom/GnashComponentModule.cpp
delete mode 100644 plugin/xpcom/Makefile.am
delete mode 100644 plugin/xpcom/README.txt
delete mode 100644 plugin/xpcom/iGnashComponent.idl
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-291-ga32ab90,
Benjamin Wolsey <=