Revision 4d3b6f6e vl.c

b/vl.c
172 172
int vga_ram_size;
173 173
static DisplayState display_state;
174 174
int nographic;
175
int curses;
175 176
const char* keyboard_layout = NULL;
176 177
int64_t ticks_per_sec;
177 178
int ram_size;
......
7652 7653
           "                (default is CL-GD5446 PCI VGA)\n"
7653 7654
           "-no-acpi        disable ACPI\n"
7654 7655
#endif
7656
#ifdef CONFIG_CURSES
7657
           "-curses         use a curses/ncurses interface instead of SDL\n"
7658
#endif
7655 7659
           "-no-reboot      exit instead of rebooting\n"
7656 7660
           "-loadvm file    start right away with a saved state (loadvm in monitor)\n"
7657 7661
	   "-vnc display    start a VNC server on display\n"
......
7757 7761
    QEMU_OPTION_smp,
7758 7762
    QEMU_OPTION_vnc,
7759 7763
    QEMU_OPTION_no_acpi,
7764
    QEMU_OPTION_curses,
7760 7765
    QEMU_OPTION_no_reboot,
7761 7766
    QEMU_OPTION_show_cursor,
7762 7767
    QEMU_OPTION_daemonize,
......
7853 7858
    { "usbdevice", HAS_ARG, QEMU_OPTION_usbdevice },
7854 7859
    { "smp", HAS_ARG, QEMU_OPTION_smp },
7855 7860
    { "vnc", HAS_ARG, QEMU_OPTION_vnc },
7861
#ifdef CONFIG_CURSES
7862
    { "curses", 0, QEMU_OPTION_curses },
7863
#endif
7856 7864

  
7857 7865
    /* temporary options */
7858 7866
    { "usb", 0, QEMU_OPTION_usb },
......
8189 8197
#endif
8190 8198
    snapshot = 0;
8191 8199
    nographic = 0;
8200
    curses = 0;
8192 8201
    kernel_filename = NULL;
8193 8202
    kernel_cmdline = "";
8194 8203
    cyls = heads = secs = 0;
......
8363 8372
                pstrcpy(monitor_device, sizeof(monitor_device), "stdio");
8364 8373
                nographic = 1;
8365 8374
                break;
8375
#ifdef CONFIG_CURSES
8376
            case QEMU_OPTION_curses:
8377
                curses = 1;
8378
                break;
8379
#endif
8366 8380
            case QEMU_OPTION_portrait:
8367 8381
                graphic_rotate = 1;
8368 8382
                break;
......
8903 8917
    /* terminal init */
8904 8918
    memset(&display_state, 0, sizeof(display_state));
8905 8919
    if (nographic) {
8920
        if (curses) {
8921
            fprintf(stderr, "fatal: -nographic can't be used with -curses\n");
8922
            exit(1);
8923
        }
8906 8924
        /* nearly nothing to do */
8907 8925
        dumb_display_init(ds);
8908 8926
    } else if (vnc_display != NULL) {
8909 8927
        vnc_display_init(ds);
8910 8928
        if (vnc_display_open(ds, vnc_display) < 0)
8911 8929
            exit(1);
8912
    } else {
8930
    } else
8931
#if defined(CONFIG_CURSES)
8932
    if (curses) {
8933
        curses_display_init(ds, full_screen);
8934
    } else
8935
#endif
8936
    {
8913 8937
#if defined(CONFIG_SDL)
8914 8938
        sdl_display_init(ds, full_screen, no_frame);
8915 8939
#elif defined(CONFIG_COCOA)

Also available in: Unified diff