summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMavridis Philippe <[email protected]>2023-12-01 21:20:22 +0200
committerMavridis Philippe <[email protected]>2023-12-16 18:18:14 +0200
commitaec0061106cfff96bb21499850c863b0054ecb5f (patch)
treecb9b6cdf7414490066b5d7ec1cc573656837e9ed
parent6e5c7efaca8c387084817cf1bea6459f5b4e03c2 (diff)
downloadtqt3-aec0061106cfff96bb21499850c863b0054ecb5f.tar.gz
tqt3-aec0061106cfff96bb21499850c863b0054ecb5f.zip
Add support for HistoryBackButton and HistoryForwardButton
This resolves TDE/tdebase#421. Signed-off-by: Mavridis Philippe <[email protected]>
-rw-r--r--src/kernel/ntqnamespace.h24
-rw-r--r--src/kernel/qapplication_x11.cpp4
-rw-r--r--src/kernel/qevent.cpp5
3 files changed, 21 insertions, 12 deletions
diff --git a/src/kernel/ntqnamespace.h b/src/kernel/ntqnamespace.h
index b044494b1..a8261be23 100644
--- a/src/kernel/ntqnamespace.h
+++ b/src/kernel/ntqnamespace.h
@@ -74,17 +74,19 @@ public:
// documented in qevent.cpp
enum ButtonState { // mouse/keyboard state values
- NoButton = 0x0000,
- LeftButton = 0x0001,
- RightButton = 0x0002,
- MidButton = 0x0004,
- MouseButtonMask = 0x0007,
- ShiftButton = 0x0100,
- ControlButton = 0x0200,
- AltButton = 0x0400,
- MetaButton = 0x0800,
- KeyButtonMask = 0x0f00,
- Keypad = 0x4000
+ NoButton = 0x0000,
+ LeftButton = 0x0001,
+ RightButton = 0x0002,
+ MidButton = 0x0004,
+ HistoryBackButton = 0x0008,
+ HistoryForwardButton = 0x0010,
+ MouseButtonMask = 0x001f,
+ ShiftButton = 0x0100,
+ ControlButton = 0x0200,
+ AltButton = 0x0400,
+ MetaButton = 0x0800,
+ KeyButtonMask = 0x0f00,
+ Keypad = 0x4000
};
// documented in qobject.cpp
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index de2c62d27..ef52e5a32 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -4228,6 +4228,10 @@ bool TQETWidget::translateMouseEvent( const XEvent *event )
translateWheelEvent( globalPos.x(), globalPos.y(), delta, state, (hor)?Horizontal:Vertical );
}
return TRUE;
+
+ // history navigation buttons
+ case 8: button = HistoryBackButton; break;
+ case 9: button = HistoryForwardButton; break;
}
if ( event->type == ButtonPress ) { // mouse button pressed
#if defined(Q_OS_IRIX) && defined(QT_TABLET_SUPPORT)
diff --git a/src/kernel/qevent.cpp b/src/kernel/qevent.cpp
index 3a4af436f..36f59c53f 100644
--- a/src/kernel/qevent.cpp
+++ b/src/kernel/qevent.cpp
@@ -91,6 +91,8 @@
the right button on left-handed mice.)
\value RightButton the right button.
\value MidButton the middle button.
+ \value HistoryBackButton history navigation back button.
+ \value HistoryForwardButton history navigation forward button.
\value ShiftButton a Shift key on the keyboard is also pressed.
\value ControlButton a Ctrl key on the keyboard is also pressed.
\value AltButton an Alt key on the keyboard is also pressed.
@@ -98,7 +100,8 @@
\value Keypad a keypad button is pressed.
\value KeyButtonMask a mask for ShiftButton, ControlButton,
AltButton and MetaButton.
- \value MouseButtonMask a mask for LeftButton, RightButton and MidButton.
+ \value MouseButtonMask a mask for LeftButton, RightButton, MidButton,
+ HistoryBackButton and HistoryForwardButton.
*/
/*!