ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.19 by pcg, Thu Dec 18 05:45:11 2003 UTC vs.
Revision 1.28 by pcg, Fri Jan 16 22:11:09 2004 UTC

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.28 2004/01/16 22:11:09 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 */
57void 59void
… …
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
692void 702void
693rxvt_term::check_cb (check_watcher &w) 703rxvt_term::check_cb (check_watcher &w)
694{ 704{
… …
742 rxvt_process_x_event (this, &xev); 752 rxvt_process_x_event (this, &xev);
743 } 753 }
744 while (XPending (Xdisplay)); 754 while (XPending (Xdisplay));
745} 755}
746 756
757#ifdef CURSOR_BLINK
747void 758void
748rxvt_term::blink_cb (time_watcher &w) 759rxvt_term::blink_cb (time_watcher &w)
749{ 760{
750 w.at += BLINK_INTERVAL;
751 hidden_cursor = !hidden_cursor; 761 hidden_cursor = !hidden_cursor;
752 want_refresh = 1; 762 want_refresh = 1;
763
764 w.start (w.at + BLINK_INTERVAL);
753} 765}
766#endif
754 767
755void 768void
756rxvt_term::x_cb (io_watcher &w, short revents) 769rxvt_term::x_cb (io_watcher &w, short revents)
757{ 770{
758 SET_R (this); 771 SET_R (this);
… …
873 if (refreshnow) 886 if (refreshnow)
874 { 887 {
875 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 888 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
876 refresh_limit++; 889 refresh_limit++;
877 890
878 rxvt_scr_refresh (this, refresh_type); 891 scr_refresh (refresh_type);
879 } 892 }
880 893
881 } 894 }
882 else 895 else
883 { 896 {
… …
903// read the next character, currently handles UTF-8 916// read the next character, currently handles UTF-8
904// will probably handle all sorts of other stuff in the future 917// will probably handle all sorts of other stuff in the future
905uint32_t 918uint32_t
906rxvt_term::next_char () 919rxvt_term::next_char ()
907{ 920{
908 struct mbstate &s = mbstate;
909
910 while (cmdbuf_ptr < cmdbuf_endp) 921 while (cmdbuf_ptr < cmdbuf_endp)
911 { 922 {
912 uint8_t ch = *cmdbuf_ptr; 923 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++; 924 return *cmdbuf_ptr++;
938 925
939 /* first byte */ 926 wchar_t wc;
940 s.orig = ch; /* for broken encodings */ 927 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
941 s.reg = ch; 928
942 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } 929 if (len == (size_t)-2)
943 if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; } 930 return NOCHAR;
944 if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; } 931
945 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } 932 if (len == (size_t)-1)
946 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } 933 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
947 } 934
948 else 935 // assume wchar == unicode
949 { 936 cmdbuf_ptr += len;
950 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
951 return ch; 937 return wc;
952 }
953 } 938 }
954 939
955 return NOCHAR; 940 return NOCHAR;
956} 941}
957 942
… …
1009 if (R->pending_scroll_selection) { 994 if (R->pending_scroll_selection) {
1010 quick_timeout = 1; 995 quick_timeout = 1;
1011 if (!R->scroll_selection_delay-- 996 if (!R->scroll_selection_delay--
1012 && rxvt_scr_page(aR_ R->scroll_selection_dir, 997 && rxvt_scr_page(aR_ R->scroll_selection_dir,
1013 R->scroll_selection_lines)) { 998 R->scroll_selection_lines)) {
1014 rxvt_selection_extend(aR_ R->selection_save_x, 999 R->selection_extend (R->selection_save_x,
1015 R->selection_save_y, R->selection_save_state); 1000 R->selection_save_y, R->selection_save_state);
1016 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 1001 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1017 R->refresh_type |= SMOOTH_REFRESH; 1002 R->refresh_type |= SMOOTH_REFRESH;
1018 R->want_refresh = 1; 1003 R->want_refresh = 1;
1019 } 1004 }
… …
1053 1038
1054#ifdef POINTER_BLANK 1039#ifdef POINTER_BLANK
1055void 1040void
1056rxvt_term::pointer_blank () 1041rxvt_term::pointer_blank ()
1057{ 1042{
1058 pointer_ev.stop ();
1059
1060 if (!(Options & Opt_pointerBlank)) 1043 if (!(Options & Opt_pointerBlank))
1061 return; 1044 return;
1062 1045
1063 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1046 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1064 XFlush (Xdisplay); 1047 XFlush (Xdisplay);
… …
1083 int button_number, key_state = 0; 1066 int button_number, key_state = 0;
1084 int x, y; 1067 int x, y;
1085 1068
1086 x = ev->x; 1069 x = ev->x;
1087 y = ev->y; 1070 y = ev->y;
1088 rxvt_pixel_position(aR_ &x, &y); 1071 R->pixel_position (&x, &y);
1089 1072
1090 if (R->MEvent.button == AnyButton) { 1073 if (R->MEvent.button == AnyButton) {
1091 button_number = 3; 1074 button_number = 3;
1092 } else { 1075 } else {
1093 button_number = R->MEvent.button - Button1; 1076 button_number = R->MEvent.button - Button1;
… …
1344 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1327 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1345 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1328 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,
1346 ConfigureNotify, ev)); 1329 ConfigureNotify, ev));
1347 if (R->szHint.width != width || R->szHint.height != height) { 1330 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)); 1331 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height));
1349 rxvt_resize_all_windows(aR_ (unsigned int)width, 1332 R->resize_all_windows (width, height, 1);
1350 (unsigned int)height, 1);
1351 } 1333 }
1352#ifdef DEBUG_SIZE 1334#ifdef DEBUG_SIZE
1353 else { 1335 else {
1354 D_SIZE((stderr, "Size: Not resizing")); 1336 D_SIZE((stderr, "Size: Not resizing"));
1355 } 1337 }
… …
1414 1396
1415 case GraphicsExpose: 1397 case GraphicsExpose:
1416 case Expose: 1398 case Expose:
1417 if (ev->xany.window == R->TermWin.vt) { 1399 if (ev->xany.window == R->TermWin.vt) {
1418#ifdef NO_SLOW_LINK_SUPPORT 1400#ifdef NO_SLOW_LINK_SUPPORT
1419 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1401 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1420 ev->xexpose.width, ev->xexpose.height, False); 1402 ev->xexpose.width, ev->xexpose.height, False);
1421#else 1403#else
1422 // don't understand this, so commented it out 1404 // don't understand this, so commented it out
1423 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1405 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1424 ev->xexpose.width, ev->xexpose.height, False); 1406 ev->xexpose.width, ev->xexpose.height, False);
1425 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1407 //rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1426 // ev->xexpose.width, R->TermWin.height, False); 1408 // ev->xexpose.width, R->TermWin.height, False);
1427#endif 1409#endif
1428 R->want_refresh = 1; 1410 R->want_refresh = 1;
1429 } else { 1411 } else {
… …
1474 &unused_mask); 1456 &unused_mask);
1475#ifdef MOUSE_THRESHOLD 1457#ifdef MOUSE_THRESHOLD
1476 /* deal with a `jumpy' mouse */ 1458 /* deal with a `jumpy' mouse */
1477 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1459 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1478#endif 1460#endif
1479 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1461 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1480 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1462 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1481#ifdef SELECTION_SCROLLING 1463#ifdef SELECTION_SCROLLING
1482 if (ev->xbutton.y<R->TermWin.int_bwidth || 1464 if (ev->xbutton.y<R->TermWin.int_bwidth ||
1483 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1465 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {
1484 int dist; 1466 int dist;
… …
1533 &unused_root_x, &unused_root_y, 1515 &unused_root_x, &unused_root_y,
1534 &(ev->xbutton.x), &(ev->xbutton.y), 1516 &(ev->xbutton.x), &(ev->xbutton.y),
1535 &unused_mask); 1517 &unused_mask);
1536 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO, 1518 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1537 scrollbar_size()); 1519 scrollbar_size());
1538 rxvt_scr_refresh(aR_ R->refresh_type); 1520 R->scr_refresh (R->refresh_type);
1539 R->refresh_limit = 0; 1521 R->refresh_limit = 0;
1540 rxvt_scrollbar_show(aR_ 1); 1522 rxvt_scrollbar_show(aR_ 1);
1541 } 1523 }
1542 break; 1524 break;
1543 } 1525 }
… …
1545 1527
1546/* INTPROTO */ 1528/* INTPROTO */
1547void 1529void
1548rxvt_button_press(pR_ XButtonEvent *ev) 1530rxvt_button_press(pR_ XButtonEvent *ev)
1549{ 1531{
1550 int reportmode = 0, clickintime; 1532 int reportmode = 0, clickintime;
1551 1533
1552 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1534 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1553 if (!R->bypass_keystate) 1535 if (!R->bypass_keystate)
1554 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1536 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1555/* 1537/*
… …
1602 if (ev->button != R->MEvent.button) 1584 if (ev->button != R->MEvent.button)
1603 R->MEvent.clicks = 0; 1585 R->MEvent.clicks = 0;
1604 switch (ev->button) 1586 switch (ev->button)
1605 { 1587 {
1606 case Button1: 1588 case Button1:
1589 /* allow shift+left click to extend selection */
1590 if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report))
1591 {
1607 if (R->MEvent.button == Button1 && clickintime) 1592 if (R->MEvent.button == Button1 && clickintime)
1593 R->selection_rotate (ev->x, ev->y);
1608 R->MEvent.clicks++; 1594 else
1595 R->selection_extend (ev->x, ev->y, 1);
1596 }
1609 else 1597 else
1598 {
1599 if (R->MEvent.button == Button1 && clickintime)
1600 R->MEvent.clicks++;
1601 else
1610 R->MEvent.clicks = 1; 1602 R->MEvent.clicks = 1;
1603
1611 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y); 1604 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1605 }
1606
1612 R->MEvent.button = Button1; 1607 R->MEvent.button = Button1;
1613 break; 1608 break;
1614 1609
1615 case Button3: 1610 case Button3:
1616 if (R->MEvent.button == Button3 && clickintime) 1611 if (R->MEvent.button == Button3 && clickintime)
1617 rxvt_selection_rotate(aR_ ev->x, ev->y); 1612 R->selection_rotate (ev->x, ev->y);
1618 else 1613 else
1619 rxvt_selection_extend(aR_ ev->x, ev->y, 1); 1614 R->selection_extend (ev->x, ev->y, 1);
1620 R->MEvent.button = Button3; 1615 R->MEvent.button = Button3;
1621 break; 1616 break;
1622 } 1617 }
1623 } 1618 }
1624 R->MEvent.time = ev->time; 1619 R->MEvent.time = ev->time;
… …
1818 * when overriding mouse reporting 1813 * when overriding mouse reporting
1819 */ 1814 */
1820 if (R->PrivateModes & PrivMode_mouse_report 1815 if (R->PrivateModes & PrivMode_mouse_report
1821 && R->bypass_keystate 1816 && R->bypass_keystate
1822 && ev->button == Button1 && R->MEvent.clicks <= 1) 1817 && ev->button == Button1 && R->MEvent.clicks <= 1)
1823 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1818 R->selection_extend (ev->x, ev->y, 0);
1824 1819
1825 switch (ev->button) { 1820 switch (ev->button) {
1826 case Button1: 1821 case Button1:
1827 case Button3: 1822 case Button3:
1828 rxvt_selection_make(aR_ ev->time); 1823 rxvt_selection_make(aR_ ev->time);
… …
1851 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1846 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1852 } 1847 }
1853# endif 1848# endif
1854# ifdef JUMP_MOUSE_WHEEL 1849# ifdef JUMP_MOUSE_WHEEL
1855 rxvt_scr_page(aR_ v, i); 1850 rxvt_scr_page(aR_ v, i);
1856 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1851 R->scr_refresh (SMOOTH_REFRESH);
1857 rxvt_scrollbar_show(aR_ 1); 1852 rxvt_scrollbar_show(aR_ 1);
1858# else 1853# else
1859 for (; i--;) 1854 while (i--)
1860 { 1855 {
1861 rxvt_scr_page(aR_ v, 1); 1856 rxvt_scr_page(aR_ v, 1);
1862 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1857 R->scr_refresh (SMOOTH_REFRESH);
1863 rxvt_scrollbar_show(aR_ 1); 1858 rxvt_scrollbar_show(aR_ 1);
1864 } 1859 }
1865# endif 1860# endif
1866 } 1861 }
1867 break; 1862 break;
… …
2221 break; 2216 break;
2222 case 'I': /* cursor up and scroll down if needed */ 2217 case 'I': /* cursor up and scroll down if needed */
2223 rxvt_scr_index(aR_ DN); 2218 rxvt_scr_index(aR_ DN);
2224 break; 2219 break;
2225 case 'J': /* erase to end of screen */ 2220 case 'J': /* erase to end of screen */
2226 rxvt_scr_erase_screen(aR_ 0); 2221 R->scr_erase_screen (0);
2227 break; 2222 break;
2228 case 'K': /* erase to end of line */ 2223 case 'K': /* erase to end of line */
2229 rxvt_scr_erase_line(aR_ 0); 2224 rxvt_scr_erase_line(aR_ 0);
2230 break; 2225 break;
2231 case 'Y': /* move to specified row and col */ 2226 case 'Y': /* move to specified row and col */
… …
2566 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2561 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2567 rxvt_scr_tab(aR_ arg[0]); 2562 rxvt_scr_tab(aR_ arg[0]);
2568 break; 2563 break;
2569 2564
2570 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2565 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2571 rxvt_scr_erase_screen(aR_ arg[0]); 2566 R->scr_erase_screen (arg[0]);
2572 break; 2567 break;
2573 2568
2574 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2569 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2575 rxvt_scr_erase_line(aR_ arg[0]); 2570 rxvt_scr_erase_line(aR_ arg[0]);
2576 break; 2571 break;
… …
2746 break; 2741 break;
2747 case 6: /* lower window */ 2742 case 6: /* lower window */
2748 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2743 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);
2749 break; 2744 break;
2750 case 7: /* refresh window */ 2745 case 7: /* refresh window */
2751 rxvt_scr_touch(aR_ True); 2746 R->scr_touch (true);
2752 break; 2747 break;
2753 case 8: /* set size (chars) */ 2748 case 8: /* set size (chars) */
2754 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2749 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),
2755 (unsigned int)(args[1] * R->TermWin.fheight)); 2750 (unsigned int)(args[1] * R->TermWin.fheight));
2756 break; 2751 break;
… …
2967 if (*str != ';') { 2962 if (*str != ';') {
2968#if XPM_BACKGROUND 2963#if XPM_BACKGROUND
2969 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 2964 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */
2970 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 2965 rxvt_set_bgPixmap(aR_ str); /* change pixmap */
2971#endif 2966#endif
2972 rxvt_scr_touch(aR_ True); 2967 R->scr_touch (true);
2973 } 2968 }
2974 while ((str = STRCHR(str, ';')) != NULL) { 2969 while ((str = STRCHR(str, ';')) != NULL) {
2975 str++; 2970 str++;
2976#if XPM_BACKGROUND 2971#if XPM_BACKGROUND
2977 changed += rxvt_scale_pixmap(aR_ str); 2972 changed += rxvt_scale_pixmap(aR_ str);
… …
2979 } 2974 }
2980 if (changed) { 2975 if (changed) {
2981#ifdef XPM_BACKGROUND 2976#ifdef XPM_BACKGROUND
2982 rxvt_resize_pixmap(aR); 2977 rxvt_resize_pixmap(aR);
2983#endif 2978#endif
2984 rxvt_scr_touch(aR_ True); 2979 R->scr_touch (true);
2985 } 2980 }
2986 break; 2981 break;
2987 2982
2988 case XTerm_restoreFG: 2983 case XTerm_restoreFG:
2989 rxvt_set_window_color(aR_ Color_fg, str); 2984 rxvt_set_window_color(aR_ Color_fg, str);
… …
3155 break; 3150 break;
3156#endif 3151#endif
3157#ifdef scrollBar_esc 3152#ifdef scrollBar_esc
3158 case scrollBar_esc: 3153 case scrollBar_esc:
3159 if (rxvt_scrollbar_mapping(aR_ state)) { 3154 if (rxvt_scrollbar_mapping(aR_ state)) {
3160 rxvt_resize_all_windows(aR_ 0, 0, 0); 3155 R->resize_all_windows (0, 0, 0);
3161 rxvt_scr_touch(aR_ True); 3156 R->scr_touch (true);
3162 } 3157 }
3163 break; 3158 break;
3164#endif 3159#endif
3165 case 25: /* visible/invisible cursor */ 3160 case 25: /* visible/invisible cursor */
3166 rxvt_scr_cursor_visible(aR_ state); 3161 rxvt_scr_cursor_visible(aR_ state);
… …
3192 else 3187 else
3193 R->Options &= ~Opt_scrollTtyKeypress; 3188 R->Options &= ~Opt_scrollTtyKeypress;
3194 break; 3189 break;
3195 case 1047: /* secondary screen w/ clearing */ 3190 case 1047: /* secondary screen w/ clearing */
3196 if (R->current_screen != PRIMARY) 3191 if (R->current_screen != PRIMARY)
3197 rxvt_scr_erase_screen(aR_ 2); 3192 R->scr_erase_screen (2);
3198 rxvt_scr_change_screen(aR_ state); 3193 rxvt_scr_change_screen(aR_ state);
3199 /* FALLTHROUGH */ 3194 /* FALLTHROUGH */
3200 default: 3195 default:
3201 break; 3196 break;
3202 } 3197 }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines