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.97 by root, Mon Jul 26 18:01:19 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 801#ifdef POINTER_BLANK
767void 802void
768rxvt_term::pointer_unblank () 803rxvt_term::pointer_unblank ()
979 break; 1014 break;
980 1015
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1016#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease: 1017 case KeyRelease:
983 { 1018 {
984 if (! (ev.xkey.state & ControlMask)) 1019 if (!(ev.xkey.state & ControlMask))
985 mouse_slip_wheel_speed = 0; 1020 slip_wheel_ev.stop ();
986 else 1021 else
987 { 1022 {
988 KeySym ks; 1023 KeySym ks;
989 1024
990 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0); 1025 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
991 if (ks == XK_Control_L || ks == XK_Control_R) 1026 if (ks == XK_Control_L || ks == XK_Control_R)
992 mouse_slip_wheel_speed = 0; 1027 mouse_slip_wheel_speed = 0;
993 } 1028 }
1013 && (ev.xclient.data.l[0] == DndFile 1048 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1049 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1050 || ev.xclient.data.l[0] == DndLink))
1016 { 1051 {
1017 /* Get Dnd data */ 1052 /* Get Dnd data */
1018 Atom ActualType; 1053 Atom ActualType;
1019 int ActualFormat; 1054 int ActualFormat;
1020 unsigned char *data; 1055 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1056 unsigned long Size, RemainingBytes;
1022 1057
1023 XGetWindowProperty (display->display, display->root, 1058 XGetWindowProperty (display->display, display->root,
1024 xa[XA_DNDSELECTION], 1059 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1060 0L, 1000000L,
1026 False, AnyPropertyType, 1061 False, AnyPropertyType,
1029 &data); 1064 &data);
1030 XChangeProperty (display->display, display->root, 1065 XChangeProperty (display->display, display->root,
1031 XA_CUT_BUFFER0, XA_STRING, 1066 XA_CUT_BUFFER0, XA_STRING,
1032 8, PropModeReplace, 1067 8, PropModeReplace,
1033 data, STRLEN (data)); 1068 data, STRLEN (data));
1069 XFree (data);
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1070 selection_paste (display->root, XA_CUT_BUFFER0, True);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1071 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1036 } 1072 }
1037#endif /* OFFIX_DND */ 1073#endif /* OFFIX_DND */
1038 break; 1074 break;
1131 check_our_parents (); 1167 check_our_parents ();
1132 if (am_transparent) 1168 if (am_transparent)
1133 want_full_refresh = 1; 1169 want_full_refresh = 1;
1134 } 1170 }
1135#endif 1171#endif
1136
1137 } 1172 }
1138 break; 1173 break;
1139 1174
1140 case SelectionClear: 1175 case SelectionClear:
1141 selection_clear (); 1176 selection_clear ();
1177 { 1212 {
1178#ifdef NO_SLOW_LINK_SUPPORT 1213#ifdef NO_SLOW_LINK_SUPPORT
1179 scr_expose (ev.xexpose.x, ev.xexpose.y, 1214 scr_expose (ev.xexpose.x, ev.xexpose.y,
1180 ev.xexpose.width, ev.xexpose.height, False); 1215 ev.xexpose.width, ev.xexpose.height, False);
1181#else 1216#else
1182 // don't understand this, so commented it out 1217 // I don't understand this, so I changed it :)
1183 scr_expose (ev.xexpose.x, ev.xexpose.y, 1218 scr_expose (ev.xexpose.x, ev.xexpose.y,
1184 ev.xexpose.width, ev.xexpose.height, False); 1219 ev.xexpose.width, ev.xexpose.height, False);
1185 //scr_expose (ev.xexpose.x, 0, 1220 //scr_expose (ev.xexpose.x, 0,
1186 // ev.xexpose.width, TermWin.height, False); 1221 // ev.xexpose.width, TermWin.height, False);
1187#endif 1222#endif
1189 } 1224 }
1190 else 1225 else
1191 { 1226 {
1192 XEvent unused_event; 1227 XEvent unused_event;
1193 1228
1194 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1229 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1195 Expose, 1230 ;
1196 &unused_event)) ;
1197 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1231 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1198 GraphicsExpose, 1232 ;
1199 &unused_event)) ; 1233
1200 if (isScrollbarWindow (ev.xany.window)) 1234 if (isScrollbarWindow (ev.xany.window))
1201 { 1235 {
1202 scrollBar.setIdle (); 1236 scrollBar.setIdle ();
1203 scrollbar_show (0); 1237 scrollbar_show (0);
1204 } 1238 }
1247 if (ev.xbutton.y < TermWin.int_bwidth 1281 if (ev.xbutton.y < TermWin.int_bwidth
1248 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1282 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1249 { 1283 {
1250 int dist; 1284 int dist;
1251 1285
1252 pending_scroll_selection=1;
1253
1254 /* don't clobber the current delay if we are 1286 /* don't clobber the current delay if we are
1255 * already in the middle of scrolling. 1287 * already in the middle of scrolling.
1256 */ 1288 */
1257 if (scroll_selection_delay<=0) 1289 if (!sel_scroll_ev.active)
1258 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1290 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1259 1291
1260 /* save the event params so we can highlight 1292 /* save the event params so we can highlight
1261 * the selection in the pending-scroll loop 1293 * the selection in the pending-scroll loop
1262 */ 1294 */
1263 selection_save_x=ev.xbutton.x; 1295 selection_save_x=ev.xbutton.x;
1285 else 1317 else
1286 { 1318 {
1287 /* we are within the text window, so we 1319 /* we are within the text window, so we
1288 * shouldn't be scrolling 1320 * shouldn't be scrolling
1289 */ 1321 */
1290 pending_scroll_selection = 0; 1322 if (sel_scroll_ev.active)
1323 sel_scroll_ev.stop();
1291 } 1324 }
1292#endif 1325#endif
1293#ifdef MOUSE_THRESHOLD 1326#ifdef MOUSE_THRESHOLD
1294 1327
1295 } 1328 }
1345 return; 1378 return;
1346 } 1379 }
1347 1380
1348 /* FALLTHROUGH */ 1381 /* FALLTHROUGH */
1349 case ReparentNotify: 1382 case ReparentNotify:
1350 if ((Options & Opt_transparent) && check_our_parents ()) 1383 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1351 if (am_transparent)
1352 want_full_refresh = 1; 1384 want_full_refresh = 1;
1353 break; 1385 break;
1354#endif 1386#endif
1355 } 1387 }
1356} 1388}
1357 1389
1513 upordown = 1; /* down */ 1545 upordown = 1; /* down */
1514 } 1546 }
1515 if (upordown) 1547 if (upordown)
1516 { 1548 {
1517#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1549#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1518 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1550 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1519#endif 1551#endif
1520 if (scr_page (upordown < 0 ? UP : DN, 1)) 1552 if (scr_page (upordown < 0 ? UP : DN, 1))
1521 { 1553 {
1522 if (upordown < 0) 1554 if (upordown < 0)
1523 scrollBar.setUp (); 1555 scrollBar.setUp ();
1610 refresh_type &= ~SMOOTH_REFRESH; 1642 refresh_type &= ~SMOOTH_REFRESH;
1611#endif 1643#endif
1612 1644
1613 } 1645 }
1614#ifdef SELECTION_SCROLLING 1646#ifdef SELECTION_SCROLLING
1615 pending_scroll_selection=0; 1647 if (sel_scroll_ev.active)
1648 sel_scroll_ev.stop();
1616#endif 1649#endif
1617 if (ev.window == TermWin.vt) 1650 if (ev.window == TermWin.vt)
1618 { 1651 {
1619 if (reportmode) 1652 if (reportmode)
1620 { 1653 {
1662 case Button5: 1695 case Button5:
1663 { 1696 {
1664 int i; 1697 int i;
1665 page_dirn v; 1698 page_dirn v;
1666 1699
1667 v = (ev.button == Button4) ? UP : DN; 1700 v = ev.button == Button4 ? UP : DN;
1701
1668 if (ev.state & ShiftMask) 1702 if (ev.state & ShiftMask)
1669 i = 1; 1703 i = 1;
1670 else if ((Options & Opt_mouseWheelScrollPage)) 1704 else if (Options & Opt_mouseWheelScrollPage)
1671 i = TermWin.nrow - 1; 1705 i = TermWin.nrow - 1;
1672 else 1706 else
1673 i = 5; 1707 i = 5;
1708
1674# ifdef MOUSE_SLIP_WHEELING 1709# ifdef MOUSE_SLIP_WHEELING
1675 if (ev.state & ControlMask) 1710 if (ev.state & ControlMask)
1676 { 1711 {
1677 mouse_slip_wheel_speed += (v ? -1 : 1); 1712 mouse_slip_wheel_speed += v ? -1 : 1;
1678 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1713 slip_wheel_ev.start (NOW + SCROLLBAR_CONTINUOUS_DELAY);
1679 } 1714 }
1680# endif 1715# endif
1681# ifdef JUMP_MOUSE_WHEEL 1716# ifdef JUMP_MOUSE_WHEEL
1682 scr_page (v, i); 1717 scr_page (v, i);
1683 scr_refresh (SMOOTH_REFRESH); 1718 scr_refresh (SMOOTH_REFRESH);
1701 else if (isMenuBarWindow (ev.window)) 1736 else if (isMenuBarWindow (ev.window))
1702 menubar_control (ev); 1737 menubar_control (ev);
1703#endif 1738#endif
1704} 1739}
1705 1740
1706
1707#ifdef TRANSPARENT 1741#ifdef TRANSPARENT
1742#if TINTING
1743/* shading taken from eterm-0.9.2 */
1744/* RGB 15 */
1745
1746static void
1747shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1748{
1749 unsigned char *ptr;
1750 int x, y;
1751
1752 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1753 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1754 /* No saturation */
1755 for (y = h; --y >= 0;) {
1756 for (x = -w; x < 0; x++) {
1757 int r, g, b;
1758
1759 b = ((uint16_t *) ptr)[x];
1760 r = (b & 0x7c00) * rm;
1761 g = (b & 0x3e0) * gm;
1762 b = (b & 0x1f) * bm;
1763 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1764 | ((g >> 8) & 0x3e0)
1765 | ((b >> 8) & 0x1f);
1766 }
1767 ptr += bpl;
1768 }
1769 } else {
1770 for (y = h; --y >= 0;) {
1771 for (x = -w; x < 0; x++) {
1772 int r, g, b;
1773
1774 b = ((uint16_t *) ptr)[x];
1775 r = (b & 0x7c00) * rm;
1776 g = (b & 0x3e0) * gm;
1777 b = (b & 0x1f) * bm;
1778 r |= (!(r >> 15) - 1);
1779 g |= (!(g >> 10) - 1);
1780 b |= (!(b >> 5) - 1);
1781 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1782 | ((g >> 8) & 0x3e0)
1783 | ((b >> 8) & 0x1f);
1784 }
1785 ptr += bpl;
1786 }
1787 }
1788}
1789
1790/* RGB 16 */
1791static void
1792shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1793{
1794 unsigned char *ptr;
1795 int x, y;
1796
1797 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1798 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1799 /* No saturation */
1800 for (y = h; --y >= 0;) {
1801 for (x = -w; x < 0; x++) {
1802 int r, g, b;
1803
1804 b = ((uint16_t *) ptr)[x];
1805 r = (b & 0xf800) * rm;
1806 g = (b & 0x7e0) * gm;
1807 b = (b & 0x1f) * bm;
1808 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1809 | ((g >> 8) & 0x7e0)
1810 | ((b >> 8) & 0x1f);
1811 }
1812 ptr += bpl;
1813 }
1814 } else {
1815 for (y = h; --y >= 0;) {
1816 for (x = -w; x < 0; x++) {
1817 int r, g, b;
1818
1819 b = ((uint16_t *) ptr)[x];
1820 r = (b & 0xf800) * rm;
1821 g = (b & 0x7e0) * gm;
1822 b = (b & 0x1f) * bm;
1823 r |= (!(r >> 16) - 1);
1824 g |= (!(g >> 11) - 1);
1825 b |= (!(b >> 5) - 1);
1826 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1827 | ((g >> 8) & 0x7e0)
1828 | ((b >> 8) & 0x1f);
1829 }
1830 ptr += bpl;
1831 }
1832 }
1833}
1834
1835/* RGB 24 */
1836static void
1837shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1838{
1839 unsigned char *ptr;
1840 int x, y;
1841
1842 ptr = (unsigned char *)data + (w * 3);
1843 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1844 /* No saturation */
1845 for (y = h; --y >= 0;) {
1846 for (x = -(w * 3); x < 0; x += 3) {
1847 int r, g, b;
1848
1849 if (byteorder.big_endian()) {
1850 r = (ptr[x + 0] * rm) >> 8;
1851 g = (ptr[x + 1] * gm) >> 8;
1852 b = (ptr[x + 2] * bm) >> 8;
1853 ptr[x + 0] = r;
1854 ptr[x + 1] = g;
1855 ptr[x + 2] = b;
1856 } else {
1857 r = (ptr[x + 2] * rm) >> 8;
1858 g = (ptr[x + 1] * gm) >> 8;
1859 b = (ptr[x + 0] * bm) >> 8;
1860 ptr[x + 2] = r;
1861 ptr[x + 1] = g;
1862 ptr[x + 0] = b;
1863 }
1864 }
1865 ptr += bpl;
1866 }
1867 } else {
1868 for (y = h; --y >= 0;) {
1869 for (x = -(w * 3); x < 0; x += 3) {
1870 int r, g, b;
1871
1872 if (byteorder.big_endian()) {
1873 r = (ptr[x + 0] * rm) >> 8;
1874 g = (ptr[x + 1] * gm) >> 8;
1875 b = (ptr[x + 2] * bm) >> 8;
1876
1877 r |= (!(r >> 8) - 1);
1878 g |= (!(g >> 8) - 1);
1879 b |= (!(b >> 8) - 1);
1880
1881 ptr[x + 0] = r;
1882 ptr[x + 1] = g;
1883 ptr[x + 2] = b;
1884 } else {
1885 r = (ptr[x + 2] * rm) >> 8;
1886 g = (ptr[x + 1] * gm) >> 8;
1887 b = (ptr[x + 0] * bm) >> 8;
1888
1889 r |= (!(r >> 8) - 1);
1890 g |= (!(g >> 8) - 1);
1891 b |= (!(b >> 8) - 1);
1892
1893 ptr[x + 2] = r;
1894 ptr[x + 1] = g;
1895 ptr[x + 0] = b;
1896 }
1897 }
1898 ptr += bpl;
1899 }
1900 }
1901}
1902
1903/* RGB 32 */
1904static void
1905shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1906{
1907 unsigned char *ptr;
1908 int x, y;
1909
1910 ptr = (unsigned char *)data + (w * 4);
1911 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1912 /* No saturation */
1913 for (y = h; --y >= 0;) {
1914 if (byteorder.big_endian()) {
1915 for (x = -(w * 4); x < 0; x += 4) {
1916 int r, g, b;
1917
1918 r = (ptr[x + 1] * rm) >> 8;
1919 g = (ptr[x + 2] * gm) >> 8;
1920 b = (ptr[x + 3] * bm) >> 8;
1921 ptr[x + 1] = r;
1922 ptr[x + 2] = g;
1923 ptr[x + 3] = b;
1924 }
1925 } else {
1926 for (x = -(w * 4); x < 0; x += 4) {
1927 int r, g, b;
1928
1929 r = (ptr[x + 2] * rm) >> 8;
1930 g = (ptr[x + 1] * gm) >> 8;
1931 b = (ptr[x + 0] * bm) >> 8;
1932 ptr[x + 2] = r;
1933 ptr[x + 1] = g;
1934 ptr[x + 0] = b;
1935 }
1936 }
1937 ptr += bpl;
1938 }
1939 } else {
1940 for (y = h; --y >= 0;) {
1941 for (x = -(w * 4); x < 0; x += 4) {
1942 int r, g, b;
1943
1944 if (byteorder.big_endian()) {
1945 r = (ptr[x + 1] * rm) >> 8;
1946 g = (ptr[x + 2] * gm) >> 8;
1947 b = (ptr[x + 3] * bm) >> 8;
1948
1949 r |= (!(r >> 8) - 1);
1950 g |= (!(g >> 8) - 1);
1951 b |= (!(b >> 8) - 1);
1952
1953 ptr[x + 1] = r;
1954 ptr[x + 2] = g;
1955 ptr[x + 3] = b;
1956 } else {
1957 r = (ptr[x + 2] * rm) >> 8;
1958 g = (ptr[x + 1] * gm) >> 8;
1959 b = (ptr[x + 0] * bm) >> 8;
1960
1961 r |= (!(r >> 8) - 1);
1962 g |= (!(g >> 8) - 1);
1963 b |= (!(b >> 8) - 1);
1964
1965 ptr[x + 2] = r;
1966 ptr[x + 1] = g;
1967 ptr[x + 0] = b;
1968 }
1969 }
1970 ptr += bpl;
1971 }
1972 }
1973}
1974
1975#endif
1976
1708/* 1977/*
1709 * Check our parents are still who we think they are. 1978 * Check our parents are still who we think they are.
1710 * Do transparency updates if required 1979 * Do transparency updates if required
1711 */ 1980 */
1712int 1981int
1713rxvt_term::check_our_parents () 1982rxvt_term::check_our_parents ()
1714{ 1983{
1715 int i, pchanged, aformat, have_pixmap, rootdepth; 1984 int i, pchanged, aformat, have_pixmap, rootdepth;
1716 unsigned long nitems, bytes_after; 1985 unsigned long nitems, bytes_after;
1717 Atom atype; 1986 Atom atype;
1718 unsigned char *prop = NULL; 1987 unsigned char *prop = NULL;
1719 Window root, oldp, *list; 1988 Window root, oldp, *list;
1720 Pixmap rootpixmap = None; 1989 Pixmap rootpixmap = None;
1721 XWindowAttributes wattr, wrootattr; 1990 XWindowAttributes wattr, wrootattr;
1722 1991
1723 pchanged = 0; 1992 pchanged = 0;
1724 1993
1725 if (! (Options & Opt_transparent)) 1994 if (!(Options & Opt_transparent))
1726 return pchanged; /* Don't try any more */ 1995 return pchanged; /* Don't try any more */
1727 1996
1728 XGetWindowAttributes (display->display, display->root, &wrootattr); 1997 XGetWindowAttributes (display->display, display->root, &wrootattr);
1729 rootdepth = wrootattr.depth; 1998 rootdepth = wrootattr.depth;
1730 1999
1731 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2000 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2001
1732 if (rootdepth != wattr.depth) 2002 if (rootdepth != wattr.depth)
1733 { 2003 {
1734 if (am_transparent) 2004 if (am_transparent)
1735 { 2005 {
1736 pchanged = 1; 2006 pchanged = 1;
1737 XSetWindowBackground (display->display, TermWin.vt, 2007 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1738 PixColors[Color_bg]);
1739 am_transparent = am_pixmap_trans = 0; 2008 am_transparent = am_pixmap_trans = 0;
1740 } 2009 }
2010
1741 return pchanged; /* Don't try any more */ 2011 return pchanged; /* Don't try any more */
1742 } 2012 }
1743 2013
1744 /* Get all X ops out of the queue so that our information is up-to-date. */ 2014 /* Get all X ops out of the queue so that our information is up-to-date. */
1745 XSync (display->display, False); 2015 XSync (display->display, False);
1747 /* 2017 /*
1748 * Make the frame window set by the window manager have 2018 * Make the frame window set by the window manager have
1749 * the root background. Some window managers put multiple nested frame 2019 * the root background. Some window managers put multiple nested frame
1750 * windows for each client, so we have to take care about that. 2020 * windows for each client, so we have to take care about that.
1751 */ 2021 */
1752 i = (xa[XA_XROOTPMAPID] != 0 2022 i = (xa[XA_XROOTPMAPID]
1753 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2023 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1754 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2024 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1755 &nitems, &bytes_after, &prop) == Success)); 2025 &nitems, &bytes_after, &prop) == Success);
2026
2027 if (!i || prop == NULL)
2028 i = (xa[XA_XSETROOTID]
2029 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2030 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2031 &nitems, &bytes_after, &prop) == Success);
2032
1756 if (!i || prop == NULL) 2033 if (!i || prop == NULL)
1757 have_pixmap = 0; 2034 have_pixmap = 0;
1758 else 2035 else
1759 { 2036 {
1760 have_pixmap = 1; 2037 have_pixmap = 1;
1761 rootpixmap = * ((Pixmap *)prop); 2038 rootpixmap = *(Pixmap *)prop;
1762 XFree (prop); 2039 XFree (prop);
1763 } 2040 }
2041
1764 if (have_pixmap) 2042 if (have_pixmap)
1765 { 2043 {
1766 /* 2044 /*
1767 * Copy display->root pixmap transparency 2045 * Copy display->root pixmap transparency
1768 */ 2046 */
1772 XImage *image; 2050 XImage *image;
1773 GC gc; 2051 GC gc;
1774 XGCValues gcvalue; 2052 XGCValues gcvalue;
1775 2053
1776 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2054 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1777 0, 0, &sx, &sy, &cr); 2055 0, 0, &sx, &sy, &cr);
1778 nw = (unsigned int)szHint.width; 2056 nw = (unsigned int)szHint.width;
1779 nh = (unsigned int)szHint.height; 2057 nh = (unsigned int)szHint.height;
1780 nx = ny = 0; 2058 nx = ny = 0;
1781 2059
1782 if (sx < 0) 2060 if (sx < 0)
1794 } 2072 }
1795 2073
1796 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2074 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1797 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2075 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1798 allowedxerror = -1; 2076 allowedxerror = -1;
1799 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2077 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1800 ZPixmap); 2078
1801 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2079 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1802 /* XXX: may need a delay here? */ 2080 /* XXX: may need a delay here? */
1803 allowedxerror = 0; 2081 allowedxerror = 0;
2082
1804 if (image == NULL) 2083 if (image == NULL)
1805 { 2084 {
1806 if (am_transparent && am_pixmap_trans) 2085 if (am_transparent && am_pixmap_trans)
1807 { 2086 {
1808 pchanged = 1; 2087 pchanged = 1;
1810 { 2089 {
1811 XFreePixmap (display->display, TermWin.pixmap); 2090 XFreePixmap (display->display, TermWin.pixmap);
1812 TermWin.pixmap = None; 2091 TermWin.pixmap = None;
1813 } 2092 }
1814 } 2093 }
2094
1815 am_pixmap_trans = 0; 2095 am_pixmap_trans = 0;
1816 } 2096 }
1817 else 2097 else
1818 { 2098 {
1819 if (TermWin.pixmap != None) 2099 if (TermWin.pixmap != None)
1820 XFreePixmap (display->display, TermWin.pixmap); 2100 XFreePixmap (display->display, TermWin.pixmap);
2101
2102#if TINTING
2103 if (ISSET_PIXCOLOR (Color_tint))
2104 {
2105 unsigned short shade, rm, gm, bm;
2106
2107 PixColors[Color_tint].get (display, rm, gm, bm);
2108
2109 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but...
2110
2111 /* Determine bitshift and bitmask values */
2112 switch (image->bits_per_pixel)
2113 {
2114 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2115 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2116 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2117 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2118 }
2119 }
2120#endif
2121
1821 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2122 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1822 (unsigned int)szHint.width,
1823 (unsigned int)szHint.height, 2123 szHint.width, szHint.height, image->depth);
1824 (unsigned int)image->depth);
1825 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2124 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1826 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2125 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1827 nx, ny, (unsigned int)image->width,
1828 (unsigned int)image->height); 2126 nx, ny, image->width, image->height);
1829 XFreeGC (display->display, gc); 2127 XFreeGC (display->display, gc);
1830 XDestroyImage (image); 2128 XDestroyImage (image);
1831 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2129 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
1832 TermWin.pixmap); 2130 TermWin.pixmap);
2131
1833 if (!am_transparent || !am_pixmap_trans) 2132 if (!am_transparent || !am_pixmap_trans)
1834 pchanged = 1; 2133 pchanged = 1;
2134
1835 am_transparent = am_pixmap_trans = 1; 2135 am_transparent = am_pixmap_trans = 1;
1836 } 2136 }
1837 } 2137 }
1838 2138
1839 if (!am_pixmap_trans) 2139 if (!am_pixmap_trans)
1840 { 2140 {
1841 unsigned int n; 2141 unsigned int n;
1842 /* 2142 /*
1843 * InheritPixmap transparency 2143 * InheritPixmap transparency
1844 */ 2144 */
1845 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2145 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1846 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2146 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
1847 i++)
1848 { 2147 {
1849 oldp = TermWin.parent[i]; 2148 oldp = TermWin.parent[i];
1850 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2149 XQueryTree (display->display, TermWin.parent[i - 1], &root,
1851 &TermWin.parent[i], &list, &n); 2150 &TermWin.parent[i], &list, &n);
1852 XFree (list); 2151 XFree (list);
1853 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2152 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2153
1854 if (TermWin.parent[i] == display->root) 2154 if (TermWin.parent[i] == display->root)
1855 { 2155 {
1856 if (oldp != None) 2156 if (oldp != None)
1857 pchanged = 1; 2157 pchanged = 1;
2158
1858 break; 2159 break;
1859 } 2160 }
2161
1860 if (oldp != TermWin.parent[i]) 2162 if (oldp != TermWin.parent[i])
1861 pchanged = 1; 2163 pchanged = 1;
1862 } 2164 }
1863 2165
1864 n = 0; 2166 n = 0;
1875 break; 2177 break;
1876 } 2178 }
1877 } 2179 }
1878 } 2180 }
1879 2181
1880 if (n > (int) (sizeof (TermWin.parent) 2182 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
1881 / sizeof (TermWin.parent[0])))
1882 { 2183 {
1883 D_X ((stderr, "InheritPixmap Turning off")); 2184 D_X ((stderr, "InheritPixmap Turning off"));
1884 XSetWindowBackground (display->display, TermWin.parent[0], 2185 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]);
1885 PixColors[Color_fg]);
1886 XSetWindowBackground (display->display, TermWin.vt, 2186 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1887 PixColors[Color_bg]);
1888 am_transparent = 0; 2187 am_transparent = 0;
1889 /* XXX: also turn off Opt_transparent? */ 2188 /* XXX: also turn off Opt_transparent? */
1890 } 2189 }
1891 else 2190 else
1892 { 2191 {
2192#if WAIT_FOR_WM
1893 /* wait (an arbitrary period) for the WM to do its thing 2193 /* wait (an arbitrary period) for the WM to do its thing
1894 * needed for fvwm2.2.2 (and before?) */ 2194 * 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); 2195 sleep (1);
1903# endif 2196#endif
1904 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2197 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
1905 for (n = 0; n < (unsigned int)i; n++) 2198 for (n = 0; n < (unsigned int)i; n++)
1906 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2199 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
1907 ParentRelative); 2200
1908 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2201 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
1909 ParentRelative);
1910 am_transparent = 1; 2202 am_transparent = 1;
1911 } 2203 }
1912 2204
1913 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2205 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
1914 TermWin.parent[i] = None; 2206 TermWin.parent[i] = None;
1915 } 2207 }
2208
1916 return pchanged; 2209 return pchanged;
1917} 2210}
1918#endif 2211#endif
1919 2212
1920/*}}} */ 2213/*}}} */
1935 } 2228 }
1936 2229
1937 if (ch == NOCHAR) // TODO: improve 2230 if (ch == NOCHAR) // TODO: improve
1938 break; 2231 break;
1939 2232
1940 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r') 2233 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
1941 { 2234 {
1942 /* Read a text string from the input buffer */ 2235 /* Read a text string from the input buffer */
1943 unicode_t buf[UBUFSIZ]; 2236 unicode_t buf[UBUFSIZ];
1944 bool refreshnow = false; 2237 bool refreshnow = false;
1945 int nlines = 0; 2238 int nlines = 0;
1950 for (;;) 2243 for (;;)
1951 { 2244 {
1952 seq_begin = cmdbuf_ptr; 2245 seq_begin = cmdbuf_ptr;
1953 ch = next_char (); 2246 ch = next_char ();
1954 2247
1955 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2248 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
1956 break; 2249 break;
1957 2250
1958 *str++ = ch; 2251 *str++ = ch;
1959 2252
1960 if (ch == '\n') 2253 if (ch == C0_LF)
1961 { 2254 {
1962 nlines++; 2255 nlines++;
1963 refresh_count++; 2256 refresh_count++;
1964 2257
1965 if (! (Options & Opt_jumpScroll) 2258 if (! (Options & Opt_jumpScroll)
2000 */ 2293 */
2001 if (refreshnow) 2294 if (refreshnow)
2002 { 2295 {
2003 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2296 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2004 refresh_limit++; 2297 refresh_limit++;
2005 2298 else
2006 scr_refresh (refresh_type); 2299 scr_refresh (refresh_type);
2007 } 2300 }
2008 2301
2009 } 2302 }
2010 else 2303 else
2011 { 2304 {
2025 } 2318 }
2026 2319
2027 return flag; 2320 return flag;
2028} 2321}
2029 2322
2323// read the next octet
2324unicode_t
2325rxvt_term::next_octet ()
2326{
2327 return cmdbuf_ptr < cmdbuf_endp
2328 ? *cmdbuf_ptr++
2329 : NOCHAR;
2330}
2331
2030// read the next character 2332// read the next character
2031unicode_t 2333unicode_t
2032rxvt_term::next_char () 2334rxvt_term::next_char ()
2033{ 2335{
2034 while (cmdbuf_ptr < cmdbuf_endp) 2336 while (cmdbuf_ptr < cmdbuf_endp)
2065 */ 2367 */
2066unicode_t 2368unicode_t
2067rxvt_term::cmd_getc () 2369rxvt_term::cmd_getc ()
2068{ 2370{
2069 unicode_t c = next_char (); 2371 unicode_t c = next_char ();
2372
2373 if (c == NOCHAR)
2374 throw out_of_input;
2375
2376 return c;
2377}
2378
2379unicode_t
2380rxvt_term::cmd_get8 ()
2381{
2382 unicode_t c = next_octet ();
2070 2383
2071 if (c == NOCHAR) 2384 if (c == NOCHAR)
2072 throw out_of_input; 2385 throw out_of_input;
2073 2386
2074 return c; 2387 return c;
2156/*}}} */ 2469/*}}} */
2157 2470
2158/* *INDENT-OFF* */ 2471/* *INDENT-OFF* */
2159enum { 2472enum {
2160 C1_40 = 0x40, 2473 C1_40 = 0x40,
2161 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2474 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, 2475 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, 2476 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 2477 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2165}; 2478};
2166/* *INDENT-ON* */ 2479/* *INDENT-ON* */
2167 2480
2168/*{{{ process non-printing single characters */ 2481/*{{{ process non-printing single characters */
2169void 2482void
2174 case C0_ESC: 2487 case C0_ESC:
2175 process_escape_seq (); 2488 process_escape_seq ();
2176 break; 2489 break;
2177 case C0_ENQ: /* terminal Status */ 2490 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2491 if (rs[Rs_answerbackstring])
2179 tt_write (
2180 (const unsigned char *)rs[Rs_answerbackstring], 2492 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2493 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2182 else 2494 else
2183 tt_write ((unsigned char *)VT100_ANS, 2495 tt_write ((unsigned char *)VT100_ANS,
2184 (unsigned int)STRLEN (VT100_ANS)); 2496 (unsigned int)STRLEN (VT100_ANS));
2185 break; 2497 break;
2186 case C0_BEL: /* bell */ 2498 case C0_BEL: /* bell */
2187 scr_bell (); 2499 scr_bell ();
2188 break; 2500 break;
2189 case C0_BS: /* backspace */ 2501 case C0_BS: /* backspace */
2205 break; 2517 break;
2206 case C0_SI: /* shift in - acs */ 2518 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2519 scr_charset_choose (0);
2208 break; 2520 break;
2209 2521
2522#ifdef EIGHT_BIT_CONTROLS
2210 // 8-bit controls 2523 // 8-bit controls
2211 case 0x90: /* DCS */ 2524 case 0x90: /* DCS */
2212 process_dcs_seq (); 2525 process_dcs_seq ();
2213 break; 2526 break;
2214 case 0x9b: /* CSI */ 2527 case 0x9b: /* CSI */
2215 process_csi_seq (); 2528 process_csi_seq ();
2216 break; 2529 break;
2217 case 0x9d: /* CSI */ 2530 case 0x9d: /* CSI */
2218 process_osc_seq (); 2531 process_osc_seq ();
2219 break; 2532 break;
2533#endif
2220 } 2534 }
2221} 2535}
2222/*}}} */ 2536/*}}} */
2223 2537
2224 2538
2342 break; 2656 break;
2343 2657
2344 /* 8.3.87: NEXT LINE */ 2658 /* 8.3.87: NEXT LINE */
2345 case C1_NEL: /* ESC E */ 2659 case C1_NEL: /* ESC E */
2346 { 2660 {
2347 unicode_t nlcr[] = { L'\n', L'\r' }; 2661 unicode_t nlcr[] = { C0_LF, C0_CR };
2348 scr_add_lines (nlcr, 1, 2); 2662 scr_add_lines (nlcr, 1, 2);
2349 } 2663 }
2350 break; 2664 break;
2351 2665
2352 /* kidnapped escape sequence: Should be 8.3.48 */ 2666 /* kidnapped escape sequence: Should be 8.3.48 */
2363 case C1_RI: /* ESC M */ 2677 case C1_RI: /* ESC M */
2364 scr_index (DN); 2678 scr_index (DN);
2365 break; 2679 break;
2366 2680
2367 /* 8.3.142: SINGLE-SHIFT TWO */ 2681 /* 8.3.142: SINGLE-SHIFT TWO */
2368 /*case C1_SS2: scr_single_shift (2); break; */ 2682 /*case C1_SS2: scr_single_shift (2); break; */
2369 2683
2370 /* 8.3.143: SINGLE-SHIFT THREE */ 2684 /* 8.3.143: SINGLE-SHIFT THREE */
2371 /*case C1_SS3: scr_single_shift (3); break; */ 2685 /*case C1_SS3: scr_single_shift (3); break; */
2372 2686
2373 /* 8.3.27: DEVICE CONTROL STRING */ 2687 /* 8.3.27: DEVICE CONTROL STRING */
2374 case C1_DCS: /* ESC P */ 2688 case C1_DCS: /* ESC P */
2375 process_dcs_seq (); 2689 process_dcs_seq ();
2376 break; 2690 break;
2391 process_osc_seq (); 2705 process_osc_seq ();
2392 break; 2706 break;
2393 2707
2394 /* 8.3.106: RESET TO INITIAL STATE */ 2708 /* 8.3.106: RESET TO INITIAL STATE */
2395 case 'c': 2709 case 'c':
2710 mbstate.reset ();
2396 scr_poweron (); 2711 scr_poweron ();
2397 scrollbar_show (1); 2712 scrollbar_show (1);
2398 break; 2713 break;
2399 2714
2400 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2715 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2412 2727
2413/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2728/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2414/* *INDENT-OFF* */ 2729/* *INDENT-OFF* */
2415enum { 2730enum {
2416 CSI_ICH = 0x40, 2731 CSI_ICH = 0x40,
2417 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2732 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 , 2733 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, 2734 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, 2735 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, 2736 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, 2737 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, */ 2752 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, [, \, ], ^, _, */ 2753 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, */ 2754 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, */ 2755 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, */ 2756 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, {, |, }, ~, */ 2757 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2443 }; 2758 };
2444/* *INDENT-ON* */ 2759/* *INDENT-ON* */
2445 2760
2446void 2761void
2447rxvt_term::process_csi_seq () 2762rxvt_term::process_csi_seq ()
2646 tt_printf ("\033[0n"); 2961 tt_printf ("\033[0n");
2647 break; 2962 break;
2648 case 6: /* CPR requested */ 2963 case 6: /* CPR requested */
2649 scr_report_position (); 2964 scr_report_position ();
2650 break; 2965 break;
2651#if defined (ENABLE_DISPLAY_ANSWER)
2652 case 7: /* unofficial extension */ 2966 case 7: /* unofficial extension */
2967 if (Options & Opt_insecure)
2653 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2968 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2654 break; 2969 break;
2655#endif
2656 case 8: /* unofficial extension */ 2970 case 8: /* unofficial extension */
2657 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2971 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2658 break; 2972 break;
2659 } 2973 }
2660 break; 2974 break;
2661 2975
2662 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2976 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2800 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3114 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2801 break; 3115 break;
2802 case 13: /* report window position */ 3116 case 13: /* report window position */
2803 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3117 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2804 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3118 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2805 -wattr.border_width, -wattr.border_width, 3119 -wattr.border_width, -wattr.border_width,
2806 &x, &y, &wdummy); 3120 &x, &y, &wdummy);
2807 tt_printf ("\033[3;%d;%dt", x, y); 3121 tt_printf ("\033[3;%d;%dt", x, y);
2808 break; 3122 break;
2809 case 14: /* report window size (pixels) */ 3123 case 14: /* report window size (pixels) */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3124 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2811 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3125 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2814 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3128 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2815 break; 3129 break;
2816 case 19: /* report window size (chars) */ 3130 case 19: /* report window size (chars) */
2817 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3131 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
2818 break; 3132 break;
2819#if 0 /* XXX: currently disabled due to security concerns */
2820 case 20: /* report icon label */ 3133 case 20: /* report icon label */
3134 if (Options & Opt_insecure)
3135 {
3136 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3137 XGetIconName (display->display, TermWin.parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3138 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
3139 }
2823 break; 3140 break;
2824 case 21: /* report window title */ 3141 case 21: /* report window title */
3142 if (Options & Opt_insecure)
3143 {
3144 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3145 XFetchName (display->display, TermWin.parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3146 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
3147 }
2827 break; 3148 break;
2828#endif
2829 } 3149 }
2830} 3150}
2831#endif 3151#endif
2832 3152
2833/*----------------------------------------------------------------------*/ 3153/*----------------------------------------------------------------------*/
2834/* 3154/*
2835 * get input up until STRING TERMINATOR (or BEL) 3155 * get input up until STRING TERMINATOR (or BEL)
2836 * ends_how is terminator used. returned input must be free ()d 3156 * ends_how is terminator used. returned input must be free()'d
2837 */ 3157 */
2838unsigned char * 3158unsigned char *
2839rxvt_term::get_to_st (unicode_t &ends_how) 3159rxvt_term::get_to_st (unicode_t &ends_how)
2840{ 3160{
2841 int seen_esc = 0; /* seen escape? */ 3161 unicode_t prev = 0, ch;
2842 unsigned int n = 0; 3162 unsigned int n = 0;
2843 unsigned char *s; 3163 unsigned char *s;
2844 unicode_t ch;
2845 unsigned char string[STRING_MAX]; 3164 unsigned char string[STRING_MAX];
2846 3165
2847 while ((ch = cmd_getc ())) 3166 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3167 {
2849 if (ch == C0_BEL
2850 || ch == CHAR_ST
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2852 break;
2853
2854 if (ch == C0_ESC) 3168 if (prev == C0_ESC)
2855 {
2856 seen_esc = 1;
2857 continue;
2858 } 3169 {
2859 else if (ch == '\t') 3170 if (ch == 0x5c) /* 7bit ST */
2860 ch = ' '; /* translate '\t' to space */ 3171 break;
2861 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3172 else
3173 return NULL;
3174 }
3175 else if (ch == C0_BEL || ch == CHAR_ST)
3176 break;
3177 else if (ch < 0x20)
2862 return NULL; /* other control character - exit */ 3178 return NULL; /* other control character - exit */
2863 3179
2864 if (n < sizeof (string) - 1) 3180 if (n >= sizeof (string) - 1)
3181 // stop at some sane length
3182 return NULL;
3183
3184 if (ch == C0_SYN)
3185 {
3186 string[n++] = cmd_get8 ();
3187 prev = 0;
3188 }
3189 else
2865 string[n++] = ch; 3190 string[n++] = prev = ch;
2866
2867 seen_esc = 0;
2868 } 3191 }
2869 3192
2870 string[n++] = '\0'; 3193 string[n++] = '\0';
2871 3194
2872 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3195 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2915 { 3238 {
2916 unsigned char *s = get_to_st (eh); 3239 unsigned char *s = get_to_st (eh);
2917 3240
2918 if (s) 3241 if (s)
2919 { 3242 {
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); 3243 process_xterm_seq (arg, (char *)s, eh);
2932
2933 free (s); 3244 free (s);
2934 } 3245 }
2935 } 3246 }
2936} 3247}
3248
3249void
3250rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3251{
3252 if (str[0] == '?' && !str[1])
3253 {
3254 if (Options & Opt_insecure)
3255 {
3256 unsigned short r, g, b;
3257 PixColors[color].get (display, r, g, b);
3258 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3259 }
3260 }
3261 else
3262 set_window_color (color, str);
3263}
3264
2937/* 3265/*
2938 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3266 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2939 * 0 = change iconName/title 3267 * 0 = change iconName/title
2940 * 1 = change iconName 3268 * 1 = change iconName
2941 * 2 = change title 3269 * 2 = change title
2942 * 4 = change color 3270 * 4 = change color
3271 * 10 = change fg color
3272 * 11 = change bg color
2943 * 12 = change text color 3273 * 12 = change text color
2944 * 13 = change mouse foreground color 3274 * 13 = change mouse foreground color
2945 * 17 = change highlight character colour 3275 * 17 = change highlight character colour
2946 * 18 = change bold character color 3276 * 18 = change bold character color
2947 * 19 = change underlined character color 3277 * 19 = change underlined character color
2948 * 46 = change logfile (not implemented) 3278 * 46 = change logfile (not implemented)
2949 * 50 = change font 3279 * 50 = change font
2950 * 3280 *
2951 * rxvt extensions: 3281 * rxvt extensions:
2952 * 10 = menu (may change in future)
2953 * 20 = bg pixmap 3282 * 20 = bg pixmap
2954 * 39 = change default fg color 3283 * 39 = change default fg color
2955 * 49 = change default bg color 3284 * 49 = change default bg color
2956 * 55 = dump scrollback buffer and all of screen 3285 * 55 = dump scrollback buffer and all of screen
2957 * 701 = change locale 3286 * 701 = change locale
2958 * 702 = find font 3287 * 702 = find font
3288 * 703 = menu
2959 */ 3289 */
2960void 3290void
2961rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3291rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2962{ 3292{
2963 int changed = 0; 3293 int changed = 0;
2964 int color; 3294 int color;
2965 char *buf, *name; 3295 char *buf, *name;
3296 bool query = str[0] == '?' && !str[1];
2966 3297
2967 assert (str != NULL); 3298 assert (str != NULL);
2968 switch (op) 3299 switch (op)
2969 { 3300 {
2970 case XTerm_name: 3301 case XTerm_name:
2974 set_icon_name (str); 3305 set_icon_name (str);
2975 break; 3306 break;
2976 case XTerm_title: 3307 case XTerm_title:
2977 set_title (str); 3308 set_title (str);
2978 break; 3309 break;
3310 case XTerm_property:
3311 if (str[0] == '?')
3312 {
3313 Atom prop = XInternAtom (display->display, str + 1, True);
3314 Atom actual_type;
3315 int actual_format;
3316 unsigned long nitems;
3317 unsigned long bytes_after;
3318 unsigned char *value = 0;
3319 const char *str = "";
3320
3321 if (prop
3322 && XGetWindowProperty (display->display, TermWin.parent[0],
3323 prop, 0, 1<<16, 0, AnyPropertyType,
3324 &actual_type, &actual_format,
3325 &nitems, &bytes_after, &value) == Success
3326 && actual_type != None
3327 && actual_format == 8)
3328 str = (const char *)(value);
3329
3330 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3331
3332 XFree (value);
3333 }
3334 else
3335 {
3336 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3337
3338 if (eq)
3339 {
3340 *eq = 0;
3341 XChangeProperty (display->display, TermWin.parent[0],
3342 display->atom (str), XA_STRING, 8,
3343 PropModeReplace, (unsigned char *)eq + 1,
3344 strlen (eq + 1));
3345 }
3346 else
3347 XDeleteProperty (display->display, TermWin.parent[0],
3348 display->atom (str));
3349 }
3350 break;
3351
2979 case XTerm_Color: 3352 case XTerm_Color:
2980 for (buf = (char *)str; buf && *buf;) 3353 for (buf = (char *)str; buf && *buf;)
2981 { 3354 {
2982 if ((name = STRCHR (buf, ';')) == NULL) 3355 if ((name = STRCHR (buf, ';')) == NULL)
2983 break; 3356 break;
2989 break; 3362 break;
2990 3363
2991 if ((buf = STRCHR (name, ';')) != NULL) 3364 if ((buf = STRCHR (name, ';')) != NULL)
2992 *buf++ = '\0'; 3365 *buf++ = '\0';
2993 3366
3367 if (name[0] == '?' && !name[1])
3368 {
3369 if (Options & Opt_insecure)
3370 {
3371 unsigned short r, g, b;
3372 PixColors[color + minCOLOR].get (display, r, g, b);
3373 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3374 }
3375 }
3376 else
2994 set_window_color (color + minCOLOR, name); 3377 set_window_color (color + minCOLOR, name);
2995 } 3378 }
3379 break;
3380 case XTerm_Color00:
3381 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3382 break;
3383 case XTerm_Color01:
3384 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2996 break; 3385 break;
2997#ifndef NO_CURSORCOLOR 3386#ifndef NO_CURSORCOLOR
2998 case XTerm_Color_cursor: 3387 case XTerm_Color_cursor:
2999 set_window_color (Color_cursor, str); 3388 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3000 break; 3389 break;
3001#endif 3390#endif
3002 case XTerm_Color_pointer: 3391 case XTerm_Color_pointer_fg:
3003 set_window_color (Color_pointer, str); 3392 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3393 break;
3394 case XTerm_Color_pointer_bg:
3395 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3004 break; 3396 break;
3005#ifndef NO_BOLD_UNDERLINE_REVERSE 3397#ifndef NO_BOLD_UNDERLINE_REVERSE
3006 case XTerm_Color_BD: 3398 case XTerm_Color_BD:
3007 set_window_color (Color_BD, str); 3399 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3008 break; 3400 break;
3009 case XTerm_Color_UL: 3401 case XTerm_Color_UL:
3010 set_window_color (Color_UL, str); 3402 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3011 break; 3403 break;
3012 case XTerm_Color_RV: 3404 case XTerm_Color_RV:
3013 set_window_color (Color_RV, str); 3405 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3014 break; 3406 break;
3015#endif 3407#endif
3016 3408
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: 3409 case XTerm_Pixmap:
3024 if (*str != ';') 3410 if (*str != ';')
3025 { 3411 {
3026#if XPM_BACKGROUND 3412#if XPM_BACKGROUND
3027 scale_pixmap (""); /* reset to default scaling */ 3413 scale_pixmap (""); /* reset to default scaling */
3050 set_window_color (Color_fg, str); 3436 set_window_color (Color_fg, str);
3051 break; 3437 break;
3052 case XTerm_restoreBG: 3438 case XTerm_restoreBG:
3053 set_window_color (Color_bg, str); 3439 set_window_color (Color_bg, str);
3054 break; 3440 break;
3441
3055 case XTerm_logfile: 3442 case XTerm_logfile:
3056 // TODO, when secure mode? 3443 // TODO, when secure mode?
3057 break; 3444 break;
3445
3058 case XTerm_font: 3446 case XTerm_font:
3447 if (query)
3448 {
3449 if (Options & Opt_insecure)
3450 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3451 TermWin.fontset->fontdesc
3452 ? TermWin.fontset->fontdesc
3453 : "",
3454 resp);
3455 }
3456 else
3059 change_font (str); 3457 change_font (str);
3060 break; 3458 break;
3459
3061#ifndef NO_FRILLS 3460#ifndef NO_FRILLS
3062 case XTerm_locale: 3461 case XTerm_locale:
3063 if (str[0] == '?' && !str[1]) 3462 if (query)
3064 tt_printf ("%-.250s\n", locale); 3463 {
3464 if (Options & Opt_insecure)
3465 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3466 }
3065 else 3467 else
3066 { 3468 {
3067 set_locale (str); 3469 set_locale (str);
3068# ifdef USE_XIM 3470# ifdef USE_XIM
3069 im_cb (); 3471 im_cb ();
3070# endif 3472# endif
3071 } 3473 }
3072 break; 3474 break;
3475
3073 case XTerm_findfont: 3476 case XTerm_findfont:
3477 if (Options & Opt_insecure)
3074 { 3478 {
3075 int fid = TermWin.fontset->find_font (atoi (str)); 3479 int fid = TermWin.fontset->find_font (atoi (str));
3076 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name); 3480 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3481 fid, (*TermWin.fontset)[fid]->name, resp);
3077 } 3482 }
3483 break;
3484#endif
3485
3486#ifdef MENUBAR
3487 case XTerm_Menu:
3488 if (Options & Opt_insecure)
3489 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3078 break; 3490 break;
3079#endif 3491#endif
3080#if 0 3492#if 0
3081 case XTerm_dumpscreen: /* no error notices */ 3493 case XTerm_dumpscreen: /* no error notices */
3082 { 3494 {
3083 int fd; 3495 int fd;
3084 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3496 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3085 { 3497 {
3086 scr_dump (fd); 3498 scr_dump (fd);
3087 close (fd); 3499 close (fd);
3088 } 3500 }
3175 // 1035 enable modifiers for alt, numlock NYI 3587 // 1035 enable modifiers for alt, numlock NYI
3176 // 1036 send ESC for meta keys NYI 3588 // 1036 send ESC for meta keys NYI
3177 // 1037 send DEL for keypad delete NYI 3589 // 1037 send DEL for keypad delete NYI
3178 { 1047, PrivMode_Screen }, 3590 { 1047, PrivMode_Screen },
3179 // 1048 save and restore cursor 3591 // 1048 save and restore cursor
3180 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3592 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3181 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3593 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3182 }; 3594 };
3183 3595
3184 if (nargs == 0) 3596 if (nargs == 0)
3185 return; 3597 return;
3204 3616
3205 /* extra handling for values with state unkept */ 3617 /* extra handling for values with state unkept */
3206 switch (arg[i]) 3618 switch (arg[i])
3207 { 3619 {
3208 case 1048: /* alternative cursor save */ 3620 case 1048: /* alternative cursor save */
3209 case 1049: 3621 if (Options & Opt_secondaryScreen)
3210 if (mode == 0) 3622 if (mode == 0)
3211 scr_cursor (RESTORE); 3623 scr_cursor (RESTORE);
3212 else if (mode == 1) 3624 else if (mode == 1)
3213 scr_cursor (SAVE); 3625 scr_cursor (SAVE);
3214 /* FALLTHROUGH */ 3626 break;
3215 } 3627 }
3216 3628
3217 if (state >= 0) 3629 if (state >= 0)
3218 /* extra handling for values with valid 0 or 1 state */ 3630 /* extra handling for values with valid 0 or 1 state */
3219 switch (arg[i]) 3631 switch (arg[i])
3243 scr_relative_origin (state); 3655 scr_relative_origin (state);
3244 break; 3656 break;
3245 case 7: /* autowrap */ 3657 case 7: /* autowrap */
3246 scr_autowrap (state); 3658 scr_autowrap (state);
3247 break; 3659 break;
3248 /* case 8: - auto repeat, can't do on a per window basis */ 3660 /* case 8: - auto repeat, can't do on a per window basis */
3249 case 9: /* X10 mouse reporting */ 3661 case 9: /* X10 mouse reporting */
3250 if (state) /* orthogonal */ 3662 if (state) /* orthogonal */
3251 PrivateModes &= ~PrivMode_MouseX11; 3663 PrivateModes &= ~PrivMode_MouseX11;
3252 break; 3664 break;
3253#ifdef menuBar_esc 3665#ifdef menuBar_esc
3267 break; 3679 break;
3268#endif 3680#endif
3269 case 25: /* visible/invisible cursor */ 3681 case 25: /* visible/invisible cursor */
3270 scr_cursor_visible (state); 3682 scr_cursor_visible (state);
3271 break; 3683 break;
3272 /* case 35: - shift keys */ 3684 /* case 35: - shift keys */
3273 /* case 40: - 80 <--> 132 mode */ 3685 /* case 40: - 80 <--> 132 mode */
3274 case 47: /* secondary screen */ 3686 case 47: /* secondary screen */
3275 scr_change_screen (state); 3687 scr_change_screen (state);
3276 break; 3688 break;
3277 /* case 66: - application key pad */ 3689 /* case 66: - application key pad */
3278 /* case 67: - backspace key */ 3690 /* case 67: - backspace key */
3279 case 1000: /* X11 mouse reporting */ 3691 case 1000: /* X11 mouse reporting */
3280 if (state) /* orthogonal */ 3692 if (state) /* orthogonal */
3281 PrivateModes &= ~PrivMode_MouseX10; 3693 PrivateModes &= ~PrivMode_MouseX10;
3282 break; 3694 break;
3283#if 0 3695#if 0
3294 if (state) 3706 if (state)
3295 Options |= Opt_scrollTtyKeypress; 3707 Options |= Opt_scrollTtyKeypress;
3296 else 3708 else
3297 Options &= ~Opt_scrollTtyKeypress; 3709 Options &= ~Opt_scrollTtyKeypress;
3298 break; 3710 break;
3299 case 1047: /* secondary screen w/ clearing */ 3711 case 1047: /* secondary screen w/ clearing last */
3300 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3712 if (Options & Opt_secondaryScreen)
3301 if (current_screen != PRIMARY) 3713 if (current_screen != PRIMARY)
3302 scr_erase_screen (2); 3714 scr_erase_screen (2);
3303
3304 scr_change_screen (state); 3715 scr_change_screen (state);
3305 /* FALLTHROUGH */ 3716 break;
3717 case 1049: /* secondary screen w/ clearing first */
3718 scr_change_screen (state);
3719 if (Options & Opt_secondaryScreen)
3720 if (current_screen != PRIMARY)
3721 scr_erase_screen (2);
3722 break;
3306 default: 3723 default:
3307 break; 3724 break;
3308 } 3725 }
3309 } 3726 }
3310} 3727}
3339 rendset = 1, rendstyle = RS_Uline; 3756 rendset = 1, rendstyle = RS_Uline;
3340 break; 3757 break;
3341 case 5: 3758 case 5:
3342 rendset = 1, rendstyle = RS_Blink; 3759 rendset = 1, rendstyle = RS_Blink;
3343 break; 3760 break;
3761 //case 6: // scoansi light background
3344 case 7: 3762 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 3763 rendset = 1, rendstyle = RS_RVid;
3346 break; 3764 break;
3347 case 8: 3765 case 8:
3348 // invisible. NYI 3766 // invisible. NYI
3767 break;
3768 //case 10: // scoansi acs off
3769 //case 11: // scoansi acs on
3770 //case 12: // scoansi acs on, |0x80
3771 case 21: // disable bold, blink and invis (some terminals use this)
3772 rendset = 0, rendstyle = RS_Bold | RS_Blink;
3349 break; 3773 break;
3350 case 22: 3774 case 22:
3351 rendset = 0, rendstyle = RS_Bold; 3775 rendset = 0, rendstyle = RS_Bold;
3352 break; 3776 break;
3353 case 24: 3777 case 24:
3446 } 3870 }
3447 } 3871 }
3448} 3872}
3449/*}}} */ 3873/*}}} */
3450 3874
3451/*{{{ process Rob Nation's own graphics mode sequences */ 3875/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3452void 3876void
3453rxvt_term::process_graphics () 3877rxvt_term::process_graphics ()
3454{ 3878{
3455 unicode_t ch, cmd = cmd_getc (); 3879 unicode_t ch, cmd = cmd_getc ();
3456 3880

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines