[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-317-gfcfbf55

[Benjamin Wolsey]

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  fcfbf55881b85c8dd564672f8209cd3e66e9d720 (commit)
       via  fa60fdd922aa5649ae0ed91e496d4eaa8d6d3fa5 (commit)
       via  1a1806ffe9bd7753115bcae8ed8f52812f8b962e (commit)
       via  67da8555c404de9cbce5a0418d5cb21131d984df (commit)
      from  229dfaced2d4b1e23b5f1779439f6f80041167a7 (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=fcfbf55881b85c8dd564672f8209cd3e66e9d720


commit fcfbf55881b85c8dd564672f8209cd3e66e9d720
Author: Benjamin Wolsey <address@hidden>
Date:   Tue Mar 22 08:29:40 2011 +0100

    Drop remaining reference to HAVE_DMALLOC.

diff --git a/Makefile.am b/Makefile.am
index ab75502..4f02700 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -293,10 +293,6 @@ endif
        @echo " FONTCONFIG_CFLAGS is $(FONTCONFIG_CFLAGS)"
        @echo " FONTCONFIG_LIBS is $(FONTCONFIG_LIBS)"
        @echo " LIBINTL is $(LIBINTL)"
-if HAVE_DMALLOC
-       @echo " DMALLOC_CFLAGS is $(DMALLOC_CFLAGS)"
-       @echo " DMALLOC_LIBS is $(DMALLOC_LIBS)"
-endif
 if BUILD_MYSQL_EXT
        @echo " MYSQL_CFLAGS is $(MYSQL_CFLAGS)"
        @echo " MYSQL_LIBS is $(MYSQL_LIBS)"

http://git.savannah.gnu.org/cgit//commit/?id=fa60fdd922aa5649ae0ed91e496d4eaa8d6d3fa5


commit fa60fdd922aa5649ae0ed91e496d4eaa8d6d3fa5
Author: Benjamin Wolsey <address@hidden>
Date:   Tue Mar 22 08:21:17 2011 +0100

    Implement screenResolution for Qt4.

diff --git a/gui/kde/Kde4Gui.cpp b/gui/kde/Kde4Gui.cpp
index f40c847..cd8dd3e 100644
--- a/gui/kde/Kde4Gui.cpp
+++ b/gui/kde/Kde4Gui.cpp
@@ -52,9 +52,9 @@
 #include <QCheckBox>
 #include <QLCDNumber>
 #include <QSpinBox>
-#include <QSocketNotifier>
 #include <QClipboard>
 #include <QString>
+#include <QDesktopWidget>
 
 #include "Range2d.h"
 
@@ -362,6 +362,16 @@ Kde4Gui::unsetFullscreen()
     }
 }
 
+std::pair<int, int>
+Kde4Gui::screenResolution() const
+{
+    QDesktopWidget* d = QApplication::desktop();
+    assert(d);
+
+    const QRect c = d->screenGeometry();
+    return std::make_pair(c.width(), c.height());
+}
+
 gnash::key::code
 Kde4Gui::qtToGnashKey(QKeyEvent *event)
 {
diff --git a/gui/kde/Kde4Gui.h b/gui/kde/Kde4Gui.h
index 6385248..1a75a15 100644
--- a/gui/kde/Kde4Gui.h
+++ b/gui/kde/Kde4Gui.h
@@ -101,6 +101,7 @@ public:
     virtual bool showMouse(bool show);
     virtual void unsetFullscreen();
     virtual void setClipboard(const std::string& copy);
+    virtual std::pair<int, int> screenResolution() const;
 
     void setInvalidatedRegions(const InvalidatedRanges& ranges);
     void resize(int width, int height);

http://git.savannah.gnu.org/cgit//commit/?id=1a1806ffe9bd7753115bcae8ed8f52812f8b962e


commit 1a1806ffe9bd7753115bcae8ed8f52812f8b962e
Author: Benjamin Wolsey <address@hidden>
Date:   Tue Mar 22 08:07:54 2011 +0100

    Drop unused FD callback code.

diff --git a/gui/gtk/gtk.cpp b/gui/gtk/gtk.cpp
index 61fe3eb..68b30cd 100644
--- a/gui/gtk/gtk.cpp
+++ b/gui/gtk/gtk.cpp
@@ -89,9 +89,6 @@ namespace {
     void menuQualityHigh(GtkMenuItem *menuitem, gpointer instance); 
     void menuQualityBest(GtkMenuItem *menuitem, gpointer instance);
 
-    gboolean fd_callback_handler(GIOChannel *source, GIOCondition condition,
-                                 gpointer data);
-
     void timeoutQuit(gpointer data);
 
     // Event handlers
@@ -289,29 +286,6 @@ GtkGui::setTimeout(unsigned int timeout)
 }
 
 
-bool
-GtkGui::watchFD(int fd)
-{
-    // NOTE: "The default encoding for GIOChannel is UTF-8. If your application
-    // is reading output from a command using via pipe, you may need to set the
-    // encoding to the encoding of the current locale (see g_get_charset())
-    // with the g_io_channel_set_encoding() function."
-
-    GIOChannel* gio_read = g_io_channel_unix_new(fd);
-    
-    if (!gio_read) {
-        return false;
-    }
-    
-    if (!g_io_add_watch (gio_read, GIOCondition(G_IO_HUP),
-                         GIOFunc (fd_callback_handler), this)) {
-        g_io_channel_unref(gio_read);
-        return false;
-    }
-    
-    return true;
-}
-
 void
 GtkGui::error(const std::string& msg)
 {
@@ -2728,18 +2702,6 @@ menuQualityBest(GtkMenuItem* /*menuitem*/, gpointer data)
     gui->setQuality(QUALITY_BEST);
 }
 
-gboolean
-fd_callback_handler(GIOChannel *source, GIOCondition /*condition*/,
-                    gpointer data)
-{
-    Gui* gui = static_cast<Gui*>(data);
-
-    gui->callCallback(g_io_channel_unix_get_fd (source));
-
-    return true;
-}
-
-
 } // anonymous namespace
 
 } // end of namespace gnash
diff --git a/gui/gtk/gtksup.h b/gui/gtk/gtksup.h
index bd0ce6e..9e42d00 100644
--- a/gui/gtk/gtksup.h
+++ b/gui/gtk/gtksup.h
@@ -79,8 +79,6 @@ public:
     virtual double getScreenDPI() const;
 
     virtual void setClipboard(const std::string& copy);
-    
-    bool watchFD(int fd);
 
     /// Grab focus so to receive all key events
     //
diff --git a/gui/gui.cpp b/gui/gui.cpp
index 90923de..7d86e0a 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -1319,32 +1319,6 @@ Gui::getQuality() const
     return _stage->getQuality();
 }
 
-void
-Gui::setFDCallback(int fd, boost::function<void ()> callback)
-{
-    log_debug("Setting callback for fd #%d", fd);
-    
-    _fd_callbacks[fd] = callback;
-
-    watchFD(fd);
-}
-
-
-void
-Gui::callCallback(int fd)
-{
-    std::map<int, boost::function<void ()> >::iterator it = 
_fd_callbacks.find(fd);
-
-    if (it == _fd_callbacks.end()) {
-        log_error("Attempted to call a callback for an unregistered fd.");
-        return;
-    }
-
-    boost::function<void()>& f = it->second;
-
-    f();
-}
-// end of namespace
 }
 
 // local Variables:
diff --git a/gui/gui.h b/gui/gui.h
index 87a7c17..cf9552b 100644
--- a/gui/gui.h
+++ b/gui/gui.h
@@ -103,18 +103,6 @@ public:
       _interval = interval;
     }
 
-    /// Instructs the Gui to monitor a file descriptor.
-    //
-    /// @param fd The file descriptor to monitor
-    /// @param callback The callback to fire
-    void setFDCallback(int fd, boost::function<void ()> callback);
-
-    /// Calls the callback function registered for a file descriptor.
-    //
-    /// @param fd The file descriptor for which the registered callback should
-    ///        be fired.
-    void callCallback(int fd);
-
     /// Return the clock provided by this Gui.
     //
     /// The Gui clock will be paused when the gui is put
diff --git a/gui/kde/Kde4Gui.cpp b/gui/kde/Kde4Gui.cpp
index 302638b..f40c847 100644
--- a/gui/kde/Kde4Gui.cpp
+++ b/gui/kde/Kde4Gui.cpp
@@ -22,7 +22,6 @@
 #include "gnashconfig.h"
 #endif
 
-
 #include <map>
 #include <boost/assign/list_inserter.hpp>
 
@@ -81,7 +80,6 @@ namespace gnash
 
 Kde4Gui::Kde4Gui(unsigned long xid, float scale, bool loop, RunResources& r)
  : Gui(xid, scale, loop, r)
- , _fdMonitor(*this)
 {
 }
 
@@ -163,15 +161,6 @@ Kde4Gui::run()
     return _application->exec();
 }
 
-
-bool
-Kde4Gui::watchFD(int fd)
-{
-    _fdMonitor.addFD(fd);
-    return true;
-}
-
-
 bool
 Kde4Gui::createWindow(const char* windowtitle, int width, int height,
                      int xPosition, int yPosition)
@@ -731,12 +720,14 @@ EmbedWidget::EmbedWidget(Kde4Gui& gui)
     connect(_playButton, SIGNAL(clicked()), _drawingWidget, SLOT(play()));
 }
 
-void EmbedWidget::hidePlayButton()
+void
+EmbedWidget::hidePlayButton()
 {
     _playButton->hide();
 }
 
-void EmbedWidget::showPlayButton()
+void
+EmbedWidget::showPlayButton()
 {
     _playButton->show();
 }
@@ -1013,35 +1004,7 @@ PreferencesDialog::savePreferences()
     emit accept();
 }
 
-
 } // End of Kde4GuiPrefs namespace
 
-FDMonitor::FDMonitor(Kde4Gui& gui)
-    : _gui(gui)
-{
-}
-
-FDMonitor::~FDMonitor()
-{
-}
-
-void
-FDMonitor::dataReceived(int fd)
-{
-    _gui.callCallback(fd);
-}
-
-void
-FDMonitor::addFD(int fd)
-{
-    QSocketNotifier* socketNotifier =
-                        new QSocketNotifier(fd, QSocketNotifier::Read, this);
-
-    connect(socketNotifier, SIGNAL(activated(int)),
-            this, SLOT(dataReceived(int)));
-
-    socketNotifier->setEnabled(true);
-}
-
 }
 
diff --git a/gui/kde/Kde4Gui.h b/gui/kde/Kde4Gui.h
index d058c24..6385248 100644
--- a/gui/kde/Kde4Gui.h
+++ b/gui/kde/Kde4Gui.h
@@ -82,24 +82,6 @@ private:
 };
 
 
-class FDMonitor : public QObject
-{
-    Q_OBJECT
-public:
-    FDMonitor(Kde4Gui& gui);
-    ~FDMonitor();
-
-    // Add a file descriptor for monitoring.
-    void addFD(int fd);
-
-public slots:
-    void dataReceived(int fd);
-
-private:
-    Kde4Gui& _gui;
-};
-
-
 class DSOEXPORT Kde4Gui :  public Gui
 {
 public:
@@ -110,7 +92,6 @@ public:
                               int xPosition = 0, int yPosition = 0);
     virtual void resizeWindow(int width, int height);
     virtual bool run();
-    virtual bool watchFD(int fd);
     virtual void renderBuffer();
     virtual void setInterval(unsigned int interval);
     virtual void setTimeout(unsigned int timeout);
@@ -151,9 +132,6 @@ private:
     /// Called when the movie is played.
     void playHook();
 
-    /// Object that allows the mainloop to read file descriptors.
-    FDMonitor _fdMonitor;
-
     DrawBounds _drawbounds;
  
     /// The main application, which should destroy everything

http://git.savannah.gnu.org/cgit//commit/?id=67da8555c404de9cbce5a0418d5cb21131d984df


commit 67da8555c404de9cbce5a0418d5cb21131d984df
Author: Benjamin Wolsey <address@hidden>
Date:   Tue Mar 22 08:06:49 2011 +0100

    Drop old configuration code.

diff --git a/configure.ac b/configure.ac
index b3e2a3e..e3f8a7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -401,7 +401,6 @@ AC_SUBST(STATISTICS_LIST)
 #
 solreadonly=no
 localconnection=yes
-lctrace=yes
 
 AC_ARG_WITH(security,
   AC_HELP_STRING([--with-security=], [Specify which security features to 
enable]),
@@ -427,17 +426,12 @@ AC_ARG_WITH(security,
         localconnection=yes
         nsecurity=$((nsecurity+1))
         ;;
-      lctrace)
-        lctrace=yes
-        nsecurity=$((nsecurity+1))
-        ;;
       all|ALL)
         solreadonly=yes
         lc=yes
-        lctrace=yes
         nsecurity=3
         ;;
-      *) AC_MSG_ERROR([invalid security feature specified: ${withval} given 
(accept: solreadonly|lc|lctrace)])
+      *) AC_MSG_ERROR([invalid security feature specified: ${withval} given 
(accept: solreadonly|lc)])
         ;;
       esac]
     withval=`echo ${withval} | cut -d ' ' -f 2-6`
@@ -446,13 +440,6 @@ AC_ARG_WITH(security,
     fi
   done
 )
-if test xlctrace = xyes; then
-  security_list="${security_list} lctrace"
-  AC_DEFINE(USE_LC_TRACE, [1],
-           [Support LocalConnection])
-  AC_MSG_NOTICE([This build supports LocalConnection tracing])
-  AC_MSG_WARN([This option will effect your performance])
-fi
 
 if test x$localconnection = xyes; then
   security_list="${security_list} localconnection"
@@ -1130,21 +1117,6 @@ AM_CONDITIONAL(HAVE_CSOUND, test x"$CSOUND" != x)
 AC_PATH_PROG(GIT, git)
 AC_SUBST(GIT)
 
-dnl -------------------------------------
-dnl LIRC
-dnl -------------------------------------
-AC_ARG_ENABLE(lirc, AC_HELP_STRING([--enable-lirc], [Disable support for 
Lirc]),
-[case "${enableval}" in
-  yes) lirc=yes ;;
-  no)  lirc=no ;;
-  *)   AC_MSG_ERROR([bad value ${enableval} for enable-lirc option]) ;;
-esac], lirc=no)
-
-if test x"$lirc" = x"yes"; then
-  AC_DEFINE([USE_LIRC], [], [LIRC daemon support])
-fi
-AM_CONDITIONAL(USE_LIRC, test x$lirc = xyes)
-
 dnl --------------------------------------------------------
 dnl Extension selection
 dnl --------------------------------------------------------
@@ -1791,8 +1763,6 @@ AC_DEFINE(USE_PNG, [1], [Use the PNG library])
 AM_CONDITIONAL(USE_GIF, true)
 AM_CONDITIONAL(USE_PNG, true)
 
-AM_CONDITIONAL(HAVE_DMALLOC, [ test x$has_dmalloc = xyes ])
-
 AC_PATH_TOOL([AUTOTRACE], [autotrace])
 AC_HEADER_DIRENT
 
@@ -2882,13 +2852,6 @@ else
   fi
 fi
 
-if test x"${dmalloc}" = x"yes"; then
-  echo "        DMalloc support enabled"
-  echo "        For a list of the command-line options enter: dmalloc --usage"
-else
-  echo "        DMalloc support disabled (default). Use --enable-dmalloc to 
enable."
-fi
-
 if test x"${npapi}" = x"yes"; then
   echo "        NPAPI plugin enabled (default). Use --disable-npapi to 
disable."
   echo "            NPAPI plugin will be installed in ${FIREFOX_PLUGINS}"

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am         |    4 ---
 configure.ac        |   39 +----------------------------------
 gui/gtk/gtk.cpp     |   38 ----------------------------------
 gui/gtk/gtksup.h    |    2 -
 gui/gui.cpp         |   26 -----------------------
 gui/gui.h           |   12 ----------
 gui/kde/Kde4Gui.cpp |   57 +++++++++++++-------------------------------------
 gui/kde/Kde4Gui.h   |   23 +-------------------
 8 files changed, 17 insertions(+), 184 deletions(-)


hooks/post-receive
-- 
Gnash