X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=vid_glx.c;h=542690a6f8b6548b2b05f3bfef9e4eb7cafad47b;hp=5fa9867b6ec74b5c0ee2dcf8019a0e8f8e363f88;hb=70bd7f90c7dc5330df6154dba2d1743ed0f3ef00;hpb=241f521388f39d8145d5036ebb1969baaf98006d diff --git a/vid_glx.c b/vid_glx.c index 5fa9867b..542690a6 100644 --- a/vid_glx.c +++ b/vid_glx.c @@ -17,18 +17,18 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include -#include -#include -#include -#include -#include +//#include +//#include +//#include +//#include +//#include +//#include #include #include -#include "quakedef.h" - +#include +#include #include #include @@ -38,29 +38,58 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include +#include "quakedef.h" + +int cl_available = true; + +//GLX prototypes +XVisualInfo *(GLAPIENTRY *qglXChooseVisual)(Display *dpy, int screen, int *attribList); +GLXContext (GLAPIENTRY *qglXCreateContext)(Display *dpy, XVisualInfo *vis, GLXContext shareList, Bool direct); +void (GLAPIENTRY *qglXDestroyContext)(Display *dpy, GLXContext ctx); +Bool (GLAPIENTRY *qglXMakeCurrent)(Display *dpy, GLXDrawable drawable, GLXContext ctx); +void (GLAPIENTRY *qglXSwapBuffers)(Display *dpy, GLXDrawable drawable); +const char *(GLAPIENTRY *qglXQueryExtensionsString)(Display *dpy, int screen); + +//GLX_ARB_get_proc_address +void *(GLAPIENTRY *qglXGetProcAddressARB)(const GLubyte *procName); + +static gl_extensionfunctionlist_t getprocaddressfuncs[] = +{ + {"glXGetProcAddressARB", (void **) &qglXGetProcAddressARB}, + {NULL, NULL} +}; + +//GLX_SGI_video_sync +GLint (GLAPIENTRY *qglXGetVideoSyncSGI)(GLuint *count); +GLint (GLAPIENTRY *qglXWaitVideoSyncSGI)(int divisor, int remainder, unsigned int *count); + +static gl_extensionfunctionlist_t videosyncfuncs[] = +{ + {"glXGetVideoSyncSGI", (void **) &qglXGetVideoSyncSGI}, + {"glXWaitVideoSyncSGI", (void **) &qglXWaitVideoSyncSGI}, + {NULL, NULL} +}; + static Display *vidx11_display = NULL; static int scrnum; static Window win; static GLXContext ctx = NULL; +Atom wm_delete_window_atom; + #define KEY_MASK (KeyPressMask | KeyReleaseMask) #define MOUSE_MASK (ButtonPressMask | ButtonReleaseMask | \ PointerMotionMask | ButtonMotionMask ) #define X_MASK (KEY_MASK | MOUSE_MASK | VisibilityChangeMask | StructureNotifyMask ) -viddef_t vid; // global video state - static qboolean mouse_avail = true; static qboolean mouse_active = false, usingmouse = false; -// static qboolean dga_active; static float mouse_x, mouse_y; -static float old_mouse_x, old_mouse_y; static int p_mouse_x, p_mouse_y; cvar_t vid_dga = {CVAR_SAVE, "vid_dga", "1"}; cvar_t vid_dga_mouseaccel = {0, "vid_dga_mouseaccel", "1"}; -cvar_t m_filter = {0, "m_filter", "0"}; qboolean vidmode_ext = false; @@ -69,7 +98,6 @@ static int win_x, win_y; static int scr_width, scr_height; static XF86VidModeModeInfo **vidmodes; -//static int default_dotclock_vidmode; static int num_vidmodes; static qboolean vidmode_active = false; @@ -78,18 +106,9 @@ static Colormap vidx11_colormap; /*-----------------------------------------------------------------------*/ -float gldepthmin, gldepthmax; - -const char *gl_vendor; -const char *gl_renderer; -const char *gl_version; -const char *gl_extensions; - -/*-----------------------------------------------------------------------*/ static int -XLateKey(XKeyEvent *ev/*, qboolean modified*/) +XLateKey(XKeyEvent *ev) { -// char tmp[2]; int key = 0; KeySym keysym; @@ -183,7 +202,7 @@ XLateKey(XKeyEvent *ev/*, qboolean modified*/) { /* ASCII keys */ key = keysym; - if (/*!modified && */((key >= 'A') && (key <= 'Z'))) + if ((key >= 'A') && (key <= 'Z')) key = key + ('a' - 'A'); } break; @@ -200,7 +219,7 @@ static Cursor CreateNullCursor(Display *display, Window root) XColor dummycolour; Cursor cursor; - cursormask = XCreatePixmap(display, root, 1, 1, 1/*depth*/); + cursormask = XCreatePixmap(display, root, 1, 1, 1); xgc.function = GXclear; gc = XCreateGC(display, cursormask, GCFunction, &xgc); XFillRectangle(display, cursormask, gc, 0, 0, 1, 1); @@ -251,8 +270,6 @@ static void install_grabs(void) mouse_active = true; mouse_x = mouse_y = 0; - -// XSync(vidx11_display, True); } static void uninstall_grabs(void) @@ -275,7 +292,6 @@ static void uninstall_grabs(void) static void HandleEvents(void) { XEvent event; -// KeySym ks; qboolean dowarp = false; if (!vidx11_display) @@ -288,11 +304,17 @@ static void HandleEvents(void) switch (event.type) { case KeyPress: + // key pressed + Key_Event(XLateKey(&event.xkey), true); + break; + case KeyRelease: - Key_Event(XLateKey(&event.xkey), event.type == KeyPress); + // key released + Key_Event(XLateKey(&event.xkey), false); break; case MotionNotify: + // mouse moved if (usingmouse) { if (vid_dga.integer == 1) @@ -302,30 +324,14 @@ static void HandleEvents(void) } else { - /* - if (!p_mouse_x && !p_mouse_y) - { - Con_Printf("event->xmotion.x: %d\n", event.xmotion.x); - Con_Printf("event->xmotion.y: %d\n", event.xmotion.y); - } - */ - //if (usingmouse) - { - if (!event.xmotion.send_event) - { - mouse_x += event.xmotion.x - p_mouse_x; - mouse_y += event.xmotion.y - p_mouse_y; - if (abs(scr_width/2 - event.xmotion.x) > scr_width / 4 || abs(scr_height/2 - event.xmotion.y) > scr_height / 4) - dowarp = true; - } - } - /* - else + + if (!event.xmotion.send_event) { - mouse_x += (event.xmotion.x - p_mouse_x); - mouse_y += (event.xmotion.y - p_mouse_y); + mouse_x += event.xmotion.x - p_mouse_x; + mouse_y += event.xmotion.y - p_mouse_y; + if (abs(scr_width/2 - event.xmotion.x) > scr_width / 4 || abs(scr_height/2 - event.xmotion.y) > scr_height / 4) + dowarp = true; } - */ p_mouse_x = event.xmotion.x; p_mouse_y = event.xmotion.y; } @@ -335,6 +341,7 @@ static void HandleEvents(void) break; case ButtonPress: + // mouse button pressed switch(event.xbutton.button) { case 1: @@ -359,6 +366,7 @@ static void HandleEvents(void) break; case ButtonRelease: + // mouse button released switch(event.xbutton.button) { case 1: @@ -382,15 +390,46 @@ static void HandleEvents(void) } break; - case CreateNotify : + case CreateNotify: + // window created win_x = event.xcreatewindow.x; win_y = event.xcreatewindow.y; break; - case ConfigureNotify : + case ConfigureNotify: + // window changed size/location win_x = event.xconfigure.x; win_y = event.xconfigure.y; break; + case DestroyNotify: + // window has been destroyed + Sys_Quit(); + break; + case ClientMessage: + // window manager messages + if ((event.xclient.format == 32) && (event.xclient.data.l[0] == wm_delete_window_atom)) + Sys_Quit(); + break; + case MapNotify: + // window restored + vid_hidden = false; + break; + case UnmapNotify: + // window iconified/rolledup/whatever + vid_hidden = true; + break; + case FocusIn: + // window is now the input focus + break; + case FocusOut: + // window is no longer the input focus + break; + case EnterNotify: + // mouse entered window + break; + case LeaveNotify: + // mouse left window + break; } } @@ -435,16 +474,15 @@ void VID_Shutdown(void) if (!ctx || !vidx11_display) return; + vid_hidden = true; + usingmouse = false; if (vidx11_display) { uninstall_grabs(); + // FIXME: glXDestroyContext here? if (vidmode_active) XF86VidModeSwitchToMode(vidx11_display, scrnum, vidmodes[0]); -/* Disabled, causes a segfault during shutdown. - if (ctx) - glXDestroyContext(vidx11_display, ctx); -*/ if (win) XDestroyWindow(vidx11_display, win); XCloseDisplay(vidx11_display); @@ -453,6 +491,8 @@ void VID_Shutdown(void) vidx11_display = NULL; win = 0; ctx = NULL; + + GL_CloseLibrary(); } void signal_handler(int sig) @@ -493,13 +533,13 @@ void VID_Finish (void) int usemouse; if (r_render.integer) { - glFinish(); - glXSwapBuffers(vidx11_display, win); + qglFinish(); + qglXSwapBuffers(vidx11_display, win); } // handle the mouse state when windowed if that's changed usemouse = false; - if (vid_mouse.integer && key_dest == key_game) + if (vid_mouse.integer && !key_consoleactive) usemouse = true; if (vidmode_active) usemouse = true; @@ -599,78 +639,57 @@ int VID_SetGamma(float prescale, float gamma, float scale, float base) void VID_Init(void) { - int i; -// LordHavoc: FIXME: finish this code, we need to allocate colors before we can store them -#if 0 - int gammaattrib[] = + Cvar_RegisterVariable (&vid_dga); + Cvar_RegisterVariable (&vid_dga_mouseaccel); + InitSig(); // trap evil signals + if (COM_CheckParm ("-nomouse") || COM_CheckParm("-safe")) + mouse_avail = false; +} + +void VID_BuildGLXAttrib(int *attrib, int stencil, int gamma) +{ + *attrib++ = GLX_RGBA; + *attrib++ = GLX_RED_SIZE;*attrib++ = 1; + *attrib++ = GLX_GREEN_SIZE;*attrib++ = 1; + *attrib++ = GLX_BLUE_SIZE;*attrib++ = 1; + *attrib++ = GLX_DOUBLEBUFFER; + *attrib++ = GLX_DEPTH_SIZE;*attrib++ = 1; + if (stencil) { - GLX_RGBA, - GLX_RED_SIZE, 1, - GLX_GREEN_SIZE, 1, - GLX_BLUE_SIZE, 1, - GLX_DOUBLEBUFFER, - GLX_DEPTH_SIZE, 1, - GLX_X_VISUAL_TYPE, GLX_DIRECT_COLOR, - None - }; -#endif - int nogammaattrib[] = + *attrib++ = GLX_STENCIL_SIZE;*attrib++ = 8; + } + if (gamma) { - GLX_RGBA, - GLX_RED_SIZE, 1, - GLX_GREEN_SIZE, 1, - GLX_BLUE_SIZE, 1, - GLX_DOUBLEBUFFER, - GLX_DEPTH_SIZE, 1, - None + *attrib++ = GLX_X_VISUAL_TYPE;*attrib++ = GLX_DIRECT_COLOR; }; -// char gldir[MAX_OSPATH]; - int width = 640, height = 480; + *attrib++ = None; +} + +int VID_InitMode(int fullscreen, int width, int height, int bpp, int stencil) +{ + int i; + int attrib[32]; XSetWindowAttributes attr; unsigned long mask; Window root; XVisualInfo *visinfo; - qboolean fullscreen = true; int MajorVersion, MinorVersion; + const char *drivername; - Cvar_RegisterVariable (&vid_dga); - Cvar_RegisterVariable (&vid_dga_mouseaccel); - Cvar_RegisterVariable (&m_filter); - -// interpret command-line params - -// set vid parameters - if ((i = COM_CheckParm("-window")) != 0) - fullscreen = false; - - if ((i = COM_CheckParm("-width")) != 0) - width = atoi(com_argv[i+1]); - - if ((i = COM_CheckParm("-height")) != 0) - height = atoi(com_argv[i+1]); - - if ((i = COM_CheckParm("-conwidth")) != 0) - vid.conwidth = atoi(com_argv[i+1]); - else - vid.conwidth = 640; - - vid.conwidth &= 0xfff8; // make it a multiple of eight - - if (vid.conwidth < 320) - vid.conwidth = 320; - - // pick a conheight that matches with correct aspect - vid.conheight = vid.conwidth*3 / 4; - - if ((i = COM_CheckParm("-conheight")) != 0) - vid.conheight = atoi(com_argv[i+1]); - if (vid.conheight < 200) - vid.conheight = 200; + drivername = "libGL.so.1"; + i = COM_CheckParm("-gl_driver"); + if (i && i < com_argc - 1) + drivername = com_argv[i + 1]; + if (!GL_OpenLibrary(drivername)) + { + Con_Printf("Unable to load GL driver \"%s\"\n", drivername); + return false; + } if (!(vidx11_display = XOpenDisplay(NULL))) { - fprintf(stderr, "Error couldn't open the X display\n"); - exit(1); + Con_Printf("Couldn't open the X display\n"); + return false; } scrnum = DefaultScreen(vidx11_display); @@ -686,19 +705,33 @@ void VID_Init(void) vidmode_ext = true; } + if ((qglXChooseVisual = GL_GetProcAddress("glXChooseVisual")) == NULL + || (qglXCreateContext = GL_GetProcAddress("glXCreateContext")) == NULL + || (qglXMakeCurrent = GL_GetProcAddress("glXMakeCurrent")) == NULL + || (qglXSwapBuffers = GL_GetProcAddress("glXSwapBuffers")) == NULL + || (qglXQueryExtensionsString = GL_GetProcAddress("glXQueryExtensionsString")) == NULL) + { + Con_Printf("glX functions not found in %s\n", gl_driver); + return false; + } + visinfo = NULL; // LordHavoc: FIXME: finish this code, we need to allocate colors before we can store them #if 0 if (!COM_CheckParm("-nogamma")) - visinfo = glXChooseVisual(vidx11_display, scrnum, gammaattrib); + { + VID_BuildGLXAttrib(attrib, stencil, true); + visinfo = qglXChooseVisual(vidx11_display, scrnum, attrib); + } #endif if (!visinfo) { - visinfo = glXChooseVisual(vidx11_display, scrnum, nogammaattrib); + VID_BuildGLXAttrib(attrib, stencil, false); + visinfo = qglXChooseVisual(vidx11_display, scrnum, attrib); if (!visinfo) { - fprintf(stderr, "qkHack: Error couldn't get an RGB, Double-buffered, Depth visual\n"); - exit(1); + Con_Printf("Couldn't get an RGB, Double-buffered, Depth visual\n"); + return false; } } @@ -772,6 +805,11 @@ void VID_Init(void) XStoreName(vidx11_display, win, gamename); XMapWindow(vidx11_display, win); + // LordHavoc: making the close button on a window do the right thing + // seems to involve this mess, sigh... + wm_delete_window_atom = XInternAtom(vidx11_display, "WM_DELETE_WINDOW", false); + XSetWMProtocols(vidx11_display, win, &wm_delete_window_atom, 1); + if (vidmode_active) { XMoveWindow(vidx11_display, win, 0, 0); @@ -782,28 +820,37 @@ void VID_Init(void) XF86VidModeSetViewPort(vidx11_display, scrnum, 0, 0); } - XFlush(vidx11_display); + //XSync(vidx11_display, False); + + ctx = qglXCreateContext(vidx11_display, visinfo, NULL, True); + if (!ctx) + Sys_Error ("glXCreateContext failed\n"); - ctx = glXCreateContext(vidx11_display, visinfo, NULL, True); + if (!qglXMakeCurrent(vidx11_display, win, ctx)) + Sys_Error ("glXMakeCurrent failed\n"); - glXMakeCurrent(vidx11_display, win, ctx); + XSync(vidx11_display, False); scr_width = width; scr_height = height; - if (vid.conheight > height) - vid.conheight = height; - if (vid.conwidth > width) - vid.conwidth = width; + if ((qglGetString = GL_GetProcAddress("glGetString")) == NULL) + Sys_Error("glGetString not found in %s", gl_driver); - InitSig(); // trap evil signals - - GL_Init(); + gl_renderer = qglGetString(GL_RENDERER); + gl_vendor = qglGetString(GL_VENDOR); + gl_version = qglGetString(GL_VERSION); + gl_extensions = qglGetString(GL_EXTENSIONS); + gl_platform = "GLX"; + gl_platformextensions = qglXQueryExtensionsString(vidx11_display, scrnum); - Con_SafePrintf ("Video mode %dx%d initialized.\n", width, height); + GL_CheckExtension("GLX_ARB_get_proc_address", getprocaddressfuncs, "-nogetprocaddress", false); + gl_videosyncavailable = GL_CheckExtension("GLX_SGI_video_sync", videosyncfuncs, "-novideosync", false); - // force a surface cache flush -// vid.recalc_refdef = 1; + usingmouse = false; + vid_hidden = false; + GL_Init(); + return true; } void Sys_SendKeyEvents(void) @@ -811,16 +858,6 @@ void Sys_SendKeyEvents(void) HandleEvents(); } -void IN_Init(void) -{ - if (COM_CheckParm ("-nomouse")) - mouse_avail = false; -} - -void IN_Shutdown(void) -{ -} - /* =========== IN_Commands @@ -830,53 +867,47 @@ void IN_Commands (void) { } -/* -=========== -IN_Move -=========== -*/ -void IN_MouseMove (usercmd_t *cmd) +void IN_Move (usercmd_t *cmd) { - if (!mouse_avail) - return; - - if (m_filter.integer) - { - mouse_x = (mouse_x + old_mouse_x) * 0.5; - mouse_y = (mouse_y + old_mouse_y) * 0.5; - - old_mouse_x = mouse_x; - old_mouse_y = mouse_y; - } - - // LordHavoc: viewzoom affects mouse sensitivity for sniping - mouse_x *= sensitivity.value * cl.viewzoom; - mouse_y *= sensitivity.value * cl.viewzoom; - - if (in_strafe.state & 1) - cmd->sidemove += m_side.value * mouse_x; - else - cl.viewangles[YAW] -= m_yaw.value * mouse_x; + if (mouse_avail) + IN_Mouse(cmd, mouse_x, mouse_y); + mouse_x = 0; + mouse_y = 0; +} - //if (freelook) - V_StopPitchDrift (); +static void *prjobj = NULL; - if (/*freelook && */!(in_strafe.state & 1)) - cl.viewangles[PITCH] += m_pitch.value * mouse_y; - else +int GL_OpenLibrary(const char *name) +{ + Con_Printf("Loading GL driver %s\n", name); + GL_CloseLibrary(); + if (!(prjobj = dlopen(name, RTLD_LAZY))) { - if ((in_strafe.state & 1) && noclip_anglehack) - cmd->upmove -= m_forward.value * mouse_y; - else - cmd->forwardmove -= m_forward.value * mouse_y; + Con_Printf("Unable to open symbol list for %s\n", name); + return false; } - mouse_x = mouse_y = 0.0; + strcpy(gl_driver, name); + return true; } -void IN_Move (usercmd_t *cmd) +void GL_CloseLibrary(void) { - IN_MouseMove(cmd); - cl.viewangles[PITCH] = bound (in_pitch_min.value, cl.viewangles[PITCH], in_pitch_max.value); + if (prjobj) + dlclose(prjobj); + prjobj = NULL; + gl_driver[0] = 0; + qglXGetProcAddressARB = NULL; + gl_extensions = ""; + gl_platform = ""; + gl_platformextensions = ""; } - +void *GL_GetProcAddress(const char *name) +{ + void *p = NULL; + if (qglXGetProcAddressARB != NULL) + p = (void *) qglXGetProcAddressARB(name); + if (p == NULL) + p = (void *) dlsym(prjobj, name); + return p; +}