From b6708407c9cf5a85f51237190a915d900530d09f Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Wed, 3 Sep 2014 19:21:55 +0000 Subject: unify --- spectrogram.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/spectrogram.c b/spectrogram.c index 43ab315..2c86081 100644 --- a/spectrogram.c +++ b/spectrogram.c @@ -144,13 +144,15 @@ usage(void) } void -init_bg(Display *d, Pixmap pix, GC gc, int w, int h, unsigned long *pal) +init_bg(Display *d, Pixmap pix, GC gc, XRectangle r, unsigned long *pal) { int i; - for (i = 0; i < h; i++) { + for (i = 0; i < r.height; i++) { XSetForeground(d, gc, pal[i]); - XDrawLine(d, pix, gc, 0, h - i - 1, w - 1, h - i - 1); + XDrawLine(d, pix, gc, + 0, r.height - i - 1, + r.width - 1, r.height - i - 1); } } @@ -281,11 +283,11 @@ init_panel(Display *d, Window win, int x, int y, int w, int h, int mirror) if (!sp_pal) sp_pal = init_palette(d, p_spectr, p->maxval); - init_bg(d, p->spbg.pix, p->spbg.gc, p->s.width, p->s.height, sp_pal); + init_bg(d, p->spbg.pix, p->spbg.gc, p->s, sp_pal); if (!sh_pal) sh_pal = init_palette(d, p_shadow, p->maxval); - init_bg(d, p->shbg.pix, p->shbg.gc, p->s.width, p->s.height, sh_pal); + init_bg(d, p->shbg.pix, p->shbg.gc, p->s, sh_pal); if (!wf_pal) wf_pal = init_palette(d, p_waterfall, p->maxval); -- cgit v1.2.3