AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-16 11:06:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Treat middle mouse button as a key instead.

Browse Source 
This means you can rebind 'pick block' to another key, and then assign a hotkey to middle mouse
This commit is contained in:
UnknownShadow200 2019-08-29 18:34:21 +10:00
parent 11e44e9a6b
commit d82b40bb0b
6 changed files with 43 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Game.c
View File

@ -560,7 +560,7 @@ static void Game_Render3D(double delta, float t) {
Entities_RenderHoveredNames(delta); Entities_RenderHoveredNames(delta);
left = InputHandler_IsMousePressed(MOUSE_LEFT); left = InputHandler_IsMousePressed(MOUSE_LEFT);
middle = InputHandler_IsMousePressed(MOUSE_MIDDLE); middle = KeyBind_IsPressed(KEYBIND_PICK_BLOCK);
right = InputHandler_IsMousePressed(MOUSE_RIGHT); right = InputHandler_IsMousePressed(MOUSE_RIGHT);
InputHandler_PickBlocks(true, left, middle, right); InputHandler_PickBlocks(true, left, middle, right);

8
src/Input.c
View File

@ -42,7 +42,7 @@ const char* const Key_Names[KEY_COUNT] = {
"KeypadAdd", "KeypadDecimal", "KeypadEnter", "KeypadAdd", "KeypadDecimal", "KeypadEnter",
"Tilde", "Minus", "Plus", "BracketLeft", "BracketRight", "Slash", "Tilde", "Minus", "Plus", "BracketLeft", "BracketRight", "Slash",
"Semicolon", "Quote", "Comma", "Period", "BackSlash", "Semicolon", "Quote", "Comma", "Period", "BackSlash",
"XButton1", "XButton2", "XButton1", "XButton2", "MouseMid"
}; };
/* TODO: Should this only be shown in GUI? not saved to disc? */ /* TODO: Should this only be shown in GUI? not saved to disc? */
@ -64,7 +64,7 @@ const char* const Key_Names[KEY_COUNT] = {
"5", "6", "7", "8", "9", "5", "6", "7", "8", "9",
"GRAVE", "MINUS", "PLUS", "LBRACKET", "RBRACKET", "GRAVE", "MINUS", "PLUS", "LBRACKET", "RBRACKET",
"SEMICOLON", "APOSTROPHE", "COMMA", "PERIOD", "SLASH", "BACKSLASH", "SEMICOLON", "APOSTROPHE", "COMMA", "PERIOD", "SLASH", "BACKSLASH",
"XBUTTON1", "XBUTTON2", "XBUTTON1", "XBUTTON2", "MOUSEMID"
};*/ };*/
void Key_SetPressed(Key key, bool pressed) { void Key_SetPressed(Key key, bool pressed) {
@ -128,7 +128,7 @@ const cc_uint8 KeyBind_Defaults[KEYBIND_COUNT] = {
KEY_LSHIFT, 'X', 'Z', 'Q', 'E', KEY_LSHIFT, 'X', 'Z', 'Q', 'E',
KEY_LALT, KEY_F3, KEY_F12, KEY_F11, KEY_LALT, KEY_F3, KEY_F12, KEY_F11,
KEY_F5, KEY_F1, KEY_F7, 'C', KEY_F5, KEY_F1, KEY_F7, 'C',
KEY_LCTRL, 0, 0, 0, KEY_LCTRL, 0, KEY_MOUSEMID, 0,
KEY_F6, KEY_LALT, KEY_F8, KEY_F6, KEY_LALT, KEY_F8,
'G', KEY_F10, 0 'G', KEY_F10, 0
}; };
@ -139,7 +139,7 @@ static const char* const keybindNames[KEYBIND_COUNT] = {
"Speed", "NoClip", "Fly", "FlyUp", "FlyDown", "Speed", "NoClip", "Fly", "FlyUp", "FlyDown",
"ExtInput", "HideFPS", "Screenshot", "Fullscreen", "ExtInput", "HideFPS", "Screenshot", "Fullscreen",
"ThirdPerson", "HideGUI", "AxisLines", "ZoomScrolling", "ThirdPerson", "HideGUI", "AxisLines", "ZoomScrolling",
"HalfSpeed", "MouseLeft", "MouseMiddle", "MouseRight", "HalfSpeed", "MouseLeft", "PickBlock", "MouseRight",
"AutoRotate", "HotbarSwitching", "SmoothCamera", "AutoRotate", "HotbarSwitching", "SmoothCamera",
"DropBlock", "IDOverlay", "BreakableLiquids" "DropBlock", "IDOverlay", "BreakableLiquids"
}; };

4
src/Input.h
View File

@ -39,7 +39,7 @@ enum Key_ {
KEY_TILDE, KEY_MINUS, KEY_EQUALS, KEY_LBRACKET, KEY_RBRACKET, KEY_SLASH, KEY_TILDE, KEY_MINUS, KEY_EQUALS, KEY_LBRACKET, KEY_RBRACKET, KEY_SLASH,
KEY_SEMICOLON, KEY_QUOTE, KEY_COMMA, KEY_PERIOD, KEY_BACKSLASH, KEY_SEMICOLON, KEY_QUOTE, KEY_COMMA, KEY_PERIOD, KEY_BACKSLASH,
KEY_XBUTTON1, KEY_XBUTTON2, /* so these can be used for hotkeys */ KEY_XBUTTON1, KEY_XBUTTON2, KEY_MOUSEMID, /* so these can be used for hotkeys */
KEY_COUNT KEY_COUNT
}; };
typedef int Key; typedef int Key;
@ -100,7 +100,7 @@ enum KeyBind_ {
KEYBIND_SPEED, KEYBIND_NOCLIP, KEYBIND_FLY, KEYBIND_FLY_UP, KEYBIND_FLY_DOWN, KEYBIND_SPEED, KEYBIND_NOCLIP, KEYBIND_FLY, KEYBIND_FLY_UP, KEYBIND_FLY_DOWN,
KEYBIND_EXT_INPUT, KEYBIND_HIDE_FPS, KEYBIND_SCREENSHOT, KEYBIND_FULLSCREEN, KEYBIND_EXT_INPUT, KEYBIND_HIDE_FPS, KEYBIND_SCREENSHOT, KEYBIND_FULLSCREEN,
KEYBIND_THIRD_PERSON, KEYBIND_HIDE_GUI, KEYBIND_AXIS_LINES, KEYBIND_ZOOM_SCROLL, KEYBIND_THIRD_PERSON, KEYBIND_HIDE_GUI, KEYBIND_AXIS_LINES, KEYBIND_ZOOM_SCROLL,
KEYBIND_HALF_SPEED, KEYBIND_MOUSE_LEFT, KEYBIND_MOUSE_MIDDLE, KEYBIND_MOUSE_RIGHT, KEYBIND_HALF_SPEED, KEYBIND_MOUSE_LEFT, KEYBIND_PICK_BLOCK, KEYBIND_MOUSE_RIGHT,
KEYBIND_AUTOROTATE, KEYBIND_HOTBAR_SWITCH, KEYBIND_SMOOTH_CAMERA, KEYBIND_AUTOROTATE, KEYBIND_HOTBAR_SWITCH, KEYBIND_SMOOTH_CAMERA,
KEYBIND_DROP_BLOCK, KEYBIND_IDOVERLAY, KEYBIND_BREAK_LIQUIDS, KEYBIND_DROP_BLOCK, KEYBIND_IDOVERLAY, KEYBIND_BREAK_LIQUIDS,
KEYBIND_COUNT KEYBIND_COUNT

11
src/InputHandler.c
View File

@ -35,7 +35,6 @@ bool InputHandler_IsMousePressed(MouseButton button) {
/* Key --> mouse mappings */ /* Key --> mouse mappings */
if (button == MOUSE_LEFT && KeyBind_IsPressed(KEYBIND_MOUSE_LEFT)) return true; if (button == MOUSE_LEFT && KeyBind_IsPressed(KEYBIND_MOUSE_LEFT)) return true;
if (button == MOUSE_MIDDLE && KeyBind_IsPressed(KEYBIND_MOUSE_MIDDLE)) return true;
if (button == MOUSE_RIGHT && KeyBind_IsPressed(KEYBIND_MOUSE_RIGHT)) return true; if (button == MOUSE_RIGHT && KeyBind_IsPressed(KEYBIND_MOUSE_RIGHT)) return true;
return false; return false;
} }
@ -201,6 +200,8 @@ static bool InputHandler_HandleCoreKey(Key key) {
} else { } else {
InputHandler_CycleDistanceForwards(viewDists, count); InputHandler_CycleDistanceForwards(viewDists, count);
} }
} else if (key == KeyBinds[KEYBIND_PICK_BLOCK]) {
InputHandler_PickBlocks(false, false, true, false);
} else if (key == KEY_F5 && Game_ClassicMode) { } else if (key == KEY_F5 && Game_ClassicMode) {
int weather = Env.Weather == WEATHER_SUNNY ? WEATHER_RAINY : WEATHER_SUNNY; int weather = Env.Weather == WEATHER_SUNNY ? WEATHER_RAINY : WEATHER_SUNNY;
Env_SetWeather(weather); Env_SetWeather(weather);
@ -408,8 +409,7 @@ static void InputHandler_MouseDown(void* obj, int btn) {
} }
} }
InputHandler_PickBlocks(false, btn == MOUSE_LEFT, InputHandler_PickBlocks(false, btn == MOUSE_LEFT, false, btn == MOUSE_RIGHT);
btn == MOUSE_MIDDLE, btn == MOUSE_RIGHT);
} }
static void InputHandler_MouseUp(void* obj, int btn) { static void InputHandler_MouseUp(void* obj, int btn) {
@ -429,12 +429,11 @@ static void InputHandler_MouseUp(void* obj, int btn) {
static bool InputHandler_SimulateMouse(Key key, bool pressed) { static bool InputHandler_SimulateMouse(Key key, bool pressed) {
Key left = KeyBinds[KEYBIND_MOUSE_LEFT]; Key left = KeyBinds[KEYBIND_MOUSE_LEFT];
Key middle = KeyBinds[KEYBIND_MOUSE_MIDDLE];
Key right = KeyBinds[KEYBIND_MOUSE_RIGHT]; Key right = KeyBinds[KEYBIND_MOUSE_RIGHT];
MouseButton btn; MouseButton btn;
if (!(key == left || key == middle || key == right)) return false; if (!(key == left || key == right)) return false;
btn = key == left ? MOUSE_LEFT : key == middle ? MOUSE_MIDDLE : MOUSE_RIGHT; btn = key == left ? MOUSE_LEFT : MOUSE_RIGHT;
if (pressed) { InputHandler_MouseDown(NULL, btn); } if (pressed) { InputHandler_MouseDown(NULL, btn); }
else { InputHandler_MouseUp(NULL, btn); } else { InputHandler_MouseUp(NULL, btn); }
return true; return true;

4
src/Menus.c
View File

@ -1758,8 +1758,8 @@ static void MouseKeyBindingsScreen_Init(struct KeyBindingsScreen* s) {
} }
void MouseKeyBindingsScreen_Show(void) { void MouseKeyBindingsScreen_Show(void) {
static const cc_uint8 binds[3] = { KEYBIND_MOUSE_LEFT, KEYBIND_MOUSE_MIDDLE, KEYBIND_MOUSE_RIGHT }; static const cc_uint8 binds[3] = { KEYBIND_MOUSE_LEFT, KEYBIND_PICK_BLOCK, KEYBIND_MOUSE_RIGHT };
static const char* descs[3] = { "Left", "Middle", "Right" }; static const char* descs[3] = { "Left", "Pick block", "Right" };
KeyBindingsScreen_Show(Array_Elems(binds), binds, descs, MouseKeyBindingsScreen_Init); KeyBindingsScreen_Show(Array_Elems(binds), binds, descs, MouseKeyBindingsScreen_Init);
} }

60
src/Window.c
View File

@ -268,7 +268,7 @@ static LRESULT CALLBACK Window_Procedure(HWND handle, UINT message, WPARAM wPara
/* Set before position change, in case mouse buttons changed when outside window */ /* Set before position change, in case mouse buttons changed when outside window */
Mouse_SetPressed(MOUSE_LEFT, (wParam & 0x01) != 0); Mouse_SetPressed(MOUSE_LEFT, (wParam & 0x01) != 0);
Mouse_SetPressed(MOUSE_RIGHT, (wParam & 0x02) != 0); Mouse_SetPressed(MOUSE_RIGHT, (wParam & 0x02) != 0);
Mouse_SetPressed(MOUSE_MIDDLE, (wParam & 0x10) != 0); Key_SetPressed(KEY_MOUSEMID, (wParam & 0x10) != 0);
/* TODO: do we need to set XBUTTON1/XBUTTON2 here */ /* TODO: do we need to set XBUTTON1/XBUTTON2 here */
Mouse_SetPosition(LOWORD(lParam), HIWORD(lParam)); Mouse_SetPosition(LOWORD(lParam), HIWORD(lParam));
break; break;
@ -279,21 +279,21 @@ static LRESULT CALLBACK Window_Procedure(HWND handle, UINT message, WPARAM wPara
return 0; return 0;
case WM_LBUTTONDOWN: case WM_LBUTTONDOWN:
Mouse_SetPressed(MOUSE_LEFT, true); break; Mouse_SetPressed(MOUSE_LEFT, true); break;
case WM_MBUTTONDOWN: case WM_MBUTTONDOWN:
Mouse_SetPressed(MOUSE_MIDDLE, true); break; Key_SetPressed(KEY_MOUSEMID, true); break;
case WM_RBUTTONDOWN: case WM_RBUTTONDOWN:
Mouse_SetPressed(MOUSE_RIGHT, true); break; Mouse_SetPressed(MOUSE_RIGHT, true); break;
case WM_XBUTTONDOWN: case WM_XBUTTONDOWN:
Key_SetPressed(HIWORD(wParam) == 1 ? KEY_XBUTTON1 : KEY_XBUTTON2, true); Key_SetPressed(HIWORD(wParam) == 1 ? KEY_XBUTTON1 : KEY_XBUTTON2, true);
break; break;
case WM_LBUTTONUP: case WM_LBUTTONUP:
Mouse_SetPressed(MOUSE_LEFT, false); break; Mouse_SetPressed(MOUSE_LEFT, false); break;
case WM_MBUTTONUP: case WM_MBUTTONUP:
Mouse_SetPressed(MOUSE_MIDDLE, false); break; Key_SetPressed(KEY_MOUSEMID, false); break;
case WM_RBUTTONUP: case WM_RBUTTONUP:
Mouse_SetPressed(MOUSE_RIGHT, false); break; Mouse_SetPressed(MOUSE_RIGHT, false); break;
case WM_XBUTTONUP: case WM_XBUTTONUP:
Key_SetPressed(HIWORD(wParam) == 1 ? KEY_XBUTTON1 : KEY_XBUTTON2, false); Key_SetPressed(HIWORD(wParam) == 1 ? KEY_XBUTTON1 : KEY_XBUTTON2, false);
break; break;
@ -1096,21 +1096,21 @@ void Window_ProcessEvents(void) {
break; break;
case ButtonPress: case ButtonPress:
if (e.xbutton.button == 1) Mouse_SetPressed(MOUSE_LEFT, true); if (e.xbutton.button == 1) Mouse_SetPressed(MOUSE_LEFT, true);
else if (e.xbutton.button == 2) Mouse_SetPressed(MOUSE_MIDDLE, true); else if (e.xbutton.button == 2) Key_SetPressed(KEY_MOUSEMID, true);
else if (e.xbutton.button == 3) Mouse_SetPressed(MOUSE_RIGHT, true); else if (e.xbutton.button == 3) Mouse_SetPressed(MOUSE_RIGHT, true);
else if (e.xbutton.button == 4) Mouse_SetWheel(Mouse_Wheel + 1); else if (e.xbutton.button == 4) Mouse_SetWheel(Mouse_Wheel + 1);
else if (e.xbutton.button == 5) Mouse_SetWheel(Mouse_Wheel - 1); else if (e.xbutton.button == 5) Mouse_SetWheel(Mouse_Wheel - 1);
else if (e.xbutton.button == 6) Key_SetPressed(KEY_XBUTTON1, true); else if (e.xbutton.button == 6) Key_SetPressed(KEY_XBUTTON1, true);
else if (e.xbutton.button == 7) Key_SetPressed(KEY_XBUTTON2, true); else if (e.xbutton.button == 7) Key_SetPressed(KEY_XBUTTON2, true);
break; break;
case ButtonRelease: case ButtonRelease:
if (e.xbutton.button == 1) Mouse_SetPressed(MOUSE_LEFT, false); if (e.xbutton.button == 1) Mouse_SetPressed(MOUSE_LEFT, false);
else if (e.xbutton.button == 2) Mouse_SetPressed(MOUSE_MIDDLE, false); else if (e.xbutton.button == 2) Key_SetPressed(KEY_MOUSEMID, false);
else if (e.xbutton.button == 3) Mouse_SetPressed(MOUSE_RIGHT, false); else if (e.xbutton.button == 3) Mouse_SetPressed(MOUSE_RIGHT, false);
else if (e.xbutton.button == 6) Key_SetPressed(KEY_XBUTTON1, false); else if (e.xbutton.button == 6) Key_SetPressed(KEY_XBUTTON1, false);
else if (e.xbutton.button == 7) Key_SetPressed(KEY_XBUTTON2, false); else if (e.xbutton.button == 7) Key_SetPressed(KEY_XBUTTON2, false);
break; break;
case MotionNotify: case MotionNotify:
@ -1657,11 +1657,11 @@ static OSStatus Window_ProcessMouseEvent(EventRef inEvent) {
switch (button) { switch (button) {
case kEventMouseButtonPrimary: case kEventMouseButtonPrimary:
Mouse_SetPressed(MOUSE_LEFT, down); break; Mouse_SetPressed(MOUSE_LEFT, down); break;
case kEventMouseButtonSecondary: case kEventMouseButtonSecondary:
Mouse_SetPressed(MOUSE_RIGHT, down); break; Mouse_SetPressed(MOUSE_RIGHT, down); break;
case kEventMouseButtonTertiary: case kEventMouseButtonTertiary:
Mouse_SetPressed(MOUSE_MIDDLE, down); break; Key_SetPressed(KEY_MOUSEMID, down); break;
} }
return eventNotHandledErr; return eventNotHandledErr;
@ -2224,15 +2224,15 @@ static void Window_HandleMouseEvent(const SDL_Event* e) {
bool pressed = e->button.state == SDL_PRESSED; bool pressed = e->button.state == SDL_PRESSED;
switch (e->button.button) { switch (e->button.button) {
case SDL_BUTTON_LEFT: case SDL_BUTTON_LEFT:
Mouse_SetPressed(MOUSE_LEFT, pressed); break; Mouse_SetPressed(MOUSE_LEFT, pressed); break;
case SDL_BUTTON_MIDDLE: case SDL_BUTTON_MIDDLE:
Mouse_SetPressed(MOUSE_MIDDLE, pressed); break; Key_SetPressed(KEY_MOUSEMID, pressed); break;
case SDL_BUTTON_RIGHT: case SDL_BUTTON_RIGHT:
Mouse_SetPressed(MOUSE_RIGHT, pressed); break; Mouse_SetPressed(MOUSE_RIGHT, pressed); break;
case SDL_BUTTON_X1: case SDL_BUTTON_X1:
Key_SetPressed(KEY_XBUTTON1, pressed); break; Key_SetPressed(KEY_XBUTTON1, pressed); break;
case SDL_BUTTON_X2: case SDL_BUTTON_X2:
Key_SetPressed(KEY_XBUTTON2, pressed); break; Key_SetPressed(KEY_XBUTTON2, pressed); break;
} }
} }
@ -2403,16 +2403,14 @@ static EM_BOOL Window_MouseWheel(int type, const EmscriptenWheelEvent* ev, void*
} }
static EM_BOOL Window_MouseButton(int type, const EmscriptenMouseEvent* ev, void* data) { static EM_BOOL Window_MouseButton(int type, const EmscriptenMouseEvent* ev, void* data) {
MouseButton btn; bool down = type == EMSCRIPTEN_EVENT_MOUSEDOWN;
Window_CorrectFocus(); Window_CorrectFocus();
switch (ev->button) { switch (ev->button) {
case 0: btn = MOUSE_LEFT; break; case 0: Mouse_SetPressed(MOUSE_LEFT, down); break;
case 1: btn = MOUSE_MIDDLE; break; case 1: Input_SetPressed(KEY_MOUSEMID, down); break;
case 2: btn = MOUSE_RIGHT; break; case 2: Mouse_SetPressed(MOUSE_RIGHT, down); break;
default: return false;
} }
Mouse_SetPressed(btn, type == EMSCRIPTEN_EVENT_MOUSEDOWN);
return true; return true;
} }
@ -2420,7 +2418,7 @@ static EM_BOOL Window_MouseMove(int type, const EmscriptenMouseEvent* ev, void*
/* Set before position change, in case mouse buttons changed when outside window */ /* Set before position change, in case mouse buttons changed when outside window */
Mouse_SetPressed(MOUSE_LEFT, (ev->buttons & 0x01) != 0); Mouse_SetPressed(MOUSE_LEFT, (ev->buttons & 0x01) != 0);
Mouse_SetPressed(MOUSE_RIGHT, (ev->buttons & 0x02) != 0); Mouse_SetPressed(MOUSE_RIGHT, (ev->buttons & 0x02) != 0);
Mouse_SetPressed(MOUSE_MIDDLE, (ev->buttons & 0x04) != 0); Input_SetPressed(KEY_MOUSEMID, (ev->buttons & 0x04) != 0);
Mouse_SetPosition(ev->canvasX, ev->canvasY); Mouse_SetPosition(ev->canvasX, ev->canvasY);
if (win_rawMouse) Event_RaiseMouseMove(&MouseEvents.RawMoved, ev->movementX, ev->movementY); if (win_rawMouse) Event_RaiseMouseMove(&MouseEvents.RawMoved, ev->movementX, ev->movementY);