fix for qvfb

1 files changed, 70 insertions, 57 deletions

diff --git a/core/applets/screenshotapplet/screenshot.cpp b/core/applets/screenshotapplet/screenshot.cpp
index 7e2fdf0..f024f47 100644
--- a/core/applets/screenshotapplet/screenshot.cpp
+++ b/core/applets/screenshotapplet/screenshot.cpp
@@ -379,105 +379,118 @@ void ScreenshotControl::savePixmap()
     if ( !QDir( dirName).exists() ) {
       qDebug("making dir " + dirName);
       QString msg = "mkdir -p " + dirName;
       system(msg.latin1());
     }
     fileName = dirName + fileName;
     if (fileName.right(3) != "png")
       fileName = fileName + ".png";
     lnk.setFile(fileName); //sets File property
     qDebug("saving file " + fileName);
     snapshot.save( fileName, "PNG");
     QFileInfo fi( fileName);
     lnk.setName( fi.fileName()); //sets file name
 
     if (!lnk.writeLink())
       qDebug("Writing doclink did not work");
 
   }
 
   QPEApplication::beep();
 }
 
 void ScreenshotControl::performGrab()
 {
-  snapshot = QPixmap::grabWindow( QPEApplication::desktop()->winId(), 0, 0, QApplication::desktop()->width(),  QApplication::desktop()->height() );
-
-  if (buttonPushed == 1) {
-    qDebug("grabbing screen");
-    grabTimer->stop();
-    show();
-    qApp->processEvents();
-    savePixmap();
-  }
-  else {
-    grabTimer->stop();
-
-    struct sockaddr_in raddr;
-    struct hostent *rhost_info;
-    int sock = -1;
-    bool ok = false;
-
-    if (( rhost_info = (struct hostent *) ::gethostbyname ((char *) SCAP_hostname )) != 0 ) {
-      ::memset ( &raddr, 0, sizeof (struct sockaddr_in));
-      ::memcpy ( &raddr. sin_addr, rhost_info-> h_addr, rhost_info-> h_length );
-      raddr. sin_family = rhost_info-> h_addrtype;
-      raddr. sin_port = htons ( SCAP_port );
-
-      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: %3\n"                     // 3: content length
-                   "Content-Type: image/gif\n"
-                   "Host: %4\n"                               // 4: scap host
-                   "\n";
-
-          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 );
-            ::write ( sock, img.bits(), img.numBytes() );
-
-            ok = true;
-          }
-        }
-        ::close ( sock );
-      }
-    }
-    if ( ok )
-      QMessageBox::information( 0, tr( "Success" ), QString( "<p>%1</p>" ).arg ( tr( "Screenshot was uploaded to %1" )).arg( SCAP_hostname ));
-    else
-      QMessageBox::warning( 0, tr( "Error" ), QString( "<p>%1</p>" ).arg( tr( "Connection to %1 failed." )).arg( SCAP_hostname ));
-  }
+		snapshot = QPixmap::grabWindow( QPEApplication::desktop()->winId(), 0, 0, QApplication::desktop()->width(),  QApplication::desktop()->height() );
+
+		if (buttonPushed == 1) {
+				qDebug("grabbing screen");
+				grabTimer->stop();
+				show();
+				qApp->processEvents();
+				savePixmap();
+		} else {
+				grabTimer->stop();
+
+				struct sockaddr_in raddr;
+				struct hostent *rhost_info;
+				int sock = -1;
+				bool ok = false;
+
+				if (( rhost_info = (struct hostent *) ::gethostbyname ((char *) SCAP_hostname )) != 0 ) {
+						::memset ( &raddr, 0, sizeof (struct sockaddr_in));
+						::memcpy ( &raddr. sin_addr, rhost_info-> h_addr, rhost_info-> h_length );
+						raddr. sin_family = rhost_info-> h_addrtype;
+						raddr. sin_port = htons ( SCAP_port );
+
+						if (( sock = ::socket ( AF_INET, SOCK_STREAM, 0 )) >= 0 ) {
+								if ( ::connect ( sock, (struct sockaddr *) & raddr, sizeof (struct sockaddr)) >= 0 ) {
+
+										QString header;
+
+										QPixmap pix;
+										QString displayEnv = getenv("QWS_DISPLAY");
+										qDebug(displayEnv);
+
+										QString SCAP_model="";
+#warning FIXME: model string should be filled with actual device model
+												if( snapshot.width() > 320)
+														SCAP_model ="Corgi";
+										
+										if(displayEnv == "QVFb:0")  {//set this if you plan on using this app in qvfb!!
+ 												pix = snapshot.xForm(QWMatrix().rotate(90));
+										} else
+												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: %3\n"                     // 3: content length
+												"Content-Type: image/png\n"
+												"Host: %4\n"                               // 4: scap host
+												"\n";
+
+		 
+										header = header.arg( SCAP_model).arg( ::getenv( "USER" ) ).arg( img.numBytes() ).arg( SCAP_hostname );
+										qDebug(header);
+					
+										if ( !pix.isNull() )  {
+												const char *ascii = header.latin1( );
+												uint ascii_len = ::strlen( ascii );
+												::write ( sock, ascii, ascii_len );
+												::write ( sock, img.bits(), img.numBytes() );
+
+												ok = true;
+										}
+								}
+								::close ( sock );
+						}
+				}
+				if ( ok )
+						QMessageBox::information( 0, tr( "Success" ), QString( "<p>%1</p>" ).arg ( tr( "Screenshot was uploaded to %1" )).arg( SCAP_hostname ));
+				else
+						QMessageBox::warning( 0, tr( "Error" ), QString( "<p>%1</p>" ).arg( tr( "Connection to %1 failed." )).arg( SCAP_hostname ));
+		}
 
 }
 
 
 
 //===========================================================================
 
 ScreenshotApplet::ScreenshotApplet( QWidget *parent, const char *name )
     : QWidget( parent, name )
 {
 		setFixedWidth( AppLnk::smallIconSize());
 
     QImage  img = (const char **)snapshot_xpm;
     img = img.smoothScale(AppLnk::smallIconSize(), AppLnk::smallIconSize());
     m_icon.convertFromImage(img);
 }
 
 ScreenshotApplet::~ScreenshotApplet()
 {
 }
 
 void ScreenshotApplet::mousePressEvent( QMouseEvent *)
 {
   ScreenshotControl *sc = new ScreenshotControl ( );