Merge lp:~unity-team/nux/nux.fix-746761 into lp:nux

[Mirco Müller]

Internal modification of class nux::TextEntry to allow most common dead-keys. Also check https://launchpadlibrarian.net/69808424/working-dead-keys.ogv Fixes LP: #746761

[lp:~unity-team/nux/nux.fix-746761]

333. By Mirco Müller on 2011-04-18

Always be a good boy and clean up afterwards

[David Barth (dbarth)]

I don't feel like the code can make the difference between a /dead/ key and a normal apostrophe for example. Could you confirm that it will not impact users which don't use dead keys at all, and force them into having to type apostrophe + space to actually get the apostrophe?

review: Needs Information

[David Barth (dbarth)]

Could you also check if either pango, cairo or an accepted nux dependency can provide you with a trasnlation table or a dtection mechanism for the question i was asking above?

[Mirco Müller (macslow)]

This patch does allow entering e.g. "á" and "'a", thus mimicking real input-methods. But it does that despite what ever is set system-wide.

It is a quick fix after all and not using input-methods. That would have taken longer to figure out and implement. This was an urgent fix. But by now this will probably not be accepted anymore as we want proper input-method support and we are in a new dev-cycle anyway and have more time.

Unmerged revisions

333. By Mirco Müller on 2011-04-18

Always be a good boy and clean up afterwards

332. By Mirco Müller on 2011-04-18

Rudimentary support for dead-keys. Not perfect, but works for most common cases. Fixes LP: #746761

331. By Mirco Müller on 2011-04-15

Text-Entry widget did not have default focus, thus typing wasn't possible... fixed now

=== modified file 'Nux/TextEntry.cpp'
--- Nux/TextEntry.cpp	2011-04-07 15:54:21 +0000
+++ Nux/TextEntry.cpp	2011-04-18 15:28:17 +0000
@@ -165,6 +165,8 @@
 
     update_canvas_ = true;
 
+    _dead_key = NULL;
+
     OnMouseDown.connect (sigc::mem_fun (this, &TextEntry::RecvMouseDown) );
     OnMouseDrag.connect (sigc::mem_fun (this, &TextEntry::RecvMouseDrag) );
     OnMouseUp.connect (sigc::mem_fun (this, &TextEntry::RecvMouseUp) );
@@ -187,6 +189,8 @@
     cairo_font_options_destroy (font_options_);
     if (_texture2D)
       _texture2D->UnReference ();
+
+    ClearDeadKey ();
   }
 
   void TextEntry::PreLayoutManagement ()
@@ -346,6 +350,98 @@
     //return EVENT_RESULT_HANDLED;
   }
 
+  bool TextEntry::IsDeadKeyEmpty ()
+  {
+    return (_dead_key == NULL);
+  }
+
+  bool TextEntry::IsDeadKey (const TCHAR* character)
+  {
+    return (!strcmp (character, "~") || 
+            !strcmp (character, "^") ||
+            !strcmp (character, "`") ||
+            !strcmp (character, "'"));
+  }
+
+  void TextEntry::StoreDeadKey (const char* character)
+  {
+    ClearDeadKey ();
+    _dead_key = strdup (character);
+  }
+
+  bool TextEntry::IsSpace (const TCHAR* character)
+  {
+    return !strcmp (character, " ");
+  }
+
+  void TextEntry::ClearDeadKey ()
+  {
+    if (_dead_key)
+    {
+      free (_dead_key);
+      _dead_key = NULL;
+    }
+  }
+
+  void TextEntry::EnterDeadKey ()
+  {
+    if (_dead_key)
+    {
+      EnterText (_dead_key);
+      ClearDeadKey ();
+    }
+  }
+
+  void TextEntry::EnterComposedCharacter (const TCHAR* character)
+  {
+    if (!strcmp (_dead_key, "^") && !strcmp (character, "a")) EnterText ("â");
+    if (!strcmp (_dead_key, "~") && !strcmp (character, "a")) EnterText ("ã");
+    if (!strcmp (_dead_key, "'") && !strcmp (character, "a")) EnterText ("á");
+    if (!strcmp (_dead_key, "`") && !strcmp (character, "a")) EnterText ("à");
+    if (!strcmp (_dead_key, "^") && !strcmp (character, "A")) EnterText ("Â");
+    if (!strcmp (_dead_key, "~") && !strcmp (character, "A")) EnterText ("Ã");
+    if (!strcmp (_dead_key, "'") && !strcmp (character, "A")) EnterText ("Á");
+    if (!strcmp (_dead_key, "`") && !strcmp (character, "A")) EnterText ("À");
+
+    if (!strcmp (_dead_key, "^") && !strcmp (character, "e")) EnterText ("ê");
+    if (!strcmp (_dead_key, "~") && !strcmp (character, "e")) EnterText ("ẽ");
+    if (!strcmp (_dead_key, "'") && !strcmp (character, "e")) EnterText ("é");
+    if (!strcmp (_dead_key, "`") && !strcmp (character, "e")) EnterText ("è");
+    if (!strcmp (_dead_key, "^") && !strcmp (character, "E")) EnterText ("Ê");
+    if (!strcmp (_dead_key, "~") && !strcmp (character, "E")) EnterText ("Ẽ");
+    if (!strcmp (_dead_key, "'") && !strcmp (character, "E")) EnterText ("É");
+    if (!strcmp (_dead_key, "`") && !strcmp (character, "E")) EnterText ("È");
+
+    if (!strcmp (_dead_key, "^") && !strcmp (character, "i")) EnterText ("î");
+    if (!strcmp (_dead_key, "~") && !strcmp (character, "i")) EnterText ("ĩ");
+    if (!strcmp (_dead_key, "'") && !strcmp (character, "i")) EnterText ("í");
+    if (!strcmp (_dead_key, "`") && !strcmp (character, "i")) EnterText ("ì");
+    if (!strcmp (_dead_key, "^") && !strcmp (character, "I")) EnterText ("Î");
+    if (!strcmp (_dead_key, "~") && !strcmp (character, "I")) EnterText ("Ĩ");
+    if (!strcmp (_dead_key, "'") && !strcmp (character, "I")) EnterText ("Í");
+    if (!strcmp (_dead_key, "`") && !strcmp (character, "I")) EnterText ("Ì");
+
+    if (!strcmp (_dead_key, "^") && !strcmp (character, "o")) EnterText ("ô");
+    if (!strcmp (_dead_key, "~") && !strcmp (character, "o")) EnterText ("õ");
+    if (!strcmp (_dead_key, "'") && !strcmp (character, "o")) EnterText ("ó");
+    if (!strcmp (_dead_key, "`") && !strcmp (character, "o")) EnterText ("ò");
+    if (!strcmp (_dead_key, "^") && !strcmp (character, "O")) EnterText ("Ô");
+    if (!strcmp (_dead_key, "~") && !strcmp (character, "O")) EnterText ("Õ");
+    if (!strcmp (_dead_key, "'") && !strcmp (character, "O")) EnterText ("Ó");
+    if (!strcmp (_dead_key, "`") && !strcmp (character, "O")) EnterText ("Ò");
+
+    if (!strcmp (_dead_key, "^") && !strcmp (character, "u")) EnterText ("û");
+    if (!strcmp (_dead_key, "~") && !strcmp (character, "u")) EnterText ("ũ");
+    if (!strcmp (_dead_key, "'") && !strcmp (character, "u")) EnterText ("ú");
+    if (!strcmp (_dead_key, "`") && !strcmp (character, "u")) EnterText ("ù");
+    if (!strcmp (_dead_key, "^") && !strcmp (character, "U")) EnterText ("Û");
+    if (!strcmp (_dead_key, "~") && !strcmp (character, "U")) EnterText ("Ũ");
+    if (!strcmp (_dead_key, "'") && !strcmp (character, "U")) EnterText ("Ú");
+    if (!strcmp (_dead_key, "`") && !strcmp (character, "U")) EnterText ("Ù");
+
+    ClearDeadKey ();
+  }
+
   void TextEntry::ProcessKeyEvent (
     unsigned long    event_type  ,   /*event type*/
     unsigned long    keysym     ,   /*event keysym*/
@@ -499,7 +595,20 @@
 
     if (character != 0 && (strlen (character) != 0))
     {
-      EnterText(character);
+      if (IsDeadKeyEmpty ())
+      {
+        if (IsDeadKey (character))
+          StoreDeadKey (character);
+	else
+          EnterText (character);
+      }
+      else
+      {
+        if (IsSpace (character))
+          EnterDeadKey ();
+	else
+          EnterComposedCharacter (character);
+      }
     }
 
     QueueRefresh(false, true);

=== modified file 'Nux/TextEntry.h'
--- Nux/TextEntry.h	2011-03-24 18:42:55 +0000
+++ Nux/TextEntry.h	2011-04-18 15:28:17 +0000
@@ -317,6 +317,14 @@
     void GetCursorLocationInLayout(int *strong_x, int *strong_y, int *strong_height,
                                    int *weak_x, int *weak_y, int *weak_height);
 
+    bool IsDeadKeyEmpty ();
+    bool IsDeadKey (const TCHAR* character);
+    void StoreDeadKey (const TCHAR* character);
+    void ClearDeadKey ();
+    bool IsSpace (const TCHAR* character);
+    void EnterDeadKey ();
+    void EnterComposedCharacter (const TCHAR* character);
+
 //     /**
 //      * Updates the cursor location of input method context.
 //      */
@@ -464,6 +472,8 @@
 
     int full_height_;
 
+    TCHAR* _dead_key;
+
 //     /** The background texture of the edit control */
 //     Texture *background_;
 

=== modified file 'examples/pangotextedit.cpp'
--- examples/pangotextedit.cpp	2011-03-08 01:47:17 +0000
+++ examples/pangotextedit.cpp	2011-04-18 15:28:17 +0000
@@ -33,10 +33,10 @@
     text_entry->SetMaximumWidth(300);
     text_entry->SetMinimumHeight (20);
 
-    
     MainVLayout->AddView(text_entry, 0, nux::eCenter, nux::eFull);
     MainVLayout->SetContentDistribution(nux::eStackCenter);
-    
+    MainVLayout->SetFocused (true);
+
     nux::GetWindowThread ()->SetLayout(MainVLayout);
     nux::ColorLayer background(nux::Color(0xFF4D4D4D));
     static_cast<nux::WindowThread*>(thread)->SetWindowBackgroundPaintLayer(&background);