1 files changed, 18 insertions, 42 deletions

diff --git a/core/apps/calibrate/calibrate.cpp b/core/apps/calibrate/calibrate.cpp
index 7b60e64..54fa8ec 100644
--- a/core/apps/calibrate/calibrate.cpp
+++ b/core/apps/calibrate/calibrate.cpp
@@ -39,13 +39,14 @@ Calibrate::Calibrate(QWidget* parent, const char * name, WFlags wf) :
     const int offset = 30;
     QRect desk = qApp->desktop()->geometry();
     setGeometry( 0, 0, desk.width(), desk.height() );
     if ( desk.height() < 250 ) {
   int w = desk.height()/3;
   logo.convertFromImage(Resource::loadImage("launcher/opielogo").smoothScale(w,w));
-    } else {
+        }
+        else {
   logo = Resource::loadPixmap( "launcher/opielogo" );
     }
     cd.screenPoints[QWSPointerCalibrationData::TopLeft] = QPoint( offset, offset );
     cd.screenPoints[QWSPointerCalibrationData::BottomLeft] = QPoint( offset, qt_screen->deviceHeight() - offset );
     cd.screenPoints[QWSPointerCalibrationData::BottomRight] = QPoint( qt_screen->deviceWidth() - offset, qt_screen->deviceHeight() - offset );
     cd.screenPoints[QWSPointerCalibrationData::TopRight] = QPoint( qt_screen->deviceWidth() - offset, offset );
@@ -88,51 +89,29 @@ void Calibrate::reset()
     location = QWSPointerCalibrationData::TopLeft;
     crossPos = fromDevice( cd.screenPoints[location] );
 }
 
 QPoint Calibrate::fromDevice( const QPoint &p )
 {
-    return qt_screen->mapFromDevice( p,
-    QSize(qt_screen->deviceWidth(), qt_screen->deviceHeight()) );
+        return qt_screen->mapFromDevice ( p, QSize( qt_screen->deviceWidth ( ), qt_screen->deviceHeight() ) );
 }
 
 bool Calibrate::sanityCheck()
 {
-    QPoint tl = cd.devPoints[QWSPointerCalibrationData::TopLeft];
-    QPoint tr = cd.devPoints[QWSPointerCalibrationData::TopRight];
-    QPoint bl = cd.devPoints[QWSPointerCalibrationData::BottomLeft];
-    QPoint br = cd.devPoints[QWSPointerCalibrationData::BottomRight];
-
-    int vl = QABS( tl.y() - bl.y() );
-    int vr = QABS( tr.y() - br.y() );
-    int diff = QABS( vl - vr );
-    int avg = ( vl + vr ) / 2;
-    if ( diff > avg / 20 ) // 5% leeway
-  return FALSE;
+        QRect r ( cd.devPoints[ QWSPointerCalibrationData::TopLeft ], cd.devPoints[ QWSPointerCalibrationData::BottomRight ] );
+        r = r. normalize ( ); // This should also handle rotated TS controllers
 
-    int ht = QABS( tl.x() - tr.x() );
-    int hb = QABS( br.x() - bl.x() );
-    diff = QABS( ht - hb );
-    avg = ( ht + hb ) / 2;
-    if ( diff > avg / 20 ) // 5% leeway
-  return FALSE;
+        cd. devPoints [QWSPointerCalibrationData::TopRight]   = r. topRight ( );
+        cd. devPoints [QWSPointerCalibrationData::BottomLeft] = r. bottomLeft ( );
+        cd. devPoints [QWSPointerCalibrationData::Center]     = r. center ( );
 
-    return TRUE;
+                return true;
 }
 
 void Calibrate::moveCrosshair( QPoint pt )
 {
-/*
-    QPainter p( this );
-    p.drawPixmap( crossPos.x()-8, crossPos.y()-8, saveUnder );
-    saveUnder = QPixmap::grabWindow( winId(), pt.x()-8, pt.y()-8, 16, 16 );
-    p.drawRect( pt.x()-1, pt.y()-8, 2, 7 );
-    p.drawRect( pt.x()-1, pt.y()+1, 2, 7 );
-    p.drawRect( pt.x()-8, pt.y()-1, 7, 2 );
-    p.drawRect( pt.x()+1, pt.y()-1, 7, 2 );
-*/
     showCross = FALSE;
     repaint( crossPos.x()-8, crossPos.y()-8, 16, 16 );
     showCross = TRUE;
     crossPos = pt;
     repaint( crossPos.x()-8, crossPos.y()-8, 16, 16 );
 }
@@ -151,35 +130,30 @@ void Calibrate::paintEvent( QPaintEvent * )
     y = height() / 2 + 15;
 
     p.drawText( 0, y+height()/8, width(), height() - y, AlignHCenter,
   tr("Touch the crosshairs firmly and\n"
             "accurately to calibrate your screen.") );
 
-    QFont f = p.font(); f.setBold(TRUE);
+        QFont f = p.font();
+        f.setBold( TRUE );
     p.setFont( f );
     p.drawText( 0, y, width(), height() - y, AlignHCenter|WordBreak, 
       tr("Welcome to Opie") );
 
-/*
-    saveUnder = QPixmap::grabWindow( winId(), crossPos.x()-8, crossPos.y()-8,
-             16, 16 );
-    moveCrosshair( crossPos );
-*/
     if ( showCross ) {
   p.drawRect( crossPos.x()-1, crossPos.y()-8, 2, 7 );
   p.drawRect( crossPos.x()-1, crossPos.y()+1, 2, 7 );
   p.drawRect( crossPos.x()-8, crossPos.y()-1, 7, 2 );
   p.drawRect( crossPos.x()+1, crossPos.y()-1, 7, 2 );
     }
 }
 
 void Calibrate::mousePressEvent( QMouseEvent *e )
 {
     // map to device coordinates
-    QPoint devPos = qt_screen->mapToDevice( e->pos(),
-      QSize(qt_screen->width(), qt_screen->height()) );
+        QPoint devPos = qt_screen->mapToDevice( e->pos(), QSize( qt_screen->width(), qt_screen->height() ) );
     if ( penPos.isNull() )
   penPos = devPos;
     else
   penPos = QPoint( (penPos.x() + devPos.x())/2,
        (penPos.y() + devPos.y())/2 );
 }
@@ -189,22 +163,24 @@ void Calibrate::mouseReleaseEvent( QMouseEvent * )
     if ( timer->isActive() )
   return;
 
     bool doMove = TRUE;
 
     cd.devPoints[location] = penPos;
-    if ( location < QWSPointerCalibrationData::LastLocation ) {
-  location = (QWSPointerCalibrationData::Location)((int)location + 1);
-    } else {
+        if ( location == QWSPointerCalibrationData::TopLeft ) {
+                location = QWSPointerCalibrationData::BottomRight;
+        }
+        else {
   if ( sanityCheck() ) {
       reset();
       goodcd = cd;
       hide();
       emit accept();
       doMove = FALSE;
-  } else {
+                }
+                else {
       location = QWSPointerCalibrationData::TopLeft;
   }
     }
       
     if ( doMove ) {
   QPoint target = fromDevice( cd.screenPoints[location] );