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

Merge pull request #2415 from zavadovsky/android_fixes

Browse Source 
Android fixes
This commit is contained in:
Bernhard Miklautz 2015-02-23 12:44:40 +01:00
commit 757085096c
2 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/Android/FreeRDPCore/jni/android_event.c
View File

@ -76,7 +76,8 @@ void android_push_event(freerdp * inst, ANDROID_EVENT* event)
if (aCtx->event_queue->count >= aCtx->event_queue->size)
{
aCtx->event_queue->size = aCtx->event_queue->size * 2;
aCtx->event_queue->events = realloc((void*) aCtx->event_queue->events, aCtx->event_queue->size);
aCtx->event_queue->events = realloc((void*) aCtx->event_queue->events,
sizeof(ANDROID_EVENT*) * aCtx->event_queue->size);
}
aCtx->event_queue->events[(aCtx->event_queue->count)++] = event;

34
client/Android/FreeRDPCore/jni/android_freerdp.c
View File

@ -111,20 +111,44 @@ void android_begin_paint(rdpContext* context)
void android_end_paint(rdpContext* context)
{
int i;
int ninvalid;
HGDI_RGN cinvalid;
int x1, y1, x2, y2;
androidContext *ctx = (androidContext*)context;
rdpSettings* settings = context->instance->settings;
DEBUG_ANDROID("ui_update");
assert(ctx);
assert(settings);
assert(context->instance);
DEBUG_ANDROID("width=%d, height=%d, bpp=%d", settings->DesktopWidth,
settings->DesktopHeight, settings->ColorDepth);
ninvalid = ctx->rdpCtx.gdi->primary->hdc->hwnd->ninvalid;
if (ninvalid == 0)
{
DEBUG_ANDROID("ui_update: ninvalid=%d", ninvalid);
return;
}
cinvalid = ctx->rdpCtx.gdi->primary->hdc->hwnd->cinvalid;
x1 = cinvalid[0].x;
y1 = cinvalid[0].y;
x2 = cinvalid[0].x + cinvalid[0].w;
y2 = cinvalid[0].y + cinvalid[0].h;
for (i = 0; i < ninvalid; i++)
{
x1 = MIN(x1, cinvalid[i].x);
y1 = MIN(y1, cinvalid[i].y);
x2 = MAX(x2, cinvalid[i].x + cinvalid[i].w);
y2 = MAX(y2, cinvalid[i].y + cinvalid[i].h);
}
DEBUG_ANDROID("ui_update: ninvalid=%d x=%d, y=%d, width=%d, height=%d, bpp=%d",
ninvalid, x1, y1, x2 - x1, y2 - y1, settings->ColorDepth);
freerdp_callback("OnGraphicsUpdate", "(IIIII)V", context->instance,
0, 0, settings->DesktopWidth, settings->DesktopHeight);
x1, y1, x2 - x1, y2 - y1);
}
void android_desktop_resize(rdpContext* context)