From 339f99bc2a023c4392f1b316cd2baeda6703d1b6 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Wed, 10 Sep 2014 21:53:32 +0000 Subject: split code --- aux.c | 18 ++++++++++++++++++ aux.h | 1 + spectrogram.c | 13 +------------ 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/aux.c b/aux.c index 5012968..736e903 100644 --- a/aux.c +++ b/aux.c @@ -16,6 +16,7 @@ */ #include +#include #include @@ -76,3 +77,20 @@ move(Display *d, Window win, Window container) XMoveWindow(d, container, dx, dy); } + +void +restrictsize(Display *d, Window win, int minw, int minh, int maxw, int maxh) +{ + Atom nhints; + XSizeHints *hints; + + nhints = XInternAtom(d, "WM_NORMAL_HINTS", 0); + hints = XAllocSizeHints(); + hints->flags = PMinSize|PMaxSize; + hints->min_width = minw; + hints->min_height = minh; + hints->max_width = maxw; + hints->max_height = maxh; + XSetWMSizeHints(d, win, hints, nhints); + XFree(hints); +} diff --git a/aux.h b/aux.h index 4f731b4..c9f8075 100644 --- a/aux.h +++ b/aux.h @@ -22,6 +22,7 @@ __BEGIN_DECLS void fullscreen(Display *, Window); void hide_ptr(Display *, Window); void move(Display *, Window, Window); +void restrictsize(Display *, Window, int, int, int, int); __END_DECLS #endif diff --git a/spectrogram.c b/spectrogram.c index 08ddb5d..466917b 100644 --- a/spectrogram.c +++ b/spectrogram.c @@ -25,7 +25,6 @@ #include #include "aux.h" -#include "cms.h" #include "fft.h" #include "sio.h" #include "widget.h" @@ -59,8 +58,6 @@ main(int argc, char **argv) Display *dsp; Window win, container; Atom delwin; - Atom nhints; - XSizeHints *hints; XClassHint *class; XWindowAttributes wa; XRectangle geo; @@ -151,15 +148,7 @@ main(int argc, char **argv) XSetWMProtocols(dsp, win, &delwin, 1); /* set minimal size */ - nhints = XInternAtom(dsp, "WM_NORMAL_HINTS", 0); - hints = XAllocSizeHints(); - hints->flags = PMinSize|PMaxSize; - hints->min_width = width; - hints->min_height = height; - hints->max_width = maxwidth; - hints->max_height = maxheight; - XSetWMSizeHints(dsp, win, hints, nhints); - XFree(hints); + restrictsize(dsp, win, width, height, maxwidth, maxheight); container = XCreateSimpleWindow(dsp, win, 0, 0, width, height, 0, white, black); -- cgit v1.2.3