Import Upstream version 1.9.5.3

ChangeLog

@@ -17,7 +17,7 @@
     
     (c) 2006-2008 Mike Lampard, Philip Lawatsch, and others
     
-    $Revision: 452 $ -  $Date: 2008-01-25 16:04:31 +1030 (Fri, 25 Jan 2008) $ $Author: mlampard $
+    $Revision: 458 $ -  $Date: 2008-01-31 15:48:40 +1030 (Thu, 31 Jan 2008) $ $Author: mlampard $
 
     This daemon listens on localhost port 15550 for client connections,
     and arbitrates LCD display.  Allows for multiple simultaneous clients.
@@ -166,3 +166,10 @@ allow clients use of all 'L' keys.
 1.9.5.2:
 - BugFix: IS_USER_SELECTED client command was broken. fix it.
 - BugFix: restore client ability to change backlight state.
+1.9.5.3:
+- BugFix: plugins/g15daemon_net.c: ensure that OOB traffic is not mixed with
+          normal image buffers.
+- Feature: Add --set-backlight to allow clients (and the backlight button)
+	to set the backlight level for the currently shown screen only.  Default is
+	now to disallow clients changing backlight, and to set backlight globally
+	via the button.

Makefile.in

@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -472,8 +472,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -498,8 +498,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -509,13 +509,12 @@ ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -589,6 +588,10 @@ dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
+
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
@@ -615,6 +618,8 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
@@ -773,21 +778,21 @@ uninstall-man: uninstall-man1 uninstall-man3
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-am clean clean-generic \
 	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
-	distclean distclean-generic distclean-hdr distclean-libtool \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-hook install-docDATA \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-imageDATA install-info \
-	install-info-am install-man install-man1 install-man3 \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-docDATA uninstall-imageDATA uninstall-man \
-	uninstall-man1 uninstall-man3
+	dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \
+	distcheck distclean distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-data-hook install-docDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-imageDATA install-info install-info-am install-man \
+	install-man1 install-man3 install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-docDATA uninstall-imageDATA \
+	uninstall-man uninstall-man1 uninstall-man3
 
 
 install-data-hook:

aclocal.m4

@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,10 +11,13 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf.  If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
@@ -6602,7 +6605,7 @@ AC_SUBST([SED])
 AC_MSG_RESULT([$SED])
 ])
 
-# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -6617,7 +6620,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.10'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.10.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -6633,8 +6636,10 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -6906,7 +6911,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
   # each Makefile.in and add a new line on top of each file to say so.
   # Grep'ing the whole file is not good either: AIX grep has a line
   # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -6954,13 +6959,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 12
+# serial 13
 
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
@@ -7065,16 +7070,17 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
 # our stamp files there.
 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
 [# Compute $1's index in $config_headers.
+_am_arg=$1
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $1 | $1:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
@@ -7346,7 +7352,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
 # This macro is traced by Automake.
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for g15daemon 1.9.5.2.
+# Generated by GNU Autoconf 2.61 for g15daemon 1.9.5.3.
 #
 # Report bugs to <mlampard@users.sf.net>.
 #
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='g15daemon'
 PACKAGE_TARNAME='g15daemon'
-PACKAGE_VERSION='1.9.5.2'
-PACKAGE_STRING='g15daemon 1.9.5.2'
+PACKAGE_VERSION='1.9.5.3'
+PACKAGE_STRING='g15daemon 1.9.5.3'
 PACKAGE_BUGREPORT='mlampard@users.sf.net'
 
 ac_default_prefix=/usr
@@ -1401,7 +1401,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures g15daemon 1.9.5.2 to adapt to many kinds of systems.
+\`configure' configures g15daemon 1.9.5.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1472,7 +1472,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of g15daemon 1.9.5.2:";;
+     short | recursive ) echo "Configuration of g15daemon 1.9.5.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1575,7 +1575,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-g15daemon configure 1.9.5.2
+g15daemon configure 1.9.5.3
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1589,7 +1589,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by g15daemon $as_me 1.9.5.2, which was
+It was created by g15daemon $as_me 1.9.5.3, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2407,7 +2407,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='g15daemon'
- VERSION='1.9.5.2'
+ VERSION='1.9.5.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -22399,7 +22399,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by g15daemon $as_me 1.9.5.2, which was
+This file was extended by g15daemon $as_me 1.9.5.3, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22452,7 +22452,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-g15daemon config.status 1.9.5.2
+g15daemon config.status 1.9.5.3
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -23192,21 +23192,22 @@ echo "$as_me: $ac_file is unchanged" >&6;}
   fi
   rm -f "$tmp/out12"
 # Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $ac_file | $ac_file:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -23243,7 +23244,7 @@ echo "$as_me: executing $ac_file commands" >&6;}
   # each Makefile.in and add a new line on top of each file to say so.
   # Grep'ing the whole file is not good either: AIX grep has a line
   # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \

configure.in

@@ -1,10 +1,10 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
-# $Revision: 450 $ -  $Date: 2008-01-24 19:59:54 +1030 (Thu, 24 Jan 2008) $ $Author: mlampard $
+# $Revision: 458 $ -  $Date: 2008-01-31 15:48:40 +1030 (Thu, 31 Jan 2008) $ $Author: mlampard $
 
 
 AC_PREREQ(2.59)
-AC_INIT(g15daemon, [1.9.5.2], [mlampard@users.sf.net])
+AC_INIT(g15daemon, [1.9.5.3], [mlampard@users.sf.net])
 AC_PREFIX_DEFAULT(/usr)
 AC_CONFIG_AUX_DIR(config)
 AC_CANONICAL_HOST()

debian/README.Debian

@@ -1,35 +1,6 @@
 g15daemon for Debian
 --------------------
 
+<possible notes regarding this package - if none, delete this file>
 
-Debian 'xkeyboard-config' package already have support for g15
-keyboards, so you don't need to exec 'xmodmap' as described on
-original documentations.  Anywaym you should configure your
-xorg.conf file, so that xorg will understand the extra keys.
-
-To have the full support of the extra keys, you should edit the
-xorg configuration file /etc/X11/xorg.conf .  The 'XkbModel' should
-be "logitech_g15".
-
-I.e. on my machine:
-
-Section "InputDevice"
-        Identifier      "Generic Keyboard"
-        Driver          "kbd"
-        Option          "CoreKeyboard"
-        Option          "XkbRules"      "xorg"
-        Option          "XkbModel"      "logitech_g15"
-        Option          "XkbLayout"     "us"
-EndSection
-
-
-Also in KDE and gnome you should set the g15daemon keyboard.
-In KDE you find the configuration in:
-  Control Center
-    Regional & Accessibility
-      Keyboard Layout
-        On the right at the top "Keyboard model" select:
-        "Logitech G15 extra keys via G15daemon"
-
-
- -- Giacomo Catenazzi <cate@debian.org>  Mon, 30 Aug 2007 08:04:22 +0200
+ -- Anthony J. Mirabella <mirabeaj@gmail.com>, Thu, 28 Sep 2006 04:46:06 -0400

debian/changelog

@@ -1,67 +1,108 @@
-g15daemon (1.9.5.2-1) unstable; urgency=low
+g15daemon 1.9.5.3 edgy; urgency=low
+ * BugFix: plugins/g15daemon_net.c: ensure that OOB traffic is not mixed with
+           normal image buffers.
+ * Feature: Add --set-backlight to allow clients (and the backlight button)
+           to set the backlight level for the currently shown screen only. 
+ 	   Default is now to disallow clients changing backlight, and to set 
+	   backlight globally via the button.
 
-  * New upstream version
-  * Change default behaviour: to switch client use MR (as already documented
-    in /etc/default/g15daemon, but wrongly implemented)
+ -- Mike Lampard <mlampard@users.sourceforge.net> Thu, 31 Jan 2008 15:47:06 +1030
 
- -- Giacomo Catenazzi <cate@debian.org>  Mon, 28 Jan 2008 09:12:16 +0100
+g15daemon 1.9.5.2 edgy; urgency=high
+  * BugFix: IS_USER_SELECTED client command was broken. fix it.
+  * BugFix: restore client ability to change backlight state.
 
-g15daemon (1.9.1.0.svn346-1) unstable; urgency=low
+ -- Mike Lampard <mlampard@users.sourceforge.net> Sat, 26 Jan 2008 11:36:04 +1030
 
-  * New upstream version (from svn)
+g15daemon 1.9.5.1 edgy; urgency=high
+  * BugFix: If lcd refresh is requested whilst processing, refreshes were missed.
+  * Optimisation: The delay between screen updates is no longer required. remove.
 
- -- Giacomo Catenazzi <cate@debian.org>  Tue, 18 Dec 2007 09:15:42 +0100
+g15daemon 1.9.5 edgy; urgency=low
+  * Add example udev helper scripts to contrib directory.
+  * API:     Add NEVER_SELECT cmd to client API to enforce non-display on
+	     client-switch.  Used by G15Macro if available.
+  * Debug:   Add segfault handler to libg15daemon_client to aid debugging
+	     clients.
+  * Feature: Add screendump ability.  Pressing M1+M3 simultaneously will write
+	     a pbm format image of the currently displayed screen to 
+	     /tmp/g15daemon-sc-?.pbm, where ? is an incremental number.
+  * BugFix:  Only wakeup display thread if LCD buffer is visible.
+  * Packaging: Fix debian packaging to include plugins.
 
-g15daemon (1.9.0-wip.20070910-5) unstable; urgency=low
+g15daemon 1.9.4 edgy; urgency=low
+  * Debug:   Log warning if keyboard disappears.
+  * Bugfix:  Fix autoconf autodetect bugs re uinput plugin.
+  * Feature: If autodetection of uinput fails, configure now has a
+             --disable-uinput override.  
+  * Feature: WIP should now compile and run on Linux, MacOSX, and Solaris (v10+).
+  	     Only Linux and Solaris have been tested.
+  * Debug:   Add more debugging to plugin loader.
+  * Debug:   Log build date,OS and GCC version.
+  * Feature: Plugin loader will now use DEEP_BIND if available, hopefully
+             resolving conflicts on OS's that support it.
+  * Feature: Solaris support.  Requires some end-user changes to the usb
+	     stack at the moment.  Documentation coming soon.
+  * BugFix:  Plugin loader is now much more robust.
+  * Feature: Add OS specific documentation for Linux and FreeBSD.
+	     Compilation and use on FreeBSD is completely untested.
+  * Feature: Debug verbosity of g15daemon_log is now variable.
+  * Feature: Plugin filenames are now cached in g15daemon.conf to allow
+	     (manual, at this stage) changing of load-order.
+  * Portability: Add our own daemon() function if platform doesn't have native
+	     support.
+  * TidyUp:  Wrap keyboard read function.
+  * TidyUp:  Make all plugin-internal functions static.
+  * Portability: Remove mutexes on Solaris, as libusb (and therefore libg15)
+	     blocks on read.
+  * Optimisation: Use pthread conditional variable to signal LCD state change.
+	     Further reduces unnecessary wakeups.
 
-  * change priority to "extra"
-  * force libg15render-dev versioned dependencies
+g15daemon 1.9.3 edgy; urgency=low
+  * BugFix: The documentation for --switch was inverted. Fix.
+  * Debug:  Print list of commandline args when in debug mode
+  * BugFix: The decreased delay caused keypresses to be misread on some
+            machines.  REVERT.
 
- -- Giacomo Catenazzi <cate@debian.org>  Tue, 09 Oct 2007 13:28:56 +0200
+g15daemon 1.9.2 edgy; urgency=low
+  * BugFix: Add exitfunc to net plugin for exit notification.
+  * BugFix: Use pause() instead of sleeping
+  * BugFix: create leaving var as volatile.
+  * BugFix: Add NAME section to g15daemon_client manpages
+  * Tweak delay between successive keyboard reads.  This reduces cpu load by
+    50% on my system.
+  * Bugfix: Ensure that all plugin exit functions are called on leaving.
+  * Bugfix: if keypress event is received (very early in the startup process,
+            the daemon would crash.  Check that expected pointers are valid.
+  * Bugfix: Dont attempt compilation of uinput plugin if headers are
+            unavailable.
+  * Bugfix: Write a blank buffer to the LCD before exiting.
+  * Feature: Add --lcdlevel cmdline option to allow setting default LCD brightness level
 
-g15daemon (1.9.0-wip.20070910-4) unstable; urgency=low
+g15daemon 1.9.1 edgy; urgency=low
+  * BugFix: Plugins are now installed in ${PREFIX}/{${LIBDIR}/g15daemon/${VERSION}/plugins
+  * Feature: OS-X support thanks to Fabrizio Sestito.
+  * Bugfix: libg15daemon_client: keypresses were being corrupted.
+  * Bugfix: libg15daemon_client: use g15_recv rather than recv.
+  * Bugfix: use default scheduling for all threads.
+  * Optimisation: minor optimisation of lcd_cycle() code.
+  * Security: repair some potential security holes.
+  * Bugfix: Backlight status was being mis-applied when cycling screens.
+  * Bugfix: Language bindings were not being distributed.
 
-  * Correct building errors (closes: #441919, #442995)
+g15daemon 1.9.0 edgy; urgency=low
+  * Feature: Add plugin API
+  * Feature: partially rewritten event core 
+  * Feature: updated g15daemon_xmms_spectrum plugin with new features, available in trunk/g15daemon_audio_plugins (SVN)
+  * Feature: Clock is now a plugin
+  * Feature: dependency on libdaemon is now removed
+  * Feature: g15daemon is now dependant on libg15render.
+  * Feature: Clock now includes analog clock thanks to Rasta Freak <igor.jusic@zg.t-com.hr>
+  * Moved g15daemon_xmms_spectrum plugin to separate package
  
- -- Giacomo Catenazzi <cate@debian.org>  Tue, 18 Sep 2007 20:29:54 +0200
-
-g15daemon (1.9.0-wip.20070910-3) unstable; urgency=low
-
-  * first try to make a debian/rules full working for
-    svn and released version
-  * fix directory fixes (closes: #442296)
-  
- -- Giacomo Catenazzi <cate@debian.org>  Fri, 14 Sep 2007 20:59:27 +0200
-
-g15daemon (1.9.0-wip.20070910-2) unstable; urgency=low
-
-  * pause() instead of busy loop.
-
- -- Giacomo Catenazzi <cate@debian.org>  Tue, 11 Sep 2007 06:12:01 +0200
-
-g15daemon (1.9.0-wip.20070910-1) unstable; urgency=low
-
-  * New upstream release (from svn)
-  * Don't install plugin in /usr/share (Closes: #441619)
-
- -- Giacomo Catenazzi <cate@debian.org>  Mon, 10 Sep 2007 23:02:14 +0200
-
-g15daemon (1.9.0-2) unstable; urgency=low
-
-  * Updates: better init.d scripts (with support for L1 key)
-  * install also the sample plugin (clock, net, uinput)
-
- -- Giacomo Catenazzi <cate@debian.org>  Thu, 30 Aug 2007 23:31:18 +0200
-
-g15daemon (1.9.0-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Giacomo Catenazzi <cate@debian.org>  Tue, 28 Aug 2007 20:09:54 +0200
-
-g15daemon (1.2.7-1) unstable; urgency=low
+g15daemon (1.2.1-1) breezy; urgency=low
 
   * Initial release 
 
- -- Giacomo Catenazzi <cate@debian.org>  Mon, 27 Aug 2007 20:00:20 +0200
+ -- Anthony J. Mirabella <mirabeaj@gmail.com>  Thu, 28 Sep 2006 04:46:06 -0400
 

debian/compat

@@ -1 +1 @@
-5
+4

debian/control

@@ -1,35 +1,28 @@
 Source: g15daemon
 Section: utils
-Priority: extra
-Maintainer: Giacomo Catenazzi <cate@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, automake1.9, libtool,
- libg15-dev, libg15render-dev (>=1.2.0.svn250-2), libusb-dev, libfreetype6-dev
-Standards-Version: 3.7.3
-Homepage: http://www.g15tools.com/
+Priority: optional
+Maintainer: Anthony J. Mirabella <mirabeaj@gmail.com>
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, libg15-dev, libg15render-dev
+Standards-Version: 3.6.2
 
 Package: g15daemon
-Section: utils
 Architecture: any
-Depends: ${shlibs:Depends}, libg15daemon-client1 (=${binary:Version})
-Recommends: xkeyboard-config ( >= 0.9+cvs.20070428-1)
-Description:  Screen multiplexer for Logitech G15 Keyboard
+Depends: ${shlibs:Depends}, ${misc:Depends}, libg15daemon-client (= ${Source-Version})
+Description: Screen multiplexer for Logitech G15 Keyboard
  G15daemon provides multiple virtual screens for the LCD on the Logitech
- G11 and G15 keyboards.
- .
- This package contain the daemon and a generic client to talk to the
- daemon.
+ G15 Keyboard
 
-Package: libg15daemon-client1
+Package: libg15daemon-client
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: Development packages for libg15daemon-client
- Includes the files needed for developing g15daemon clients
+Description: Client library for communicating with g15daemon
+ Provides interface functions for clients that wish to communicate with
+ a running instance of g15daemon
 
 Package: libg15daemon-client-dev
 Section: libdevel
 Architecture: any
-Depends: libg15daemon-client1 (= ${binary:Version})
+Depends: libg15daemon-client (= ${Source-Version})
 Description: Development packages for libg15daemon-client
  Includes the files needed for developing g15daemon clients
-

debian/copyright

@@ -1,28 +1,10 @@
-This package was debianized by Giacomo A. Catenazzi <cate@debian.org> on
-Mon, 27 Aug 2007 20:00:20 +0200.
+This package was debianized by Anthony J. Mirabella <mirabeaj@gmail.com> on
+Thu, 28 Sep 2006 04:46:06 -0400.
 
-It was downloaded from http://g15daemon.sourceforge.net/
+It was downloaded from <fill in ftp site>
 
-Upstream Authors: 
-
-    Mike Lampard <mlampard@users.sf.net>
-    Sven Ludwig
-    James Green
-    Philip Lawatsch <philip@lawatsch.at>
-
-Copyright:
-
-    Copyright (c) 2006 Mike Lampard, Philip Lawatsch, and others
+Copyright Holder: <put author(s) name and email here>
 
 License:
 
-    g15tools 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.
-
-License can be found in the file `/usr/share/common-licenses/GPL-2'.
-
-The Debian packaging is (C) 2007, Giacomo Catenazzi <cate@debian.org> and
-is licensed under the GPL v2 (or later), see `/usr/share/common-licenses/GPL-2'.
-
+<Put the license of the package here>

debian/docs

@@ -1,4 +1,3 @@
-FAQ
 NEWS
 README
 TODO

debian/g15daemon.default

@@ -1,12 +0,0 @@
-# Defaults for g15daemon initscript
-
-# SWITCH_KEY selects  the key used to switch between client screens
-#
-# SWITCH_KEY="MR"   to use the MR key (on top left)
-# SWITCH_KEY="L1    to use the L1 key: the small round key below the LCD
-
-
-SWITCH_KEY="MR"
-
-# Additional options that are passed to the Daemon.
-DAEMON_OPTS=""

debian/g15daemon.init

@@ -1,89 +0,0 @@
-#! /bin/sh
-
-### BEGIN INIT INFO
-# Provides:          g15daemon
-# Required-Start:    $local_fs
-# Required-Stop:     $local_fs
-# Should-Start:      $remote_fs
-# Should-Stop:       $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: load deamon for Logitech G15 keyboard lcd display
-# Description:       load deamon for Logitech G15 keyboard lcd display
-### END INIT INFO
-
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/g15daemon
-NAME=g15daemon
-DESC=g15daemon
-
-test -x $DAEMON || exit 0
-
-# Include g15daemon defaults if available
-if [ -f /etc/default/g15daemon ] ; then
-	. /etc/default/g15daemon
-fi
-
-if [ "$SWITCH_KEY" = "MR" ]; then
-	DAEMON_OPTS="-s $DAEMON_OPTS"
-fi
-
-set -e
-
-case "$1" in
-  start)
-	echo -n "Starting $DESC: "
-	start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
-		--exec $DAEMON -- $DAEMON_OPTS
-	echo "$NAME."
-	;;
-  stop)
-	echo -n "Stopping $DESC: "
-	$DAEMON -k
-	start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
-		--exec $DAEMON
-	echo "$NAME."
-	;;
-  #reload)
-	#
-	#	If the daemon can reload its config files on the fly
-	#	for example by sending it SIGHUP, do it here.
-	#
-	#	If the daemon responds to changes in its config file
-	#	directly anyway, make this a do-nothing entry.
-	#
-	# echo "Reloading $DESC configuration files."
-	# start-stop-daemon --stop --signal 1 --quiet --pidfile \
-	#	/var/run/$NAME.pid --exec $DAEMON
-  #;;
-  force-reload)
-	#
-	#	If the "reload" option is implemented, move the "force-reload"
-	#	option to the "reload" entry above. If not, "force-reload" is
-	#	just the same as "restart" except that it does nothing if the
-	#   daemon isn't already running.
-	# check wether $DAEMON is running. If so, restart
-	start-stop-daemon --stop --test --quiet --pidfile \
-		/var/run/$NAME.pid --exec $DAEMON \
-	&& $0 restart \
-	|| exit 0
-	;;
-  restart)
-    echo -n "Restarting $DESC: "
-	start-stop-daemon --stop --quiet --pidfile \
-		/var/run/$NAME.pid --exec $DAEMON
-	sleep 1
-	start-stop-daemon --start --quiet --pidfile \
-		/var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
-	echo "$NAME."
-	;;
-  *)
-	N=/etc/init.d/$NAME
-	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
-	echo "Usage: $N {start|stop|restart|force-reload}" >&2
-	exit 1
-	;;
-esac
-
-exit 0

debian/g15daemon.install

@@ -1,4 +1,3 @@
-debian/tmp/usr/sbin/g15daemon usr/sbin
-debian/tmp/usr/lib/g15daemon/1.9.5.2/plugins/*.so	usr/lib/g15daemon/1.9.5.2/plugins/
-debian/tmp/usr/share/g15daemon/splash/g15logo2.wbmp	usr/share/g15daemon/splash/
-
+usr/sbin/*
+usr/lib/g15daemon/*/plugins/*
+usr/share/doc/g15daemon*/*

debian/g15daemon.manpages

@@ -1 +0,0 @@
-Documentation/g15daemon.1

debian/libg15daemon-client-dev.install

@@ -1,5 +1,6 @@
-debian/tmp/usr/include/* usr/include/
-debian/tmp/usr/lib/lib*.a usr/lib/
-debian/tmp/usr/lib/lib*.so usr/lib/
-debian/tmp/usr/lib/*.la usr/lib/
-
+usr/include/*
+usr/lib/lib*.a
+usr/lib/lib*.so
+usr/lib/pkgconfig/*
+usr/lib/*.la
+usr/share/pkgconfig/*

debian/libg15daemon-client1.install

@@ -1 +0,0 @@
-debian/tmp/usr/lib/lib*.so.* usr/lib/

debian/libg15daemon-client1.manpages

@@ -1 +0,0 @@
-Documentation/g15daemon_client_devel.3

debian/rules

@@ -1,28 +1,107 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# for SVN versions
-AUTOMAKE_REMOVE := Makefile Makefile.in */Makefile */Makefile.in configure aclocal.m4
-AUTOMAKE_REMOVE += *.lo *.o *.la */*.lo */*.o */*.la
-AUTOMAKE_REMOVE += g15daemon/g15daemon g15daemon/g15daemontest
-AUTOMAKE_REMOVE += config.status config.log config.h config.h.in config/* libtool stamp-h1
-AUTOMAKE_REMOVE += */.libs/
-
-#clean::
-#	-rm -Rf $(AUTOMAKE_REMOVE)
-
-#makebuilddir:: Makefile
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
 
-#Makefile:: Makefile.am autogen.sh
-#	[ -d config ] || mkdir config
-#	aclocal -I config
-#	libtoolize --automake --force --copy
-#	autoheader
-#	automake --add-missing --copy
-#	autoconf
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS = --quiet
+CFLAGS = -Wall -g
 
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+config.status: configure
+	dh_testdir
+	# Add here commands to configure the package.
+	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+
+
+build: build-stamp
+
+build-stamp:  config.status
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE)
+	#docbook-to-man debian/g15daemon.sgml > g15daemon.1
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
+
+	# Add here commands to clean up after the build process.
+	-$(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	# Add here commands to install the package into debian/g15daemon.
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+	dh_installexamples
+	dh_install -a --sourcedir=debian/tmp
+#	dh_installmenu
+#	dh_installdebconf	
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman Documentation/g15daemon.1  Documentation/g15daemon_client_devel.3
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_python
+#	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 

debian/watch

@@ -1,7 +0,0 @@
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
-version=3
-
-http://sf.net/g15daemon/g15daemon-([1-9].*)\.tar\.bz2
-

g15daemon/Makefile.in

@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -60,7 +60,7 @@ am_g15daemontest_OBJECTS = lcdclient_test.$(OBJEXT)
 g15daemontest_OBJECTS = $(am_g15daemontest_OBJECTS)
 g15daemontest_DEPENDENCIES =  \
 	$(top_builddir)/libg15daemon_client/libg15daemon_client.la
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -256,8 +256,8 @@ install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	     || test -f $$p1 \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
@@ -343,8 +343,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -356,8 +356,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -367,13 +367,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

g15daemon/main.c

@@ -17,7 +17,7 @@
     
     (c) 2006-2008 Mike Lampard, Philip Lawatsch, and others
     
-    $Revision: 452 $ -  $Date: 2008-01-25 16:04:31 +1030 (Fri, 25 Jan 2008) $ $Author: mlampard $
+    $Revision: 457 $ -  $Date: 2008-01-31 15:32:46 +1030 (Thu, 31 Jan 2008) $ $Author: mlampard $
     
     This daemon listens on localhost port 15550 for client connections,
     and arbitrates LCD display.  Allows for multiple simultaneous clients.
@@ -54,6 +54,7 @@ int keyboard_backlight_off_onexit = 0;
 unsigned int g15daemon_debug = 0;
 unsigned int cycle_key;
 unsigned int client_handles_keys = 0;
+static unsigned int set_backlight = 0;
 struct lcd_t *keyhandler = NULL;
 
 static int loaded_plugins = 0;
@@ -88,7 +89,7 @@ int g15daemon_send_event(void *caller, unsigned int event, unsigned long value)
                                               g15daemon_log(LOG_WARNING,"Error in send: %s\n",strerror(errno));
                 }
                 if(value & G15_KEY_LIGHT){ // the backlight key was pressed - maintain user-selected state 
-                  lcd_t *displaying = lcd->masterlist->tail->lcd;  
+                  lcd_t *displaying = lcd->masterlist->current->lcd;  
                   lcd->masterlist->kb_backlight_state++;
                   lcd->masterlist->kb_backlight_state %= 3;
                   displaying->backlight_state++;  
@@ -246,10 +247,13 @@ static void *lcd_draw_thread(void *lcdlist){
         uf_write_buf_to_g15(displaying);
         g15daemon_log(LOG_DEBUG,"LCD Update Complete");
         
-        if(prev_state!=displaying->backlight_state) {
+        if(prev_state!=displaying->backlight_state && set_backlight!=0) {
               prev_state=displaying->backlight_state;
               pthread_mutex_lock(&g15lib_mutex);
               setLCDBrightness(displaying->backlight_state);
+              usleep(5);
+              setLCDBrightness(displaying->backlight_state);
+              setKBBrightness(displaying->backlight_state);
               pthread_mutex_unlock(&g15lib_mutex);
         }
 
@@ -359,13 +363,14 @@ int main (int argc, char *argv[])
         
         if (!strncmp(daemonargs, "-h",2) || !strncmp(daemonargs, "--help",6)) {
             printf("G15Daemon version %s - %s\n",VERSION,uf_return_running() >= 0 ?"Loaded & Running":"Not Running");
-            printf("%s -h (--help) or -k (--kill) or -s (--switch) or -d (--debug) [level] or -v (--version) or -l (--lcdlevel) [0-2] \n\n -k will kill a previous incarnation",argv[0]);
+            printf("%s -h (--help) or -k (--kill) or -s (--switch) or -d (--debug) [level] or -v (--version) or -l (--lcdlevel) [0-2] \n\n -k\twill kill a previous incarnation",argv[0]);
             #ifdef LIBG15_VERSION
             #if LIBG15_VERSION >= 1200
-            printf(", if uppercase -K or -KILL turn off the keyboard backlight on the way out.");
+            printf("\n -K\tturn off the keyboard backlight on the way out.");
             #endif
             #endif
-            printf("\n -h shows this help\n -s changes the screen-switch key from L1 to MR (beware)\n -d debug mode - stay in foreground and output all debug messages to STDERR\n -v show version\n -l set default LCD backlight level\n");
+            printf("\n -h\tshows this help\n -s\tchanges the screen-switch key from L1 to MR (beware)\n -d\tdebug mode - stay in foreground and output all debug messages to STDERR\n -v\tshow version\n -l\tset default LCD backlight level\n");
+            printf(" --set-backlight sets backlight individually for currently shown screen.\n\t\tDefault is to set backlight globally (keyboard default).\n");
             exit(0);
         }
 
@@ -374,6 +379,10 @@ int main (int argc, char *argv[])
             cycle_cmdline_override=1;
         }
 
+        if (!strncmp(daemonargs, "--set-backlight",15)) {
+            set_backlight = 1;
+        }
+
         if (!strncmp(daemonargs, "-d",2) || !strncmp(daemonargs, "--debug",7)) {
             g15daemon_debug = 1;
             if((argv[i+1])!=NULL)

libg15daemon_client/Makefile.in

@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -59,7 +59,7 @@ libg15daemon_client_la_OBJECTS = $(am_libg15daemon_client_la_OBJECTS)
 libg15daemon_client_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(libg15daemon_client_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -234,8 +234,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -243,8 +243,8 @@ uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -315,8 +315,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -328,8 +328,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -339,13 +339,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

plugins/Makefile.in

@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -73,7 +73,7 @@ g15plugin_uinput_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(g15plugin_uinput_la_LDFLAGS) $(LDFLAGS) -o $@
 @UINPUT_INTERFACE_PLUGIN_TRUE@am_g15plugin_uinput_la_rpath = -rpath \
 @UINPUT_INTERFACE_PLUGIN_TRUE@	$(libdir)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -256,8 +256,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 	  else :; fi; \
 	done
 
@@ -265,8 +265,8 @@ uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -326,8 +326,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -339,8 +339,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -350,13 +350,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

plugins/g15_plugin_net.c

@@ -17,7 +17,7 @@
 
     (c) 2006-2008 Mike Lampard, Philip Lawatsch, and others
     
-    $Revision: 451 $ -  $Date: 2008-01-25 15:15:04 +1030 (Fri, 25 Jan 2008) $ $Author: mlampard $
+    $Revision: 456 $ -  $Date: 2008-01-28 16:35:31 +1030 (Mon, 28 Jan 2008) $ $Author: mlampard $
         
     This daemon listens on localhost port 15550 for client connections,
     and arbitrates LCD display.  Allows for multiple simultaneous clients.
@@ -219,7 +219,7 @@ static int g15_recv(lcdnode_t *lcdnode, int sock, char *buf, unsigned int len)
                 }
            	process_client_cmds(lcdnode, sock, msgbuf,len);
             }
-            else if(pfd[0].revents & POLLIN && !(pfd[0].revents & POLLERR || pfd[0].revents & POLLHUP || pfd[0].revents & POLLNVAL)) {
+            else if(pfd[0].revents & POLLIN && !(pfd[0].revents & POLLERR || pfd[0].revents & POLLHUP || pfd[0].revents & POLLNVAL || pfd[0].revents & POLLPRI)) {
 
                 retval = recv(sock, buf+total, bytesleft, 0);
                 if (retval < 1) { 

rpm/g15daemon.spec

@@ -3,11 +3,11 @@
 %define prefix	/usr
 Summary: Daemon to control logitech G15 keyboards
 Name: g15daemon
-Version: 1.9.5.2
+Version: 1.9.5.3
 Release: 1
 Copyright: GPL
 Group: Applications/System
-Source: ftp://prdownloads.sf.net/g15daemon-1.9.5.2.tar.bz2
+Source: ftp://prdownloads.sf.net/g15daemon-1.9.5.3.tar.bz2
 URL: http://g15daemon.sf.net
 Distribution: Linux
 Vendor: NONE