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.20 by pcg, Thu Dec 18 07:31:18 2003 UTC vs.
Revision 1.33 by pcg, Fri Jan 30 18:12:17 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.20 2003/12/18 07:31:18 pcg Exp $ 4 * $Id: command.C,v 1.33 2004/01/30 18:12:17 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>
… …
64 KeySym keysym; 64 KeySym keysym;
65#ifdef DEBUG_CMD 65#ifdef DEBUG_CMD
66 static int debug_key = 1; /* accessible by a debugger only */ 66 static int debug_key = 1; /* accessible by a debugger only */
67#endif 67#endif
68 int valid_keysym; 68 int valid_keysym;
69 unsigned char *kbuf = R->kbuf; 69 unsigned char kbuf[KBUFSZ];
70 70
71/* 71/*
72 * 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
73 * escape sequence to toggle the Keypad. 73 * escape sequence to toggle the Keypad.
74 * 74 *
… …
90 if (R->Input_Context) 90 if (R->Input_Context)
91 { 91 {
92 Status status_return; 92 Status status_return;
93 93
94#ifdef X_HAVE_UTF8_STRING 94#ifdef X_HAVE_UTF8_STRING
95 if (R->enc_utf8) 95 if (R->enc_utf8 && 0)
96 len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf, 96 len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf,
97 KBUFSZ, &keysym, &status_return); 97 KBUFSZ, &keysym, &status_return);
98 else 98 else
99#endif 99#endif
100 { 100 {
… …
635 for (i = 0, p = kbuf; i < len; i++, p++) 635 for (i = 0, p = kbuf; i < len; i++, p++)
636 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 636 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
637 fprintf(stderr, "'\n"); 637 fprintf(stderr, "'\n");
638 } 638 }
639#endif /* DEBUG_CMD */ 639#endif /* DEBUG_CMD */
640 R->tt_write(kbuf, (unsigned int)len); 640 R->tt_write (kbuf, (unsigned int)len);
641} 641}
642/*}}} */ 642/*}}} */
643 643
644#if (MENUBAR_MAX) 644#if (MENUBAR_MAX)
645/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 645/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */
… …
679{ 679{
680#ifdef TRANSPARENT 680#ifdef TRANSPARENT
681 if (want_full_refresh) 681 if (want_full_refresh)
682 { 682 {
683 want_full_refresh = 0; 683 want_full_refresh = 0;
684 rxvt_scr_clear (this); 684 scr_clear ();
685 rxvt_scr_touch (this, False); 685 scr_touch (false);
686 want_refresh = 1; 686 want_refresh = 1;
687 } 687 }
688#endif 688#endif
689 689
690 if (want_refresh) 690 if (want_refresh)
691 { 691 {
692 rxvt_scr_refresh (this, refresh_type); 692 scr_refresh (refresh_type);
693 rxvt_scrollbar_show (this, 1); 693 rxvt_scrollbar_show (this, 1);
694#ifdef USE_XIM 694#ifdef USE_XIM
695 rxvt_IMSendSpot (this); 695 rxvt_IMSendSpot (this);
696#endif 696#endif
697 } 697 }
698 698
699 XFlush (Xdisplay); 699 XFlush (Xdisplay);
700#if 0
701 if (XPending (Xdisplay)) process_x_events ();
702 if (XPending (Xdisplay)) process_x_events ();
703#endif
704} 700}
705 701
706void 702void
707rxvt_term::check_cb (check_watcher &w) 703rxvt_term::check_cb (check_watcher &w)
708{ 704{
… …
720 XEvent xev; 716 XEvent xev;
721 717
722 XNextEvent (Xdisplay, &xev); 718 XNextEvent (Xdisplay, &xev);
723 719
724#if defined(CURSOR_BLINK) 720#if defined(CURSOR_BLINK)
725 if ((Options & Opt_cursorBlink) 721 if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
726 && xev.type == KeyPress)
727 { 722 {
728 if (hidden_cursor) 723 if (hidden_cursor)
729 { 724 {
730 hidden_cursor = 0; 725 hidden_cursor = 0;
731 want_refresh = 1; 726 want_refresh = 1;
732 } 727 }
733 728
734 blink_ev.start (NOW + BLINK_INTERVAL); 729 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
735 } 730 }
736#endif 731#endif
737 732
738#if defined(POINTER_BLANK) 733#if defined(POINTER_BLANK)
739 if ((Options & Opt_pointerBlank) 734 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
740 && (pointerBlankDelay > 0))
741 { 735 {
742 if (xev.type == MotionNotify 736 if (xev.type == MotionNotify
743 || xev.type == ButtonPress 737 || xev.type == ButtonPress
744 || xev.type == ButtonRelease) 738 || xev.type == ButtonRelease)
745 if (hidden_pointer) 739 if (hidden_pointer)
… …
756 rxvt_process_x_event (this, &xev); 750 rxvt_process_x_event (this, &xev);
757 } 751 }
758 while (XPending (Xdisplay)); 752 while (XPending (Xdisplay));
759} 753}
760 754
755#ifdef CURSOR_BLINK
761void 756void
762rxvt_term::blink_cb (time_watcher &w) 757rxvt_term::cursor_blink_cb (time_watcher &w)
763{ 758{
764 w.at += BLINK_INTERVAL;
765 hidden_cursor = !hidden_cursor; 759 hidden_cursor = !hidden_cursor;
766 want_refresh = 1; 760 want_refresh = 1;
761
762 w.start (w.at + BLINK_INTERVAL);
767} 763}
764#endif
765
766#ifdef TEXT_BLINK
767void
768rxvt_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
768 778
769void 779void
770rxvt_term::x_cb (io_watcher &w, short revents) 780rxvt_term::x_cb (io_watcher &w, short revents)
771{ 781{
772 SET_R (this); 782 SET_R (this);
… …
887 if (refreshnow) 897 if (refreshnow)
888 { 898 {
889 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 899 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
890 refresh_limit++; 900 refresh_limit++;
891 901
892 rxvt_scr_refresh (this, refresh_type); 902 scr_refresh (refresh_type);
893 } 903 }
894 904
895 } 905 }
896 else 906 else
897 { 907 {
… …
995 if (R->pending_scroll_selection) { 1005 if (R->pending_scroll_selection) {
996 quick_timeout = 1; 1006 quick_timeout = 1;
997 if (!R->scroll_selection_delay-- 1007 if (!R->scroll_selection_delay--
998 && rxvt_scr_page(aR_ R->scroll_selection_dir, 1008 && rxvt_scr_page(aR_ R->scroll_selection_dir,
999 R->scroll_selection_lines)) { 1009 R->scroll_selection_lines)) {
1000 rxvt_selection_extend(aR_ R->selection_save_x, 1010 R->selection_extend (R->selection_save_x,
1001 R->selection_save_y, R->selection_save_state); 1011 R->selection_save_y, R->selection_save_state);
1002 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY; 1012 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1003 R->refresh_type |= SMOOTH_REFRESH; 1013 R->refresh_type |= SMOOTH_REFRESH;
1004 R->want_refresh = 1; 1014 R->want_refresh = 1;
1005 } 1015 }
… …
1021 quick_timeout |= R->want_full_refresh; 1031 quick_timeout |= R->want_full_refresh;
1022#endif 1032#endif
1023#endif 1033#endif
1024} 1034}
1025 1035
1036#ifdef POINTER_BLANK
1026void 1037void
1027rxvt_term::pointer_unblank () 1038rxvt_term::pointer_unblank ()
1028{ 1039{
1029 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 1040 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
1030 recolour_cursor (); 1041 recolour_cursor ();
1031 1042
1032#ifdef POINTER_BLANK
1033 hidden_pointer = 0; 1043 hidden_pointer = 0;
1034 1044
1035 if (Options & Opt_pointerBlank) 1045 if (Options & Opt_pointerBlank)
1036 pointer_ev.start (NOW + pointerBlankDelay); 1046 pointer_ev.start (NOW + pointerBlankDelay);
1037#endif
1038} 1047}
1039 1048
1040#ifdef POINTER_BLANK
1041void 1049void
1042rxvt_term::pointer_blank () 1050rxvt_term::pointer_blank ()
1043{ 1051{
1044 pointer_ev.stop ();
1045
1046 if (!(Options & Opt_pointerBlank)) 1052 if (!(Options & Opt_pointerBlank))
1047 return; 1053 return;
1048 1054
1049 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1055 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor);
1050 XFlush (Xdisplay); 1056 XFlush (Xdisplay);
… …
1069 int button_number, key_state = 0; 1075 int button_number, key_state = 0;
1070 int x, y; 1076 int x, y;
1071 1077
1072 x = ev->x; 1078 x = ev->x;
1073 y = ev->y; 1079 y = ev->y;
1074 rxvt_pixel_position(aR_ &x, &y); 1080 R->pixel_position (&x, &y);
1075 1081
1076 if (R->MEvent.button == AnyButton) { 1082 if (R->MEvent.button == AnyButton) {
1077 button_number = 3; 1083 button_number = 3;
1078 } else { 1084 } else {
1079 button_number = R->MEvent.button - Button1; 1085 button_number = R->MEvent.button - Button1;
… …
1297 if (R->Input_Context != NULL) 1303 if (R->Input_Context != NULL)
1298 XSetICFocus(R->Input_Context); 1304 XSetICFocus(R->Input_Context);
1299#endif 1305#endif
1300#ifdef CURSOR_BLINK 1306#ifdef CURSOR_BLINK
1301 if (R->Options & Opt_cursorBlink) 1307 if (R->Options & Opt_cursorBlink)
1302 R->blink_ev.start (NOW + BLINK_INTERVAL); 1308 R->cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1303#endif 1309#endif
1304 } 1310 }
1305 break; 1311 break;
1306 1312
1307 case FocusOut: 1313 case FocusOut:
… …
1312 if (R->Input_Context != NULL) 1318 if (R->Input_Context != NULL)
1313 XUnsetICFocus(R->Input_Context); 1319 XUnsetICFocus(R->Input_Context);
1314#endif 1320#endif
1315#ifdef CURSOR_BLINK 1321#ifdef CURSOR_BLINK
1316 if (R->Options & Opt_cursorBlink) 1322 if (R->Options & Opt_cursorBlink)
1317 R->blink_ev.stop (); 1323 R->cursor_blink_ev.stop ();
1318 R->hidden_cursor = 0; 1324 R->hidden_cursor = 0;
1319#endif 1325#endif
1320 } 1326 }
1321 break; 1327 break;
1322 1328
… …
1330 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1336 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1331 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1337 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window,
1332 ConfigureNotify, ev)); 1338 ConfigureNotify, ev));
1333 if (R->szHint.width != width || R->szHint.height != height) { 1339 if (R->szHint.width != width || R->szHint.height != height) {
1334 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));
1335 rxvt_resize_all_windows(aR_ (unsigned int)width, 1341 R->resize_all_windows (width, height, 1);
1336 (unsigned int)height, 1);
1337 } 1342 }
1338#ifdef DEBUG_SIZE 1343#ifdef DEBUG_SIZE
1339 else { 1344 else {
1340 D_SIZE((stderr, "Size: Not resizing")); 1345 D_SIZE((stderr, "Size: Not resizing"));
1341 } 1346 }
… …
1364 rxvt_selection_send(aR_ &(ev->xselectionrequest)); 1369 rxvt_selection_send(aR_ &(ev->xselectionrequest));
1365 break; 1370 break;
1366 1371
1367 case UnmapNotify: 1372 case UnmapNotify:
1368 R->TermWin.mapped = 0; 1373 R->TermWin.mapped = 0;
1374#ifdef TEXT_BLINK
1375 R->text_blink_ev.stop ();
1376#endif
1369 break; 1377 break;
1370 1378
1371 case MapNotify: 1379 case MapNotify:
1372 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
1373 break; 1384 break;
1374 1385
1375 case PropertyNotify: 1386 case PropertyNotify:
1376 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) { 1387 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) {
1377 if (ev->xproperty.state == PropertyNewValue) 1388 if (ev->xproperty.state == PropertyNewValue)
… …
1400 1411
1401 case GraphicsExpose: 1412 case GraphicsExpose:
1402 case Expose: 1413 case Expose:
1403 if (ev->xany.window == R->TermWin.vt) { 1414 if (ev->xany.window == R->TermWin.vt) {
1404#ifdef NO_SLOW_LINK_SUPPORT 1415#ifdef NO_SLOW_LINK_SUPPORT
1405 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1416 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1406 ev->xexpose.width, ev->xexpose.height, False); 1417 ev->xexpose.width, ev->xexpose.height, False);
1407#else 1418#else
1408 // don't understand this, so commented it out 1419 // don't understand this, so commented it out
1409 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1420 R->scr_expose (ev->xexpose.x, ev->xexpose.y,
1410 ev->xexpose.width, ev->xexpose.height, False); 1421 ev->xexpose.width, ev->xexpose.height, False);
1411 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1422 //rxvt_scr_expose(aR_ ev->xexpose.x, 0,
1412 // ev->xexpose.width, R->TermWin.height, False); 1423 // ev->xexpose.width, R->TermWin.height, False);
1413#endif 1424#endif
1414 R->want_refresh = 1; 1425 R->want_refresh = 1;
1415 } else { 1426 } else {
… …
1460 &unused_mask); 1471 &unused_mask);
1461#ifdef MOUSE_THRESHOLD 1472#ifdef MOUSE_THRESHOLD
1462 /* deal with a `jumpy' mouse */ 1473 /* deal with a `jumpy' mouse */
1463 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1474 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) {
1464#endif 1475#endif
1465 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1476 R->selection_extend ((ev->xbutton.x), (ev->xbutton.y),
1466 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1477 (ev->xbutton.state & Button3Mask) ? 2 : 0);
1467#ifdef SELECTION_SCROLLING 1478#ifdef SELECTION_SCROLLING
1468 if (ev->xbutton.y<R->TermWin.int_bwidth || 1479 if (ev->xbutton.y < R->TermWin.int_bwidth
1469 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1480 || Pixel2Row(ev->xbutton.y) > (R->TermWin.nrow-1)) {
1470 int dist; 1481 int dist;
1471 1482
1472 R->pending_scroll_selection=1; 1483 R->pending_scroll_selection=1;
1473 1484
1474 /* don't clobber the current delay if we are 1485 /* don't clobber the current delay if we are
… …
1519 &unused_root_x, &unused_root_y, 1530 &unused_root_x, &unused_root_y,
1520 &(ev->xbutton.x), &(ev->xbutton.y), 1531 &(ev->xbutton.x), &(ev->xbutton.y),
1521 &unused_mask); 1532 &unused_mask);
1522 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,
1523 scrollbar_size()); 1534 scrollbar_size());
1524 rxvt_scr_refresh(aR_ R->refresh_type); 1535 R->scr_refresh (R->refresh_type);
1525 R->refresh_limit = 0; 1536 R->refresh_limit = 0;
1526 rxvt_scrollbar_show(aR_ 1); 1537 rxvt_scrollbar_show(aR_ 1);
1527 } 1538 }
1528 break; 1539 break;
1529 } 1540 }
… …
1531 1542
1532/* INTPROTO */ 1543/* INTPROTO */
1533void 1544void
1534rxvt_button_press(pR_ XButtonEvent *ev) 1545rxvt_button_press(pR_ XButtonEvent *ev)
1535{ 1546{
1536 int reportmode = 0, clickintime; 1547 int reportmode = 0, clickintime;
1537 1548
1538 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1549 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
1539 if (!R->bypass_keystate) 1550 if (!R->bypass_keystate)
1540 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1551 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1541/* 1552/*
… …
1588 if (ev->button != R->MEvent.button) 1599 if (ev->button != R->MEvent.button)
1589 R->MEvent.clicks = 0; 1600 R->MEvent.clicks = 0;
1590 switch (ev->button) 1601 switch (ev->button)
1591 { 1602 {
1592 case Button1: 1603 case Button1:
1604 /* allow shift+left click to extend selection */
1605 if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report))
1606 {
1593 if (R->MEvent.button == Button1 && clickintime) 1607 if (R->MEvent.button == Button1 && clickintime)
1608 R->selection_rotate (ev->x, ev->y);
1594 R->MEvent.clicks++; 1609 else
1610 R->selection_extend (ev->x, ev->y, 1);
1611 }
1595 else 1612 else
1613 {
1614 if (R->MEvent.button == Button1 && clickintime)
1615 R->MEvent.clicks++;
1616 else
1596 R->MEvent.clicks = 1; 1617 R->MEvent.clicks = 1;
1618
1597 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y); 1619 R->selection_click (R->MEvent.clicks, ev->x, ev->y);
1620 }
1621
1598 R->MEvent.button = Button1; 1622 R->MEvent.button = Button1;
1599 break; 1623 break;
1600 1624
1601 case Button3: 1625 case Button3:
1602 if (R->MEvent.button == Button3 && clickintime) 1626 if (R->MEvent.button == Button3 && clickintime)
1603 rxvt_selection_rotate(aR_ ev->x, ev->y); 1627 R->selection_rotate (ev->x, ev->y);
1604 else 1628 else
1605 rxvt_selection_extend(aR_ ev->x, ev->y, 1); 1629 R->selection_extend (ev->x, ev->y, 1);
1606 R->MEvent.button = Button3; 1630 R->MEvent.button = Button3;
1607 break; 1631 break;
1608 } 1632 }
1609 } 1633 }
1610 R->MEvent.time = ev->time; 1634 R->MEvent.time = ev->time;
… …
1804 * when overriding mouse reporting 1828 * when overriding mouse reporting
1805 */ 1829 */
1806 if (R->PrivateModes & PrivMode_mouse_report 1830 if (R->PrivateModes & PrivMode_mouse_report
1807 && R->bypass_keystate 1831 && R->bypass_keystate
1808 && ev->button == Button1 && R->MEvent.clicks <= 1) 1832 && ev->button == Button1 && R->MEvent.clicks <= 1)
1809 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1833 R->selection_extend (ev->x, ev->y, 0);
1810 1834
1811 switch (ev->button) { 1835 switch (ev->button) {
1812 case Button1: 1836 case Button1:
1813 case Button3: 1837 case Button3:
1814 rxvt_selection_make(aR_ ev->time); 1838 rxvt_selection_make(aR_ ev->time);
… …
1837 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1861 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1838 } 1862 }
1839# endif 1863# endif
1840# ifdef JUMP_MOUSE_WHEEL 1864# ifdef JUMP_MOUSE_WHEEL
1841 rxvt_scr_page(aR_ v, i); 1865 rxvt_scr_page(aR_ v, i);
1842 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1866 R->scr_refresh (SMOOTH_REFRESH);
1843 rxvt_scrollbar_show(aR_ 1); 1867 rxvt_scrollbar_show(aR_ 1);
1844# else 1868# else
1845 for (; i--;) 1869 while (i--)
1846 { 1870 {
1847 rxvt_scr_page(aR_ v, 1); 1871 rxvt_scr_page(aR_ v, 1);
1848 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1872 R->scr_refresh (SMOOTH_REFRESH);
1849 rxvt_scrollbar_show(aR_ 1); 1873 rxvt_scrollbar_show(aR_ 1);
1850 } 1874 }
1851# endif 1875# endif
1852 } 1876 }
1853 break; 1877 break;
… …
2207 break; 2231 break;
2208 case 'I': /* cursor up and scroll down if needed */ 2232 case 'I': /* cursor up and scroll down if needed */
2209 rxvt_scr_index(aR_ DN); 2233 rxvt_scr_index(aR_ DN);
2210 break; 2234 break;
2211 case 'J': /* erase to end of screen */ 2235 case 'J': /* erase to end of screen */
2212 rxvt_scr_erase_screen(aR_ 0); 2236 R->scr_erase_screen (0);
2213 break; 2237 break;
2214 case 'K': /* erase to end of line */ 2238 case 'K': /* erase to end of line */
2215 rxvt_scr_erase_line(aR_ 0); 2239 rxvt_scr_erase_line(aR_ 0);
2216 break; 2240 break;
2217 case 'Y': /* move to specified row and col */ 2241 case 'Y': /* move to specified row and col */
… …
2552 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2576 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2553 rxvt_scr_tab(aR_ arg[0]); 2577 rxvt_scr_tab(aR_ arg[0]);
2554 break; 2578 break;
2555 2579
2556 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2580 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2557 rxvt_scr_erase_screen(aR_ arg[0]); 2581 R->scr_erase_screen (arg[0]);
2558 break; 2582 break;
2559 2583
2560 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2584 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2561 rxvt_scr_erase_line(aR_ arg[0]); 2585 rxvt_scr_erase_line(aR_ arg[0]);
2562 break; 2586 break;
… …
2684 break; 2708 break;
2685#endif 2709#endif
2686 2710
2687 case CSI_78: /* DECREQTPARM */ 2711 case CSI_78: /* DECREQTPARM */
2688 if (arg[0] == 0 || arg[0] == 1) 2712 if (arg[0] == 0 || arg[0] == 1)
2689 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);
2690 /* FALLTHROUGH */ 2714 /* FALLTHROUGH */
2691 2715
2692 default: 2716 default:
2693 break; 2717 break;
2694 } 2718 }
… …
2732 break; 2756 break;
2733 case 6: /* lower window */ 2757 case 6: /* lower window */
2734 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2758 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]);
2735 break; 2759 break;
2736 case 7: /* refresh window */ 2760 case 7: /* refresh window */
2737 rxvt_scr_touch(aR_ True); 2761 R->scr_touch (true);
2738 break; 2762 break;
2739 case 8: /* set size (chars) */ 2763 case 8: /* set size (chars) */
2740 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2764 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth),
2741 (unsigned int)(args[1] * R->TermWin.fheight)); 2765 (unsigned int)(args[1] * R->TermWin.fheight));
2742 break; 2766 break;
… …
2953 if (*str != ';') { 2977 if (*str != ';') {
2954#if XPM_BACKGROUND 2978#if XPM_BACKGROUND
2955 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 2979 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */
2956 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 2980 rxvt_set_bgPixmap(aR_ str); /* change pixmap */
2957#endif 2981#endif
2958 rxvt_scr_touch(aR_ True); 2982 R->scr_touch (true);
2959 } 2983 }
2960 while ((str = STRCHR(str, ';')) != NULL) { 2984 while ((str = STRCHR(str, ';')) != NULL) {
2961 str++; 2985 str++;
2962#if XPM_BACKGROUND 2986#if XPM_BACKGROUND
2963 changed += rxvt_scale_pixmap(aR_ str); 2987 changed += rxvt_scale_pixmap(aR_ str);
… …
2965 } 2989 }
2966 if (changed) { 2990 if (changed) {
2967#ifdef XPM_BACKGROUND 2991#ifdef XPM_BACKGROUND
2968 rxvt_resize_pixmap(aR); 2992 rxvt_resize_pixmap(aR);
2969#endif 2993#endif
2970 rxvt_scr_touch(aR_ True); 2994 R->scr_touch (true);
2971 } 2995 }
2972 break; 2996 break;
2973 2997
2974 case XTerm_restoreFG: 2998 case XTerm_restoreFG:
2975 rxvt_set_window_color(aR_ Color_fg, str); 2999 rxvt_set_window_color(aR_ Color_fg, str);
… …
3061#endif 3085#endif
3062 { 1000, PrivMode_MouseX11 }, 3086 { 1000, PrivMode_MouseX11 },
3063 { 1010, PrivMode_TtyOutputInh }, 3087 { 1010, PrivMode_TtyOutputInh },
3064 { 1011, PrivMode_Keypress }, 3088 { 1011, PrivMode_Keypress },
3065 { 1047, PrivMode_Screen }, 3089 { 1047, PrivMode_Screen },
3090 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3066 }; 3091 };
3067 3092
3068 if (nargs == 0) 3093 if (nargs == 0)
3069 return; 3094 return;
3070 3095
… …
3141 break; 3166 break;
3142#endif 3167#endif
3143#ifdef scrollBar_esc 3168#ifdef scrollBar_esc
3144 case scrollBar_esc: 3169 case scrollBar_esc:
3145 if (rxvt_scrollbar_mapping(aR_ state)) { 3170 if (rxvt_scrollbar_mapping(aR_ state)) {
3146 rxvt_resize_all_windows(aR_ 0, 0, 0); 3171 R->resize_all_windows (0, 0, 0);
3147 rxvt_scr_touch(aR_ True); 3172 R->scr_touch (true);
3148 } 3173 }
3149 break; 3174 break;
3150#endif 3175#endif
3151 case 25: /* visible/invisible cursor */ 3176 case 25: /* visible/invisible cursor */
3152 rxvt_scr_cursor_visible(aR_ state); 3177 rxvt_scr_cursor_visible(aR_ state);
… …
3177 R->Options |= Opt_scrollTtyKeypress; 3202 R->Options |= Opt_scrollTtyKeypress;
3178 else 3203 else
3179 R->Options &= ~Opt_scrollTtyKeypress; 3204 R->Options &= ~Opt_scrollTtyKeypress;
3180 break; 3205 break;
3181 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 */
3182 if (R->current_screen != PRIMARY) 3208 if (R->current_screen != PRIMARY)
3183 rxvt_scr_erase_screen(aR_ 2); 3209 R->scr_erase_screen (2);
3184 rxvt_scr_change_screen(aR_ state); 3210 rxvt_scr_change_screen(aR_ state);
3185 /* FALLTHROUGH */ 3211 /* FALLTHROUGH */
3186 default: 3212 default:
3187 break; 3213 break;
3188 } 3214 }

Diff Legend

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