mirror of
https://github.com/FreeRDP/FreeRDP.git
synced 2025-06-03 00:00:20 +00:00
mfreerdp: fix indentation
This commit is contained in:
parent
fe34a529d5
commit
e10367ac9e
@ -14,6 +14,5 @@
|
||||
@property (assign) IBOutlet MRDPView *mrdpView;
|
||||
@property (assign) IBOutlet NSWindow *window;
|
||||
|
||||
|
||||
int rdp_connect(void);
|
||||
@end
|
||||
|
@ -20,7 +20,6 @@
|
||||
int savedWindowId;
|
||||
int scrollWheelCount;
|
||||
|
||||
/* store state info for some keys */
|
||||
int kdlshift;
|
||||
int kdrshift;
|
||||
int kdlctrl;
|
||||
@ -31,7 +30,7 @@
|
||||
int kdrmeta;
|
||||
int kdcapslock;
|
||||
|
||||
@public
|
||||
@public
|
||||
BOOL isMoveSizeInProgress;
|
||||
BOOL saveInitialDragLoc;
|
||||
BOOL skipMoveWindowOnce;
|
||||
|
@ -34,8 +34,6 @@
|
||||
#import "MRDPView.h"
|
||||
#import "MRDPCursor.h"
|
||||
|
||||
#define RUN_IN_XCODE
|
||||
|
||||
// LK_TODO
|
||||
#define GOT_HERE //printf("### got here: %s : %s() : %d\n", __FILE__, __func__, __LINE__)
|
||||
|
||||
@ -224,7 +222,7 @@ struct kkey g_keys[256] =
|
||||
|
||||
/************************************************************************
|
||||
methods we override
|
||||
************************************************************************/
|
||||
************************************************************************/
|
||||
|
||||
/** *********************************************************************
|
||||
* create MRDPView with specified rectangle
|
||||
@ -305,7 +303,7 @@ struct kkey g_keys[256] =
|
||||
* http://developer.apple.com/library/mac/#documentation/Cocoa/Conceptual/EventOverview/MouseTrackingEvents/MouseTrackingEvents.html#//apple_ref/doc/uid/10000060i-CH11-SW1
|
||||
***********************************************************************/
|
||||
|
||||
- (void) mouseMoved:(NSEvent *)event
|
||||
- (void) mouseMoved:(NSEvent *)event
|
||||
{
|
||||
[super mouseMoved:event];
|
||||
|
||||
@ -723,7 +721,7 @@ struct kkey g_keys[256] =
|
||||
|
||||
/************************************************************************
|
||||
instance methods
|
||||
************************************************************************/
|
||||
************************************************************************/
|
||||
|
||||
/** *********************************************************************
|
||||
* called when RDP server wants us to update a rect with new data
|
||||
@ -1062,112 +1060,13 @@ BOOL mac_pre_connect(freerdp *inst)
|
||||
|
||||
NSArray *args = [[NSProcessInfo processInfo] arguments];
|
||||
|
||||
#ifdef RUN_IN_XCODE
|
||||
g_mrdpview->argc = 30;
|
||||
#else
|
||||
g_mrdpview->argc = (int) [args count];
|
||||
#endif
|
||||
|
||||
g_mrdpview->argv = malloc(sizeof(char *) * g_mrdpview->argc);
|
||||
if (g_mrdpview->argv == NULL) {
|
||||
|
||||
if (g_mrdpview->argv == NULL)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
#ifdef RUN_IN_XCODE
|
||||
|
||||
// create our own cmd line args
|
||||
i = 0;
|
||||
|
||||
NSString *sptr = [args objectAtIndex:0];
|
||||
len = [sptr length] + 1;
|
||||
cptr = (char *) malloc(len);
|
||||
strcpy(cptr, [sptr UTF8String]);
|
||||
g_mrdpview->argv[i++] = cptr;
|
||||
|
||||
cptr = (char *)malloc(80);
|
||||
strcpy(cptr, "-g");
|
||||
g_mrdpview->argv[i++] = cptr;
|
||||
|
||||
cptr = (char *)malloc(80);
|
||||
strcpy(cptr, "1280x800");
|
||||
g_mrdpview->argv[i++] = cptr;
|
||||
|
||||
cptr = (char *)malloc(80);
|
||||
strcpy(cptr, "--sec");
|
||||
g_mrdpview->argv[i++] = cptr;
|
||||
|
||||
cptr = (char *)malloc(80);
|
||||
strcpy(cptr, "rdp");
|
||||
g_mrdpview->argv[i++] = cptr;
|
||||
|
||||
cptr = (char *)malloc(80);
|
||||
strcpy(cptr, "--plugin");
|
||||
g_mrdpview->argv[i++] = cptr;
|
||||
|
||||
cptr = (char *)malloc(80);
|
||||
strcpy(cptr, "cliprdr");
|
||||
g_mrdpview->argv[i++] = cptr;
|
||||
|
||||
cptr = (char *)malloc(80);
|
||||
strcpy(cptr, "--plugin");
|
||||
g_mrdpview->argv[i++] = cptr;
|
||||
|
||||
cptr = (char *)malloc(80);
|
||||
strcpy(cptr, "rdpsnd");
|
||||
g_mrdpview->argv[i++] = cptr;
|
||||
|
||||
cptr = (char *)malloc(80);
|
||||
strcpy(cptr, "-u");
|
||||
g_mrdpview->argv[i++] = cptr;
|
||||
|
||||
cptr = (char *)malloc(80);
|
||||
strcpy(cptr, "lk");
|
||||
g_mrdpview->argv[i++] = cptr;
|
||||
|
||||
cptr = (char *)malloc(80);
|
||||
strcpy(cptr, "-p");
|
||||
g_mrdpview->argv[i++] = cptr;
|
||||
|
||||
cptr = (char *)malloc(80);
|
||||
strcpy(cptr, "abc@@@123");
|
||||
g_mrdpview->argv[i++] = cptr;
|
||||
|
||||
#if 1
|
||||
// for RemoteApp (RAIL) testing
|
||||
cptr = (char *)malloc(80);
|
||||
strcpy(cptr, "--app");
|
||||
g_mrdpview->argv[i++] = cptr;
|
||||
g_mrdpview->isRemoteApp = TRUE;
|
||||
|
||||
cptr = (char *)malloc(80);
|
||||
strcpy(cptr, "--plugin");
|
||||
g_mrdpview->argv[i++] = cptr;
|
||||
|
||||
cptr = (char *)malloc(80);
|
||||
strcpy(cptr, "rail");
|
||||
g_mrdpview->argv[i++] = cptr;
|
||||
|
||||
cptr = (char *)malloc(80);
|
||||
strcpy(cptr, "--data");
|
||||
g_mrdpview->argv[i++] = cptr;
|
||||
|
||||
cptr = (char *)malloc(80);
|
||||
strcpy(cptr, "||WordPad");
|
||||
g_mrdpview->argv[i++] = cptr;
|
||||
|
||||
cptr = (char *)malloc(80);
|
||||
strcpy(cptr, "--");
|
||||
g_mrdpview->argv[i++] = cptr;
|
||||
#endif
|
||||
|
||||
cptr = (char *)malloc(80);
|
||||
strcpy(cptr, "192.168.1.69:45990");
|
||||
g_mrdpview->argv[i++] = cptr;
|
||||
|
||||
g_mrdpview->argc = i;
|
||||
|
||||
#else
|
||||
// MacFreeRDP was not run in Xcode
|
||||
i = 0;
|
||||
|
||||
// in RemoteApp (RAIL) mode, we connect to RDP server at max screen resolution;
|
||||
@ -1213,7 +1112,6 @@ BOOL mac_pre_connect(freerdp *inst)
|
||||
g_mrdpview->argv[i++] = cptr;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
inst->context->argc = g_mrdpview->argc;
|
||||
inst->context->argv = g_mrdpview->argv;
|
||||
|
Loading…
Reference in New Issue
Block a user