From 217ed1d0a57952f559907d96ce555a580c2f222a Mon Sep 17 00:00:00 2001
From: Alexander Zhirov <a.zhirov@agrohold.ru>
Date: Mon, 20 Feb 2023 19:09:40 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20-=20=D0=A4=D0=B8=D0=BA=D1=81=20=D1=80?=
 =?UTF-8?q?=D0=B0=D1=81=D1=88=D0=B8=D1=80=D1=8F=D0=B5=D0=BC=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D0=B8=20=D1=84=D1=80=D0=B5=D0=B9=D0=BC=D0=B0=20=D0=B2=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Выделен патч для фикса смены языка/расположения иконки для x32
---
 freerdp/client/X11/cli/settings.c |  3 ++-
 i586.patch                        | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 i586.patch

diff --git a/freerdp/client/X11/cli/settings.c b/freerdp/client/X11/cli/settings.c
index 32f1d86..0455676 100644
--- a/freerdp/client/X11/cli/settings.c
+++ b/freerdp/client/X11/cli/settings.c
@@ -398,9 +398,10 @@ static Ihandle* settingsBoxAbout()
     IupSetAttribute(inputAbout, "VISIBLELINES", "6");
     IupSetAttribute(inputAbout, "PADDING", "5");
     IupSetAttribute(inputAbout, "FORMATTING", "YES");
+    IupSetAttribute(inputAbout, "EXPAND", "YES");
     IupSetAttribute(inputAbout, "VALUE", getAbout());
 
-    return IupSetAttributes(IupFrame(IupHbox(inputAbout, NULL)), "TITLE=\"О программе\", MARGIN=10x10");
+    return IupSetAttributes(IupFrame(IupHbox(inputAbout, NULL)), "TITLE=\"О программе\", MARGIN=5x5");
 }
 
 static Ihandle* settingsHorizontalBox()
diff --git a/i586.patch b/i586.patch
new file mode 100644
index 0000000..8fab10f
--- /dev/null
+++ b/i586.patch
@@ -0,0 +1,22 @@
+diff --git a/freerdp/client/X11/cli/gui.c b/freerdp/client/X11/cli/gui.c
+index 7cbd9aa..181a3cc 100644
+--- a/freerdp/client/X11/cli/gui.c
++++ b/freerdp/client/X11/cli/gui.c
+@@ -214,7 +214,7 @@ Ihandle* guiStart()
+     IupSetAttribute(iconLang, "NAME", "KEYBOARD");
+     IupSetAttribute(iconLang, "IMAGE", "keyboardRu");
+     IupSetAttribute(iconLang, "FLOATING", "YES");
+-    IupSetAttribute(iconLang, "POSITION", "13,222");
++    IupSetAttribute(iconLang, "POSITION", "13,235");
+     IupSetAttribute(iconLang, "TIP", "Текущая раскладка клавиатуры (Alt+Shift)");
+ #endif
+ 
+@@ -268,7 +268,7 @@ Ihandle* guiStart()
+     IupSetAttribute(dlg, "DEFAULTENTER", "CONNECT");
+     IupSetAttribute(dlg, "DEFAULTESC", "CLOSE");
+ #ifdef IUP_WITH_LANGUAGE_KEYBOARD_ICON
+-    IupSetCallback(dlg, "iup_XkeyAlt(K_LSHIFT)", (Icallback) k_any);
++    IupSetCallback(dlg, "K_ANY", (Icallback) k_any);
+     IupSetCallback(dlg, "GETFOCUS_CB", (Icallback) k_any);
+ #endif
+