/[rdesktop]/sourceforge.net/rdesktop/trunk/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/rdesktop/trunk/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 846 by jdmeijer, Fri Mar 11 00:50:19 2005 UTC
# Line 648  process_polygon2(STREAM s, POLYGON2_ORDE Line 648  process_polygon2(STREAM s, POLYGON2_ORDE
648  static void  static void
649  process_polyline(STREAM s, POLYLINE_ORDER * os, uint32 present, BOOL delta)  process_polyline(STREAM s, POLYLINE_ORDER * os, uint32 present, BOOL delta)
650  {  {
651          int index, line, data;          int index, next, data;
         int x, y, xfrom, yfrom;  
652          uint8 flags = 0;          uint8 flags = 0;
653          PEN pen;          PEN pen;
654          uint8 opcode;          POINT *points;
655    
656          if (present & 0x01)          if (present & 0x01)
657                  rdp_in_coord(s, &os->x, delta);                  rdp_in_coord(s, &os->x, delta);
# Line 691  process_polyline(STREAM s, POLYLINE_ORDE Line 690  process_polyline(STREAM s, POLYLINE_ORDE
690                  return;                  return;
691          }          }
692    
693          opcode = os->opcode - 1;          points = (POINT *) xmalloc((os->lines + 1) * sizeof(POINT));
694          x = os->x;          memset(points, 0, (os->lines + 1) * sizeof(POINT));
695          y = os->y;  
696            points[0].x = os->x;
697            points[0].y = os->y;
698          pen.style = pen.width = 0;          pen.style = pen.width = 0;
699          pen.colour = os->fgcolour;          pen.colour = os->fgcolour;
700    
701          index = 0;          index = 0;
702          data = ((os->lines - 1) / 4) + 1;          data = ((os->lines - 1) / 4) + 1;
703          for (line = 0; (line < os->lines) && (data < os->datasize); line++)          for (next = 1; (next <= os->lines) && (data < os->datasize); next++)
704          {          {
705                  xfrom = x;                  if ((next - 1) % 4 == 0)
                 yfrom = y;  
   
                 if (line % 4 == 0)  
706                          flags = os->data[index++];                          flags = os->data[index++];
707    
708                  if ((flags & 0xc0) == 0)                  if (~flags & 0x80)
709                          flags |= 0xc0;  /* none = both */                          points[next].x = parse_delta(os->data, &data);
   
                 if (flags & 0x40)  
                         x += parse_delta(os->data, &data);  
   
                 if (flags & 0x80)  
                         y += parse_delta(os->data, &data);  
710    
711                  ui_line(opcode, xfrom, yfrom, x, y, &pen);                  if (~flags & 0x40)
712                            points[next].y = parse_delta(os->data, &data);
713    
714                  flags <<= 2;                  flags <<= 2;
715          }          }
716    
717            if (next - 1 == os->lines)
718                    ui_polyline(os->opcode - 1, points, os->lines + 1, &pen);
719            else
720                    error("polyline parse error\n");
721    
722            xfree(points);
723  }  }
724    
725  /* Process an ellipse order */  /* Process an ellipse order */
# 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.846
  ViewVC Help
Powered by ViewVC 1.1.26