1 files changed, 13 insertions, 4 deletions

diff --git a/noncore/comm/keypebble/krfbbuffer.cpp b/noncore/comm/keypebble/krfbbuffer.cpp
index 5a52f31..f1cb929 100644
--- a/noncore/comm/keypebble/krfbbuffer.cpp
+++ b/noncore/comm/keypebble/krfbbuffer.cpp
@@ -1,20 +1,22 @@
 #include <assert.h>
 #include <qpixmap.h>
 #include <qbrush.h>
 #include <qimage.h>
 #include <qpainter.h>
 #include <qapplication.h>
 #include "krfbdecoder.h"
 #include "krfbbuffer.h"
+#include "krfbconnection.h"
+#include "krfbserver.h"
 #include "krfbserverinfo.h"
 
 //
 // Endian stuff
 //
 #ifndef KDE_USE_FINAL
 const int endianTest = 1;
 #endif
 
 #define Swap16IfLE(s) \
     (*(char *)&endianTest ? ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff)) : (s))
 
@@ -77,36 +79,38 @@ void KRFBBuffer::copyRect( int srcX, int srcY,
 {
 //  qWarning( "Got copy rect" );
   bitBlt( pix, destX, destY, pix, srcX, srcY, w, h, CopyROP );
 
   emit updated( destX, destY, w, h );
 }
 
 void KRFBBuffer::drawRawRectChunk( void *data,
                                    int x, int y, int w, int h )
 {
   QImage img( w, h, 32 );
 
+        int scaleFactor=decoder->con->options()->scaleFactor;
   int redMax = Swap16IfLE( decoder->format->redMax );
   int greenMax = Swap16IfLE( decoder->format->greenMax );
   int blueMax = Swap16IfLE( decoder->format->blueMax );
 
   QPainter p( pix );
 
   if ( decoder->format->bpp == 8 ) {
     uchar *d = (unsigned char *) data;
 
     uint r,g,b;
 
-    for ( int j = 0; j < h; j++ ) {
+                
+    for ( int j = 0; j < h; j++) {
       for ( int i = 0; i < w ; i++ ) {
         r = d[ j * w + i ];
         r = r >> decoder->format->redShift;
         r = r & redMax;
 
         g = d[ j * w + i ];
         g = g >> decoder->format->greenShift;
         g = g & greenMax;
 
         b = d[ j * w + i ];
         b = b >> decoder->format->blueShift;
         b = b & blueMax;
@@ -178,17 +182,22 @@ void KRFBBuffer::drawRawRectChunk( void *data,
                                                                 b = ( b * 255 ) / blueMax;
 
                                                                 ulong *p = ( ulong * ) img.scanLine( j ) + i;
                                                                 *p = qRgb( r,g,b );
                                                 }
                                 }
                 }
   else {
     p.setBrush( QBrush( Qt::black ) );
     p.drawRect( x, y, w, h );
   }
 
-  p.drawImage( x, y, img );
-
-  emit updated( x, y, w, h );
+        if (scaleFactor > 1) {
+                 p.drawImage( x/scaleFactor, y/scaleFactor, img.smoothScale(w/scaleFactor,h/scaleFactor) );
+                 emit updated( x/scaleFactor, y/scaleFactor, w/scaleFactor, h/scaleFactor );
+        } 
+        else {
+                 p.drawImage( x, y, img);
+                 emit updated( x, y, w, h );
+        }
 }