From aa9d41b80d31b0c41cc7eaf9f58172761b77a7b9 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Sun, 27 Mar 2011 18:54:18 +0000
Subject: [PATCH] Minor adjustments for smaller screen sizes

---
 src/keyboard.c | 53 +++++++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/src/keyboard.c b/src/keyboard.c
index 363cd55..cabb753 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -116,49 +116,48 @@ static const KeyboardKeys _layout_letters[] =
 	{ 2, 0, XK_Shift_L, XK_comma, "<" },
 	{ 2, 2, 0, XK_period, "." },
 	{ 2, 0, XK_Shift_L, XK_period, ">" },
-	{ 3, 2, 0, 0, NULL },
+	{ 3, 3, 0, 0, NULL },
 	{ 3, 3, 0, XK_Control_L, "Ctrl" },
-	{ 3, 2, 0, XK_Alt_L, "Alt" },
-	{ 3, 7, 0, XK_space, " " },
+	{ 3, 3, 0, XK_Alt_L, "Alt" },
+	{ 3, 5, 0, XK_space, " " },
 	{ 3, 3, 0, XK_Return, "\xe2\x86\xb2" },
 	{ 3, 3, 0, XK_BackSpace, "\xe2\x8c\xab" },
 	{ 0, 0, 0, 0, NULL }
 }, _layout_keypad[] =
 {
-	{ 0, 2, 0, XK_Num_Lock, "Num" },
-	{ 0, 2, 0, XK_KP_Home, "\xe2\x86\x96" },
+	{ 0, 3, 0, XK_Num_Lock, "Num" },
+	{ 0, 3, 0, XK_KP_Home, "\xe2\x86\x96" },
 	{ 0, 0, XK_Num_Lock, XK_7, "7" },
-	{ 0, 2, 0, XK_KP_Up, "\xe2\x86\x91" },
+	{ 0, 3, 0, XK_KP_Up, "\xe2\x86\x91" },
 	{ 0, 0, XK_Num_Lock, XK_8, "8" },
-	{ 0, 2, 0, XK_KP_Page_Up, "\xe2\x87\x9e" },
+	{ 0, 3, 0, XK_KP_Page_Up, "\xe2\x87\x9e" },
 	{ 0, 0, XK_Num_Lock, XK_9, "9" },
-	{ 0, 2, 0, XK_KP_Subtract, "-" },
-	{ 1, 2, 0, XK_KP_Divide, "/" },
-	{ 1, 2, 0, XK_KP_Left, "\xe2\x86\x90" },
+	{ 0, 3, 0, XK_KP_Subtract, "-" },
+	{ 1, 3, 0, XK_KP_Divide, "/" },
+	{ 1, 3, 0, XK_KP_Left, "\xe2\x86\x90" },
 	{ 1, 0, XK_Num_Lock, XK_4, "4" },
-	{ 1, 2, 0, XK_5, "5" },
-	{ 1, 2, 0, XK_KP_Right, "\xe2\x86\x92" },
+	{ 1, 3, 0, XK_5, "5" },
+	{ 1, 3, 0, XK_KP_Right, "\xe2\x86\x92" },
 	{ 1, 0, XK_Num_Lock, XK_6, "6" },
-	{ 1, 2, 0, XK_KP_Add, "+" },
-	{ 2, 2, 0, XK_KP_Multiply, "*" },
-	{ 2, 2, 0, XK_KP_End, "\xe2\x86\x99" },
+	{ 1, 3, 0, XK_KP_Add, "+" },
+	{ 2, 3, 0, XK_KP_Multiply, "*" },
+	{ 2, 3, 0, XK_KP_End, "\xe2\x86\x99" },
 	{ 2, 0, XK_Num_Lock, XK_1, "1" },
-	{ 2, 2, 0, XK_KP_Down, "\xe2\x86\x93" },
+	{ 2, 3, 0, XK_KP_Down, "\xe2\x86\x93" },
 	{ 2, 0, XK_Num_Lock, XK_2, "2" },
-	{ 2, 2, 0, XK_KP_Page_Down, "\xe2\x87\x9f" },
+	{ 2, 3, 0, XK_KP_Page_Down, "\xe2\x87\x9f" },
 	{ 2, 0, XK_Num_Lock, XK_3, "3" },
-	{ 2, 2, 0, XK_KP_Enter, "\xe2\x86\xb2" },
-	{ 3, 2, 0, 0, NULL },
-	{ 3, 4, 0, XK_KP_Insert, "Ins" },
+	{ 2, 3, 0, XK_KP_Enter, "\xe2\x86\xb2" },
+	{ 3, 3, 0, 0, NULL },
+	{ 3, 6, 0, XK_KP_Insert, "Ins" },
 	{ 3, 0, XK_Num_Lock, XK_0, "0" },
-	{ 3, 2, 0, XK_KP_Delete, "Del" },
+	{ 3, 3, 0, XK_KP_Delete, "Del" },
 	{ 3, 0, XK_Num_Lock, XK_KP_Decimal, "." },
-	{ 3, 2, 0, XK_BackSpace, "\xe2\x8c\xab" },
+	{ 3, 3, 0, XK_BackSpace, "\xe2\x8c\xab" },
 	{ 0, 0, 0, 0, NULL }
 }, _layout_special[] =
 {
-	{ 0, 2, 0, XK_Escape, "Esc" },
-	{ 0, 1, 0, 0, NULL },
+	{ 0, 3, 0, XK_Escape, "Esc" },
 	{ 0, 2, 0, XK_F1, "F1" },
 	{ 0, 2, 0, XK_F2, "F2" },
 	{ 0, 2, 0, XK_F3, "F3" },
@@ -205,9 +204,9 @@ static const KeyboardKeys _layout_letters[] =
 	{ 2, 0, XK_Shift_L, XK_semicolon, ":" },
 	{ 2, 2, 0, XK_apostrophe, "'" },
 	{ 2, 0, XK_Shift_L, XK_apostrophe, "\"" },
-	{ 3, 2, 0, 0, NULL },
+	{ 3, 3, 0, 0, NULL },
 	{ 3, 2, 0, XK_Shift_L, "\xe2\x87\xa7" },
-	{ 3, 4, 0, XK_space, " " },
+	{ 3, 3, 0, XK_space, " " },
 	{ 3, 2, 0, XK_comma, "," },
 	{ 3, 0, XK_Shift_L, XK_comma, "<" },
 	{ 3, 2, 0, XK_period, "." },
@@ -432,7 +431,7 @@ static GtkWidget * _keyboard_add_layout(Keyboard * keyboard,
 	}
 	g_signal_connect(G_OBJECT(widget), "changed", G_CALLBACK(
 				_layout_changed), keyboard);
-	keyboard_layout_add_widget(layout, 3, 0, 2, widget);
+	keyboard_layout_add_widget(layout, 3, 0, 3, widget);
 	return keyboard_layout_get_widget(layout);
 }