mfreerdp: fix indentation

This commit is contained in:
Marc-André Moreau 2013-02-21 21:42:47 -05:00
parent fe34a529d5
commit e10367ac9e
8 changed files with 2311 additions and 2415 deletions

View File

@ -14,6 +14,5 @@
@property (assign) IBOutlet MRDPView *mrdpView; @property (assign) IBOutlet MRDPView *mrdpView;
@property (assign) IBOutlet NSWindow *window; @property (assign) IBOutlet NSWindow *window;
int rdp_connect(void); int rdp_connect(void);
@end @end

View File

@ -21,7 +21,7 @@
- (void) applicationWillTerminate:(NSNotification *)notification - (void) applicationWillTerminate:(NSNotification *)notification
{ {
//[mrdpView releaseResources]; //[mrdpView releaseResources];
} }
@end @end

View File

@ -13,11 +13,11 @@
@interface MRDPCursor : NSObject @interface MRDPCursor : NSObject
{ {
@public @public
rdpPointer *pointer; rdpPointer *pointer;
BYTE *cursor_data; // bitmapped pixel data BYTE *cursor_data; // bitmapped pixel data
NSBitmapImageRep *bmiRep; NSBitmapImageRep *bmiRep;
NSCursor *nsCursor; NSCursor *nsCursor;
NSImage *nsImage; NSImage *nsImage;
} }
@end @end

View File

@ -7,35 +7,34 @@
@interface MRDPRailView : NSView @interface MRDPRailView : NSView
{ {
freerdp* rdp_instance; freerdp* rdp_instance;
rdpContext* context; rdpContext* context;
NSBitmapImageRep* bmiRep; NSBitmapImageRep* bmiRep;
NSPoint savedDragLocation; NSPoint savedDragLocation;
char* pixelData; char* pixelData;
BOOL mouseInClientArea; BOOL mouseInClientArea;
BOOL titleBarClicked; BOOL titleBarClicked;
BOOL gestureEventInProgress; BOOL gestureEventInProgress;
int width; int width;
int height; int height;
int savedWindowId; int savedWindowId;
int scrollWheelCount; int scrollWheelCount;
/* store state info for some keys */ int kdlshift;
int kdlshift; int kdrshift;
int kdrshift; int kdlctrl;
int kdlctrl; int kdrctrl;
int kdrctrl; int kdlalt;
int kdlalt; int kdralt;
int kdralt; int kdlmeta;
int kdlmeta; int kdrmeta;
int kdrmeta; int kdcapslock;
int kdcapslock;
@public
@public BOOL isMoveSizeInProgress;
BOOL isMoveSizeInProgress; BOOL saveInitialDragLoc;
BOOL saveInitialDragLoc; BOOL skipMoveWindowOnce;
BOOL skipMoveWindowOnce; int localMoveType;
int localMoveType;
} }
@property (assign) MRDPRailWindow* mrdpRailWindow; @property (assign) MRDPRailWindow* mrdpRailWindow;

File diff suppressed because it is too large Load Diff

View File

@ -12,7 +12,7 @@
- (BOOL) canBecomeKeyWindow - (BOOL) canBecomeKeyWindow
{ {
return YES; return YES;
} }
@end @end

View File

@ -24,52 +24,52 @@
@interface MRDPView : NSView @interface MRDPView : NSView
{ {
CFRunLoopSourceRef run_loop_src; CFRunLoopSourceRef run_loop_src;
CFRunLoopSourceRef run_loop_src_channels; CFRunLoopSourceRef run_loop_src_channels;
NSBitmapImageRep *bmiRep; NSBitmapImageRep *bmiRep;
NSMutableArray *cursors; NSMutableArray *cursors;
NSMutableArray *windows; NSMutableArray *windows;
NSTimer *pasteboard_timer; NSTimer *pasteboard_timer;
NSRect rect; NSRect rect;
NSRect prevWinPosition; NSRect prevWinPosition;
freerdp *rdp_instance; freerdp *rdp_instance;
rdpContext *rdp_context; rdpContext *rdp_context;
char *pixel_data; char *pixel_data;
int width; int width;
int height; int height;
int argc; int argc;
int titleBarHeight; int titleBarHeight;
char **argv; char **argv;
// RAIL stuff // RAIL stuff
MRDPWindow *currentWindow; MRDPWindow *currentWindow;
NSPoint savedDragLocation; NSPoint savedDragLocation;
BOOL mouseInClientArea; BOOL mouseInClientArea;
BOOL isRemoteApp; BOOL isRemoteApp;
BOOL firstCreateWindow; BOOL firstCreateWindow;
BOOL isMoveSizeInProgress; BOOL isMoveSizeInProgress;
BOOL skipResizeOnce; BOOL skipResizeOnce;
BOOL saveInitialDragLoc; BOOL saveInitialDragLoc;
BOOL skipMoveWindowOnce; BOOL skipMoveWindowOnce;
// store state info for some keys // store state info for some keys
int kdlshift; int kdlshift;
int kdrshift; int kdrshift;
int kdlctrl; int kdlctrl;
int kdrctrl; int kdrctrl;
int kdlalt; int kdlalt;
int kdralt; int kdralt;
int kdlmeta; int kdlmeta;
int kdrmeta; int kdrmeta;
int kdcapslock; int kdcapslock;
@public @public
NSWindow *ourMainWindow; NSWindow *ourMainWindow;
NSPasteboard *pasteboard_rd; // for reading from clipboard NSPasteboard *pasteboard_rd; // for reading from clipboard
NSPasteboard *pasteboard_wr; // for writing to clipboard NSPasteboard *pasteboard_wr; // for writing to clipboard
int pasteboard_changecount; int pasteboard_changecount;
int pasteboard_format; int pasteboard_format;
int is_connected; // true when connected to RDP server int is_connected; // true when connected to RDP server
} }
- (void) rdpConnectError; - (void) rdpConnectError;
@ -147,30 +147,30 @@ void apple_to_windowMove(NSRect * r, RAIL_WINDOW_MOVE_ORDER * windowMove);
struct mac_context struct mac_context
{ {
// *must* have this - do not delete // *must* have this - do not delete
rdpContext _p; rdpContext _p;
}; };
struct cursor struct cursor
{ {
rdpPointer *pointer; rdpPointer *pointer;
BYTE *cursor_data; // bitmapped pixel data BYTE *cursor_data; // bitmapped pixel data
void *bmiRep; // NSBitmapImageRep void *bmiRep; // NSBitmapImageRep
void *nsCursor; // NSCursor void *nsCursor; // NSCursor
void *nsImage; // NSImage void *nsImage; // NSImage
}; };
struct rgba_data struct rgba_data
{ {
char red; char red;
char green; char green;
char blue; char blue;
char alpha; char alpha;
}; };
struct kkey struct kkey
{ {
int key_code; int key_code;
int flags; int flags;
}; };

File diff suppressed because it is too large Load Diff