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.23 by pcg, Thu Dec 18 14:11:47 2003 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.23 2003/12/18 14:11:47 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
… …
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 }
… …
873 if (refreshnow) 887 if (refreshnow)
874 { 888 {
875 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 889 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
876 refresh_limit++; 890 refresh_limit++;
877 891
878 rxvt_scr_refresh (this, refresh_type); 892 scr_refresh (refresh_type);
879 } 893 }
880 894
881 } 895 }
882 else 896 else
883 { 897 {
… …
903// read the next character, currently handles UTF-8 917// read the next character, currently handles UTF-8
904// will probably handle all sorts of other stuff in the future 918// will probably handle all sorts of other stuff in the future
905uint32_t 919uint32_t
906rxvt_term::next_char () 920rxvt_term::next_char ()
907{ 921{
908 struct mbstate &s = mbstate;
909
910 while (cmdbuf_ptr < cmdbuf_endp) 922 while (cmdbuf_ptr < cmdbuf_endp)
911 { 923 {
912 uint8_t ch = *cmdbuf_ptr; 924 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++; 925 return *cmdbuf_ptr++;
938 926
939 /* first byte */ 927 wchar_t wc;
940 s.orig = ch; /* for broken encodings */ 928 int len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
941 s.reg = ch; 929
942 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } 930 if (len == (size_t)-2)
943 if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; } 931 return NOCHAR;
944 if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; } 932
945 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } 933 if (len == (size_t)-1)
946 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } 934 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
947 } 935
948 else 936 // assume wchar == unicode
949 { 937 cmdbuf_ptr += len;
950 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
951 return ch; 938 return wc;
952 }
953 } 939 }
954 940
955 return NOCHAR; 941 return NOCHAR;
956} 942}
957 943
… …
1009 if (R->pending_scroll_selection) { 995 if (R->pending_scroll_selection) {
1010 quick_timeout = 1; 996 quick_timeout = 1;
1011 if (!R->scroll_selection_delay-- 997 if (!R->scroll_selection_delay--
1012 && rxvt_scr_page(aR_ R->scroll_selection_dir, 998 && rxvt_scr_page(aR_ R->scroll_selection_dir,
1013 R->scroll_selection_lines)) { 999 R->scroll_selection_lines)) {
1014 rxvt_selection_extend(aR_ R->selection_save_x, 1000 R->selection_extend (R->selection_save_x,
1015 R->selection_save_y, R->selection_save_state); 1001 R->selection_save_y, R->selection_save_state);
1016 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 1002 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1017 R->refresh_type |= SMOOTH_REFRESH; 1003 R->refresh_type |= SMOOTH_REFRESH;
1018 R->want_refresh = 1; 1004 R->want_refresh = 1;
1019 } 1005 }
… …
1083 int button_number, key_state = 0; 1069 int button_number, key_state = 0;
1084 int x, y; 1070 int x, y;
1085 1071
1086 x = ev->x; 1072 x = ev->x;
1087 y = ev->y; 1073 y = ev->y;
1088 rxvt_pixel_position(aR_ &x, &y); 1074 R->pixel_position (&x, &y);
1089 1075
1090 if (R->MEvent.button == AnyButton) { 1076 if (R->MEvent.button == AnyButton) {
1091 button_number = 3; 1077 button_number = 3;
1092 } else { 1078 } else {
1093 button_number = R->MEvent.button - Button1; 1079 button_number = R->MEvent.button - Button1;
… …
1344 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1330 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1345 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1331 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,
1346 ConfigureNotify, ev)); 1332 ConfigureNotify, ev));
1347 if (R->szHint.width != width || R->szHint.height != height) { 1333 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)); 1334 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height));
1349 rxvt_resize_all_windows(aR_ (unsigned int)width, 1335 R->resize_all_windows (width, height, 1);
1350 (unsigned int)height, 1);
1351 } 1336 }
1352#ifdef DEBUG_SIZE 1337#ifdef DEBUG_SIZE
1353 else { 1338 else {
1354 D_SIZE((stderr, "Size: Not resizing")); 1339 D_SIZE((stderr, "Size: Not resizing"));
1355 } 1340 }
… …
1414 1399
1415 case GraphicsExpose: 1400 case GraphicsExpose:
1416 case Expose: 1401 case Expose:
1417 if (ev->xany.window == R->TermWin.vt) { 1402 if (ev->xany.window == R->TermWin.vt) {
1418#ifdef NO_SLOW_LINK_SUPPORT 1403#ifdef NO_SLOW_LINK_SUPPORT
1419 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1404 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1420 ev->xexpose.width, ev->xexpose.height, False); 1405 ev->xexpose.width, ev->xexpose.height, False);
1421#else 1406#else
1422 // don't understand this, so commented it out 1407 // don't understand this, so commented it out
1423 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1408 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1424 ev->xexpose.width, ev->xexpose.height, False); 1409 ev->xexpose.width, ev->xexpose.height, False);
1425 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1410 //rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1426 // ev->xexpose.width, R->TermWin.height, False); 1411 // ev->xexpose.width, R->TermWin.height, False);
1427#endif 1412#endif
1428 R->want_refresh = 1; 1413 R->want_refresh = 1;
1429 } else { 1414 } else {
… …
1474 &unused_mask); 1459 &unused_mask);
1475#ifdef MOUSE_THRESHOLD 1460#ifdef MOUSE_THRESHOLD
1476 /* deal with a `jumpy' mouse */ 1461 /* deal with a `jumpy' mouse */
1477 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1462 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1478#endif 1463#endif
1479 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1464 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1480 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1465 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1481#ifdef SELECTION_SCROLLING 1466#ifdef SELECTION_SCROLLING
1482 if (ev->xbutton.y<R->TermWin.int_bwidth || 1467 if (ev->xbutton.y<R->TermWin.int_bwidth ||
1483 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1468 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) {
1484 int dist; 1469 int dist;
… …
1533 &unused_root_x, &unused_root_y, 1518 &unused_root_x, &unused_root_y,
1534 &(ev->xbutton.x), &(ev->xbutton.y), 1519 &(ev->xbutton.x), &(ev->xbutton.y),
1535 &unused_mask); 1520 &unused_mask);
1536 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO, 1521 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1537 scrollbar_size()); 1522 scrollbar_size());
1538 rxvt_scr_refresh(aR_ R->refresh_type); 1523 R->scr_refresh (R->refresh_type);
1539 R->refresh_limit = 0; 1524 R->refresh_limit = 0;
1540 rxvt_scrollbar_show(aR_ 1); 1525 rxvt_scrollbar_show(aR_ 1);
1541 } 1526 }
1542 break; 1527 break;
1543 } 1528 }
… …
1602 if (ev->button != R->MEvent.button) 1587 if (ev->button != R->MEvent.button)
1603 R->MEvent.clicks = 0; 1588 R->MEvent.clicks = 0;
1604 switch (ev->button) 1589 switch (ev->button)
1605 { 1590 {
1606 case Button1: 1591 case Button1:
1592 /* allow shift+left click to extend selection */
1593 if (ev->state & ShiftMask)
1594 {
1607 if (R->MEvent.button == Button1 && clickintime) 1595 if (R->MEvent.button == Button1 && clickintime)
1596 R->selection_rotate (ev->x, ev->y);
1608 R->MEvent.clicks++; 1597 else
1598 R->selection_extend (ev->x, ev->y, 1);
1599 }
1609 else 1600 else
1601 {
1602 if (R->MEvent.button == Button1 && clickintime)
1603 R->MEvent.clicks++;
1604 else
1610 R->MEvent.clicks = 1; 1605 R->MEvent.clicks = 1;
1606
1611 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y); 1607 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1608 }
1609
1612 R->MEvent.button = Button1; 1610 R->MEvent.button = Button1;
1613 break; 1611 break;
1614 1612
1615 case Button3: 1613 case Button3:
1616 if (R->MEvent.button == Button3 && clickintime) 1614 if (R->MEvent.button == Button3 && clickintime)
1617 rxvt_selection_rotate(aR_ ev->x, ev->y); 1615 R->selection_rotate (ev->x, ev->y);
1618 else 1616 else
1619 rxvt_selection_extend(aR_ ev->x, ev->y, 1); 1617 R->selection_extend (ev->x, ev->y, 1);
1620 R->MEvent.button = Button3; 1618 R->MEvent.button = Button3;
1621 break; 1619 break;
1622 } 1620 }
1623 } 1621 }
1624 R->MEvent.time = ev->time; 1622 R->MEvent.time = ev->time;
… …
1818 * when overriding mouse reporting 1816 * when overriding mouse reporting
1819 */ 1817 */
1820 if (R->PrivateModes & PrivMode_mouse_report 1818 if (R->PrivateModes & PrivMode_mouse_report
1821 && R->bypass_keystate 1819 && R->bypass_keystate
1822 && ev->button == Button1 && R->MEvent.clicks <= 1) 1820 && ev->button == Button1 && R->MEvent.clicks <= 1)
1823 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1821 R->selection_extend (ev->x, ev->y, 0);
1824 1822
1825 switch (ev->button) { 1823 switch (ev->button) {
1826 case Button1: 1824 case Button1:
1827 case Button3: 1825 case Button3:
1828 rxvt_selection_make(aR_ ev->time); 1826 rxvt_selection_make(aR_ ev->time);
… …
1851 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1849 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1852 } 1850 }
1853# endif 1851# endif
1854# ifdef JUMP_MOUSE_WHEEL 1852# ifdef JUMP_MOUSE_WHEEL
1855 rxvt_scr_page(aR_ v, i); 1853 rxvt_scr_page(aR_ v, i);
1856 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1854 R->scr_refresh (SMOOTH_REFRESH);
1857 rxvt_scrollbar_show(aR_ 1); 1855 rxvt_scrollbar_show(aR_ 1);
1858# else 1856# else
1859 for (; i--;) 1857 while (i--)
1860 { 1858 {
1861 rxvt_scr_page(aR_ v, 1); 1859 rxvt_scr_page(aR_ v, 1);
1862 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1860 R->scr_refresh (SMOOTH_REFRESH);
1863 rxvt_scrollbar_show(aR_ 1); 1861 rxvt_scrollbar_show(aR_ 1);
1864 } 1862 }
1865# endif 1863# endif
1866 } 1864 }
1867 break; 1865 break;
… …
2221 break; 2219 break;
2222 case 'I': /* cursor up and scroll down if needed */ 2220 case 'I': /* cursor up and scroll down if needed */
2223 rxvt_scr_index(aR_ DN); 2221 rxvt_scr_index(aR_ DN);
2224 break; 2222 break;
2225 case 'J': /* erase to end of screen */ 2223 case 'J': /* erase to end of screen */
2226 rxvt_scr_erase_screen(aR_ 0); 2224 R->scr_erase_screen (0);
2227 break; 2225 break;
2228 case 'K': /* erase to end of line */ 2226 case 'K': /* erase to end of line */
2229 rxvt_scr_erase_line(aR_ 0); 2227 rxvt_scr_erase_line(aR_ 0);
2230 break; 2228 break;
2231 case 'Y': /* move to specified row and col */ 2229 case 'Y': /* move to specified row and col */
… …
2566 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2564 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2567 rxvt_scr_tab(aR_ arg[0]); 2565 rxvt_scr_tab(aR_ arg[0]);
2568 break; 2566 break;
2569 2567
2570 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2568 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2571 rxvt_scr_erase_screen(aR_ arg[0]); 2569 R->scr_erase_screen (arg[0]);
2572 break; 2570 break;
2573 2571
2574 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2572 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2575 rxvt_scr_erase_line(aR_ arg[0]); 2573 rxvt_scr_erase_line(aR_ arg[0]);
2576 break; 2574 break;
… …
2746 break; 2744 break;
2747 case 6: /* lower window */ 2745 case 6: /* lower window */
2748 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2746 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);
2749 break; 2747 break;
2750 case 7: /* refresh window */ 2748 case 7: /* refresh window */
2751 rxvt_scr_touch(aR_ True); 2749 R->scr_touch (true);
2752 break; 2750 break;
2753 case 8: /* set size (chars) */ 2751 case 8: /* set size (chars) */
2754 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2752 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),
2755 (unsigned int)(args[1] * R->TermWin.fheight)); 2753 (unsigned int)(args[1] * R->TermWin.fheight));
2756 break; 2754 break;
… …
2967 if (*str != ';') { 2965 if (*str != ';') {
2968#if XPM_BACKGROUND 2966#if XPM_BACKGROUND
2969 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 2967 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */
2970 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 2968 rxvt_set_bgPixmap(aR_ str); /* change pixmap */
2971#endif 2969#endif
2972 rxvt_scr_touch(aR_ True); 2970 R->scr_touch (true);
2973 } 2971 }
2974 while ((str = STRCHR(str, ';')) != NULL) { 2972 while ((str = STRCHR(str, ';')) != NULL) {
2975 str++; 2973 str++;
2976#if XPM_BACKGROUND 2974#if XPM_BACKGROUND
2977 changed += rxvt_scale_pixmap(aR_ str); 2975 changed += rxvt_scale_pixmap(aR_ str);
… …
2979 } 2977 }
2980 if (changed) { 2978 if (changed) {
2981#ifdef XPM_BACKGROUND 2979#ifdef XPM_BACKGROUND
2982 rxvt_resize_pixmap(aR); 2980 rxvt_resize_pixmap(aR);
2983#endif 2981#endif
2984 rxvt_scr_touch(aR_ True); 2982 R->scr_touch (true);
2985 } 2983 }
2986 break; 2984 break;
2987 2985
2988 case XTerm_restoreFG: 2986 case XTerm_restoreFG:
2989 rxvt_set_window_color(aR_ Color_fg, str); 2987 rxvt_set_window_color(aR_ Color_fg, str);
… …
3155 break; 3153 break;
3156#endif 3154#endif
3157#ifdef scrollBar_esc 3155#ifdef scrollBar_esc
3158 case scrollBar_esc: 3156 case scrollBar_esc:
3159 if (rxvt_scrollbar_mapping(aR_ state)) { 3157 if (rxvt_scrollbar_mapping(aR_ state)) {
3160 rxvt_resize_all_windows(aR_ 0, 0, 0); 3158 R->resize_all_windows (0, 0, 0);
3161 rxvt_scr_touch(aR_ True); 3159 R->scr_touch (true);
3162 } 3160 }
3163 break; 3161 break;
3164#endif 3162#endif
3165 case 25: /* visible/invisible cursor */ 3163 case 25: /* visible/invisible cursor */
3166 rxvt_scr_cursor_visible(aR_ state); 3164 rxvt_scr_cursor_visible(aR_ state);
… …
3192 else 3190 else
3193 R->Options &= ~Opt_scrollTtyKeypress; 3191 R->Options &= ~Opt_scrollTtyKeypress;
3194 break; 3192 break;
3195 case 1047: /* secondary screen w/ clearing */ 3193 case 1047: /* secondary screen w/ clearing */
3196 if (R->current_screen != PRIMARY) 3194 if (R->current_screen != PRIMARY)
3197 rxvt_scr_erase_screen(aR_ 2); 3195 R->scr_erase_screen (2);
3198 rxvt_scr_change_screen(aR_ state); 3196 rxvt_scr_change_screen(aR_ state);
3199 /* FALLTHROUGH */ 3197 /* FALLTHROUGH */
3200 default: 3198 default:
3201 break; 3199 break;
3202 } 3200 }

Diff Legend

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