1 | /*--------------------------------*-C-*---------------------------------* |
1 | /*--------------------------------*-C-*---------------------------------* |
2 | * File: command.c |
2 | * File: command.c |
3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
4 | * $Id: command.C,v 1.19 2003/12/18 05:45:11 pcg Exp $ |
4 | * $Id: command.C,v 1.32 2004/01/29 23:31:45 pcg Exp $ |
5 | * |
5 | * |
6 | * All portions of code are copyright by their respective author/s. |
6 | * All portions of code are copyright by their respective author/s. |
7 | * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> |
7 | * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> |
8 | * - original version |
8 | * - original version |
9 | * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> |
9 | * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> |
… | |
… | |
48 | #include "../config.h" /* NECESSARY */ |
48 | #include "../config.h" /* NECESSARY */ |
49 | #include "rxvt.h" /* NECESSARY */ |
49 | #include "rxvt.h" /* NECESSARY */ |
50 | #include "version.h" |
50 | #include "version.h" |
51 | #include "command.h" |
51 | #include "command.h" |
52 | |
52 | |
|
|
53 | #include <wchar.h> |
|
|
54 | |
53 | /*----------------------------------------------------------------------*/ |
55 | /*----------------------------------------------------------------------*/ |
54 | |
56 | |
55 | /*{{{ Convert the keypress event into a string */ |
57 | /*{{{ Convert the keypress event into a string */ |
56 | /* INTPROTO */ |
58 | /* INTPROTO */ |
57 | void |
59 | void |
… | |
… | |
62 | KeySym keysym; |
64 | KeySym keysym; |
63 | #ifdef DEBUG_CMD |
65 | #ifdef DEBUG_CMD |
64 | static int debug_key = 1; /* accessible by a debugger only */ |
66 | static int debug_key = 1; /* accessible by a debugger only */ |
65 | #endif |
67 | #endif |
66 | int valid_keysym; |
68 | int valid_keysym; |
67 | unsigned char *kbuf = R->kbuf; |
69 | unsigned char kbuf[KBUFSZ]; |
68 | |
70 | |
69 | /* |
71 | /* |
70 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
72 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
71 | * escape sequence to toggle the Keypad. |
73 | * escape sequence to toggle the Keypad. |
72 | * |
74 | * |
… | |
… | |
88 | if (R->Input_Context) |
90 | if (R->Input_Context) |
89 | { |
91 | { |
90 | Status status_return; |
92 | Status status_return; |
91 | |
93 | |
92 | #ifdef X_HAVE_UTF8_STRING |
94 | #ifdef X_HAVE_UTF8_STRING |
|
|
95 | if (R->enc_utf8 && 0) |
93 | len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf, |
96 | len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf, |
94 | KBUFSZ, &keysym, &status_return); |
97 | KBUFSZ, &keysym, &status_return); |
95 | #else |
98 | else |
96 | wchar_t wkbuf[KBUFSZ + 1]; |
99 | #endif |
97 | |
|
|
98 | // assume wchar_t == unicode or better |
|
|
99 | len = XwcLookupString (R->Input_Context, ev, wkbuf, |
|
|
100 | KBUFSZ, &keysym, &status_return); |
|
|
101 | |
|
|
102 | if (status_return == XLookupChars |
|
|
103 | || status_return == XLookupBoth) |
|
|
104 | { |
100 | { |
|
|
101 | wchar_t wkbuf[KBUFSZ + 1]; |
|
|
102 | |
|
|
103 | // the XOpenIM manpage lies about hardcoding the locale |
|
|
104 | // at the point of XOpenIM, so temporarily switch locales |
|
|
105 | if (R->rs[Rs_imLocale]) |
|
|
106 | SET_LOCALE (R->rs[Rs_imLocale]); |
|
|
107 | // assume wchar_t == unicode or better |
|
|
108 | len = XwcLookupString (R->Input_Context, ev, wkbuf, |
|
|
109 | KBUFSZ, &keysym, &status_return); |
|
|
110 | if (R->rs[Rs_imLocale]) |
|
|
111 | SET_LOCALE (R->locale); |
|
|
112 | |
|
|
113 | if (status_return == XLookupChars |
|
|
114 | || status_return == XLookupBoth) |
|
|
115 | { |
105 | wkbuf[len] = 0; |
116 | wkbuf[len] = 0; |
106 | len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); |
117 | len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); |
|
|
118 | if (len < 0) |
|
|
119 | len = 0; |
|
|
120 | } |
|
|
121 | else |
|
|
122 | len = 0; |
107 | } |
123 | } |
108 | else |
124 | |
109 | len = 0; |
|
|
110 | #endif |
|
|
111 | valid_keysym = status_return == XLookupKeySym |
125 | valid_keysym = status_return == XLookupKeySym |
112 | || status_return == XLookupBoth; |
126 | || status_return == XLookupBoth; |
113 | } |
127 | } |
114 | else |
128 | else |
115 | #endif |
129 | #endif |
… | |
… | |
621 | for (i = 0, p = kbuf; i < len; i++, p++) |
635 | for (i = 0, p = kbuf; i < len; i++, p++) |
622 | fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); |
636 | fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); |
623 | fprintf(stderr, "'\n"); |
637 | fprintf(stderr, "'\n"); |
624 | } |
638 | } |
625 | #endif /* DEBUG_CMD */ |
639 | #endif /* DEBUG_CMD */ |
626 | R->tt_write(kbuf, (unsigned int)len); |
640 | R->tt_write (kbuf, (unsigned int)len); |
627 | } |
641 | } |
628 | /*}}} */ |
642 | /*}}} */ |
629 | |
643 | |
630 | #if (MENUBAR_MAX) |
644 | #if (MENUBAR_MAX) |
631 | /*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ |
645 | /*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ |
… | |
… | |
665 | { |
679 | { |
666 | #ifdef TRANSPARENT |
680 | #ifdef TRANSPARENT |
667 | if (want_full_refresh) |
681 | if (want_full_refresh) |
668 | { |
682 | { |
669 | want_full_refresh = 0; |
683 | want_full_refresh = 0; |
670 | rxvt_scr_clear (this); |
684 | scr_clear (); |
671 | rxvt_scr_touch (this, False); |
685 | scr_touch (false); |
672 | want_refresh = 1; |
686 | want_refresh = 1; |
673 | } |
687 | } |
674 | #endif |
688 | #endif |
675 | |
689 | |
676 | if (want_refresh) |
690 | if (want_refresh) |
677 | { |
691 | { |
678 | rxvt_scr_refresh (this, refresh_type); |
692 | scr_refresh (refresh_type); |
679 | rxvt_scrollbar_show (this, 1); |
693 | rxvt_scrollbar_show (this, 1); |
680 | #ifdef USE_XIM |
694 | #ifdef USE_XIM |
681 | rxvt_IMSendSpot (this); |
695 | rxvt_IMSendSpot (this); |
682 | #endif |
696 | #endif |
683 | } |
697 | } |
684 | |
698 | |
685 | XFlush (Xdisplay); |
699 | XFlush (Xdisplay); |
686 | #if 0 |
|
|
687 | if (XPending (Xdisplay)) process_x_events (); |
|
|
688 | if (XPending (Xdisplay)) process_x_events (); |
|
|
689 | #endif |
|
|
690 | } |
700 | } |
691 | |
701 | |
692 | void |
702 | void |
693 | rxvt_term::check_cb (check_watcher &w) |
703 | rxvt_term::check_cb (check_watcher &w) |
694 | { |
704 | { |
… | |
… | |
706 | XEvent xev; |
716 | XEvent xev; |
707 | |
717 | |
708 | XNextEvent (Xdisplay, &xev); |
718 | XNextEvent (Xdisplay, &xev); |
709 | |
719 | |
710 | #if defined(CURSOR_BLINK) |
720 | #if defined(CURSOR_BLINK) |
711 | if ((Options & Opt_cursorBlink) |
721 | if ((Options & Opt_cursorBlink) && xev.type == KeyPress) |
712 | && xev.type == KeyPress) |
|
|
713 | { |
722 | { |
714 | if (hidden_cursor) |
723 | if (hidden_cursor) |
715 | { |
724 | { |
716 | hidden_cursor = 0; |
725 | hidden_cursor = 0; |
717 | want_refresh = 1; |
726 | want_refresh = 1; |
718 | } |
727 | } |
719 | |
728 | |
720 | blink_ev.start (NOW + BLINK_INTERVAL); |
729 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
721 | } |
730 | } |
722 | #endif |
731 | #endif |
723 | |
732 | |
724 | #if defined(POINTER_BLANK) |
733 | #if defined(POINTER_BLANK) |
725 | if ((Options & Opt_pointerBlank) |
734 | if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) |
726 | && (pointerBlankDelay > 0)) |
|
|
727 | { |
735 | { |
728 | if (xev.type == MotionNotify |
736 | if (xev.type == MotionNotify |
729 | || xev.type == ButtonPress |
737 | || xev.type == ButtonPress |
730 | || xev.type == ButtonRelease) |
738 | || xev.type == ButtonRelease) |
731 | if (hidden_pointer) |
739 | if (hidden_pointer) |
… | |
… | |
742 | rxvt_process_x_event (this, &xev); |
750 | rxvt_process_x_event (this, &xev); |
743 | } |
751 | } |
744 | while (XPending (Xdisplay)); |
752 | while (XPending (Xdisplay)); |
745 | } |
753 | } |
746 | |
754 | |
|
|
755 | #ifdef CURSOR_BLINK |
747 | void |
756 | void |
748 | rxvt_term::blink_cb (time_watcher &w) |
757 | rxvt_term::cursor_blink_cb (time_watcher &w) |
749 | { |
758 | { |
750 | w.at += BLINK_INTERVAL; |
|
|
751 | hidden_cursor = !hidden_cursor; |
759 | hidden_cursor = !hidden_cursor; |
752 | want_refresh = 1; |
760 | want_refresh = 1; |
|
|
761 | |
|
|
762 | w.start (w.at + BLINK_INTERVAL); |
753 | } |
763 | } |
|
|
764 | #endif |
|
|
765 | |
|
|
766 | #ifdef TEXT_BLINK |
|
|
767 | void |
|
|
768 | rxvt_term::text_blink_cb (time_watcher &w) |
|
|
769 | { |
|
|
770 | if (scr_refresh_rend (RS_Blink, RS_Blink)) |
|
|
771 | { |
|
|
772 | hidden_text = !hidden_text; |
|
|
773 | want_refresh = 1; |
|
|
774 | w.start (w.at + TEXT_BLINK_INTERVAL); |
|
|
775 | } |
|
|
776 | } |
|
|
777 | #endif |
754 | |
778 | |
755 | void |
779 | void |
756 | rxvt_term::x_cb (io_watcher &w, short revents) |
780 | rxvt_term::x_cb (io_watcher &w, short revents) |
757 | { |
781 | { |
758 | SET_R (this); |
782 | SET_R (this); |
… | |
… | |
873 | if (refreshnow) |
897 | if (refreshnow) |
874 | { |
898 | { |
875 | if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
899 | if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
876 | refresh_limit++; |
900 | refresh_limit++; |
877 | |
901 | |
878 | rxvt_scr_refresh (this, refresh_type); |
902 | scr_refresh (refresh_type); |
879 | } |
903 | } |
880 | |
904 | |
881 | } |
905 | } |
882 | else |
906 | else |
883 | { |
907 | { |
… | |
… | |
903 | // read the next character, currently handles UTF-8 |
927 | // read the next character, currently handles UTF-8 |
904 | // will probably handle all sorts of other stuff in the future |
928 | // will probably handle all sorts of other stuff in the future |
905 | uint32_t |
929 | uint32_t |
906 | rxvt_term::next_char () |
930 | rxvt_term::next_char () |
907 | { |
931 | { |
908 | struct mbstate &s = mbstate; |
|
|
909 | |
|
|
910 | while (cmdbuf_ptr < cmdbuf_endp) |
932 | while (cmdbuf_ptr < cmdbuf_endp) |
911 | { |
933 | { |
912 | uint8_t ch = *cmdbuf_ptr; |
934 | if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh |
913 | |
|
|
914 | if (s.cnt) |
|
|
915 | { |
|
|
916 | if ((ch & 0xc0) == 0x80) |
|
|
917 | { |
|
|
918 | cmdbuf_ptr++; |
|
|
919 | |
|
|
920 | /* continuation */ |
|
|
921 | s.reg = (s.reg << 6) | (ch & 0x7f); |
|
|
922 | |
|
|
923 | if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */ |
|
|
924 | return s.reg; |
|
|
925 | |
|
|
926 | continue; |
|
|
927 | } |
|
|
928 | else |
|
|
929 | { |
|
|
930 | s.cnt = 0; |
|
|
931 | return s.orig; /* the _occasional_ non-utf-8 character may slip through... */ |
|
|
932 | } |
|
|
933 | } |
|
|
934 | |
|
|
935 | if ((ch & 0xc0) == 0xc0) |
|
|
936 | { |
|
|
937 | cmdbuf_ptr++; |
935 | return *cmdbuf_ptr++; |
938 | |
936 | |
939 | /* first byte */ |
937 | wchar_t wc; |
940 | s.orig = ch; /* for broken encodings */ |
938 | int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); |
941 | s.reg = ch; |
939 | |
942 | if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } |
940 | if (len == (size_t)-2) |
943 | if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; } |
941 | return NOCHAR; |
944 | if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; } |
942 | |
945 | if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } |
943 | if (len == (size_t)-1) |
946 | if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } |
944 | return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
947 | } |
945 | |
948 | else |
946 | // assume wchar == unicode |
949 | { |
947 | cmdbuf_ptr += len; |
950 | cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */ |
|
|
951 | return ch; |
948 | return wc; |
952 | } |
|
|
953 | } |
949 | } |
954 | |
950 | |
955 | return NOCHAR; |
951 | return NOCHAR; |
956 | } |
952 | } |
957 | |
953 | |
… | |
… | |
1009 | if (R->pending_scroll_selection) { |
1005 | if (R->pending_scroll_selection) { |
1010 | quick_timeout = 1; |
1006 | quick_timeout = 1; |
1011 | if (!R->scroll_selection_delay-- |
1007 | if (!R->scroll_selection_delay-- |
1012 | && rxvt_scr_page(aR_ R->scroll_selection_dir, |
1008 | && rxvt_scr_page(aR_ R->scroll_selection_dir, |
1013 | R->scroll_selection_lines)) { |
1009 | R->scroll_selection_lines)) { |
1014 | rxvt_selection_extend(aR_ R->selection_save_x, |
1010 | R->selection_extend (R->selection_save_x, |
1015 | R->selection_save_y, R->selection_save_state); |
1011 | R->selection_save_y, R->selection_save_state); |
1016 | R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; |
1012 | R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; |
1017 | R->refresh_type |= SMOOTH_REFRESH; |
1013 | R->refresh_type |= SMOOTH_REFRESH; |
1018 | R->want_refresh = 1; |
1014 | R->want_refresh = 1; |
1019 | } |
1015 | } |
… | |
… | |
1035 | quick_timeout |= R->want_full_refresh; |
1031 | quick_timeout |= R->want_full_refresh; |
1036 | #endif |
1032 | #endif |
1037 | #endif |
1033 | #endif |
1038 | } |
1034 | } |
1039 | |
1035 | |
|
|
1036 | #ifdef POINTER_BLANK |
1040 | void |
1037 | void |
1041 | rxvt_term::pointer_unblank () |
1038 | rxvt_term::pointer_unblank () |
1042 | { |
1039 | { |
1043 | XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); |
1040 | XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); |
1044 | recolour_cursor (); |
1041 | recolour_cursor (); |
1045 | |
1042 | |
1046 | #ifdef POINTER_BLANK |
|
|
1047 | hidden_pointer = 0; |
1043 | hidden_pointer = 0; |
1048 | |
1044 | |
1049 | if (Options & Opt_pointerBlank) |
1045 | if (Options & Opt_pointerBlank) |
1050 | pointer_ev.start (NOW + pointerBlankDelay); |
1046 | pointer_ev.start (NOW + pointerBlankDelay); |
1051 | #endif |
|
|
1052 | } |
1047 | } |
1053 | |
1048 | |
1054 | #ifdef POINTER_BLANK |
|
|
1055 | void |
1049 | void |
1056 | rxvt_term::pointer_blank () |
1050 | rxvt_term::pointer_blank () |
1057 | { |
1051 | { |
1058 | pointer_ev.stop (); |
|
|
1059 | |
|
|
1060 | if (!(Options & Opt_pointerBlank)) |
1052 | if (!(Options & Opt_pointerBlank)) |
1061 | return; |
1053 | return; |
1062 | |
1054 | |
1063 | XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); |
1055 | XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); |
1064 | XFlush (Xdisplay); |
1056 | XFlush (Xdisplay); |
… | |
… | |
1083 | int button_number, key_state = 0; |
1075 | int button_number, key_state = 0; |
1084 | int x, y; |
1076 | int x, y; |
1085 | |
1077 | |
1086 | x = ev->x; |
1078 | x = ev->x; |
1087 | y = ev->y; |
1079 | y = ev->y; |
1088 | rxvt_pixel_position(aR_ &x, &y); |
1080 | R->pixel_position (&x, &y); |
1089 | |
1081 | |
1090 | if (R->MEvent.button == AnyButton) { |
1082 | if (R->MEvent.button == AnyButton) { |
1091 | button_number = 3; |
1083 | button_number = 3; |
1092 | } else { |
1084 | } else { |
1093 | button_number = R->MEvent.button - Button1; |
1085 | button_number = R->MEvent.button - Button1; |
… | |
… | |
1311 | if (R->Input_Context != NULL) |
1303 | if (R->Input_Context != NULL) |
1312 | XSetICFocus(R->Input_Context); |
1304 | XSetICFocus(R->Input_Context); |
1313 | #endif |
1305 | #endif |
1314 | #ifdef CURSOR_BLINK |
1306 | #ifdef CURSOR_BLINK |
1315 | if (R->Options & Opt_cursorBlink) |
1307 | if (R->Options & Opt_cursorBlink) |
1316 | R->blink_ev.start (NOW + BLINK_INTERVAL); |
1308 | R->cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1317 | #endif |
1309 | #endif |
1318 | } |
1310 | } |
1319 | break; |
1311 | break; |
1320 | |
1312 | |
1321 | case FocusOut: |
1313 | case FocusOut: |
… | |
… | |
1326 | if (R->Input_Context != NULL) |
1318 | if (R->Input_Context != NULL) |
1327 | XUnsetICFocus(R->Input_Context); |
1319 | XUnsetICFocus(R->Input_Context); |
1328 | #endif |
1320 | #endif |
1329 | #ifdef CURSOR_BLINK |
1321 | #ifdef CURSOR_BLINK |
1330 | if (R->Options & Opt_cursorBlink) |
1322 | if (R->Options & Opt_cursorBlink) |
1331 | R->blink_ev.stop (); |
1323 | R->cursor_blink_ev.stop (); |
1332 | R->hidden_cursor = 0; |
1324 | R->hidden_cursor = 0; |
1333 | #endif |
1325 | #endif |
1334 | } |
1326 | } |
1335 | break; |
1327 | break; |
1336 | |
1328 | |
… | |
… | |
1344 | D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); |
1336 | D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); |
1345 | } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, |
1337 | } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, |
1346 | ConfigureNotify, ev)); |
1338 | ConfigureNotify, ev)); |
1347 | if (R->szHint.width != width || R->szHint.height != height) { |
1339 | if (R->szHint.width != width || R->szHint.height != height) { |
1348 | D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height)); |
1340 | D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height)); |
1349 | rxvt_resize_all_windows(aR_ (unsigned int)width, |
1341 | R->resize_all_windows (width, height, 1); |
1350 | (unsigned int)height, 1); |
|
|
1351 | } |
1342 | } |
1352 | #ifdef DEBUG_SIZE |
1343 | #ifdef DEBUG_SIZE |
1353 | else { |
1344 | else { |
1354 | D_SIZE((stderr, "Size: Not resizing")); |
1345 | D_SIZE((stderr, "Size: Not resizing")); |
1355 | } |
1346 | } |
… | |
… | |
1378 | rxvt_selection_send(aR_ &(ev->xselectionrequest)); |
1369 | rxvt_selection_send(aR_ &(ev->xselectionrequest)); |
1379 | break; |
1370 | break; |
1380 | |
1371 | |
1381 | case UnmapNotify: |
1372 | case UnmapNotify: |
1382 | R->TermWin.mapped = 0; |
1373 | R->TermWin.mapped = 0; |
|
|
1374 | #ifdef TEXT_BLINK |
|
|
1375 | R->text_blink_ev.stop (); |
|
|
1376 | #endif |
1383 | break; |
1377 | break; |
1384 | |
1378 | |
1385 | case MapNotify: |
1379 | case MapNotify: |
1386 | R->TermWin.mapped = 1; |
1380 | R->TermWin.mapped = 1; |
|
|
1381 | #ifdef TEXT_BLINK |
|
|
1382 | R->text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1383 | #endif |
1387 | break; |
1384 | break; |
1388 | |
1385 | |
1389 | case PropertyNotify: |
1386 | case PropertyNotify: |
1390 | if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) { |
1387 | if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) { |
1391 | if (ev->xproperty.state == PropertyNewValue) |
1388 | if (ev->xproperty.state == PropertyNewValue) |
… | |
… | |
1414 | |
1411 | |
1415 | case GraphicsExpose: |
1412 | case GraphicsExpose: |
1416 | case Expose: |
1413 | case Expose: |
1417 | if (ev->xany.window == R->TermWin.vt) { |
1414 | if (ev->xany.window == R->TermWin.vt) { |
1418 | #ifdef NO_SLOW_LINK_SUPPORT |
1415 | #ifdef NO_SLOW_LINK_SUPPORT |
1419 | rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, |
1416 | R->scr_expose (ev->xexpose.x, ev->xexpose.y, |
1420 | ev->xexpose.width, ev->xexpose.height, False); |
1417 | ev->xexpose.width, ev->xexpose.height, False); |
1421 | #else |
1418 | #else |
1422 | // don't understand this, so commented it out |
1419 | // don't understand this, so commented it out |
1423 | rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, |
1420 | R->scr_expose (ev->xexpose.x, ev->xexpose.y, |
1424 | ev->xexpose.width, ev->xexpose.height, False); |
1421 | ev->xexpose.width, ev->xexpose.height, False); |
1425 | //rxvt_scr_expose(aR_ ev->xexpose.x, 0, |
1422 | //rxvt_scr_expose(aR_ ev->xexpose.x, 0, |
1426 | // ev->xexpose.width, R->TermWin.height, False); |
1423 | // ev->xexpose.width, R->TermWin.height, False); |
1427 | #endif |
1424 | #endif |
1428 | R->want_refresh = 1; |
1425 | R->want_refresh = 1; |
1429 | } else { |
1426 | } else { |
… | |
… | |
1474 | &unused_mask); |
1471 | &unused_mask); |
1475 | #ifdef MOUSE_THRESHOLD |
1472 | #ifdef MOUSE_THRESHOLD |
1476 | /* deal with a `jumpy' mouse */ |
1473 | /* deal with a `jumpy' mouse */ |
1477 | if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { |
1474 | if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { |
1478 | #endif |
1475 | #endif |
1479 | rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), |
1476 | R->selection_extend ((ev->xbutton.x), (ev->xbutton.y), |
1480 | (ev->xbutton.state & Button3Mask) ? 2 : 0); |
1477 | (ev->xbutton.state & Button3Mask) ? 2 : 0); |
1481 | #ifdef SELECTION_SCROLLING |
1478 | #ifdef SELECTION_SCROLLING |
1482 | if (ev->xbutton.y<R->TermWin.int_bwidth || |
1479 | if (ev->xbutton.y<R->TermWin.int_bwidth || |
1483 | Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { |
1480 | Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { |
1484 | int dist; |
1481 | int dist; |
… | |
… | |
1533 | &unused_root_x, &unused_root_y, |
1530 | &unused_root_x, &unused_root_y, |
1534 | &(ev->xbutton.x), &(ev->xbutton.y), |
1531 | &(ev->xbutton.x), &(ev->xbutton.y), |
1535 | &unused_mask); |
1532 | &unused_mask); |
1536 | rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO, |
1533 | rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO, |
1537 | scrollbar_size()); |
1534 | scrollbar_size()); |
1538 | rxvt_scr_refresh(aR_ R->refresh_type); |
1535 | R->scr_refresh (R->refresh_type); |
1539 | R->refresh_limit = 0; |
1536 | R->refresh_limit = 0; |
1540 | rxvt_scrollbar_show(aR_ 1); |
1537 | rxvt_scrollbar_show(aR_ 1); |
1541 | } |
1538 | } |
1542 | break; |
1539 | break; |
1543 | } |
1540 | } |
… | |
… | |
1545 | |
1542 | |
1546 | /* INTPROTO */ |
1543 | /* INTPROTO */ |
1547 | void |
1544 | void |
1548 | rxvt_button_press(pR_ XButtonEvent *ev) |
1545 | rxvt_button_press(pR_ XButtonEvent *ev) |
1549 | { |
1546 | { |
1550 | int reportmode = 0, clickintime; |
1547 | int reportmode = 0, clickintime; |
1551 | |
1548 | |
1552 | R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); |
1549 | R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); |
1553 | if (!R->bypass_keystate) |
1550 | if (!R->bypass_keystate) |
1554 | reportmode = !!(R->PrivateModes & PrivMode_mouse_report); |
1551 | reportmode = !!(R->PrivateModes & PrivMode_mouse_report); |
1555 | /* |
1552 | /* |
… | |
… | |
1602 | if (ev->button != R->MEvent.button) |
1599 | if (ev->button != R->MEvent.button) |
1603 | R->MEvent.clicks = 0; |
1600 | R->MEvent.clicks = 0; |
1604 | switch (ev->button) |
1601 | switch (ev->button) |
1605 | { |
1602 | { |
1606 | case Button1: |
1603 | case Button1: |
|
|
1604 | /* allow shift+left click to extend selection */ |
|
|
1605 | if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report)) |
|
|
1606 | { |
1607 | if (R->MEvent.button == Button1 && clickintime) |
1607 | if (R->MEvent.button == Button1 && clickintime) |
|
|
1608 | R->selection_rotate (ev->x, ev->y); |
1608 | R->MEvent.clicks++; |
1609 | else |
|
|
1610 | R->selection_extend (ev->x, ev->y, 1); |
|
|
1611 | } |
1609 | else |
1612 | else |
|
|
1613 | { |
|
|
1614 | if (R->MEvent.button == Button1 && clickintime) |
|
|
1615 | R->MEvent.clicks++; |
|
|
1616 | else |
1610 | R->MEvent.clicks = 1; |
1617 | R->MEvent.clicks = 1; |
|
|
1618 | |
1611 | rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y); |
1619 | R->selection_click (R->MEvent.clicks, ev->x, ev->y); |
|
|
1620 | } |
|
|
1621 | |
1612 | R->MEvent.button = Button1; |
1622 | R->MEvent.button = Button1; |
1613 | break; |
1623 | break; |
1614 | |
1624 | |
1615 | case Button3: |
1625 | case Button3: |
1616 | if (R->MEvent.button == Button3 && clickintime) |
1626 | if (R->MEvent.button == Button3 && clickintime) |
1617 | rxvt_selection_rotate(aR_ ev->x, ev->y); |
1627 | R->selection_rotate (ev->x, ev->y); |
1618 | else |
1628 | else |
1619 | rxvt_selection_extend(aR_ ev->x, ev->y, 1); |
1629 | R->selection_extend (ev->x, ev->y, 1); |
1620 | R->MEvent.button = Button3; |
1630 | R->MEvent.button = Button3; |
1621 | break; |
1631 | break; |
1622 | } |
1632 | } |
1623 | } |
1633 | } |
1624 | R->MEvent.time = ev->time; |
1634 | R->MEvent.time = ev->time; |
… | |
… | |
1818 | * when overriding mouse reporting |
1828 | * when overriding mouse reporting |
1819 | */ |
1829 | */ |
1820 | if (R->PrivateModes & PrivMode_mouse_report |
1830 | if (R->PrivateModes & PrivMode_mouse_report |
1821 | && R->bypass_keystate |
1831 | && R->bypass_keystate |
1822 | && ev->button == Button1 && R->MEvent.clicks <= 1) |
1832 | && ev->button == Button1 && R->MEvent.clicks <= 1) |
1823 | rxvt_selection_extend(aR_ ev->x, ev->y, 0); |
1833 | R->selection_extend (ev->x, ev->y, 0); |
1824 | |
1834 | |
1825 | switch (ev->button) { |
1835 | switch (ev->button) { |
1826 | case Button1: |
1836 | case Button1: |
1827 | case Button3: |
1837 | case Button3: |
1828 | rxvt_selection_make(aR_ ev->time); |
1838 | rxvt_selection_make(aR_ ev->time); |
… | |
… | |
1851 | R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; |
1861 | R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; |
1852 | } |
1862 | } |
1853 | # endif |
1863 | # endif |
1854 | # ifdef JUMP_MOUSE_WHEEL |
1864 | # ifdef JUMP_MOUSE_WHEEL |
1855 | rxvt_scr_page(aR_ v, i); |
1865 | rxvt_scr_page(aR_ v, i); |
1856 | rxvt_scr_refresh(aR_ SMOOTH_REFRESH); |
1866 | R->scr_refresh (SMOOTH_REFRESH); |
1857 | rxvt_scrollbar_show(aR_ 1); |
1867 | rxvt_scrollbar_show(aR_ 1); |
1858 | # else |
1868 | # else |
1859 | for (; i--;) |
1869 | while (i--) |
1860 | { |
1870 | { |
1861 | rxvt_scr_page(aR_ v, 1); |
1871 | rxvt_scr_page(aR_ v, 1); |
1862 | rxvt_scr_refresh(aR_ SMOOTH_REFRESH); |
1872 | R->scr_refresh (SMOOTH_REFRESH); |
1863 | rxvt_scrollbar_show(aR_ 1); |
1873 | rxvt_scrollbar_show(aR_ 1); |
1864 | } |
1874 | } |
1865 | # endif |
1875 | # endif |
1866 | } |
1876 | } |
1867 | break; |
1877 | break; |
… | |
… | |
2221 | break; |
2231 | break; |
2222 | case 'I': /* cursor up and scroll down if needed */ |
2232 | case 'I': /* cursor up and scroll down if needed */ |
2223 | rxvt_scr_index(aR_ DN); |
2233 | rxvt_scr_index(aR_ DN); |
2224 | break; |
2234 | break; |
2225 | case 'J': /* erase to end of screen */ |
2235 | case 'J': /* erase to end of screen */ |
2226 | rxvt_scr_erase_screen(aR_ 0); |
2236 | R->scr_erase_screen (0); |
2227 | break; |
2237 | break; |
2228 | case 'K': /* erase to end of line */ |
2238 | case 'K': /* erase to end of line */ |
2229 | rxvt_scr_erase_line(aR_ 0); |
2239 | rxvt_scr_erase_line(aR_ 0); |
2230 | break; |
2240 | break; |
2231 | case 'Y': /* move to specified row and col */ |
2241 | case 'Y': /* move to specified row and col */ |
… | |
… | |
2566 | case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ |
2576 | case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ |
2567 | rxvt_scr_tab(aR_ arg[0]); |
2577 | rxvt_scr_tab(aR_ arg[0]); |
2568 | break; |
2578 | break; |
2569 | |
2579 | |
2570 | case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ |
2580 | case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ |
2571 | rxvt_scr_erase_screen(aR_ arg[0]); |
2581 | R->scr_erase_screen (arg[0]); |
2572 | break; |
2582 | break; |
2573 | |
2583 | |
2574 | case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ |
2584 | case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ |
2575 | rxvt_scr_erase_line(aR_ arg[0]); |
2585 | rxvt_scr_erase_line(aR_ arg[0]); |
2576 | break; |
2586 | break; |
… | |
… | |
2698 | break; |
2708 | break; |
2699 | #endif |
2709 | #endif |
2700 | |
2710 | |
2701 | case CSI_78: /* DECREQTPARM */ |
2711 | case CSI_78: /* DECREQTPARM */ |
2702 | if (arg[0] == 0 || arg[0] == 1) |
2712 | if (arg[0] == 0 || arg[0] == 1) |
2703 | R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2); |
2713 | R->tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); |
2704 | /* FALLTHROUGH */ |
2714 | /* FALLTHROUGH */ |
2705 | |
2715 | |
2706 | default: |
2716 | default: |
2707 | break; |
2717 | break; |
2708 | } |
2718 | } |
… | |
… | |
2746 | break; |
2756 | break; |
2747 | case 6: /* lower window */ |
2757 | case 6: /* lower window */ |
2748 | XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); |
2758 | XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); |
2749 | break; |
2759 | break; |
2750 | case 7: /* refresh window */ |
2760 | case 7: /* refresh window */ |
2751 | rxvt_scr_touch(aR_ True); |
2761 | R->scr_touch (true); |
2752 | break; |
2762 | break; |
2753 | case 8: /* set size (chars) */ |
2763 | case 8: /* set size (chars) */ |
2754 | rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), |
2764 | rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), |
2755 | (unsigned int)(args[1] * R->TermWin.fheight)); |
2765 | (unsigned int)(args[1] * R->TermWin.fheight)); |
2756 | break; |
2766 | break; |
… | |
… | |
2967 | if (*str != ';') { |
2977 | if (*str != ';') { |
2968 | #if XPM_BACKGROUND |
2978 | #if XPM_BACKGROUND |
2969 | rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ |
2979 | rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ |
2970 | rxvt_set_bgPixmap(aR_ str); /* change pixmap */ |
2980 | rxvt_set_bgPixmap(aR_ str); /* change pixmap */ |
2971 | #endif |
2981 | #endif |
2972 | rxvt_scr_touch(aR_ True); |
2982 | R->scr_touch (true); |
2973 | } |
2983 | } |
2974 | while ((str = STRCHR(str, ';')) != NULL) { |
2984 | while ((str = STRCHR(str, ';')) != NULL) { |
2975 | str++; |
2985 | str++; |
2976 | #if XPM_BACKGROUND |
2986 | #if XPM_BACKGROUND |
2977 | changed += rxvt_scale_pixmap(aR_ str); |
2987 | changed += rxvt_scale_pixmap(aR_ str); |
… | |
… | |
2979 | } |
2989 | } |
2980 | if (changed) { |
2990 | if (changed) { |
2981 | #ifdef XPM_BACKGROUND |
2991 | #ifdef XPM_BACKGROUND |
2982 | rxvt_resize_pixmap(aR); |
2992 | rxvt_resize_pixmap(aR); |
2983 | #endif |
2993 | #endif |
2984 | rxvt_scr_touch(aR_ True); |
2994 | R->scr_touch (true); |
2985 | } |
2995 | } |
2986 | break; |
2996 | break; |
2987 | |
2997 | |
2988 | case XTerm_restoreFG: |
2998 | case XTerm_restoreFG: |
2989 | rxvt_set_window_color(aR_ Color_fg, str); |
2999 | rxvt_set_window_color(aR_ Color_fg, str); |
… | |
… | |
3075 | #endif |
3085 | #endif |
3076 | { 1000, PrivMode_MouseX11 }, |
3086 | { 1000, PrivMode_MouseX11 }, |
3077 | { 1010, PrivMode_TtyOutputInh }, |
3087 | { 1010, PrivMode_TtyOutputInh }, |
3078 | { 1011, PrivMode_Keypress }, |
3088 | { 1011, PrivMode_Keypress }, |
3079 | { 1047, PrivMode_Screen }, |
3089 | { 1047, PrivMode_Screen }, |
|
|
3090 | { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ |
3080 | }; |
3091 | }; |
3081 | |
3092 | |
3082 | if (nargs == 0) |
3093 | if (nargs == 0) |
3083 | return; |
3094 | return; |
3084 | |
3095 | |
… | |
… | |
3155 | break; |
3166 | break; |
3156 | #endif |
3167 | #endif |
3157 | #ifdef scrollBar_esc |
3168 | #ifdef scrollBar_esc |
3158 | case scrollBar_esc: |
3169 | case scrollBar_esc: |
3159 | if (rxvt_scrollbar_mapping(aR_ state)) { |
3170 | if (rxvt_scrollbar_mapping(aR_ state)) { |
3160 | rxvt_resize_all_windows(aR_ 0, 0, 0); |
3171 | R->resize_all_windows (0, 0, 0); |
3161 | rxvt_scr_touch(aR_ True); |
3172 | R->scr_touch (true); |
3162 | } |
3173 | } |
3163 | break; |
3174 | break; |
3164 | #endif |
3175 | #endif |
3165 | case 25: /* visible/invisible cursor */ |
3176 | case 25: /* visible/invisible cursor */ |
3166 | rxvt_scr_cursor_visible(aR_ state); |
3177 | rxvt_scr_cursor_visible(aR_ state); |
… | |
… | |
3191 | R->Options |= Opt_scrollTtyKeypress; |
3202 | R->Options |= Opt_scrollTtyKeypress; |
3192 | else |
3203 | else |
3193 | R->Options &= ~Opt_scrollTtyKeypress; |
3204 | R->Options &= ~Opt_scrollTtyKeypress; |
3194 | break; |
3205 | break; |
3195 | case 1047: /* secondary screen w/ clearing */ |
3206 | case 1047: /* secondary screen w/ clearing */ |
|
|
3207 | case 1049: /* better secondary screen w/ clearing, but not fully implemented */ |
3196 | if (R->current_screen != PRIMARY) |
3208 | if (R->current_screen != PRIMARY) |
3197 | rxvt_scr_erase_screen(aR_ 2); |
3209 | R->scr_erase_screen (2); |
3198 | rxvt_scr_change_screen(aR_ state); |
3210 | rxvt_scr_change_screen(aR_ state); |
3199 | /* FALLTHROUGH */ |
3211 | /* FALLTHROUGH */ |
3200 | default: |
3212 | default: |
3201 | break; |
3213 | break; |
3202 | } |
3214 | } |