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

[<mla...@us...>]

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.