Исправлено дублирвоание для host записей, добавлены CMake-конфиги FreeRDP

FreeRDP_X11_path_config/CMakeLists.txt

@@ -0,0 +1,253 @@
+# FreeRDP: A Remote Desktop Protocol Implementation
+# FreeRDP X11 Client
+#
+# Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+# Copyright 2013 Corey Clayton <can.of.tuna@gmail.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set(MODULE_NAME "xfreerdp-client")
+set(MODULE_PREFIX "FREERDP_CLIENT_X11_CONTROL")
+
+include(FindDocBookXSL)
+include_directories(${X11_INCLUDE_DIRS})
+include_directories(${OPENSSL_INCLUDE_DIR})
+
+include_directories(iup PRIVATE /root/iup/iup/source/include)
+
+set(${MODULE_PREFIX}_SRCS
+	xf_gdi.c
+	xf_gdi.h
+	xf_gfx.c
+	xf_gfx.h
+	xf_rail.c
+	xf_rail.h	
+	xf_input.c
+	xf_input.h
+	xf_event.c
+	xf_event.h
+	xf_floatbar.c
+	xf_floatbar.h
+	xf_input.c
+	xf_input.h
+	xf_channels.c
+	xf_channels.h
+	xf_cliprdr.c
+	xf_cliprdr.h
+	xf_monitor.c
+	xf_monitor.h
+	xf_disp.c
+	xf_disp.h
+	xf_graphics.c
+	xf_graphics.h
+	xf_keyboard.c
+	xf_keyboard.h
+	xf_video.c
+	xf_video.h
+	xf_window.c
+	xf_window.h
+	xf_client.c
+	xf_client.h)
+
+if (CHANNEL_TSMF_CLIENT)
+	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS}
+	xf_tsmf.c
+	xf_tsmf.h)
+endif()
+
+if(WITH_CLIENT_INTERFACE)
+	if(CLIENT_INTERFACE_SHARED)
+		add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
+		if (WITH_LIBRARY_VERSIONING)
+			set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION})
+		endif()
+	else()
+		add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
+	endif()
+  
+else()
+	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} cli/xfreerdp.c cli/images.c xfreerdp.h cli/arguments.c cli/concat.c cli/gui.c cli/node_settings.c cli/rxrandr_broker cli/rxrandr.c cli/settings.c cli/db.c cli/address.c cli/monitor.c cli/xrdp.c)
+	add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
+	set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "xfreerdp")
+	include_directories(..)
+endif()
+
+set(${MODULE_PREFIX}_LIBS
+	${X11_LIBRARIES})
+
+if(WITH_MANPAGES)
+	find_program(XSLTPROC_EXECUTABLE NAMES xsltproc)
+
+	if(DOCBOOKXSL_FOUND AND XSLTPROC_EXECUTABLE)
+
+		# We need the variable ${MAN_TODAY} to contain the current date in ISO
+		# format to replace it in the configure_file step.
+		include(today)
+
+		TODAY(MAN_TODAY)
+
+		configure_file(xfreerdp.1.xml.in xfreerdp.1.xml @ONLY IMMEDIATE)
+
+		# Compile the helper tool with default compiler settings.
+		# We need the include paths though.
+		get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
+		set(GENERATE_INCLUDES "")
+		foreach(dir ${dirs})
+			set(GENERATE_INCLUDES ${GENERATE_INCLUDES} -I${dir})
+		endforeach(dir)
+
+		add_custom_command(OUTPUT xfreerdp.1
+					COMMAND ${CMAKE_C_COMPILER} ${GENERATE_INCLUDES}
+						${CMAKE_CURRENT_SOURCE_DIR}/generate_argument_docbook.c
+						-o ${CMAKE_CURRENT_BINARY_DIR}/generate_argument_docbook
+					COMMAND ${CMAKE_CURRENT_BINARY_DIR}/generate_argument_docbook
+					COMMAND ${CMAKE_COMMAND} -E copy
+						${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-channels.1.xml ${CMAKE_CURRENT_BINARY_DIR}
+					COMMAND ${CMAKE_COMMAND} -E copy
+						${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-examples.1.xml ${CMAKE_CURRENT_BINARY_DIR}
+					COMMAND ${CMAKE_COMMAND} -E copy
+						${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-envvar.1.xml ${CMAKE_CURRENT_BINARY_DIR}
+					COMMAND ${XSLTPROC_EXECUTABLE} ${DOCBOOKXSL_DIR}/manpages/docbook.xsl xfreerdp.1.xml
+					WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+					DEPENDS
+						${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1.xml
+						${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-examples.1.xml
+						${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-channels.1.xml
+						${CMAKE_CURRENT_SOURCE_DIR}/xfreerdp-envvar.1.xml)
+
+		add_custom_target(xfreerdp.manpage ALL
+			DEPENDS xfreerdp.1)
+
+		install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1 1)
+	else()
+		message(WARNING "WITH_MANPAGES was set, but xsltproc was not found. man-pages will not be installed")
+	endif()
+endif(WITH_MANPAGES)
+
+set(XSHM_FEATURE_TYPE "REQUIRED")
+set(XSHM_FEATURE_PURPOSE "X11 shared memory")
+set(XSHM_FEATURE_DESCRIPTION "X11 shared memory extension")
+
+set(XINERAMA_FEATURE_TYPE "RECOMMENDED")
+set(XINERAMA_FEATURE_PURPOSE "multi-monitor")
+set(XINERAMA_FEATURE_DESCRIPTION "X11 multi-monitor extension")
+
+set(XEXT_FEATURE_TYPE "RECOMMENDED")
+set(XEXT_FEATURE_PURPOSE "X11 extension")
+set(XEXT_FEATURE_DESCRIPTION "X11 core extensions")
+
+set(XCURSOR_FEATURE_TYPE "RECOMMENDED")
+set(XCURSOR_FEATURE_PURPOSE "cursor")
+set(XCURSOR_FEATURE_DESCRIPTION "X11 cursor extension")
+
+set(XV_FEATURE_TYPE "RECOMMENDED")
+set(XV_FEATURE_PURPOSE "video")
+set(XV_FEATURE_DESCRIPTION "X11 video extension")
+
+set(XI_FEATURE_TYPE "RECOMMENDED")
+set(XI_FEATURE_PURPOSE "input")
+set(XI_FEATURE_DESCRIPTION "X11 input extension") 
+
+set(XRENDER_FEATURE_TYPE "RECOMMENDED")
+set(XRENDER_FEATURE_PURPOSE "rendering")
+set(XRENDER_FEATURE_DESCRIPTION "X11 render extension") 
+
+set(XRANDR_FEATURE_TYPE "RECOMMENDED")
+set(XRANDR_FEATURE_PURPOSE "tracking output configuration")
+set(XRANDR_FEATURE_DESCRIPTION "X11 randr extension")
+
+set(XFIXES_FEATURE_TYPE "RECOMMENDED")
+set(XFIXES_FEATURE_PURPOSE "X11 xfixes extension")
+set(XFIXES_FEATURE_DESCRIPTION "Useful additions to the X11 core protocol")
+
+find_feature(XShm ${XSHM_FEATURE_TYPE} ${XSHM_FEATURE_PURPOSE} ${XSHM_FEATURE_DESCRIPTION})
+find_feature(Xinerama ${XINERAMA_FEATURE_TYPE} ${XINERAMA_FEATURE_PURPOSE} ${XINERAMA_FEATURE_DESCRIPTION})
+find_feature(Xext ${XEXT_FEATURE_TYPE} ${XEXT_FEATURE_PURPOSE} ${XEXT_FEATURE_DESCRIPTION})
+find_feature(Xcursor ${XCURSOR_FEATURE_TYPE} ${XCURSOR_FEATURE_PURPOSE} ${XCURSOR_FEATURE_DESCRIPTION})
+find_feature(Xv ${XV_FEATURE_TYPE} ${XV_FEATURE_PURPOSE} ${XV_FEATURE_DESCRIPTION})
+find_feature(Xi ${XI_FEATURE_TYPE} ${XI_FEATURE_PURPOSE} ${XI_FEATURE_DESCRIPTION})
+find_feature(Xrender ${XRENDER_FEATURE_TYPE} ${XRENDER_FEATURE_PURPOSE} ${XRENDER_FEATURE_DESCRIPTION})
+find_feature(XRandR ${XRANDR_FEATURE_TYPE} ${XRANDR_FEATURE_PURPOSE} ${XRANDR_FEATURE_DESCRIPTION})
+find_feature(Xfixes ${XFIXES_FEATURE_TYPE} ${XFIXES_FEATURE_PURPOSE} ${XFIXES_FEATURE_DESCRIPTION})
+
+if(WITH_XINERAMA)
+	add_definitions(-DWITH_XINERAMA)
+	include_directories(${XINERAMA_INCLUDE_DIRS})
+	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${XINERAMA_LIBRARIES})
+endif()
+
+if(WITH_XEXT)
+	add_definitions(-DWITH_XEXT)
+	include_directories(${XEXT_INCLUDE_DIRS})
+	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${XEXT_LIBRARIES})
+endif()
+
+if(WITH_XCURSOR)
+	add_definitions(-DWITH_XCURSOR)
+	include_directories(${XCURSOR_INCLUDE_DIRS})
+	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${XCURSOR_LIBRARIES})
+endif()
+
+if(WITH_XV)
+	add_definitions(-DWITH_XV)
+	include_directories(${XV_INCLUDE_DIRS})
+	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${XV_LIBRARIES})
+endif()
+
+if(WITH_XI)
+	add_definitions(-DWITH_XI)
+	include_directories(${XI_INCLUDE_DIRS})
+	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${XI_LIBRARIES})
+endif()
+
+if(WITH_XRENDER)
+	add_definitions(-DWITH_XRENDER)
+	include_directories(${XRENDER_INCLUDE_DIRS})
+	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${XRENDER_LIBRARIES})
+endif()
+
+if(WITH_XRANDR)
+	add_definitions(-DWITH_XRANDR)
+	include_directories(${XRANDR_INCLUDE_DIRS})
+	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${XRANDR_LIBRARIES})
+endif()
+
+if(WITH_XFIXES)
+	add_definitions(-DWITH_XFIXES)
+	include_directories(${XFIXES_INCLUDE_DIRS})
+	set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${XFIXES_LIBRARIES})
+endif()
+
+include_directories(${CMAKE_SOURCE_DIR}/resources)
+
+set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-client freerdp m)
+if (NOT APPLE)
+	list(APPEND ${MODULE_PREFIX}_LIBS rt)
+endif()
+#target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${${MODULE_PREFIX}_LIBS} iup /root/xfreerdp/source/client/X11/sqlite3.a)
+target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${${MODULE_PREFIX}_LIBS} iup sqlite3)
+#target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${${MODULE_PREFIX}_LIBS} iup Xrandr -L/home/alexander/programming/c/FreeRDP/client/X11/cli/sqlite3.a -lsqlite3)
+
+if(WITH_IPP)
+    target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${IPP_LIBRARY_LIST})
+endif()
+
+if(WITH_CLIENT_INTERFACE)
+	install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
+	add_subdirectory(cli)
+else()
+	install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT client)
+endif()
+
+set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Client/X11")
+

FreeRDP_X11_path_config/README.md

@@ -0,0 +1,5 @@
+# CMake-файлы для FreeRDP
+
+Файлы основаны на [FreeRDP 2.8.0](https://github.com/FreeRDP/FreeRDP)
+
+Необходимо поместить в каталог проекта `./client/X11`.

FreeRDP_X11_path_config/cli/.gitignore

@@ -0,0 +1,2 @@
+xfreerdp
+

FreeRDP_X11_path_config/cli/CMakeLists.txt

@@ -0,0 +1,51 @@
+# FreeRDP: A Remote Desktop Protocol Implementation
+# FreeRDP X11 cmake build script
+#
+# Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set(MODULE_NAME "xfreerdp-cli")
+set(MODULE_PREFIX "FREERDP_CLIENT_X11")
+
+set(${MODULE_PREFIX}_SRCS
+	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 "..")
+
+set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} xfreerdp-client freerdp-client)
+
+if(OPENBSD)
+	target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} ossaudio)
+else()
+	target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
+endif()
+
+install(TARGETS ${MODULE_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT client)
+
+set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Client/X11")
+

db.c

@@ -252,10 +252,11 @@ int dbAddServer(char *ip, char *dns)
     }
 
     sqlite3_stmt *res;
-    char *sql = "SELECT * FROM `hosts` WHERE `ip` = ?";
+    char *sql = "SELECT * FROM `hosts` WHERE `ip` = ? OR `dns` = ?";
     if (sqlite3_prepare_v2(db, sql, -1, &res, 0) == SQLITE_OK)
     {
         sqlite3_bind_text(res, 1, ip, -1, 0);
+        sqlite3_bind_text(res, 2, dns, -1, 0);
     }
     else
     {
@@ -272,12 +273,13 @@ int dbAddServer(char *ip, char *dns)
         sql = "UPDATE `hosts` set `set` = 0";
         if (sqlite3_exec(db, sql, NULL, NULL, NULL) == SQLITE_OK)
         {
-            sql = "UPDATE `hosts` set `dns` = ?, `set` = 1 where id = ?";
+            sql = "UPDATE `hosts` set `dns` = ?, `ip` = ?, `set` = 1 where id = ?";
 
             if (sqlite3_prepare_v2(db, sql, -1, &res, 0) == SQLITE_OK)
             {
                 sqlite3_bind_text(res, 1, dns, -1, 0);
-                sqlite3_bind_int(res, 2, id);
+                sqlite3_bind_text(res, 2, ip, -1, 0);
+                sqlite3_bind_int(res, 3, id);
             }
 
             if (sqlite3_step(res) == SQLITE_BUSY)

gui.c

@@ -47,9 +47,9 @@ static int guiConnect(Ihandle *self)
 
 //    if (free_rdp_connect(args.argc, args.argv) != XF_EXIT_DNS_NAME_NOT_FOUND)
 //    {
-        dbInsertHistory(login, host);
         if (!dbAddServer(result, host))
         {
+            dbInsertHistory(login, host);
             IupSetAttribute(IupGetDialogChild(self, "SERVER"), "APPENDITEM", host);
         }
         dbSetUserNameCurrent(login);