From 4f13d9c88e8a00ccb9ba8d5380db2f93d3f67908 Mon Sep 17 00:00:00 2001 From: Phil Jones Date: Wed, 5 Oct 2022 14:35:12 +0100 Subject: Add options to hide input for passwords etc. --- src/entry_backend/harfbuzz.c | 9 ++++++++- src/entry_backend/pango.c | 17 ++++++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) (limited to 'src/entry_backend') diff --git a/src/entry_backend/harfbuzz.c b/src/entry_backend/harfbuzz.c index 2834d9d..c5fc07e 100644 --- a/src/entry_backend/harfbuzz.c +++ b/src/entry_backend/harfbuzz.c @@ -230,7 +230,14 @@ void entry_backend_harfbuzz_update(struct entry *entry) /* Render the entry text */ hb_buffer_clear_contents(buffer); setup_hb_buffer(buffer); - hb_buffer_add_utf8(buffer, entry->input_mb, -1, 0, -1); + if (entry->hide_input) { + size_t char_len = N_ELEM(entry->hidden_character_mb); + for (size_t i = 0; i < entry->input_length; i++) { + hb_buffer_add_utf8(buffer, entry->hidden_character_mb, char_len, 0, char_len); + } + } else { + hb_buffer_add_utf8(buffer, entry->input_mb, -1, 0, -1); + } hb_shape(entry->harfbuzz.hb_font, buffer, NULL, 0); extents = render_hb_buffer(cr, buffer); extents.x_advance = MAX(extents.x_advance, entry->input_width); diff --git a/src/entry_backend/pango.c b/src/entry_backend/pango.c index d4737a1..01fc153 100644 --- a/src/entry_backend/pango.c +++ b/src/entry_backend/pango.c @@ -85,7 +85,22 @@ void entry_backend_pango_update(struct entry *entry) cairo_translate(cr, entry->prompt_padding, 0); /* Render the entry text */ - pango_layout_set_text(layout, entry->input_mb, -1); + if (entry->hide_input) { + /* + * Pango needs to be passed the whole text at once, so we need + * to manually replicate the replacement character in a buffer. + */ + static char buf[sizeof(entry->input_mb)]; + uint32_t char_len = entry->hidden_character_mb_length; + for (size_t i = 0; i < entry->input_length; i++) { + for (size_t j = 0; j < char_len; j++) { + buf[i * char_len + j] = entry->hidden_character_mb[j]; + } + } + pango_layout_set_text(layout, buf, -1); + } else { + pango_layout_set_text(layout, entry->input_mb, -1); + } pango_cairo_update_layout(cr, layout); pango_cairo_show_layout(cr, layout); pango_layout_get_pixel_extents(entry->pango.layout, &ink_rect, &logical_rect); -- cgit v1.2.3