Add note about c700 physical screen orientation handling.

1 files changed, 15 insertions, 3 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 29c8ad2..713cc90 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -1085,131 +1085,143 @@ int iPAQ::lightSensorResolution ( ) const
 }
 
 /**************************************************
  *
  * Zaurus
  *
  **************************************************/
 
 
 
 void Zaurus::init ( )
 {
 	d-> m_vendorstr = "Sharp";
 	d-> m_vendor = Vendor_Sharp;
 
 	QFile f ( "/proc/filesystems" );
 
 	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 ( );
 
 		d-> m_modelstr = QString("Zaurus ") + model;
 		if ( model == "SL-5500" )
 			d-> m_model = Model_Zaurus_SL5500;
 		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 (model unknown)";
 	}
 
 	switch ( d-> m_model ) {
 		case Model_Zaurus_SLA300:
 			d-> m_rotation = Rot0;
 			break;
 		case Model_Zaurus_SLC700:
-			/* note for C700, we must check the display rotation
-			 * sensor to set an appropriate value
-			 */
+			bool flipstate = false;
+			// Note: need to 1) set flipstate based on physical screen orientation
+			// and 2) check to see if the user overrode the rotation direction
+			// using appearance, and if so, remove that item from the Config to
+			// ensure the rotate applet flips us back to the previous state.
+			if ( flipstate ) {
+				// 480x640
+				d-> m_rotation = Rot0;
+				d-> m_direction = CW;
+			} else {
+				// 640x480
+				d-> m_rotation = Rot270;
+				d-> m_direction = CCW;
+			}
+			break;
 		case Model_Zaurus_SLB600:
 		case Model_Zaurus_SL5500:
 		case Model_Zaurus_SL5000:
 		default:
 			d-> m_rotation = Rot270;
 			break;
 	}
 	m_leds [0] = Led_Off;
 }
 
 void Zaurus::initButtons ( )
 {
 	if ( d-> m_buttons )
 		return;
 
 	d-> m_qwsserver = qApp ? ( qApp-> type ( ) == QApplication::GuiServer ) : false;
 
 	d-> m_buttons = new QValueList <ODeviceButton>;
 
 	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 ( QObject::tr ( "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 ( );
 
 	QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
 	connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )), this, SLOT( systemMessage ( const QCString &, const QByteArray & )));
 }
 
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
 //#include <asm/sharp_char.h> // including kernel headers is evil ...
 
 #define SHARP_DEV_IOCTL_COMMAND_START 0x5680
 
 #define	SHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START)
 #define SHARP_BUZZER_MAKESOUND   (SHARP_BUZZER_IOCTL_START)
 
 #define SHARP_BUZ_TOUCHSOUND       1  /* touch panel sound */
 #define SHARP_BUZ_KEYSOUND         2  /* key sound */
 #define SHARP_BUZ_SCHEDULE_ALARM  11  /* schedule alarm */
 
 /* --- for SHARP_BUZZER device --- */
 
 //#define	SHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START)
 //#define SHARP_BUZZER_MAKESOUND   (SHARP_BUZZER_IOCTL_START)
 
 #define SHARP_BUZZER_SETVOLUME   (SHARP_BUZZER_IOCTL_START+1)
 #define SHARP_BUZZER_GETVOLUME   (SHARP_BUZZER_IOCTL_START+2)
 #define SHARP_BUZZER_ISSUPPORTED (SHARP_BUZZER_IOCTL_START+3)
 #define SHARP_BUZZER_SETMUTE     (SHARP_BUZZER_IOCTL_START+4)
 #define SHARP_BUZZER_STOPSOUND   (SHARP_BUZZER_IOCTL_START+5)