kopia lustrzana https://github.com/jamescoxon/dl-fldigi
Double Click bug fix
* Double click text selection for transfer to QSO record fieldspull/1/head
rodzic
9dd563a8af
commit
fe315583d2
|
|
@ -118,6 +118,7 @@ extern Fl_Input2 *inpCall2;
|
||||||
extern Fl_Input2 *inpCall3;
|
extern Fl_Input2 *inpCall3;
|
||||||
extern Fl_Input2 *inpCall4;
|
extern Fl_Input2 *inpCall4;
|
||||||
|
|
||||||
|
extern Fl_Group *QsoInfoFrame1B;
|
||||||
extern Fl_Group *qsoFrameView;
|
extern Fl_Group *qsoFrameView;
|
||||||
extern Fl_Group *QsoButtonFrame;
|
extern Fl_Group *QsoButtonFrame;
|
||||||
extern Fl_Group *QsoInfoFrame;
|
extern Fl_Group *QsoInfoFrame;
|
||||||
|
|
|
||||||
|
|
@ -517,24 +517,39 @@ void FTextRX::handle_qso_data(int start, int end)
|
||||||
|
|
||||||
Fl_Input* target = 0;
|
Fl_Input* target = 0;
|
||||||
|
|
||||||
if (rst.match(s))
|
if (QsoInfoFrame1B->visible()) {
|
||||||
target = inpRstIn;
|
if (call.match(s)) { // point p to substring
|
||||||
else if (loc.match(s))
|
const regmatch_t& offsets = call.suboff()[1];
|
||||||
target = inpLoc;
|
p = s + offsets.rm_so;
|
||||||
else if (call.match(s)) { // point p to substring
|
*(s + offsets.rm_eo) = '\0';
|
||||||
const regmatch_t& offsets = call.suboff()[1];
|
inpCall->value(p);
|
||||||
p = s + offsets.rm_so;
|
inpCall->do_callback();
|
||||||
*(s + offsets.rm_eo) = '\0';
|
} else {
|
||||||
target = inpCall;
|
inpXchgIn->position(inpXchgIn->size());
|
||||||
}
|
if (inpXchgIn->size()) inpXchgIn->insert(" ", 1);
|
||||||
else if (count_if(s, s + strlen(s), static_cast<int(*)(int)>(isdigit)))
|
inpXchgIn->insert(s);
|
||||||
target = inpQth;
|
}
|
||||||
else
|
} else {
|
||||||
target = *inpName->value() ? inpQth : inpName;
|
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->value(p);
|
||||||
target->do_callback();
|
target->do_callback();
|
||||||
|
}
|
||||||
free(s);
|
free(s);
|
||||||
|
|
||||||
restoreFocus(NULL);
|
restoreFocus(NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Ładowanie…
Reference in New Issue