summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-01-26 01:01:32 (UTC)
committer kergoth <kergoth>2003-01-26 01:01:32 (UTC)
commit7b5f4142a1ace5fba9fdf9b8e5538669a56ba60b (patch) (unidiff)
tree29ab0dfa5c6d35621857af78a6fa3eaae517be33
parent7d07568352e368fe473e4c1c5493df2ebb0090d2 (diff)
downloadopie-7b5f4142a1ace5fba9fdf9b8e5538669a56ba60b.zip
opie-7b5f4142a1ace5fba9fdf9b8e5538669a56ba60b.tar.gz
opie-7b5f4142a1ace5fba9fdf9b8e5538669a56ba60b.tar.bz2
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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/odevice.cpp55
-rw-r--r--libopie/odevice.h10
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
@@ -66,4 +66,6 @@ public:
66 66
67 QString m_sysverstr; 67 QString m_sysverstr;
68
69 Transformation m_rotation;
68 70
69 QValueList <ODeviceButton> m_buttons; 71 QValueList <ODeviceButton> m_buttons;
@@ -250,4 +252,5 @@ ODevice::ODevice ( )
250 d-> m_system = System_Unknown; 252 d-> m_system = System_Unknown;
251 d-> m_sysverstr = "0.0"; 253 d-> m_sysverstr = "0.0";
254 d-> m_rotation = None;
252 255
253 d-> m_holdtime = 1000; // 1000ms 256 d-> m_holdtime = 1000; // 1000ms
@@ -401,4 +404,9 @@ QString ODevice::systemVersionString ( ) const
401} 404}
402 405
406Transformation ODevice::rotation ( ) const
407{
408 return d-> m_rotation;
409}
410
403void ODevice::alarmSound ( ) 411void ODevice::alarmSound ( )
404{ 412{
@@ -588,4 +596,17 @@ void iPAQ::init ( )
588 } 596 }
589 597
598 switch ( d-> m_model ) {
599 case Model_iPAQ_H31xx:
600 case Model_iPAQ_H38xx:
601 d-> m_rotation = Rot90;
602 break;
603 case Model_iPAQ_H36xx:
604 case Model_iPAQ_H37xx:
605 case Model_iPAQ_H39xx:
606 default:
607 d-> m_rotation = Rot270;
608 break;
609 }
610
590 f. setName ( "/etc/familiar-version" ); 611 f. setName ( "/etc/familiar-version" );
591 if ( f. open ( IO_ReadOnly )) { 612 if ( f. open ( IO_ReadOnly )) {
@@ -642,5 +663,4 @@ typedef struct {
642 663
643 664
644
645QValueList <OLed> iPAQ::ledList ( ) const 665QValueList <OLed> iPAQ::ledList ( ) const
646{ 666{
@@ -938,15 +958,34 @@ void Zaurus::init ( )
938 QString model = ts. readLine ( ); 958 QString model = ts. readLine ( );
939 f. close ( ); 959 f. close ( );
940 if ( model == "SL-5000D" ) { 960
941 d-> m_model = Model_Zaurus_SL5000; 961 d-> m_modelstr = QString("Zaurus ") + model;
942 d-> m_modelstr = "Zaurus SL-5000D"; 962 if ( model == "SL-5500" )
943 } else if ( model == "SL-5500" ) {
944 d-> m_model = Model_Zaurus_SL5500; 963 d-> m_model = Model_Zaurus_SL5500;
945 d-> m_modelstr = "Zaurus SL-5500"; 964 else if ( model == "SL-C700" )
946 } 965 d-> m_model = Model_Zaurus_SLC700;
966 else if ( model == "SL-A300" )
967 d-> m_model = Model_Zaurus_SLA300;
968 else if ( model == "SL-B600" || model == "SL-5600" )
969 d-> m_model = Model_Zaurus_SLB600;
970 else
971 d-> m_model = Model_Zaurus_SL5000;
947 } 972 }
948 else { 973 else {
949 d-> m_model = Model_Zaurus_SL5000; 974 d-> m_model = Model_Zaurus_SL5000;
950 d-> m_modelstr = "Zaurus SL-5000D (unverified)"; 975 d-> m_modelstr = "Zaurus (model unknown)";
976 }
977
978 switch ( d-> m_model ) {
979 case Model_Zaurus_SLC700:
980 /* note for C700, we must check the display rotation
981 * sensor to set an appropriate value
982 */
983 case Model_Zaurus_SLA300:
984 case Model_Zaurus_SLB600:
985 case Model_Zaurus_SL5500:
986 case Model_Zaurus_SL5000:
987 default:
988 d-> m_rotation = Rot270;
989 break;
951 } 990 }
952 991
diff --git a/libopie/odevice.h b/libopie/odevice.h
index 54b85a2..8164c4d 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -27,4 +27,6 @@
27#include <opie/odevicebutton.h> 27#include <opie/odevicebutton.h>
28 28
29enum Transformation { None, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */
30
29class ODeviceData; 31class ODeviceData;
30 32
@@ -49,4 +51,7 @@ enum OModel {
49 Model_Zaurus_SL5000 = ( Model_Zaurus | 0x000001 ), 51 Model_Zaurus_SL5000 = ( Model_Zaurus | 0x000001 ),
50 Model_Zaurus_SL5500 = ( Model_Zaurus | 0x000002 ), 52 Model_Zaurus_SL5500 = ( Model_Zaurus | 0x000002 ),
53 Model_Zaurus_SLA300 = ( Model_Zaurus | 0x000003 ),
54 Model_Zaurus_SLB600 = ( Model_Zaurus | 0x000004 ),
55 Model_Zaurus_SLC700 = ( Model_Zaurus | 0x000005 ),
51}; 56};
52 57
@@ -90,5 +95,4 @@ enum OHardKey {
90}; 95};
91 96
92
93class ODevice : public QObject { 97class ODevice : public QObject {
94 Q_OBJECT 98 Q_OBJECT
@@ -108,6 +112,4 @@ public:
108 static ODevice *inst ( ); 112 static ODevice *inst ( );
109 113
110
111
112// information 114// information
113 115
@@ -124,4 +126,6 @@ public:
124 QString systemVersionString ( ) const; 126 QString systemVersionString ( ) const;
125 127
128 Transformation rotation ( ) const;
129
126 // system 130 // system
127 131