mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup/code formatting

Browse Source
This commit is contained in:
akallabeth 2022-02-18 08:49:56 +01:00 committed by akallabeth
parent f03059e718
commit 8b3f9431de
5 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/Android/android_freerdp.c
View File

@ -76,7 +76,7 @@ static void android_OnChannelConnectedEventHandler(void* context,
if (strcmp(e->name, CLIPRDR_SVC_CHANNEL_NAME) == 0)
{
android_cliprdr_init(afc, (CliprdrClientContext*)e->pInterface);
}
}
else
freerdp_client_OnChannelConnectedEventHandler(context, e);
}
@ -99,7 +99,7 @@ static void android_OnChannelDisconnectedEventHandler(void* context,
if (strcmp(e->name, CLIPRDR_SVC_CHANNEL_NAME) == 0)
{
android_cliprdr_uninit(afc, (CliprdrClientContext*)e->pInterface);
}
}
else
freerdp_client_OnChannelDisconnectedEventHandler(context, e);
}

2
client/Mac/cli/AppDelegate.m
View File

@ -75,7 +75,7 @@ void mac_set_view_size(rdpContext *context, MRDPView *view);
initWithFormat:@"%@:%u",
[NSString stringWithCString:settings->ServerHostname
encoding:NSUTF8StringEncoding],
settings -> ServerPort];
settings->ServerPort];
}
[window setTitle:winTitle];

1
client/Windows/wf_client.c
View File

@ -1431,7 +1431,6 @@ static int wfreerdp_client_stop(rdpContext* context)
return 0;
}
int RdpClientEntry(RDP_CLIENT_ENTRY_POINTS* pEntryPoints)
{
pEntryPoints->Version = 1;

16
client/X11/xf_input.c
View File

@ -648,20 +648,20 @@ int xf_input_event(xfContext* xfc, const XEvent* xevent, XIDeviceEvent* event, i
{
case XI_ButtonPress:
xfc->xi_event = TRUE;
xf_generic_ButtonEvent(xfc, (int)event->event_x, (int)event->event_y, event->detail,
event->event, xfc->remote_app, TRUE);
xf_generic_ButtonEvent(xfc, (int)event->event_x, (int)event->event_y, event->detail,
event->event, xfc->remote_app, TRUE);
break;
case XI_ButtonRelease:
xfc->xi_event = TRUE;
xf_generic_ButtonEvent(xfc, (int)event->event_x, (int)event->event_y, event->detail,
event->event, xfc->remote_app, FALSE);
xf_generic_ButtonEvent(xfc, (int)event->event_x, (int)event->event_y, event->detail,
event->event, xfc->remote_app, FALSE);
break;
case XI_Motion:
xfc->xi_event = TRUE;
xf_generic_MotionNotify(xfc, (int)event->event_x, (int)event->event_y,
event->detail, event->event, xfc->remote_app);
xf_generic_MotionNotify(xfc, (int)event->event_x, (int)event->event_y, event->detail,
event->event, xfc->remote_app);
break;
case XI_RawButtonPress:
case XI_RawButtonRelease:
@ -674,7 +674,7 @@ int xf_input_event(xfContext* xfc, const XEvent* xevent, XIDeviceEvent* event, i
xf_generic_RawButtonEvent(xfc, ev->detail, xfc->remote_app,
evtype == XI_RawButtonPress);
}
break;
break;
case XI_RawMotion:
xfc->xi_rawevent = xfc->common.mouse_grabbed &&
freerdp_settings_get_bool(settings, FreeRDP_MouseUseRelativeMove);
@ -691,7 +691,7 @@ int xf_input_event(xfContext* xfc, const XEvent* xevent, XIDeviceEvent* event, i
xf_generic_RawMotionNotify(xfc, (int)x, (int)y, event->event, xfc->remote_app);
}
break;
break;
default:
WLog_WARN(TAG, "[%s] Unhandled event %d: Event was registered but is not handled!");
break;

5
scripts/android-build.conf
View File

@ -15,7 +15,7 @@ WITH_OPENSSL=1
WITH_FFMPEG=0
BUILD_DEPS=1
DEPS_ONLY=0
NDK_TARGET=23
NDK_TARGET=26
JPEG_TAG=master
OPENH264_TAG=v1.8.0 # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0
@ -23,8 +23,7 @@ OPENSSL_TAG=OpenSSL_1_1_1m
FFMPEG_TAG=n4.4.1
SRC_DIR=$SCRIPT_PATH/..
#BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs
BUILD_DST=~/StudioProjects/tcclient-android/app/libs/
BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs
BUILD_SRC=$SRC_DIR/build
CMAKE_BUILD_TYPE=Debug