summaryrefslogtreecommitdiff
authorkorovkin <korovkin>2006-12-13 19:31:16 (UTC)
committer korovkin <korovkin>2006-12-13 19:31:16 (UTC)
commit5a0012fb3b75ff41437b0685386731d1367e4e7b (patch) (unidiff)
tree39aaca04066159ed4c97a4ffae521d938d013780
parenta691909050b60b94f5525093062c23d0fab11d1b (diff)
downloadopie-5a0012fb3b75ff41437b0685386731d1367e4e7b.zip
opie-5a0012fb3b75ff41437b0685386731d1367e4e7b.tar.gz
opie-5a0012fb3b75ff41437b0685386731d1367e4e7b.tar.bz2
Committed patch provided by Paul Solkolovsky which combines all
the 2.6 based PDAs togeter. Thank you Paul!
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice_ipaq.cpp77
-rw-r--r--libopie2/opiecore/device/odevice_mypal.cpp17
2 files changed, 43 insertions, 51 deletions
diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp
index 00939bf..16ecc27 100644
--- a/libopie2/opiecore/device/odevice_ipaq.cpp
+++ b/libopie2/opiecore/device/odevice_ipaq.cpp
@@ -84,76 +84,68 @@ typedef struct {
84#define LED_ON OD_IOW( 'f', 5, LED_IN ) 84#define LED_ON OD_IOW( 'f', 5, LED_IN )
85#define FLITE_ON OD_IOW( 'f', 7, FLITE_IN ) 85#define FLITE_ON OD_IOW( 'f', 7, FLITE_IN )
86 86
87#define Model_Keyboardless_2_6 (Model_iPAQ_H191x | Model_iPAQ_H22xx | Model_iPAQ_HX4700 | Model_iPAQ_H4xxx)
88
87struct i_button ipaq_buttons [] = { 89struct i_button ipaq_buttons [] = {
88 { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx | Model_iPAQ_H191x | Model_iPAQ_H22xx | Model_iPAQ_HX4700 | Model_iPAQ_H4xxx, 90
91 // Common button map for all keyboardless devices with 2.6 kernel
92 { Model_Keyboardless_2_6,
89 Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"), 93 Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"),
90 "devicebuttons/ipaq_calendar", 94 "devicebuttons/ipaq_calendar",
91 "datebook", "nextView()", 95 "datebook", "nextView()",
92 "today", "raise()" }, 96 "today", "raise()" },
93 { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx | Model_iPAQ_H191x | Model_iPAQ_H22xx | Model_iPAQ_HX4700 | Model_iPAQ_H4xxx, 97 { Model_Keyboardless_2_6,
94 Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"), 98 Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"),
95 "devicebuttons/ipaq_contact", 99 "devicebuttons/ipaq_contact",
96 "addressbook", "raise()", 100 "addressbook", "raise()",
97 "addressbook", "beamBusinessCard()" }, 101 "addressbook", "beamBusinessCard()" },
98 { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx, 102 { Model_Keyboardless_2_6,
99 Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), 103 Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Mail Button"),
100 "devicebuttons/ipaq_menu",
101 "QPE/TaskBar", "toggleMenu()",
102 "QPE/TaskBar", "toggleStartMenu()" },
103 { Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx,
104 Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"),
105 "devicebuttons/ipaq_mail", 104 "devicebuttons/ipaq_mail",
106 "opiemail", "raise()", 105 "opiemail", "raise()",
107 "opiemail", "newMail()" }, 106 "opiemail", "newMail()" },
108 { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx | Model_iPAQ_H191x | Model_iPAQ_H4xxx, 107 { Model_Keyboardless_2_6,
109 Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), 108 Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"),
110 "devicebuttons/ipaq_home", 109 "devicebuttons/ipaq_home",
111 "QPE/Launcher", "home()", 110 "QPE/Launcher", "home()",
112 "buttonsettings", "raise()" }, 111 "buttonsettings", "raise()" },
113 { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, 112 { Model_Keyboardless_2_6,
114 Qt::Key_F24, QT_TRANSLATE_NOOP("Button", "Record Button"), 113 Qt::Key_F24, QT_TRANSLATE_NOOP("Button", "Record Button"),
115 "devicebuttons/ipaq_record", 114 "devicebuttons/ipaq_record",
116 "QPE/VMemo", "toggleRecord()", 115 "QPE/VMemo", "toggleRecord()",
117 "sound", "raise()" }, 116 "sound", "raise()" },
118 117
119 { Model_iPAQ_H191x | Model_iPAQ_H4xxx, 118 // Devices with 2.4 kernel
120 Qt::Key_F8, QT_TRANSLATE_NOOP("Button", "Mail Button"), 119 { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx,
121 "devicebuttons/ipaq_mail", 120 Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"),
122 "opiemail", "raise()", 121 "devicebuttons/ipaq_calendar",
123 "opiemail", "newMail()" }, 122 "datebook", "nextView()",
124 { Model_iPAQ_H191x | Model_iPAQ_H4xxx, 123 "today", "raise()" },
125 Qt::Key_F7, QT_TRANSLATE_NOOP("Button", "Record Button"), 124 { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx,
126 "devicebuttons/ipaq_record", 125 Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"),
127 "QPE/VMemo", "toggleRecord()", 126 "devicebuttons/ipaq_contact",
128 "sound", "raise()" }, 127 "addressbook", "raise()",
129 128 "addressbook", "beamBusinessCard()" },
130 //h2200 has different button mapping 129 { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx,
131 { Model_iPAQ_H22xx, 130 Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"),
132 Qt::Key_NumLock, QT_TRANSLATE_NOOP("Button", "Mail Button"),
133 "devicebuttons/ipaq_mail",
134 "opiemail", "raise()",
135 "opiemail", "newMail()" },
136 { Model_iPAQ_H22xx,
137 Qt::Key_ScrollLock, QT_TRANSLATE_NOOP("Button", "Menu Button"),
138 "devicebuttons/ipaq_menu", 131 "devicebuttons/ipaq_menu",
139 "QPE/TaskBar", "toggleMenu()", 132 "QPE/TaskBar", "toggleMenu()",
140 "QPE/TaskBar", "toggleStartMenu()" }, 133 "QPE/TaskBar", "toggleStartMenu()" },
141 // and hx4700 has different button mapping still 134 { Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx,
142 { Model_iPAQ_HX4700, 135 Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"),
143 Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Mail Button"),
144 "devicebuttons/ipaq_mail", 136 "devicebuttons/ipaq_mail",
145 "opiemail", "raise()", 137 "opiemail", "raise()",
146 "opiemail", "newMail()" }, 138 "opiemail", "newMail()" },
147 { Model_iPAQ_HX4700, 139 { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx,
148 Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Record Button"), 140 Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"),
149 "devicebuttons/ipaq_record",
150 "QPE/VMemo", "toggleRecord()",
151 "sound", "raise()" },
152 { Model_iPAQ_HX4700,
153 Qt::Key_Home, QT_TRANSLATE_NOOP("Button", "Home Button"),
154 "devicebuttons/ipaq_home", 141 "devicebuttons/ipaq_home",
155 "QPE/Launcher", "home()", 142 "QPE/Launcher", "home()",
156 "buttonsettings", "raise()" }, 143 "buttonsettings", "raise()" },
144 { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx,
145 Qt::Key_F24, QT_TRANSLATE_NOOP("Button", "Record Button"),
146 "devicebuttons/ipaq_record",
147 "QPE/VMemo", "toggleRecord()",
148 "sound", "raise()" },
157 149
158}; 150};
159 151
@@ -346,11 +338,8 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b
346 break; 338 break;
347 } 339 }
348 340
349 // map Power Button short/long press to F6 for h191x
350 case Key_F6:
351 if ( d->m_model != Model_iPAQ_H191x && d->m_model != Model_iPAQ_H4xxx )
352 break;
353 // map Power Button short/long press to F34/F35 341 // map Power Button short/long press to F34/F35
342 case HardKey_Suspend: // Hope we don't have infinite recursion here
354 case Key_SysReq: { 343 case Key_SysReq: {
355 if ( isPress ) { 344 if ( isPress ) {
356 if ( m_power_timer ) 345 if ( m_power_timer )
diff --git a/libopie2/opiecore/device/odevice_mypal.cpp b/libopie2/opiecore/device/odevice_mypal.cpp
index 7eb8d1d..208be46 100644
--- a/libopie2/opiecore/device/odevice_mypal.cpp
+++ b/libopie2/opiecore/device/odevice_mypal.cpp
@@ -60,29 +60,32 @@
60using namespace Opie::Core; 60using namespace Opie::Core;
61using namespace Opie::Core::Internal; 61using namespace Opie::Core::Internal;
62 62
63#define Model_Keyboardless_2_6 (Model_MyPal_716)
64
63struct m_button mypal_buttons [] = { 65struct m_button mypal_buttons [] = {
64 { Model_MyPal_716, 66 // Common button map for all keyboardless devices with 2.6 kernel
67 { Model_Keyboardless_2_6,
65 Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"), 68 Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"),
66 "devicebuttons/ipaq_calendar", 69 "devicebuttons/ipaq_calendar",
67 "datebook", "nextView()", 70 "datebook", "nextView()",
68 "today", "raise()" }, 71 "today", "raise()" },
69 { Model_MyPal_716, 72 { Model_Keyboardless_2_6,
70 Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"), 73 Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"),
71 "devicebuttons/ipaq_contact", 74 "devicebuttons/ipaq_contact",
72 "addressbook", "raise()", 75 "addressbook", "raise()",
73 "addressbook", "beamBusinessCard()" }, 76 "addressbook", "beamBusinessCard()" },
74 { Model_MyPal_716, 77 { Model_Keyboardless_2_6,
75 Qt::Key_F8, QT_TRANSLATE_NOOP("Button", "Mail Button"), 78 Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Mail Button"),
76 "devicebuttons/ipaq_mail", 79 "devicebuttons/ipaq_mail",
77 "opiemail", "raise()", 80 "opiemail", "raise()",
78 "opiemail", "newMail()" }, 81 "opiemail", "newMail()" },
79 { Model_MyPal_716, 82 { Model_Keyboardless_2_6,
80 Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), 83 Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"),
81 "devicebuttons/ipaq_home", 84 "devicebuttons/ipaq_home",
82 "QPE/Launcher", "home()", 85 "QPE/Launcher", "home()",
83 "buttonsettings", "raise()" }, 86 "buttonsettings", "raise()" },
84 { Model_MyPal_716, 87 { Model_Keyboardless_2_6,
85 Qt::Key_F7, QT_TRANSLATE_NOOP("Button", "Record Button"), 88 Qt::Key_F24, QT_TRANSLATE_NOOP("Button", "Record Button"),
86 "devicebuttons/ipaq_record", 89 "devicebuttons/ipaq_record",
87 "QPE/VMemo", "toggleRecord()", 90 "QPE/VMemo", "toggleRecord()",
88 "sound", "raise()" }, 91 "sound", "raise()" },