Merge lp:~andrew-bugs-launchpad-net/nspluginwrapper/flashsaver into lp:nspluginwrapper

[Andrew Sayers]

[Andrew Sayers (andrew-bugs-launchpad-net)]

Adobe Flash doesn't currently inhibit the screensaver when playing a video: http://bugs.adobe.com/jira/browse/FP-997?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel). There's no sign of activity in that bug report, and users are currently working around the bug on their own: http://ubuntuforums.org/showthread.php?t=1090393

This branch includes an "npsaver.bin" application that monitors X Window events, and inhibits the screensaver when npviewer.bin is fullscreen and on the top of the stack. This gives a very close match to Flash's behaviour in Windows.

This application is being proposed for inclusion in nspluginwrapper for mainly practical reasons: the process should run whenever a Flash window is open, and has to be written in C to avoid depending on packages not currently installed by default.

This branch directly modifies the "configure" script - I think this is normally frowned upon, but I can't find the m4 script that automatically generates "configure".

Unmerged revisions

58. By Andrew Sayers <email address hidden> on 2009-06-23

Ran flashsaver through valgrind, caught a few memory leaks

57. By Andrew Sayers <email address hidden> on 2009-06-13

s/dbus-1/libdbus-1/ in debian/control

56. By Andrew Sayers <email address hidden> on 2009-06-13

Fixed a daft build-dependency issue

55. By Andrew Sayers <email address hidden> on 2009-06-13

Flash screensaver workaround now operational

54. By Andrew Sayers <email address hidden> on 2009-06-12

Initial Flash screensaver workaround

=== modified file 'Makefile'
--- Makefile	2009-01-02 10:07:27 +0000
+++ Makefile	2009-06-13 09:20:20 +0000
@@ -143,6 +143,15 @@
 npviewer_LDFLAGS += $(libsocket_LDFLAGS)
 endif
 
+npsaver_PROGRAM = npsaver.bin
+npsaver_RAWSRCS = npw-screensaver.c inhibit-screensaver.c
+npsaver_SOURCES = $(npsaver_RAWSRCS:%.c=$(SRC_PATH)/src/%.c)
+npsaver_OBJECTS = $(npsaver_RAWSRCS:%.c=npsaver-%.o)
+npsaver_CFLAGS  = $(DBUS_CFLAGS) -DNDEBUG
+npsaver_LDFLAGS = $(DBUS_LDFLAGS)
+npsaver_LDFLAGS += $(X_LDFLAGS)
+npsaver_LDFLAGS += $(libdl_LDFLAGS) $(libpthread_LDFLAGS) -lgthread-2.0
+
 npplayer_PROGRAM  = npplayer
 npplayer_SOURCES  = npw-player.c debug.c rpc.c utils.c glibcurl.c gtk2xtbin.c $(tidy_SOURCES)
 npplayer_OBJECTS  = $(npplayer_SOURCES:%.c=npplayer-%.o)
@@ -208,6 +217,7 @@
 TARGETS		+= $(npwrapper_LIBRARY)
 ifeq ($(build_viewer),yes)
 TARGETS		+= $(npviewer_PROGRAM)
+TARGETS		+= $(npsaver_PROGRAM)
 TARGETS		+= $(libxpcom_LIBRARY)
 TARGETS		+= $(libnoxshm_LIBRARY)
 endif
@@ -253,7 +263,7 @@
 distclean: clean
 	rm -f config-host.* config.*
 
-uninstall: uninstall.player uninstall.wrapper uninstall.viewer uninstall.libxpcom uninstall.libnoxshm uninstall.loader uninstall.config uninstall.dirs
+uninstall: uninstall.player uninstall.wrapper uninstall.viewer uninstall.saver uninstall.libxpcom uninstall.libnoxshm uninstall.loader uninstall.config uninstall.dirs
 uninstall.dirs:
 	rmdir $(DESTDIR)$(pkglibdir)/noarch
 	rmdir $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)
@@ -269,6 +279,9 @@
 uninstall.viewer:
 	rm -f $(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS)/$(npviewer_PROGRAM)
 	rm -f $(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS)/$(npviewer_PROGRAM:%.bin=%)
+uninstall.saver:
+	rm -f $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npsaver_PROGRAM)
+	rm -f $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npsaver_PROGRAM:%.bin=%)
 uninstall.libxpcom:
 	rm -f $(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS)/$(libxpcom_LIBRARY)
 uninstall.libnoxshm:
@@ -281,7 +294,7 @@
 uninstall.mkruntime:
 	rm -f $(DESTDIR)$(pkglibdir)/noarch/mkruntime
 
-install: install.dirs install.player install.wrapper install.viewer install.libxpcom install.libnoxshm install.loader install.config
+install: install.dirs install.player install.wrapper install.viewer install.saver install.libxpcom install.libnoxshm install.loader install.config
 install.dirs:
 	mkdir -p $(DESTDIR)$(pkglibdir)/noarch
 	mkdir -p $(DESTDIR)$(pkglibdir)/$(ARCH)
@@ -302,6 +315,8 @@
 	$(INSTALL) -m 755 $(STRIP_OPT) $(npwrapper_LIBRARY) $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npwrapper_LIBRARY)
 ifeq ($(build_viewer),yes)
 install.viewer: install.viewer.bin install.viewer.glue
+install.saver: $(npsaver_PROGRAM)
+	$(INSTALL) -m 755 $(STRIP_OPT) $(npsaver_PROGRAM) $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npsaver_PROGRAM)
 install.libxpcom: do.install.libxpcom
 install.libnoxshm: do.install.libnoxshm
 else
@@ -386,6 +401,15 @@
 npviewer-%.o: $(SRC_PATH)/src/%.cpp
 	$(CXX) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(npviewer_CFLAGS) -DBUILD_VIEWER
 
+$(npsaver_PROGRAM): $(npsaver_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS)
+	$(CC) $(LDFLAGS) -o $@ $(npsaver_OBJECTS) $(npsaver_LDFLAGS)
+
+npsaver-%.o: $(SRC_PATH)/src/%.c
+	$(CC) $(CFLAGS) -o $@ -c $< $(CPPFLAGS) $(npsaver_CFLAGS) -DBUILD_VIEWER
+
+npsaver-%.o: $(SRC_PATH)/src/%.cpp
+	$(CXX) $(CFLAGS) -o $@ -c $< $(CPPFLAGS) $(npsaver_CFLAGS) -DBUILD_VIEWER
+
 $(npplayer_PROGRAM): $(npplayer_OBJECTS) $(npplayer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS)
 	$(CC) $(LDFLAGS) -o $@ $(npplayer_OBJECTS) $(npplayer_LDFLAGS)
 
 
=== modified file 'configure'
--- configure	2009-01-02 10:07:27 +0000
+++ configure	2009-06-13 09:20:20 +0000
@@ -436,6 +436,32 @@
     rm -f $TMPC $TMPE
 fi
 
+# check for DBUS-1 compile CFLAGS
+if test "$build_viewer" = "yes" -o "$build_player" = "yes"; then
+    if $pkgconfig --exists dbus-1; then
+	DBUS_CFLAGS=`$pkgconfig --cflags dbus-1`
+	DBUS_LDFLAGS=`$pkgconfig --libs dbus-1`
+	DBUS_VERSION=`$pkgconfig --modversion dbus-1`
+    else
+	echo "DBUS not found"
+	exit 1
+    fi
+    cat > $TMPC << EOF
+#include <dbus/dbus.h>
+int main(void) {
+    DBusError err;
+    dbus_error_init(&err);
+    return 0;
+}
+EOF
+    if ! $cc $CFLAGS $DBUS_CFLAGS $DBUS_LDFLAGS $TMPC -o $TMPE > /dev/null 2>&1; then
+	echo "DBUS not usable"
+	rm -f $TMPC
+	exit 1
+    fi
+    rm -f $TMPC $TMPE
+fi
+
 # check for cURL compile CFLAGS
 if test "$build_player" = "yes"; then
     if $pkgconfig --exists libcurl; then
@@ -689,6 +715,8 @@
 echo "GLIB_LDFLAGS=$GLIB_LDFLAGS" >> $config_mak
 echo "GTK_CFLAGS=$GTK_CFLAGS" >> $config_mak
 echo "GTK_LDFLAGS=$GTK_LDFLAGS" >> $config_mak
+echo "DBUS_CFLAGS=$DBUS_CFLAGS" >> $config_mak
+echo "DBUS_LDFLAGS=$DBUS_LDFLAGS" >> $config_mak
 echo "CURL_CFLAGS=$CURL_CFLAGS" >> $config_mak
 echo "CURL_LDFLAGS=$CURL_LDFLAGS" >> $config_mak
 if test "$biarch" = "yes"; then
 
=== modified file 'debian/control'
--- debian/control	2008-08-27 17:19:36 +0000
+++ debian/control	2009-06-13 16:56:18 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu MOTU Developers <[e-mail]>
 XSBC-Original-Maintainer: Rob Andrews <[e-mail]>
-Build-Depends: debhelper (>= 5), quilt, autotools-dev, libc6-dev-i386 [ amd64 ], libxt-dev, x11proto-core-dev, x11proto-xext-dev, libx11-dev, libatk1.0-dev, libfontconfig1-dev, libgtk2.0-dev, libglib2.0-dev, libpango1.0-dev, ia32-libs [ amd64 ], gcc-multilib [ amd64 ], g++-multilib [ amd64 ], libcurl4-gnutls-dev
+Build-Depends: debhelper (>= 5), quilt, autotools-dev, libc6-dev-i386 [ amd64 ], libxt-dev, x11proto-core-dev, x11proto-xext-dev, libx11-dev, libatk1.0-dev, libfontconfig1-dev, libgtk2.0-dev, libglib2.0-dev, libpango1.0-dev, ia32-libs [ amd64 ], gcc-multilib [ amd64 ], g++-multilib [ amd64 ], libcurl4-gnutls-dev, libdbus-1-dev
 Standards-Version: 3.8.0
 Xs-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-dev/nspluginwrapper/ubuntu
 
 
=== added file 'src/inhibit-screensaver.c'
--- src/inhibit-screensaver.c	1970-01-01 00:00:00 +0000
+++ src/inhibit-screensaver.c	2009-06-23 12:32:38 +0000
@@ -0,0 +1,195 @@
+/*
+ *  inhibit-screensaver.c - screensaver (dis)inhibition functions
+ *
+ *  nspluginwrapper (C) 2005-2009 Gwenole Beauchesne
+ *
+ *  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 2 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <dbus/dbus.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#define DBUS_MESSAGE(O, M) dbus_message_new_method_call("org."O".ScreenSaver", "/org/"O"/ScreenSaver", "org."O".ScreenSaver", M)
+
+// GNOME and KDE use the compatible interfaces with different names
+static DBusMessage *freedesktop_inhibit;
+static DBusMessage *gnome_inhibit;
+
+static DBusConnection *connection;
+
+static char const*const name = "npviewer.bin";
+static char const*const reason = "Fullscreen Flash application running";
+
+static enum { UNINITIALISED, UNINHIBITED, INHIBITED } state = UNINITIALISED;
+
+static unsigned int freedesktop_cookie;
+static unsigned int       gnome_cookie;
+
+void screensaver_terminate() {
+#ifndef NDEBUG
+	printf("Freeing screensaver data\n");
+#endif
+  if (freedesktop_inhibit)
+    dbus_message_unref(freedesktop_inhibit);
+  freedesktop_inhibit = 0;
+  if (gnome_inhibit)
+    dbus_message_unref(gnome_inhibit);
+  gnome_inhibit = 0;
+  if (connection)
+    dbus_connection_unref(connection);
+  connection = 0;
+};
+
+void initialise() {
+
+  if (UNINITIALISED != state) return;
+
+  DBusError err;
+
+  dbus_error_init(&err);
+
+  connection = dbus_bus_get(DBUS_BUS_SESSION, &err);
+  if (dbus_error_is_set(&err)) { 
+    fprintf(stderr, "Connection Error (%s)\n", err.message); 
+    dbus_error_free(&err); 
+  }
+  if (NULL == connection) { 
+    exit(1); 
+  }
+
+  freedesktop_inhibit   = DBUS_MESSAGE("freedesktop",   "Inhibit");
+  gnome_inhibit         = DBUS_MESSAGE("gnome"      ,   "Inhibit");
+
+  dbus_message_append_args(freedesktop_inhibit,
+                           DBUS_TYPE_STRING, &name,
+                           DBUS_TYPE_STRING, &reason,
+                           DBUS_TYPE_INVALID);
+
+  dbus_message_append_args(gnome_inhibit,
+                           DBUS_TYPE_STRING, &name,
+                           DBUS_TYPE_STRING, &reason,
+                           DBUS_TYPE_INVALID);
+
+  state = UNINHIBITED;
+
+  atexit(screensaver_terminate);
+
+}
+
+// Send either gnome_inhibit or freedesktop_inhibit, and get the reply
+int inhibit_one(DBusMessage* inhibit) {
+  DBusPendingCall* pending;
+  DBusMessageIter args;
+  dbus_uint32_t ret;
+
+  if (!dbus_connection_send_with_reply(connection, inhibit, &pending, -1)) { 
+    fprintf(stderr, "Out Of Memory!\n"); 
+    exit(1);
+  }
+  if (NULL == pending) { 
+    fprintf(stderr, "Pending Call Null\n"); 
+    exit(1); 
+  }
+
+  dbus_connection_flush(connection);
+
+  dbus_pending_call_block(pending);
+
+  // get the reply message
+  DBusMessage* msg = dbus_pending_call_steal_reply(pending);
+  if (NULL == msg) {
+    fprintf(stderr, "Reply Null\n"); 
+    exit(1); 
+  }
+  // free the pending message handle
+  dbus_pending_call_unref(pending);
+
+  // read the parameters
+  if (!dbus_message_iter_init(msg, &args))
+    fprintf(stderr, "Message has no arguments!\n"); 
+  else if (DBUS_TYPE_UINT32 != dbus_message_iter_get_arg_type(&args)) 
+    ret = 0; // Failed
+  else
+    dbus_message_iter_get_basic(&args, &ret);
+
+  // free reply and close connection
+  dbus_message_unref(msg);
+
+  return ret;
+}
+
+void screensaver_inhibit() {
+  initialise();
+  if (UNINHIBITED != state) return;
+
+#ifndef NDEBUG
+	printf("Inhibiting screensaver\n");
+#endif
+
+  freedesktop_cookie = inhibit_one(freedesktop_inhibit);
+        gnome_cookie = inhibit_one(gnome_inhibit);
+
+  state = INHIBITED;
+}
+
+void screensaver_uninhibit() {
+  if (INHIBITED != state) return;
+
+#ifndef NDEBUG
+	printf("Uninhibiting screensaver\n");
+#endif
+
+  if (freedesktop_cookie) {
+    DBusMessage *uninhibit = DBUS_MESSAGE("freedesktop", "UnInhibit");
+    dbus_message_append_args(uninhibit,
+			     DBUS_TYPE_UINT32, &freedesktop_cookie,
+			     DBUS_TYPE_INVALID);
+
+    if (!dbus_connection_send(connection, uninhibit, NULL)) {
+      fprintf(stderr, "Out Of Memory!\n");
+      exit(1);
+    };
+
+    // free reply and close connection
+    dbus_message_unref(uninhibit);
+  };
+
+
+  if (      gnome_cookie) {
+    DBusMessage *uninhibit = DBUS_MESSAGE("gnome", "UnInhibit");
+    dbus_message_append_args(uninhibit,
+			     DBUS_TYPE_UINT32, &      gnome_cookie,
+			     DBUS_TYPE_INVALID);
+
+    if (!dbus_connection_send(connection, uninhibit, NULL)) {
+      fprintf(stderr, "Out Of Memory!\n");
+      exit(1);
+    };
+
+    // free reply and close connection
+    dbus_message_unref(uninhibit);
+  };
+
+  state = UNINHIBITED;
+  
+}
+
+void screensaver_flip() {
+  if (INHIBITED==state)
+    screensaver_uninhibit();
+  else
+    screensaver_inhibit();
+}
 
=== added file 'src/inhibit-screensaver.h'
--- src/inhibit-screensaver.h	1970-01-01 00:00:00 +0000
+++ src/inhibit-screensaver.h	2009-06-23 12:32:38 +0000
@@ -0,0 +1,13 @@
+// These functions can be safely called at the wrong time (e.g. calling inhibit() several times in a row).  The extra calls will do nothing.
+
+// Inhibit the screensaver
+void screensaver_inhibit();
+
+// Uninhibit the screensaver
+void screensaver_uninhibit();
+
+// If the screensaver is inhibited, uninhibit the screensaver.  Else inhibit the screensaver
+void screensaver_flip();
+
+// Free data when the program terminates (automatically called during normal process termination)
+void screensaver_terminate();
 
=== added file 'src/npw-screensaver.c'
--- src/npw-screensaver.c	1970-01-01 00:00:00 +0000
+++ src/npw-screensaver.c	2009-06-23 12:32:38 +0000
@@ -0,0 +1,211 @@
+/*
+ *  npw-screensaver.c - control the screensaver based on Flash
+ *
+ *  nspluginwrapper (C) 2005-2009 Gwenole Beauchesne
+ *
+ *  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 2 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <time.h>
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+#include <stdlib.h>
+#include "inhibit-screensaver.h"
+#include <string.h>
+#ifndef NDEBUG
+#include <stdio.h>
+#endif
+#include <unistd.h>
+
+// Run for at least VALGRIND seconds, with no waiting.  Useful for testing with valgrind
+//#define VALGRIND 10
+
+// Minimum number of seconds between (dis)inhibiting the screensaver
+#define MIN_TIME 30
+
+// WM_NAME
+Atom name;
+// _NET_WM_STATE
+Atom state;
+// _NET_WM_STATE_FULLSCREEN
+Atom fullscreen;
+// _NET_CLIENT_LIST_STACKING
+Atom stacking;
+
+// Temporary variables used in many places
+
+Atom           type;
+int            format;
+unsigned long  nItems;
+unsigned long  bytesAfter;
+unsigned char *property;
+
+// Current display
+Display *display;
+// Root window of the current display
+Atom root_window;
+
+// Is this window a fullscreen npviewer window?
+int is_fullscreen_flash(Window* w)
+{
+  if (property)
+    XFree(property);
+  property = 0;
+
+  // Is this window called npviewer.bin?
+  if (Success != XGetWindowProperty(display, *w, name, 0, 3, False, XA_STRING,
+				    &type, &format, &nItems, &bytesAfter, &property)
+      || !property
+      || strcmp((char*)property, "npviewer.bin")) {
+    if (property)
+      XFree(property);
+    property = 0;
+    return 0;
+  };
+  if (property)
+    XFree(property);
+  property = 0;
+
+  // Get the number of state atoms for this window
+  if (Success != XGetWindowProperty(display, *w, state, 0, 0, False, XA_ATOM,
+				    &type, &format, &nItems, &bytesAfter, &property)
+      || !property
+      || !bytesAfter) {
+    if (property)
+      XFree(property);
+    property = 0;
+    return 0;
+  };
+  if (property)
+    XFree(property);
+  property = 0;
+
+  // Get the state atoms for this window
+  property = 0;
+  if (Success != XGetWindowProperty(display, *w, state, 0, (bytesAfter / 4), False, XA_ATOM,
+				    &type, &format, &nItems, &bytesAfter, &property)
+      || !property) {
+    if (property)
+      XFree(property);
+    property = 0;
+    return 0;
+  };
+
+  // Check whether any of the state atoms are _NET_WM_STATE_FULLSCREEN
+  if (property) {
+    Atom* states = (Atom*)property;
+    while (nItems--) {
+      if (*states++ == fullscreen) {
+	XFree(property);
+	property = 0;
+	return 1;
+      };
+    };
+
+    XFree(property);
+    property = 0;
+  };
+
+  // Fail
+  return 0;
+}
+
+// Inhibit or uninhibit the screensaver, depending on the current state of npviewer
+void inhibit(Atom* old_window)
+{
+  if(Success == XGetWindowProperty(display, root_window, stacking, 0, 0, False, XA_WINDOW,
+				   &type, &format, &nItems, &bytesAfter, &property)) {
+
+    if (property)
+      XFree(property);
+    property = 0;
+
+    if(Success == XGetWindowProperty(display, root_window, stacking, (bytesAfter / 4) - 1, sizeof(Atom), False, XA_WINDOW,
+				   &type, &format, &nItems, &bytesAfter, &property)
+       && property && *old_window != *((Atom*)property)) {
+      *old_window = *((Atom*)property);
+
+      if (is_fullscreen_flash(old_window)) {
+	screensaver_inhibit();
+      } else {
+	screensaver_uninhibit();
+      };
+    }
+
+    if (property) {
+      XFree(property);
+    };
+    property = 0;
+  }
+}
+
+// Get the value for an atom
+void get_atom(char const*const name, Atom* a)
+{
+  *a = XInternAtom(display, name, True);
+  if(*a == None) {
+#ifndef NDEBUG
+      printf("No such atom: %s\n", name);
+#endif
+      exit(1);
+    }
+}
+
+int main()
+{
+  // Start with the root window.
+  display = XOpenDisplay(0);
+
+  get_atom("WM_NAME", &name);
+  get_atom("_NET_WM_STATE", &state);
+  get_atom("_NET_WM_STATE_FULLSCREEN", &fullscreen);
+  get_atom("_NET_CLIENT_LIST_STACKING", &stacking);
+
+  root_window = XDefaultRootWindow(display);
+
+  Atom old_window = root_window;
+
+  XSelectInput(display, root_window, PropertyChangeMask);
+
+  XEvent event;
+
+  time_t prev_time = 0;
+
+#ifdef VALGRIND
+  time_t start_time = time(0);
+  while (time(0) - start_time < VALGRIND) {
+#else
+  for (;;) {
+#endif
+    XNextEvent(display, &event);
+    if (event.xproperty.atom != stacking) continue; // Window stacking has changed
+
+#ifndef VALGRIND
+    time_t time_elapsed = time(0) - prev_time;
+    if (time_elapsed < MIN_TIME) // Update at most once every 30 seconds
+      sleep(MIN_TIME - time_elapsed);
+#endif
+
+    inhibit(&old_window);
+    prev_time = time(0);
+  };
+
+#ifndef NDEBUG
+  printf("Freeing global variables\n");
+#endif
+  XCloseDisplay(display);
+  if (property)
+    XFree(property);
+}
 
=== modified file 'src/npw-viewer.sh'
--- src/npw-viewer.sh	2008-12-27 02:10:20 +0000
+++ src/npw-viewer.sh	2009-06-13 09:20:20 +0000
@@ -3,6 +3,7 @@
 #  nsplugin viewer wrapper script (C) 2005-2006 Gwenole Beauchesne
 #
 OS="`uname -s`"
+OS_LOWER="`uname -s | tr '[A-Z]' '[a-z]'`"
 ARCH="`uname -m`"
 NPW_LIBDIR="%NPW_LIBDIR%"
 
@@ -143,4 +144,9 @@
     fi
 fi
 
-exec $LOADER $NPW_VIEWER_DIR/npviewer.bin ${1+"$@"}
+$NPW_LIBDIR/$ARCH/$OS_LOWER/npsaver.bin &
+NPSAVER=$!
+
+$LOADER $NPW_VIEWER_DIR/npviewer.bin ${1+"$@"}
+
+kill $NPSAVER