* disabled Control-Z use in Tx panel.
  * added Tx text capture to clipboard when ESC pressed
    - allows subsequent Control-V paste of text back to
      the Tx panel
pull/1/head
David Freese 2012-11-22 04:33:44 -06:00
rodzic fec0ead620
commit de390ac26a
3 zmienionych plików z 11 dodań i 6 usunięć

Wyświetl plik

@ -2548,9 +2548,9 @@ int default_handler(int event)
}
Fl_Widget* w = Fl::focus();
int key = Fl::event_key();
if (w == fl_digi_main || w->window() == fl_digi_main) {
int key = Fl::event_key();
if (key == FL_Escape || (key >= FL_F && key <= FL_F_Last) ||
((key == '1' || key == '2' || key == '3' || key == '4') && Fl::event_alt())) {
TransmitText->take_focus();
@ -2582,9 +2582,13 @@ int default_handler(int event)
else if (w == dlgLogbook || w->window() == dlgLogbook)
return log_search_handler(event);
else if (Fl::event_key() == FL_Escape)
else if ((Fl::event_key() == FL_Escape) ||
(Fl::event_ctrl() && ((key == 'z' || key == 'Z')) &&
TransmitText->visible_focus()))
return 1;
else if (Fl::event_ctrl()) return w->handle(FL_KEYBOARD);
return 0;
}

Wyświetl plik

@ -1079,6 +1079,8 @@ int FTextTX::handle_key(int key)
}
if (trx_state == STATE_TX && active_modem->get_stopflag() == false) {
kf_select_all(0, this);
kf_copy(0, this);
clear();
if (arq_text_available)
AbortARQ();

Wyświetl plik

@ -338,10 +338,10 @@ void Fl_Text_Buffer_mod::replace(int start, int end, const char *text)
return;
if (start < 0)
start = 0;
if (end < 0) // needed to prevent control-Z crash
end = 0;
if (end > mLength)
end = mLength;
if (end < start)
end = start;
IS_UTF8_ALIGNED2(this, (start))
IS_UTF8_ALIGNED2(this, (end))
@ -349,8 +349,7 @@ void Fl_Text_Buffer_mod::replace(int start, int end, const char *text)
call_predelete_callbacks(start, end - start);
const char *deletedText = text_range(start, end);
if (end > start)
remove_(start, end);
remove_(start, end);
int nInserted = insert_(start, text);
mCursorPosHint = start + nInserted;
call_modify_callbacks(start, end - start, nInserted, 0, deletedText);