summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
Diffstat (limited to 'platform')
-rw-r--r--platform/osx/audio_driver_osx.cpp3
-rw-r--r--platform/windows/detect.py2
-rw-r--r--platform/windows/os_windows.cpp1
-rw-r--r--platform/winrt/os_winrt.cpp1
-rw-r--r--platform/x11/detect.py12
-rw-r--r--platform/x11/joystick_linux.cpp239
-rw-r--r--platform/x11/joystick_linux.h3
-rw-r--r--platform/x11/os_x11.cpp21
-rw-r--r--platform/x11/os_x11.h2
9 files changed, 169 insertions, 115 deletions
diff --git a/platform/osx/audio_driver_osx.cpp b/platform/osx/audio_driver_osx.cpp
index a74303e6c2..d9d91b22fb 100644
--- a/platform/osx/audio_driver_osx.cpp
+++ b/platform/osx/audio_driver_osx.cpp
@@ -172,6 +172,9 @@ void AudioDriverOSX::unlock() {
void AudioDriverOSX::finish() {
+ if (active)
+ AudioOutputUnitStop(audio_unit);
+
memdelete_arr(samples_in);
};
diff --git a/platform/windows/detect.py b/platform/windows/detect.py
index 0d7ee64d80..397ca078fb 100644
--- a/platform/windows/detect.py
+++ b/platform/windows/detect.py
@@ -262,7 +262,7 @@ def configure(env):
env.Append(CCFLAGS=["/I"+DIRECTX_PATH+"/Include"])
env.Append(LIBPATH=[DIRECTX_PATH+"/Lib/x86"])
env['ENV'] = os.environ;
- env["x86_opt_vc"]=env["bits"]!="64"
+ env["x86_opt_vc"]=True
else:
# Workaround for MinGW. See:
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 886c43d116..20f417ccc6 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -47,7 +47,6 @@
#include "tcp_server_winsock.h"
#include "packet_peer_udp_winsock.h"
#include "stream_peer_winsock.h"
-#include "os/pc_joystick_map.h"
#include "lang_table.h"
#include "os/memory_pool_dynamic_prealloc.h"
#include "globals.h"
diff --git a/platform/winrt/os_winrt.cpp b/platform/winrt/os_winrt.cpp
index f507c1aae7..b6ce7f950d 100644
--- a/platform/winrt/os_winrt.cpp
+++ b/platform/winrt/os_winrt.cpp
@@ -43,7 +43,6 @@
#include "servers/audio/audio_server_sw.h"
#include "servers/visual/visual_server_wrap_mt.h"
-#include "os/pc_joystick_map.h"
#include "os/memory_pool_dynamic_prealloc.h"
#include "globals.h"
#include "io/marshalls.h"
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index e035c72993..bb4bf9bd6f 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -158,18 +158,14 @@ def configure(env):
if (env["gamepad"]=="yes" and platform.system() == "Linux"):
# pkg-config returns 0 when the lib exists...
found_udev = not os.system("pkg-config --exists libudev")
- found_evdev = not os.system("pkg-config --exists libevdev")
- if (found_udev and found_evdev):
- print("Enabling gamepad support with udev/evdev")
+ if (found_udev):
+ print("Enabling gamepad support with udev")
env.Append(CPPFLAGS=["-DJOYDEV_ENABLED"])
env.ParseConfig('pkg-config libudev --cflags --libs')
- env.ParseConfig('pkg-config libevdev --cflags --libs')
else:
- if (not found_udev):
- print("libudev development libraries not found")
- if (not found_evdev):
- print("libevdev development libraries not found")
+ print("libudev development libraries not found")
+
print("Some libraries are missing for the required gamepad support, aborting!")
print("Install the mentioned libraries or build with 'gamepad=no' to disable gamepad support.")
sys.exit(255)
diff --git a/platform/x11/joystick_linux.cpp b/platform/x11/joystick_linux.cpp
index 6eb3671bc0..1a11876d5d 100644
--- a/platform/x11/joystick_linux.cpp
+++ b/platform/x11/joystick_linux.cpp
@@ -31,22 +31,35 @@
#ifdef JOYDEV_ENABLED
#include "joystick_linux.h"
-#include "print_string.h"
-#include <libevdev/libevdev.h>
+#include <linux/input.h>
#include <libudev.h>
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
-#include <cstring>
+
+#define LONG_BITS (sizeof(long) * 8)
+#define test_bit(nr, addr) (((1UL << ((nr) % LONG_BITS)) & ((addr)[(nr) / LONG_BITS])) != 0)
+#define NBITS(x) ((((x)-1)/LONG_BITS)+1)
static const char* ignore_str = "/dev/input/js";
joystick_linux::Joystick::Joystick() {
fd = -1;
dpad = 0;
- dev = NULL;
devpath = "";
+ for (int i = 0; i < MAX_ABS; i++) {
+ abs_info[i] = NULL;
+ }
+}
+
+joystick_linux::Joystick::~Joystick() {
+
+ for (int i = 0; i < MAX_ABS; i++) {
+ if (abs_info[i]) {
+ memdelete(abs_info[i]);
+ }
+ }
}
void joystick_linux::Joystick::reset() {
@@ -112,10 +125,14 @@ void joystick_linux::enumerate_joysticks(udev *p_udev) {
dev = udev_device_new_from_syspath(p_udev, path);
const char* devnode = udev_device_get_devnode(dev);
- if (devnode != NULL && strstr(devnode, ignore_str) == NULL) {
- joy_mutex->lock();
- open_joystick(devnode);
- joy_mutex->unlock();
+ if (devnode) {
+
+ String devnode_str = devnode;
+ if (devnode_str.find(ignore_str) == -1) {
+ joy_mutex->lock();
+ open_joystick(devnode);
+ joy_mutex->unlock();
+ }
}
udev_device_unref(dev);
}
@@ -146,22 +163,24 @@ void joystick_linux::monitor_joysticks(udev *p_udev) {
/* Check if our file descriptor has received data. */
if (ret > 0 && FD_ISSET(fd, &fds)) {
/* Make the call to receive the device.
- select() ensured that this will not block. */
+ select() ensured that this will not block. */
dev = udev_monitor_receive_device(mon);
if (dev && udev_device_get_devnode(dev) != 0) {
joy_mutex->lock();
- const char* action = udev_device_get_action(dev);
+ String action = udev_device_get_action(dev);
const char* devnode = udev_device_get_devnode(dev);
+ if (devnode) {
- if (strstr(devnode, ignore_str) == NULL) {
-
- if (strcmp(action, "add") == 0)
- open_joystick(devnode);
+ String devnode_str = devnode;
+ if (devnode_str.find(ignore_str) == -1) {
- else if (strcmp(action, "remove") == 0)
- close_joystick(get_joy_from_path(devnode));
+ if (action == "add")
+ open_joystick(devnode);
+ else if (String(action) == "remove")
+ close_joystick(get_joy_from_path(devnode));
+ }
}
udev_device_unref(dev);
@@ -208,7 +227,6 @@ void joystick_linux::close_joystick(int p_id) {
if (joy.fd != -1) {
- libevdev_free(joy.dev);
close(joy.fd);
joy.fd = -1;
input->joy_connection_changed(p_id, false, "");
@@ -230,21 +248,27 @@ static String _hex_str(uint8_t p_byte) {
void joystick_linux::setup_joystick_properties(int p_id) {
Joystick* joy = &joysticks[p_id];
- libevdev* dev = joy->dev;
+
+ unsigned long keybit[NBITS(KEY_MAX)] = { 0 };
+ unsigned long absbit[NBITS(ABS_MAX)] = { 0 };
int num_buttons = 0;
int num_axes = 0;
+ if ((ioctl(joy->fd, EVIOCGBIT(EV_KEY, sizeof(keybit)), keybit) < 0) ||
+ (ioctl(joy->fd, EVIOCGBIT(EV_ABS, sizeof(absbit)), absbit) < 0)) {
+ return;
+ }
for (int i = BTN_JOYSTICK; i < KEY_MAX; ++i) {
- if (libevdev_has_event_code(dev, EV_KEY, i)) {
+ if (test_bit(i, keybit)) {
joy->key_map[i] = num_buttons++;
}
}
for (int i = BTN_MISC; i < BTN_JOYSTICK; ++i) {
- if (libevdev_has_event_code(dev, EV_KEY, i)) {
+ if (test_bit(i, keybit)) {
joy->key_map[i] = num_buttons++;
}
@@ -255,68 +279,83 @@ void joystick_linux::setup_joystick_properties(int p_id) {
i = ABS_HAT3Y;
continue;
}
- if (libevdev_has_event_code(dev, EV_ABS, i)) {
+ if (test_bit(i, absbit)) {
joy->abs_map[i] = num_axes++;
+ joy->abs_info[i] = memnew(input_absinfo);
+ if (ioctl(joy->fd, EVIOCGABS(i), joy->abs_info[i]) < 0) {
+ memdelete(joy->abs_info[i]);
+ joy->abs_info[i] = NULL;
+ }
}
}
}
+
void joystick_linux::open_joystick(const char *p_path) {
int joy_num = get_free_joy_slot();
int fd = open(p_path, O_RDONLY | O_NONBLOCK);
if (fd != -1 && joy_num != -1) {
- int rc = libevdev_new_from_fd(fd, &joysticks[joy_num].dev);
- if (rc < 0) {
+ unsigned long evbit[NBITS(EV_MAX)] = { 0 };
+ unsigned long keybit[NBITS(KEY_MAX)] = { 0 };
+ unsigned long absbit[NBITS(ABS_MAX)] = { 0 };
- fprintf(stderr, "Failed to init libevdev (%s)\n", strerror(-rc));
+ if ((ioctl(fd, EVIOCGBIT(0, sizeof(evbit)), evbit) < 0) ||
+ (ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(keybit)), keybit) < 0) ||
+ (ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(absbit)), absbit) < 0)) {
+ close(fd);
return;
}
- libevdev *dev = joysticks[joy_num].dev;
-
//check if the device supports basic gamepad events, prevents certain keyboards from
//being detected as joysticks
- if (libevdev_has_event_type(dev, EV_ABS) && libevdev_has_event_type(dev, EV_KEY) &&
- (libevdev_has_event_code(dev, EV_KEY, BTN_A) || libevdev_has_event_code(dev, EV_KEY, BTN_THUMBL) || libevdev_has_event_code(dev, EV_KEY, BTN_TOP))) {
-
- char uid[128];
- String name = libevdev_get_name(dev);
- uint16_t bus = __bswap_16(libevdev_get_id_bustype(dev));
- uint16_t vendor = __bswap_16(libevdev_get_id_vendor(dev));
- uint16_t product = __bswap_16(libevdev_get_id_product(dev));
- uint16_t version = __bswap_16(libevdev_get_id_version(dev));
-
- joysticks[joy_num].reset();
-
- Joystick &joy = joysticks[joy_num];
- joy.fd = fd;
- joy.devpath = String(p_path);
- setup_joystick_properties(joy_num);
- sprintf(uid, "%04x%04x", bus, 0);
- if (vendor && product && version) {
-
- sprintf(uid + String(uid).length(), "%04x%04x%04x%04x%04x%04x", vendor,0,product,0,version,0);
- input->joy_connection_changed(joy_num, true, name, uid);
- }
- else {
- String uidname = uid;
- int uidlen = MIN(name.length(), 11);
- for (int i=0; i<uidlen; i++) {
+ if (!(test_bit(EV_KEY, evbit) && test_bit(EV_ABS, evbit) &&
+ ((test_bit(ABS_X, absbit) || test_bit(ABS_Y, absbit) || test_bit(ABS_HAT0X, absbit)) &&
+ (test_bit(BTN_A, keybit) || test_bit(BTN_THUMBL, keybit))))) {
+ close(fd);
+ return;
+ }
- uidname = uidname + _hex_str(name[i]);
- }
- uidname += "00";
- input->joy_connection_changed(joy_num, true, name, uidname);
+ char uid[128];
+ char namebuf[128];
+ String name = "";
+ input_id inpid;
+ if (ioctl(fd, EVIOCGNAME(sizeof(namebuf)), namebuf) >= 0) {
+ name = namebuf;
+ }
- }
+ if (ioctl(fd, EVIOCGID, &inpid) < 0) {
+ close(fd);
+ return;
+ }
+
+ joysticks[joy_num].reset();
+
+ Joystick &joy = joysticks[joy_num];
+ joy.fd = fd;
+ joy.devpath = String(p_path);
+ setup_joystick_properties(joy_num);
+ sprintf(uid, "%04x%04x", __bswap_16(inpid.bustype), 0);
+ if (inpid.vendor && inpid.product && inpid.version) {
+
+ uint16_t vendor = __bswap_16(inpid.vendor);
+ uint16_t product = __bswap_16(inpid.product);
+ uint16_t version = __bswap_16(inpid.version);
+
+ sprintf(uid + String(uid).length(), "%04x%04x%04x%04x%04x%04x", vendor,0,product,0,version,0);
+ input->joy_connection_changed(joy_num, true, name, uid);
}
else {
- //device is not a gamepad, clean up
- libevdev_free(dev);
- close(fd);
+ String uidname = uid;
+ int uidlen = MIN(name.length(), 11);
+ for (int i=0; i<uidlen; i++) {
+
+ uidname = uidname + _hex_str(name[i]);
+ }
+ uidname += "00";
+ input->joy_connection_changed(joy_num, true, name, uidname);
}
}
}
@@ -350,58 +389,54 @@ uint32_t joystick_linux::process_joysticks(uint32_t p_event_id) {
if (joysticks[i].fd == -1) continue;
- input_event ev;
+ input_event events[32];
Joystick* joy = &joysticks[i];
- libevdev* dev = joy->dev;
- int rc = 1;
- rc = libevdev_next_event(dev, LIBEVDEV_READ_FLAG_NORMAL, &ev);
+ int len;
- if (rc < 0 && rc != -EAGAIN) {
- continue;
- }
-
- while (rc == LIBEVDEV_READ_STATUS_SYNC || rc == LIBEVDEV_READ_STATUS_SUCCESS) {
-
- switch (ev.type) {
- case EV_KEY:
- p_event_id = input->joy_button(p_event_id, i, joy->key_map[ev.code], ev.value);
- break;
-
- case EV_ABS:
-
- switch (ev.code) {
- case ABS_HAT0X:
- if (ev.value != 0) {
- if (ev.value < 0) joy->dpad |= InputDefault::HAT_MASK_LEFT;
- else joy->dpad |= InputDefault::HAT_MASK_RIGHT;
-
- }
- else joy->dpad &= ~(InputDefault::HAT_MASK_LEFT | InputDefault::HAT_MASK_RIGHT);
-
- p_event_id = input->joy_hat(p_event_id, i, joy->dpad);
- break;
-
- case ABS_HAT0Y:
- if (ev.value != 0) {
- if (ev.value < 0) joy->dpad |= InputDefault::HAT_MASK_UP;
- else joy->dpad |= InputDefault::HAT_MASK_DOWN;
- }
- else joy->dpad &= ~(InputDefault::HAT_MASK_UP | InputDefault::HAT_MASK_DOWN);
+ while ((len = read(joy->fd, events, (sizeof events))) > 0) {
+ len /= sizeof(events[0]);
+ for (int j = 0; j < len; j++) {
- p_event_id = input->joy_hat(p_event_id, i, joy->dpad);
+ input_event &ev = events[j];
+ switch (ev.type) {
+ case EV_KEY:
+ p_event_id = input->joy_button(p_event_id, i, joy->key_map[ev.code], ev.value);
break;
- default:
- if (joy->abs_map[ev.code] != -1) {
- InputDefault::JoyAxis value = axis_correct(libevdev_get_abs_info(dev, ev.code), ev.value);
- joy->curr_axis[joy->abs_map[ev.code]] = value;
+ case EV_ABS:
+
+ switch (ev.code) {
+ case ABS_HAT0X:
+ if (ev.value != 0) {
+ if (ev.value < 0) joy->dpad |= InputDefault::HAT_MASK_LEFT;
+ else joy->dpad |= InputDefault::HAT_MASK_RIGHT;
+ }
+ else joy->dpad &= ~(InputDefault::HAT_MASK_LEFT | InputDefault::HAT_MASK_RIGHT);
+
+ p_event_id = input->joy_hat(p_event_id, i, joy->dpad);
+ break;
+
+ case ABS_HAT0Y:
+ if (ev.value != 0) {
+ if (ev.value < 0) joy->dpad |= InputDefault::HAT_MASK_UP;
+ else joy->dpad |= InputDefault::HAT_MASK_DOWN;
+ }
+ else joy->dpad &= ~(InputDefault::HAT_MASK_UP | InputDefault::HAT_MASK_DOWN);
+
+ p_event_id = input->joy_hat(p_event_id, i, joy->dpad);
+ break;
+
+ default:
+ if (joy->abs_map[ev.code] != -1 && joy->abs_info[ev.code]) {
+ InputDefault::JoyAxis value = axis_correct(joy->abs_info[ev.code], ev.value);
+ joy->curr_axis[joy->abs_map[ev.code]] = value;
+ }
+ break;
}
break;
}
- break;
}
- rc = libevdev_next_event(dev, LIBEVDEV_READ_FLAG_NORMAL, &ev);
}
for (int j = 0; j < MAX_ABS; j++) {
int index = joy->abs_map[j];
diff --git a/platform/x11/joystick_linux.h b/platform/x11/joystick_linux.h
index ee9bd0352a..7f96e3451f 100644
--- a/platform/x11/joystick_linux.h
+++ b/platform/x11/joystick_linux.h
@@ -61,9 +61,10 @@ private:
int fd;
String devpath;
- struct libevdev *dev;
+ input_absinfo *abs_info[MAX_ABS];
Joystick();
+ ~Joystick();
void reset();
};
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp
index f42e93b93f..e5591810e7 100644
--- a/platform/x11/os_x11.cpp
+++ b/platform/x11/os_x11.cpp
@@ -65,7 +65,6 @@
#include <X11/Xatom.h>
-//#include "os/pc_joystick_map.h"
#undef CursorShape
@@ -575,6 +574,10 @@ Point2 OS_X11::get_mouse_pos() const {
void OS_X11::set_window_title(const String& p_title) {
XStoreName(x11_display,x11_window,p_title.utf8().get_data());
+
+ Atom _net_wm_name = XInternAtom(x11_display, "_NET_WM_NAME", false);
+ Atom utf8_string = XInternAtom(x11_display, "UTF8_STRING", false);
+ XChangeProperty( x11_display, x11_window, _net_wm_name, utf8_string, 8, PropModeReplace, (unsigned char*) p_title.utf8().get_data(), p_title.utf8().length());
}
void OS_X11::set_video_mode(const VideoMode& p_video_mode,int p_screen) {
@@ -1782,6 +1785,22 @@ String OS_X11::get_joy_guid(int p_device) const {
return input->get_joy_guid_remapped(p_device);
}
+void OS_X11::set_context(int p_context) {
+
+ XClassHint* classHint = NULL;
+ classHint = XAllocClassHint();
+ if (classHint) {
+
+ if (p_context == CONTEXT_EDITOR)
+ classHint->res_name = (char *)"Godot_Editor";
+ if (p_context == CONTEXT_PROJECTMAN)
+ classHint->res_name = (char *)"Godot_ProjectList";
+ classHint->res_class = (char *)"Godot";
+ XSetClassHint(x11_display, x11_window, classHint);
+ XFree(classHint);
+ }
+}
+
OS_X11::OS_X11() {
#ifdef RTAUDIO_ENABLED
diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h
index 91dbeac284..0891e4b8eb 100644
--- a/platform/x11/os_x11.h
+++ b/platform/x11/os_x11.h
@@ -226,6 +226,8 @@ public:
virtual bool is_joy_known(int p_device);
virtual String get_joy_guid(int p_device) const;
+ virtual void set_context(int p_context);
+
void run();
OS_X11();
generated by cgit v1.2.3 (git 2.39.1) at 2026-01-08 22:09:56 +0000