X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=vid_glx.c;h=4050a1c8f531ca5b90cf4bf2d05ecb2371ef628d;hb=eb59c580e111af2abb37775ef320151776fe84d1;hp=4135f726b00bbe224a40e6edcb4c5c0edf7b1306;hpb=dd7e9b3ed67aa77575442a2fa7f1f2df947cfe07;p=xonotic%2Fdarkplaces.git diff --git a/vid_glx.c b/vid_glx.c index 4135f726..4050a1c8 100644 --- a/vid_glx.c +++ b/vid_glx.c @@ -17,31 +17,36 @@ 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 // TODO possibly ifdef this out on non-supporting systems... Solaris (as always)? #include +#include "quakedef.h" + #include #include +#include #include +#if !defined(__APPLE__) && !defined(__MACH__) && !defined(SUNOS) #include +#endif #include -#include "quakedef.h" +#include "nexuiz.xpm" +#include "darkplaces.xpm" +// 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); @@ -59,14 +64,12 @@ static dllfunction_t getprocaddressfuncs[] = {NULL, NULL} }; -//GLX_SGI_video_sync -GLint (GLAPIENTRY *qglXGetVideoSyncSGI)(GLuint *count); -GLint (GLAPIENTRY *qglXWaitVideoSyncSGI)(GLint divisor, GLint remainder, GLuint *count); +//GLX_SGI_swap_control +GLint (GLAPIENTRY *qglXSwapIntervalSGI)(GLint interval); -static dllfunction_t videosyncfuncs[] = +static dllfunction_t swapcontrolfuncs[] = { - {"glXGetVideoSyncSGI", (void **) &qglXGetVideoSyncSGI}, - {"glXWaitVideoSyncSGI", (void **) &qglXWaitVideoSyncSGI}, + {"glXSwapIntervalSGI", (void **) &qglXSwapIntervalSGI}, {NULL, NULL} }; @@ -85,23 +88,27 @@ Atom wm_delete_window_atom; LeaveWindowMask) -static qboolean mouse_avail = true; -static qboolean mouse_active = false, usingmouse = false; -static float mouse_x, mouse_y; -static int p_mouse_x, p_mouse_y; +static qboolean mouse_avail = true; +static qboolean vid_usingmousegrab = false; +static qboolean vid_usingmouse = false; +static qboolean vid_usinghidecursor = false; +static qboolean vid_usingvsync = false; +static qboolean vid_usevsync = false; +static qboolean vid_x11_hardwaregammasupported = false; +static qboolean vid_x11_dgasupported = false; +static int vid_x11_gammarampsize = 0; -cvar_t vid_dga = {CVAR_SAVE, "vid_dga", "1"}; -cvar_t vid_dga_mouseaccel = {0, "vid_dga_mouseaccel", "1"}; +#if !defined(__APPLE__) && !defined(SUNOS) +cvar_t vid_dgamouse = {CVAR_SAVE, "vid_dgamouse", "1", "make use of DGA mouse input"}; +static qboolean vid_usingdgamouse = false; +#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 qboolean vidmode_active = false; +static XF86VidModeModeInfo init_vidmode; +static qboolean vid_isfullscreen = false; static Visual *vidx11_visual; static Colormap vidx11_colormap; @@ -191,6 +198,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; @@ -199,13 +207,15 @@ static int XLateKey(XKeyEvent *ev, char *ascii) case XK_Insert:key = K_INS; break; case XK_KP_Insert: key = K_KP_INS; break; - case XK_KP_Multiply: key = '*'; break; + case XK_KP_Multiply: key = K_KP_MULTIPLY; break; case XK_KP_Add: key = K_KP_PLUS; break; 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') @@ -240,63 +250,116 @@ static Cursor CreateNullCursor(Display *display, Window root) return cursor; } -static void install_grabs(void) +void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecursor) { - XWindowAttributes attribs_1; - XSetWindowAttributes attribs_2; + qboolean usedgamouse; - XGetWindowAttributes(vidx11_display, win, &attribs_1); - attribs_2.event_mask = attribs_1.your_event_mask | KEY_MASK | MOUSE_MASK; - XChangeWindowAttributes(vidx11_display, win, CWEventMask, &attribs_2); + if (!vidx11_display || !win) + return; -// inviso cursor - XDefineCursor(vidx11_display, win, CreateNullCursor(vidx11_display, win)); + if (relative) + fullscreengrab = true; - XGrabPointer(vidx11_display, win, True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime); + if (!mouse_avail) + fullscreengrab = relative = hidecursor = false; - if (vid_dga.integer) - { - int MajorVersion, MinorVersion; + usedgamouse = relative && vid_dgamouse.integer; +#if !defined(__APPLE__) && !defined(SUNOS) + if (!vid_x11_dgasupported) + usedgamouse = false; + if (fullscreengrab && vid_usingmouse && (vid_usingdgamouse != usedgamouse)) + VID_SetMouse(false, false, false); // ungrab first! +#endif - if (!XF86DGAQueryVersion(vidx11_display, &MajorVersion, &MinorVersion)) + if (vid_usingmousegrab != fullscreengrab) + { + vid_usingmousegrab = fullscreengrab; + cl_ignoremousemoves = 2; + if (fullscreengrab) { - // unable to query, probalby not supported - Con_Printf( "Failed to detect XF86DGA Mouse\n" ); - vid_dga.integer = 0; + XGrabPointer(vidx11_display, win, True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime); + if (vid_grabkeyboard.integer || vid_isfullscreen) + XGrabKeyboard(vidx11_display, win, False, GrabModeAsync, GrabModeAsync, CurrentTime); } else { - vid_dga.integer = 1; - XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), XF86DGADirectMouse); - XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, 0, 0); + XUngrabPointer(vidx11_display, CurrentTime); + XUngrabKeyboard(vidx11_display, CurrentTime); } } - else - XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, scr_width / 2, scr_height / 2); - - XGrabKeyboard(vidx11_display, win, False, GrabModeAsync, GrabModeAsync, CurrentTime); - mouse_active = true; - mouse_x = mouse_y = 0; -} - -static void uninstall_grabs(void) -{ - if (!vidx11_display || !win) - return; + if (relative) + { + if (!vid_usingmouse) + { + XWindowAttributes attribs_1; + XSetWindowAttributes attribs_2; - if (vid_dga.integer == 1) - XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), 0); + XGetWindowAttributes(vidx11_display, win, &attribs_1); + attribs_2.event_mask = attribs_1.your_event_mask | KEY_MASK | MOUSE_MASK; + XChangeWindowAttributes(vidx11_display, win, CWEventMask, &attribs_2); - XUngrabPointer(vidx11_display, CurrentTime); - XUngrabKeyboard(vidx11_display, CurrentTime); +#if !defined(__APPLE__) && !defined(SUNOS) + vid_usingdgamouse = usedgamouse; + if (usedgamouse) + { + XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), XF86DGADirectMouse); + XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, 0, 0); + } + else +#endif + XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, vid.width / 2, vid.height / 2); -// inviso cursor - XUndefineCursor(vidx11_display, win); + cl_ignoremousemoves = 2; + vid_usingmouse = true; + } + } + else + { + if (vid_usingmouse) + { +#if !defined(__APPLE__) && !defined(SUNOS) + if (vid_usingdgamouse) + XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), 0); + vid_usingdgamouse = false; +#endif + cl_ignoremousemoves = 2; + vid_usingmouse = false; + } + } - mouse_active = false; + if (vid_usinghidecursor != hidecursor) + { + vid_usinghidecursor = hidecursor; + if (hidecursor) + XDefineCursor(vidx11_display, win, CreateNullCursor(vidx11_display, win)); + else + XUndefineCursor(vidx11_display, win); + } } +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; @@ -327,121 +390,45 @@ static void HandleEvents(void) case MotionNotify: // mouse moved - if (usingmouse) + if (vid_usingmouse) { - if (vid_dga.integer == 1) +#if !defined(__APPLE__) && !defined(SUNOS) + if (vid_usingdgamouse) { - mouse_x += event.xmotion.x_root * vid_dga_mouseaccel.value; - mouse_y += event.xmotion.y_root * vid_dga_mouseaccel.value; + in_mouse_x += event.xmotion.x_root; + in_mouse_y += event.xmotion.y_root; } else +#endif { - 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) + in_mouse_x += event.xmotion.x - in_windowmouse_x; + in_mouse_y += event.xmotion.y - in_windowmouse_y; + //if (abs(vid.width/2 - event.xmotion.x) + abs(vid.height/2 - event.xmotion.y)) + 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; - p_mouse_y = event.xmotion.y; } } - else - ui_mouseupdate(event.xmotion.x, event.xmotion.y); + in_windowmouse_x = event.xmotion.x; + in_windowmouse_y = event.xmotion.y; break; 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: @@ -454,33 +441,44 @@ static void HandleEvents(void) // window changed size/location win_x = event.xconfigure.x; win_y = event.xconfigure.y; + if(vid_resizable.integer < 2) + { + vid.width = event.xconfigure.width; + vid.height = event.xconfigure.height; + } break; case DestroyNotify: // window has been destroyed - Sys_Quit(); + Sys_Quit(0); break; case ClientMessage: // window manager messages if ((event.xclient.format == 32) && ((unsigned int)event.xclient.data.l[0] == wm_delete_window_atom)) - Sys_Quit(); + Sys_Quit(0); break; case MapNotify: + if (vid.fullscreen) + break; // window restored vid_hidden = false; - vid_activewindow = false; VID_RestoreSystemGamma(); break; case UnmapNotify: + if (vid.fullscreen) + break; // window iconified/rolledup/whatever vid_hidden = true; - vid_activewindow = false; VID_RestoreSystemGamma(); break; case FocusIn: + if (vid.fullscreen) + break; // window is now the input focus vid_activewindow = true; break; case FocusOut: + if (vid.fullscreen) + break; // window is no longer the input focus vid_activewindow = false; VID_RestoreSystemGamma(); @@ -497,36 +495,54 @@ 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; - XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, p_mouse_x, p_mouse_y); + // we'll catch the warp motion by its send_event flag, updating the + // stored mouse position without adding any delta motion + XEvent event; + event.type = MotionNotify; + event.xmotion.display = vidx11_display; + event.xmotion.window = win; + event.xmotion.x = vid.width / 2; + event.xmotion.y = vid.height / 2; + XSendEvent(vidx11_display, win, False, PointerMotionMask, &event); + XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, vid.width / 2, vid.height / 2); } - } -static void IN_DeactivateMouse( void ) +static void *prjobj = NULL; + +static void GL_CloseLibrary(void) { - if (!mouse_avail || !vidx11_display || !win) - return; + if (prjobj) + dlclose(prjobj); + prjobj = NULL; + gl_driver[0] = 0; + qglXGetProcAddressARB = NULL; + gl_extensions = ""; + gl_platform = ""; + gl_platformextensions = ""; +} - if (mouse_active) +static int GL_OpenLibrary(const char *name) +{ + Con_Printf("Loading OpenGL driver %s\n", name); + GL_CloseLibrary(); + if (!(prjobj = dlopen(name, RTLD_LAZY | RTLD_GLOBAL))) { - uninstall_grabs(); - mouse_active = false; + Con_Printf("Unable to open symbol list for %s\n", name); + return false; } + strlcpy(gl_driver, name, sizeof(gl_driver)); + return true; } -static void IN_ActivateMouse( void ) +void *GL_GetProcAddress(const char *name) { - if (!mouse_avail || !vidx11_display || !win) - return; - - if (!mouse_active) - { - mouse_x = mouse_y = 0; // don't spazz - install_grabs(); - mouse_active = true; - } + void *p = NULL; + if (qglXGetProcAddressARB != NULL) + p = (void *) qglXGetProcAddressARB((GLubyte *)name); + if (p == NULL) + p = (void *) dlsym(prjobj, name); + return p; } void VID_Shutdown(void) @@ -534,21 +550,18 @@ void VID_Shutdown(void) if (!ctx || !vidx11_display) return; + VID_SetMouse(false, false, false); + VID_RestoreSystemGamma(); + + // FIXME: glXDestroyContext here? + if (vid_isfullscreen) + XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, &init_vidmode); + if (win) + XDestroyWindow(vidx11_display, win); + XCloseDisplay(vidx11_display); + vid_hidden = true; - usingmouse = false; - if (vidx11_display) - { - VID_RestoreSystemGamma(); - uninstall_grabs(); - - // FIXME: glXDestroyContext here? - if (vidmode_active) - XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, vidmodes[0]); - if (win) - XDestroyWindow(vidx11_display, win); - XCloseDisplay(vidx11_display); - } - vidmode_active = false; + vid_isfullscreen = false; vidx11_display = NULL; win = 0; ctx = NULL; @@ -559,10 +572,9 @@ void VID_Shutdown(void) void signal_handler(int sig) { - printf("Received signal %d, exiting...\n", sig); + Con_Printf("Received signal %d, exiting...\n", sig); VID_RestoreSystemGamma(); - Sys_Quit(); - exit(0); + Sys_Quit(1); } void InitSig(void) @@ -579,99 +591,99 @@ void InitSig(void) signal(SIGTERM, signal_handler); } -/* -================= -VID_GetWindowSize -================= -*/ -void VID_GetWindowSize (int *x, int *y, int *width, int *height) -{ - *x = *y = 0; - *width = scr_width; - *height = scr_height; -} - void VID_Finish (void) { - int usemouse; - if (r_render.integer) + vid_usevsync = vid_vsync.integer && !cls.timedemo && gl_videosyncavailable; + if (vid_usingvsync != vid_usevsync && gl_videosyncavailable) { - qglFinish(); - qglXSwapBuffers(vidx11_display, win); + vid_usingvsync = vid_usevsync; + if (qglXSwapIntervalSGI (vid_usevsync)) + 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 - usemouse = false; - if (vid_mouse.integer && !key_consoleactive) - usemouse = true; - if (vidmode_active) - usemouse = true; - if (usemouse) - { - if (!usingmouse) - { - usingmouse = true; - IN_ActivateMouse (); - } - } - else + if (r_render.integer) { - if (usingmouse) + CHECKGLERROR + if (r_speeds.integer || gl_finish.integer) { - usingmouse = false; - IN_DeactivateMouse (); + 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) { - Cvar_RegisterVariable (&vid_dga); - Cvar_RegisterVariable (&vid_dga_mouseaccel); +#if !defined(__APPLE__) && !defined(SUNOS) + Cvar_RegisterVariable (&vid_dgamouse); +#endif InitSig(); // trap evil signals - if (COM_CheckParm ("-nomouse") || COM_CheckParm("-safe")) +// COMMANDLINEOPTION: Input: -nomouse disables mouse support (see also vid_mouse cvar) + if (COM_CheckParm ("-nomouse")) mouse_avail = false; } -void VID_BuildGLXAttrib(int *attrib, int stencil) +void VID_BuildGLXAttrib(int *attrib, qboolean stencil, qboolean stereobuffer, int samples) { *attrib++ = GLX_RGBA; - *attrib++ = GLX_RED_SIZE;*attrib++ = 1; - *attrib++ = GLX_GREEN_SIZE;*attrib++ = 1; - *attrib++ = GLX_BLUE_SIZE;*attrib++ = 1; + *attrib++ = GLX_RED_SIZE;*attrib++ = stencil ? 8 : 5; + *attrib++ = GLX_GREEN_SIZE;*attrib++ = stencil ? 8 : 5; + *attrib++ = GLX_BLUE_SIZE;*attrib++ = stencil ? 8 : 5; *attrib++ = GLX_DOUBLEBUFFER; - *attrib++ = GLX_DEPTH_SIZE;*attrib++ = 1; + *attrib++ = GLX_DEPTH_SIZE;*attrib++ = stencil ? 24 : 16; // if stencil is enabled, ask for alpha too if (stencil) { *attrib++ = GLX_STENCIL_SIZE;*attrib++ = 8; - *attrib++ = GLX_ALPHA_SIZE;*attrib++ = 1; + *attrib++ = GLX_ALPHA_SIZE;*attrib++ = 8; + } + if (stereobuffer) + *attrib++ = GLX_STEREO; + if (samples > 1) + { + *attrib++ = GLX_SAMPLE_BUFFERS_ARB; + *attrib++ = 1; + *attrib++ = GLX_SAMPLES_ARB; + *attrib++ = samples; } *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 samples) { int i; int attrib[32]; XSetWindowAttributes attr; + XClassHint *clshints; + XWMHints *wmhints; + XSizeHints *szhints; unsigned long mask; Window root; XVisualInfo *visinfo; int MajorVersion, MinorVersion; const char *drivername; +#if defined(__APPLE__) && defined(__MACH__) + drivername = "/usr/X11R6/lib/libGL.1.dylib"; +#else drivername = "libGL.so.1"; +#endif +// COMMANDLINEOPTION: Linux GLX: -gl_driver selects a GL driver library, default is libGL.so.1, useful only for using fxmesa or similar, if you don't know what this is for, you don't need it +// COMMANDLINEOPTION: BSD GLX: -gl_driver selects a GL driver library, default is libGL.so.1, useful only for using fxmesa or similar, if you don't know what this is for, you don't need it +// LordHavoc: although this works on MacOSX, it's useless there (as there is only one system libGL) i = COM_CheckParm("-gl_driver"); if (i && i < com_argc - 1) drivername = com_argv[i + 1]; @@ -683,10 +695,13 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp) if (!(vidx11_display = XOpenDisplay(NULL))) { - Con_Printf("Couldn't open the X display\n"); + Con_Print("Couldn't open the X display\n"); return false; } + // make autorepeat send keypress/keypress/.../keyrelease instead of intervening keyrelease + XkbSetDetectableAutoRepeat(vidx11_display, true, NULL); + vidx11_screen = DefaultScreen(vidx11_display); root = RootWindow(vidx11_display, vidx11_screen); @@ -700,21 +715,29 @@ 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, samples); visinfo = qglXChooseVisual(vidx11_display, vidx11_screen, attrib); + if (!visinfo && (samples == 1)) + { + /* Some Mesa drivers reject sample buffers with 1 sample, so try + * entirely without one */ + VID_BuildGLXAttrib(attrib, bpp == 32, stereobuffer, 0); + visinfo = qglXChooseVisual(vidx11_display, vidx11_screen, attrib); + } if (!visinfo) { - Con_Printf("Couldn't get an RGB, Double-buffered, Depth visual\n"); + Con_Print("Couldn't get an RGB, Double-buffered, Depth visual\n"); return false; } @@ -725,6 +748,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; @@ -754,13 +785,15 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp) // change to the mode XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, vidmodes[best_fit]); - vidmode_active = true; + vid_isfullscreen = true; // Move the viewport to top left XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0); } else fullscreen = 0; + + free(vidmodes); } } @@ -773,7 +806,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp) // LordHavoc: save the colormap for later, too vidx11_colormap = attr.colormap = XCreateColormap(vidx11_display, root, visinfo->visual, AllocNone); attr.event_mask = X_MASK; - if (vidmode_active) + if (vid_isfullscreen) { mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | CWEventMask | CWOverrideRedirect; attr.override_redirect = True; @@ -784,7 +817,30 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp) mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask; win = XCreateWindow(vidx11_display, root, 0, 0, width, height, 0, visinfo->depth, InputOutput, visinfo->visual, mask, &attr); - XStoreName(vidx11_display, win, gamename); + + wmhints = XAllocWMHints(); + if(XpmCreatePixmapFromData(vidx11_display, win, + (gamemode == GAME_NEXUIZ) ? nexuiz_xpm : darkplaces_xpm, + &wmhints->icon_pixmap, &wmhints->icon_mask, NULL) == XpmSuccess) + wmhints->flags |= IconPixmapHint | IconMaskHint; + + clshints = XAllocClassHint(); + clshints->res_name = strdup(gamename); + clshints->res_class = strdup("DarkPlaces"); + + szhints = XAllocSizeHints(); + if(vid_resizable.integer == 0) + { + szhints->min_width = szhints->max_width = width; + szhints->min_height = szhints->max_height = height; + szhints->flags |= PMinSize | PMaxSize; + } + + XmbSetWMProperties(vidx11_display, win, gamename, gamename, (char **) com_argv, com_argc, szhints, wmhints, clshints); + XFree(clshints); + XFree(wmhints); + XFree(szhints); + //XStoreName(vidx11_display, win, gamename); XMapWindow(vidx11_display, win); // LordHavoc: making the close button on a window do the right thing @@ -792,7 +848,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp) wm_delete_window_atom = XInternAtom(vidx11_display, "WM_DELETE_WINDOW", false); XSetWMProtocols(vidx11_display, win, &wm_delete_window_atom, 1); - if (vidmode_active) + if (vid_isfullscreen) { XMoveWindow(vidx11_display, win, 0, 0); XRaiseWindow(vidx11_display, win); @@ -806,92 +862,81 @@ 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_extensions = (const char *)qglGetString(GL_EXTENSIONS); gl_platform = "GLX"; gl_platformextensions = qglXQueryExtensionsString(vidx11_display, vidx11_screen); - GL_CheckExtension("GLX_ARB_get_proc_address", getprocaddressfuncs, "-nogetprocaddress", false); - gl_videosyncavailable = GL_CheckExtension("GLX_SGI_video_sync", videosyncfuncs, "-novideosync", false); + gl_videosyncavailable = false; - usingmouse = false; +// COMMANDLINEOPTION: Linux GLX: -nogetprocaddress disables GLX_ARB_get_proc_address (not required, more formal method of getting extension functions) +// COMMANDLINEOPTION: BSD GLX: -nogetprocaddress disables GLX_ARB_get_proc_address (not required, more formal method of getting extension functions) +// COMMANDLINEOPTION: MacOSX GLX: -nogetprocaddress disables GLX_ARB_get_proc_address (not required, more formal method of getting extension functions) + GL_CheckExtension("GLX_ARB_get_proc_address", getprocaddressfuncs, "-nogetprocaddress", false); +// COMMANDLINEOPTION: Linux GLX: -novideosync disables GLX_SGI_swap_control +// COMMANDLINEOPTION: BSD GLX: -novideosync disables GLX_SGI_swap_control +// COMMANDLINEOPTION: MacOSX GLX: -novideosync disables GLX_SGI_swap_control + gl_videosyncavailable = GL_CheckExtension("GLX_SGI_swap_control", swapcontrolfuncs, "-novideosync", false); + + vid_usingmousegrab = false; + vid_usingmouse = false; + vid_usinghidecursor = false; + vid_usingvsync = false; vid_hidden = false; vid_activewindow = true; + vid_x11_hardwaregammasupported = XF86VidModeGetGammaRampSize(vidx11_display, vidx11_screen, &vid_x11_gammarampsize) != 0; +#if !defined(__APPLE__) && !defined(SUNOS) + vid_x11_dgasupported = XF86DGAQueryVersion(vidx11_display, &MajorVersion, &MinorVersion); + if (!vid_x11_dgasupported) + Con_Print( "Failed to detect XF86DGA Mouse extension\n" ); +#endif GL_Init(); return true; } void Sys_SendKeyEvents(void) { - HandleEvents(); -} - -/* -=========== -IN_Commands -=========== -*/ -void IN_Commands (void) -{ -} - -void IN_Move (usercmd_t *cmd) -{ - if (mouse_avail) - IN_Mouse(cmd, mouse_x, mouse_y); - mouse_x = 0; - mouse_y = 0; -} + static qboolean sound_active = true; -static void *prjobj = NULL; - -int GL_OpenLibrary(const char *name) -{ - Con_Printf("Loading OpenGL driver %s\n", name); - GL_CloseLibrary(); - if (!(prjobj = dlopen(name, RTLD_LAZY))) + // enable/disable sound on focus gain/loss + if (!vid_hidden && (vid_activewindow || !snd_mutewhenidle.integer)) { - Con_Printf("Unable to open symbol list for %s\n", name); - return false; + if (!sound_active) + { + S_UnblockSound (); + sound_active = true; + } + } + else + { + if (sound_active) + { + S_BlockSound (); + sound_active = false; + } } - strcpy(gl_driver, name); - return true; -} -void GL_CloseLibrary(void) -{ - if (prjobj) - dlclose(prjobj); - prjobj = NULL; - gl_driver[0] = 0; - qglXGetProcAddressARB = NULL; - gl_extensions = ""; - gl_platform = ""; - gl_platformextensions = ""; + HandleEvents(); } -void *GL_GetProcAddress(const char *name) +void IN_Move (void) { - void *p = NULL; - if (qglXGetProcAddressARB != NULL) - p = (void *) qglXGetProcAddressARB(name); - if (p == NULL) - p = (void *) dlsym(prjobj, name); - return p; } -