Browse Source

Everywhere: Rename back-click to backward-click

This matches the current forward-click terminology.
Filiph Sandström 3 years ago
parent
commit
c6247fe414

+ 1 - 1
Kernel/API/MousePacket.h

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

+ 1 - 1
Kernel/Devices/HID/PS2MouseDevice.cpp

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

+ 1 - 1
Userland/Demos/Mouse/main.cpp

@@ -92,7 +92,7 @@ public:
         if (m_buttons & GUI::MouseButton::Forward)
             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);
 
         if (m_show_scroll_wheel) {

+ 1 - 1
Userland/Libraries/LibGUI/Event.h

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

+ 1 - 1
Userland/Libraries/LibGUI/WindowServerConnection.cpp

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

+ 1 - 1
Userland/Services/WindowServer/Event.h

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

+ 1 - 1
Userland/Services/WindowServer/Screen.cpp

@@ -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::Secondary);
     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);
     if (m_cursor_location != prev_location) {
         auto message = make<MouseEvent>(Event::MouseMove, m_cursor_location, buttons, MouseButton::None, m_modifiers);

+ 4 - 4
Userland/Services/WindowServer/WindowManager.cpp

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

+ 2 - 2
Userland/Services/WindowServer/WindowManager.h

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