author | mickeyl <mickeyl> | 2003-12-25 22:15:35 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-12-25 22:15:35 (UTC) |
commit | cc7125330e8c797b22d8f9fc450357a59e7e1be3 (patch) (unidiff) | |
tree | b0e8679e1862a283a049e477c537f58fa49ac53d | |
parent | f2805565b0d7edd2e72445f6d56e43eadcdac72d (diff) | |
download | opie-cc7125330e8c797b22d8f9fc450357a59e7e1be3.zip opie-cc7125330e8c797b22d8f9fc450357a59e7e1be3.tar.gz opie-cc7125330e8c797b22d8f9fc450357a59e7e1be3.tar.bz2 |
Make that (theoretically) work with resolutions other than 320x240
and 240x320.
-rw-r--r-- | core/applets/screenshotapplet/screenshot.cpp | 23 |
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 | |||
@@ -428,33 +428,22 @@ void ScreenshotControl::performGrab() | |||
428 | if ( ::connect ( sock, (struct sockaddr *) & raddr, sizeof (struct sockaddr)) >= 0 ) { | 428 | if ( ::connect ( sock, (struct sockaddr *) & raddr, sizeof (struct sockaddr)) >= 0 ) { |
429 | QString header; | 429 | QString header; |
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 | if ( snapshot. width ( ) == 320 && snapshot. height ( ) == 240 ) | ||
442 | { | ||
443 | pix = snapshot; | ||
444 | } | ||
445 | else if ( snapshot. width ( ) == 240 && snapshot. height ( ) == 320 ) | ||
446 | { | ||
447 | pix = snapshot. xForm ( QWMatrix ( ). rotate ( 90 )); | ||
448 | } | ||
449 | 441 | ||
450 | if ( !pix. isNull ( )) | 442 | if ( !pix. isNull ( )) |
451 | { | 443 | { |
452 | const char *ascii = header. latin1 ( ); | 444 | const char *ascii = header. latin1 ( ); |
453 | uint ascii_len = ::strlen ( ascii ); | 445 | uint ascii_len = ::strlen ( ascii ); |
454 | |||
455 | ::write ( sock, ascii, ascii_len ); | 446 | ::write ( sock, ascii, ascii_len ); |
456 | |||
457 | QImage img = pix. convertToImage ( ). convertDepth ( 16 ); | ||
458 | ::write ( sock, img. bits ( ), img.numBytes ( )); | 447 | ::write ( sock, img. bits ( ), img.numBytes ( )); |
459 | 448 | ||
460 | ok = true; | 449 | ok = true; |