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");
}
- if (r_render.integer)
+ if (!vid_hidden)
{
CHECKGLERROR
if (r_speeds.integer == 2 || gl_finish.integer)
*attrib++ = None;
}
-int VID_InitMode(int fullscreen, int *width, int *height, int bpp, int refreshrate, int stereobuffer, int samples)
+qboolean VID_InitMode(viddef_mode_t *mode)
{
int i;
int attrib[32];
return false;
}
- VID_BuildGLXAttrib(attrib, bpp == 32, stereobuffer, samples);
+ VID_BuildGLXAttrib(attrib, mode->bitsperpixel == 32, mode->stereobuffer, mode->samples);
visinfo = qglXChooseVisual(vidx11_display, vidx11_screen, attrib);
if (!visinfo)
{
return false;
}
- if (fullscreen)
+ if (mode->fullscreen)
{
if(vid_netwmfullscreen.integer)
{
for (i = 0; i < num_vidmodes; i++)
{
- if (*width > vidmodes[i]->hdisplay || *height > vidmodes[i]->vdisplay)
+ if (mode->width > vidmodes[i]->hdisplay || mode->height > vidmodes[i]->vdisplay)
continue;
- x = *width - vidmodes[i]->hdisplay;
- y = *height - vidmodes[i]->vdisplay;
+ x = mode->width - vidmodes[i]->hdisplay;
+ y = mode->height - vidmodes[i]->vdisplay;
dist = (x * x) + (y * y);
if (best_fit == -1 || dist < best_dist)
{
// 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;
+ mode->width = vidmodes[best_fit]->hdisplay;
+ mode->height = vidmodes[best_fit]->vdisplay;
// change to the mode
XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, vidmodes[best_fit]);
// Move the viewport to top left
XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0);
- Con_DPrintf("Using XVidMode fullscreen mode at %dx%d\n", *width, *height);
+ Con_DPrintf("Using XVidMode fullscreen mode at %dx%d\n", mode->width, mode->height);
}
free(vidmodes);
// use the full desktop resolution
vid_isfullscreen = true;
// width and height will be filled in later
- *width = DisplayWidth(vidx11_display, vidx11_screen);
- *height = DisplayHeight(vidx11_display, vidx11_screen);
- Con_DPrintf("Using X11 fullscreen mode at %dx%d\n", *width, *height);
+ mode->width = DisplayWidth(vidx11_display, vidx11_screen);
+ mode->height = DisplayHeight(vidx11_display, vidx11_screen);
+ Con_DPrintf("Using X11 fullscreen mode at %dx%d\n", mode->width, mode->height);
}
}
vidx11_colormap = attr.colormap = XCreateColormap(vidx11_display, root, visinfo->visual, AllocNone);
attr.event_mask = X_MASK;
- if (fullscreen)
+ if (mode->fullscreen)
{
if(vid_isnetwmfullscreen)
{
mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
}
- win = XCreateWindow(vidx11_display, root, 0, 0, *width, *height, 0, visinfo->depth, InputOutput, visinfo->visual, mask, &attr);
+ win = XCreateWindow(vidx11_display, root, 0, 0, mode->width, mode->height, 0, visinfo->depth, InputOutput, visinfo->visual, mask, &attr);
wmhints = XAllocWMHints();
if(XpmCreatePixmapFromData(vidx11_display, win,
szhints = XAllocSizeHints();
if(vid_resizable.integer == 0 && !vid_isnetwmfullscreen)
{
- szhints->min_width = szhints->max_width = *width;
- szhints->min_height = szhints->max_height = *height;
+ szhints->min_width = szhints->max_width = mode->width;
+ szhints->min_height = szhints->max_height = mode->height;
szhints->flags |= PMinSize | PMaxSize;
}
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)
static qboolean sound_active = true;
// enable/disable sound on focus gain/loss
- if (!vid_hidden && (vid_activewindow || !snd_mutewhenidle.integer))
+ if ((!vid_hidden && vid_activewindow) || !snd_mutewhenidle.integer)
{
if (!sound_active)
{
void IN_Move (void)
{
}
+
+size_t VID_ListModes(vid_mode_t *modes, size_t maxcount)
+{
+ if(vidmode_ext)
+ {
+ int i, bpp;
+ size_t k;
+ XF86VidModeModeInfo **vidmodes;
+ int num_vidmodes;
+
+ XF86VidModeGetAllModeLines(vidx11_display, vidx11_screen, &num_vidmodes, &vidmodes);
+ k = 0;
+ for (i = 0; i < num_vidmodes; i++)
+ {
+ if(k >= maxcount)
+ break;
+ // we don't get bpp info, so let's just assume all of 8, 15, 16, 24, 32 work
+ for(bpp = 8; bpp <= 32; bpp = ((bpp == 8) ? 15 : (bpp & 0xF8) + 8))
+ {
+ if(k >= maxcount)
+ break;
+ modes[k].width = vidmodes[i]->hdisplay;
+ modes[k].height = vidmodes[i]->vdisplay;
+ modes[k].bpp = 8;
+ if(vidmodes[i]->dotclock && vidmodes[i]->htotal && vidmodes[i]->vtotal)
+ modes[k].refreshrate = vidmodes[i]->dotclock / vidmodes[i]->htotal / vidmodes[i]->vtotal;
+ else
+ modes[k].refreshrate = 60;
+ modes[k].pixelheight_num = 1;
+ modes[k].pixelheight_denom = 1; // xvidmode does not provide this
+ ++k;
+ }
+ }
+ return k;
+ }
+ return 0; // FIXME implement this
+}
projects / xonotic / darkplaces.git / blobdiff