Merge branch 'tari01-pr/show-layout'

Attributes GH PR #52: https://github.com/AyatanaIndicators/ayatana-indicator-keyboard/pull/52

10 files changed, 116 insertions, 27 deletions

diff --git a/data/icons/ContrastHigh/scalable/status/ayatana-indicator-keyboard-An.svg b/data/icons/ContrastHigh/scalable/status/ayatana-indicator-keyboard-An.svg
new file mode 100644
index 00000000..365e0229
--- /dev/null
+++ b/data/icons/ContrastHigh/scalable/status/ayatana-indicator-keyboard-An.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg version="1.1" width="24" height="24"><rect x="0.4" y="0.4" width="23.2" height="23.2" rx="4.0" style="stroke:black;stroke-width:0.8;fill:white;"/><text x="2.5" y="16.5009765625" style="font-family:Sans Regular;font-weight:600;font-size:13;fill:black">An</text></svg>
diff --git a/data/icons/ContrastHigh/scalable/status/ayatana-indicator-keyboard-Go.svg b/data/icons/ContrastHigh/scalable/status/ayatana-indicator-keyboard-Go.svg
new file mode 100644
index 00000000..fb70e020
--- /dev/null
+++ b/data/icons/ContrastHigh/scalable/status/ayatana-indicator-keyboard-Go.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg version="1.1" width="24" height="24"><rect x="0.4" y="0.4" width="23.2" height="23.2" rx="4.0" style="stroke:black;stroke-width:0.8;fill:white;"/><text x="2.5" y="16.5009765625" style="font-family:Sans Regular;font-weight:600;font-size:13;fill:black">Go</text></svg>
diff --git a/data/icons/hicolor/scalable/status/ayatana-indicator-keyboard-An.svg b/data/icons/hicolor/scalable/status/ayatana-indicator-keyboard-An.svg
new file mode 100644
index 00000000..a610ecc1
--- /dev/null
+++ b/data/icons/hicolor/scalable/status/ayatana-indicator-keyboard-An.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg version="1.1" width="24" height="24"><defs><mask id="m"><rect x="0" y="0" width="24" height="24" style="fill:white"/><text x="3.0" y="17.193359375" style="font-family:Sans Regular;font-weight:500;font-size:15;fill:black">An</text></mask></defs><rect x="0.0" y="0.0" width="24" height="24" rx="3" mask="url(#m)" style="fill:#ffffff"/></svg>
diff --git a/data/icons/hicolor/scalable/status/ayatana-indicator-keyboard-Go.svg b/data/icons/hicolor/scalable/status/ayatana-indicator-keyboard-Go.svg
new file mode 100644
index 00000000..a51cc3fc
--- /dev/null
+++ b/data/icons/hicolor/scalable/status/ayatana-indicator-keyboard-Go.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg version="1.1" width="24" height="24"><defs><mask id="m"><rect x="0" y="0" width="24" height="24" style="fill:white"/><text x="3.0" y="17.193359375" style="font-family:Sans Regular;font-weight:500;font-size:15;fill:black">Go</text></mask></defs><rect x="0.0" y="0.0" width="24" height="24" rx="3" mask="url(#m)" style="fill:#ffffff"/></svg>
diff --git a/debian/control b/debian/control
index c862f7de..1e28556c 100644
--- a/debian/control
+++ b/debian/control
@@ -28,6 +28,8 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ayatana-indicator-common,
+         matekbd-keyboard-display | gkbd-capplet,
+         zenity,
 Description: Ayatana Indicator Keyboard Applet
  This package contains the keyboard indicator, which should show as an
  icon in the top panel of indicator aware destkop environments.
diff --git a/src/keyboard-lomiri.c b/src/keyboard-lomiri.c
index c6496e87..e5e0f623 100644
--- a/src/keyboard-lomiri.c
+++ b/src/keyboard-lomiri.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 Robert Tari <robert@tari.in>
+ * Copyright 2021-2023 Robert Tari <robert@tari.in>
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -185,6 +185,11 @@ guint keyboard_GetNumLayouts(Keyboard *pKeyboard)
     }
 }
 
+guint keyboard_GetLayoutIndex (Keyboard *pKeyboard)
+{
+    return pKeyboard->pPrivate->nLayout;
+}
+
 void keyboard_GetLayout(Keyboard *pKeyboard, gint nLayout, gchar **pLanguage, gchar **pDescription)
 {
     if (nLayout == -1)
diff --git a/src/keyboard-x11.c b/src/keyboard-x11.c
index c3161377..2e8435ff 100644
--- a/src/keyboard-x11.c
+++ b/src/keyboard-x11.c
@@ -370,6 +370,11 @@ guint keyboard_GetNumLayouts(Keyboard *pKeyboard)
     return nLayouts;
 }
 
+guint keyboard_GetLayoutIndex (Keyboard *pKeyboard)
+{
+    return pKeyboard->pPrivate->nLayout;
+}
+
 void keyboard_GetLayout(Keyboard *pKeyboard, gint nLayout, gchar **pLanguage, gchar **pDescription)
 {
     if (nLayout == -1)
@@ -588,8 +593,14 @@ static void keyboard_init(Keyboard *self)
             pLayout->sDescription = g_strdup(sDescription);
         }
 
-        g_hash_table_replace(self->pPrivate->lLayouts, pLayout->sId, pLayout);
+        gboolean bContains = g_hash_table_contains (self->pPrivate->lLayouts, pLayout->sId);
 
+        if (!bContains)
+        {
+            g_debug ("    {\"%s\", \"%s\"}, //%s", pLayout->sLanguage, pLayout->sId, pLayout->sDescription);
+        }
+
+        g_hash_table_replace(self->pPrivate->lLayouts, pLayout->sId, pLayout);
         pRxkbLayout = rxkb_layout_next(pRxkbLayout);
     }
 
diff --git a/src/keyboard.h b/src/keyboard.h
index 20ae9dac..39f822cd 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Robert Tari <robert@tari.in>
+ * Copyright 2021-2023 Robert Tari <robert@tari.in>
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -47,6 +47,7 @@ GType keyboard_get_type(void);
 Keyboard* keyboard_new();
 void keyboard_AddSource(Keyboard *pKeyboard);
 guint keyboard_GetNumLayouts(Keyboard *pKeyboard);
+guint keyboard_GetLayoutIndex (Keyboard *pKeyboard);
 void keyboard_GetLayout(Keyboard *pKeyboard, gint nLayout, gchar **pLanguage, gchar **pDescription);
 void keyboard_SetLayout(Keyboard *pKeyboard, gint nLayout);
 
diff --git a/src/languages.h b/src/languages.h
index e7497773..66af1a33 100644
--- a/src/languages.h
+++ b/src/languages.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 Robert Tari <robert@tari.in>
+ * Copyright 2021-2023 Robert Tari <robert@tari.in>
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -32,7 +32,10 @@ Language LANGUAGES[] =
     {"En", "us+alt-intl"}, //English (US, alt. intl.)
     {"En", "us+colemak"}, //English (Colemak)
     {"En", "us+colemak_dh"}, //English (Colemak-DH)
+    {"En", "us+colemak_dh_wide"}, //English (Colemak-DH Wide)
+    {"En", "us+colemak_dh_ortho"}, //English (Colemak-DH Ortholinear)
     {"En", "us+colemak_dh_iso"}, //English (Colemak-DH ISO)
+    {"En", "us+colemak_dh_wide_iso"}, //English (Colemak-DH Wide ISO)
     {"En", "us+dvorak"}, //English (Dvorak)
     {"En", "us+dvorak-intl"}, //English (Dvorak, intl., with dead keys)
     {"En", "us+dvorak-alt-intl"}, //English (Dvorak, alt. intl.)
@@ -77,7 +80,7 @@ Language LANGUAGES[] =
     {"De", "at"}, //German (Austria)
     {"De", "at+nodeadkeys"}, //German (Austria, no dead keys)
     {"De", "at+mac"}, //German (Austria, Macintosh)
-    {"En", "au"}, //English (Australian)
+    {"En", "au"}, //English (Australia)
     {"Az", "az"}, //Azerbaijani
     {"Az", "az+cyrillic"}, //Azerbaijani (Cyrillic)
     {"Be", "by"}, //Belarusian
@@ -103,6 +106,7 @@ Language LANGUAGES[] =
     {"Bn", "in+ben_inscript"}, //Bangla (India, Baishakhi InScript)
     {"Ma", "in+eeyek"}, //Manipuri (Eeyek)
     {"Gu", "in+guj"}, //Gujarati
+    {"Gu", "in+guj-kagapa"}, //Gujarati (KaGaPa, phonetic)
     {"Pa", "in+guru"}, //Punjabi (Gurmukhi)
     {"Pa", "in+jhelum"}, //Punjabi (Gurmukhi Jhelum)
     {"Kn", "in+kan"}, //Kannada
@@ -110,6 +114,7 @@ Language LANGUAGES[] =
     {"Ml", "in+mal"}, //Malayalam
     {"Ml", "in+mal_lalitha"}, //Malayalam (Lalitha)
     {"Ml", "in+mal_enhanced"}, //Malayalam (enhanced InScript, with rupee)
+    {"Ml", "in+mal_poorna"}, //Malayalam (Poorna, extended InScript)
     {"Or", "in+ori"}, //Oriya
     {"Or", "in+ori-bolnagri"}, //Oriya (Bolnagri)
     {"Or", "in+ori-wx"}, //Oriya (Wx)
@@ -143,6 +148,7 @@ Language LANGUAGES[] =
     {"Pt", "br+nodeadkeys"}, //Portuguese (Brazil, no dead keys)
     {"Pt", "br+dvorak"}, //Portuguese (Brazil, Dvorak)
     {"Pt", "br+nativo"}, //Portuguese (Brazil, Nativo)
+    {"Ru", "br+rus"}, //Russian (Brazil, phonetic)
     {"Pt", "br+nativo-us"}, //Portuguese (Brazil, Nativo for US keyboards)
     {"Eo", "br+nativo-epo"}, //Esperanto (Brazil, Nativo)
     {"Pt", "br+thinkpad"}, //Portuguese (Brazil, IBM/Lenovo ThinkPad)
@@ -202,13 +208,15 @@ Language LANGUAGES[] =
     {"Hr", "hr+unicodeus"}, //Croatian (US, with Croatian digraphs)
     {"Hr", "hr+us"}, //Croatian (US)
     {"Cs", "cz"}, //Czech
-    {"Cs", "cz+bksl"}, //Czech (with <\|> key)
+    {"Cs", "cz+bksl"}, //Czech (extra backslash)
     {"Cs", "cz+qwerty"}, //Czech (QWERTY)
-    {"Cs", "cz+qwerty_bksl"}, //Czech (QWERTY, extended backslash)
+    {"Cs", "cz+qwerty_bksl"}, //Czech (QWERTY, extra backslash)
     {"Cs", "cz+qwerty-mac"}, //Czech (QWERTY, Macintosh)
     {"Cs", "cz+ucw"}, //Czech (UCW, only accented letters)
     {"Cs", "cz+dvorak-ucw"}, //Czech (US, Dvorak, UCW support)
-    {"Ru", "cz+rus"}, //Russian (Czech, phonetic)
+    {"Ru", "cz+rus"}, //Russian (Czechia, phonetic)
+    {"Cs", "cz+winkeys"}, //Czech (QWERTZ, Windows flavour)
+    {"Cs", "cz+winkeys-qwerty"}, //Czech (QWERTY, Windows flavour)
     {"Da", "dk"}, //Danish
     {"Da", "dk+nodeadkeys"}, //Danish (no dead keys)
     {"Da", "dk+winkeys"}, //Danish (Windows)
@@ -226,6 +234,7 @@ Language LANGUAGES[] =
     {"Et", "ee+us"}, //Estonian (US)
     {"Fa", "ir"}, //Persian
     {"Fa", "ir+pes_keypad"}, //Persian (with Persian keypad)
+    {"Fa", "ir+winkeys"}, //Persian (Windows)
     {"Az", "ir+azb"}, //Azerbaijani (Iran)
     {"Ku", "ir+ku"}, //Kurdish (Iran, Latin Q)
     {"Ku", "ir+ku_f"}, //Kurdish (Iran, F)
@@ -373,7 +382,8 @@ Language LANGUAGES[] =
     {"Lv", "lv+apostrophe"}, //Latvian (apostrophe)
     {"Lv", "lv+tilde"}, //Latvian (tilde)
     {"Lv", "lv+fkey"}, //Latvian (F)
-    {"Lv", "lv+modern"}, //Latvian (modern)
+    {"Lv", "lv+modern"}, //Latvian (Modern Latin)
+    {"Lv", "lv+modern-cyr"}, //Latvian (Modern Cyrillic)
     {"Lv", "lv+ergonomic"}, //Latvian (ergonomic, ŪGJRMV)
     {"Lv", "lv+adapted"}, //Latvian (adapted)
     {"Mi", "mao"}, //Maori
@@ -401,6 +411,8 @@ Language LANGUAGES[] =
     {"No", "no+mac"}, //Norwegian (Macintosh)
     {"No", "no+mac_nodeadkeys"}, //Norwegian (Macintosh, no dead keys)
     {"No", "no+colemak"}, //Norwegian (Colemak)
+    {"No", "no+colemak_dh"}, //Norwegian (Colemak-DH)
+    {"No", "no+colemak_dh_wide"}, //Norwegian (Colemak-DH Wide)
     {"Pl", "pl"}, //Polish
     {"Pl", "pl+legacy"}, //Polish (legacy)
     {"Pl", "pl+qwertz"}, //Polish (QWERTZ)
@@ -461,9 +473,9 @@ Language LANGUAGES[] =
     {"Sl", "si+alternatequotes"}, //Slovenian (with guillemets)
     {"Sl", "si+us"}, //Slovenian (US)
     {"Sk", "sk"}, //Slovak
-    {"Sk", "sk+bksl"}, //Slovak (extended backslash)
+    {"Sk", "sk+bksl"}, //Slovak (extra backslash)
     {"Sk", "sk+qwerty"}, //Slovak (QWERTY)
-    {"Sk", "sk+qwerty_bksl"}, //Slovak (QWERTY, extended backslash)
+    {"Sk", "sk+qwerty_bksl"}, //Slovak (QWERTY, extra backslash)
     {"Es", "es"}, //Spanish
     {"Es", "es+nodeadkeys"}, //Spanish (no dead keys)
     {"Es", "es+winkeys"}, //Spanish (Windows)
@@ -471,7 +483,6 @@ Language LANGUAGES[] =
     {"Es", "es+dvorak"}, //Spanish (Dvorak)
     {"As", "es+ast"}, //Asturian (Spain, with bottom-dot H and L)
     {"Ca", "es+cat"}, //Catalan (Spain, with middle-dot L)
-    {"Es", "es+mac"}, //Spanish (Macintosh)
     {"Sv", "se"}, //Swedish
     {"Sv", "se+nodeadkeys"}, //Swedish (no dead keys)
     {"Sv", "se+dvorak"}, //Swedish (Dvorak)
@@ -526,8 +537,6 @@ Language LANGUAGES[] =
     {"Uk", "ua+winkeys"}, //Ukrainian (Windows)
     {"Uk", "ua+macOS"}, //Ukrainian (macOS)
     {"Uk", "ua+legacy"}, //Ukrainian (legacy)
-    {"Uk", "ua+rstu"}, //Ukrainian (standard RSTU)
-    {"Ru", "ua+rstu_ru"}, //Russian (Ukraine, standard RSTU)
     {"Uk", "ua+homophonic"}, //Ukrainian (homophonic)
     {"Tt", "ua+crh"}, //Crimean Tatar (Turkish Q)
     {"Tt", "ua+crh_f"}, //Crimean Tatar (Turkish F)
@@ -598,7 +607,7 @@ Language LANGUAGES[] =
     {"Ph", "ph+dvorak"}, //Filipino (Dvorak, Latin)
     {"Ph", "ph+dvorak-bay"}, //Filipino (Dvorak, Baybayin)
     {"Ro", "md"}, //Moldavian
-    {"Ro", "md+gag"}, //Moldavian (Gagauz)
+    {"Ro", "md+gag"}, //Gagauz (Moldova)
     {"Id", "id"}, //Indonesian (Latin)
     {"Jv", "id+javanese"}, //Javanese
     {"Id", "id+melayu-phonetic"}, //Indonesian (Arab Melayu, phonetic)
@@ -607,6 +616,10 @@ Language LANGUAGES[] =
     {"Ms", "my"}, //Malay (Jawi, Arabic Keyboard)
     {"Ms", "my+phonetic"}, //Malay (Jawi, phonetic)
     {"custom", "custom"}, //A user-defined custom Layout
+    {"An", "ancient"}, //Ancient
+    {"Go", "ancient+got"}, //Gothic
+    {"Ua", "ancient+uga"}, //Ugaritic
+    {"Ae", "ancient+ave"}, //Avestan
     {"Ap", "apl"}, //APL
     {"Ap", "apl+dyalog"}, //APL symbols (Dyalog APL)
     {"Ap", "apl+sax"}, //APL symbols (SAX, Sharp APL for Unix)
@@ -633,7 +646,6 @@ Language LANGUAGES[] =
     {"Cp", "eg"}, //Coptic
     {"Hu", "hu+oldhun"}, //Old Hungarian
     {"Hu", "hu+oldhunlig"}, //Old Hungarian (for ligatures)
-    {"Ae", "ir+ave"}, //Avestan
     {"Lt", "lt+us_dvorak"}, //Lithuanian (Dvorak)
     {"Lt", "lt+sun_type6"}, //Lithuanian (Sun Type 6/7)
     {"Lv", "lv+dvorak"}, //Latvian (Dvorak)
@@ -650,7 +662,7 @@ Language LANGUAGES[] =
     {"En", "us+alt-intl-unicode"}, //English (US, intl., AltGr Unicode combining, alt.)
     {"At", "us+ats"}, //Atsina
     {"Sx", "us+crd"}, //Coeur d'Alene Salish
-    {"Cs", "us+cz_sk_de"}, //Czech Slovak and German (US)
+    {"Cs", "us+cz_sk_de"}, //Czech, Slovak and German (US)
     {"Cs", "us+cz_sk_pl_de_es_fi_sv"}, //Czech, Slovak, Polish, Spanish, Finnish, Swedish and German (US)
     {"En", "us+drix"}, //English (Drix)
     {"De", "us+de_se_fi"}, //German, Swedish and Finnish (US)
@@ -680,7 +692,7 @@ Language LANGUAGES[] =
     {"Ro", "ro+sun_type6"}, //Romanian (Sun Type 6/7)
     {"Sr", "rs+combiningkeys"}, //Serbian (combining accents instead of dead keys)
     {"Cu", "ru+chu"}, //Church Slavonic
-    {"Ru", "ru+ruu"}, //Russian (with Ukrainian-Belorussian layout)
+    {"Ru", "ru+ruu"}, //Russian (plus Ukrainian and Belarusian letters)
     {"Ru", "ru+rulemak"}, //Russian (Rulemak, phonetic Colemak)
     {"Ru", "ru+phonetic_mac"}, //Russian (phonetic Macintosh)
     {"Ru", "ru+sun_type6"}, //Russian (Sun Type 6/7)
@@ -689,20 +701,20 @@ Language LANGUAGES[] =
     {"Ru", "ru+gost-14289-88"}, //Russian (GOST 14289-88)
     {"Ru", "ru+prxn"}, //Russian (Polyglot and Reactionary)
     {"Ru", "ru+winkeys-p"}, //Russian (Programmer)
+    {"Ru", "ru+typo"}, //Russian (plus typographic symbols)
+    {"Ru", "ru+rtu"}, //Russian (plus Tatar letters)
     {"Hy", "am+olpc-phonetic"}, //Armenian (OLPC, phonetic)
     {"He", "il+biblicalSIL"}, //Hebrew (Biblical, SIL phonetic)
     {"Ar", "ara+sun_type6"}, //Arabic (Sun Type 6/7)
     {"Ar", "ara+basic_ext"}, //Arabic (Arabic numerals, extensions in the 4th level)
     {"Ar", "ara+basic_ext_digits"}, //Arabic (Eastern Arabic numerals, extensions in the 4th level)
-    {"Ua", "ara+uga"}, //Ugaritic instead of Arabic
     {"Ar", "ara+ergoarabic"}, //Arabic (ErgoArabic)
     {"Bl", "be+sun_type6"}, //Belgian (Sun Type 6/7)
     {"Pt", "br+sun_type6"}, //Portuguese (Brazil, Sun Type 6/7)
     {"Cs", "cz+sun_type6"}, //Czech (Sun Type 6/7)
     {"Cs", "cz+prog"}, //Czech (programming)
-    {"Cs", "cz+typo"}, //Czech (typographic)
-    {"Cs", "cz+coder"}, //Czech (coder)
     {"Cs", "cz+prog_typo"}, //Czech (programming, typographic)
+    {"Cs", "cz+coder"}, //Czech (coder)
     {"Cs", "cz+colemak-ucw"}, //Czech (US, Colemak, UCW support)
     {"Da", "dk+sun_type6"}, //Danish (Sun Type 6/7)
     {"Nl", "nl+sun_type6"}, //Dutch (Sun Type 6/7)
@@ -734,7 +746,6 @@ Language LANGUAGES[] =
     {"De", "ch+sun_type6_de"}, //German (Switzerland, Sun Type 6/7)
     {"Fr", "ch+sun_type6_fr"}, //French (Switzerland, Sun Type 6/7)
     {"Tr", "tr+sun_type6"}, //Turkish (Sun Type 6/7)
-    {"Tr", "tr+otk"}, //Old Turkic
     {"Tr", "tr+us"}, //Turkish (Turkey, Latin Q, Swap i and ı)
     {"Uk", "ua+sun_type6"}, //Ukrainian (Sun Type 6/7)
     {"En", "gb+sun_type6"}, //English (UK, Sun Type 6/7)
@@ -746,7 +757,7 @@ Language LANGUAGES[] =
     {"Ix", "trans+qwerty"}, //International Phonetic Alphabet (QWERTY)
     {"Md", "in+modi-kagapa"}, //Modi (KaGaPa phonetic)
     {"Sa", "in+san-misc"}, //Sanskrit symbols
-    {"Ur", "in+urd-navees"}, //Urdu (Navees)}
+    {"Ur", "in+urd-navees"}, //Urdu (Navees)
     {"emoji", "emoji"}, //Emoji
     {NULL, NULL}
 };
diff --git a/src/service.c b/src/service.c
index 3dabf5c9..7593a0aa 100644
--- a/src/service.c
+++ b/src/service.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 Robert Tari <robert@tari.in>
+ * Copyright 2021-2023 Robert Tari <robert@tari.in>
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -30,6 +30,7 @@ static void *m_pLibHandle = NULL;
 static Keyboard* (*m_fnKeyboardNew)();
 static void (*m_fnKeyboardAddSource)(Keyboard *pKeyboard);
 static guint (*m_fnKeyboardGetNumLayouts)(Keyboard *pKeyboard);
+static guint (*m_fnKeyboardGetLayoutIndex)(Keyboard *pKeyboard);
 static void (*m_fnKeyboardGetLayout)(Keyboard *pKeyboard, gint nLayout, gchar **pLanguage, gchar **pDescription);
 static void (*m_fnKeyboardSetLayout)(Keyboard *pKeyboard, gint nLayout);
 
@@ -37,7 +38,8 @@ enum
 {
     SECTION_HEADER = (1 << 0),
     SECTION_LAYOUTS = (1 << 1),
-    SECTION_SETTINGS = (1 << 2)
+    SECTION_DISPLAY = (1 << 2),
+    SECTION_SETTINGS = (1 << 3)
 };
 
 enum
@@ -73,6 +75,7 @@ struct _IndicatorKeyboardServicePrivate
     struct ProfileMenuInfo lMenus[N_PROFILES];
     GSimpleActionGroup *pActionGroup;
     GSimpleAction *pSettingsAction;
+    GSimpleAction *pDisplayAction;
     GSimpleAction *pLayoutAction;
     GMenu *pLayoutSection;
     Keyboard *pKeyboard;
@@ -187,6 +190,14 @@ static GMenuModel* createSettingsSection(IndicatorKeyboardService *self)
     return G_MENU_MODEL(pMenu);
 }
 
+static GMenuModel* createDisplaySection (IndicatorKeyboardService *self)
+{
+    GMenu * pMenu = g_menu_new ();
+    g_menu_append (pMenu, _("Show Current Layout"), "indicator.display");
+
+    return G_MENU_MODEL (pMenu);
+}
+
 static void rebuildSection(GMenu *pMenu, int nPos, GMenuModel *pModel)
 {
     g_menu_remove(pMenu, nPos);
@@ -219,10 +230,15 @@ static void rebuildNow(IndicatorKeyboardService *self, guint nSections)
         rebuildSection(pInfoGreeter->pSubmenu, 0, createLayoutSection(self));
     }
 
+    if (nSections & SECTION_DISPLAY)
+    {
+        rebuildSection (pInfoDesktop->pSubmenu, 1, createDisplaySection (self));
+    }
+
     if (nSections & SECTION_SETTINGS)
     {
-        rebuildSection(pInfoDesktop->pSubmenu, 1, createSettingsSection(self));
-        rebuildSection(pInfoPhone->pSubmenu, 1, createSettingsSection(self));
+        rebuildSection(pInfoDesktop->pSubmenu, 2, createSettingsSection(self));
+        rebuildSection(pInfoPhone->pSubmenu, 2, createSettingsSection(self));
     }
 }
 
@@ -246,6 +262,7 @@ static void createMenu(IndicatorKeyboardService *self, int nProfile)
     else if (nProfile == PROFILE_DESKTOP)
     {
         lSections[nSection++] = createLayoutSection(self);
+        lSections[nSection++] = createDisplaySection(self);
         lSections[nSection++] = createSettingsSection(self);
     }
     else if (nProfile == PROFILE_GREETER)
@@ -310,6 +327,37 @@ static void onSettings(GSimpleAction *pAction, GVariant *pVariant, gpointer pUse
     }
 }
 
+static void onDisplay (GSimpleAction *pAction, GVariant *pVariant, gpointer pData)
+{
+    IndicatorKeyboardService *self = INDICATOR_KEYBOARD_SERVICE (pData);
+    guint nLayout = m_fnKeyboardGetLayoutIndex (self->pPrivate->pKeyboard);
+    gchar *sProgram = NULL;
+
+    if (ayatana_common_utils_is_mate ())
+    {
+        sProgram = "matekbd-keyboard-display";
+    }
+    else
+    {
+        sProgram = "gkbd-keyboard-display";
+    }
+
+    gboolean bHasProgram = ayatana_common_utils_have_program (sProgram);
+
+    if (!bHasProgram)
+    {
+        gchar *sMessage = g_strdup_printf ("The %s application is required to display keyboard layouts, but it was not found.", sProgram);
+        ayatana_common_utils_zenity_warning ("dialog-warning", _("Warning"), sMessage);
+        g_free (sMessage);
+
+        return;
+    }
+
+    gchar *sCommand = g_strdup_printf ("%s -g %i", sProgram, nLayout + 1);
+    ayatana_common_utils_execute_command (sCommand);
+    g_free (sCommand);
+}
+
 static void initActions(IndicatorKeyboardService *self)
 {
     GSimpleAction *pAction;
@@ -333,6 +381,11 @@ static void initActions(IndicatorKeyboardService *self)
     g_action_map_add_action(G_ACTION_MAP(self->pPrivate->pActionGroup), G_ACTION(pAction));
     self->pPrivate->pSettingsAction = pAction;
     g_signal_connect(pAction, "activate", G_CALLBACK(onSettings), self);
+
+    pAction = g_simple_action_new ("display", NULL);
+    g_action_map_add_action (G_ACTION_MAP (self->pPrivate->pActionGroup), G_ACTION (pAction));
+    self->pPrivate->pDisplayAction = pAction;
+    g_signal_connect (pAction, "activate", G_CALLBACK (onDisplay), self);
 }
 
 static void onBusAcquired(GDBusConnection *pConnection, const gchar *sName, gpointer pData)
@@ -441,6 +494,7 @@ static void onDispose(GObject *pObject)
     }
 
     g_clear_object (&self->pPrivate->pSettingsAction);
+    g_clear_object (&self->pPrivate->pDisplayAction);
     g_clear_object (&self->pPrivate->pLayoutAction);
 
     for (int nProfile = 0; nProfile < N_PROFILES; ++nProfile)
@@ -493,6 +547,7 @@ static void indicator_keyboard_service_init(IndicatorKeyboardService *self)
 
     m_fnKeyboardAddSource = dlsym(m_pLibHandle, "keyboard_AddSource");
     m_fnKeyboardGetNumLayouts = dlsym(m_pLibHandle, "keyboard_GetNumLayouts");
+    m_fnKeyboardGetLayoutIndex = dlsym(m_pLibHandle, "keyboard_GetLayoutIndex");
     m_fnKeyboardGetLayout = dlsym(m_pLibHandle, "keyboard_GetLayout");
     m_fnKeyboardSetLayout = dlsym(m_pLibHandle, "keyboard_SetLayout");
     self->pPrivate = indicator_keyboard_service_get_instance_private(self);