Changeset 4325

Timestamp:

03/14/10 15:59:51 (6 months ago)

Author:

andoma

Message:

Add an auto-standby-if-idle configurable option

Location:

trunk/showtime

Files:

• Makefile (modified) (1 diff)
• src/main.c (modified) (4 diffs)
• src/runcontrol.c (added)
• src/runcontrol.h (added)
• src/showtime.h (modified) (1 diff)
• src/ui/glw/glw.c (modified) (2 diffs)

trunk/showtime/Makefile

@@ -31 +31 @@
 #
 SRCS += src/main.c \
+        src/runcontrol.c \
         src/version.c \
         src/navigator.c \

trunk/showtime/src/main.c

@@ -43 +43 @@
 #include "misc/callout.h"
 #include "api/opensubtitles.h"
+#include "runcontrol.h"
 
 /**
@@ -119 +120 @@
   const char *startpage;
   int nuiargs = 0;
+  int can_standby = 0;
+  int can_poweroff = 0;
 
   trace_level = TRACE_ERROR;
@@ -142 +145 @@
     } else if(!strcmp(argv[0], "--ffmpeglog")) {
       ffmpeglog = 1;
+      argc -= 1; argv += 1;
+      continue;
+    } else if(!strcmp(argv[0], "--with-standby")) {
+      can_standby = 1;
+      argc -= 1; argv += 1;
+      continue;
+    } else if(!strcmp(argv[0], "--with-poweroff")) {
+      can_poweroff = 1;
       argc -= 1; argv += 1;
       continue;
@@ -221 +232 @@
   /* opensubtitles.org */
   opensub_init();
+
+  /* */
+  runcontrol_init(can_standby, can_poweroff);
 
   TRACE(TRACE_DEBUG, "core", "Starting UI");

trunk/showtime/src/showtime.h

@@ -82 +82 @@
 }
 
+void runcontrol_activity(void);
+
 #endif /* SHOWTIME_H */

trunk/showtime/src/ui/glw/glw.c

@@ -1341 +1341 @@
   dir[2] = p[2] - -100;
  
+  if(gpe->type != GLW_POINTER_MOTION_REFRESH)
+    runcontrol_activity();
 
   /* If a widget has grabbed to pointer (such as when holding the button
@@ -1483 +1485 @@
   int r;
 
+  runcontrol_activity();
+
   glw_lock(gr);