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.412 by ayin, Sun Feb 17 11:13:11 2008 UTC vs.
Revision 1.453 by sf-exg, Wed Aug 18 17:45:42 2010 UTC

… …
162 162
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hex 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
… …
282} 288}
283 289
284static int 290static int
285hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
286{ 292{
287 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
290 { 296 {
291 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
292 298
… …
416 */ 422 */
417 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
420 426
421 if (numlock_state || (ev.state & ModNumLockMask))
422 {
423 numlock_state = (ev.state & ModNumLockMask);
424 set_privmode (PrivMode_aplKP, !numlock_state);
425 }
426
427 kbuf[0] = 0; 427 kbuf[0] = 0;
428 428
429#ifdef USE_XIM 429#ifdef USE_XIM
430 if (Input_Context) 430 if (Input_Context)
431 { 431 {
… …
505#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
506 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
507#else 507#else
508 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
509#endif 509#endif
510 max_it (lnsppg, 1);
511
510 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
511 { 513 {
512 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
513 return; 515 return;
514 } 516 }
… …
579 } 581 }
580 } 582 }
581 583
582#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 585 // ISO 14755 support
584 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 587 {
586 int hv; 588 int hv;
587 589
588 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
… …
619 scr_overlay_off (); 621 scr_overlay_off ();
620# endif 622# endif
621 iso14755buf = 0; 623 iso14755buf = 0;
622 } 624 }
623 } 625 }
626 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
627 { 630 {
628 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 632# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
644 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645 { 648 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1; 650 unsigned int newlen = 1;
648 651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
649 switch (translate_keypad (keysym, kp)) 655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
650 { 658 {
651#ifndef NO_BACKSPACE_KEY 659#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace: 660 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace) 661 if (priv_modes & PrivMode_HaveBackSpace)
654 { 662 {
… …
763 771
764 default: 772 default:
765 { 773 {
766 int param = map_function_key (keysym); 774 int param = map_function_key (keysym);
767 if (param > 0) 775 if (param > 0)
776 {
768 sprintf (kbuf,"\033[%d~", param); 777 int n = sprintf (kbuf,"\033[%d~", param);
778 /*
779 * pass Shift/Control indicators for function keys ending with `~'
780 *
781 * eg,
782 * Prior = "ESC[5~"
783 * Shift+Prior = "ESC[5$"
784 * Ctrl+Prior = "ESC[5^"
785 * Ctrl+Shift+Prior = "ESC[5@"
786 */
787 kbuf[n-1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
788 }
769 else 789 else
770 newlen = 0; 790 newlen = 0;
771 } 791 }
772 break; 792 break;
773 } 793 }
… …
824 view_start = 0; 844 view_start = 0;
825 want_refresh = 1; 845 want_refresh = 1;
826 } 846 }
827 847
828 /* 848 /*
829 * these modifications only affect the static keybuffer
830 * pass Shift/Control indicators for function keys ending with `~'
831 *
832 * eg,
833 * Prior = "ESC[5~"
834 * Shift+Prior = "ESC[5$"
835 * Ctrl+Prior = "ESC[5^"
836 * Ctrl+Shift+Prior = "ESC[5@"
837 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>). 849 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
838 */ 850 */
839 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
840 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
841 851
842 /* escape prefix */ 852 /* escape prefix */
843 if (meta 853 if (meta
844#ifdef META8_OPTION 854#ifdef META8_OPTION
845 && meta_char == C0_ESC 855 && meta_char == C0_ESC
… …
1015 } 1025 }
1016 while (row < end_row); 1026 while (row < end_row);
1017 } 1027 }
1018 1028
1019 scr_refresh (); 1029 scr_refresh ();
1020 scrollbar_show (1); 1030 scrollBar.show (1);
1021#ifdef USE_XIM 1031#ifdef USE_XIM
1022 IMSendSpot (); 1032 IMSendSpot ();
1023#endif 1033#endif
1024 } 1034 }
1025 1035
1026 display->flush (); 1036 display->flush ();
1027} 1037}
1028 1038
1029/* checks wether a refresh is requested and starts the refresh timer */ 1039/* checks whether a refresh is requested and starts the refresh timer */
1030void 1040void
1031rxvt_term::refresh_check () 1041rxvt_term::refresh_check ()
1032{ 1042{
1033 if (want_refresh && !flush_ev.is_active ()) 1043 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1044 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1127 { 1137 {
1128 // this should really be sched_yield(), but the linux guys thought 1138 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1139 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is 1140 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1141 // allowed by the sus... as is returning ENOSYS.
1142 // since the linux guys additionally thought that breaking the only
1143 // known workaround against their unusable sched_yield hack is cool,
1144 // we just nanosleep a bit and hope for the best.
1132 1145
1133 struct timespec ts = { 0, 0 }; 1146 struct timespec ts = { 0, 1000 };
1134 nanosleep (&ts, 0); 1147 nanosleep (&ts, 0);
1135 1148
1136 w.stop (); 1149 w.stop ();
1137 } 1150 }
1138 1151
… …
1188{ 1201{
1189 make_current (); 1202 make_current ();
1190 1203
1191 if (revents & ev::READ) 1204 if (revents & ev::READ)
1192 // loop, but don't allow a single term to monopolize us 1205 // loop, but don't allow a single term to monopolize us
1193 while (pty_fill ()) 1206 for (int i = CBUFCNT; i-- && pty_fill (); )
1194 if (cmd_parse ()) 1207 cmd_parse ();
1195 break;
1196 1208
1197 if (revents & ev::WRITE) 1209 if (revents & ev::WRITE)
1198 pty_write (); 1210 pty_write ();
1199 1211
1200 refresh_check (); 1212 refresh_check ();
… …
1459 selection_property (ev.xproperty.window, ev.xproperty.atom); 1471 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460 1472
1461 break; 1473 break;
1462 1474
1463 case SelectionClear: 1475 case SelectionClear:
1464 selection_clear (); 1476 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465 break; 1477 break;
1466 1478
1467 case SelectionNotify: 1479 case SelectionNotify:
1468 if (selection_wait == Sel_normal) 1480 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1481 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1473 selection_send (ev.xselectionrequest); 1485 selection_send (ev.xselectionrequest);
1474 break; 1486 break;
1475 1487
1476 case MapNotify: 1488 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP 1489#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a 1490 /* This is needed specifically to fix the case of no window manager or a
1479 * non-reparenting window manager. In those cases we never get first 1491 * non-reparenting window manager. In those cases we never get first
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1492 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does 1493 * care of multiplicity of ConfigureNotify events arriving while WM does
1482 * reparenting. 1494 * reparenting.
1483 * We should not render background immidiately, as there could be several 1495 * We should not render background immediately, as there could be several
1484 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1496 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1485 * by scheduling background redraw as soon as we can, but giving a short 1497 * by scheduling background redraw as soon as we can, but giving a short
1486 * bit of time for ConfigureNotifies to arrive. 1498 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all 1499 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results. 1500 * of ConfigureNotifys for the best results.
… …
1536 ; 1548 ;
1537 1549
1538 if (scrollBar.state && ev.xany.window == scrollBar.win) 1550 if (scrollBar.state && ev.xany.window == scrollBar.win)
1539 { 1551 {
1540 scrollBar.state = STATE_IDLE; 1552 scrollBar.state = STATE_IDLE;
1541 scrollbar_show (0); 1553 scrollBar.show (0);
1542 } 1554 }
1543 } 1555 }
1544 break; 1556 break;
1545 1557
1546 case MotionNotify: 1558 case MotionNotify:
… …
1645 &unused_root, &unused_child, 1657 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1658 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1659 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1660 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1661 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1650 scrollbar_size ()); 1662 scrollBar.size ());
1651 want_refresh = 1; 1663 want_refresh = 1;
1652 scrollbar_show (1); 1664 scrollBar.show (1);
1653 } 1665 }
1654 break; 1666 break;
1655 } 1667 }
1656 1668
1657#if defined(CURSOR_BLINK) 1669#if defined(CURSOR_BLINK)
… …
1682#endif 1694#endif
1683 1695
1684 refresh_check (); 1696 refresh_check ();
1685} 1697}
1686 1698
1699#if ENABLE_FRILLS
1700void
1701rxvt_term::set_urgency (bool enable)
1702{
1703 if (enable == urgency_hint)
1704 return;
1705
1706 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1707 {
1708 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1709 XSetWMHints (dpy, parent[0], h);
1710 urgency_hint = enable;
1711 }
1712}
1713#endif
1714
1687void 1715void
1688rxvt_term::focus_in () 1716rxvt_term::focus_in ()
1689{ 1717{
1690 if (!focus) 1718 if (!focus)
1691 { 1719 {
1692 focus = 1; 1720 focus = 1;
1693 want_refresh = 1; 1721 want_refresh = 1;
1694
1695 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696 1722
1697#if USE_XIM 1723#if USE_XIM
1698 if (Input_Context != NULL) 1724 if (Input_Context != NULL)
1699 { 1725 {
1700 IMSetPosition (); 1726 IMSetPosition ();
… …
1712 scr_recolour (); 1738 scr_recolour ();
1713 } 1739 }
1714#endif 1740#endif
1715#if ENABLE_FRILLS 1741#if ENABLE_FRILLS
1716 if (option (Opt_urgentOnBell)) 1742 if (option (Opt_urgentOnBell))
1717 { 1743 set_urgency (0);
1718 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1719 {
1720 h->flags &= ~XUrgencyHint;
1721 XSetWMHints (dpy, parent[0], h);
1722 }
1723 }
1724#endif 1744#endif
1745
1746 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1725 } 1747 }
1726} 1748}
1727 1749
1728void 1750void
1729rxvt_term::focus_out () 1751rxvt_term::focus_out ()
… …
1731 if (focus) 1753 if (focus)
1732 { 1754 {
1733 focus = 0; 1755 focus = 0;
1734 want_refresh = 1; 1756 want_refresh = 1;
1735 1757
1736 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1758#if ENABLE_FRILLS
1737 1759 if (option (Opt_urgentOnBell))
1760 set_urgency (0);
1761#endif
1738#if ENABLE_FRILLS || ISO_14755 1762#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf) 1763 if (iso14755buf)
1740 { 1764 {
1741 iso14755buf = 0; 1765 iso14755buf = 0;
1742# if ISO_14755 1766# if ISO_14755
… …
1759 { 1783 {
1760 pix_colors = pix_colors_unfocused; 1784 pix_colors = pix_colors_unfocused;
1761 scr_recolour (); 1785 scr_recolour ();
1762 } 1786 }
1763#endif 1787#endif
1788
1789 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764 } 1790 }
1765} 1791}
1766 1792
1767void 1793void
1768rxvt_term::update_fade_color (unsigned int idx) 1794rxvt_term::update_fade_color (unsigned int idx)
… …
1845 /* save the xbutton state (for ButtonRelease) */ 1871 /* save the xbutton state (for ButtonRelease) */
1846 MEvent.state = ev.state; 1872 MEvent.state = ev.state;
1847#ifdef MOUSE_REPORT_DOUBLECLICK 1873#ifdef MOUSE_REPORT_DOUBLECLICK
1848 if (ev.button == MEvent.button && clickintime) 1874 if (ev.button == MEvent.button && clickintime)
1849 { 1875 {
1850 /* same button, within alloted time */ 1876 /* same button, within allowed time */
1851 MEvent.clicks++; 1877 MEvent.clicks++;
1852 1878
1853 if (MEvent.clicks > 1) 1879 if (MEvent.clicks > 1)
1854 { 1880 {
1855 /* only report double clicks */ 1881 /* only report double clicks */
… …
2010 } 2036 }
2011 2037
2012 if (scrollBar.style == R_SB_XTERM 2038 if (scrollBar.style == R_SB_XTERM
2013 || scrollbar_above_slider (ev.y) 2039 || scrollbar_above_slider (ev.y)
2014 || scrollbar_below_slider (ev.y)) 2040 || scrollbar_below_slider (ev.y))
2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2041 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2016 2042
2017 scrollBar.state = STATE_MOTION; 2043 scrollBar.state = STATE_MOTION;
2018 break; 2044 break;
2019 2045
2020 case Button1: 2046 case Button1:
… …
2043 else 2069 else
2044 { 2070 {
2045 scr_page ((ev.button == Button1 ? DN : UP), 2071 scr_page ((ev.button == Button1 ? DN : UP),
2046 (nrow 2072 (nrow
2047 * scrollbar_position (ev.y) 2073 * scrollbar_position (ev.y)
2048 / scrollbar_size ())); 2074 / scrollBar.size ()));
2049 } 2075 }
2050 2076
2051 break; 2077 break;
2052 } 2078 }
2053 } 2079 }
… …
2066 reportmode = !! (priv_modes & PrivMode_mouse_report); 2092 reportmode = !! (priv_modes & PrivMode_mouse_report);
2067 2093
2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2094 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2069 { 2095 {
2070 scrollBar.state = STATE_IDLE; 2096 scrollBar.state = STATE_IDLE;
2071 scrollbar_show (0); 2097 scrollBar.show (0);
2072 } 2098 }
2073 2099
2074#ifdef SELECTION_SCROLLING 2100#ifdef SELECTION_SCROLLING
2075 sel_scroll_ev.stop(); 2101 sel_scroll_ev.stop();
2076#endif 2102#endif
… …
2126 selection_make (ev.time); 2152 selection_make (ev.time);
2127 break; 2153 break;
2128 2154
2129 case Button2: 2155 case Button2:
2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2156 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2157 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132 break; 2158 break;
2133 2159
2134#ifdef MOUSE_WHEEL 2160#ifdef MOUSE_WHEEL
2135 case Button4: 2161 case Button4:
2136 case Button5: 2162 case Button5:
… …
2159 } 2185 }
2160 else 2186 else
2161# endif 2187# endif
2162 { 2188 {
2163 scr_page (v, i); 2189 scr_page (v, i);
2164 scrollbar_show (1); 2190 scrollBar.show (1);
2165 } 2191 }
2166 } 2192 }
2167 break; 2193 break;
2168#endif 2194#endif
2169 } 2195 }
2170 } 2196 }
2171} 2197}
2172 2198
2173/*}}} */ 2199/*}}} */
2174 2200
2175bool 2201void
2176rxvt_term::cmd_parse () 2202rxvt_term::cmd_parse ()
2177{ 2203{
2178 bool flag = false;
2179 wchar_t ch = NOCHAR; 2204 wchar_t ch = NOCHAR;
2180 char *seq_begin; // remember start of esc-sequence here 2205 char *seq_begin; // remember start of esc-sequence here
2181 2206
2182 for (;;) 2207 for (;;)
2183 { 2208 {
2184 if (ch == NOCHAR) 2209 if (expect_false (ch == NOCHAR))
2185 { 2210 {
2186 seq_begin = cmdbuf_ptr; 2211 seq_begin = cmdbuf_ptr;
2187 ch = next_char (); 2212 ch = next_char ();
2188 2213
2189 if (ch == NOCHAR) 2214 if (ch == NOCHAR)
2190 break; 2215 break;
2191 } 2216 }
2192 2217
2193 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2218 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2194 { 2219 {
2195 if (!seen_input) 2220 if (expect_false (!seen_input))
2196 { 2221 {
2197 seen_input = 1; 2222 seen_input = 1;
2198 // many badly-written programs (e.g. jed) contain a race condition: 2223 // many badly-written programs (e.g. jed) contain a race condition:
2199 // they first read the screensize and then install a SIGWINCH handler. 2224 // they first read the screensize and then install a SIGWINCH handler.
2200 // some window managers resize the window early, and these programs 2225 // some window managers resize the window early, and these programs
… …
2213 wchar_t *str = buf; 2238 wchar_t *str = buf;
2214 wchar_t *eol = str + min (ncol, UBUFSIZ); 2239 wchar_t *eol = str + min (ncol, UBUFSIZ);
2215 2240
2216 for (;;) 2241 for (;;)
2217 { 2242 {
2218 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2243 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2219 break; 2244 break;
2220 2245
2221 *str++ = ch; 2246 *str++ = ch;
2222 2247
2223 if (ch == C0_LF || str >= eol) 2248 if (expect_false (ch == C0_LF || str >= eol))
2224 { 2249 {
2225 if (ch == C0_LF) 2250 if (ch == C0_LF)
2226 nlines++; 2251 nlines++;
2227 2252
2228 refresh_count++; 2253 refresh_count++;
… …
2277 * What the heck we'll cheat and only refresh less than every page-full. 2302 * What the heck we'll cheat and only refresh less than every page-full.
2278 * if skipScroll is enabled. 2303 * if skipScroll is enabled.
2279 */ 2304 */
2280 if (refreshnow) 2305 if (refreshnow)
2281 { 2306 {
2282 flag = true;
2283 scr_refresh (); 2307 scr_refresh ();
2284 want_refresh = 1; 2308 want_refresh = 1;
2285 } 2309 }
2286
2287 } 2310 }
2288 else 2311 else
2289 { 2312 {
2290 try 2313 try
2291 { 2314 {
… …
2299 } 2322 }
2300 2323
2301 ch = NOCHAR; 2324 ch = NOCHAR;
2302 } 2325 }
2303 } 2326 }
2304
2305 return flag;
2306} 2327}
2307 2328
2308// read the next character 2329// read the next character
2309wchar_t 2330wchar_t
2310rxvt_term::next_char () NOTHROW 2331rxvt_term::next_char () NOTHROW
2311{ 2332{
2312 while (cmdbuf_ptr < cmdbuf_endp) 2333 while (cmdbuf_ptr < cmdbuf_endp)
2313 { 2334 {
2314 // assume 7-bit to be ascii ALWAYS 2335 // assume 7-bit to be ascii ALWAYS
2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2336 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2316 return *cmdbuf_ptr++; 2337 return *cmdbuf_ptr++;
2317 2338
2318 wchar_t wc; 2339 wchar_t wc;
2319 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2340 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2320 2341
… …
2324 cmdbuf_ptr = cmdbuf_endp; 2345 cmdbuf_ptr = cmdbuf_endp;
2325 break; 2346 break;
2326 } 2347 }
2327 2348
2328 if (len == (size_t)-1) 2349 if (len == (size_t)-1)
2350 {
2351 mbstate.reset (); // reset now undefined conversion state
2329 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2352 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2353 }
2330 2354
2331 // assume wchar == unicode 2355 // assume wchar == unicode
2332 cmdbuf_ptr += len; 2356 cmdbuf_ptr += len;
2333 return wc & UNICODE_MASK; 2357 return wc & UNICODE_MASK;
2334 } 2358 }
… …
2378/*----------------------------------------------------------------------*/ 2402/*----------------------------------------------------------------------*/
2379#ifdef PRINTPIPE 2403#ifdef PRINTPIPE
2380FILE * 2404FILE *
2381rxvt_term::popen_printer () 2405rxvt_term::popen_printer ()
2382{ 2406{
2383 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2407 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2384 2408
2385 if (stream == NULL) 2409 if (stream == NULL)
2386 rxvt_warn ("can't open printer pipe, not printing.\n"); 2410 rxvt_warn ("can't open printer pipe, not printing.\n");
2387 2411
2388 return stream; 2412 return stream;
… …
2399 * simulate attached vt100 printer 2423 * simulate attached vt100 printer
2400 */ 2424 */
2401void 2425void
2402rxvt_term::process_print_pipe () 2426rxvt_term::process_print_pipe ()
2403{ 2427{
2404 int done; 2428 FILE *fd = popen_printer ();
2405 FILE *fd;
2406 2429
2407 if ((fd = popen_printer ()) == NULL) 2430 if (!fd)
2408 return; 2431 return;
2409 2432
2410 /* 2433 /*
2411 * Send all input to the printer until either ESC[4i or ESC[?4i 2434 * Send all input to the printer until either ESC[4i or ESC[?4i
2412 * is received. 2435 * is received.
2413 */ 2436 */
2414 for (done = 0; !done;) 2437 for (int done = 0; !done; )
2415 { 2438 {
2416 unsigned char buf[8]; 2439 unsigned char buf[8];
2417 unicode_t ch; 2440 unicode_t ch;
2418 unsigned int i, len; 2441 unsigned int i, len;
2419 2442
… …
2677 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2700 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2678 case C1_SCI: /* ESC Z */ 2701 case C1_SCI: /* ESC Z */
2679 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2702 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2680 break; /* steal obsolete ESC [ c */ 2703 break; /* steal obsolete ESC [ c */
2681 2704
2682 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2705 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2683 case C1_CSI: /* ESC [ */ 2706 case C1_CSI: /* ESC [ */
2684 process_csi_seq (); 2707 process_csi_seq ();
2685 break; 2708 break;
2686 2709
2687 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2710 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2688 case C1_OSC: /* ESC ] */ 2711 case C1_OSC: /* ESC ] */
2689 process_osc_seq (); 2712 process_osc_seq ();
2690 break; 2713 break;
2691 2714
2692 /* 8.3.106: RESET TO INITIAL STATE */ 2715 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2693 case 'c': 2716 case 'c':
2694 mbstate.reset (); 2717 mbstate.reset ();
2695 scr_poweron (); 2718 scr_poweron ();
2696 scrollbar_show (1); 2719 scrollBar.show (1);
2697 break; 2720 break;
2698 2721
2699 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2722 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2700 case 'n': 2723 case 'n':
2701 scr_charset_choose (2); 2724 scr_charset_choose (2);
… …
2752 2775
2753 nargs = 0; 2776 nargs = 0;
2754 2777
2755 priv = 0; 2778 priv = 0;
2756 ch = cmd_getc (); 2779 ch = cmd_getc ();
2757 if (ch >= '<' && ch <= '?') 2780 if ((ch >= '<' && ch <= '?') || ch == '!')
2758 { 2781 {
2759 /* '<' '=' '>' '?' */ 2782 /* '<' '=' '>' '?' '!' */
2760 priv = ch; 2783 priv = ch;
2761 ch = cmd_getc (); 2784 ch = cmd_getc ();
2762 } 2785 }
2763 2786
2764 /* read any numerical arguments */ 2787 /* read any numerical arguments */
… …
2818 2841
2819 case '?': 2842 case '?':
2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2843 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2821 process_terminal_mode (ch, priv, nargs, arg); 2844 process_terminal_mode (ch, priv, nargs, arg);
2822 break; 2845 break;
2846
2847 case '!':
2848 if (ch == CSI_70)
2849 {
2850 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2851 scr_soft_reset ();
2852
2853 static const int pm_h[] = { 7, 25 };
2854 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2855
2856 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2857 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2823 } 2858 }
2859 break;
2860 }
2861
2824 return; 2862 return;
2825 } 2863 }
2826 2864
2827 switch (ch) 2865 switch (ch)
2828 { 2866 {
… …
3195 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3233 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3196 */ 3234 */
3197void 3235void
3198rxvt_term::process_dcs_seq () 3236rxvt_term::process_dcs_seq ()
3199{ 3237{
3200 char *s;
3201 unicode_t eh;
3202
3203 /* 3238 /*
3204 * Not handled yet 3239 * Not handled yet
3205 */ 3240 */
3241
3242 unicode_t eh;
3206 s = get_to_st (eh); 3243 char *s = get_to_st (eh);
3207 if (s) 3244 if (s)
3208 free (s); 3245 free (s);
3209 3246
3210 return; 3247 return;
3211} 3248}
… …
3215 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3252 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3216 */ 3253 */
3217void 3254void
3218rxvt_term::process_osc_seq () 3255rxvt_term::process_osc_seq ()
3219{ 3256{
3220 unicode_t ch, eh;
3221 int arg; 3257 int arg;
3222 3258
3223 ch = cmd_getc (); 3259 unicode_t ch = cmd_getc ();
3224 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3260 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3225 arg = arg * 10 + (ch - '0'); 3261 arg = arg * 10 + (ch - '0');
3226 3262
3227 if (ch == ';') 3263 if (ch == ';')
3228 { 3264 {
3265 unicode_t eh;
3229 char *s = get_to_st (eh); 3266 char *s = get_to_st (eh);
3230 3267
3231 if (s) 3268 if (s)
3232 { 3269 {
3233 process_xterm_seq (arg, s, eh); 3270 process_xterm_seq (arg, s, eh);
… …
3257 3294
3258/* 3295/*
3259 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3296 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3260 */ 3297 */
3261void 3298void
3262rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3299rxvt_term::process_xterm_seq (int op, char *str, char resp)
3263{ 3300{
3264 int color; 3301 int color;
3265 char *buf, *name; 3302 char *buf, *name;
3266 bool query = str[0] == '?' && !str[1]; 3303 bool query = str[0] == '?' && !str[1];
3267 int saveop = op; 3304 int saveop = op;
… …
3308 3345
3309 XFree (value); 3346 XFree (value);
3310 } 3347 }
3311 else 3348 else
3312 { 3349 {
3313 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3350 char *eq = strchr (str, '=');
3314 3351
3315 if (eq) 3352 if (eq)
3316 { 3353 {
3317 *eq = 0; 3354 *eq = 0;
3318 set_utf8_property (display->atom (str), eq + 1); 3355 set_utf8_property (display->atom (str), eq + 1);
… …
3358 process_color_seq (op, Color_pointer_fg, str, resp); 3395 process_color_seq (op, Color_pointer_fg, str, resp);
3359 break; 3396 break;
3360 case XTerm_Color_pointer_bg: 3397 case XTerm_Color_pointer_bg:
3361 process_color_seq (op, Color_pointer_bg, str, resp); 3398 process_color_seq (op, Color_pointer_bg, str, resp);
3362 break; 3399 break;
3400#ifdef OPTION_HC
3401 case XTerm_Color_HC:
3402 process_color_seq (op, Color_HC, str, resp);
3403 break;
3404 case XTerm_Color_HTC:
3405 process_color_seq (op, Color_HTC, str, resp);
3406 break;
3407#endif
3363#ifndef NO_BOLD_UNDERLINE_REVERSE 3408#ifndef NO_BOLD_UNDERLINE_REVERSE
3364 case XTerm_Color_RV:
3365 process_color_seq (op, Color_RV, str, resp);
3366 break;
3367 case Rxvt_Color_BD:
3368 case URxvt_Color_BD: 3409 case URxvt_Color_BD:
3369 process_color_seq (op, Color_BD, str, resp); 3410 process_color_seq (op, Color_BD, str, resp);
3370 break; 3411 break;
3371 case Rxvt_Color_UL:
3372 case URxvt_Color_UL: 3412 case URxvt_Color_UL:
3373 process_color_seq (op, Color_UL, str, resp); 3413 process_color_seq (op, Color_UL, str, resp);
3374 break; 3414 break;
3375 case URxvt_Color_IT: 3415 case URxvt_Color_IT:
3376 process_color_seq (op, Color_IT, str, resp); 3416 process_color_seq (op, Color_IT, str, resp);
3377 break; 3417 break;
3378#endif 3418#endif
3419 case URxvt_Color_border:
3420 process_color_seq (op, Color_border, str, resp);
3421 break;
3379#if ENABLE_TRANSPARENCY 3422#if ENABLE_TRANSPARENCY
3380 case URxvt_Color_tint: 3423 case URxvt_Color_tint:
3381 process_color_seq (op, Color_tint, str, resp); 3424 process_color_seq (op, Color_tint, str, resp);
3382 { 3425 {
3383 bool changed = false; 3426 bool changed = false;
… …
3398 case Rxvt_Pixmap: 3441 case Rxvt_Pixmap:
3399 if (!strcmp (str, "?")) 3442 if (!strcmp (str, "?"))
3400 { 3443 {
3401 char str[256]; 3444 char str[256];
3402 3445
3403 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3446 sprintf (str, "[%dx%d+%d+%d]",
3404 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3447 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3405 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3448 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3406 process_xterm_seq (XTerm_title, str, CHAR_ST); 3449 process_xterm_seq (XTerm_title, str, CHAR_ST);
3407 } 3450 }
3408 else 3451 else
… …
3507 break; 3550 break;
3508#endif 3551#endif
3509 3552
3510#if ENABLE_PERL 3553#if ENABLE_PERL
3511 case URxvt_perl: 3554 case URxvt_perl:
3512 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3555 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3513 ; // no responses yet
3514 break; 3556 break;
3515#endif 3557#endif
3516 } 3558 }
3517} 3559}
3518/*----------------------------------------------------------------------*/ 3560/*----------------------------------------------------------------------*/
… …
3541 { 3583 {
3542 if (mode == 'r') 3584 if (mode == 'r')
3543 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3585 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3544 else 3586 else
3545 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3587 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3588
3546 set_privmode (bit, state); 3589 set_privmode (bit, state);
3547 } 3590 }
3548 3591
3549 return state; 3592 return state;
3550} 3593}
… …
3559 static const struct 3602 static const struct
3560 { 3603 {
3561 const int argval; 3604 const int argval;
3562 const unsigned long bit; 3605 const unsigned long bit;
3563 } argtopriv[] = { 3606 } argtopriv[] = {
3564 { 1, PrivMode_aplCUR }, 3607 { 1, PrivMode_aplCUR }, // DECCKM
3565 { 2, PrivMode_vt52 }, 3608 { 2, PrivMode_vt52 },
3566 { 3, PrivMode_132 }, 3609 { 3, PrivMode_132 }, // DECCOLM
3567 { 4, PrivMode_smoothScroll }, 3610 { 4, PrivMode_smoothScroll }, // DECSCLM
3568 { 5, PrivMode_rVideo }, 3611 { 5, PrivMode_rVideo }, // DECSCNM
3569 { 6, PrivMode_relOrigin }, 3612 { 6, PrivMode_relOrigin }, // DECOM
3570 { 7, PrivMode_Autowrap }, 3613 { 7, PrivMode_Autowrap }, // DECAWM
3571 // 8, bi-directional support mode 3614 // 8, auto-repeat keys // DECARM
3572 { 9, PrivMode_MouseX10 }, 3615 { 9, PrivMode_MouseX10 },
3573 // 18, 19 printing-related 3616 // 18 end FF to printer after print screen
3617 // 19 Print screen prints full screen/scorll region
3574 { 25, PrivMode_VisibleCursor }, 3618 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3575#ifdef scrollBar_esc 3619#ifdef scrollBar_esc
3576 { scrollBar_esc, PrivMode_scrollBar }, 3620 { scrollBar_esc, PrivMode_scrollBar },
3577#endif 3621#endif
3578 { 35, PrivMode_ShiftKeys }, // rxvt extension 3622 { 35, PrivMode_ShiftKeys }, // rxvt extension
3623 // 38, tektronix mode // DECTEK
3579 { 40, PrivMode_132OK }, 3624 { 40, PrivMode_132OK },
3580 // 41 xterm more fixes NYI 3625 // 41 xterm more fixes NYI
3581 // 45 margin bell NYI 3626 // 45 margin bell NYI
3582 // 46 start logging 3627 // 46 start logging
3583 { 47, PrivMode_Screen }, 3628 { 47, PrivMode_Screen },
3584 { 66, PrivMode_aplKP }, 3629 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3585#ifndef NO_BACKSPACE_KEY 3630#ifndef NO_BACKSPACE_KEY
3586 { 67, PrivMode_BackSpace }, 3631 { 67, PrivMode_BackSpace }, // DECBKM
3587#endif 3632#endif
3588 { 1000, PrivMode_MouseX11 }, 3633 { 1000, PrivMode_MouseX11 },
3589 { 1002, PrivMode_MouseBtnEvent }, 3634 { 1002, PrivMode_MouseBtnEvent },
3590 { 1003, PrivMode_MouseAnyEvent }, 3635 { 1003, PrivMode_MouseAnyEvent },
3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3636 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
… …
3630 3675
3631 scr_touch (true); 3676 scr_touch (true);
3632 break; 3677 break;
3633#endif 3678#endif
3634 case 1048: /* alternative cursor save */ 3679 case 1048: /* alternative cursor save */
3635 case 1049:
3636 if (option (Opt_secondaryScreen)) 3680 if (option (Opt_secondaryScreen))
3637 if (mode == 0) 3681 if (mode == 0)
3638 scr_cursor (RESTORE); 3682 scr_cursor (RESTORE);
3639 else if (mode == 1) 3683 else if (mode == 1)
3640 scr_cursor (SAVE); 3684 scr_cursor (SAVE);
… …
3653 */ 3697 */
3654 set_privmode (PrivMode_vt52, 1); 3698 set_privmode (PrivMode_vt52, 1);
3655 break; 3699 break;
3656 case 3: /* 80/132 */ 3700 case 3: /* 80/132 */
3657 if (priv_modes & PrivMode_132OK) 3701 if (priv_modes & PrivMode_132OK)
3658 {
3659 scr_poweron ();
3660 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3702 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3661 }
3662 break; 3703 break;
3663 case 4: /* smooth scrolling */ 3704 case 4: /* smooth scrolling */
3664 set_option (Opt_jumpScroll, !state); 3705 set_option (Opt_jumpScroll, !state);
3665 break; 3706 break;
3666 case 5: /* reverse video */ 3707 case 5: /* reverse video */
… …
3677 if (state) /* orthogonal */ 3718 if (state) /* orthogonal */
3678 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3719 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3679 break; 3720 break;
3680#ifdef scrollBar_esc 3721#ifdef scrollBar_esc
3681 case scrollBar_esc: 3722 case scrollBar_esc:
3682 if (scrollbar_mapping (state)) 3723 if (scrollBar.map (state))
3683 { 3724 {
3684 resize_all_windows (0, 0, 0); 3725 resize_all_windows (0, 0, 0);
3685 scr_touch (true); 3726 scr_touch (true);
3686 } 3727 }
3687 break; 3728 break;
… …
3708 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3749 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3709 vt_emask_mouse = PointerMotionMask; 3750 vt_emask_mouse = PointerMotionMask;
3710 } 3751 }
3711 else 3752 else
3712 vt_emask_mouse = NoEventMask; 3753 vt_emask_mouse = NoEventMask;
3754
3713 vt_select_input (); 3755 vt_select_input ();
3714 break; 3756 break;
3715 case 1010: /* scroll to bottom on TTY output inhibit */ 3757 case 1010: /* scroll to bottom on TTY output inhibit */
3716 set_option (Opt_scrollTtyOutput, !state); 3758 set_option (Opt_scrollTtyOutput, !state);
3717 break; 3759 break;
3718 case 1011: /* scroll to bottom on key press */ 3760 case 1011: /* scroll to bottom on key press */
3719 set_option (Opt_scrollTtyKeypress, state); 3761 set_option (Opt_scrollTtyKeypress, state);
3720 break; 3762 break;
3721 case 1047: /* secondary screen w/ clearing last */ 3763 case 1047: /* secondary screen w/ clearing last */
3722 if (option (Opt_secondaryScreen)) 3764 if (option (Opt_secondaryScreen))
3723 if (current_screen != PRIMARY) 3765 if (!state)
3724 scr_erase_screen (2); 3766 scr_erase_screen (2);
3767
3725 scr_change_screen (state); 3768 scr_change_screen (state);
3726 break; 3769 break;
3727 case 1049: /* secondary screen w/ clearing first */ 3770 case 1049: /* secondary screen w/ clearing first */
3771 if (option (Opt_secondaryScreen))
3772 if (state)
3773 scr_cursor (SAVE);
3774
3728 scr_change_screen (state); 3775 scr_change_screen (state);
3776
3729 if (option (Opt_secondaryScreen)) 3777 if (option (Opt_secondaryScreen))
3730 if (current_screen != PRIMARY) 3778 if (state)
3731 scr_erase_screen (2); 3779 scr_erase_screen (2);
3780 else
3781 scr_cursor (RESTORE);
3732 break; 3782 break;
3733 default: 3783 default:
3734 break; 3784 break;
3735 } 3785 }
3736 } 3786 }

Diff Legend

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