#include <X11/cursorfont.h>
#include <X11/extensions/XShm.h>
+#if !defined(__APPLE__) && !defined(__MACH__)
#include <X11/extensions/xf86dga.h>
+#endif
#include <X11/extensions/xf86vmode.h>
#include "quakedef.h"
+// Tell startup code that we have a client
int cl_available = true;
//GLX prototypes
//GLX_ARB_get_proc_address
void *(GLAPIENTRY *qglXGetProcAddressARB)(const GLubyte *procName);
-static gl_extensionfunctionlist_t getprocaddressfuncs[] =
+static dllfunction_t getprocaddressfuncs[] =
{
{"glXGetProcAddressARB", (void **) &qglXGetProcAddressARB},
{NULL, NULL}
};
-//GLX_SGI_video_sync
-GLint (GLAPIENTRY *qglXGetVideoSyncSGI)(GLuint *count);
-GLint (GLAPIENTRY *qglXWaitVideoSyncSGI)(int divisor, int remainder, unsigned int *count);
+//GLX_SGI_swap_control
+GLint (GLAPIENTRY *qglXSwapIntervalSGI)(GLint interval);
-static gl_extensionfunctionlist_t videosyncfuncs[] =
+static dllfunction_t swapcontrolfuncs[] =
{
- {"glXGetVideoSyncSGI", (void **) &qglXGetVideoSyncSGI},
- {"glXWaitVideoSyncSGI", (void **) &qglXWaitVideoSyncSGI},
+ {"glXSwapIntervalSGI", (void **) &qglXSwapIntervalSGI},
{NULL, NULL}
};
static Display *vidx11_display = NULL;
-static int scrnum;
+static int vidx11_screen;
static Window win;
static GLXContext ctx = NULL;
#define KEY_MASK (KeyPressMask | KeyReleaseMask)
#define MOUSE_MASK (ButtonPressMask | ButtonReleaseMask | \
- PointerMotionMask | ButtonMotionMask )
-#define X_MASK (KEY_MASK | MOUSE_MASK | VisibilityChangeMask | StructureNotifyMask )
-
-
-static qboolean mouse_avail = true;
-static qboolean mouse_active = false, usingmouse = false;
+ PointerMotionMask | ButtonMotionMask)
+#define X_MASK (KEY_MASK | MOUSE_MASK | VisibilityChangeMask | \
+ StructureNotifyMask | FocusChangeMask | EnterWindowMask | \
+ LeaveWindowMask)
+
+
+static qboolean mouse_avail = true;
+static qboolean mouse_active = false;
+static qboolean vid_usingmouse = false;
+static qboolean vid_usemouse = false;
+static qboolean vid_usingvsync = false;
+static qboolean vid_usevsync = false;
+static qboolean ignoremousemove = false;
static float mouse_x, mouse_y;
static int p_mouse_x, p_mouse_y;
+#ifndef __APPLE__
cvar_t vid_dga = {CVAR_SAVE, "vid_dga", "1"};
cvar_t vid_dga_mouseaccel = {0, "vid_dga_mouseaccel", "1"};
+#endif
qboolean vidmode_ext = false;
/*-----------------------------------------------------------------------*/
-static int
-XLateKey(XKeyEvent *ev)
+static int XLateKey(XKeyEvent *ev, char *ascii)
{
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_Page_Down: key = KP_PGDN; break;
- case XK_Page_Down: key = K_PGDN; break;
+ case XK_KP_Up: key = K_KP_UPARROW; break;
+ case XK_Up: key = K_UPARROW; break;
- case XK_KP_Home: key = KP_HOME; break;
- case XK_Home: key = K_HOME; break;
+ case XK_Escape: key = K_ESCAPE; break;
- case XK_KP_End: key = KP_END; break;
- case XK_End: key = K_END; break;
+ case XK_KP_Enter: key = K_KP_ENTER; break;
+ case XK_Return: key = K_ENTER; break;
- case XK_KP_Left: key = KP_LEFTARROW; break;
- case XK_Left: key = K_LEFTARROW; break;
+ case XK_Tab: key = K_TAB; break;
- case XK_KP_Right: key = KP_RIGHTARROW; break;
- case XK_Right: key = K_RIGHTARROW; break;
+ case XK_F1: key = K_F1; break;
- case XK_KP_Down: key = KP_DOWNARROW; break;
- case XK_Down: key = K_DOWNARROW; break;
+ case XK_F2: key = K_F2; break;
- case XK_KP_Up: key = KP_UPARROW; break;
- case XK_Up: key = K_UPARROW; break;
+ case XK_F3: key = K_F3; break;
- case XK_Escape: key = K_ESCAPE; break;
+ case XK_F4: key = K_F4; break;
- case XK_KP_Enter: key = KP_ENTER; break;
- case XK_Return: key = K_ENTER; break;
+ case XK_F5: key = K_F5; break;
- case XK_Tab: key = K_TAB; break;
+ case XK_F6: key = K_F6; 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_F7: key = K_F7; break;
- case XK_BackSpace: key = K_BACKSPACE; break;
+ case XK_F8: key = K_F8; break;
- case XK_KP_Delete: key = KP_DEL; break;
- case XK_Delete: key = K_DEL; break;
+ case XK_F9: key = K_F9; break;
- case XK_Pause: key = K_PAUSE; 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 ((key >= 'A') && (key <= 'Z'))
- key = key + ('a' - 'A');
- }
+
break;
}
XGrabPointer(vidx11_display, win, True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime);
+#ifndef __APPLE__
if (vid_dga.integer)
{
int MajorVersion, MinorVersion;
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
}
}
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;
+ ignoremousemove = true;
}
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);
XUndefineCursor(vidx11_display, win);
mouse_active = false;
+ ignoremousemove = true;
}
static void HandleEvents(void)
{
XEvent event;
+ int key;
+ char ascii;
qboolean dowarp = false;
if (!vidx11_display)
{
case KeyPress:
// key pressed
- Key_Event(XLateKey(&event.xkey), true);
+ key = XLateKey (&event.xkey, &ascii);
+ Key_Event(key, ascii, true);
break;
case KeyRelease:
// key released
- Key_Event(XLateKey(&event.xkey), false);
+ key = XLateKey (&event.xkey, &ascii);
+ Key_Event(key, ascii, false);
break;
case MotionNotify:
// mouse moved
- if (usingmouse)
+ if (vid_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 (!event.xmotion.send_event)
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:
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;
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;
break;
case ClientMessage:
// window manager messages
- if ((event.xclient.format == 32) && (event.xclient.data.l[0] == wm_delete_window_atom))
+ 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
XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, p_mouse_x, p_mouse_y);
}
+ // if told to ignore one mouse move, do so
+ if (ignoremousemove)
+ {
+ ignoremousemove = false;
+ mouse_x = 0;
+ mouse_y = 0;
+ }
}
static void IN_DeactivateMouse( void )
if (!mouse_active)
{
- mouse_x = mouse_y = 0; // don't spazz
install_grabs();
mouse_active = true;
}
}
+static void *prjobj = NULL;
+
+static void GL_CloseLibrary(void)
+{
+ if (prjobj)
+ dlclose(prjobj);
+ prjobj = NULL;
+ gl_driver[0] = 0;
+ qglXGetProcAddressARB = NULL;
+ gl_extensions = "";
+ gl_platform = "";
+ gl_platformextensions = "";
+}
+
+static int GL_OpenLibrary(const char *name)
+{
+ Con_Printf("Loading OpenGL driver %s\n", name);
+ GL_CloseLibrary();
+ if (!(prjobj = dlopen(name, RTLD_LAZY)))
+ {
+ 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)
{
return;
vid_hidden = true;
- usingmouse = false;
+ vid_usingmouse = false;
if (vidx11_display)
{
+ VID_RestoreSystemGamma();
uninstall_grabs();
+ // FIXME: glXDestroyContext here?
if (vidmode_active)
- XF86VidModeSwitchToMode(vidx11_display, scrnum, vidmodes[0]);
+ XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, vidmodes[0]);
if (win)
XDestroyWindow(vidx11_display, win);
XCloseDisplay(vidx11_display);
ctx = NULL;
GL_CloseLibrary();
+ Key_ClearStates ();
}
void signal_handler(int sig)
{
printf("Received signal %d, exiting...\n", sig);
+ VID_RestoreSystemGamma();
Sys_Quit();
exit(0);
}
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;
+ vid_usemouse = false;
if (vid_mouse.integer && !key_consoleactive)
- usemouse = true;
+ vid_usemouse = true;
if (vidmode_active)
- usemouse = true;
- if (usemouse)
+ vid_usemouse = true;
+ if (vid_usemouse)
{
- if (!usingmouse)
+ if (!vid_usingmouse)
{
- usingmouse = true;
+ vid_usingmouse = true;
IN_ActivateMouse ();
}
}
else
{
- if (usingmouse)
+ if (vid_usingmouse)
{
- usingmouse = false;
+ vid_usingmouse = false;
IN_DeactivateMouse ();
}
}
-}
-
-// 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)
-{
-// 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;
-
- 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))
+ if (r_render.integer)
{
- for (;!(mask & 1);mask >>= 1)
- ++Bshift;
- for (;(mask & 1);mask >>= 1)
- --Bloss;
+ if (r_speeds.integer || gl_finish.integer)
+ qglFinish();
+ qglXSwapBuffers(vidx11_display, win);
}
+}
- BuildGammaTable16(prescale, gamma, scale, base, ramp);
+int VID_SetGamma(unsigned short *ramps)
+{
+ return XF86VidModeSetGammaRamp(vidx11_display, vidx11_screen, 256, ramps, ramps + 256, ramps + 512);
+}
- // convert gamma ramp to palette (yes this seems odd)
- ncolors = vidx11_visual->map_entries;
- for (i = 0;i < ncolors;i++)
- {
- 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);
- }
- 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
+int VID_GetGamma(unsigned short *ramps)
+{
+ return XF86VidModeGetGammaRamp(vidx11_display, vidx11_screen, 256, ramps, ramps + 256, ramps + 512);
}
void VID_Init(void)
{
+#ifndef __APPLE__
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;
}
-void VID_BuildGLXAttrib(int *attrib, int stencil, int gamma)
+void VID_BuildGLXAttrib(int *attrib, int stencil)
{
*attrib++ = GLX_RGBA;
*attrib++ = GLX_RED_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;
}
- if (gamma)
- {
- *attrib++ = GLX_X_VISUAL_TYPE;*attrib++ = GLX_DIRECT_COLOR;
- };
*attrib++ = None;
}
-int VID_InitMode(int fullscreen, int width, int height, int bpp, int stencil)
+int VID_InitMode(int fullscreen, int width, int height, int bpp)
{
int i;
int attrib[32];
Window root;
XVisualInfo *visinfo;
int MajorVersion, MinorVersion;
-
- if (!GL_OpenLibrary("libGL.so.1"))
+ 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 <drivername> 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 <drivername> 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\n");
+ Con_Printf("Unable to load GL driver \"%s\"\n", drivername);
return false;
}
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;
}
- 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;
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;
}
return false;
}
- visinfo = NULL;
-// LordHavoc: FIXME: finish this code, we need to allocate colors before we can store them
-#if 0
- if (!COM_CheckParm("-nogamma"))
- {
- VID_BuildGLXAttrib(attrib, stencil, true);
- visinfo = qglXChooseVisual(vidx11_display, scrnum, attrib);
- }
-#endif
+ VID_BuildGLXAttrib(attrib, bpp == 32);
+ visinfo = qglXChooseVisual(vidx11_display, vidx11_screen, attrib);
if (!visinfo)
{
- VID_BuildGLXAttrib(attrib, stencil, false);
- visinfo = qglXChooseVisual(vidx11_display, scrnum, attrib);
- if (!visinfo)
- {
- Con_Printf("Couldn't get an RGB, Double-buffered, Depth visual\n");
- return false;
- }
+ 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;
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;
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");
- qglXMakeCurrent(vidx11_display, win, ctx);
+ if (!qglXMakeCurrent(vidx11_display, win, ctx))
+ Sys_Error ("glXMakeCurrent failed\n");
+
+ XSync(vidx11_display, False);
scr_width = width;
scr_height = height;
gl_version = qglGetString(GL_VERSION);
gl_extensions = qglGetString(GL_EXTENSIONS);
gl_platform = "GLX";
- gl_platformextensions = qglXQueryExtensionsString(vidx11_display, scrnum);
+ 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_usingmouse = false;
+ vid_usingvsync = false;
+ ignoremousemove = true;
vid_hidden = false;
+ vid_activewindow = true;
GL_Init();
return true;
}
{
}
-void IN_Move (usercmd_t *cmd)
+void IN_Move (void)
{
if (mouse_avail)
- IN_Mouse(cmd, mouse_x, mouse_y);
+ IN_Mouse(mouse_x, mouse_y);
mouse_x = 0;
mouse_y = 0;
}
-
-static void *prjobj = NULL;
-
-int GL_OpenLibrary(const char *name)
-{
- Con_Printf("Loading GL driver %s\n", name);
- GL_CloseLibrary();
- if (!(prjobj = dlopen(name, RTLD_LAZY)))
- {
- Con_Printf("Unable to open symbol list for %s\n", name);
- return 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 = "";
-}
-
-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;
-}
projects / xonotic / darkplaces.git / blobdiff