summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-12-25 22:15:35 (UTC)
committer mickeyl <mickeyl>2003-12-25 22:15:35 (UTC)
commitcc7125330e8c797b22d8f9fc450357a59e7e1be3 (patch) (unidiff)
treeb0e8679e1862a283a049e477c537f58fa49ac53d
parentf2805565b0d7edd2e72445f6d56e43eadcdac72d (diff)
downloadopie-cc7125330e8c797b22d8f9fc450357a59e7e1be3.zip
opie-cc7125330e8c797b22d8f9fc450357a59e7e1be3.tar.gz
opie-cc7125330e8c797b22d8f9fc450357a59e7e1be3.tar.bz2
Make that (theoretically) work with resolutions other than 320x240
and 240x320.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/screenshotapplet/screenshot.cpp39
1 files changed, 14 insertions, 25 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
@@ -402,3 +402,3 @@ void ScreenshotControl::performGrab()
402{ 402{
403 snapshot = QPixmap::grabWindow( QPEApplication::desktop()->winId(), 0, 0, QApplication::desktop()->width(), QApplication::desktop()->height() ); 403 snapshot = QPixmap::grabWindow( QPEApplication::desktop()->winId(), 0, 0, QApplication::desktop()->width(), QApplication::desktop()->height() );
404 404
@@ -430,30 +430,19 @@ void ScreenshotControl::performGrab()
430 430
431 QPixmap pix = ( snapshot.width() > snapshot.height() ) ? snapshot : snapshot.xForm( QWMatrix().rotate(90) );
432 QImage img = pix.convertToImage().convertDepth( 16 ); // could make that also depth independent, if hh.org/scap can handle it
433
431 header = "POST /scap/capture.cgi?%1+%2 HTTP/1.1\n" // 1: model / 2: user 434 header = "POST /scap/capture.cgi?%1+%2 HTTP/1.1\n" // 1: model / 2: user
432 "Content-length: 153600\n" 435 "Content-length: %3\n" // 3: content length
433 "Content-Type: image/gif\n" 436 "Content-Type: image/gif\n"
434 "Host: %4\n" // 3: scap host 437 "Host: %4\n" // 4: scap host
435 "\n"; 438 "\n";
436 439
437 header = header. arg ( "" ). arg ( ::getenv ( "USER" )). arg ( SCAP_hostname ); 440 header = header.arg( "" ).arg( ::getenv ( "USER" ) ).arg( img.numBytes() ).arg( SCAP_hostname );
438
439 QPixmap pix;
440 441
441 if ( snapshot. width ( ) == 320 && snapshot. height ( ) == 240 ) 442 if ( !pix.isNull() )
442 {
443 pix = snapshot;
444 }
445 else if ( snapshot. width ( ) == 240 && snapshot. height ( ) == 320 )
446 { 443 {
447 pix = snapshot. xForm ( QWMatrix ( ). rotate ( 90 )); 444 const char *ascii = header.latin1( );
448 } 445 uint ascii_len = ::strlen( ascii );
449
450 if ( !pix. isNull ( ))
451 {
452 const char *ascii = header. latin1 ( );
453 uint ascii_len = ::strlen ( ascii );
454
455 ::write ( sock, ascii, ascii_len ); 446 ::write ( sock, ascii, ascii_len );
456 447 ::write ( sock, img.bits(), img.numBytes() );
457 QImage img = pix. convertToImage ( ). convertDepth ( 16 );
458 ::write ( sock, img. bits ( ), img.numBytes ( ));
459 448
@@ -466,5 +455,5 @@ void ScreenshotControl::performGrab()
466 if ( ok ) 455 if ( ok )
467 QMessageBox::information ( 0, tr( "Success" ), QString ( "<p>%1</p>" ). arg ( tr( "Screenshot was uploaded to %1" )). arg ( SCAP_hostname )); 456 QMessageBox::information( 0, tr( "Success" ), QString( "<p>%1</p>" ).arg ( tr( "Screenshot was uploaded to %1" )).arg( SCAP_hostname ));
468 else 457 else
469 QMessageBox::warning ( 0, tr( "Error" ), QString ( "<p>%1</p>" ). arg ( tr( "Connection to %1 failed." )). arg ( SCAP_hostname )); 458 QMessageBox::warning( 0, tr( "Error" ), QString( "<p>%1</p>" ).arg( tr( "Connection to %1 failed." )).arg( SCAP_hostname ));
470 } 459 }
@@ -481,3 +470,3 @@ ScreenshotApplet::ScreenshotApplet( QWidget *parent, const char *name )
481 setFixedWidth( AppLnk::smallIconSize()); 470 setFixedWidth( AppLnk::smallIconSize());
482 471
483 QImage img = (const char **)snapshot_xpm; 472 QImage img = (const char **)snapshot_xpm;