diff options
| -rw-r--r-- | zwgc/X_driver.c | 5 | ||||
| -rw-r--r-- | zwgc/standard_ports.c | 4 | ||||
| -rw-r--r-- | zwgc/tty_filter.c | 8 |
3 files changed, 12 insertions, 5 deletions
diff --git a/zwgc/X_driver.c b/zwgc/X_driver.c index 7e9b7ef..5b339d0 100644 --- a/zwgc/X_driver.c +++ b/zwgc/X_driver.c @@ -301,6 +301,8 @@ int open_display_and_load_resources(pargc, argv) int X_driver_ioerror(display) Display *display; { + extern void finalize_zephyr(); + ERROR2("X IO error on display '%s'--exiting\n", display->display_name); finalize_zephyr(); exit(1); @@ -314,8 +316,9 @@ Display *display; extern void x_get_input(); /*ARGSUSED*/ -int X_driver_init(drivername, pargc, argv) +int X_driver_init(drivername, notfirst, pargc, argv) char *drivername; + char notfirst; int *pargc; char **argv; { diff --git a/zwgc/standard_ports.c b/zwgc/standard_ports.c index 615a975..1d228d3 100644 --- a/zwgc/standard_ports.c +++ b/zwgc/standard_ports.c @@ -231,7 +231,9 @@ void init_standard_ports(pargc, argv) if (p->port_setup_status == DISABLED) continue; - if (p->port_init && (*(p->port_init))(p->port_name, pargc, argv)) { + if (p->port_init && (*(p->port_init))(p->port_name, + *first_working_port, + pargc, argv)) { p->port_setup_status = DISABLED; continue; } diff --git a/zwgc/tty_filter.c b/zwgc/tty_filter.c index 0e0e3fb..531cc2c 100644 --- a/zwgc/tty_filter.c +++ b/zwgc/tty_filter.c @@ -68,8 +68,9 @@ static string_dictionary termcap_dict; #define EAT_PADDING(var) while (*var && isdigit(*var)) var++ /* ARGSUSED */ -int tty_filter_init(drivername, pargc, argv) +int tty_filter_init(drivername, notfirst, pargc, argv) char *drivername; +char notfirst; int *pargc; char **argv; { @@ -82,8 +83,9 @@ char **argv; termcap_dict = string_dictionary_Create(7); if (!(term = getenv("TERM"))) { /* Only use termcap if $TERM. */ - if (isrealtty) - /* only complain if initializing tty mode */ + if (isrealtty && !notfirst) + /* only complain if initializing tty mode, and would be first + available port */ ERROR("$TERM not set. tty mode will be plain.\n"); } else { tgetent(tc_buf, term); |