i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Actually handle more than 3 mouse buttons

Browse Source 
The code in input_server was pretty much all set for this, but there was
no way to configure the extra buttons. Add them to the mouse view in
Input preferences (up to 5 buttons are handled now)

Define a new B_MOUSE_BUTTON(n) macro to generate the bitmask for a given
button (numbered from 1).

Change-Id: I9091082277937d89b08464ff474e7bbb5db82401
Reviewed-on: https://review.haiku-os.org/c/haiku/+/180
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Adrien Destugues
2020-04-18 18:20:37 +00:00
committed by waddlesplash
parent 6ae1da352b
commit 5bbf7f1be0
8 changed files with 122 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/View.h
+16 -12
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2001-2019 Haiku, Inc. All rights reserved.
* Copyright 2001-2020 Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _VIEW_H
@@ -16,10 +16,13 @@
// mouse button
#define B_MOUSE_BUTTON(n) (1 << ((n) - 1))
// Legacy BeOS R5 mouse button definitions
enum {
B_PRIMARY_MOUSE_BUTTON = 0x01,
B_SECONDARY_MOUSE_BUTTON = 0x02,
B_TERTIARY_MOUSE_BUTTON = 0x04
B_PRIMARY_MOUSE_BUTTON = B_MOUSE_BUTTON(1),
B_SECONDARY_MOUSE_BUTTON = B_MOUSE_BUTTON(2),
B_TERTIARY_MOUSE_BUTTON = B_MOUSE_BUTTON(3)
};
// mouse transit
@@ -41,10 +44,11 @@ enum {
B_LOCK_WINDOW_FOCUS = 0x00000001,
B_SUSPEND_VIEW_FOCUS = 0x00000002,
B_NO_POINTER_HISTORY = 0x00000004,
// NOTE: New in Haiku (unless this flag is
// specified, both BWindow and BView::GetMouse()
// will filter out older mouse moved messages)
// NOTE: This is the default behavior in Haiku, unlike in BeOS
B_FULL_POINTER_HISTORY = 0x00000008
// NOTE: New in Haiku (unless this flag is
// specified, both BWindow and BView::GetMouse()
// will filter out older mouse moved messages)
};
enum {
@@ -76,11 +80,11 @@ const uint32 B_FRAME_EVENTS = 0x04000000UL; /* 26 */
const uint32 B_NAVIGABLE = 0x02000000UL; /* 25 */
const uint32 B_SUBPIXEL_PRECISE = 0x01000000UL; /* 24 */
const uint32 B_DRAW_ON_CHILDREN = 0x00800000UL; /* 23 */
const uint32 B_INPUT_METHOD_AWARE = 0x00400000UL; /* 23 */
const uint32 B_SCROLL_VIEW_AWARE = 0x00200000UL; /* 22 */
const uint32 B_SUPPORTS_LAYOUT = 0x00100000UL; /* 21 */
const uint32 B_INVALIDATE_AFTER_LAYOUT = 0x00080000UL; /* 20 */
const uint32 B_TRANSPARENT_BACKGROUND = 0x00040000UL; /* 19 */
const uint32 B_INPUT_METHOD_AWARE = 0x00400000UL; /* 22 */
const uint32 B_SCROLL_VIEW_AWARE = 0x00200000UL; /* 21 */
const uint32 B_SUPPORTS_LAYOUT = 0x00100000UL; /* 20 */
const uint32 B_INVALIDATE_AFTER_LAYOUT = 0x00080000UL; /* 19 */
const uint32 B_TRANSPARENT_BACKGROUND = 0x00040000UL; /* 18 */
#define _RESIZE_MASK_ (0xffff)