alexander
/
GUI-FreeRDP
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Исправлен патч gui.patch 

- Добавлено версионирование
This commit is contained in:
Alexander Zhirov 2023-02-16 19:23:41 +03:00
parent 4dea975c45
commit f3f30a4cf8
4 changed files with 73 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
freerdp/client/X11/cli/about.c Normal file
View File

@ -0,0 +1,15 @@
/*
* about.c
*
* Created on: 16 февр. 2023 г.
* Author: alexander
*/
#include "about.h"
char* getAbout()
{
char *about = ""
"GUI FreeRDP\nv1.2.1\nСобрано на основе freerdp v2.9.0";
return about;
}

13
freerdp/client/X11/cli/about.h Normal file
View File

@ -0,0 +1,13 @@
/*
* about.h
*
* Created on: 16 февр. 2023 г.
* Author: alexander
*/
#ifndef CLIENT_X11_CLI_ABOUT_H_
#define CLIENT_X11_CLI_ABOUT_H_
char* getAbout();
#endif /* CLIENT_X11_CLI_ABOUT_H_ */

49
freerdp/client/X11/cli/settings.c
View File

@ -16,6 +16,7 @@
#include "settings.h"
#include "arguments.h"
#include "node_settings.h"
#include "about.h"
void toggleActive(Ihandle *self, char *name)
{
@ -347,21 +348,51 @@ static Ihandle* settingsBoxMonitor()
IupSetInt(ddMonitor, "ACTIVE", getSetParameter(PARAMETER_FULLSCREEN) && !getSetParameter(PARAMETER_MULTIMONITOR));
return IupSetAttributes(
IupFrame(
IupFrame(
IupVbox(
IupSetAttributes(
IupVbox(
IupSetCallbacks(IupSetAttributes(tglFullscreen, "NAME=SETTINGS_TGL_FULLSCREEN, EXPAND=YES, TIP=\"Выполнить подключение на весь экран\""), "ACTION",
(Icallback) settingsTglFullscreen, NULL),
IupSetCallbacks(IupSetAttributes(tglMultimonitor, "NAME=SETTINGS_TGL_MULTIMONITOR, TIP=\"Задействовать все подключенные мониторы\""), "ACTION",
(Icallback) settingsTglMultimonitor, NULL),
IupSetCallbacks(IupSetAttributes(ddMonitor, "NAME=MONITORS, DROPDOWN=YES, EXPAND=YES, TIP=\"Выбрать конкретный монитор для подключения\""), "ACTION",
(Icallback) settingsChooseMonitor, NULL),
NULL)), "TITLE=\"Монитор\", MARGIN=10x10, CGAP=5");
IupSetCallbacks(IupSetAttributes(tglFullscreen, "NAME=SETTINGS_TGL_FULLSCREEN, EXPAND=YES, TIP=\"Выполнить подключение на весь экран\""), "ACTION", (Icallback) settingsTglFullscreen, NULL),
IupSetCallbacks(IupSetAttributes(tglMultimonitor, "NAME=SETTINGS_TGL_MULTIMONITOR, TIP=\"Задействовать все подключенные мониторы\""), "ACTION", (Icallback) settingsTglMultimonitor, NULL),
NULL
), "MARGIN=0x0, GAP=0x0"),
IupSetCallbacks(IupSetAttributes(ddMonitor, "NAME=MONITORS, DROPDOWN=YES, EXPAND=YES, TIP=\"Выбрать конкретный монитор для подключения\""), "ACTION", (Icallback) settingsChooseMonitor, NULL),
NULL)
), "TITLE=\"Монитор\", MARGIN=15x10, GAP=15x0");
}
static Ihandle* settingsBoxAbout()
{
Ihandle *inputAbout;
inputAbout = IupText(NULL);
IupSetAttribute(inputAbout, "READONLY", "YES");
IupSetAttribute(inputAbout, "MULTILINE", "YES");
IupSetAttribute(inputAbout, "SIZE", "160");
IupSetAttribute(inputAbout, "VISIBLELINES", "6");
IupSetAttribute(inputAbout, "PADDING", "5");
IupSetAttribute(inputAbout, "VALUE", getAbout());
return IupSetAttributes(IupFrame(IupHbox(inputAbout, NULL)), "TITLE=\"О программе\", MARGIN=10x10");
}
static Ihandle* settingsHorizontalBox()
{
return IupSetAttributes(
IupHbox(IupVbox(settingsBoxCheckbox(), settingsBoxMonitor(), NULL), settingsBoxSecurity(), settingsBoxBitsPerPixel(), NULL), "MARGIN=5x5");
IupHbox(
IupSetAttributes(
IupVbox(settingsBoxCheckbox(), settingsBoxMonitor(), NULL),
"NMARGIN=0x0"
),
IupSetAttributes(
IupVbox(
IupSetAttributes(IupHbox(settingsBoxSecurity(), settingsBoxBitsPerPixel(), NULL), "GAP=10x0"),
settingsBoxAbout(),
NULL),
"MARGIN=0x0"),
NULL), "NMARGIN=10x0, NGAP=10x0"
);
}
/*

34
gui.patch
View File

@ -1,8 +1,8 @@
diff --git a/client/X11/CMakeLists.txt b/client/X11/CMakeLists.txt
index 869652c..e30acc5 100644
index 869652c..c1fffe4 100644
--- a/client/X11/CMakeLists.txt
+++ b/client/X11/CMakeLists.txt
@@ -57,6 +57,37 @@ set(${MODULE_PREFIX}_SRCS
@@ -57,6 +57,38 @@ set(${MODULE_PREFIX}_SRCS
xf_client.c
xf_client.h)
@ -21,6 +21,7 @@ index 869652c..e30acc5 100644
+ cli/db.c
+ cli/address.c
+ cli/monitor.c
+ cli/about.c
+ cli/xrdp.c)
+
+set(IUP_FEATURE_TYPE "REQUIRED")
@ -40,7 +41,7 @@ index 869652c..e30acc5 100644
if (CHANNEL_TSMF_CLIENT)
set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS}
xf_tsmf.c
@@ -74,7 +105,7 @@ if(WITH_CLIENT_INTERFACE)
@@ -74,7 +106,7 @@ if(WITH_CLIENT_INTERFACE)
endif()
else()
@ -49,7 +50,7 @@ index 869652c..e30acc5 100644
add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "xfreerdp")
include_directories(..)
@@ -226,13 +257,21 @@ if(WITH_XFIXES)
@@ -226,13 +258,21 @@ if(WITH_XFIXES)
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${XFIXES_LIBRARIES})
endif()
@ -72,31 +73,6 @@ index 869652c..e30acc5 100644
if(WITH_IPP)
target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${IPP_LIBRARY_LIST})
diff --git a/client/X11/cli/CMakeLists.txt b/client/X11/cli/CMakeLists.txt
index 5f805c2..1e7d1c4 100644
--- a/client/X11/cli/CMakeLists.txt
+++ b/client/X11/cli/CMakeLists.txt
@@ -19,7 +19,19 @@ set(MODULE_NAME "xfreerdp-cli")
set(MODULE_PREFIX "FREERDP_CLIENT_X11")
set(${MODULE_PREFIX}_SRCS
- xfreerdp.c)
+ xfreerdp.c
+ images.c
+ arguments.c
+ concat.c
+ gui.c
+ node_settings.c
+ rxrandr_broker.c
+ rxrandr.c
+ settings.c
+ db.c
+ address.c
+ monitor.c
+ xrdp.c)
add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "xfreerdp" RUNTIME_OUTPUT_DIRECTORY "..")
diff --git a/client/X11/cli/xfreerdp.c b/client/X11/cli/xfreerdp.c
index 8db4d39..abdf3ca 100644
--- a/client/X11/cli/xfreerdp.c