Cleanup

tui_main.c

@@ -3131,14 +3131,15 @@ int main(int argc, char **argv) {
           qnav_stack_pop();
           break;
         }
-        if (qmenu_drive(qm, key, &act)) {
+        if (!qmenu_drive(qm, key, &act))
+          break;
         switch (act.any.type) {
         case Qmenu_action_type_canceled:
           qnav_stack_pop();
           break;
-          case Qmenu_action_type_picked: {
+        case Qmenu_action_type_picked:
           switch (qmenu_id(qm)) {
-            case Main_menu_id: {
+          case Main_menu_id:
             switch (act.picked.id) {
             case Main_menu_quit:
               goto quit;
@@ -3186,7 +3187,6 @@ int main(int argc, char **argv) {
 #endif
             }
             break;
-            }
           case Autofit_menu_id: {
             Usz new_field_h, new_field_w;
             bool did_get_ok_size = false;
@@ -3202,9 +3202,8 @@ int main(int argc, char **argv) {
             }
             if (did_get_ok_size) {
               ged_resize_grid(&t.ged.field, &t.ged.mbuf_r, new_field_h,
-                                new_field_w, t.ged.tick_num,
-                                &t.ged.scratch_field, &t.ged.undo_hist,
-                                &t.ged.ged_cursor);
+                              new_field_w, t.ged.tick_num, &t.ged.scratch_field,
+                              &t.ged.undo_hist, &t.ged.ged_cursor);
               ged_update_internal_geometry(&t.ged);
               t.ged.needs_remarking = true;
               t.ged.is_draw_dirty = true;
@@ -3214,7 +3213,7 @@ int main(int argc, char **argv) {
             pop_qnav_if_main_menu();
             break;
           }
-            case Confirm_new_file_menu_id: {
+          case Confirm_new_file_menu_id:
             switch (act.picked.id) {
             case Confirm_new_file_reject_id:
               qnav_stack_pop();
@@ -3228,8 +3227,7 @@ int main(int argc, char **argv) {
                 field_resize_raw(&t.ged.field, new_field_h, new_field_w);
                 memset(t.ged.field.buffer, '.',
                        new_field_h * new_field_w * sizeof(Glyph));
-                  ged_cursor_confine(&t.ged.ged_cursor, new_field_h,
-                                     new_field_w);
+                ged_cursor_confine(&t.ged.ged_cursor, new_field_h, new_field_w);
                 mbuf_reusable_ensure_size(&t.ged.mbuf_r, new_field_h,
                                           new_field_w);
                 ged_update_internal_geometry(&t.ged);
@@ -3244,7 +3242,6 @@ int main(int argc, char **argv) {
             }
             }
             break;
-            }
           case Cosmetics_menu_id:
             switch (act.picked.id) {
             case Cosmetics_soft_margins_id:
@@ -3261,8 +3258,7 @@ int main(int argc, char **argv) {
             }
             break;
           case Set_fancy_grid_dots_menu_id:
-              plainorfancy_menu_was_picked(&t, act.picked.id,
-                                           &t.fancy_grid_dots,
+            plainorfancy_menu_was_picked(&t, act.picked.id, &t.fancy_grid_dots,
                                          Preftouch_griddotstype);
             break;
           case Set_fancy_grid_rulers_menu_id:
@@ -3274,8 +3270,7 @@ int main(int argc, char **argv) {
           case Portmidi_output_device_menu_id: {
             ged_stop_all_sustained_notes(&t.ged);
             midi_mode_deinit(&t.midi_mode);
-              PmError pme =
-                  midi_mode_init_portmidi(&t.midi_mode, act.picked.id);
+            PmError pme = midi_mode_init_portmidi(&t.midi_mode, act.picked.id);
             qnav_stack_pop();
             if (pme) {
               qmsg_printf_push("PortMidi Error",
@@ -3290,8 +3285,6 @@ int main(int argc, char **argv) {
           }
           break;
         }
-          }
-        }
         break;
       }
       case Qblock_type_qform: {