|
|
|
@ -39,7 +39,7 @@ struct OskWindow : public Window {
|
|
|
|
|
QueryString *qs; ///< text-input
|
|
|
|
|
int text_btn; ///< widget number of parent's text field
|
|
|
|
|
Textbuf *text; ///< pointer to parent's textbuffer (to update caret position)
|
|
|
|
|
char *orig_str_buf; ///< Original string.
|
|
|
|
|
std::string orig_str; ///< Original string.
|
|
|
|
|
bool shift; ///< Is the shift effectively pressed?
|
|
|
|
|
|
|
|
|
|
OskWindow(WindowDesc *desc, Window *parent, int button) : Window(desc)
|
|
|
|
@ -58,7 +58,7 @@ struct OskWindow : public Window {
|
|
|
|
|
this->querystrings[WID_OSK_TEXT] = this->qs;
|
|
|
|
|
|
|
|
|
|
/* make a copy in case we need to reset later */
|
|
|
|
|
this->orig_str_buf = stredup(this->qs->text.buf);
|
|
|
|
|
this->orig_str = this->qs->text.buf;
|
|
|
|
|
|
|
|
|
|
this->InitNested(0);
|
|
|
|
|
this->SetFocusedWidget(WID_OSK_TEXT);
|
|
|
|
@ -69,11 +69,6 @@ struct OskWindow : public Window {
|
|
|
|
|
this->UpdateOskState();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
~OskWindow()
|
|
|
|
|
{
|
|
|
|
|
free(this->orig_str_buf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Only show valid characters; do not show characters that would
|
|
|
|
|
* only insert a space when we have a spacebar to do that or
|
|
|
|
@ -162,7 +157,7 @@ struct OskWindow : public Window {
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case WID_OSK_OK:
|
|
|
|
|
if (this->qs->orig == nullptr || strcmp(this->qs->text.buf, this->qs->orig) != 0) {
|
|
|
|
|
if (!this->qs->orig.has_value() || this->qs->text.buf != this->qs->orig) {
|
|
|
|
|
/* pass information by simulating a button press on parent window */
|
|
|
|
|
if (this->qs->ok_button >= 0) {
|
|
|
|
|
this->parent->OnClick(pt, this->qs->ok_button, 1);
|
|
|
|
@ -179,7 +174,7 @@ struct OskWindow : public Window {
|
|
|
|
|
/* Window gets deleted when the parent window removes itself. */
|
|
|
|
|
return;
|
|
|
|
|
} else { // or reset to original string
|
|
|
|
|
qs->text.Assign(this->orig_str_buf);
|
|
|
|
|
qs->text.Assign(this->orig_str);
|
|
|
|
|
qs->text.MovePos(WKC_END);
|
|
|
|
|
this->OnEditboxChanged(WID_OSK_TEXT);
|
|
|
|
|
this->Close();
|
|
|
|
@ -425,8 +420,7 @@ void UpdateOSKOriginalText(const Window *parent, int button)
|
|
|
|
|
OskWindow *osk = dynamic_cast<OskWindow *>(FindWindowById(WC_OSK, 0));
|
|
|
|
|
if (osk == nullptr || osk->parent != parent || osk->text_btn != button) return;
|
|
|
|
|
|
|
|
|
|
free(osk->orig_str_buf);
|
|
|
|
|
osk->orig_str_buf = stredup(osk->qs->text.buf);
|
|
|
|
|
osk->orig_str = osk->qs->text.buf;
|
|
|
|
|
|
|
|
|
|
osk->SetDirty();
|
|
|
|
|
}
|
|
|
|
|