Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-17 18:45:10 +00:00
Code Issues Releases Activity

move get_x11_color() to colours.c

Browse Source
This commit is contained in:
Phil Sutter 2009-11-22 14:55:22 +01:00
parent 0ef81a2f05
commit 346b4cfbc1
4 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/colours.c
View File

@ -163,3 +163,28 @@ unsigned long *do_gradient(int width, unsigned long first_colour, unsigned long
return colours;
}
long get_x11_color(const char *name)
{
XColor color;
color.pixel = 0;
if (!XParseColor(display, DefaultColormap(display, screen), name, &color)) {
/* lets check if it's a hex colour with the # missing in front
* if yes, then do something about it */
char newname[DEFAULT_TEXT_BUFFER_SIZE];
newname[0] = '#';
strncpy(&newname[1], name, DEFAULT_TEXT_BUFFER_SIZE - 1);
/* now lets try again */
if (!XParseColor(display, DefaultColormap(display, screen), &newname[0],
&color)) {
NORM_ERR("can't parse X color '%s'", name);
return 0xFF00FF;
}
}
if (!XAllocColor(display, DefaultColormap(display, screen), &color)) {
NORM_ERR("can't allocate X color '%s'", name);
}
return (long) color.pixel;
}

2
src/colours.h
View File

@ -32,4 +32,6 @@
unsigned int adjust_colours(unsigned int);
unsigned long *do_gradient(int, unsigned long, unsigned long);
long get_x11_color(const char *);
#endif /* _COLOURS_H */

26
src/x11.c
View File

@ -524,32 +524,6 @@ static Window find_subwindow(Window win, int w, int h)
return win;
}
long get_x11_color(const char *name)
{
XColor color;
color.pixel = 0;
if (!XParseColor(display, DefaultColormap(display, screen), name, &color)) {
/* lets check if it's a hex colour with the # missing in front
* if yes, then do something about it */
char newname[DEFAULT_TEXT_BUFFER_SIZE];
newname[0] = '#';
strncpy(&newname[1], name, DEFAULT_TEXT_BUFFER_SIZE - 1);
/* now lets try again */
if (!XParseColor(display, DefaultColormap(display, screen), &newname[0],
&color)) {
NORM_ERR("can't parse X color '%s'", name);
return 0xFF00FF;
}
}
if (!XAllocColor(display, DefaultColormap(display, screen), &color)) {
NORM_ERR("can't allocate X color '%s'", name);
}
return (long) color.pixel;
}
void create_gc(void)
{
XGCValues values;

1
src/x11.h
View File

@ -91,7 +91,6 @@ void init_window(int use_own_window, int width, int height, int set_trans,
void destroy_window(void);
void create_gc(void);
void set_transparent_background(Window win);
long get_x11_color(const char *);
void get_x11_desktop_info(Display *display, Atom atom);
void set_struts(int);