CVS: rdesktop/uiports qterdesktopbuild.sh,1.1,1.2 qtewin.cpp,1.2,1.3 qtewin.h,1.1,1.2 qtrdesktopbuild.sh,1.2,1.3 qtreadme.txt,1.1,1.2 qtwin.cpp,1.3,1.4

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

Modified Files:
	qterdesktopbuild.sh qtewin.cpp qtewin.h qtrdesktopbuild.sh 
	qtreadme.txt qtwin.cpp 
Log Message:
added 16 bit color and sound and command line params to qte and other cleanups

Index: qterdesktopbuild.sh
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/uiports/qterdesktopbuild.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** qterdesktopbuild.sh	12 Aug 2004 02:36:29 -0000	1.1
--- qterdesktopbuild.sh	4 Oct 2004 03:24:08 -0000	1.2
***************
*** 2,14 ****
  # qterdesktop build script
  
! rm qterdesktop
! rm *.o
! rm moc_*
  
  cc="g++"
  cflags="-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -Os -fno-default-inline -DNO_DEBUG -DWITH_OPENSSL"
  # uncomment the following line to turn on debug
! #cflags=$cflags+" -DWITH_DEBUG"
! lflags="-lcrypto -L/usr/local/qt/lib -lqte"
  
  # rdesktop core files
--- 2,16 ----
  # qterdesktop build script
  
! rm -f qterdesktop
! rm -f *.o
! rm -f moc_*
  
  cc="g++"
  cflags="-pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -Os -fno-default-inline -DNO_DEBUG -DWITH_OPENSSL"
  # uncomment the following line to turn on debug
! #cflags=$cflags" -DWITH_DEBUG"
! # uncomment the following line to turn on sound
! cflags=$cflags" -DWITH_RDPSND"
! lflags="-L/usr/local/qt/lib -lqte -lcrypto"
  
  # rdesktop core files
***************
*** 26,29 ****
--- 28,33 ----
  $cc $cflags -c ../channels.c -o channels.o
  $cc $cflags -c ../pstcache.c -o pstcache.o
+ $cc $cflags -c ../rdpsnd.c -o rdpsnd.o
+ $cc $cflags -c ../rdpsnd_oss.c -o rdpsnd_oss.o
  
  # qt files
***************
*** 35,37 ****
  $cc $cflags -I/usr/local/qt/include -c moc_qtewin.cpp -o moc_qtewin.o
  
! $cc $lflags -o qterdesktop moc_qtewin.o qtewin.o 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
--- 39,41 ----
  $cc $cflags -I/usr/local/qt/include -c moc_qtewin.cpp -o moc_qtewin.o
  
! $cc $lflags -o qterdesktop moc_qtewin.o qtewin.o 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 rdpsnd.o rdpsnd_oss.o

Index: qtewin.cpp
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/uiports/qtewin.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** qtewin.cpp	2 Oct 2004 01:30:33 -0000	1.2
--- qtewin.cpp	4 Oct 2004 03:24:09 -0000	1.3
***************
*** 1,5 ****
  /*
     rdesktop: A Remote Desktop Protocol client.
!    User interface services - X Window System
     Copyright (C) Jay Sorg 2004
  
--- 1,5 ----
  /*
     rdesktop: A Remote Desktop Protocol client.
!    User interface services - QT Emb System
     Copyright (C) Jay Sorg 2004
[...1243 lines suppressed...]
    g_App->setMainWidget(g_SV);
    g_SV->showMaximized();
!   if (argc > 1)
!   {
!     get_username_and_hostname();
!     if (parse_parameters(argc, argv))
!       param_connect();
!   }
!   else
!   {
!     g_SV->timer_id = g_SV->startTimer(1000); /* one sec delay, then dialog */
!     g_MW->setCursor(BlankCursor);
!     g_App->exec();
!   }
    delete g_SV;
    delete g_App;
!   xfree(g_CM);
!   xfree(g_BS);
    return 0;
  }

Index: qtewin.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/uiports/qtewin.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** qtewin.h	12 Aug 2004 02:35:46 -0000	1.1
--- qtewin.h	4 Oct 2004 03:24:09 -0000	1.2
***************
*** 79,82 ****
--- 79,83 ----
    public:
      int timer_id;
+     int sound_timer_id;
  };
  
***************
*** 96,99 ****
--- 97,101 ----
    public slots:
      void dataReceived();
+     void soundSend();
      void MemuClicked(int);
    public:

Index: qtrdesktopbuild.sh
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/uiports/qtrdesktopbuild.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** qtrdesktopbuild.sh	27 Jun 2004 19:08:34 -0000	1.2
--- qtrdesktopbuild.sh	4 Oct 2004 03:24:09 -0000	1.3
***************
*** 2,8 ****
  # qtrdesktop build script
  
! rm qtrdesktop
! rm *.o
! rm moc_*
  
  cc="g++"
--- 2,8 ----
  # qtrdesktop build script
  
! rm -f qtrdesktop
! rm -f *.o
! rm -f moc_*
  
  cc="g++"

Index: qtreadme.txt
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/uiports/qtreadme.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** qtreadme.txt	24 Jun 2004 22:06:01 -0000	1.1
--- qtreadme.txt	4 Oct 2004 03:24:09 -0000	1.2
***************
*** 2,6 ****
  qt should be installed in /usr/local/qt
  you may need to have LD_LIBRARY_PATH defined to run qtrdesktop
! tested with versions 2.3.2, 3.12
  
  qtrdesktopbuild.sh can be edited to change file localtions or endianness
--- 2,6 ----
  qt should be installed in /usr/local/qt
  you may need to have LD_LIBRARY_PATH defined to run qtrdesktop
! tested with versions 2.3.2, 3.1.2
  
  qtrdesktopbuild.sh can be edited to change file localtions or endianness

Index: qtwin.cpp
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/uiports/qtwin.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** qtwin.cpp	27 Jun 2004 19:38:18 -0000	1.3
--- qtwin.cpp	4 Oct 2004 03:24:09 -0000	1.4
***************
*** 2,7 ****
     rdesktop: A Remote Desktop Protocol client.
     User interface services - QT Window System
!    Copyright (C) Matthew Chapman 1999-2002
!    qtwin.cpp by Jay Sorg
  
     This program is free software; you can redistribute it and/or modify
--- 2,6 ----
     rdesktop: A Remote Desktop Protocol client.
     User interface services - QT Window System
!    Copyright (C) Jay Sorg 2004
  
     This program is free software; you can redistribute it and/or modify



-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl