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.116 by root, Wed Aug 4 03:29:28 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 ();
680
681 flush_ev.stop ();
681} 682}
682 683
683void 684void
684rxvt_term::check_cb (check_watcher &w) 685rxvt_term::check_cb (check_watcher &w)
685{ 686{
686 SET_R (this); 687 SET_R (this);
687 SET_LOCALE (locale); 688 SET_LOCALE (locale);
688 689
690 display->flush ();
691
692 if (!flush_ev.active)
693 flush_ev.start (NOW + 0.01);
694}
695
696void
697rxvt_term::flush_cb (time_watcher &w)
698{
699 SET_R (this);
700 SET_LOCALE (locale);
701
702 refresh_limit = 1;
703 refresh_count = 0;
689 flush (); 704 flush ();
690} 705}
691 706
692#ifdef CURSOR_BLINK 707#ifdef CURSOR_BLINK
693void 708void
711 w.start (w.at + TEXT_BLINK_INTERVAL); 726 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 727 }
713} 728}
714#endif 729#endif
715 730
731#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
732void
733rxvt_term::cont_scroll_cb (time_watcher &w)
734{
735 if ((scrollbar_isUp() || scrollbar_isDn()) &&
736 scr_page (scrollbar_isUp() ? UP : DN, 1))
737 {
738 refresh_type |= SMOOTH_REFRESH;
739 want_refresh = 1;
740 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
741 }
742}
743#endif
744
745#ifdef SELECTION_SCROLLING
746void
747rxvt_term::sel_scroll_cb (time_watcher &w)
748{
749 if (scr_page (scroll_selection_dir, scroll_selection_lines))
750 {
751 selection_extend (selection_save_x, selection_save_y, selection_save_state);
752 refresh_type |= SMOOTH_REFRESH;
753 want_refresh = 1;
754 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
755 }
756}
757#endif
758
759#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
760void
761rxvt_term::slip_wheel_cb (time_watcher &w)
762{
763 if (mouse_slip_wheel_speed == 0
764 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
765 : scr_page (UP, mouse_slip_wheel_speed))
766 {
767 refresh_type |= SMOOTH_REFRESH;
768 want_refresh = 1;
769 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
770 }
771}
772#endif
773
716bool 774bool
717rxvt_term::pty_fill () 775rxvt_term::pty_fill ()
718{ 776{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 777 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
778
779 if (CBUFSIZ == n)
780 {
781 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
782 n = 0;
783 }
720 784
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 785 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 786 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 787 cmdbuf_endp = cmdbuf_ptr + n;
724 788
742 SET_LOCALE (locale); 806 SET_LOCALE (locale);
743 807
744 if (revents & EVENT_WRITE) 808 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 809 tt_write (0, 0);
746 else if (revents & EVENT_READ) 810 else if (revents & EVENT_READ)
747 {
748 // loop, but don't allow a single term to monopolize us 811 // 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 ()) 812 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 ()) 813 if (cmd_parse ())
761 break; 814 break;
762 }
763 }
764} 815}
765 816
766#ifdef POINTER_BLANK
767void 817void
768rxvt_term::pointer_unblank () 818rxvt_term::pointer_unblank ()
769{ 819{
770 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 820 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
771 recolour_cursor (); 821 recolour_cursor ();
772 822
823#ifdef POINTER_BLANK
773 hidden_pointer = 0; 824 hidden_pointer = 0;
774 825
775 if (Options & Opt_pointerBlank) 826 if (Options & Opt_pointerBlank)
776 pointer_ev.start (NOW + pointerBlankDelay); 827 pointer_ev.start (NOW + pointerBlankDelay);
828#endif
777} 829}
778 830
831#ifdef POINTER_BLANK
779void 832void
780rxvt_term::pointer_blank () 833rxvt_term::pointer_blank ()
781{ 834{
782 if (! (Options & Opt_pointerBlank)) 835 if (! (Options & Opt_pointerBlank))
783 return; 836 return;
979 break; 1032 break;
980 1033
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1034#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease: 1035 case KeyRelease:
983 { 1036 {
984 if (! (ev.xkey.state & ControlMask)) 1037 if (!(ev.xkey.state & ControlMask))
985 mouse_slip_wheel_speed = 0; 1038 slip_wheel_ev.stop ();
986 else 1039 else
987 { 1040 {
988 KeySym ks; 1041 KeySym ks;
989 1042
990 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0); 1043 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
991 if (ks == XK_Control_L || ks == XK_Control_R) 1044 if (ks == XK_Control_L || ks == XK_Control_R)
992 mouse_slip_wheel_speed = 0; 1045 mouse_slip_wheel_speed = 0;
993 } 1046 }
1013 && (ev.xclient.data.l[0] == DndFile 1066 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1067 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1068 || ev.xclient.data.l[0] == DndLink))
1016 { 1069 {
1017 /* Get Dnd data */ 1070 /* Get Dnd data */
1018 Atom ActualType; 1071 Atom ActualType;
1019 int ActualFormat; 1072 int ActualFormat;
1020 unsigned char *data; 1073 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1074 unsigned long Size, RemainingBytes;
1022 1075
1023 XGetWindowProperty (display->display, display->root, 1076 XGetWindowProperty (display->display, display->root,
1024 xa[XA_DNDSELECTION], 1077 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1078 0L, 1000000L,
1026 False, AnyPropertyType, 1079 False, AnyPropertyType,
1029 &data); 1082 &data);
1030 XChangeProperty (display->display, display->root, 1083 XChangeProperty (display->display, display->root,
1031 XA_CUT_BUFFER0, XA_STRING, 1084 XA_CUT_BUFFER0, XA_STRING,
1032 8, PropModeReplace, 1085 8, PropModeReplace,
1033 data, STRLEN (data)); 1086 data, STRLEN (data));
1087 XFree (data);
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1088 selection_paste (display->root, XA_CUT_BUFFER0, True);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1089 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1036 } 1090 }
1037#endif /* OFFIX_DND */ 1091#endif /* OFFIX_DND */
1038 break; 1092 break;
1039 1093
1040 case MappingNotify: 1094 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1095 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1096 break;
1043 1097
1044 /* 1098 /*
1045 * XXX: this is not the _current_ arrangement 1099 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1100 * Here's my conclusion:
1077#endif 1131#endif
1078#ifdef CURSOR_BLINK 1132#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink) 1133 if (Options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1134 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1081#endif 1135#endif
1136#ifdef OFF_FOCUS_FADING
1137 if (rs[Rs_fade])
1138 {
1139 PixColors = PixColorsFocused;
1140 set_colorfgbg ();
1141 scr_clear ();
1142 scr_touch (true);
1143 }
1144#endif
1082 1145
1083 } 1146 }
1084 break; 1147 break;
1085 1148
1086 case FocusOut: 1149 case FocusOut:
1095#ifdef CURSOR_BLINK 1158#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink) 1159 if (Options & Opt_cursorBlink)
1097 cursor_blink_ev.stop (); 1160 cursor_blink_ev.stop ();
1098 hidden_cursor = 0; 1161 hidden_cursor = 0;
1099#endif 1162#endif
1163#ifdef OFF_FOCUS_FADING
1164 if (rs[Rs_fade])
1165 {
1166 PixColors = PixColorsUnFocused;
1167 set_colorfgbg ();
1168 scr_clear ();
1169 scr_touch (true);
1170 }
1171#endif
1100 1172
1101 } 1173 }
1102 break; 1174 break;
1103 1175
1104 case ConfigureNotify: 1176 case ConfigureNotify:
1113 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1185 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1114 } 1186 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1187 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1116 1188
1117 if (szHint.width != width || szHint.height != height) 1189 if (szHint.width != width || szHint.height != height)
1118 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1120 resize_all_windows (width, height, 1); 1190 resize_all_windows (width, height, 1);
1121 } 1191
1122#ifdef DEBUG_SIZE
1123 else
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1192#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent) 1193 if (Options & Opt_transparent)
1130 { 1194 {
1131 check_our_parents (); 1195 check_our_parents ();
1132 if (am_transparent) 1196 if (am_transparent)
1133 want_full_refresh = 1; 1197 want_full_refresh = 1;
1134 } 1198 }
1135#endif 1199#endif
1136
1137 } 1200 }
1138 break; 1201 break;
1139 1202
1140 case SelectionClear: 1203 case SelectionClear:
1141 selection_clear (); 1204 selection_clear ();
1173 1236
1174 case GraphicsExpose: 1237 case GraphicsExpose:
1175 case Expose: 1238 case Expose:
1176 if (ev.xany.window == TermWin.vt) 1239 if (ev.xany.window == TermWin.vt)
1177 { 1240 {
1178#ifdef NO_SLOW_LINK_SUPPORT 1241 do
1179 scr_expose (ev.xexpose.x, ev.xexpose.y, 1242 scr_expose (ev.xexpose.x, ev.xexpose.y,
1180 ev.xexpose.width, ev.xexpose.height, False); 1243 ev.xexpose.width, ev.xexpose.height, False);
1181#else 1244 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1182 // don't understand this, so commented it out 1245
1246 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1247
1248 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1183 scr_expose (ev.xexpose.x, ev.xexpose.y, 1249 scr_expose (ev.xexpose.x, ev.xexpose.y,
1184 ev.xexpose.width, ev.xexpose.height, False); 1250 ev.xexpose.width, ev.xexpose.height, False);
1185 //scr_expose (ev.xexpose.x, 0, 1251
1186 // ev.xexpose.width, TermWin.height, False); 1252 scr_refresh (refresh_type);
1187#endif
1188 want_refresh = 1;
1189 } 1253 }
1190 else 1254 else
1191 { 1255 {
1192 XEvent unused_event; 1256 XEvent unused_event;
1193 1257
1194 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1258 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1195 Expose, 1259 ;
1196 &unused_event)) ;
1197 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1260 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1198 GraphicsExpose, 1261 ;
1199 &unused_event)) ; 1262
1200 if (isScrollbarWindow (ev.xany.window)) 1263 if (isScrollbarWindow (ev.xany.window))
1201 { 1264 {
1202 scrollBar.setIdle (); 1265 scrollBar.setIdle ();
1203 scrollbar_show (0); 1266 scrollbar_show (0);
1204 } 1267 }
1205#ifdef MENUBAR 1268#ifdef MENUBAR
1206 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1269 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1207 menubar_expose (); 1270 menubar_expose ();
1271#endif
1272
1273#ifdef TRANSPARENT
1274 if (am_transparent && ev.xany.window == TermWin.parent[0])
1275 XClearWindow (display->display, ev.xany.window);
1208#endif 1276#endif
1209 } 1277 }
1210 break; 1278 break;
1211 1279
1212 case MotionNotify: 1280 case MotionNotify:
1247 if (ev.xbutton.y < TermWin.int_bwidth 1315 if (ev.xbutton.y < TermWin.int_bwidth
1248 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1316 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1249 { 1317 {
1250 int dist; 1318 int dist;
1251 1319
1252 pending_scroll_selection=1;
1253
1254 /* don't clobber the current delay if we are 1320 /* don't clobber the current delay if we are
1255 * already in the middle of scrolling. 1321 * already in the middle of scrolling.
1256 */ 1322 */
1257 if (scroll_selection_delay<=0) 1323 if (!sel_scroll_ev.active)
1258 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1324 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1259 1325
1260 /* save the event params so we can highlight 1326 /* save the event params so we can highlight
1261 * the selection in the pending-scroll loop 1327 * the selection in the pending-scroll loop
1262 */ 1328 */
1263 selection_save_x=ev.xbutton.x; 1329 selection_save_x=ev.xbutton.x;
1285 else 1351 else
1286 { 1352 {
1287 /* we are within the text window, so we 1353 /* we are within the text window, so we
1288 * shouldn't be scrolling 1354 * shouldn't be scrolling
1289 */ 1355 */
1290 pending_scroll_selection = 0; 1356 if (sel_scroll_ev.active)
1357 sel_scroll_ev.stop();
1291 } 1358 }
1292#endif 1359#endif
1293#ifdef MOUSE_THRESHOLD 1360#ifdef MOUSE_THRESHOLD
1294 1361
1295 } 1362 }
1345 return; 1412 return;
1346 } 1413 }
1347 1414
1348 /* FALLTHROUGH */ 1415 /* FALLTHROUGH */
1349 case ReparentNotify: 1416 case ReparentNotify:
1350 if ((Options & Opt_transparent) && check_our_parents ()) 1417 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1351 if (am_transparent)
1352 want_full_refresh = 1; 1418 want_full_refresh = 1;
1353 break; 1419 break;
1354#endif 1420#endif
1355 } 1421 }
1356} 1422}
1357 1423
1513 upordown = 1; /* down */ 1579 upordown = 1; /* down */
1514 } 1580 }
1515 if (upordown) 1581 if (upordown)
1516 { 1582 {
1517#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1583#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1518 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1584 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1519#endif 1585#endif
1520 if (scr_page (upordown < 0 ? UP : DN, 1)) 1586 if (scr_page (upordown < 0 ? UP : DN, 1))
1521 { 1587 {
1522 if (upordown < 0) 1588 if (upordown < 0)
1523 scrollBar.setUp (); 1589 scrollBar.setUp ();
1610 refresh_type &= ~SMOOTH_REFRESH; 1676 refresh_type &= ~SMOOTH_REFRESH;
1611#endif 1677#endif
1612 1678
1613 } 1679 }
1614#ifdef SELECTION_SCROLLING 1680#ifdef SELECTION_SCROLLING
1615 pending_scroll_selection=0; 1681 if (sel_scroll_ev.active)
1682 sel_scroll_ev.stop();
1616#endif 1683#endif
1617 if (ev.window == TermWin.vt) 1684 if (ev.window == TermWin.vt)
1618 { 1685 {
1619 if (reportmode) 1686 if (reportmode)
1620 { 1687 {
1662 case Button5: 1729 case Button5:
1663 { 1730 {
1664 int i; 1731 int i;
1665 page_dirn v; 1732 page_dirn v;
1666 1733
1667 v = (ev.button == Button4) ? UP : DN; 1734 v = ev.button == Button4 ? UP : DN;
1735
1668 if (ev.state & ShiftMask) 1736 if (ev.state & ShiftMask)
1669 i = 1; 1737 i = 1;
1670 else if ((Options & Opt_mouseWheelScrollPage)) 1738 else if (Options & Opt_mouseWheelScrollPage)
1671 i = TermWin.nrow - 1; 1739 i = TermWin.nrow - 1;
1672 else 1740 else
1673 i = 5; 1741 i = 5;
1742
1674# ifdef MOUSE_SLIP_WHEELING 1743# ifdef MOUSE_SLIP_WHEELING
1675 if (ev.state & ControlMask) 1744 if (ev.state & ControlMask)
1676 { 1745 {
1677 mouse_slip_wheel_speed += (v ? -1 : 1); 1746 mouse_slip_wheel_speed += v ? -1 : 1;
1747 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
1748 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
1749
1750 if (slip_wheel_ev.at < NOW)
1678 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1751 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1752
1753 slip_wheel_ev.start ();
1679 } 1754 }
1755 else
1756 {
1680# endif 1757# endif
1681# ifdef JUMP_MOUSE_WHEEL 1758# 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); 1759 scr_page (v, i);
1689 scr_refresh (SMOOTH_REFRESH); 1760 scr_refresh (SMOOTH_REFRESH);
1690 scrollbar_show (1); 1761 scrollbar_show (1);
1762# else
1763 while (i--)
1764 {
1765 scr_page (v, 1);
1766 scr_refresh (SMOOTH_REFRESH);
1767 scrollbar_show (1);
1768 }
1769# endif
1770# ifdef MOUSE_SLIP_WHEELING
1691 } 1771 }
1692# endif 1772#endif
1693
1694 } 1773 }
1695 break; 1774 break;
1696#endif 1775#endif
1697
1698 } 1776 }
1699 } 1777 }
1700#ifdef MENUBAR 1778#ifdef MENUBAR
1701 else if (isMenuBarWindow (ev.window)) 1779 else if (isMenuBarWindow (ev.window))
1702 menubar_control (ev); 1780 menubar_control (ev);
1703#endif 1781#endif
1704} 1782}
1705 1783
1706
1707#ifdef TRANSPARENT 1784#ifdef TRANSPARENT
1785#if TINTING
1786/* taken from aterm-0.4.2 */
1787
1788typedef uint32_t RUINT32T;
1789
1790void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1791{
1792 int sh_r, sh_g, sh_b;
1793 RUINT32T mask_r, mask_g, mask_b;
1794 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1795 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1796 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1797 int i;
1798
1799 Visual* visual = display->visual;
1800
1801 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1802
1803 /* for convenience */
1804 mask_r = visual->red_mask;
1805 mask_g = visual->green_mask;
1806 mask_b = visual->blue_mask;
1807
1808 /* boring lookup table pre-initialization */
1809 switch (srcImage->bits_per_pixel) {
1810 case 15:
1811 if ((mask_r != 0x7c00) ||
1812 (mask_g != 0x03e0) ||
1813 (mask_b != 0x001f))
1814 return;
1815 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
1816 lookup_r = lookup;
1817 lookup_g = lookup+32;
1818 lookup_b = lookup+32+32;
1819 sh_r = 10;
1820 sh_g = 5;
1821 sh_b = 0;
1822 break;
1823 case 16:
1824 if ((mask_r != 0xf800) ||
1825 (mask_g != 0x07e0) ||
1826 (mask_b != 0x001f))
1827 return;
1828 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
1829 lookup_r = lookup;
1830 lookup_g = lookup+32;
1831 lookup_b = lookup+32+64;
1832 sh_r = 11;
1833 sh_g = 5;
1834 sh_b = 0;
1835 break;
1836 case 24:
1837 if ((mask_r != 0xff0000) ||
1838 (mask_g != 0x00ff00) ||
1839 (mask_b != 0x0000ff))
1840 return;
1841 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1842 lookup_r = lookup;
1843 lookup_g = lookup+256;
1844 lookup_b = lookup+256+256;
1845 sh_r = 16;
1846 sh_g = 8;
1847 sh_b = 0;
1848 break;
1849 case 32:
1850 if ((mask_r != 0xff0000) ||
1851 (mask_g != 0x00ff00) ||
1852 (mask_b != 0x0000ff))
1853 return;
1854 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1855 lookup_r = lookup;
1856 lookup_g = lookup+256;
1857 lookup_b = lookup+256+256;
1858 sh_r = 16;
1859 sh_g = 8;
1860 sh_b = 0;
1861 break;
1862 default:
1863 return; /* we do not support this color depth */
1864 }
1865
1866 /* prepare limits for color transformation (each channel is handled separately) */
1867 if (shade < 0) {
1868 shade = -shade;
1869 if (shade < 0) shade = 0;
1870 if (shade > 100) shade = 100;
1871
1872 lower_lim_r = 65535-rm;
1873 lower_lim_g = 65535-gm;
1874 lower_lim_b = 65535-bm;
1875
1876 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
1877 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1878 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1879
1880 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1881 } else {
1882 if (shade < 0) shade = 0;
1883 if (shade > 100) shade = 100;
1884
1885 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1886
1887 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1888 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1889 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1890 }
1891
1892 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1893 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1894 {
1895 unsigned int tmp;
1896
1897 tmp = lower_lim_r;
1898 lower_lim_r = lower_lim_b;
1899 lower_lim_b = tmp;
1900
1901 tmp = upper_lim_r;
1902 upper_lim_r = upper_lim_b;
1903 upper_lim_b = tmp;
1904 }
1905
1906 /* fill our lookup tables */
1907 for (i = 0; i <= mask_r>>sh_r; i++)
1908 {
1909 RUINT32T tmp;
1910 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
1911 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
1912 lookup_r[i] = (tmp/65535)<<sh_r;
1913 }
1914 for (i = 0; i <= mask_g>>sh_g; i++)
1915 {
1916 RUINT32T tmp;
1917 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
1918 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
1919 lookup_g[i] = (tmp/65535)<<sh_g;
1920 }
1921 for (i = 0; i <= mask_b>>sh_b; i++)
1922 {
1923 RUINT32T tmp;
1924 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
1925 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
1926 lookup_b[i] = (tmp/65535)<<sh_b;
1927 }
1928
1929 /* apply table to input image (replacing colors by newly calculated ones) */
1930 switch (srcImage->bits_per_pixel)
1931 {
1932 case 15:
1933 {
1934 unsigned short *p1, *pf, *p, *pl;
1935 p1 = (unsigned short *) srcImage->data;
1936 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1937 while (p1 < pf)
1938 {
1939 p = p1;
1940 pl = p1 + srcImage->width;
1941 for (; p < pl; p++)
1942 {
1943 *p = lookup_r[(*p & 0x7c00)>>10] |
1944 lookup_g[(*p & 0x03e0)>> 5] |
1945 lookup_b[(*p & 0x001f)];
1946 }
1947 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1948 }
1949 break;
1950 }
1951 case 16:
1952 {
1953 unsigned short *p1, *pf, *p, *pl;
1954 p1 = (unsigned short *) srcImage->data;
1955 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1956 while (p1 < pf)
1957 {
1958 p = p1;
1959 pl = p1 + srcImage->width;
1960 for (; p < pl; p++)
1961 {
1962 *p = lookup_r[(*p & 0xf800)>>11] |
1963 lookup_g[(*p & 0x07e0)>> 5] |
1964 lookup_b[(*p & 0x001f)];
1965 }
1966 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1967 }
1968 break;
1969 }
1970 case 24:
1971 {
1972 unsigned char *p1, *pf, *p, *pl;
1973 p1 = (unsigned char *) srcImage->data;
1974 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1975 while (p1 < pf)
1976 {
1977 p = p1;
1978 pl = p1 + srcImage->width * 3;
1979 for (; p < pl; p += 3)
1980 {
1981 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1982 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1983 p[2] = lookup_r[(p[2] & 0x0000ff)];
1984 }
1985 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1986 }
1987 break;
1988 }
1989 case 32:
1990 {
1991 RUINT32T *p1, *pf, *p, *pl;
1992 p1 = (RUINT32T *) srcImage->data;
1993 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1994
1995 while (p1 < pf)
1996 {
1997 p = p1;
1998 pl = p1 + srcImage->width;
1999 for (; p < pl; p++)
2000 {
2001 *p = lookup_r[(*p & 0xff0000)>>16] |
2002 lookup_g[(*p & 0x00ff00)>> 8] |
2003 lookup_b[(*p & 0x0000ff)] |
2004 (*p & ~0xffffff);
2005 }
2006 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2007 }
2008 break;
2009 }
2010 }
2011
2012 free (lookup);
2013}
2014#endif
2015
1708/* 2016/*
1709 * Check our parents are still who we think they are. 2017 * Check our parents are still who we think they are.
1710 * Do transparency updates if required 2018 * Do transparency updates if required
1711 */ 2019 */
1712int 2020int
1713rxvt_term::check_our_parents () 2021rxvt_term::check_our_parents ()
1714{ 2022{
1715 int i, pchanged, aformat, have_pixmap, rootdepth; 2023 int i, pchanged, aformat, have_pixmap, rootdepth;
1716 unsigned long nitems, bytes_after; 2024 unsigned long nitems, bytes_after;
1717 Atom atype; 2025 Atom atype;
1718 unsigned char *prop = NULL; 2026 unsigned char *prop = NULL;
1719 Window root, oldp, *list; 2027 Window root, oldp, *list;
1720 Pixmap rootpixmap = None; 2028 Pixmap rootpixmap = None;
1721 XWindowAttributes wattr, wrootattr; 2029 XWindowAttributes wattr, wrootattr;
1722 2030
1723 pchanged = 0; 2031 pchanged = 0;
1724 2032
1725 if (! (Options & Opt_transparent)) 2033 if (!(Options & Opt_transparent))
1726 return pchanged; /* Don't try any more */ 2034 return pchanged; /* Don't try any more */
1727 2035
1728 XGetWindowAttributes (display->display, display->root, &wrootattr); 2036 XGetWindowAttributes (display->display, display->root, &wrootattr);
1729 rootdepth = wrootattr.depth; 2037 rootdepth = wrootattr.depth;
1730 2038
1731 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2039 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2040
1732 if (rootdepth != wattr.depth) 2041 if (rootdepth != wattr.depth)
1733 { 2042 {
1734 if (am_transparent) 2043 if (am_transparent)
1735 { 2044 {
1736 pchanged = 1; 2045 pchanged = 1;
1737 XSetWindowBackground (display->display, TermWin.vt, 2046 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
1738 PixColors[Color_bg]);
1739 am_transparent = am_pixmap_trans = 0; 2047 am_transparent = am_pixmap_trans = 0;
1740 } 2048 }
2049
1741 return pchanged; /* Don't try any more */ 2050 return pchanged; /* Don't try any more */
1742 } 2051 }
1743 2052
1744 /* Get all X ops out of the queue so that our information is up-to-date. */ 2053 /* Get all X ops out of the queue so that our information is up-to-date. */
1745 XSync (display->display, False); 2054 XSync (display->display, False);
1747 /* 2056 /*
1748 * Make the frame window set by the window manager have 2057 * Make the frame window set by the window manager have
1749 * the root background. Some window managers put multiple nested frame 2058 * the root background. Some window managers put multiple nested frame
1750 * windows for each client, so we have to take care about that. 2059 * windows for each client, so we have to take care about that.
1751 */ 2060 */
1752 i = (xa[XA_XROOTPMAPID] != 0 2061 i = (xa[XA_XROOTPMAPID]
1753 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2062 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1754 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2063 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1755 &nitems, &bytes_after, &prop) == Success)); 2064 &nitems, &bytes_after, &prop) == Success);
2065
1756 if (!i || prop == NULL) 2066 if (!i || prop == NULL)
2067 i = (xa[XA_XSETROOTID]
2068 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2069 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2070 &nitems, &bytes_after, &prop) == Success);
2071
2072 if (!i || prop == NULL
2073#if TINTING
2074 || !rs[Rs_color + Color_tint]
2075#endif
2076 )
1757 have_pixmap = 0; 2077 have_pixmap = 0;
1758 else 2078 else
1759 { 2079 {
1760 have_pixmap = 1; 2080 have_pixmap = 1;
1761 rootpixmap = * ((Pixmap *)prop); 2081 rootpixmap = *(Pixmap *)prop;
1762 XFree (prop); 2082 XFree (prop);
1763 } 2083 }
2084
1764 if (have_pixmap) 2085 if (have_pixmap)
1765 { 2086 {
1766 /* 2087 /*
1767 * Copy display->root pixmap transparency 2088 * Copy display->root pixmap transparency
1768 */ 2089 */
1772 XImage *image; 2093 XImage *image;
1773 GC gc; 2094 GC gc;
1774 XGCValues gcvalue; 2095 XGCValues gcvalue;
1775 2096
1776 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2097 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1777 0, 0, &sx, &sy, &cr); 2098 0, 0, &sx, &sy, &cr);
1778 nw = (unsigned int)szHint.width; 2099 nw = (unsigned int)szHint.width;
1779 nh = (unsigned int)szHint.height; 2100 nh = (unsigned int)szHint.height;
1780 nx = ny = 0; 2101 nx = ny = 0;
1781 2102
1782 if (sx < 0) 2103 if (sx < 0)
1794 } 2115 }
1795 2116
1796 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2117 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1797 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2118 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1798 allowedxerror = -1; 2119 allowedxerror = -1;
1799 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2120 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1800 ZPixmap); 2121
1801 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2122 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1802 /* XXX: may need a delay here? */ 2123 /* XXX: may need a delay here? */
1803 allowedxerror = 0; 2124 allowedxerror = 0;
2125
1804 if (image == NULL) 2126 if (image == NULL)
1805 { 2127 {
1806 if (am_transparent && am_pixmap_trans) 2128 if (am_transparent && am_pixmap_trans)
1807 { 2129 {
1808 pchanged = 1; 2130 pchanged = 1;
1810 { 2132 {
1811 XFreePixmap (display->display, TermWin.pixmap); 2133 XFreePixmap (display->display, TermWin.pixmap);
1812 TermWin.pixmap = None; 2134 TermWin.pixmap = None;
1813 } 2135 }
1814 } 2136 }
2137
1815 am_pixmap_trans = 0; 2138 am_pixmap_trans = 0;
1816 } 2139 }
1817 else 2140 else
1818 { 2141 {
1819 if (TermWin.pixmap != None) 2142 if (TermWin.pixmap != None)
1820 XFreePixmap (display->display, TermWin.pixmap); 2143 XFreePixmap (display->display, TermWin.pixmap);
2144
2145#if TINTING
2146 if (ISSET_PIXCOLOR (Color_tint))
2147 {
2148 unsigned short rm, gm, bm;
2149 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2150
2151 PixColorsFocused[Color_tint].get (display, rm, gm, bm);
2152
2153 ShadeXImage (display, image, shade, rm, gm, bm);
2154 }
2155#endif
2156
1821 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2157 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1822 (unsigned int)szHint.width,
1823 (unsigned int)szHint.height, 2158 szHint.width, szHint.height, image->depth);
1824 (unsigned int)image->depth);
1825 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2159 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1826 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2160 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1827 nx, ny, (unsigned int)image->width,
1828 (unsigned int)image->height); 2161 nx, ny, image->width, image->height);
1829 XFreeGC (display->display, gc); 2162 XFreeGC (display->display, gc);
1830 XDestroyImage (image); 2163 XDestroyImage (image);
1831 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2164 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
1832 TermWin.pixmap); 2165 XClearWindow (display->display, TermWin.parent[0]);
2166
1833 if (!am_transparent || !am_pixmap_trans) 2167 if (!am_transparent || !am_pixmap_trans)
1834 pchanged = 1; 2168 pchanged = 1;
2169
1835 am_transparent = am_pixmap_trans = 1; 2170 am_transparent = am_pixmap_trans = 1;
1836 } 2171 }
1837 } 2172 }
1838 2173
1839 if (!am_pixmap_trans) 2174 if (!am_pixmap_trans)
1840 { 2175 {
1841 unsigned int n; 2176 unsigned int n;
1842 /* 2177 /*
1843 * InheritPixmap transparency 2178 * InheritPixmap transparency
1844 */ 2179 */
1845 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root)); 2180 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1846 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2181 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
1847 i++)
1848 { 2182 {
1849 oldp = TermWin.parent[i]; 2183 oldp = TermWin.parent[i];
1850 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2184 XQueryTree (display->display, TermWin.parent[i - 1], &root,
1851 &TermWin.parent[i], &list, &n); 2185 &TermWin.parent[i], &list, &n);
1852 XFree (list); 2186 XFree (list);
1853 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2187 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2188
1854 if (TermWin.parent[i] == display->root) 2189 if (TermWin.parent[i] == display->root)
1855 { 2190 {
1856 if (oldp != None) 2191 if (oldp != None)
1857 pchanged = 1; 2192 pchanged = 1;
2193
1858 break; 2194 break;
1859 } 2195 }
2196
1860 if (oldp != TermWin.parent[i]) 2197 if (oldp != TermWin.parent[i])
1861 pchanged = 1; 2198 pchanged = 1;
1862 } 2199 }
1863 2200
1864 n = 0; 2201 n = 0;
1875 break; 2212 break;
1876 } 2213 }
1877 } 2214 }
1878 } 2215 }
1879 2216
1880 if (n > (int) (sizeof (TermWin.parent) 2217 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
1881 / sizeof (TermWin.parent[0])))
1882 { 2218 {
1883 D_X ((stderr, "InheritPixmap Turning off")); 2219 D_X ((stderr, "InheritPixmap Turning off"));
1884 XSetWindowBackground (display->display, TermWin.parent[0], 2220 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]);
1885 PixColors[Color_fg]);
1886 XSetWindowBackground (display->display, TermWin.vt, 2221 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
1887 PixColors[Color_bg]);
1888 am_transparent = 0; 2222 am_transparent = 0;
1889 /* XXX: also turn off Opt_transparent? */ 2223 /* XXX: also turn off Opt_transparent? */
1890 } 2224 }
1891 else 2225 else
1892 { 2226 {
2227#if WAIT_FOR_WM
1893 /* wait (an arbitrary period) for the WM to do its thing 2228 /* wait (an arbitrary period) for the WM to do its thing
1894 * needed for fvwm2.2.2 (and before?) */ 2229 * 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); 2230 sleep (1);
1903# endif 2231#endif
1904 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2232 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
1905 for (n = 0; n < (unsigned int)i; n++) 2233 for (n = 0; n < (unsigned int)i; n++)
2234 {
1906 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2235 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
1907 ParentRelative); 2236 XClearWindow (display->display, TermWin.parent[n]);
2237 }
2238
1908 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2239 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
1909 ParentRelative);
1910 am_transparent = 1; 2240 am_transparent = 1;
1911 } 2241 }
1912 2242
1913 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2243 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
1914 TermWin.parent[i] = None; 2244 TermWin.parent[i] = None;
1915 } 2245 }
2246
2247 // this is experimental
2248 if (scrollBar.win)
2249 {
2250 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2251 XClearWindow (display->display, scrollBar.win);
2252 scrollBar.setIdle ();
2253 scrollbar_show (0);
2254 }
2255
1916 return pchanged; 2256 return pchanged;
1917} 2257}
1918#endif 2258#endif
1919 2259
1920/*}}} */ 2260/*}}} */
1935 } 2275 }
1936 2276
1937 if (ch == NOCHAR) // TODO: improve 2277 if (ch == NOCHAR) // TODO: improve
1938 break; 2278 break;
1939 2279
1940 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r') 2280 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
1941 { 2281 {
1942 /* Read a text string from the input buffer */ 2282 /* Read a text string from the input buffer */
1943 unicode_t buf[UBUFSIZ]; 2283 unicode_t buf[UBUFSIZ];
1944 bool refreshnow = false; 2284 bool refreshnow = false;
1945 int nlines = 0; 2285 int nlines = 0;
1950 for (;;) 2290 for (;;)
1951 { 2291 {
1952 seq_begin = cmdbuf_ptr; 2292 seq_begin = cmdbuf_ptr;
1953 ch = next_char (); 2293 ch = next_char ();
1954 2294
1955 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2295 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
1956 break; 2296 break;
1957 2297
1958 *str++ = ch; 2298 *str++ = ch;
1959 2299
1960 if (ch == '\n') 2300 if (ch == C0_LF)
1961 { 2301 {
1962 nlines++; 2302 nlines++;
1963 refresh_count++; 2303 refresh_count++;
1964 2304
1965 if (! (Options & Opt_jumpScroll) 2305 if (! (Options & Opt_jumpScroll)
1966 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2306 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
1967 { 2307 {
1968 refreshnow = true; 2308 refreshnow = true;
1969 flag = true;
1970 ch = NOCHAR; 2309 ch = NOCHAR;
1971 break; 2310 break;
1972 } 2311 }
1973 2312
1974 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2313 // scr_add_lines only works for nlines < TermWin.nrow - 1.
1992 /* 2331 /*
1993 * If there have been a lot of new lines, then update the screen 2332 * If there have been a lot of new lines, then update the screen
1994 * What the heck I'll cheat and only refresh less than every page-full. 2333 * What the heck I'll cheat and only refresh less than every page-full.
1995 * the number of pages between refreshes is refresh_limit, which 2334 * the number of pages between refreshes is refresh_limit, which
1996 * is incremented here because we must be doing flat-out scrolling. 2335 * is incremented here because we must be doing flat-out scrolling.
1997 *
1998 * refreshing should be correct for small scrolls, because of the
1999 * time-out
2000 */ 2336 */
2001 if (refreshnow) 2337 if (refreshnow)
2002 { 2338 {
2003 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2339 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2004 refresh_limit++; 2340 refresh_limit++;
2005 2341 else
2342 {
2343 flag = true;
2006 scr_refresh (refresh_type); 2344 scr_refresh (refresh_type);
2345 }
2007 } 2346 }
2008 2347
2009 } 2348 }
2010 else 2349 else
2011 { 2350 {
2025 } 2364 }
2026 2365
2027 return flag; 2366 return flag;
2028} 2367}
2029 2368
2369// read the next octet
2370unicode_t
2371rxvt_term::next_octet ()
2372{
2373 return cmdbuf_ptr < cmdbuf_endp
2374 ? *cmdbuf_ptr++
2375 : NOCHAR;
2376}
2377
2030// read the next character 2378// read the next character
2031unicode_t 2379unicode_t
2032rxvt_term::next_char () 2380rxvt_term::next_char ()
2033{ 2381{
2034 while (cmdbuf_ptr < cmdbuf_endp) 2382 while (cmdbuf_ptr < cmdbuf_endp)
2065 */ 2413 */
2066unicode_t 2414unicode_t
2067rxvt_term::cmd_getc () 2415rxvt_term::cmd_getc ()
2068{ 2416{
2069 unicode_t c = next_char (); 2417 unicode_t c = next_char ();
2418
2419 if (c == NOCHAR)
2420 throw out_of_input;
2421
2422 return c;
2423}
2424
2425unicode_t
2426rxvt_term::cmd_get8 ()
2427{
2428 unicode_t c = next_octet ();
2070 2429
2071 if (c == NOCHAR) 2430 if (c == NOCHAR)
2072 throw out_of_input; 2431 throw out_of_input;
2073 2432
2074 return c; 2433 return c;
2156/*}}} */ 2515/*}}} */
2157 2516
2158/* *INDENT-OFF* */ 2517/* *INDENT-OFF* */
2159enum { 2518enum {
2160 C1_40 = 0x40, 2519 C1_40 = 0x40,
2161 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2520 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, 2521 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, 2522 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 2523 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2165}; 2524};
2166/* *INDENT-ON* */ 2525/* *INDENT-ON* */
2167 2526
2168/*{{{ process non-printing single characters */ 2527/*{{{ process non-printing single characters */
2169void 2528void
2174 case C0_ESC: 2533 case C0_ESC:
2175 process_escape_seq (); 2534 process_escape_seq ();
2176 break; 2535 break;
2177 case C0_ENQ: /* terminal Status */ 2536 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2537 if (rs[Rs_answerbackstring])
2179 tt_write (
2180 (const unsigned char *)rs[Rs_answerbackstring], 2538 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2539 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2182 else 2540 else
2183 tt_write ((unsigned char *)VT100_ANS, 2541 tt_write ((unsigned char *)VT100_ANS,
2184 (unsigned int)STRLEN (VT100_ANS)); 2542 (unsigned int)STRLEN (VT100_ANS));
2185 break; 2543 break;
2186 case C0_BEL: /* bell */ 2544 case C0_BEL: /* bell */
2187 scr_bell (); 2545 scr_bell ();
2188 break; 2546 break;
2189 case C0_BS: /* backspace */ 2547 case C0_BS: /* backspace */
2205 break; 2563 break;
2206 case C0_SI: /* shift in - acs */ 2564 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2565 scr_charset_choose (0);
2208 break; 2566 break;
2209 2567
2568#ifdef EIGHT_BIT_CONTROLS
2210 // 8-bit controls 2569 // 8-bit controls
2211 case 0x90: /* DCS */ 2570 case 0x90: /* DCS */
2212 process_dcs_seq (); 2571 process_dcs_seq ();
2213 break; 2572 break;
2214 case 0x9b: /* CSI */ 2573 case 0x9b: /* CSI */
2215 process_csi_seq (); 2574 process_csi_seq ();
2216 break; 2575 break;
2217 case 0x9d: /* CSI */ 2576 case 0x9d: /* CSI */
2218 process_osc_seq (); 2577 process_osc_seq ();
2219 break; 2578 break;
2579#endif
2220 } 2580 }
2221} 2581}
2222/*}}} */ 2582/*}}} */
2223 2583
2224 2584
2342 break; 2702 break;
2343 2703
2344 /* 8.3.87: NEXT LINE */ 2704 /* 8.3.87: NEXT LINE */
2345 case C1_NEL: /* ESC E */ 2705 case C1_NEL: /* ESC E */
2346 { 2706 {
2347 unicode_t nlcr[] = { L'\n', L'\r' }; 2707 unicode_t nlcr[] = { C0_LF, C0_CR };
2348 scr_add_lines (nlcr, 1, 2); 2708 scr_add_lines (nlcr, 1, 2);
2349 } 2709 }
2350 break; 2710 break;
2351 2711
2352 /* kidnapped escape sequence: Should be 8.3.48 */ 2712 /* kidnapped escape sequence: Should be 8.3.48 */
2363 case C1_RI: /* ESC M */ 2723 case C1_RI: /* ESC M */
2364 scr_index (DN); 2724 scr_index (DN);
2365 break; 2725 break;
2366 2726
2367 /* 8.3.142: SINGLE-SHIFT TWO */ 2727 /* 8.3.142: SINGLE-SHIFT TWO */
2368 /*case C1_SS2: scr_single_shift (2); break; */ 2728 /*case C1_SS2: scr_single_shift (2); break; */
2369 2729
2370 /* 8.3.143: SINGLE-SHIFT THREE */ 2730 /* 8.3.143: SINGLE-SHIFT THREE */
2371 /*case C1_SS3: scr_single_shift (3); break; */ 2731 /*case C1_SS3: scr_single_shift (3); break; */
2372 2732
2373 /* 8.3.27: DEVICE CONTROL STRING */ 2733 /* 8.3.27: DEVICE CONTROL STRING */
2374 case C1_DCS: /* ESC P */ 2734 case C1_DCS: /* ESC P */
2375 process_dcs_seq (); 2735 process_dcs_seq ();
2376 break; 2736 break;
2391 process_osc_seq (); 2751 process_osc_seq ();
2392 break; 2752 break;
2393 2753
2394 /* 8.3.106: RESET TO INITIAL STATE */ 2754 /* 8.3.106: RESET TO INITIAL STATE */
2395 case 'c': 2755 case 'c':
2756 mbstate.reset ();
2396 scr_poweron (); 2757 scr_poweron ();
2397 scrollbar_show (1); 2758 scrollbar_show (1);
2398 break; 2759 break;
2399 2760
2400 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2761 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2412 2773
2413/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2774/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2414/* *INDENT-OFF* */ 2775/* *INDENT-OFF* */
2415enum { 2776enum {
2416 CSI_ICH = 0x40, 2777 CSI_ICH = 0x40,
2417 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2778 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 , 2779 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, 2780 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, 2781 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, 2782 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, 2783 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, */ 2798 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, [, \, ], ^, _, */ 2799 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, */ 2800 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, */ 2801 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, */ 2802 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, {, |, }, ~, */ 2803 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2443 }; 2804 };
2444/* *INDENT-ON* */ 2805/* *INDENT-ON* */
2445 2806
2446void 2807void
2447rxvt_term::process_csi_seq () 2808rxvt_term::process_csi_seq ()
2646 tt_printf ("\033[0n"); 3007 tt_printf ("\033[0n");
2647 break; 3008 break;
2648 case 6: /* CPR requested */ 3009 case 6: /* CPR requested */
2649 scr_report_position (); 3010 scr_report_position ();
2650 break; 3011 break;
2651#if defined (ENABLE_DISPLAY_ANSWER)
2652 case 7: /* unofficial extension */ 3012 case 7: /* unofficial extension */
3013 if (Options & Opt_insecure)
2653 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3014 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2654 break; 3015 break;
2655#endif
2656 case 8: /* unofficial extension */ 3016 case 8: /* unofficial extension */
2657 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3017 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2658 break; 3018 break;
2659 } 3019 }
2660 break; 3020 break;
2661 3021
2662 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3022 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2800 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3160 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2801 break; 3161 break;
2802 case 13: /* report window position */ 3162 case 13: /* report window position */
2803 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3163 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2804 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3164 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2805 -wattr.border_width, -wattr.border_width, 3165 -wattr.border_width, -wattr.border_width,
2806 &x, &y, &wdummy); 3166 &x, &y, &wdummy);
2807 tt_printf ("\033[3;%d;%dt", x, y); 3167 tt_printf ("\033[3;%d;%dt", x, y);
2808 break; 3168 break;
2809 case 14: /* report window size (pixels) */ 3169 case 14: /* report window size (pixels) */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3170 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2811 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3171 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2814 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3174 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2815 break; 3175 break;
2816 case 19: /* report window size (chars) */ 3176 case 19: /* report window size (chars) */
2817 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3177 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
2818 break; 3178 break;
2819#if 0 /* XXX: currently disabled due to security concerns */
2820 case 20: /* report icon label */ 3179 case 20: /* report icon label */
3180 if (Options & Opt_insecure)
3181 {
3182 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3183 XGetIconName (display->display, TermWin.parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3184 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
3185 }
2823 break; 3186 break;
2824 case 21: /* report window title */ 3187 case 21: /* report window title */
3188 if (Options & Opt_insecure)
3189 {
3190 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3191 XFetchName (display->display, TermWin.parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3192 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
3193 }
2827 break; 3194 break;
2828#endif
2829 } 3195 }
2830} 3196}
2831#endif 3197#endif
2832 3198
2833/*----------------------------------------------------------------------*/ 3199/*----------------------------------------------------------------------*/
2834/* 3200/*
2835 * get input up until STRING TERMINATOR (or BEL) 3201 * get input up until STRING TERMINATOR (or BEL)
2836 * ends_how is terminator used. returned input must be free ()d 3202 * ends_how is terminator used. returned input must be free()'d
2837 */ 3203 */
2838unsigned char * 3204unsigned char *
2839rxvt_term::get_to_st (unicode_t &ends_how) 3205rxvt_term::get_to_st (unicode_t &ends_how)
2840{ 3206{
2841 int seen_esc = 0; /* seen escape? */ 3207 unicode_t prev = 0, ch;
2842 unsigned int n = 0; 3208 unsigned int n = 0;
2843 unsigned char *s; 3209 unsigned char *s;
2844 unicode_t ch;
2845 unsigned char string[STRING_MAX]; 3210 unsigned char string[STRING_MAX];
2846 3211
2847 while ((ch = cmd_getc ())) 3212 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3213 {
2849 if (ch == C0_BEL
2850 || ch == CHAR_ST
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2852 break;
2853
2854 if (ch == C0_ESC) 3214 if (prev == C0_ESC)
2855 {
2856 seen_esc = 1;
2857 continue;
2858 } 3215 {
2859 else if (ch == '\t') 3216 if (ch == 0x5c) /* 7bit ST */
2860 ch = ' '; /* translate '\t' to space */ 3217 break;
2861 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3218 else
3219 return NULL;
3220 }
3221 else if (ch == C0_BEL || ch == CHAR_ST)
3222 break;
3223 else if (ch < 0x20)
2862 return NULL; /* other control character - exit */ 3224 return NULL; /* other control character - exit */
2863 3225
2864 if (n < sizeof (string) - 1) 3226 if (n >= sizeof (string) - 1)
3227 // stop at some sane length
3228 return NULL;
3229
3230 if (ch == C0_SYN)
3231 {
3232 string[n++] = cmd_get8 ();
3233 prev = 0;
3234 }
3235 else
2865 string[n++] = ch; 3236 string[n++] = prev = ch;
2866
2867 seen_esc = 0;
2868 } 3237 }
2869 3238
2870 string[n++] = '\0'; 3239 string[n++] = '\0';
2871 3240
2872 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3241 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2915 { 3284 {
2916 unsigned char *s = get_to_st (eh); 3285 unsigned char *s = get_to_st (eh);
2917 3286
2918 if (s) 3287 if (s)
2919 { 3288 {
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); 3289 process_xterm_seq (arg, (char *)s, eh);
2932
2933 free (s); 3290 free (s);
2934 } 3291 }
2935 } 3292 }
2936} 3293}
3294
3295void
3296rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3297{
3298 if (str[0] == '?' && !str[1])
3299 {
3300 if (Options & Opt_insecure)
3301 {
3302 unsigned short r, g, b;
3303 PixColorsFocused[color].get (display, r, g, b);
3304 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3305 }
3306 }
3307 else
3308 set_window_color (color, str);
3309}
3310
2937/* 3311/*
2938 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3312 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2939 * 0 = change iconName/title 3313 * 0 = change iconName/title
2940 * 1 = change iconName 3314 * 1 = change iconName
2941 * 2 = change title 3315 * 2 = change title
2942 * 4 = change color 3316 * 4 = change color
3317 * 10 = change fg color
3318 * 11 = change bg color
2943 * 12 = change text color 3319 * 12 = change text color
2944 * 13 = change mouse foreground color 3320 * 13 = change mouse foreground color
2945 * 17 = change highlight character colour 3321 * 17 = change highlight character colour
2946 * 18 = change bold character color 3322 * 18 = change bold character color
2947 * 19 = change underlined character color 3323 * 19 = change underlined character color
2948 * 46 = change logfile (not implemented) 3324 * 46 = change logfile (not implemented)
2949 * 50 = change font 3325 * 50 = change font
2950 * 3326 *
2951 * rxvt extensions: 3327 * rxvt extensions:
2952 * 10 = menu (may change in future)
2953 * 20 = bg pixmap 3328 * 20 = bg pixmap
2954 * 39 = change default fg color 3329 * 39 = change default fg color
2955 * 49 = change default bg color 3330 * 49 = change default bg color
2956 * 55 = dump scrollback buffer and all of screen 3331 * 55 = dump scrollback buffer and all of screen
2957 * 701 = change locale 3332 * 701 = change locale
2958 * 702 = find font 3333 * 702 = find font
3334 * 703 = menu
2959 */ 3335 */
2960void 3336void
2961rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3337rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2962{ 3338{
2963 int changed = 0; 3339 int changed = 0;
2964 int color; 3340 int color;
2965 char *buf, *name; 3341 char *buf, *name;
3342 bool query = str[0] == '?' && !str[1];
2966 3343
2967 assert (str != NULL); 3344 assert (str != NULL);
2968 switch (op) 3345 switch (op)
2969 { 3346 {
2970 case XTerm_name: 3347 case XTerm_name:
2974 set_icon_name (str); 3351 set_icon_name (str);
2975 break; 3352 break;
2976 case XTerm_title: 3353 case XTerm_title:
2977 set_title (str); 3354 set_title (str);
2978 break; 3355 break;
3356 case XTerm_property:
3357 if (str[0] == '?')
3358 {
3359 Atom prop = XInternAtom (display->display, str + 1, True);
3360 Atom actual_type;
3361 int actual_format;
3362 unsigned long nitems;
3363 unsigned long bytes_after;
3364 unsigned char *value = 0;
3365 const char *str = "";
3366
3367 if (prop
3368 && XGetWindowProperty (display->display, TermWin.parent[0],
3369 prop, 0, 1<<16, 0, AnyPropertyType,
3370 &actual_type, &actual_format,
3371 &nitems, &bytes_after, &value) == Success
3372 && actual_type != None
3373 && actual_format == 8)
3374 str = (const char *)(value);
3375
3376 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3377
3378 XFree (value);
3379 }
3380 else
3381 {
3382 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3383
3384 if (eq)
3385 {
3386 *eq = 0;
3387 XChangeProperty (display->display, TermWin.parent[0],
3388 display->atom (str), XA_STRING, 8,
3389 PropModeReplace, (unsigned char *)eq + 1,
3390 strlen (eq + 1));
3391 }
3392 else
3393 XDeleteProperty (display->display, TermWin.parent[0],
3394 display->atom (str));
3395 }
3396 break;
3397
2979 case XTerm_Color: 3398 case XTerm_Color:
2980 for (buf = (char *)str; buf && *buf;) 3399 for (buf = (char *)str; buf && *buf;)
2981 { 3400 {
2982 if ((name = STRCHR (buf, ';')) == NULL) 3401 if ((name = STRCHR (buf, ';')) == NULL)
2983 break; 3402 break;
2989 break; 3408 break;
2990 3409
2991 if ((buf = STRCHR (name, ';')) != NULL) 3410 if ((buf = STRCHR (name, ';')) != NULL)
2992 *buf++ = '\0'; 3411 *buf++ = '\0';
2993 3412
3413 if (name[0] == '?' && !name[1])
3414 {
3415 if (Options & Opt_insecure)
3416 {
3417 unsigned short r, g, b;
3418 PixColorsFocused[color + minCOLOR].get (display, r, g, b);
3419 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3420 }
3421 }
3422 else
2994 set_window_color (color + minCOLOR, name); 3423 set_window_color (color + minCOLOR, name);
2995 } 3424 }
3425 break;
3426 case XTerm_Color00:
3427 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3428 break;
3429 case XTerm_Color01:
3430 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2996 break; 3431 break;
2997#ifndef NO_CURSORCOLOR 3432#ifndef NO_CURSORCOLOR
2998 case XTerm_Color_cursor: 3433 case XTerm_Color_cursor:
2999 set_window_color (Color_cursor, str); 3434 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3000 break; 3435 break;
3001#endif 3436#endif
3002 case XTerm_Color_pointer: 3437 case XTerm_Color_pointer_fg:
3003 set_window_color (Color_pointer, str); 3438 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3439 break;
3440 case XTerm_Color_pointer_bg:
3441 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3004 break; 3442 break;
3005#ifndef NO_BOLD_UNDERLINE_REVERSE 3443#ifndef NO_BOLD_UNDERLINE_REVERSE
3006 case XTerm_Color_BD: 3444 case XTerm_Color_BD:
3007 set_window_color (Color_BD, str); 3445 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3008 break; 3446 break;
3009 case XTerm_Color_UL: 3447 case XTerm_Color_UL:
3010 set_window_color (Color_UL, str); 3448 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3011 break; 3449 break;
3012 case XTerm_Color_RV: 3450 case XTerm_Color_RV:
3013 set_window_color (Color_RV, str); 3451 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3014 break; 3452 break;
3015#endif 3453#endif
3016 3454
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: 3455 case XTerm_Pixmap:
3024 if (*str != ';') 3456 if (*str != ';')
3025 { 3457 {
3026#if XPM_BACKGROUND 3458#if XPM_BACKGROUND
3027 scale_pixmap (""); /* reset to default scaling */ 3459 scale_pixmap (""); /* reset to default scaling */
3050 set_window_color (Color_fg, str); 3482 set_window_color (Color_fg, str);
3051 break; 3483 break;
3052 case XTerm_restoreBG: 3484 case XTerm_restoreBG:
3053 set_window_color (Color_bg, str); 3485 set_window_color (Color_bg, str);
3054 break; 3486 break;
3487
3055 case XTerm_logfile: 3488 case XTerm_logfile:
3056 // TODO, when secure mode? 3489 // TODO, when secure mode?
3057 break; 3490 break;
3491
3058 case XTerm_font: 3492 case XTerm_font:
3493 if (query)
3494 {
3495 if (Options & Opt_insecure)
3496 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3497 TermWin.fontset->fontdesc
3498 ? TermWin.fontset->fontdesc
3499 : "",
3500 resp);
3501 }
3502 else
3059 change_font (str); 3503 change_font (str);
3060 break; 3504 break;
3505
3061#ifndef NO_FRILLS 3506#ifndef NO_FRILLS
3062 case XTerm_locale: 3507 case XTerm_locale:
3063 if (str[0] == '?' && !str[1]) 3508 if (query)
3064 tt_printf ("%-.250s\n", locale); 3509 {
3510 if (Options & Opt_insecure)
3511 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3512 }
3065 else 3513 else
3066 { 3514 {
3067 set_locale (str); 3515 set_locale (str);
3068# ifdef USE_XIM 3516# ifdef USE_XIM
3069 im_cb (); 3517 im_cb ();
3070# endif 3518# endif
3071 } 3519 }
3072 break; 3520 break;
3521
3073 case XTerm_findfont: 3522 case XTerm_findfont:
3523 if (Options & Opt_insecure)
3074 { 3524 {
3075 int fid = TermWin.fontset->find_font (atoi (str)); 3525 int fid = TermWin.fontset->find_font (atoi (str));
3076 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name); 3526 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3527 fid, (*TermWin.fontset)[fid]->name, resp);
3077 } 3528 }
3529 break;
3530#endif
3531
3532#ifdef MENUBAR
3533 case XTerm_Menu:
3534 if (Options & Opt_insecure)
3535 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3078 break; 3536 break;
3079#endif 3537#endif
3080#if 0 3538#if 0
3081 case XTerm_dumpscreen: /* no error notices */ 3539 case XTerm_dumpscreen: /* no error notices */
3082 { 3540 {
3083 int fd; 3541 int fd;
3084 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3542 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3085 { 3543 {
3086 scr_dump (fd); 3544 scr_dump (fd);
3087 close (fd); 3545 close (fd);
3088 } 3546 }
3175 // 1035 enable modifiers for alt, numlock NYI 3633 // 1035 enable modifiers for alt, numlock NYI
3176 // 1036 send ESC for meta keys NYI 3634 // 1036 send ESC for meta keys NYI
3177 // 1037 send DEL for keypad delete NYI 3635 // 1037 send DEL for keypad delete NYI
3178 { 1047, PrivMode_Screen }, 3636 { 1047, PrivMode_Screen },
3179 // 1048 save and restore cursor 3637 // 1048 save and restore cursor
3180 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3638 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3181 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3639 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3182 }; 3640 };
3183 3641
3184 if (nargs == 0) 3642 if (nargs == 0)
3185 return; 3643 return;
3204 3662
3205 /* extra handling for values with state unkept */ 3663 /* extra handling for values with state unkept */
3206 switch (arg[i]) 3664 switch (arg[i])
3207 { 3665 {
3208 case 1048: /* alternative cursor save */ 3666 case 1048: /* alternative cursor save */
3209 case 1049: 3667 if (Options & Opt_secondaryScreen)
3210 if (mode == 0) 3668 if (mode == 0)
3211 scr_cursor (RESTORE); 3669 scr_cursor (RESTORE);
3212 else if (mode == 1) 3670 else if (mode == 1)
3213 scr_cursor (SAVE); 3671 scr_cursor (SAVE);
3214 /* FALLTHROUGH */ 3672 break;
3215 } 3673 }
3216 3674
3217 if (state >= 0) 3675 if (state >= 0)
3218 /* extra handling for values with valid 0 or 1 state */ 3676 /* extra handling for values with valid 0 or 1 state */
3219 switch (arg[i]) 3677 switch (arg[i])
3243 scr_relative_origin (state); 3701 scr_relative_origin (state);
3244 break; 3702 break;
3245 case 7: /* autowrap */ 3703 case 7: /* autowrap */
3246 scr_autowrap (state); 3704 scr_autowrap (state);
3247 break; 3705 break;
3248 /* case 8: - auto repeat, can't do on a per window basis */ 3706 /* case 8: - auto repeat, can't do on a per window basis */
3249 case 9: /* X10 mouse reporting */ 3707 case 9: /* X10 mouse reporting */
3250 if (state) /* orthogonal */ 3708 if (state) /* orthogonal */
3251 PrivateModes &= ~PrivMode_MouseX11; 3709 PrivateModes &= ~PrivMode_MouseX11;
3252 break; 3710 break;
3253#ifdef menuBar_esc 3711#ifdef menuBar_esc
3267 break; 3725 break;
3268#endif 3726#endif
3269 case 25: /* visible/invisible cursor */ 3727 case 25: /* visible/invisible cursor */
3270 scr_cursor_visible (state); 3728 scr_cursor_visible (state);
3271 break; 3729 break;
3272 /* case 35: - shift keys */ 3730 /* case 35: - shift keys */
3273 /* case 40: - 80 <--> 132 mode */ 3731 /* case 40: - 80 <--> 132 mode */
3274 case 47: /* secondary screen */ 3732 case 47: /* secondary screen */
3275 scr_change_screen (state); 3733 scr_change_screen (state);
3276 break; 3734 break;
3277 /* case 66: - application key pad */ 3735 /* case 66: - application key pad */
3278 /* case 67: - backspace key */ 3736 /* case 67: - backspace key */
3279 case 1000: /* X11 mouse reporting */ 3737 case 1000: /* X11 mouse reporting */
3280 if (state) /* orthogonal */ 3738 if (state) /* orthogonal */
3281 PrivateModes &= ~PrivMode_MouseX10; 3739 PrivateModes &= ~PrivMode_MouseX10;
3282 break; 3740 break;
3283#if 0 3741#if 0
3294 if (state) 3752 if (state)
3295 Options |= Opt_scrollTtyKeypress; 3753 Options |= Opt_scrollTtyKeypress;
3296 else 3754 else
3297 Options &= ~Opt_scrollTtyKeypress; 3755 Options &= ~Opt_scrollTtyKeypress;
3298 break; 3756 break;
3299 case 1047: /* secondary screen w/ clearing */ 3757 case 1047: /* secondary screen w/ clearing last */
3300 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3758 if (Options & Opt_secondaryScreen)
3301 if (current_screen != PRIMARY) 3759 if (current_screen != PRIMARY)
3302 scr_erase_screen (2); 3760 scr_erase_screen (2);
3303
3304 scr_change_screen (state); 3761 scr_change_screen (state);
3305 /* FALLTHROUGH */ 3762 break;
3763 case 1049: /* secondary screen w/ clearing first */
3764 scr_change_screen (state);
3765 if (Options & Opt_secondaryScreen)
3766 if (current_screen != PRIMARY)
3767 scr_erase_screen (2);
3768 break;
3306 default: 3769 default:
3307 break; 3770 break;
3308 } 3771 }
3309 } 3772 }
3310} 3773}
3333 rendset = 0, rendstyle = ~RS_None; 3796 rendset = 0, rendstyle = ~RS_None;
3334 break; 3797 break;
3335 case 1: 3798 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 3799 rendset = 1, rendstyle = RS_Bold;
3337 break; 3800 break;
3801 //case 2: // faint or second colour
3338 case 4: 3802 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 3803 rendset = 1, rendstyle = RS_Uline;
3340 break; 3804 break;
3341 case 5: 3805 case 5: // slowly blinking
3806 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 3807 rendset = 1, rendstyle = RS_Blink;
3343 break; 3808 break;
3809 //case 6: // scoansi light background
3344 case 7: 3810 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 3811 rendset = 1, rendstyle = RS_RVid;
3346 break; 3812 break;
3347 case 8: 3813 case 8:
3348 // invisible. NYI 3814 // invisible. NYI
3349 break; 3815 break;
3816 //case 9: // crossed out
3817 //case 10: // scoansi acs off, primary font
3818 //case 11: // scoansi acs on, first alt font
3819 //case 12: // scoansi acs on, |0x80, second alt font
3820 //...
3821 //case 19: // ninth alt font
3822 //case 20: // gothic
3823 case 21: // disable bold, faint
3824 rendset = 0, rendstyle = RS_Bold;
3825 break;
3350 case 22: 3826 case 22:
3351 rendset = 0, rendstyle = RS_Bold; 3827 rendset = 0, rendstyle = RS_Bold;
3352 break; 3828 break;
3829 //case 23: disable italic
3353 case 24: 3830 case 24:
3354 rendset = 0, rendstyle = RS_Uline; 3831 rendset = 0, rendstyle = RS_Uline;
3355 break; 3832 break;
3356 case 25: 3833 case 25:
3357 rendset = 0, rendstyle = RS_Blink; 3834 rendset = 0, rendstyle = RS_Blink;
3358 break; 3835 break;
3359 case 27: 3836 case 27:
3360 rendset = 0, rendstyle = RS_RVid; 3837 rendset = 0, rendstyle = RS_RVid;
3361 break; 3838 break;
3362 case 28:
3363 // visible. NYI 3839 //case 28: // visible. NYI
3364 break; 3840 //case 29: // not crossed-out
3365 } 3841 }
3366 3842
3367 if (rendset != -1) 3843 if (rendset != -1)
3368 { 3844 {
3369 scr_rendition (rendset, rendstyle); 3845 scr_rendition (rendset, rendstyle);
3446 } 3922 }
3447 } 3923 }
3448} 3924}
3449/*}}} */ 3925/*}}} */
3450 3926
3451/*{{{ process Rob Nation's own graphics mode sequences */ 3927/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3452void 3928void
3453rxvt_term::process_graphics () 3929rxvt_term::process_graphics ()
3454{ 3930{
3455 unicode_t ch, cmd = cmd_getc (); 3931 unicode_t ch, cmd = cmd_getc ();
3456 3932

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines