aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2014-09-26 16:43:22 +0000
committerDimitri Sokolyuk <demon@dim13.org>2014-09-26 16:43:22 +0000
commitfedf703a0a4412c736003a0aedc7e087e2897225 (patch)
tree65d8e3b3eb6a0861a74912e5403376e7b7d2fafb
parentfd8b0b6c5cf6a0fdb4bfab2187a6e95141ffdcbc (diff)
experimental Xaw Box
-rw-r--r--Display.c3
-rw-r--r--Makefile2
-rw-r--r--spectrogram.c11
3 files changed, 12 insertions, 4 deletions
diff --git a/Display.c b/Display.c
index 6a82b55..36b57eb 100644
--- a/Display.c
+++ b/Display.c
@@ -4,6 +4,9 @@
#include <X11/StringDefs.h>
#include "DisplayP.h"
+//static ChangeManaged(Widget);
+//static XtGeometryResult GeometryManager(Widget, XtWidgetGeometry *, XtWidgetGeometry *);
+
#define Offset(field) XtOffsetOf(DisplayRec, display.field)
static XtResource resources[] = {
};
diff --git a/Makefile b/Makefile
index 77029f6..141dc9a 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ VERSION=3.0
PROG= spectrogram
SRCS= spectrogram.c fft.c cms.c aux.c widget.c Sgraph.c Display.c
-LIBS= fftw3 xt xext xrender
+LIBS= fftw3 xaw7 xext xrender
BINDIR= /usr/local/bin
UNAME!= uname
diff --git a/spectrogram.c b/spectrogram.c
index 9a1b828..821e2e5 100644
--- a/spectrogram.c
+++ b/spectrogram.c
@@ -19,7 +19,8 @@
#include <X11/Xutil.h>
#include <X11/Intrinsic.h>
-#include "Display.h"
+//#include "Display.h"
+#include <X11/Xaw/Box.h>
#include "Sgraph.h"
#include <err.h>
@@ -121,13 +122,17 @@ main(int argc, char **argv)
init_fft(samples);
warnx("samples: %d", samples);
- display = XtCreateManagedWidget("Display", displayWidgetClass,
- toplevel, NULL, 0);
+ n = 0;
+ XtSetArg(args[n], XtNorientation, "horizontal"); n++;
+ display = XtCreateManagedWidget("Display", boxWidgetClass,
+ toplevel, args, n);
n = 0;
XtSetArg(args[n], XtNsamples, samples); n++;
sgraph = XtCreateManagedWidget("SGraph", sgraphWidgetClass,
display, args, n);
+ sgraph = XtCreateManagedWidget("SGraph", sgraphWidgetClass,
+ display, args, n);
XtOverrideTranslations(sgraph,
XtParseTranslationTable("<Key>q: quit()"));