diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2012-05-07 11:00:32 -0700 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2012-05-07 11:00:32 -0700 |
| commit | 3e422c04c6289f3f1f7cf9ce4325982b942ede7c (patch) | |
| tree | 90d6d4e81caaf366d217e7adaf049623ef7e14c7 /freerdp | |
| parent | 9a03ab966d4d5e7883ff201dc6d455e5e7b7fb5f (diff) | |
| download | xrdp-proprietary-3e422c04c6289f3f1f7cf9ce4325982b942ede7c.tar.gz xrdp-proprietary-3e422c04c6289f3f1f7cf9ce4325982b942ede7c.zip | |
fixes from ArvidNorr
Diffstat (limited to 'freerdp')
| -rw-r--r-- | freerdp/xrdp-color.c | 8 | ||||
| -rw-r--r-- | freerdp/xrdp-freerdp.c | 15 |
2 files changed, 13 insertions, 10 deletions
diff --git a/freerdp/xrdp-color.c b/freerdp/xrdp-color.c index 0ae11339..1bbdef43 100644 --- a/freerdp/xrdp-color.c +++ b/freerdp/xrdp-color.c @@ -187,6 +187,10 @@ convert_bitmap(int in_bpp, int out_bpp, char* bmpdata, { return bmpdata; } + if ((in_bpp == 15) && (out_bpp == 15)) + { + return bmpdata; + } g_writeln("convert_bitmap: error unknown conversion from %d to %d", in_bpp, out_bpp); return 0; @@ -265,6 +269,10 @@ convert_color(int in_bpp, int out_bpp, int in_color, int* palette) { return in_color; } + if ((in_bpp == 15) && (out_bpp == 15)) + { + return in_color; + } g_writeln("convert_color: error unknown conversion from %d to %d", in_bpp, out_bpp); return 0; diff --git a/freerdp/xrdp-freerdp.c b/freerdp/xrdp-freerdp.c index 78277e08..f7e7fd5e 100644 --- a/freerdp/xrdp-freerdp.c +++ b/freerdp/xrdp-freerdp.c @@ -139,22 +139,17 @@ lib_mod_event(struct mod* mod, int msg, long param1, long param2, param1, param2); break; case 107: - //mod->inst->rdp_send_input_mouse(mod->inst, - // MOUSE_FLAG_BUTTON4, param1, param2); + mod->inst->rdp_send_input_mouse(mod->inst, + PTRFLAGS_WHEEL | 0x0078, 0, 0); break; case 108: - //mod->inst->rdp_send_input_mouse(mod->inst, - // MOUSE_FLAG_BUTTON4 | MOUSE_FLAG_DOWN, - // param1, param2); break; case 109: - //mod->inst->rdp_send_input_mouse(mod->inst, - // MOUSE_FLAG_BUTTON5, param1, param2); + mod->inst->rdp_send_input_mouse(mod->inst, + PTRFLAGS_WHEEL | + PTRFLAGS_WHEEL_NEGATIVE | 0x0088, 0, 0); break; case 110: - //mod->inst->rdp_send_input_mouse(mod->inst, - // MOUSE_FLAG_BUTTON5 | MOUSE_FLAG_DOWN, - // param1, param2); break; } LIB_DEBUG(mod, "out lib_mod_event"); |