diff --git a/src/Android.mk b/src/Android.mk index 035d48887..1d0603e6f 100644 --- a/src/Android.mk +++ b/src/Android.mk @@ -28,6 +28,7 @@ LOCAL_SRC_FILES := am_map.c \ m_cheat.c \ m_fixed.c \ m_menu.c \ + m_textinput.c \ m_misc.c \ m_queue.c \ m_random.c \ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 258ff882c..adce10023 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,551 +1,553 @@ -# SRB2 Core - -# Core sources -set(SRB2_CORE_SOURCES - am_map.c - b_bot.c - command.c - comptime.c - console.c - d_clisrv.c - d_main.c - d_net.c - d_netcmd.c - d_netfil.c - d_protocol.c - dehacked.c - f_finale.c - f_wipe.c - filesrch.c - g_game.c - g_input.c - hu_stuff.c - i_tcp.c - info.c - lzf.c - m_aatree.c - m_anigif.c - m_argv.c - m_bbox.c - m_cheat.c - m_cond.c - m_fixed.c - m_menu.c - m_misc.c - m_perfstats.c - m_queue.c - m_random.c - md5.c - mserv.c - http-mserv.c - qs22j.c - s_sound.c - screen.c - sounds.c - st_stuff.c - #string.c - tables.c - v_video.c - w_wad.c - y_inter.c - z_zone.c -) - -set(SRB2_CORE_HEADERS - am_map.h - b_bot.h - byteptr.h - command.h - console.h - d_clisrv.h - d_event.h - d_main.h - d_net.h - d_netcmd.h - d_netfil.h - d_player.h - d_protocol.h - d_think.h - d_ticcmd.h - dehacked.h - doomdata.h - doomdef.h - doomstat.h - doomtype.h - endian.h - f_finale.h - fastcmp.h - filesrch.h - g_game.h - g_input.h - g_state.h - hu_stuff.h - i_joy.h - i_net.h - i_sound.h - i_system.h - i_tcp.h - i_time.h - i_video.h - info.h - keys.h - lzf.h - m_aatree.h - m_anigif.h - m_argv.h - m_bbox.h - m_cheat.h - m_cond.h - m_dllist.h - m_fixed.h - m_menu.h - m_misc.h - m_queue.h - m_perfstats.h - m_random.h - m_swap.h - md5.h - mserv.h - qs22j.h - s_sound.h - screen.h - sounds.h - st_stuff.h - tables.h - v_video.h - w_wad.h - y_inter.h - z_zone.h - - config.h.in -) - -set(SRB2_CORE_RENDER_SOURCES - r_bsp.c - r_data.c - r_draw.c - r_fps.c - r_main.c - r_patch.c - r_plane.c - r_segs.c - r_sky.c - r_splats.c - r_things.c - - r_bsp.h - r_data.h - r_defs.h - r_draw.h - r_fps.h - r_local.h - r_main.h - r_patch - r_plane.h - r_segs.h - r_sky.h - r_splats.h - r_state.h - r_things.h -) - -set(SRB2_CORE_GAME_SOURCES - p_ceilng.c - p_enemy.c - p_floor.c - p_inter.c - p_lights.c - p_map.c - p_maputl.c - p_mobj.c - p_polyobj.c - p_saveg.c - p_setup.c - p_sight.c - p_slopes.c - p_spec.c - p_telept.c - p_tick.c - p_user.c - k_director.c - k_kart.c - i_time.c - - p_local.h - p_maputl.h - p_mobj.h - p_polyobj.h - p_pspr.h - p_saveg.h - p_setup.h - p_slopes.h - p_spec.h - p_tick.h - k_director.h - k_kart.h -) - -if(NOT (CMAKE_CXX_COMPILER_ID MATCHES "Clang")) - set(SRB2_CORE_SOURCES ${SRB2_CORE_SOURCES} string.c) -endif() - -prepend_sources(SRB2_CORE_SOURCES) -prepend_sources(SRB2_CORE_HEADERS) -prepend_sources(SRB2_CORE_RENDER_SOURCES) -prepend_sources(SRB2_CORE_GAME_SOURCES) - -set(SRB2_CORE_HEADERS ${SRB2_CORE_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/config.h) -source_group("Main" FILES ${SRB2_CORE_SOURCES} ${SRB2_CORE_HEADERS}) -source_group("Renderer" FILES ${SRB2_CORE_RENDER_SOURCES}) -source_group("Game" FILES ${SRB2_CORE_GAME_SOURCES}) - -### Configuration -set(SRB2_CONFIG_HAVE_BLUA ON CACHE BOOL - "Enable Lua interpreter support") -set(SRB2_CONFIG_HAVE_PNG ON CACHE BOOL - "Enable PNG support. Depends on zlib, so will be disabled if you don't enable that too.") -set(SRB2_CONFIG_HAVE_ZLIB ON CACHE BOOL - "Enable zlib support.") -set(SRB2_CONFIG_HAVE_GME ON CACHE BOOL - "Enable GME support.") -set(SRB2_CONFIG_HAVE_OPENMPT ON CACHE BOOL - "Enable OpenMPT support.") -set(SRB2_CONFIG_HAVE_DISCORDRPC OFF CACHE BOOL - "Enable Discord rich presence support.") -set(SRB2_CONFIG_HAVE_CURL ON CACHE BOOL - "Enable curl support, used for downloading files via HTTP.") -set(SRB2_CONFIG_HWRENDER ON CACHE BOOL - "Enable hardware rendering through OpenGL.") -set(SRB2_CONFIG_STATIC_OPENGL OFF CACHE BOOL - "Use statically linked OpenGL. NOT RECOMMENDED.") -set(SRB2_CONFIG_USE_FBO_OGL ON CACHE BOOL - "Enable OpenGL FBO Downsampling support.") - -### use internal libraries? -if(${CMAKE_SYSTEM} MATCHES "Windows") ###set on Windows only - set(SRB2_CONFIG_USE_INTERNAL_LIBRARIES OFF CACHE BOOL - "Use SRB2Kart's internal copies of required dependencies (SDL2, PNG, zlib, GME, OpenMPT).") -endif() - -if(${SRB2_CONFIG_HAVE_BLUA}) - add_definitions(-DHAVE_BLUA) - set(SRB2_LUA_SOURCES - lua_baselib.c - lua_blockmaplib.c - lua_consolelib.c - lua_hooklib.c - lua_hudlib.c - lua_hudlib_drawlist.c - lua_infolib.c - lua_maplib.c - lua_mathlib.c - lua_mobjlib.c - lua_playerlib.c - lua_script.c - lua_skinlib.c - lua_thinkerlib.c - lua_udatalib.c - lua_glib.c - ) - set(SRB2_LUA_HEADERS - lua_hook.h - lua_hud.h - lua_hudlib_drawlist.h - lua_libs.h - lua_script.h - lua_udatalib.h - lua_glib.h - ) - - prepend_sources(SRB2_LUA_SOURCES) - prepend_sources(SRB2_LUA_HEADERS) - - source_group("LUA" FILES ${SRB2_LUA_SOURCES} ${SRB2_LUA_HEADERS}) - - set(SRB2_BLUA_SOURCES - blua/lapi.c - blua/lauxlib.c - blua/lbaselib.c - blua/ldblib.c - blua/lcode.c - blua/ldebug.c - blua/ldo.c - blua/ldump.c - blua/lfunc.c - blua/lgc.c - blua/linit.c - blua/liolib.c - blua/llex.c - blua/lmem.c - blua/lobject.c - blua/lopcodes.c - blua/lparser.c - blua/lstate.c - blua/lstring.c - blua/lstrlib.c - blua/ltable.c - blua/ltablib.c - blua/ltm.c - blua/lundump.c - blua/lvm.c - blua/lzio.c - ) - set(SRB2_BLUA_HEADERS - blua/lapi.h - blua/lauxlib.h - blua/lcode.h - blua/ldebug.h - blua/ldo.h - blua/lfunc.h - blua/lgc.h - blua/llex.h - blua/llimits.h - blua/lmem.h - blua/lobject.h - blua/lopcodes.h - blua/lparser.h - blua/lstate.h - blua/lstring.h - blua/ltable.h - blua/ltm.h - blua/lua.h - blua/luaconf.h - blua/lualib.h - blua/lundump.h - blua/lvm.h - blua/lzio.h - ) - - prepend_sources(SRB2_BLUA_SOURCES) - prepend_sources(SRB2_BLUA_HEADERS) - - source_group("LUA\\Interpreter" FILES ${SRB2_BLUA_SOURCES} ${SRB2_BLUA_HEADERS}) -endif() - -if(${SRB2_CONFIG_HAVE_GME}) - if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES}) - set(GME_FOUND ON) - set(GME_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/gme/include) - if(${SRB2_SYSTEM_BITS} EQUAL 64) - set(GME_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/gme/win64 -lgme") - else() # 32-bit - set(GME_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/gme/win32 -lgme") - endif() - else() - find_package(GME) - endif() - if(${GME_FOUND}) - set(SRB2_HAVE_GME ON) - add_definitions(-DHAVE_LIBGME) - else() - message(WARNING "You have specified that GME is available but it was not found.") - endif() -endif() - -if(${SRB2_CONFIG_HAVE_DISCORDRPC}) - if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES}) - set(DISCORDRPC_FOUND ON) - if(${SRB2_SYSTEM_BITS} EQUAL 64) - set(DISCORDRPC_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/discord-rpc/win64-dynamic/include) - set(DISCORDRPC_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/discord-rpc/win64-dynamic/lib -ldiscord-rpc") - else() # 32-bit - set(DISCORDRPC_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/discord-rpc/win32-dynamic/include) - set(DISCORDRPC_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/discord-rpc/win32-dynamic/lib -ldiscord-rpc") - endif() - else() - find_package(DiscordRPC) - endif() - if(${DISCORDRPC_FOUND}) - set(SRB2_HAVE_DISCORDRPC ON) - add_definitions(-DHAVE_DISCORDRPC) - add_definitions(-DUSE_STUN) - set(SRB2_DISCORDRPC_SOURCES discord.c stun.c) - set(SRB2_DISCORDRPC_HEADERS discord.h stun.h) - prepend_sources(SRB2_DISCORDRPC_SOURCES) - prepend_sources(SRB2_DISCORDRPC_HEADERS) - source_group("Discord Rich Presence" FILES ${SRB2_DISCORDRPC_SOURCES} ${SRB2_DISCORDRPC_HEADERS}) - else() - message(WARNING "You have specified that Discord Rich Presence is available but it was not found.") - endif() -endif() - -if(${SRB2_CONFIG_HAVE_OPENMPT}) - if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES}) - set(OPENMPT_FOUND ON) - set(OPENMPT_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/libopenmpt/inc) - if(${SRB2_SYSTEM_BITS} EQUAL 64) - set(OPENMPT_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/libopenmpt/lib/x86_64/mingw -lopenmpt") - else() # 32-bit - set(OPENMPT_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/libopenmpt/lib/x86/mingw -lopenmpt") - endif() - else() - find_package(OPENMPT) - endif() - if(${OPENMPT_FOUND}) - set(SRB2_HAVE_OPENMPT ON) - add_definitions(-DHAVE_OPENMPT) - else() - message(WARNING "You have specified that OpenMPT is available but it was not found.") - endif() -endif() - -if(${SRB2_CONFIG_HAVE_ZLIB}) - if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES}) - set(ZLIB_FOUND ON) - set(ZLIB_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/zlib) - if(${SRB2_SYSTEM_BITS} EQUAL 64) - set(ZLIB_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/zlib/win32 -lz64") - else() # 32-bit - set(ZLIB_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/zlib/win32 -lz32") - endif() - else() - find_package(ZLIB) - endif() - if(${ZLIB_FOUND}) - set(SRB2_HAVE_ZLIB ON) - add_definitions(-DHAVE_ZLIB) - else() - message(WARNING "You have specified that ZLIB is available but it was not found. SRB2Kart may not compile correctly.") - endif() -endif() - -if(${SRB2_CONFIG_HAVE_PNG} AND ${SRB2_CONFIG_HAVE_ZLIB}) - if (${ZLIB_FOUND}) - if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES}) - set(PNG_FOUND ON) - set(PNG_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/libpng-src) - if(${SRB2_SYSTEM_BITS} EQUAL 64) - set(PNG_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/libpng-src/projects -lpng64") - else() # 32-bit - set(PNG_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/libpng-src/projects -lpng32") - endif() - else() - find_package(PNG) - endif() - if(${PNG_FOUND}) - set(SRB2_HAVE_PNG ON) - add_definitions(-DHAVE_PNG) - add_definitions(-D_LARGEFILE64_SOURCE) - set(SRB2_PNG_SOURCES apng.c) - set(SRB2_PNG_HEADERS apng.h) - prepend_sources(SRB2_PNG_SOURCES) - prepend_sources(SRB2_PNG_HEADERS) - source_group("Main" FILES ${SRB2_CORE_SOURCES} ${SRB2_CORE_HEADERS} - ${SRB2_PNG_SOURCES} ${SRB2_PNG_HEADERS}) - else() - message(WARNING "You have specified that PNG is available but it was not found. SRB2Kart may not compile correctly.") - endif() - endif() -endif() - -if(${SRB2_CONFIG_HAVE_CURL}) - if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES}) - set(CURL_FOUND ON) - set(CURL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/curl/include) - if(${SRB2_SYSTEM_BITS} EQUAL 64) - set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib64 -lcurl") - else() # 32-bit - set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib32 -lcurl") - endif() - else() - find_package(CURL) - endif() - if(${CURL_FOUND}) - set(SRB2_HAVE_CURL ON) - add_definitions(-DHAVE_CURL) - else() - message(WARNING "You have specified that CURL is available but it was not found. SRB2Kart may not compile correctly.") - endif() -endif() - -if(${SRB2_CONFIG_HWRENDER}) - add_definitions(-DHWRENDER) - set(SRB2_HWRENDER_SOURCES - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_batching.c - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_shaders.c - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_bsp.c - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_cache.c - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_clip.c - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_draw.c - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_main.c - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md2.c - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md2load.c - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md3load.c - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_model.c - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/u_list.c - ) - - set (SRB2_HWRENDER_HEADERS - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_batching.h - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_shaders.h - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_clip.h - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_data.h - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_defs.h - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_dll.h - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_drv.h - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_glob.h - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_main.h - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md2.h - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md2load.h - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md3load.h - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_model.h - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/u_list.h - ) - - set(SRB2_R_OPENGL_SOURCES - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/r_opengl/r_opengl.c - ) - - set(SRB2_R_OPENGL_HEADERS - ${CMAKE_CURRENT_SOURCE_DIR}/hardware/r_opengl/r_opengl.h - ) - -endif() - -if(${SRB2_CONFIG_HWRENDER} AND ${SRB2_CONFIG_STATIC_OPENGL}) - find_package(OpenGL) - if(${OPENGL_FOUND}) - add_definitions(-DHWRENDER) - add_definitions(-DSTATIC_OPENGL) - else() - message(WARNING "You have specified static opengl but opengl was not found. Not setting HWRENDER.") - endif() -endif() - -if(${SRB2_CONFIG_HWRENDER}) - if(${SRB2_CONFIG_USE_FBO_OGL}) - set(SRB2_USE_FBO_OGL ON) - add_definitions(-DUSE_FBO_OGL) - endif() -endif() - -# Targets - -# Compatibility flag with later versions of GCC -# We should really fix our code to not need this -if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -mno-ms-bitfields) -endif() - -if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -Wno-absolute-value) -endif() - -add_definitions(-DCMAKECONFIG) - -#add_library(SRB2Core STATIC -# ${SRB2_CORE_SOURCES} -# ${SRB2_CORE_HEADERS} -# ${SRB2_CORE_RENDER_SOURCES} -# ${SRB2_CORE_GAME_SOURCES} -# ${SRB2_LUA_SOURCES} -# ${SRB2_LUA_HEADERS} -# ${SRB2_BLUA_SOURCES} -# ${SRB2_BLUA_HEADERS} -#) - -add_subdirectory(sdl) - -if(NOT ${SRB2_SDL2_AVAILABLE} AND NOT ${SRB2_WIN32_AVAILABLE}) - message(FATAL_ERROR "There are no targets available to build an SRB2Kart executable. :(") -endif() +# SRB2 Core + +# Core sources +set(SRB2_CORE_SOURCES + am_map.c + b_bot.c + command.c + comptime.c + console.c + d_clisrv.c + d_main.c + d_net.c + d_netcmd.c + d_netfil.c + d_protocol.c + dehacked.c + f_finale.c + f_wipe.c + filesrch.c + g_game.c + g_input.c + hu_stuff.c + i_tcp.c + info.c + lzf.c + m_aatree.c + m_anigif.c + m_argv.c + m_bbox.c + m_cheat.c + m_cond.c + m_fixed.c + m_menu.c + m_textinput.c + m_misc.c + m_perfstats.c + m_queue.c + m_random.c + md5.c + mserv.c + http-mserv.c + qs22j.c + s_sound.c + screen.c + sounds.c + st_stuff.c + #string.c + tables.c + v_video.c + w_wad.c + y_inter.c + z_zone.c +) + +set(SRB2_CORE_HEADERS + am_map.h + b_bot.h + byteptr.h + command.h + console.h + d_clisrv.h + d_event.h + d_main.h + d_net.h + d_netcmd.h + d_netfil.h + d_player.h + d_protocol.h + d_think.h + d_ticcmd.h + dehacked.h + doomdata.h + doomdef.h + doomstat.h + doomtype.h + endian.h + f_finale.h + fastcmp.h + filesrch.h + g_game.h + g_input.h + g_state.h + hu_stuff.h + i_joy.h + i_net.h + i_sound.h + i_system.h + i_tcp.h + i_time.h + i_video.h + info.h + keys.h + lzf.h + m_aatree.h + m_anigif.h + m_argv.h + m_bbox.h + m_cheat.h + m_cond.h + m_dllist.h + m_fixed.h + m_menu.h + m_textinput.h + m_misc.h + m_queue.h + m_perfstats.h + m_random.h + m_swap.h + md5.h + mserv.h + qs22j.h + s_sound.h + screen.h + sounds.h + st_stuff.h + tables.h + v_video.h + w_wad.h + y_inter.h + z_zone.h + + config.h.in +) + +set(SRB2_CORE_RENDER_SOURCES + r_bsp.c + r_data.c + r_draw.c + r_fps.c + r_main.c + r_patch.c + r_plane.c + r_segs.c + r_sky.c + r_splats.c + r_things.c + + r_bsp.h + r_data.h + r_defs.h + r_draw.h + r_fps.h + r_local.h + r_main.h + r_patch + r_plane.h + r_segs.h + r_sky.h + r_splats.h + r_state.h + r_things.h +) + +set(SRB2_CORE_GAME_SOURCES + p_ceilng.c + p_enemy.c + p_floor.c + p_inter.c + p_lights.c + p_map.c + p_maputl.c + p_mobj.c + p_polyobj.c + p_saveg.c + p_setup.c + p_sight.c + p_slopes.c + p_spec.c + p_telept.c + p_tick.c + p_user.c + k_director.c + k_kart.c + i_time.c + + p_local.h + p_maputl.h + p_mobj.h + p_polyobj.h + p_pspr.h + p_saveg.h + p_setup.h + p_slopes.h + p_spec.h + p_tick.h + k_director.h + k_kart.h +) + +if(NOT (CMAKE_CXX_COMPILER_ID MATCHES "Clang")) + set(SRB2_CORE_SOURCES ${SRB2_CORE_SOURCES} string.c) +endif() + +prepend_sources(SRB2_CORE_SOURCES) +prepend_sources(SRB2_CORE_HEADERS) +prepend_sources(SRB2_CORE_RENDER_SOURCES) +prepend_sources(SRB2_CORE_GAME_SOURCES) + +set(SRB2_CORE_HEADERS ${SRB2_CORE_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/config.h) +source_group("Main" FILES ${SRB2_CORE_SOURCES} ${SRB2_CORE_HEADERS}) +source_group("Renderer" FILES ${SRB2_CORE_RENDER_SOURCES}) +source_group("Game" FILES ${SRB2_CORE_GAME_SOURCES}) + +### Configuration +set(SRB2_CONFIG_HAVE_BLUA ON CACHE BOOL + "Enable Lua interpreter support") +set(SRB2_CONFIG_HAVE_PNG ON CACHE BOOL + "Enable PNG support. Depends on zlib, so will be disabled if you don't enable that too.") +set(SRB2_CONFIG_HAVE_ZLIB ON CACHE BOOL + "Enable zlib support.") +set(SRB2_CONFIG_HAVE_GME ON CACHE BOOL + "Enable GME support.") +set(SRB2_CONFIG_HAVE_OPENMPT ON CACHE BOOL + "Enable OpenMPT support.") +set(SRB2_CONFIG_HAVE_DISCORDRPC OFF CACHE BOOL + "Enable Discord rich presence support.") +set(SRB2_CONFIG_HAVE_CURL ON CACHE BOOL + "Enable curl support, used for downloading files via HTTP.") +set(SRB2_CONFIG_HWRENDER ON CACHE BOOL + "Enable hardware rendering through OpenGL.") +set(SRB2_CONFIG_STATIC_OPENGL OFF CACHE BOOL + "Use statically linked OpenGL. NOT RECOMMENDED.") +set(SRB2_CONFIG_USE_FBO_OGL ON CACHE BOOL + "Enable OpenGL FBO Downsampling support.") + +### use internal libraries? +if(${CMAKE_SYSTEM} MATCHES "Windows") ###set on Windows only + set(SRB2_CONFIG_USE_INTERNAL_LIBRARIES OFF CACHE BOOL + "Use SRB2Kart's internal copies of required dependencies (SDL2, PNG, zlib, GME, OpenMPT).") +endif() + +if(${SRB2_CONFIG_HAVE_BLUA}) + add_definitions(-DHAVE_BLUA) + set(SRB2_LUA_SOURCES + lua_baselib.c + lua_blockmaplib.c + lua_consolelib.c + lua_hooklib.c + lua_hudlib.c + lua_hudlib_drawlist.c + lua_infolib.c + lua_maplib.c + lua_mathlib.c + lua_mobjlib.c + lua_playerlib.c + lua_script.c + lua_skinlib.c + lua_thinkerlib.c + lua_udatalib.c + lua_glib.c + ) + set(SRB2_LUA_HEADERS + lua_hook.h + lua_hud.h + lua_hudlib_drawlist.h + lua_libs.h + lua_script.h + lua_udatalib.h + lua_glib.h + ) + + prepend_sources(SRB2_LUA_SOURCES) + prepend_sources(SRB2_LUA_HEADERS) + + source_group("LUA" FILES ${SRB2_LUA_SOURCES} ${SRB2_LUA_HEADERS}) + + set(SRB2_BLUA_SOURCES + blua/lapi.c + blua/lauxlib.c + blua/lbaselib.c + blua/ldblib.c + blua/lcode.c + blua/ldebug.c + blua/ldo.c + blua/ldump.c + blua/lfunc.c + blua/lgc.c + blua/linit.c + blua/liolib.c + blua/llex.c + blua/lmem.c + blua/lobject.c + blua/lopcodes.c + blua/lparser.c + blua/lstate.c + blua/lstring.c + blua/lstrlib.c + blua/ltable.c + blua/ltablib.c + blua/ltm.c + blua/lundump.c + blua/lvm.c + blua/lzio.c + ) + set(SRB2_BLUA_HEADERS + blua/lapi.h + blua/lauxlib.h + blua/lcode.h + blua/ldebug.h + blua/ldo.h + blua/lfunc.h + blua/lgc.h + blua/llex.h + blua/llimits.h + blua/lmem.h + blua/lobject.h + blua/lopcodes.h + blua/lparser.h + blua/lstate.h + blua/lstring.h + blua/ltable.h + blua/ltm.h + blua/lua.h + blua/luaconf.h + blua/lualib.h + blua/lundump.h + blua/lvm.h + blua/lzio.h + ) + + prepend_sources(SRB2_BLUA_SOURCES) + prepend_sources(SRB2_BLUA_HEADERS) + + source_group("LUA\\Interpreter" FILES ${SRB2_BLUA_SOURCES} ${SRB2_BLUA_HEADERS}) +endif() + +if(${SRB2_CONFIG_HAVE_GME}) + if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES}) + set(GME_FOUND ON) + set(GME_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/gme/include) + if(${SRB2_SYSTEM_BITS} EQUAL 64) + set(GME_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/gme/win64 -lgme") + else() # 32-bit + set(GME_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/gme/win32 -lgme") + endif() + else() + find_package(GME) + endif() + if(${GME_FOUND}) + set(SRB2_HAVE_GME ON) + add_definitions(-DHAVE_LIBGME) + else() + message(WARNING "You have specified that GME is available but it was not found.") + endif() +endif() + +if(${SRB2_CONFIG_HAVE_DISCORDRPC}) + if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES}) + set(DISCORDRPC_FOUND ON) + if(${SRB2_SYSTEM_BITS} EQUAL 64) + set(DISCORDRPC_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/discord-rpc/win64-dynamic/include) + set(DISCORDRPC_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/discord-rpc/win64-dynamic/lib -ldiscord-rpc") + else() # 32-bit + set(DISCORDRPC_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/discord-rpc/win32-dynamic/include) + set(DISCORDRPC_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/discord-rpc/win32-dynamic/lib -ldiscord-rpc") + endif() + else() + find_package(DiscordRPC) + endif() + if(${DISCORDRPC_FOUND}) + set(SRB2_HAVE_DISCORDRPC ON) + add_definitions(-DHAVE_DISCORDRPC) + add_definitions(-DUSE_STUN) + set(SRB2_DISCORDRPC_SOURCES discord.c stun.c) + set(SRB2_DISCORDRPC_HEADERS discord.h stun.h) + prepend_sources(SRB2_DISCORDRPC_SOURCES) + prepend_sources(SRB2_DISCORDRPC_HEADERS) + source_group("Discord Rich Presence" FILES ${SRB2_DISCORDRPC_SOURCES} ${SRB2_DISCORDRPC_HEADERS}) + else() + message(WARNING "You have specified that Discord Rich Presence is available but it was not found.") + endif() +endif() + +if(${SRB2_CONFIG_HAVE_OPENMPT}) + if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES}) + set(OPENMPT_FOUND ON) + set(OPENMPT_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/libopenmpt/inc) + if(${SRB2_SYSTEM_BITS} EQUAL 64) + set(OPENMPT_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/libopenmpt/lib/x86_64/mingw -lopenmpt") + else() # 32-bit + set(OPENMPT_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/libopenmpt/lib/x86/mingw -lopenmpt") + endif() + else() + find_package(OPENMPT) + endif() + if(${OPENMPT_FOUND}) + set(SRB2_HAVE_OPENMPT ON) + add_definitions(-DHAVE_OPENMPT) + else() + message(WARNING "You have specified that OpenMPT is available but it was not found.") + endif() +endif() + +if(${SRB2_CONFIG_HAVE_ZLIB}) + if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES}) + set(ZLIB_FOUND ON) + set(ZLIB_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/zlib) + if(${SRB2_SYSTEM_BITS} EQUAL 64) + set(ZLIB_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/zlib/win32 -lz64") + else() # 32-bit + set(ZLIB_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/zlib/win32 -lz32") + endif() + else() + find_package(ZLIB) + endif() + if(${ZLIB_FOUND}) + set(SRB2_HAVE_ZLIB ON) + add_definitions(-DHAVE_ZLIB) + else() + message(WARNING "You have specified that ZLIB is available but it was not found. SRB2Kart may not compile correctly.") + endif() +endif() + +if(${SRB2_CONFIG_HAVE_PNG} AND ${SRB2_CONFIG_HAVE_ZLIB}) + if (${ZLIB_FOUND}) + if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES}) + set(PNG_FOUND ON) + set(PNG_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/libpng-src) + if(${SRB2_SYSTEM_BITS} EQUAL 64) + set(PNG_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/libpng-src/projects -lpng64") + else() # 32-bit + set(PNG_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/libpng-src/projects -lpng32") + endif() + else() + find_package(PNG) + endif() + if(${PNG_FOUND}) + set(SRB2_HAVE_PNG ON) + add_definitions(-DHAVE_PNG) + add_definitions(-D_LARGEFILE64_SOURCE) + set(SRB2_PNG_SOURCES apng.c) + set(SRB2_PNG_HEADERS apng.h) + prepend_sources(SRB2_PNG_SOURCES) + prepend_sources(SRB2_PNG_HEADERS) + source_group("Main" FILES ${SRB2_CORE_SOURCES} ${SRB2_CORE_HEADERS} + ${SRB2_PNG_SOURCES} ${SRB2_PNG_HEADERS}) + else() + message(WARNING "You have specified that PNG is available but it was not found. SRB2Kart may not compile correctly.") + endif() + endif() +endif() + +if(${SRB2_CONFIG_HAVE_CURL}) + if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES}) + set(CURL_FOUND ON) + set(CURL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/curl/include) + if(${SRB2_SYSTEM_BITS} EQUAL 64) + set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib64 -lcurl") + else() # 32-bit + set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib32 -lcurl") + endif() + else() + find_package(CURL) + endif() + if(${CURL_FOUND}) + set(SRB2_HAVE_CURL ON) + add_definitions(-DHAVE_CURL) + else() + message(WARNING "You have specified that CURL is available but it was not found. SRB2Kart may not compile correctly.") + endif() +endif() + +if(${SRB2_CONFIG_HWRENDER}) + add_definitions(-DHWRENDER) + set(SRB2_HWRENDER_SOURCES + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_batching.c + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_shaders.c + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_bsp.c + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_cache.c + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_clip.c + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_draw.c + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_main.c + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md2.c + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md2load.c + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md3load.c + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_model.c + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/u_list.c + ) + + set (SRB2_HWRENDER_HEADERS + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_batching.h + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_shaders.h + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_clip.h + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_data.h + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_defs.h + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_dll.h + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_drv.h + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_glob.h + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_main.h + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md2.h + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md2load.h + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md3load.h + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_model.h + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/u_list.h + ) + + set(SRB2_R_OPENGL_SOURCES + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/r_opengl/r_opengl.c + ) + + set(SRB2_R_OPENGL_HEADERS + ${CMAKE_CURRENT_SOURCE_DIR}/hardware/r_opengl/r_opengl.h + ) + +endif() + +if(${SRB2_CONFIG_HWRENDER} AND ${SRB2_CONFIG_STATIC_OPENGL}) + find_package(OpenGL) + if(${OPENGL_FOUND}) + add_definitions(-DHWRENDER) + add_definitions(-DSTATIC_OPENGL) + else() + message(WARNING "You have specified static opengl but opengl was not found. Not setting HWRENDER.") + endif() +endif() + +if(${SRB2_CONFIG_HWRENDER}) + if(${SRB2_CONFIG_USE_FBO_OGL}) + set(SRB2_USE_FBO_OGL ON) + add_definitions(-DUSE_FBO_OGL) + endif() +endif() + +# Targets + +# Compatibility flag with later versions of GCC +# We should really fix our code to not need this +if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -mno-ms-bitfields) +endif() + +if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") + set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -Wno-absolute-value) +endif() + +add_definitions(-DCMAKECONFIG) + +#add_library(SRB2Core STATIC +# ${SRB2_CORE_SOURCES} +# ${SRB2_CORE_HEADERS} +# ${SRB2_CORE_RENDER_SOURCES} +# ${SRB2_CORE_GAME_SOURCES} +# ${SRB2_LUA_SOURCES} +# ${SRB2_LUA_HEADERS} +# ${SRB2_BLUA_SOURCES} +# ${SRB2_BLUA_HEADERS} +#) + +add_subdirectory(sdl) + +if(NOT ${SRB2_SDL2_AVAILABLE} AND NOT ${SRB2_WIN32_AVAILABLE}) + message(FATAL_ERROR "There are no targets available to build an SRB2Kart executable. :(") +endif() diff --git a/src/Makefile b/src/Makefile index 87226a60b..e3e764210 100644 --- a/src/Makefile +++ b/src/Makefile @@ -529,6 +529,7 @@ OBJS:=$(i_main_o) \ $(OBJDIR)/m_fixed.o \ $(OBJDIR)/m_menu.o \ $(OBJDIR)/m_misc.o \ + $(OBJDIR)/m_textinput.o \ $(OBJDIR)/m_perfstats.o \ $(OBJDIR)/m_random.o \ $(OBJDIR)/m_queue.o \ diff --git a/src/console.c b/src/console.c index 5c2e04eb3..9781078fa 100644 --- a/src/console.c +++ b/src/console.c @@ -32,6 +32,7 @@ #include "i_threads.h" #include "d_main.h" #include "m_menu.h" +#include "m_textinput.h" #include "filesrch.h" #ifdef HWRENDER @@ -97,9 +98,7 @@ static char inputlines[32][CON_MAXPROMPTCHARS]; // hold last 32 prompt lines static INT32 inputline; // current input line number static INT32 inputhist; // line number of history input line to restore -static size_t input_cur; // position of cursor in line -static size_t input_sel; // position of selection marker (I.E.: anything between this and input_cur is "selected") -static size_t input_len; // length of current line, used to bound cursor and such +static textinput_t input; // notice: input does NOT include the "$" at the start of the line. - 11/3/16 // protos. @@ -458,7 +457,8 @@ static void CON_InputInit(void) // prepare the first prompt line memset(inputlines, 0, sizeof (inputlines)); inputline = 0; - input_cur = input_sel = input_len = 0; + + M_TextInputInit(&input, inputlines[inputline], CON_MAXPROMPTCHARS); Unlock_state(); } @@ -802,178 +802,6 @@ void CON_Ticker(void) Unlock_state(); } -// -// ---- -// -// Shortcuts for adding and deleting characters, strings, and sections -// Necessary due to moving cursor -// - -static void CON_InputClear(void) -{ - Lock_state(); - - memset(inputlines[inputline], 0, CON_MAXPROMPTCHARS); - input_cur = input_sel = input_len = 0; - - Unlock_state(); -} - -static void CON_InputSetString(const char *c) -{ - Lock_state(); - - memset(inputlines[inputline], 0, CON_MAXPROMPTCHARS); - strcpy(inputlines[inputline], c); - input_cur = input_sel = input_len = strlen(c); - - Unlock_state(); -} - -static void CON_InputAddString(const char *c) -{ - size_t csize = strlen(c); - - Lock_state(); - - if (input_len + csize > CON_MAXPROMPTCHARS-1) - { - Unlock_state(); - return; - } - if (input_cur != input_len) - memmove(&inputlines[inputline][input_cur+csize], &inputlines[inputline][input_cur], input_len-input_cur); - memcpy(&inputlines[inputline][input_cur], c, csize); - input_len += csize; - input_sel = (input_cur += csize); - - Unlock_state(); -} - -static void CON_InputDel(size_t start, size_t end) -{ - size_t len; - - Lock_state(); - - len = (end - start); - - if (end != input_len) - memmove(&inputlines[inputline][start], &inputlines[inputline][end], input_len-end); - memset(&inputlines[inputline][input_len - len], 0, len); - - input_len -= len; - - if (input_sel >= end) - input_sel -= len; - else if (input_sel > start) - input_sel = start; - - if (input_cur >= end) - input_cur -= len; - else if (input_cur > start) - input_cur = start; - - Unlock_state(); -} - -static void CON_InputDelSelection(void) -{ - size_t start, end; - - Lock_state(); - - if (input_cur > input_sel) - { - start = input_sel; - end = input_cur; - } - else - { - start = input_cur; - end = input_sel; - } - - CON_InputDel(start, end); - - input_sel = input_cur = start; - - Unlock_state(); -} - -static void CON_ToWordEnd(boolean move_sel) -{ - Lock_state(); - - // Skip spaces - while (input_cur < input_len && isspace(inputlines[inputline][input_cur])) - ++input_cur; - - // Skip word - while (input_cur < input_len && !isspace(inputlines[inputline][input_cur])) - ++input_cur; - - if (move_sel) input_sel = input_cur; - - Unlock_state(); -} - -static void CON_ToWordBegin(boolean move_sel) -{ - Lock_state(); - - // Hack, always move back 1 character if possible so if we press ctrl-left at a word beginning - // we move to previous word - if (input_cur) --input_cur; - - // Skip spaces - while (input_cur && isspace(inputlines[inputline][input_cur])) - --input_cur; - - // Skip word - while (input_cur && !isspace(inputlines[inputline][input_cur])) - --input_cur; - - // Unless we reached beginning of line, we're pointing at a space before word, so move cursor - // forward to fix that - if (input_cur) ++input_cur; - - if (move_sel) input_sel = input_cur; - - Unlock_state(); -} - -static void CON_InputAddChar(char c) -{ - if (input_len >= CON_MAXPROMPTCHARS-1) - return; - - Lock_state(); - - if (input_cur != input_len) - memmove(&inputlines[inputline][input_cur+1], &inputlines[inputline][input_cur], input_len-input_cur); - inputlines[inputline][input_cur++] = c; - inputlines[inputline][++input_len] = 0; - input_sel = input_cur; - - Unlock_state(); -} - -static void CON_InputDelChar(void) -{ - if (!input_cur) - return; - - Lock_state(); - - if (input_cur != input_len) - memmove(&inputlines[inputline][input_cur-1], &inputlines[inputline][input_cur], input_len-input_cur); - inputlines[inputline][--input_len] = 0; - input_sel = --input_cur; - - Unlock_state(); -} - // // ---- // @@ -1054,6 +882,10 @@ boolean CON_Responder(event_t *ev) } } + Lock_state(); + M_TextInputHandle(&input, key); + Unlock_state(); + // Always eat ctrl/shift/alt if console open, so the menu doesn't get ideas if (key == KEY_LSHIFT || key == KEY_RSHIFT || key == KEY_LCTRL || key == KEY_RCTRL @@ -1066,12 +898,11 @@ boolean CON_Responder(event_t *ev) // show all cvars/commands that match what we have inputted if (key == KEY_TAB) { - if (!completion[0]) { - if (!input_len || input_len >= 40 || strchr(inputlines[inputline], ' ')) + if (!input.length || input.length >= 40 || strchr(input.buffer, ' ')) return true; - strcpy(completion, inputlines[inputline]); + strcpy(completion, input.buffer); comskips = varskips = 0; } @@ -1092,74 +923,9 @@ boolean CON_Responder(event_t *ev) return true; } - if (key == 'x' || key == 'X') - { - if (input_sel > input_cur) - I_ClipboardCopy(&inputlines[inputline][input_cur], input_sel-input_cur); - else - I_ClipboardCopy(&inputlines[inputline][input_sel], input_cur-input_sel); - CON_InputDelSelection(); + // Those are already handled in M_TextInputHandle, but they do extra logic... Maybe textinput_t should have some sort of callbacks? + if (key == 'x' || key == 'X' || key == 'v' || key == 'V') completion[0] = 0; - return true; - } - else if (key == 'c' || key == 'C') - { - if (input_sel > input_cur) - I_ClipboardCopy(&inputlines[inputline][input_cur], input_sel-input_cur); - else - I_ClipboardCopy(&inputlines[inputline][input_sel], input_cur-input_sel); - return true; - } - else if (key == 'v' || key == 'V') - { - const char *paste = I_ClipboardPaste(); - if (input_sel != input_cur) - CON_InputDelSelection(); - if (paste != NULL) - CON_InputAddString(paste); - completion[0] = 0; - return true; - } - else if (key == 'w' || key == 'W') - { - size_t word_start, word_end, i; - word_end = i = input_cur; - - // Unless we're pointing at the beginning of line, decrement i so we only start - // removing symbols that come before the cursor - if (i) --i; - - // We might be pointing to spaces, skip them first - while (i && isspace(inputlines[inputline][i])) - --i; - - // Now skip the "word" - while (i && !isspace(inputlines[inputline][i])) - --i; - - // Unless we reached beginning of line, i is pointing at first space that was found - // before word start, and we don't want to remove it - if (i) ++i; - - word_start = i; - - if (word_start != word_end) - CON_InputDel(word_start, word_end); - - return true; - } - else if (key == KEY_RIGHTARROW) - CON_ToWordEnd(!shiftdown); - else if (key == KEY_LEFTARROW) - CON_ToWordBegin(!shiftdown); - - // Select all - if (key == 'a' || key == 'A') - { - input_sel = 0; - input_cur = input_len; - return true; - } // ...why shouldn't it eat the key? if it doesn't, it just means you // can control Sonic from the console, which is silly @@ -1174,9 +940,9 @@ boolean CON_Responder(event_t *ev) // remember typing for several completions (a-la-4dos) if (!completion[0]) { - if (!input_len || input_len >= 40 || strchr(inputlines[inputline], ' ')) + if (!input.length || input.length >= 40 || strchr(input.buffer, ' ')) return true; - strcpy(completion, inputlines[inputline]); + strcpy(completion, input.buffer); comskips = varskips = 0; } else @@ -1207,7 +973,11 @@ boolean CON_Responder(event_t *ev) cmd = CV_CompleteVar(completion, varskips); if (cmd) - CON_InputSetString(va("%s ", cmd)); + { + Lock_state(); + M_TextInputSetString(&input, va("%s ", cmd)); + Unlock_state(); + } else { if (comskips > 0) @@ -1233,37 +1003,6 @@ boolean CON_Responder(event_t *ev) return true; } - if (key == KEY_LEFTARROW) - { - if (input_cur != 0) - --input_cur; - if (!shiftdown) - input_sel = input_cur; - return true; - } - else if (key == KEY_RIGHTARROW) - { - if (input_cur < input_len) - ++input_cur; - if (!shiftdown) - input_sel = input_cur; - return true; - } - else if (key == KEY_HOME) - { - input_cur = 0; - if (!shiftdown) - input_sel = input_cur; - return true; - } - else if (key == KEY_END) - { - input_cur = input_len; - if (!shiftdown) - input_sel = input_cur; - return true; - } - // At this point we're messing with input // Clear completion completion[0] = 0; @@ -1271,45 +1010,29 @@ boolean CON_Responder(event_t *ev) // command enter if (key == KEY_ENTER) { - if (!input_len) + if (!input.length) return true; // push the command - COM_BufAddText(inputlines[inputline]); + COM_BufAddText(input.buffer); COM_BufAddText("\n"); CONS_Printf("\x86""%c""\x80""%s\n", CON_PROMPTCHAR, inputlines[inputline]); + Lock_state(); + // Only add command to history if it differs from previous one - if (strcmp(inputlines[inputline], inputlines[(inputline-1) & 31])) + if (strcmp(input.buffer, inputlines[(inputline-1) & 31])) + { inputline = (inputline+1) & 31; + M_TextInputInit(&input, inputlines[inputline], CON_MAXPROMPTCHARS); + } inputhist = inputline; - CON_InputClear(); + M_TextInputClear(&input); - return true; - } + Unlock_state(); - // backspace and delete command prompt - if (input_sel != input_cur) - { - if (key == KEY_BACKSPACE || key == KEY_DEL) - { - CON_InputDelSelection(); - return true; - } - } - else if (key == KEY_BACKSPACE) - { - CON_InputDelChar(); - return true; - } - else if (key == KEY_DEL) - { - if (input_cur == input_len) - return true; - ++input_cur; - CON_InputDelChar(); return true; } @@ -1326,7 +1049,9 @@ boolean CON_Responder(event_t *ev) if (inputhist == inputline) inputhist = (inputline + 1) & 31; - CON_InputSetString(inputlines[inputhist]); + Lock_state(); + M_TextInputSetString(&input, inputlines[inputhist]); + Unlock_state(); return true; } @@ -1340,41 +1065,16 @@ boolean CON_Responder(event_t *ev) while (inputhist != inputline && !inputlines[inputhist][0]); // back to currentline + Lock_state(); if (inputhist == inputline) - CON_InputClear(); + M_TextInputClear(&input); else - CON_InputSetString(inputlines[inputhist]); + M_TextInputSetString(&input, inputlines[inputhist]); + Unlock_state(); + return true; } - // allow people to use keypad in console (good for typing IP addresses) - Calum - if (key >= KEY_KEYPAD7 && key <= KEY_KPADDEL) - { - char keypad_translation[] = {'7','8','9','-', - '4','5','6','+', - '1','2','3', - '0','.'}; - - key = keypad_translation[key - KEY_KEYPAD7]; - } - else if (key == KEY_KPADSLASH) - key = '/'; - - // same capslock code as hu_stuff.c's HU_responder. Check there for details. - key = CON_ShiftChar(key); - - // enter a char into the command prompt - if (key < 32 || key > 127) - return true; - - // add key to cmd line here - if (key >= 'A' && key <= 'Z' && !(shiftdown ^ capslock)) //this is only really necessary for dedicated servers - key = key + 'a' - 'A'; - - if (input_sel != input_cur) - CON_InputDelSelection(); - CON_InputAddChar(key); - return true; } @@ -1656,16 +1356,16 @@ static void CON_DrawInput(void) clen = con_width-13; - if (input_len <= clen) + if (input.length <= clen) { c = 0; - clen = input_len; + clen = input.length; } else // input line scrolls left if it gets too long { clen -= 2; // There will always be some extra truncation -- but where is what we'll find out - if (input_cur <= clen/2) + if (input.cursor <= clen/2) { // Close enough to right edge to show all c = 0; @@ -1676,15 +1376,15 @@ static void CON_DrawInput(void) { // Cursor in the middle (or right side) of input // Move over for the ellipsis - c = input_cur - (clen/2) + 2; + c = input.cursor - (clen/2) + 2; x += charwidth*2; lellip = 1; - if (c + clen >= input_len) + if (c + clen >= input.length) { // Cursor in the right side of input // We were too far over, so move back - c = input_len - clen; + c = input.length - clen; } else { @@ -1698,7 +1398,7 @@ static void CON_DrawInput(void) if (lellip) { x -= charwidth*3; - if (input_sel < c) + if (input.select < c) V_DrawFill(x, y, charwidth*3, (10 * con_scalefactor), 107 | V_NOSCALESTART); for (i = 0; i < 3; ++i, x += charwidth) V_DrawCharacter(x, y, '.' | cv_constextsize.value | V_GRAYMAP | V_NOSCALESTART, !cv_allcaps.value); @@ -1708,7 +1408,7 @@ static void CON_DrawInput(void) for (cend = c + clen; c < cend; ++c, x += charwidth) { - if ((input_sel > c && input_cur <= c) || (input_sel <= c && input_cur > c)) + if ((input.select > c && input.cursor <= c) || (input.select <= c && input.cursor > c)) { V_DrawFill(x, y, charwidth, (10 * con_scalefactor), 107 | V_NOSCALESTART); V_DrawCharacter(x, y, p[c] | cv_constextsize.value | V_YELLOWMAP | V_NOSCALESTART, !cv_allcaps.value); @@ -1716,14 +1416,14 @@ static void CON_DrawInput(void) else V_DrawCharacter(x, y, p[c] | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value); - if (c == input_cur && con_tick >= 4) + if (c == input.cursor && con_tick >= 4) V_DrawCharacter(x, y + (con_scalefactor*2), '_' | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value); } - if (cend == input_cur && con_tick >= 4) + if (cend == input.cursor && con_tick >= 4) V_DrawCharacter(x, y + (con_scalefactor*2), '_' | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value); if (rellip) { - if (input_sel > cend) + if (input.select > cend) V_DrawFill(x, y, charwidth*3, (10 * con_scalefactor), 107 | V_NOSCALESTART); for (i = 0; i < 3; ++i, x += charwidth) V_DrawCharacter(x, y, '.' | cv_constextsize.value | V_GRAYMAP | V_NOSCALESTART, !cv_allcaps.value); diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 09813198a..89aa24b13 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -6381,7 +6381,7 @@ boolean TryRunTics(tic_t realtics) if (demo.playback) { - neededtic = gametic + realtics * (gamestate == GS_LEVEL ? cv_playbackspeed.value : 1); + neededtic = gametic + realtics; // start a game after a demo maketic += realtics; firstticstosend = maketic; diff --git a/src/d_main.c b/src/d_main.c index 471d29fa2..996d879e3 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -827,7 +827,7 @@ void D_SRB2Loop(void) rendertimefrac = FRACUNIT; } - rendertimefrac_unpaused = (!hu_stopped) ? g_time.timefrac : FRACUNIT; + rendertimefrac_unpaused = g_time.timefrac; } else { @@ -857,7 +857,7 @@ void D_SRB2Loop(void) LUA_Step(); #ifdef HAVE_DISCORDRPC - if (!dedicated) + if (! dedicated) { Discord_RunCallbacks(); } diff --git a/src/doomdef.h b/src/doomdef.h index 361cd92d1..ff53c8c8e 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -474,7 +474,12 @@ void M_StartupLocale(void); // M_GetText function that just returns the string. #define M_GetText(x) (x) #endif -void *M_Memcpy(void* dest, const void* src, size_t n); + +FUNCINLINE static ATTRINLINE void *M_Memcpy(void *dest, const void *src, size_t n) +{ + return memcpy(dest, src, n); +} + char *va(const char *format, ...) FUNCPRINTF; char *M_GetToken(const char *inputString); char *sizeu1(size_t num); diff --git a/src/g_game.c b/src/g_game.c index 6b61f0a43..8616d55dc 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -6386,8 +6386,18 @@ void G_BeginRecording(void) // Full replay title demo_p += 64; { + char demotitlename[65]; char *title = G_BuildMapTitle(gamemap); - snprintf(demo.titlename, 64, "%s - %s", title, modeattacking ? "Time Attack" : connectedservername); + + // Print to a separate temp buffer instead of demo.titlename, so we can use it in M_TextInputSetString + snprintf(demotitlename, 64, "%s - %s", title, modeattacking ? "Time Attack" : connectedservername); + + // Init just in case it isn't initialized already + M_TextInputInit(&demo.titlenameinput, demo.titlename, sizeof(demo.titlename)); + + // This will indirectly assign to demo.titlename too + M_TextInputSetString(&demo.titlenameinput, demotitlename); + Z_Free(title); } @@ -8377,7 +8387,6 @@ void G_SaveDemo(void) boolean G_DemoTitleResponder(event_t *ev) { - size_t len; INT32 ch; if (ev->type != ev_keydown) @@ -8398,28 +8407,7 @@ boolean G_DemoTitleResponder(event_t *ev) return true; } - if ((ch >= HU_FONTSTART && ch <= HU_FONTEND && hu_font[ch-HU_FONTSTART]) - || ch == ' ') // Allow spaces, of course - { - len = strlen(demo.titlename); - if (len < 64) - { - demo.titlename[len+1] = 0; - demo.titlename[len] = cv_keyboardlayout.value == 3 ? CON_ShitAndAltGrChar(ch) : CON_ShiftChar(ch); - } - } - else if (ch == KEY_BACKSPACE) - { - if (shiftdown) - memset(demo.titlename, 0, sizeof(demo.titlename)); - else - { - len = strlen(demo.titlename); - - if (len > 0) - demo.titlename[len-1] = 0; - } - } + M_TextInputHandle(&demo.titlenameinput, ch); return true; } diff --git a/src/g_game.h b/src/g_game.h index 14decd858..aaafa233c 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -17,6 +17,7 @@ #include "doomdef.h" #include "doomstat.h" #include "d_event.h" +#include "m_textinput.h" extern char gamedatafilename[64]; extern char timeattackfolder[64]; @@ -44,6 +45,7 @@ extern consvar_t cv_recordmultiplayerdemos, cv_netdemosyncquality, cv_maxdemosiz // Publicly-accessible demo vars struct demovars_s { char titlename[65]; + textinput_t titlenameinput; boolean recording, playback, timing; UINT16 version; // Current file format of the demo being played boolean title; // Title Screen demo can be cancelled by any key diff --git a/src/hu_stuff.c b/src/hu_stuff.c index 35430119b..d8e345ba7 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -49,6 +49,8 @@ #include "s_sound.h" // song credits #include "k_kart.h" +#include "m_textinput.h" + #ifdef HWRENDER #include "hardware/hw_main.h" #endif @@ -86,8 +88,8 @@ patch_t *frameslash; // framerate stuff. Used in screen.c static player_t *plr; boolean chat_on; // entering a chat message? -static char w_chat[HU_MAXMSGLEN + 1]; -static size_t c_input = 0; // let's try to make the chat input less shitty. +static char w_chat_buf[HU_MAXMSGLEN + 1]; +static textinput_t w_chat; static boolean headsupactive = false; boolean hu_showscores; // draw rankings static char hu_tick; @@ -1143,71 +1145,6 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum) #endif } -// Handles key input and string input -// -static inline boolean HU_keyInChatString(char *s, char ch) -{ - size_t l; - - if ((ch >= HU_FONTSTART && ch <= HU_FONTEND && hu_font[ch-HU_FONTSTART]) - || ch == ' ') // Allow spaces, of course - { - l = strlen(s); - if (l < HU_MAXMSGLEN - 1) - { - if (c_input >= strlen(s)) // don't do anything complicated - { - s[l++] = ch; - s[l]=0; - } - else - { - // move everything past c_input for new characters: - size_t m = HU_MAXMSGLEN-1; - while (m>=c_input) - { - if (s[m]) - s[m+1] = (s[m]); - if (m == 0) // prevent overflow - break; - m--; - } - s[c_input] = ch; // and replace this. - } - c_input++; - return true; - } - return false; - } - else if (ch == KEY_BACKSPACE) - { - size_t i = c_input; - - if (c_input <= 0) - return false; - - if (!s[i-1]) - return false; - - if (i >= strlen(s)-1) - { - s[strlen(s)-1] = 0; - c_input--; - return false; - } - - for (; (i < HU_MAXMSGLEN); i++) - { - s[i-1] = s[i]; - } - c_input--; - } - else if (ch != KEY_ENTER) - return false; // did not eat key - - return true; // ate the key -} - #endif // @@ -1280,9 +1217,9 @@ static boolean HU_clearChatSpaces(void) char c; // current character we're iterating. boolean nothingbutspaces = true; - for (; i < strlen(w_chat); i++) // iterate through message and eradicate all spaces that don't belong. + for (; i < strlen(w_chat_buf); i++) // iterate through message and eradicate all spaces that don't belong. { - c = w_chat[i]; + c = w_chat_buf[i]; if (!c) break; // if there's nothing, it's safe to assume our message has ended, so let's not waste any more time here. @@ -1294,128 +1231,110 @@ static boolean HU_clearChatSpaces(void) return nothingbutspaces; } -// -// -static void HU_queueChatChar(INT32 c) +static void HU_SendChatMessage(void) { - // send automaticly the message (no more chat char) - if (c == KEY_ENTER) + char buf[2 + HU_MAXMSGLEN + 1]; + char *msg = &buf[2]; + size_t ci = 2; + INT32 target = 0; + char c; + + if (HU_clearChatSpaces()) // Avoids being able to send empty messages, or something. + return; // If this returns true, that means our message was NOTHING but spaces, so don't send it period. + + do { + c = w_chat_buf[-2+ci++]; + if (!c || (c >= ' ' && !(c & 0x80))) // copy printable characters and terminating '\0' only. + buf[ci-1]=c; + } while (c); + + M_TextInputClear(&w_chat); + + // last minute mute check + if (CHAT_MUTE) { - char buf[2 + HU_MAXMSGLEN + 1]; - char *msg = &buf[2]; - size_t i; - size_t ci = 2; - INT32 target = 0; + HU_AddChatText(va("%s>ERROR: The chat is muted. You can't say anything.", "\x85"), false); + return; + } - if (HU_clearChatSpaces()) // Avoids being able to send empty messages, or something. - return; // If this returns true, that means our message was NOTHING but spaces, so don't send it period. + if (strlen(msg) > 4 && strnicmp(msg, "/pm", 3) == 0) // used /pm + { + INT32 spc = 1; // used if nodenum[1] is a space. + char *nodenum = (char*) malloc(3); + const char *newmsg; - do { - c = w_chat[-2+ci++]; - if (!c || (c >= ' ' && !(c & 0x80))) // copy printable characters and terminating '\0' only. - buf[ci-1]=c; - } while (c); - i = 0; - for (;(iERROR: The chat is muted. You can't say anything.", "\x85"), false); + HU_AddChatText(va("%sCannot send sayto in Say-Team.", "\x85"), false); return; } - if (strlen(msg) > 4 && strnicmp(msg, "/pm", 3) == 0) // used /pm + memcpy(nodenum, msg+3, 2); + nodenum[2] = '\0'; + + // check for undesirable characters in our "number" + if (((nodenum[0] < '0') || (nodenum[0] > '9')) || ((nodenum[1] < '0') || (nodenum[1] > '9'))) { - INT32 spc = 1; // used if nodenum[1] is a space. - char *nodenum = (char*) malloc(3); - const char *newmsg; - - // what we're gonna do now is check if the node exists - // with that logic, characters 4 and 5 are our numbers: - - // teamtalk can't send PMs, just don't send it, else everyone would be able to see it, and no one wants to see your sex RP sicko. - if (teamtalk) - { - HU_AddChatText(va("%sCannot send sayto in Say-Team.", "\x85"), false); - return; - } - - memcpy(nodenum, msg+3, 2); - nodenum[2] = '\0'; - - // check for undesirable characters in our "number" - if (((nodenum[0] < '0') || (nodenum[0] > '9')) || ((nodenum[1] < '0') || (nodenum[1] > '9'))) - { - // check if nodenum[1] is a space - if (nodenum[1] == ' ') - spc = 0; - // let it slide - else - { - HU_AddChatText("\x82NOTICE: \x80Invalid command format. Correct format is \'/pm \'.", false); - free(nodenum); - return; - } - } - // I'm very bad at C, I swear I am, additional checks eww! - if (spc != 0) - { - if (msg[5] != ' ') - { - HU_AddChatText("\x82NOTICE: \x80Invalid command format. Correct format is \'/pm \'.", false); - free(nodenum); - return; - } - } - - target = atoi((const char*) nodenum); // turn that into a number - free(nodenum); - //CONS_Printf("%d\n", target); - - // check for target player, if it doesn't exist then we can't send the message! - if (target < MAXPLAYERS && playeringame[target]) // player exists - target++; // even though playernums are from 0 to 31, target is 1 to 32, so up that by 1 to have it work! + // check if nodenum[1] is a space + if (nodenum[1] == ' ') + spc = 0; + // let it slide else { - HU_AddChatText(va("\x82NOTICE: \x80Player %d does not exist.", target), false); // same + HU_AddChatText("\x82NOTICE: \x80Invalid command format. Correct format is \'/pm \'.", false); + free(nodenum); return; } - - // we need to get rid of the /pm - newmsg = msg+5+spc; - strlcpy(msg, newmsg, HU_MAXMSGLEN + 1); } - if (ci > 3) // don't send target+flags+empty message. + // I'm very bad at C, I swear I am, additional checks eww! + if (spc != 0) { - if (teamtalk) - buf[0] = -1; // target - else - buf[0] = target; - - buf[1] = 0; // flags - SendNetXCmd(XD_SAY, buf, 2 + strlen(&buf[2]) + 1); + if (msg[5] != ' ') + { + HU_AddChatText("\x82NOTICE: \x80Invalid command format. Correct format is \'/pm \'.", false); + free(nodenum); + return; + } } - return; + + target = atoi((const char*) nodenum); // turn that into a number + free(nodenum); + //CONS_Printf("%d\n", target); + + // check for target player, if it doesn't exist then we can't send the message! + if (target < MAXPLAYERS && playeringame[target]) // player exists + target++; // even though playernums are from 0 to 31, target is 1 to 32, so up that by 1 to have it work! + else + { + HU_AddChatText(va("\x82NOTICE: \x80Player %d does not exist.", target), false); // same + return; + } + + // we need to get rid of the /pm + newmsg = msg+5+spc; + strlcpy(msg, newmsg, HU_MAXMSGLEN + 1); + } + if (ci > 3) // don't send target+flags+empty message. + { + if (teamtalk) + buf[0] = -1; // target + else + buf[0] = target; + + buf[1] = 0; // flags + SendNetXCmd(XD_SAY, buf, 2 + strlen(&buf[2]) + 1); } } #endif void HU_clearChatChars(void) { - size_t i = 0; - for (;idata1 != gamecontrol[gc_talkkey][1])) return false; - c = cv_keyboardlayout.value == 3 ? CON_ShitAndAltGrChar(c) : CON_ShiftChar(c); + M_TextInputHandle(&w_chat, c); - // pasting. pasting is cool. chat is a bit limited, though :( - if (((c == 'v' || c == 'V') && ctrldown) && !CHAT_MUTE) - { - const char *paste = I_ClipboardPaste(); - size_t chatlen; - size_t pastelen; - - // create a dummy string real quickly - - if (paste == NULL) - return true; - - chatlen = strlen(w_chat); - pastelen = strlen(paste); - if (chatlen+pastelen > HU_MAXMSGLEN) - return true; // we can't paste this!! - - if (c_input >= strlen(w_chat)) // add it at the end of the string. - { - memcpy(&w_chat[chatlen], paste, pastelen); // copy all of that. - c_input += pastelen; - /*size_t i = 0; - for (;i= c_input) - { - if (w_chat[i]) - w_chat[i+pastelen] = w_chat[i]; - if (i == 0) // prevent overflow - break; - i--; - } - memcpy(&w_chat[c_input], paste, pastelen); // copy all of that. - c_input += pastelen; - return true; - } - } - - if (!CHAT_MUTE && HU_keyInChatString(w_chat,c)) - { - HU_queueChatChar(c); - } if (c == KEY_ENTER) { chat_on = false; - c_input = 0; // reset input cursor chat_scrollmedown = true; // you hit enter, so you might wanna autoscroll to see what you just sent. :) + HU_SendChatMessage(); } else if (c == KEY_ESCAPE || ((c == gamecontrol[gc_talkkey][0] || c == gamecontrol[gc_talkkey][1] @@ -1561,7 +1433,6 @@ boolean HU_Responder(event_t *ev) && c >= KEY_MOUSE1)) // If it's not a keyboard key, then the chat button is used as a toggle. { chat_on = false; - c_input = 0; // reset input cursor } else if ((c == KEY_UPARROW || c == KEY_MOUSEWHEELUP) && chat_scroll > 0 && !OLDCHAT) // CHAT SCROLLING YAYS! { @@ -1575,10 +1446,6 @@ boolean HU_Responder(event_t *ev) justscrolleddown = true; chat_scrolltime = 4; } - else if (c == KEY_LEFTARROW && c_input != 0 && !OLDCHAT) // i said go back - c_input--; - else if (c == KEY_RIGHTARROW && c_input < strlen(w_chat) && !OLDCHAT) // don't need to check for admin or w/e here since the chat won't ever contain anything if it's muted. - c_input++; return true; } #endif @@ -1932,8 +1799,9 @@ static void HU_DrawChat(void) INT32 charwidth = 4, charheight = 6; INT32 boxw = cv_chatwidth.value; INT32 t = 0, c = 0, y = chaty - (typelines*charheight); - UINT32 i = 0, saylen = strlen(w_chat); // You learn new things everyday! + UINT32 i = 0, saylen = strlen(w_chat_buf); // You learn new things everyday! INT32 cflag = 0; + size_t select_start = 0, select_end = 0; const char *ntalk = "Say: ", *ttalk = "Team: "; const char *talk = ntalk; const char *mute = "Chat has been muted."; @@ -1995,13 +1863,19 @@ static void HU_DrawChat(void) i = 0; typelines = 1; - if ((strlen(w_chat) == 0 || c_input == 0) && hu_tick < 4) - V_DrawChatCharacter(chatx + 2 + c, y+1, '_' |V_SNAPTOBOTTOM|V_SNAPTOLEFT|t, !cv_allcaps.value, NULL); + if ((w_chat.cursor == 0 || w_chat.length == 0) && hu_tick < 4) + V_DrawChatCharacter(chatx+2+c+charwidth*w_chat.cursor, y+1, '_'|V_SNAPTOBOTTOM|V_SNAPTOLEFT|t, !cv_allcaps.value, NULL); - while (w_chat[i]) + if (w_chat.select != w_chat.cursor) + { + select_start = min(w_chat.select, w_chat.cursor); + select_end = max(w_chat.select, w_chat.cursor); + } + + while (w_chat_buf[i]) { boolean skippedline = false; - if (c_input == (i+1)) + if (w_chat.cursor == (i+1)) { INT32 cursorx = (c+charwidth < boxw-charwidth) ? (chatx + 2 + c+charwidth) : (chatx+1); // we may have to go down. INT32 cursory = (cursorx != chatx+1) ? (y) : (y+charheight); @@ -2016,10 +1890,14 @@ static void HU_DrawChat(void) } //Hurdler: isn't it better like that? - if (w_chat[i] < HU_FONTSTART) - ++i; - else - V_DrawChatCharacter(chatx + c + 2, y, w_chat[i++] | V_SNAPTOBOTTOM|V_SNAPTOLEFT | t, !cv_allcaps.value, NULL); + if (w_chat_buf[i] >= HU_FONTSTART) + V_DrawChatCharacter(chatx + c + 2, y, w_chat_buf[i] | V_SNAPTOBOTTOM|V_SNAPTOLEFT | t, !cv_allcaps.value, NULL); + + // Draw selection + if (i >= select_start && i < select_end) + V_DrawFill(chatx + c + 2, y-1, charwidth, charheight, 103|V_TRANSLUCENT|V_SNAPTOBOTTOM|V_SNAPTOLEFT|t); + + ++i; c += charwidth; if (c > boxw-(charwidth*2) && !skippedline) @@ -2031,7 +1909,7 @@ static void HU_DrawChat(void) } // handle /pm list. It's messy, horrible and I don't care. - if (strnicmp(w_chat, "/pm", 3) == 0 && vid.width >= 400 && !teamtalk) // 320x200 unsupported kthxbai + if (strnicmp(w_chat_buf, "/pm", 3) == 0 && vid.width >= 400 && !teamtalk) // 320x200 unsupported kthxbai { INT32 count = 0; INT32 p_dispy = chaty - charheight -1; @@ -2051,38 +1929,38 @@ static void HU_DrawChat(void) { // filter: (code needs optimization pls help I'm bad with C) - if (w_chat[3]) + if (w_chat_buf[3]) { char *nodenum; UINT32 n; - // right, that's half important: (w_chat[4] may be a space since /pm0 msg is perfectly acceptable!) - if ( ( ((w_chat[3] != 0) && ((w_chat[3] < '0') || (w_chat[3] > '9'))) || ((w_chat[4] != 0) && (((w_chat[4] < '0') || (w_chat[4] > '9'))))) && (w_chat[4] != ' ')) + // right, that's half important: (w_chat_buf[4] may be a space since /pm0 msg is perfectly acceptable!) + if ( ( ((w_chat_buf[3] != 0) && ((w_chat_buf[3] < '0') || (w_chat_buf[3] > '9'))) || ((w_chat_buf[4] != 0) && (((w_chat_buf[4] < '0') || (w_chat_buf[4] > '9'))))) && (w_chat_buf[4] != ' ')) break; nodenum = (char*) malloc(3); - memcpy(nodenum, w_chat+3, 2); + memcpy(nodenum, w_chat_buf+3, 2); nodenum[2] = '\0'; n = atoi((const char*) nodenum); // turn that into a number free(nodenum); // special cases: - if ((n == 0) && !(w_chat[4] == '0')) + if ((n == 0) && !(w_chat_buf[4] == '0')) { if (!(i<10)) continue; } - else if ((n == 1) && !(w_chat[3] == '0')) + else if ((n == 1) && !(w_chat_buf[3] == '0')) { if (!((i == 1) || ((i >= 10) && (i <= 19)))) continue; } - else if ((n == 2) && !(w_chat[3] == '0')) + else if ((n == 2) && !(w_chat_buf[3] == '0')) { if (!((i == 2) || ((i >= 20) && (i <= 29)))) continue; } - else if ((n == 3) && !(w_chat[3] == '0')) + else if ((n == 3) && !(w_chat_buf[3] == '0')) { if (!((i == 3) || ((i >= 30) && (i <= 31)))) continue; @@ -2121,6 +1999,7 @@ static void HU_DrawChat_Old(void) size_t i = 0; const char *ntalk = "Say: ", *ttalk = "Say-Team: "; const char *talk = ntalk; + size_t select_start = 0, select_end = 0; INT32 charwidth = 8 * con_scalefactor; //SHORT(hu_font['A'-HU_FONTSTART]->width) * con_scalefactor; INT32 charheight = 8 * con_scalefactor; //SHORT(hu_font['A'-HU_FONTSTART]->height) * con_scalefactor; if (teamtalk) @@ -2149,14 +2028,19 @@ static void HU_DrawChat_Old(void) c += charwidth; } - if ((strlen(w_chat) == 0 || c_input == 0) && hu_tick < 4) - V_DrawCharacter(HU_INPUTX+c, y+2*con_scalefactor, '_' |cv_constextsize.value | V_NOSCALESTART|t, !cv_allcaps.value); + if ((w_chat.cursor == 0 || w_chat.length == 0) && hu_tick < 4) + V_DrawCharacter(HU_INPUTX+c+charwidth*w_chat.cursor, y+2*con_scalefactor, '_'|cv_constextsize.value|V_NOSCALESTART|t, !cv_allcaps.value); + + if (w_chat.select != w_chat.cursor) + { + select_start = min(w_chat.select, w_chat.cursor); + select_end = max(w_chat.select, w_chat.cursor); + } i = 0; - while (w_chat[i]) + while (w_chat_buf[i]) { - - if (c_input == (i+1) && hu_tick < 4) + if (w_chat.cursor == (i+1) && hu_tick < 4) { INT32 cursorx = (HU_INPUTX+c+charwidth < vid.width) ? (HU_INPUTX + c + charwidth) : (HU_INPUTX); // we may have to go down. INT32 cursory = (cursorx != HU_INPUTX) ? (y) : (y+charheight); @@ -2164,17 +2048,18 @@ static void HU_DrawChat_Old(void) } //Hurdler: isn't it better like that? - if (w_chat[i] < HU_FONTSTART) - { - ++i; - //charwidth = 4 * con_scalefactor; - } - else + if (w_chat_buf[i] >= HU_FONTSTART) { //charwidth = SHORT(hu_font[w_chat[i]-HU_FONTSTART]->width) * con_scalefactor; - V_DrawCharacter(HU_INPUTX + c, y, w_chat[i++] | cv_constextsize.value | V_NOSCALESTART | t, !cv_allcaps.value); + V_DrawCharacter(HU_INPUTX + c, y, w_chat_buf[i] | cv_constextsize.value | V_NOSCALESTART | t, !cv_allcaps.value); } + // Draw selection + if (i >= select_start && i < select_end) + V_DrawFill(HU_INPUTX + c, y, charwidth, charheight, 103|V_TRANSLUCENT|cv_constextsize.value|V_NOSCALESTART|t); + + ++i; + c += charwidth; if (c >= vid.width) { diff --git a/src/lua_script.c b/src/lua_script.c index 9d5bef4a7..fb16ad169 100644 --- a/src/lua_script.c +++ b/src/lua_script.c @@ -22,6 +22,8 @@ #include "p_saveg.h" #include "p_local.h" #include "p_slopes.h" // for P_SlopeById +#include "s_sound.h" +#include "m_menu.h" #ifdef LUA_ALLOW_BYTECODE #include "d_netfil.h" // for LUA_DumpFile #endif @@ -1333,6 +1335,12 @@ static UINT8 UnArchiveValue(int TABLESINDEX) break; case ARCH_TEND: return 1; + default: + CONS_Alert(CONS_ERROR, "Unknown value type unarchived, save is corrupted!\n"); + G_SetExitGameFlag(); + S_StartSound(NULL, sfx_syfail); // he he he + M_StartMessage(M_GetText("Corrupted save received\nPress ESC\n"), NULL, MM_NOTHING); + return 1; } return 0; } @@ -1460,7 +1468,13 @@ static void UnArchiveExtVars(void *pointer) for (i = 0; i < field_count; i++) { READSTRING(save_p, field); - UnArchiveValue(TABLESINDEX); + + if (UnArchiveValue(TABLESINDEX) == 1) + { + CONS_Alert(CONS_ERROR, "Unexpected end marker when reading ExtVars (field '%s')\n", field); + break; + } + lua_setfield(gL, -2, field); } @@ -1524,12 +1538,29 @@ static void UnArchiveTables(void) for (i = 1; i <= n; i++) { lua_rawgeti(gL, TABLESINDEX, i); + + if (!lua_istable(gL, -1)) + { + CONS_Alert(CONS_ERROR, "Value in tables list #%d is not a table! (corrupted save?)\n", i); + continue; + } + while (true) { if (UnArchiveValue(TABLESINDEX) == 1) // read key break; - if (UnArchiveValue(TABLESINDEX) == 2) // read value + + UINT8 ret = UnArchiveValue(TABLESINDEX); + + if (ret == 1) + { + CONS_Alert(CONS_ERROR, "Unexpected end of save reached (Corrupted save?)\n"); + lua_pop(gL, 1); // Pop key + break; + } + else if (ret == 2) // read value n++; + if (lua_isnil(gL, -2)) // if key is nil (if a function etc was accidentally saved) { CONS_Alert(CONS_ERROR, "A nil key in table %d was found! (Invalid key type or corrupted save?)\n", i); @@ -1589,8 +1620,13 @@ void LUA_Step(void) { if (!gL) return; - lua_settop(gL, 0); - lua_gc(gL, LUA_GCSTEP, 1); + + if (lua_gettop(gL) != 0) + { + CONS_Alert(CONS_WARNING, "Eek, there is garbage on lua stack!\n"); + lua_settop(gL, 0); + lua_gc(gL, LUA_GCSTEP, 1); + } } void LUA_Archive(void) diff --git a/src/lzf.c b/src/lzf.c index 28ba1b6cb..d5a837888 100644 --- a/src/lzf.c +++ b/src/lzf.c @@ -166,7 +166,7 @@ typedef unsigned char u8; #ifdef LZF_HSLOT # define LZF_HSLOT_BIAS ((const u8 *)in_data) #else -# if LZF_USE_OFFSETS +# ifdef LZF_USE_OFFSETS # define LZF_HSLOT_BIAS ((const u8 *)in_data) typedef unsigned int LZF_HSLOT; # else diff --git a/src/m_menu.c b/src/m_menu.c index 2bfb3e1f1..bc7e9d85b 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -30,6 +30,7 @@ #include "g_game.h" #include "g_input.h" #include "m_argv.h" +#include "m_textinput.h" // Data. #include "sounds.h" @@ -159,6 +160,9 @@ boolean fromlevelselect = false; boolean menu_text_input = false; +char menu_text_input_buf[MAXSTRINGLENGTH]; +static textinput_t menuinput; + static INT32 coolalphatimer = 9; typedef enum @@ -245,6 +249,7 @@ menu_t SR_MainDef, SR_UnlockChecklistDef; // Misc. Main Menu static void M_Options(INT32 choice); +static void M_Multiplayer(INT32 choice); static void M_LocalSkinMenu(INT32 choice); static void M_LocalSkinChange(INT32 choice); static void M_Manual(INT32 choice); @@ -591,7 +596,7 @@ static menuitem_t MainMenu[] = { {IT_SUBMENU|IT_STRING, NULL, "Extras", &SR_MainDef, 76}, {IT_CALL |IT_STRING, NULL, "Time Attack", M_TimeAttack, 84}, - {IT_SUBMENU|IT_STRING, NULL, "Multiplayer", &MP_MainDef, 92}, + {IT_CALL |IT_STRING, NULL, "Multiplayer", M_Multiplayer, 92}, {IT_CALL |IT_STRING, NULL, "Options", M_Options, 100}, {IT_CALL |IT_STRING, NULL, "Addons", M_Addons, 108}, {IT_CALL |IT_STRING, NULL, "Quit Game", M_QuitSRB2, 116}, @@ -2577,6 +2582,7 @@ static menuitem_t OP_AdvancedBirdMenu[] = {IT_STRING | IT_CVAR, NULL, "Fade Back In While Respawning", &cv_respawnfademusicback, 40}, {IT_STRING | IT_CVAR, NULL, "Resync Threshold", &cv_music_resync_threshold, 60}, + {IT_STRING | IT_CVAR, NULL, "Resync Special Music Only", &cv_music_resync_powerups_only, 70}, }; static const char* OP_AdvancedBirdTooltips[] = @@ -3499,46 +3505,15 @@ static void M_ChangeCvar(INT32 choice) static boolean M_ChangeStringCvar(INT32 choice) { consvar_t *cv = (consvar_t *)currentMenu->menuitems[itemOn].itemaction; - char buf[MAXSTRINGLENGTH]; - size_t len; - choice = M_ShiftChar(choice); - - switch (choice) + if (M_TextInputHandle(&menuinput, choice)) { - case KEY_BACKSPACE: - len = strlen(cv->string); - if (len > 0) - { - S_StartSound(NULL,sfx_menu1); // Tails - M_Memcpy(buf, cv->string, len); - buf[len-1] = 0; - CV_Set(cv, buf); - } - return true; - case KEY_DEL: - if (cv->string[0]) - { - S_StartSound(NULL,sfx_menu1); // Tails - CV_Set(cv, ""); - } - return true; - default: - if ((cv_keyboardlayout.value != 3 && choice >= 32 && choice <= 127) || (cv_keyboardlayout.value == 3 && choice >= 32 && choice <= 141)) - { - len = strlen(cv->string); - if (len < MAXSTRINGLENGTH - 1) - { - S_StartSound(NULL,sfx_menu1); // Tails - M_Memcpy(buf, cv->string, len); - buf[len++] = (char)choice; - buf[len] = 0; - CV_Set(cv, buf); - } - return true; - } - break; + S_StartSound(NULL,sfx_menu1); // Tails + CV_Set(cv, menuinput.buffer); + + return true; } + return false; } @@ -3555,6 +3530,21 @@ static void M_ResetCvars(void) } } +// If current menu item is IT_CV_STRING, setup menuinput +static void M_CheckStringItem(void) +{ + if (itemOn < currentMenu->numitems && (currentMenu->menuitems[itemOn].status & IT_CVARTYPE) == IT_CV_STRING) + { + consvar_t *cv = (consvar_t *)currentMenu->menuitems[itemOn].itemaction; + + // Just in case + memset(menu_text_input_buf, 0, sizeof menu_text_input_buf); + M_TextInputInit(&menuinput, menu_text_input_buf, sizeof menu_text_input_buf); + + M_TextInputSetString(&menuinput, cv->string); + } +} + static void M_NextOpt(void) { INT16 oldItemOn = itemOn; // prevent infinite loop @@ -3566,6 +3556,8 @@ static void M_NextOpt(void) else itemOn++; } while (oldItemOn != itemOn && (currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_SPACE); + + M_CheckStringItem(); } static void M_PrevOpt(void) @@ -3579,6 +3571,8 @@ static void M_PrevOpt(void) else itemOn--; } while (oldItemOn != itemOn && (currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_SPACE); + + M_CheckStringItem(); } // lock out further input in a tic when important buttons are pressed @@ -3939,7 +3933,6 @@ boolean M_Responder(event_t *ev) if ((currentMenu->menuitems[itemOn].status & IT_CVARTYPE) == IT_CV_STRING) { menu_text_input = true; - ch = M_ShiftChar(ch); if (M_ChangeStringCvar(ch)) return true; else @@ -4600,6 +4593,8 @@ void M_SetupNextMenu(menu_t *menudef) } } } + + M_CheckStringItem(); } // @@ -4939,6 +4934,33 @@ void M_DrawTextBoxFlags(INT32 x, INT32 y, INT32 width, INT32 boxlines, INT32 fla V_DrawFill(x+5, y+5, width*8+6, boxlines*8+6, 239|flags); } +void M_DrawTextInput(INT32 x, INT32 y, textinput_t *input, INT32 flags) +{ + INT32 skullx = x; + + V_DrawString(x, y, V_ALLOWLOWERCASE|flags, input->buffer); + + // draw text cursor for name + if (input->length) + skullx = x+V_SubStringWidth(input->buffer, input->cursor, V_ALLOWLOWERCASE); + + if (skullAnimCounter < 4) // blink cursor + V_DrawCharacter(skullx, y+3, '_'|flags, false); + + // draw selection + if (input->select != input->cursor) + { + size_t start = min(input->select, input->cursor); + size_t end = max(input->select, input->cursor); + + size_t len = end - start; + + INT32 startx = V_SubStringWidth(input->buffer, start, V_ALLOWLOWERCASE); + + V_DrawFill(x+startx, y, V_SubStringWidth(input->buffer+start, len, V_ALLOWLOWERCASE), 8, 103|V_TRANSLUCENT|flags); + } +} + // horizontally centered text static void M_CentreText(INT32 y, const char *string) { @@ -5140,10 +5162,12 @@ static void M_DrawGenericMenu(void) break; case IT_CV_STRING: M_DrawTextBox(x, y + 4, MAXSTRINGLENGTH, 1); - V_DrawString(x + 8, y + 12, V_ALLOWLOWERCASE, cv->string); - if (skullAnimCounter < 4 && i == itemOn) - V_DrawCharacter(x + 8 + V_StringWidth(cv->string, 0), y + 12, - '_' | 0x80, false); + + if (itemOn == i) + M_DrawTextInput(x + 8, y + 12, &menuinput, 0); + else + V_DrawString(x + 8, y + 12, V_ALLOWLOWERCASE, cv->string); + y += 16; break; default: @@ -5327,10 +5351,12 @@ static void M_DrawGenericScrollMenu(void) if (y + 12 > (currentMenu->y + 2*scrollareaheight)) break; M_DrawTextBox(x, y + 4, MAXSTRINGLENGTH, 1); - V_DrawString(x + 8, y + 12, lowercase, cv->string); - if (skullAnimCounter < 4 && i == itemOn) - V_DrawCharacter(x + 8 + V_StringWidth(cv->string, 0), y + 12, - '_' | 0x80, false); + + if (itemOn == i) + M_DrawTextInput(x + 8, y + 12, &menuinput, 0); + else + V_DrawString(x + 8, y + 12, lowercase, cv->string); + break; default: V_DrawRightAlignedString(BASEVIDWIDTH - x, y, @@ -5466,10 +5492,12 @@ static void M_DrawCenteredMenu(void) break; case IT_CV_STRING: M_DrawTextBox(x, y + 4, MAXSTRINGLENGTH, 1); - V_DrawString(x + 8, y + 12, V_ALLOWLOWERCASE, cv->string); - if (skullAnimCounter < 4 && i == itemOn) - V_DrawCharacter(x + 8 + V_StringWidth(cv->string, 0), y + 12, - '_' | 0x80, false); + + if (itemOn == i) + M_DrawTextInput(x + 8, y + 12, &menuinput, 0); + else + V_DrawString(x + 8, y + 12, V_ALLOWLOWERCASE, cv->string); + y += 16; break; default: @@ -6645,11 +6673,11 @@ I_mutex replayquerymutex; #define MAXREPLAYQUERY 40 -char replayqueryinput[MAXREPLAYQUERY+1]; // The input typed -size_t replayquerypos = 0; // Position in input window +static char replayqueryinput_buffer[MAXREPLAYQUERY+1]; // The input typed +static textinput_t replayqueryinput; -size_t replayqueryfound = 0; // Number of checked replay entries -size_t replayquerycheck = 0; // Index of next replay entry to check in demolist_all +static size_t replayqueryfound = 0; // Number of checked replay entries +static size_t replayquerycheck = 0; // Index of next replay entry to check in demolist_all #define DF_ENCORE 0x40 static INT16 replayScrollTitle = 0; @@ -6704,8 +6732,8 @@ static void LoadReplayNames(void) static void ResetReplayQuery(void) { - memset(replayqueryinput, 0, MAXREPLAYQUERY); - replayquerypos = 0; + memset(replayqueryinput_buffer, 0, MAXREPLAYQUERY); + M_TextInputInit(&replayqueryinput, replayqueryinput_buffer, MAXREPLAYQUERY); replayqueryfound = 0; replayquerycheck = 0; @@ -6729,7 +6757,7 @@ static void M_HutCheckReplays(size_t maxnum) return; // If we don't have any query, just copy all demos and consider them checked - if (replayquerypos == 0) + if (replayqueryinput.length == 0) { // Mark as done replayqueryfound = replayquerycheck = sizedirmenu; @@ -6753,7 +6781,7 @@ static void M_HutCheckReplays(size_t maxnum) case MD_NOTLOADED: case MD_OUTDATED: case MD_LOADED: - if (demolist_all[replayquerycheck].title[0] && strcasestr(demolist_all[replayquerycheck].title, replayqueryinput) != NULL) + if (demolist_all[replayquerycheck].title[0] && strcasestr(demolist_all[replayquerycheck].title, replayqueryinput.buffer) != NULL) AddCheckedReplay(); // It matches, add it! else replayquerycheck++; // Doesn't match, moving on... @@ -6852,41 +6880,23 @@ void M_ReplayHut(INT32 choice) static boolean M_HandleReplayHutQuery(INT32 choice) { - switch (choice) + // Yea gonna copy buffer and check if it changed, thats better than checking for specific keys i think + char tmp[MAXREPLAYQUERY+1]; + memcpy(tmp, replayqueryinput_buffer, MAXREPLAYQUERY+1); + + if (M_TextInputHandle(&replayqueryinput, choice)) { - case KEY_BACKSPACE: - if (replayquerypos == 0) - break; - - S_StartSound(NULL,sfx_menu1); - - replayquerypos--; - replayqueryinput[replayquerypos] = 0; + S_StartSound(NULL,sfx_menu1); + // Restart search only if we actually modified input and not just moved in it + if (memcmp(tmp, replayqueryinput_buffer, MAXREPLAYQUERY+1)) + { preparefilemenu(false, true); dir_on[menudepthleft] = 0; PrepReplayList(false); + } - return true; - - default: - if (choice < 32 || choice > 127) - break; - - if (replayquerypos < MAXREPLAYQUERY) - { - S_StartSound(NULL,sfx_menu1); - - replayqueryinput[replayquerypos] = choice; - replayqueryinput[replayquerypos+1] = 0; - ++replayquerypos; - - preparefilemenu(false, true); - dir_on[menudepthleft] = 0; - PrepReplayList(false); - } - - return true; + return true; } return false; @@ -7317,15 +7327,11 @@ static void M_DrawReplayHut(void) // Draw search query M_DrawTextBoxFlags(x, 200 - 22, MAXREPLAYQUERY, 1, V_SNAPTOBOTTOM); - if (replayquerypos) - V_DrawString(x + 8, 200 - 14, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, replayqueryinput); + if (replayqueryinput.length) + M_DrawTextInput(x + 8, 200 - 14, &replayqueryinput, V_SNAPTOBOTTOM); else V_DrawString(x + 8, 200 - 14, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, "\x86Type to search..."); - // draw text cursor for name - if (replayquerypos && skullAnimCounter < 4) // blink cursor - V_DrawCharacter(x + 8 + V_StringWidth(replayqueryinput, V_ALLOWLOWERCASE), 200 - 14, '_'|V_SNAPTOBOTTOM, false); - if (replaynamesloaded && replayquerycheck < sizedirmenu) V_DrawString(x + 8, 200 - 30, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, va("Searching %u/%u...", (unsigned)replayquerycheck, (unsigned)sizedirmenu)); } @@ -8903,9 +8909,11 @@ void M_DrawTimeAttackMenu(void) if (currentMenu->menuitems[i].status & IT_CV_STRING) { M_DrawTextBox(x + 32, y - 8, MAXPLAYERNAME, 1); - V_DrawString(x + 40, y, V_ALLOWLOWERCASE, cv->string); - if (itemOn == i && skullAnimCounter < 4) // blink cursor - V_DrawCharacter(x + 40 + V_StringWidth(cv->string, V_ALLOWLOWERCASE), y, '_',false); + + if (itemOn != i) + V_DrawString(x + 40, y, V_ALLOWLOWERCASE, cv->string); + else + M_DrawTextInput(x + 40, y, &menuinput, 0); } else { @@ -10182,7 +10190,19 @@ static void M_StartServerMenu(INT32 choice) // ============== static char setupm_ip[28]; +static textinput_t setupm_input_ip; #endif + +void M_Multiplayer(INT32 choice) +{ + (void)choice; +#ifndef NONET + memset(setupm_ip, 0, 28); + M_TextInputInit(&setupm_input_ip, setupm_ip, 28); +#endif + M_SetupNextMenu(&MP_MainDef); +} + static UINT8 setupm_pselect = 1; // Draw the funky Connect IP menu. Tails 11-19-2002 @@ -10216,12 +10236,10 @@ Update the maxplayers label... V_DrawFill(x+5, y+4+5, /*16*8 + 6,*/ BASEVIDWIDTH - 2*(x+5), 8+6, 239); // draw name string - V_DrawString(x+8,y+12, V_ALLOWLOWERCASE, setupm_ip); - - // draw text cursor for name - if (itemOn == 9 - && skullAnimCounter < 4) //blink cursor - V_DrawCharacter(x+8+V_StringWidth(setupm_ip, V_ALLOWLOWERCASE),y+12,'_',false); + if (itemOn != 9) + V_DrawString(x+8,y+12, V_ALLOWLOWERCASE, setupm_ip); + else + M_DrawTextInput(x+8, y+12, &setupm_input_ip, 0); #endif // character bar, ripped off the color bar :V @@ -10409,7 +10427,6 @@ static void M_ConnectLastServer(INT32 choice) // Tails 11-19-2002 static void M_HandleConnectIP(INT32 choice) { - size_t l; boolean exitmenu = false; // exit to previous menu and send name change switch (choice) @@ -10434,41 +10451,21 @@ static void M_HandleConnectIP(INT32 choice) exitmenu = true; break; + case KEY_LEFTARROW: + case KEY_RIGHTARROW: case KEY_BACKSPACE: - if ((l = strlen(setupm_ip)) != 0) - { - S_StartSound(NULL,sfx_menu1); // Tails - setupm_ip[l-1] = 0; - } - break; - case KEY_DEL: - if (setupm_ip[0]) - { + if (M_TextInputHandle(&setupm_input_ip, choice)) S_StartSound(NULL,sfx_menu1); // Tails - setupm_ip[0] = 0; - } break; default: - l = strlen(setupm_ip); - if (l >= 28-1) - break; - // Rudimentary number and period enforcing - also allows letters so hostnames can be used instead - if ((choice >= '-' && choice <= ':') || (choice >= 'A' && choice <= 'Z') || (choice >= 'a' && choice <= 'z')) + if ((choice >= '-' && choice <= ':') || (choice >= 'A' && choice <= 'Z') || (choice >= 'a' && choice <= 'z') + || (choice >= 199 && choice <= 211 && choice != 202 && choice != 206)) //numpad too! { - S_StartSound(NULL,sfx_menu1); // Tails - setupm_ip[l] = (char)choice; - setupm_ip[l+1] = 0; - } - else if (choice >= 199 && choice <= 211 && choice != 202 && choice != 206) //numpad too! - { - char keypad_translation[] = {'7','8','9','-','4','5','6','+','1','2','3','0','.'}; - choice = keypad_translation[choice - 199]; - S_StartSound(NULL,sfx_menu1); // Tails - setupm_ip[l] = (char)choice; - setupm_ip[l+1] = 0; + if (M_TextInputHandle(&setupm_input_ip, choice)) + S_StartSound(NULL,sfx_menu1); // Tails } break; } @@ -10493,14 +10490,15 @@ static state_t *multi_state; // this is set before entering the MultiPlayer setup menu, // for either player 1 or 2 -static char setupm_name[MAXPLAYERNAME+1]; -static player_t *setupm_player; -static consvar_t *setupm_cvskin; -static consvar_t *setupm_cvcolor; -static consvar_t *setupm_cvname; -static UINT8 setupm_skinxpos; -static INT32 setupm_fakeskin; -static INT32 setupm_fakecolor; +static char setupm_name[MAXPLAYERNAME+1]; +static textinput_t setupm_input; +static player_t *setupm_player; +static consvar_t *setupm_cvskin; +static consvar_t *setupm_cvcolor; +static consvar_t *setupm_cvname; +static UINT8 setupm_skinxpos; +static INT32 setupm_fakeskin; +static INT32 setupm_fakecolor; //variables used for other skin select menus static UINT8 setupm_skinypos; @@ -10576,11 +10574,11 @@ static void M_DrawSetupMultiPlayerMenu(void) } M_DrawTextBox(mx + 32, my - 8 + nameboxaddy, MAXPLAYERNAME, 1); - V_DrawString(mx + 40, my + nameboxaddy, V_ALLOWLOWERCASE, setupm_name); - // draw text cursor for name - if (!itemOn && skullAnimCounter < 4) // blink cursor - V_DrawCharacter(mx + 40 + V_StringWidth(setupm_name, V_ALLOWLOWERCASE), my + nameboxaddy, '_', false); + if (itemOn != 0) + V_DrawString(mx + 40, my + nameboxaddy, V_ALLOWLOWERCASE, setupm_input.buffer); + else + M_DrawTextInput(mx + 40, my + nameboxaddy, &setupm_input, 0); // draw skin string st = V_StringWidth(skins[setupm_fakeskin].realname, 0); @@ -11179,7 +11177,6 @@ static void M_DrawSetupMultiPlayerMenu(void) // Handle 1P/2P MP Setup static void M_HandleSetupMultiPlayer(INT32 choice) { - size_t l; boolean exitmenu = false; // exit to previous menu and send name change if ((choice == gamecontrol[gc_fire][0] || choice == gamecontrol[gc_fire][1]) && itemOn == 2) @@ -11301,7 +11298,12 @@ static void M_HandleSetupMultiPlayer(INT32 choice) break; case KEY_LEFTARROW: - if (cv_skinselectmenu.value == SKINMENUTYPE_2D && itemOn == 1) + if (itemOn == 0) + { + M_TextInputHandle(&setupm_input, choice); + S_StartSound(NULL,sfx_menu1); // Tails + } + else if (cv_skinselectmenu.value == SKINMENUTYPE_2D && itemOn == 1) { if (setupm_skinlockedselect) { @@ -11355,7 +11357,12 @@ static void M_HandleSetupMultiPlayer(INT32 choice) break; case KEY_RIGHTARROW: - if (cv_skinselectmenu.value == SKINMENUTYPE_2D && itemOn == 1) + if (itemOn == 0) + { + M_TextInputHandle(&setupm_input, choice); + S_StartSound(NULL,sfx_menu1); // Tails + } + else if (cv_skinselectmenu.value == SKINMENUTYPE_2D && itemOn == 1) { if (setupm_skinlockedselect) { @@ -11386,7 +11393,7 @@ static void M_HandleSetupMultiPlayer(INT32 choice) } else if (cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED){ if (setupm_skinselect >= ((setupm_skinypos-1)+SKINGRIDHEIGHT)*8+24 && setupm_skinypos < (ROUNDSKINSUPTO8/8)-SKINGRIDHEIGHT+24) - setupm_skinypos++; + setupm_skinypos++; } } else @@ -11424,11 +11431,8 @@ static void M_HandleSetupMultiPlayer(INT32 choice) BREAKWHENLOCKED if (itemOn == 0) { - if ((l = strlen(setupm_name))!=0) - { - S_StartSound(NULL,sfx_menu1); // Tails - setupm_name[l-1] =0; - } + M_TextInputHandle(&setupm_input, choice); + S_StartSound(NULL,sfx_menu1); // Tails } else if ((cv_skinselectmenu.value == SKINMENUTYPE_GRID || cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED) && itemOn == 1) { @@ -11453,10 +11457,10 @@ static void M_HandleSetupMultiPlayer(INT32 choice) case KEY_DEL: if (cv_skinselectmenu.value) BREAKWHENLOCKED - if (itemOn == 0 && (l = strlen(setupm_name))!=0) + if (itemOn == 0) { + M_TextInputHandle(&setupm_input, choice); S_StartSound(NULL,sfx_menu1); // Tails - setupm_name[0] = 0; } break; @@ -11493,17 +11497,10 @@ static void M_HandleSetupMultiPlayer(INT32 choice) break; default: - if (choice < 32 || choice > 127) - break; if (itemOn == 0) { - l = strlen(setupm_name); - if (l < MAXPLAYERNAME) - { + if (M_TextInputHandle(&setupm_input, choice)) S_StartSound(NULL,sfx_menu1); // Tails - setupm_name[l] =(char)choice; - setupm_name[l+1] =0; - } } break; } @@ -11568,7 +11565,9 @@ static void M_SetupMultiPlayer(INT32 choice) multi_state = cv_skinselectspin.value == SKINSELECTSPIN_PAIN ? &states[S_KART_PAIN] : &states[mobjinfo[MT_PLAYER].seestate]; multi_tics = multi_state->tics*FRACUNIT; - strcpy(setupm_name, cv_playername.string); + + M_TextInputInit(&setupm_input, setupm_name, sizeof(setupm_name)); + M_TextInputSetString(&setupm_input, cv_playername.string); // set for player 1 setupm_player = &players[consoleplayer]; @@ -11610,7 +11609,9 @@ static void M_SetupMultiPlayer2(INT32 choice) multi_state = cv_skinselectspin.value == SKINSELECTSPIN_PAIN ? &states[S_KART_PAIN] : &states[mobjinfo[MT_PLAYER].seestate]; multi_tics = multi_state->tics*FRACUNIT; - strcpy (setupm_name, cv_playername2.string); + + M_TextInputInit(&setupm_input, setupm_name, sizeof(setupm_name)); + M_TextInputSetString(&setupm_input, cv_playername2.string); // set for splitscreen secondary player setupm_player = &players[displayplayers[1]]; @@ -11651,7 +11652,9 @@ static void M_SetupMultiPlayer3(INT32 choice) multi_state = cv_skinselectspin.value == SKINSELECTSPIN_PAIN ? &states[S_KART_PAIN] : &states[mobjinfo[MT_PLAYER].seestate]; multi_tics = multi_state->tics; - strcpy(setupm_name, cv_playername3.string); + + M_TextInputInit(&setupm_input, setupm_name, sizeof(setupm_name)); + M_TextInputSetString(&setupm_input, cv_playername3.string); // set for splitscreen third player setupm_player = &players[displayplayers[2]]; @@ -11692,7 +11695,9 @@ static void M_SetupMultiPlayer4(INT32 choice) multi_state = cv_skinselectspin.value == SKINSELECTSPIN_PAIN ? &states[S_KART_PAIN] : &states[mobjinfo[MT_PLAYER].seestate]; multi_tics = multi_state->tics; - strcpy(setupm_name, cv_playername4.string); + + M_TextInputInit(&setupm_input, setupm_name, sizeof(setupm_name)); + M_TextInputSetString(&setupm_input, cv_playername4.string); // set for splitscreen fourth player setupm_player = &players[displayplayers[3]]; @@ -12876,10 +12881,12 @@ static void M_DrawColorMenu(void) if (y + 12 > (currentMenu->y + 2*scrollareaheight)) break; M_DrawTextBox(x, y + 4, MAXSTRINGLENGTH, 1); - V_DrawString(x + 8, y + 12, V_ALLOWLOWERCASE, cv->string); - if (skullAnimCounter < 4 && i == itemOn) - V_DrawCharacter(x + 8 + V_StringWidth(cv->string, 0), y + 12, - '_' | 0x80, false); + + if (itemOn == i) + M_DrawTextInput(x + 8, y + 12, &menuinput, 0); + else + V_DrawString(x + 8, y + 12, V_ALLOWLOWERCASE, cv->string); + y += 16; break; default: diff --git a/src/m_menu.h b/src/m_menu.h index bd0cd0e69..486b5b869 100644 --- a/src/m_menu.h +++ b/src/m_menu.h @@ -64,6 +64,10 @@ void M_DrawTextBox(INT32 x, INT32 y, INT32 width, INT32 boxlines); // Same but with extra flags applied void M_DrawTextBoxFlags(INT32 x, INT32 y, INT32 width, INT32 boxlines, INT32 flags); +// Draw text input +typedef struct textinput_s textinput_t; +void M_DrawTextInput(INT32 x, INT32 y, textinput_t *input, INT32 flags); + // Used in d_netcmd to restart time attack void M_ModeAttackRetry(INT32 choice); diff --git a/src/m_misc.c b/src/m_misc.c index b8c88abb5..8bb82cdd7 100644 --- a/src/m_misc.c +++ b/src/m_misc.c @@ -1987,11 +1987,6 @@ char *sizeu5(size_t num) return sizeu5_buf; } -FUNCINLINE ATTRINLINE void *M_Memcpy(void *dest, const void *src, size_t n) -{ - return memcpy(dest, src, n); -} - /** Return the appropriate message for a file error or end of file. */ const char *M_FileError(FILE *fp) diff --git a/src/m_textinput.c b/src/m_textinput.c new file mode 100644 index 000000000..a73511f77 --- /dev/null +++ b/src/m_textinput.c @@ -0,0 +1,303 @@ +#include "m_textinput.h" +#include "i_system.h" +#include "keys.h" +#include "console.h" + +static void M_TextInputDel(textinput_t *input, size_t start, size_t end) +{ + size_t len; + + len = (end - start); + + if (end != input->length) + memmove(&input->buffer[start], &input->buffer[end], input->length-end); + memset(&input->buffer[input->length - len], 0, len); + + input->length -= len; + + if (input->select >= end) + input->select -= len; + else if (input->select > start) + input->select = start; + + if (input->cursor >= end) + input->cursor -= len; + else if (input->cursor > start) + input->cursor = start; +} + +static void M_TextInputDelSelection(textinput_t *input) +{ + size_t start, end; + + if (input->cursor > input->select) + { + start = input->select; + end = input->cursor; + } + else + { + start = input->cursor; + end = input->select; + } + + M_TextInputDel(input, start, end); + + input->select = input->cursor = start; +} + +static void M_TextInputAddString(textinput_t *input, const char *c) +{ + size_t csize = strlen(c); + + if (input->length + csize > input->buffer_size-1) + return; + + if (input->cursor != input->length) + memmove(&input->buffer[input->cursor+csize], &input->buffer[input->cursor], input->length-input->cursor); + memcpy(&input->buffer[input->cursor], c, csize); + input->length += csize; + input->select = (input->cursor += csize); + input->buffer[input->length] = 0; +} + +static void M_TextInputAddChar(textinput_t *input, char c) +{ + if (input->length >= input->buffer_size-1) + return; + + if (input->cursor != input->length) + memmove(&input->buffer[input->cursor+1], &input->buffer[input->cursor], input->length-input->cursor); + input->buffer[input->cursor++] = c; + input->buffer[++input->length] = 0; + input->select = input->cursor; +} + +static void M_TextInputDelChar(textinput_t *input) +{ + if (!input->cursor) + return; + + if (input->cursor != input->length) + memmove(&input->buffer[input->cursor-1], &input->buffer[input->cursor], input->length-input->cursor); + input->buffer[--input->length] = 0; + input->select = --input->cursor; +} + +static void M_TextInputToWordEnd(textinput_t *input, boolean move_sel) +{ + // Skip spaces + while (input->cursor < input->length && isspace(input->buffer[input->cursor])) + ++input->cursor; + + // Skip word + while (input->cursor < input->length && !isspace(input->buffer[input->cursor])) + ++input->cursor; + + if (move_sel) input->select = input->cursor; +} + +static void M_TextInputToWordBegin(textinput_t *input, boolean move_sel) +{ + // Hack, always move back 1 character if possible so if we press ctrl-left at a word beginning + // we move to previous word + if (input->cursor) --input->cursor; + + // Skip spaces + while (input->cursor && isspace(input->buffer[input->cursor])) + --input->cursor; + + // Skip word + while (input->cursor && !isspace(input->buffer[input->cursor])) + --input->cursor; + + // Unless we reached beginning of line, we're pointing at a space before word, so move cursor + // forward to fix that + if (input->cursor) ++input->cursor; + + if (move_sel) input->select = input->cursor; +} + +void M_TextInputInit(textinput_t *input, char *buffer, size_t buffer_size) +{ + input->buffer = buffer; + input->buffer_size = buffer_size; + + M_TextInputClear(input); +} + +void M_TextInputClear(textinput_t *input) +{ + input->cursor = 0; + input->select = 0; + input->length = 0; +} + +void M_TextInputSetString(textinput_t *input, const char *c) +{ + memset(input->buffer, 0, input->buffer_size); + strcpy(input->buffer, c); + input->cursor = input->select = input->length = strlen(c); +} + +boolean M_TextInputHandle(textinput_t *input, INT32 key) +{ + if (key == KEY_LSHIFT || key == KEY_RSHIFT + || key == KEY_LCTRL || key == KEY_RCTRL + || key == KEY_LALT || key == KEY_RALT) + return false; + + if ((cv_keyboardlayout.value != 3 && ctrldown) || (cv_keyboardlayout.value == 3 && ctrldown && !altdown)) + { + if (key == 'x' || key == 'X') + { + if (input->select > input->cursor) + I_ClipboardCopy(&input->buffer[input->cursor], input->select-input->cursor); + else + I_ClipboardCopy(&input->buffer[input->select], input->cursor-input->select); + M_TextInputDelSelection(input); + return true; + } + else if (key == 'c' || key == 'C') + { + if (input->select > input->cursor) + I_ClipboardCopy(&input->buffer[input->cursor], input->select-input->cursor); + else + I_ClipboardCopy(&input->buffer[input->select], input->cursor-input->select); + return true; + } + else if (key == 'v' || key == 'V') + { + const char *paste = I_ClipboardPaste(); + if (input->select != input->cursor) + M_TextInputDelSelection(input); + if (paste != NULL) + M_TextInputAddString(input, paste); + return true; + } + else if (key == 'w' || key == 'W') + { + size_t word_start, word_end, i; + word_end = i = input->cursor; + + // Unless we're pointing at the beginning of line, decrement i so we only start + // removing symbols that come before the cursor + if (i) --i; + + // We might be pointing to spaces, skip them first + while (i && isspace(input->buffer[i])) + --i; + + // Now skip the "word" + while (i && !isspace(input->buffer[i])) + --i; + + // Unless we reached beginning of line, i is pointing at first space that was found + // before word start, and we don't want to remove it + if (i) ++i; + + word_start = i; + + if (word_start != word_end) + M_TextInputDel(input, word_start, word_end); + + return true; + } + else if (key == KEY_RIGHTARROW) + M_TextInputToWordEnd(input, !shiftdown); + else if (key == KEY_LEFTARROW) + M_TextInputToWordBegin(input, !shiftdown); + + // Select all + if (key == 'a' || key == 'A') + { + input->select = 0; + input->cursor = input->length; + return true; + } + + // ...why shouldn't it eat the key? if it doesn't, it just means you + // can control Sonic from the console, which is silly + return true; + } + + if (key == KEY_LEFTARROW) + { + if (input->cursor != 0) + --input->cursor; + if (!shiftdown) + input->select = input->cursor; + return true; + } + else if (key == KEY_RIGHTARROW) + { + if (input->cursor < input->length) + ++input->cursor; + if (!shiftdown) + input->select = input->cursor; + return true; + } + else if (key == KEY_HOME) + { + input->cursor = 0; + if (!shiftdown) + input->select = input->cursor; + return true; + } + else if (key == KEY_END) + { + input->cursor = input->length; + if (!shiftdown) + input->select = input->cursor; + return true; + } + + // backspace and delete command prompt + if (input->select != input->cursor) + { + if (key == KEY_BACKSPACE || key == KEY_DEL) + { + M_TextInputDelSelection(input); + return true; + } + } + else if (key == KEY_BACKSPACE) + { + M_TextInputDelChar(input); + return true; + } + else if (key == KEY_DEL) + { + if (input->cursor == input->length) + return true; + ++input->cursor; + M_TextInputDelChar(input); + return true; + } + + // allow people to use keypad in console (good for typing IP addresses) - Calum + if (key >= KEY_KEYPAD7 && key <= KEY_KPADDEL) + { + char keypad_translation[] = {'7','8','9','-', + '4','5','6','+', + '1','2','3', + '0','.'}; + + key = keypad_translation[key - KEY_KEYPAD7]; + } + else if (key == KEY_KPADSLASH) + key = '/'; + + // same capslock code as hu_stuff.c's HU_responder. Check there for details. + key = cv_keyboardlayout.value == 3 ? CON_ShitAndAltGrChar(key) : CON_ShiftChar(key); + + // enter a char into the command prompt + if (key < 32 || key > 127) + return false; + + if (input->select != input->cursor) + M_TextInputDelSelection(input); + M_TextInputAddChar(input, key); + + return true; +} diff --git a/src/m_textinput.h b/src/m_textinput.h new file mode 100644 index 000000000..aad5e94ab --- /dev/null +++ b/src/m_textinput.h @@ -0,0 +1,23 @@ +#ifndef __M_TEXTINPUT__ +#define __M_TEXTINPUT__ + +#include "doomtype.h" + +typedef struct textinput_s { + size_t cursor; + size_t select; + size_t length; + + char *buffer; + size_t buffer_size; +} textinput_t; + +void M_TextInputInit(textinput_t *input, char *buffer, size_t buffer_size); + +void M_TextInputClear(textinput_t *input); + +void M_TextInputSetString(textinput_t *input, const char *c); + +boolean M_TextInputHandle(textinput_t *input, INT32 key); + +#endif diff --git a/src/p_local.h b/src/p_local.h index ab078e8b5..0902c8b3d 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -249,7 +249,7 @@ void P_RecalcPrecipInSector(sector_t *sector); void P_PrecipitationEffects(void); void P_RemoveMobj(mobj_t *th); -boolean P_MobjWasRemoved(const mobj_t *th); + void P_RemoveSavegameMobj(mobj_t *th); boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state); boolean P_SetMobjState(mobj_t *mobj, statenum_t state); @@ -261,6 +261,12 @@ boolean P_RailThinker(mobj_t *mobj); void P_PushableThinker(mobj_t *mobj); void P_SceneryThinker(mobj_t *mobj); +// This does not need to be added to Lua. +// To test it in Lua, check mobj.valid +FUNCINLINE static ATTRINLINE boolean P_MobjWasRemoved(const mobj_t *mobj) +{ + return !(mobj && mobj->thinker.function.acp1 == (actionf_p1)P_MobjThinker); +} fixed_t P_MobjFloorZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t x, fixed_t y, line_t *line, boolean lowest, boolean perfect); fixed_t P_MobjCeilingZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t x, fixed_t y, line_t *line, boolean lowest, boolean perfect); diff --git a/src/p_mobj.c b/src/p_mobj.c index fb5a0fd0a..0fc870045 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -10140,13 +10140,6 @@ void P_RemoveMobj(mobj_t *mobj) } } -// This does not need to be added to Lua. -// To test it in Lua, check mobj.valid -FUNCINLINE ATTRINLINE boolean P_MobjWasRemoved(const mobj_t *mobj) -{ - return !(mobj && mobj->thinker.function.acp1 == (actionf_p1)P_MobjThinker); -} - void P_FreePrecipMobj(precipmobj_t *mobj) { // unlink from sector and block lists diff --git a/src/p_spec.c b/src/p_spec.c index 2a4e13d55..81d5ad8b4 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -2179,9 +2179,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) mapmusflags |= MUSIC_FORCERESET; mapmusposition = position; - - if (cv_birdmusic.value) - mapmusresume = 0; + mapmusresume = 0; S_ChangeMusicEx(mapmusname, mapmusflags, !(line->flags & ML_EFFECT4), position, !(line->flags & ML_EFFECT2) ? prefadems : 0, diff --git a/src/p_user.c b/src/p_user.c index a9b1b6b72..4cdbd2ae5 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -800,19 +800,13 @@ void P_RestoreMusic(player_t *player) if (G_RaceGametype() && player->laps >= (UINT8)(cv_numlaps.value - 1)) S_SpeedMusic(1.2f); #endif - if (cv_birdmusic.value) - { - if (mapmusresume && cv_resume.value) - position = mapmusresume; - else - position = mapmusposition; - - S_ChangeMusicEx(mapmusname, mapmusflags, true, position, 0, S_GetRestoreMusicFadeIn()); - S_ClearRestoreMusicFadeInCvar(); - } + if (mapmusresume && cv_resume.value) // mapmusresume will be 0 anyways when birdmusic stuff is disabled + position = mapmusresume; else - S_ChangeMusicEx(mapmusname, mapmusflags, true, mapmusposition, 0, 0); + position = mapmusposition; + S_ChangeMusicEx(mapmusname, mapmusflags, true, position, 0, S_GetRestoreMusicFadeIn()); + S_ClearRestoreMusicFadeInCvar(); mapmusresume = 0; } } diff --git a/src/r_main.c b/src/r_main.c index f61753a19..618899c72 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -1359,7 +1359,28 @@ void R_SkyboxFrame(player_t *player) // newview->sin = FINESINE(viewangle>>ANGLETOFINESHIFT); // newview->cos = FINECOSINE(viewangle>>ANGLETOFINESHIFT); - R_InterpolateView(R_UsingFrameInterpolation() ? rendertimefrac_unpaused : FRACUNIT, false); + R_InterpolateView(R_UsingFrameInterpolation() ? demo.playback ? rendertimefrac_unpaused : rendertimefrac : FRACUNIT, false); +} + +static void +R_SetupCommonFrame +( player_t * player, + subsector_t * subsector) +{ + newview->player = player; + + newview->x += quake.x; + newview->y += quake.y; + newview->z += quake.z; + + newview->roll = R_ViewRollAngle(player); + + if (subsector) + newview->sector = subsector->sector; + else + newview->sector = R_PointInSubsector(newview->x, newview->y)->sector; + + R_InterpolateView(R_UsingFrameInterpolation() ? demo.playback ? rendertimefrac_unpaused : rendertimefrac : FRACUNIT, false); } void R_SetupFrame(player_t *player, boolean skybox) @@ -1393,7 +1414,6 @@ void R_SetupFrame(player_t *player, boolean skybox) { SETUPCAM(0, cv_chasecam, VIEWCONTEXT_PLAYER1) } - #undef SETUPCAM if (player->spectator) // no spectator chasecam @@ -1410,25 +1430,20 @@ void R_SetupFrame(player_t *player, boolean skybox) thiscam->chase = false; newview->sky = !skybox; - if (player->awayviewtics) + + if (player->awayviewtics) // cut-away view stuff { - // cut-away view stuff viewmobj = player->awayviewmobj; // should be a MT_ALTVIEWMAN I_Assert(viewmobj != NULL); newview->x = viewmobj->x; newview->y = viewmobj->y; newview->z = viewmobj->z + 20*FRACUNIT; + newview->aim = player->awayviewaiming; newview->angle = viewmobj->angle; - newview->x += quake.x; - newview->y += quake.y; - - if (!P_MobjWasRemoved(viewmobj) && viewmobj->subsector && thiscam && thiscam->subsector->sector) - newview->sector = viewmobj->subsector->sector; - else - newview->sector = R_PointInSubsector(newview->x, newview->y)->sector; + R_SetupCommonFrame(player, viewmobj->subsector); } else if (!player->spectator && (thiscam && chasecam)) // use outside cam view { @@ -1437,24 +1452,21 @@ void R_SetupFrame(player_t *player, boolean skybox) newview->x = thiscam->x; newview->y = thiscam->y; newview->z = thiscam->z + (thiscam->height>>1); + newview->aim = thiscam->aiming; newview->angle = thiscam->angle; - newview->x += quake.x; - newview->y += quake.y; - - if (thiscam->subsector && thiscam->subsector->sector) - newview->sector = thiscam->subsector->sector; - else - newview->sector = R_PointInSubsector(newview->x, newview->y)->sector; + R_SetupCommonFrame(player, thiscam->subsector); } else // use the player's eyes view { - newview->z = player->viewz; - viewmobj = player->mo; I_Assert(viewmobj != NULL); + newview->x = viewmobj->x; + newview->y = viewmobj->y; + newview->z = player->viewz; + newview->aim = player->aiming; newview->angle = viewmobj->angle; @@ -1479,14 +1491,9 @@ void R_SetupFrame(player_t *player, boolean skybox) } } } + + R_SetupCommonFrame(player, viewmobj->subsector); } - - newview->roll = R_ViewRollAngle(player); - newview->z += quake.z; - - newview->player = player; - - R_InterpolateView(R_UsingFrameInterpolation() ? rendertimefrac_unpaused : FRACUNIT, false); } #define ANGLED_PORTALS diff --git a/src/s_sound.c b/src/s_sound.c index ec5ebf00d..f8db2b296 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -107,6 +107,7 @@ static CV_PossibleValue_t music_resync_threshold_cons_t[] = { {0} }; consvar_t cv_music_resync_threshold = {"music_resync_threshold", "0", CV_SAVE|CV_CALL, music_resync_threshold_cons_t, I_UpdateSongLagThreshold, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_music_resync_powerups_only = {"music_resync_powerups_only", "No", CV_SAVE|CV_CALL, CV_YesNo, I_UpdateSongLagThreshold, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_invincmusicfade = {"invincmusicfade", "300", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_growmusicfade = {"growmusicfade", "500", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -275,13 +276,14 @@ void S_RegisterSoundStuff(void) CV_RegisterVar(&cv_gamemidimusic); #endif - //bird music stuff + // bird music stuff CV_RegisterVar(&cv_playmusicifunfocused); CV_RegisterVar(&cv_playsoundifunfocused); CV_RegisterVar(&cv_pausemusic); CV_RegisterVar(&cv_music_resync_threshold); - + CV_RegisterVar(&cv_music_resync_powerups_only); + CV_RegisterVar(&cv_invincmusicfade); CV_RegisterVar(&cv_growmusicfade); @@ -293,6 +295,7 @@ void S_RegisterSoundStuff(void) CV_RegisterVar(&cv_resume); CV_RegisterVar(&cv_fading); CV_RegisterVar(&cv_birdmusic); + // bird music stuff end COM_AddCommand("tunes", Command_Tunes_f); COM_AddCommand("restartaudio", Command_RestartAudio_f); @@ -1242,7 +1245,7 @@ void S_InitSfxChannels(INT32 sfxVolume) if (S_PrecacheSound()) { // Initialize external data (all sounds) at start, keep static. - CONS_Printf(M_GetText("Loading sounds... ")); + CONS_Printf(M_GetText("Pre-caching sounds...")); for (i = 1; i < sfx_freeslot0; i++) if (S_sfx[i].name && !S_sfx[i].data) @@ -1252,7 +1255,7 @@ void S_InitSfxChannels(INT32 sfxVolume) if (S_sfx[i].priority && !S_sfx[i].data) S_sfx[i].data = I_GetSfx(&S_sfx[i]); - CONS_Printf(M_GetText(" pre-cached all sound data\n")); + CONS_Printf(M_GetText("...pre-cached all sound data\n")); } } @@ -1768,9 +1771,7 @@ boolean S_MusicPaused(void) boolean S_MusicNotInFocus(void) { - return ( - ( window_notinfocus && ! cv_playmusicifunfocused.value ) - ); + return (window_notinfocus && !cv_playmusicifunfocused.value); } musictype_t S_MusicType(void) @@ -1798,10 +1799,8 @@ boolean S_MusicInfo(char *mname, UINT16 *mflags, boolean *looping) boolean S_MusicExists(const char *mname, boolean checkMIDI, boolean checkDigi) { - return ( - (checkDigi ? W_CheckNumForName(va("O_%s", mname)) != LUMPERROR : false) - || (checkMIDI ? W_CheckNumForName(va("D_%s", mname)) != LUMPERROR : false) - ); + return (checkDigi ? W_CheckNumForName(va("O_%s", mname)) != LUMPERROR : false) + || (checkMIDI ? W_CheckNumForName(va("D_%s", mname)) != LUMPERROR : false); } /// ------------------------ @@ -2034,8 +2033,10 @@ void S_StopMusic(void) || demo.title) // SRB2Kart: Demos don't interrupt title screen music return; - if ((cv_birdmusic.value) && (strcasecmp(music_name, mapmusname) == 0)) + if (cv_birdmusic.value && (strcasecmp(music_name, mapmusname) == 0)) mapmusresume = I_GetSongPosition(); + else + mapmusresume = 0; if (I_SongPaused()) I_ResumeSong(); @@ -2108,10 +2109,7 @@ void S_SetMusicVolume(INT32 digvolume, INT32 seqvolume) void S_SetRestoreMusicFadeInCvar (consvar_t *cv) { - if (!cv_birdmusic.value) - return; - - music_refade_cv = cv; + music_refade_cv = cv_birdmusic.value ? cv : 0; } int S_GetRestoreMusicFadeIn (void) @@ -2370,7 +2368,7 @@ static void GameDigiMusic_OnChange(void) digital_disabled = false; I_StartupSound(); // will return early if initialised I_InitMusic(); - + if (Playing()) P_RestoreMusic(&players[consoleplayer]); else @@ -2407,14 +2405,12 @@ static void ModFilter_OnChange(void) { if (openmpt_mhandle) openmpt_module_set_render_param(openmpt_mhandle, OPENMPT_MODULE_RENDER_INTERPOLATIONFILTER_LENGTH, cv_modfilter.value); - } static void StereoSep_OnChange(void) { if (openmpt_mhandle) openmpt_module_set_render_param(openmpt_mhandle, OPENMPT_MODULE_RENDER_STEREOSEPARATION_PERCENT, cv_stereosep.value); - } static void AmigaFilter_OnChange(void) diff --git a/src/s_sound.h b/src/s_sound.h index 6f4d03f09..899d0e043 100644 --- a/src/s_sound.h +++ b/src/s_sound.h @@ -54,6 +54,7 @@ extern consvar_t cv_amigatype; //bird music stuff extern consvar_t cv_music_resync_threshold; +extern consvar_t cv_music_resync_powerups_only; extern consvar_t cv_invincmusicfade; extern consvar_t cv_growmusicfade; diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c index 444fbb370..f999d8684 100644 --- a/src/sdl/i_system.c +++ b/src/sdl/i_system.c @@ -111,6 +111,7 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T); #endif #if defined (__unix__) || (defined (UNIXCOMMON) && !defined (__APPLE__)) +#include #include #include #define NEWSIGNALHANDLER @@ -544,10 +545,9 @@ typedef struct feild_t tty_con; -// when printing general stuff to stdout stderr (Sys_Printf) -// we need to disable the tty console stuff -// this increments so we can recursively disable -static INT32 ttycon_hide = 0; +// lock to prevent clearing partial lines, since not everything +// printed ends on a newline. +static boolean ttycon_ateol = true; // some key codes that the terminal may be using // TTimo NOTE: I'm not sure how relevant this is static INT32 tty_erase; @@ -575,63 +575,31 @@ static inline void tty_FlushIn(void) // TTimo NOTE: it seems on some terminals just sending '\b' is not enough // so for now, in any case we send "\b \b" .. yeah well .. // (there may be a way to find out if '\b' alone would work though) +// Hanicef NOTE: using \b this way is unreliable because of terminal state, +// it's better to use \r to reset the cursor to the beginning of the +// line and clear from there. static void tty_Back(void) { - char key; - ssize_t d; - key = '\b'; - d = write(STDOUT_FILENO, &key, 1); - key = ' '; - d = write(STDOUT_FILENO, &key, 1); - key = '\b'; - d = write(STDOUT_FILENO, &key, 1); - (void)d; + write(STDOUT_FILENO, "\r", 1); + if (tty_con.cursor>0) + { + write(STDOUT_FILENO, tty_con.buffer, tty_con.cursor); + } + write(STDOUT_FILENO, " \b", 2); } static void tty_Clear(void) { size_t i; + write(STDOUT_FILENO, "\r", 1); if (tty_con.cursor>0) { for (i=0; i0); - ttycon_hide--; - if (ttycon_hide == 0 && tty_con.cursor) - { - for (i=0; i 0) + ev.type = ev_console; + ev.data1 = 0; + if (read(STDIN_FILENO, &key, 1) == -1 || !key) + return; + + // we have something + // backspace? + // NOTE TTimo testing a lot of values .. seems it's the only way to get it to work everywhere + if ((key == tty_erase) || (key == 127) || (key == 8)) { - tty_con.cursor--; - tty_con.buffer[tty_con.cursor] = '\0'; - tty_Back(); + if (tty_con.cursor > 0) + { + tty_con.cursor--; + tty_con.buffer[tty_con.cursor] = '\0'; + tty_Back(); + } + ev.data1 = KEY_BACKSPACE; } - ev.data1 = KEY_BACKSPACE; - } - else if (key < ' ') // check if this is a control char - { - if (key == '\n') + else if (key < ' ') // check if this is a control char { - tty_Clear(); - tty_con.cursor = 0; - ev.data1 = KEY_ENTER; + if (key == '\n') + { + tty_Clear(); + tty_con.cursor = 0; + ev.data1 = KEY_ENTER; + } + else if (key == 0x4) // ^D, aka EOF + { + // shut down, most unix programs behave this way + I_Quit(); + } + else continue; } - else return; + else if (tty_con.cursor < sizeof(tty_con.buffer)) + { + // push regular character + ev.data1 = tty_con.buffer[tty_con.cursor] = key; + tty_con.cursor++; + // print the current line (this is differential) + write(STDOUT_FILENO, &key, 1); + } + if (ev.data1) D_PostEvent(&ev); + //tty_FlushIn(); } - else if (tty_con.cursor < sizeof (tty_con.buffer)) - { - // push regular character - ev.data1 = tty_con.buffer[tty_con.cursor] = key; - tty_con.cursor++; - // print the current line (this is differential) - d = write(STDOUT_FILENO, &key, 1); - } - if (ev.data1) D_PostEvent(&ev); - //tty_FlushIn(); - (void)d; } #elif defined (_WIN32) @@ -937,9 +920,16 @@ static void I_RegisterChildSignals(void) void I_OutputMsg(const char *fmt, ...) { size_t len; - char txt[8192]; + char *txt; va_list argptr; + va_start(argptr,fmt); + len = vsnprintf(NULL, 0, fmt, argptr); + va_end(argptr); + if (len == 0) + return; + + txt = malloc(len+1); va_start(argptr,fmt); vsprintf(txt, fmt, argptr); va_end(argptr); @@ -973,7 +963,10 @@ void I_OutputMsg(const char *fmt, ...) DWORD bytesWritten; if (co == INVALID_HANDLE_VALUE) + { + free(txt); return; + } if (GetFileType(co) == FILE_TYPE_CHAR && GetConsoleMode(co, &bytesWritten)) { @@ -989,11 +982,16 @@ void I_OutputMsg(const char *fmt, ...) if (oldLength > 0) { LPVOID blank = malloc(oldLength); - if (!blank) return; + if (!blank) + { + free(txt); + return; + } memset(blank, ' ', oldLength); // Blank out. oldLines = malloc(oldLength*sizeof(TCHAR)); if (!oldLines) { + free(txt); free(blank); return; } @@ -1028,18 +1026,20 @@ void I_OutputMsg(const char *fmt, ...) } #else #ifdef HAVE_TERMIOS - if (consolevent) + if (consolevent && ttycon_ateol) { - tty_Hide(); + tty_Clear(); + ttycon_ateol = false; } #endif if (!framebuffer) fprintf(stderr, "%s", txt); #ifdef HAVE_TERMIOS - if (consolevent) + if (consolevent && txt[len-1] == '\n') { - tty_Show(); + write(STDOUT_FILENO, tty_con.buffer, tty_con.cursor); + ttycon_ateol = true; } #endif @@ -1048,6 +1048,7 @@ void I_OutputMsg(const char *fmt, ...) fflush(stderr); #endif + free(txt); } // @@ -2668,6 +2669,7 @@ void I_GamepadRumble(INT32 device_id, UINT16 low_strength, UINT16 high_strength, (void)device_id; (void)low_strength; (void)high_strength; + (void)duration; #else I_Assert(device_id > 0); // Gamepad devices are always ID 1 or higher @@ -2685,6 +2687,9 @@ void I_SetGamepadIndicatorColor(INT32 device_id, UINT8 red, UINT8 green, UINT8 b { #if !(SDL_VERSION_ATLEAST(2,0,14)) (void)device_id; + (void)red; + (void)green; + (void)blue; #else I_Assert(device_id > 0); // Gamepad devices are always ID 1 or higher diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c index 12abb7c65..20cd3107c 100644 --- a/src/sdl/mixer_sound.c +++ b/src/sdl/mixer_sound.c @@ -93,6 +93,7 @@ static UINT16 SAMPLERATE = 44100; /// ------------------------ UINT8 sound_started = false; + static UINT32 stutter_threshold; static Mix_Music *music; @@ -592,6 +593,9 @@ Countstutter (int len) { UINT32 bytes; + if (!cv_birdmusic.value || gamestate != GS_LEVEL) + return; + if (hu_stopped) { music_stutter_bytes += len; @@ -627,8 +631,7 @@ static void count_music_bytes(int chan, void *stream, int len, void *udata) music_bytes += len; - if (cv_birdmusic.value && gamestate == GS_LEVEL) - Countstutter(len); + Countstutter(len); } static void music_loop(void) @@ -1041,12 +1044,9 @@ UINT32 I_GetSongPosition(void) // 8M: 1 | 8S: 2 | 16M: 2 | 16S: 4 } -void I_UpdateSongLagThreshold (void) +void I_UpdateSongLagThreshold(void) { - if (!cv_birdmusic.value) - return; - - stutter_threshold = cv_music_resync_threshold.value/1000.0*(4*44100); + stutter_threshold = cv_music_resync_powerups_only.value ? 0 : (cv_music_resync_threshold.value/1000.0*(4*44100)); } /// ------------------------ diff --git a/src/st_stuff.c b/src/st_stuff.c index aa5e07ed6..dd6bd5f6b 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -808,25 +808,82 @@ static void ST_overlayDrawer(void) } } -void ST_DrawDemoTitleEntry(void) +static void ST_DrawTextInput(INT32 x, INT32 y, textinput_t *input, INT32 flags) { static UINT8 skullAnimCounter = 0; - char *nametodraw; + static const INT32 MAXINPUTWIDTH = (MAXSTRINGLENGTH-1)*8; - skullAnimCounter++; + if (renderisnewtic) + skullAnimCounter++; skullAnimCounter %= 8; - nametodraw = demo.titlename; - while (V_StringWidth(nametodraw, 0) > MAXSTRINGLENGTH*8 - 8) - nametodraw++; + char nametodraw[MAXSTRINGLENGTH*2+1] = {0}; + size_t drawstart = 0; + size_t drawend = 0; // Only used for selection + + INT32 skullx = x; + + while (V_SubStringWidth(input->buffer+drawstart, input->cursor-drawstart, V_ALLOWLOWERCASE) > MAXINPUTWIDTH) + ++drawstart; + + size_t drawlength = V_SubStringLengthToFit(input->buffer+drawstart, MAXINPUTWIDTH+8, V_ALLOWLOWERCASE)+1; + drawend = drawstart + drawlength; + + memcpy(nametodraw, input->buffer+drawstart, drawlength); + + if (input->length) + skullx += V_SubStringWidth(nametodraw, input->cursor-drawstart, V_ALLOWLOWERCASE); + + V_DrawString(x, y, V_ALLOWLOWERCASE|flags, nametodraw); + + // draw text cursor for name + if (skullAnimCounter < 4) // blink cursor + V_DrawCharacter(skullx, y+3, '_'|flags, false); + + // draw selection + if (input->select != input->cursor) + { + size_t start = min(input->select, input->cursor); + size_t end = max(input->select, input->cursor); + + INT32 startx = 0; + INT32 width = 0; + + // I couldn't figure out one formula so here's bunch of separate cases + if (start < drawstart && end > drawend) // Selection covers whole visible portion of demo name + { + startx = -2; + width = V_StringWidth(nametodraw, V_ALLOWLOWERCASE)+4; + } + else if (start < drawstart) // Only left side of selection is off visible part + { + startx = -2; + size_t len = (end - start) - (drawstart - start); + width = V_SubStringWidth(nametodraw, len, V_ALLOWLOWERCASE)+2; + } + else if (end > drawend) // Only right side of selection is off visible part + { + startx = V_SubStringWidth(nametodraw, start-drawstart, V_ALLOWLOWERCASE); + width = V_StringWidth(nametodraw+(start-drawstart), V_ALLOWLOWERCASE)+2; + } + else // All selection is on visible part + { + startx = V_SubStringWidth(nametodraw, start-drawstart, V_ALLOWLOWERCASE); + width = V_SubStringWidth(nametodraw+(start-drawstart), end-start, V_ALLOWLOWERCASE); + } + + V_DrawFill(x+startx, y, width, 8, 103|V_TRANSLUCENT|flags); + } +} + +void ST_DrawDemoTitleEntry(void) +{ #define x (BASEVIDWIDTH/2 - 139) #define y (BASEVIDHEIGHT/2) M_DrawTextBox(x, y + 4, MAXSTRINGLENGTH, 1); - V_DrawString(x + 8, y + 12, V_ALLOWLOWERCASE, nametodraw); - if (skullAnimCounter < 4) - V_DrawCharacter(x + 8 + V_StringWidth(nametodraw, 0), y + 12, - '_' | 0x80, false); + + ST_DrawTextInput(x + 8, y + 12, &demo.titlenameinput, 0); M_DrawTextBox(x + 30, y - 24, 26, 1); V_DrawString(x + 38, y - 16, V_ALLOWLOWERCASE, "Enter the name of the replay."); diff --git a/src/v_video.c b/src/v_video.c index ee9cfa5f9..fb5fb7a90 100644 --- a/src/v_video.c +++ b/src/v_video.c @@ -2843,11 +2843,14 @@ INT32 V_LevelNameHeight(const char *string) // // Find string width from hu_font chars // -INT32 V_StringWidth(const char *string, INT32 option) +INT32 V_SubStringWidth(const char *string, INT32 length, INT32 option) { INT32 c, w = 0; INT32 spacewidth = 4, charwidth = 0; - size_t i; + ssize_t i; + + if (length < 0) + length = strlen(string); switch (option & V_SPACINGMASK) { @@ -2863,7 +2866,7 @@ INT32 V_StringWidth(const char *string, INT32 option) break; } - for (i = 0; i < strlen(string); i++) + for (i = 0; string[i] && i < length; i++) { c = string[i]; if ((UINT8)c >= 0x80 && (UINT8)c <= 0x8F) //color parsing! -Inuyasha 2.16.09 @@ -2882,11 +2885,14 @@ INT32 V_StringWidth(const char *string, INT32 option) // // Find string width from hu_font chars, 0.5x scale // -INT32 V_SmallStringWidth(const char *string, INT32 option) +INT32 V_SmallSubStringWidth(const char *string, INT32 length, INT32 option) { INT32 c, w = 0; INT32 spacewidth = 2, charwidth = 0; - size_t i; + ssize_t i; + + if (length < 0) + length = strlen(string); switch (option & V_SPACINGMASK) { @@ -2902,7 +2908,7 @@ INT32 V_SmallStringWidth(const char *string, INT32 option) break; } - for (i = 0; i < strlen(string); i++) + for (i = 0; string[i] && i < length; i++) { c = string[i]; if ((UINT8)c >= 0x80 && (UINT8)c <= 0x8F) //color parsing! -Inuyasha 2.16.09 @@ -2921,12 +2927,15 @@ INT32 V_SmallStringWidth(const char *string, INT32 option) // // Find string width from tny_font chars // -INT32 V_ThinStringWidth(const char *string, INT32 option) +INT32 V_ThinSubStringWidth(const char *string, INT32 length, INT32 option) { INT32 c, w = 0; INT32 spacewidth = 2, charwidth = 0; boolean lowercase = (option & V_ALLOWLOWERCASE); - size_t i; + ssize_t i; + + if (length < 0) + length = strlen(string); switch (option & V_SPACINGMASK) { @@ -2943,7 +2952,7 @@ INT32 V_ThinStringWidth(const char *string, INT32 option) break; } - for (i = 0; i < strlen(string); i++) + for (i = 0; string[i] && i < length; i++) { c = string[i]; if ((UINT8)c >= 0x80 && (UINT8)c <= 0x8F) //color parsing! -Inuyasha 2.16.09 @@ -2961,7 +2970,7 @@ INT32 V_ThinStringWidth(const char *string, INT32 option) else { w += (charwidth ? charwidth - : ((option & V_6WIDTHSPACE && i < strlen(string)-1) ? max(1, SHORT(tny_font[c]->width)-1) // Reuse this flag for the alternate bunched-up spacing + : ((option & V_6WIDTHSPACE && i < length-1) ? max(1, SHORT(tny_font[c]->width)-1) // Reuse this flag for the alternate bunched-up spacing : SHORT(tny_font[c]->width))); } } @@ -2970,6 +2979,45 @@ INT32 V_ThinStringWidth(const char *string, INT32 option) return w; } +// +// Find maximum length for substring taken from current string to fit into given width +// +INT32 V_SubStringLengthToFit(const char *string, INT32 width, INT32 option) +{ + INT32 c, w = 0; + INT32 spacewidth = 4, charwidth = 0; + INT32 i; + + switch (option & V_SPACINGMASK) + { + case V_MONOSPACE: + spacewidth = 8; + /* FALLTHRU */ + case V_OLDSPACING: + charwidth = 8; + break; + case V_6WIDTHSPACE: + spacewidth = 6; + default: + break; + } + + for (i = 0; string[i] && w < width; i++) + { + c = string[i]; + if ((UINT8)c >= 0x80 && (UINT8)c <= 0x8F) //color parsing! -Inuyasha 2.16.09 + continue; + + c = toupper(c) - HU_FONTSTART; + if (c < 0 || c >= HU_FONTSIZE || !hu_font[c]) + w += spacewidth; + else + w += (charwidth ? charwidth : SHORT(hu_font[c]->width)); + } + + return max(i-1, 0); +} + char V_GetSkincolorChar(INT32 color) { char cstart = 0x80; diff --git a/src/v_video.h b/src/v_video.h index b1d10af6a..bc1e8c546 100644 --- a/src/v_video.h +++ b/src/v_video.h @@ -237,11 +237,17 @@ void V_DrawCreditString(fixed_t x, fixed_t y, INT32 option, const char *string); INT32 V_CreditStringWidth(const char *string); // Find string width from hu_font chars -INT32 V_StringWidth(const char *string, INT32 option); +INT32 V_SubStringWidth(const char *string, INT32 length, INT32 option); +#define V_StringWidth(string, option) V_SubStringWidth(string, -1, option) // Find string width from hu_font chars, 0.5x scale -INT32 V_SmallStringWidth(const char *string, INT32 option); +INT32 V_SmallSubStringWidth(const char *string, INT32 length, INT32 option); +#define V_SmallStringWidth(string, option) V_SmallSubStringWidth(string, -1, option) // Find string width from tny_font chars -INT32 V_ThinStringWidth(const char *string, INT32 option); +INT32 V_ThinSubStringWidth(const char *string, INT32 length, INT32 option); +#define V_ThinStringWidth(string, option) V_ThinSubStringWidth(string, -1, option) + +// Find maximum length for substring taken from current string to fit into given width +INT32 V_SubStringLengthToFit(const char *string, INT32 width, INT32 option); char V_GetSkincolorChar(INT32 color);