Removed unnecessary parts of input processing
This commit is contained in:
parent
0e732bea40
commit
057484e119
7 changed files with 54 additions and 115 deletions
|
|
@ -443,9 +443,6 @@ void DrawingProgram::modify_grid(const NetworkingObjects::NetObjWeakPtr<WorldGri
|
||||||
void DrawingProgram::update() {
|
void DrawingProgram::update() {
|
||||||
controls.cursorHoveringOverCanvas = world.main.toolbar.check_if_position_isnt_obstructed(world.main.input.mouse.pos);
|
controls.cursorHoveringOverCanvas = world.main.toolbar.check_if_position_isnt_obstructed(world.main.input.mouse.pos);
|
||||||
|
|
||||||
controls.previousMouseWorldPos = controls.currentMouseWorldPos;
|
|
||||||
controls.currentMouseWorldPos = world.get_mouse_world_pos();
|
|
||||||
|
|
||||||
if(addFileInNextFrame) {
|
if(addFileInNextFrame) {
|
||||||
add_file_to_canvas_by_path_execute(addFileInfo.first, addFileInfo.second);
|
add_file_to_canvas_by_path_execute(addFileInfo.first, addFileInfo.second);
|
||||||
addFileInNextFrame = false;
|
addFileInNextFrame = false;
|
||||||
|
|
@ -454,9 +451,6 @@ void DrawingProgram::update() {
|
||||||
selection.update();
|
selection.update();
|
||||||
drawTool->tool_update();
|
drawTool->tool_update();
|
||||||
|
|
||||||
if(controls.leftClickReleased)
|
|
||||||
controls.leftClickReleased = false;
|
|
||||||
|
|
||||||
update_downloading_dropped_files();
|
update_downloading_dropped_files();
|
||||||
check_updateable_components();
|
check_updateable_components();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -107,14 +107,8 @@ class DrawingProgram {
|
||||||
struct GlobalControls {
|
struct GlobalControls {
|
||||||
std::optional<WorldScalar> lockedCameraScale;
|
std::optional<WorldScalar> lockedCameraScale;
|
||||||
|
|
||||||
WorldVec previousMouseWorldPos = {0, 0};
|
|
||||||
WorldVec currentMouseWorldPos = {0, 0};
|
|
||||||
bool leftClick = false;
|
|
||||||
bool leftClickHeld = false;
|
bool leftClickHeld = false;
|
||||||
bool leftClickReleased = false;
|
|
||||||
bool middleClick = false;
|
|
||||||
bool middleClickHeld = false;
|
bool middleClickHeld = false;
|
||||||
bool middleClickReleased = false;
|
|
||||||
bool cursorHoveringOverCanvas = false;
|
bool cursorHoveringOverCanvas = false;
|
||||||
|
|
||||||
DrawingProgramLayerManager::LayerSelector layerSelector = DrawingProgramLayerManager::LayerSelector::LAYER_BEING_EDITED;
|
DrawingProgramLayerManager::LayerSelector layerSelector = DrawingProgramLayerManager::LayerSelector::LAYER_BEING_EDITED;
|
||||||
|
|
|
||||||
|
|
@ -77,19 +77,20 @@ void GridModifyTool::input_mouse_motion_callback(const InputManager::MouseMotion
|
||||||
NetworkingObjects::NetObjTemporaryPtr<WorldGrid> gLock = grid.lock();
|
NetworkingObjects::NetObjTemporaryPtr<WorldGrid> gLock = grid.lock();
|
||||||
if(gLock) {
|
if(gLock) {
|
||||||
WorldGrid& g = *gLock;
|
WorldGrid& g = *gLock;
|
||||||
|
auto mouseWorldPos = drawP.world.drawData.cam.c.from_space(motion.pos);
|
||||||
switch(selectionMode) {
|
switch(selectionMode) {
|
||||||
case 0:
|
case 0:
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
g.offset = drawP.world.get_mouse_world_pos();
|
g.offset = mouseWorldPos;
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
g.size = std::max(FixedPoint::abs(drawP.world.get_mouse_world_pos().x() - g.offset.x()), WorldScalar(1));
|
g.size = std::max(FixedPoint::abs(mouseWorldPos.x() - g.offset.x()), WorldScalar(1));
|
||||||
break;
|
break;
|
||||||
case 3:
|
case 3:
|
||||||
if(g.bounds.has_value()) {
|
if(g.bounds.has_value()) {
|
||||||
auto& b = g.bounds.value();
|
auto& b = g.bounds.value();
|
||||||
b.min = cwise_vec_min(drawP.world.get_mouse_world_pos(), b.max);
|
b.min = cwise_vec_min(mouseWorldPos, b.max);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
selectionMode = 0;
|
selectionMode = 0;
|
||||||
|
|
@ -97,7 +98,7 @@ void GridModifyTool::input_mouse_motion_callback(const InputManager::MouseMotion
|
||||||
case 4:
|
case 4:
|
||||||
if(g.bounds.has_value()) {
|
if(g.bounds.has_value()) {
|
||||||
auto& b = g.bounds.value();
|
auto& b = g.bounds.value();
|
||||||
b.max = cwise_vec_max(drawP.world.get_mouse_world_pos(), b.min);
|
b.max = cwise_vec_max(mouseWorldPos, b.min);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
selectionMode = 0;
|
selectionMode = 0;
|
||||||
|
|
@ -191,7 +192,8 @@ void GridModifyTool::draw(SkCanvas* canvas, const DrawData& drawData) {
|
||||||
}
|
}
|
||||||
if(selectionMode == 0 || selectionMode == 2) {
|
if(selectionMode == 0 || selectionMode == 2) {
|
||||||
Vector2f gSizeScreenPos;
|
Vector2f gSizeScreenPos;
|
||||||
if(drawP.world.get_mouse_world_pos().x() < g.offset.x() && selectionMode == 2)
|
auto mouseWorldPos = drawP.world.drawData.cam.c.from_space(drawData.main->input.mouse.pos);
|
||||||
|
if(mouseWorldPos.x() < g.offset.x() && selectionMode == 2)
|
||||||
gSizeScreenPos = drawData.cam.c.to_space(g.offset - WorldVec{g.size, 0});
|
gSizeScreenPos = drawData.cam.c.to_space(g.offset - WorldVec{g.size, 0});
|
||||||
else
|
else
|
||||||
gSizeScreenPos = drawData.cam.c.to_space(g.offset + WorldVec{g.size, 0});
|
gSizeScreenPos = drawData.cam.c.to_space(g.offset + WorldVec{g.size, 0});
|
||||||
|
|
|
||||||
|
|
@ -361,12 +361,6 @@ const InputManager::KeyData& InputManager::key(KeyCode kCode) {
|
||||||
|
|
||||||
void InputManager::set_key_down(const SDL_KeyboardEvent& e, KeyCode kCode) {
|
void InputManager::set_key_down(const SDL_KeyboardEvent& e, KeyCode kCode) {
|
||||||
auto& k = keys[kCode];
|
auto& k = keys[kCode];
|
||||||
if(!k.held || (std::chrono::steady_clock::now() - k.lastPressTime) > std::chrono::milliseconds(500)) // Timer works around some systems that emit a keypress twice (a repeat and a press event)
|
|
||||||
k.repeat = true;
|
|
||||||
if(!k.held) { // We use if statements instead of setting booleans so that values arent forced to false
|
|
||||||
k.pressed = true;
|
|
||||||
k.lastPressTime = std::chrono::steady_clock::now();
|
|
||||||
}
|
|
||||||
k.held = true;
|
k.held = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -435,18 +429,13 @@ void InputManager::backend_mouse_button_down_update(const SDL_MouseButtonEvent&
|
||||||
Vector2f mousePos = {e.x * main.window.density, e.y * main.window.density};
|
Vector2f mousePos = {e.x * main.window.density, e.y * main.window.density};
|
||||||
mouse.set_pos(mousePos);
|
mouse.set_pos(mousePos);
|
||||||
|
|
||||||
if(e.button == 1) {
|
if(e.button == 1)
|
||||||
mouse.leftDown = true;
|
mouse.leftDown = true;
|
||||||
mouse.leftClicks = e.clicks;
|
else if(e.button == 2)
|
||||||
}
|
|
||||||
else if(e.button == 2) {
|
|
||||||
mouse.middleDown = true;
|
mouse.middleDown = true;
|
||||||
mouse.middleClicks = e.clicks;
|
else if(e.button == 3)
|
||||||
}
|
|
||||||
else if(e.button == 3) {
|
|
||||||
mouse.rightDown = true;
|
mouse.rightDown = true;
|
||||||
mouse.rightClicks = e.clicks;
|
|
||||||
}
|
|
||||||
MouseButtonCallbackArgs args{
|
MouseButtonCallbackArgs args{
|
||||||
.deviceType = MouseDeviceType::MOUSE,
|
.deviceType = MouseDeviceType::MOUSE,
|
||||||
.button = static_cast<MouseButton>(e.button),
|
.button = static_cast<MouseButton>(e.button),
|
||||||
|
|
@ -477,8 +466,6 @@ void InputManager::backend_mouse_wheel_update(const SDL_MouseWheelEvent& e) {
|
||||||
Vector2f mouseNewPos = {e.mouse_x * main.window.density, e.mouse_y * main.window.density};
|
Vector2f mouseNewPos = {e.mouse_x * main.window.density, e.mouse_y * main.window.density};
|
||||||
mouse.set_pos(mouseNewPos);
|
mouse.set_pos(mouseNewPos);
|
||||||
|
|
||||||
mouse.scrollAmount.x() += e.x;
|
|
||||||
mouse.scrollAmount.y() += e.y;
|
|
||||||
main.input_mouse_wheel_callback({
|
main.input_mouse_wheel_callback({
|
||||||
.mousePos = mouseNewPos,
|
.mousePos = mouseNewPos,
|
||||||
.amount = {e.x, e.y},
|
.amount = {e.x, e.y},
|
||||||
|
|
@ -494,7 +481,6 @@ void InputManager::backend_pen_button_down_update(const SDL_PenButtonEvent& e) {
|
||||||
|
|
||||||
pen.previousPos = mouseNewPos;
|
pen.previousPos = mouseNewPos;
|
||||||
pen.buttons[e.button].held = true;
|
pen.buttons[e.button].held = true;
|
||||||
pen.buttons[e.button].pressed = true;
|
|
||||||
pen.isEraser = e.pen_state & SDL_PEN_INPUT_ERASER_TIP;
|
pen.isEraser = e.pen_state & SDL_PEN_INPUT_ERASER_TIP;
|
||||||
|
|
||||||
if(e.button == main.toolbar.tabletOptions.middleClickButton) {
|
if(e.button == main.toolbar.tabletOptions.middleClickButton) {
|
||||||
|
|
@ -571,7 +557,6 @@ void InputManager::backend_pen_touch_down_update(const SDL_PenTouchEvent& e) {
|
||||||
if((std::chrono::steady_clock::now() - pen.lastPenLeftClickTime) > std::chrono::milliseconds(300))
|
if((std::chrono::steady_clock::now() - pen.lastPenLeftClickTime) > std::chrono::milliseconds(300))
|
||||||
pen.leftClicksSaved = 0;
|
pen.leftClicksSaved = 0;
|
||||||
pen.leftClicksSaved++;
|
pen.leftClicksSaved++;
|
||||||
mouse.leftClicks = pen.leftClicksSaved;
|
|
||||||
pen.lastPenLeftClickTime = std::chrono::steady_clock::now();
|
pen.lastPenLeftClickTime = std::chrono::steady_clock::now();
|
||||||
pen.isEraser = e.eraser;
|
pen.isEraser = e.eraser;
|
||||||
|
|
||||||
|
|
@ -579,7 +564,7 @@ void InputManager::backend_pen_touch_down_update(const SDL_PenTouchEvent& e) {
|
||||||
.deviceType = MouseDeviceType::PEN,
|
.deviceType = MouseDeviceType::PEN,
|
||||||
.button = MouseButton::LEFT,
|
.button = MouseButton::LEFT,
|
||||||
.down = e.down,
|
.down = e.down,
|
||||||
.clicks = mouse.leftClicks,
|
.clicks = pen.leftClicksSaved,
|
||||||
.pos = mouseNewPos
|
.pos = mouseNewPos
|
||||||
});
|
});
|
||||||
main.input_pen_touch_callback({
|
main.input_pen_touch_callback({
|
||||||
|
|
@ -680,13 +665,12 @@ void InputManager::touch_finger_do_mouse_down() {
|
||||||
touch.leftClicksSaved = 0;
|
touch.leftClicksSaved = 0;
|
||||||
touch.leftClicksSaved++;
|
touch.leftClicksSaved++;
|
||||||
touch.lastLeftClickTime = std::chrono::steady_clock::now();
|
touch.lastLeftClickTime = std::chrono::steady_clock::now();
|
||||||
mouse.leftClicks = touch.leftClicksSaved;
|
|
||||||
|
|
||||||
main.input_mouse_button_callback({
|
main.input_mouse_button_callback({
|
||||||
.deviceType = MouseDeviceType::TOUCH,
|
.deviceType = MouseDeviceType::TOUCH,
|
||||||
.button = MouseButton::LEFT,
|
.button = MouseButton::LEFT,
|
||||||
.down = true,
|
.down = true,
|
||||||
.clicks = mouse.leftClicks,
|
.clicks = touch.leftClicksSaved,
|
||||||
.pos = mouseNewPos
|
.pos = mouseNewPos
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -871,46 +855,46 @@ void InputManager::backend_key_down_update(const SDL_KeyboardEvent& e) {
|
||||||
switch(kPress) {
|
switch(kPress) {
|
||||||
case SDLK_UP:
|
case SDLK_UP:
|
||||||
set_key_down(e, KEY_TEXT_UP);
|
set_key_down(e, KEY_TEXT_UP);
|
||||||
if(textBox && key(KEY_TEXT_UP).repeat)
|
if(textBox)
|
||||||
textBox->process_key_input(*cursor, RichText::TextBox::InputKey::UP, ctrl_or_meta_held(), key(KEY_GENERIC_LSHIFT).held, modMap);
|
textBox->process_key_input(*cursor, RichText::TextBox::InputKey::UP, ctrl_or_meta_held(), key(KEY_GENERIC_LSHIFT).held, modMap);
|
||||||
break;
|
break;
|
||||||
case SDLK_DOWN:
|
case SDLK_DOWN:
|
||||||
set_key_down(e, KEY_TEXT_DOWN);
|
set_key_down(e, KEY_TEXT_DOWN);
|
||||||
if(textBox && key(KEY_TEXT_DOWN).repeat)
|
if(textBox)
|
||||||
textBox->process_key_input(*cursor, RichText::TextBox::InputKey::DOWN, ctrl_or_meta_held(), key(KEY_GENERIC_LSHIFT).held, modMap);
|
textBox->process_key_input(*cursor, RichText::TextBox::InputKey::DOWN, ctrl_or_meta_held(), key(KEY_GENERIC_LSHIFT).held, modMap);
|
||||||
break;
|
break;
|
||||||
case SDLK_LEFT:
|
case SDLK_LEFT:
|
||||||
set_key_down(e, KEY_TEXT_LEFT);
|
set_key_down(e, KEY_TEXT_LEFT);
|
||||||
if(textBox && key(KEY_TEXT_LEFT).repeat)
|
if(textBox)
|
||||||
textBox->process_key_input(*cursor, RichText::TextBox::InputKey::LEFT, ctrl_or_meta_held(), key(KEY_GENERIC_LSHIFT).held, modMap);
|
textBox->process_key_input(*cursor, RichText::TextBox::InputKey::LEFT, ctrl_or_meta_held(), key(KEY_GENERIC_LSHIFT).held, modMap);
|
||||||
break;
|
break;
|
||||||
case SDLK_RIGHT:
|
case SDLK_RIGHT:
|
||||||
set_key_down(e, KEY_TEXT_RIGHT);
|
set_key_down(e, KEY_TEXT_RIGHT);
|
||||||
if(textBox && key(KEY_TEXT_RIGHT).repeat)
|
if(textBox)
|
||||||
textBox->process_key_input(*cursor, RichText::TextBox::InputKey::RIGHT, ctrl_or_meta_held(), key(KEY_GENERIC_LSHIFT).held, modMap);
|
textBox->process_key_input(*cursor, RichText::TextBox::InputKey::RIGHT, ctrl_or_meta_held(), key(KEY_GENERIC_LSHIFT).held, modMap);
|
||||||
break;
|
break;
|
||||||
case SDLK_BACKSPACE:
|
case SDLK_BACKSPACE:
|
||||||
set_key_down(e, KEY_TEXT_BACKSPACE);
|
set_key_down(e, KEY_TEXT_BACKSPACE);
|
||||||
if(textBox && key(KEY_TEXT_BACKSPACE).repeat)
|
if(textBox)
|
||||||
text.do_textbox_operation_with_undo([&]() {
|
text.do_textbox_operation_with_undo([&]() {
|
||||||
textBox->process_key_input(*cursor, RichText::TextBox::InputKey::BACKSPACE, ctrl_or_meta_held(), key(KEY_GENERIC_LSHIFT).held, modMap);
|
textBox->process_key_input(*cursor, RichText::TextBox::InputKey::BACKSPACE, ctrl_or_meta_held(), key(KEY_GENERIC_LSHIFT).held, modMap);
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
case SDLK_DELETE:
|
case SDLK_DELETE:
|
||||||
set_key_down(e, KEY_TEXT_DELETE);
|
set_key_down(e, KEY_TEXT_DELETE);
|
||||||
if(textBox && key(KEY_TEXT_DELETE).repeat)
|
if(textBox)
|
||||||
text.do_textbox_operation_with_undo([&]() {
|
text.do_textbox_operation_with_undo([&]() {
|
||||||
textBox->process_key_input(*cursor, RichText::TextBox::InputKey::DEL, ctrl_or_meta_held(), key(KEY_GENERIC_LSHIFT).held, modMap);
|
textBox->process_key_input(*cursor, RichText::TextBox::InputKey::DEL, ctrl_or_meta_held(), key(KEY_GENERIC_LSHIFT).held, modMap);
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
case SDLK_HOME:
|
case SDLK_HOME:
|
||||||
set_key_down(e, KEY_TEXT_HOME);
|
set_key_down(e, KEY_TEXT_HOME);
|
||||||
if(textBox && key(KEY_TEXT_HOME).repeat)
|
if(textBox)
|
||||||
textBox->process_key_input(*cursor, RichText::TextBox::InputKey::HOME, ctrl_or_meta_held(), key(KEY_GENERIC_LSHIFT).held, modMap);
|
textBox->process_key_input(*cursor, RichText::TextBox::InputKey::HOME, ctrl_or_meta_held(), key(KEY_GENERIC_LSHIFT).held, modMap);
|
||||||
break;
|
break;
|
||||||
case SDLK_END:
|
case SDLK_END:
|
||||||
set_key_down(e, KEY_TEXT_END);
|
set_key_down(e, KEY_TEXT_END);
|
||||||
if(textBox && key(KEY_TEXT_END).repeat)
|
if(textBox)
|
||||||
textBox->process_key_input(*cursor, RichText::TextBox::InputKey::END, ctrl_or_meta_held(), key(KEY_GENERIC_LSHIFT).held, modMap);
|
textBox->process_key_input(*cursor, RichText::TextBox::InputKey::END, ctrl_or_meta_held(), key(KEY_GENERIC_LSHIFT).held, modMap);
|
||||||
break;
|
break;
|
||||||
case SDLK_LSHIFT:
|
case SDLK_LSHIFT:
|
||||||
|
|
@ -930,48 +914,54 @@ void InputManager::backend_key_down_update(const SDL_KeyboardEvent& e) {
|
||||||
break;
|
break;
|
||||||
case SDLK_C:
|
case SDLK_C:
|
||||||
// Use either Ctrl or Meta (command for Mac) keys. We do either instead of checking, since checking can get complicated on Emscripten
|
// Use either Ctrl or Meta (command for Mac) keys. We do either instead of checking, since checking can get complicated on Emscripten
|
||||||
if((kMod & SDL_KMOD_GUI) || (kMod & SDL_KMOD_CTRL))
|
if((kMod & SDL_KMOD_GUI) || (kMod & SDL_KMOD_CTRL)) {
|
||||||
set_key_down(e, KEY_TEXT_COPY);
|
set_key_down(e, KEY_TEXT_COPY);
|
||||||
if(textBox && key(KEY_TEXT_COPY).repeat)
|
if(textBox)
|
||||||
set_clipboard_plain_and_richtext_pair(textBox->process_copy(*cursor));
|
set_clipboard_plain_and_richtext_pair(textBox->process_copy(*cursor));
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case SDLK_X:
|
case SDLK_X:
|
||||||
if((kMod & SDL_KMOD_GUI) || (kMod & SDL_KMOD_CTRL))
|
if((kMod & SDL_KMOD_GUI) || (kMod & SDL_KMOD_CTRL)) {
|
||||||
set_key_down(e, KEY_TEXT_CUT);
|
set_key_down(e, KEY_TEXT_CUT);
|
||||||
if(textBox && key(KEY_TEXT_CUT).repeat)
|
if(textBox)
|
||||||
text.do_textbox_operation_with_undo([&]() {
|
text.do_textbox_operation_with_undo([&]() {
|
||||||
set_clipboard_plain_and_richtext_pair(textBox->process_cut(*cursor));
|
set_clipboard_plain_and_richtext_pair(textBox->process_cut(*cursor));
|
||||||
});
|
});
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case SDLK_V:
|
case SDLK_V:
|
||||||
if((kMod & SDL_KMOD_GUI) || (kMod & SDL_KMOD_CTRL))
|
if((kMod & SDL_KMOD_GUI) || (kMod & SDL_KMOD_CTRL)) {
|
||||||
set_key_down(e, KEY_TEXT_PASTE);
|
set_key_down(e, KEY_TEXT_PASTE);
|
||||||
if(textBox && key(KEY_TEXT_PASTE).repeat)
|
if(textBox)
|
||||||
text.do_textbox_operation_with_undo([&]() {
|
text.do_textbox_operation_with_undo([&]() {
|
||||||
call_text_paste(true);
|
call_text_paste(true);
|
||||||
});
|
});
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case SDLK_A:
|
case SDLK_A:
|
||||||
if((kMod & SDL_KMOD_GUI) || (kMod & SDL_KMOD_CTRL))
|
if((kMod & SDL_KMOD_GUI) || (kMod & SDL_KMOD_CTRL)) {
|
||||||
set_key_down(e, KEY_TEXT_SELECTALL);
|
set_key_down(e, KEY_TEXT_SELECTALL);
|
||||||
if(textBox && key(KEY_TEXT_SELECTALL).repeat)
|
if(textBox)
|
||||||
textBox->process_key_input(*cursor, RichText::TextBox::InputKey::SELECT_ALL, ctrl_or_meta_held(), key(KEY_GENERIC_LSHIFT).held, modMap);
|
textBox->process_key_input(*cursor, RichText::TextBox::InputKey::SELECT_ALL, ctrl_or_meta_held(), key(KEY_GENERIC_LSHIFT).held, modMap);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case SDLK_Z:
|
case SDLK_Z:
|
||||||
if((kMod & SDL_KMOD_GUI) || (kMod & SDL_KMOD_CTRL))
|
if((kMod & SDL_KMOD_GUI) || (kMod & SDL_KMOD_CTRL)) {
|
||||||
set_key_down(e, KEY_TEXT_UNDO);
|
set_key_down(e, KEY_TEXT_UNDO);
|
||||||
if(textBox && key(KEY_TEXT_UNDO).repeat)
|
if(textBox)
|
||||||
text.textBoxes.front().textboxUndo.undo();
|
text.textBoxes.front().textboxUndo.undo();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case SDLK_R:
|
case SDLK_R:
|
||||||
if((kMod & SDL_KMOD_GUI) || (kMod & SDL_KMOD_CTRL))
|
if((kMod & SDL_KMOD_GUI) || (kMod & SDL_KMOD_CTRL)) {
|
||||||
set_key_down(e, KEY_TEXT_REDO);
|
set_key_down(e, KEY_TEXT_REDO);
|
||||||
if(textBox && key(KEY_TEXT_REDO).repeat)
|
if(textBox)
|
||||||
text.textBoxes.front().textboxUndo.redo();
|
text.textBoxes.front().textboxUndo.redo();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case SDLK_RETURN: {
|
case SDLK_RETURN: {
|
||||||
set_key_down(e, KEY_TEXT_ENTER);
|
set_key_down(e, KEY_TEXT_ENTER);
|
||||||
if(textBox && key(KEY_TEXT_ENTER).repeat)
|
if(textBox)
|
||||||
text.do_textbox_operation_with_undo([&]() {
|
text.do_textbox_operation_with_undo([&]() {
|
||||||
textBox->process_key_input(*cursor, RichText::TextBox::InputKey::ENTER, ctrl_or_meta_held(), key(KEY_GENERIC_LSHIFT).held, modMap);
|
textBox->process_key_input(*cursor, RichText::TextBox::InputKey::ENTER, ctrl_or_meta_held(), key(KEY_GENERIC_LSHIFT).held, modMap);
|
||||||
});
|
});
|
||||||
|
|
@ -980,7 +970,7 @@ void InputManager::backend_key_down_update(const SDL_KeyboardEvent& e) {
|
||||||
}
|
}
|
||||||
case SDLK_TAB: {
|
case SDLK_TAB: {
|
||||||
set_key_down(e, KEY_TEXT_TAB);
|
set_key_down(e, KEY_TEXT_TAB);
|
||||||
if(textBox && key(KEY_TEXT_TAB).repeat)
|
if(textBox)
|
||||||
text.do_textbox_operation_with_undo([&]() {
|
text.do_textbox_operation_with_undo([&]() {
|
||||||
textBox->process_key_input(*cursor, RichText::TextBox::InputKey::TAB, ctrl_or_meta_held(), key(KEY_GENERIC_LSHIFT).held, modMap);
|
textBox->process_key_input(*cursor, RichText::TextBox::InputKey::TAB, ctrl_or_meta_held(), key(KEY_GENERIC_LSHIFT).held, modMap);
|
||||||
});
|
});
|
||||||
|
|
@ -1175,7 +1165,6 @@ void InputManager::stop_key_input() {
|
||||||
|
|
||||||
void InputManager::Mouse::set_pos(const Vector2f& newPos) {
|
void InputManager::Mouse::set_pos(const Vector2f& newPos) {
|
||||||
pos = newPos;
|
pos = newPos;
|
||||||
move = newPos - lastPos;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void InputManager::update() {
|
void InputManager::update() {
|
||||||
|
|
@ -1195,23 +1184,8 @@ void InputManager::update() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void InputManager::frame_reset(const Vector2i& windowSize) {
|
void InputManager::frame_reset(const Vector2i& windowSize) {
|
||||||
mouse.lastPos = mouse.pos;
|
|
||||||
mouse.move = Vector2f({0.0f, 0.0f});
|
|
||||||
mouse.scrollAmount = Vector2f({0.0f, 0.0f});
|
|
||||||
mouse.leftClicks = 0;
|
|
||||||
mouse.rightClicks = 0;
|
|
||||||
mouse.middleClicks = 0;
|
|
||||||
|
|
||||||
cursorIcon = SystemCursorType::DEFAULT;
|
cursorIcon = SystemCursorType::DEFAULT;
|
||||||
|
|
||||||
for(auto& p : keys) {
|
|
||||||
p.pressed = false;
|
|
||||||
p.repeat = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
for(auto& p : pen.buttons)
|
|
||||||
p.pressed = false;
|
|
||||||
|
|
||||||
lastPressedKeybind = std::nullopt;
|
lastPressedKeybind = std::nullopt;
|
||||||
if(stopKeyInput)
|
if(stopKeyInput)
|
||||||
stopKeyInput--;
|
stopKeyInput--;
|
||||||
|
|
|
||||||
|
|
@ -58,30 +58,21 @@ struct InputManager {
|
||||||
bool toggleFullscreen = false;
|
bool toggleFullscreen = false;
|
||||||
|
|
||||||
struct KeyData {
|
struct KeyData {
|
||||||
bool pressed = false;
|
|
||||||
bool held = false;
|
bool held = false;
|
||||||
bool repeat = false;
|
|
||||||
std::chrono::steady_clock::time_point lastPressTime;
|
std::chrono::steady_clock::time_point lastPressTime;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct Mouse {
|
struct Mouse {
|
||||||
void set_pos(const Vector2f& newPos);
|
void set_pos(const Vector2f& newPos);
|
||||||
Vector2f scrollAmount = {0, 0};
|
|
||||||
Vector2f pos = {0, 0};
|
Vector2f pos = {0, 0};
|
||||||
Vector2f previousPos = {0, 0};
|
|
||||||
Vector2f move = {0, 0};
|
|
||||||
bool leftDown = false;
|
bool leftDown = false;
|
||||||
bool rightDown = false;
|
bool rightDown = false;
|
||||||
bool middleDown = false;
|
bool middleDown = false;
|
||||||
uint8_t leftClicks = 0;
|
|
||||||
uint8_t rightClicks = 0;
|
|
||||||
uint8_t middleClicks = 0;
|
|
||||||
Vector2f lastPos = {0, 0};
|
|
||||||
} mouse;
|
} mouse;
|
||||||
|
|
||||||
struct Touch {
|
struct Touch {
|
||||||
int leftClicksSaved = 0;
|
uint8_t leftClicksSaved = 0;
|
||||||
int fingerTapsSaved = 0;
|
uint8_t fingerTapsSaved = 0;
|
||||||
std::chrono::steady_clock::time_point lastLeftClickTime;
|
std::chrono::steady_clock::time_point lastLeftClickTime;
|
||||||
std::chrono::steady_clock::time_point lastFingerTapTime;
|
std::chrono::steady_clock::time_point lastFingerTapTime;
|
||||||
std::vector<SDL_TouchFingerEvent> fingers;
|
std::vector<SDL_TouchFingerEvent> fingers;
|
||||||
|
|
@ -98,7 +89,7 @@ struct InputManager {
|
||||||
bool isDown = false;
|
bool isDown = false;
|
||||||
bool isEraser = false;
|
bool isEraser = false;
|
||||||
float pressure = 0.0f;
|
float pressure = 0.0f;
|
||||||
int leftClicksSaved = 0;
|
uint8_t leftClicksSaved = 0;
|
||||||
Vector2f previousPos;
|
Vector2f previousPos;
|
||||||
|
|
||||||
std::chrono::steady_clock::time_point lastPenLeftClickTime;
|
std::chrono::steady_clock::time_point lastPenLeftClickTime;
|
||||||
|
|
|
||||||
|
|
@ -165,9 +165,6 @@ void World::init_client(const std::string& serverFullID) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void World::focus_update() {
|
void World::focus_update() {
|
||||||
mousePreviousWorldVec = drawData.cam.c.from_space(main.input.mouse.pos);
|
|
||||||
mouseWorldMove = drawData.cam.c.from_space(main.input.mouse.move);
|
|
||||||
|
|
||||||
connection_update();
|
connection_update();
|
||||||
if(setToDestroy)
|
if(setToDestroy)
|
||||||
return;
|
return;
|
||||||
|
|
@ -337,14 +334,6 @@ void World::add_chat_message(const std::string& name, const std::string& message
|
||||||
chatMessages.pop_back();
|
chatMessages.pop_back();
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldVec World::get_mouse_world_pos() {
|
|
||||||
return mousePreviousWorldVec;
|
|
||||||
}
|
|
||||||
|
|
||||||
WorldVec World::get_mouse_world_move() {
|
|
||||||
return mouseWorldMove;
|
|
||||||
}
|
|
||||||
|
|
||||||
void World::early_destroy() {
|
void World::early_destroy() {
|
||||||
//con.early_destroy();
|
//con.early_destroy();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -59,9 +59,6 @@ class World {
|
||||||
void send_chat_message(const std::string& message);
|
void send_chat_message(const std::string& message);
|
||||||
void add_chat_message(const std::string& name, const std::string& message, Toolbar::ChatMessage::Type type);
|
void add_chat_message(const std::string& name, const std::string& message, Toolbar::ChatMessage::Type type);
|
||||||
|
|
||||||
WorldVec get_mouse_world_pos();
|
|
||||||
WorldVec get_mouse_world_move();
|
|
||||||
|
|
||||||
WorldScalar calculate_zoom_from_uniform_zoom(WorldScalar uniformZoom, WorldVec oldWindowSize);
|
WorldScalar calculate_zoom_from_uniform_zoom(WorldScalar uniformZoom, WorldVec oldWindowSize);
|
||||||
|
|
||||||
void focus_update();
|
void focus_update();
|
||||||
|
|
@ -130,8 +127,6 @@ class World {
|
||||||
void connection_update();
|
void connection_update();
|
||||||
|
|
||||||
TimePoint timeToSendCameraData;
|
TimePoint timeToSendCameraData;
|
||||||
WorldVec mousePreviousWorldVec = {0, 0};
|
|
||||||
WorldVec mouseWorldMove = {0, 0};
|
|
||||||
|
|
||||||
std::chrono::steady_clock::time_point lastKeepAliveSent;
|
std::chrono::steady_clock::time_point lastKeepAliveSent;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue