/[rdesktop]/sourceforge.net/trunk/rdesktop/orders.c
This is repository of my old source code which isn't updated any more. Go to git.rot13.org for current projects!
ViewVC logotype

Diff of /sourceforge.net/trunk/rdesktop/orders.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 831 by jdmeijer, Tue Mar 8 00:43:10 2005 UTC revision 843 by jdmeijer, Thu Mar 10 22:40:20 2005 UTC
# Line 805  process_text2(STREAM s, TEXT2_ORDER * os Line 805  process_text2(STREAM s, TEXT2_ORDER * os
805                  in_uint8(s, os->flags);                  in_uint8(s, os->flags);
806    
807          if (present & 0x000004)          if (present & 0x000004)
808                  in_uint8(s, os->unknown);                  in_uint8(s, os->opcode);
809    
810          if (present & 0x000008)          if (present & 0x000008)
811                  in_uint8(s, os->mixmode);                  in_uint8(s, os->mixmode);
# Line 840  process_text2(STREAM s, TEXT2_ORDER * os Line 840  process_text2(STREAM s, TEXT2_ORDER * os
840          if (present & 0x002000)          if (present & 0x002000)
841                  in_uint16_le(s, os->boxbottom);                  in_uint16_le(s, os->boxbottom);
842    
843          /*          rdp_parse_brush(s, &os->brush, present >> 14);
          * Unknown members, seen when connecting to a session that was disconnected with  
          * mstsc and with wintach's spreadsheet test.  
          */  
         if (present & 0x004000)  
                 in_uint8s(s, 1);  
   
         if (present & 0x008000)  
                 in_uint8s(s, 1);  
   
         if (present & 0x010000)  
         {  
                 in_uint8s(s, 1);        /* guessing the length here */  
                 warning("Unknown order state member (0x010000) in text2 order.\n");  
         }  
   
         if (present & 0x020000)  
                 in_uint8s(s, 4);  
   
         if (present & 0x040000)  
                 in_uint8s(s, 4);  
844    
845          if (present & 0x080000)          if (present & 0x080000)
846                  in_uint16_le(s, os->x);                  in_uint16_le(s, os->x);
# Line 874  process_text2(STREAM s, TEXT2_ORDER * os Line 854  process_text2(STREAM s, TEXT2_ORDER * os
854                  in_uint8a(s, os->text, os->length);                  in_uint8a(s, os->text, os->length);
855          }          }
856    
857          DEBUG(("TEXT2(x=%d,y=%d,cl=%d,ct=%d,cr=%d,cb=%d,bl=%d,bt=%d,bb=%d,br=%d,fg=0x%x,bg=0x%x,font=%d,fl=0x%x,mix=%d,unk=0x%x,n=%d)\n", os->x, os->y, os->clipleft, os->cliptop, os->clipright, os->clipbottom, os->boxleft, os->boxtop, os->boxright, os->boxbottom, os->fgcolour, os->bgcolour, os->font, os->flags, os->mixmode, os->unknown, os->length));          DEBUG(("TEXT2(x=%d,y=%d,cl=%d,ct=%d,cr=%d,cb=%d,bl=%d,bt=%d,br=%d,bb=%d,bs=%d,bg=0x%x,fg=0x%x,font=%d,fl=0x%x,op=0x%x,mix=%d,n=%d)\n", os->x, os->y, os->clipleft, os->cliptop, os->clipright, os->clipbottom, os->boxleft, os->boxtop, os->boxright, os->boxbottom, os->brush.style, os->bgcolour, os->fgcolour, os->font, os->flags, os->opcode, os->mixmode, os->length));
858    
859          DEBUG(("Text: "));          DEBUG(("Text: "));
860    
# Line 883  process_text2(STREAM s, TEXT2_ORDER * os Line 863  process_text2(STREAM s, TEXT2_ORDER * os
863    
864          DEBUG(("\n"));          DEBUG(("\n"));
865    
866          ui_draw_text(os->font, os->flags, os->mixmode, os->x, os->y,          ui_draw_text(os->font, os->flags, os->opcode - 1, os->mixmode, os->x, os->y,
867                       os->clipleft, os->cliptop,                       os->clipleft, os->cliptop, os->clipright - os->clipleft,
868                       os->clipright - os->clipleft,                       os->clipbottom - os->cliptop, os->boxleft, os->boxtop,
869                       os->clipbottom - os->cliptop,                       os->boxright - os->boxleft, os->boxbottom - os->boxtop,
870                       os->boxleft, os->boxtop,                       &os->brush, os->bgcolour, os->fgcolour, os->text, os->length);
                      os->boxright - os->boxleft,  
                      os->boxbottom - os->boxtop, os->bgcolour, os->fgcolour, os->text, os->length);  
871  }  }
872    
873  /* Process a raw bitmap cache order */  /* Process a raw bitmap cache order */
Legend:
Removed from v.831  
changed lines
  Added in v.843
  ViewVC Help
Powered by ViewVC 1.1.26