summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2004-01-18 05:11:58 (UTC)
committer llornkcor <llornkcor>2004-01-18 05:11:58 (UTC)
commitf5d28a9b86f5fdf8b4512d34c34e77284756f95c (patch) (side-by-side diff)
tree9c6bf9022095a957c16f7a31f447608612a1589e
parent933d897346745d3d51e41591c59387ef6d2bb917 (diff)
downloadopie-f5d28a9b86f5fdf8b4512d34c34e77284756f95c.zip
opie-f5d28a9b86f5fdf8b4512d34c34e77284756f95c.tar.gz
opie-f5d28a9b86f5fdf8b4512d34c34e77284756f95c.tar.bz2
fix for QWS_DISPLAY not being set
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/screenshotapplet/screenshot.cpp23
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
@@ -407,38 +407,41 @@ void ScreenshotControl::performGrab()
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
@@ -447,39 +450,43 @@ void ScreenshotControl::performGrab()
"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;