summaryrefslogtreecommitdiff
Unidiff
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
@@ -355,168 +355,157 @@ void ScreenshotControl::savePixmap()
355 fileName = FileNamePath; 355 fileName = FileNamePath;
356 //not sure why this is needed here, but it forgets fileName 356 //not sure why this is needed here, but it forgets fileName
357 // if this is below the braces 357 // if this is below the braces
358 358
359 if (fileName.right(3) != "png") 359 if (fileName.right(3) != "png")
360 fileName = fileName + ".png"; 360 fileName = fileName + ".png";
361 lnk.setFile(fileName); //sets File property 361 lnk.setFile(fileName); //sets File property
362 qDebug("saving file " + fileName); 362 qDebug("saving file " + fileName);
363 snapshot.save( fileName, "PNG"); 363 snapshot.save( fileName, "PNG");
364 QFileInfo fi( fileName); 364 QFileInfo fi( fileName);
365 lnk.setName( fi.fileName()); //sets file name 365 lnk.setName( fi.fileName()); //sets file name
366 366
367 if (!lnk.writeLink()) 367 if (!lnk.writeLink())
368 qDebug("Writing doclink did not work"); 368 qDebug("Writing doclink did not work");
369 } 369 }
370 else { 370 else {
371 371
372 fileName = "sc_" + QDateTime::currentDateTime().toString(); 372 fileName = "sc_" + QDateTime::currentDateTime().toString();
373 fileName.replace(QRegExp("'"), ""); 373 fileName.replace(QRegExp("'"), "");
374 fileName.replace(QRegExp(" "), "_"); 374 fileName.replace(QRegExp(" "), "_");
375 fileName.replace(QRegExp(":"), "."); 375 fileName.replace(QRegExp(":"), ".");
376 fileName.replace(QRegExp(","), ""); 376 fileName.replace(QRegExp(","), "");
377 QString dirName = QDir::homeDirPath() + "/Documents/image/png/"; 377 QString dirName = QDir::homeDirPath() + "/Documents/image/png/";
378 378
379 if ( !QDir( dirName).exists() ) { 379 if ( !QDir( dirName).exists() ) {
380 qDebug("making dir " + dirName); 380 qDebug("making dir " + dirName);
381 QString msg = "mkdir -p " + dirName; 381 QString msg = "mkdir -p " + dirName;
382 system(msg.latin1()); 382 system(msg.latin1());
383 } 383 }
384 fileName = dirName + fileName; 384 fileName = dirName + fileName;
385 if (fileName.right(3) != "png") 385 if (fileName.right(3) != "png")
386 fileName = fileName + ".png"; 386 fileName = fileName + ".png";
387 lnk.setFile(fileName); //sets File property 387 lnk.setFile(fileName); //sets File property
388 qDebug("saving file " + fileName); 388 qDebug("saving file " + fileName);
389 snapshot.save( fileName, "PNG"); 389 snapshot.save( fileName, "PNG");
390 QFileInfo fi( fileName); 390 QFileInfo fi( fileName);
391 lnk.setName( fi.fileName()); //sets file name 391 lnk.setName( fi.fileName()); //sets file name
392 392
393 if (!lnk.writeLink()) 393 if (!lnk.writeLink())
394 qDebug("Writing doclink did not work"); 394 qDebug("Writing doclink did not work");
395 395
396 } 396 }
397 397
398 QPEApplication::beep(); 398 QPEApplication::beep();
399} 399}
400 400
401void ScreenshotControl::performGrab() 401void 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 } 411 }
412 else { 412 else {
413 grabTimer->stop(); 413 grabTimer->stop();
414 414
415 struct sockaddr_in raddr; 415 struct sockaddr_in raddr;
416 struct hostent *rhost_info; 416 struct hostent *rhost_info;
417 int sock = -1; 417 int sock = -1;
418 bool ok = false; 418 bool ok = false;
419 419
420 if (( rhost_info = (struct hostent *) ::gethostbyname ((char *) SCAP_hostname )) != 0 ) { 420 if (( rhost_info = (struct hostent *) ::gethostbyname ((char *) SCAP_hostname )) != 0 ) {
421 ::memset ( &raddr, 0, sizeof (struct sockaddr_in)); 421 ::memset ( &raddr, 0, sizeof (struct sockaddr_in));
422 ::memcpy ( &raddr. sin_addr, rhost_info-> h_addr, rhost_info-> h_length ); 422 ::memcpy ( &raddr. sin_addr, rhost_info-> h_addr, rhost_info-> h_length );
423 raddr. sin_family = rhost_info-> h_addrtype; 423 raddr. sin_family = rhost_info-> h_addrtype;
424 raddr. sin_port = htons ( SCAP_port ); 424 raddr. sin_port = htons ( SCAP_port );
425 425
426 if (( sock = ::socket ( AF_INET, SOCK_STREAM, 0 )) >= 0 ) 426 if (( sock = ::socket ( AF_INET, SOCK_STREAM, 0 )) >= 0 )
427 { 427 {
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
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
460 ok = true; 449 ok = true;
461 } 450 }
462 } 451 }
463 ::close ( sock ); 452 ::close ( sock );
464 } 453 }
465 } 454 }
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 }
471 460
472} 461}
473 462
474 463
475 464
476//=========================================================================== 465//===========================================================================
477 466
478ScreenshotApplet::ScreenshotApplet( QWidget *parent, const char *name ) 467ScreenshotApplet::ScreenshotApplet( QWidget *parent, const char *name )
479 : QWidget( parent, name ) 468 : QWidget( parent, name )
480{ 469{
481 setFixedWidth( AppLnk::smallIconSize()); 470 setFixedWidth( AppLnk::smallIconSize());
482 471
483 QImage img = (const char **)snapshot_xpm; 472 QImage img = (const char **)snapshot_xpm;
484 img = img.smoothScale(AppLnk::smallIconSize(), AppLnk::smallIconSize()); 473 img = img.smoothScale(AppLnk::smallIconSize(), AppLnk::smallIconSize());
485 m_icon.convertFromImage(img); 474 m_icon.convertFromImage(img);
486} 475}
487 476
488ScreenshotApplet::~ScreenshotApplet() 477ScreenshotApplet::~ScreenshotApplet()
489{ 478{
490} 479}
491 480
492void ScreenshotApplet::mousePressEvent( QMouseEvent *) 481void ScreenshotApplet::mousePressEvent( QMouseEvent *)
493{ 482{
494 ScreenshotControl *sc = new ScreenshotControl ( ); 483 ScreenshotControl *sc = new ScreenshotControl ( );
495 QPoint curPos = mapToGlobal ( QPoint ( 0, 0 )); 484 QPoint curPos = mapToGlobal ( QPoint ( 0, 0 ));
496 485
497 // windowPosX is the windows position centered above the applets icon. 486 // windowPosX is the windows position centered above the applets icon.
498 // If the icon is near the edge of the screen, the window would leave the visible area 487 // If the icon is near the edge of the screen, the window would leave the visible area
499 // so we check the position against the screen width and correct the difference if needed 488 // so we check the position against the screen width and correct the difference if needed
500 489
501 int screenWidth = qApp->desktop()->width(); 490 int screenWidth = qApp->desktop()->width();
502 int windowPosX = curPos. x ( ) - ( sc-> sizeHint ( ). width ( ) - width ( )) / 2 ; 491 int windowPosX = curPos. x ( ) - ( sc-> sizeHint ( ). width ( ) - width ( )) / 2 ;
503 int ZwindowPosX, XwindowPosX; 492 int ZwindowPosX, XwindowPosX;
504 493
505 // the window would be placed beyond the screen wich doesn't look tooo good 494 // the window would be placed beyond the screen wich doesn't look tooo good
506 if ( (windowPosX + sc-> sizeHint ( ). width ( )) > screenWidth ) { 495 if ( (windowPosX + sc-> sizeHint ( ). width ( )) > screenWidth ) {
507 XwindowPosX = windowPosX + sc-> sizeHint ( ). width ( ) - screenWidth; 496 XwindowPosX = windowPosX + sc-> sizeHint ( ). width ( ) - screenWidth;
508 ZwindowPosX = windowPosX - XwindowPosX - 1; 497 ZwindowPosX = windowPosX - XwindowPosX - 1;
509 } else { 498 } else {
510 ZwindowPosX = windowPosX; 499 ZwindowPosX = windowPosX;
511 } 500 }
512 501
513 sc-> move ( ZwindowPosX, curPos. y ( ) - sc-> sizeHint ( ). height ( ) ); 502 sc-> move ( ZwindowPosX, curPos. y ( ) - sc-> sizeHint ( ). height ( ) );
514 sc-> show ( ); 503 sc-> show ( );
515} 504}
516 505
517void ScreenshotApplet::paintEvent( QPaintEvent* ) 506void ScreenshotApplet::paintEvent( QPaintEvent* )
518{ 507{
519 QPainter p ( this ); 508 QPainter p ( this );
520 p.drawPixmap( 0,0, m_icon ); 509 p.drawPixmap( 0,0, m_icon );
521} 510}
522 511