X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsystemkeyboardinput.cpp;h=862dd2926d88a5b0538cfdb5fb1d41201ec4b3e9;hb=13efe34eae11be0d3a16522bcf63b21e754c8297;hp=f5657bd7d49066d4c854279bfbfde8705ddbd55a;hpb=37b46ec8dc03e090a6bec4a753233329a8335d41;p=libs%2Fgltk.git

diff --git a/source/systemkeyboardinput.cpp b/source/systemkeyboardinput.cpp
index f5657bd..862dd29 100644
--- a/source/systemkeyboardinput.cpp
+++ b/source/systemkeyboardinput.cpp
@@ -7,7 +7,8 @@ namespace GLtk {
 
 SystemKeyboardInput::SystemKeyboardInput(Root &r, Input::Keyboard &k):
 	InputMethod(r),
-	keyboard(k)
+	keyboard(k),
+	modifier_state(0)
 {
 	keyboard.signal_button_press.connect(sigc::mem_fun(this, &SystemKeyboardInput::key_press));
 	keyboard.signal_button_release.connect(sigc::mem_fun(this, &SystemKeyboardInput::key_release));
@@ -19,8 +20,14 @@ bool SystemKeyboardInput::key_press(unsigned key)
 	if(!root.is_visible())
 		return false;
 
-	// TODO modifiers
-	if(root.key_press(key, 0))
+	if(key==Input::KEY_SHIFT_L || key==Input::KEY_SHIFT_R)
+		modifier_state |= MOD_SHIFT;
+	else if(key==Input::KEY_CTRL_L || key==Input::KEY_CTRL_R)
+		modifier_state |= MOD_CTRL;
+	else if(key==Input::KEY_ALT_L || key==Input::KEY_ALT_R)
+		modifier_state |= MOD_ALT;
+
+	if(root.key_press(key, modifier_state))
 		return true;
 	
 	switch(key)
@@ -29,7 +36,7 @@ bool SystemKeyboardInput::key_press(unsigned key)
 	case Input::KEY_RIGHT: return root.navigate(NAV_RIGHT);
 	case Input::KEY_UP: return root.navigate(NAV_UP);
 	case Input::KEY_DOWN: return root.navigate(NAV_DOWN);
-	case Input::KEY_TAB: return root.navigate(NAV_NEXT);
+	case Input::KEY_TAB: return root.navigate((modifier_state&MOD_SHIFT) ? NAV_PREVIOUS : NAV_NEXT);
 	case Input::KEY_SPACE: return root.navigate(NAV_ACTIVATE);
 	case Input::KEY_ENTER: return root.navigate(NAV_ACCEPT);
 	case Input::KEY_ESC: return root.navigate(NAV_CANCEL);
@@ -41,7 +48,18 @@ bool SystemKeyboardInput::key_press(unsigned key)
 bool SystemKeyboardInput::key_release(unsigned key)
 {
 	if(root.is_visible())
-		return root.key_release(key, 0);
+	{
+		bool result = root.key_release(key, modifier_state);
+
+		if(key==Input::KEY_SHIFT_L || key==Input::KEY_SHIFT_R)
+			modifier_state &= ~MOD_SHIFT;
+		else if(key==Input::KEY_CTRL_L || key==Input::KEY_CTRL_R)
+			modifier_state &= ~MOD_CTRL;
+		else if(key==Input::KEY_ALT_L || key==Input::KEY_ALT_R)
+			modifier_state &= ~MOD_ALT;
+
+		return result;
+	}
 	else
 		return false;
 }