mirror of https://github.com/davatorium/rofi.git
Remove old cairo color set functions
This commit is contained in:
parent
78916c6a94
commit
f42e4ffbd7
|
@ -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;
|
||||
|
|
|
@ -216,34 +216,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.
|
||||
*
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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 ) {
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue