lpnf/lovr
1
0
Fork 0
mirror of https://github.com/bjornbytes/lovr.git synced 2024-07-03 04:53:35 +00:00
Code Issues Projects Releases Wiki Activity

xcb backend respects LOVR_USE_GLFW;

Browse source
This commit is contained in:
bjorn 2024-06-06 09:52:44 -07:00
parent 44ef12c59c
commit bb48cdadfb
4 changed files with 92 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -882,7 +882,11 @@ elseif(ANDROID)
endif()
elseif(UNIX)
target_sources(lovr PRIVATE src/core/os_linux.c)
target_link_libraries(lovr xcb xcb-xinput xcb-xkb xkbcommon xkbcommon-x11)
if(LOVR_USE_GLFW)
target_link_libraries(lovr X11 xcb X11-xcb)
else()
target_link_libraries(lovr xcb xcb-xinput xcb-xkb xkbcommon xkbcommon-x11)
endif()
set_target_properties(lovr PROPERTIES
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
BUILD_WITH_INSTALL_RPATH TRUE

8
Tupfile.lua
View file

@ -142,7 +142,11 @@ if target == 'linux' then
cflags += '-D_DEFAULT_SOURCE'
lflags += '-lm -lpthread -ldl'
lflags += '-Wl,-rpath,\\$ORIGIN'
lflags += '-lxcb -lxcb-xinput -lxcb-xkb -lxkbcommon -lxkbcommon-x11'
if config.glfw then
lflags += '-lX11 -lxcb -lX11-xcb'
else
lflags += '-lxcb -lxcb-xinput -lxcb-xkb -lxkbcommon -lxkbcommon-x11'
end
end
if target == 'wasm' then
@ -227,7 +231,7 @@ else
tup.rule('.obj/lua/*.o', '^ LD %o^ $(cc) $(flags) -o %o %f $(lua_lflags)', lib('lua'))
end
if config.glfw and (target == 'win32' or target == 'macos') then
if config.glfw and (target == 'win32' or target == 'macos' or target == 'linux') then
cflags += '-Ideps/glfw/include'
cflags += '-DLOVR_USE_GLFW'
lflags += '-lglfw'

10
src/core/os.h
View file

@ -188,17 +188,17 @@ void os_window_get_size(uint32_t* width, uint32_t* height);
float os_window_get_pixel_density(void);
void os_window_message_box(const char* message);
void os_get_mouse_position(double* x, double* y);
void os_set_mouse_mode(os_mouse_mode mode);
bool os_is_mouse_down(os_mouse_button button);
bool os_is_key_down(os_key key);
size_t os_get_home_directory(char* buffer, size_t size);
size_t os_get_data_directory(char* buffer, size_t size);
size_t os_get_working_directory(char* buffer, size_t size);
size_t os_get_executable_path(char* buffer, size_t size);
size_t os_get_bundle_path(char* buffer, size_t size, const char** root);
void os_get_mouse_position(double* x, double* y);
void os_set_mouse_mode(os_mouse_mode mode);
bool os_is_mouse_down(os_mouse_button button);
bool os_is_key_down(os_key key);
uintptr_t os_get_win32_window(void);
uintptr_t os_get_win32_instance(void);

141
src/core/os_linux.c
View file

@ -5,6 +5,10 @@
#include <time.h>
#include <pwd.h>
#include <sys/mman.h>
#ifdef LOVR_USE_GLFW
#include "os_glfw.h"
#else
#include <linux/input.h>
#include <xcb/xcb.h>
#include <xcb/xkb.h>
@ -13,8 +17,6 @@
#include <xkbcommon/xkbcommon-x11.h>
#include <xkbcommon/xkbcommon-compose.h>
#define NS_PER_SEC 1000000000ULL
static struct {
xcb_connection_t* connection;
xcb_screen_t* screen;
@ -45,12 +47,16 @@ static struct {
int16_t grabX;
int16_t grabY;
} state;
#endif
bool os_init(void) {
return true;
}
void os_destroy(void) {
#ifdef LOVR_USE_GLFW
glfwTerminate();
#else
free(state.deleteWindow);
if (state.hiddenCursor) xcb_free_cursor(state.connection, state.hiddenCursor);
xkb_compose_state_unref(state.compose);
@ -60,6 +66,7 @@ void os_destroy(void) {
xkb_context_unref(state.xkb);
xcb_disconnect(state.connection);
memset(&state, 0, sizeof(state));
#endif
}
const char* os_get_name(void) {
@ -77,14 +84,14 @@ void os_open_console(void) {
double os_get_time(void) {
struct timespec t;
clock_gettime(CLOCK_MONOTONIC, &t);
return (double) t.tv_sec + (t.tv_nsec / (double) NS_PER_SEC);
return (double) t.tv_sec + (t.tv_nsec / (double) 1e9);
}
void os_sleep(double seconds) {
seconds += .5e-9;
struct timespec t;
t.tv_sec = seconds;
t.tv_nsec = (seconds - t.tv_sec) * NS_PER_SEC;
t.tv_nsec = (seconds - t.tv_sec) * 1e9;
while (nanosleep(&t, &t));
}
@ -92,6 +99,7 @@ void os_request_permission(os_permission permission) {
//
}
#ifndef LOVR_USE_GLFW
const char* os_get_clipboard_text(void) {
return NULL; // TODO
}
@ -99,6 +107,7 @@ const char* os_get_clipboard_text(void) {
void os_set_clipboard_text(const char* text) {
// TODO
}
#endif
void* os_vm_init(size_t size) {
return mmap(NULL, size, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
@ -124,6 +133,11 @@ void os_thread_detach(void) {
//
}
void os_on_permission(fn_permission* callback) {
//
}
#ifndef LOVR_USE_GLFW
static os_key convertKey(uint8_t keycode) {
switch (keycode - 8) {
case KEY_ESC: return OS_KEY_ESCAPE;
@ -383,10 +397,6 @@ void os_on_mousewheel_move(fn_mousewheel_move* callback) {
state.onWheelMove = callback;
}
void os_on_permission(fn_permission* callback) {
//
}
bool os_window_open(const os_window_config* config) {
state.connection = xcb_connect(NULL, NULL);
@ -531,6 +541,64 @@ void os_window_message_box(const char* message) {
//
}
void os_get_mouse_position(double* x, double* y) {
*x = state.mouseX;
*y = state.mouseY;
}
void os_set_mouse_mode(os_mouse_mode mode) {
if (!state.connection || state.mouseMode == mode) return;
state.mouseMode = mode;
struct {
xcb_input_event_mask_t info;
xcb_input_xi_event_mask_t mask;
} rawInput;
rawInput.info.deviceid = XCB_INPUT_DEVICE_ALL_MASTER;
rawInput.info.mask_len = 1;
rawInput.mask = mode == MOUSE_MODE_GRABBED ? XCB_INPUT_XI_EVENT_MASK_RAW_MOTION : 0;
xcb_input_xi_select_events(state.connection, state.screen->root, 1, &rawInput.info);
if (mode == MOUSE_MODE_GRABBED) {
if (!state.hiddenCursor) {
state.hiddenCursor = xcb_generate_id(state.connection);
xcb_pixmap_t pixmap = xcb_generate_id(state.connection);
xcb_create_pixmap(state.connection, 1, pixmap, state.window, 1, 1);
xcb_create_cursor(state.connection, state.hiddenCursor, pixmap, pixmap, 0, 0, 0, 0, 0, 0, 0, 0);
xcb_free_pixmap(state.connection, pixmap);
}
uint32_t events = XCB_EVENT_MASK_BUTTON_RELEASE;
xcb_grab_pointer(state.connection, 0, state.window, events, 1, 1, state.window, state.hiddenCursor, XCB_CURRENT_TIME);
state.grabX = state.mouseX;
state.grabY = state.mouseY;
} else {
xcb_change_window_attributes(state.connection, state.window, XCB_CW_CURSOR, &(uint32_t) { XCB_CURSOR_NONE });
xcb_warp_pointer(state.connection, XCB_NONE, state.window, 0, 0, 0, 0, state.grabX, state.grabY);
xcb_ungrab_pointer(state.connection, XCB_CURRENT_TIME);
state.mouseX = state.grabX;
state.mouseY = state.grabY;
}
}
bool os_is_mouse_down(os_mouse_button button) {
return state.mouseDown[button];
}
bool os_is_key_down(os_key key) {
return state.keyDown[key];
}
uintptr_t os_get_xcb_connection(void) {
return (uintptr_t) state.connection;
}
uintptr_t os_get_xcb_window(void) {
return (uintptr_t) state.window;
}
#endif
size_t os_get_home_directory(char* buffer, size_t size) {
const char* path = getenv("HOME");
@ -595,60 +663,3 @@ size_t os_get_bundle_path(char* buffer, size_t size, const char** root) {
*root = NULL;
return os_get_executable_path(buffer, size);
}
void os_get_mouse_position(double* x, double* y) {
*x = state.mouseX;
*y = state.mouseY;
}
void os_set_mouse_mode(os_mouse_mode mode) {
if (!state.connection || state.mouseMode == mode) return;
state.mouseMode = mode;
struct {
xcb_input_event_mask_t info;
xcb_input_xi_event_mask_t mask;
} rawInput;
rawInput.info.deviceid = XCB_INPUT_DEVICE_ALL_MASTER;
rawInput.info.mask_len = 1;
rawInput.mask = mode == MOUSE_MODE_GRABBED ? XCB_INPUT_XI_EVENT_MASK_RAW_MOTION : 0;
xcb_input_xi_select_events(state.connection, state.screen->root, 1, &rawInput.info);
if (mode == MOUSE_MODE_GRABBED) {
if (!state.hiddenCursor) {
state.hiddenCursor = xcb_generate_id(state.connection);
xcb_pixmap_t pixmap = xcb_generate_id(state.connection);
xcb_create_pixmap(state.connection, 1, pixmap, state.window, 1, 1);
xcb_create_cursor(state.connection, state.hiddenCursor, pixmap, pixmap, 0, 0, 0, 0, 0, 0, 0, 0);
xcb_free_pixmap(state.connection, pixmap);
}
uint32_t events = XCB_EVENT_MASK_BUTTON_RELEASE;
xcb_grab_pointer(state.connection, 0, state.window, events, 1, 1, state.window, state.hiddenCursor, XCB_CURRENT_TIME);
state.grabX = state.mouseX;
state.grabY = state.mouseY;
} else {
xcb_change_window_attributes(state.connection, state.window, XCB_CW_CURSOR, &(uint32_t) { XCB_CURSOR_NONE });
xcb_warp_pointer(state.connection, XCB_NONE, state.window, 0, 0, 0, 0, state.grabX, state.grabY);
xcb_ungrab_pointer(state.connection, XCB_CURRENT_TIME);
state.mouseX = state.grabX;
state.mouseY = state.grabY;
}
}
bool os_is_mouse_down(os_mouse_button button) {
return state.mouseDown[button];
}
bool os_is_key_down(os_key key) {
return state.keyDown[key];
}
uintptr_t os_get_xcb_connection(void) {
return (uintptr_t) state.connection;
}
uintptr_t os_get_xcb_window(void) {
return (uintptr_t) state.window;
}