Thread: [G15daemon-commits] SF.net SVN: g15daemon: [447] trunk/g15daemon-wip (Page 3)

Brought to you by: aneurysm9, mlampard

g15daemon-commits

[G15daemon-commits] SF.net SVN: g15daemon: [447] trunk/g15daemon-wip

From: <mla...@us...> - 2008-01-23 11:05:26

Revision: 447
          http://g15daemon.svn.sourceforge.net/g15daemon/?rev=447&view=rev
Author:   mlampard
Date:     2008-01-23 03:05:31 -0800 (Wed, 23 Jan 2008)

Log Message:
-----------
g15daemon 1.9x: prepare for release 1.9.5

Modified Paths:
--------------
    trunk/g15daemon-wip/ChangeLog
    trunk/g15daemon-wip/configure.in
    trunk/g15daemon-wip/debian/changelog
    trunk/g15daemon-wip/rpm/g15daemon.spec

Modified: trunk/g15daemon-wip/ChangeLog
===================================================================
--- trunk/g15daemon-wip/ChangeLog	2008-01-23 11:00:13 UTC (rev 446)
+++ trunk/g15daemon-wip/ChangeLog	2008-01-23 11:05:31 UTC (rev 447)
@@ -149,7 +149,7 @@
 	   blocks on read.
 - Optimisation: Use pthread conditional variable to signal LCD state change.
 	   Further reduces unnecessary wakeups.
-1.9.4->SVN
+1.9.5
 - 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.
@@ -159,3 +159,4 @@
 	  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.

Modified: trunk/g15daemon-wip/configure.in
===================================================================
--- trunk/g15daemon-wip/configure.in	2008-01-23 11:00:13 UTC (rev 446)
+++ trunk/g15daemon-wip/configure.in	2008-01-23 11:05:31 UTC (rev 447)
@@ -4,7 +4,7 @@
 
 
 AC_PREREQ(2.59)
-AC_INIT(g15daemon, [1.9.4], [mla...@us...])
+AC_INIT(g15daemon, [1.9.5], [mla...@us...])
 AC_PREFIX_DEFAULT(/usr)
 AC_CONFIG_AUX_DIR(config)
 AC_CANONICAL_HOST()

Modified: trunk/g15daemon-wip/debian/changelog
===================================================================
--- trunk/g15daemon-wip/debian/changelog	2008-01-23 11:00:13 UTC (rev 446)
+++ trunk/g15daemon-wip/debian/changelog	2008-01-23 11:05:31 UTC (rev 447)
@@ -1,3 +1,15 @@
+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.4 edgy; urgency=low
   * Debug:   Log warning if keyboard disappears.
   * Bugfix:  Fix autoconf autodetect bugs re uinput plugin.

Modified: trunk/g15daemon-wip/rpm/g15daemon.spec
===================================================================
--- trunk/g15daemon-wip/rpm/g15daemon.spec	2008-01-23 11:00:13 UTC (rev 446)
+++ trunk/g15daemon-wip/rpm/g15daemon.spec	2008-01-23 11:05:31 UTC (rev 447)
@@ -3,11 +3,11 @@
 %define prefix	/usr
 Summary: Daemon to control logitech G15 keyboards
 Name: g15daemon
-Version: 1.9.4
+Version: 1.9.5
 Release: 1
 Copyright: GPL
 Group: Applications/System
-Source: ftp://prdownloads.sf.net/g15daemon-1.9.4.tar.bz2
+Source: ftp://prdownloads.sf.net/g15daemon-1.9.5.tar.bz2
 URL: http://g15daemon.sf.net
 Distribution: Linux
 Vendor: NONE


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[G15daemon-commits] SF.net SVN: g15daemon: [449] trunk/g15daemon-wip

From: <mla...@us...> - 2008-01-24 07:12:27

Revision: 449
          http://g15daemon.svn.sourceforge.net/g15daemon/?rev=449&view=rev
Author:   mlampard
Date:     2008-01-23 23:12:07 -0800 (Wed, 23 Jan 2008)

Log Message:
-----------
g15daemon 1.9x: work around bug exposed by g15composer - occasionally screens were not being updated.

Modified Paths:
--------------
    trunk/g15daemon-wip/ChangeLog
    trunk/g15daemon-wip/g15daemon/main.c
    trunk/g15daemon-wip/g15daemon/utility_funcs.c

Modified: trunk/g15daemon-wip/ChangeLog
===================================================================
--- trunk/g15daemon-wip/ChangeLog	2008-01-24 04:01:44 UTC (rev 448)
+++ trunk/g15daemon-wip/ChangeLog	2008-01-24 07:12:07 UTC (rev 449)
@@ -160,3 +160,6 @@
 	  /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.
+SVN: (1.9.6)
+- BugFix: If lcd refresh is requested whilst processing, refreshes were missed.
+- Optimisation: The delay between screen updates is no longer required. remove.

Modified: trunk/g15daemon-wip/g15daemon/main.c
===================================================================
--- trunk/g15daemon-wip/g15daemon/main.c	2008-01-24 04:01:44 UTC (rev 448)
+++ trunk/g15daemon-wip/g15daemon/main.c	2008-01-24 07:12:07 UTC (rev 449)
@@ -223,10 +223,8 @@
 static void *lcd_draw_thread(void *lcdlist){
 
     g15daemon_t *masterlist = (g15daemon_t*)(lcdlist);
-    static unsigned int lastscreentime;
     /* unsigned int fps = 0; */
     lcd_t *displaying = masterlist->tail->lcd;
-    char *lastdisplayed=NULL;
     memset(displaying->buf,0,1024);
     
     g15daemon_sleep(2);
@@ -244,13 +242,9 @@
         /* if the current screen is less than 20ms from the previous (equivelant to 50fps) delay it */
         /* this allows a real-world fps of 40fps with no almost frame loss and reduces peak usb bus-load */
                         
-        if((g15daemon_gettime_ms() - lastscreentime)>=20||(char*)displaying!=lastdisplayed){  
-            g15daemon_log(LOG_DEBUG,"Updating LCD");        
-            uf_write_buf_to_g15(displaying);
-            lastscreentime = g15daemon_gettime_ms();
-            lastdisplayed = (char*)displaying;
-            g15daemon_log(LOG_DEBUG,"LCD Update Complete");
-        }
+        g15daemon_log(LOG_DEBUG,"Updating LCD");        
+        uf_write_buf_to_g15(displaying);
+        g15daemon_log(LOG_DEBUG,"LCD Update Complete");
         
         if(displaying->state_changed){
             pthread_mutex_lock(&g15lib_mutex);

Modified: trunk/g15daemon-wip/g15daemon/utility_funcs.c
===================================================================
--- trunk/g15daemon-wip/g15daemon/utility_funcs.c	2008-01-24 04:01:44 UTC (rev 448)
+++ trunk/g15daemon-wip/g15daemon/utility_funcs.c	2008-01-24 07:12:07 UTC (rev 449)
@@ -75,34 +75,39 @@
     return ptr;
 }
 
-
+static int refresh_pending=0;
 void g15daemon_init_refresh() {
   pthread_condattr_t attr;
   pthread_cond_init(&lcd_refresh, &attr);
 }
 
 void g15daemon_send_refresh(lcd_t *lcd) {
-    if(lcd==lcd->masterlist->current->lcd||lcd->state_changed)
+    if(lcd==lcd->masterlist->current->lcd||lcd->state_changed) {
       pthread_cond_broadcast(&lcd_refresh);
+      refresh_pending++;
+    }
 }
 
 void g15daemon_wait_refresh() {
     pthread_mutex_t dummy_mutex;
     struct timespec timeout;
     int retval;
-    /* Create a dummy mutex which doesn't unlock for sure while waiting. */
-    pthread_mutex_init(&dummy_mutex, NULL);
-    pthread_mutex_lock(&dummy_mutex);
+    if(refresh_pending<1) {
+      /* Create a dummy mutex which doesn't unlock for sure while waiting. */
+      pthread_mutex_init(&dummy_mutex, NULL);
+      pthread_mutex_lock(&dummy_mutex);
 start:
-    time(&timeout.tv_sec);
-    timeout.tv_sec += 1;
-    timeout.tv_nsec = 0L;
+      time(&timeout.tv_sec);
+      timeout.tv_sec += 1;
+      timeout.tv_nsec = 0L;
 
-    retval=pthread_cond_timedwait(&lcd_refresh, &dummy_mutex, &timeout);
-    if(!leaving && retval == ETIMEDOUT)
-      goto start;
-    pthread_mutex_unlock(&dummy_mutex);
-    pthread_mutex_destroy(&dummy_mutex);
+      retval=pthread_cond_timedwait(&lcd_refresh, &dummy_mutex, &timeout);
+      if(!leaving && retval == ETIMEDOUT)
+        goto start;
+      pthread_mutex_unlock(&dummy_mutex);
+      pthread_mutex_destroy(&dummy_mutex);
+    }
+    refresh_pending--;
 }
 
 void g15daemon_quit_refresh() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[G15daemon-commits] SF.net SVN: g15daemon: [450] trunk/g15daemon-wip

From: <mla...@us...> - 2008-01-24 09:29:50

Revision: 450
          http://g15daemon.svn.sourceforge.net/g15daemon/?rev=450&view=rev
Author:   mlampard
Date:     2008-01-24 01:29:54 -0800 (Thu, 24 Jan 2008)

Log Message:
-----------
g15daemon 1.9x: Release 1.9.5.1

Modified Paths:
--------------
    trunk/g15daemon-wip/configure.in
    trunk/g15daemon-wip/debian/changelog
    trunk/g15daemon-wip/rpm/g15daemon.spec

Modified: trunk/g15daemon-wip/configure.in
===================================================================
--- trunk/g15daemon-wip/configure.in	2008-01-24 07:12:07 UTC (rev 449)
+++ trunk/g15daemon-wip/configure.in	2008-01-24 09:29:54 UTC (rev 450)
@@ -4,7 +4,7 @@
 
 
 AC_PREREQ(2.59)
-AC_INIT(g15daemon, [1.9.5], [mla...@us...])
+AC_INIT(g15daemon, [1.9.5.1], [mla...@us...])
 AC_PREFIX_DEFAULT(/usr)
 AC_CONFIG_AUX_DIR(config)
 AC_CANONICAL_HOST()

Modified: trunk/g15daemon-wip/debian/changelog
===================================================================
--- trunk/g15daemon-wip/debian/changelog	2008-01-24 07:12:07 UTC (rev 449)
+++ trunk/g15daemon-wip/debian/changelog	2008-01-24 09:29:54 UTC (rev 450)
@@ -1,3 +1,7 @@
+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.
+
 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

Modified: trunk/g15daemon-wip/rpm/g15daemon.spec
===================================================================
--- trunk/g15daemon-wip/rpm/g15daemon.spec	2008-01-24 07:12:07 UTC (rev 449)
+++ trunk/g15daemon-wip/rpm/g15daemon.spec	2008-01-24 09:29:54 UTC (rev 450)
@@ -3,11 +3,11 @@
 %define prefix	/usr
 Summary: Daemon to control logitech G15 keyboards
 Name: g15daemon
-Version: 1.9.5
+Version: 1.9.5.1
 Release: 1
 Copyright: GPL
 Group: Applications/System
-Source: ftp://prdownloads.sf.net/g15daemon-1.9.5.tar.bz2
+Source: ftp://prdownloads.sf.net/g15daemon-1.9.5.1.tar.bz2
 URL: http://g15daemon.sf.net
 Distribution: Linux
 Vendor: NONE


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[G15daemon-commits] SF.net SVN: g15daemon: [451] trunk/g15daemon-wip

From: <mla...@us...> - 2008-01-25 04:44:59

Revision: 451
          http://g15daemon.svn.sourceforge.net/g15daemon/?rev=451&view=rev
Author:   mlampard
Date:     2008-01-24 20:45:04 -0800 (Thu, 24 Jan 2008)

Log Message:
-----------
g15daemon 1.9x: IS_USER_SELECTED client cmd was broken some time in the distant past.  Fix it.

Modified Paths:
--------------
    trunk/g15daemon-wip/ChangeLog
    trunk/g15daemon-wip/g15daemon/linked_lists.c
    trunk/g15daemon-wip/libg15daemon_client/g15daemon_net.c
    trunk/g15daemon-wip/plugins/g15_plugin_net.c

Modified: trunk/g15daemon-wip/ChangeLog
===================================================================
--- trunk/g15daemon-wip/ChangeLog	2008-01-24 09:29:54 UTC (rev 450)
+++ trunk/g15daemon-wip/ChangeLog	2008-01-25 04:45:04 UTC (rev 451)
@@ -160,6 +160,8 @@
 	  /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.
-SVN: (1.9.6)
+1.9.5.1:
 - BugFix: If lcd refresh is requested whilst processing, refreshes were missed.
 - Optimisation: The delay between screen updates is no longer required. remove.
+SVN:
+- BugFix: IS_USER_SELECTED client command was broken. fix it.

Modified: trunk/g15daemon-wip/g15daemon/linked_lists.c
===================================================================
--- trunk/g15daemon-wip/g15daemon/linked_lists.c	2008-01-24 09:29:54 UTC (rev 450)
+++ trunk/g15daemon-wip/g15daemon/linked_lists.c	2008-01-25 04:45:04 UTC (rev 451)
@@ -124,8 +124,8 @@
     g15daemon_send_event(current_screen->lcd, G15_EVENT_VISIBILITY_CHANGED, SCR_HIDDEN);
     do
     {
-        g15daemon_send_event(current_screen->lcd, G15_EVENT_USER_FOREGROUND, 0);
-        
+        masterlist->current->lcd->usr_foreground=0;        
+
         if(masterlist->tail == masterlist->current){
             masterlist->current = masterlist->head;
         }else{
@@ -147,7 +147,7 @@
     masterlist->current->last_priority =  masterlist->current;
     pthread_mutex_unlock(&lcdlist_mutex);
 
-    g15daemon_send_event(current_screen->lcd, G15_EVENT_USER_FOREGROUND, 1);
+    masterlist->current->lcd->usr_foreground=1;
     g15daemon_send_event(masterlist->current->lcd, G15_EVENT_VISIBILITY_CHANGED, SCR_VISIBLE);
 
 }

Modified: trunk/g15daemon-wip/libg15daemon_client/g15daemon_net.c
===================================================================
--- trunk/g15daemon-wip/libg15daemon_client/g15daemon_net.c	2008-01-24 09:29:54 UTC (rev 450)
+++ trunk/g15daemon-wip/libg15daemon_client/g15daemon_net.c	2008-01-25 04:45:04 UTC (rev 451)
@@ -286,12 +286,12 @@
         case G15DAEMON_IS_USER_SELECTED:{
             packet[0] = (unsigned char)command;
             send( sock, packet, 1, MSG_OOB );
-            retval = g15_recv_oob_answer(sock) - 48;
+            retval = g15_recv_oob_answer(sock);
             break;
         }       
         default:
             return -1;    
     }
-    
+    usleep(1000);    
     return retval;       
 }

Modified: trunk/g15daemon-wip/plugins/g15_plugin_net.c
===================================================================
--- trunk/g15daemon-wip/plugins/g15_plugin_net.c	2008-01-24 09:29:54 UTC (rev 450)
+++ trunk/g15daemon-wip/plugins/g15_plugin_net.c	2008-01-25 04:45:04 UTC (rev 451)
@@ -89,12 +89,12 @@
     } 
     case CLIENT_CMD_IS_USER_SELECTED: { /* client wants to know if it was set to foreground by the user */
         pthread_mutex_lock(&lcdlist_mutex);
-        if(lcdnode->lcd->usr_foreground)  /* user manually selected this lcd */
-            msgbuf[0] = '1';
+        if(lcdnode->lcd->usr_foreground==1)  /* user manually selected this lcd */
+            msgbuf[0] = 1;
         else
-            msgbuf[0] = '0';
+            msgbuf[0] = 0;
         pthread_mutex_unlock(&lcdlist_mutex);
-        send(sock,msgbuf,1,0);
+        send(sock,msgbuf,1,MSG_OOB);
         break;
     } 
     default:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[G15daemon-commits] SF.net SVN: g15daemon: [452] trunk/g15daemon-wip

From: <mla...@us...> - 2008-01-25 05:34:25

Revision: 452
          http://g15daemon.svn.sourceforge.net/g15daemon/?rev=452&view=rev
Author:   mlampard
Date:     2008-01-24 21:34:31 -0800 (Thu, 24 Jan 2008)

Log Message:
-----------
g15daemon 1.9x: restore client ability to change backlight state for individual screens.

Modified Paths:
--------------
    trunk/g15daemon-wip/ChangeLog
    trunk/g15daemon-wip/g15daemon/main.c

Modified: trunk/g15daemon-wip/ChangeLog
===================================================================
--- trunk/g15daemon-wip/ChangeLog	2008-01-25 04:45:04 UTC (rev 451)
+++ trunk/g15daemon-wip/ChangeLog	2008-01-25 05:34:31 UTC (rev 452)
@@ -165,3 +165,4 @@
 - Optimisation: The delay between screen updates is no longer required. remove.
 SVN:
 - BugFix: IS_USER_SELECTED client command was broken. fix it.
+- BugFix: restore client ability to change backlight state.

Modified: trunk/g15daemon-wip/g15daemon/main.c
===================================================================
--- trunk/g15daemon-wip/g15daemon/main.c	2008-01-25 04:45:04 UTC (rev 451)
+++ trunk/g15daemon-wip/g15daemon/main.c	2008-01-25 05:34:31 UTC (rev 452)
@@ -226,7 +226,7 @@
     /* unsigned int fps = 0; */
     lcd_t *displaying = masterlist->tail->lcd;
     memset(displaying->buf,0,1024);
-    
+    static int prev_state=0;
     g15daemon_sleep(2);
 
     while (!leaving) {
@@ -246,15 +246,18 @@
         uf_write_buf_to_g15(displaying);
         g15daemon_log(LOG_DEBUG,"LCD Update Complete");
         
+        if(prev_state!=displaying->backlight_state) {
+              prev_state=displaying->backlight_state;
+              pthread_mutex_lock(&g15lib_mutex);
+              setLCDBrightness(displaying->backlight_state);
+              pthread_mutex_unlock(&g15lib_mutex);
+        }
+
         if(displaying->state_changed){
             pthread_mutex_lock(&g15lib_mutex);
             setLCDContrast(displaying->contrast_state);
             if(displaying->masterlist->remote_keyhandler_sock==0) // only allow mled control if the macro recorder isnt running
               setLEDs(displaying->mkey_state);
-            if(masterlist->kb_backlight_state)
-              setLCDBrightness(displaying->backlight_state);
-            else
-              setLCDBrightness(masterlist->kb_backlight_state);
             pthread_mutex_unlock(&g15lib_mutex);
             displaying->state_changed = 0;
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[G15daemon-commits] SF.net SVN: g15daemon: [453] trunk/g15daemon-wip

From: <mla...@us...> - 2008-01-26 01:15:34

Revision: 453
          http://g15daemon.svn.sourceforge.net/g15daemon/?rev=453&view=rev
Author:   mlampard
Date:     2008-01-25 17:15:36 -0800 (Fri, 25 Jan 2008)

Log Message:
-----------
g15daemon 1.9x: prepare for new release.

Modified Paths:
--------------
    trunk/g15daemon-wip/ChangeLog
    trunk/g15daemon-wip/configure.in
    trunk/g15daemon-wip/debian/changelog
    trunk/g15daemon-wip/rpm/g15daemon.spec

Modified: trunk/g15daemon-wip/ChangeLog
===================================================================
--- trunk/g15daemon-wip/ChangeLog	2008-01-25 05:34:31 UTC (rev 452)
+++ trunk/g15daemon-wip/ChangeLog	2008-01-26 01:15:36 UTC (rev 453)
@@ -163,6 +163,6 @@
 1.9.5.1:
 - BugFix: If lcd refresh is requested whilst processing, refreshes were missed.
 - Optimisation: The delay between screen updates is no longer required. remove.
-SVN:
+1.9.5.2:
 - BugFix: IS_USER_SELECTED client command was broken. fix it.
 - BugFix: restore client ability to change backlight state.

Modified: trunk/g15daemon-wip/configure.in
===================================================================
--- trunk/g15daemon-wip/configure.in	2008-01-25 05:34:31 UTC (rev 452)
+++ trunk/g15daemon-wip/configure.in	2008-01-26 01:15:36 UTC (rev 453)
@@ -4,7 +4,7 @@
 
 
 AC_PREREQ(2.59)
-AC_INIT(g15daemon, [1.9.5.1], [mla...@us...])
+AC_INIT(g15daemon, [1.9.5.2], [mla...@us...])
 AC_PREFIX_DEFAULT(/usr)
 AC_CONFIG_AUX_DIR(config)
 AC_CANONICAL_HOST()

Modified: trunk/g15daemon-wip/debian/changelog
===================================================================
--- trunk/g15daemon-wip/debian/changelog	2008-01-25 05:34:31 UTC (rev 452)
+++ trunk/g15daemon-wip/debian/changelog	2008-01-26 01:15:36 UTC (rev 453)
@@ -1,8 +1,14 @@
-1.9.5.1 edgy; urgency=high
+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.
+
+ -- Mike Lampard <mla...@us...> Sat, 26 Jan 2008 11:36:04 +1030
+
+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.
 
-1.9.5 edgy; urgency=low
+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.

Modified: trunk/g15daemon-wip/rpm/g15daemon.spec
===================================================================
--- trunk/g15daemon-wip/rpm/g15daemon.spec	2008-01-25 05:34:31 UTC (rev 452)
+++ trunk/g15daemon-wip/rpm/g15daemon.spec	2008-01-26 01:15:36 UTC (rev 453)
@@ -3,11 +3,11 @@
 %define prefix	/usr
 Summary: Daemon to control logitech G15 keyboards
 Name: g15daemon
-Version: 1.9.5.1
+Version: 1.9.5.2
 Release: 1
 Copyright: GPL
 Group: Applications/System
-Source: ftp://prdownloads.sf.net/g15daemon-1.9.5.1.tar.bz2
+Source: ftp://prdownloads.sf.net/g15daemon-1.9.5.2.tar.bz2
 URL: http://g15daemon.sf.net
 Distribution: Linux
 Vendor: NONE


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[G15daemon-commits] SF.net SVN: g15daemon: [456] trunk/g15daemon-wip

From: <mla...@us...> - 2008-01-28 06:07:47

Revision: 456
          http://g15daemon.svn.sourceforge.net/g15daemon/?rev=456&view=rev
Author:   mlampard
Date:     2008-01-27 22:05:31 -0800 (Sun, 27 Jan 2008)

Log Message:
-----------
g15daemon 1.9x: ensure that OOB traffic is kept separate from image buffers in g15_recv().

Modified Paths:
--------------
    trunk/g15daemon-wip/ChangeLog
    trunk/g15daemon-wip/plugins/g15_plugin_net.c

Modified: trunk/g15daemon-wip/ChangeLog
===================================================================
--- trunk/g15daemon-wip/ChangeLog	2008-01-27 06:58:43 UTC (rev 455)
+++ trunk/g15daemon-wip/ChangeLog	2008-01-28 06:05:31 UTC (rev 456)
@@ -166,3 +166,6 @@
 1.9.5.2:
 - BugFix: IS_USER_SELECTED client command was broken. fix it.
 - BugFix: restore client ability to change backlight state.
+SVN:
+- BugFix: plugins/g15daemon_net.c: ensure that OOB traffic is not mixed with
+          normal image buffers.

Modified: trunk/g15daemon-wip/plugins/g15_plugin_net.c
===================================================================
--- trunk/g15daemon-wip/plugins/g15_plugin_net.c	2008-01-27 06:58:43 UTC (rev 455)
+++ trunk/g15daemon-wip/plugins/g15_plugin_net.c	2008-01-28 06:05:31 UTC (rev 456)
@@ -219,7 +219,7 @@
                 }
            	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) { 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[G15daemon-commits] SF.net SVN: g15daemon: [457] trunk/g15daemon-wip

From: <mla...@us...> - 2008-01-31 05:02:53

Revision: 457
          http://g15daemon.svn.sourceforge.net/g15daemon/?rev=457&view=rev
Author:   mlampard
Date:     2008-01-30 21:02:46 -0800 (Wed, 30 Jan 2008)

Log Message:
-----------
g15daemon 1.9x: Add --set-backlight cmdline option to allow for individual per-screen backlight settings

Modified Paths:
--------------
    trunk/g15daemon-wip/ChangeLog
    trunk/g15daemon-wip/g15daemon/main.c

Modified: trunk/g15daemon-wip/ChangeLog
===================================================================
--- trunk/g15daemon-wip/ChangeLog	2008-01-28 06:05:31 UTC (rev 456)
+++ trunk/g15daemon-wip/ChangeLog	2008-01-31 05:02:46 UTC (rev 457)
@@ -169,3 +169,7 @@
 SVN:
 - 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.

Modified: trunk/g15daemon-wip/g15daemon/main.c
===================================================================
--- trunk/g15daemon-wip/g15daemon/main.c	2008-01-28 06:05:31 UTC (rev 456)
+++ trunk/g15daemon-wip/g15daemon/main.c	2008-01-31 05:02:46 UTC (rev 457)
@@ -54,6 +54,7 @@
 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;
@@ -246,7 +247,7 @@
         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);
@@ -362,13 +363,14 @@
         
         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);
         }
 
@@ -377,6 +379,10 @@
             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)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[G15daemon-commits] SF.net SVN: g15daemon: [458] trunk/g15daemon-wip

From: <mla...@us...> - 2008-01-31 05:18:40

Revision: 458
          http://g15daemon.svn.sourceforge.net/g15daemon/?rev=458&view=rev
Author:   mlampard
Date:     2008-01-30 21:18:40 -0800 (Wed, 30 Jan 2008)

Log Message:
-----------
g15daemon 1.9x: Prepare for next release.

Modified Paths:
--------------
    trunk/g15daemon-wip/ChangeLog
    trunk/g15daemon-wip/configure.in
    trunk/g15daemon-wip/debian/changelog
    trunk/g15daemon-wip/rpm/g15daemon.spec

Modified: trunk/g15daemon-wip/ChangeLog
===================================================================
--- trunk/g15daemon-wip/ChangeLog	2008-01-31 05:02:46 UTC (rev 457)
+++ trunk/g15daemon-wip/ChangeLog	2008-01-31 05:18:40 UTC (rev 458)
@@ -166,7 +166,7 @@
 1.9.5.2:
 - BugFix: IS_USER_SELECTED client command was broken. fix it.
 - BugFix: restore client ability to change backlight state.
-SVN:
+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)

Modified: trunk/g15daemon-wip/configure.in
===================================================================
--- trunk/g15daemon-wip/configure.in	2008-01-31 05:02:46 UTC (rev 457)
+++ trunk/g15daemon-wip/configure.in	2008-01-31 05:18:40 UTC (rev 458)
@@ -4,7 +4,7 @@
 
 
 AC_PREREQ(2.59)
-AC_INIT(g15daemon, [1.9.5.2], [mla...@us...])
+AC_INIT(g15daemon, [1.9.5.3], [mla...@us...])
 AC_PREFIX_DEFAULT(/usr)
 AC_CONFIG_AUX_DIR(config)
 AC_CANONICAL_HOST()

Modified: trunk/g15daemon-wip/debian/changelog
===================================================================
--- trunk/g15daemon-wip/debian/changelog	2008-01-31 05:02:46 UTC (rev 457)
+++ trunk/g15daemon-wip/debian/changelog	2008-01-31 05:18:40 UTC (rev 458)
@@ -1,3 +1,13 @@
+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.
+
+ -- Mike Lampard <mla...@us...> Thu, 31 Jan 2008 15:47:06 +1030
+
 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.

Modified: trunk/g15daemon-wip/rpm/g15daemon.spec
===================================================================
--- trunk/g15daemon-wip/rpm/g15daemon.spec	2008-01-31 05:02:46 UTC (rev 457)
+++ trunk/g15daemon-wip/rpm/g15daemon.spec	2008-01-31 05:18:40 UTC (rev 458)
@@ -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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

<< < 1 2 3 (Page 3 of 3)