X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=vid_glx.c;h=4a95aa1f8914c50a8ef70ef06c3d47ab2a3bfdbe;hp=8124ed710a69ae703e85770c0b5bbe62b9bcbaae;hb=426d3967446d906a9612ae09e6748d3dad26c60f;hpb=c65b6faa99d227bcd00107311acfb66a95be02c6 diff --git a/vid_glx.c b/vid_glx.c index 8124ed71..4a95aa1f 100644 --- a/vid_glx.c +++ b/vid_glx.c @@ -17,50 +17,86 @@ 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 #include #include +#if !defined(__APPLE__) && !defined(__MACH__) #include +#endif #include +#include "quakedef.h" + +// Tell startup code that we have a client +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 dllfunction_t getprocaddressfuncs[] = +{ + {"glXGetProcAddressARB", (void **) &qglXGetProcAddressARB}, + {NULL, NULL} +}; + +//GLX_SGI_video_sync +GLint (GLAPIENTRY *qglXGetVideoSyncSGI)(GLuint *count); +GLint (GLAPIENTRY *qglXWaitVideoSyncSGI)(GLint divisor, GLint remainder, GLuint *count); + +static dllfunction_t videosyncfuncs[] = +{ + {"glXGetVideoSyncSGI", (void **) &qglXGetVideoSyncSGI}, + {"glXWaitVideoSyncSGI", (void **) &qglXWaitVideoSyncSGI}, + {NULL, NULL} +}; + static Display *vidx11_display = NULL; -static int scrnum; +static int vidx11_screen; 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 ) - + PointerMotionMask | ButtonMotionMask) +#define X_MASK (KEY_MASK | MOUSE_MASK | VisibilityChangeMask | \ + StructureNotifyMask | FocusChangeMask | EnterWindowMask | \ + LeaveWindowMask) -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; +#ifndef __APPLE__ 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"}; +#endif qboolean vidmode_ext = false; @@ -69,7 +105,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,114 +113,111 @@ 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*/) +static int XLateKey(XKeyEvent *ev, char *ascii) { -// char tmp[2]; int key = 0; - KeySym keysym; + char buf[64]; + KeySym keysym, shifted; - keysym = XLookupKeysym(ev, 0); + keysym = XLookupKeysym (ev, 0); + XLookupString(ev, buf, sizeof buf, &shifted, 0); + *ascii = buf[0]; switch(keysym) { - case XK_KP_Page_Up: key = KP_PGUP; break; - case XK_Page_Up: key = K_PGUP; break; + case XK_KP_Page_Up: key = K_KP_PGUP; break; + case XK_Page_Up: key = K_PGUP; break; + + case XK_KP_Page_Down: key = K_KP_PGDN; break; + case XK_Page_Down: key = K_PGDN; break; - case XK_KP_Page_Down: key = KP_PGDN; break; - case XK_Page_Down: key = K_PGDN; break; + case XK_KP_Home: key = K_KP_HOME; break; + case XK_Home: key = K_HOME; break; - case XK_KP_Home: key = KP_HOME; break; - case XK_Home: key = K_HOME; break; + case XK_KP_End: key = K_KP_END; break; + case XK_End: key = K_END; break; - case XK_KP_End: key = KP_END; break; - case XK_End: key = K_END; break; + case XK_KP_Left: key = K_KP_LEFTARROW; break; + case XK_Left: key = K_LEFTARROW; break; - case XK_KP_Left: key = KP_LEFTARROW; break; - case XK_Left: key = K_LEFTARROW; break; + case XK_KP_Right: key = K_KP_RIGHTARROW; break; + case XK_Right: key = K_RIGHTARROW; break; - case XK_KP_Right: key = KP_RIGHTARROW; break; - case XK_Right: key = K_RIGHTARROW; break; + case XK_KP_Down: key = K_KP_DOWNARROW; break; + case XK_Down: key = K_DOWNARROW; break; - case XK_KP_Down: key = KP_DOWNARROW; break; - case XK_Down: key = K_DOWNARROW; break; + case XK_KP_Up: key = K_KP_UPARROW; break; + case XK_Up: key = K_UPARROW; break; - case XK_KP_Up: key = KP_UPARROW; break; - case XK_Up: key = K_UPARROW; break; + case XK_Escape: key = K_ESCAPE; break; - case XK_Escape: key = K_ESCAPE; break; + case XK_KP_Enter: key = K_KP_ENTER; break; + case XK_Return: key = K_ENTER; break; - case XK_KP_Enter: key = KP_ENTER; break; - case XK_Return: key = K_ENTER; break; + case XK_Tab: key = K_TAB; break; - case XK_Tab: key = K_TAB; break; + case XK_F1: key = K_F1; break; - case XK_F1: key = K_F1; break; - case XK_F2: key = K_F2; break; - case XK_F3: key = K_F3; break; - case XK_F4: key = K_F4; break; - case XK_F5: key = K_F5; break; - case XK_F6: key = K_F6; break; - case XK_F7: key = K_F7; break; - case XK_F8: key = K_F8; break; - case XK_F9: key = K_F9; break; - case XK_F10: key = K_F10; break; - case XK_F11: key = K_F11; break; - case XK_F12: key = K_F12; break; + case XK_F2: key = K_F2; break; - case XK_BackSpace: key = K_BACKSPACE; break; + case XK_F3: key = K_F3; break; - case XK_KP_Delete: key = KP_DEL; break; - case XK_Delete: key = K_DEL; break; + case XK_F4: key = K_F4; break; - case XK_Pause: key = K_PAUSE; break; + case XK_F5: key = K_F5; break; + + case XK_F6: key = K_F6; break; + + case XK_F7: key = K_F7; break; + + case XK_F8: key = K_F8; break; + + case XK_F9: key = K_F9; break; + + case XK_F10: key = K_F10; break; + + case XK_F11: key = K_F11; break; + + case XK_F12: key = K_F12; break; + + case XK_BackSpace: key = K_BACKSPACE; break; + + case XK_KP_Delete: key = K_KP_DEL; break; + case XK_Delete: key = K_DEL; break; + + case XK_Pause: key = K_PAUSE; break; case XK_Shift_L: - case XK_Shift_R: key = K_SHIFT; break; + case XK_Shift_R: key = K_SHIFT; break; case XK_Execute: case XK_Control_L: - case XK_Control_R: key = K_CTRL; break; + case XK_Control_R: key = K_CTRL; break; - case XK_Mode_switch: case XK_Alt_L: case XK_Meta_L: case XK_Alt_R: - case XK_Meta_R: key = K_ALT; break; + case XK_Meta_R: key = K_ALT; break; - case XK_Caps_Lock: key = K_CAPSLOCK; break; - case XK_KP_Begin: key = KP_5; break; + case XK_KP_Begin: key = K_KP_5; break; - case XK_Insert: key = K_INS; break; - case XK_KP_Insert: key = KP_INS; break; + case XK_Insert:key = K_INS; break; + case XK_KP_Insert: key = K_KP_INS; break; - case XK_KP_Multiply: key = KP_MULTIPLY; break; - case XK_KP_Add: key = KP_PLUS; break; - case XK_KP_Subtract: key = KP_MINUS; break; - case XK_KP_Divide: key = KP_DIVIDE; break; - - /* For Sun keyboards */ - case XK_F27: key = K_HOME; break; - case XK_F29: key = K_PGUP; break; - case XK_F33: key = K_END; break; - case XK_F35: key = K_PGDN; break; + case XK_KP_Multiply: key = '*'; 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; default: - if (keysym < 128) - { - /* ASCII keys */ + if (keysym < 32 && keysym > 126) + break; + + if (keysym >= 'A' && keysym <= 'Z') + key = keysym - 'A' + 'a'; + else key = keysym; - if (/*!modified && */((key >= 'A') && (key <= 'Z'))) - key = key + ('a' - 'A'); - } + break; } @@ -200,7 +232,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); @@ -227,6 +259,7 @@ static void install_grabs(void) XGrabPointer(vidx11_display, win, True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime); +#ifndef __APPLE__ if (vid_dga.integer) { int MajorVersion, MinorVersion; @@ -234,7 +267,7 @@ static void install_grabs(void) if (!XF86DGAQueryVersion(vidx11_display, &MajorVersion, &MinorVersion)) { // unable to query, probalby not supported - Con_Printf( "Failed to detect XF86DGA Mouse\n" ); + Con_Print( "Failed to detect XF86DGA Mouse\n" ); vid_dga.integer = 0; } else @@ -245,14 +278,13 @@ static void install_grabs(void) } } else +#endif 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; - -// XSync(vidx11_display, True); } static void uninstall_grabs(void) @@ -260,8 +292,10 @@ static void uninstall_grabs(void) if (!vidx11_display || !win) return; +#ifndef __APPLE__ if (vid_dga.integer == 1) XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), 0); +#endif XUngrabPointer(vidx11_display, CurrentTime); XUngrabKeyboard(vidx11_display, CurrentTime); @@ -275,7 +309,8 @@ static void uninstall_grabs(void) static void HandleEvents(void) { XEvent event; -// KeySym ks; + int key; + char ascii; qboolean dowarp = false; if (!vidx11_display) @@ -288,109 +323,185 @@ static void HandleEvents(void) switch (event.type) { case KeyPress: + // key pressed + key = XLateKey (&event.xkey, &ascii); + Key_Event(key, ascii, true); + break; + case KeyRelease: - Key_Event(XLateKey(&event.xkey), event.type == KeyPress); + // key released + key = XLateKey (&event.xkey, &ascii); + Key_Event(key, ascii, false); break; case MotionNotify: + // mouse moved if (usingmouse) { +#ifndef __APPLE__ if (vid_dga.integer == 1) { mouse_x += event.xmotion.x_root * vid_dga_mouseaccel.value; mouse_y += event.xmotion.y_root * vid_dga_mouseaccel.value; } else +#endif { - /* - 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; } } - else - ui_mouseupdate(event.xmotion.x, event.xmotion.y); + //else + // ui_mouseupdate(event.xmotion.x, event.xmotion.y); break; case ButtonPress: + // mouse button pressed switch(event.xbutton.button) { case 1: - Key_Event(K_MOUSE1, true); + Key_Event(K_MOUSE1, 0, true); break; case 2: - Key_Event(K_MOUSE3, true); + Key_Event(K_MOUSE3, 0, true); break; case 3: - Key_Event(K_MOUSE2, true); + Key_Event(K_MOUSE2, 0, true); break; case 4: - Key_Event(K_MWHEELUP, true); + Key_Event(K_MWHEELUP, 0, true); break; case 5: - Key_Event(K_MWHEELDOWN, true); + Key_Event(K_MWHEELDOWN, 0, true); + break; + case 6: + Key_Event(K_MOUSE4, 0, true); break; - default: - Con_Printf("HandleEvents: ButtonPress gave value %d, 1-5 expected\n", event.xbutton.button); + 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; } break; case ButtonRelease: + // mouse button released switch(event.xbutton.button) { case 1: - Key_Event(K_MOUSE1, false); + Key_Event(K_MOUSE1, 0, false); break; case 2: - Key_Event(K_MOUSE3, false); + Key_Event(K_MOUSE3, 0, false); break; case 3: - Key_Event(K_MOUSE2, false); + Key_Event(K_MOUSE2, 0, false); break; case 4: - Key_Event(K_MWHEELUP, false); + Key_Event(K_MWHEELUP, 0, false); break; case 5: - Key_Event(K_MWHEELDOWN, false); + 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; - default: - Con_Printf("HandleEvents: ButtonRelease gave value %d, 1-5 expected\n", event.xbutton.button); + 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; } 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) && ((unsigned int)event.xclient.data.l[0] == wm_delete_window_atom)) + Sys_Quit(); + break; + 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: + // window is now the input focus + vid_activewindow = true; + break; + case FocusOut: + // window is no longer the input focus + vid_activewindow = false; + VID_RestoreSystemGamma(); + break; + case EnterNotify: + // mouse entered window + break; + case LeaveNotify: + // mouse left window + break; } } @@ -429,22 +540,21 @@ static void IN_ActivateMouse( void ) } } - void VID_Shutdown(void) { if (!ctx || !vidx11_display) return; + vid_hidden = true; + usingmouse = false; if (vidx11_display) { + VID_RestoreSystemGamma(); 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); -*/ + XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, vidmodes[0]); if (win) XDestroyWindow(vidx11_display, win); XCloseDisplay(vidx11_display); @@ -453,11 +563,15 @@ void VID_Shutdown(void) vidx11_display = NULL; win = 0; ctx = NULL; + + GL_CloseLibrary(); + Key_ClearStates (); } void signal_handler(int sig) { printf("Received signal %d, exiting...\n", sig); + VID_RestoreSystemGamma(); Sys_Quit(); exit(0); } @@ -493,13 +607,14 @@ void VID_Finish (void) int usemouse; if (r_render.integer) { - glFinish(); - glXSwapBuffers(vidx11_display, win); + if (r_speeds.integer || gl_finish.integer) + 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; @@ -521,160 +636,79 @@ void VID_Finish (void) } } -// LordHavoc: ported from SDL 1.2.2, this was far more difficult to port from -// SDL than to simply use the XFree gamma ramp extension, but that affects the -// whole screen even when the game window is inactive, this only affects the -// screen while the window is active, very desirable behavior :) -int VID_SetGamma(float prescale, float gamma, float scale, float base) +int VID_SetGamma(unsigned short *ramps) { -// LordHavoc: FIXME: finish this code, we need to allocate colors before we can store them -#if 1 - return FALSE; -#else - int i, ncolors, c; - unsigned int Rmask, Gmask, Bmask, Rloss, Gloss, Bloss, Rshift, Gshift, Bshift, mask; - XColor xcmap[256]; - unsigned short ramp[256]; - - if (COM_CheckParm("-nogamma")) - return FALSE; - - if (vidx11_visual->class != DirectColor) - { - Con_Printf("X11 Visual class is %d, can only do gamma on %d\n", vidx11_visual->class, DirectColor); - return FALSE; - } - - Rmask = vidx11_visual->red_mask; - Gmask = vidx11_visual->green_mask; - Bmask = vidx11_visual->blue_mask; + return XF86VidModeSetGammaRamp(vidx11_display, vidx11_screen, 256, ramps, ramps + 256, ramps + 512); +} - Rshift = 0; - Rloss = 8; - if ((mask = Rmask)) - { - for (;!(mask & 1);mask >>= 1) - ++Rshift; - for (;(mask & 1);mask >>= 1) - --Rloss; - } - Gshift = 0; - Gloss = 8; - if ((mask = Gmask)) - { - for (;!(mask & 1);mask >>= 1) - ++Gshift; - for (;(mask & 1);mask >>= 1) - --Gloss; - } - Bshift = 0; - Bloss = 8; - if ((mask = Bmask)) - { - for (;!(mask & 1);mask >>= 1) - ++Bshift; - for (;(mask & 1);mask >>= 1) - --Bloss; - } +int VID_GetGamma(unsigned short *ramps) +{ + return XF86VidModeGetGammaRamp(vidx11_display, vidx11_screen, 256, ramps, ramps + 256, ramps + 512); +} - BuildGammaTable16(prescale, gamma, scale, base, ramp); +void VID_Init(void) +{ +#ifndef __APPLE__ + Cvar_RegisterVariable (&vid_dga); + Cvar_RegisterVariable (&vid_dga_mouseaccel); +#endif + InitSig(); // trap evil signals +// COMMANDLINEOPTION: -nomouse disables mouse support (see also vid_mouse cvar) + if (COM_CheckParm ("-nomouse") || COM_CheckParm("-safe")) + mouse_avail = false; +} - // convert gamma ramp to palette (yes this seems odd) - ncolors = vidx11_visual->map_entries; - for (i = 0;i < ncolors;i++) +void VID_BuildGLXAttrib(int *attrib, int stencil) +{ + *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 is enabled, ask for alpha too + if (stencil) { - c = (256 * i / ncolors); - xcmap[i].pixel = ((c >> Rloss) << Rshift) | ((c >> Gloss) << Gshift) | ((c >> Bloss) << Bshift); - xcmap[i].red = ramp[c]; - xcmap[i].green = ramp[c]; - xcmap[i].blue = ramp[c]; - xcmap[i].flags = (DoRed|DoGreen|DoBlue); + *attrib++ = GLX_STENCIL_SIZE;*attrib++ = 8; + *attrib++ = GLX_ALPHA_SIZE;*attrib++ = 1; } - XStoreColors(vidx11_display, vidx11_colormap, xcmap, ncolors); - XSync(vidx11_display, false); - // FIXME: should this check for BadAccess/BadColor/BadValue errors produced by XStoreColors before setting this true? - return TRUE; -#endif + *attrib++ = None; } -void VID_Init(void) +int VID_InitMode(int fullscreen, int width, int height, int bpp) { int i; -// LordHavoc: FIXME: finish this code, we need to allocate colors before we can store them -#if 0 - int gammaattrib[] = - { - 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[] = - { - GLX_RGBA, - GLX_RED_SIZE, 1, - GLX_GREEN_SIZE, 1, - GLX_BLUE_SIZE, 1, - GLX_DOUBLEBUFFER, - GLX_DEPTH_SIZE, 1, - None - }; -// char gldir[MAX_OSPATH]; - int width = 640, height = 480; + 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; +#if defined(__APPLE__) && defined(__MACH__) + drivername = "/usr/X11R6/lib/libGL.1.dylib"; +#else + drivername = "libGL.so.1"; +#endif +// COMMANDLINEOPTION: -gl_driver selects a GL driver library, default is libGL.so.1 (Linux/BSD) or opengl32.dll (windows) or /usr/X11R6/lib/libGL.1.dylib (MacOSX), if you don't know what this is for, you don't need it + 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_Print("Couldn't open the X display\n"); + return false; } - scrnum = DefaultScreen(vidx11_display); - root = RootWindow(vidx11_display, scrnum); + vidx11_screen = DefaultScreen(vidx11_display); + root = RootWindow(vidx11_display, vidx11_screen); // Get video mode list MajorVersion = MinorVersion = 0; @@ -682,35 +716,36 @@ void VID_Init(void) vidmode_ext = false; else { - Con_Printf("Using XFree86-VidModeExtension Version %d.%d\n", MajorVersion, MinorVersion); + Con_DPrintf("Using XFree86-VidModeExtension Version %d.%d\n", MajorVersion, MinorVersion); vidmode_ext = true; } - 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); -#endif + 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; + } + + VID_BuildGLXAttrib(attrib, bpp == 32); + visinfo = qglXChooseVisual(vidx11_display, vidx11_screen, attrib); if (!visinfo) { - visinfo = glXChooseVisual(vidx11_display, scrnum, nogammaattrib); - if (!visinfo) - { - fprintf(stderr, "qkHack: Error couldn't get an RGB, Double-buffered, Depth visual\n"); - exit(1); - } + Con_Print("Couldn't get an RGB, Double-buffered, Depth visual\n"); + return false; } if (vidmode_ext) { int best_fit, best_dist, dist, x, y; - XF86VidModeGetAllModeLines(vidx11_display, scrnum, &num_vidmodes, &vidmodes); - // Are we going fullscreen? If so, let's change video mode if (fullscreen) { + XF86VidModeGetAllModeLines(vidx11_display, vidx11_screen, &num_vidmodes, &vidmodes); best_dist = 9999999; best_fit = -1; @@ -738,11 +773,11 @@ void VID_Init(void) height = vidmodes[best_fit]->vdisplay; // change to the mode - XF86VidModeSwitchToMode(vidx11_display, scrnum, vidmodes[best_fit]); + XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, vidmodes[best_fit]); vidmode_active = true; // Move the viewport to top left - XF86VidModeSetViewPort(vidx11_display, scrnum, 0, 0); + XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0); } else fullscreen = 0; @@ -772,6 +807,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); @@ -779,31 +819,45 @@ void VID_Init(void) XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, 0, 0); XFlush(vidx11_display); // Move the viewport to top left - XF86VidModeSetViewPort(vidx11_display, scrnum, 0, 0); + XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 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_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, vidx11_screen); - GL_Init(); + gl_videosyncavailable = false; - Con_SafePrintf ("Video mode %dx%d initialized.\n", width, height); +// COMMANDLINEOPTION: -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: -novideosync disables GLX_SGI_video_sync (required for video sync control on GLX) + 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; + vid_activewindow = true; + GL_Init(); + return true; } void Sys_SendKeyEvents(void) @@ -811,16 +865,6 @@ void Sys_SendKeyEvents(void) HandleEvents(); } -void IN_Init(void) -{ - if (COM_CheckParm ("-nomouse")) - mouse_avail = false; -} - -void IN_Shutdown(void) -{ -} - /* =========== IN_Commands @@ -830,55 +874,48 @@ 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; - cl.viewangles[PITCH] = bound (-90, cl.viewangles[PITCH], 90); - } - else +int GL_OpenLibrary(const char *name) +{ + Con_Printf("Loading OpenGL 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); + 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; +}