dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Debug: Add button to debug window to log contents to console

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-05-21 19:00:18 +01:00
parent 30409192f0
commit 5d8f459066
3 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lang/english.txt
View File

@@ -3823,6 +3823,8 @@ STR_NEWGRF_INSPECT_PARENT_BUTTON :{BLACK}Parent
STR_NEWGRF_INSPECT_PARENT_TOOLTIP :{BLACK}Inspect the object of the parent scope STR_NEWGRF_INSPECT_PARENT_TOOLTIP :{BLACK}Inspect the object of the parent scope
STR_NEWGRF_INSPECT_REFRESH :{BLACK}R STR_NEWGRF_INSPECT_REFRESH :{BLACK}R
STR_NEWGRF_INSPECT_REFRESH_TOOLTIP :{BLACK}Toggle whether to refresh the contents every frame STR_NEWGRF_INSPECT_REFRESH_TOOLTIP :{BLACK}Toggle whether to refresh the contents every frame
STR_NEWGRF_INSPECT_LOG_CONSOLE :{BLACK}L
STR_NEWGRF_INSPECT_LOG_CONSOLE_TOOLTIP :{BLACK}Log text content of this window to the console
STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT :{STRING1} at {HEX} STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT :{STRING1} at {HEX}
STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT_OBJECT :Object STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT_OBJECT :Object

25
src/newgrf_debug_gui.cpp
View File

@@ -304,6 +304,7 @@ struct NewGRFInspectWindow : Window {
int first_variable_line_index = 0; int first_variable_line_index = 0;
bool auto_refresh = false; bool auto_refresh = false;
bool log_console = false;
/** /**
* Check whether the given variable has a parameter. * Check whether the given variable has a parameter.
@@ -417,6 +418,8 @@ struct NewGRFInspectWindow : Window {
vseprintf(buf, lastof(buf), format, va); vseprintf(buf, lastof(buf), format, va);
va_end(va); va_end(va);
if (this->log_console) DEBUG(misc, 0, " %s", buf);
offset -= this->vscroll->GetPosition(); offset -= this->vscroll->GetPosition();
if (offset < 0 || offset >= this->vscroll->GetCapacity()) return; if (offset < 0 || offset >= this->vscroll->GetCapacity()) return;
@@ -465,6 +468,13 @@ struct NewGRFInspectWindow : Window {
if (widget != WID_NGRFI_MAINPANEL) return; if (widget != WID_NGRFI_MAINPANEL) return;
if (this->log_console) {
GetFeatureHelper(this->window_number)->SetStringParameters(this->GetFeatureIndex());
char buf[1024];
GetString(buf, STR_NEWGRF_INSPECT_CAPTION, lastof(buf));
DEBUG(misc, 0, "*** %s ***", buf + Utf8EncodedCharLen(buf[0]));
}
uint index = this->GetFeatureIndex(); uint index = this->GetFeatureIndex();
const NIFeature *nif = GetFeature(this->window_number); const NIFeature *nif = GetFeature(this->window_number);
const NIHelper *nih = nif->helper; const NIHelper *nih = nif->helper;
@@ -474,6 +484,8 @@ struct NewGRFInspectWindow : Window {
uint i = 0; uint i = 0;
nih->ExtraInfo(index, [&](const char *buf) { nih->ExtraInfo(index, [&](const char *buf) {
if (this->log_console) DEBUG(misc, 0, " %s", buf);
int offset = i++; int offset = i++;
offset -= this->vscroll->GetPosition(); offset -= this->vscroll->GetPosition();
if (offset < 0 || offset >= this->vscroll->GetCapacity()) return; if (offset < 0 || offset >= this->vscroll->GetCapacity()) return;
@@ -592,6 +604,11 @@ struct NewGRFInspectWindow : Window {
} }
} }
if (this->log_console) {
const_cast<NewGRFInspectWindow*>(this)->log_console = false;
DEBUG(misc, 0, "*** END ***");
}
/* Not nice and certainly a hack, but it beats duplicating /* Not nice and certainly a hack, but it beats duplicating
* this whole function just to count the actual number of * this whole function just to count the actual number of
* elements. Especially because they need to be redrawn. */ * elements. Especially because they need to be redrawn. */
@@ -655,6 +672,12 @@ struct NewGRFInspectWindow : Window {
this->SetWidgetDirty(WID_NGRFI_REFRESH); this->SetWidgetDirty(WID_NGRFI_REFRESH);
break; break;
} }
case WID_NGRFI_LOG_CONSOLE: {
this->log_console = true;
this->SetWidgetDirty(WID_NGRFI_MAINPANEL);
break;
}
} }
} }
@@ -699,6 +722,7 @@ static const NWidgetPart _nested_newgrf_inspect_chain_widgets[] = {
NWidget(NWID_HORIZONTAL), NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_GREY), NWidget(WWT_CLOSEBOX, COLOUR_GREY),
NWidget(WWT_CAPTION, COLOUR_GREY, WID_NGRFI_CAPTION), SetDataTip(STR_NEWGRF_INSPECT_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), NWidget(WWT_CAPTION, COLOUR_GREY, WID_NGRFI_CAPTION), SetDataTip(STR_NEWGRF_INSPECT_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_NGRFI_LOG_CONSOLE), SetDataTip(STR_NEWGRF_INSPECT_LOG_CONSOLE, STR_NEWGRF_INSPECT_LOG_CONSOLE_TOOLTIP),
NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_NGRFI_REFRESH), SetDataTip(STR_NEWGRF_INSPECT_REFRESH, STR_NEWGRF_INSPECT_REFRESH_TOOLTIP), NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_NGRFI_REFRESH), SetDataTip(STR_NEWGRF_INSPECT_REFRESH, STR_NEWGRF_INSPECT_REFRESH_TOOLTIP),
NWidget(WWT_SHADEBOX, COLOUR_GREY), NWidget(WWT_SHADEBOX, COLOUR_GREY),
NWidget(WWT_DEFSIZEBOX, COLOUR_GREY), NWidget(WWT_DEFSIZEBOX, COLOUR_GREY),
@@ -725,6 +749,7 @@ static const NWidgetPart _nested_newgrf_inspect_widgets[] = {
NWidget(WWT_CLOSEBOX, COLOUR_GREY), NWidget(WWT_CLOSEBOX, COLOUR_GREY),
NWidget(WWT_CAPTION, COLOUR_GREY, WID_NGRFI_CAPTION), SetDataTip(STR_NEWGRF_INSPECT_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), NWidget(WWT_CAPTION, COLOUR_GREY, WID_NGRFI_CAPTION), SetDataTip(STR_NEWGRF_INSPECT_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_NGRFI_PARENT), SetDataTip(STR_NEWGRF_INSPECT_PARENT_BUTTON, STR_NEWGRF_INSPECT_PARENT_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_NGRFI_PARENT), SetDataTip(STR_NEWGRF_INSPECT_PARENT_BUTTON, STR_NEWGRF_INSPECT_PARENT_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_NGRFI_LOG_CONSOLE), SetDataTip(STR_NEWGRF_INSPECT_LOG_CONSOLE, STR_NEWGRF_INSPECT_LOG_CONSOLE_TOOLTIP),
NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_NGRFI_REFRESH), SetDataTip(STR_NEWGRF_INSPECT_REFRESH, STR_NEWGRF_INSPECT_REFRESH_TOOLTIP), NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_NGRFI_REFRESH), SetDataTip(STR_NEWGRF_INSPECT_REFRESH, STR_NEWGRF_INSPECT_REFRESH_TOOLTIP),
NWidget(WWT_SHADEBOX, COLOUR_GREY), NWidget(WWT_SHADEBOX, COLOUR_GREY),
NWidget(WWT_DEFSIZEBOX, COLOUR_GREY), NWidget(WWT_DEFSIZEBOX, COLOUR_GREY),

1
src/widgets/newgrf_debug_widget.h
View File

@@ -20,6 +20,7 @@ enum NewGRFInspectWidgets {
WID_NGRFI_MAINPANEL, ///< Panel widget containing the actual data. WID_NGRFI_MAINPANEL, ///< Panel widget containing the actual data.
WID_NGRFI_SCROLLBAR, ///< Scrollbar. WID_NGRFI_SCROLLBAR, ///< Scrollbar.
WID_NGRFI_REFRESH, ///< Refresh toggle. WID_NGRFI_REFRESH, ///< Refresh toggle.
WID_NGRFI_LOG_CONSOLE, ///< Log to console
}; };
/** Widgets of the #SpriteAlignerWindow class. */ /** Widgets of the #SpriteAlignerWindow class. */