1) Add Sharp Zaurus A300/B600|5600/C700 models, will add the model specific bits

 later.
2) Add rotation data and method, to set a default rotation based on model .. so
 we can ditch the use of the startup script to set that.

2 files changed, 54 insertions, 11 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index d39d72f..78eb416 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -44,48 +44,50 @@
 
 #define OD_IOC(dir,type,number,size)    (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 ))
 
 #define OD_IO(type,number)              OD_IOC(0,type,number,0)
 #define OD_IOW(type,number,size)        OD_IOC(1,type,number,sizeof(size))
 #define OD_IOR(type,number,size)        OD_IOC(2,type,number,sizeof(size))
 #define OD_IORW(type,number,size)       OD_IOC(3,type,number,sizeof(size))
 
 using namespace Opie;
 
 class ODeviceData {
 public:
 	bool m_qwsserver;
 
 	QString m_vendorstr;
 	OVendor m_vendor;
 	
 	QString m_modelstr;
 	OModel m_model;
 
 	QString m_systemstr;
 	OSystem m_system;
 	
 	QString m_sysverstr;
+
+	Transformation m_rotation;
 	
 	QValueList <ODeviceButton> m_buttons;
 	uint                       m_holdtime;
 };
 
 
 class iPAQ : public ODevice, public QWSServer::KeyboardFilter {
 protected: 
 	virtual void init ( );
 	
 public:
 	virtual bool setSoftSuspend ( bool soft );
 
 	virtual bool setDisplayBrightness ( int b );
 	virtual int displayBrightnessResolution ( ) const;
 
 	virtual void alarmSound ( );
 	
     virtual QValueList <OLed> ledList ( ) const;
 	virtual QValueList <OLedState> ledStateList ( OLed led ) const;
 	virtual OLedState ledState ( OLed led ) const;
 	virtual bool setLedState ( OLed led, OLedState st );
 
 	virtual bool hasLightSensor ( ) const;
@@ -228,48 +230,49 @@ ODevice *ODevice::inst ( )
 	return dev;
 }
 
 
 /**************************************************
  *
  * common
  *
  **************************************************/
 
 
 ODevice::ODevice ( )
 {
 	d = new ODeviceData;
 
 	d-> m_qwsserver = qApp ? ( qApp-> type ( ) == QApplication::GuiServer ) : false;
 
 	d-> m_modelstr = "Unknown";
 	d-> m_model = Model_Unknown;
 	d-> m_vendorstr = "Unknown";
 	d-> m_vendor = Vendor_Unknown;
 	d-> m_systemstr = "Unknown";
 	d-> m_system = System_Unknown;
 	d-> m_sysverstr = "0.0";
+	d-> m_rotation = None;
 	
 	d-> m_holdtime = 1000; // 1000ms
 	
 	QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
 	connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )), this, SLOT( systemMessage ( const QCString &, const QByteArray & )));	                     	
 }
 
 void ODevice::systemMessage ( const QCString &msg, const QByteArray & )
 {
 	if ( msg == "deviceButtonMappingChanged()" ) {
 		reloadButtonMapping ( );
 	} 
 }
 
 void ODevice::init ( )
 {
 	// Simulation uses iPAQ 3660 device buttons
 
 	for ( uint i = 0; i < ( sizeof( ipaq_buttons ) / sizeof( i_button )); i++ ) {
 		i_button *ib = ipaq_buttons + i;	
 		ODeviceButton b;
 		
 		if (( ib-> model & Model_iPAQ_H36xx ) == Model_iPAQ_H36xx ) {		
 			b. setKeycode ( ib-> code );
@@ -379,48 +382,53 @@ QString ODevice::modelString ( ) const
 {
 	return d-> m_modelstr;
 }
 
 OModel ODevice::model ( ) const
 {
 	return d-> m_model;
 }
 
 QString ODevice::systemString ( ) const
 {
 	return d-> m_systemstr;
 }
 
 OSystem ODevice::system ( ) const
 {
 	return d-> m_system;
 }
 
 QString ODevice::systemVersionString ( ) const
 {
 	return d-> m_sysverstr;
 }
 
+Transformation ODevice::rotation ( ) const
+{
+	return d-> m_rotation;
+}
+
 void ODevice::alarmSound ( )
 {
 #ifndef QT_NO_SOUND
 	static Sound snd ( "alarm" );
 
 	if ( snd. isFinished ( ))
 		snd. play ( );
 #endif
 }
 
 void ODevice::keySound ( )
 {
 #ifndef QT_NO_SOUND
 	static Sound snd ( "keysound" );
 
 	if ( snd. isFinished ( ))
 		snd. play ( );
 #endif
 }
 
 void ODevice::touchSound ( )
 {
 
 #ifndef QT_NO_SOUND
@@ -566,48 +574,61 @@ void iPAQ::init ( )
 
 	QFile f ( "/proc/hal/model" );
 
 	if ( f. open ( IO_ReadOnly )) {
 		QTextStream ts ( &f );
 
 		d-> m_modelstr = "H" + ts. readLine ( );
 
 		if ( d-> m_modelstr == "H3100" )
 			d-> m_model = Model_iPAQ_H31xx;
 		else if ( d-> m_modelstr == "H3600" )
 			d-> m_model = Model_iPAQ_H36xx;
 		else if ( d-> m_modelstr == "H3700" )
 			d-> m_model = Model_iPAQ_H37xx;
 		else if ( d-> m_modelstr == "H3800" )
 			d-> m_model = Model_iPAQ_H38xx;
 		else if ( d-> m_modelstr == "H3900" )
 			d-> m_model = Model_iPAQ_H39xx;
 		else
 			d-> m_model = Model_Unknown;
 
 		f. close ( );
 	}
 
+	switch ( d-> m_model ) {
+		case Model_iPAQ_H31xx:
+		case Model_iPAQ_H38xx:
+			d-> m_rotation = Rot90;
+			break;
+		case Model_iPAQ_H36xx:
+		case Model_iPAQ_H37xx:
+		case Model_iPAQ_H39xx:
+		default:
+			d-> m_rotation = Rot270;
+			break;
+	}
+
 	f. setName ( "/etc/familiar-version" );
 	if ( f. open ( IO_ReadOnly )) { 
 		d-> m_systemstr = "Familiar";
 		d-> m_system = System_Familiar;
 		
 		QTextStream ts ( &f );
 		d-> m_sysverstr = ts. readLine ( ). mid ( 10 );
 		
 		f. close ( );
 	}
 
 	m_leds [0] = m_leds [1] = Led_Off;
 	
 	m_power_timer = 0;
 	
 	for ( uint i = 0; i < ( sizeof( ipaq_buttons ) / sizeof( i_button )); i++ ) {
 		i_button *ib = ipaq_buttons + i;	
 		ODeviceButton b;
 		
 		if (( ib-> model & d-> m_model ) == d-> m_model ) {		
 			b. setKeycode ( ib-> code );
 			b. setUserText ( qApp-> translate ( "Button", ib-> utext ));
 			b. setPixmap ( Resource::loadPixmap ( ib-> pix ));
 			b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( ib-> fpressedservice ), ib-> fpressedaction ));
@@ -620,49 +641,48 @@ void iPAQ::init ( )
 	
 	if ( d-> m_qwsserver )
 		QWSServer::setKeyboardFilter ( this );	
 }
 
 //#include <linux/h3600_ts.h>  // including kernel headers is evil ...
 
 typedef struct {
   unsigned char OffOnBlink;       /* 0=off 1=on 2=Blink */
   unsigned char TotalTime;        /* Units of 5 seconds */
   unsigned char OnTime;           /* units of 100m/s */
   unsigned char OffTime;          /* units of 100m/s */
 } LED_IN;
 
 typedef struct {
 	unsigned char mode;
 	unsigned char pwr;
 	unsigned char brightness;
 } FLITE_IN;
 
 #define LED_ON    OD_IOW( 'f', 5, LED_IN )
 #define FLITE_ON  OD_IOW( 'f', 7, FLITE_IN )
 
 
-
 QValueList <OLed> iPAQ::ledList ( ) const
 {
 	QValueList <OLed> vl;
 	vl << Led_Power;
 
 	if ( d-> m_model == Model_iPAQ_H38xx )
 		vl << Led_BlueTooth;
 	return vl;
 }
 
 QValueList <OLedState> iPAQ::ledStateList ( OLed l ) const
 {
 	QValueList <OLedState> vl;
 
 	if ( l == Led_Power )
 		vl << Led_Off << Led_On << Led_BlinkSlow << Led_BlinkFast;
 	else if ( l == Led_BlueTooth && d-> m_model == Model_iPAQ_H38xx )
 		vl << Led_Off; // << Led_On << ???
 		
 	return vl;
 }
 
 OLedState iPAQ::ledState ( OLed l ) const
 {	
@@ -916,59 +936,78 @@ void Zaurus::init ( )
 	if ( f. open ( IO_ReadOnly ) && ( QTextStream ( &f ). read ( ). find ( "\tjffs2\n" ) >= 0 )) {
 		d-> m_vendorstr = "OpenZaurus Team";
 		d-> m_systemstr = "OpenZaurus";
 		d-> m_system = System_OpenZaurus;
 
 		f. close ( );
 
 		f. setName ( "/etc/oz_version" );
 		if ( f. open ( IO_ReadOnly )) { 
 			QTextStream ts ( &f );
 			d-> m_sysverstr = ts. readLine ( );//. mid ( 10 );
 			f. close ( );
 		}
 	}
 	else {
 		d-> m_systemstr = "Zaurus";
 		d-> m_system = System_Zaurus;
 	}
 
 	f. setName ( "/proc/deviceinfo/product" );
 	if ( f. open ( IO_ReadOnly ) ) {
 		QTextStream ts ( &f );
 		QString model = ts. readLine ( );
 		f. close ( );
-		if ( model == "SL-5000D" ) {
-			d-> m_model = Model_Zaurus_SL5000;
-			d-> m_modelstr = "Zaurus SL-5000D";
-		} else if ( model == "SL-5500" ) {
+
+		d-> m_modelstr = QString("Zaurus ") + model;
+		if ( model == "SL-5500" )
 			d-> m_model = Model_Zaurus_SL5500;
-			d-> m_modelstr = "Zaurus SL-5500";
-		}
+		else if ( model == "SL-C700" )
+			d-> m_model = Model_Zaurus_SLC700;
+		else if ( model == "SL-A300" )
+			d-> m_model = Model_Zaurus_SLA300;
+		else if ( model == "SL-B600" || model == "SL-5600" )
+			d-> m_model = Model_Zaurus_SLB600;
+		else
+			d-> m_model = Model_Zaurus_SL5000;
 	}
 	else {
 		d-> m_model = Model_Zaurus_SL5000;
-		d-> m_modelstr = "Zaurus SL-5000D (unverified)";
+		d-> m_modelstr = "Zaurus (model unknown)";
+	}
+
+	switch ( d-> m_model ) {
+		case Model_Zaurus_SLC700:
+			/* note for C700, we must check the display rotation
+			 * sensor to set an appropriate value
+			 */
+		case Model_Zaurus_SLA300:
+		case Model_Zaurus_SLB600:
+		case Model_Zaurus_SL5500:
+		case Model_Zaurus_SL5000:
+		default:
+			d-> m_rotation = Rot270;
+			break;
 	}
 
 	for ( uint i = 0; i < ( sizeof( z_buttons ) / sizeof( z_button )); i++ ) {
 		z_button *zb = z_buttons + i;	
 		ODeviceButton b;
 		
 		b. setKeycode ( zb-> code );
 		b. setUserText ( qApp-> translate ( "Button", zb-> utext ));
 		b. setPixmap ( Resource::loadPixmap ( zb-> pix ));
 		b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( zb-> fpressedservice ), zb-> fpressedaction ));
 		b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( zb-> fheldservice ), zb-> fheldaction ));
                                         
 		d-> m_buttons. append ( b );
 	}
 	reloadButtonMapping ( );
 
 	m_leds [0] = Led_Off;
 }
 
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
 //#include <asm/sharp_char.h> // including kernel headers is evil ...
diff --git a/libopie/odevice.h b/libopie/odevice.h
index 54b85a2..8164c4d 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -5,145 +5,149 @@
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
                              
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
                                           
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #ifndef _LIBOPIE_ODEVICE_H_
 #define _LIBOPIE_ODEVICE_H_
 
 #include <qobject.h>
 #include <qstring.h>
 #include <qnamespace.h>
 
 #include <opie/odevicebutton.h>
 
+enum Transformation { None, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */
+
 class ODeviceData;
 
 namespace Opie {
 
 enum OModel {
 	Model_Unknown,
 	
 	Model_Series_Mask   = 0xff000000,
 
 	Model_iPAQ          = ( 1 << 24 ),
 
 	Model_iPAQ_All      = ( Model_iPAQ | 0xffffff ),
 	Model_iPAQ_H31xx    = ( Model_iPAQ | 0x000001 ),
 	Model_iPAQ_H36xx    = ( Model_iPAQ | 0x000002 ),
 	Model_iPAQ_H37xx    = ( Model_iPAQ | 0x000004 ),
 	Model_iPAQ_H38xx    = ( Model_iPAQ | 0x000008 ),
 	Model_iPAQ_H39xx    = ( Model_iPAQ | 0x000010 ),
 
 	Model_Zaurus        = ( 2 << 24 ),
 
 	Model_Zaurus_SL5000 = ( Model_Zaurus | 0x000001 ),
 	Model_Zaurus_SL5500 = ( Model_Zaurus | 0x000002 ),
+	Model_Zaurus_SLA300 = ( Model_Zaurus | 0x000003 ),
+	Model_Zaurus_SLB600 = ( Model_Zaurus | 0x000004 ),
+	Model_Zaurus_SLC700 = ( Model_Zaurus | 0x000005 ),
 };
 
 enum OVendor {	
 	Vendor_Unknown,
 
 	Vendor_HP,
 	Vendor_Sharp
 };	
 
 enum OSystem {
 	System_Unknown,
 
 	System_Familiar,
 	System_Zaurus,
 	System_OpenZaurus
 };
 
 enum OLedState {
 	Led_Off,
 	Led_On,
 	Led_BlinkSlow,
 	Led_BlinkFast
 };
 
 enum OLed {
 	Led_Mail,
 	Led_Power,
 	Led_BlueTooth
 };
 
 enum OHardKey {
 	HardKey_Datebook  = Qt::Key_F9,
 	HardKey_Contacts  = Qt::Key_F10,
 	HardKey_Menu      = Qt::Key_F11,
 	HardKey_Home      = Qt::Key_F12,
 	HardKey_Mail      = Qt::Key_F13,
 	HardKey_Record    = Qt::Key_F24,
 	HardKey_Suspend   = Qt::Key_F34,
 	HardKey_Backlight = Qt::Key_F35,
 };
 
-
 class ODevice : public QObject {
 	Q_OBJECT
 	
 private:
 	ODevice ( const ODevice & );
 
 protected:
 	ODevice ( );
 	virtual void init ( );
 	
 	ODeviceData *d;
 
 public:
 	virtual ~ODevice ( );
 
 	static ODevice *inst ( );
 
-
-
 // information
 
 	QString modelString ( ) const; 
 	OModel model ( ) const;
 	inline OModel series ( ) const { return (OModel) ( model ( ) & Model_Series_Mask ); }
 	
 	QString vendorString ( ) const;
 	OVendor vendor ( ) const;
 
 	QString systemString ( ) const;
 	OSystem system ( ) const;
 
 	QString systemVersionString ( ) const;
 
+	Transformation rotation ( ) const;
+
 // system	
 
 	virtual bool setSoftSuspend ( bool on );
 	virtual bool suspend ( );
 
 	virtual bool setDisplayStatus ( bool on );
 	virtual bool setDisplayBrightness ( int brightness );
 	virtual int displayBrightnessResolution ( ) const;
 	
 // input / output
 
 	virtual void alarmSound ( );
 	virtual void keySound ( );
 	virtual void touchSound ( );
 
 	virtual QValueList <OLed> ledList ( ) const;
 	virtual QValueList <OLedState> ledStateList ( OLed led ) const;
 	virtual OLedState ledState ( OLed led ) const;
 	virtual bool setLedState ( OLed led, OLedState st );
 
 	virtual bool hasLightSensor ( ) const;
 	virtual int readLightSensor ( );
 	virtual int lightSensorResolution ( ) const;