heck
/
heck_orca-c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Remove unnecessary 'Prefs' loading struct 

Just load it directly into the Tui state.
master
cancel 5 years ago
parent
e4bb9a8100
commit
0fc2b52539
1 changed files with 86 additions and 118 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 204
      tui_main.c

204
tui_main.c
View File

@ -2463,26 +2463,6 @@ void try_send_to_gui_clipboard(Ged const *a, bool *io_use_gui_clipboard) {
} }
} }
typedef struct {
oso *portmidi_output_device;
oso *osc_output_address;
oso *osc_output_port;
int softmargin_y, softmargin_x;
bool osc_output_enabled : 1, fancy_grid_dots : 1, fancy_grid_rulers : 1;
U32 touched;
} Prefs;
void prefs_init(Prefs *p) { *p = (Prefs){0}; }
void prefs_deinit(Prefs *p) {
osofree(p->portmidi_output_device);
osofree(p->osc_output_address);
osofree(p->osc_output_port);
}
typedef enum {
Prefs_load_ok = 0,
} Prefs_load_error;
char const *const confopts[] = { char const *const confopts[] = {
"portmidi_output_device", "portmidi_output_device",
"osc_output_address", "osc_output_address",
@ -2544,32 +2524,65 @@ bool conf_read_boolish(char const *val, bool *out) {
return false; return false;
} }
typedef struct {
Ged ged;
Midi_mode midi_mode;
oso *file_name;
oso *osc_address, *osc_port;
int undo_history_limit;
int softmargin_y, softmargin_x;
int hardmargin_y, hardmargin_x;
U32 prefs_touched;
bool use_gui_cboard;
bool strict_timing;
bool osc_output_enabled;
bool fancy_grid_dots;
bool fancy_grid_rulers;
} Tui;
void print_loading_message(char const *s) {
Usz len = strlen(s);
if (len > INT_MAX)
return;
int h, w;
getmaxyx(stdscr, h, w);
int y = h / 2;
int x = (int)len < w ? (w - (int)len) / 2 : 0;
werase(stdscr);
wmove(stdscr, y, x);
waddstr(stdscr, s);
refresh();
}
ORCA_NOINLINE ORCA_NOINLINE
Prefs_load_error prefs_load_from_conf_file(Prefs *p) { void tui_load_prefs(Tui *t) {
oso *portmidi_output_device = NULL, *osc_output_address = NULL,
*osc_output_port = NULL;
U32 touched = 0;
Ezconf_r ez; Ezconf_r ez;
for (ezconf_r_start(&ez); ezconf_r_step(&ez, confopts, Confoptslen);) { for (ezconf_r_start(&ez); ezconf_r_step(&ez, confopts, Confoptslen);) {
switch (ez.index) { switch (ez.index) {
case Confopt_portmidi_output_device: case Confopt_portmidi_output_device:
osoput(&p->portmidi_output_device, ez.value); osoput(&portmidi_output_device, ez.value);
break; break;
case Confopt_osc_output_address: { case Confopt_osc_output_address: {
// Don't actually allocate heap string if string is empty // Don't actually allocate heap string if string is empty
Usz len = strlen(ez.value); Usz len = strlen(ez.value);
if (len > 0) if (len > 0)
osoputlen(&p->osc_output_address, ez.value, len); osoputlen(&osc_output_address, ez.value, len);
p->touched |= TOUCHFLAG(Confopt_osc_output_address); touched |= TOUCHFLAG(Confopt_osc_output_address);
break; break;
} }
case Confopt_osc_output_port: { case Confopt_osc_output_port: {
osoput(&p->osc_output_port, ez.value); osoput(&osc_output_port, ez.value);
p->touched |= TOUCHFLAG(Confopt_osc_output_port); touched |= TOUCHFLAG(Confopt_osc_output_port);
break; break;
} }
case Confopt_osc_output_enabled: { case Confopt_osc_output_enabled: {
bool enabled; bool enabled;
if (conf_read_boolish(ez.value, &enabled)) { if (conf_read_boolish(ez.value, &enabled)) {
p->osc_output_enabled = enabled; t->osc_output_enabled = enabled;
p->touched |= TOUCHFLAG(Confopt_osc_output_enabled); touched |= TOUCHFLAG(Confopt_osc_output_enabled);
} }
break; break;
} }
@ -2577,62 +2590,69 @@ Prefs_load_error prefs_load_from_conf_file(Prefs *p) {
int softmargin_y, softmargin_x; int softmargin_y, softmargin_x;
if (read_nxn_or_n(ez.value, &softmargin_x, &softmargin_y) && if (read_nxn_or_n(ez.value, &softmargin_x, &softmargin_y) &&
softmargin_y >= 0 && softmargin_x >= 0) { softmargin_y >= 0 && softmargin_x >= 0) {
p->softmargin_y = softmargin_y; t->softmargin_y = softmargin_y;
p->softmargin_x = softmargin_x; t->softmargin_x = softmargin_x;
p->touched |= TOUCHFLAG(Confopt_margins); touched |= TOUCHFLAG(Confopt_margins);
} }
break; break;
} }
case Confopt_grid_dot_type: { case Confopt_grid_dot_type: {
bool fancy; bool fancy;
if (plainorfancy(ez.value, &fancy)) { if (plainorfancy(ez.value, &fancy)) {
p->fancy_grid_dots = fancy; t->fancy_grid_dots = fancy;
p->touched |= TOUCHFLAG(Confopt_grid_dot_type); touched |= TOUCHFLAG(Confopt_grid_dot_type);
} }
break; break;
} }
case Confopt_grid_ruler_type: { case Confopt_grid_ruler_type: {
bool fancy; bool fancy;
if (plainorfancy(ez.value, &fancy)) { if (plainorfancy(ez.value, &fancy)) {
p->fancy_grid_rulers = fancy; t->fancy_grid_rulers = fancy;
p->touched |= TOUCHFLAG(Confopt_grid_ruler_type); touched |= TOUCHFLAG(Confopt_grid_ruler_type);
} }
break; break;
} }
} }
} }
return Prefs_load_ok;
}
void print_loading_message(char const *s) { if (touched & TOUCHFLAG(Confopt_osc_output_address)) {
Usz len = strlen(s); ososwap(&t->osc_address, &osc_output_address);
if (len > INT_MAX) } else {
return; // leave null
int h, w; }
getmaxyx(stdscr, h, w); if (touched & TOUCHFLAG(Confopt_osc_output_port)) {
int y = h / 2; ososwap(&t->osc_port, &osc_output_port);
int x = (int)len < w ? (w - (int)len) / 2 : 0; } else {
werase(stdscr); osoput(&t->osc_port, "49162");
wmove(stdscr, y, x); }
waddstr(stdscr, s);
refresh();
}
typedef struct { #ifdef FEAT_PORTMIDI
Ged ged; if (t->midi_mode.any.type == Midi_mode_type_null &&
Midi_mode midi_mode; osolen(portmidi_output_device)) {
oso *file_name; // PortMidi can be hilariously slow to initialize. Since it will be
oso *osc_address, *osc_port; // initialized automatically if the user has a prefs entry for PortMidi
int undo_history_limit; // devices, we should show a message to the user letting them know why
int softmargin_y, softmargin_x; // orca is locked up/frozen. (When it's done via menu action, that's
int hardmargin_y, hardmargin_x; // fine, since they can figure out why.)
U32 prefs_touched; print_loading_message("Waiting on PortMidi...");
bool use_gui_cboard; PmError pmerr;
bool strict_timing; PmDeviceID devid;
bool osc_output_enabled; if (portmidi_find_device_id_by_name(osoc(portmidi_output_device),
bool fancy_grid_dots; osolen(portmidi_output_device), &pmerr,
bool fancy_grid_rulers; &devid)) {
} Tui; midi_mode_deinit(&t->midi_mode);
pmerr = midi_mode_init_portmidi(&t->midi_mode, devid);
if (pmerr) {
// todo stuff
}
}
}
#endif
t->prefs_touched |= touched;
osofree(portmidi_output_device);
osofree(osc_output_address);
osofree(osc_output_port);
}
void tui_save_prefs(Tui *t) { void tui_save_prefs(Tui *t) {
Ezconf_opt optsbuff[Confoptslen]; Ezconf_opt optsbuff[Confoptslen];
@ -3414,59 +3434,7 @@ int main(int argc, char **argv) {
printf("\033[?2004h\n"); // Ask terminal to use bracketed paste. printf("\033[?2004h\n"); // Ask terminal to use bracketed paste.
Prefs prefs; tui_load_prefs(&t);
prefs_init(&prefs);
Prefs_load_error prefserr = prefs_load_from_conf_file(&prefs);
if (prefserr == Prefs_load_ok) {
t.prefs_touched |= prefs.touched;
if (prefs.touched & TOUCHFLAG(Confopt_osc_output_address)) {
ososwap(&t.osc_address, &prefs.osc_output_address);
} else {
// leave null
}
if (prefs.touched & TOUCHFLAG(Confopt_osc_output_port)) {
ososwap(&t.osc_port, &prefs.osc_output_port);
} else {
osoput(&t.osc_port, "49162");
}
if (prefs.touched & TOUCHFLAG(Confopt_osc_output_enabled)) {
t.osc_output_enabled = prefs.osc_output_enabled;
}
if (prefs.touched & TOUCHFLAG(Confopt_margins)) {
t.softmargin_y = prefs.softmargin_y;
t.softmargin_x = prefs.softmargin_x;
}
if (prefs.touched & TOUCHFLAG(Confopt_grid_dot_type)) {
t.fancy_grid_dots = prefs.fancy_grid_dots;
}
if (prefs.touched & TOUCHFLAG(Confopt_grid_ruler_type)) {
t.fancy_grid_rulers = prefs.fancy_grid_rulers;
}
#ifdef FEAT_PORTMIDI
if (t.midi_mode.any.type == Midi_mode_type_null &&
osolen(prefs.portmidi_output_device)) {
// PortMidi can be hilariously slow to initialize. Since it will be
// initialized automatically if the user has a prefs entry for PortMidi
// devices, we should show a message to the user letting them know why
// orca is locked up/frozen. (When it's done via menu action, that's
// fine, since they can figure out why.)
print_loading_message("Waiting on PortMidi...");
PmError pmerr;
PmDeviceID devid;
if (portmidi_find_device_id_by_name(osoc(prefs.portmidi_output_device),
osolen(prefs.portmidi_output_device),
&pmerr, &devid)) {
midi_mode_deinit(&t.midi_mode);
pmerr = midi_mode_init_portmidi(&t.midi_mode, devid);
if (pmerr) {
// todo stuff
}
}
}
#endif
}
prefs_deinit(&prefs);
tui_restart_osc_udp_if_enabled(&t); tui_restart_osc_udp_if_enabled(&t);
WINDOW *cont_window = NULL; // No window yet, wait for resize WINDOW *cont_window = NULL; // No window yet, wait for resize

Write Preview
Loading…
Cancel
Save