mirror
/
ClassiCube
mirror of https://github.com/ClassiCube/ClassiCube
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

X11: Try to log default depth/visual ID too

This commit is contained in:
UnknownShadow200 2025-10-26 08:00:45 +11:00
parent e334105074
commit f2b9b42437
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Window_X11.c
View File

@ -346,7 +346,7 @@ static void ApplyIcon(Window win) {
(unsigned char*)CCIcon_Data, CCIcon_Size); (unsigned char*)CCIcon_Data, CCIcon_Size);
} }
static XVisualInfo Select2DVisual(void) { static XVisualInfo GetDefaultVisual(void) {
XVisualInfo info = { 0 }; XVisualInfo info = { 0 };
int screen = DefaultScreen(win_display); int screen = DefaultScreen(win_display);
info.depth = DefaultDepth(win_display, screen); info.depth = DefaultDepth(win_display, screen);
@ -354,6 +354,8 @@ static XVisualInfo Select2DVisual(void) {
return info; return info;
} }
#define GetVisualID(viz) (viz.visual ? viz.visual->visualid : 0)
static void DoCreateWindow(int width, int height, int _2d) { static void DoCreateWindow(int width, int height, int _2d) {
XSetWindowAttributes attributes = { 0 }; XSetWindowAttributes attributes = { 0 };
XSizeHints hints = { 0 }; XSizeHints hints = { 0 };
@ -367,14 +369,16 @@ static void DoCreateWindow(int width, int height, int _2d) {
y = Display_CentreY(height); y = Display_CentreY(height);
RegisterAtoms(); RegisterAtoms();
#if CC_GFX_BACKEND_IS_GL() win_visual = GetDefaultVisual();
win_visual = _2d ? Select2DVisual() : GLContext_SelectVisual(); visualID = GetVisualID(win_visual);
#else Platform_Log2("Display defaults (depth: %i, visual: %h)", &win_visual.depth, &visualID);
win_visual = Select2DVisual();
#endif
visualID = win_visual.visual ? win_visual.visual->visualid : 0;
#if CC_GFX_BACKEND_IS_GL()
if (!_2d) win_visual = GLContext_SelectVisual();
#endif
visualID = GetVisualID(win_visual);
Platform_Log2("Creating window (depth: %i, visual: %h)", &win_visual.depth, &visualID); Platform_Log2("Creating window (depth: %i, visual: %h)", &win_visual.depth, &visualID);
attributes.colormap = XCreateColormap(win_display, win_rootWin, win_visual.visual, AllocNone); attributes.colormap = XCreateColormap(win_display, win_rootWin, win_visual.visual, AllocNone);
attributes.event_mask = win_eventMask; attributes.event_mask = win_eventMask;
@ -1430,7 +1434,7 @@ void Window_DisableRawMouse(void) {
*#########################################################################################################################*/ *#########################################################################################################################*/
#if CC_GFX_BACKEND_IS_GL() && defined CC_BUILD_EGL #if CC_GFX_BACKEND_IS_GL() && defined CC_BUILD_EGL
static XVisualInfo GLContext_SelectVisual(void) { static XVisualInfo GLContext_SelectVisual(void) {
XVisualInfo info = Select2DVisual(); XVisualInfo info = GetDefaultVisual();
ctx_visualID = info.visual ? info.visual->visualid : 0; ctx_visualID = info.visual ? info.visual->visualid : 0;
return info; return info;
} }