From 7b3e0918cfe9f24737f725a21ef577aff3a43dfb Mon Sep 17 00:00:00 2001 From: Dave Davenport Date: Mon, 6 Feb 2017 23:45:46 +0100 Subject: [PATCH] Reduce amount of paths created --- include/widgets/textbox.h | 20 +++---- source/dialogs/ssh.c | 2 +- source/helper.c | 6 +- source/rofi.c | 2 +- source/widgets/widget.c | 116 +++++++++++++------------------------- 5 files changed, 53 insertions(+), 93 deletions(-) diff --git a/include/widgets/textbox.h b/include/widgets/textbox.h index b7a70d16..20ed7e0a 100644 --- a/include/widgets/textbox.h +++ b/include/widgets/textbox.h @@ -46,16 +46,16 @@ typedef struct */ typedef enum { - TB_AUTOHEIGHT = 1 << 0, - TB_AUTOWIDTH = 1 << 1, - TB_LEFT = 1 << 16, - TB_RIGHT = 1 << 17, - TB_CENTER = 1 << 18, - TB_EDITABLE = 1 << 19, - TB_MARKUP = 1 << 20, - TB_WRAP = 1 << 21, - TB_PASSWORD = 1 << 22, - TB_INDICATOR = 1 << 23, + TB_AUTOHEIGHT = 1 << 0, + TB_AUTOWIDTH = 1 << 1, + TB_LEFT = 1 << 16, + TB_RIGHT = 1 << 17, + TB_CENTER = 1 << 18, + TB_EDITABLE = 1 << 19, + TB_MARKUP = 1 << 20, + TB_WRAP = 1 << 21, + TB_PASSWORD = 1 << 22, + TB_INDICATOR = 1 << 23, } TextboxFlags; /** * Flags indicating current state of the textbox. diff --git a/source/dialogs/ssh.c b/source/dialogs/ssh.c index c0ba2f8c..8cfe68fd 100644 --- a/source/dialogs/ssh.c +++ b/source/dialogs/ssh.c @@ -198,7 +198,7 @@ static char **read_hosts_file ( char ** retv, unsigned int *length ) // Reading one line per time. while ( getline ( &buffer, &buffer_length, fd ) > 0 ) { // Evaluate one line. - unsigned int index = 0, ti = 0; + unsigned int index = 0, ti = 0; char *token = buffer; // Tokenize it. diff --git a/source/helper.c b/source/helper.c index e71a5f3c..9abb6a35 100644 --- a/source/helper.c +++ b/source/helper.c @@ -251,7 +251,7 @@ GRegex **tokenize ( const char *input, int case_sensitive ) } char *saveptr = NULL, *token; - GRegex **retv = NULL; + GRegex **retv = NULL; if ( !config.tokenize ) { retv = g_malloc0 ( sizeof ( GRegex* ) * 2 ); retv[0] = (GRegex *) create_regex ( input, case_sensitive ); @@ -862,8 +862,8 @@ int rofi_scorer_fuzzy_evaluate ( const char *pattern, glong plen, const char *st // uleft: value of the upper left cell; ulefts: maximum value of uleft and cells on the left. The arbitrary initial // values suppress warnings. int uleft = 0, ulefts = 0, left, lefts; - const gchar *pit = pattern, *sit; - enum CharClass prev = NON_WORD, cur; + const gchar *pit = pattern, *sit; + enum CharClass prev = NON_WORD, cur; for ( si = 0, sit = str; si < slen; si++, sit = g_utf8_next_char ( sit ) ) { cur = rofi_scorer_get_character_class ( g_utf8_get_char ( sit ) ); score[si] = rofi_scorer_get_score_for ( prev, cur ); diff --git a/source/rofi.c b/source/rofi.c index 5b4fa79a..2bc57024 100644 --- a/source/rofi.c +++ b/source/rofi.c @@ -416,7 +416,7 @@ static int add_mode ( const char * token ) } else #endif // WINDOW_MODE - // SSh dialog + // SSh dialog if ( strcasecmp ( token, "ssh" ) == 0 ) { modi[num_modi] = &ssh_mode; num_modi++; diff --git a/source/widgets/widget.c b/source/widgets/widget.c index fdd956b2..e3b3b1e8 100644 --- a/source/widgets/widget.c +++ b/source/widgets/widget.c @@ -108,36 +108,36 @@ void widget_draw ( widget *widget, cairo_t *d ) } // Store current state. cairo_save ( d ); - int margin_left = distance_get_pixel ( widget->margin.left, ORIENTATION_HORIZONTAL ); - int margin_top = distance_get_pixel ( widget->margin.top, ORIENTATION_VERTICAL ); - int margin_right = distance_get_pixel ( widget->margin.right, ORIENTATION_HORIZONTAL ); - int margin_bottom = distance_get_pixel ( widget->margin.bottom, ORIENTATION_VERTICAL ); - int radius_bl = distance_get_pixel ( widget->border_radius.left, ORIENTATION_HORIZONTAL ); - int radius_tr = distance_get_pixel ( widget->border_radius.right, ORIENTATION_HORIZONTAL ); - int radius_tl = distance_get_pixel ( widget->border_radius.top, ORIENTATION_VERTICAL ); - int radius_br = distance_get_pixel ( widget->border_radius.bottom, ORIENTATION_VERTICAL ); - int left = distance_get_pixel ( widget->border.left, ORIENTATION_HORIZONTAL ); - int right = distance_get_pixel ( widget->border.right, ORIENTATION_HORIZONTAL ); - int top = distance_get_pixel ( widget->border.top, ORIENTATION_VERTICAL ); - int bottom = distance_get_pixel ( widget->border.bottom, ORIENTATION_VERTICAL ); + int margin_left = distance_get_pixel ( widget->margin.left, ORIENTATION_HORIZONTAL ); + int margin_top = distance_get_pixel ( widget->margin.top, ORIENTATION_VERTICAL ); + int margin_right = distance_get_pixel ( widget->margin.right, ORIENTATION_HORIZONTAL ); + int margin_bottom = distance_get_pixel ( widget->margin.bottom, ORIENTATION_VERTICAL ); + int radius_bl = distance_get_pixel ( widget->border_radius.left, ORIENTATION_HORIZONTAL ); + int radius_tr = distance_get_pixel ( widget->border_radius.right, ORIENTATION_HORIZONTAL ); + int radius_tl = distance_get_pixel ( widget->border_radius.top, ORIENTATION_VERTICAL ); + int radius_br = distance_get_pixel ( widget->border_radius.bottom, ORIENTATION_VERTICAL ); + int left = distance_get_pixel ( widget->border.left, ORIENTATION_HORIZONTAL ); + int right = distance_get_pixel ( widget->border.right, ORIENTATION_HORIZONTAL ); + int top = distance_get_pixel ( widget->border.top, ORIENTATION_VERTICAL ); + int bottom = distance_get_pixel ( widget->border.bottom, ORIENTATION_VERTICAL ); - if ( (radius_bl + radius_tl) > (widget->h-margin_top-margin_bottom)) { - int j = (widget->h-margin_top-margin_bottom)/2.0; + if ( ( radius_bl + radius_tl ) > ( widget->h - margin_top - margin_bottom ) ) { + int j = ( widget->h - margin_top - margin_bottom ) / 2.0; radius_bl = MIN ( radius_bl, j ); radius_tl = MIN ( radius_tl, j ); } - if ( (radius_br + radius_tr) > (widget->h-margin_top-margin_bottom)) { - int j = (widget->h-margin_top-margin_bottom)/2.0; - radius_br = MIN ( radius_br, j); - radius_tr = MIN ( radius_tr, j); + if ( ( radius_br + radius_tr ) > ( widget->h - margin_top - margin_bottom ) ) { + int j = ( widget->h - margin_top - margin_bottom ) / 2.0; + radius_br = MIN ( radius_br, j ); + radius_tr = MIN ( radius_tr, j ); } - if (( radius_tl + radius_tr ) > ( widget->w - margin_left - margin_right )) { - int j = ( widget->w - margin_left - margin_right )/2.0; + if ( ( radius_tl + radius_tr ) > ( widget->w - margin_left - margin_right ) ) { + int j = ( widget->w - margin_left - margin_right ) / 2.0; radius_tr = MIN ( radius_tr, j ); radius_tl = MIN ( radius_tl, j ); } - if (( radius_bl + radius_br ) > ( widget->w - margin_left - margin_right )) { - int j = ( widget->w - margin_left - margin_right )/2.0; + if ( ( radius_bl + radius_br ) > ( widget->w - margin_left - margin_right ) ) { + int j = ( widget->w - margin_left - margin_right ) / 2.0; radius_br = MIN ( radius_br, j ); radius_bl = MIN ( radius_bl, j ); } @@ -145,69 +145,30 @@ void widget_draw ( widget *widget, cairo_t *d ) // Background painting. // Set new x/y possition. cairo_translate ( d, widget->x, widget->y ); - cairo_set_source_rgba ( d, 0.0, 0.0, 0.0, 1.0 ); - - cairo_arc ( d, margin_left + radius_tl + left / 2.0, margin_top + radius_tl + top / 2.0, radius_tl, -1.0 * M_PI, -0.5 * M_PI ); + cairo_set_line_width ( d, 0 ); + // Set outlines. + cairo_move_to ( d, margin_left + radius_tl + left / 2.0, margin_top + radius_tl + top / 2.0 ); + if ( radius_tl ) { + cairo_arc ( d, margin_left + radius_tl + left / 2.0, margin_top + radius_tl + top / 2.0, radius_tl, -1.0 * M_PI, -0.5 * M_PI ); + } cairo_line_to ( d, widget->w - margin_right - radius_tr - right / 2.0, margin_top + top / 2.0 ); - cairo_arc ( d, widget->w - margin_right - radius_tr - right / 2.0, margin_top + radius_tr + top / 2.0, radius_tr, -0.5 * M_PI, 0 * M_PI ); + if ( radius_tr ) { + cairo_arc ( d, widget->w - margin_right - radius_tr - right / 2.0, margin_top + radius_tr + top / 2.0, radius_tr, -0.5 * M_PI, 0 * M_PI ); + } cairo_line_to ( d, widget->w - margin_right - right / 2.0, widget->h - margin_bottom - radius_br - bottom / 2.0 ); - cairo_arc ( d, widget->w - margin_right - radius_br - right / 2.0, widget->h - margin_bottom - radius_br - bottom / 2.0, radius_br, 0.0 * M_PI, 0.5 * M_PI ); + if ( radius_br ) { + cairo_arc ( d, widget->w - margin_right - radius_br - right / 2.0, widget->h - margin_bottom - radius_br - bottom / 2.0, radius_br, 0.0 * M_PI, 0.5 * M_PI ); + } cairo_line_to ( d, margin_left + radius_bl + left / 2.0, widget->h - margin_bottom - bottom / 2.0 ); - cairo_arc ( d, margin_left + radius_bl + left / 2.0, widget->h - margin_bottom - radius_bl - bottom / 2.0, radius_bl, 0.5 * M_PI, 1.0 * M_PI ); + if ( radius_bl ) { + cairo_arc ( d, margin_left + radius_bl + left / 2.0, widget->h - margin_bottom - radius_bl - bottom / 2.0, radius_bl, 0.5 * M_PI, 1.0 * M_PI ); + } cairo_line_to ( d, margin_left + left / 2.0, margin_top + radius_tl + top / 2.0 ); cairo_close_path ( d ); cairo_set_source_rgba ( d, 1.0, 1.0, 1.0, 1.0 ); rofi_theme_get_color ( widget, "background", d ); - cairo_fill ( d ); - - cairo_set_line_width ( d, 0 ); - if ( radius_tl ) { - double a = ( radius_tl - left ); - double b = ( radius_tl - top ); - double be = acos ( ( 0.5 * sqrt ( a * a + b * b ) ) / radius_tl ); - double a1 = atan ( a / b ) + be - 0.5 * M_PI; - double ai = 2 * ( 0.5 * M_PI - be ); - cairo_arc ( d, margin_left + left + cos ( a1 ) * radius_tl, - margin_top + ( radius_tl ) + radius_tl * sin ( a1 ), - radius_tl+0.5, -M_PI + a1, -M_PI + a1 + ai); - } - cairo_line_to ( d, widget->w - margin_right - radius_tr, margin_top ); - if ( radius_tr ) { - double a = ( radius_tr - right ); - double b = ( radius_tr - top ); - double be = acos ( ( 0.5 * sqrt ( a * a + b * b ) ) / radius_tr ); - double a1 = atan ( a / b ) + be - 0.5 * M_PI; - double ai = 2 * ( 0.5 * M_PI - be ); - cairo_arc ( d, widget->w - margin_right - right - cos ( a1 ) * radius_tr, - margin_top + radius_tr * ( 1 + sin ( a1 ) ), radius_tr+0.5, - -0.5*M_PI+ a1, -0.5*M_PI+a1 + ai ); - } - cairo_line_to ( d, widget->w - margin_right, widget->h - margin_bottom - radius_br ); - if ( radius_br ) { - double a = ( radius_br - right ); - double b = ( radius_br - bottom ); - double be = acos ( ( 0.5 * sqrt ( a * a + b * b ) ) / radius_br ); - double a1 = atan ( a / b ) + be - 0.5 * M_PI; - double ai = 2 * ( 0.5 * M_PI - be ); - cairo_arc ( d, widget->w - margin_right - right - cos ( a1 ) * radius_br, - widget->h - margin_bottom - radius_br * ( 1 + sin ( a1 ) ), radius_br+0.5, - 0.0 * M_PI + a1 , 0.0 * M_PI + a1 + ai ); - } - cairo_line_to ( d, margin_left + radius_bl, widget->h - margin_bottom ); - if ( radius_bl ) { - double a = ( radius_bl - left ); - double b = ( radius_bl - bottom ); - double be = acos ( ( 0.5 * sqrt ( a * a + b * b ) ) / radius_bl ); - double a1 = atan ( a / b ) + be - 0.5 * M_PI; - double ai = 2 * ( 0.5 * M_PI - be ); - cairo_arc ( d, margin_left + left + cos ( a1 ) * radius_bl, - widget->h - margin_bottom - radius_bl * ( 1 + sin ( a1 ) ), radius_bl+0.5, - 0.5 * M_PI + a1, 0.5 * M_PI + a1 + ai ); - } - cairo_line_to ( d, margin_left, margin_top + radius_tl ); - cairo_close_path ( d ); - + cairo_fill_preserve ( d ); cairo_clip ( d ); widget->draw ( widget, d ); @@ -215,7 +176,6 @@ void widget_draw ( widget *widget, cairo_t *d ) cairo_restore ( d ); - if ( left || top || right || bottom ) { cairo_save ( d ); cairo_translate ( d, widget->x, widget->y );