diff options
| author | Richard M. Stallman <[email protected]> | 1995-02-14 14:22:29 +0000 |
|---|---|---|
| committer | Richard M. Stallman <[email protected]> | 1995-02-14 14:22:29 +0000 |
| commit | 92e2441bd19f0d368851ed12a14616bf6e414164 (patch) | |
| tree | e0bbcb5126b12005944ab8f7d3684ed8fe1e9db4 /src/xterm.c | |
| parent | c32112069d0291f615d649cb4d0500bcfc170aab (diff) | |
(x_display_bar_cursor): Use frame's cursor_width.
(x_connection_signal): New function.
(x_initialize): Use it as signal handler.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/xterm.c b/src/xterm.c index 62e7072dc4..9755900229 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -4127,7 +4127,8 @@ x_display_bar_cursor (f, on) f->display.x->cursor_gc, CHAR_TO_PIXEL_COL (f, curs_x), CHAR_TO_PIXEL_ROW (f, curs_y), - 1, f->display.x->line_height); + max (f->display.x->cursor_width, 1), + f->display.x->line_height); f->phys_cursor_x = curs_x; f->phys_cursor_y = curs_y; @@ -4404,6 +4405,18 @@ x_connection_closed (display, error_message) error ("%s", error_message); } +static SIGTYPE +x_connection_signal (signalnum) /* If we don't have an argument, */ + int signalnum; /* some compilers complain in signal calls. */ +{ + /* We really ought to close the connection to the display + that actually failed. + But do we actually get this signal ever with X11? */ + fprintf (stderr, "X connection closed"); + shut_down_emacs (0, 0, Qnil); + exit (70); +} + /* This is the usual handler for X protocol errors. It kills all frames on the display that we got the error for. If that was the only one, it prints an error message and kills Emacs. */ @@ -5836,7 +5849,7 @@ x_initialize () signal (SIGWINCH, SIG_DFL); #endif /* ! defined (SIGWINCH) */ - signal (SIGPIPE, x_connection_closed); + signal (SIGPIPE, x_connection_signal); } void |