Fixed key text display when shift is used (caps is still broken) as well

as several improvements to the code.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 00e207e95d5aab6bbc37c8178bd189b0c0619be6)

1 files changed, 6 insertions, 5 deletions

diff --git a/src/MainWidget.h b/src/MainWidget.h
index f476c67..2c708cc 100644
--- a/src/MainWidget.h
+++ b/src/MainWidget.h
@@ -50,9 +50,8 @@ public:
 
 public slots:
 	void keyPress(unsigned int keycode);
-	void toggleCaps();
 	void toggleNumlock();
-	void toggleShift();
+	void toggleShift(unsigned int keycode);
 	void toggleNumericPad();
 	void toggleFontAutoRes();
 	void toggleLock();
@@ -73,6 +72,8 @@ protected:
 
 private:
 	void updateFont();
+	void updateNumlock();
+	void updateShift();
 
 	bool nresize;
 
@@ -82,8 +83,8 @@ private:
 
 
 	VButton *caps;
-	VButton *lshft;
-	VButton *rshft;
+	VButton *lshift;
+	VButton *rshift;
 
 	VButton *lctrl;
 	VButton *rctrl;
@@ -110,7 +111,7 @@ private:
 	TQValueList<VButton *> other_keys;
 	TQValueList<NumpadVButton *> numl_keys;
 
-	void send_key(unsigned int keycode, bool press, bool release);
+	void send_key(unsigned int keycode);
 	 
 	Display *display;	
 	KbdTray *tray;