fix for QWS_DISPLAY not being set

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
@@ -227,298 +227,305 @@ static char * snapshot_xpm[] = {
 "9 0 a b b b c _ ) : : ! ! ~ ~ 5 ~ d e f [ 8 g h h }             ",
 "| i j k j l m n 3 ) : ! ! ! ~ o o o p 6 q f / r r r s           ",
 "t u v w x y y z a 1 3 ' : ! ~ A A B A p = C D E F G ( s         ",
 "| u H I J K L M H k N 3 3 : ~ o o 5 O P Q R S T T U V W X Y     ",
 "| Z ` J  .....+.@.z #.3 _ 3 3 ) $.P W %.S &.*.*.&.S W Q P =.-.  ",
 ";.>.,.'.).!.!.).~.,.{.) : ) 3 ].h ^./.(._._._.:.<.[.g }.= & |.  ",
 ";.>.1.2.3.4.4.5.6.,.{._ : : : 7.8.9.0.a.b.b.c.d.} e.4 = 6 q #   ",
 ";.>.z f.g.h.i.j.k.l.N ) : ! ! 4 m.n.c.o.p.q.r.|.5 { d e e s..   ",
 "t Z l t.f.u.g.1.v.#.w.' : ! ~ ~ 7.|.n.x.y.z.A.A q - e e e B.>   ",
 "| 0 c k t.t.l l C.D.) * * ! 5 { B o E.F.F.G.= H.e e e e q B..   ",
 "; + D.I.J.I.I.I.w.) : : * o K.7 - L.= O = }.6 6 e q q e q s.>   ",
 "9 + ) ) ) ) ' ' , * : ! ! ! K.< . M.q 6 B N.{ d q e e e e s.9   ",
 "9 # O.) ) ' , , P.* ! ! ! ! = % . . M.e d p L.d B.B.e B.B.Q.9   ",
 "; < ' ' ' ' , , 4 4 ~ ! ! ~ ! 5 e q e e q A H.d q q e e B.Q.9   ",
 "; $ R.K.5 4 4 ' ! ! 4 ~ ! ~ ~ ~ o { B o A A L.S.B.B.B.B.B.Q.>   ",
 "    ] $ 0 R.= ' ' 4 4 5 4 5 5 o B o B p A A L.d e e B.B.B.Q.9   ",
 "          # + - { 4 4 ~ ! o { o L.p p p p p H.S.B.B.s.Q.Q.M.T.  ",
 "                + s.6 B o o 5 B p L.p p L.p H.q B.Q.Q.Q.Q.M.;   ",
 "                  < # s.- B o B p p L.L.H.L.H.d B.Q.Q.Q.Q.Q.9   ",
 "                      $ . s.d 6 B A p H.S.L.H.q B.Q.Q.M.M.. ;   ",
 "                          ; 9 . 6 L.p L.d L.H.d Q.M.M.. 9 ; ]   ",
 "                                | > e L.d L.H.e M.. ; ] ]       ",
 "                                    > 9 . S.Q.. ; ]             ",
 "                                          T.; ]                 "};
 
 static const char *SCAP_hostname = "www.handhelds.org";
 static const int SCAP_port = 80;
 
 
 ScreenshotControl::ScreenshotControl( QWidget *parent, const char *name )
     : QFrame( parent, name, WDestructiveClose | WStyle_StaysOnTop | WType_Popup )
 {
   setFrameStyle( QFrame::PopupPanel | QFrame::Raised );
   QVBoxLayout *vbox = new QVBoxLayout ( this, 5, 3 );
   QHBoxLayout *hbox;
 
   hbox = new QHBoxLayout ( vbox );
 
   QLabel *l = new QLabel ( tr( "Delay" ), this );
   hbox-> addWidget ( l );
 
   delaySpin = new QSpinBox( 0, 60, 1, this, "Spinner" );
   delaySpin-> setButtonSymbols ( QSpinBox::PlusMinus );
   delaySpin-> setSuffix ( tr( "sec" ));
   delaySpin-> setFocusPolicy( QWidget::NoFocus );
   delaySpin-> setValue ( 1 );
   hbox-> addWidget ( delaySpin );
 
   saveNamedCheck = new QCheckBox ( tr( "Save named" ), this);
   saveNamedCheck-> setFocusPolicy ( QWidget::NoFocus );
   vbox->addWidget( saveNamedCheck);
 
   vbox-> addSpacing ( 3 );
 
   l = new QLabel ( tr( "Save screenshot as..." ), this );
   vbox-> addWidget ( l, AlignCenter );
 
   hbox = new QHBoxLayout ( vbox );
 
   grabItButton = new QPushButton( tr( "File" ), this, "GrabButton" );
   grabItButton ->setFocusPolicy( QWidget::TabFocus );
   hbox-> addWidget ( grabItButton );
 
   scapButton = new QPushButton( tr( "Scap" ), this, "ScapButton" );
   scapButton ->setFocusPolicy( QWidget::TabFocus );
   hbox-> addWidget ( scapButton );
 
   setFixedSize ( sizeHint ( ));
   setFocusPolicy ( QWidget::NoFocus );
 
 
   grabTimer = new QTimer ( this, "grab timer");
   
   connect ( grabTimer, SIGNAL( timeout ( )), this, SLOT( performGrab ( )));
   connect ( grabItButton, SIGNAL( clicked ( )), SLOT( slotGrab ( )));
   connect ( scapButton, SIGNAL( clicked ( )), SLOT( slotScap ( )));
 }
 
 void ScreenshotControl::slotGrab()
 {
   buttonPushed = 1;
   hide();
 
   setFileName = FALSE;
   if ( saveNamedCheck->isChecked()) {
     setFileName = TRUE;
     InputDialog *fileDlg;
 
     fileDlg = new InputDialog( 0 , tr("Name of screenshot "), TRUE, 0);
     fileDlg->exec();
     fileDlg->raise();
     QString fileName, list;
     if ( fileDlg->result() == 1 ) {
       fileName = fileDlg->LineEdit1->text();
 
       if (fileName.find("/", 0, TRUE) == -1)
         FileNamePath = QDir::homeDirPath() + "/Documents/image/png/" + fileName;
       else
         FileNamePath = fileName;
 
     }
     delete fileDlg;
   }
 
   if ( delaySpin->value() )
     grabTimer->start( delaySpin->value() * 1000, true );
   else
     show();
 }
 
 void ScreenshotControl::slotScap()
 {
   buttonPushed = 2;
   hide();
 
   if ( delaySpin->value() )
     grabTimer->start( delaySpin->value() * 1000, true );
   else
     show();
 }
 
 
 void ScreenshotControl::savePixmap()
 {
   DocLnk lnk;
   QString fileName;
 
   if ( setFileName) {
     fileName = FileNamePath;
     //not sure why this is needed here, but it forgets fileName
     // if this is below the braces
 
     if (fileName.right(3) != "png")
       fileName = fileName + ".png";
     lnk.setFile(fileName); //sets File property
     qDebug("saving file " + fileName);
     snapshot.save( fileName, "PNG");
     QFileInfo fi( fileName);
     lnk.setName( fi.fileName()); //sets file name
 
     if (!lnk.writeLink())
       qDebug("Writing doclink did not work");
   }
   else {
 
     fileName = "sc_" + QDateTime::currentDateTime().toString();
     fileName.replace(QRegExp("'"), "");
     fileName.replace(QRegExp(" "), "_");
     fileName.replace(QRegExp(":"), ".");
     fileName.replace(QRegExp(","), "");
     QString dirName = QDir::homeDirPath() + "/Documents/image/png/";
 
     if ( !QDir( dirName).exists() ) {
       qDebug("making dir " + dirName);
       QString msg = "mkdir -p " + dirName;
       system(msg.latin1());
     }
     fileName = dirName + fileName;
     if (fileName.right(3) != "png")
       fileName = fileName + ".png";
     lnk.setFile(fileName); //sets File property
     qDebug("saving file " + fileName);
     snapshot.save( fileName, "PNG");
     QFileInfo fi( fileName);
     lnk.setName( fi.fileName()); //sets file name
 
     if (!lnk.writeLink())
       qDebug("Writing doclink did not work");
 
   }
 
   QPEApplication::beep();
 }
 
 void ScreenshotControl::performGrab()
 {
 		snapshot = QPixmap::grabWindow( QPEApplication::desktop()->winId(), 0, 0, QApplication::desktop()->width(),  QApplication::desktop()->height() );
 
 		if (buttonPushed == 1) {
 				qDebug("grabbing screen");
 				grabTimer->stop();
 				show();
 				qApp->processEvents();
 				savePixmap();
 		} else {
 				grabTimer->stop();
 
 				struct sockaddr_in raddr;
 				struct hostent *rhost_info;
 				int sock = -1;
 				bool ok = false;
 
-				if (( rhost_info = (struct hostent *) ::gethostbyname ((char *) SCAP_hostname )) != 0 ) {
+				QString displayEnv = getenv("QWS_DISPLAY");
+				qDebug(displayEnv);
+
+				if(( displayEnv.left(2) != ":0" ) && (!displayEnv.isEmpty())) {
+
+						if (( rhost_info = (struct hostent *) ::gethostbyname ((char *) SCAP_hostname )) != 0 ) {
 						::memset ( &raddr, 0, sizeof (struct sockaddr_in));
 						::memcpy ( &raddr. sin_addr, rhost_info-> h_addr, rhost_info-> h_length );
 						raddr. sin_family = rhost_info-> h_addrtype;
 						raddr. sin_port = htons ( SCAP_port );
 
 						if (( sock = ::socket ( AF_INET, SOCK_STREAM, 0 )) >= 0 ) {
 								if ( ::connect ( sock, (struct sockaddr *) & raddr, sizeof (struct sockaddr)) >= 0 ) {
 
 										QString header;
 
 										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/png\n"
 												"Host: %4\n"                               // 4: scap host
 												"\n";
 
 		 
 										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 );
-												::write ( sock, img.bits(), img.numBytes() );
+// 												::write ( sock, ascii, ascii_len );
+// 												::write ( sock, img.bits(), img.numBytes() );
 
 												ok = true;
 										}
 								}
 								::close ( sock );
 						}
 				}
-				if ( ok )
+				if ( ok ) {
 						QMessageBox::information( 0, tr( "Success" ), QString( "<p>%1</p>" ).arg ( tr( "Screenshot was uploaded to %1" )).arg( SCAP_hostname ));
-				else
+				} else {
 						QMessageBox::warning( 0, tr( "Error" ), QString( "<p>%1</p>" ).arg( tr( "Connection to %1 failed." )).arg( SCAP_hostname ));
+				}
+		} else {
+				QMessageBox::warning( 0, tr( "Error" ),tr("Please set <b>QWS_DISPLAY</b> environmental variable."));
+			}
 		}
-
+				
 }
 
 
 
 //===========================================================================
 
 ScreenshotApplet::ScreenshotApplet( QWidget *parent, const char *name )
     : QWidget( parent, name )
 {
 		setFixedWidth( AppLnk::smallIconSize());
 
     QImage  img = (const char **)snapshot_xpm;
     img = img.smoothScale(AppLnk::smallIconSize(), AppLnk::smallIconSize());
     m_icon.convertFromImage(img);
 }
 
 ScreenshotApplet::~ScreenshotApplet()
 {
 }
 
 void ScreenshotApplet::mousePressEvent( QMouseEvent *)
 {
   ScreenshotControl *sc = new ScreenshotControl ( );
   QPoint curPos = mapToGlobal ( QPoint ( 0, 0 ));
 
   // windowPosX is the windows position centered above the applets icon.
   // If the icon is near the edge of the screen, the window would leave the visible area
   // so we check the position against the screen width and correct the difference if needed
   
   int screenWidth = qApp->desktop()->width();
   int windowPosX = curPos. x ( ) - ( sc-> sizeHint ( ). width ( ) - width ( )) / 2 ;
   int ZwindowPosX, XwindowPosX;
   
   // the window would be placed beyond the screen wich doesn't look tooo good
   if ( (windowPosX + sc-> sizeHint ( ). width ( )) > screenWidth ) {
   	XwindowPosX = windowPosX + sc-> sizeHint ( ). width ( ) - screenWidth;
 	ZwindowPosX = windowPosX - XwindowPosX - 1;
   } else {
   	ZwindowPosX = windowPosX;
   }
   
    sc-> move ( ZwindowPosX, curPos. y ( ) - sc-> sizeHint ( ). height ( ) );
    sc-> show ( );
 }
 
 void ScreenshotApplet::paintEvent( QPaintEvent* )
 {
   QPainter p ( this );
 	p.drawPixmap( 0,0, m_icon );
 }