Rim/t8-mod
Rim/t8-mod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Updated Console

Browse Source 
Added command line tag for external console
This commit is contained in:
bodnjenie14 2024-05-27 17:04:52 +01:00 committed by GitHub
parent d003511810
commit 324fcc2425
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 153 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
source/proxy-dll/component/console.cpp
View File

@ -1,5 +1,3 @@
//TODO: Fix console branding
#include <std_include.hpp> #include <std_include.hpp>
#include "loader/component_loader.hpp" #include "loader/component_loader.hpp"
#include <utilities/string.hpp> #include <utilities/string.hpp>
@ -14,9 +12,8 @@ namespace console
{ {
namespace namespace
{ {
const char* branding_str = "Project-Bo4 >"; const char* branding_str = "shield> ";
size_t branding_length = std::strlen(branding_str);
size_t branding_lenght = std::strlen(branding_str);
utilities::hook::detour printf_hook; utilities::hook::detour printf_hook;
std::recursive_mutex print_mutex; std::recursive_mutex print_mutex;
@ -73,11 +70,8 @@ namespace console
show_cursor(false); show_cursor(false);
set_cursor_pos(0); set_cursor_pos(0);
invoke_printf("%s", con.buffer); invoke_printf("%s%s", branding_str, con.buffer);
//invoke_printf("%s %s", branding_str, con.buffer); set_cursor_pos(branding_length + con.cursor);
set_cursor_pos(con.cursor);
//set_cursor_pos(branding_lenght + con.cursor);
show_cursor(true); show_cursor(true);
} }
@ -88,18 +82,17 @@ namespace console
show_cursor(false); show_cursor(false);
set_cursor_pos(0); set_cursor_pos(0);
for (auto i = 0; i < std::strlen(con.buffer); i++) for (auto i = 0; i < branding_length + std::strlen(con.buffer); i++)
{ {
invoke_printf(" "); invoke_printf(" ");
} }
set_cursor_pos(con.cursor); set_cursor_pos(0);
show_cursor(true); show_cursor(true);
} }
int dispatch_message(const int type, const std::string& message) int dispatch_message(const int type, const std::string& message)
{ {
std::lock_guard _0(print_mutex); std::lock_guard _0(print_mutex);
clear_output(); clear_output();
@ -132,7 +125,7 @@ namespace console
CONSOLE_SCREEN_BUFFER_INFO info{}; CONSOLE_SCREEN_BUFFER_INFO info{};
GetConsoleScreenBufferInfo(OUTPUT_HANDLE, &info); GetConsoleScreenBufferInfo(OUTPUT_HANDLE, &info);
const auto columns = static_cast<size_t>(info.srWindow.Right - info.srWindow.Left - 1); const auto columns = static_cast<size_t>(info.srWindow.Right - info.srWindow.Left - 1);
return std::max(size_t(0), std::min(columns, sizeof(con.buffer))); return std::max(size_t(0), std::min(columns, sizeof(con.buffer) - branding_length));
} }
void handle_resize() void handle_resize()
@ -200,9 +193,7 @@ namespace console
if (con.cursor > 0) if (con.cursor > 0)
{ {
con.cursor--; con.cursor--;
set_cursor_pos(con.cursor); set_cursor_pos(branding_length + con.cursor);
//set_cursor_pos(branding_lenght + con.cursor);
} }
break; break;
@ -212,8 +203,7 @@ namespace console
if (con.cursor < std::strlen(con.buffer)) if (con.cursor < std::strlen(con.buffer))
{ {
con.cursor++; con.cursor++;
set_cursor_pos(con.cursor); set_cursor_pos(branding_length + con.cursor);
//set_cursor_pos(branding_lenght + con.cursor);
} }
break; break;
@ -246,9 +236,7 @@ namespace console
con.cursor = 0; con.cursor = 0;
clear_output(); clear_output();
invoke_printf("%s%s\r\n", branding_str, con.buffer);
invoke_printf("]%s\r\n", con.buffer);
strncpy_s(con.buffer, "", sizeof(con.buffer)); strncpy_s(con.buffer, "", sizeof(con.buffer));
break; break;
} }
@ -260,9 +248,7 @@ namespace console
} }
clear_output(); clear_output();
std::memmove(con.buffer + con.cursor - 1, con.buffer + con.cursor, strlen(con.buffer) + 1 - con.cursor); std::memmove(con.buffer + con.cursor - 1, con.buffer + con.cursor, strlen(con.buffer) + 1 - con.cursor);
con.buffer - 1;
con.cursor--; con.cursor--;
update(); update();
@ -288,8 +274,7 @@ namespace console
break; break;
} }
std::memmove(con.buffer + con.cursor + 1, std::memmove(con.buffer + con.cursor + 1, con.buffer + con.cursor, std::strlen(con.buffer) + 1 - con.cursor);
con.buffer + con.cursor, std::strlen(con.buffer) + 1 - con.cursor);
con.buffer[con.cursor] = c; con.buffer[con.cursor] = c;
con.cursor++; con.cursor++;
@ -385,8 +370,7 @@ namespace console
break; break;
} }
} }
} } });
});
} }
void pre_destroy() override void pre_destroy() override