mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-01-17 22:50:51 +00:00
added vid_fullscreen cvar as a CVAR_ROM. This will change once the renderer is setup to reload textures.
removed -window, -mode, and internal mode table and functions that strictly delt with them. Rewrote the mode selection part of VID_Init Altered VID_SetMode and associated functions to use data obtained from VID_Init instead of mode tables. Also tidied up a little.
This commit is contained in:
Chris Ison
parent
bff8a24d12
commit
64f74731c5
1 changed files with 71 additions and 514 deletions
|
|
@ -85,52 +85,16 @@ static BOOL (GLAPIENTRY *qf_wglMakeCurrent) (HDC, HGLRC);
|
|||
#define NO_MODE (MODE_WINDOWED - 1)
|
||||
#define MODE_FULLSCREEN_DEFAULT (MODE_WINDOWED + 1)
|
||||
|
||||
typedef struct {
|
||||
modestate_t type;
|
||||
int width;
|
||||
int height;
|
||||
int modenum;
|
||||
int dib;
|
||||
int fullscreen;
|
||||
int bpp;
|
||||
int halfscreen;
|
||||
char modedesc[17];
|
||||
} vmode_t;
|
||||
|
||||
typedef struct {
|
||||
int width;
|
||||
int height;
|
||||
} lmode_t;
|
||||
|
||||
static lmode_t lowresmodes[] = {
|
||||
{320, 200},
|
||||
{320, 240},
|
||||
{400, 300},
|
||||
{512, 384},
|
||||
};
|
||||
|
||||
static int nummodes;
|
||||
static vmode_t modelist[MAX_MODE_LIST];
|
||||
static vmode_t badmode;
|
||||
|
||||
static qboolean windowed, leavecurrentmode;
|
||||
static int windowed_mouse;
|
||||
static HICON hIcon;
|
||||
|
||||
static RECT WindowRect;
|
||||
static DWORD WindowStyle;
|
||||
|
||||
static int vid_modenum = NO_MODE;
|
||||
static int vid_realmode;
|
||||
static int vid_default = MODE_WINDOWED;
|
||||
static int windowed_default;
|
||||
static qboolean fullsbardraw = true;
|
||||
|
||||
static HDC maindc;
|
||||
|
||||
|
||||
|
||||
static char *VID_GetModeDescription (int mode);
|
||||
static void GL_Init (void);
|
||||
|
||||
static void * (WINAPI *glGetProcAddress) (const char *symbol) = NULL;
|
||||
|
|
@ -179,22 +143,12 @@ CenterWindow (HWND hWndCenter, int width, int height, BOOL lefttopjustify)
|
|||
}
|
||||
|
||||
static qboolean
|
||||
VID_SetWindowedMode (int modenum)
|
||||
VID_SetWindowedMode ( void )
|
||||
{
|
||||
HDC hdc;
|
||||
int lastmodestate, width, height;
|
||||
int width, height;
|
||||
RECT rect;
|
||||
|
||||
lastmodestate = modestate;
|
||||
|
||||
WindowRect.top = WindowRect.left = 0;
|
||||
|
||||
WindowRect.right = modelist[modenum].width;
|
||||
WindowRect.bottom = modelist[modenum].height;
|
||||
|
||||
window_width = modelist[modenum].width;
|
||||
window_height = modelist[modenum].height;
|
||||
|
||||
WindowStyle = WS_OVERLAPPED | WS_BORDER | WS_CAPTION | WS_SYSMENU |
|
||||
WS_MINIMIZEBOX | WS_CLIPSIBLINGS | WS_CLIPCHILDREN;
|
||||
|
||||
|
|
@ -229,13 +183,6 @@ VID_SetWindowedMode (int modenum)
|
|||
PatBlt (hdc, 0, 0, WindowRect.right, WindowRect.bottom, BLACKNESS);
|
||||
ReleaseDC (mainwindow, hdc);
|
||||
|
||||
if (vid.conheight > modelist[modenum].height)
|
||||
vid.conheight = modelist[modenum].height;
|
||||
if (vid.conwidth > modelist[modenum].width)
|
||||
vid.conwidth = modelist[modenum].width;
|
||||
scr_width = vid.width = vid.conwidth;
|
||||
scr_height = vid.height = vid.conheight;
|
||||
|
||||
vid.numpages = 2;
|
||||
|
||||
if(hIcon) {
|
||||
|
|
@ -247,39 +194,14 @@ VID_SetWindowedMode (int modenum)
|
|||
}
|
||||
|
||||
static qboolean
|
||||
VID_SetFullDIBMode (int modenum)
|
||||
VID_SetFullDIBMode ( void )
|
||||
{
|
||||
HDC hdc;
|
||||
int lastmodestate, width, height;
|
||||
int width, height;
|
||||
RECT rect;
|
||||
|
||||
memset (&win_gdevmode,0,sizeof(win_gdevmode));
|
||||
|
||||
if (!leavecurrentmode) {
|
||||
win_gdevmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT;
|
||||
win_gdevmode.dmBitsPerPel = modelist[modenum].bpp;
|
||||
win_gdevmode.dmPelsWidth = modelist[modenum].width <<
|
||||
modelist[modenum].halfscreen;
|
||||
win_gdevmode.dmPelsHeight = modelist[modenum].height;
|
||||
win_gdevmode.dmSize = sizeof (win_gdevmode);
|
||||
|
||||
if (ChangeDisplaySettings (&win_gdevmode, CDS_FULLSCREEN) !=
|
||||
DISP_CHANGE_SUCCESSFUL)
|
||||
Sys_Error ("Couldn't set fullscreen DIB mode (%lx)",
|
||||
GetLastError());
|
||||
}
|
||||
|
||||
lastmodestate = modestate;
|
||||
modestate = MS_FULLDIB;
|
||||
|
||||
WindowRect.top = WindowRect.left = 0;
|
||||
|
||||
WindowRect.right = modelist[modenum].width;
|
||||
WindowRect.bottom = modelist[modenum].height;
|
||||
|
||||
|
||||
window_width = modelist[modenum].width;
|
||||
window_height = modelist[modenum].height;
|
||||
if (ChangeDisplaySettings (&win_gdevmode, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL)
|
||||
Sys_Error ("Couldn't set fullscreen DIB mode (%lx)", GetLastError());
|
||||
|
||||
// FIXME: some drivers have broken FS popup window handling
|
||||
// until I find way around it, or find some other cause for it
|
||||
|
|
@ -313,13 +235,6 @@ VID_SetFullDIBMode (int modenum)
|
|||
PatBlt (hdc, 0, 0, WindowRect.right, WindowRect.bottom, BLACKNESS);
|
||||
ReleaseDC (mainwindow, hdc);
|
||||
|
||||
if (vid.conheight > modelist[modenum].height)
|
||||
vid.conheight = modelist[modenum].height;
|
||||
if (vid.conwidth > modelist[modenum].width)
|
||||
vid.conwidth = modelist[modenum].width;
|
||||
scr_width = vid.width = vid.conwidth;
|
||||
scr_height = vid.height = vid.conheight;
|
||||
|
||||
vid.numpages = 2;
|
||||
|
||||
// needed because we're not getting WM_MOVE messages fullscreen on NT
|
||||
|
|
@ -335,44 +250,39 @@ VID_SetFullDIBMode (int modenum)
|
|||
}
|
||||
|
||||
static int
|
||||
VID_SetMode (int modenum, unsigned char *palette)
|
||||
VID_SetMode (unsigned char *palette)
|
||||
{
|
||||
int original_mode;
|
||||
qboolean stat = 0;
|
||||
MSG msg;
|
||||
|
||||
if ((windowed && (modenum != 0)) ||
|
||||
(!windowed && (modenum < 1)) || (!windowed && (modenum >= nummodes))) {
|
||||
Sys_Error ("Bad video mode");
|
||||
}
|
||||
|
||||
// so Con_Printfs don't mess us up by forcing vid and snd updates
|
||||
|
||||
CDAudio_Pause ();
|
||||
|
||||
if (vid_modenum == NO_MODE)
|
||||
original_mode = windowed_default;
|
||||
else
|
||||
original_mode = vid_modenum;
|
||||
WindowRect.top = WindowRect.left = 0;
|
||||
|
||||
WindowRect.right = vid_width->int_val;
|
||||
WindowRect.bottom = vid_height->int_val;
|
||||
|
||||
window_width = vid_width->int_val;
|
||||
window_height = vid_height->int_val;
|
||||
|
||||
// Set either the fullscreen or windowed mode
|
||||
if (modelist[modenum].type == MS_WINDOWED) {
|
||||
if (!vid_fullscreen->int_val) {
|
||||
if (in_grab->int_val && key_dest == key_game) {
|
||||
stat = VID_SetWindowedMode (modenum);
|
||||
stat = VID_SetWindowedMode ();
|
||||
IN_ActivateMouse ();
|
||||
IN_HideMouse ();
|
||||
} else {
|
||||
IN_DeactivateMouse ();
|
||||
IN_ShowMouse ();
|
||||
stat = VID_SetWindowedMode (modenum);
|
||||
stat = VID_SetWindowedMode ();
|
||||
}
|
||||
} else if (modelist[modenum].type == MS_FULLDIB) {
|
||||
stat = VID_SetFullDIBMode (modenum);
|
||||
} else {
|
||||
stat = VID_SetFullDIBMode ();
|
||||
IN_ActivateMouse ();
|
||||
IN_HideMouse ();
|
||||
} else {
|
||||
Sys_Error ("VID_SetMode: Bad mode type in modelist");
|
||||
}
|
||||
}
|
||||
|
||||
VID_UpdateWindowStatus (window_x, window_y);
|
||||
|
||||
|
|
@ -390,7 +300,6 @@ VID_SetMode (int modenum, unsigned char *palette)
|
|||
// Who knows if it helps, but it probably doesn't hurt
|
||||
SetForegroundWindow (mainwindow);
|
||||
VID_SetPalette (palette);
|
||||
vid_modenum = modenum;
|
||||
|
||||
while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE)) {
|
||||
TranslateMessage (&msg);
|
||||
|
|
@ -408,8 +317,7 @@ VID_SetMode (int modenum, unsigned char *palette)
|
|||
// fix the leftover Alt from any Alt-Tab or the like that switched us away
|
||||
IN_ClearStates ();
|
||||
|
||||
Con_Printf ("Video mode %s initialized.\n",
|
||||
VID_GetModeDescription (vid_modenum));
|
||||
Con_Printf ("Video mode %ix%i initialized.\n",vid_width->int_val, vid_height->int_val);
|
||||
|
||||
VID_SetPalette (palette);
|
||||
|
||||
|
|
@ -448,7 +356,7 @@ GL_EndRendering (void)
|
|||
}
|
||||
|
||||
// handle the mouse state when windowed if that's changed
|
||||
if (modestate == MS_WINDOWED) {
|
||||
if (!vid_fullscreen->int_val) {
|
||||
if (!in_grab->int_val) {
|
||||
if (windowed_mouse) {
|
||||
IN_DeactivateMouse ();
|
||||
|
|
@ -500,7 +408,7 @@ VID_Shutdown (void)
|
|||
if (hDC && mainwindow)
|
||||
ReleaseDC (mainwindow, hDC);
|
||||
|
||||
if (modestate == MS_FULLDIB)
|
||||
if (vid_fullscreen->int_val)
|
||||
ChangeDisplaySettings (NULL, 0);
|
||||
|
||||
if (maindc && mainwindow)
|
||||
|
|
@ -524,10 +432,7 @@ bSetupPixelFormat (HDC hDC)
|
|||
pfd.dwFlags = PFD_DOUBLEBUFFER | PFD_SUPPORT_OPENGL | PFD_DRAW_TO_WINDOW;
|
||||
pfd.iPixelType = PFD_TYPE_RGBA;
|
||||
|
||||
if (!modelist[vid_default].bpp)
|
||||
pfd.cColorBits = 16;
|
||||
else
|
||||
pfd.cColorBits = modelist[vid_default].bpp;
|
||||
pfd.cColorBits = win_gdevmode.dmBitsPerPel ;
|
||||
|
||||
pfd.cDepthBits = 32;
|
||||
pfd.iLayerType = PFD_MAIN_PLANE;
|
||||
|
|
@ -544,264 +449,19 @@ bSetupPixelFormat (HDC hDC)
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
static int
|
||||
VID_NumModes (void)
|
||||
{
|
||||
return nummodes;
|
||||
}
|
||||
|
||||
static vmode_t *
|
||||
VID_GetModePtr (int modenum)
|
||||
{
|
||||
if ((modenum >= 0) && (modenum < nummodes))
|
||||
return &modelist[modenum];
|
||||
else
|
||||
return &badmode;
|
||||
}
|
||||
|
||||
static char *
|
||||
VID_GetModeDescription (int mode)
|
||||
{
|
||||
char *pinfo;
|
||||
vmode_t *pv;
|
||||
static char temp[100];
|
||||
|
||||
if ((mode < 0) || (mode >= nummodes))
|
||||
return NULL;
|
||||
|
||||
if (!leavecurrentmode) {
|
||||
pv = VID_GetModePtr (mode);
|
||||
pinfo = pv->modedesc;
|
||||
} else {
|
||||
snprintf (temp, sizeof (temp), "Desktop resolution (%dx%d)",
|
||||
modelist[MODE_FULLSCREEN_DEFAULT].width,
|
||||
modelist[MODE_FULLSCREEN_DEFAULT].height);
|
||||
pinfo = temp;
|
||||
}
|
||||
|
||||
return pinfo;
|
||||
}
|
||||
|
||||
|
||||
// KJB: Added this to return the mode driver name in description for console
|
||||
static char *
|
||||
VID_GetExtModeDescription (int mode)
|
||||
{
|
||||
static char pinfo[40];
|
||||
vmode_t *pv;
|
||||
|
||||
if ((mode < 0) || (mode >= nummodes))
|
||||
return NULL;
|
||||
|
||||
pv = VID_GetModePtr (mode);
|
||||
if (modelist[mode].type == MS_FULLDIB) {
|
||||
if (!leavecurrentmode) {
|
||||
snprintf (pinfo, sizeof (pinfo), "%s fullscreen", pv->modedesc);
|
||||
} else {
|
||||
snprintf (pinfo, sizeof (pinfo), "Desktop resolution (%dx%d)",
|
||||
modelist[MODE_FULLSCREEN_DEFAULT].width,
|
||||
modelist[MODE_FULLSCREEN_DEFAULT].height);
|
||||
}
|
||||
} else {
|
||||
if (modestate == MS_WINDOWED)
|
||||
snprintf (pinfo, sizeof (pinfo), "%s windowed", pv->modedesc);
|
||||
else
|
||||
snprintf (pinfo, sizeof (pinfo), "windowed");
|
||||
}
|
||||
|
||||
return pinfo;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
VID_InitDIB (HINSTANCE hInstance)
|
||||
{
|
||||
WNDCLASS wc;
|
||||
|
||||
// Register the frame class
|
||||
wc.style = 0;
|
||||
wc.lpfnWndProc = (WNDPROC) MainWndProc;
|
||||
wc.cbClsExtra = 0;
|
||||
wc.cbWndExtra = 0;
|
||||
wc.hInstance = hInstance;
|
||||
wc.hIcon = 0;
|
||||
wc.hCursor = LoadCursor (NULL, IDC_ARROW);
|
||||
wc.hbrBackground = NULL;
|
||||
wc.lpszMenuName = 0;
|
||||
wc.lpszClassName = "QuakeForge";
|
||||
|
||||
if (!RegisterClass (&wc))
|
||||
Sys_Error ("Couldn't register window class (%lx)", GetLastError());
|
||||
|
||||
modelist[0].type = MS_WINDOWED;
|
||||
|
||||
if (COM_CheckParm ("-width"))
|
||||
modelist[0].width = atoi (com_argv[COM_CheckParm ("-width") + 1]);
|
||||
else
|
||||
modelist[0].width = 640;
|
||||
|
||||
if (modelist[0].width < 320)
|
||||
modelist[0].width = 320;
|
||||
|
||||
if (COM_CheckParm ("-height"))
|
||||
modelist[0].height = atoi (com_argv[COM_CheckParm ("-height") + 1]);
|
||||
else
|
||||
modelist[0].height = modelist[0].width * 240 / 320;
|
||||
|
||||
if (modelist[0].height < 240)
|
||||
modelist[0].height = 240;
|
||||
|
||||
snprintf (modelist[0].modedesc, sizeof (modelist[0].modedesc), "%dx%d",
|
||||
modelist[0].width, modelist[0].height);
|
||||
|
||||
modelist[0].modenum = MODE_WINDOWED;
|
||||
modelist[0].dib = 1;
|
||||
modelist[0].fullscreen = 0;
|
||||
modelist[0].halfscreen = 0;
|
||||
modelist[0].bpp = 0;
|
||||
|
||||
nummodes = 1;
|
||||
}
|
||||
|
||||
static void
|
||||
VID_InitFullDIB (HINSTANCE hInstance)
|
||||
{
|
||||
DEVMODE devmode;
|
||||
int i, modenum, originalnummodes, existingmode, numlowresmodes;
|
||||
int j, bpp, done;
|
||||
BOOL stat;
|
||||
|
||||
// enumerate >8 bpp modes
|
||||
originalnummodes = nummodes;
|
||||
modenum = 0;
|
||||
|
||||
do {
|
||||
stat = EnumDisplaySettings (NULL, modenum, &devmode);
|
||||
|
||||
if ((devmode.dmBitsPerPel >= 15) &&
|
||||
(devmode.dmPelsWidth <= MAXWIDTH) &&
|
||||
(devmode.dmPelsHeight <= MAXHEIGHT) &&
|
||||
(nummodes < MAX_MODE_LIST)) {
|
||||
devmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT;
|
||||
|
||||
if (ChangeDisplaySettings (&devmode, CDS_TEST | CDS_FULLSCREEN) ==
|
||||
DISP_CHANGE_SUCCESSFUL) {
|
||||
modelist[nummodes].type = MS_FULLDIB;
|
||||
modelist[nummodes].width = devmode.dmPelsWidth;
|
||||
modelist[nummodes].height = devmode.dmPelsHeight;
|
||||
modelist[nummodes].modenum = 0;
|
||||
modelist[nummodes].halfscreen = 0;
|
||||
modelist[nummodes].dib = 1;
|
||||
modelist[nummodes].fullscreen = 1;
|
||||
modelist[nummodes].bpp = devmode.dmBitsPerPel;
|
||||
snprintf (modelist[nummodes].modedesc,
|
||||
sizeof (modelist[nummodes].modedesc), "%ldx%ldx%ld",
|
||||
devmode.dmPelsWidth, devmode.dmPelsHeight,
|
||||
devmode.dmBitsPerPel);
|
||||
|
||||
// if the width is more than twice the height, reduce it by
|
||||
// half because this is probably a dual-screen monitor
|
||||
if (!COM_CheckParm ("-noadjustaspect")) {
|
||||
if (modelist[nummodes].width >
|
||||
(modelist[nummodes].height << 1)) {
|
||||
modelist[nummodes].width >>= 1;
|
||||
modelist[nummodes].halfscreen = 1;
|
||||
snprintf (modelist[nummodes].modedesc,
|
||||
sizeof (modelist[nummodes].modedesc),
|
||||
"%dx%dx%d", modelist[nummodes].width,
|
||||
modelist[nummodes].height,
|
||||
modelist[nummodes].bpp);
|
||||
}
|
||||
}
|
||||
|
||||
for (i = originalnummodes, existingmode = 0; i < nummodes;
|
||||
i++) {
|
||||
if ((modelist[nummodes].width == modelist[i].width) &&
|
||||
(modelist[nummodes].height == modelist[i].height) &&
|
||||
(modelist[nummodes].bpp == modelist[i].bpp)) {
|
||||
existingmode = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!existingmode) {
|
||||
nummodes++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
modenum++;
|
||||
} while (stat);
|
||||
|
||||
// see if there are any low-res modes that aren't being reported
|
||||
numlowresmodes = sizeof (lowresmodes) / sizeof (lowresmodes[0]);
|
||||
bpp = 16;
|
||||
done = 0;
|
||||
|
||||
do {
|
||||
for (j = 0; (j < numlowresmodes) && (nummodes < MAX_MODE_LIST); j++) {
|
||||
devmode.dmBitsPerPel = bpp;
|
||||
devmode.dmPelsWidth = lowresmodes[j].width;
|
||||
devmode.dmPelsHeight = lowresmodes[j].height;
|
||||
devmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT;
|
||||
|
||||
if (ChangeDisplaySettings (&devmode, CDS_TEST | CDS_FULLSCREEN) ==
|
||||
DISP_CHANGE_SUCCESSFUL) {
|
||||
modelist[nummodes].type = MS_FULLDIB;
|
||||
modelist[nummodes].width = devmode.dmPelsWidth;
|
||||
modelist[nummodes].height = devmode.dmPelsHeight;
|
||||
modelist[nummodes].modenum = 0;
|
||||
modelist[nummodes].halfscreen = 0;
|
||||
modelist[nummodes].dib = 1;
|
||||
modelist[nummodes].fullscreen = 1;
|
||||
modelist[nummodes].bpp = devmode.dmBitsPerPel;
|
||||
snprintf (modelist[nummodes].modedesc,
|
||||
sizeof (modelist[nummodes].modedesc), "%ldx%ldx%ld",
|
||||
devmode.dmPelsWidth, devmode.dmPelsHeight,
|
||||
devmode.dmBitsPerPel);
|
||||
|
||||
for (i = originalnummodes, existingmode = 0; i < nummodes;
|
||||
i++) {
|
||||
if ((modelist[nummodes].width == modelist[i].width) &&
|
||||
(modelist[nummodes].height == modelist[i].height) &&
|
||||
(modelist[nummodes].bpp == modelist[i].bpp)) {
|
||||
existingmode = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!existingmode) {
|
||||
nummodes++;
|
||||
}
|
||||
}
|
||||
}
|
||||
switch (bpp) {
|
||||
case 16:
|
||||
bpp = 32;
|
||||
break;
|
||||
case 32:
|
||||
bpp = 24;
|
||||
break;
|
||||
case 24:
|
||||
done = 1;
|
||||
break;
|
||||
}
|
||||
} while (!done);
|
||||
|
||||
if (nummodes == originalnummodes)
|
||||
Con_Printf ("No fullscreen DIB modes found\n");
|
||||
}
|
||||
|
||||
void
|
||||
VID_Init (unsigned char *palette)
|
||||
{
|
||||
int i, existingmode;
|
||||
int basenummodes, width, height=480, bpp, findbpp, done;
|
||||
BOOL stat;
|
||||
int bpp, vid_mode;
|
||||
HDC hdc;
|
||||
DEVMODE devmode;
|
||||
HGLRC baseRC;
|
||||
DWORD lasterror;
|
||||
WNDCLASS wc;
|
||||
|
||||
vid_fullscreen = Cvar_Get ("vid_fullscreen", "0", CVAR_ROM | CVAR_ARCHIVE,
|
||||
NULL,
|
||||
"Run WGL client at fullscreen");
|
||||
GL_Pre_Init ();
|
||||
|
||||
qf_wglCreateContext = QFGL_ProcAddress (libgl_handle, "wglCreateContext",
|
||||
|
|
@ -815,16 +475,30 @@ VID_Init (unsigned char *palette)
|
|||
qf_wglMakeCurrent = QFGL_ProcAddress (libgl_handle, "wglMakeCurrent",
|
||||
true);
|
||||
|
||||
memset (&devmode, 0, sizeof (devmode));
|
||||
memset (&win_gdevmode, 0, sizeof (win_gdevmode));
|
||||
|
||||
hIcon = LoadIcon (global_hInstance, MAKEINTRESOURCE (IDI_ICON1));
|
||||
|
||||
VID_InitDIB (global_hInstance);
|
||||
basenummodes = nummodes = 1;
|
||||
|
||||
|
||||
VID_InitFullDIB (global_hInstance);
|
||||
// Register the frame class
|
||||
wc.style = 0;
|
||||
wc.lpfnWndProc = (WNDPROC) MainWndProc;
|
||||
wc.cbClsExtra = 0;
|
||||
wc.cbWndExtra = 0;
|
||||
wc.hInstance = global_hInstance;
|
||||
wc.hIcon = 0;
|
||||
wc.hCursor = LoadCursor (NULL, IDC_ARROW);
|
||||
wc.hbrBackground = NULL;
|
||||
wc.lpszMenuName = 0;
|
||||
wc.lpszClassName = "QuakeForge";
|
||||
|
||||
if (COM_CheckParm ("-window")) {
|
||||
if (!RegisterClass (&wc))
|
||||
Sys_Error ("Couldn't register window class (%lx)", GetLastError());
|
||||
|
||||
VID_GetWindowSize (640, 480);
|
||||
|
||||
if (!vid_fullscreen->int_val) {
|
||||
hdc = GetDC (NULL);
|
||||
|
||||
if (GetDeviceCaps (hdc, RASTERCAPS) & RC_PALETTE) {
|
||||
|
|
@ -833,146 +507,32 @@ VID_Init (unsigned char *palette)
|
|||
|
||||
ReleaseDC (NULL, hdc);
|
||||
|
||||
windowed = true;
|
||||
|
||||
vid_default = MODE_WINDOWED;
|
||||
} else {
|
||||
if (nummodes == 1)
|
||||
Sys_Error ("No RGB fullscreen modes available");
|
||||
|
||||
windowed = false;
|
||||
|
||||
if (COM_CheckParm ("-mode")) {
|
||||
vid_default = atoi (com_argv[COM_CheckParm ("-mode") + 1]);
|
||||
if (COM_CheckParm ("-bpp")) {
|
||||
bpp = atoi (com_argv[COM_CheckParm ("-bpp") + 1]);
|
||||
} else {
|
||||
if (COM_CheckParm ("-current")) {
|
||||
modelist[MODE_FULLSCREEN_DEFAULT].width =
|
||||
GetSystemMetrics (SM_CXSCREEN);
|
||||
modelist[MODE_FULLSCREEN_DEFAULT].height =
|
||||
GetSystemMetrics (SM_CYSCREEN);
|
||||
vid_default = MODE_FULLSCREEN_DEFAULT;
|
||||
leavecurrentmode = 1;
|
||||
} else {
|
||||
if (COM_CheckParm ("-width")) {
|
||||
width = atoi (com_argv[COM_CheckParm ("-width") + 1]);
|
||||
} else {
|
||||
width = 640;
|
||||
}
|
||||
|
||||
if (COM_CheckParm ("-bpp")) {
|
||||
bpp = atoi (com_argv[COM_CheckParm ("-bpp") + 1]);
|
||||
findbpp = 0;
|
||||
} else {
|
||||
bpp = 15;
|
||||
findbpp = 1;
|
||||
}
|
||||
|
||||
if (COM_CheckParm ("-height"))
|
||||
height = atoi (com_argv[COM_CheckParm ("-height") + 1]);
|
||||
|
||||
// if they want to force it, add the specified mode to the list
|
||||
if (COM_CheckParm ("-force") && (nummodes < MAX_MODE_LIST)) {
|
||||
modelist[nummodes].type = MS_FULLDIB;
|
||||
modelist[nummodes].width = width;
|
||||
modelist[nummodes].height = height;
|
||||
modelist[nummodes].modenum = 0;
|
||||
modelist[nummodes].halfscreen = 0;
|
||||
modelist[nummodes].dib = 1;
|
||||
modelist[nummodes].fullscreen = 1;
|
||||
modelist[nummodes].bpp = bpp;
|
||||
snprintf (modelist[nummodes].modedesc,
|
||||
sizeof (modelist[nummodes].modedesc),
|
||||
"%ldx%ldx%ld", devmode.dmPelsWidth,
|
||||
devmode.dmPelsHeight, devmode.dmBitsPerPel);
|
||||
|
||||
for (i = nummodes, existingmode = 0; i < nummodes; i++) {
|
||||
if ((modelist[nummodes].width == modelist[i].width) &&
|
||||
(modelist[nummodes].height == modelist[i].height)
|
||||
&& (modelist[nummodes].bpp == modelist[i].bpp)) {
|
||||
existingmode = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!existingmode) {
|
||||
nummodes++;
|
||||
}
|
||||
}
|
||||
|
||||
done = 0;
|
||||
|
||||
do {
|
||||
if (COM_CheckParm ("-height")) {
|
||||
height = atoi
|
||||
(com_argv[COM_CheckParm ("-height") + 1]);
|
||||
|
||||
for (i = 1, vid_default = 0; i < nummodes; i++) {
|
||||
if ((modelist[i].width == width) &&
|
||||
(modelist[i].height == height) &&
|
||||
(modelist[i].bpp == bpp)) {
|
||||
vid_default = i;
|
||||
done = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (i = 1, vid_default = 0; i < nummodes; i++) {
|
||||
if ((modelist[i].width == width)
|
||||
&& (modelist[i].bpp == bpp)) {
|
||||
vid_default = i;
|
||||
done = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!done) {
|
||||
if (findbpp) {
|
||||
switch (bpp) {
|
||||
case 15:
|
||||
bpp = 16;
|
||||
break;
|
||||
case 16:
|
||||
bpp = 32;
|
||||
break;
|
||||
case 32:
|
||||
bpp = 24;
|
||||
break;
|
||||
case 24:
|
||||
done = 1;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
done = 1;
|
||||
}
|
||||
}
|
||||
} while (!done);
|
||||
|
||||
if (!vid_default) {
|
||||
Sys_Error ("Specified video mode not available");
|
||||
}
|
||||
}
|
||||
bpp = 16;
|
||||
}
|
||||
vid_mode = 0;
|
||||
do {
|
||||
stat = EnumDisplaySettings (NULL, vid_mode, &win_gdevmode);
|
||||
|
||||
if ((win_gdevmode.dmBitsPerPel == bpp) && (win_gdevmode.dmPelsWidth == vid.width) &&
|
||||
(win_gdevmode.dmPelsHeight == vid.height)) {
|
||||
win_gdevmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT;
|
||||
|
||||
if (ChangeDisplaySettings (&win_gdevmode, CDS_TEST | CDS_FULLSCREEN) ==
|
||||
DISP_CHANGE_SUCCESSFUL) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
vid_mode++;
|
||||
} while (stat);
|
||||
if (!stat)
|
||||
Sys_Error("Couldn't get requested resolution (%i, %i, %i)",vid_width->int_val, vid_height->int_val, bpp);
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
vid.maxwarpwidth = WARP_WIDTH;
|
||||
vid.maxwarpheight = WARP_HEIGHT;
|
||||
vid.colormap8 = vid_colormap;
|
||||
|
|
@ -985,7 +545,7 @@ VID_Init (unsigned char *palette)
|
|||
DestroyWindow (hwnd_dialog);
|
||||
#endif
|
||||
|
||||
VID_SetMode (vid_default, palette);
|
||||
VID_SetMode (palette);
|
||||
|
||||
maindc = GetDC (mainwindow);
|
||||
bSetupPixelFormat (maindc);
|
||||
|
|
@ -1017,9 +577,6 @@ VID_Init (unsigned char *palette)
|
|||
|
||||
vid.initialized = true;
|
||||
|
||||
vid_realmode = vid_modenum;
|
||||
|
||||
strcpy (badmode.modedesc, "Bad mode");
|
||||
win_canalttab = true;
|
||||
|
||||
if (COM_CheckParm ("-nofullsbar"))
|
||||
|
|
|
|||
Loading…
Reference in a new issue