mirror
/
dl-fldigi
kopia lustrzana https://github.com/jamescoxon/dl-fldigi
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Double Click bug fix 

* Double click text selection for transfer to QSO record fields
pull/1/head
Arvo Järve 2013-05-20 17:51:52 -05:00 zatwierdzone przez David Freese
rodzic 9dd563a8af
commit fe315583d2
2 zmienionych plików z 32 dodań i 16 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
src/include/fl_digi.h
Wyświetl plik

@ -118,6 +118,7 @@ extern Fl_Input2 *inpCall2;
extern Fl_Input2 *inpCall3;
extern Fl_Input2 *inpCall4;
extern Fl_Group *QsoInfoFrame1B;
extern Fl_Group *qsoFrameView;
extern Fl_Group *QsoButtonFrame;
extern Fl_Group *QsoInfoFrame;

47
src/widgets/FTextRXTX.cxx
Wyświetl plik

@ -517,24 +517,39 @@ void FTextRX::handle_qso_data(int start, int end)
Fl_Input* target = 0;
if (rst.match(s))
target = inpRstIn;
else if (loc.match(s))
target = inpLoc;
else if (call.match(s)) { // point p to substring
const regmatch_t& offsets = call.suboff()[1];
p = s + offsets.rm_so;
*(s + offsets.rm_eo) = '\0';
target = inpCall;
}
else if (count_if(s, s + strlen(s), static_cast<int(*)(int)>(isdigit)))
target = inpQth;
else
target = *inpName->value() ? inpQth : inpName;
if (QsoInfoFrame1B->visible()) {
if (call.match(s)) { // point p to substring
const regmatch_t& offsets = call.suboff()[1];
p = s + offsets.rm_so;
*(s + offsets.rm_eo) = '\0';
inpCall->value(p);
inpCall->do_callback();
} else {
inpXchgIn->position(inpXchgIn->size());
if (inpXchgIn->size()) inpXchgIn->insert(" ", 1);
inpXchgIn->insert(s);
}
} else {
if (rst.match(s))
target = inpRstIn;
else if (loc.match(s))
target = inpLoc;
else if (call.match(s)) { // point p to substring
const regmatch_t& offsets = call.suboff()[1];
p = s + offsets.rm_so;
*(s + offsets.rm_eo) = '\0';
target = inpCall;
}
else if (count_if(s, s + strlen(s), static_cast<int(*)(int)>(isdigit)))
target = inpQth;
else
target = *inpName->value() ? inpQth : inpName;
target->value(p);
target->do_callback();
target->value(p);
target->do_callback();
}
free(s);
restoreFocus(NULL);
}