libobs/nix: Move X11-specific code to obs-nix-x11.c

Currently, obs-nix.c is highly tied to the X11 display
server. It includes X11 headers directly, and make use
of X11 functions. Most of the code inside obs-nix.c that
is X11-specific is related to hotkeys handling.

Introduce a new vtable for hotkeys callbacks, that will
used by X11 and Wayland to expose their specific routines.
In this commit, only the X11 hotkeys vtable is implemented.

Move all the X11-specific code to obs-nix-x11.c, and add
a new function to retrieve the X11 hotkeys vtable.
master
Georges Basile Stavracas Neto 2020-03-06 17:24:33 -03:00
parent 586767ab12
commit 510c747459
5 changed files with 1348 additions and 1211 deletions

View File

@ -187,6 +187,7 @@ elseif(APPLE)
elseif(UNIX)
set(libobs_PLATFORM_SOURCES
obs-nix.c
obs-nix-x11.c
util/threading-posix.c
util/pipe-posix.c
util/platform-nix.c)

1270
libobs/obs-nix-x11.c Normal file

File diff suppressed because it is too large Load Diff

22
libobs/obs-nix-x11.h Normal file
View File

@ -0,0 +1,22 @@
/******************************************************************************
Copyright (C) 2019 by Jason Francis <cycl0ps@tuta.io>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************/
#pragma once
#include "obs-nix.h"
void obs_nix_x11_log_info(void);
const struct obs_nix_hotkeys_vtable *obs_nix_x11_get_hotkeys_vtable(void);

File diff suppressed because it is too large Load Diff

42
libobs/obs-nix.h Normal file
View File

@ -0,0 +1,42 @@
/******************************************************************************
Copyright (C) 2020 by Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************/
#pragma once
#ifdef __cplusplus
extern "C" {
#endif
#include "obs-internal.h"
struct obs_nix_hotkeys_vtable {
bool (*init)(struct obs_core_hotkeys *hotkeys);
void (*free)(struct obs_core_hotkeys *hotkeys);
bool (*is_pressed)(obs_hotkeys_platform_t *context, obs_key_t key);
void (*key_to_str)(obs_key_t key, struct dstr *dstr);
obs_key_t (*key_from_virtual_key)(int sym);
int (*key_to_virtual_key)(obs_key_t key);
};
#ifdef __cplusplus
}
#endif