Release version 0.2.8

thkala · thkala · commit a3b3a0368ff9 · 2014-05-12T03:49:47.000+03:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,15 @@
+Fri Jul  6 00:25:10 EEST 2007 - Theodoros V. Kalamatianos <nyb@users.sourceforge.net>
+	* Release 0.2.8
+	* Fixed the auto-detection code so that it fails with an error when no
+	  input devices are present at all, rather than letting actkbd attempt
+	  to use /dev/input/event0 and fail with some misleading error message
+	  (reported by Jerome Borme).
+	* Added a sample rule file for udev
+	* Note that a udev rule is the recommended way to launch actkbd on Linux
+	* Remove version.h - the version string is automatically set in the
+	  Makefile
+	* Documentation updates
+
 Sun Aug 20 14:06:59 EEST 2006 - Theodoros V. Kalamatianos <nyb@users.sourceforge.net>
 	* Release 0.2.7
 	* Fixed a bug in the keyboard autodetection code, where the automatic
diff --git a/Makefile b/Makefile
@@ -12,8 +12,14 @@ prefix := /usr/local
 sbindir := $(prefix)/sbin
 sysconfdir := /etc
 
+# Yes, I am lazy...
+VER := $(shell head -n 1 NEWS | cut -d : -f 1)
+
+
+
 DEBUG :=
 CFLAGS := -O2 -Wall $(DEBUG)
+CPPFLAGS := -DVERSION=\"$(VER)\" -DCONFIG=\"$(sysconfdir)/actkbd.conf\"
 
 
 
@@ -25,12 +31,9 @@ actkbd.o : actkbd.h
 mask.o : actkbd.h
 
 config.o : actkbd.h config.c
-	$(CC) $(CFLAGS)	-c -o config.o config.c -DCONFIG=\"$(sysconfdir)/actkbd.conf\"
 
 linux.o : actkbd.h
 
-actkbd.h: version.h
-
 install: all
 	install -D -m755 actkbd $(sbindir)/actkbd
 	install -d -m755 $(sysconfdir)
diff --git a/NEWS b/NEWS
@@ -1,6 +1,10 @@
-0.2.7:
-	* Fixed a bug in the keyboard autodetection code, where the automatic
-	  detection would fail if the first entry in /proc/bus/input/devices
-	  was not a keyboard (reported by Jerome Borme).
-	* Improved the Linux-specific information in the README.
-	* Minor bugfixes
+0.2.8:
+	* Fixed the auto-detection code so that it fails with an error when no
+	  input devices are present at all, rather than letting actkbd attempt
+	  to use /dev/input/event0 and fail with some misleading error message
+	  (reported by Jerome Borme).
+	* Added a sample rule file for udev
+	* Note that a udev rule is the recommended way to launch actkbd on Linux
+	* Remove version.h - the version string is automatically set in the
+	  Makefile
+	* Documentation updates
diff --git a/README b/README
@@ -61,11 +61,24 @@ In most cases, loading the `evdev' kernel module will be sufficient:
 
 # modprobe evdev
 
-In most Linux systems the device nodes to use are named /dev/input/eventX,
-where X is a decimal unsigned number, e.g. /dev/input/event0. If the /proc
-filesystem is mounted and accessible, actkbd should be able to detect a
-usable keyboard device. You should not need to manually specify one, unless
-there are multiple keyboards present.
+On Linux it is recommended that actkbd is launched using udev rules. This allows
+the administrator to use a different configuration for each keyboard, as long as
+udev can tell the devices apart. This method is far more reliable and flexible
+than using an init script, as it allows for proper support of hotplug events and
+removes the probability of the auto-detection code getting confused and causing
+problems.
+
+In most Linux systems the device nodes to use are named /dev/input/eventX, where
+X is a decimal unsigned number, e.g. /dev/input/event0. If the /proc filesystem
+is mounted and accessible, actkbd should be able to detect a usable keyboard
+device. You should not need to manually specify one, unless there are multiple
+keyboards present.
+
+Update: On newer kernels several special buttons (like the Power switch) may
+appear as input devices as well. There is no way for the auto-detection code to
+tell them apart and it is quite possible that the actual keyboard will not be
+the one actkbd will select. Using udev to start actkbd is the best way to avoid
+this problem.
 
 
 
diff --git a/TODO b/TODO
@@ -1,9 +1,5 @@
 1. Items in the ToDo list:
 
-* Find out what happens if the keyboard device suddenly disappears - I have
-  to find a USB keyboard to test this. Make sure we handle this gracefully -
-  no a SIGSEGV is NOT graceful.
-
 * Perform some testing on non-IA32 platforms, especially on 64-bit and
   big-endian CPUs - some external feedback is welcome.
 
@@ -32,13 +28,24 @@
 
 * Autotools ?
 
+
+
+2. Completed
+
 * Research and update the documentation with information on how to couple actkbd
   with the hotplug subsystem, so that multiple keyboards can be supported. Any
   takers ?
+  UPDATE: A sample udev file is now provided. Pretty simple, actually...
+
+* Find out what happens if the keyboard device suddenly disappears - I have
+  to find a USB keyboard to test this. Make sure we handle this gracefully -
+  no a SIGSEGV is NOT graceful.
+  UPDATE: actkbd acts as it should. Users using hotplugged devices can just
+	ignore the error message when they remove the keyboard.
 
 
 
-2. Features that will probably never be added:
+3. Features that will probably never be added:
 
 * Check/Implement support for linux-2.4 kernels. I can't even remember whether
   those had a proper event interface...
@@ -56,6 +63,8 @@
 	comes to mind). It would be simpler and much more efficient to setup the
 	hotplug scripts to launch multiple actkbd instances, each with its own
 	configuration file.
+  UPDATE: There is now a sample udev rule file that can be adapted for multiple
+	keyboards.
 
 * Use select() to handle multiple keyboards, instead of just the first one,
   and get a USB keyboard to test it.
diff --git a/actkbd.h b/actkbd.h
@@ -25,8 +25,6 @@
 #include <signal.h>
 #include <sys/types.h>
 
-#include "version.h"
-
 
 #define UNUSED 0
 
diff --git a/linux.c b/linux.c
@@ -65,6 +65,7 @@ int init_dev() {
     }
 
     /* Compile the regular expression and scan for it */
+    ret = -1;
     regcomp(&preg, "^H: Handlers=(.* )?kbd (.* )?event([0-9]+)", REG_EXTENDED);
     do {
 	char l[128] = "";
diff --git a/samples/actkbd.conf b/samples/actkbd.conf
diff --git a/samples/udev.rules b/samples/udev.rules
@@ -0,0 +1,22 @@
+# udev rules for keyboards
+ACTION=="add", SUBSYSTEM=="input", KERNEL=="event[0-9]*", GOTO="_INPUT_"
+GOTO="_END_"
+
+
+LABEL="_INPUT_"
+
+# AT keyboard
+DRIVERS=="atkbd", ENV{__CFG}="/etc/actkbd/actkbd.atkbd.conf", GOTO="_KBD_"
+
+GOTO="_END_"
+
+
+# Keyboards
+LABEL="_KBD_"
+
+# Launch actkbd
+RUN+="/usr/sbin/actkbd -q -D -c %E{__CFG}"
+
+
+# End
+LABEL="_END_"
diff --git a/version.h b/version.h

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ int init_dev() {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`/* Compile the regular expression and scan for it */`
	`68`	`+ ret = -1;`
`68`	`69`	`regcomp(&preg, "^H: Handlers=(.* )?kbd (.* )?event([0-9]+)", REG_EXTENDED);`
`69`	`70`	`do {`
`70`	`71`	`char l[128] = "";`