CVS: rdesktop/uiports makefile_qt,NONE,1.1 qtreadme.txt,1.2,1.3 qtwin.cpp,1.6,1.7 qtrdesktopbuild.sh,1.3,NONE

Update of /cvsroot/rdesktop/rdesktop/uiports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11180

Modified Files:
	qtreadme.txt qtwin.cpp 
Added Files:
	makefile_qt 
Removed Files:
	qtrdesktopbuild.sh 
Log Message:
added makefile_qt and new orders to qt uiport

--- NEW FILE: makefile_qt ---
#
# qtrdesktop makefile
# qt should be installed in /usr/local/qt
#
CC = g++
CPPFLAGS = -O2 -Wall -I/usr/local/qt/include
RESTOBJ = ../tcp.o ../iso.o ../mcs.o ../secure.o ../rdp.o ../rdp5.o ../orders.o ../cache.o ../mppc.o ../licence.o ../bitmap.o ../channels.o ../pstcache.o
LD2FLAGS = -L/usr/local/qt/lib -L/usr/X11R6/lib
LDFLAGS = -lcrypto -lqt -lXext -lX11 -lm
MOCFILE = /usr/local/qt/bin/moc

all: qtrd

qtrd: $(RESTOBJ) qtwin.o
	$(MOCFILE) qtwin.h > moc_qtwin.cpp
	$(CC) $(CPPFLAGS) -c moc_qtwin.cpp
	$(CC) -o qtrdesktop $(LD2FLAGS) qtwin.o moc_qtwin.o $(RESTOBJ) $(LDFLAGS)
	strip qtrdesktop

clean:
	rm -f qtrdesktop
	rm -f *.o
	rm -f ../*.o

Index: qtreadme.txt
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/uiports/qtreadme.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** qtreadme.txt	4 Oct 2004 03:24:09 -0000	1.2
--- qtreadme.txt	13 Mar 2005 06:00:56 -0000	1.3
***************
*** 4,12 ****
  tested with versions 2.3.2, 3.1.2
  
! qtrdesktopbuild.sh can be edited to change file localtions or endianness
! run ./qtrdesktopbuild.sh in this directory to compile it
  
  qtreadme.txt - notes, this file
! qtrdesktopbuild.sh - script to build
  qtwin.cpp - ui lib
  qtwin.h - header
--- 4,12 ----
  tested with versions 2.3.2, 3.1.2
  
! makefile_qt can be edited to change file localtions
! run make -f makefile_qt in this directory to compile it
  
  qtreadme.txt - notes, this file
! makefile_qt - makefile
  qtwin.cpp - ui lib
  qtwin.h - header

Index: qtwin.cpp
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/uiports/qtwin.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** qtwin.cpp	3 Nov 2004 03:27:53 -0000	1.6
--- qtwin.cpp	13 Mar 2005 06:00:56 -0000	1.7
***************
*** 49,52 ****
--- 49,53 ----
  int g_encryption = 1;
  int g_desktop_save = 1;
+ int g_polygon_ellipse_orders = 0;
  int g_bitmap_cache = 1;
  int g_bitmap_cache_persist_enable = False;
***************
*** 765,773 ****
  
  //*****************************************************************************
! void ui_draw_text(uint8 font, uint8 flags, int mixmode,
                    int x, int y, int clipx, int clipy,
                    int clipcx, int clipcy, int boxx,
!                   int boxy, int boxcx, int boxcy, int bgcolour,
!                   int fgcolour, uint8 * text, uint8 length)
  {
    FONTGLYPH *glyph;
--- 766,774 ----
  
  //*****************************************************************************
! void ui_draw_text(uint8 font, uint8 flags, uint8 opcode, int mixmode,
                    int x, int y, int clipx, int clipy,
                    int clipcx, int clipcy, int boxx,
!                   int boxy, int boxcx, int boxcy, BRUSH * brush,
!                   int bgcolour, int fgcolour, uint8 * text, uint8 length)
  {
    FONTGLYPH *glyph;
***************
*** 1176,1179 ****
--- 1177,1213 ----
  
  /*****************************************************************************/
+ void ui_polygon(uint8 opcode, uint8 fillmode, POINT * point, int npoints,
+                 BRUSH * brush, int bgcolour, int fgcolour)
+ {
+ }
+ 
+ /*****************************************************************************/
+ /* todo, use qt function for this (QPainter::drawPolyline) */
+ void ui_polyline(uint8 opcode, POINT * points, int npoints, PEN * pen)
+ {
+   int i, x, y, dx, dy;
+   if (npoints > 0)
+   {
+     x = points[0].x;
+     y = points[0].y;
+     for (i = 1; i < npoints; i++)
+     {
+       dx = points[i].x;
+       dy = points[i].y;
+       ui_line(opcode, x, y, x + dx, y + dy, pen);
+       x = x + dx;
+       y = y + dy;
+     }
+   }
+ }
+ 
+ /*****************************************************************************/
+ void ui_ellipse(uint8 opcode, uint8 fillmode,
+                 int x, int y, int cx, int cy,
+                 BRUSH * brush, int bgcolour, int fgcolour)
+ {
+ }
+ 
+ /*****************************************************************************/
  void generate_random(uint8* random)
  {

--- qtrdesktopbuild.sh DELETED ---



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click