From 5530bfb71e07e04d6b350ad773bbd3c4311a97c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Sun, 14 Apr 2013 11:28:07 -0400 Subject: [PATCH] mfreerdp: minor cleanup --- client/Mac/Info.plist | 2 +- client/Mac/MRDPView.h | 24 ++++++++++++------------ client/Mac/main.m | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/client/Mac/Info.plist b/client/Mac/Info.plist index cb6976502..253612c6e 100644 --- a/client/Mac/Info.plist +++ b/client/Mac/Info.plist @@ -25,7 +25,7 @@ LSMinimumSystemVersion NSHumanReadableCopyright - Copyright © 2012 __MyCompanyName__. All rights reserved. + Copyright © 2012 FreeRDP Open Source Project. NSMainNibFile MainMenu NSPrincipalClass diff --git a/client/Mac/MRDPView.h b/client/Mac/MRDPView.h index c894cb939..c15b35641 100644 --- a/client/Mac/MRDPView.h +++ b/client/Mac/MRDPView.h @@ -76,8 +76,8 @@ @public NSWindow* ourMainWindow; - NSPasteboard* pasteboard_rd; /* for reading from clipboard */ - NSPasteboard* pasteboard_wr; /* for writing to clipboard */ + NSPasteboard* pasteboard_rd; + NSPasteboard* pasteboard_wr; int pasteboard_changecount; int pasteboard_format; int is_connected; @@ -95,20 +95,21 @@ @end /* Pointer Flags */ -#define PTR_FLAGS_WHEEL 0x0200 -#define PTR_FLAGS_WHEEL_NEGATIVE 0x0100 -#define PTR_FLAGS_MOVE 0x0800 -#define PTR_FLAGS_DOWN 0x8000 -#define PTR_FLAGS_BUTTON1 0x1000 -#define PTR_FLAGS_BUTTON2 0x2000 -#define PTR_FLAGS_BUTTON3 0x4000 -#define WheelRotationMask 0x01FF +#define PTR_FLAGS_WHEEL 0x0200 +#define PTR_FLAGS_WHEEL_NEGATIVE 0x0100 +#define PTR_FLAGS_MOVE 0x0800 +#define PTR_FLAGS_DOWN 0x8000 +#define PTR_FLAGS_BUTTON1 0x1000 +#define PTR_FLAGS_BUTTON2 0x2000 +#define PTR_FLAGS_BUTTON3 0x4000 +#define WheelRotationMask 0x01FF void mf_Pointer_New(rdpContext* context, rdpPointer* pointer); void mf_Pointer_Free(rdpContext* context, rdpPointer* pointer); void mf_Pointer_Set(rdpContext* context, rdpPointer* pointer); void mf_Pointer_SetNull(rdpContext* context); void mf_Pointer_SetDefault(rdpContext* context); + int rdp_connect(void); BOOL mac_pre_connect(freerdp* instance); BOOL mac_post_connect(freerdp* instance); @@ -154,11 +155,10 @@ void mac_rail_enable_remoteapp_mode(void); void mac_process_rail_server_minmaxinfo_event(rdpChannels* channels, wMessage* event); void mac_process_rail_server_localmovesize_event(freerdp* instance, wMessage* event); void apple_center_window(NSRect* r); -void apple_to_windowMove(NSRect* r, RAIL_WINDOW_MOVE_ORDER * windowMove); +void apple_to_windowMove(NSRect* r, RAIL_WINDOW_MOVE_ORDER* windowMove); struct mac_context { - // *must* have this - do not delete rdpContext _p; }; diff --git a/client/Mac/main.m b/client/Mac/main.m index 4cba6cfc1..5726f5c03 100644 --- a/client/Mac/main.m +++ b/client/Mac/main.m @@ -19,7 +19,7 @@ #import -int main(int argc, char *argv[]) +int main(int argc, char* argv[]) { - return NSApplicationMain(argc, (const char **)argv); + return NSApplicationMain(argc, (const char**) argv); }