summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/screenshotapplet/screenshot.cpp31
1 files changed, 22 insertions, 9 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
@@ -408,8 +408,7 @@ void ScreenshotControl::performGrab()
show();
qApp->processEvents();
savePixmap();
- }
- else {
+ } else {
grabTimer->stop();
struct sockaddr_in raddr;
@@ -423,24 +422,38 @@ void ScreenshotControl::performGrab()
raddr. sin_family = rhost_info-> h_addrtype;
raddr. sin_port = htons ( SCAP_port );
- if (( sock = ::socket ( AF_INET, SOCK_STREAM, 0 )) >= 0 )
- {
+ 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) );
+ 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/gif\n"
+ "Content-Type: image/png\n"
"Host: %4\n" // 4: scap host
"\n";
- header = header.arg( "" ).arg( ::getenv ( "USER" ) ).arg( img.numBytes() ).arg( SCAP_hostname );
- if ( !pix.isNull() )
- {
+ 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 );