aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2013-06-13 22:08:53 +0000
committerDimitri Sokolyuk <demon@dim13.org>2013-06-13 22:08:53 +0000
commit149c6099c2c25ceefe69e026533a7297a5de684f (patch)
treed79b8bb29a55d2ce935eded1be122fa54cd62ef6
parent93a2d2613c0362b3c8488ce0b46ec700b0f52ab2 (diff)
encapsulate black and white
-rw-r--r--spectrogram.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/spectrogram.c b/spectrogram.c
index 516f899..d968434 100644
--- a/spectrogram.c
+++ b/spectrogram.c
@@ -65,8 +65,6 @@ struct data {
int maxval;
unsigned long *wf;
unsigned long *sp;
- unsigned long black;
- unsigned long white;
};
void
@@ -197,7 +195,7 @@ draw(struct data *data)
XDrawPoint(dsp, pix, gc, rx, wf_right.y);
/* spectrogram neg mask */
- XSetForeground(dsp, gc, data->black);
+ XSetForeground(dsp, gc, data->wf[0]);
XDrawLine(dsp, pix, gc,
lx, sp_left.y,
lx, sp_left.y + sp_left.height - l - 1);
@@ -234,6 +232,8 @@ main(int argc, char **argv)
Atom delwin;
int scr;
+ unsigned long black;
+ unsigned long white;
struct sio *sio;
struct fft *fft;
@@ -262,8 +262,8 @@ main(int argc, char **argv)
if (!dsp)
errx(1, "Cannot connect to X11 server");
scr = DefaultScreen(dsp);
- data.black = BlackPixel(dsp, scr);
- data.white = WhitePixel(dsp, scr);
+ black = BlackPixel(dsp, scr);
+ white = WhitePixel(dsp, scr);
cmap = DefaultColormap(dsp, scr);
signal(SIGINT, catch);
@@ -280,7 +280,7 @@ main(int argc, char **argv)
height = 3 * width / 4;
win = XCreateSimpleWindow(dsp, RootWindow(dsp, scr), 0, 0,
- width, height, 2, data.white, data.black);
+ width, height, 2, white, black);
XStoreName(dsp, win, __progname);
delwin = XInternAtom(dsp, "WM_DELETE_WINDOW", 0);
XSetWMProtocols(dsp, win, &delwin, 1);