-rw-r--r-- | libopie2/opiecore/device/odevice.cpp | 88 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_zaurus.cpp | 22 |
2 files changed, 35 insertions, 75 deletions
diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp index 3d69614..2c5190c 100644 --- a/libopie2/opiecore/device/odevice.cpp +++ b/libopie2/opiecore/device/odevice.cpp | |||
@@ -172,33 +172,33 @@ ODevice::ODevice() | |||
172 | d->m_model = Model_Unknown; | 172 | d->m_model = Model_Unknown; |
173 | d->m_vendorstr = "Unknown"; | 173 | d->m_vendorstr = "Unknown"; |
174 | d->m_vendor = Vendor_Unknown; | 174 | d->m_vendor = Vendor_Unknown; |
175 | d->m_systemstr = "Unknown"; | 175 | d->m_systemstr = "Unknown"; |
176 | d->m_system = System_Unknown; | 176 | d->m_system = System_Unknown; |
177 | d->m_sysverstr = "0.0"; | 177 | d->m_sysverstr = "0.0"; |
178 | d->m_rotation = Rot0; | 178 | d->m_rotation = Rot0; |
179 | d->m_direction = CW; | 179 | d->m_direction = CW; |
180 | 180 | ||
181 | d->m_holdtime = 1000; // 1000ms | 181 | d->m_holdtime = 1000; // 1000ms |
182 | d->m_buttons = 0; | 182 | d->m_buttons = 0; |
183 | d->m_cpu_frequencies = new QStrList; | 183 | d->m_cpu_frequencies = new QStrList; |
184 | 184 | ||
185 | 185 | ||
186 | /* mixer */ | 186 | /* mixer */ |
187 | d->m_sound = d->m_vol = d->m_mixer = -1; | 187 | d->m_sound = d->m_vol = d->m_mixer = -1; |
188 | 188 | ||
189 | /* System QCopChannel created */ | 189 | /* System QCopChannel created */ |
190 | d->m_initializedButtonQcop = false; | 190 | d->m_initializedButtonQcop = false; |
191 | 191 | ||
192 | // New distribution detection code first checks for legacy distributions, | 192 | // New distribution detection code first checks for legacy distributions, |
193 | // identified by /etc/familiar-version or /etc/oz_version. | 193 | // identified by /etc/familiar-version or /etc/oz_version. |
194 | // Then check for OpenEmbedded and lastly, read /etc/issue | 194 | // Then check for OpenEmbedded and lastly, read /etc/issue |
195 | 195 | ||
196 | for ( unsigned int i = 0; i < sizeof distributions; ++i ) | 196 | for ( unsigned int i = 0; i < sizeof distributions; ++i ) |
197 | { | 197 | { |
198 | if ( QFile::exists( distributions[i].sysvfile ) ) | 198 | if ( QFile::exists( distributions[i].sysvfile ) ) |
199 | { | 199 | { |
200 | d->m_systemstr = distributions[i].sysstr; | 200 | d->m_systemstr = distributions[i].sysstr; |
201 | d->m_system = distributions[i].system; | 201 | d->m_system = distributions[i].system; |
202 | d->m_sysverstr = "<Unknown>"; | 202 | d->m_sysverstr = "<Unknown>"; |
203 | QFile f( distributions[i].sysvfile ); | 203 | QFile f( distributions[i].sysvfile ); |
204 | if ( f.open( IO_ReadOnly ) ) | 204 | if ( f.open( IO_ReadOnly ) ) |
@@ -258,138 +258,99 @@ ODevice::~ODevice() | |||
258 | 258 | ||
259 | #define APM_IOC_SUSPEND OD_IO( 'A', 2 ) | 259 | #define APM_IOC_SUSPEND OD_IO( 'A', 2 ) |
260 | 260 | ||
261 | /** | 261 | /** |
262 | * This method will try to suspend the device | 262 | * This method will try to suspend the device |
263 | * It only works if the user is the QWS Server and the apm application | 263 | * It only works if the user is the QWS Server and the apm application |
264 | * is installed. | 264 | * is installed. |
265 | * It tries to suspend and then waits some time cause some distributions | 265 | * It tries to suspend and then waits some time cause some distributions |
266 | * do have asynchronus apm implementations. | 266 | * do have asynchronus apm implementations. |
267 | * This method will either fail and return false or it'll suspend the | 267 | * This method will either fail and return false or it'll suspend the |
268 | * device and return once the device got woken up | 268 | * device and return once the device got woken up |
269 | * | 269 | * |
270 | * @return if the device got suspended | 270 | * @return if the device got suspended |
271 | */ | 271 | */ |
272 | bool ODevice::suspend() | 272 | bool ODevice::suspend() |
273 | { | 273 | { |
274 | if ( !isQWS( ) ) // only qwsserver is allowed to suspend | 274 | return false; // default implementation == unknown device or qvfb |
275 | return false; | ||
276 | |||
277 | if ( d->m_model == Model_Unknown ) // better don't suspend in qvfb / on unkown devices | ||
278 | return false; | ||
279 | |||
280 | bool res = false; | ||
281 | ODevice::sendSuspendmsg(); | ||
282 | |||
283 | struct timeval tvs, tvn; | ||
284 | ::gettimeofday ( &tvs, 0 ); | ||
285 | |||
286 | ::sync(); // flush fs caches | ||
287 | res = ( ::system ( "apm --suspend" ) == 0 ); | ||
288 | |||
289 | // This is needed because the iPAQ apm implementation is asynchronous and we | ||
290 | // can not be sure when exactly the device is really suspended | ||
291 | // This can be deleted as soon as a stable familiar with a synchronous apm implementation exists. | ||
292 | |||
293 | if ( res ) { | ||
294 | do { // wait at most 1.5 sec: either suspend didn't work or the device resumed | ||
295 | ::usleep ( 200 * 1000 ); | ||
296 | ::gettimeofday ( &tvn, 0 ); | ||
297 | } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < 1500 ); | ||
298 | } | ||
299 | |||
300 | return res; | ||
301 | } | 275 | } |
302 | 276 | ||
303 | //#include <linux/fb.h> better not rely on kernel headers in userspace ... | 277 | //#include <linux/fb.h> better not rely on kernel headers in userspace ... |
304 | 278 | ||
305 | #define FBIOBLANK OD_IO( 'F', 0x11 ) // 0x4611 | 279 | #define FBIOBLANK OD_IO( 'F', 0x11 ) // 0x4611 |
306 | 280 | ||
307 | /* VESA Blanking Levels */ | 281 | /* VESA Blanking Levels */ |
308 | #define VESA_NO_BLANKING 0 | 282 | #define VESA_NO_BLANKING 0 |
309 | #define VESA_VSYNC_SUSPEND 1 | 283 | #define VESA_VSYNC_SUSPEND 1 |
310 | #define VESA_HSYNC_SUSPEND 2 | 284 | #define VESA_HSYNC_SUSPEND 2 |
311 | #define VESA_POWERDOWN 3 | 285 | #define VESA_POWERDOWN 3 |
312 | 286 | ||
313 | /** | 287 | /** |
314 | * This sets the display on or off | 288 | * This sets the display on or off |
315 | */ | 289 | */ |
316 | bool ODevice::setDisplayStatus ( bool on ) | 290 | bool ODevice::setDisplayStatus( bool on ) |
317 | { | 291 | { |
318 | qDebug("ODevice::setDisplayStatus(%d)", on); | 292 | qDebug( "ODevice::setDisplayStatus( %d ) - please override me.", on ); |
319 | 293 | return false; // don't do anything for unknown models | |
320 | if ( d->m_model == Model_Unknown ) | ||
321 | return false; | ||
322 | |||
323 | bool res = false; | ||
324 | int fd; | ||
325 | |||
326 | #ifdef QT_QWS_DEVFS | ||
327 | if (( fd = ::open ( "/dev/fb/0", O_RDWR )) >= 0 ) { | ||
328 | #else | ||
329 | if (( fd = ::open ( "/dev/fb0", O_RDWR )) >= 0 ) { | ||
330 | #endif | ||
331 | res = ( ::ioctl ( fd, FBIOBLANK, on ? VESA_NO_BLANKING : VESA_POWERDOWN ) == 0 ); | ||
332 | ::close ( fd ); | ||
333 | } | ||
334 | return res; | ||
335 | } | 294 | } |
336 | 295 | ||
337 | /** | 296 | /** |
338 | * This sets the display brightness | 297 | * This sets the display brightness |
339 | * | 298 | * |
340 | * @param b The brightness to be set on a scale from 0 to 255 | 299 | * @param b The brightness to be set on a scale from 0 to 255 |
341 | * @return success or failure | 300 | * @return success or failure |
342 | */ | 301 | */ |
343 | bool ODevice::setDisplayBrightness ( int b) | 302 | bool ODevice::setDisplayBrightness( int b ) |
344 | { | 303 | { |
345 | Q_UNUSED( b ) | 304 | qDebug( "ODevice::setDisplayBrightness( %d ) - please override me.", b ); |
346 | return false; | 305 | return false; |
347 | } | 306 | } |
348 | 307 | ||
349 | /** | 308 | /** |
350 | * | 309 | * |
351 | * @return Returns the number of steppings on the brightness slider | 310 | * @returns the number of steppings on the brightness slider |
352 | * in the Light-'n-Power settings. Values smaller zero and bigger | 311 | * in the Light-'n-Power settings. Values smaller than zero and bigger |
353 | * than 255 do not make sense. | 312 | * than 255 do not make sense. |
354 | * | 313 | * |
355 | * \sa QSlider::setLineStep | 314 | * \sa QSlider::setLineStep |
356 | * \sa QSlider::setPageStep | 315 | * \sa QSlider::setPageStep |
357 | */ | 316 | */ |
358 | int ODevice::displayBrightnessResolution() const | 317 | int ODevice::displayBrightnessResolution() const |
359 | { | 318 | { |
319 | qDebug( "ODevice::displayBrightnessResolution() - please override me." ); | ||
360 | return 16; | 320 | return 16; |
361 | } | 321 | } |
362 | 322 | ||
363 | /** | 323 | /** |
364 | * This sets the display contrast | 324 | * This sets the display contrast |
365 | * @param p The contrast to be set on a scale from 0 to 255 | 325 | * @param p The contrast to be set on a scale from 0 to 255 |
366 | * @return success or failure | 326 | * @returns success or failure |
367 | */ | 327 | */ |
368 | bool ODevice::setDisplayContrast ( int p) | 328 | bool ODevice::setDisplayContrast( int p ) |
369 | { | 329 | { |
370 | Q_UNUSED( p ) | 330 | qDebug( "ODevice::setDisplayContrast( %d ) - please override me.", p ); |
371 | return false; | 331 | return false; |
372 | } | 332 | } |
373 | 333 | ||
374 | /** | 334 | /** |
375 | * @return return the max value for the brightness settings slider | 335 | * @returns the maximum value for the contrast settings slider |
376 | * or 0 if the device doesn't support setting of a contrast | 336 | * or 0 if the device doesn't support setting of a contrast |
377 | */ | 337 | */ |
378 | int ODevice::displayContrastResolution() const | 338 | int ODevice::displayContrastResolution() const |
379 | { | 339 | { |
340 | qDebug( "ODevice::displayBrightnessResolution() - please override me." ); | ||
380 | return 0; | 341 | return 0; |
381 | } | 342 | } |
382 | 343 | ||
383 | /** | 344 | /** |
384 | * This returns the vendor as string | 345 | * This returns the vendor as string |
385 | * @return Vendor as QString | 346 | * @return Vendor as QString |
386 | */ | 347 | */ |
387 | QString ODevice::vendorString() const | 348 | QString ODevice::vendorString() const |
388 | { | 349 | { |
389 | return d->m_vendorstr; | 350 | return d->m_vendorstr; |
390 | } | 351 | } |
391 | 352 | ||
392 | /** | 353 | /** |
393 | * This returns the vendor as one of the values of OVendor | 354 | * This returns the vendor as one of the values of OVendor |
394 | * @return OVendor | 355 | * @return OVendor |
395 | */ | 356 | */ |
@@ -626,73 +587,72 @@ uint ODevice::buttonHoldTime() const | |||
626 | { | 587 | { |
627 | return d->m_holdtime; | 588 | return d->m_holdtime; |
628 | } | 589 | } |
629 | 590 | ||
630 | /** | 591 | /** |
631 | * This method return a ODeviceButton for a key code | 592 | * This method return a ODeviceButton for a key code |
632 | * or 0 if no special hardware button is available for the device | 593 | * or 0 if no special hardware button is available for the device |
633 | * | 594 | * |
634 | * @return The devicebutton or 0l | 595 | * @return The devicebutton or 0l |
635 | * @see ODeviceButton | 596 | * @see ODeviceButton |
636 | */ | 597 | */ |
637 | const ODeviceButton *ODevice::buttonForKeycode ( ushort code ) | 598 | const ODeviceButton *ODevice::buttonForKeycode ( ushort code ) |
638 | { | 599 | { |
639 | initButtons(); | 600 | initButtons(); |
640 | 601 | ||
641 | for ( QValueListConstIterator<ODeviceButton> it = d->m_buttons->begin(); it != d->m_buttons->end(); ++it ) { | 602 | for ( QValueListConstIterator<ODeviceButton> it = d->m_buttons->begin(); it != d->m_buttons->end(); ++it ) { |
642 | if ( (*it). keycode() == code ) | 603 | if ( (*it).keycode() == code ) |
643 | return &(*it); | 604 | return &(*it); |
644 | } | 605 | } |
645 | return 0; | 606 | return 0; |
646 | } | 607 | } |
647 | 608 | ||
648 | void ODevice::reloadButtonMapping() | 609 | void ODevice::reloadButtonMapping() |
649 | { | 610 | { |
650 | if(!d->m_buttons) | 611 | if(!d->m_buttons) |
651 | initButtons(); | 612 | initButtons(); |
652 | 613 | ||
653 | if(!d->m_initializedButtonQcop) { | 614 | if(!d->m_initializedButtonQcop) { |
654 | QCopChannel *chan = new QCopChannel("QPE/System", this, "ODevice button channel"); | 615 | QCopChannel *chan = new QCopChannel("QPE/System", this, "ODevice button channel"); |
655 | connect(chan,SIGNAL(received(const QCString&,const QByteArray&)), | 616 | connect(chan,SIGNAL(received(const QCString&,const QByteArray&)), |
656 | this,SLOT(systemMessage(const QCString&,const QByteArray&))); | 617 | this,SLOT(systemMessage(const QCString&,const QByteArray&))); |
657 | d->m_initializedButtonQcop = true; | 618 | d->m_initializedButtonQcop = true; |
658 | } | 619 | } |
659 | 620 | ||
660 | Config cfg ( "ButtonSettings" ); | 621 | Config cfg ( "ButtonSettings" ); |
661 | 622 | ||
662 | for ( uint i = 0; i < d->m_buttons->count(); i++ ) { | 623 | for ( uint i = 0; i < d->m_buttons->count(); i++ ) { |
663 | ODeviceButton &b = ( *d->m_buttons ) [i]; | 624 | ODeviceButton &b = ( *d->m_buttons ) [i]; |
664 | QString group = "Button" + QString::number ( i ); | 625 | QString group = "Button" + QString::number ( i ); |
665 | 626 | ||
666 | QCString pch, hch; | 627 | QCString pch, hch; |
667 | QCString pm, hm; | 628 | QCString pm, hm; |
668 | QByteArray pdata, hdata; | 629 | QByteArray pdata, hdata; |
669 | 630 | ||
670 | if ( cfg. hasGroup ( group )) { | 631 | if ( cfg. hasGroup ( group )) { |
671 | cfg. setGroup ( group ); | 632 | cfg. setGroup ( group ); |
672 | pch = cfg. readEntry ( "PressedActionChannel" ). latin1(); | 633 | pch = cfg. readEntry ( "PressedActionChannel" ). latin1(); |
673 | pm = cfg. readEntry ( "PressedActionMessage" ). latin1(); | 634 | pm = cfg. readEntry ( "PressedActionMessage" ). latin1(); |
674 | // pdata = decodeBase64 ( buttonFile. readEntry ( "PressedActionArgs" )); | 635 | // pdata = decodeBase64 ( buttonFile. readEntry ( "PressedActionArgs" )); |
675 | 636 | ||
676 | hch = cfg. readEntry ( "HeldActionChannel" ). latin1(); | 637 | hch = cfg. readEntry ( "HeldActionChannel" ). latin1(); |
677 | hm = cfg. readEntry ( "HeldActionMessage" ). latin1(); | 638 | hm = cfg. readEntry ( "HeldActionMessage" ). latin1(); |
678 | // hdata = decodeBase64 ( buttonFile. readEntry ( "HeldActionArgs" )); | 639 | // hdata = decodeBase64 ( buttonFile. readEntry ( "HeldActionArgs" )); |
679 | } | 640 | } |
680 | 641 | ||
681 | b. setPressedAction ( OQCopMessage ( pch, pm, pdata )); | 642 | b. setPressedAction ( OQCopMessage ( pch, pm, pdata )); |
682 | |||
683 | b. setHeldAction ( OQCopMessage ( hch, hm, hdata )); | 643 | b. setHeldAction ( OQCopMessage ( hch, hm, hdata )); |
684 | } | 644 | } |
685 | } | 645 | } |
686 | 646 | ||
687 | void ODevice::remapPressedAction ( int button, const OQCopMessage &action ) | 647 | void ODevice::remapPressedAction ( int button, const OQCopMessage &action ) |
688 | { | 648 | { |
689 | initButtons(); | 649 | initButtons(); |
690 | 650 | ||
691 | QString mb_chan; | 651 | QString mb_chan; |
692 | 652 | ||
693 | if ( button >= (int) d->m_buttons->count()) | 653 | if ( button >= (int) d->m_buttons->count()) |
694 | return; | 654 | return; |
695 | 655 | ||
696 | ODeviceButton &b = ( *d->m_buttons ) [button]; | 656 | ODeviceButton &b = ( *d->m_buttons ) [button]; |
697 | b. setPressedAction ( action ); | 657 | b. setPressedAction ( action ); |
698 | 658 | ||
@@ -728,36 +688,36 @@ void ODevice::remapHeldAction ( int button, const OQCopMessage &action ) | |||
728 | QCopEnvelope ( "QPE/System", "deviceButtonMappingChanged()" ); | 688 | QCopEnvelope ( "QPE/System", "deviceButtonMappingChanged()" ); |
729 | } | 689 | } |
730 | 690 | ||
731 | /** | 691 | /** |
732 | * @internal | 692 | * @internal |
733 | */ | 693 | */ |
734 | void ODevice::virtual_hook(int, void* ){ | 694 | void ODevice::virtual_hook(int, void* ){ |
735 | 695 | ||
736 | } | 696 | } |
737 | 697 | ||
738 | /** | 698 | /** |
739 | * \brief Send a QCOP Message before suspending | 699 | * \brief Send a QCOP Message before suspending |
740 | * | 700 | * |
741 | * Sends a QCOP message to channel QPE/System | 701 | * Sends a QCOP message to channel QPE/System |
742 | * with the message "aboutToSuspend()" if this | 702 | * with the message "aboutToSuspend()" if this |
743 | * is the windowing server. | 703 | * is the windowing server. |
744 | * | 704 | * |
745 | * Call this in your custom \sa suspend() Method | 705 | * Call this in your custom \sa suspend() Method |
746 | * before going to suspend. | 706 | * before going to suspend. |
747 | * | 707 | * |
748 | */ | 708 | */ |
749 | void ODevice::sendSuspendmsg() | 709 | void ODevice::sendSuspendmsg() |
750 | { | 710 | { |
751 | if ( isQWS() ) | 711 | if ( isQWS() ) |
752 | return; | 712 | return; |
753 | 713 | ||
754 | QCopEnvelope ( "QPE/System", "aboutToSuspend()" ); | 714 | QCopEnvelope ( "QPE/System", "aboutToSuspend()" ); |
755 | } | 715 | } |
756 | 716 | ||
757 | /** | 717 | /** |
758 | * \brief Prepend the QWSServer::KeyboardFilter to the list of installed KeyFilters | 718 | * \brief Prepend the QWSServer::KeyboardFilter to the list of installed KeyFilters |
759 | * | 719 | * |
760 | * Prepend a QWSServer::KeyboardFilter to the List of Keyboard | 720 | * Prepend a QWSServer::KeyboardFilter to the List of Keyboard |
761 | * Filters. This function is the only way to prepend a KeyFilter. | 721 | * Filters. This function is the only way to prepend a KeyFilter. |
762 | * | 722 | * |
763 | * @param aFilter The KeyFilter to be prepended to the list of filters | 723 | * @param aFilter The KeyFilter to be prepended to the list of filters |
@@ -774,33 +734,33 @@ void ODevice::addPreHandler(QWSServer::KeyboardFilter*aFilter) | |||
774 | * \brief Remove the QWSServer::KeyboardFilter in the param from the list | 734 | * \brief Remove the QWSServer::KeyboardFilter in the param from the list |
775 | * | 735 | * |
776 | * Remove the QWSServer::KeyboardFilter \par aFilter from the List | 736 | * Remove the QWSServer::KeyboardFilter \par aFilter from the List |
777 | * of Keyfilters. Call this when you delete the KeyFilter! | 737 | * of Keyfilters. Call this when you delete the KeyFilter! |
778 | * | 738 | * |
779 | * @param aFilter The filter to be removed from the Opie::Core::OKeyFilter | 739 | * @param aFilter The filter to be removed from the Opie::Core::OKeyFilter |
780 | * @see Opie::Core::ODevice::addPreHandler | 740 | * @see Opie::Core::ODevice::addPreHandler |
781 | */ | 741 | */ |
782 | void ODevice::remPreHandler(QWSServer::KeyboardFilter*aFilter) | 742 | void ODevice::remPreHandler(QWSServer::KeyboardFilter*aFilter) |
783 | { | 743 | { |
784 | Opie::Core::OKeyFilter::inst()->remPreHandler(aFilter); | 744 | Opie::Core::OKeyFilter::inst()->remPreHandler(aFilter); |
785 | } | 745 | } |
786 | 746 | ||
787 | 747 | ||
788 | /** | 748 | /** |
789 | * @internal | 749 | * @internal |
790 | * | 750 | * |
791 | * @see changeMixerForAlarm | 751 | * @see changeMixerForAlarm |
792 | */ | 752 | */ |
793 | void ODevice::playingStopped() { | 753 | void ODevice::playingStopped() { |
794 | if ( sender() ) | 754 | if ( sender() ) |
795 | const_cast<QObject*>(sender())->disconnect( this ); | 755 | const_cast<QObject*>(sender())->disconnect( this ); |
796 | 756 | ||
797 | #ifndef QT_NO_SOUND | 757 | #ifndef QT_NO_SOUND |
798 | if ( d->m_sound >= 0 ) { | 758 | if ( d->m_sound >= 0 ) { |
799 | ::ioctl ( d->m_sound, MIXER_WRITE( d->m_mixer ), &d->m_vol ); | 759 | ::ioctl ( d->m_sound, MIXER_WRITE( d->m_mixer ), &d->m_vol ); |
800 | ::close ( d->m_sound ); | 760 | ::close ( d->m_sound ); |
801 | } | 761 | } |
802 | #endif | 762 | #endif |
803 | } | 763 | } |
804 | 764 | ||
805 | 765 | ||
806 | /** | 766 | /** |
@@ -816,39 +776,39 @@ void ODevice::playingStopped() { | |||
816 | * this Method and it will automatically restore the Mixer to | 776 | * this Method and it will automatically restore the Mixer to |
817 | * the user configuration after the sound finished playing. | 777 | * the user configuration after the sound finished playing. |
818 | * | 778 | * |
819 | * Note: The onwership of \param snd is not transfered and playing | 779 | * Note: The onwership of \param snd is not transfered and playing |
820 | * is not started in this method. If 'snd' gets deleted before | 780 | * is not started in this method. If 'snd' gets deleted before |
821 | * playing is finished the volume doesn't get set back to | 781 | * playing is finished the volume doesn't get set back to |
822 | * the user preference! | 782 | * the user preference! |
823 | * | 783 | * |
824 | * \code | 784 | * \code |
825 | * static Sound snd("alarm"); | 785 | * static Sound snd("alarm"); |
826 | * if(!snd.isFinished()) | 786 | * if(!snd.isFinished()) |
827 | * return; | 787 | * return; |
828 | * | 788 | * |
829 | * changeMixerForAlarm( my_channel, "/dev/mixer", &snd ); | 789 | * changeMixerForAlarm( my_channel, "/dev/mixer", &snd ); |
830 | * snd.play() | 790 | * snd.play() |
831 | * \endcode | 791 | * \endcode |
832 | * | 792 | * |
833 | * | 793 | * |
834 | * | 794 | * |
835 | * @param mixer The mixer number/channel to use | 795 | * @param mixer The mixer number/channel to use |
836 | * @param file The file name. If you convert from QString use QFile::encodeName | 796 | * @param file The file name. If you convert from QString use QFile::encodeName |
837 | * @param snd The sound to wait for finishing | 797 | * @param snd The sound to wait for finishing |
838 | * | 798 | * |
839 | */ | 799 | */ |
840 | void ODevice::changeMixerForAlarm( int mixer, const char* file, Sound *snd ) { | 800 | void ODevice::changeMixerForAlarm( int mixer, const char* file, Sound *snd ) { |
841 | #ifndef QT_NO_SOUND | 801 | #ifndef QT_NO_SOUND |
842 | if (( d->m_sound = ::open ( file, O_RDWR )) >= 0 ) { | 802 | if (( d->m_sound = ::open ( file, O_RDWR )) >= 0 ) { |
843 | if ( ::ioctl ( d->m_sound, MIXER_READ( mixer ), &d->m_vol ) >= 0 ) { | 803 | if ( ::ioctl ( d->m_sound, MIXER_READ( mixer ), &d->m_vol ) >= 0 ) { |
844 | Config cfg ( "qpe" ); | 804 | Config cfg ( "qpe" ); |
845 | cfg. setGroup ( "Volume" ); | 805 | cfg. setGroup ( "Volume" ); |
846 | 806 | ||
847 | int volalarm = cfg. readNumEntry ( "AlarmPercent", 50 ); | 807 | int volalarm = cfg. readNumEntry ( "AlarmPercent", 50 ); |
848 | if ( volalarm < 0 ) | 808 | if ( volalarm < 0 ) |
849 | volalarm = 0; | 809 | volalarm = 0; |
850 | else if ( volalarm > 100 ) | 810 | else if ( volalarm > 100 ) |
851 | volalarm = 100; | 811 | volalarm = 100; |
852 | volalarm |= ( volalarm << 8 ); | 812 | volalarm |= ( volalarm << 8 ); |
853 | 813 | ||
854 | if ( ::ioctl ( d->m_sound, MIXER_WRITE( mixer ), &volalarm ) >= 0 ) | 814 | if ( ::ioctl ( d->m_sound, MIXER_WRITE( mixer ), &volalarm ) >= 0 ) |
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp index 7377965..82e127e 100644 --- a/libopie2/opiecore/device/odevice_zaurus.cpp +++ b/libopie2/opiecore/device/odevice_zaurus.cpp | |||
@@ -89,44 +89,44 @@ struct z_button z_buttons_c700 [] = { | |||
89 | "devicebuttons/z_contact", | 89 | "devicebuttons/z_contact", |
90 | "addressbook", "raise()", | 90 | "addressbook", "raise()", |
91 | "addressbook", "beamBusinessCard()" }, | 91 | "addressbook", "beamBusinessCard()" }, |
92 | { Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), | 92 | { Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), |
93 | "devicebuttons/z_home", | 93 | "devicebuttons/z_home", |
94 | "QPE/Launcher", "home()", | 94 | "QPE/Launcher", "home()", |
95 | "buttonsettings", "raise()" }, | 95 | "buttonsettings", "raise()" }, |
96 | { Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), | 96 | { Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), |
97 | "devicebuttons/z_menu", | 97 | "devicebuttons/z_menu", |
98 | "QPE/TaskBar", "toggleMenu()", | 98 | "QPE/TaskBar", "toggleMenu()", |
99 | "QPE/TaskBar", "toggleStartMenu()" }, | 99 | "QPE/TaskBar", "toggleStartMenu()" }, |
100 | { Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"), | 100 | { Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"), |
101 | "devicebuttons/z_mail", | 101 | "devicebuttons/z_mail", |
102 | "opiemail", "raise()", | 102 | "opiemail", "raise()", |
103 | "opiemail", "newMail()" }, | 103 | "opiemail", "newMail()" }, |
104 | 104 | ||
105 | { Qt::Key_F15, QT_TRANSLATE_NOOP("Button", "Display Rotate"), | 105 | { Qt::Key_F15, QT_TRANSLATE_NOOP("Button", "Hinge1"), |
106 | "devicebuttons/z_hinge", | 106 | "devicebuttons/z_hinge1", |
107 | "QPE/Rotation", "rotateDefault()", | 107 | "QPE/Rotation", "rotateDefault()", |
108 | "QPE/Dummy", "doNothing()" }, | 108 | "QPE/Rotation", "rotateDefault()" }, |
109 | { Qt::Key_F16, QT_TRANSLATE_NOOP("Button", "Display Rotate"), | 109 | { Qt::Key_F16, QT_TRANSLATE_NOOP("Button", "Hinge2"), |
110 | "devicebuttons/z_hinge", | 110 | "devicebuttons/z_hinge2", |
111 | "QPE/Rotation", "rotateDefault()", | 111 | "QPE/Rotation", "rotateDefault()", |
112 | "QPE/Dummy", "doNothing()" }, | 112 | "QPE/Rotation", "rotateDefault()" }, |
113 | { Qt::Key_F17, QT_TRANSLATE_NOOP("Button", "Display Rotate"), | 113 | { Qt::Key_F17, QT_TRANSLATE_NOOP("Button", "Hinge3"), |
114 | "devicebuttons/z_hinge", | 114 | "devicebuttons/z_hinge3", |
115 | "QPE/Rotation", "rotateDefault()", | 115 | "QPE/Rotation", "rotateDefault()", |
116 | "QPE/Dummy", "doNothing()" }, | 116 | "QPE/Rotation", "rotateDefault()" }, |
117 | }; | 117 | }; |
118 | 118 | ||
119 | // FIXME This gets unnecessary complicated. We should think about splitting the Zaurus | 119 | // FIXME This gets unnecessary complicated. We should think about splitting the Zaurus |
120 | // class up into individual classes. We need three classes | 120 | // class up into individual classes. We need three classes |
121 | // | 121 | // |
122 | // Zaurus-Collie (SA-model w/ 320x240 lcd, for SL5500 and SL5000) | 122 | // Zaurus-Collie (SA-model w/ 320x240 lcd, for SL5500 and SL5000) |
123 | // Zaurus-Poodle (PXA-model w/ 320x240 lcd, for SL5600) | 123 | // Zaurus-Poodle (PXA-model w/ 320x240 lcd, for SL5600) |
124 | // Zaurus-Corgi (PXA-model w/ 640x480 lcd, for C700, C750, C760, C860, C3000) | 124 | // Zaurus-Corgi (PXA-model w/ 640x480 lcd, for C700, C750, C760, C860, C3000) |
125 | // Zaurus-Tosa (PXA-model w/ 480x640 lcd, for SL6000) | 125 | // Zaurus-Tosa (PXA-model w/ 480x640 lcd, for SL6000) |
126 | // | 126 | // |
127 | // Only question right now is: Do we really need to do it? Because as soon | 127 | // Only question right now is: Do we really need to do it? Because as soon |
128 | // as the OpenZaurus kernel is ready, there will be a unified interface for all | 128 | // as the OpenZaurus kernel is ready, there will be a unified interface for all |
129 | // Zaurus models (concerning apm, backlight, buttons, etc.) | 129 | // Zaurus models (concerning apm, backlight, buttons, etc.) |
130 | // | 130 | // |
131 | // Comments? - mickeyl. | 131 | // Comments? - mickeyl. |
132 | 132 | ||
@@ -475,33 +475,33 @@ bool Zaurus::setDisplayStatus( bool on ) | |||
475 | char buf[10]; | 475 | char buf[10]; |
476 | buf[0] = on ? FB_BLANK_UNBLANK : FB_BLANK_POWERDOWN; | 476 | buf[0] = on ? FB_BLANK_UNBLANK : FB_BLANK_POWERDOWN; |
477 | buf[1] = '\0'; | 477 | buf[1] = '\0'; |
478 | res = ( ::write( fd, &buf[0], 2 ) == 0 ); | 478 | res = ( ::write( fd, &buf[0], 2 ) == 0 ); |
479 | ::close( fd ); | 479 | ::close( fd ); |
480 | } | 480 | } |
481 | } | 481 | } |
482 | return res; | 482 | return res; |
483 | } | 483 | } |
484 | 484 | ||
485 | bool Zaurus::suspend() | 485 | bool Zaurus::suspend() |
486 | { | 486 | { |
487 | qDebug("ODevice::suspend"); | 487 | qDebug("ODevice::suspend"); |
488 | if ( !isQWS( ) ) // only qwsserver is allowed to suspend | 488 | if ( !isQWS( ) ) // only qwsserver is allowed to suspend |
489 | return false; | 489 | return false; |
490 | 490 | ||
491 | if ( d->m_model == Model_Unknown ) // better don't suspend in qvfb / on unkown devices | 491 | if ( d->m_model == Model_Unknown ) // better don't suspend on unknown devices |
492 | return false; | 492 | return false; |
493 | 493 | ||
494 | bool res = false; | 494 | bool res = false; |
495 | ODevice::sendSuspendmsg(); | 495 | ODevice::sendSuspendmsg(); |
496 | 496 | ||
497 | struct timeval tvs, tvn; | 497 | struct timeval tvs, tvn; |
498 | ::gettimeofday ( &tvs, 0 ); | 498 | ::gettimeofday ( &tvs, 0 ); |
499 | 499 | ||
500 | ::sync(); // flush fs caches | 500 | ::sync(); // flush fs caches |
501 | res = ( ::system ( "apm --suspend" ) == 0 ); | 501 | res = ( ::system ( "apm --suspend" ) == 0 ); |
502 | 502 | ||
503 | // This is needed because the apm implementation is asynchronous and we | 503 | // This is needed because the apm implementation is asynchronous and we |
504 | // can not be sure when exactly the device is really suspended | 504 | // can not be sure when exactly the device is really suspended |
505 | if ( res ) { | 505 | if ( res ) { |
506 | do { // Yes, wait 15 seconds. This APM sucks big time. | 506 | do { // Yes, wait 15 seconds. This APM sucks big time. |
507 | ::usleep ( 200 * 1000 ); | 507 | ::usleep ( 200 * 1000 ); |
@@ -521,33 +521,33 @@ Transformation Zaurus::rotation() const | |||
521 | 521 | ||
522 | switch ( d->m_model ) { | 522 | switch ( d->m_model ) { |
523 | case Model_Zaurus_SLC3000: // fallthrough | 523 | case Model_Zaurus_SLC3000: // fallthrough |
524 | case Model_Zaurus_SLC7x0: | 524 | case Model_Zaurus_SLC7x0: |
525 | { | 525 | { |
526 | OHingeStatus hs = readHingeSensor(); | 526 | OHingeStatus hs = readHingeSensor(); |
527 | qDebug( "Zaurus::rotation() - hinge sensor = %d", (int) hs ); | 527 | qDebug( "Zaurus::rotation() - hinge sensor = %d", (int) hs ); |
528 | 528 | ||
529 | if ( m_embedix ) | 529 | if ( m_embedix ) |
530 | { | 530 | { |
531 | if ( hs == CASE_PORTRAIT ) rot = Rot0; | 531 | if ( hs == CASE_PORTRAIT ) rot = Rot0; |
532 | else if ( hs == CASE_UNKNOWN ) rot = Rot0; | 532 | else if ( hs == CASE_UNKNOWN ) rot = Rot0; |
533 | else rot = Rot270; | 533 | else rot = Rot270; |
534 | } | 534 | } |
535 | else | 535 | else |
536 | { | 536 | { |
537 | if ( hs == CASE_PORTRAIT ) rot = Rot270; | 537 | if ( hs == CASE_PORTRAIT ) rot = Rot90; |
538 | else if ( hs == CASE_UNKNOWN ) rot = Rot0; | 538 | else if ( hs == CASE_UNKNOWN ) rot = Rot0; |
539 | else rot = Rot0; | 539 | else rot = Rot0; |
540 | } | 540 | } |
541 | } | 541 | } |
542 | break; | 542 | break; |
543 | case Model_Zaurus_SL6000: | 543 | case Model_Zaurus_SL6000: |
544 | case Model_Zaurus_SLB600: | 544 | case Model_Zaurus_SLB600: |
545 | case Model_Zaurus_SLA300: | 545 | case Model_Zaurus_SLA300: |
546 | case Model_Zaurus_SL5500: | 546 | case Model_Zaurus_SL5500: |
547 | case Model_Zaurus_SL5000: | 547 | case Model_Zaurus_SL5000: |
548 | default: | 548 | default: |
549 | rot = d->m_rotation; | 549 | rot = d->m_rotation; |
550 | break; | 550 | break; |
551 | } | 551 | } |
552 | 552 | ||
553 | return rot; | 553 | return rot; |