godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases Wiki Activity

Fix unused variables warning when touch is disabled

Browse Source
This commit is contained in:
Kacper Gibas
2023-10-13 14:38:04 +02:00
parent 51f81e1c88
commit 8eb32f9aad
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
platform/linuxbsd/x11/display_server_x11.cpp
View File

@@ -4085,9 +4085,6 @@ void DisplayServerX11::process_events() {
if (XGetEventData(x11_display, &event.xcookie)) { if (XGetEventData(x11_display, &event.xcookie)) {
if (event.xcookie.type == GenericEvent && event.xcookie.extension == xi.opcode) { if (event.xcookie.type == GenericEvent && event.xcookie.extension == xi.opcode) {
XIDeviceEvent *event_data = (XIDeviceEvent *)event.xcookie.data; XIDeviceEvent *event_data = (XIDeviceEvent *)event.xcookie.data;
int index = event_data->detail;
Vector2 pos = Vector2(event_data->event_x, event_data->event_y);
switch (event_data->evtype) { switch (event_data->evtype) {
case XI_HierarchyChanged: case XI_HierarchyChanged:
case XI_DeviceChanged: { case XI_DeviceChanged: {
@@ -4204,6 +4201,9 @@ void DisplayServerX11::process_events() {
} }
bool is_begin = event_data->evtype == XI_TouchBegin; bool is_begin = event_data->evtype == XI_TouchBegin;
int index = event_data->detail;
Vector2 pos = Vector2(event_data->event_x, event_data->event_y);
Ref<InputEventScreenTouch> st; Ref<InputEventScreenTouch> st;
st.instantiate(); st.instantiate();
st->set_window_id(window_id); st->set_window_id(window_id);
@@ -4235,6 +4235,10 @@ void DisplayServerX11::process_events() {
if (ime_window_event || ignore_events) { if (ime_window_event || ignore_events) {
break; break;
} }
int index = event_data->detail;
Vector2 pos = Vector2(event_data->event_x, event_data->event_y);
HashMap<int, Vector2>::Iterator curr_pos_elem = xi.state.find(index); HashMap<int, Vector2>::Iterator curr_pos_elem = xi.state.find(index);
if (!curr_pos_elem) { // Defensive if (!curr_pos_elem) { // Defensive
break; break;