… | |
… | |
36 | #include "keyboard.h" |
36 | #include "keyboard.h" |
37 | #include "rxvtperl.h" |
37 | #include "rxvtperl.h" |
38 | |
38 | |
39 | #include <limits> |
39 | #include <limits> |
40 | |
40 | |
41 | #include <cassert> |
41 | #include <assert.h> |
42 | #include <csignal> |
42 | #include <signal.h> |
43 | #include <cstring> |
43 | #include <string.h> |
44 | |
44 | |
45 | #include <termios.h> |
45 | #include <termios.h> |
46 | |
46 | |
47 | #ifdef HAVE_XSETLOCALE |
47 | #ifdef HAVE_XSETLOCALE |
48 | # define X_LOCALE |
48 | # define X_LOCALE |
49 | # include <X11/Xlocale.h> |
49 | # include <X11/Xlocale.h> |
50 | #else |
50 | #else |
51 | # ifdef HAVE_SETLOCALE |
|
|
52 | # include <clocale> |
51 | # include <locale.h> |
53 | # endif |
|
|
54 | #endif |
52 | #endif |
55 | |
53 | |
56 | struct termios rxvt_term::def_tio; |
54 | struct termios rxvt_term::def_tio; |
57 | vector<rxvt_term *> rxvt_term::termlist; |
55 | vector<rxvt_term *> rxvt_term::termlist; |
58 | |
56 | |
… | |
… | |
350 | |
348 | |
351 | delete this; |
349 | delete this; |
352 | } |
350 | } |
353 | |
351 | |
354 | void |
352 | void |
355 | rxvt_term::set_option (uint8_t opt, bool set) |
353 | rxvt_term::set_option (uint8_t opt, bool set) NOTHROW |
356 | { |
354 | { |
357 | if (!opt) |
355 | if (!opt) |
358 | return; |
356 | return; |
359 | |
357 | |
360 | uint8_t mask = 1 << (opt & 7); |
358 | uint8_t mask = 1 << (opt & 7); |
… | |
… | |
376 | for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) |
374 | for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) |
377 | (*t)->emergency_cleanup (); |
375 | (*t)->emergency_cleanup (); |
378 | } |
376 | } |
379 | |
377 | |
380 | #if !ENABLE_MINIMAL |
378 | #if !ENABLE_MINIMAL |
381 | static void |
379 | static void ecb_cold |
382 | print_x_error (Display *dpy, XErrorEvent *event) |
380 | print_x_error (Display *dpy, XErrorEvent *event) |
383 | { |
381 | { |
384 | char buffer[BUFSIZ]; |
382 | char buffer[BUFSIZ]; |
385 | char mesg[BUFSIZ]; |
383 | char mesg[BUFSIZ]; |
386 | char number[32]; |
384 | char number[32]; |
… | |
… | |
424 | mesg, BUFSIZ); |
422 | mesg, BUFSIZ); |
425 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); |
423 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); |
426 | } |
424 | } |
427 | #endif |
425 | #endif |
428 | |
426 | |
429 | int |
427 | int ecb_cold |
430 | rxvt_xerror_handler (Display *display, XErrorEvent *event) |
428 | rxvt_xerror_handler (Display *display, XErrorEvent *event) |
431 | { |
429 | { |
432 | if (GET_R->allowedxerror == -1) |
430 | if (GET_R->allowedxerror == -1) |
433 | GET_R->allowedxerror = event->error_code; |
431 | GET_R->allowedxerror = event->error_code; |
434 | else |
432 | else |
… | |
… | |
443 | } |
441 | } |
444 | |
442 | |
445 | return 0; |
443 | return 0; |
446 | } |
444 | } |
447 | |
445 | |
448 | int |
446 | int ecb_cold |
449 | rxvt_xioerror_handler (Display *display) |
447 | rxvt_xioerror_handler (Display *display) |
450 | { |
448 | { |
451 | rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", |
449 | rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", |
452 | DisplayString (display)); |
450 | DisplayString (display)); |
453 | rxvt_emergency_cleanup (); |
451 | rxvt_emergency_cleanup (); |
… | |
… | |
710 | // size, i.e., when the wm does not honour our size hints, there are |
708 | // size, i.e., when the wm does not honour our size hints, there are |
711 | // extra areas not covered by the terminal screen. Such gaps, when a |
709 | // extra areas not covered by the terminal screen. Such gaps, when a |
712 | // bg pixmap is set, would have to be cleared manually to properly |
710 | // bg pixmap is set, would have to be cleared manually to properly |
713 | // refresh the background. We take the simpler route and shrink the |
711 | // refresh the background. We take the simpler route and shrink the |
714 | // vt window so as to avoid creating gaps. |
712 | // vt window so as to avoid creating gaps. |
715 | width = ncol * fwidth; |
713 | vt_width = ncol * fwidth; |
716 | height = nrow * fheight; |
714 | vt_height = nrow * fheight; |
717 | } |
715 | } |
718 | |
716 | |
719 | /*----------------------------------------------------------------------*/ |
717 | /*----------------------------------------------------------------------*/ |
720 | /* |
718 | /* |
721 | * Tell the teletype handler what size the window is. |
719 | * Tell the teletype handler what size the window is. |
… | |
… | |
729 | |
727 | |
730 | struct winsize ws; |
728 | struct winsize ws; |
731 | |
729 | |
732 | ws.ws_col = ncol; |
730 | ws.ws_col = ncol; |
733 | ws.ws_row = nrow; |
731 | ws.ws_row = nrow; |
734 | ws.ws_xpixel = width; |
732 | ws.ws_xpixel = vt_width; |
735 | ws.ws_ypixel = height; |
733 | ws.ws_ypixel = vt_height; |
736 | ioctl (pty->pty, TIOCSWINSZ, &ws); |
734 | ioctl (pty->pty, TIOCSWINSZ, &ws); |
737 | |
735 | |
738 | #if 0 |
736 | #if 0 |
739 | // TIOCSWINSZ is supposed to do this automatically and correctly |
737 | // TIOCSWINSZ is supposed to do this automatically and correctly |
740 | if (cmd_pid) /* force through to the command */ |
738 | if (cmd_pid) /* force through to the command */ |
… | |
… | |
766 | |
764 | |
767 | delete fontset[0]; |
765 | delete fontset[0]; |
768 | fontset[0] = fs; |
766 | fontset[0] = fs; |
769 | |
767 | |
770 | prop = (*fs)[rxvt_fontset::firstFont]->properties (); |
768 | prop = (*fs)[rxvt_fontset::firstFont]->properties (); |
771 | prop.height += lineSpace; |
|
|
772 | prop.width += letterSpace; |
769 | prop.width += letterSpace; |
773 | |
770 | |
774 | fs->set_prop (prop, false); |
771 | fs->set_prop (prop, false); |
775 | |
772 | |
776 | fwidth = prop.width; |
773 | fwidth = prop.width; |
777 | fheight = prop.height; |
774 | fheight = prop.height + lineSpace; |
778 | fbase = prop.ascent; |
775 | fbase = prop.ascent; |
779 | |
776 | |
780 | for (int style = 1; style < 4; style++) |
777 | for (int style = 1; style < 4; style++) |
781 | { |
778 | { |
782 | #if ENABLE_STYLES |
779 | #if ENABLE_STYLES |
… | |
… | |
1075 | if (scrollBar.state) |
1072 | if (scrollBar.state) |
1076 | scrollBar.resize (); |
1073 | scrollBar.resize (); |
1077 | |
1074 | |
1078 | XMoveResizeWindow (dpy, vt, |
1075 | XMoveResizeWindow (dpy, vt, |
1079 | window_vt_x, window_vt_y, |
1076 | window_vt_x, window_vt_y, |
1080 | width, height); |
1077 | vt_width, vt_height); |
1081 | |
1078 | |
1082 | #ifdef HAVE_BG_PIXMAP |
1079 | #ifdef HAVE_BG_PIXMAP |
1083 | if (bg_window_size_sensitive ()) |
1080 | if (bg_window_size_sensitive ()) |
1084 | update_background (); |
1081 | update_background (); |
1085 | #endif |
1082 | #endif |
… | |
… | |
1110 | newwidth = wattr.width - szHint.base_width; |
1107 | newwidth = wattr.width - szHint.base_width; |
1111 | if (newheight == 0) |
1108 | if (newheight == 0) |
1112 | newheight = wattr.height - szHint.base_height; |
1109 | newheight = wattr.height - szHint.base_height; |
1113 | } |
1110 | } |
1114 | |
1111 | |
1115 | if (newwidth != width || newheight != height) |
1112 | if (newwidth != vt_width || newheight != vt_height) |
1116 | { |
1113 | { |
1117 | newwidth += szHint.base_width; |
1114 | newwidth += szHint.base_width; |
1118 | newheight += szHint.base_height; |
1115 | newheight += szHint.base_height; |
1119 | resize_all_windows (newwidth, newheight, 0); |
1116 | resize_all_windows (newwidth, newheight, 0); |
1120 | } |
1117 | } |
… | |
… | |
1528 | im_destroy (); |
1525 | im_destroy (); |
1529 | |
1526 | |
1530 | if (Input_Context) |
1527 | if (Input_Context) |
1531 | return; |
1528 | return; |
1532 | |
1529 | |
1533 | #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) |
|
|
1534 | if (rs[Rs_imLocale]) |
1530 | if (rs[Rs_imLocale]) |
1535 | SET_LOCALE (rs[Rs_imLocale]); |
1531 | SET_LOCALE (rs[Rs_imLocale]); |
1536 | #endif |
|
|
1537 | |
1532 | |
1538 | p = rs[Rs_inputMethod]; |
1533 | p = rs[Rs_inputMethod]; |
1539 | if (p && *p) |
1534 | if (p && *p) |
1540 | { |
1535 | { |
1541 | bool found = false; |
1536 | bool found = false; |
… | |
… | |
1569 | /* try with no modifiers base IF the user didn't specify an IM */ |
1564 | /* try with no modifiers base IF the user didn't specify an IM */ |
1570 | if (im_get_ic ("@im=none")) |
1565 | if (im_get_ic ("@im=none")) |
1571 | goto done; |
1566 | goto done; |
1572 | |
1567 | |
1573 | done: |
1568 | done: |
1574 | #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) |
|
|
1575 | if (rs[Rs_imLocale]) |
1569 | if (rs[Rs_imLocale]) |
1576 | SET_LOCALE (locale); |
1570 | SET_LOCALE (locale); |
1577 | #endif |
|
|
1578 | } |
1571 | } |
1579 | |
1572 | |
1580 | void |
1573 | void |
1581 | rxvt_term::im_set_position () |
1574 | rxvt_term::im_set_position () |
1582 | { |
1575 | { |