kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move color fallback from process_bitmap_updates to process_demand_active

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@653 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Jay Sorg 2004-04-15 22:03:24 +00:00
parent acbe93c9a8
commit 64bb8d7e46
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
rdp.c
View File

@ -409,7 +409,7 @@ rdp_out_bitmap_caps(STREAM s)
out_uint16_le(s, RDP_CAPSET_BITMAP); out_uint16_le(s, RDP_CAPSET_BITMAP);
out_uint16_le(s, RDP_CAPLEN_BITMAP); out_uint16_le(s, RDP_CAPLEN_BITMAP);
out_uint16_le(s, 8); /* Preferred BPP */ out_uint16_le(s, g_server_bpp); /* Preferred BPP */
out_uint16_le(s, 1); /* Receive 1 BPP */ out_uint16_le(s, 1); /* Receive 1 BPP */
out_uint16_le(s, 1); /* Receive 4 BPP */ out_uint16_le(s, 1); /* Receive 4 BPP */
out_uint16_le(s, 1); /* Receive 8 BPP */ out_uint16_le(s, 1); /* Receive 8 BPP */
@ -618,9 +618,35 @@ static void
process_demand_active(STREAM s) process_demand_active(STREAM s)
{ {
uint8 type; uint8 type;
uint16 i;
uint16 p_bpp;
in_uint32_le(s, g_rdp_shareid); in_uint32_le(s, g_rdp_shareid);
/* scan for prefered bpp */
while (s_check_rem(s, 6))
{
in_uint16_le(s, i);
if (i == RDP_CAPSET_BITMAP)
{
in_uint16_le(s, i);
if (i == RDP_CAPLEN_BITMAP)
{
in_uint16_le(s, p_bpp);
if (p_bpp == 8 || p_bpp == 15 || p_bpp == 16 || p_bpp == 24)
{
if (p_bpp < g_server_bpp)
{
warning("Server limited colour depth to %d bits\n", p_bpp);
g_server_bpp = p_bpp;
}
break;
}
}
}
}
DEBUG(("DEMAND_ACTIVE(id=0x%x)\n", g_rdp_shareid)); DEBUG(("DEMAND_ACTIVE(id=0x%x)\n", g_rdp_shareid));
rdp_send_confirm_active(); rdp_send_confirm_active();
@ -754,13 +780,6 @@ process_bitmap_updates(STREAM s)
DEBUG(("BITMAP_UPDATE(l=%d,t=%d,r=%d,b=%d,w=%d,h=%d,Bpp=%d,cmp=%d)\n", DEBUG(("BITMAP_UPDATE(l=%d,t=%d,r=%d,b=%d,w=%d,h=%d,Bpp=%d,cmp=%d)\n",
left, top, right, bottom, width, height, Bpp, compress)); left, top, right, bottom, width, height, Bpp, compress));
/* Server may limit bpp - this is how we find out */
if (g_server_bpp != bpp)
{
warning("Server limited colour depth to %d bits\n", bpp);
g_server_bpp = bpp;
}
if (!compress) if (!compress)
{ {
int y; int y;