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

Fix X error when border_width is <1.

Browse Source
This commit is contained in:
Brenden Matthews 2010-04-07 10:59:45 -07:00
parent 04fd11b631
commit c9f1625908
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/conky.c
View File

@ -4295,11 +4295,11 @@ static void set_default_configurations(void)
text_alignment = BOTTOM_LEFT; text_alignment = BOTTOM_LEFT;
info.x11.monitor.number = 1; info.x11.monitor.number = 1;
info.x11.monitor.current = 0; info.x11.monitor.current = 0;
info.x11.desktop.current = 1; info.x11.desktop.current = 1;
info.x11.desktop.number = 1; info.x11.desktop.number = 1;
info.x11.desktop.nitems = 0; info.x11.desktop.nitems = 0;
info.x11.desktop.all_names = NULL; info.x11.desktop.all_names = NULL;
info.x11.desktop.name = NULL; info.x11.desktop.name = NULL;
#endif /* X11 */ #endif /* X11 */
free_templates(); free_templates();
@ -4622,7 +4622,7 @@ char load_config_file(const char *f)
CONF("border_width") { CONF("border_width") {
if (value) { if (value) {
window.border_width = strtol(value, 0, 0); window.border_width = strtol(value, 0, 0);
if (window.border_width < 0) window.border_width = 0; if (window.border_width < 1) window.border_width = 1;
} else { } else {
CONF_ERR; CONF_ERR;
} }

2
src/x11.c
View File

@ -336,7 +336,7 @@ void init_window(int own_window, int w, int h, int set_trans, int back_colour,
XClassHint classHint; XClassHint classHint;
XWMHints wmHint; XWMHints wmHint;
Atom xa; Atom xa;
#ifdef USE_ARGB #ifdef USE_ARGB
if (have_argb_visual) { if (have_argb_visual) {
attrs.colormap = window.colourmap; attrs.colormap = window.colourmap;