QString getBlock(char_type c)
{
// store an educated guess for the next search
+ // 0 <= lastBlock < no_blocks
// FIXME THREAD
static int lastBlock = 0;
if (c < 0x7f)
lastBlock = 0;
- // off the end already
- if (lastBlock == no_blocks)
- return QString();
-
// c falls into a covered area, and we can guess which
if (c >= unicode_blocks[lastBlock].start
&& c <= unicode_blocks[lastBlock].end)
int i = 0;
while (i < no_blocks && c > unicode_blocks[i].end)
++i;
+
if (i == no_blocks)
return QString();
+
+ if (c < unicode_blocks[i].start) {
+ // 0 < i < no_blocks
+ // cache the previous block for guessing next time
+ lastBlock = i - 1;
+ return QString();
+ }
+
+ // 0 <= i < no_blocks
+ // cache the last block for guessing next time
lastBlock = i;
- //LYXERR0("fail: " << int(c) << ' ' << lastBlock);
return unicode_blocks[lastBlock].qname;
}
void setSymbols(QList<char_type> const & symbols, Encoding const * encoding)
{
beginResetModel();
- beginInsertRows(QModelIndex(), 0, symbols.size() - 1);
symbols_ = symbols;
encoding_ = encoding;
- endInsertRows();
endResetModel();
}
void GuiSymbols::updateSymbolList(bool update_combo)
{
- QString category = categoryCO->currentText();
- bool const nocategory = category.isEmpty();
+ QString const category = categoryCO->currentText();
char_type range_start = 0x0000;
char_type range_end = 0x110000;
QList<char_type> s;
}
}
- SymbolsList::const_iterator const end = symbols_.end();
int numItem = 0;
- for (SymbolsList::const_iterator it = symbols_.begin(); it != end; ++it) {
- char_type c = *it;
- if (!update_combo && !show_all && (c <= range_start || c >= range_end))
+ for (char_type c : symbols_) {
+ if (!update_combo && !show_all && (c < range_start || c > range_end))
continue;
QChar::Category const cat = QChar::category(uint(c));
// we do not want control or space characters
s.append(c);
if (update_combo) {
QString block = getBlock(c);
- if (category.isEmpty())
- category = block;
if (used_blocks.find(block) == used_blocks.end())
used_blocks[block] = numItem;
}
int old = categoryCO->findText(category);
if (old != -1)
categoryCO->setCurrentIndex(old);
- // update again in case the combo has not yet been filled
- // on first cycle (at dialog initialization)
- if (nocategory && !category.isEmpty())
- updateSymbolList();
+ else if (update_combo) {
+ // restart with a non-empty block
+ // this happens when the encoding changes when moving the cursor
+ categoryCO->setCurrentIndex(0);
+ updateSymbolList(false);
+ }
}