Make that (theoretically) work with resolutions other than 320x240

and 240x320.

1 files changed, 6 insertions, 17 deletions

diff --git a/core/applets/screenshotapplet/screenshot.cpp b/core/applets/screenshotapplet/screenshot.cpp
index f2cc2c5..7e2fdf0 100644
--- a/core/applets/screenshotapplet/screenshot.cpp
+++ b/core/applets/screenshotapplet/screenshot.cpp
@@ -425,39 +425,28 @@ void ScreenshotControl::performGrab()
 
       if (( sock = ::socket ( AF_INET, SOCK_STREAM, 0 )) >= 0 )
       {
         if ( ::connect ( sock, (struct sockaddr *) & raddr, sizeof (struct sockaddr)) >= 0 ) {
           QString header;
 
+          QPixmap pix = ( snapshot.width() > snapshot.height() ) ? snapshot : snapshot.xForm( QWMatrix().rotate(90) );
+          QImage img = pix.convertToImage().convertDepth( 16 ); // could make that also depth independent, if hh.org/scap can handle it
+
           header = "POST /scap/capture.cgi?%1+%2 HTTP/1.1\n"  // 1: model / 2: user
-                   "Content-length: 153600\n"
+                   "Content-length: %3\n"                     // 3: content length
                    "Content-Type: image/gif\n"
-                   "Host: %4\n"                               // 3: scap host
+                   "Host: %4\n"                               // 4: scap host
                    "\n";
 
-          header = header. arg ( "" ). arg ( ::getenv ( "USER" )). arg ( SCAP_hostname );
-
-          QPixmap pix;
-
-          if ( snapshot. width ( ) == 320 && snapshot. height ( ) == 240 )
-          {
-            pix = snapshot;
-          }
-          else if ( snapshot. width ( ) == 240 && snapshot. height ( ) == 320 )
-          {
-            pix = snapshot. xForm ( QWMatrix ( ). rotate ( 90 ));
-          }
+          header = header.arg( "" ).arg( ::getenv ( "USER" ) ).arg( img.numBytes() ).arg( SCAP_hostname );
 
           if ( !pix. isNull ( ))
           {
             const char *ascii = header. latin1 ( );
             uint ascii_len = ::strlen ( ascii );
-
             ::write ( sock, ascii, ascii_len );
-
-            QImage img = pix. convertToImage ( ). convertDepth ( 16 );
             ::write ( sock, img. bits ( ), img.numBytes ( ));
 
             ok = true;
           }
         }
         ::close ( sock );