RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

x11: Add config vars to disable usage of X11 extensions

This commit is contained in:
rdb 2025-07-28 10:05:10 +02:00
parent 1f85588dd4
commit 2767bddbe6
3 changed files with 56 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
panda/src/x11display/config_x11display.cxx
View File

@ -45,6 +45,27 @@ ConfigVariableBool x_init_threads
PRC_DESC("Set this true to ask Panda3D to call XInitThreads() upon loading "
"the display module, which may help with some threading issues."));
ConfigVariableBool x_support_xcursor
("x-support-xcursor", true,
PRC_DESC("Set this false if you wish to disable loading of the XCursor "
"library, which is used for setting custom cursor icons."));
ConfigVariableBool x_support_xinput2
("x-support-xinput2", true,
PRC_DESC("Set this false if you wish to disable loading of the XInput2 "
"library, which is used for raw mouse events as well as for relative "
"mouse events if the xf86dga extension is not supported."));
ConfigVariableBool x_support_xf86dga
("x-support-xf86dga", true,
PRC_DESC("Set this false if you wish to disable loading of the xf86dga "
"extension, which is used for relative mouse mode."));
ConfigVariableBool x_support_xrandr
("x-support-xrandr", true,
PRC_DESC("Set this false if you wish to disable loading of the Xrandr "
"extension, which is used for changing screen resolutions."));
ConfigVariableInt x_wheel_up_button
("x-wheel-up-button", 4,
PRC_DESC("This is the mouse button index of the wheel_up event: which "

4
panda/src/x11display/config_x11display.h
View File

@ -27,6 +27,10 @@ extern EXPCL_PANDAX11 void init_libx11display();
extern ConfigVariableString display_cfg;
extern ConfigVariableBool x_error_abort;
extern ConfigVariableBool x_init_threads;
extern ConfigVariableBool x_support_xcursor;
extern ConfigVariableBool x_support_xinput2;
extern ConfigVariableBool x_support_xf86dga;
extern ConfigVariableBool x_support_xrandr;
extern ConfigVariableInt x_wheel_up_button;
extern ConfigVariableInt x_wheel_down_button;

40
panda/src/x11display/x11GraphicsPipe.cxx
View File

@ -121,15 +121,22 @@ x11GraphicsPipe(const std::string &display) :
_is_valid = true;
// Dynamically load the xf86dga extension.
void *xf86dga = dlopen("libXxf86dga.so.1", RTLD_NOW | RTLD_LOCAL);
if (xf86dga != nullptr) {
if (!x_support_xf86dga) {
_XF86DGADirectVideo = nullptr;
if (x11display_cat.is_debug()) {
x11display_cat.debug()
<< "XFree86-DGA support is disabled"
<< "; relative mouse mode may not work.\n";
}
} else if (void *xf86dga = dlopen("libXxf86dga.so.1", RTLD_NOW | RTLD_LOCAL)) {
pfn_XF86DGAQueryVersion _XF86DGAQueryVersion = (pfn_XF86DGAQueryVersion)dlsym(xf86dga, "XF86DGAQueryVersion");
_XF86DGADirectVideo = (pfn_XF86DGADirectVideo)dlsym(xf86dga, "XF86DGADirectVideo");
int major_ver, minor_ver;
if (_XF86DGAQueryVersion == nullptr || _XF86DGADirectVideo == nullptr) {
x11display_cat.warning()
<< "libXxf86dga.so.1 does not provide required functions; relative mouse mode may not work.\n";
<< "libXxf86dga.so.1 does not provide required functions"
<< "; relative mouse mode may not work.\n";
} else if (!_XF86DGAQueryVersion(_display, &major_ver, &minor_ver)) {
_XF86DGADirectVideo = nullptr;
@ -138,13 +145,19 @@ x11GraphicsPipe(const std::string &display) :
_XF86DGADirectVideo = nullptr;
if (x11display_cat.is_debug()) {
x11display_cat.debug()
<< "cannot dlopen libXxf86dga.so.1; relative mouse mode may not work.\n";
<< "cannot dlopen libXxf86dga.so.1"
<< "; relative mouse mode may not work.\n";
}
}
// Dynamically load the XCursor extension.
void *xcursor = dlopen("libXcursor.so.1", RTLD_NOW | RTLD_LOCAL);
if (xcursor != nullptr) {
if (!x_support_xcursor) {
_xcursor_size = -1;
if (x11display_cat.is_debug()) {
x11display_cat.debug()
<< "XCursor support is disabled; cursor changing will not work.\n";
}
} else if (void *xcursor = dlopen("libXcursor.so.1", RTLD_NOW | RTLD_LOCAL)) {
pfn_XcursorGetDefaultSize _XcursorGetDefaultSize = (pfn_XcursorGetDefaultSize)dlsym(xcursor, "XcursorGetDefaultSize");
_XcursorXcFileLoadImages = (pfn_XcursorXcFileLoadImages)dlsym(xcursor, "XcursorXcFileLoadImages");
_XcursorImagesLoadCursor = (pfn_XcursorImagesLoadCursor)dlsym(xcursor, "XcursorImagesLoadCursor");
@ -175,8 +188,14 @@ x11GraphicsPipe(const std::string &display) :
}
// Dynamically load the XRandr extension.
void *xrandr = dlopen("libXrandr.so.2", RTLD_NOW | RTLD_LOCAL);
if (xrandr != nullptr) {
if (!x_support_xrandr) {
_have_xrandr = false;
if (x11display_cat.is_debug()) {
x11display_cat.debug()
<< "XRandR support is disabled; resolution setting will not work.\n";
}
}
else if (void *xrandr = dlopen("libXrandr.so.2", RTLD_NOW | RTLD_LOCAL)) {
pfn_XRRQueryExtension _XRRQueryExtension = (pfn_XRRQueryExtension)dlsym(xrandr, "XRRQueryExtension");
pfn_XRRQueryVersion _XRRQueryVersion = (pfn_XRRQueryVersion)dlsym(xrandr, "XRRQueryVersion");
@ -238,7 +257,8 @@ x11GraphicsPipe(const std::string &display) :
// Dynamically load the XInput2 extension.
int ev, err;
if (XQueryExtension(_display, "XInputExtension", &_xi_opcode, &ev, &err)) {
if (x_support_xinput2 &&
XQueryExtension(_display, "XInputExtension", &_xi_opcode, &ev, &err)) {
void *xi = dlopen("libXi.so.6", RTLD_NOW | RTLD_LOCAL);
if (xi != nullptr) {
pfn_XIQueryVersion _XIQueryVersion = (pfn_XIQueryVersion)dlsym(xi, "XIQueryVersion");
@ -272,6 +292,8 @@ x11GraphicsPipe(const std::string &display) :
<< "cannot dlopen libXi.so.1; relative mouse mode will not work.\n";
}
}
} else {
_XISelectEvents = nullptr;
}
// Use Xrandr to fill in the supported resolution list.