diff -urN midi_prog-/Makefile midi_prog/Makefile --- midi_prog-/Makefile Sun Apr 27 22:00:00 2014 +++ midi_prog/Makefile Mon Apr 28 22:00:00 2014 @@ -1,6 +1,6 @@ CC = gcc LIB = -lm -lpthread -L../cui -lcui -TARG = prog37 +TARG = prog38 OBJS = main.o vcf.o ch.o delay.o stat.o note.o env.o tone.o filter.o lfo.o modu.o vco.o wave.o out.o rd.o util.o OBJS += cui_tone.o CFLAGS += -Wall -I.. diff -urN midi_prog-/cui_tone.c midi_prog/cui_tone.c --- midi_prog-/cui_tone.c Sun Apr 27 22:00:00 2014 +++ midi_prog/cui_tone.c Mon Apr 28 22:00:00 2014 @@ -5,6 +5,7 @@ #include "cui/menu.h" #include "cui/num.h" #include "cui/handler.h" +#include "cui/arg.h" #include "tone.h" #include "ch.h" @@ -150,7 +151,9 @@ char **av = (char **)arg; int init_ret = cui_init(av); - cui root = cui_scpanel_new(NULL, 0, 0, 44, 20, "cui_tone"); + int w = cui_arg_int(av, "-w", 0, NULL); + int h = cui_arg_int(av, "-h", 0, NULL); + cui root = cui_scpanel_new(NULL, 0, 0, w, h, "cui_tone"); cui sheet = cui_scpanel_sheet_get(root); cui ch, note, bs_ch, note_i, bs_vco, bs_filt, bs_env; cui bs_lfo_modu, bs_lfo, bs_env_modu, bs_delay; @@ -159,7 +162,7 @@ char *filt_lst[] = { "OFF", "LPF", "HPF", "BPF", NULL }; char *onoff_lst[] = { "OFF", "ON", NULL }; - ch = cui_menu_int_new(sheet, 0, 0, 2+1, 0, 0, 15); + ch = cui_menu_int_new(sheet, 0, 0, -1, 0, 0, 15); cui_wlb_name_new(sheet, "ch ", "ch", NULL); note = cui_num_new(sheet, CUI_CHILD_X2+1, CUI_CHILD_Y, 3+3, 69, 0, 127, 0); @@ -312,7 +315,8 @@ cui_wh_fit(bs_ch); cui_wh_fit(sheet); - cui_wh_set(root, sheet->w+2, sheet->h+2); + if(w == 0) cui_w_set(root, sheet->w+2); + if(h == 0) cui_h_set(root, sheet->h+2); cui_bind(ch, CUI_EVT_BUTTON, ch_note_hdr, sheet); cui_bind(note, CUI_EVT_BUTTON, ch_note_hdr, sheet);