commit 1df710f2ebf438e511d940476e2a4ea0494a9240
author oliverschmidt <oliverschmidt> jeu. mai 12 23:55:18 2005 +0000
committer oliverschmidt <oliverschmidt> jeu. mai 12 23:55:18 2005 +0000
tree 7302816f80cfdcb8690407f590f6d1648d0be05f
parent 124c3ee71d1ad44efdf6fb4d0ec95b6cb19e079e

Added support reading back screen saver setting.

contiki/apps/program-handler.c

diff --git a/contiki/apps/program-handler.c b/contiki/apps/program-handler.c
index 005ca22..eed7954 100644
--- a/contiki/apps/program-handler.c
+++ b/contiki/apps/program-handler.c
@@ -43,7 +43,7 @@
  *
  * This file is part of the Contiki desktop OS
  *
- * $Id: program-handler.c,v 1.29 2005/05/12 21:27:20 oliverschmidt Exp $
+ * $Id: program-handler.c,v 1.30 2005/05/12 23:55:18 oliverschmidt Exp $
  *
  */
 
@@ -134,7 +134,7 @@
 static char *displayname;
 
 #if CTK_CONF_SCREENSAVER
-static char screensaver[20];
+char program_handler_screensaver[20];
 #endif /* CTK_CONF_SCREENSAVER */
 
 /*-----------------------------------------------------------------------------------*/
@@ -256,9 +256,9 @@
 program_handler_setscreensaver(char *name)
 {
   if(name == NULL) {
-    screensaver[0] = 0;
+    program_handler_screensaver[0] = 0;
   } else {
-    strncpy(screensaver, name, sizeof(screensaver));
+    strncpy(program_handler_screensaver, name, sizeof(program_handler_screensaver));
   }
 }
 #endif /* CTK_CONF_SCREENSAVER */
@@ -314,7 +314,7 @@
     displayname = NULL;
 
 #if CTK_CONF_SCREENSAVER
-    screensaver[0] = 0;
+    program_handler_screensaver[0] = 0;
 #endif /* CTK_CONF_SCREENSAVER */
 
   } else if(ev == ctk_signal_button_activate) {
@@ -358,8 +358,8 @@
 #if CTK_CONF_SCREENSAVER
   } else if(ev == ctk_signal_screensaver_start) {
 #if WITH_LOADER_ARCH
-    if(screensaver[0] != 0) {
-      program_handler_load(screensaver, NULL);
+    if(program_handler_screensaver[0] != 0) {
+      program_handler_load(program_handler_screensaver, NULL);
     }
 #endif /* WITH_LOADER_ARCH */
 #endif /* CTK_CONF_SCREENSAVER */

contiki/apps/program-handler.h

diff --git a/contiki/apps/program-handler.h b/contiki/apps/program-handler.h
index c2b2310..9cf1d56 100644
--- a/contiki/apps/program-handler.h
+++ b/contiki/apps/program-handler.h
@@ -29,7 +29,7 @@
  *
  * This file is part of the Contiki desktop environment for the C64.
  *
- * $Id: program-handler.h,v 1.7 2005/05/12 21:27:20 oliverschmidt Exp $
+ * $Id: program-handler.h,v 1.8 2005/05/12 23:55:18 oliverschmidt Exp $
  *
  */
 #ifndef __PROGRAM_HANDLER_H__
@@ -37,6 +37,10 @@
 
 #include "dsc.h"
 
+#define program_handler_getscreensaver() program_handler_screensaver
+
+extern char program_handler_screensaver[];
+
 void program_handler_init(void);
 void program_handler_load(char *name, char *arg);
 void program_handler_setscreensaver(char *name);