author | llornkcor <llornkcor> | 2004-01-18 05:11:58 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2004-01-18 05:11:58 (UTC) |
commit | f5d28a9b86f5fdf8b4512d34c34e77284756f95c (patch) (unidiff) | |
tree | 9c6bf9022095a957c16f7a31f447608612a1589e | |
parent | 933d897346745d3d51e41591c59387ef6d2bb917 (diff) | |
download | opie-f5d28a9b86f5fdf8b4512d34c34e77284756f95c.zip opie-f5d28a9b86f5fdf8b4512d34c34e77284756f95c.tar.gz opie-f5d28a9b86f5fdf8b4512d34c34e77284756f95c.tar.bz2 |
fix for QWS_DISPLAY not being set
-rw-r--r-- | core/applets/screenshotapplet/screenshot.cpp | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/core/applets/screenshotapplet/screenshot.cpp b/core/applets/screenshotapplet/screenshot.cpp index f024f47..99effa5 100644 --- a/core/applets/screenshotapplet/screenshot.cpp +++ b/core/applets/screenshotapplet/screenshot.cpp | |||
@@ -395,103 +395,110 @@ void ScreenshotControl::savePixmap() | |||
395 | 395 | ||
396 | } | 396 | } |
397 | 397 | ||
398 | QPEApplication::beep(); | 398 | QPEApplication::beep(); |
399 | } | 399 | } |
400 | 400 | ||
401 | void ScreenshotControl::performGrab() | 401 | 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 | ||
405 | if (buttonPushed == 1) { | 405 | if (buttonPushed == 1) { |
406 | qDebug("grabbing screen"); | 406 | qDebug("grabbing screen"); |
407 | grabTimer->stop(); | 407 | grabTimer->stop(); |
408 | show(); | 408 | show(); |
409 | qApp->processEvents(); | 409 | qApp->processEvents(); |
410 | savePixmap(); | 410 | savePixmap(); |
411 | } else { | 411 | } else { |
412 | grabTimer->stop(); | 412 | grabTimer->stop(); |
413 | 413 | ||
414 | struct sockaddr_in raddr; | 414 | struct sockaddr_in raddr; |
415 | struct hostent *rhost_info; | 415 | struct hostent *rhost_info; |
416 | int sock = -1; | 416 | int sock = -1; |
417 | bool ok = false; | 417 | bool ok = false; |
418 | 418 | ||
419 | if (( rhost_info = (struct hostent *) ::gethostbyname ((char *) SCAP_hostname )) != 0 ) { | 419 | QString displayEnv = getenv("QWS_DISPLAY"); |
420 | qDebug(displayEnv); | ||
421 | |||
422 | if(( displayEnv.left(2) != ":0" ) && (!displayEnv.isEmpty())) { | ||
423 | |||
424 | if (( rhost_info = (struct hostent *) ::gethostbyname ((char *) SCAP_hostname )) != 0 ) { | ||
420 | ::memset ( &raddr, 0, sizeof (struct sockaddr_in)); | 425 | ::memset ( &raddr, 0, sizeof (struct sockaddr_in)); |
421 | ::memcpy ( &raddr. sin_addr, rhost_info-> h_addr, rhost_info-> h_length ); | 426 | ::memcpy ( &raddr. sin_addr, rhost_info-> h_addr, rhost_info-> h_length ); |
422 | raddr. sin_family = rhost_info-> h_addrtype; | 427 | raddr. sin_family = rhost_info-> h_addrtype; |
423 | raddr. sin_port = htons ( SCAP_port ); | 428 | raddr. sin_port = htons ( SCAP_port ); |
424 | 429 | ||
425 | if (( sock = ::socket ( AF_INET, SOCK_STREAM, 0 )) >= 0 ) { | 430 | if (( sock = ::socket ( AF_INET, SOCK_STREAM, 0 )) >= 0 ) { |
426 | if ( ::connect ( sock, (struct sockaddr *) & raddr, sizeof (struct sockaddr)) >= 0 ) { | 431 | if ( ::connect ( sock, (struct sockaddr *) & raddr, sizeof (struct sockaddr)) >= 0 ) { |
427 | 432 | ||
428 | QString header; | 433 | QString header; |
429 | 434 | ||
430 | QPixmap pix; | 435 | QPixmap pix; |
431 | QString displayEnv = getenv("QWS_DISPLAY"); | ||
432 | qDebug(displayEnv); | ||
433 | 436 | ||
434 | QString SCAP_model=""; | 437 | QString SCAP_model=""; |
435 | #warning FIXME: model string should be filled with actual device model | 438 | #warning FIXME: model string should be filled with actual device model |
436 | if( snapshot.width() > 320) | 439 | if( snapshot.width() > 320) |
437 | SCAP_model ="Corgi"; | 440 | SCAP_model ="Corgi"; |
438 | 441 | ||
439 | if(displayEnv == "QVFb:0") {//set this if you plan on using this app in qvfb!! | 442 | if(displayEnv == "QVFb:0") {//set this if you plan on using this app in qvfb!! |
440 | pix = snapshot.xForm(QWMatrix().rotate(90)); | 443 | pix = snapshot.xForm(QWMatrix().rotate(90)); |
441 | } else | 444 | } else |
442 | pix = ( snapshot.width() > snapshot.height() ) ? snapshot : snapshot.xForm( QWMatrix().rotate(90) ); | 445 | pix = ( snapshot.width() > snapshot.height() ) ? snapshot : snapshot.xForm( QWMatrix().rotate(90) ); |
443 | 446 | ||
444 | QImage img = pix.convertToImage().convertDepth( 16 ); // could make that also depth independent, if hh.org/scap can handle it | 447 | QImage img = pix.convertToImage().convertDepth( 16 ); // could make that also depth independent, if hh.org/scap can handle it |
445 | 448 | ||
446 | header = "POST /scap/capture.cgi?%1+%2 HTTP/1.1\n" // 1: model / 2: user | 449 | header = "POST /scap/capture.cgi?%1+%2 HTTP/1.1\n" // 1: model / 2: user |
447 | "Content-length: %3\n" // 3: content length | 450 | "Content-length: %3\n" // 3: content length |
448 | "Content-Type: image/png\n" | 451 | "Content-Type: image/png\n" |
449 | "Host: %4\n" // 4: scap host | 452 | "Host: %4\n" // 4: scap host |
450 | "\n"; | 453 | "\n"; |
451 | 454 | ||
452 | 455 | ||
453 | header = header.arg( SCAP_model).arg( ::getenv( "USER" ) ).arg( img.numBytes() ).arg( SCAP_hostname ); | 456 | header = header.arg( SCAP_model).arg( ::getenv( "USER" ) ).arg( img.numBytes() ).arg( SCAP_hostname ); |
454 | qDebug(header); | 457 | qDebug(header); |
455 | 458 | ||
456 | if ( !pix.isNull() ) { | 459 | if ( !pix.isNull() ) { |
457 | const char *ascii = header.latin1( ); | 460 | const char *ascii = header.latin1( ); |
458 | uint ascii_len = ::strlen( ascii ); | 461 | uint ascii_len = ::strlen( ascii ); |
459 | ::write ( sock, ascii, ascii_len ); | 462 | // ::write ( sock, ascii, ascii_len ); |
460 | ::write ( sock, img.bits(), img.numBytes() ); | 463 | // ::write ( sock, img.bits(), img.numBytes() ); |
461 | 464 | ||
462 | ok = true; | 465 | ok = true; |
463 | } | 466 | } |
464 | } | 467 | } |
465 | ::close ( sock ); | 468 | ::close ( sock ); |
466 | } | 469 | } |
467 | } | 470 | } |
468 | if ( ok ) | 471 | if ( ok ) { |
469 | QMessageBox::information( 0, tr( "Success" ), QString( "<p>%1</p>" ).arg ( tr( "Screenshot was uploaded to %1" )).arg( SCAP_hostname )); | 472 | QMessageBox::information( 0, tr( "Success" ), QString( "<p>%1</p>" ).arg ( tr( "Screenshot was uploaded to %1" )).arg( SCAP_hostname )); |
470 | else | 473 | } else { |
471 | QMessageBox::warning( 0, tr( "Error" ), QString( "<p>%1</p>" ).arg( tr( "Connection to %1 failed." )).arg( SCAP_hostname )); | 474 | QMessageBox::warning( 0, tr( "Error" ), QString( "<p>%1</p>" ).arg( tr( "Connection to %1 failed." )).arg( SCAP_hostname )); |
475 | } | ||
476 | } else { | ||
477 | QMessageBox::warning( 0, tr( "Error" ),tr("Please set <b>QWS_DISPLAY</b> environmental variable.")); | ||
478 | } | ||
472 | } | 479 | } |
473 | 480 | ||
474 | } | 481 | } |
475 | 482 | ||
476 | 483 | ||
477 | 484 | ||
478 | //=========================================================================== | 485 | //=========================================================================== |
479 | 486 | ||
480 | ScreenshotApplet::ScreenshotApplet( QWidget *parent, const char *name ) | 487 | ScreenshotApplet::ScreenshotApplet( QWidget *parent, const char *name ) |
481 | : QWidget( parent, name ) | 488 | : QWidget( parent, name ) |
482 | { | 489 | { |
483 | setFixedWidth( AppLnk::smallIconSize()); | 490 | setFixedWidth( AppLnk::smallIconSize()); |
484 | 491 | ||
485 | QImage img = (const char **)snapshot_xpm; | 492 | QImage img = (const char **)snapshot_xpm; |
486 | img = img.smoothScale(AppLnk::smallIconSize(), AppLnk::smallIconSize()); | 493 | img = img.smoothScale(AppLnk::smallIconSize(), AppLnk::smallIconSize()); |
487 | m_icon.convertFromImage(img); | 494 | m_icon.convertFromImage(img); |
488 | } | 495 | } |
489 | 496 | ||
490 | ScreenshotApplet::~ScreenshotApplet() | 497 | ScreenshotApplet::~ScreenshotApplet() |
491 | { | 498 | { |
492 | } | 499 | } |
493 | 500 | ||
494 | void ScreenshotApplet::mousePressEvent( QMouseEvent *) | 501 | void ScreenshotApplet::mousePressEvent( QMouseEvent *) |
495 | { | 502 | { |
496 | ScreenshotControl *sc = new ScreenshotControl ( ); | 503 | ScreenshotControl *sc = new ScreenshotControl ( ); |
497 | QPoint curPos = mapToGlobal ( QPoint ( 0, 0 )); | 504 | QPoint curPos = mapToGlobal ( QPoint ( 0, 0 )); |