24178, 21035

1 files changed, 58 insertions, 36 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
index 666cc60a24..84e5dcfbe4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
@@ -187,30 +187,40 @@ public class Display extends Device {
 		{OS.GDK_Alt_R,		SWT.ALT},
 		{OS.GDK_Meta_L,	SWT.ALT},
 		{OS.GDK_Meta_R,	SWT.ALT},
-		{OS.GDK_Shift_L,	SWT.SHIFT},
-		{OS.GDK_Shift_R,	SWT.SHIFT},
+		{OS.GDK_Shift_L,		SWT.SHIFT},
+		{OS.GDK_Shift_R,		SWT.SHIFT},
 		{OS.GDK_Control_L,	SWT.CONTROL},
 		{OS.GDK_Control_R,	SWT.CONTROL},
 		
 		/* Non-Numeric Keypad Keys */
-		{OS.GDK_Up,			SWT.ARROW_UP},
-		{OS.GDK_Down,		SWT.ARROW_DOWN},
-		{OS.GDK_Left,		SWT.ARROW_LEFT},
-		{OS.GDK_Right,		SWT.ARROW_RIGHT},
-		{OS.GDK_Page_Up,	SWT.PAGE_UP},
-		{OS.GDK_Page_Down,	SWT.PAGE_DOWN},
-		{OS.GDK_Home,		SWT.HOME},
-		{OS.GDK_End,		SWT.END},
-		{OS.GDK_Insert,		SWT.INSERT},
+		{OS.GDK_Up,						SWT.ARROW_UP},
+		{OS.GDK_KP_Up,					SWT.ARROW_UP},
+		{OS.GDK_Down,					SWT.ARROW_DOWN},
+		{OS.GDK_KP_Down,			SWT.ARROW_DOWN},
+		{OS.GDK_Left,						SWT.ARROW_LEFT},
+		{OS.GDK_KP_Left,				SWT.ARROW_LEFT},
+		{OS.GDK_Right,					SWT.ARROW_RIGHT},
+		{OS.GDK_KP_Right,				SWT.ARROW_RIGHT},
+		{OS.GDK_Page_Up,				SWT.PAGE_UP},
+		{OS.GDK_KP_Page_Up,		SWT.PAGE_UP},
+		{OS.GDK_Page_Down,			SWT.PAGE_DOWN},
+		{OS.GDK_KP_Page_Down,	SWT.PAGE_DOWN},
+		{OS.GDK_Home,					SWT.HOME},
+		{OS.GDK_KP_Home,			SWT.HOME},
+		{OS.GDK_End,						SWT.END},
+		{OS.GDK_KP_End,				SWT.END},
+		{OS.GDK_Insert,					SWT.INSERT},
+		{OS.GDK_KP_Insert,			SWT.INSERT},
 		
 		/* Virtual and Ascii Keys */
 		{OS.GDK_BackSpace,		SWT.BS},
-		{OS.GDK_Return,			SWT.CR},
-		{OS.GDK_Delete,			SWT.DEL},
+		{OS.GDK_Return,				SWT.CR},
+		{OS.GDK_Delete,				SWT.DEL},
+		{OS.GDK_KP_Delete,		SWT.DEL},
 		{OS.GDK_Escape,			SWT.ESC},
-		{OS.GDK_Cancel,			SWT.ESC},
-		{OS.GDK_Linefeed,		SWT.LF},
-		{OS.GDK_Tab,			SWT.TAB},
+		{OS.GDK_Cancel,				SWT.ESC},
+		{OS.GDK_Linefeed,			SWT.LF},
+		{OS.GDK_Tab,					SWT.TAB},
 		{OS.GDK_ISO_Left_Tab, 	SWT.TAB},
 	
 		/* Functions Keys */
@@ -223,27 +233,39 @@ public class Display extends Device {
 		{OS.GDK_F7,		SWT.F7},
 		{OS.GDK_F8,		SWT.F8},
 		{OS.GDK_F9,		SWT.F9},
-		{OS.GDK_F10,	SWT.F10},
-		{OS.GDK_F11,	SWT.F11},
-		{OS.GDK_F12,	SWT.F12},
+		{OS.GDK_F10,		SWT.F10},
+		{OS.GDK_F11,		SWT.F11},
+		{OS.GDK_F12,		SWT.F12},
+		{OS.GDK_F13,		SWT.F13},
+		{OS.GDK_F14,		SWT.F14},
+		{OS.GDK_F15,		SWT.F15},
 		
-		/* Numeric Keypad Constants */
-//		{OS.GDK_KP_Add,		SWT.KP_PLUS},
-//		{OS.GDK_KP_Subtract,	SWT.KP_MINUS},
-//		{OS.GDK_KP_Multiply,	SWT.KP_TIMES},
-//		{OS.GDK_KP_Divide,	SWT.KP_DIVIDE},
-//		{OS.GDK_KP_Decimal,	SWT.KP_PERIOD},
-//		{OS.GDK_KP_Enter,	SWT.CR},
-//		{OS.GDK_KP_0,		SWT.KP_0},
-//		{OS.GDK_KP_1,		SWT.KP_1},
-//		{OS.GDK_KP_2,		SWT.KP_2},
-//		{OS.GDK_KP_3,		SWT.KP_3},
-//		{OS.GDK_KP_4,		SWT.KP_4},
-//		{OS.GDK_KP_5,		SWT.KP_5},
-//		{OS.GDK_KP_6,		SWT.KP_6},
-//		{OS.GDK_KP_7,		SWT.KP_7},
-//		{OS.GDK_KP_8,		SWT.KP_8},
-//		{OS.GDK_KP_9,		SWT.KP_9},
+		/* Numeric Keypad Keys */
+		{OS.GDK_KP_Add,			SWT.KEYPAD_PLUS},
+		{OS.GDK_KP_Subtract,	SWT.KEYPAD_MINUS},
+		{OS.GDK_KP_Multiply,		SWT.KEYPAD_TIMES},
+		{OS.GDK_KP_Divide,		SWT.KEYPAD_DIVIDE},
+		{OS.GDK_KP_Decimal,	SWT.KEYPAD_DECIMAL},
+		{OS.GDK_KP_Enter,			SWT.KEYPAD_CR},
+		{OS.GDK_KP_0,		SWT.KEYPAD_0},
+		{OS.GDK_KP_1,		SWT.KEYPAD_1},
+		{OS.GDK_KP_2,		SWT.KEYPAD_2},
+		{OS.GDK_KP_3,		SWT.KEYPAD_3},
+		{OS.GDK_KP_4,		SWT.KEYPAD_4},
+		{OS.GDK_KP_5,		SWT.KEYPAD_5},
+		{OS.GDK_KP_6,		SWT.KEYPAD_6},
+		{OS.GDK_KP_7,		SWT.KEYPAD_7},
+		{OS.GDK_KP_8,		SWT.KEYPAD_8},
+		{OS.GDK_KP_9,		SWT.KEYPAD_9},
+
+		/* Other keys */
+		{OS.GDK_Caps_Lock,		SWT.CAPS_LOCK},
+		{OS.GDK_Num_Lock,		SWT.NUM_LOCK},
+		{OS.GDK_Scroll_Lock,		SWT.SCROLL_LOCK},
+		{OS.GDK_Pause,				SWT.PAUSE},
+		{OS.GDK_Break,				SWT.BREAK},
+		{OS.GDK_Print,					SWT.PRINT_SCREEN},
+		{OS.GDK_Help,					SWT.HELP},
 		
 	};