X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=vid_glx.c;h=de1ac666dc29f00015a58f0553f11f7d28e0f4e8;hb=7ef262a7368c32d0e0bf7eb8bf4bbf7c79338bff;hp=48ab6c8210d8fc2725a22920002707a0408bb5f9;hpb=df8727697622029dd7a03047999ffc19b49e44ea;p=xonotic%2Fdarkplaces.git diff --git a/vid_glx.c b/vid_glx.c index 48ab6c82..de1ac666 100644 --- a/vid_glx.c +++ b/vid_glx.c @@ -17,12 +17,6 @@ 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 @@ -35,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include -#if !defined(__APPLE__) && !defined(__MACH__) +#if !defined(__APPLE__) && !defined(__MACH__) && !defined(SUNOS) #include #endif #include @@ -45,6 +39,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // Tell startup code that we have a client int cl_available = true; +// note: if we used the XRandR extension we could support refresh rates +qboolean vid_supportrefreshrate = false; + //GLX prototypes XVisualInfo *(GLAPIENTRY *qglXChooseVisual)(Display *dpy, int screen, int *attribList); GLXContext (GLAPIENTRY *qglXCreateContext)(Display *dpy, XVisualInfo *vis, GLXContext shareList, Bool direct); @@ -88,26 +85,24 @@ Atom wm_delete_window_atom; static qboolean mouse_avail = true; static qboolean vid_usingmouse = false; -static qboolean vid_usemouse = false; static qboolean vid_usingvsync = false; static qboolean vid_usevsync = false; -static qboolean ignoremousemove = false; +static qboolean vid_x11_hardwaregammasupported = false; +static int vid_x11_gammarampsize = 0; static float mouse_x, mouse_y; static int p_mouse_x, p_mouse_y; -#ifndef __APPLE__ -cvar_t vid_dga = {CVAR_SAVE, "vid_dga", "1"}; -cvar_t vid_dga_mouseaccel = {0, "vid_dga_mouseaccel", "1"}; +#if !defined(__APPLE__) && !defined(SUNOS) +// FIXME: vid_dga_mouseaccel is poorly named, it is actually the multiplier for mouse movement, not an acceleration (which would be a power function or something) +cvar_t vid_dga = {CVAR_SAVE, "vid_dga", "1", "make use of DGA mouse input"}; +cvar_t vid_dga_mouseaccel = {0, "vid_dga_mouseaccel", "1", "speed of mouse when using DGA mouse input"}; #endif qboolean vidmode_ext = false; static int win_x, win_y; -static int scr_width, scr_height; - -static XF86VidModeModeInfo **vidmodes; -static int num_vidmodes; +static XF86VidModeModeInfo init_vidmode; static qboolean vid_isfullscreen = false; static Visual *vidx11_visual; @@ -198,6 +193,7 @@ static int XLateKey(XKeyEvent *ev, char *ascii) case XK_Alt_L: case XK_Meta_L: + case XK_ISO_Level3_Shift: case XK_Alt_R: case XK_Meta_R: key = K_ALT; break; @@ -211,8 +207,10 @@ static int XLateKey(XKeyEvent *ev, char *ascii) case XK_KP_Subtract: key = K_KP_MINUS; break; case XK_KP_Divide: key = K_KP_SLASH; break; + case XK_section: key = '~'; break; + default: - if (keysym < 32 && keysym > 126) + if (keysym < 32) break; if (keysym >= 'A' && keysym <= 'Z') @@ -249,12 +247,11 @@ static Cursor CreateNullCursor(Display *display, Window root) static void IN_Activate (qboolean grab) { - if (!mouse_avail || !vidx11_display || !win) + if (!vidx11_display) return; - if (grab) { - if (!vid_usingmouse) + if (!vid_usingmouse && mouse_avail && win) { XWindowAttributes attribs_1; XSetWindowAttributes attribs_2; @@ -268,7 +265,7 @@ static void IN_Activate (qboolean grab) XGrabPointer(vidx11_display, win, True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime); -#ifndef __APPLE__ +#if !defined(__APPLE__) && !defined(SUNOS) if (vid_dga.integer) { int MajorVersion, MinorVersion; @@ -278,7 +275,7 @@ static void IN_Activate (qboolean grab) // unable to query, probably not supported Con_Print( "Failed to detect XF86DGA Mouse\n" ); Cvar_SetValueQuick(&vid_dga, 0); - XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, scr_width / 2, scr_height / 2); + XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, vid.width / 2, vid.height / 2); } else { @@ -288,12 +285,12 @@ static void IN_Activate (qboolean grab) } else #endif - XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, scr_width / 2, scr_height / 2); + XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, vid.width / 2, vid.height / 2); XGrabKeyboard(vidx11_display, win, False, GrabModeAsync, GrabModeAsync, CurrentTime); mouse_x = mouse_y = 0; - ignoremousemove = true; + cl_ignoremousemove = true; vid_usingmouse = true; } } @@ -301,23 +298,46 @@ static void IN_Activate (qboolean grab) { if (vid_usingmouse) { -#ifndef __APPLE__ - if (vid_dga.integer == 1) +#if !defined(__APPLE__) && !defined(SUNOS) + if (vid_dga.integer) XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), 0); #endif XUngrabPointer(vidx11_display, CurrentTime); XUngrabKeyboard(vidx11_display, CurrentTime); - // inviso cursor - XUndefineCursor(vidx11_display, win); + // inviso cursor + if (win) + XUndefineCursor(vidx11_display, win); - ignoremousemove = true; + cl_ignoremousemove = true; vid_usingmouse = false; } } } +static keynum_t buttonremap[18] = +{ + K_MOUSE1, + K_MOUSE3, + K_MOUSE2, + K_MWHEELUP, + K_MWHEELDOWN, + K_MOUSE4, + K_MOUSE5, + K_MOUSE6, + K_MOUSE7, + K_MOUSE8, + K_MOUSE9, + K_MOUSE10, + K_MOUSE11, + K_MOUSE12, + K_MOUSE13, + K_MOUSE14, + K_MOUSE15, + K_MOUSE16, +}; + static void HandleEvents(void) { XEvent event; @@ -350,7 +370,7 @@ static void HandleEvents(void) // mouse moved if (vid_usingmouse) { -#ifndef __APPLE__ +#if !defined(__APPLE__) && !defined(SUNOS) if (vid_dga.integer == 1) { mouse_x += event.xmotion.x_root * vid_dga_mouseaccel.value; @@ -364,7 +384,7 @@ static void HandleEvents(void) { 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) + if (abs(vid.width/2 - event.xmotion.x) > vid.width / 4 || abs(vid.height/2 - event.xmotion.y) > vid.height / 4) dowarp = true; } p_mouse_x = event.xmotion.x; @@ -377,94 +397,18 @@ static void HandleEvents(void) case ButtonPress: // mouse button pressed - switch(event.xbutton.button) - { - case 1: - Key_Event(K_MOUSE1, 0, true); - break; - case 2: - Key_Event(K_MOUSE3, 0, true); - break; - case 3: - Key_Event(K_MOUSE2, 0, true); - break; - case 4: - Key_Event(K_MWHEELUP, 0, true); - break; - case 5: - Key_Event(K_MWHEELDOWN, 0, true); - break; - case 6: - Key_Event(K_MOUSE4, 0, true); - break; - case 7: - Key_Event(K_MOUSE5, 0, true); - break; - case 8: - Key_Event(K_MOUSE6, 0, true); - break; - case 9: - Key_Event(K_MOUSE7, 0, true); - break; - case 10: - Key_Event(K_MOUSE8, 0, true); - break; - case 11: - Key_Event(K_MOUSE9, 0, true); - break; - case 12: - Key_Event(K_MOUSE10, 0, true); - break; - default: - Con_Printf("HandleEvents: ButtonPress gave value %d, 1-12 expected\n", event.xbutton.button); - break; - } + if (event.xbutton.button <= 18) + Key_Event(buttonremap[event.xbutton.button - 1], 0, true); + else + Con_Printf("HandleEvents: ButtonPress gave value %d, 1-18 expected\n", event.xbutton.button); break; case ButtonRelease: // mouse button released - switch(event.xbutton.button) - { - case 1: - Key_Event(K_MOUSE1, 0, false); - break; - case 2: - Key_Event(K_MOUSE3, 0, false); - break; - case 3: - Key_Event(K_MOUSE2, 0, false); - break; - case 4: - Key_Event(K_MWHEELUP, 0, false); - break; - case 5: - Key_Event(K_MWHEELDOWN, 0, false); - break; - case 6: - Key_Event(K_MOUSE4, 0, false); - break; - case 7: - Key_Event(K_MOUSE5, 0, false); - break; - case 8: - Key_Event(K_MOUSE6, 0, false); - break; - case 9: - Key_Event(K_MOUSE7, 0, false); - break; - case 10: - Key_Event(K_MOUSE8, 0, false); - break; - case 11: - Key_Event(K_MOUSE9, 0, false); - break; - case 12: - Key_Event(K_MOUSE10, 0, false); - break; - default: - Con_Printf("HandleEvents: ButtonRelease gave value %d, 1-12 expected\n", event.xbutton.button); - break; - } + if (event.xbutton.button <= 18) + Key_Event(buttonremap[event.xbutton.button - 1], 0, false); + else + Con_Printf("HandleEvents: ButtonRelease gave value %d, 1-18 expected\n", event.xbutton.button); break; case CreateNotify: @@ -490,13 +434,11 @@ static void HandleEvents(void) case MapNotify: // window restored vid_hidden = false; - vid_activewindow = false; VID_RestoreSystemGamma(); break; case UnmapNotify: // window iconified/rolledup/whatever vid_hidden = true; - vid_activewindow = false; VID_RestoreSystemGamma(); break; case FocusIn: @@ -520,18 +462,10 @@ static void HandleEvents(void) if (dowarp) { /* move the mouse to the window center again */ - p_mouse_x = scr_width / 2; - p_mouse_y = scr_height / 2; + p_mouse_x = vid.width / 2; + p_mouse_y = vid.height / 2; XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, p_mouse_x, p_mouse_y); } - - // if told to ignore one mouse move, do so - if (ignoremousemove) - { - ignoremousemove = false; - mouse_x = 0; - mouse_y = 0; - } } static void *prjobj = NULL; @@ -557,7 +491,7 @@ static int GL_OpenLibrary(const char *name) Con_Printf("Unable to open symbol list for %s\n", name); return false; } - strcpy(gl_driver, name); + strlcpy(gl_driver, name, sizeof(gl_driver)); return true; } @@ -565,7 +499,7 @@ void *GL_GetProcAddress(const char *name) { void *p = NULL; if (qglXGetProcAddressARB != NULL) - p = (void *) qglXGetProcAddressARB(name); + p = (void *) qglXGetProcAddressARB((GLubyte *)name); if (p == NULL) p = (void *) dlsym(prjobj, name); return p; @@ -576,20 +510,19 @@ void VID_Shutdown(void) if (!ctx || !vidx11_display) return; - vid_hidden = true; - vid_usingmouse = false; if (vidx11_display) { - VID_RestoreSystemGamma(); IN_Activate(false); + VID_RestoreSystemGamma(); // FIXME: glXDestroyContext here? if (vid_isfullscreen) - XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, vidmodes[0]); + XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, &init_vidmode); if (win) XDestroyWindow(vidx11_display, win); XCloseDisplay(vidx11_display); } + vid_hidden = true; vid_isfullscreen = false; vidx11_display = NULL; win = 0; @@ -621,20 +554,10 @@ void InitSig(void) signal(SIGTERM, signal_handler); } -/* -================= -VID_GetWindowSize -================= -*/ -void VID_GetWindowSize (int *x, int *y, int *width, int *height) +void VID_Finish (qboolean allowmousegrab) { - *x = *y = 0; - *width = scr_width; - *height = scr_height; -} + qboolean vid_usemouse; -void VID_Finish (void) -{ vid_usevsync = vid_vsync.integer && !cls.timedemo && gl_videosyncavailable; if (vid_usingvsync != vid_usevsync && gl_videosyncavailable) { @@ -643,9 +566,9 @@ void VID_Finish (void) Con_Print("glXSwapIntervalSGI didn't accept the vid_vsync change, it will take effect on next vid_restart (GLX_SGI_swap_control does not allow turning off vsync)\n"); } -// handle the mouse state when windowed if that's changed + // handle the mouse state when windowed if that's changed vid_usemouse = false; - if (vid_mouse.integer && !key_consoleactive && !cls.demoplayback) + if (allowmousegrab && vid_mouse.integer && !key_consoleactive && (key_dest != key_game || !cls.demoplayback)) vid_usemouse = true; if (!vid_activewindow) vid_usemouse = false; @@ -655,25 +578,31 @@ void VID_Finish (void) if (r_render.integer) { + CHECKGLERROR if (r_speeds.integer || gl_finish.integer) - qglFinish(); - qglXSwapBuffers(vidx11_display, win); + { + qglFinish();CHECKGLERROR + } + qglXSwapBuffers(vidx11_display, win);CHECKGLERROR } + + if (vid_x11_hardwaregammasupported) + VID_UpdateGamma(false, vid_x11_gammarampsize); } -int VID_SetGamma(unsigned short *ramps) +int VID_SetGamma(unsigned short *ramps, int rampsize) { - return XF86VidModeSetGammaRamp(vidx11_display, vidx11_screen, 256, ramps, ramps + 256, ramps + 512); + return XF86VidModeSetGammaRamp(vidx11_display, vidx11_screen, rampsize, ramps, ramps + rampsize, ramps + rampsize*2); } -int VID_GetGamma(unsigned short *ramps) +int VID_GetGamma(unsigned short *ramps, int rampsize) { - return XF86VidModeGetGammaRamp(vidx11_display, vidx11_screen, 256, ramps, ramps + 256, ramps + 512); + return XF86VidModeGetGammaRamp(vidx11_display, vidx11_screen, rampsize, ramps, ramps + rampsize, ramps + rampsize*2); } void VID_Init(void) { -#ifndef __APPLE__ +#if !defined(__APPLE__) && !defined(SUNOS) Cvar_RegisterVariable (&vid_dga); Cvar_RegisterVariable (&vid_dga_mouseaccel); #endif @@ -683,7 +612,7 @@ void VID_Init(void) mouse_avail = false; } -void VID_BuildGLXAttrib(int *attrib, int stencil) +void VID_BuildGLXAttrib(int *attrib, qboolean stencil, qboolean stereobuffer) { *attrib++ = GLX_RGBA; *attrib++ = GLX_RED_SIZE;*attrib++ = 1; @@ -697,10 +626,12 @@ void VID_BuildGLXAttrib(int *attrib, int stencil) *attrib++ = GLX_STENCIL_SIZE;*attrib++ = 8; *attrib++ = GLX_ALPHA_SIZE;*attrib++ = 1; } + if (stereobuffer) + *attrib++ = GLX_STEREO; *attrib++ = None; } -int VID_InitMode(int fullscreen, int width, int height, int bpp) +int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer) { int i; int attrib[32]; @@ -747,17 +678,18 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp) 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) + if ((qglXChooseVisual = (XVisualInfo *(GLAPIENTRY *)(Display *dpy, int screen, int *attribList))GL_GetProcAddress("glXChooseVisual")) == NULL + || (qglXCreateContext = (GLXContext (GLAPIENTRY *)(Display *dpy, XVisualInfo *vis, GLXContext shareList, Bool direct))GL_GetProcAddress("glXCreateContext")) == NULL + || (qglXDestroyContext = (void (GLAPIENTRY *)(Display *dpy, GLXContext ctx))GL_GetProcAddress("glXDestroyContext")) == NULL + || (qglXMakeCurrent = (Bool (GLAPIENTRY *)(Display *dpy, GLXDrawable drawable, GLXContext ctx))GL_GetProcAddress("glXMakeCurrent")) == NULL + || (qglXSwapBuffers = (void (GLAPIENTRY *)(Display *dpy, GLXDrawable drawable))GL_GetProcAddress("glXSwapBuffers")) == NULL + || (qglXQueryExtensionsString = (const char *(GLAPIENTRY *)(Display *dpy, int screen))GL_GetProcAddress("glXQueryExtensionsString")) == NULL) { Con_Printf("glX functions not found in %s\n", gl_driver); return false; } - VID_BuildGLXAttrib(attrib, bpp == 32); + VID_BuildGLXAttrib(attrib, bpp == 32, stereobuffer); visinfo = qglXChooseVisual(vidx11_display, vidx11_screen, attrib); if (!visinfo) { @@ -772,6 +704,14 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp) // Are we going fullscreen? If so, let's change video mode if (fullscreen) { + XF86VidModeModeLine *current_vidmode; + XF86VidModeModeInfo **vidmodes; + int num_vidmodes; + + // This nice hack comes from the SDL source code + current_vidmode = (XF86VidModeModeLine*)((char*)&init_vidmode + sizeof(init_vidmode.dotclock)); + XF86VidModeGetModeLine(vidx11_display, vidx11_screen, (int*)&init_vidmode.dotclock, current_vidmode); + XF86VidModeGetAllModeLines(vidx11_display, vidx11_screen, &num_vidmodes, &vidmodes); best_dist = 9999999; best_fit = -1; @@ -808,6 +748,8 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp) } else fullscreen = 0; + + free(vidmodes); } } @@ -853,23 +795,29 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp) ctx = qglXCreateContext(vidx11_display, visinfo, NULL, True); if (!ctx) - Sys_Error ("glXCreateContext failed\n"); + { + Con_Printf ("glXCreateContext failed\n"); + return false; + } if (!qglXMakeCurrent(vidx11_display, win, ctx)) - Sys_Error ("glXMakeCurrent failed\n"); + { + Con_Printf ("glXMakeCurrent failed\n"); + return false; + } XSync(vidx11_display, False); - scr_width = width; - scr_height = height; - - if ((qglGetString = GL_GetProcAddress("glGetString")) == NULL) - Sys_Error("glGetString not found in %s", gl_driver); + if ((qglGetString = (const GLubyte* (GLAPIENTRY *)(GLenum name))GL_GetProcAddress("glGetString")) == NULL) + { + Con_Printf ("glGetString not found in %s\n", gl_driver); + return false; + } - gl_renderer = qglGetString(GL_RENDERER); - gl_vendor = qglGetString(GL_VENDOR); - gl_version = qglGetString(GL_VERSION); - gl_extensions = qglGetString(GL_EXTENSIONS); + gl_renderer = (const char *)qglGetString(GL_RENDERER); + gl_vendor = (const char *)qglGetString(GL_VENDOR); + gl_version = (const char *)qglGetString(GL_VERSION); + gl_extensions = (const char *)qglGetString(GL_EXTENSIONS); gl_platform = "GLX"; gl_platformextensions = qglXQueryExtensionsString(vidx11_display, vidx11_screen); @@ -886,15 +834,29 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp) vid_usingmouse = false; vid_usingvsync = false; - ignoremousemove = true; vid_hidden = false; vid_activewindow = true; + vid_x11_hardwaregammasupported = XF86VidModeGetGammaRampSize(vidx11_display, vidx11_screen, &vid_x11_gammarampsize) != 0; GL_Init(); return true; } void Sys_SendKeyEvents(void) { + static qboolean sound_active = true; + + // enable/disable sound on focus gain/loss + if (!vid_activewindow && sound_active) + { + S_BlockSound (); + sound_active = false; + } + else if (vid_activewindow && !sound_active) + { + S_UnblockSound (); + sound_active = true; + } + HandleEvents(); }