if (settings->AsyncInput)
{
if (!(inputThread = CreateThread(NULL, 0,
- (LPTHREAD_START_ROUTINE) mac_client_input_thread, context, 0, NULL)))
+ (LPTHREAD_START_ROUTINE) mac_client_input_thread, context, 0, NULL)))
{
WLog_ERR(TAG, "failed to create async input thread");
goto disconnect;
else
{
if (!(inputEvent = freerdp_get_message_queue_event_handle(instance,
- FREERDP_INPUT_MESSAGE_QUEUE)))
+ FREERDP_INPUT_MESSAGE_QUEUE)))
{
WLog_ERR(TAG, "failed to get input event handle");
goto disconnect;
if (!settings->AsyncTransport)
{
if (!(nCountTmp = freerdp_get_event_handles(context, &events[nCount],
- 16 - nCount)))
+ 16 - nCount)))
{
WLog_ERR(TAG, "freerdp_get_event_handles failed");
break;
rdp_pointer.SetDefault = mf_Pointer_SetDefault;
settings = instance->settings;
- if (!gdi_init(instance, PIXEL_FORMAT_BGRX32))
+ if (!gdi_init(instance, PIXEL_FORMAT_BGRX32))
return FALSE;
gdi = instance->context->gdi;
view->bitmap_context = mac_create_bitmap_context(instance->context);
pointer_cache_register_callbacks(instance->update);
graphics_register_pointer(instance->context->graphics, &rdp_pointer);
-
/* setup pasteboard (aka clipboard) for copy operations (write only) */
view->pasteboard_wr = [NSPasteboard generalPasteboard];
/* setup pasteboard for read operations */
BOOL mf_Pointer_New(rdpContext* context, rdpPointer* pointer)
{
- rdpGdi* gdi;
+ rdpGdi* gdi;
NSRect rect;
NSImage* image;
NSPoint hotSpot;
NSBitmapImageRep* bmiRep;
MRDPCursor* mrdpCursor = [[MRDPCursor alloc] init];
mfContext* mfc = (mfContext*) context;
- MRDPView* view;
- UINT32 format;
+ MRDPView* view;
+ UINT32 format;
- if (!mfc || !context || !pointer)
- return FALSE;
+ if (!mfc || !context || !pointer)
+ return FALSE;
- view = (MRDPView*) mfc->view;
- gdi = context->gdi;
+ view = (MRDPView*) mfc->view;
+ gdi = context->gdi;
- if (!gdi || !view)
- return FALSE;
+ if (!gdi || !view)
+ return FALSE;
rect.size.width = pointer->width;
rect.size.height = pointer->height;
return FALSE;
mrdpCursor->cursor_data = cursor_data;
+ format = PIXEL_FORMAT_RGBA32;
- format = PIXEL_FORMAT_RGBA32;
if (freerdp_image_copy_from_pointer_data(
- cursor_data, format,
- 0, 0, 0, pointer->width, pointer->height,
+ cursor_data, format,
+ 0, 0, 0, pointer->width, pointer->height,
pointer->xorMaskData, pointer->lengthXorMask,
pointer->andMaskData, pointer->lengthAndMask,
pointer->xorBpp, NULL) < 0)
isPlanar:NO
colorSpaceName:NSDeviceRGBColorSpace
bitmapFormat:0
- bytesPerRow:rect.size.width * GetBytesPerPixel(format)
+ bytesPerRow:rect.size.width * GetBytesPerPixel(format)
bitsPerPixel:0];
mrdpCursor->bmiRep = bmiRep;
/* create an image using above representation */