[Pommed-commits] r318 - in trunk: . pommed pommed/mactel pommed/pmac

[Julien Blache]

Author: jblache
Date: 2007-04-30 19:54:04 +0000 (Mon, 30 Apr 2007)
New Revision: 318

Modified:
   trunk/ChangeLog
   trunk/pommed/evdev.c
   trunk/pommed/kbd_auto.c
   trunk/pommed/kbd_backlight.h
   trunk/pommed/mactel/kbd_backlight.c
   trunk/pommed/pmac/kbd_backlight.c
Log:
Add simple backlight toggle mode.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-04-28 20:13:45 UTC (rev 317)
+++ trunk/ChangeLog	2007-04-30 19:54:04 UTC (rev 318)
@@ -4,6 +4,8 @@
 version 1.4:
 	- pommed: add Geyser keyboard identification, PowerBook5,8 (at
 	least) and later.
+	- pommed: added a simple backlight toggle mode, used when the
+	automatic backlight is disabled in the configuration file.
 
 version 1.3:
 	- gpomme: added configuration GUI, courtesy of Daniel G. SIEGEL.

Modified: trunk/pommed/evdev.c
===================================================================
--- trunk/pommed/evdev.c	2007-04-28 20:13:45 UTC (rev 317)
+++ trunk/pommed/evdev.c	2007-04-30 19:54:04 UTC (rev 318)
@@ -129,7 +129,10 @@
 	    if (!has_kbd_backlight())
 	      break;
 
-	    kbd_backlight_inhibit_toggle(KBD_INHIBIT_USER);
+	    if (kbd_cfg.auto_on)
+	      kbd_backlight_inhibit_toggle(KBD_INHIBIT_USER);
+	    else
+	      kbd_backlight_toggle();
 	    break;
 
 	  case K_KBD_BCK_DOWN:

Modified: trunk/pommed/kbd_auto.c
===================================================================
--- trunk/pommed/kbd_auto.c	2007-04-28 20:13:45 UTC (rev 317)
+++ trunk/pommed/kbd_auto.c	2007-04-30 19:54:04 UTC (rev 318)
@@ -19,7 +19,28 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+/* simple backlight toggle */
 void
+kbd_backlight_toggle(void)
+{
+  int curval;
+
+  curval = kbd_backlight_get();
+
+  if (curval != KBD_BACKLIGHT_OFF)
+    {
+      kbd_bck_info.toggle_lvl = curval;
+      kbd_backlight_set(KBD_BACKLIGHT_OFF, KBD_USER);
+    }
+  else
+    {
+      kbd_backlight_set(kbd_bck_info.toggle_lvl, KBD_USER);
+    }
+}
+
+
+/* Automatic backlight */
+void
 kbd_backlight_inhibit_set(int mask)
 {
   if (!kbd_bck_info.inhibit)

Modified: trunk/pommed/kbd_backlight.h
===================================================================
--- trunk/pommed/kbd_backlight.h	2007-04-28 20:13:45 UTC (rev 317)
+++ trunk/pommed/kbd_backlight.h	2007-04-30 19:54:04 UTC (rev 318)
@@ -29,6 +29,7 @@
 
 #define KBD_INHIBIT_USER        (1 << 0)
 #define KBD_INHIBIT_LID         (1 << 1)
+#define KBD_INHIBIT_CFG         (1 << 2)
 
 
 #define KBD_USER     0
@@ -43,6 +44,8 @@
   int inhibit;
   int inhibit_lvl;
 
+  int toggle_lvl; /* backlight level for simple toggle */
+
   int auto_on;  /* automatic */
   int r_sens;   /* right sensor */
   int l_sens;   /* left sensor */
@@ -66,6 +69,9 @@
 
 /* In kbd_auto.c */
 void
+kbd_backlight_toggle(void);
+
+void
 kbd_backlight_inhibit_set(int mask);
 
 void

Modified: trunk/pommed/mactel/kbd_backlight.c
===================================================================
--- trunk/pommed/mactel/kbd_backlight.c	2007-04-28 20:13:45 UTC (rev 317)
+++ trunk/pommed/mactel/kbd_backlight.c	2007-04-30 19:54:04 UTC (rev 318)
@@ -95,7 +95,7 @@
 
   FILE *fp;
 
-  if (kbd_bck_info.inhibit)
+  if (kbd_bck_info.inhibit ^ KBD_INHIBIT_CFG)
     return;
 
   curval = kbd_backlight_get();
@@ -159,7 +159,7 @@
   int val;
   int newval;
 
-  if (kbd_bck_info.inhibit)
+  if (kbd_bck_info.inhibit ^ KBD_INHIBIT_CFG)
     return;
 
   val = kbd_backlight_get();
@@ -202,8 +202,10 @@
   if (kbd_cfg.auto_on)
     kbd_bck_info.inhibit = 0;
   else
-    kbd_bck_info.inhibit = KBD_INHIBIT_USER;
+    kbd_bck_info.inhibit = KBD_INHIBIT_CFG;
 
+  kbd_bck_info.toggle_lvl = kbd_cfg.auto_lvl;
+
   kbd_bck_info.inhibit_lvl = 0;
 
   kbd_bck_info.auto_on = 0;

Modified: trunk/pommed/pmac/kbd_backlight.c
===================================================================
--- trunk/pommed/pmac/kbd_backlight.c	2007-04-28 20:13:45 UTC (rev 317)
+++ trunk/pommed/pmac/kbd_backlight.c	2007-04-30 19:54:04 UTC (rev 318)
@@ -93,7 +93,7 @@
   int ret;
   unsigned char buf[8];
 
-  if (kbd_bck_info.inhibit)
+  if (kbd_bck_info.inhibit ^ KBD_INHIBIT_CFG)
     return;
 
   curval = kbd_backlight_get();
@@ -182,7 +182,7 @@
   int val;
   int newval;
 
-  if (kbd_bck_info.inhibit)
+  if (kbd_bck_info.inhibit ^ KBD_INHIBIT_CFG)
     return;
 
   if (lmuaddr == 0)
@@ -230,8 +230,10 @@
   if (kbd_cfg.auto_on)
     kbd_bck_info.inhibit = 0;
   else
-    kbd_bck_info.inhibit = KBD_INHIBIT_USER;
+    kbd_bck_info.inhibit = KBD_INHIBIT_CFG;
 
+  kbd_bck_info.toggle_lvl = kbd_cfg.auto_lvl;
+
   kbd_bck_info.inhibit_lvl = 0;
 
   kbd_bck_info.auto_on = 0;