p/tdv
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: p:de7089d6696cdba8aa524464d5f5840e768fab65
Branches Tags
p:master
..
compare: p:39ff4069c0054dce24e1562575c89553381a2407
Branches Tags
p:master

No commits in common. "de7089d6696cdba8aa524464d5f5840e768fab65" and "39ff4069c0054dce24e1562575c89553381a2407" have entirely different histories.
de7089d669 ... 39ff4069c0

2 changed files with 66 additions and 162 deletions
Show Stats Expand all files Collapse all files

28
dicts/gnu-fdl-en-cz.sh
View File

@ -2,28 +2,20 @@
# GNU/FDL English-Czech dictionary, see https://www.svobodneslovniky.cz/ # GNU/FDL English-Czech dictionary, see https://www.svobodneslovniky.cz/
curl -Lo- https://www.svobodneslovniky.cz/data/en-cs.txt.gz | \ curl -Lo- https://www.svobodneslovniky.cz/data/en-cs.txt.gz | \
zcat | grep -v ^# | sed 's/\\//g' | perl -CSD -F\\t -le ' zcat | grep -v ^# | sed 's/\\//g' | perl -CSD -F\\t -le '
sub tabesc { shift =~ s/\\/\\\\/gr =~ s/\n/\\n/gr =~ s/\t/\\t/gr } sub e { shift =~ s/\\/\\\\/gr =~ s/\n/\\n/gr =~ s/\t/\\t/gr }
sub w { sub w {
my ($name, $dict, $collation) = @_; open(my $f, "|-", "tabfile gnu-fdl-$_[0]") or die $!;
open(my $f, "|-", "tabfile", "--pango", "--collation=$collation", print $f e($k) . "\t" . e(join("\n", @$v))
"--website=https://www.svobodneslovniky.cz", while ($k, $v) = each %{$_[1]};
"gnu-fdl-$name") or die $!;
print $f tabesc($keyword) . "\t" . tabesc(join("\n", @$defs))
while ($keyword, $defs) = each %{$dict};
close($f); close($f);
} }
sub xmlesc { shift =~ s/&/&amp;/gr =~ s/</&lt;/gr =~ s/>/&gt;/gr } my ($en, $cz, $notes, $special, $translator) = @F;
sub entry { if ($cz) {
my ($definition, $notes) = map {xmlesc($_)} @_;
$notes ? "$definition <i>$notes</i>" : $definition;
}
my ($en, $cs, $notes, $special, $translator) = @F;
if ($cs) {
$notes =~ s/\w+:\s?//g; # remove word classes $notes =~ s/\w+:\s?//g; # remove word classes
$notes =~ s/(\w+\.)(?!])/($1)/; # quote "pl." $notes =~ s/(\w+\.)(?!])/($1)/; # quote "pl."
push(@{$encs{$en}}, entry($cs, $notes)); push(@{$encz{$en}}, $notes ? "$cz " . $notes : $cz);
push(@{$csen{$cs}}, entry($en, $notes)); push(@{$czen{$cz}}, $notes ? "$en " . $notes : $en);
} END { } END {
w("en-cz", \%encs, "en"); w("en-cz", \%encz);
w("cz-en", \%csen, "cs"); w("cz-en", \%czen);
}' }'

198
src/sdtui.c
View File

@ -48,10 +48,6 @@
#define TOP_BAR_CUTOFF 2 ///< How many lines are reserved on top #define TOP_BAR_CUTOFF 2 ///< How many lines are reserved on top
#define APP_TITLE PROJECT_NAME " " ///< Left top corner #define APP_TITLE PROJECT_NAME " " ///< Left top corner
#ifndef A_ITALIC
#define A_ITALIC 0
#endif
// --- Utilities --------------------------------------------------------------- // --- Utilities ---------------------------------------------------------------
static size_t static size_t
@ -197,8 +193,8 @@ typedef struct application Application;
struct view_entry struct view_entry
{ {
gchar * word; ///< Word gchar * word; ///< Word
GPtrArray * definitions; ///< Word definition entries (gchar *) gchar ** definitions; ///< Word definition entries
GPtrArray * formatting; ///< chtype * or NULL per definition gsize definitions_length; ///< Length of the @a definitions array
}; };
struct dictionary struct dictionary
@ -273,75 +269,14 @@ app_char_width (Application *app, gunichar c)
/// Splits the entry and adds it to a pointer array. /// Splits the entry and adds it to a pointer array.
static void static void
view_entry_split_add (ViewEntry *ve, const gchar *text, const chtype *attrs) view_entry_split_add (GPtrArray *out, const gchar *text)
{ {
const gchar *p = text, *nl; const gchar *p = text, *nl;
for (; (nl = strchr (p, '\n')); p = nl + 1) for (; (nl = strchr (p, '\n')); p = nl + 1)
if (nl != p) if (nl != p)
{ g_ptr_array_add (out, g_strndup (p, nl - p));
g_ptr_array_add (ve->definitions, g_strndup (p, nl - p));
g_ptr_array_add (ve->formatting, !attrs ? NULL
: g_memdup2 (attrs + (p - text), (nl - p) * sizeof *attrs));
}
if (*p) if (*p)
{ g_ptr_array_add (out, g_strdup (p));
g_ptr_array_add (ve->definitions, g_strdup (p));
g_ptr_array_add (ve->formatting, !attrs ? NULL
: g_memdup2 (attrs + (p - text), strlen (p) * sizeof *attrs));
}
}
static chtype
app_pango_iterator_to_attrs (PangoAttrIterator *iterator)
{
chtype attrs = 0;
PangoAttrInt *attr = NULL;
if ((attr = (PangoAttrInt *) pango_attr_iterator_get (iterator,
PANGO_ATTR_WEIGHT)) && attr->value >= PANGO_WEIGHT_BOLD)
attrs |= A_BOLD;
if ((attr = (PangoAttrInt *) pango_attr_iterator_get (iterator,
PANGO_ATTR_UNDERLINE)) && attr->value == PANGO_UNDERLINE_SINGLE)
attrs |= A_UNDERLINE;
if ((attr = (PangoAttrInt *) pango_attr_iterator_get (iterator,
PANGO_ATTR_STYLE)) && attr->value == PANGO_STYLE_ITALIC)
attrs |= A_ITALIC;
return attrs;
}
static void
view_entry_split_add_pango (ViewEntry *ve, const gchar *markup)
{
// This function skips leading whitespace, but it's the canonical one
gchar *text = NULL;
PangoAttrList *attrs = NULL;
if (!pango_parse_markup (markup, -1, 0, &attrs, &text, NULL, NULL))
{
gchar *replacement = g_strdup_printf ("<%s>", _("error in entry"));
view_entry_split_add (ve, replacement, NULL);
g_free (replacement);
return;
}
PangoAttrIterator *iterator = pango_attr_list_get_iterator (attrs);
chtype *formatting = g_malloc0_n (strlen (text), sizeof *formatting);
do
{
gint start = 0, end = 0;
pango_attr_iterator_range (iterator, &start, &end);
if (end == G_MAXINT)
end = strlen (text);
chtype attrs = app_pango_iterator_to_attrs (iterator);
while (start < end)
formatting[start++] = attrs;
}
while (pango_attr_iterator_next (iterator));
view_entry_split_add (ve, text, formatting);
g_free (formatting);
pango_attr_iterator_destroy (iterator);
pango_attr_list_unref (attrs);
g_free (text);
} }
/// Decomposes a dictionary entry into the format we want. /// Decomposes a dictionary entry into the format we want.
@ -356,22 +291,29 @@ view_entry_new (StardictIterator *iterator)
StardictEntry *entry = stardict_iterator_get_entry (iterator); StardictEntry *entry = stardict_iterator_get_entry (iterator);
g_return_val_if_fail (entry != NULL, NULL); g_return_val_if_fail (entry != NULL, NULL);
ve->definitions = g_ptr_array_new_with_free_func (g_free); GPtrArray *definitions = g_ptr_array_new ();
ve->formatting = g_ptr_array_new_with_free_func (g_free); const GList *fields = stardict_entry_get_fields (entry);
gboolean found_anything_displayable = FALSE; gboolean found_anything_displayable = FALSE;
for (const GList *fields = stardict_entry_get_fields (entry); fields; ) while (fields)
{ {
const StardictEntryField *field = fields->data; const StardictEntryField *field = fields->data;
switch (field->type) switch (field->type)
{ {
case STARDICT_FIELD_MEANING: case STARDICT_FIELD_MEANING:
view_entry_split_add (ve, field->data, NULL); view_entry_split_add (definitions, field->data);
found_anything_displayable = TRUE; found_anything_displayable = TRUE;
break; break;
case STARDICT_FIELD_PANGO: case STARDICT_FIELD_PANGO:
view_entry_split_add_pango (ve, field->data); {
char *text;
if (!pango_parse_markup (field->data, -1,
0, NULL, &text, NULL, NULL))
text = g_strdup_printf ("<%s>", _("error in entry"));
view_entry_split_add (definitions, text);
found_anything_displayable = TRUE; found_anything_displayable = TRUE;
g_free (text);
break; break;
}
case STARDICT_FIELD_PHONETIC: case STARDICT_FIELD_PHONETIC:
g_string_append_printf (word, " /%s/", (const gchar *) field->data); g_string_append_printf (word, " /%s/", (const gchar *) field->data);
break; break;
@ -384,10 +326,13 @@ view_entry_new (StardictIterator *iterator)
g_object_unref (entry); g_object_unref (entry);
if (!found_anything_displayable) if (!found_anything_displayable)
g_ptr_array_add (ve->definitions, g_ptr_array_add (definitions,
g_strdup_printf ("<%s>", _("no usable field found"))); g_strdup_printf ("<%s>", _("no usable field found")));
ve->word = g_string_free (word, FALSE); ve->word = g_string_free (word, FALSE);
ve->definitions_length = definitions->len;
g_ptr_array_add (definitions, NULL);
ve->definitions = (gchar **) g_ptr_array_free (definitions, FALSE);
return ve; return ve;
} }
@ -396,8 +341,7 @@ static void
view_entry_free (ViewEntry *ve) view_entry_free (ViewEntry *ve)
{ {
g_free (ve->word); g_free (ve->word);
g_ptr_array_free (ve->definitions, TRUE); g_strfreev (ve->definitions);
g_ptr_array_free (ve->formatting, TRUE);
g_slice_free1 (sizeof *ve, ve); g_slice_free1 (sizeof *ve, ve);
} }
@ -452,7 +396,7 @@ app_reload_view (Application *self)
while (remains > 0 && stardict_iterator_is_valid (iterator)) while (remains > 0 && stardict_iterator_is_valid (iterator))
{ {
ViewEntry *entry = view_entry_new (iterator); ViewEntry *entry = view_entry_new (iterator);
remains -= entry->definitions->len; remains -= entry->definitions_length;
g_ptr_array_add (self->entries, entry); g_ptr_array_add (self->entries, entry);
stardict_iterator_next (iterator); stardict_iterator_next (iterator);
} }
@ -485,7 +429,9 @@ app_load_color (Application *self, GKeyFile *kf, const gchar *name, int id)
else if (!strcmp (*it, "ul")) attrs.attrs |= A_UNDERLINE; else if (!strcmp (*it, "ul")) attrs.attrs |= A_UNDERLINE;
else if (!strcmp (*it, "blink")) attrs.attrs |= A_BLINK; else if (!strcmp (*it, "blink")) attrs.attrs |= A_BLINK;
else if (!strcmp (*it, "reverse")) attrs.attrs |= A_REVERSE; else if (!strcmp (*it, "reverse")) attrs.attrs |= A_REVERSE;
#ifdef A_ITALIC
else if (!strcmp (*it, "italic")) attrs.attrs |= A_ITALIC; else if (!strcmp (*it, "italic")) attrs.attrs |= A_ITALIC;
#endif // A_ITALIC
} }
g_strfreev (values); g_strfreev (values);
@ -832,11 +778,10 @@ row_buffer_init (RowBuffer *self, Application *app)
/// Replace invalid chars and push all codepoints to the array w/ attributes. /// Replace invalid chars and push all codepoints to the array w/ attributes.
static void static void
row_buffer_append_length (RowBuffer *self, row_buffer_append (RowBuffer *self, const gchar *str, chtype attrs)
const gchar *text, glong length, chtype attrs)
{ {
glong ucs4_len; glong ucs4_len;
gunichar *ucs4 = g_utf8_to_ucs4_fast (text, length, &ucs4_len); gunichar *ucs4 = g_utf8_to_ucs4_fast (str, -1, &ucs4_len);
for (glong i = 0; i < ucs4_len; i++) for (glong i = 0; i < ucs4_len; i++)
{ {
// XXX: this is very crude as it disrespects combining marks // XXX: this is very crude as it disrespects combining marks
@ -849,47 +794,6 @@ row_buffer_append_length (RowBuffer *self,
g_free (ucs4); g_free (ucs4);
} }
static void
row_buffer_append (RowBuffer *self, const gchar *text, chtype attrs)
{
row_buffer_append_length (self, text, -1, attrs);
}
/// Combine attributes, taking care to replace colour bits entirely
static void
row_buffer_merge_attributes (chtype *target, int merged)
{
if (merged & A_COLOR)
*target = (*target & ~A_COLOR) | merged;
else
*target |= merged;
}
static void
row_buffer_append_with_formatting (RowBuffer *self,
const gchar *text, const chtype *formatting, chtype default_attrs)
{
if (!formatting)
{
row_buffer_append (self, text, default_attrs);
return;
}
while (*text)
{
glong chunk_length = 1;
while (text[chunk_length] && formatting[chunk_length] == *formatting)
chunk_length++;
chtype merged = default_attrs;
row_buffer_merge_attributes (&merged, *formatting);
row_buffer_append_length (self, text, chunk_length, merged);
text += chunk_length;
formatting += chunk_length;
}
}
/// Pop as many codepoints as needed to free up "space" character cells. /// Pop as many codepoints as needed to free up "space" character cells.
/// Given the suffix nature of combining marks, this should work pretty fine. /// Given the suffix nature of combining marks, this should work pretty fine.
static gint static gint
@ -1092,6 +996,16 @@ app_show_help (Application *self)
app_show_message (self, lines, G_N_ELEMENTS (lines)); app_show_message (self, lines, G_N_ELEMENTS (lines));
} }
/// Combine attributes, taking care to replace colour bits entirely
static void
app_merge_attributes (int *target, int merged)
{
if (merged & A_COLOR)
*target = (*target & ~A_COLOR) | merged;
else
*target |= merged;
}
/// Redraw the dictionary view. /// Redraw the dictionary view.
static void static void
app_redraw_view (Application *self) app_redraw_view (Application *self)
@ -1114,16 +1028,16 @@ app_redraw_view (Application *self)
for (i = 0; i < self->entries->len; i++) for (i = 0; i < self->entries->len; i++)
{ {
ViewEntry *ve = g_ptr_array_index (self->entries, i); ViewEntry *ve = g_ptr_array_index (self->entries, i);
for (; k < ve->definitions->len; k++) for (; k < ve->definitions_length; k++)
{ {
chtype attrs = ((self->top_position + i) & 1) int attrs = ((self->top_position + i) & 1)
? APP_ATTR (ODD) : APP_ATTR (EVEN); ? APP_ATTR (ODD) : APP_ATTR (EVEN);
if (shown == self->selected) if (shown == self->selected)
row_buffer_merge_attributes (&attrs, self->focused app_merge_attributes (&attrs, self->focused
? APP_ATTR (SELECTION) : APP_ATTR (DEFOCUSED)); ? APP_ATTR (SELECTION) : APP_ATTR (DEFOCUSED));
gboolean last = k + 1 == ve->definitions->len; gboolean last = k + 1 == ve->definitions_length;
if (last && self->underline_last) if (last && self->underline_last)
attrs |= A_UNDERLINE; attrs |= A_UNDERLINE;
@ -1145,9 +1059,7 @@ app_redraw_view (Application *self)
row_buffer_init (&buf, self); row_buffer_init (&buf, self);
row_buffer_append (&buf, " ", attrs); row_buffer_append (&buf, " ", attrs);
row_buffer_append_with_formatting (&buf, row_buffer_append (&buf, ve->definitions[k], attrs);
g_ptr_array_index (ve->definitions, k),
g_ptr_array_index (ve->formatting, k), attrs);
row_buffer_finish (&buf, COLS - left_width, attrs); row_buffer_finish (&buf, COLS - left_width, attrs);
if ((gint) ++shown == LINES - TOP_BAR_CUTOFF) if ((gint) ++shown == LINES - TOP_BAR_CUTOFF)
@ -1192,7 +1104,7 @@ app_count_view_items (Application *self)
for (i = 0; i < self->entries->len; i++) for (i = 0; i < self->entries->len; i++)
{ {
ViewEntry *entry = g_ptr_array_index (self->entries, i); ViewEntry *entry = g_ptr_array_index (self->entries, i);
n_definitions += entry->definitions->len; n_definitions += entry->definitions_length;
} }
return n_definitions; return n_definitions;
} }
@ -1216,16 +1128,16 @@ app_scroll_up (Application *self, guint n)
break; break;
ViewEntry *ve = prepend_entry (self, --self->top_position); ViewEntry *ve = prepend_entry (self, --self->top_position);
self->top_offset = ve->definitions->len - 1; self->top_offset = ve->definitions_length - 1;
n_definitions += ve->definitions->len; n_definitions += ve->definitions_length;
// Remove the last entry if not shown // Remove the last entry if not shown
ViewEntry *last_entry = ViewEntry *last_entry =
g_ptr_array_index (self->entries, self->entries->len - 1); g_ptr_array_index (self->entries, self->entries->len - 1);
if ((gint) (n_definitions - self->top_offset if ((gint) (n_definitions - self->top_offset
- last_entry->definitions->len) >= LINES - TOP_BAR_CUTOFF) - last_entry->definitions_length) >= LINES - TOP_BAR_CUTOFF)
{ {
n_definitions -= last_entry->definitions->len; n_definitions -= last_entry->definitions_length;
g_ptr_array_remove_index_fast g_ptr_array_remove_index_fast
(self->entries, self->entries->len - 1); (self->entries, self->entries->len - 1);
} }
@ -1249,9 +1161,9 @@ app_scroll_down (Application *self, guint n)
guint to_be_definitions = n_definitions; guint to_be_definitions = n_definitions;
ViewEntry *first_entry = g_ptr_array_index (self->entries, 0); ViewEntry *first_entry = g_ptr_array_index (self->entries, 0);
if (++to_be_offset >= first_entry->definitions->len) if (++to_be_offset >= first_entry->definitions_length)
{ {
to_be_definitions -= first_entry->definitions->len; to_be_definitions -= first_entry->definitions_length;
to_be_offset = 0; to_be_offset = 0;
} }
if ((gint) (to_be_definitions - to_be_offset) < LINES - TOP_BAR_CUTOFF) if ((gint) (to_be_definitions - to_be_offset) < LINES - TOP_BAR_CUTOFF)
@ -1262,7 +1174,7 @@ app_scroll_down (Application *self, guint n)
break; break;
g_ptr_array_add (self->entries, new_entry); g_ptr_array_add (self->entries, new_entry);
to_be_definitions += new_entry->definitions->len; to_be_definitions += new_entry->definitions_length;
} }
if (to_be_offset == 0) if (to_be_offset == 0)
{ {
@ -1293,7 +1205,7 @@ app_one_entry_up (Application *self)
for (i = 0; i < self->entries->len; i++) for (i = 0; i < self->entries->len; i++)
{ {
ViewEntry *ve = g_ptr_array_index (self->entries, i); ViewEntry *ve = g_ptr_array_index (self->entries, i);
gint new_first = first + ve->definitions->len; gint new_first = first + ve->definitions_length;
if (new_first >= (gint) self->selected) if (new_first >= (gint) self->selected)
break; break;
first = new_first; first = new_first;
@ -1321,7 +1233,7 @@ app_one_entry_down (Application *self)
for (i = 0; i < self->entries->len; i++) for (i = 0; i < self->entries->len; i++)
{ {
ViewEntry *ve = g_ptr_array_index (self->entries, i); ViewEntry *ve = g_ptr_array_index (self->entries, i);
first += ve->definitions->len; first += ve->definitions_length;
if (first > (gint) self->selected) if (first > (gint) self->selected)
break; break;
} }
@ -1457,9 +1369,9 @@ app_get_current_definition (Application *self)
for (guint i = 0; i < self->entries->len; i++) for (guint i = 0; i < self->entries->len; i++)
{ {
ViewEntry *ve = g_ptr_array_index (self->entries, i); ViewEntry *ve = g_ptr_array_index (self->entries, i);
if (offset < ve->definitions->len) if (offset < ve->definitions_length)
return g_ptr_array_index (ve->definitions, offset); return ve->definitions[offset];
offset -= ve->definitions->len; offset -= ve->definitions_length;
} }
return NULL; return NULL;
} }