Bananymous/xbanan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Bananymous:7be8edada72ed6eaa47625e24181fe3e61e8d6a1
Branches Tags
Bananymous:main
...
compare: Bananymous:main
Branches Tags
Bananymous:main

3 Commits
7be8edada7 ... main

Author SHA1 Message Date
Oskari Alaranta
b2c642f03d Don't make SHM extension dependent option 
This was here because I though banan-os didn't define them, but they do
exist there :^)
 2026-04-15 19:23:34 +03:00
Oskari Alaranta
654e878165 Allow compiling with just xorgproto installed 2026-04-15 19:22:56 +03:00
Oskari Alaranta
5076d3bbaf Add missing sys/socket.h include 2026-04-15 18:53:45 +03:00
3 changed files with 51 additions and 55 deletions
Expand all files Collapse all files

7
xbanan/CMakeLists.txt
View File

@@ -12,12 +12,7 @@ set(SOURCES
) )
option(ENABLE_GLX "enable glx extension" ON) option(ENABLE_GLX "enable glx extension" ON)
option(ENABLE_SHM "enable shm extension" ON)
include(CheckSymbolExists)
include(CMakeDependentOption)
check_symbol_exists(shmat "sys/shm.h" HAVE_SHMAT)
check_symbol_exists(shmdt "sys/shm.h" HAVE_SHMDT)
cmake_dependent_option(ENABLE_SHM "enable shm extension" ON "HAVE_SHMAT;HAVE_SHMDT" OFF)
if(ENABLE_GLX) if(ENABLE_GLX)
set(SOURCES ${SOURCES} ExtGLX.cpp) set(SOURCES ${SOURCES} ExtGLX.cpp)

98
xbanan/ExtGLX.cpp
View File

@@ -1,63 +1,63 @@
#include "Extensions.h" #include "Extensions.h"
#include "Utils.h" #include "Utils.h"
#include <GL/glx.h>
#include <GL/glxproto.h> #include <GL/glxproto.h>
#include <GL/glxtokens.h>
using BOOL32 = CARD32; using BOOL32 = CARD32;
CARD32 g_fb_configs[2][24][2] { CARD32 g_fb_configs[2][24][2] {
{ {
{ GLX_FBCONFIG_ID, 1 }, { GLX_FBCONFIG_ID, 1 },
{ GLX_VISUAL_ID, g_visual.visualID }, { GLX_VISUAL_ID, g_visual.visualID },
{ GLX_BUFFER_SIZE, 32 }, { GLX_BUFFER_SIZE, 32 },
{ GLX_LEVEL, 0 }, { GLX_LEVEL, 0 },
{ GLX_DOUBLEBUFFER, True }, { GLX_DOUBLEBUFFER, xTrue },
{ GLX_STEREO, False }, { GLX_STEREO, xFalse },
{ GLX_RENDER_TYPE, GLX_RGBA_BIT }, { GLX_RENDER_TYPE, GLX_RGBA_BIT },
{ GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT }, { GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT },
{ GLX_X_RENDERABLE, True }, { GLX_X_RENDERABLE, xTrue },
{ GLX_X_VISUAL_TYPE, GLX_TRUE_COLOR }, { GLX_X_VISUAL_TYPE, GLX_TRUE_COLOR },
{ GLX_CONFIG_CAVEAT, GLX_NONE }, { GLX_CONFIG_CAVEAT, GLX_NONE },
{ GLX_TRANSPARENT_TYPE, GLX_NONE }, { GLX_TRANSPARENT_TYPE, GLX_NONE },
{ GLX_RED_SIZE, 8 }, { GLX_RED_SIZE, 8 },
{ GLX_GREEN_SIZE, 8 }, { GLX_GREEN_SIZE, 8 },
{ GLX_BLUE_SIZE, 8 }, { GLX_BLUE_SIZE, 8 },
{ GLX_ALPHA_SIZE, 8 }, { GLX_ALPHA_SIZE, 8 },
{ GLX_DEPTH_SIZE, 24 }, { GLX_DEPTH_SIZE, 24 },
{ GLX_STENCIL_SIZE, 8 }, { GLX_STENCIL_SIZE, 8 },
{ GLX_ACCUM_RED_SIZE, 0 }, { GLX_ACCUM_RED_SIZE, 0 },
{ GLX_ACCUM_GREEN_SIZE, 0 }, { GLX_ACCUM_GREEN_SIZE, 0 },
{ GLX_ACCUM_BLUE_SIZE, 0 }, { GLX_ACCUM_BLUE_SIZE, 0 },
{ GLX_ACCUM_ALPHA_SIZE, 0 }, { GLX_ACCUM_ALPHA_SIZE, 0 },
{ GLX_SAMPLE_BUFFERS, 0 }, { GLX_SAMPLE_BUFFERS_SGIS, 0 },
{ GLX_SAMPLES, 0 }, { GLX_SAMPLES_SGIS, 0 },
}, },
{ {
{ GLX_FBCONFIG_ID, 2 }, { GLX_FBCONFIG_ID, 2 },
{ GLX_VISUAL_ID, g_visual.visualID }, { GLX_VISUAL_ID, g_visual.visualID },
{ GLX_BUFFER_SIZE, 32 }, { GLX_BUFFER_SIZE, 32 },
{ GLX_LEVEL, 0 }, { GLX_LEVEL, 0 },
{ GLX_DOUBLEBUFFER, False }, { GLX_DOUBLEBUFFER, xFalse },
{ GLX_STEREO, False }, { GLX_STEREO, xFalse },
{ GLX_RENDER_TYPE, GLX_RGBA_BIT }, { GLX_RENDER_TYPE, GLX_RGBA_BIT },
{ GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT }, { GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT },
{ GLX_X_RENDERABLE, True }, { GLX_X_RENDERABLE, xTrue },
{ GLX_X_VISUAL_TYPE, GLX_TRUE_COLOR }, { GLX_X_VISUAL_TYPE, GLX_TRUE_COLOR },
{ GLX_CONFIG_CAVEAT, GLX_NONE }, { GLX_CONFIG_CAVEAT, GLX_NONE },
{ GLX_TRANSPARENT_TYPE, GLX_NONE }, { GLX_TRANSPARENT_TYPE, GLX_NONE },
{ GLX_RED_SIZE, 8 }, { GLX_RED_SIZE, 8 },
{ GLX_GREEN_SIZE, 8 }, { GLX_GREEN_SIZE, 8 },
{ GLX_BLUE_SIZE, 8 }, { GLX_BLUE_SIZE, 8 },
{ GLX_ALPHA_SIZE, 8 }, { GLX_ALPHA_SIZE, 8 },
{ GLX_DEPTH_SIZE, 24 }, { GLX_DEPTH_SIZE, 24 },
{ GLX_STENCIL_SIZE, 8 }, { GLX_STENCIL_SIZE, 8 },
{ GLX_ACCUM_RED_SIZE, 0 }, { GLX_ACCUM_RED_SIZE, 0 },
{ GLX_ACCUM_GREEN_SIZE, 0 }, { GLX_ACCUM_GREEN_SIZE, 0 },
{ GLX_ACCUM_BLUE_SIZE, 0 }, { GLX_ACCUM_BLUE_SIZE, 0 },
{ GLX_ACCUM_ALPHA_SIZE, 0 }, { GLX_ACCUM_ALPHA_SIZE, 0 },
{ GLX_SAMPLE_BUFFERS, 0 }, { GLX_SAMPLE_BUFFERS_SGIS, 0 },
{ GLX_SAMPLES, 0 }, { GLX_SAMPLES_SGIS, 0 },
}, },
}; };

1
xbanan/main.cpp
View File

@@ -7,6 +7,7 @@
#include <signal.h> #include <signal.h>
#include <sys/epoll.h> #include <sys/epoll.h>
#include <sys/socket.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>