summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/apps/calibrate/calibrate.cpp27
-rw-r--r--core/apps/calibrate/calibrate.h6
2 files changed, 29 insertions, 4 deletions
diff --git a/core/apps/calibrate/calibrate.cpp b/core/apps/calibrate/calibrate.cpp
index a5f8792..e079195 100644
--- a/core/apps/calibrate/calibrate.cpp
+++ b/core/apps/calibrate/calibrate.cpp
@@ -26,7 +26,7 @@
#include <qpe/qcopenvelope_qws.h>
#include <qapplication.h>
-#if defined(Q_WS_QWS) || defined(_WS_QWS_)
+//#if defined(Q_WS_QWS) || defined(_WS_QWS_)
#include <qpainter.h>
#include <qtimer.h>
@@ -37,6 +37,7 @@
Calibrate::Calibrate( QWidget* parent, const char * name, WFlags wf ) :
QDialog( parent, name, TRUE, wf | WStyle_Tool | WStyle_Customize | WStyle_StaysOnTop )
{
+#ifdef QWS
showCross = TRUE;
const int offset = 30;
QRect desk = qApp->desktop() ->geometry();
@@ -58,6 +59,7 @@ Calibrate::Calibrate( QWidget* parent, const char * name, WFlags wf ) :
timer = new QTimer( this );
connect( timer, SIGNAL( timeout() ), this, SLOT( timeout() ) );
+#endif
}
Calibrate::~Calibrate()
@@ -67,15 +69,19 @@ Calibrate::~Calibrate()
void Calibrate::show()
{
+#ifdef QWS
grabMouse();
QWSServer::mouseHandler() ->getCalibration( &goodcd );
QWSServer::mouseHandler() ->clearCalibration();
QDialog::show();
+#endif
}
void Calibrate::store()
{
+#ifdef QWS
QWSServer::mouseHandler() ->calibrate( &goodcd );
+#endif
}
void Calibrate::hide()
@@ -94,18 +100,26 @@ void Calibrate::hide()
void Calibrate::reset()
{
+#ifdef QWS
penPos = QPoint();
location = QWSPointerCalibrationData::TopLeft;
crossPos = fromDevice( cd.screenPoints[ location ] );
+#endif
}
QPoint Calibrate::fromDevice( const QPoint &p )
{
+#ifdef QWS
return qt_screen->mapFromDevice ( p, QSize( qt_screen->deviceWidth ( ), qt_screen->deviceHeight() ) );
+#else
+ return QPoint();
+#endif
+
}
bool Calibrate::sanityCheck()
{
+#ifdef QWS
QPoint tl = cd.devPoints[QWSPointerCalibrationData::TopLeft];
QPoint tr = cd.devPoints[QWSPointerCalibrationData::TopRight];
QPoint bl = cd.devPoints[QWSPointerCalibrationData::BottomLeft];
@@ -146,6 +160,9 @@ bool Calibrate::sanityCheck()
return false;
else
return true;
+#else
+return true;
+#endif
}
void Calibrate::moveCrosshair( QPoint pt )
@@ -190,6 +207,7 @@ void Calibrate::paintEvent( QPaintEvent * )
void Calibrate::mousePressEvent( QMouseEvent *e )
{
+#ifdef QWS
// map to device coordinates
QPoint devPos = qt_screen->mapToDevice( e->pos(), QSize( qt_screen->width(), qt_screen->height() ) );
if ( penPos.isNull() )
@@ -197,10 +215,12 @@ void Calibrate::mousePressEvent( QMouseEvent *e )
else
penPos = QPoint( ( penPos.x() + devPos.x() ) / 2,
( penPos.y() + devPos.y() ) / 2 );
+#endif
}
void Calibrate::mouseReleaseEvent( QMouseEvent * )
{
+#ifdef QWS
if ( timer->isActive() )
return ;
@@ -229,10 +249,12 @@ void Calibrate::mouseReleaseEvent( QMouseEvent * )
dy = ( target.y() - crossPos.y() ) / 10;
timer->start( 30 );
}
+#endif
}
void Calibrate::timeout()
{
+#ifdef QWS
QPoint target = fromDevice( cd.screenPoints[ location ] );
bool doneX = FALSE;
@@ -255,6 +277,7 @@ void Calibrate::timeout()
}
moveCrosshair( newPos );
+#endif
}
-#endif // _WS_QWS_
+//#endif // _WS_QWS_
diff --git a/core/apps/calibrate/calibrate.h b/core/apps/calibrate/calibrate.h
index 97108c9..06aa0c9 100644
--- a/core/apps/calibrate/calibrate.h
+++ b/core/apps/calibrate/calibrate.h
@@ -20,7 +20,7 @@
#include <qwsmouse_qws.h>
-#if defined(Q_WS_QWS) || defined(_WS_QWS_)
+//#if defined(Q_WS_QWS) || defined(_WS_QWS_)
#include <qdialog.h>
#include <qpixmap.h>
@@ -52,8 +52,10 @@ private:
void store();
void reset();
QPixmap logo;
+#ifdef QWS
QWSPointerCalibrationData goodcd,cd;
QWSPointerCalibrationData::Location location;
+#endif
QPoint crossPos;
QPoint penPos;
QPixmap saveUnder;
@@ -63,5 +65,5 @@ private:
bool showCross;
};
-#endif // _WS_QWS_
+//#endif // _WS_QWS_