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.81 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.107 by root, Sat Jul 31 00:01:12 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
672 scr_refresh (refresh_type); 672 scr_refresh (refresh_type);
673 scrollbar_show (1); 673 scrollbar_show (1);
674#ifdef USE_XIM 674#ifdef USE_XIM
675 IMSendSpot (); 675 IMSendSpot ();
676#endif 676#endif
677
678 } 677 }
679 678
680 display->flush (); 679 display->flush ();
681} 680}
682 681
711 w.start (w.at + TEXT_BLINK_INTERVAL); 710 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 711 }
713} 712}
714#endif 713#endif
715 714
715#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
716void
717rxvt_term::cont_scroll_cb (time_watcher &w)
718{
719 if ((scrollbar_isUp() || scrollbar_isDn()) &&
720 scr_page (scrollbar_isUp() ? UP : DN, 1))
721 {
722 refresh_type |= SMOOTH_REFRESH;
723 want_refresh = 1;
724 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
725 }
726}
727#endif
728
729#ifdef SELECTION_SCROLLING
730void
731rxvt_term::sel_scroll_cb (time_watcher &w)
732{
733 if (scr_page (scroll_selection_dir, scroll_selection_lines))
734 {
735 selection_extend (selection_save_x, selection_save_y, selection_save_state);
736 refresh_type |= SMOOTH_REFRESH;
737 want_refresh = 1;
738 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
739 }
740}
741#endif
742
743#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
744void
745rxvt_term::slip_wheel_cb (time_watcher &w)
746{
747 if (mouse_slip_wheel_speed == 0
748 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
749 : scr_page (UP, mouse_slip_wheel_speed))
750 {
751 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
754 }
755}
756#endif
757
716bool 758bool
717rxvt_term::pty_fill () 759rxvt_term::pty_fill ()
718{ 760{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 761 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
762
763 if (CBUFSIZ == n)
764 {
765 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
766 n = 0;
767 }
720 768
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 769 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 770 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 771 cmdbuf_endp = cmdbuf_ptr + n;
724 772
742 SET_LOCALE (locale); 790 SET_LOCALE (locale);
743 791
744 if (revents & EVENT_WRITE) 792 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 793 tt_write (0, 0);
746 else if (revents & EVENT_READ) 794 else if (revents & EVENT_READ)
747 {
748 // loop, but don't allow a single term to monopolize us 795 // loop, but don't allow a single term to monopolize us
749 // the number of loops is fully arbitrary, and thus wrong
750 while (pty_fill ()) 796 while (pty_fill ())
751 {
752 if (!seen_input)
753 {
754 seen_input = 1;
755 /* once we know the shell is running, send the screen size. Again! */
756 // I don't know why, btw.
757 tt_winch ();
758 }
759
760 if (cmd_parse ()) 797 if (cmd_parse ())
761 break; 798 break;
762 }
763 }
764} 799}
765 800
766#ifdef POINTER_BLANK
767void 801void
768rxvt_term::pointer_unblank () 802rxvt_term::pointer_unblank ()
769{ 803{
770 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 804 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
771 recolour_cursor (); 805 recolour_cursor ();
772 806
807#ifdef POINTER_BLANK
773 hidden_pointer = 0; 808 hidden_pointer = 0;
774 809
775 if (Options & Opt_pointerBlank) 810 if (Options & Opt_pointerBlank)
776 pointer_ev.start (NOW + pointerBlankDelay); 811 pointer_ev.start (NOW + pointerBlankDelay);
812#endif
777} 813}
778 814
815#ifdef POINTER_BLANK
779void 816void
780rxvt_term::pointer_blank () 817rxvt_term::pointer_blank ()
781{ 818{
782 if (! (Options & Opt_pointerBlank)) 819 if (! (Options & Opt_pointerBlank))
783 return; 820 return;
979 break; 1016 break;
980 1017
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1018#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease: 1019 case KeyRelease:
983 { 1020 {
984 if (! (ev.xkey.state & ControlMask)) 1021 if (!(ev.xkey.state & ControlMask))
985 mouse_slip_wheel_speed = 0; 1022 slip_wheel_ev.stop ();
986 else 1023 else
987 { 1024 {
988 KeySym ks; 1025 KeySym ks;
989 1026
990 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0); 1027 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
991 if (ks == XK_Control_L || ks == XK_Control_R) 1028 if (ks == XK_Control_L || ks == XK_Control_R)
992 mouse_slip_wheel_speed = 0; 1029 mouse_slip_wheel_speed = 0;
993 } 1030 }
1013 && (ev.xclient.data.l[0] == DndFile 1050 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1051 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1052 || ev.xclient.data.l[0] == DndLink))
1016 { 1053 {
1017 /* Get Dnd data */ 1054 /* Get Dnd data */
1018 Atom ActualType; 1055 Atom ActualType;
1019 int ActualFormat; 1056 int ActualFormat;
1020 unsigned char *data; 1057 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1058 unsigned long Size, RemainingBytes;
1022 1059
1023 XGetWindowProperty (display->display, display->root, 1060 XGetWindowProperty (display->display, display->root,
1024 xa[XA_DNDSELECTION], 1061 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1062 0L, 1000000L,
1026 False, AnyPropertyType, 1063 False, AnyPropertyType,
1029 &data); 1066 &data);
1030 XChangeProperty (display->display, display->root, 1067 XChangeProperty (display->display, display->root,
1031 XA_CUT_BUFFER0, XA_STRING, 1068 XA_CUT_BUFFER0, XA_STRING,
1032 8, PropModeReplace, 1069 8, PropModeReplace,
1033 data, STRLEN (data)); 1070 data, STRLEN (data));
1071 XFree (data);
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1072 selection_paste (display->root, XA_CUT_BUFFER0, True);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1073 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1036 } 1074 }
1037#endif /* OFFIX_DND */ 1075#endif /* OFFIX_DND */
1038 break; 1076 break;
1077#endif 1115#endif
1078#ifdef CURSOR_BLINK 1116#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink) 1117 if (Options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1118 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1081#endif 1119#endif
1120#ifdef OFF_FOCUS_FADING
1121 if (rs[Rs_fade])
1122 {
1123 PixColors = PixColorsFocused;
1124 set_colorfgbg ();
1125 scr_clear ();
1126 scr_touch (true);
1127 }
1128#endif
1082 1129
1083 } 1130 }
1084 break; 1131 break;
1085 1132
1086 case FocusOut: 1133 case FocusOut:
1094#endif 1141#endif
1095#ifdef CURSOR_BLINK 1142#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink) 1143 if (Options & Opt_cursorBlink)
1097 cursor_blink_ev.stop (); 1144 cursor_blink_ev.stop ();
1098 hidden_cursor = 0; 1145 hidden_cursor = 0;
1146#endif
1147#ifdef OFF_FOCUS_FADING
1148 if (rs[Rs_fade])
1149 {
1150 PixColors = PixColorsUnFocused;
1151 set_colorfgbg ();
1152 scr_clear ();
1153 scr_touch (true);
1154 }
1099#endif 1155#endif
1100 1156
1101 } 1157 }
1102 break; 1158 break;
1103 1159
1131 check_our_parents (); 1187 check_our_parents ();
1132 if (am_transparent) 1188 if (am_transparent)
1133 want_full_refresh = 1; 1189 want_full_refresh = 1;
1134 } 1190 }
1135#endif 1191#endif
1136
1137 } 1192 }
1138 break; 1193 break;
1139 1194
1140 case SelectionClear: 1195 case SelectionClear:
1141 selection_clear (); 1196 selection_clear ();
1177 { 1232 {
1178#ifdef NO_SLOW_LINK_SUPPORT 1233#ifdef NO_SLOW_LINK_SUPPORT
1179 scr_expose (ev.xexpose.x, ev.xexpose.y, 1234 scr_expose (ev.xexpose.x, ev.xexpose.y,
1180 ev.xexpose.width, ev.xexpose.height, False); 1235 ev.xexpose.width, ev.xexpose.height, False);
1181#else 1236#else
1182 // don't understand this, so commented it out 1237 // I don't understand this, so I changed it :)
1183 scr_expose (ev.xexpose.x, ev.xexpose.y, 1238 scr_expose (ev.xexpose.x, ev.xexpose.y,
1184 ev.xexpose.width, ev.xexpose.height, False); 1239 ev.xexpose.width, ev.xexpose.height, False);
1185 //scr_expose (ev.xexpose.x, 0, 1240 //scr_expose (ev.xexpose.x, 0,
1186 // ev.xexpose.width, TermWin.height, False); 1241 // ev.xexpose.width, TermWin.height, False);
1187#endif 1242#endif
1189 } 1244 }
1190 else 1245 else
1191 { 1246 {
1192 XEvent unused_event; 1247 XEvent unused_event;
1193 1248
1194 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1249 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1195 Expose, 1250 ;
1196 &unused_event)) ;
1197 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1251 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1198 GraphicsExpose, 1252 ;
1199 &unused_event)) ; 1253
1200 if (isScrollbarWindow (ev.xany.window)) 1254 if (isScrollbarWindow (ev.xany.window))
1201 { 1255 {
1202 scrollBar.setIdle (); 1256 scrollBar.setIdle ();
1203 scrollbar_show (0); 1257 scrollbar_show (0);
1204 } 1258 }
1247 if (ev.xbutton.y < TermWin.int_bwidth 1301 if (ev.xbutton.y < TermWin.int_bwidth
1248 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1302 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1249 { 1303 {
1250 int dist; 1304 int dist;
1251 1305
1252 pending_scroll_selection=1;
1253
1254 /* don't clobber the current delay if we are 1306 /* don't clobber the current delay if we are
1255 * already in the middle of scrolling. 1307 * already in the middle of scrolling.
1256 */ 1308 */
1257 if (scroll_selection_delay<=0) 1309 if (!sel_scroll_ev.active)
1258 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1310 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1259 1311
1260 /* save the event params so we can highlight 1312 /* save the event params so we can highlight
1261 * the selection in the pending-scroll loop 1313 * the selection in the pending-scroll loop
1262 */ 1314 */
1263 selection_save_x=ev.xbutton.x; 1315 selection_save_x=ev.xbutton.x;
1285 else 1337 else
1286 { 1338 {
1287 /* we are within the text window, so we 1339 /* we are within the text window, so we
1288 * shouldn't be scrolling 1340 * shouldn't be scrolling
1289 */ 1341 */
1290 pending_scroll_selection = 0; 1342 if (sel_scroll_ev.active)
1343 sel_scroll_ev.stop();
1291 } 1344 }
1292#endif 1345#endif
1293#ifdef MOUSE_THRESHOLD 1346#ifdef MOUSE_THRESHOLD
1294 1347
1295 } 1348 }
1345 return; 1398 return;
1346 } 1399 }
1347 1400
1348 /* FALLTHROUGH */ 1401 /* FALLTHROUGH */
1349 case ReparentNotify: 1402 case ReparentNotify:
1350 if ((Options & Opt_transparent) && check_our_parents ()) 1403 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1351 if (am_transparent)
1352 want_full_refresh = 1; 1404 want_full_refresh = 1;
1353 break; 1405 break;
1354#endif 1406#endif
1355 } 1407 }
1356} 1408}
1357 1409
1513 upordown = 1; /* down */ 1565 upordown = 1; /* down */
1514 } 1566 }
1515 if (upordown) 1567 if (upordown)
1516 { 1568 {
1517#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1569#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1518 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1570 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1519#endif 1571#endif
1520 if (scr_page (upordown < 0 ? UP : DN, 1)) 1572 if (scr_page (upordown < 0 ? UP : DN, 1))
1521 { 1573 {
1522 if (upordown < 0) 1574 if (upordown < 0)
1523 scrollBar.setUp (); 1575 scrollBar.setUp ();
1610 refresh_type &= ~SMOOTH_REFRESH; 1662 refresh_type &= ~SMOOTH_REFRESH;
1611#endif 1663#endif
1612 1664
1613 } 1665 }
1614#ifdef SELECTION_SCROLLING 1666#ifdef SELECTION_SCROLLING
1615 pending_scroll_selection=0; 1667 if (sel_scroll_ev.active)
1668 sel_scroll_ev.stop();
1616#endif 1669#endif
1617 if (ev.window == TermWin.vt) 1670 if (ev.window == TermWin.vt)
1618 { 1671 {
1619 if (reportmode) 1672 if (reportmode)
1620 { 1673 {
1662 case Button5: 1715 case Button5:
1663 { 1716 {
1664 int i; 1717 int i;
1665 page_dirn v; 1718 page_dirn v;
1666 1719
1667 v = (ev.button == Button4) ? UP : DN; 1720 v = ev.button == Button4 ? UP : DN;
1721
1668 if (ev.state & ShiftMask) 1722 if (ev.state & ShiftMask)
1669 i = 1; 1723 i = 1;
1670 else if ((Options & Opt_mouseWheelScrollPage)) 1724 else if (Options & Opt_mouseWheelScrollPage)
1671 i = TermWin.nrow - 1; 1725 i = TermWin.nrow - 1;
1672 else 1726 else
1673 i = 5; 1727 i = 5;
1728
1674# ifdef MOUSE_SLIP_WHEELING 1729# ifdef MOUSE_SLIP_WHEELING
1675 if (ev.state & ControlMask) 1730 if (ev.state & ControlMask)
1676 { 1731 {
1677 mouse_slip_wheel_speed += (v ? -1 : 1); 1732 mouse_slip_wheel_speed += v ? -1 : 1;
1733 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
1734 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
1735
1736 if (slip_wheel_ev.at < NOW)
1678 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1737 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1738
1739 slip_wheel_ev.start ();
1679 } 1740 }
1741 else
1742 {
1680# endif 1743# endif
1681# ifdef JUMP_MOUSE_WHEEL 1744# ifdef JUMP_MOUSE_WHEEL
1682 scr_page (v, i);
1683 scr_refresh (SMOOTH_REFRESH);
1684 scrollbar_show (1);
1685# else
1686 while (i--)
1687 {
1688 scr_page (v, 1); 1745 scr_page (v, i);
1689 scr_refresh (SMOOTH_REFRESH); 1746 scr_refresh (SMOOTH_REFRESH);
1690 scrollbar_show (1); 1747 scrollbar_show (1);
1748# else
1749 while (i--)
1750 {
1751 scr_page (v, 1);
1752 scr_refresh (SMOOTH_REFRESH);
1753 scrollbar_show (1);
1754 }
1755# endif
1756# ifdef MOUSE_SLIP_WHEELING
1691 } 1757 }
1692# endif 1758#endif
1693
1694 } 1759 }
1695 break; 1760 break;
1696#endif 1761#endif
1697
1698 } 1762 }
1699 } 1763 }
1700#ifdef MENUBAR 1764#ifdef MENUBAR
1701 else if (isMenuBarWindow (ev.window)) 1765 else if (isMenuBarWindow (ev.window))
1702 menubar_control (ev); 1766 menubar_control (ev);
1703#endif 1767#endif
1704} 1768}
1705 1769
1706
1707#ifdef TRANSPARENT 1770#ifdef TRANSPARENT
1771#if TINTING
1772/* shading taken from eterm-0.9.2 */
1773/* RGB 15 */
1774
1775static void
1776shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1777{
1778 unsigned char *ptr;
1779 int x, y;
1780
1781 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1782 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1783 /* No saturation */
1784 for (y = h; --y >= 0;) {
1785 for (x = -w; x < 0; x++) {
1786 int r, g, b;
1787
1788 b = ((uint16_t *) ptr)[x];
1789 r = (b & 0x7c00) * rm;
1790 g = (b & 0x3e0) * gm;
1791 b = (b & 0x1f) * bm;
1792 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1793 | ((g >> 8) & 0x3e0)
1794 | ((b >> 8) & 0x1f);
1795 }
1796 ptr += bpl;
1797 }
1798 } else {
1799 for (y = h; --y >= 0;) {
1800 for (x = -w; x < 0; x++) {
1801 int r, g, b;
1802
1803 b = ((uint16_t *) ptr)[x];
1804 r = (b & 0x7c00) * rm;
1805 g = (b & 0x3e0) * gm;
1806 b = (b & 0x1f) * bm;
1807 r |= (!(r >> 15) - 1);
1808 g |= (!(g >> 10) - 1);
1809 b |= (!(b >> 5) - 1);
1810 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1811 | ((g >> 8) & 0x3e0)
1812 | ((b >> 8) & 0x1f);
1813 }
1814 ptr += bpl;
1815 }
1816 }
1817}
1818
1819/* RGB 16 */
1820static void
1821shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1822{
1823 unsigned char *ptr;
1824 int x, y;
1825
1826 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1827 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1828 /* No saturation */
1829 for (y = h; --y >= 0;) {
1830 for (x = -w; x < 0; x++) {
1831 int r, g, b;
1832
1833 b = ((uint16_t *) ptr)[x];
1834 r = (b & 0xf800) * rm;
1835 g = (b & 0x7e0) * gm;
1836 b = (b & 0x1f) * bm;
1837 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1838 | ((g >> 8) & 0x7e0)
1839 | ((b >> 8) & 0x1f);
1840 }
1841 ptr += bpl;
1842 }
1843 } else {
1844 for (y = h; --y >= 0;) {
1845 for (x = -w; x < 0; x++) {
1846 int r, g, b;
1847
1848 b = ((uint16_t *) ptr)[x];
1849 r = (b & 0xf800) * rm;
1850 g = (b & 0x7e0) * gm;
1851 b = (b & 0x1f) * bm;
1852 r |= (!(r >> 16) - 1);
1853 g |= (!(g >> 11) - 1);
1854 b |= (!(b >> 5) - 1);
1855 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1856 | ((g >> 8) & 0x7e0)
1857 | ((b >> 8) & 0x1f);
1858 }
1859 ptr += bpl;
1860 }
1861 }
1862}
1863
1864/* RGB 24 */
1865static void
1866shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1867{
1868 unsigned char *ptr;
1869 int x, y;
1870
1871 ptr = (unsigned char *)data + (w * 3);
1872 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1873 /* No saturation */
1874 for (y = h; --y >= 0;) {
1875 for (x = -(w * 3); x < 0; x += 3) {
1876 int r, g, b;
1877
1878 if (byteorder.big_endian()) {
1879 r = (ptr[x + 0] * rm) >> 8;
1880 g = (ptr[x + 1] * gm) >> 8;
1881 b = (ptr[x + 2] * bm) >> 8;
1882 ptr[x + 0] = r;
1883 ptr[x + 1] = g;
1884 ptr[x + 2] = b;
1885 } else {
1886 r = (ptr[x + 2] * rm) >> 8;
1887 g = (ptr[x + 1] * gm) >> 8;
1888 b = (ptr[x + 0] * bm) >> 8;
1889 ptr[x + 2] = r;
1890 ptr[x + 1] = g;
1891 ptr[x + 0] = b;
1892 }
1893 }
1894 ptr += bpl;
1895 }
1896 } else {
1897 for (y = h; --y >= 0;) {
1898 for (x = -(w * 3); x < 0; x += 3) {
1899 int r, g, b;
1900
1901 if (byteorder.big_endian()) {
1902 r = (ptr[x + 0] * rm) >> 8;
1903 g = (ptr[x + 1] * gm) >> 8;
1904 b = (ptr[x + 2] * bm) >> 8;
1905
1906 r |= (!(r >> 8) - 1);
1907 g |= (!(g >> 8) - 1);
1908 b |= (!(b >> 8) - 1);
1909
1910 ptr[x + 0] = r;
1911 ptr[x + 1] = g;
1912 ptr[x + 2] = b;
1913 } else {
1914 r = (ptr[x + 2] * rm) >> 8;
1915 g = (ptr[x + 1] * gm) >> 8;
1916 b = (ptr[x + 0] * bm) >> 8;
1917
1918 r |= (!(r >> 8) - 1);
1919 g |= (!(g >> 8) - 1);
1920 b |= (!(b >> 8) - 1);
1921
1922 ptr[x + 2] = r;
1923 ptr[x + 1] = g;
1924 ptr[x + 0] = b;
1925 }
1926 }
1927 ptr += bpl;
1928 }
1929 }
1930}
1931
1932/* RGB 32 */
1933static void
1934shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1935{
1936 unsigned char *ptr;
1937 int x, y;
1938
1939 ptr = (unsigned char *)data + (w * 4);
1940 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1941 /* No saturation */
1942 for (y = h; --y >= 0;) {
1943 if (byteorder.big_endian()) {
1944 for (x = -(w * 4); x < 0; x += 4) {
1945 int r, g, b;
1946
1947 r = (ptr[x + 1] * rm) >> 8;
1948 g = (ptr[x + 2] * gm) >> 8;
1949 b = (ptr[x + 3] * bm) >> 8;
1950 ptr[x + 1] = r;
1951 ptr[x + 2] = g;
1952 ptr[x + 3] = b;
1953 }
1954 } else {
1955 for (x = -(w * 4); x < 0; x += 4) {
1956 int r, g, b;
1957
1958 r = (ptr[x + 2] * rm) >> 8;
1959 g = (ptr[x + 1] * gm) >> 8;
1960 b = (ptr[x + 0] * bm) >> 8;
1961 ptr[x + 2] = r;
1962 ptr[x + 1] = g;
1963 ptr[x + 0] = b;
1964 }
1965 }
1966 ptr += bpl;
1967 }
1968 } else {
1969 for (y = h; --y >= 0;) {
1970 for (x = -(w * 4); x < 0; x += 4) {
1971 int r, g, b;
1972
1973 if (byteorder.big_endian()) {
1974 r = (ptr[x + 1] * rm) >> 8;
1975 g = (ptr[x + 2] * gm) >> 8;
1976 b = (ptr[x + 3] * bm) >> 8;
1977
1978 r |= (!(r >> 8) - 1);
1979 g |= (!(g >> 8) - 1);
1980 b |= (!(b >> 8) - 1);
1981
1982 ptr[x + 1] = r;
1983 ptr[x + 2] = g;
1984 ptr[x + 3] = b;
1985 } else {
1986 r = (ptr[x + 2] * rm) >> 8;
1987 g = (ptr[x + 1] * gm) >> 8;
1988 b = (ptr[x + 0] * bm) >> 8;
1989
1990 r |= (!(r >> 8) - 1);
1991 g |= (!(g >> 8) - 1);
1992 b |= (!(b >> 8) - 1);
1993
1994 ptr[x + 2] = r;
1995 ptr[x + 1] = g;
1996 ptr[x + 0] = b;
1997 }
1998 }
1999 ptr += bpl;
2000 }
2001 }
2002}
2003
2004#endif
2005
1708/* 2006/*
1709 * Check our parents are still who we think they are. 2007 * Check our parents are still who we think they are.
1710 * Do transparency updates if required 2008 * Do transparency updates if required
1711 */ 2009 */
1712int 2010int
1713rxvt_term::check_our_parents () 2011rxvt_term::check_our_parents ()
1714{ 2012{
1715 int i, pchanged, aformat, have_pixmap, rootdepth; 2013 int i, pchanged, aformat, have_pixmap, rootdepth;
1716 unsigned long nitems, bytes_after; 2014 unsigned long nitems, bytes_after;
1717 Atom atype; 2015 Atom atype;
1718 unsigned char *prop = NULL; 2016 unsigned char *prop = NULL;
1719 Window root, oldp, *list; 2017 Window root, oldp, *list;
1720 Pixmap rootpixmap = None; 2018 Pixmap rootpixmap = None;
1721 XWindowAttributes wattr, wrootattr; 2019 XWindowAttributes wattr, wrootattr;
1722 2020
1723 pchanged = 0; 2021 pchanged = 0;
1724 2022
1725 if (! (Options & Opt_transparent)) 2023 if (!(Options & Opt_transparent))
1726 return pchanged; /* Don't try any more */ 2024 return pchanged; /* Don't try any more */
1727 2025
1728 XGetWindowAttributes (display->display, display->root, &wrootattr); 2026 XGetWindowAttributes (display->display, display->root, &wrootattr);
1729 rootdepth = wrootattr.depth; 2027 rootdepth = wrootattr.depth;
1730 2028
1731 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2029 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2030
1732 if (rootdepth != wattr.depth) 2031 if (rootdepth != wattr.depth)
1733 { 2032 {
1734 if (am_transparent) 2033 if (am_transparent)
1735 { 2034 {
1736 pchanged = 1; 2035 pchanged = 1;
1737 XSetWindowBackground (display->display, TermWin.vt, 2036 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
1738 PixColors[Color_bg]);
1739 am_transparent = am_pixmap_trans = 0; 2037 am_transparent = am_pixmap_trans = 0;
1740 } 2038 }
2039
1741 return pchanged; /* Don't try any more */ 2040 return pchanged; /* Don't try any more */
1742 } 2041 }
1743 2042
1744 /* Get all X ops out of the queue so that our information is up-to-date. */ 2043 /* Get all X ops out of the queue so that our information is up-to-date. */
1745 XSync (display->display, False); 2044 XSync (display->display, False);
1747 /* 2046 /*
1748 * Make the frame window set by the window manager have 2047 * Make the frame window set by the window manager have
1749 * the root background. Some window managers put multiple nested frame 2048 * the root background. Some window managers put multiple nested frame
1750 * windows for each client, so we have to take care about that. 2049 * windows for each client, so we have to take care about that.
1751 */ 2050 */
1752 i = (xa[XA_XROOTPMAPID] != 0 2051 i = (xa[XA_XROOTPMAPID]
1753 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2052 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1754 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2053 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1755 &nitems, &bytes_after, &prop) == Success)); 2054 &nitems, &bytes_after, &prop) == Success);
2055
1756 if (!i || prop == NULL) 2056 if (!i || prop == NULL)
2057 i = (xa[XA_XSETROOTID]
2058 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2059 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2060 &nitems, &bytes_after, &prop) == Success);
2061
2062 if (!i || prop == NULL || !rs[Rs_color + Color_tint])
1757 have_pixmap = 0; 2063 have_pixmap = 0;
1758 else 2064 else
1759 { 2065 {
1760 have_pixmap = 1; 2066 have_pixmap = 1;
1761 rootpixmap = * ((Pixmap *)prop); 2067 rootpixmap = *(Pixmap *)prop;
1762 XFree (prop); 2068 XFree (prop);
1763 } 2069 }
2070
1764 if (have_pixmap) 2071 if (have_pixmap)
1765 { 2072 {
1766 /* 2073 /*
1767 * Copy display->root pixmap transparency 2074 * Copy display->root pixmap transparency
1768 */ 2075 */
1771 Window cr; 2078 Window cr;
1772 XImage *image; 2079 XImage *image;
1773 GC gc; 2080 GC gc;
1774 XGCValues gcvalue; 2081 XGCValues gcvalue;
1775 2082
1776 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2083 XTranslateCoordinates (display->display, TermWin.vt, display->root,
1777 0, 0, &sx, &sy, &cr); 2084 0, 0, &sx, &sy, &cr);
1778 nw = (unsigned int)szHint.width; 2085 nw = (unsigned int)szHint.width;
1779 nh = (unsigned int)szHint.height; 2086 nh = (unsigned int)szHint.height;
1780 nx = ny = 0; 2087 nx = ny = 0;
1781 2088
1782 if (sx < 0) 2089 if (sx < 0)
1794 } 2101 }
1795 2102
1796 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2103 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1797 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2104 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1798 allowedxerror = -1; 2105 allowedxerror = -1;
1799 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2106 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1800 ZPixmap); 2107
1801 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2108 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1802 /* XXX: may need a delay here? */ 2109 /* XXX: may need a delay here? */
1803 allowedxerror = 0; 2110 allowedxerror = 0;
2111
1804 if (image == NULL) 2112 if (image == NULL)
1805 { 2113 {
1806 if (am_transparent && am_pixmap_trans) 2114 if (am_transparent && am_pixmap_trans)
1807 { 2115 {
1808 pchanged = 1; 2116 pchanged = 1;
1810 { 2118 {
1811 XFreePixmap (display->display, TermWin.pixmap); 2119 XFreePixmap (display->display, TermWin.pixmap);
1812 TermWin.pixmap = None; 2120 TermWin.pixmap = None;
1813 } 2121 }
1814 } 2122 }
2123
1815 am_pixmap_trans = 0; 2124 am_pixmap_trans = 0;
1816 } 2125 }
1817 else 2126 else
1818 { 2127 {
1819 if (TermWin.pixmap != None) 2128 if (TermWin.pixmap != None)
1820 XFreePixmap (display->display, TermWin.pixmap); 2129 XFreePixmap (display->display, TermWin.pixmap);
2130
2131#if TINTING
2132 if (ISSET_PIXCOLOR (Color_tint))
2133 {
2134 unsigned short rm, gm, bm;
2135 if (rs[Rs_shade])
2136 PixColorsFocused[Color_tint].fade (display, atoi (rs[Rs_shade])).get (display, rm, gm, bm);
2137 else
2138 PixColorsFocused[Color_tint].get (display, rm, gm, bm);
2139
2140 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but...
2141
2142 /* Determine bitshift and bitmask values */
2143 switch (image->bits_per_pixel)
2144 {
2145 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2146 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2147 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2148 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2149 }
2150 }
2151#endif
2152
1821 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2153 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1822 (unsigned int)szHint.width,
1823 (unsigned int)szHint.height, 2154 szHint.width, szHint.height, image->depth);
1824 (unsigned int)image->depth);
1825 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2155 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1826 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2156 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1827 nx, ny, (unsigned int)image->width,
1828 (unsigned int)image->height); 2157 nx, ny, image->width, image->height);
1829 XFreeGC (display->display, gc); 2158 XFreeGC (display->display, gc);
1830 XDestroyImage (image); 2159 XDestroyImage (image);
1831 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2160 XSetWindowBackgroundPixmap (display->display, TermWin.vt, TermWin.pixmap);
1832 TermWin.pixmap); 2161
1833 if (!am_transparent || !am_pixmap_trans) 2162 if (!am_transparent || !am_pixmap_trans)
1834 pchanged = 1; 2163 pchanged = 1;
2164
1835 am_transparent = am_pixmap_trans = 1; 2165 am_transparent = am_pixmap_trans = 1;
1836 } 2166 }
1837 } 2167 }
1838 2168
1839 if (!am_pixmap_trans) 2169 if (!am_pixmap_trans)
1840 { 2170 {
1841 unsigned int n; 2171 unsigned int n;
1842 /* 2172 /*
1843 * InheritPixmap transparency 2173 * InheritPixmap transparency
1844 */ 2174 */
1845 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2175 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1846 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2176 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
1847 i++)
1848 { 2177 {
1849 oldp = TermWin.parent[i]; 2178 oldp = TermWin.parent[i];
1850 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2179 XQueryTree (display->display, TermWin.parent[i - 1], &root,
1851 &TermWin.parent[i], &list, &n); 2180 &TermWin.parent[i], &list, &n);
1852 XFree (list); 2181 XFree (list);
1853 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2182 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2183
1854 if (TermWin.parent[i] == display->root) 2184 if (TermWin.parent[i] == display->root)
1855 { 2185 {
1856 if (oldp != None) 2186 if (oldp != None)
1857 pchanged = 1; 2187 pchanged = 1;
2188
1858 break; 2189 break;
1859 } 2190 }
2191
1860 if (oldp != TermWin.parent[i]) 2192 if (oldp != TermWin.parent[i])
1861 pchanged = 1; 2193 pchanged = 1;
1862 } 2194 }
1863 2195
1864 n = 0; 2196 n = 0;
1875 break; 2207 break;
1876 } 2208 }
1877 } 2209 }
1878 } 2210 }
1879 2211
1880 if (n > (int) (sizeof (TermWin.parent) 2212 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
1881 / sizeof (TermWin.parent[0])))
1882 { 2213 {
1883 D_X ((stderr, "InheritPixmap Turning off")); 2214 D_X ((stderr, "InheritPixmap Turning off")); /* Mikachu? */
1884 XSetWindowBackground (display->display, TermWin.parent[0], 2215 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]);
1885 PixColors[Color_fg]);
1886 XSetWindowBackground (display->display, TermWin.vt, 2216 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
1887 PixColors[Color_bg]);
1888 am_transparent = 0; 2217 am_transparent = 0;
1889 /* XXX: also turn off Opt_transparent? */ 2218 /* XXX: also turn off Opt_transparent? */
1890 } 2219 }
1891 else 2220 else
1892 { 2221 {
2222#if WAIT_FOR_WM
1893 /* wait (an arbitrary period) for the WM to do its thing 2223 /* wait (an arbitrary period) for the WM to do its thing
1894 * needed for fvwm2.2.2 (and before?) */ 2224 * needed for fvwm2.2.2 (and before?) */
1895# ifdef HAVE_NANOSLEEP
1896 struct timespec rqt;
1897
1898 rqt.tv_sec = 1;
1899 rqt.tv_nsec = 0;
1900 nanosleep (&rqt, NULL);
1901# else
1902 sleep (1); 2225 sleep (1);
1903# endif 2226#endif
1904 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2227 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
1905 for (n = 0; n < (unsigned int)i; n++) 2228 for (n = 0; n < (unsigned int)i; n++)
1906 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2229 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
1907 ParentRelative); 2230
1908 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2231 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
1909 ParentRelative);
1910 am_transparent = 1; 2232 am_transparent = 1;
1911 } 2233 }
1912 2234
1913 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2235 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
1914 TermWin.parent[i] = None; 2236 TermWin.parent[i] = None;
1915 } 2237 }
2238
1916 return pchanged; 2239 return pchanged;
1917} 2240}
1918#endif 2241#endif
1919 2242
1920/*}}} */ 2243/*}}} */
1935 } 2258 }
1936 2259
1937 if (ch == NOCHAR) // TODO: improve 2260 if (ch == NOCHAR) // TODO: improve
1938 break; 2261 break;
1939 2262
1940 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r') 2263 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
1941 { 2264 {
1942 /* Read a text string from the input buffer */ 2265 /* Read a text string from the input buffer */
1943 unicode_t buf[UBUFSIZ]; 2266 unicode_t buf[UBUFSIZ];
1944 bool refreshnow = false; 2267 bool refreshnow = false;
1945 int nlines = 0; 2268 int nlines = 0;
1950 for (;;) 2273 for (;;)
1951 { 2274 {
1952 seq_begin = cmdbuf_ptr; 2275 seq_begin = cmdbuf_ptr;
1953 ch = next_char (); 2276 ch = next_char ();
1954 2277
1955 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2278 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
1956 break; 2279 break;
1957 2280
1958 *str++ = ch; 2281 *str++ = ch;
1959 2282
1960 if (ch == '\n') 2283 if (ch == C0_LF)
1961 { 2284 {
1962 nlines++; 2285 nlines++;
1963 refresh_count++; 2286 refresh_count++;
1964 2287
1965 if (! (Options & Opt_jumpScroll) 2288 if (! (Options & Opt_jumpScroll)
2000 */ 2323 */
2001 if (refreshnow) 2324 if (refreshnow)
2002 { 2325 {
2003 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2326 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2004 refresh_limit++; 2327 refresh_limit++;
2005 2328 else
2006 scr_refresh (refresh_type); 2329 scr_refresh (refresh_type);
2007 } 2330 }
2008 2331
2009 } 2332 }
2010 else 2333 else
2011 { 2334 {
2025 } 2348 }
2026 2349
2027 return flag; 2350 return flag;
2028} 2351}
2029 2352
2353// read the next octet
2354unicode_t
2355rxvt_term::next_octet ()
2356{
2357 return cmdbuf_ptr < cmdbuf_endp
2358 ? *cmdbuf_ptr++
2359 : NOCHAR;
2360}
2361
2030// read the next character 2362// read the next character
2031unicode_t 2363unicode_t
2032rxvt_term::next_char () 2364rxvt_term::next_char ()
2033{ 2365{
2034 while (cmdbuf_ptr < cmdbuf_endp) 2366 while (cmdbuf_ptr < cmdbuf_endp)
2065 */ 2397 */
2066unicode_t 2398unicode_t
2067rxvt_term::cmd_getc () 2399rxvt_term::cmd_getc ()
2068{ 2400{
2069 unicode_t c = next_char (); 2401 unicode_t c = next_char ();
2402
2403 if (c == NOCHAR)
2404 throw out_of_input;
2405
2406 return c;
2407}
2408
2409unicode_t
2410rxvt_term::cmd_get8 ()
2411{
2412 unicode_t c = next_octet ();
2070 2413
2071 if (c == NOCHAR) 2414 if (c == NOCHAR)
2072 throw out_of_input; 2415 throw out_of_input;
2073 2416
2074 return c; 2417 return c;
2156/*}}} */ 2499/*}}} */
2157 2500
2158/* *INDENT-OFF* */ 2501/* *INDENT-OFF* */
2159enum { 2502enum {
2160 C1_40 = 0x40, 2503 C1_40 = 0x40,
2161 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2504 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2162 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2505 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2163 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2506 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2164 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2507 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2165}; 2508};
2166/* *INDENT-ON* */ 2509/* *INDENT-ON* */
2167 2510
2168/*{{{ process non-printing single characters */ 2511/*{{{ process non-printing single characters */
2169void 2512void
2174 case C0_ESC: 2517 case C0_ESC:
2175 process_escape_seq (); 2518 process_escape_seq ();
2176 break; 2519 break;
2177 case C0_ENQ: /* terminal Status */ 2520 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2521 if (rs[Rs_answerbackstring])
2179 tt_write (
2180 (const unsigned char *)rs[Rs_answerbackstring], 2522 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2523 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2182 else 2524 else
2183 tt_write ((unsigned char *)VT100_ANS, 2525 tt_write ((unsigned char *)VT100_ANS,
2184 (unsigned int)STRLEN (VT100_ANS)); 2526 (unsigned int)STRLEN (VT100_ANS));
2185 break; 2527 break;
2186 case C0_BEL: /* bell */ 2528 case C0_BEL: /* bell */
2187 scr_bell (); 2529 scr_bell ();
2188 break; 2530 break;
2189 case C0_BS: /* backspace */ 2531 case C0_BS: /* backspace */
2205 break; 2547 break;
2206 case C0_SI: /* shift in - acs */ 2548 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2549 scr_charset_choose (0);
2208 break; 2550 break;
2209 2551
2552#ifdef EIGHT_BIT_CONTROLS
2210 // 8-bit controls 2553 // 8-bit controls
2211 case 0x90: /* DCS */ 2554 case 0x90: /* DCS */
2212 process_dcs_seq (); 2555 process_dcs_seq ();
2213 break; 2556 break;
2214 case 0x9b: /* CSI */ 2557 case 0x9b: /* CSI */
2215 process_csi_seq (); 2558 process_csi_seq ();
2216 break; 2559 break;
2217 case 0x9d: /* CSI */ 2560 case 0x9d: /* CSI */
2218 process_osc_seq (); 2561 process_osc_seq ();
2219 break; 2562 break;
2563#endif
2220 } 2564 }
2221} 2565}
2222/*}}} */ 2566/*}}} */
2223 2567
2224 2568
2342 break; 2686 break;
2343 2687
2344 /* 8.3.87: NEXT LINE */ 2688 /* 8.3.87: NEXT LINE */
2345 case C1_NEL: /* ESC E */ 2689 case C1_NEL: /* ESC E */
2346 { 2690 {
2347 unicode_t nlcr[] = { L'\n', L'\r' }; 2691 unicode_t nlcr[] = { C0_LF, C0_CR };
2348 scr_add_lines (nlcr, 1, 2); 2692 scr_add_lines (nlcr, 1, 2);
2349 } 2693 }
2350 break; 2694 break;
2351 2695
2352 /* kidnapped escape sequence: Should be 8.3.48 */ 2696 /* kidnapped escape sequence: Should be 8.3.48 */
2363 case C1_RI: /* ESC M */ 2707 case C1_RI: /* ESC M */
2364 scr_index (DN); 2708 scr_index (DN);
2365 break; 2709 break;
2366 2710
2367 /* 8.3.142: SINGLE-SHIFT TWO */ 2711 /* 8.3.142: SINGLE-SHIFT TWO */
2368 /*case C1_SS2: scr_single_shift (2); break; */ 2712 /*case C1_SS2: scr_single_shift (2); break; */
2369 2713
2370 /* 8.3.143: SINGLE-SHIFT THREE */ 2714 /* 8.3.143: SINGLE-SHIFT THREE */
2371 /*case C1_SS3: scr_single_shift (3); break; */ 2715 /*case C1_SS3: scr_single_shift (3); break; */
2372 2716
2373 /* 8.3.27: DEVICE CONTROL STRING */ 2717 /* 8.3.27: DEVICE CONTROL STRING */
2374 case C1_DCS: /* ESC P */ 2718 case C1_DCS: /* ESC P */
2375 process_dcs_seq (); 2719 process_dcs_seq ();
2376 break; 2720 break;
2391 process_osc_seq (); 2735 process_osc_seq ();
2392 break; 2736 break;
2393 2737
2394 /* 8.3.106: RESET TO INITIAL STATE */ 2738 /* 8.3.106: RESET TO INITIAL STATE */
2395 case 'c': 2739 case 'c':
2740 mbstate.reset ();
2396 scr_poweron (); 2741 scr_poweron ();
2397 scrollbar_show (1); 2742 scrollbar_show (1);
2398 break; 2743 break;
2399 2744
2400 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2745 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2412 2757
2413/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2758/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2414/* *INDENT-OFF* */ 2759/* *INDENT-OFF* */
2415enum { 2760enum {
2416 CSI_ICH = 0x40, 2761 CSI_ICH = 0x40,
2417 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2762 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2418 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2763 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2419 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2764 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2420 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2765 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2421 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2766 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2422 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2767 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2437 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2782 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2438 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2783 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2439 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2784 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2440 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2785 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2441 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2786 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2442 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2787 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2443 }; 2788 };
2444/* *INDENT-ON* */ 2789/* *INDENT-ON* */
2445 2790
2446void 2791void
2447rxvt_term::process_csi_seq () 2792rxvt_term::process_csi_seq ()
2646 tt_printf ("\033[0n"); 2991 tt_printf ("\033[0n");
2647 break; 2992 break;
2648 case 6: /* CPR requested */ 2993 case 6: /* CPR requested */
2649 scr_report_position (); 2994 scr_report_position ();
2650 break; 2995 break;
2651#if defined (ENABLE_DISPLAY_ANSWER)
2652 case 7: /* unofficial extension */ 2996 case 7: /* unofficial extension */
2997 if (Options & Opt_insecure)
2653 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2998 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2654 break; 2999 break;
2655#endif
2656 case 8: /* unofficial extension */ 3000 case 8: /* unofficial extension */
2657 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3001 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2658 break; 3002 break;
2659 } 3003 }
2660 break; 3004 break;
2661 3005
2662 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3006 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2800 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3144 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2801 break; 3145 break;
2802 case 13: /* report window position */ 3146 case 13: /* report window position */
2803 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3147 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2804 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3148 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2805 -wattr.border_width, -wattr.border_width, 3149 -wattr.border_width, -wattr.border_width,
2806 &x, &y, &wdummy); 3150 &x, &y, &wdummy);
2807 tt_printf ("\033[3;%d;%dt", x, y); 3151 tt_printf ("\033[3;%d;%dt", x, y);
2808 break; 3152 break;
2809 case 14: /* report window size (pixels) */ 3153 case 14: /* report window size (pixels) */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3154 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2811 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3155 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2814 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3158 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2815 break; 3159 break;
2816 case 19: /* report window size (chars) */ 3160 case 19: /* report window size (chars) */
2817 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3161 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
2818 break; 3162 break;
2819#if 0 /* XXX: currently disabled due to security concerns */
2820 case 20: /* report icon label */ 3163 case 20: /* report icon label */
3164 if (Options & Opt_insecure)
3165 {
3166 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3167 XGetIconName (display->display, TermWin.parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3168 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
3169 }
2823 break; 3170 break;
2824 case 21: /* report window title */ 3171 case 21: /* report window title */
3172 if (Options & Opt_insecure)
3173 {
3174 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3175 XFetchName (display->display, TermWin.parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3176 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
3177 }
2827 break; 3178 break;
2828#endif
2829 } 3179 }
2830} 3180}
2831#endif 3181#endif
2832 3182
2833/*----------------------------------------------------------------------*/ 3183/*----------------------------------------------------------------------*/
2834/* 3184/*
2835 * get input up until STRING TERMINATOR (or BEL) 3185 * get input up until STRING TERMINATOR (or BEL)
2836 * ends_how is terminator used. returned input must be free ()d 3186 * ends_how is terminator used. returned input must be free()'d
2837 */ 3187 */
2838unsigned char * 3188unsigned char *
2839rxvt_term::get_to_st (unicode_t &ends_how) 3189rxvt_term::get_to_st (unicode_t &ends_how)
2840{ 3190{
2841 int seen_esc = 0; /* seen escape? */ 3191 unicode_t prev = 0, ch;
2842 unsigned int n = 0; 3192 unsigned int n = 0;
2843 unsigned char *s; 3193 unsigned char *s;
2844 unicode_t ch;
2845 unsigned char string[STRING_MAX]; 3194 unsigned char string[STRING_MAX];
2846 3195
2847 while ((ch = cmd_getc ())) 3196 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3197 {
2849 if (ch == C0_BEL
2850 || ch == CHAR_ST
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2852 break;
2853
2854 if (ch == C0_ESC) 3198 if (prev == C0_ESC)
2855 {
2856 seen_esc = 1;
2857 continue;
2858 } 3199 {
2859 else if (ch == '\t') 3200 if (ch == 0x5c) /* 7bit ST */
2860 ch = ' '; /* translate '\t' to space */ 3201 break;
2861 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3202 else
3203 return NULL;
3204 }
3205 else if (ch == C0_BEL || ch == CHAR_ST)
3206 break;
3207 else if (ch < 0x20)
2862 return NULL; /* other control character - exit */ 3208 return NULL; /* other control character - exit */
2863 3209
2864 if (n < sizeof (string) - 1) 3210 if (n >= sizeof (string) - 1)
3211 // stop at some sane length
3212 return NULL;
3213
3214 if (ch == C0_SYN)
3215 {
3216 string[n++] = cmd_get8 ();
3217 prev = 0;
3218 }
3219 else
2865 string[n++] = ch; 3220 string[n++] = prev = ch;
2866
2867 seen_esc = 0;
2868 } 3221 }
2869 3222
2870 string[n++] = '\0'; 3223 string[n++] = '\0';
2871 3224
2872 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3225 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2915 { 3268 {
2916 unsigned char *s = get_to_st (eh); 3269 unsigned char *s = get_to_st (eh);
2917 3270
2918 if (s) 3271 if (s)
2919 { 3272 {
2920 /*
2921 * rxvt_menubar_dispatch () violates the constness of the string,
2922 * so do it here
2923 */
2924 if (arg == XTerm_Menu)
2925#if 0 /* XXX: currently disabled due to security concerns */
2926 menubar_dispatch ((char *)s);
2927#else
2928 (void)0;
2929#endif
2930 else
2931 xterm_seq (arg, (char *)s, eh); 3273 process_xterm_seq (arg, (char *)s, eh);
2932
2933 free (s); 3274 free (s);
2934 } 3275 }
2935 } 3276 }
2936} 3277}
3278
3279void
3280rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3281{
3282 if (str[0] == '?' && !str[1])
3283 {
3284 if (Options & Opt_insecure)
3285 {
3286 unsigned short r, g, b;
3287 PixColorsFocused[color].get (display, r, g, b);
3288 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3289 }
3290 }
3291 else
3292 set_window_color (color, str);
3293}
3294
2937/* 3295/*
2938 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3296 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2939 * 0 = change iconName/title 3297 * 0 = change iconName/title
2940 * 1 = change iconName 3298 * 1 = change iconName
2941 * 2 = change title 3299 * 2 = change title
2942 * 4 = change color 3300 * 4 = change color
3301 * 10 = change fg color
3302 * 11 = change bg color
2943 * 12 = change text color 3303 * 12 = change text color
2944 * 13 = change mouse foreground color 3304 * 13 = change mouse foreground color
2945 * 17 = change highlight character colour 3305 * 17 = change highlight character colour
2946 * 18 = change bold character color 3306 * 18 = change bold character color
2947 * 19 = change underlined character color 3307 * 19 = change underlined character color
2948 * 46 = change logfile (not implemented) 3308 * 46 = change logfile (not implemented)
2949 * 50 = change font 3309 * 50 = change font
2950 * 3310 *
2951 * rxvt extensions: 3311 * rxvt extensions:
2952 * 10 = menu (may change in future)
2953 * 20 = bg pixmap 3312 * 20 = bg pixmap
2954 * 39 = change default fg color 3313 * 39 = change default fg color
2955 * 49 = change default bg color 3314 * 49 = change default bg color
2956 * 55 = dump scrollback buffer and all of screen 3315 * 55 = dump scrollback buffer and all of screen
2957 * 701 = change locale 3316 * 701 = change locale
2958 * 702 = find font 3317 * 702 = find font
3318 * 703 = menu
2959 */ 3319 */
2960void 3320void
2961rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3321rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2962{ 3322{
2963 int changed = 0; 3323 int changed = 0;
2964 int color; 3324 int color;
2965 char *buf, *name; 3325 char *buf, *name;
3326 bool query = str[0] == '?' && !str[1];
2966 3327
2967 assert (str != NULL); 3328 assert (str != NULL);
2968 switch (op) 3329 switch (op)
2969 { 3330 {
2970 case XTerm_name: 3331 case XTerm_name:
2974 set_icon_name (str); 3335 set_icon_name (str);
2975 break; 3336 break;
2976 case XTerm_title: 3337 case XTerm_title:
2977 set_title (str); 3338 set_title (str);
2978 break; 3339 break;
3340 case XTerm_property:
3341 if (str[0] == '?')
3342 {
3343 Atom prop = XInternAtom (display->display, str + 1, True);
3344 Atom actual_type;
3345 int actual_format;
3346 unsigned long nitems;
3347 unsigned long bytes_after;
3348 unsigned char *value = 0;
3349 const char *str = "";
3350
3351 if (prop
3352 && XGetWindowProperty (display->display, TermWin.parent[0],
3353 prop, 0, 1<<16, 0, AnyPropertyType,
3354 &actual_type, &actual_format,
3355 &nitems, &bytes_after, &value) == Success
3356 && actual_type != None
3357 && actual_format == 8)
3358 str = (const char *)(value);
3359
3360 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3361
3362 XFree (value);
3363 }
3364 else
3365 {
3366 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3367
3368 if (eq)
3369 {
3370 *eq = 0;
3371 XChangeProperty (display->display, TermWin.parent[0],
3372 display->atom (str), XA_STRING, 8,
3373 PropModeReplace, (unsigned char *)eq + 1,
3374 strlen (eq + 1));
3375 }
3376 else
3377 XDeleteProperty (display->display, TermWin.parent[0],
3378 display->atom (str));
3379 }
3380 break;
3381
2979 case XTerm_Color: 3382 case XTerm_Color:
2980 for (buf = (char *)str; buf && *buf;) 3383 for (buf = (char *)str; buf && *buf;)
2981 { 3384 {
2982 if ((name = STRCHR (buf, ';')) == NULL) 3385 if ((name = STRCHR (buf, ';')) == NULL)
2983 break; 3386 break;
2989 break; 3392 break;
2990 3393
2991 if ((buf = STRCHR (name, ';')) != NULL) 3394 if ((buf = STRCHR (name, ';')) != NULL)
2992 *buf++ = '\0'; 3395 *buf++ = '\0';
2993 3396
3397 if (name[0] == '?' && !name[1])
3398 {
3399 if (Options & Opt_insecure)
3400 {
3401 unsigned short r, g, b;
3402 PixColorsFocused[color + minCOLOR].get (display, r, g, b);
3403 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3404 }
3405 }
3406 else
2994 set_window_color (color + minCOLOR, name); 3407 set_window_color (color + minCOLOR, name);
2995 } 3408 }
3409 break;
3410 case XTerm_Color00:
3411 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3412 break;
3413 case XTerm_Color01:
3414 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2996 break; 3415 break;
2997#ifndef NO_CURSORCOLOR 3416#ifndef NO_CURSORCOLOR
2998 case XTerm_Color_cursor: 3417 case XTerm_Color_cursor:
2999 set_window_color (Color_cursor, str); 3418 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3000 break; 3419 break;
3001#endif 3420#endif
3002 case XTerm_Color_pointer: 3421 case XTerm_Color_pointer_fg:
3003 set_window_color (Color_pointer, str); 3422 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3423 break;
3424 case XTerm_Color_pointer_bg:
3425 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3004 break; 3426 break;
3005#ifndef NO_BOLD_UNDERLINE_REVERSE 3427#ifndef NO_BOLD_UNDERLINE_REVERSE
3006 case XTerm_Color_BD: 3428 case XTerm_Color_BD:
3007 set_window_color (Color_BD, str); 3429 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3008 break; 3430 break;
3009 case XTerm_Color_UL: 3431 case XTerm_Color_UL:
3010 set_window_color (Color_UL, str); 3432 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3011 break; 3433 break;
3012 case XTerm_Color_RV: 3434 case XTerm_Color_RV:
3013 set_window_color (Color_RV, str); 3435 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3014 break; 3436 break;
3015#endif 3437#endif
3016 3438
3017 case XTerm_Menu:
3018 /*
3019 * rxvt_menubar_dispatch () violates the constness of the string,
3020 * so DON'T do it here
3021 */
3022 break;
3023 case XTerm_Pixmap: 3439 case XTerm_Pixmap:
3024 if (*str != ';') 3440 if (*str != ';')
3025 { 3441 {
3026#if XPM_BACKGROUND 3442#if XPM_BACKGROUND
3027 scale_pixmap (""); /* reset to default scaling */ 3443 scale_pixmap (""); /* reset to default scaling */
3050 set_window_color (Color_fg, str); 3466 set_window_color (Color_fg, str);
3051 break; 3467 break;
3052 case XTerm_restoreBG: 3468 case XTerm_restoreBG:
3053 set_window_color (Color_bg, str); 3469 set_window_color (Color_bg, str);
3054 break; 3470 break;
3471
3055 case XTerm_logfile: 3472 case XTerm_logfile:
3056 // TODO, when secure mode? 3473 // TODO, when secure mode?
3057 break; 3474 break;
3475
3058 case XTerm_font: 3476 case XTerm_font:
3477 if (query)
3478 {
3479 if (Options & Opt_insecure)
3480 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3481 TermWin.fontset->fontdesc
3482 ? TermWin.fontset->fontdesc
3483 : "",
3484 resp);
3485 }
3486 else
3059 change_font (str); 3487 change_font (str);
3060 break; 3488 break;
3489
3061#ifndef NO_FRILLS 3490#ifndef NO_FRILLS
3062 case XTerm_locale: 3491 case XTerm_locale:
3063 if (str[0] == '?' && !str[1]) 3492 if (query)
3064 tt_printf ("%-.250s\n", locale); 3493 {
3494 if (Options & Opt_insecure)
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3496 }
3065 else 3497 else
3066 { 3498 {
3067 set_locale (str); 3499 set_locale (str);
3068# ifdef USE_XIM 3500# ifdef USE_XIM
3069 im_cb (); 3501 im_cb ();
3070# endif 3502# endif
3071 } 3503 }
3072 break; 3504 break;
3505
3073 case XTerm_findfont: 3506 case XTerm_findfont:
3507 if (Options & Opt_insecure)
3074 { 3508 {
3075 int fid = TermWin.fontset->find_font (atoi (str)); 3509 int fid = TermWin.fontset->find_font (atoi (str));
3076 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name); 3510 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3511 fid, (*TermWin.fontset)[fid]->name, resp);
3077 } 3512 }
3513 break;
3514#endif
3515
3516#ifdef MENUBAR
3517 case XTerm_Menu:
3518 if (Options & Opt_insecure)
3519 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3078 break; 3520 break;
3079#endif 3521#endif
3080#if 0 3522#if 0
3081 case XTerm_dumpscreen: /* no error notices */ 3523 case XTerm_dumpscreen: /* no error notices */
3082 { 3524 {
3083 int fd; 3525 int fd;
3084 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3526 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3085 { 3527 {
3086 scr_dump (fd); 3528 scr_dump (fd);
3087 close (fd); 3529 close (fd);
3088 } 3530 }
3175 // 1035 enable modifiers for alt, numlock NYI 3617 // 1035 enable modifiers for alt, numlock NYI
3176 // 1036 send ESC for meta keys NYI 3618 // 1036 send ESC for meta keys NYI
3177 // 1037 send DEL for keypad delete NYI 3619 // 1037 send DEL for keypad delete NYI
3178 { 1047, PrivMode_Screen }, 3620 { 1047, PrivMode_Screen },
3179 // 1048 save and restore cursor 3621 // 1048 save and restore cursor
3180 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3622 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3181 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3623 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3182 }; 3624 };
3183 3625
3184 if (nargs == 0) 3626 if (nargs == 0)
3185 return; 3627 return;
3204 3646
3205 /* extra handling for values with state unkept */ 3647 /* extra handling for values with state unkept */
3206 switch (arg[i]) 3648 switch (arg[i])
3207 { 3649 {
3208 case 1048: /* alternative cursor save */ 3650 case 1048: /* alternative cursor save */
3209 case 1049: 3651 if (Options & Opt_secondaryScreen)
3210 if (mode == 0) 3652 if (mode == 0)
3211 scr_cursor (RESTORE); 3653 scr_cursor (RESTORE);
3212 else if (mode == 1) 3654 else if (mode == 1)
3213 scr_cursor (SAVE); 3655 scr_cursor (SAVE);
3214 /* FALLTHROUGH */ 3656 break;
3215 } 3657 }
3216 3658
3217 if (state >= 0) 3659 if (state >= 0)
3218 /* extra handling for values with valid 0 or 1 state */ 3660 /* extra handling for values with valid 0 or 1 state */
3219 switch (arg[i]) 3661 switch (arg[i])
3243 scr_relative_origin (state); 3685 scr_relative_origin (state);
3244 break; 3686 break;
3245 case 7: /* autowrap */ 3687 case 7: /* autowrap */
3246 scr_autowrap (state); 3688 scr_autowrap (state);
3247 break; 3689 break;
3248 /* case 8: - auto repeat, can't do on a per window basis */ 3690 /* case 8: - auto repeat, can't do on a per window basis */
3249 case 9: /* X10 mouse reporting */ 3691 case 9: /* X10 mouse reporting */
3250 if (state) /* orthogonal */ 3692 if (state) /* orthogonal */
3251 PrivateModes &= ~PrivMode_MouseX11; 3693 PrivateModes &= ~PrivMode_MouseX11;
3252 break; 3694 break;
3253#ifdef menuBar_esc 3695#ifdef menuBar_esc
3267 break; 3709 break;
3268#endif 3710#endif
3269 case 25: /* visible/invisible cursor */ 3711 case 25: /* visible/invisible cursor */
3270 scr_cursor_visible (state); 3712 scr_cursor_visible (state);
3271 break; 3713 break;
3272 /* case 35: - shift keys */ 3714 /* case 35: - shift keys */
3273 /* case 40: - 80 <--> 132 mode */ 3715 /* case 40: - 80 <--> 132 mode */
3274 case 47: /* secondary screen */ 3716 case 47: /* secondary screen */
3275 scr_change_screen (state); 3717 scr_change_screen (state);
3276 break; 3718 break;
3277 /* case 66: - application key pad */ 3719 /* case 66: - application key pad */
3278 /* case 67: - backspace key */ 3720 /* case 67: - backspace key */
3279 case 1000: /* X11 mouse reporting */ 3721 case 1000: /* X11 mouse reporting */
3280 if (state) /* orthogonal */ 3722 if (state) /* orthogonal */
3281 PrivateModes &= ~PrivMode_MouseX10; 3723 PrivateModes &= ~PrivMode_MouseX10;
3282 break; 3724 break;
3283#if 0 3725#if 0
3294 if (state) 3736 if (state)
3295 Options |= Opt_scrollTtyKeypress; 3737 Options |= Opt_scrollTtyKeypress;
3296 else 3738 else
3297 Options &= ~Opt_scrollTtyKeypress; 3739 Options &= ~Opt_scrollTtyKeypress;
3298 break; 3740 break;
3299 case 1047: /* secondary screen w/ clearing */ 3741 case 1047: /* secondary screen w/ clearing last */
3300 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3742 if (Options & Opt_secondaryScreen)
3301 if (current_screen != PRIMARY) 3743 if (current_screen != PRIMARY)
3302 scr_erase_screen (2); 3744 scr_erase_screen (2);
3303
3304 scr_change_screen (state); 3745 scr_change_screen (state);
3305 /* FALLTHROUGH */ 3746 break;
3747 case 1049: /* secondary screen w/ clearing first */
3748 scr_change_screen (state);
3749 if (Options & Opt_secondaryScreen)
3750 if (current_screen != PRIMARY)
3751 scr_erase_screen (2);
3752 break;
3306 default: 3753 default:
3307 break; 3754 break;
3308 } 3755 }
3309 } 3756 }
3310} 3757}
3333 rendset = 0, rendstyle = ~RS_None; 3780 rendset = 0, rendstyle = ~RS_None;
3334 break; 3781 break;
3335 case 1: 3782 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 3783 rendset = 1, rendstyle = RS_Bold;
3337 break; 3784 break;
3785 //case 2: // faint or second colour
3338 case 4: 3786 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 3787 rendset = 1, rendstyle = RS_Uline;
3340 break; 3788 break;
3341 case 5: 3789 case 5: // slowly blinking
3790 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 3791 rendset = 1, rendstyle = RS_Blink;
3343 break; 3792 break;
3793 //case 6: // scoansi light background
3344 case 7: 3794 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 3795 rendset = 1, rendstyle = RS_RVid;
3346 break; 3796 break;
3347 case 8: 3797 case 8:
3348 // invisible. NYI 3798 // invisible. NYI
3349 break; 3799 break;
3800 //case 9: // crossed out
3801 //case 10: // scoansi acs off, primary font
3802 //case 11: // scoansi acs on, first alt font
3803 //case 12: // scoansi acs on, |0x80, second alt font
3804 //...
3805 //case 19: // ninth alt font
3806 //case 20: // gothic
3807 case 21: // disable bold, faint
3808 rendset = 0, rendstyle = RS_Bold;
3809 break;
3350 case 22: 3810 case 22:
3351 rendset = 0, rendstyle = RS_Bold; 3811 rendset = 0, rendstyle = RS_Bold;
3352 break; 3812 break;
3813 //case 23: disable italic
3353 case 24: 3814 case 24:
3354 rendset = 0, rendstyle = RS_Uline; 3815 rendset = 0, rendstyle = RS_Uline;
3355 break; 3816 break;
3356 case 25: 3817 case 25:
3357 rendset = 0, rendstyle = RS_Blink; 3818 rendset = 0, rendstyle = RS_Blink;
3358 break; 3819 break;
3359 case 27: 3820 case 27:
3360 rendset = 0, rendstyle = RS_RVid; 3821 rendset = 0, rendstyle = RS_RVid;
3361 break; 3822 break;
3362 case 28:
3363 // visible. NYI 3823 //case 28: // visible. NYI
3364 break; 3824 //case 29: // not crossed-out
3365 } 3825 }
3366 3826
3367 if (rendset != -1) 3827 if (rendset != -1)
3368 { 3828 {
3369 scr_rendition (rendset, rendstyle); 3829 scr_rendition (rendset, rendstyle);
3446 } 3906 }
3447 } 3907 }
3448} 3908}
3449/*}}} */ 3909/*}}} */
3450 3910
3451/*{{{ process Rob Nation's own graphics mode sequences */ 3911/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3452void 3912void
3453rxvt_term::process_graphics () 3913rxvt_term::process_graphics ()
3454{ 3914{
3455 unicode_t ch, cmd = cmd_getc (); 3915 unicode_t ch, cmd = cmd_getc ();
3456 3916

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines