X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=vid_glx.c;h=890cf78f34704fbaf5318ab3f40bafd0cf4a49ec;hb=31bc6f42205f75d58be52a0059c95cdbe90679af;hp=a1a898fde3c3975759361c4f56bfc7783a16c1ee;hpb=957825a5faf70f18bb5d088ca834b8855adea510;p=xonotic%2Fdarkplaces.git diff --git a/vid_glx.c b/vid_glx.c index a1a898fd..890cf78f 100644 --- a/vid_glx.c +++ b/vid_glx.c @@ -17,172 +17,207 @@ 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__) && !defined(SUNOS) #include +#endif #include -static Display *dpy = NULL; -static int scrnum; +#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_swap_control +GLint (GLAPIENTRY *qglXSwapIntervalSGI)(GLint interval); + +static dllfunction_t swapcontrolfuncs[] = +{ + {"glXSwapIntervalSGI", (void **) &qglXSwapIntervalSGI}, + {NULL, NULL} +}; + +static Display *vidx11_display = NULL; +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 qboolean mouse_avail = true; +static qboolean vid_usingmouse = false; +static qboolean vid_usingvsync = false; +static qboolean vid_usevsync = false; 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 = {"vid_dga", "1", true}; -cvar_t vid_dga_mouseaccel = {"vid_dga_mouseaccel", "1", false}; -cvar_t m_filter = {"m_filter", "0"}; +#if !defined(__APPLE__) && !defined(SUNOS) +cvar_t vid_dga = {CVAR_SAVE, "vid_dga", "1"}; +cvar_t vid_dga_mouseaccel = {0, "vid_dga_mouseaccel", "1"}; +#endif qboolean vidmode_ext = false; 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; - -/*-----------------------------------------------------------------------*/ - -float gldepthmin, gldepthmax; +static qboolean vid_isfullscreen = false; -const char *gl_vendor; -const char *gl_renderer; -const char *gl_version; -const char *gl_extensions; +static Visual *vidx11_visual; +static Colormap vidx11_colormap; /*-----------------------------------------------------------------------*/ -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_Home: key = K_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_Left: key = K_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_Down: key = K_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_Escape: key = K_ESCAPE; break; - case XK_KP_Page_Down: key = KP_PGDN; break; - case XK_Page_Down: key = K_PGDN; break; + case XK_KP_Enter: key = K_KP_ENTER; break; + case XK_Return: key = K_ENTER; break; - case XK_KP_Home: key = KP_HOME; break; - case XK_Home: key = K_HOME; break; + case XK_Tab: key = K_TAB; break; - case XK_KP_End: key = KP_END; break; - case XK_End: key = K_END; break; + case XK_F1: key = K_F1; break; - case XK_KP_Left: key = KP_LEFTARROW; break; - case XK_Left: key = K_LEFTARROW; break; + case XK_F2: key = K_F2; break; - case XK_KP_Right: key = KP_RIGHTARROW; break; - case XK_Right: key = K_RIGHTARROW; break; + case XK_F3: key = K_F3; break; - case XK_KP_Down: key = KP_DOWNARROW; break; - case XK_Down: key = K_DOWNARROW; break; + case XK_F4: key = K_F4; break; - case XK_KP_Up: key = KP_UPARROW; break; - case XK_Up: key = K_UPARROW; break; + case XK_F5: key = K_F5; break; - case XK_Escape: key = K_ESCAPE; break; + case XK_F6: key = K_F6; break; - case XK_KP_Enter: key = KP_ENTER; break; - case XK_Return: key = K_ENTER; break; + case XK_F7: key = K_F7; break; - case XK_Tab: key = K_TAB; break; + case XK_F8: key = K_F8; 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_F9: key = K_F9; break; - case XK_BackSpace: key = K_BACKSPACE; break; + case XK_F10: key = K_F10; break; - case XK_KP_Delete: key = KP_DEL; break; - case XK_Delete: key = K_DEL; break; + case XK_F11: key = K_F11; break; - case XK_Pause: key = K_PAUSE; 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; + 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; - /* 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_section: key = '~'; 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; } @@ -197,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); @@ -210,182 +245,273 @@ static Cursor CreateNullCursor(Display *display, Window root) return cursor; } -static void install_grabs(void) +static void IN_Activate (qboolean grab) { - XWindowAttributes attribs_1; - XSetWindowAttributes attribs_2; + if (!vidx11_display) + return; + if (grab) + { + if (!vid_usingmouse && mouse_avail && win) + { + XWindowAttributes attribs_1; + XSetWindowAttributes attribs_2; - XGetWindowAttributes(dpy, win, &attribs_1); - attribs_2.event_mask = attribs_1.your_event_mask | KEY_MASK | MOUSE_MASK; - XChangeWindowAttributes(dpy, win, CWEventMask, &attribs_2); + 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); -// inviso cursor - XDefineCursor(dpy, win, CreateNullCursor(dpy, win)); + // inviso cursor + XDefineCursor(vidx11_display, win, CreateNullCursor(vidx11_display, win)); - XGrabPointer(dpy, win, True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime); + XGrabPointer(vidx11_display, win, True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime); - if (vid_dga.value) - { - int MajorVersion, MinorVersion; +#if !defined(__APPLE__) && !defined(SUNOS) + if (vid_dga.integer) + { + int MajorVersion, MinorVersion; - if (!XF86DGAQueryVersion(dpy, &MajorVersion, &MinorVersion)) - { - // unable to query, probalby not supported - Con_Printf( "Failed to detect XF86DGA Mouse\n" ); - vid_dga.value = 0; - } - else - { - vid_dga.value = 1; - XF86DGADirectVideo(dpy, DefaultScreen(dpy), XF86DGADirectMouse); - XWarpPointer(dpy, None, win, 0, 0, 0, 0, 0, 0); + if (!XF86DGAQueryVersion(vidx11_display, &MajorVersion, &MinorVersion)) + { + // 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, vid.width / 2, vid.height / 2); + } + else + { + 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); + + XGrabKeyboard(vidx11_display, win, False, GrabModeAsync, GrabModeAsync, CurrentTime); + + mouse_x = mouse_y = 0; + cl_ignoremousemove = true; + vid_usingmouse = true; } } else - XWarpPointer(dpy, None, win, 0, 0, 0, 0, vid.width / 2, vid.height / 2); - - XGrabKeyboard(dpy, win, False, GrabModeAsync, GrabModeAsync, CurrentTime); - - mouse_active = true; - mouse_x = mouse_y = 0; - -// XSync(dpy, True); -} - -static void uninstall_grabs(void) -{ - if (!dpy || !win) - return; - - if (vid_dga.value == 1) - XF86DGADirectVideo(dpy, DefaultScreen(dpy), 0); + { + if (vid_usingmouse) + { +#if !defined(__APPLE__) && !defined(SUNOS) + if (vid_dga.integer) + XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), 0); +#endif - XUngrabPointer(dpy, CurrentTime); - XUngrabKeyboard(dpy, CurrentTime); + XUngrabPointer(vidx11_display, CurrentTime); + XUngrabKeyboard(vidx11_display, CurrentTime); -// inviso cursor - XUndefineCursor(dpy, win); + // inviso cursor + if (win) + XUndefineCursor(vidx11_display, win); - mouse_active = false; + cl_ignoremousemove = true; + vid_usingmouse = false; + } + } } static void HandleEvents(void) { XEvent event; -// KeySym ks; + int key; + char ascii; qboolean dowarp = false; - if (!dpy) + if (!vidx11_display) return; - while (XPending(dpy)) + while (XPending(vidx11_display)) { - XNextEvent(dpy, &event); + XNextEvent(vidx11_display, &event); 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: - if (usingmouse) + // mouse moved + if (vid_usingmouse) { - if (vid_dga.value == 1) +#if !defined(__APPLE__) && !defined(SUNOS) + 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(vid.width/2 - event.xmotion.x) > vid.width / 4 || abs(vid.height/2 - event.xmotion.y) > vid.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(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); 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; + case 7: + Key_Event(K_MOUSE5, 0, true); break; - default: - Con_Printf("HandleEvents: ButtonPress gave value %d, 1-5 expected\n", event.xbutton.button); + 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; - default: - Con_Printf("HandleEvents: ButtonRelease gave value %d, 1-5 expected\n", event.xbutton.button); + 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; } 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; } } @@ -394,65 +520,78 @@ static void HandleEvents(void) /* move the mouse to the window center again */ p_mouse_x = vid.width / 2; p_mouse_y = vid.height / 2; - XWarpPointer(dpy, None, win, 0, 0, 0, 0, p_mouse_x, p_mouse_y); + XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, p_mouse_x, p_mouse_y); } - } -static void IN_DeactivateMouse( void ) -{ - if (!mouse_avail || !dpy || !win) - return; +static void *prjobj = NULL; - if (mouse_active) - { - uninstall_grabs(); - mouse_active = false; - } +static void GL_CloseLibrary(void) +{ + if (prjobj) + dlclose(prjobj); + prjobj = NULL; + gl_driver[0] = 0; + qglXGetProcAddressARB = NULL; + gl_extensions = ""; + gl_platform = ""; + gl_platformextensions = ""; } -static void IN_ActivateMouse( void ) +static int GL_OpenLibrary(const char *name) { - if (!mouse_avail || !dpy || !win) - return; - - if (!mouse_active) + Con_Printf("Loading OpenGL driver %s\n", name); + GL_CloseLibrary(); + if (!(prjobj = dlopen(name, RTLD_LAZY))) { - mouse_x = mouse_y = 0; // don't spazz - install_grabs(); - mouse_active = true; + Con_Printf("Unable to open symbol list for %s\n", name); + return false; } + strcpy(gl_driver, name); + return true; } +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; +} void VID_Shutdown(void) { - if (!ctx || !dpy) + if (!ctx || !vidx11_display) return; - if (dpy) + if (vidx11_display) { - uninstall_grabs(); + IN_Activate(false); + VID_RestoreSystemGamma(); - if (vidmode_active) - XF86VidModeSwitchToMode(dpy, scrnum, vidmodes[0]); -/* Disabled, causes a segfault during shutdown. - if (ctx) - glXDestroyContext(dpy, ctx); -*/ + // FIXME: glXDestroyContext here? + if (vid_isfullscreen) + XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, vidmodes[0]); if (win) - XDestroyWindow(dpy, win); - XCloseDisplay(dpy); + XDestroyWindow(vidx11_display, win); + XCloseDisplay(vidx11_display); } - vidmode_active = false; - dpy = NULL; + vid_hidden = true; + vid_isfullscreen = false; + vidx11_display = NULL; win = 0; ctx = NULL; + + GL_CloseLibrary(); + Key_ClearStates (); } 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); } @@ -471,216 +610,148 @@ void InitSig(void) signal(SIGTERM, signal_handler); } -void VID_CheckMultitexture(void) +void VID_Finish (void) { - void *prjobj; - qglMTexCoord2f = NULL; - qglSelectTexture = NULL; - // Check to see if multitexture is disabled - if (COM_CheckParm("-nomtex")) - { - Con_Printf("...multitexture disabled\n"); - return; - } - if ((prjobj = dlopen(NULL, RTLD_LAZY)) == NULL) - { - Con_Printf("Unable to open symbol list for main program.\n"); - return; - } - // Test for ARB_multitexture - if (!COM_CheckParm("-SGISmtex") && strstr(gl_extensions, "GL_ARB_multitexture ")) + qboolean vid_usemouse; + + vid_usevsync = vid_vsync.integer && !cls.timedemo && gl_videosyncavailable; + if (vid_usingvsync != vid_usevsync && gl_videosyncavailable) { - Con_Printf("...using GL_ARB_multitexture\n"); - qglMTexCoord2f = (void *) dlsym(prjobj, "glMultiTexCoord2fARB"); - qglSelectTexture = (void *) dlsym(prjobj, "glActiveTextureARB"); - gl_mtexable = true; - gl_mtex_enum = GL_TEXTURE0_ARB; + 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"); } - else if (strstr(gl_extensions, "GL_SGIS_multitexture ")) // Test for SGIS_multitexture (if ARB_multitexture not found) + +// handle the mouse state when windowed if that's changed + vid_usemouse = false; + if (vid_mouse.integer && !key_consoleactive && !cls.demoplayback) + vid_usemouse = true; + if (!vid_activewindow) + vid_usemouse = false; + if (vid_isfullscreen) + vid_usemouse = true; + IN_Activate(vid_usemouse); + + if (r_render.integer) { - Con_Printf("...using GL_SGIS_multitexture\n"); - qglMTexCoord2f = (void *) dlsym(prjobj, "glMTexCoord2fSGIS"); - qglSelectTexture = (void *) dlsym(prjobj, "glSelectTextureSGIS"); - gl_mtexable = true; - gl_mtex_enum = TEXTURE0_SGIS; + if (r_speeds.integer || gl_finish.integer) + qglFinish(); + qglXSwapBuffers(vidx11_display, win); } - else - Con_Printf("...multitexture disabled (not detected)\n"); - dlclose(prjobj); } -void VID_CheckCVA(void) +int VID_SetGamma(unsigned short *ramps) { - void *prjobj; - qglLockArraysEXT = NULL; - qglUnlockArraysEXT = NULL; - gl_supportslockarrays = false; - if (COM_CheckParm("-nocva")) - { - Con_Printf("...compiled vertex arrays disabled\n"); - return; - } - if ((prjobj = dlopen(NULL, RTLD_LAZY)) == NULL) - { - Con_Printf("Unable to open symbol list for main program.\n"); - return; - } - if (strstr(gl_extensions, "GL_EXT_compiled_vertex_array")) - { - Con_Printf("...using compiled vertex arrays\n"); - qglLockArraysEXT = (void *) dlsym(prjobj, "glLockArraysEXT"); - qglUnlockArraysEXT = (void *) dlsym(prjobj, "glUnlockArraysEXT"); - gl_supportslockarrays = true; - } - dlclose(prjobj); + return XF86VidModeSetGammaRamp(vidx11_display, vidx11_screen, 256, ramps, ramps + 256, ramps + 512); } -/* -================= -GL_BeginRendering - -================= -*/ -void GL_BeginRendering (int *x, int *y, int *width, int *height) +int VID_GetGamma(unsigned short *ramps) { - *x = *y = 0; - *width = scr_width; - *height = scr_height; - -// glViewport (*x, *y, *width, *height); + return XF86VidModeGetGammaRamp(vidx11_display, vidx11_screen, 256, ramps, ramps + 256, ramps + 512); } - -void GL_EndRendering (void) +void VID_Init(void) { - int usemouse; - if (!r_render.value) - return; - glFlush(); - glXSwapBuffers(dpy, win); - -// handle the mouse state when windowed if that's changed - usemouse = false; - if (vid_mouse.value && key_dest == key_game) - usemouse = true; - if (vidmode_active) - usemouse = true; - if (usemouse) - { - if (!usingmouse) - { - usingmouse = true; - IN_ActivateMouse (); - } - } - else - { - if (usingmouse) - { - usingmouse = false; - IN_DeactivateMouse (); - } - } +#if !defined(__APPLE__) && !defined(SUNOS) + Cvar_RegisterVariable (&vid_dga); + Cvar_RegisterVariable (&vid_dga_mouseaccel); +#endif + InitSig(); // trap evil signals +// COMMANDLINEOPTION: Input: -nomouse disables mouse support (see also vid_mouse cvar) + if (COM_CheckParm ("-nomouse") || COM_CheckParm("-safe")) + mouse_avail = false; } -int VID_SetGamma(float prescale, float gamma, float scale, float base) +void VID_BuildGLXAttrib(int *attrib, int stencil) { - return FALSE; + *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) + { + *attrib++ = GLX_STENCIL_SIZE;*attrib++ = 8; + *attrib++ = GLX_ALPHA_SIZE;*attrib++ = 1; + } + *attrib++ = None; } -void VID_Init(void) +int VID_InitMode(int fullscreen, int width, int height, int bpp) { int i; - int attrib[] = - { - 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; - int actualWidth, actualHeight; - - Cvar_RegisterVariable (&vid_mouse); - 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; + 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]; + if (!GL_OpenLibrary(drivername)) + { + Con_Printf("Unable to load GL driver \"%s\"\n", drivername); + return false; + } - if (!(dpy = XOpenDisplay(NULL))) + 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(dpy); - root = RootWindow(dpy, scrnum); + vidx11_screen = DefaultScreen(vidx11_display); + root = RootWindow(vidx11_display, vidx11_screen); // Get video mode list MajorVersion = MinorVersion = 0; - if (!XF86VidModeQueryVersion(dpy, &MajorVersion, &MinorVersion)) + if (!XF86VidModeQueryVersion(vidx11_display, &MajorVersion, &MinorVersion)) 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 = glXChooseVisual(dpy, scrnum, attrib); + 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) { - 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(dpy, 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; @@ -701,27 +772,34 @@ void VID_Init(void) if (best_fit != -1) { - actualWidth = vidmodes[best_fit]->hdisplay; - actualHeight = vidmodes[best_fit]->vdisplay; + // LordHavoc: changed from ActualWidth/ActualHeight =, + // to width/height =, so the window will take the full area of + // the mode chosen + width = vidmodes[best_fit]->hdisplay; + height = vidmodes[best_fit]->vdisplay; // change to the mode - XF86VidModeSwitchToMode(dpy, scrnum, vidmodes[best_fit]); - vidmode_active = true; + XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, vidmodes[best_fit]); + vid_isfullscreen = true; // Move the viewport to top left - XF86VidModeSetViewPort(dpy, scrnum, 0, 0); + XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0); } else fullscreen = 0; } } + // LordHavoc: save the visual for use in gamma ramp settings later + vidx11_visual = visinfo->visual; + /* window attributes */ attr.background_pixel = 0; attr.border_pixel = 0; - attr.colormap = XCreateColormap(dpy, root, visinfo->visual, AllocNone); + // 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; @@ -731,44 +809,72 @@ void VID_Init(void) else mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask; - win = XCreateWindow(dpy, root, 0, 0, width, height, 0, visinfo->depth, InputOutput, visinfo->visual, mask, &attr); - XStoreName(dpy, win, "DarkPlaces-GLX"); - XMapWindow(dpy, win); + win = XCreateWindow(vidx11_display, root, 0, 0, width, height, 0, visinfo->depth, InputOutput, visinfo->visual, mask, &attr); + XStoreName(vidx11_display, win, gamename); + XMapWindow(vidx11_display, win); - if (vidmode_active) + // 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 (vid_isfullscreen) { - XMoveWindow(dpy, win, 0, 0); - XRaiseWindow(dpy, win); - XWarpPointer(dpy, None, win, 0, 0, 0, 0, 0, 0); - XFlush(dpy); + XMoveWindow(vidx11_display, win, 0, 0); + XRaiseWindow(vidx11_display, win); + XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, 0, 0); + XFlush(vidx11_display); // Move the viewport to top left - XF86VidModeSetViewPort(dpy, scrnum, 0, 0); + XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0); } - XFlush(dpy); - - ctx = glXCreateContext(dpy, visinfo, NULL, True); + //XSync(vidx11_display, False); - glXMakeCurrent(dpy, win, ctx); + ctx = qglXCreateContext(vidx11_display, visinfo, NULL, True); + if (!ctx) + { + Con_Printf ("glXCreateContext failed\n"); + return false; + } - scr_width = width; - scr_height = height; + if (!qglXMakeCurrent(vidx11_display, win, ctx)) + { + Con_Printf ("glXMakeCurrent failed\n"); + return false; + } - if (vid.conheight > height) - vid.conheight = height; - if (vid.conwidth > width) - vid.conwidth = width; - vid.width = vid.conwidth; - vid.height = vid.conheight; + XSync(vidx11_display, False); - InitSig(); // trap evil signals + if ((qglGetString = GL_GetProcAddress("glGetString")) == NULL) + { + Con_Printf ("glGetString not found in %s", 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_platform = "GLX"; + gl_platformextensions = qglXQueryExtensionsString(vidx11_display, vidx11_screen); + + gl_videosyncavailable = 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_usingmouse = false; + vid_usingvsync = false; + vid_hidden = false; + vid_activewindow = true; GL_Init(); - - Con_SafePrintf ("Video mode %dx%d initialized.\n", width, height); - - // force a surface cache flush - vid.recalc_refdef = 1; + return true; } void Sys_SendKeyEvents(void) @@ -776,71 +882,13 @@ void Sys_SendKeyEvents(void) HandleEvents(); } -void IN_Init(void) -{ -} - -void IN_Shutdown(void) -{ -} - -/* -=========== -IN_Commands -=========== -*/ -void IN_Commands (void) +void IN_Move (void) { -} - -/* -=========== -IN_Move -=========== -*/ -void IN_MouseMove (usercmd_t *cmd) -{ - if (!mouse_avail) - return; - - if (m_filter.value) - { - 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; - } - - mouse_x *= sensitivity.value; - mouse_y *= sensitivity.value; - - if (in_strafe.state & 1) - cmd->sidemove += m_side.value * mouse_x; - else - cl.viewangles[YAW] -= m_yaw.value * mouse_x; - - //if (freelook) - V_StopPitchDrift (); - - if (/*freelook && */!(in_strafe.state & 1)) + if (mouse_avail) { - cl.viewangles[PITCH] += m_pitch.value * mouse_y; - cl.viewangles[PITCH] = bound (-70, cl.viewangles[PITCH], 80); + in_mouse_x = mouse_x; + in_mouse_y = mouse_y; } - else - { - if ((in_strafe.state & 1) && noclip_anglehack) - cmd->upmove -= m_forward.value * mouse_y; - else - cmd->forwardmove -= m_forward.value * mouse_y; - } - mouse_x = mouse_y = 0.0; -} - -void IN_Move (usercmd_t *cmd) -{ - IN_MouseMove(cmd); + mouse_x = 0; + mouse_y = 0; } - -