Keyboard layout icon names can be longer than 2 letters for issue ice…

…-wm/icewm#161.

man/icewm.pod

@@ -1391,7 +1391,7 @@ in the XPM image is the sensitive point for the mouse pointer.
 =item F<icons>
 
 Contains icons for applications and keyboard layouts. These can be in
-XPM, PNG or SVG format.  The names of an application icon files may
+XPM, PNG or SVG format.  The filename of an I<application icon> may
 follow a specific naming pattern, like F<app_32x32.xpm>.  They start
 with a base name, which usually is just a single word.  Then follows
 an underscore, followed by a size specification, as in C<SIZExSIZE>.

src/akeyboard.cc

@@ -7,6 +7,7 @@
 #include "ytrace.h"
 #include "yapp.h"
 #include "wmmgr.h"
+#include "ascii.h"
 #include "intl.h"
 #include <unistd.h>
 #include <sys/wait.h>
@@ -29,9 +30,7 @@ KeyboardStatus::KeyboardStatus(IApp* app, IAppletContainer* tb, YWindow* parent)
         setSize(w, h);
     }
     setTitle("Keyboard");
-    if (fKeyboard != null) {
-        fIcon = YIcon::getIcon(fKeyboard.substring(0, 2));
-    }
+    getIcon();
 }
 
 KeyboardStatus::~KeyboardStatus() {
@@ -53,11 +52,7 @@ void KeyboardStatus::updateKeyboard(mstring keyboard) {
                 break;
             }
         }
-        if (fKeyboard != null) {
-            fIcon = YIcon::getIcon(fKeyboard.substring(0, 2));
-        } else {
-            fIcon = null;
-        }
+        getIcon();
         repaint();
         if (toolTipVisible())
             updateToolTip();
@@ -241,4 +236,20 @@ void KeyboardStatus::draw(Graphics& g) {
     }
 }
 
+void KeyboardStatus::getIcon() {
+    fIcon = null;
+    if (fKeyboard != null) {
+        size_t k = 0;
+        while (k < fKeyboard.length() && ASCII::isLower(fKeyboard[k])) {
+            k++;
+        }
+        if (k) {
+            fIcon = YIcon::getIcon(fKeyboard.substring(0, k));
+        }
+        if (fIcon == null && k != 2) {
+            fIcon = YIcon::getIcon(fKeyboard.substring(0, 2));
+        }
+    }
+}
+
 // vim: set sw=4 ts=4 et:

src/akeyboard.h

@@ -33,6 +33,7 @@ class KeyboardStatus:
     mstring detectLayout();
     void fill(Graphics& g);
     void draw(Graphics& g);
+    void getIcon();
 
     IApp* app;
     IAppletContainer* taskBar;