Merge lp:~azzar1/unity/fix-lp-1347735 into lp:unity

[Andrea Azzarone]

== Problem ==
Lockscreen capslock detection doesn't work well with remapped capslocks

== Fix ==
Use gdk keymap to get the state of the caps lock.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3842
http://jenkins.qa.ubuntu.com/job/unity-ci/1030/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/117/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/117/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/117/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1030/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3846
http://jenkins.qa.ubuntu.com/job/unity-ci/1031/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/118

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1031/rebuild

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Fine, just fix that small thing I diff-commented.

[Andrea Azzarone (azzar1)]

> Fine, just fix that small thing I diff-commented.

Fixed!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3847
http://jenkins.qa.ubuntu.com/job/unity-ci/1032/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/119

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1032/rebuild

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

+1

review: Approve

=== modified file 'unity-shared/TextInput.cpp'
--- unity-shared/TextInput.cpp	2014-04-23 16:49:25 +0000
+++ unity-shared/TextInput.cpp	2014-07-28 17:57:07 +0000
@@ -23,8 +23,6 @@
 #include "unity-shared/RawPixel.h"
 #include "unity-shared/PreviewStyle.h"
 
-#include <X11/XKBlib.h>
-
 namespace unity
 {
 
@@ -42,9 +40,6 @@
 const RawPixel TOOLTIP_OFFSET    = 10_em;
 const RawPixel DEFAULT_ICON_SIZE = 22_em;
 
-// Caps is on 0x1, couldn't find any #define in /usr/include/X11
-const int CAPS_STATE_ON = 0x1;
-
 std::string WARNING_ICON    = "dialog-warning-symbolic";
 // Fonts
 const std::string HINT_LABEL_DEFAULT_FONT_NAME = "Ubuntu";
@@ -114,7 +109,6 @@
   pango_entry_->SetFontSize(PANGO_ENTRY_FONT_SIZE);
   pango_entry_->cursor_moved.connect([this](int i) { QueueDraw(); });
   pango_entry_->mouse_down.connect(sigc::mem_fun(this, &TextInput::OnMouseButtonDown));
-  pango_entry_->key_up.connect(sigc::mem_fun(this, &TextInput::OnKeyUp));
   pango_entry_->end_key_focus.connect(sigc::mem_fun(this, &TextInput::OnEndKeyFocus));
   pango_entry_->text_changed.connect([this](nux::TextEntry*) {
     hint_->SetVisible(input_string().empty());
@@ -155,6 +149,10 @@
     "notify::gtk-font-name", sigc::mem_fun(this, &TextInput::OnFontChanged));
   OnFontChanged(gtk_settings_get_default());
 
+  sig_manager_.Add<void, GdkKeymap*>(gdk_keymap_get_default(), "state-changed", [this](GdkKeymap*) {
+    CheckIfCapsLockOn();
+  });
+
   input_string.SetGetterFunction(sigc::mem_fun(this, &TextInput::get_input_string));
   input_string.SetSetterFunction(sigc::mem_fun(this, &TextInput::set_input_string));
   im_active.SetGetterFunction(sigc::mem_fun(this, &TextInput::get_im_active));
@@ -174,14 +172,8 @@
 
 void TextInput::CheckIfCapsLockOn()
 {
-  Display *dpy = nux::GetGraphicsDisplay()->GetX11Display();
-  unsigned int state = 0;
-  XkbGetIndicatorState(dpy, XkbUseCoreKbd, &state);
-
-  if ((state & CAPS_STATE_ON) == 1)
-    caps_lock_on = true;
-  else
-    caps_lock_on = false;
+  GdkKeymap* keymap = gdk_keymap_get_default();
+  caps_lock_on = gdk_keymap_get_caps_lock_state(keymap) == FALSE ? false : true;
 }
 
 void TextInput::SetSpinnerVisible(bool visible)
@@ -418,16 +410,6 @@
   texture2D->UnReference();
 }
 
-void TextInput::OnKeyUp(unsigned keysym,
-                        unsigned long keycode,
-                        unsigned long state)
-{
-  if (!caps_lock_on && keysym == NUX_VK_CAPITAL)
-    caps_lock_on = true;
-  else if (caps_lock_on && keysym == NUX_VK_CAPITAL)
-    caps_lock_on = false;
-}
-
 void TextInput::OnMouseButtonDown(int x, int y, unsigned long button, unsigned long key)
 {
   hint_->SetVisible(false);

=== modified file 'unity-shared/TextInput.h'
--- unity-shared/TextInput.h	2014-04-23 16:49:25 +0000
+++ unity-shared/TextInput.h	2014-07-28 17:57:07 +0000
@@ -99,7 +99,6 @@
 protected:
   void OnInputHintChanged();
   void OnMouseButtonDown(int x, int y, unsigned long button_flags, unsigned long key_flags);
-  void OnKeyUp(unsigned keysym, unsigned long keycode, unsigned long state);
   void OnEndKeyFocus();
 
   // getters & setters