Merge pull request #11273 from akallabeth/cleanups

[client,x11] implement keyboard mapping

include/CMakeLists.txt

@@ -17,7 +17,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-option(WITH_OPAQUE_SETTINGS "Hide rdpSettings struct definition, only allow getter/setter access" OFF)
+if(WITH_FREERDP_3x_DEPRECATED)
+  option(WITH_OPAQUE_SETTINGS "Hide rdpSettings struct definition, only allow getter/setter access" OFF)
+else()
+  set(WITH_OPAQUE_SETTINGS ON CACHE INTERNAL "WITH_FREERDP_3x_DEPRECATED")
+endif()
 
 # prepare paths for C
 file(TO_NATIVE_PATH "${FREERDP_DATA_PATH}" NATIVE_FREERDP_DATA_PATH)

include/freerdp/codecs.h

@@ -86,12 +86,14 @@ extern "C"
 	WINPR_ATTR_MALLOC(freerdp_client_codecs_free, 1)
 	FREERDP_API rdpCodecs* freerdp_client_codecs_new(UINT32 TheadingFlags);
 
+#if defined(WITH_FREERDP_3x_DEPRECATED)
 	WINPR_DEPRECATED_VAR("[since 3.6.0] Use freerdp_client_codecs_free",
 	                     FREERDP_API void codecs_free(rdpCodecs* codecs));
 
 	WINPR_DEPRECATED_VAR("[since 3.6.0] Use freerdp_client_codecs_new",
 	                     WINPR_ATTR_MALLOC(codecs_free, 1)
 	                         FREERDP_API rdpCodecs* codecs_new(rdpContext* context));
+#endif
 
 #ifdef __cplusplus
 }

include/freerdp/freerdp.h

@@ -569,14 +569,18 @@ owned by rdpRdp */
 
 	FREERDP_API BOOL freerdp_connect(freerdp* instance);
 
+#if defined(WITH_FREERDP_3x_DEPRECATED)
 	WINPR_DEPRECATED_VAR("use freerdp_abort_connect_context instead",
 	                     FREERDP_API BOOL freerdp_abort_connect(freerdp* instance));
+#endif
 
 	FREERDP_API BOOL freerdp_abort_connect_context(rdpContext* context);
 	FREERDP_API HANDLE freerdp_abort_event(rdpContext* context);
 
+#if defined(WITH_FREERDP_3x_DEPRECATED)
 	WINPR_DEPRECATED_VAR("use freerdp_shall_disconnect_context instead",
 	                     FREERDP_API BOOL freerdp_shall_disconnect(freerdp* instance));
+#endif
 
 	FREERDP_API BOOL freerdp_shall_disconnect_context(const rdpContext* context);
 	FREERDP_API BOOL freerdp_disconnect(freerdp* instance);
@@ -591,8 +595,11 @@ owned by rdpRdp */
 	 */
 	FREERDP_API const char* freerdp_disconnect_reason_string(int reason);
 
+#if defined(WITH_FREERDP_3x_DEPRECATED)
 	WINPR_DEPRECATED_VAR("use freerdp_disconnect_before_reconnect_context instead",
 	                     FREERDP_API BOOL freerdp_disconnect_before_reconnect(freerdp* instance));
+#endif
+
 	FREERDP_API BOOL freerdp_disconnect_before_reconnect_context(rdpContext* context);
 
 	FREERDP_API BOOL freerdp_reconnect(freerdp* instance);

include/freerdp/locale/keyboard.h

@@ -262,6 +262,7 @@ FREERDP_API const char* freerdp_keyboard_get_layout_name_from_id(DWORD keyboardL
  */
 FREERDP_API DWORD freerdp_keyboard_get_layout_id_from_name(const char* name);
 
+#if defined(WITH_FREERDP_3x_DEPRECATED)
 WINPR_DEPRECATED_VAR("since 3.11.0, implement yourself in client",
 	                 FREERDP_API DWORD freerdp_keyboard_init(DWORD keyboardLayoutId));
 
@@ -276,6 +277,7 @@ WINPR_DEPRECATED_VAR("since 3.11.0, implement yourself in client",
 WINPR_DEPRECATED_VAR("since 3.11.0, implement yourself in client",
 	                 FREERDP_API DWORD freerdp_keyboard_get_x11_keycode_from_rdp_scancode(
 	                     DWORD scancode, BOOL extended));
+#endif
 
 /** @brief deallocate a \b FREERDP_REMAP_TABLE
  *

include/freerdp/server/proxy/proxy_config.h

@@ -86,11 +86,13 @@ extern "C"
 		size_t InterceptCount;
 
 		/* clipboard specific settings */
+#if defined(WITH_FREERDP_3x_DEPRECATED)
 		WINPR_DEPRECATED_VAR("[since 3.6.0] Unused, ignore", BOOL TextOnly);
 		WINPR_DEPRECATED_VAR("[since 3.6.0] Unused, ignore", UINT32 MaxTextLength);
 
 		/* gfx settings */
 		WINPR_DEPRECATED_VAR("[since 3.6.0] Unused, ignore", BOOL DecodeGFX);
+#endif
 
 		/* modules */
 		char** Modules; /* module file names to load */

include/freerdp/server/shadow.h

@@ -303,11 +303,13 @@ extern "C"
 	FREERDP_API void shadow_subsystem_set_entry_builtin(const char* name);
 	FREERDP_API void shadow_subsystem_set_entry(pfnShadowSubsystemEntry pEntry);
 
+#if defined(WITH_FREERDP_3x_DEPRECATED)
 	WINPR_DEPRECATED_VAR(
 	    "[since 3.4.0] Use shadow_subsystem_pointer_convert_alpha_pointer_data_to_format instead",
 	    FREERDP_API int shadow_subsystem_pointer_convert_alpha_pointer_data(
 	        const BYTE* WINPR_RESTRICT pixels, BOOL premultiplied, UINT32 width, UINT32 height,
 	        SHADOW_MSG_OUT_POINTER_ALPHA_UPDATE* WINPR_RESTRICT pointerColor));
+#endif
 
 	/** @brief Convert a pointer image from input format to RDP specific encoding
 	 *
@@ -347,11 +349,13 @@ extern "C"
 
 	FREERDP_API int shadow_capture_align_clip_rect(RECTANGLE_16* rect, const RECTANGLE_16* clip);
 
+#if defined(WITH_FREERDP_3x_DEPRECATED)
 	WINPR_DEPRECATED_VAR("[since 3.4.0] Use shadow_capture_compare_with_format",
 	                     FREERDP_API int shadow_capture_compare(
 	                         const BYTE* WINPR_RESTRICT pData1, UINT32 nStep1, UINT32 nWidth,
 	                         UINT32 nHeight, const BYTE* WINPR_RESTRICT pData2, UINT32 nStep2,
 	                         RECTANGLE_16* WINPR_RESTRICT rect));
+#endif
 
 	/** @brief Compare two framebuffer images of possibly different formats with each other
 	 *