Menu
▾
▴
[Hackndev-commit] SF.net SVN: hackndev: [872] tsk/trunk
|
From: <ph...@us...> - 2007-02-24 01:37:34
|
Revision: 872
http://svn.sourceforge.net/hackndev/?rev=872&view=rev
Author: phiren
Date: 2007-02-23 17:37:32 -0800 (Fri, 23 Feb 2007)
Log Message:
-----------
TSK: Added A right messagease map and made tsk search in more places for
uinput
Modified Paths:
--------------
tsk/trunk/messagease.map
tsk/trunk/tsk.c
Added Paths:
-----------
tsk/trunk/messageaseLeft.h
tsk/trunk/messageaseRight.h
Removed Paths:
-------------
tsk/trunk/messagease.h
Deleted: tsk/trunk/messagease.h
===================================================================
--- tsk/trunk/messagease.h 2007-02-23 22:55:50 UTC (rev 871)
+++ tsk/trunk/messagease.h 2007-02-24 01:37:32 UTC (rev 872)
@@ -1,157 +0,0 @@
-/*
- * messagease.h -- Layout of the left-hand MessagEase stamp
- *
- * Author: Scott Mansell <ph...@gm...>
- *
- * This file is released under the GPL version 2
- *
- * The MessagEase layout is Copyright © 2005 EXideas
- */
-
-#ifndef LOOKUP
-#define LOOKUP
-
-#define BOX_Y 4
-#define BOX_X 9
-
-static int lookup[ 35 * 9 ];
-
-static struct {
- int box;
- int direction;
- int value; } data[] = {
-// LetterPad
-{ 32, 0, 30 }, /* A */
-{ 32, 5, 47 }, // v
-{ 33, 0, 49 }, /* N */
-{ 33, 6, 38 }, // l
-{ 34, 0, 23 }, /* I */
-{ 34, 7, 45 }, // x
-{ 23, 0, 35 }, /* H */
-{ 23, 4, 37 }, // k
-{ 24, 0, 24 }, /* O */
-{ 24, 1, 16 }, // q
-{ 24, 2, 22 }, // u
-{ 24, 3, 25 }, // p
-{ 24, 4, 48 }, // b
-{ 24, 5, 36 }, // j
-{ 24, 6, 32 }, // d
-{ 24, 7, 34 }, // g
-{ 24, 8, 46 }, // c
-{ 25, 0, 19 }, /* R */
-{ 25, 8, 50 }, // m
-{ 14, 0, 20 }, /* T */
-{ 14, 3, 21 }, // y
-{ 15, 0, 18 }, /* E */
-{ 15, 2, 17 }, // w
-{ 15, 4, 44 }, // z
-{ 16, 0, 31 }, /* S */
-{ 16, 1, 33 }, // f
-// Number pad
-{ 28, 0, 2 }, // 1
-{ 29, 0, 3 }, // 2
-{ 30, 0, 4 }, // 3
-{ 19, 0, 5 }, // 4
-{ 20, 0, 6 }, // 5
-{ 21, 0, 7 }, // 6
-{ 10, 0, 8 }, // 7
-{ 11, 0, 9 }, // 8
-{ 12, 0, 10}, // 9
-{ 2, 0, 11 }, // 0
-// Whitespace
-{ 3, 0, 57 }, // Space
-{ 4, 0, 57 }, // Space
-{ 5, 0, 57 }, // Space
-{ 6, 0, 57 }, // Space
-{13, 0, 57 }, // Space
-{13, 5, 28 }, // Return
-{13, 6, 28 }, // Return
-{13, 7, 28 }, // Return
-{ 3, 4, 15 }, // Tab
-{ 4, 4, 15 }, // Tab
-{ 5, 4, 15 }, // Tab
-{ 6, 4, 15 }, // Tab
-{ 7, 0, 14 }, // Backspace
-{ 6, 8, 14 }, // Backspace
-{ 5, 8, 14 }, // Backspace
-{ 4, 8, 14 }, // Backspace
-{ 3, 8, 14 }, // Backspace
-{31, 0, 58 }, // Caps lock
-{27, 0, 0}, // ESC
-//Symbols
-
-{ 28, 4, 74}, // +
-{ 32, 4, 74},
-{ 28, 7, 151}, // $
-{ 32, 7, 151},
-{ 29, 1, 41}, // `
-{ 33, 1, 41},
-{ 29, 2, 152}, // ^
-{ 33, 2, 152},
-{ 29, 3, 40}, // '
-{ 33, 3, 40},
-{ 29, 4, 153}, // !
-{ 33, 4, 153},
-{ 29, 5, 43}, // \
-{ 33, 5, 43},
-{ 29, 7, 53}, // /
-{ 33, 7, 53},
-{ 29, 8, 78}, // +
-{ 33, 8, 78},
-{ 30, 6, 13}, // =
-{ 34, 6, 13},
-{ 30, 8, 154}, // ?
-{ 34, 8, 154},
-{ 19, 1, 155}, // {
-{ 23, 1, 155},
-{ 19, 3, 159}, // %
-{ 23, 3, 159},
-{ 19, 5, 160}, // _
-{ 23, 5, 160},
-{ 19, 7, 26}, // [
-{ 23, 7, 26},
-{ 19, 8, 157}, // (
-{ 23, 8, 157},
-{ 21, 1, 161}, // |
-{ 25, 1, 161},
-{ 21, 3, 156}, // }
-{ 25, 3, 156},
-{ 21, 4, 158}, // )
-{ 25, 4, 158},
-{ 21, 5, 27}, // ]
-{ 25, 5, 27},
-{ 21, 7, 162}, // @
-{ 25, 7, 162},
-{ 10, 1, 163}, // ~
-{ 14, 1, 163},
-{ 10, 4, 164}, // *
-{ 14, 4, 164},
-{ 10, 8, 165}, // <
-{ 14, 8, 165},
-{ 11, 1, 167}, // "
-{ 15, 1, 167},
-{ 11, 3, 40}, // '
-{ 15, 3, 40},
-{ 11, 7, 51}, // ,
-{ 15, 7, 51},
-{ 11, 6, 52}, // .
-{ 15, 6, 52},
-{ 11, 5, 150}, // :
-{ 15, 5, 150},
-{ 12, 2, 168}, // &
-{ 16, 2, 168},
-{ 12, 4, 166}, // >
-{ 16, 4, 166},
-{ 12, 6, 39 }, // ;
-{ 16, 6, 39 },
-{ 12, 7, 169}, // #
-{ 16, 7, 169},
-//ModKeys
-{ 19, 2, 29 }, // Ctrl
-{ 23, 2, 97 }, // Ctrl
-{ 19, 6, 56 }, // Alt
-{ 23, 6, 100}, // Alt
-{ 21, 2, 42 }, // shift
-{ 25, 2, 54 } // shift
-};
-#endif
Modified: tsk/trunk/messagease.map
===================================================================
--- tsk/trunk/messagease.map 2007-02-23 22:55:50 UTC (rev 871)
+++ tsk/trunk/messagease.map 2007-02-24 01:37:32 UTC (rev 872)
@@ -1,13 +1,14 @@
# Messagease
-#Sticky Mod keys
-keycode 54 = SShift
-keycode 97 = SCtrl
-keycode 100 = SAlt
-keycode 29 = SCtrl
-keycode 42 = SShift
-keycode 56 = SAlt
+#Locking mod keys
+keycode 54 = Shift_Lock
+keycode 97 = Control_Lock
+keycode 100 = Alt_Lock
+keycode 29 = Control_Lock
+keycode 42 = Shift_Lock
+keycode 56 = Alt_Lock
+
keycode 150 = colon
keycode 151 = dollar
keycode 152 = asciicircum
Added: tsk/trunk/messageaseLeft.h
===================================================================
--- tsk/trunk/messageaseLeft.h (rev 0)
+++ tsk/trunk/messageaseLeft.h 2007-02-24 01:37:32 UTC (rev 872)
@@ -0,0 +1,157 @@
+/*
+ * messagease.h -- Layout of the left-hand MessagEase stamp
+ *
+ * Author: Scott Mansell <ph...@gm...>
+ *
+ * This file is released under the GPL version 2
+ *
+ * The MessagEase layout is Copyright © 2005 EXideas
+ */
+
+#ifndef LOOKUP
+#define LOOKUP
+
+#define BOX_Y 4
+#define BOX_X 9
+
+static int lookup[ 35 * 9 ];
+
+static struct {
+ int box;
+ int direction;
+ int value; } data[] = {
+// LetterPad
+{ 32, 0, 30 }, /* A */
+{ 32, 5, 47 }, // v
+{ 33, 0, 49 }, /* N */
+{ 33, 6, 38 }, // l
+{ 34, 0, 23 }, /* I */
+{ 34, 7, 45 }, // x
+{ 23, 0, 35 }, /* H */
+{ 23, 4, 37 }, // k
+{ 24, 0, 24 }, /* O */
+{ 24, 1, 16 }, // q
+{ 24, 2, 22 }, // u
+{ 24, 3, 25 }, // p
+{ 24, 4, 48 }, // b
+{ 24, 5, 36 }, // j
+{ 24, 6, 32 }, // d
+{ 24, 7, 34 }, // g
+{ 24, 8, 46 }, // c
+{ 25, 0, 19 }, /* R */
+{ 25, 8, 50 }, // m
+{ 14, 0, 20 }, /* T */
+{ 14, 3, 21 }, // y
+{ 15, 0, 18 }, /* E */
+{ 15, 2, 17 }, // w
+{ 15, 4, 44 }, // z
+{ 16, 0, 31 }, /* S */
+{ 16, 1, 33 }, // f
+// Number pad
+{ 28, 0, 2 }, // 1
+{ 29, 0, 3 }, // 2
+{ 30, 0, 4 }, // 3
+{ 19, 0, 5 }, // 4
+{ 20, 0, 6 }, // 5
+{ 21, 0, 7 }, // 6
+{ 10, 0, 8 }, // 7
+{ 11, 0, 9 }, // 8
+{ 12, 0, 10}, // 9
+{ 2, 0, 11 }, // 0
+// Whitespace
+{ 3, 0, 57 }, // Space
+{ 4, 0, 57 }, // Space
+{ 5, 0, 57 }, // Space
+{ 6, 0, 57 }, // Space
+{13, 0, 57 }, // Space
+{13, 5, 28 }, // Return
+{13, 6, 28 }, // Return
+{13, 7, 28 }, // Return
+{ 3, 4, 15 }, // Tab
+{ 4, 4, 15 }, // Tab
+{ 5, 4, 15 }, // Tab
+{ 6, 4, 15 }, // Tab
+{ 7, 0, 14 }, // Backspace
+{ 6, 8, 14 }, // Backspace
+{ 5, 8, 14 }, // Backspace
+{ 4, 8, 14 }, // Backspace
+{ 3, 8, 14 }, // Backspace
+{31, 0, 58 }, // Caps lock
+{27, 0, 0}, // ESC
+//Symbols
+
+{ 28, 4, 74}, // +
+{ 32, 4, 74},
+{ 28, 7, 151}, // $
+{ 32, 7, 151},
+{ 29, 1, 41}, // `
+{ 33, 1, 41},
+{ 29, 2, 152}, // ^
+{ 33, 2, 152},
+{ 29, 3, 40}, // '
+{ 33, 3, 40},
+{ 29, 4, 153}, // !
+{ 33, 4, 153},
+{ 29, 5, 43}, // \
+{ 33, 5, 43},
+{ 29, 7, 53}, // /
+{ 33, 7, 53},
+{ 29, 8, 78}, // +
+{ 33, 8, 78},
+{ 30, 6, 13}, // =
+{ 34, 6, 13},
+{ 30, 8, 154}, // ?
+{ 34, 8, 154},
+{ 19, 1, 155}, // {
+{ 23, 1, 155},
+{ 19, 3, 159}, // %
+{ 23, 3, 159},
+{ 19, 5, 160}, // _
+{ 23, 5, 160},
+{ 19, 7, 26}, // [
+{ 23, 7, 26},
+{ 19, 8, 157}, // (
+{ 23, 8, 157},
+{ 21, 1, 161}, // |
+{ 25, 1, 161},
+{ 21, 3, 156}, // }
+{ 25, 3, 156},
+{ 21, 4, 158}, // )
+{ 25, 4, 158},
+{ 21, 5, 27}, // ]
+{ 25, 5, 27},
+{ 21, 7, 162}, // @
+{ 25, 7, 162},
+{ 10, 1, 163}, // ~
+{ 14, 1, 163},
+{ 10, 4, 164}, // *
+{ 14, 4, 164},
+{ 10, 8, 165}, // <
+{ 14, 8, 165},
+{ 11, 1, 167}, // "
+{ 15, 1, 167},
+{ 11, 3, 40}, // '
+{ 15, 3, 40},
+{ 11, 7, 51}, // ,
+{ 15, 7, 51},
+{ 11, 6, 52}, // .
+{ 15, 6, 52},
+{ 11, 5, 150}, // :
+{ 15, 5, 150},
+{ 12, 2, 168}, // &
+{ 16, 2, 168},
+{ 12, 4, 166}, // >
+{ 16, 4, 166},
+{ 12, 6, 39 }, // ;
+{ 16, 6, 39 },
+{ 12, 7, 169}, // #
+{ 16, 7, 169},
+//ModKeys
+{ 19, 2, 29 }, // Ctrl
+{ 23, 2, 97 }, // Ctrl
+{ 19, 6, 56 }, // Alt
+{ 23, 6, 100}, // Alt
+{ 21, 2, 42 }, // shift
+{ 25, 2, 54 } // shift
+};
+#endif
Added: tsk/trunk/messageaseRight.h
===================================================================
--- tsk/trunk/messageaseRight.h (rev 0)
+++ tsk/trunk/messageaseRight.h 2007-02-24 01:37:32 UTC (rev 872)
@@ -0,0 +1,157 @@
+/*
+ * messagease.h -- Layout of the left-hand MessagEase stamp
+ *
+ * Author: Scott Mansell <ph...@gm...>
+ *
+ * This file is released under the GPL version 2
+ *
+ * The MessagEase layout is Copyright © 2005 EXideas
+ */
+
+#ifndef LOOKUP
+#define LOOKUP
+
+#define BOX_Y 4
+#define BOX_X 9
+
+static int lookup[ 35 * 9 ];
+
+static struct {
+ int box;
+ int direction;
+ int value; } data[] = {
+// LetterPad
+{ 28, 0, 30 }, /* A */
+{ 28, 5, 47 }, // v
+{ 29, 0, 49 }, /* N */
+{ 29, 6, 38 }, // l
+{ 30, 0, 23 }, /* I */
+{ 30, 7, 45 }, // x
+{ 19, 0, 35 }, /* H */
+{ 19, 4, 37 }, // k
+{ 20, 0, 24 }, /* O */
+{ 20, 1, 16 }, // q
+{ 20, 2, 22 }, // u
+{ 20, 3, 25 }, // p
+{ 20, 4, 48 }, // b
+{ 20, 5, 36 }, // j
+{ 20, 6, 32 }, // d
+{ 20, 7, 34 }, // g
+{ 20, 8, 46 }, // c
+{ 21, 0, 19 }, /* R */
+{ 21, 8, 50 }, // m
+{ 10, 0, 20 }, /* T */
+{ 10, 3, 21 }, // y
+{ 11, 0, 18 }, /* E */
+{ 11, 2, 17 }, // w
+{ 11, 4, 44 }, // z
+{ 12, 0, 31 }, /* S */
+{ 12, 1, 33 }, // f
+// Number pad
+{ 32, 0, 2 }, // 1
+{ 33, 0, 3 }, // 2
+{ 34, 0, 4 }, // 3
+{ 23, 0, 5 }, // 4
+{ 24, 0, 6 }, // 5
+{ 25, 0, 7 }, // 6
+{ 14, 0, 8 }, // 7
+{ 15, 0, 9 }, // 8
+{ 16, 0, 10}, // 9
+{ 6, 0, 11 }, // 0
+// Whitespace
+{ 2, 0, 57 }, // Space
+{ 3, 0, 57 }, // Space
+{ 4, 0, 57 }, // Space
+{ 5, 0, 57 }, // Space
+{13, 0, 57 }, // Space
+{13, 5, 28 }, // Return
+{13, 6, 28 }, // Return
+{13, 7, 28 }, // Return
+{ 2, 4, 15 }, // Tab
+{ 3, 4, 15 }, // Tab
+{ 4, 4, 15 }, // Tab
+{ 5, 4, 15 }, // Tab
+{ 1, 0, 14 }, // Backspace
+{ 2, 8, 14 }, // Backspace
+{ 3, 8, 14 }, // Backspace
+{ 4, 8, 14 }, // Backspace
+{ 5, 8, 14 }, // Backspace
+{31, 0, 58 }, // Caps lock
+{27, 0, 0}, // ESC
+//Symbols
+
+{ 28, 4, 74}, // +
+{ 32, 4, 74},
+{ 28, 7, 151}, // $
+{ 32, 7, 151},
+{ 29, 1, 41}, // `
+{ 33, 1, 41},
+{ 29, 2, 152}, // ^
+{ 33, 2, 152},
+{ 29, 3, 40}, // '
+{ 33, 3, 40},
+{ 29, 4, 153}, // !
+{ 33, 4, 153},
+{ 29, 5, 43}, // \
+{ 33, 5, 43},
+{ 29, 7, 53}, // /
+{ 33, 7, 53},
+{ 29, 8, 78}, // +
+{ 33, 8, 78},
+{ 30, 6, 13}, // =
+{ 34, 6, 13},
+{ 30, 8, 154}, // ?
+{ 34, 8, 154},
+{ 19, 1, 155}, // {
+{ 23, 1, 155},
+{ 19, 3, 159}, // %
+{ 23, 3, 159},
+{ 19, 5, 160}, // _
+{ 23, 5, 160},
+{ 19, 7, 26}, // [
+{ 23, 7, 26},
+{ 19, 8, 157}, // (
+{ 23, 8, 157},
+{ 21, 1, 161}, // |
+{ 25, 1, 161},
+{ 21, 3, 156}, // }
+{ 25, 3, 156},
+{ 21, 4, 158}, // )
+{ 25, 4, 158},
+{ 21, 5, 27}, // ]
+{ 25, 5, 27},
+{ 21, 7, 162}, // @
+{ 25, 7, 162},
+{ 10, 1, 163}, // ~
+{ 14, 1, 163},
+{ 10, 4, 164}, // *
+{ 14, 4, 164},
+{ 10, 8, 165}, // <
+{ 14, 8, 165},
+{ 11, 1, 167}, // "
+{ 15, 1, 167},
+{ 11, 3, 40}, // '
+{ 15, 3, 40},
+{ 11, 7, 51}, // ,
+{ 15, 7, 51},
+{ 11, 6, 52}, // .
+{ 15, 6, 52},
+{ 11, 5, 150}, // :
+{ 15, 5, 150},
+{ 12, 2, 168}, // &
+{ 16, 2, 168},
+{ 12, 4, 166}, // >
+{ 16, 4, 166},
+{ 12, 6, 39 }, // ;
+{ 16, 6, 39 },
+{ 12, 7, 169}, // #
+{ 16, 7, 169},
+//ModKeys
+{ 19, 2, 29 }, // Ctrl
+{ 23, 2, 97 }, // Ctrl
+{ 19, 6, 56 }, // Alt
+{ 23, 6, 100}, // Alt
+{ 21, 2, 42 }, // shift
+{ 25, 2, 54 } // shift
+};
+#endif
Modified: tsk/trunk/tsk.c
===================================================================
--- tsk/trunk/tsk.c 2007-02-23 22:55:50 UTC (rev 871)
+++ tsk/trunk/tsk.c 2007-02-24 01:37:32 UTC (rev 872)
@@ -21,7 +21,7 @@
#define absZ 24
#define DOWN 192
-#include "messagease.h"
+#include "messageaseRight.h"
//Don't touch these, they automaticly adjust to the above settings
#define HEIGHT (int) ((TOP-BOTTOM)/BOX_Y)
@@ -151,8 +151,12 @@
int uinput = open("/dev/input/uinput",O_WRONLY | O_NDELAY);
if (uinput == -1)
{
+ uinput = open("/dev/uinput",O_WRONLY | O_NDELAY);
+ if (uinput == -1)
+ {
printf("Error: Could not open uinput driver.\n");
return 1;
+ }
}
memset(&uidev, 0, sizeof(uidev));
strncpy(uidev.name, "SerKBD", UINPUT_MAX_NAME_SIZE);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
