PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2025-07-31 21:59:25 -04:00
Code Releases Activity

Remove duplicate code, make password right character length.

Browse source
This commit is contained in:
Dave Davenport 2016-01-11 08:36:20 +01:00
parent b012ec1e8a
commit f080aa2d61
2 changed files with 36 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

18
include/textbox.h
View file

@ -40,15 +40,15 @@ typedef struct
typedef enum typedef enum
{ {
TB_AUTOHEIGHT = 1 << 0, TB_AUTOHEIGHT = 1 << 0,
TB_AUTOWIDTH = 1 << 1, TB_AUTOWIDTH = 1 << 1,
TB_LEFT = 1 << 16, TB_LEFT = 1 << 16,
TB_RIGHT = 1 << 17, TB_RIGHT = 1 << 17,
TB_CENTER = 1 << 18, TB_CENTER = 1 << 18,
TB_EDITABLE = 1 << 19, TB_EDITABLE = 1 << 19,
TB_MARKUP = 1 << 20, TB_MARKUP = 1 << 20,
TB_WRAP = 1 << 21, TB_WRAP = 1 << 21,
TB_PASSWORD = 1 << 22, TB_PASSWORD = 1 << 22,
} TextboxFlags; } TextboxFlags;
typedef enum typedef enum

56
source/textbox.c
View file

@ -124,6 +124,31 @@ void textbox_font ( textbox *tb, TextBoxFontType tbft )
tb->tbft = tbft; tb->tbft = tbft;
} }
/**
* @param tb The textbox object.
*
* Update the pango layout's text. It does this depending on the
* textbox flags.
*/
static void __textbox_update_pango_text ( textbox *tb )
{
if ( ( tb->flags & TB_PASSWORD ) == TB_PASSWORD ) {
size_t l = g_utf8_strlen ( tb->text, -1 );
char string [l + 1];
memset ( string, '*', l );
string[l] = '\0';
pango_layout_set_attributes ( tb->layout, NULL );
pango_layout_set_text ( tb->layout, string, l );
}
else if ( tb->flags & TB_MARKUP || tb->tbft & MARKUP ) {
pango_layout_set_markup ( tb->layout, tb->text, strlen ( tb->text ) );
}
else {
pango_layout_set_attributes ( tb->layout, NULL );
pango_layout_set_text ( tb->layout, tb->text, strlen ( tb->text ) );
}
}
// set the default text to display // set the default text to display
void textbox_text ( textbox *tb, const char *text ) void textbox_text ( textbox *tb, const char *text )
{ {
@ -143,21 +168,7 @@ void textbox_text ( textbox *tb, const char *text )
tb->text = g_strdup ( "Invalid UTF-8 string." ); tb->text = g_strdup ( "Invalid UTF-8 string." );
} }
} }
if ( ( tb->flags & TB_PASSWORD ) == TB_PASSWORD ) { __textbox_update_pango_text ( tb );
size_t l = strlen ( tb->text );
char string [l + 1];
memset ( string, '*', l );
string[l] = '\0';
pango_layout_set_attributes ( tb->layout, NULL );
pango_layout_set_text ( tb->layout, string, l );
}
else if ( tb->flags & TB_MARKUP || tb->tbft & MARKUP ) {
pango_layout_set_markup ( tb->layout, tb->text, strlen ( tb->text ) );
}
else {
pango_layout_set_attributes ( tb->layout, NULL );
pango_layout_set_text ( tb->layout, tb->text, strlen ( tb->text ) );
}
if ( tb->flags & TB_AUTOWIDTH ) { if ( tb->flags & TB_AUTOWIDTH ) {
textbox_moveresize ( tb, tb->widget.x, tb->widget.y, tb->widget.w, tb->widget.h ); textbox_moveresize ( tb, tb->widget.x, tb->widget.y, tb->widget.w, tb->widget.h );
} }
@ -247,20 +258,7 @@ static void texbox_update ( textbox *tb )
int cursor_width = MAX ( 2, font_height / 10 ); int cursor_width = MAX ( 2, font_height / 10 );
if ( tb->changed ) { if ( tb->changed ) {
if ( ( tb->flags & TB_PASSWORD ) == TB_PASSWORD ) { __textbox_update_pango_text ( tb );
size_t l = strlen ( tb->text );
char string [l + 1];
memset ( string, '*', l );
string[l] = '\0';
pango_layout_set_attributes ( tb->layout, NULL );
pango_layout_set_text ( tb->layout, string, l );
}
else if ( tb->flags & TB_MARKUP ) {
pango_layout_set_markup ( tb->layout, text, text_len );
}
else{
pango_layout_set_text ( tb->layout, text, text_len );
}
} }
if ( tb->flags & TB_EDITABLE ) { if ( tb->flags & TB_EDITABLE ) {