opie-taskbar: c7x0 w/ w100 acceleration needs a special suspend/resume script

4 files changed, 49 insertions, 3 deletions

diff --git a/packages/opie-taskbar/opie-taskbar.inc b/packages/opie-taskbar/opie-taskbar.inc
index 6ca4e12d78..3f6c8bca2e 100644
--- a/packages/opie-taskbar/opie-taskbar.inc
+++ b/packages/opie-taskbar/opie-taskbar.inc
@@ -86,6 +86,15 @@ do_install() {
 
         install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}${palmtopdir}/pics/
         install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}${palmtopdir}/pics/
+
+	case ${MACHINE} in
+	c7x0)
+		install -d ${D}${sysconfdir}/apm/event.d/
+		install -m 0755 ${WORKDIR}/qpe-suspend-resume ${D}${sysconfdir}/apm/event.d/00-qpe-suspend-resume.sh
+                ;;
+        *)
+                ;;
+        esac	
 }
 
 updatercd_postinst_mnci() {
@@ -97,6 +106,6 @@ fi
 update-rc.d $D ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS}
 }
 
-FILES_opie-taskbar_append = " /etc ${palmtopdir}/apps ${palmtopdir}/pics"
+FILES_opie-taskbar_append = " ${sysconfdir} ${palmtopdir}/apps ${palmtopdir}/pics"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/qpe-suspend-resume b/packages/opie-taskbar/opie-taskbar/c7x0/qpe-suspend-resume
new file mode 100644
index 0000000000..be37519512
--- /dev/null
+++ b/packages/opie-taskbar/opie-taskbar/c7x0/qpe-suspend-resume
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+QTDIR=/opt/QtPalmtop
+LD_LIBRARY_PATH=$QTDIR
+export LD_LIBRARY_PATH QTDIR
+LOGGING=0
+log() {
+  if [ $LOGGING -eq 1 ]; then
+    echo "$(date +%y/%m/%d-%H:%m:%S): $@" >> /var/log/qte.log
+  fi
+}
+
+retcode=1
+tries=3
+
+if [ "$1" = suspend ]; then
+    while [ $retcode -ne 0 -a $tries -gt 0 ]; do
+      log "-> $QTDIR/bin/qcop QPE/System 'aboutToSuspend()'"
+      $QTDIR/bin/qcop QPE/System 'aboutToSuspend()'
+      retcode=$?
+      tries=`expr $tries - 1`
+      log "<- Result $retcode"
+    done
+elif [ "$1" = resume ]; then
+    while [ $retcode -ne 0 -a $tries -gt 0 ]; do
+      log "-> $QTDIR/bin/qcop QPE/System 'returnFromSuspend()'"
+      $QTDIR/bin/qcop QPE/System 'returnFromSuspend()'
+      retcode=$?
+      tries=`expr $tries - 1`
+      log "<- Result $retcode"
+    done
+fi
+
diff --git a/packages/opie-taskbar/opie-taskbar_1.2.1.bb b/packages/opie-taskbar/opie-taskbar_1.2.1.bb
index 359ea213ec..662db8ee93 100644
--- a/packages/opie-taskbar/opie-taskbar_1.2.1.bb
+++ b/packages/opie-taskbar/opie-taskbar_1.2.1.bb
@@ -1,5 +1,5 @@
 include ${PN}.inc
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
@@ -15,3 +15,5 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
            file://qpe.conf \
 	   file://locale.conf \
 	   file://opie_defaults"
+
+SRC_URI_append_c7x0 = " file://qpe-suspend-resume"
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index f1874cf82a..69ee9ab7a6 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -1,6 +1,6 @@
 include ${PN}.inc
 PV = "${OPIE_CVS_PV}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
@@ -16,3 +16,5 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            file://qpe.conf \
            file://locale.conf \
            file://opie_defaults"
+
+SRC_URI_append_c7x0 = " file://qpe-suspend-resume"