CVS: rdesktop/uiports qterdesktopbuild.sh,1.2,1.3 qtewin.cpp,1.3,1.4 qtwin.cpp,1.4,1.5

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

Modified Files:
	qterdesktopbuild.sh qtewin.cpp qtwin.cpp 
Log Message:
got 24 bpp working in qtewin.cpp

Index: qterdesktopbuild.sh
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/uiports/qterdesktopbuild.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** qterdesktopbuild.sh	4 Oct 2004 03:24:08 -0000	1.2
--- qterdesktopbuild.sh	30 Oct 2004 17:02:54 -0000	1.3
***************
*** 12,16 ****
  # uncomment the following line to turn on sound
  cflags=$cflags" -DWITH_RDPSND"
! lflags="-L/usr/local/qt/lib -lqte -lcrypto"
  
  # rdesktop core files
--- 12,17 ----
  # uncomment the following line to turn on sound
  cflags=$cflags" -DWITH_RDPSND"
! lflags="-L/usr/local/qt/lib"
! libs="-lqte -lcrypto"
  
  # rdesktop core files
***************
*** 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
--- 40,42 ----
  $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 $libs

Index: qtewin.cpp
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/uiports/qtewin.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** qtewin.cpp	4 Oct 2004 03:24:09 -0000	1.3
--- qtewin.cpp	30 Oct 2004 17:02:54 -0000	1.4
***************
*** 26,29 ****
--- 26,30 ----
  #include <qapplication.h>
  #endif
+ #include <qcursor.h>
  #include <qmainwindow.h>
  #include <qwidget.h>
***************
*** 120,124 ****
  #define SETPIXEL32(d, x, y, w, v) *(((uint32*)d) + ((y) * (w) + (x))) = v
  
[...1237 lines suppressed...]
  {
--- 2199,2203 ----
  }
  
! /******************************************************************************/
  int main(int argc, char ** argv)
  {
***************
*** 2101,2105 ****
    {
      g_SV->timer_id = g_SV->startTimer(1000); /* one sec delay, then dialog */
!     g_MW->setCursor(BlankCursor);
      g_App->exec();
    }
--- 2219,2223 ----
    {
      g_SV->timer_id = g_SV->startTimer(1000); /* one sec delay, then dialog */
!     g_MW->setCursor((int)10); /* Qt::BlankCursor */
      g_App->exec();
    }

Index: qtwin.cpp
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/uiports/qtwin.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** qtwin.cpp	4 Oct 2004 03:24:09 -0000	1.4
--- qtwin.cpp	30 Oct 2004 17:02:54 -0000	1.5
***************
*** 41,45 ****
  /* rdesktop globals */
  extern int g_tcp_port_rdp;
! int g_use_rdp5 = 0;
  char g_hostname[16];
  char g_username[64];
--- 41,45 ----
  /* rdesktop globals */
  extern int g_tcp_port_rdp;
! int g_use_rdp5 = 1;
  char g_hostname[16];
  char g_username[64];
***************
*** 48,52 ****
  int g_server_bpp = 8;
  int g_encryption = 1;
! int g_desktop_save =1;
  int g_bitmap_cache = 1;
  int g_bitmap_cache_persist_enable = False;
--- 48,52 ----
  int g_server_bpp = 8;
  int g_encryption = 1;
! int g_desktop_save = 1;
  int g_bitmap_cache = 1;
  int g_bitmap_cache_persist_enable = False;
***************
*** 70,74 ****
  QSocketNotifier* SocketNotifier;
  QApplication* App;
! QMyMainWindow* MW;
  QMyScrollView* SV;
  QPixmap* BS;
--- 70,74 ----
  QSocketNotifier* SocketNotifier;
  QApplication* App;
! QMyMainWindow* g_MW;
  QMyScrollView* SV;
  QPixmap* BS;
***************
*** 429,433 ****
  void QMyScrollView::keyPressEvent(QKeyEvent* e)
  {
!   MW->keyPressEvent(e);
  }
  
--- 429,433 ----
  void QMyScrollView::keyPressEvent(QKeyEvent* e)
  {
!   g_MW->keyPressEvent(e);
  }
  
***************
*** 435,439 ****
  void QMyScrollView::keyReleaseEvent(QKeyEvent* e)
  {
!   MW->keyReleaseEvent(e);
  }
  
--- 435,439 ----
  void QMyScrollView::keyReleaseEvent(QKeyEvent* e)
  {
!   g_MW->keyReleaseEvent(e);
  }
  
***************
*** 442,446 ****
  void ui_begin_update(void)
  {
!   P1->begin(MW);
    P2->begin(BS);
  }
--- 442,446 ----
  void ui_begin_update(void)
  {
!   P1->begin(g_MW);
    P2->begin(BS);
  }
***************
*** 470,476 ****
  {
    int w, h;
!   MW = new QMyMainWindow();
    SV = new QMyScrollView();
!   SV->addChild(MW);
    BS = new QPixmap(g_width, g_height);
    QPainter* P = new QPainter(BS);
--- 470,476 ----
  {
    int w, h;
!   g_MW = new QMyMainWindow();
    SV = new QMyScrollView();
!   SV->addChild(g_MW);
    BS = new QPixmap(g_width, g_height);
    QPainter* P = new QPainter(BS);
***************
*** 485,489 ****
    w = d->width();                   // returns screen width
    h = d->height();                  // returns screen height
!   MW->resize(g_width, g_height);
    if (w < g_width || h < g_height)
      SV->resize(w, h);
--- 485,489 ----
    w = d->width();                   // returns screen width
    h = d->height();                  // returns screen height
!   g_MW->resize(g_width, g_height);
    if (w < g_width || h < g_height)
      SV->resize(w, h);
***************
*** 494,498 ****
    App->setMainWidget(SV);
    SV->show();
!   MW->setMouseTracking(true);
    if (g_title[0] != 0)
      SV->setCaption(g_title);
--- 494,498 ----
    App->setMainWidget(SV);
    SV->show();
!   g_MW->setMouseTracking(true);
    if (g_title[0] != 0)
      SV->setCaption(g_title);
***************
*** 518,523 ****
      return;
    // start notifier
!   SocketNotifier = new QSocketNotifier(g_sock, QSocketNotifier::Read, MW);
!   MW->connect(SocketNotifier, SIGNAL(activated(int)), MW, SLOT(dataReceived()));
    UpAndRunning = 1;
    // app main loop
--- 518,523 ----
      return;
    // start notifier
!   SocketNotifier = new QSocketNotifier(g_sock, QSocketNotifier::Read, g_MW);
!   g_MW->connect(SocketNotifier, SIGNAL(activated(int)), g_MW, SLOT(dataReceived()));
    UpAndRunning = 1;
    // app main loop
***************
*** 528,532 ****
  void ui_destroy_window(void)
  {
!   delete MW;
    delete SV;
    delete BS;
--- 528,532 ----
  void ui_destroy_window(void)
  {
!   delete g_MW;
    delete SV;
    delete BS;
***************
*** 834,840 ****
    }
    if (boxcx > 1)
!     bitBltClip(MW, NULL, boxx, boxy, BS, boxx, boxy, boxcx, boxcy, Qt::CopyROP, true);
    else
!     bitBltClip(MW, NULL, clipx, clipy, BS, clipx, clipy, clipcx, clipcy, Qt::CopyROP, true);
  }
  
--- 834,840 ----
    }
    if (boxcx > 1)
!     bitBltClip(g_MW, NULL, boxx, boxy, BS, boxx, boxy, boxcx, boxcy, Qt::CopyROP, true);
    else
!     bitBltClip(g_MW, NULL, clipx, clipy, BS, clipx, clipy, clipcx, clipcy, Qt::CopyROP, true);
  }
  
***************
*** 927,931 ****
    Pixmap = new QPixmap(cx, cy);
    CommonDeskSave(DS, Pixmap, offset, 0, 0, cx, cy, 1);
!   bitBltClip(MW, BS, x, y, Pixmap, 0, 0, cx, cy, Qt::CopyROP, true);
    delete Pixmap;
  }
--- 927,931 ----
    Pixmap = new QPixmap(cx, cy);
    CommonDeskSave(DS, Pixmap, offset, 0, 0, cx, cy, 1);
!   bitBltClip(g_MW, BS, x, y, Pixmap, 0, 0, cx, cy, Qt::CopyROP, true);
    delete Pixmap;
  }
***************
*** 950,954 ****
  {
    SetOpCode(opcode);
!   bitBltClip(MW, BS, x, y, NULL, srcx, srcy, cx, cy, Qt::CopyROP, true);
    ResetOpCode(opcode);
  }
--- 950,954 ----
  {
    SetOpCode(opcode);
!   bitBltClip(g_MW, BS, x, y, NULL, srcx, srcy, cx, cy, Qt::CopyROP, true);
    ResetOpCode(opcode);
  }
***************
*** 986,990 ****
    }
    ResetOpCode(opcode);
!   bitBltClip(MW, NULL, x, y, BS, x, y, cx, cy, Qt::CopyROP, true);
  }
  
--- 986,990 ----
    }
    ResetOpCode(opcode);
!   bitBltClip(g_MW, NULL, x, y, BS, x, y, cx, cy, Qt::CopyROP, true);
  }
  
***************
*** 1006,1009 ****
--- 1006,1010 ----
  void ui_set_null_cursor(void)
  {
+   g_MW->setCursor(Qt::BlankCursor);
  }
  
***************
*** 1112,1116 ****
    Cursor = (QCursor*)cursor;
    if (Cursor != NULL)
!     MW->setCursor(*Cursor);
  }
  
--- 1113,1117 ----
    Cursor = (QCursor*)cursor;
    if (Cursor != NULL)
!     g_MW->setCursor(*Cursor);
  }
  



-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click