Skip to content

refactor split_str_once #7483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Goober5000 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor split_str_once #7483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 43 additions & 70 deletions code/hud/hudmessage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ static int Hud_mission_log_time2_coords[GR_NUM_RESOLUTIONS][2] = {
#define SHOW_OBJS_BUTTON 4
#define ACCEPT_BUTTON 5

#define HUD_MSG_LENGTH_MAX 2048
//#define HUD_MSG_MAX_PIXEL_W 439 // maximum number of pixels wide message display area is
//#define HUD_MSG_MAX_PIXEL_W 619 // maximum number of pixels wide message display area is

Expand Down Expand Up @@ -293,47 +292,30 @@ void HudGaugeMessages::pageIn()

void HudGaugeMessages::processMessageBuffer()
{
int x, offset = 0;
size_t i;
char *msg;
char *split_str, *ptr;

for ( i = 0; i < HUD_msg_buffer.size(); i++ ) {
msg = new char [HUD_msg_buffer[i].text.size()+1];
strcpy(msg, HUD_msg_buffer[i].text.c_str());

ptr = strstr(msg, NOX(": "));
if ( ptr ) {
int sw;
gr_get_string_size(&sw, nullptr, msg, 1.0f, (ptr + 2 - msg));
offset = sw;
}

x = 0;
split_str = msg;

while ((ptr = split_str_once(split_str, Max_width - x - 7)) != nullptr) { // the 7 is a fudge hack
// make sure that split went ok, if not then bail
if (ptr == split_str) {
break;
}

addPending(split_str, HUD_msg_buffer[i].source, x);
split_str = ptr;
for (auto &hud_msg: HUD_msg_buffer)
{
auto msg = hud_msg.text.c_str();

int x = 0, offset = 0;
auto ptr = strstr(msg, NOX(": "));
if (ptr)
gr_get_string_size(&offset, nullptr, msg, 1.0f, static_cast<size_t>(ptr + 2 - msg));

size_t split_len, split_next_pos;
do {
std::tie(split_len, split_next_pos, std::ignore) = split_str_once(msg, Max_width - x - 7); // the 7 is a fudge hack
addPending(msg, split_len, hud_msg.source, x);
msg += split_next_pos;
x = offset;
}

addPending(split_str, HUD_msg_buffer[i].source, x);

delete[] msg;
} while (split_next_pos > 0);
}
}

void HudGaugeMessages::addPending(const char *text, int source, int x)
void HudGaugeMessages::addPending(const char *text, size_t len, int source, int x)
{
Assert(text != nullptr);

pending_messages.emplace(text, source, x);
pending_messages.emplace(SCP_string(text, len), source, x);
}

void HudGaugeMessages::scrollMessages()
Expand Down Expand Up @@ -829,50 +811,42 @@ void hud_scrollback_button_pressed(int n)
// scroll height of the scrollback UI.
void hud_initialize_scrollback_lines()
{

Msg_scrollback_lines.clear();

if ((Msg_scrollback_vec.size() > 0) && HUD_msg_inited) {

for (int j = 0; j < (int)Msg_scrollback_vec.size(); j++) {
line_node node_msg = Msg_scrollback_vec[j];

int width = 0;
int height = 0;
gr_get_string_size(&width, &height, node_msg.text.c_str(), 1.0f, node_msg.text.length());
if (!Msg_scrollback_vec.empty() && HUD_msg_inited) {

for (auto &node_msg: Msg_scrollback_vec) {
auto text = node_msg.text.c_str();
int max_width = Hud_mission_log_list2_coords[gr_screen.res][2];
if (width > max_width) {
char c_text[HUD_MSG_LENGTH_MAX];
strcpy_s(c_text, node_msg.text.c_str());

char* text = c_text;

char* split = split_str_once(text, max_width);
Msg_scrollback_lines.push_back({node_msg.time, The_mission.HUD_timer_padding, node_msg.source, node_msg.x, 1, node_msg.underline_width, text});

while (split != nullptr) {
text = split;
split = nullptr;
split = split_str_once(text, max_width);

int offset = 1;
if (split == nullptr)
offset = height / 3;

Msg_scrollback_lines.push_back({0, 0, node_msg.source, node_msg.x, offset, 0, text});
}
} else {
node_msg.y = height / 3;
Msg_scrollback_lines.push_back(std::move(node_msg));
}
int height = 0;
bool first = true;
size_t start_pos = 0;
size_t split_len, split_next_pos;

do {
std::tie(split_len, split_next_pos, std::ignore) = split_str_once(text, max_width, std::string::npos, 1.0f, nullptr, &height);

Msg_scrollback_lines.emplace_back(
first ? node_msg.time : 0,
first ? node_msg.timer_padding : 0,
node_msg.source,
node_msg.x,
split_next_pos > 0 ? 1 : height / 3, // y coordinate is 1 for every line except the last one
first ? node_msg.underline_width : 0,
node_msg.text.substr(start_pos, split_len)
);

text += split_next_pos;
start_pos += split_next_pos;
first = false;
} while (split_next_pos > 0);
}
}
}

void hud_scrollback_init()
{

// pause all game sounds
weapon_pause_sounds();
audiostream_pause_all();
Expand Down Expand Up @@ -1050,8 +1024,7 @@ void hud_scrollback_do_frame(float /*frametime*/)
int y = 0;
if (!Msg_scrollback_lines.empty() && HUD_msg_inited) {
int i = 0;
for (int j = 0; j < (int)Msg_scrollback_lines.size(); j++) {
line_node node_msg = Msg_scrollback_lines[j];
for (auto &node_msg: Msg_scrollback_lines) {
if ((node_msg.source == HUD_SOURCE_HIDDEN) || (i++ < Scroll_offset)) {
continue;

Expand Down
2 changes: 1 addition & 1 deletion code/hud/hudmessage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class HudGaugeMessages: public HudGauge // HUD_MESSAGE_LINES

void clearMessages();
void processMessageBuffer();
void addPending(const char *text, int source, int x = 0);
void addPending(const char *text, size_t len, int source, int x = 0);
void scrollMessages();
void preprocess() override;
void render(float frametime, bool config = false) override;
Expand Down
92 changes: 43 additions & 49 deletions code/mission/missionlog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,86 +437,82 @@ int mission_log_get_count( LogType type, const char *pname, const char *sname )
}


void message_log_add_seg(log_text_seg *entry, int x, int line_offset, int msg_color, const char *text, int flags = 0)
void message_log_add_seg(log_text_seg *entry, int x, int line_offset, int msg_color, const char *text, size_t len, int flags = 0)
{
// set the vector
entry->text.reset(vm_strdup(text));
entry->text.reset(vm_strndup(text, len));
entry->color = msg_color;
entry->x = x;
entry->line_offset = line_offset;
entry->flags = flags;
}

void message_log_add_seg(log_text_seg *entry, int x, int line_offset, int msg_color, const char *text, size_t len, int flags = 0)
void message_log_add_seg(log_text_seg *entry, int x, int line_offset, int msg_color, const char *text, int flags = 0)
{
// set the vector
entry->text.reset(vm_strndup(text, len));
entry->color = msg_color;
entry->x = x;
entry->line_offset = line_offset;
entry->flags = flags;
message_log_add_seg(entry, x, line_offset, msg_color, text, strlen(text), flags);
}

void message_log_add_segs(const char *source_string, int msg_color, int flags, SCP_vector<log_text_seg> *entry, bool split_string)
void message_log_add_segs(const char *text, int msg_color, int flags, SCP_vector<log_text_seg> *entry, bool split_string)
{
if (!source_string || !entry) {
if (!text || !entry) {
mprintf(("Why are you passing a NULL pointer to message_log_add_segs?\n"));
return;
}
if (!*source_string) {
return;
}

// duplicate the string so that we can split it without modifying the source
char *dup_string = vm_strdup(source_string);
char *str = dup_string;
char *split = NULL;

if (split_string) {
int sanity_counter = 0;

while (true) {
if (X == ACTION_X) {
while (is_white_space(*str))
str++;
ignore_white_space(&text);
}
if (!*text) {
return;
}

if (P_width - X > 0) {
split = split_str_once(str, P_width - X);
int w;
auto [split_len, split_next_pos, forced] = split_str_once(text, P_width - X, std::string::npos, 1.0f, &w);

// if we couldn't actually split the string, try again on a new line
if (split == str) {
sanity_counter++;
if (sanity_counter > 5) {
Error(LOCATION, "Too many attempts to wrap a mission log line! Get a coder!\nLine = %s", str);
break;
}
} else {
log_text_seg new_seg;
message_log_add_seg(&new_seg, X, Line_offset, msg_color, str, flags);
// we have more text to write (since we didn't return, above), so if we don't actually have enough room, try again on a new line
if (split_len == 0 || forced) {
split_next_pos = 0;
sanity_counter++;
if (sanity_counter > 5) {
Error(LOCATION, "Too many attempts to wrap a mission log line! Get a coder!\nLine = %s", text);
break;
}
} else {
log_text_seg new_seg;

// When this is the final piece of the segment (no further split), preserve the
// whole input (including any trailing whitespace) and use its full width. Other
// colored segments may be concatenated onto the same rendered line after this one,
// and the trailing whitespace is what visually separates them.
if (split_next_pos == 0) {
message_log_add_seg(&new_seg, X, Line_offset, msg_color, text, flags);
entry->push_back(std::move(new_seg));

if (!split) {
int w;
gr_get_string_size(&w, nullptr, str);
X += w;
break;
}
gr_get_string_size(&w, nullptr, text);
X += w;
break;
}

message_log_add_seg(&new_seg, X, Line_offset, msg_color, text, split_len, flags);
entry->push_back(std::move(new_seg));
}

X = ACTION_X;
Line_offset++;
str = split;
text += split_next_pos;
}
} else {
if (!*text) {
return;
}

log_text_seg new_seg;
message_log_add_seg(&new_seg, X, Line_offset, msg_color, str, flags);
message_log_add_seg(&new_seg, X, Line_offset, msg_color, text, flags);
entry->push_back(std::move(new_seg));
}

// free the buffer
vm_free(dup_string);
}

int mission_log_color_get_team(int msg_color)
Expand Down Expand Up @@ -691,8 +687,7 @@ void mission_log_init_scrollback(int pw, bool split_string)
Assert(!(entry.index & CARGO_NO_DEPLETE));

message_log_add_segs(XSTR("Cargo revealed: ", 418), LOG_COLOR_NORMAL, 0, &thisEntry.segments, split_string);
strncpy(text, Cargo_names[entry.index], sizeof(text) - 1);
message_log_add_segs(text, LOG_COLOR_BRIGHT, 0, &thisEntry.segments, split_string);
message_log_add_segs(Cargo_names[entry.index], LOG_COLOR_BRIGHT, 0, &thisEntry.segments, split_string);
break;

case LOG_CAP_SUBSYS_CARGO_REVEALED:
Expand All @@ -701,8 +696,7 @@ void mission_log_init_scrollback(int pw, bool split_string)

message_log_add_segs(entry.sname_display.c_str(), LOG_COLOR_NORMAL, 0, &thisEntry.segments, split_string);
message_log_add_segs(XSTR( " subsystem cargo revealed: ", 1488), LOG_COLOR_NORMAL, 0, &thisEntry.segments, split_string);
strncpy(text, Cargo_names[entry.index], sizeof(text) - 1);
message_log_add_segs(text, LOG_COLOR_BRIGHT, 0, &thisEntry.segments, split_string);
message_log_add_segs(Cargo_names[entry.index], LOG_COLOR_BRIGHT, 0, &thisEntry.segments, split_string);
break;


Expand Down
Loading
Loading