X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=vid_glx.c;h=8327b2608e9a8e301af2d7d27d0101c0e6a816fd;hp=6773b86ca79b23898afd96cffe3292c448dea49d;hb=d85d3ae5246bd89abc0f6c77b2de80313a153f1b;hpb=5737591d891d69836735abb645a1b173baaabe96 diff --git a/vid_glx.c b/vid_glx.c index 6773b86c..8327b260 100644 --- a/vid_glx.c +++ b/vid_glx.c @@ -17,6 +17,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#if !defined(__APPLE__) && !defined(__MACH__) && !defined(SUNOS) +//#define USEDGA +#endif + #include #include @@ -35,7 +39,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include -#if !defined(__APPLE__) && !defined(__MACH__) && !defined(SUNOS) +#ifdef USEDGA #include #endif #include @@ -116,14 +120,15 @@ static qboolean vid_usinghidecursor = false; static qboolean vid_usingvsync = false; static qboolean vid_usevsync = false; static qboolean vid_x11_hardwaregammasupported = false; +#ifdef USEDGA static qboolean vid_x11_dgasupported = false; +#endif static int vid_x11_gammarampsize = 0; -#if !defined(__APPLE__) && !defined(SUNOS) +#ifdef USEDGA cvar_t vid_dgamouse = {CVAR_SAVE, "vid_dgamouse", "0", "make use of DGA mouse input"}; static qboolean vid_usingdgamouse = false; #endif -cvar_t vid_netwmfullscreen = {CVAR_SAVE, "vid_netwmfullscreen", "0", "make use _NET_WM_STATE_FULLSCREEN; turn this off if fullscreen does not work for you"}; qboolean vidmode_ext = false; @@ -132,17 +137,18 @@ static int win_x, win_y; static XF86VidModeModeInfo init_vidmode, game_vidmode; static qboolean vid_isfullscreen = false; static qboolean vid_isvidmodefullscreen = false; -static qboolean vid_isnetwmfullscreen = false; +static qboolean vid_isdesktopfullscreen = false; static qboolean vid_isoverrideredirect = false; +static vid_mode_t desktop_mode; static Visual *vidx11_visual; static Colormap vidx11_colormap; /*-----------------------------------------------------------------------*/ // -long keysym2ucs(KeySym keysym); -void DP_Xutf8LookupString(XKeyEvent * ev, +extern long keysym2ucs(KeySym keysym); // LordHavoc: suppress warning just in this case, it's not worth having a header file for this... +static void DP_Xutf8LookupString(XKeyEvent * ev, Uchar *uch, KeySym * keysym_return, Status * status_return) @@ -278,7 +284,13 @@ static int XLateKey(XKeyEvent *ev, Uchar *ascii) case XK_KP_Subtract: key = K_KP_MINUS; break; case XK_KP_Divide: key = K_KP_SLASH; break; - case XK_section: key = '~'; break; + case XK_Num_Lock: key = K_NUMLOCK; break; + case XK_Caps_Lock: key = K_CAPSLOCK; break; + case XK_Scroll_Lock: key = K_SCROLLOCK; break; + + case XK_asciicircum: *ascii = key = '^'; break; // for some reason, XLookupString returns "" on this one for Grunt|2 + + case XK_section: *ascii = key = '~'; break; default: if (keysym < 32) @@ -323,7 +335,7 @@ void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecurso static int originalmouseparms_threshold; static qboolean restore_spi; -#if !defined(__APPLE__) && !defined(SUNOS) +#ifdef USEDGA qboolean usedgamouse; #endif @@ -336,7 +348,7 @@ void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecurso if (!mouse_avail) fullscreengrab = relative = hidecursor = false; -#if !defined(__APPLE__) && !defined(SUNOS) +#ifdef USEDGA usedgamouse = relative && vid_dgamouse.integer; if (!vid_x11_dgasupported) usedgamouse = false; @@ -372,7 +384,7 @@ void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecurso attribs_2.event_mask = attribs_1.your_event_mask | KEY_MASK | MOUSE_MASK; XChangeWindowAttributes(vidx11_display, win, CWEventMask, &attribs_2); -#if !defined(__APPLE__) && !defined(SUNOS) +#ifdef USEDGA vid_usingdgamouse = usedgamouse; if (usedgamouse) { @@ -384,7 +396,7 @@ void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecurso XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, vid.width / 2, vid.height / 2); // COMMANDLINEOPTION: X11 Input: -noforcemparms disables setting of mouse parameters (not used with DGA, windows only) -#if !defined(__APPLE__) && !defined(SUNOS) +#ifdef USEDGA if (!COM_CheckParm ("-noforcemparms") && !usedgamouse) #else if (!COM_CheckParm ("-noforcemparms")) @@ -405,7 +417,7 @@ void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecurso { if (vid_usingmouse) { -#if !defined(__APPLE__) && !defined(SUNOS) +#ifdef USEDGA if (vid_usingdgamouse) XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), 0); vid_usingdgamouse = false; @@ -597,7 +609,7 @@ static void HandleEvents(void) // mouse moved if (vid_usingmouse) { -#if !defined(__APPLE__) && !defined(SUNOS) +#ifdef USEDGA if (vid_usingdgamouse) { in_mouse_x += event.xmotion.x_root; @@ -646,28 +658,37 @@ static void HandleEvents(void) // window changed size/location win_x = event.xconfigure.x; win_y = event.xconfigure.y; - if((vid_resizable.integer < 2 || vid_isnetwmfullscreen) && (vid.width != event.xconfigure.width || vid.height != event.xconfigure.height)) + // HACK on X11, we just request fullscreen mode, but + // cannot guess what the window manager will do for us + // exactly. That is why we read back the resolution we + // actually got here. + if(vid_isdesktopfullscreen) + { + desktop_mode.width = event.xconfigure.width; + desktop_mode.height = event.xconfigure.height; + } + if((vid_resizable.integer < 2 || vid_isdesktopfullscreen) && (vid.width != event.xconfigure.width || vid.height != event.xconfigure.height)) { vid.width = event.xconfigure.width; vid.height = event.xconfigure.height; - if(vid_isnetwmfullscreen) + if(vid_isdesktopfullscreen) Con_Printf("NetWM fullscreen: actually using resolution %dx%d\n", vid.width, vid.height); else Con_DPrintf("Updating to ConfigureNotify resolution %dx%d\n", vid.width, vid.height); - DPSOFTRAST_Flush(); - - if(vid.softdepthpixels) - free(vid.softdepthpixels); - - DestroyXImages(); - XSync(vidx11_display, False); - if(!BuildXImages(vid.width, vid.height)) - return; - XSync(vidx11_display, False); - - vid.softpixels = (unsigned int *) vidx11_ximage[vidx11_ximage_pos]->data; - vid.softdepthpixels = (unsigned int *)calloc(4, vid.width * vid.height); + if(vid.renderpath == RENDERPATH_SOFT) + { + DPSOFTRAST_Flush(); + if(vid.softdepthpixels) + free(vid.softdepthpixels); + DestroyXImages(); + XSync(vidx11_display, False); + if(!BuildXImages(vid.width, vid.height)) + return; + XSync(vidx11_display, False); + vid.softpixels = (unsigned int *) vidx11_ximage[vidx11_ximage_pos]->data; + vid.softdepthpixels = (unsigned int *)calloc(4, vid.width * vid.height); + } } break; case DestroyNotify: @@ -695,7 +716,7 @@ static void HandleEvents(void) XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0); } - if(vid_isnetwmfullscreen) + if(vid_isdesktopfullscreen) { // make sure it's fullscreen XEvent event; @@ -737,7 +758,7 @@ static void HandleEvents(void) if (vid_isoverrideredirect) break; - if(vid_isnetwmfullscreen && event.xfocus.mode == NotifyNormal) + if(vid_isdesktopfullscreen && event.xfocus.mode == NotifyNormal) { // iconify netwm fullscreen window when it loses focus // when the user selects it in the taskbar, the window manager will map it again and send MapNotify @@ -858,7 +879,7 @@ void VID_Shutdown(void) vid_hidden = true; vid_isfullscreen = false; - vid_isnetwmfullscreen = false; + vid_isdesktopfullscreen = false; vid_isvidmodefullscreen = false; vid_isoverrideredirect = false; vidx11_display = NULL; @@ -869,14 +890,14 @@ void VID_Shutdown(void) Key_ClearStates (); } -void signal_handler(int sig) +static void signal_handler(int sig) { Con_Printf("Received signal %d, exiting...\n", sig); VID_RestoreSystemGamma(); Sys_Quit(1); } -void InitSig(void) +static void InitSig(void) { signal(SIGHUP, signal_handler); signal(SIGINT, signal_handler); @@ -901,18 +922,18 @@ void VID_Finish (void) vid.softpixels = (unsigned int *) vidx11_ximage[vidx11_ximage_pos]->data; DPSOFTRAST_SetRenderTargets(vid.width, vid.height, vid.softdepthpixels, vid.softpixels, NULL, NULL, NULL); + ++vidx11_shmwait; + XShmPutImage(vidx11_display, win, vidx11_gc, vidx11_ximage[!vidx11_ximage_pos], 0, 0, 0, 0, vid.width, vid.height, True); + // save mouse motion so we can deal with it later in_mouse_x = 0; in_mouse_y = 0; - while(vidx11_shmwait) + while(vidx11_shmwait > 1) HandleEvents(); in_mouse_x_save += in_mouse_x; in_mouse_y_save += in_mouse_y; in_mouse_x = 0; in_mouse_y = 0; - - ++vidx11_shmwait; - XShmPutImage(vidx11_display, win, vidx11_gc, vidx11_ximage[!vidx11_ximage_pos], 0, 0, 0, 0, vid.width, vid.height, True); } else { // no buffer switching here, we just flush the renderer DPSOFTRAST_Finish(); @@ -928,7 +949,7 @@ void VID_Finish (void) if (vid_usingvsync != vid_usevsync) { vid_usingvsync = vid_usevsync; - if (qglXSwapIntervalSGI (vid_usevsync)) + if (qglXSwapIntervalSGI && 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"); } @@ -963,10 +984,10 @@ int VID_GetGamma(unsigned short *ramps, int rampsize) void VID_Init(void) { -#if !defined(__APPLE__) && !defined(SUNOS) +#ifdef USEDGA Cvar_RegisterVariable (&vid_dgamouse); #endif - Cvar_RegisterVariable (&vid_netwmfullscreen); + Cvar_RegisterVariable (&vid_desktopfullscreen); InitSig(); // trap evil signals // COMMANDLINEOPTION: Input: -nomouse disables mouse support (see also vid_mouse cvar) if (COM_CheckParm ("-nomouse")) @@ -975,7 +996,7 @@ void VID_Init(void) vidx11_shminfo[1].shmid = -1; } -void VID_BuildGLXAttrib(int *attrib, qboolean stencil, qboolean stereobuffer, int samples) +static void VID_BuildGLXAttrib(int *attrib, qboolean stencil, qboolean stereobuffer, int samples) { *attrib++ = GLX_RGBA; *attrib++ = GLX_RED_SIZE;*attrib++ = stencil ? 8 : 5; @@ -1001,7 +1022,7 @@ void VID_BuildGLXAttrib(int *attrib, qboolean stencil, qboolean stereobuffer, in *attrib++ = None; } -qboolean VID_InitModeSoft(viddef_mode_t *mode) +static qboolean VID_InitModeSoft(viddef_mode_t *mode) { int i, j; XSetWindowAttributes attr; @@ -1015,9 +1036,10 @@ qboolean VID_InitModeSoft(viddef_mode_t *mode) unsigned char *data; XGCValues gcval; const char *dpyname; + char vabuf[1024]; vid_isfullscreen = false; - vid_isnetwmfullscreen = false; + vid_isdesktopfullscreen = false; vid_isvidmodefullscreen = false; vid_isoverrideredirect = false; @@ -1043,6 +1065,13 @@ qboolean VID_InitModeSoft(viddef_mode_t *mode) vidx11_screen = DefaultScreen(vidx11_display); root = RootWindow(vidx11_display, vidx11_screen); + desktop_mode.width = DisplayWidth(vidx11_display, vidx11_screen); + desktop_mode.height = DisplayHeight(vidx11_display, vidx11_screen); + desktop_mode.bpp = DefaultDepth(vidx11_display, vidx11_screen); + desktop_mode.refreshrate = 60; // FIXME + desktop_mode.pixelheight_num = 1; // FIXME + desktop_mode.pixelheight_denom = 1; // FIXME + // Get video mode list MajorVersion = MinorVersion = 0; if (!XF86VidModeQueryVersion(vidx11_display, &MajorVersion, &MinorVersion)) @@ -1055,10 +1084,10 @@ qboolean VID_InitModeSoft(viddef_mode_t *mode) if (mode->fullscreen) { - if(vid_netwmfullscreen.integer) + if(vid_desktopfullscreen.integer) { // TODO detect WM support - vid_isnetwmfullscreen = true; + vid_isdesktopfullscreen = true; vid_isfullscreen = true; // width and height will be filled in later Con_DPrintf("Using NetWM fullscreen mode\n"); @@ -1142,7 +1171,7 @@ qboolean VID_InitModeSoft(viddef_mode_t *mode) if (mode->fullscreen) { - if(vid_isnetwmfullscreen) + if(vid_isdesktopfullscreen) { mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | CWEventMask; attr.backing_store = NotUseful; @@ -1188,7 +1217,7 @@ qboolean VID_InitModeSoft(viddef_mode_t *mode) } ++i; Mem_Free(data); - data = loadimagepixelsbgra(va("darkplaces-icon%d", i), false, false, false, NULL); + data = loadimagepixelsbgra(va(vabuf, sizeof(vabuf), "darkplaces-icon%d", i), false, false, false, NULL); } XChangeProperty(vidx11_display, win, net_wm_icon, cardinal, 32, PropModeReplace, (const unsigned char *) netwm_icon, pos); } @@ -1215,7 +1244,7 @@ qboolean VID_InitModeSoft(viddef_mode_t *mode) clshints->res_class = strdup("DarkPlaces"); szhints = XAllocSizeHints(); - if(vid_resizable.integer == 0 && !vid_isnetwmfullscreen) + if(vid_resizable.integer == 0 && !vid_isdesktopfullscreen) { szhints->min_width = szhints->max_width = mode->width; szhints->min_height = szhints->max_height = mode->height; @@ -1288,7 +1317,7 @@ qboolean VID_InitModeSoft(viddef_mode_t *mode) vid_hidden = false; vid_activewindow = true; vid_x11_hardwaregammasupported = XF86VidModeGetGammaRampSize(vidx11_display, vidx11_screen, &vid_x11_gammarampsize) != 0; -#if !defined(__APPLE__) && !defined(SUNOS) +#ifdef USEDGA vid_x11_dgasupported = XF86DGAQueryVersion(vidx11_display, &MajorVersion, &MinorVersion); if (!vid_x11_dgasupported) Con_Print( "Failed to detect XF86DGA Mouse extension\n" ); @@ -1298,7 +1327,8 @@ qboolean VID_InitModeSoft(viddef_mode_t *mode) return true; } -qboolean VID_InitModeGL(viddef_mode_t *mode) + +static qboolean VID_InitModeGL(viddef_mode_t *mode) { int i, j; int attrib[32]; @@ -1313,9 +1343,10 @@ qboolean VID_InitModeGL(viddef_mode_t *mode) char *xpm; char **idata; unsigned char *data; + char vabuf[1024]; vid_isfullscreen = false; - vid_isnetwmfullscreen = false; + vid_isdesktopfullscreen = false; vid_isvidmodefullscreen = false; vid_isoverrideredirect = false; @@ -1357,6 +1388,13 @@ qboolean VID_InitModeGL(viddef_mode_t *mode) vidx11_screen = DefaultScreen(vidx11_display); root = RootWindow(vidx11_display, vidx11_screen); + desktop_mode.width = DisplayWidth(vidx11_display, vidx11_screen); + desktop_mode.height = DisplayHeight(vidx11_display, vidx11_screen); + desktop_mode.bpp = DefaultDepth(vidx11_display, vidx11_screen); + desktop_mode.refreshrate = 60; // FIXME + desktop_mode.pixelheight_num = 1; // FIXME + desktop_mode.pixelheight_denom = 1; // FIXME + // Get video mode list MajorVersion = MinorVersion = 0; if (!XF86VidModeQueryVersion(vidx11_display, &MajorVersion, &MinorVersion)) @@ -1388,10 +1426,10 @@ qboolean VID_InitModeGL(viddef_mode_t *mode) if (mode->fullscreen) { - if(vid_netwmfullscreen.integer) + if(vid_desktopfullscreen.integer) { // TODO detect WM support - vid_isnetwmfullscreen = true; + vid_isdesktopfullscreen = true; vid_isfullscreen = true; // width and height will be filled in later Con_DPrintf("Using NetWM fullscreen mode\n"); @@ -1475,7 +1513,7 @@ qboolean VID_InitModeGL(viddef_mode_t *mode) if (mode->fullscreen) { - if(vid_isnetwmfullscreen) + if(vid_isdesktopfullscreen) { mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | CWEventMask; attr.backing_store = NotUseful; @@ -1521,7 +1559,7 @@ qboolean VID_InitModeGL(viddef_mode_t *mode) } ++i; Mem_Free(data); - data = loadimagepixelsbgra(va("darkplaces-icon%d", i), false, false, false, NULL); + data = loadimagepixelsbgra(va(vabuf, sizeof(vabuf), "darkplaces-icon%d", i), false, false, false, NULL); } XChangeProperty(vidx11_display, win, net_wm_icon, cardinal, 32, PropModeReplace, (const unsigned char *) netwm_icon, pos); } @@ -1548,7 +1586,7 @@ qboolean VID_InitModeGL(viddef_mode_t *mode) clshints->res_class = strdup("DarkPlaces"); szhints = XAllocSizeHints(); - if(vid_resizable.integer == 0 && !vid_isnetwmfullscreen) + if(vid_resizable.integer == 0 && !vid_isdesktopfullscreen) { szhints->min_width = szhints->max_width = mode->width; szhints->min_height = szhints->max_height = mode->height; @@ -1626,7 +1664,7 @@ qboolean VID_InitModeGL(viddef_mode_t *mode) vid_hidden = false; vid_activewindow = true; vid_x11_hardwaregammasupported = XF86VidModeGetGammaRampSize(vidx11_display, vidx11_screen, &vid_x11_gammarampsize) != 0; -#if !defined(__APPLE__) && !defined(SUNOS) +#ifdef USEDGA vid_x11_dgasupported = XF86DGAQueryVersion(vidx11_display, &MajorVersion, &MinorVersion); if (!vid_x11_dgasupported) Con_Print( "Failed to detect XF86DGA Mouse extension\n" ); @@ -1701,6 +1739,11 @@ void IN_Move (void) VID_ApplyJoyState(&joystate); } +vid_mode_t *VID_GetDesktopMode(void) +{ + return &desktop_mode; +} + size_t VID_ListModes(vid_mode_t *modes, size_t maxcount) { if(vidmode_ext)