server-main: g_error exits the application, it doesn't need exit(1) later

layersurface: avoid duplicate assignment

See merge request Librem5/squeekboard!467

data/keyboards/ara.yaml

@@ -0,0 +1,70 @@
+# Maintained by: Khaled Eldoheiri <khalid@kdehairy.com>
+---
+outlines:
+    default: { width: 32.66, height: 52 }
+    altline: { width: 48.99, height: 52 }
+    wide: { width: 62, height: 52 }
+    spaceline: { width: 195.96, height: 52 }
+    special: { width: 35.66, height: 52 }
+
+views:
+    base:
+        - "ذ ض ص ث ق ف غ ع خ ح ج"
+        - "ش س ي ب ل ا ت ن م ك ط"
+        - "Shift_L ء ؤ ر ة و ز ظ د BackSpace"
+        - "show_numbers preferences         space        . Return"
+    extra:
+        - "ذ ض ص ث ق لإ إ ع خ ح ج"
+        - "ش س ى ب لأ أ ت ن م ك ط"
+        - "Shift_L ئ لآ لا ه آ ز ظ د BackSpace"
+        - "show_numbers preferences         space        . Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   ، \" ' : ؛ ! ؟  BackSpace"
+        - "show_letters preferences         space        . Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space        . Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "extra"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ض"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    space:
+        outline: "spaceline"
+        label: " "
+        text: " "
+    Return:
+        outline: "altline"
+        icon: "key-enter"
+        keysym: "Return"

data/keyboards/ara_wide.yaml

@@ -0,0 +1,70 @@
+# Maintained by: Khaled Eldoheiri <khalid@kdehairy.com>
+---
+outlines:
+    default: { width: 49, height: 42 }
+    altline: { width: 73.5, height: 42 }
+    wide: { width: 108, height: 42 }
+    spaceline: { width: 324, height: 42 }
+    special: { width: 49, height: 42 }
+
+views:
+    base:
+        - "ذ ض ص ث ق ف غ ع خ ح ج"
+        - "ش س ي ب ل ا ت ن م ك ط"
+        - "Shift_L ء ؤ ر ة و ز ظ د BackSpace"
+        - "show_numbers preferences         space        . Return"
+    extra:
+        - "ذ ض ص ث ق لإ إ ع خ ح ج"
+        - "ش س ى ب لأ أ ت ن م ك ط"
+        - "Shift_L ئ لآ لا ه آ ز ظ د BackSpace"
+        - "show_numbers preferences         space        . Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   ، \" ' : ؛ ! ؟  BackSpace"
+        - "show_letters preferences         space        . Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ € ¥ ^ ° * { }"
+        - "show_numbers   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space        . Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "extra"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: "erase"
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "ض"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    space:
+        outline: "spaceline"
+        label: " "
+        text: " "
+    Return:
+        outline: "altline"
+        icon: "key-enter"
+        keysym: "Return"

data/keyboards/bg+phonetic.yaml

@@ -0,0 +1,78 @@
+---
+outlines:
+    default: { width: 32.72, height: 52 }
+    altline: { width: 47, height: 52 }
+    wide: { width: 49.09, height: 52 }
+    spaceline: { width: 185, height: 52 }
+    special: { width: 44, height: 52 }
+
+views:
+    base:
+        - "я в е р т ъ у и о п ю"
+        - "а с д ф г х й к л ш щ"
+        - "Shift_L з ь ц ж б н м ч BackSpace"
+        - "show_numbers preferences         space   .    Return"
+    upper:
+        - "Я В Е Р Т Ъ У И О П Ю"
+        - "А С Д Ф Г Х Й К Л Ш Щ"
+        - "Shift_L З Ь Ц Ж Б Н М Ч BackSpace"
+        - "show_numbers preferences         space   ,    Return"
+    numbers:
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ # € % & - _ + ( )"
+        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_letters preferences         space        Return"
+    symbols:
+        - "~ ` | · √ π τ ÷ × ¶"
+        - "© ® £ $ ¥ ^ ° * { }"
+        - "show_numbers_from_symbols   \\ / < > = [ ]  BackSpace"
+        - "show_letters preferences         space        Return"
+
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: erase
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "wide"
+        label: "123"
+    show_numbers_from_symbols:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "wide"
+        label: "abc"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    space:
+        outline: "spaceline"
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    colon:
+        text: ":"
+    "\"":
+        keysym: "quotedbl"

data/keyboards/bg.yaml

@@ -8,19 +8,19 @@ outlines:
 
 views:
     base:
-        - "я в е р т ъ у и о п ю"
+        - "у е и ш щ к с д з ц б"
-        - "а с д ф г х й к л ш щ"
+        - "ь я а о ж г т н в м ч"
-        - "Shift_L з ь ц ж б н м ч BackSpace"
+        - "Shift_L ю й ъ ф х п р л BackSpace"
         - "show_numbers preferences         space   .    Return"
     upper:
-        - "Я В Е Р Т Ъ У И О П Ю"
+        - "У Е И Ш Щ К С Д З Ц Б"
-        - "А С Д Ф Г Х Й К Л Ш Щ"
+        - "Ь Я А О Ж Г Т Н В М Ч"
-        - "Shift_L З Ь Ц Ж Б Н М Ч BackSpace"
+        - "Shift_L Ю Й Ъ Ф Х П Р Л BackSpace"
         - "show_numbers preferences         space   ,    Return"
     numbers:
         - "1 2 3 4 5 6 7 8 9 0"
         - "@ # € % & - _ + ( )"
-        - "show_symbols   , \" ' colon ; ! ?  BackSpace"
+        - "show_symbols , \" ' colon ; ! ? ѝ BackSpace"
         - "show_letters preferences         space        Return"
     symbols:
         - "~ ` | · √ π τ ÷ × ¶"

data/keyboards/ch+fr.yaml

@@ -0,0 +1,91 @@
+# Maintained by: Jordi Bossy <jordi@bossy.space>. No Copyright, enjoy!
+---
+outlines:
+    default:   { width: 35.33, height: 52 }
+    altline:   { width: 48,    height: 52 }
+    wide:      { width: 59,    height: 52 }
+    spaceline: { width: 70,    height: 52 }
+    special:   { width: 28,    height: 52 }
+
+views:
+    base:
+        - "q w e r t z u i o p"
+        - "a s d f g h j k l ?"
+        - "Shift_L   y x c v b n m  BackSpace"
+        - "show_numbers show_eschars preferences    '   space        , . Return"
+    upper:
+        - "Q W E R T Z U I O P"
+        - "A S D F G H J K L !"
+        - "Shift_L   Y X C V B N M  BackSpace"
+        - "show_numbers show_eschars preferences    \"  space        , . Return"
+    numbers:      
+        - "1 2 3 4 5 6 7 8 9 0"
+        - "@ * + - = ( ) ~ < >"
+        - "show_symbols  # & / \\ √ ; : BackSpace"
+        - "show_letters show_eschars preferences    _   space        , . Return"
+    symbols:
+        - "€ $ £ ¥ % | § µ [ ]"
+        - "© ® § ` ^ { } · ¡ ¿"
+        - "show_numbers  « » ÷ × “ ” „ BackSpace"
+        - "show_letters show_eschars preferences    -   space        , . Return"
+    eschars:
+        - "à â ç é è ê î ô ù û"
+        - "À Â Ç É È Ê Î Ô Ù Û"
+        - "show_numbers  æ œ ä ë ï ö ü  BackSpace"
+        - "show_letters_from_accents preferences  ñ Ñ   space        ° ß Return"
+
+buttons:
+    Shift_L:
+        action:
+            locking:
+                lock_view: "upper"
+                unlock_view: "base"
+        outline: "altline"
+        icon: "key-shift"
+    BackSpace:
+        outline: "altline"
+        icon: "edit-clear-symbolic"
+        action: erase
+    preferences:
+        action: "show_prefs"
+        outline: "special"
+        icon: "keyboard-mode-symbolic"
+    show_numbers:
+        action:
+            set_view: "numbers"
+        outline: "altline"
+        label: "123"
+    show_letters:
+        action:
+            set_view: "base"
+        outline: "altline"
+        label: "abc"
+    show_symbols:
+        action:
+            set_view: "symbols"
+        outline: "altline"
+        label: "*/="
+    show_eschars:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "altline"
+        label: "âÂ"
+    show_letters_from_accents:
+        action:
+            locking:
+                lock_view: "eschars"
+                unlock_view: "base"
+        outline: "altline"
+        label: "âÂ"
+    space:
+        outline: "spaceline"
+        label: " "
+        text: " "
+    Return:
+        outline: "wide"
+        icon: "key-enter"
+        keysym: "Return"
+    "\"":
+        keysym: "quotedbl"

data/langs/bg-BG.txt

@@ -1,13 +1,22 @@
+ara Арабски
+be Белгийски
 bg Български
+br Бразилски
+cz Чешки
 de Немски
+dk Датски
 es Испански
 emoji Емоджи
-fi Френски
+fi Фински
+fr Френски
 gr Гръцки
-it Италянски
+it Италиански
-no Норевежки
+jp Японски
+no Норвежки
 pl Полски
 ru Руски
 se Шведски
+th Тайски
+ua Украински
 terminal Терминал
 us Английски (САЩ)

eek/layersurface.c

@@ -312,7 +312,6 @@ on_phosh_layer_surface_unmapped (PhoshLayerSurface *self, gpointer unused)
   PhoshLayerSurfacePrivate *priv;
 
   g_return_if_fail (PHOSH_IS_LAYER_SURFACE (self));
-  priv = phosh_layer_surface_get_instance_private (self);
 
   priv = phosh_layer_surface_get_instance_private (self);
   if (priv->layer_surface) {

src/resources.rs

@@ -18,12 +18,18 @@ static KEYBOARDS: &[(&'static str, &'static str)] = &[
     ("us_wide", include_str!("../data/keyboards/us_wide.yaml")),
 
     // Language layouts: keep alphabetical.
+    ("ara", include_str!("../data/keyboards/ara.yaml")),
+    ("ara_wide", include_str!("../data/keyboards/ara_wide.yaml")),
+
     ("be", include_str!("../data/keyboards/be.yaml")),
     ("be_wide", include_str!("../data/keyboards/be_wide.yaml")),
 
     ("bg", include_str!("../data/keyboards/bg.yaml")),
+    ("bg+phonetic", include_str!("../data/keyboards/bg+phonetic.yaml")),
 
     ("br", include_str!("../data/keyboards/br.yaml")),
+    
+    ("ch+fr", include_str!("../data/keyboards/ch+fr.yaml")),
 
     ("de", include_str!("../data/keyboards/de.yaml")),
     ("de_wide", include_str!("../data/keyboards/de_wide.yaml")),

src/server-main.c

@@ -83,7 +83,6 @@ on_name_lost (GDBusConnection *connection,
     (void)name;
     (void)user_data;
     g_error("DBus unavailable, unclear how to continue.");
-    exit (1);
 }
 
 // Wayland
@@ -264,7 +263,6 @@ main (int argc, char **argv)
 
     if (display == NULL) {
         g_error ("Failed to get display: %m\n");
-        exit(1);
     }
 
 
@@ -277,11 +275,12 @@ main (int argc, char **argv)
 
     if (!instance.wayland.seat) {
         g_error("No seat Wayland global available.");
-        exit(1);
     }
     if (!instance.wayland.virtual_keyboard_manager) {
         g_error("No virtual keyboard manager Wayland global available.");
-        exit(1);
+    }
+    if (!instance.wayland.layer_shell) {
+        g_error("No layer shell global available.");
     }
 
     if (!instance.wayland.input_method_manager) {
@@ -380,7 +379,6 @@ main (int argc, char **argv)
                 vis_manager);
     if (!ui_context) {
         g_error("Could not initialize GUI");
-        exit(1);
     }
     instance.ui_context = ui_context;
     squeek_visman_set_ui(vis_manager, instance.ui_context);

tests/meson.build

@@ -58,9 +58,12 @@ foreach layout : [
     'us', 'us_wide',
 
     # Block: Languages
+    'ara', 'ara_wide',
     'be', 'be_wide',
     'bg',
+    'bg+phonetic',
     'br',
+    'ch+fr',
     'cz', 'cz_wide',
     'cz+qwerty', 'cz+qwerty_wide',
     'de', 'de_wide',