RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-23 13:17:36 +00:00
Code Issues Activity Actions

Everywhere: Rename back-click to backward-click

Browse source 
This matches the current forward-click terminology.
This commit is contained in:
Filiph Sandström 2021-10-27 18:49:04 +02:00 • committed by Idan Horowitz
parent d6a0726302
commit c6247fe414
9 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/API/MousePacket.h
View file

@ -17,7 +17,7 @@ struct MousePacket {
LeftButton = 0x01, LeftButton = 0x01,
RightButton = 0x02, RightButton = 0x02,
MiddleButton = 0x04, MiddleButton = 0x04,
BackButton = 0x08, BackwardButton = 0x08,
ForwardButton = 0x10, ForwardButton = 0x10,
}; };

2
Kernel/Devices/HID/PS2MouseDevice.cpp
View file

@ -118,7 +118,7 @@ MousePacket PS2MouseDevice::parse_data_packet(const RawPacket& raw_packet)
if (m_has_five_buttons) { if (m_has_five_buttons) {
if (raw_packet.bytes[3] & 0x10) if (raw_packet.bytes[3] & 0x10)
packet.buttons |= MousePacket::BackButton; packet.buttons |= MousePacket::BackwardButton;
if (raw_packet.bytes[3] & 0x20) if (raw_packet.bytes[3] & 0x20)
packet.buttons |= MousePacket::ForwardButton; packet.buttons |= MousePacket::ForwardButton;
} }

2
Userland/Demos/Mouse/main.cpp
View file

@ -92,7 +92,7 @@ public:
if (m_buttons & GUI::MouseButton::Forward) if (m_buttons & GUI::MouseButton::Forward)
painter.fill_rect({ 26, 44, 4, 16 }, Color::Blue); painter.fill_rect({ 26, 44, 4, 16 }, Color::Blue);
if (m_buttons & GUI::MouseButton::Back) if (m_buttons & GUI::MouseButton::Backward)
painter.fill_rect({ 26, 71, 4, 16 }, Color::Blue); painter.fill_rect({ 26, 71, 4, 16 }, Color::Blue);
if (m_show_scroll_wheel) { if (m_show_scroll_wheel) {

2
Userland/Libraries/LibGUI/Event.h
View file

@ -314,7 +314,7 @@ enum MouseButton : u8 {
Primary = 1, Primary = 1,
Secondary = 2, Secondary = 2,
Middle = 4, Middle = 4,
Back = 8, Backward = 8,
Forward = 16, Forward = 16,
}; };

2
Userland/Libraries/LibGUI/WindowServerConnection.cpp
View file

@ -218,7 +218,7 @@ static MouseButton to_mouse_button(u32 button)
case 4: case 4:
return MouseButton::Middle; return MouseButton::Middle;
case 8: case 8:
return MouseButton::Back; return MouseButton::Backward;
case 16: case 16:
return MouseButton::Forward; return MouseButton::Forward;
default: default:

2
Userland/Services/WindowServer/Event.h
View file

@ -53,7 +53,7 @@ enum class MouseButton : u8 {
Primary = 1, Primary = 1,
Secondary = 2, Secondary = 2,
Middle = 4, Middle = 4,
Back = 8, Backward = 8,
Forward = 16, Forward = 16,
}; };

2
Userland/Services/WindowServer/Screen.cpp
View file

@ -452,7 +452,7 @@ void ScreenInput::on_receive_mouse_data(const MousePacket& packet)
post_mousedown_or_mouseup_if_needed(MouseButton::Primary); post_mousedown_or_mouseup_if_needed(MouseButton::Primary);
post_mousedown_or_mouseup_if_needed(MouseButton::Secondary); post_mousedown_or_mouseup_if_needed(MouseButton::Secondary);
post_mousedown_or_mouseup_if_needed(MouseButton::Middle); post_mousedown_or_mouseup_if_needed(MouseButton::Middle);
post_mousedown_or_mouseup_if_needed(MouseButton::Back); post_mousedown_or_mouseup_if_needed(MouseButton::Backward);
post_mousedown_or_mouseup_if_needed(MouseButton::Forward); post_mousedown_or_mouseup_if_needed(MouseButton::Forward);
if (m_cursor_location != prev_location) { if (m_cursor_location != prev_location) {
auto message = make<MouseEvent>(Event::MouseMove, m_cursor_location, buttons, MouseButton::None, m_modifiers); auto message = make<MouseEvent>(Event::MouseMove, m_cursor_location, buttons, MouseButton::None, m_modifiers);

8
Userland/Services/WindowServer/WindowManager.cpp
View file

@ -995,8 +995,8 @@ auto WindowManager::DoubleClickInfo::metadata_for_button(MouseButton button) con
return m_secondary; return m_secondary;
case MouseButton::Middle: case MouseButton::Middle:
return m_middle; return m_middle;
case MouseButton::Back: case MouseButton::Backward:
return m_back; return m_backward;
case MouseButton::Forward: case MouseButton::Forward:
return m_forward; return m_forward;
default: default:
@ -1013,8 +1013,8 @@ auto WindowManager::DoubleClickInfo::metadata_for_button(MouseButton button) ->
return m_secondary; return m_secondary;
case MouseButton::Middle: case MouseButton::Middle:
return m_middle; return m_middle;
case MouseButton::Back: case MouseButton::Backward:
return m_back; return m_backward;
case MouseButton::Forward: case MouseButton::Forward:
return m_forward; return m_forward;
default: default:

4
Userland/Services/WindowServer/WindowManager.h
View file

@ -391,7 +391,7 @@ private:
m_primary = {}; m_primary = {};
m_secondary = {}; m_secondary = {};
m_middle = {}; m_middle = {};
m_back = {}; m_backward = {};
m_forward = {}; m_forward = {};
} }
@ -401,7 +401,7 @@ private:
ClickMetadata m_primary; ClickMetadata m_primary;
ClickMetadata m_secondary; ClickMetadata m_secondary;
ClickMetadata m_middle; ClickMetadata m_middle;
ClickMetadata m_back; ClickMetadata m_backward;
ClickMetadata m_forward; ClickMetadata m_forward;
}; };