jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

freerdp1: fixes from ArvidNorr

Browse Source
This commit is contained in:
Jay Sorg 2012-05-07 11:21:47 -07:00
parent 3e422c04c6
commit 769e006dfe
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
freerdp1/xrdp-color.c
View File

@ -131,6 +131,10 @@ convert_bitmap(int in_bpp, int out_bpp, char* bmpdata,
} }
return out; return out;
} }
if ((in_bpp == 15) && (out_bpp == 15))
{
return bmpdata;
}
if ((in_bpp == 16) && (out_bpp == 16)) if ((in_bpp == 16) && (out_bpp == 16))
{ {
return bmpdata; return bmpdata;
@ -239,6 +243,10 @@ convert_color(int in_bpp, int out_bpp, int in_color, int* palette)
pixel = COLOR24BGR(red, green, blue); pixel = COLOR24BGR(red, green, blue);
return pixel; return pixel;
} }
if ((in_bpp == 15) && (out_bpp == 15))
{
return in_color;
}
if ((in_bpp == 16) && (out_bpp == 16)) if ((in_bpp == 16) && (out_bpp == 16))
{ {
return in_color; return in_color;

7
freerdp1/xrdp-freerdp.c
View File

@ -152,6 +152,10 @@ lxrdp_event(struct mod* mod, int msg, long param1, long param2,
case 16: /* key up */ case 16: /* key up */
mod->inst->input->KeyboardEvent(mod->inst->input, param4, param3); mod->inst->input->KeyboardEvent(mod->inst->input, param4, param3);
break; break;
case 17: /*Synchronize*/
LLOGLN(0, ("Synchronized event handled"));
mod->inst->input->SynchronizeEvent(mod->inst->input, 0);
break;
case 100: /* mouse move */ case 100: /* mouse move */
LLOGLN(10, ("mouse move %d %d", param1, param2)); LLOGLN(10, ("mouse move %d %d", param1, param2));
x = param1; x = param1;
@ -255,6 +259,9 @@ lxrdp_event(struct mod* mod, int msg, long param1, long param2,
break; break;
} }
break; break;
default:
LLOGLN(0, ("Unhandled message type in eventhandler %d", msg));
break;
} }
return 0; return 0;
} }