summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/widgets/textbox.h20
-rw-r--r--include/widgets/widget-internal.h2
-rw-r--r--include/x11-helper.h28
-rw-r--r--source/dialogs/ssh.c2
-rw-r--r--source/helper.c2
-rw-r--r--source/rofi.c4
-rw-r--r--source/widgets/textbox.c2
-rw-r--r--source/x11-helper.c70
8 files changed, 16 insertions, 114 deletions
diff --git a/include/widgets/textbox.h b/include/widgets/textbox.h
index d81d8806..f8469ead 100644
--- a/include/widgets/textbox.h
+++ b/include/widgets/textbox.h
@@ -48,16 +48,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/include/widgets/widget-internal.h b/include/widgets/widget-internal.h
index 06a82145..01813e86 100644
--- a/include/widgets/widget-internal.h
+++ b/include/widgets/widget-internal.h
@@ -46,7 +46,7 @@ struct _widget
/** Handle mouse motion, used for dragging */
gboolean ( *motion_notify )( struct _widget *, xcb_motion_notify_event_t * );
- int (*get_desired_height) ( struct _widget * );
+ int ( *get_desired_height )( struct _widget * );
/** widget clicked callback */
widget_clicked_cb clicked;
diff --git a/include/x11-helper.h b/include/x11-helper.h
index ac8ea92f..ac833ce6 100644
--- a/include/x11-helper.h
+++ b/include/x11-helper.h
@@ -217,34 +217,6 @@ typedef struct
Color color_get ( const char *const name );
/**
- * @param d cairo drawing context to set color on
- *
- * Set cairo drawing context source color to the background color.
- */
-void color_background ( cairo_t *d );
-
-/**
- * @param d cairo drawing context to set color on
- *
- * Set cairo drawing context source color to the border color.
- */
-void color_border ( cairo_t *d );
-/**
- * @param d cairo drawing context to set color on
- *
- * Set cairo drawing context source color to the separator color.
- */
-void color_separator ( cairo_t *d );
-
-/**
- * @param d cairo drawing context to set color on.
- * @param col The color to set.
- *
- * Sets col as cairo source color.
- */
-void x11_helper_set_cairo_rgba ( cairo_t *d, Color col );
-
-/**
* Gets a surface containing the background image of the desktop.
*
* @returns a cairo surface with the background image of the desktop.
diff --git a/source/dialogs/ssh.c b/source/dialogs/ssh.c
index 8cfe68fd..c0ba2f8c 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 48fbf13d..76e334de 100644
--- a/source/helper.c
+++ b/source/helper.c
@@ -248,7 +248,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 );
diff --git a/source/rofi.c b/source/rofi.c
index 3158ec34..f39bed53 100644
--- a/source/rofi.c
+++ b/source/rofi.c
@@ -397,7 +397,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++;
@@ -608,7 +608,7 @@ static gboolean lazy_grab_keyboard ( G_GNUC_UNUSED gpointer data )
if ( take_keyboard ( xcb_stuff_get_root_window ( xcb ), 0 ) ) {
return G_SOURCE_REMOVE;
}
- lazy_grab_retry_count_kb ++;
+ lazy_grab_retry_count_kb++;
return G_SOURCE_CONTINUE;
}
diff --git a/source/widgets/textbox.c b/source/widgets/textbox.c
index ce110c0d..1d387fb6 100644
--- a/source/widgets/textbox.c
+++ b/source/widgets/textbox.c
@@ -324,7 +324,7 @@ static void texbox_update ( textbox *tb )
int cursor_x = 0;
int cursor_y = 0;
- int cursor_width = 2;//MAX ( 2, font_height / 10 );
+ int cursor_width = 2; //MAX ( 2, font_height / 10 );
int cursor_height = font_height;
if ( tb->changed ) {
diff --git a/source/x11-helper.c b/source/x11-helper.c
index 7121b2df..3723e883 100644
--- a/source/x11-helper.c
+++ b/source/x11-helper.c
@@ -851,76 +851,6 @@ Color color_get ( const char *const name )
return ret;
}
-void x11_helper_set_cairo_rgba ( cairo_t *d, Color col )
-{
- cairo_set_source_rgba ( d, col.red, col.green, col.blue, col.alpha );
-}
-
-/**
- * Type of colors stored
- */
-enum
-{
- BACKGROUND,
- BORDER,
- SEPARATOR
-};
-/**
- * Color cache.
- *
- * This stores the current color until
- */
-static struct
-{
- /** The color */
- Color color;
- /** Flag indicating it is set. */
- unsigned int set;
-} color_cache[3];
-
-void color_background ( cairo_t *d )
-{
- if ( !color_cache[BACKGROUND].set ) {
- gchar **vals = g_strsplit ( config.color_window, ",", 3 );
- if ( vals != NULL && vals[0] != NULL ) {
- color_cache[BACKGROUND].color = color_get ( vals[0] );
- }
- g_strfreev ( vals );
- color_cache[BACKGROUND].set = TRUE;
- }
-
- x11_helper_set_cairo_rgba ( d, color_cache[BACKGROUND].color );
-}
-
-void color_border ( cairo_t *d )
-{
- if ( !color_cache[BORDER].set ) {
- gchar **vals = g_strsplit ( config.color_window, ",", 3 );
- if ( vals != NULL && vals[0] != NULL && vals[1] != NULL ) {
- color_cache[BORDER].color = color_get ( vals[1] );
- }
- g_strfreev ( vals );
- color_cache[BORDER].set = TRUE;
- }
- x11_helper_set_cairo_rgba ( d, color_cache[BORDER].color );
-}
-
-void color_separator ( cairo_t *d )
-{
- if ( !color_cache[SEPARATOR].set ) {
- gchar **vals = g_strsplit ( config.color_window, ",", 3 );
- if ( vals != NULL && vals[0] != NULL && vals[1] != NULL && vals[2] != NULL ) {
- color_cache[SEPARATOR].color = color_get ( vals[2] );
- }
- else if ( vals != NULL && vals[0] != NULL && vals[1] != NULL ) {
- color_cache[SEPARATOR].color = color_get ( vals[1] );
- }
- g_strfreev ( vals );
- color_cache[SEPARATOR].set = TRUE;
- }
- x11_helper_set_cairo_rgba ( d, color_cache[SEPARATOR].color );
-}
-
xcb_window_t xcb_stuff_get_root_window ( xcb_stuff *xcb )
{
return xcb->screen->root;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-23 03:22:52 +0000