X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=menu.c;h=5f2dad2046d6408681815f381247062a1b37c4b5;hb=ea47f78f9a2c8b21d824f247032b68e2430a9b15;hp=8dd7693440103fa8333cea295a4d1fb8a5b3633b;hpb=337c93beda229bafc22d45b87d65eeff967b8464;p=xonotic%2Fdarkplaces.git diff --git a/menu.c b/menu.c index 8dd76934..5f2dad20 100644 --- a/menu.c +++ b/menu.c @@ -34,7 +34,6 @@ static cvar_t menu_progs = {CF_CLIENT, "menu_progs", "menu.dat", "name of quakec static int NehGameType; enum m_state_e m_state; -char m_return_reason[128]; void M_Menu_Main_f(cmd_state_t *cmd); void M_Menu_SinglePlayer_f(cmd_state_t *cmd); @@ -108,13 +107,6 @@ static void M_ModList_Key(cmd_state_t *cmd, int key, int ascii); static qbool m_entersound; ///< play after drawing a frame, so caching won't disrupt the sound -void M_Update_Return_Reason(const char *s) -{ - strlcpy(m_return_reason, s, sizeof(m_return_reason)); - if (s) - Con_DPrintf("%s\n", s); -} - #define StartingGame (m_multiplayer_cursor == 1) #define JoiningGame (m_multiplayer_cursor == 0) @@ -282,7 +274,7 @@ static void M_ToggleMenu(int mode) { if(mode == 0) return; // the menu is off, and we want it off - M_Menu_Main_f (&cmd_client); + M_Menu_Main_f (cmd_local); } else { @@ -858,7 +850,7 @@ static void M_ScanSaves (void) for (i=0 ; i 0) - strlcat(keystring, " or ", sizeof(keystring)); - strlcat(keystring, Key_KeynumToString (keys[j], tinystr, sizeof(tinystr)), sizeof(keystring)); + dp_strlcat(keystring, " or ", sizeof(keystring)); + dp_strlcat(keystring, Key_KeynumToString (keys[j], tinystr, TINYSTR_LEN), sizeof(keystring)); } } } @@ -2669,7 +2661,7 @@ static void M_Keys_Key(cmd_state_t *cmd, int k, int ascii) { char line[80]; int keys[NUMKEYS]; - char tinystr[2]; + char tinystr[TINYSTR_LEN]; if (bind_grab) { // defining a key @@ -2680,7 +2672,7 @@ static void M_Keys_Key(cmd_state_t *cmd, int k, int ascii) } else //if (k != '`') { - dpsnprintf(line, sizeof(line), "bind \"%s\" \"%s\"\n", Key_KeynumToString(k, tinystr, sizeof(tinystr)), bindnames[keys_cursor][0]); + dpsnprintf(line, sizeof(line), "bind \"%s\" \"%s\"\n", Key_KeynumToString(k, tinystr, TINYSTR_LEN), bindnames[keys_cursor][0]); Cbuf_InsertText (cmd, line); } @@ -2838,9 +2830,9 @@ video_resolution_t video_resolutions_hardcoded[] = // this is the number of the default mode (640x480) in the list above int video_resolutions_hardcoded_count = sizeof(video_resolutions_hardcoded) / sizeof(*video_resolutions_hardcoded) - 1; -#define VIDEO_ITEMS 10 +#define VIDEO_ITEMS 9 static int video_cursor = 0; -static int video_cursor_table[VIDEO_ITEMS] = {68, 88, 96, 104, 112, 120, 128, 136, 144, 152}; +static int video_cursor_table[VIDEO_ITEMS] = {68, 88, 96, 104, 112, 120, 128, 136, 144}; static int menu_video_resolution; video_resolution_t *video_resolutions; @@ -2904,7 +2896,7 @@ void M_Menu_Video_f(cmd_state_t *cmd) m_state = m_video; m_entersound = true; - M_Menu_Video_FindResolution(vid.width, vid.height, vid_pixelheight.value); + M_Menu_Video_FindResolution(vid.mode.width, vid.mode.height, vid_pixelheight.value); } @@ -2931,10 +2923,10 @@ static void M_Video_Draw (void) // Current and Proposed Resolution M_Print(16, video_cursor_table[t] - 12, " Current Resolution"); - if (vid_supportrefreshrate && vid.userefreshrate && vid.fullscreen) - M_Print(220, video_cursor_table[t] - 12, va(vabuf, sizeof(vabuf), "%dx%d %.2fhz", vid.width, vid.height, vid.refreshrate)); + if (vid.mode.refreshrate && vid.mode.fullscreen && !vid.mode.desktopfullscreen) + M_Print(220, video_cursor_table[t] - 12, va(vabuf, sizeof(vabuf), "%dx%d %.2fhz", vid.mode.width, vid.mode.height, vid.mode.refreshrate)); else - M_Print(220, video_cursor_table[t] - 12, va(vabuf, sizeof(vabuf), "%dx%d", vid.width, vid.height)); + M_Print(220, video_cursor_table[t] - 12, va(vabuf, sizeof(vabuf), "%dx%d", vid.mode.width, vid.mode.height)); M_Print(16, video_cursor_table[t], " New Resolution"); M_Print(220, video_cursor_table[t], va(vabuf, sizeof(vabuf), "%dx%d", menu_video_resolutions[menu_video_resolution].width, menu_video_resolutions[menu_video_resolution].height)); M_Print(96, video_cursor_table[t] + 8, va(vabuf, sizeof(vabuf), "Type: %s", menu_video_resolutions[menu_video_resolution].type)); @@ -2946,12 +2938,7 @@ static void M_Video_Draw (void) t++; // Refresh Rate - M_ItemPrint(16, video_cursor_table[t], " Use Refresh Rate", vid_supportrefreshrate); - M_DrawCheckbox(220, video_cursor_table[t], vid_userefreshrate.integer); - t++; - - // Refresh Rate - M_ItemPrint(16, video_cursor_table[t], " Refresh Rate", vid_supportrefreshrate && vid_userefreshrate.integer); + M_ItemPrint(16, video_cursor_table[t], " Refresh Rate", vid_fullscreen.integer && !vid_desktopfullscreen.integer); M_DrawSlider(220, video_cursor_table[t], vid_refreshrate.value, 50, 150); t++; @@ -3010,8 +2997,6 @@ static void M_Menu_Video_AdjustSliders (int dir) } else if (video_cursor == t++) Cvar_SetValueQuick (&vid_samples, bound(1, vid_samples.value * (dir > 0 ? 2 : 0.5), 32)); - else if (video_cursor == t++) - Cvar_SetValueQuick (&vid_userefreshrate, !vid_userefreshrate.integer); else if (video_cursor == t++) Cvar_SetValueQuick (&vid_refreshrate, bound(50, vid_refreshrate.value + dir, 150)); else if (video_cursor == t++) @@ -3033,12 +3018,10 @@ static void M_Video_Key(cmd_state_t *cmd, int key, int ascii) { case K_ESCAPE: // vid_shared.c has a copy of the current video config. We restore it - Cvar_SetValueQuick(&vid_fullscreen, vid.fullscreen); - Cvar_SetValueQuick(&vid_bitsperpixel, vid.bitsperpixel); - Cvar_SetValueQuick(&vid_samples, vid.samples); - if (vid_supportrefreshrate) - Cvar_SetValueQuick(&vid_refreshrate, vid.refreshrate); - Cvar_SetValueQuick(&vid_userefreshrate, vid.userefreshrate); + Cvar_SetValueQuick(&vid_fullscreen, vid.mode.fullscreen); + Cvar_SetValueQuick(&vid_bitsperpixel, vid.mode.bitsperpixel); + Cvar_SetValueQuick(&vid_samples, vid.mode.samples); + Cvar_SetValueQuick(&vid_refreshrate, vid.mode.refreshrate); S_LocalSound ("sound/misc/menu1.wav"); M_Menu_Options_f(cmd); @@ -3344,7 +3327,7 @@ void M_Menu_LanConfig_f(cmd_state_t *cmd) lanConfig_port = 26000; dpsnprintf(lanConfig_portname, sizeof(lanConfig_portname), "%u", (unsigned int) lanConfig_port); - M_Update_Return_Reason(""); + cl_connect_status[0] = '\0'; } @@ -3397,8 +3380,8 @@ static void M_LanConfig_Draw (void) if (lanConfig_cursor == 3) M_DrawCharacter (basex+16 + 8*strlen(lanConfig_joinname), lanConfig_cursor_table [lanConfig_cursor], 10+((int)(host.realtime*4)&1)); - if (*m_return_reason) - M_Print(basex, 168, m_return_reason); + if (*cl_connect_status) + M_Print(basex, 168, cl_connect_status); } @@ -4385,7 +4368,8 @@ static void M_GameOptions_Key(cmd_state_t *cmd, int key, int ascii) //============================================================================= /* SLIST MENU */ -static int slist_cursor; +static unsigned slist_cursor; +static unsigned slist_visible; void M_Menu_ServerList_f(cmd_state_t *cmd) { @@ -4393,7 +4377,7 @@ void M_Menu_ServerList_f(cmd_state_t *cmd) m_state = m_slist; m_entersound = true; slist_cursor = 0; - M_Update_Return_Reason(""); + cl_connect_status[0] = '\0'; if (lanConfig_cursor == 2) Net_SlistQW_f(cmd); else @@ -4403,7 +4387,7 @@ void M_Menu_ServerList_f(cmd_state_t *cmd) static void M_ServerList_Draw (void) { - int n, y, visible, start, end, statnumplayers, statmaxplayers; + unsigned n, y, start, end, statnumplayers, statmaxplayers; cachepic_t *p; const char *s; char vabuf[1024]; @@ -4415,14 +4399,14 @@ static void M_ServerList_Draw (void) M_Background(640, vid_conheight.integer); // scroll the list as the cursor moves ServerList_GetPlayerStatistics(&statnumplayers, &statmaxplayers); - s = va(vabuf, sizeof(vabuf), "%i/%i masters %i/%i servers %i/%i players", masterreplycount, masterquerycount, serverreplycount, serverquerycount, statnumplayers, statmaxplayers); + s = va(vabuf, sizeof(vabuf), "%u/%u masters %u/%u servers %u/%u players", masterreplycount, masterquerycount, serverreplycount, serverquerycount, statnumplayers, statmaxplayers); M_PrintRed((640 - strlen(s) * 8) / 2, 32, s); - if (*m_return_reason) - M_Print(16, menu_height - 8, m_return_reason); + if (*cl_connect_status) + M_Print(16, menu_height - 8, cl_connect_status); y = 48; - visible = (int)((menu_height - 16 - y) / 8 / 2); - start = bound(0, slist_cursor - (visible >> 1), serverlist_viewcount - visible); - end = min(start + visible, serverlist_viewcount); + slist_visible = (menu_height - 16 - y) / 8 / 2; + start = min(slist_cursor - min(slist_cursor, slist_visible >> 1), serverlist_viewcount - min(serverlist_viewcount, slist_visible)); + end = min(start + slist_visible, serverlist_viewcount); p = Draw_CachePic ("gfx/p_multi"); M_DrawPic((640 - Draw_GetPicWidth(p)) / 2, 4, "gfx/p_multi"); @@ -4469,14 +4453,18 @@ static void M_ServerList_Key(cmd_state_t *cmd, int k, int ascii) Net_Slist_f(cmd); break; + case K_PGUP: + slist_cursor -= slist_visible - 2; case K_UPARROW: case K_LEFTARROW: S_LocalSound ("sound/misc/menu1.wav"); slist_cursor--; - if (slist_cursor < 0) + if (slist_cursor >= serverlist_viewcount) slist_cursor = serverlist_viewcount - 1; break; + case K_PGDN: + slist_cursor += slist_visible - 2; case K_DOWNARROW: case K_RIGHTARROW: S_LocalSound ("sound/misc/menu1.wav"); @@ -4485,6 +4473,16 @@ static void M_ServerList_Key(cmd_state_t *cmd, int k, int ascii) slist_cursor = 0; break; + case K_HOME: + S_LocalSound ("sound/misc/menu1.wav"); + slist_cursor = 0; + break; + + case K_END: + S_LocalSound ("sound/misc/menu1.wav"); + slist_cursor = serverlist_viewcount - 1; + break; + case K_ENTER: S_LocalSound ("sound/misc/menu2.wav"); if (serverlist_viewcount) @@ -4547,7 +4545,7 @@ static void ModList_RebuildList(void) description = FS_CheckGameDir(list.strings[i]); if (description == NULL || description == fs_checkgamedir_missing) continue; - strlcpy (modlist[modlist_count].dir, list.strings[i], sizeof(modlist[modlist_count].dir)); + dp_strlcpy (modlist[modlist_count].dir, list.strings[i], sizeof(modlist[modlist_count].dir)); //check currently loaded mods modlist[modlist_count].loaded = false; if (fs_numgamedirs) @@ -4573,7 +4571,7 @@ static void ModList_Enable (void) // copy our mod list into an array for FS_ChangeGameDirs numgamedirs = modlist_numenabled; for (i = 0; i < modlist_numenabled; i++) - strlcpy (gamedirs[i], modlist[modlist_enabled[i]].dir,sizeof (gamedirs[i])); + dp_strlcpy (gamedirs[i], modlist[modlist_enabled[i]].dir,sizeof (gamedirs[i])); // this code snippet is from FS_ChangeGameDirs if (fs_numgamedirs == numgamedirs) @@ -4602,7 +4600,7 @@ void M_Menu_ModList_f(cmd_state_t *cmd) m_state = m_modlist; m_entersound = true; modlist_cursor = 0; - M_Update_Return_Reason(""); + cl_connect_status[0] = '\0'; ModList_RebuildList(); } @@ -4652,8 +4650,8 @@ static void M_ModList_Draw (void) for (y = 0; y < modlist_numenabled; y++) M_PrintRed(432, 48 + y * 8, modlist[modlist_enabled[y]].dir); - if (*m_return_reason) - M_Print(16, menu_height - 8, m_return_reason); + if (*cl_connect_status) + M_Print(16, menu_height - 8, cl_connect_status); // scroll the list as the cursor moves y = 48; visible = (int)((menu_height - 16 - y) / 8 / 2); @@ -4910,7 +4908,7 @@ void M_Draw (void) void M_KeyEvent (int key, int ascii, qbool downevent) { - cmd_state_t *cmd = &cmd_client; + cmd_state_t *cmd = cmd_local; if (!downevent) return; switch (m_state) @@ -5031,15 +5029,22 @@ void M_Shutdown(void) //============================================================================ // Menu prog handling -static const char *m_required_func[] = { -"m_init", -"m_keydown", -"m_draw", -"m_toggle", -"m_shutdown", -}; +static void MP_CheckRequiredFuncs(prvm_prog_t *prog, const char *filename) +{ + int i; + const char *m_required_func[] = { + "m_init", + "m_keydown", + "m_draw", + "m_toggle", + "m_shutdown", + }; + int m_numrequiredfunc = sizeof(m_required_func) / sizeof(char*); -static int m_numrequiredfunc = sizeof(m_required_func) / sizeof(char*); + for(i = 0; i < m_numrequiredfunc; ++i) + if(PRVM_ED_FindFunction(prog, m_required_func[i]) == 0) + prog->error_cmd("%s: %s not found in %s",prog->name, m_required_func[i], filename); +} static prvm_required_field_t m_required_fields[] = { @@ -5204,41 +5209,45 @@ void MR_SetRouting (qbool forceold); void MVM_error_cmd(const char *format, ...) DP_FUNC_PRINTF(1); void MVM_error_cmd(const char *format, ...) { - prvm_prog_t *prog = MVM_prog; static qbool processingError = false; char errorstring[MAX_INPUTLINE]; va_list argptr; + int outfd = sys.outfd; + + // set output to stderr + sys.outfd = fileno(stderr); va_start (argptr, format); dpvsnprintf (errorstring, sizeof(errorstring), format, argptr); va_end (argptr); if (host.framecount < 3) - Sys_Error("Menu_Error: %s\n", errorstring); + Sys_Error("Menu_Error: %s", errorstring); - Con_Printf( "Menu_Error: %s\n", errorstring ); + Con_Printf(CON_ERROR "Menu_Error: %s\n", errorstring); - if( !processingError ) { + if(!processingError) + { processingError = true; - PRVM_Crash(prog); + PRVM_Crash(); processingError = false; - } else { - Con_Printf( "Menu_Error: Recursive call to MVM_error_cmd (from PRVM_Crash)!\n" ); } + else + Sys_Error("Menu_Error: Recursive call to MVM_error_cmd (from PRVM_Crash)!"); - // fall back to the normal menu - - // say it - Con_Print("Falling back to normal menu\n"); - + Con_Print("Falling back to engine menu\n"); key_dest = key_game; - - // init the normal menu now -> this will also correct the menu router pointers MR_SetRouting (true); // reset the active scene, too (to be on the safe side ;)) R_SelectScene( RST_CLIENT ); + // prevent an endless loop if the error was triggered by a command + Cbuf_Clear(cmd_local->cbuf); + + // restore configured outfd + sys.outfd = outfd; + // Let video start at least Host_AbortCurrentFrame(); } @@ -5269,7 +5278,7 @@ static void MVM_count_edicts(prvm_prog_t *prog) for (i=0 ; inum_edicts ; i++) { ent = PRVM_EDICT_NUM(i); - if (ent->priv.required->free) + if (ent->free) continue; active++; } @@ -5299,10 +5308,12 @@ static void MP_KeyEvent (int key, int ascii, qbool downevent) static void MP_Draw (void) { prvm_prog_t *prog = MVM_prog; - // declarations that are needed right now - float oldquality; + // don't crash if we draw a frame between prog shutdown and restart, see Host_LoadConfig_f + if (!prog->loaded) + return; + R_SelectScene( RST_MENU ); // reset the temp entities each frame @@ -5319,8 +5330,8 @@ static void MP_Draw (void) // FIXME: this really shouldnt error out lest we have a very broken refdef state...? // or does it kill the server too? - PRVM_G_FLOAT(OFS_PARM0) = vid.width; - PRVM_G_FLOAT(OFS_PARM1) = vid.height; + PRVM_G_FLOAT(OFS_PARM0) = vid.mode.width; + PRVM_G_FLOAT(OFS_PARM1) = vid.mode.height; prog->ExecuteProgram(prog, PRVM_menufunction(m_draw),"m_draw() required"); // TODO: imo this should be moved into scene, too [1/27/2008 Andreas] @@ -5378,7 +5389,7 @@ static void MP_Shutdown (void) static void MP_Init (void) { prvm_prog_t *prog = MVM_prog; - PRVM_Prog_Init(prog, &cmd_client); + PRVM_Prog_Init(prog, cmd_local); prog->edictprivate_size = 0; // no private struct used prog->name = "menu"; @@ -5403,7 +5414,7 @@ static void MP_Init (void) // allocate the mempools prog->progs_mempool = Mem_AllocPool(menu_progs.string, 0, NULL); - PRVM_Prog_Load(prog, menu_progs.string, NULL, 0, m_numrequiredfunc, m_required_func, m_numrequiredfields, m_required_fields, m_numrequiredglobals, m_required_globals); + PRVM_Prog_Load(prog, menu_progs.string, NULL, 0, MP_CheckRequiredFuncs, m_numrequiredfields, m_required_fields, m_numrequiredglobals, m_required_globals); // note: OP_STATE is not supported by menu qc, we don't even try to detect // it here @@ -5470,7 +5481,7 @@ static void Call_MR_ToggleMenu_f(cmd_state_t *cmd) { int m; m = ((Cmd_Argc(cmd) < 2) ? -1 : atoi(Cmd_Argv(cmd, 1))); - Host_StartVideo(); + CL_StartVideo(); if(MR_ToggleMenu) MR_ToggleMenu(m); } @@ -5608,7 +5619,7 @@ void MR_Init(void) } menu_video_resolutions_forfullscreen = !!vid_fullscreen.integer; - M_Menu_Video_FindResolution(vid.width, vid.height, vid_pixelheight.value); + M_Menu_Video_FindResolution(vid.mode.width, vid.mode.height, vid_pixelheight.value); // use -forceqmenu to use always the normal quake menu (it sets forceqmenu to 1) // COMMANDLINEOPTION: Client: -forceqmenu disables menu.dat (same as +forceqmenu 1)