//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);
+GLint (GLAPIENTRY *qglXWaitVideoSyncSGI)(GLint divisor, GLint remainder, GLuint *count);
-static gl_extensionfunctionlist_t videosyncfuncs[] =
+static dllfunction_t videosyncfuncs[] =
{
{"glXGetVideoSyncSGI", (void **) &qglXGetVideoSyncSGI},
{"glXWaitVideoSyncSGI", (void **) &qglXWaitVideoSyncSGI},
};
static Display *vidx11_display = NULL;
-static int scrnum;
+static int vidx11_screen;
static Window win;
static GLXContext ctx = NULL;
/*-----------------------------------------------------------------------*/
-static int
-XLateKey(XKeyEvent *ev)
+static int XLateKey(XKeyEvent *ev)
{
int key = 0;
+ char buf[64];
KeySym keysym;
- keysym = XLookupKeysym(ev, 0);
+ XLookupString(ev, buf, sizeof buf, &keysym, 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 = KP_PGDN; break;
- case XK_Page_Down: key = K_PGDN; break;
+ case XK_KP_Page_Down: key = K_KP_PGDN; break;
+ case XK_Page_Down: key = K_PGDN; break;
- case XK_KP_Home: key = KP_HOME; break;
- case XK_Home: key = K_HOME; break;
+ case XK_KP_Home: key = K_KP_HOME; break;
+ case XK_Home: key = K_HOME; break;
- case XK_KP_End: key = KP_END; break;
- case XK_End: key = K_END; break;
+ case XK_KP_End: key = K_KP_END; break;
+ case XK_End: key = K_END; break;
- case XK_KP_Left: key = KP_LEFTARROW; break;
- case XK_Left: key = K_LEFTARROW; break;
+ case XK_KP_Left: key = K_KP_LEFTARROW; break;
+ case XK_Left: key = K_LEFTARROW; break;
- case XK_KP_Right: key = KP_RIGHTARROW; break;
- case XK_Right: key = K_RIGHTARROW; break;
+ case XK_KP_Right: key = K_KP_RIGHTARROW; break;
+ case XK_Right: key = K_RIGHTARROW; break;
- case XK_KP_Down: key = KP_DOWNARROW; break;
- case XK_Down: key = K_DOWNARROW; break;
+ case XK_KP_Down: key = K_KP_DOWNARROW; break;
+ case XK_Down: key = K_DOWNARROW; break;
- case XK_KP_Up: key = KP_UPARROW; break;
- case XK_Up: key = K_UPARROW; 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_Escape: key = K_ESCAPE; break;
- case XK_KP_Enter: key = KP_ENTER; break;
- case XK_Return: key = K_ENTER; break;
+ case XK_KP_Enter: key = K_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_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_F1: key = K_F1; break;
- case XK_BackSpace: key = K_BACKSPACE; break;
+ case XK_F2: key = K_F2; break;
- case XK_KP_Delete: key = KP_DEL; break;
- case XK_Delete: key = K_DEL; break;
+ case XK_F3: key = K_F3; break;
- case XK_Pause: key = K_PAUSE; 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_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;
+#if 0
+ case 0x021: key = '1';break;/* [!] */
+ case 0x040: key = '2';break;/* [@] */
+ case 0x023: key = '3';break;/* [#] */
+ case 0x024: key = '4';break;/* [$] */
+ case 0x025: key = '5';break;/* [%] */
+ case 0x05e: key = '6';break;/* [^] */
+ case 0x026: key = '7';break;/* [&] */
+ case 0x02a: key = '8';break;/* [*] */
+ case 0x028: key = '9';;break;/* [(] */
+ case 0x029: key = '0';break;/* [)] */
+ case 0x05f: key = '-';break;/* [_] */
+ case 0x02b: key = '=';break;/* [+] */
+ case 0x07c: key = '\'';break;/* [|] */
+ case 0x07d: key = '[';break;/* [}] */
+ case 0x07b: key = ']';break;/* [{] */
+ case 0x022: key = '\'';break;/* ["] */
+ case 0x03a: key = ';';break;/* [:] */
+ case 0x03f: key = '/';break;/* [?] */
+ case 0x03e: key = '.';break;/* [>] */
+ case 0x03c: key = ',';break;/* [<] */
+#endif
default:
- if (keysym < 128)
- {
- /* ASCII keys */
- key = keysym;
- if ((key >= 'A') && (key <= 'Z'))
- key = key + ('a' - 'A');
- }
+ key = *(unsigned char*)buf;
+ if (key >= 'A' && key <= 'Z')
+ key = key - 'A' + 'a';
break;
}
case 5:
Key_Event(K_MWHEELDOWN, true);
break;
- default:
- Con_Printf("HandleEvents: ButtonPress gave value %d, 1-5 expected\n", event.xbutton.button);
+ case 6:
+ Key_Event(K_MOUSE4, true);
+ break;
+ case 7:
+ Key_Event(K_MOUSE5, true);
+ break;
+ case 8:
+ Key_Event(K_MOUSE6, true);
+ break;
+ case 9:
+ Key_Event(K_MOUSE7, true);
+ break;
+ case 10:
+ Key_Event(K_MOUSE8, true);
+ break;
+ case 11:
+ Key_Event(K_MOUSE9, true);
+ break;
+ case 12:
+ Key_Event(K_MOUSE10, true);
+ break;
+ default:
+ Con_Printf("HandleEvents: ButtonPress gave value %d, 1-12 expected\n", event.xbutton.button);
break;
}
break;
case 5:
Key_Event(K_MWHEELDOWN, false);
break;
- default:
- Con_Printf("HandleEvents: ButtonRelease gave value %d, 1-5 expected\n", event.xbutton.button);
+ case 6:
+ Key_Event(K_MOUSE4, false);
+ break;
+ case 7:
+ Key_Event(K_MOUSE5, false);
+ break;
+ case 8:
+ Key_Event(K_MOUSE6, false);
+ break;
+ case 9:
+ Key_Event(K_MOUSE7, false);
+ break;
+ case 10:
+ Key_Event(K_MOUSE8, false);
+ break;
+ case 11:
+ Key_Event(K_MOUSE9, false);
+ break;
+ case 12:
+ Key_Event(K_MOUSE10, 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_allowhwgamma = true;
break;
case UnmapNotify:
// window iconified/rolledup/whatever
vid_hidden = true;
+ vid_allowhwgamma = false;
+ VID_RestoreSystemGamma();
break;
case FocusIn:
// window is now the input focus
+ vid_allowhwgamma = true;
break;
case FocusOut:
// window is no longer the input focus
+ vid_allowhwgamma = false;
+ VID_RestoreSystemGamma();
break;
case EnterNotify:
// mouse entered window
+ vid_allowhwgamma = true;
break;
case LeaveNotify:
// mouse left window
+ vid_allowhwgamma = false;
+ VID_RestoreSystemGamma();
break;
}
}
}
}
-
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]);
+ XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, vidmodes[0]);
if (win)
XDestroyWindow(vidx11_display, win);
XCloseDisplay(vidx11_display);
void signal_handler(int sig)
{
printf("Received signal %d, exiting...\n", sig);
+ VID_RestoreSystemGamma();
Sys_Quit();
exit(0);
}
}
}
-// 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;
-
- 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;
- }
-
- BuildGammaTable16(prescale, gamma, scale, base, ramp);
+ 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)
Cvar_RegisterVariable (&vid_dga);
Cvar_RegisterVariable (&vid_dga_mouseaccel);
InitSig(); // trap evil signals
+ if (COM_CheckParm ("-nomouse") || COM_CheckParm("-safe"))
+ mouse_avail = false;
}
-int VID_InitMode(int fullscreen, int width, int height, int bpp)
+void VID_BuildGLXAttrib(int *attrib, int stencil)
{
- int i;
-// LordHavoc: FIXME: finish this code, we need to allocate colors before we can store them
-#if 0
- int gammaattrib[] =
+ *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)
{
- 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
- };
+ *attrib++ = GLX_STENCIL_SIZE;*attrib++ = 8;
+ *attrib++ = GLX_ALPHA_SIZE;*attrib++ = 1;
+ }
+ *attrib++ = None;
+}
+
+int VID_InitMode(int fullscreen, int width, int height, int bpp, int stencil)
+{
+ int i;
+ int attrib[32];
XSetWindowAttributes attr;
unsigned long mask;
Window root;
XVisualInfo *visinfo;
int MajorVersion, MinorVersion;
+ const char *drivername;
- if (!GL_OpenLibrary("libGL.so.1"))
+ drivername = "libGL.so.1";
+ 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;
}
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;
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"))
- visinfo = qglXChooseVisual(vidx11_display, scrnum, gammaattrib);
-#endif
+ VID_BuildGLXAttrib(attrib, stencil);
+ visinfo = qglXChooseVisual(vidx11_display, vidx11_screen, attrib);
if (!visinfo)
{
- visinfo = qglXChooseVisual(vidx11_display, scrnum, nogammaattrib);
- if (!visinfo)
- {
- Con_Printf("Couldn't get an RGB, Double-buffered, Depth visual\n");
- return false;
- }
+ Con_Printf("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");
+
+ if (!qglXMakeCurrent(vidx11_display, win, ctx))
+ Sys_Error ("glXMakeCurrent failed\n");
- qglXMakeCurrent(vidx11_display, win, ctx);
+ 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);
+ usingmouse = false;
vid_hidden = false;
+ vid_allowhwgamma = true;
GL_Init();
return true;
}
HandleEvents();
}
-void IN_Init(void)
-{
- if (COM_CheckParm ("-nomouse") || COM_CheckParm("-safe"))
- mouse_avail = false;
-}
-
-void IN_Shutdown(void)
-{
-}
-
/*
===========
IN_Commands
p = (void *) dlsym(prjobj, name);
return p;
}
+
projects / xonotic / darkplaces.git / blobdiff