Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement formatting #29

Merged
merged 3 commits into from
Sep 3, 2022
Merged

Implement formatting #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1c3ae2
editor: Allow formatting chunks as bold
mjakeman Sep 3, 2022
62ab0e0
editor: Implement bold within a single run and add getter
mjakeman Sep 3, 2022
996b591
display: Unset selection based on action
mjakeman Sep 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 125 additions & 9 deletions src/editor/editor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1124,6 +1124,45 @@ _ensure_ordered (TextMark **start,
}
}

void
split_run_at_offset (TextRun *run,
TextRun **new,
int offset)
{
char *first_text;
char *second_text;

g_return_if_fail (TEXT_IS_RUN (run));
g_return_if_fail (new != NULL);

g_object_get (run, "text", &first_text, NULL);

second_text = g_utf8_substring (first_text, offset, -1);
first_text = g_utf8_substring (first_text, 0, offset);

g_object_set (run, "text", first_text, NULL);
*new = text_run_new (second_text);

// Copy formatting
text_run_set_style_bold (*new, text_run_get_style_bold (run));
text_run_set_style_italic (*new, text_run_get_style_italic (run));
text_run_set_style_underline (*new, text_run_get_style_underline (run));
}

void
split_run_in_place (TextRun *run,
TextRun **new,
int offset)
{
TextParagraph *parent;

parent = TEXT_PARAGRAPH (text_node_get_parent (TEXT_NODE (run)));
split_run_at_offset (run, new, offset);
text_node_insert_child_after (TEXT_NODE (parent),
TEXT_NODE (*new),
TEXT_NODE (run));
}

void
text_editor_split_at_mark (TextEditor *self,
TextMark *split)
Expand Down Expand Up @@ -1165,18 +1204,12 @@ text_editor_split_at_mark (TextEditor *self,
// Split first run if run offset is not at beginning
if (split->index != run_offset)
{
char *first_text;
char *second_text;
int split_index_within_run;

g_object_get (start, "text", &first_text, NULL);
TextRun *new_run;

split_index_within_run = split->index - run_offset;
second_text = g_utf8_substring (first_text, split_index_within_run, -1);
first_text = g_utf8_substring (first_text, 0, split_index_within_run);

g_object_set (start, "text", first_text, NULL);
text_paragraph_append_run (new, text_run_new (second_text));
split_run_at_offset (start, &new_run, split_index_within_run);
text_paragraph_append_run (new, new_run);

// Move to next run
iter = text_node_get_next (iter);
Expand Down Expand Up @@ -1327,6 +1360,89 @@ text_editor_insert_at_mark (TextEditor *self,
g_slist_free (marks);
}

void
text_editor_apply_format_bold (TextEditor *self,
TextMark *start,
TextMark *end,
gboolean is_bold)
{
TextRun *iter;
TextRun *last;
int start_run_index;
int end_run_index;

_ensure_ordered (&start, &end);

iter = text_paragraph_get_run_at_index (start->paragraph, start->index, &start_run_index);
last = text_paragraph_get_run_at_index (end->paragraph, end->index, &end_run_index);

// Check if start and end indices are in the same run
if (iter == last)
{
TextRun *first_split;
TextRun *second_split;
int start_index_offset;
int end_index_offset;

g_assert (start_run_index == end_run_index);

start_index_offset = start->index - start_run_index;
end_index_offset = end->index - end_run_index;

// Split first run
split_run_in_place (iter, &first_split, start_index_offset);

// Calculate offset into new run and split again
end_index_offset -= start_index_offset;
split_run_in_place (first_split, &second_split, end_index_offset);

// Apply format to middle run
text_run_set_style_bold (first_split, is_bold);
return;
}

// Check if we need to split the first run
if (start->index - start_run_index != 0)
{
TextRun *new_run;
split_run_in_place (iter, &new_run, start->index - start_run_index);

// Apply format to new run
text_run_set_style_bold (new_run, is_bold);
iter = new_run;
}

// Check if we need to split the last run
if (end->index - end_run_index != 0)
{
TextRun *new_run;
split_run_in_place (last, &new_run, end->index - end_run_index);

// Apply format to old run
text_run_set_style_bold (last, is_bold);
}

while (iter != NULL)
{
if (iter == last)
break;

text_run_set_style_bold (iter, is_bold);

iter = walk_until_next_run (TEXT_ITEM (iter));
}
}

gboolean
text_editor_get_format_bold_at_mark (TextEditor *self,
TextMark *mark)
{
TextRun *run;

run = text_editor_get_run_at_mark (self, mark);
return text_run_get_style_bold (run);
}

TextMark *
_get_mark (TextEditor *self,
TextEditorMarkType type)
Expand Down
5 changes: 5 additions & 0 deletions src/editor/editor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,9 @@ void text_editor_sort_marks (TextMark *mark1, TextMark *mark
TextParagraph *text_editor_next_paragraph (TextParagraph *paragraph);
TextParagraph *text_editor_previous_paragraph (TextParagraph *paragraph);

// Format Helpers
// TODO: Make this more abstract
void text_editor_apply_format_bold (TextEditor *self, TextMark *start, TextMark *end, gboolean is_bold);
gboolean text_editor_get_format_bold_at_mark (TextEditor *self, TextMark *mark);

G_END_DECLS
42 changes: 37 additions & 5 deletions src/ui/display.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,11 +988,6 @@ key_pressed (GtkEventControllerKey *controller,
{
selection = _set_selection (self->document);
}
else if (!shift_pressed && selection)
{
_unset_selection (self->document);
selection = NULL;
}

// Handle Save
if (ctrl_pressed && keyval == GDK_KEY_s)
Expand All @@ -1016,6 +1011,9 @@ key_pressed (GtkEventControllerKey *controller,
// Handle Home/End
if (keyval == GDK_KEY_Home)
{
if (!shift_pressed && selection)
_unset_selection (self->document);

if (ctrl_pressed) {
text_editor_move_first (self->editor, TEXT_EDITOR_CURSOR);
goto redraw;
Expand All @@ -1029,6 +1027,9 @@ key_pressed (GtkEventControllerKey *controller,

if (keyval == GDK_KEY_End)
{
if (!shift_pressed && selection)
_unset_selection (self->document);

if (ctrl_pressed) {
text_editor_move_last (self->editor, TEXT_EDITOR_CURSOR);
}
Expand All @@ -1042,25 +1043,37 @@ key_pressed (GtkEventControllerKey *controller,
// Handle directional movemenent
if (keyval == GDK_KEY_Left)
{
if (!shift_pressed && selection)
_unset_selection (self->document);

text_editor_move_left (self->editor, TEXT_EDITOR_CURSOR, 1);
goto redraw;
}

if (keyval == GDK_KEY_Right)
{
if (!shift_pressed && selection)
_unset_selection (self->document);

text_editor_move_right (self->editor, TEXT_EDITOR_CURSOR, 1);
goto redraw;
}

if (keyval == GDK_KEY_Up)
{
if (!shift_pressed && selection)
_unset_selection (self->document);

if (_move_cursor_vertically (self->document->cursor, TRUE))
goto redraw;
return TRUE;
}

if (keyval == GDK_KEY_Down)
{
if (!shift_pressed && selection)
_unset_selection (self->document);

if (_move_cursor_vertically (self->document->cursor, FALSE))
goto redraw;
return TRUE;
Expand Down Expand Up @@ -1095,10 +1108,29 @@ key_pressed (GtkEventControllerKey *controller,

if (keyval == GDK_KEY_Return)
{
if (selection)
{
text_editor_replace (self->editor, TEXT_EDITOR_CURSOR, TEXT_EDITOR_SELECTION, "");
_unset_selection (self->document);
}

text_editor_split (self->editor, TEXT_EDITOR_CURSOR);
goto reallocate;
}

// Handle formatting
if (keyval == GDK_KEY_b && ctrl_pressed)
{
gboolean is_bold;

is_bold = text_editor_get_format_bold_at_mark (self->editor, self->document->cursor);
text_editor_apply_format_bold (self->editor,
self->document->cursor,
self->document->selection,
!is_bold);
goto reallocate;
}

return FALSE;

reallocate:
Expand Down