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.411 by ayin, Sat Feb 16 16:07:29 2008 UTC vs.
Revision 1.456 by sf-exg, Fri Oct 22 16:49:26 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 PrivMode ((!numlock_state), PrivMode_aplKP);
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 {
… …
1015 } 1023 }
1016 while (row < end_row); 1024 while (row < end_row);
1017 } 1025 }
1018 1026
1019 scr_refresh (); 1027 scr_refresh ();
1020 scrollbar_show (1); 1028 scrollBar.show (1);
1021#ifdef USE_XIM 1029#ifdef USE_XIM
1022 IMSendSpot (); 1030 IMSendSpot ();
1023#endif 1031#endif
1024 } 1032 }
1025 1033
1026 display->flush (); 1034 display->flush ();
1027} 1035}
1028 1036
1029/* checks wether a refresh is requested and starts the refresh timer */ 1037/* checks whether a refresh is requested and starts the refresh timer */
1030void 1038void
1031rxvt_term::refresh_check () 1039rxvt_term::refresh_check ()
1032{ 1040{
1033 if (want_refresh && !flush_ev.is_active ()) 1041 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1042 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1127 { 1135 {
1128 // this should really be sched_yield(), but the linux guys thought 1136 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1137 // 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 1138 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1139 // allowed by the sus... as is returning ENOSYS.
1140 // since the linux guys additionally thought that breaking the only
1141 // known workaround against their unusable sched_yield hack is cool,
1142 // we just nanosleep a bit and hope for the best.
1132 1143
1133 struct timespec ts = { 0, 0 }; 1144 struct timespec ts = { 0, 1000 };
1134 nanosleep (&ts, 0); 1145 nanosleep (&ts, 0);
1135 1146
1136 w.stop (); 1147 w.stop ();
1137 } 1148 }
1138 1149
… …
1188{ 1199{
1189 make_current (); 1200 make_current ();
1190 1201
1191 if (revents & ev::READ) 1202 if (revents & ev::READ)
1192 // loop, but don't allow a single term to monopolize us 1203 // loop, but don't allow a single term to monopolize us
1193 while (pty_fill ()) 1204 for (int i = CBUFCNT; i-- && pty_fill (); )
1194 if (cmd_parse ()) 1205 cmd_parse ();
1195 break;
1196 1206
1197 if (revents & ev::WRITE) 1207 if (revents & ev::WRITE)
1198 pty_write (); 1208 pty_write ();
1199 1209
1200 refresh_check (); 1210 refresh_check ();
… …
1420 && ev.xfocus.mode != NotifyGrab) 1430 && ev.xfocus.mode != NotifyGrab)
1421 focus_out (); 1431 focus_out ();
1422 break; 1432 break;
1423 1433
1424 case ConfigureNotify: 1434 case ConfigureNotify:
1425 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1426 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1427 szHint.width, szHint.height);*/
1428 if (ev.xconfigure.window == parent[0]) 1435 if (ev.xconfigure.window == parent[0])
1429 { 1436 {
1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ; 1438 ;
1432 1439
… …
1459 selection_property (ev.xproperty.window, ev.xproperty.atom); 1466 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460 1467
1461 break; 1468 break;
1462 1469
1463 case SelectionClear: 1470 case SelectionClear:
1464 selection_clear (); 1471 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465 break; 1472 break;
1466 1473
1467 case SelectionNotify: 1474 case SelectionNotify:
1468 if (selection_wait == Sel_normal) 1475 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1476 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1473 selection_send (ev.xselectionrequest); 1480 selection_send (ev.xselectionrequest);
1474 break; 1481 break;
1475 1482
1476 case MapNotify: 1483 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP 1484#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a 1485 /* 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 1486 * non-reparenting window manager. In those cases we never get first
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1487 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does 1488 * care of multiplicity of ConfigureNotify events arriving while WM does
1482 * reparenting. 1489 * reparenting.
1483 * We should not render background immidiately, as there could be several 1490 * 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 1491 * 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 1492 * by scheduling background redraw as soon as we can, but giving a short
1486 * bit of time for ConfigureNotifies to arrive. 1493 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all 1494 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results. 1495 * of ConfigureNotifys for the best results.
… …
1536 ; 1543 ;
1537 1544
1538 if (scrollBar.state && ev.xany.window == scrollBar.win) 1545 if (scrollBar.state && ev.xany.window == scrollBar.win)
1539 { 1546 {
1540 scrollBar.state = STATE_IDLE; 1547 scrollBar.state = STATE_IDLE;
1541 scrollbar_show (0); 1548 scrollBar.show (0);
1542 } 1549 }
1543 } 1550 }
1544 break; 1551 break;
1545 1552
1546 case MotionNotify: 1553 case MotionNotify:
… …
1645 &unused_root, &unused_child, 1652 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1653 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1654 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1655 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1650 scrollbar_size ()); 1657 scrollBar.size ());
1651 want_refresh = 1; 1658 want_refresh = 1;
1652 scrollbar_show (1); 1659 scrollBar.show (1);
1653 } 1660 }
1654 break; 1661 break;
1655 } 1662 }
1656 1663
1657#if defined(CURSOR_BLINK) 1664#if defined(CURSOR_BLINK)
… …
1682#endif 1689#endif
1683 1690
1684 refresh_check (); 1691 refresh_check ();
1685} 1692}
1686 1693
1694#if ENABLE_FRILLS
1695void
1696rxvt_term::set_urgency (bool enable)
1697{
1698 if (enable == urgency_hint)
1699 return;
1700
1701 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1702 {
1703 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1704 XSetWMHints (dpy, parent[0], h);
1705 urgency_hint = enable;
1706 }
1707}
1708#endif
1709
1687void 1710void
1688rxvt_term::focus_in () 1711rxvt_term::focus_in ()
1689{ 1712{
1690 if (!focus) 1713 if (!focus)
1691 { 1714 {
1692 focus = 1; 1715 focus = 1;
1693 want_refresh = 1; 1716 want_refresh = 1;
1694
1695 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696 1717
1697#if USE_XIM 1718#if USE_XIM
1698 if (Input_Context != NULL) 1719 if (Input_Context != NULL)
1699 { 1720 {
1700 IMSetPosition (); 1721 IMSetPosition ();
… …
1712 scr_recolour (); 1733 scr_recolour ();
1713 } 1734 }
1714#endif 1735#endif
1715#if ENABLE_FRILLS 1736#if ENABLE_FRILLS
1716 if (option (Opt_urgentOnBell)) 1737 if (option (Opt_urgentOnBell))
1717 { 1738 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 1739#endif
1740
1741 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1725 } 1742 }
1726} 1743}
1727 1744
1728void 1745void
1729rxvt_term::focus_out () 1746rxvt_term::focus_out ()
… …
1731 if (focus) 1748 if (focus)
1732 { 1749 {
1733 focus = 0; 1750 focus = 0;
1734 want_refresh = 1; 1751 want_refresh = 1;
1735 1752
1736 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1753#if ENABLE_FRILLS
1737 1754 if (option (Opt_urgentOnBell))
1755 set_urgency (0);
1756#endif
1738#if ENABLE_FRILLS || ISO_14755 1757#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf) 1758 if (iso14755buf)
1740 { 1759 {
1741 iso14755buf = 0; 1760 iso14755buf = 0;
1742# if ISO_14755 1761# if ISO_14755
… …
1759 { 1778 {
1760 pix_colors = pix_colors_unfocused; 1779 pix_colors = pix_colors_unfocused;
1761 scr_recolour (); 1780 scr_recolour ();
1762 } 1781 }
1763#endif 1782#endif
1783
1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764 } 1785 }
1765} 1786}
1766 1787
1767void 1788void
1768rxvt_term::update_fade_color (unsigned int idx) 1789rxvt_term::update_fade_color (unsigned int idx)
… …
1845 /* save the xbutton state (for ButtonRelease) */ 1866 /* save the xbutton state (for ButtonRelease) */
1846 MEvent.state = ev.state; 1867 MEvent.state = ev.state;
1847#ifdef MOUSE_REPORT_DOUBLECLICK 1868#ifdef MOUSE_REPORT_DOUBLECLICK
1848 if (ev.button == MEvent.button && clickintime) 1869 if (ev.button == MEvent.button && clickintime)
1849 { 1870 {
1850 /* same button, within alloted time */ 1871 /* same button, within allowed time */
1851 MEvent.clicks++; 1872 MEvent.clicks++;
1852 1873
1853 if (MEvent.clicks > 1) 1874 if (MEvent.clicks > 1)
1854 { 1875 {
1855 /* only report double clicks */ 1876 /* only report double clicks */
… …
2010 } 2031 }
2011 2032
2012 if (scrollBar.style == R_SB_XTERM 2033 if (scrollBar.style == R_SB_XTERM
2013 || scrollbar_above_slider (ev.y) 2034 || scrollbar_above_slider (ev.y)
2014 || scrollbar_below_slider (ev.y)) 2035 || scrollbar_below_slider (ev.y))
2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2036 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2016 2037
2017 scrollBar.state = STATE_MOTION; 2038 scrollBar.state = STATE_MOTION;
2018 break; 2039 break;
2019 2040
2020 case Button1: 2041 case Button1:
… …
2043 else 2064 else
2044 { 2065 {
2045 scr_page ((ev.button == Button1 ? DN : UP), 2066 scr_page ((ev.button == Button1 ? DN : UP),
2046 (nrow 2067 (nrow
2047 * scrollbar_position (ev.y) 2068 * scrollbar_position (ev.y)
2048 / scrollbar_size ())); 2069 / scrollBar.size ()));
2049 } 2070 }
2050 2071
2051 break; 2072 break;
2052 } 2073 }
2053 } 2074 }
… …
2066 reportmode = !! (priv_modes & PrivMode_mouse_report); 2087 reportmode = !! (priv_modes & PrivMode_mouse_report);
2067 2088
2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2089 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2069 { 2090 {
2070 scrollBar.state = STATE_IDLE; 2091 scrollBar.state = STATE_IDLE;
2071 scrollbar_show (0); 2092 scrollBar.show (0);
2072 } 2093 }
2073 2094
2074#ifdef SELECTION_SCROLLING 2095#ifdef SELECTION_SCROLLING
2075 sel_scroll_ev.stop(); 2096 sel_scroll_ev.stop();
2076#endif 2097#endif
… …
2126 selection_make (ev.time); 2147 selection_make (ev.time);
2127 break; 2148 break;
2128 2149
2129 case Button2: 2150 case Button2:
2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2151 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); 2152 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132 break; 2153 break;
2133 2154
2134#ifdef MOUSE_WHEEL 2155#ifdef MOUSE_WHEEL
2135 case Button4: 2156 case Button4:
2136 case Button5: 2157 case Button5:
… …
2159 } 2180 }
2160 else 2181 else
2161# endif 2182# endif
2162 { 2183 {
2163 scr_page (v, i); 2184 scr_page (v, i);
2164 scrollbar_show (1); 2185 scrollBar.show (1);
2165 } 2186 }
2166 } 2187 }
2167 break; 2188 break;
2168#endif 2189#endif
2169 } 2190 }
2170 } 2191 }
2171} 2192}
2172 2193
2173/*}}} */ 2194/*}}} */
2174 2195
2175bool 2196void
2176rxvt_term::cmd_parse () 2197rxvt_term::cmd_parse ()
2177{ 2198{
2178 bool flag = false;
2179 wchar_t ch = NOCHAR; 2199 wchar_t ch = NOCHAR;
2180 char *seq_begin; // remember start of esc-sequence here 2200 char *seq_begin; // remember start of esc-sequence here
2181 2201
2182 for (;;) 2202 for (;;)
2183 { 2203 {
2184 if (ch == NOCHAR) 2204 if (expect_false (ch == NOCHAR))
2185 { 2205 {
2186 seq_begin = cmdbuf_ptr; 2206 seq_begin = cmdbuf_ptr;
2187 ch = next_char (); 2207 ch = next_char ();
2188 2208
2189 if (ch == NOCHAR) 2209 if (ch == NOCHAR)
2190 break; 2210 break;
2191 } 2211 }
2192 2212
2193 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2213 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2194 { 2214 {
2195 if (!seen_input) 2215 if (expect_false (!seen_input))
2196 { 2216 {
2197 seen_input = 1; 2217 seen_input = 1;
2198 // many badly-written programs (e.g. jed) contain a race condition: 2218 // many badly-written programs (e.g. jed) contain a race condition:
2199 // they first read the screensize and then install a SIGWINCH handler. 2219 // they first read the screensize and then install a SIGWINCH handler.
2200 // some window managers resize the window early, and these programs 2220 // some window managers resize the window early, and these programs
… …
2213 wchar_t *str = buf; 2233 wchar_t *str = buf;
2214 wchar_t *eol = str + min (ncol, UBUFSIZ); 2234 wchar_t *eol = str + min (ncol, UBUFSIZ);
2215 2235
2216 for (;;) 2236 for (;;)
2217 { 2237 {
2218 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2238 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2219 break; 2239 break;
2220 2240
2221 *str++ = ch; 2241 *str++ = ch;
2222 2242
2223 if (ch == C0_LF || str >= eol) 2243 if (expect_false (ch == C0_LF || str >= eol))
2224 { 2244 {
2225 if (ch == C0_LF) 2245 if (ch == C0_LF)
2226 nlines++; 2246 nlines++;
2227 2247
2228 refresh_count++; 2248 refresh_count++;
… …
2277 * What the heck we'll cheat and only refresh less than every page-full. 2297 * What the heck we'll cheat and only refresh less than every page-full.
2278 * if skipScroll is enabled. 2298 * if skipScroll is enabled.
2279 */ 2299 */
2280 if (refreshnow) 2300 if (refreshnow)
2281 { 2301 {
2282 flag = true;
2283 scr_refresh (); 2302 scr_refresh ();
2284 want_refresh = 1; 2303 want_refresh = 1;
2285 } 2304 }
2286
2287 } 2305 }
2288 else 2306 else
2289 { 2307 {
2290 try 2308 try
2291 { 2309 {
… …
2299 } 2317 }
2300 2318
2301 ch = NOCHAR; 2319 ch = NOCHAR;
2302 } 2320 }
2303 } 2321 }
2304
2305 return flag;
2306} 2322}
2307 2323
2308// read the next character 2324// read the next character
2309wchar_t 2325wchar_t
2310rxvt_term::next_char () NOTHROW 2326rxvt_term::next_char () NOTHROW
2311{ 2327{
2312 while (cmdbuf_ptr < cmdbuf_endp) 2328 while (cmdbuf_ptr < cmdbuf_endp)
2313 { 2329 {
2314 // assume 7-bit to be ascii ALWAYS 2330 // assume 7-bit to be ascii ALWAYS
2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2331 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2316 return *cmdbuf_ptr++; 2332 return *cmdbuf_ptr++;
2317 2333
2318 wchar_t wc; 2334 wchar_t wc;
2319 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2335 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2320 2336
… …
2324 cmdbuf_ptr = cmdbuf_endp; 2340 cmdbuf_ptr = cmdbuf_endp;
2325 break; 2341 break;
2326 } 2342 }
2327 2343
2328 if (len == (size_t)-1) 2344 if (len == (size_t)-1)
2345 {
2346 mbstate.reset (); // reset now undefined conversion state
2329 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2347 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2348 }
2330 2349
2331 // assume wchar == unicode 2350 // assume wchar == unicode
2332 cmdbuf_ptr += len; 2351 cmdbuf_ptr += len;
2333 return wc & UNICODE_MASK; 2352 return wc & UNICODE_MASK;
2334 } 2353 }
… …
2378/*----------------------------------------------------------------------*/ 2397/*----------------------------------------------------------------------*/
2379#ifdef PRINTPIPE 2398#ifdef PRINTPIPE
2380FILE * 2399FILE *
2381rxvt_term::popen_printer () 2400rxvt_term::popen_printer ()
2382{ 2401{
2383 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2402 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2384 2403
2385 if (stream == NULL) 2404 if (stream == NULL)
2386 rxvt_warn ("can't open printer pipe, not printing.\n"); 2405 rxvt_warn ("can't open printer pipe, not printing.\n");
2387 2406
2388 return stream; 2407 return stream;
… …
2399 * simulate attached vt100 printer 2418 * simulate attached vt100 printer
2400 */ 2419 */
2401void 2420void
2402rxvt_term::process_print_pipe () 2421rxvt_term::process_print_pipe ()
2403{ 2422{
2404 int done; 2423 FILE *fd = popen_printer ();
2405 FILE *fd;
2406 2424
2407 if ((fd = popen_printer ()) == NULL) 2425 if (!fd)
2408 return; 2426 return;
2409 2427
2410 /* 2428 /*
2411 * Send all input to the printer until either ESC[4i or ESC[?4i 2429 * Send all input to the printer until either ESC[4i or ESC[?4i
2412 * is received. 2430 * is received.
2413 */ 2431 */
2414 for (done = 0; !done;) 2432 for (int done = 0; !done; )
2415 { 2433 {
2416 unsigned char buf[8]; 2434 unsigned char buf[8];
2417 unicode_t ch; 2435 unicode_t ch;
2418 unsigned int i, len; 2436 unsigned int i, len;
2419 2437
… …
2564 break; 2582 break;
2565 case 'Z': /* identify the terminal type */ 2583 case 'Z': /* identify the terminal type */
2566 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2584 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2567 break; 2585 break;
2568 case '<': /* turn off VT52 mode */ 2586 case '<': /* turn off VT52 mode */
2569 PrivMode (0, PrivMode_vt52); 2587 set_privmode (PrivMode_vt52, 0);
2570 break; 2588 break;
2571 case 'F': /* use special graphics character set */ 2589 case 'F': /* use special graphics character set */
2572 case 'G': /* use regular character set */ 2590 case 'G': /* use regular character set */
2573 /* unimplemented */ 2591 /* unimplemented */
2574 break; 2592 break;
… …
2628 scr_forwardindex (); 2646 scr_forwardindex ();
2629 break; 2647 break;
2630#endif 2648#endif
2631 case '=': 2649 case '=':
2632 case '>': 2650 case '>':
2633 PrivMode ((ch == '='), PrivMode_aplKP); 2651 set_privmode (PrivMode_aplKP, ch == '=');
2634 break; 2652 break;
2635 2653
2636 case C1_40: 2654 case C1_40:
2637 cmd_getc (); 2655 cmd_getc ();
2638 break; 2656 break;
… …
2677 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2695 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2678 case C1_SCI: /* ESC Z */ 2696 case C1_SCI: /* ESC Z */
2679 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2697 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2680 break; /* steal obsolete ESC [ c */ 2698 break; /* steal obsolete ESC [ c */
2681 2699
2682 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2700 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2683 case C1_CSI: /* ESC [ */ 2701 case C1_CSI: /* ESC [ */
2684 process_csi_seq (); 2702 process_csi_seq ();
2685 break; 2703 break;
2686 2704
2687 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2705 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2688 case C1_OSC: /* ESC ] */ 2706 case C1_OSC: /* ESC ] */
2689 process_osc_seq (); 2707 process_osc_seq ();
2690 break; 2708 break;
2691 2709
2692 /* 8.3.106: RESET TO INITIAL STATE */ 2710 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2693 case 'c': 2711 case 'c':
2694 mbstate.reset (); 2712 mbstate.reset ();
2695 scr_poweron (); 2713 scr_poweron ();
2696 scrollbar_show (1); 2714 scrollBar.show (1);
2697 break; 2715 break;
2698 2716
2699 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2717 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2700 case 'n': 2718 case 'n':
2701 scr_charset_choose (2); 2719 scr_charset_choose (2);
… …
2752 2770
2753 nargs = 0; 2771 nargs = 0;
2754 2772
2755 priv = 0; 2773 priv = 0;
2756 ch = cmd_getc (); 2774 ch = cmd_getc ();
2757 if (ch >= '<' && ch <= '?') 2775 if ((ch >= '<' && ch <= '?') || ch == '!')
2758 { 2776 {
2759 /* '<' '=' '>' '?' */ 2777 /* '<' '=' '>' '?' '!' */
2760 priv = ch; 2778 priv = ch;
2761 ch = cmd_getc (); 2779 ch = cmd_getc ();
2762 } 2780 }
2763 2781
2764 /* read any numerical arguments */ 2782 /* read any numerical arguments */
… …
2818 2836
2819 case '?': 2837 case '?':
2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2838 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2821 process_terminal_mode (ch, priv, nargs, arg); 2839 process_terminal_mode (ch, priv, nargs, arg);
2822 break; 2840 break;
2841
2842 case '!':
2843 if (ch == CSI_70)
2844 {
2845 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2846 scr_soft_reset ();
2847
2848 static const int pm_h[] = { 7, 25 };
2849 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2850
2851 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2852 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2823 } 2853 }
2854 break;
2855 }
2856
2824 return; 2857 return;
2825 } 2858 }
2826 2859
2827 switch (ch) 2860 switch (ch)
2828 { 2861 {
… …
3195 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3228 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3196 */ 3229 */
3197void 3230void
3198rxvt_term::process_dcs_seq () 3231rxvt_term::process_dcs_seq ()
3199{ 3232{
3200 char *s;
3201 unicode_t eh;
3202
3203 /* 3233 /*
3204 * Not handled yet 3234 * Not handled yet
3205 */ 3235 */
3236
3237 unicode_t eh;
3206 s = get_to_st (eh); 3238 char *s = get_to_st (eh);
3207 if (s) 3239 if (s)
3208 free (s); 3240 free (s);
3209 3241
3210 return; 3242 return;
3211} 3243}
… …
3215 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3247 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3216 */ 3248 */
3217void 3249void
3218rxvt_term::process_osc_seq () 3250rxvt_term::process_osc_seq ()
3219{ 3251{
3220 unicode_t ch, eh;
3221 int arg; 3252 int arg;
3222 3253
3223 ch = cmd_getc (); 3254 unicode_t ch = cmd_getc ();
3224 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3255 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3225 arg = arg * 10 + (ch - '0'); 3256 arg = arg * 10 + (ch - '0');
3226 3257
3227 if (ch == ';') 3258 if (ch == ';')
3228 { 3259 {
3260 unicode_t eh;
3229 char *s = get_to_st (eh); 3261 char *s = get_to_st (eh);
3230 3262
3231 if (s) 3263 if (s)
3232 { 3264 {
3233 process_xterm_seq (arg, s, eh); 3265 process_xterm_seq (arg, s, eh);
… …
3257 3289
3258/* 3290/*
3259 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3291 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3260 */ 3292 */
3261void 3293void
3262rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3294rxvt_term::process_xterm_seq (int op, char *str, char resp)
3263{ 3295{
3264 int color; 3296 int color;
3265 char *buf, *name; 3297 char *buf, *name;
3266 bool query = str[0] == '?' && !str[1]; 3298 bool query = str[0] == '?' && !str[1];
3267 int saveop = op; 3299 int saveop = op;
… …
3308 3340
3309 XFree (value); 3341 XFree (value);
3310 } 3342 }
3311 else 3343 else
3312 { 3344 {
3313 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3345 char *eq = strchr (str, '=');
3314 3346
3315 if (eq) 3347 if (eq)
3316 { 3348 {
3317 *eq = 0; 3349 *eq = 0;
3318 set_utf8_property (display->atom (str), eq + 1); 3350 set_utf8_property (display->atom (str), eq + 1);
… …
3358 process_color_seq (op, Color_pointer_fg, str, resp); 3390 process_color_seq (op, Color_pointer_fg, str, resp);
3359 break; 3391 break;
3360 case XTerm_Color_pointer_bg: 3392 case XTerm_Color_pointer_bg:
3361 process_color_seq (op, Color_pointer_bg, str, resp); 3393 process_color_seq (op, Color_pointer_bg, str, resp);
3362 break; 3394 break;
3395#ifdef OPTION_HC
3396 case XTerm_Color_HC:
3397 process_color_seq (op, Color_HC, str, resp);
3398 break;
3399 case XTerm_Color_HTC:
3400 process_color_seq (op, Color_HTC, str, resp);
3401 break;
3402#endif
3363#ifndef NO_BOLD_UNDERLINE_REVERSE 3403#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: 3404 case URxvt_Color_BD:
3369 process_color_seq (op, Color_BD, str, resp); 3405 process_color_seq (op, Color_BD, str, resp);
3370 break; 3406 break;
3371 case Rxvt_Color_UL:
3372 case URxvt_Color_UL: 3407 case URxvt_Color_UL:
3373 process_color_seq (op, Color_UL, str, resp); 3408 process_color_seq (op, Color_UL, str, resp);
3374 break; 3409 break;
3375 case URxvt_Color_IT: 3410 case URxvt_Color_IT:
3376 process_color_seq (op, Color_IT, str, resp); 3411 process_color_seq (op, Color_IT, str, resp);
3377 break; 3412 break;
3378#endif 3413#endif
3414 case URxvt_Color_border:
3415 process_color_seq (op, Color_border, str, resp);
3416 break;
3379#if ENABLE_TRANSPARENCY 3417#if ENABLE_TRANSPARENCY
3380 case URxvt_Color_tint: 3418 case URxvt_Color_tint:
3381 process_color_seq (op, Color_tint, str, resp); 3419 process_color_seq (op, Color_tint, str, resp);
3382 { 3420 {
3383 bool changed = false; 3421 bool changed = false;
… …
3398 case Rxvt_Pixmap: 3436 case Rxvt_Pixmap:
3399 if (!strcmp (str, "?")) 3437 if (!strcmp (str, "?"))
3400 { 3438 {
3401 char str[256]; 3439 char str[256];
3402 3440
3403 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3441 sprintf (str, "[%dx%d+%d+%d]",
3404 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3442 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3405 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3443 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3406 process_xterm_seq (XTerm_title, str, CHAR_ST); 3444 process_xterm_seq (XTerm_title, str, CHAR_ST);
3407 } 3445 }
3408 else 3446 else
… …
3507 break; 3545 break;
3508#endif 3546#endif
3509 3547
3510#if ENABLE_PERL 3548#if ENABLE_PERL
3511 case URxvt_perl: 3549 case URxvt_perl:
3512 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3550 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3513 ; // no responses yet
3514 break; 3551 break;
3515#endif 3552#endif
3516 } 3553 }
3517} 3554}
3518/*----------------------------------------------------------------------*/ 3555/*----------------------------------------------------------------------*/
… …
3541 { 3578 {
3542 if (mode == 'r') 3579 if (mode == 'r')
3543 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3580 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3544 else 3581 else
3545 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3582 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3546 PrivMode (state, bit); 3583
3584 set_privmode (bit, state);
3547 } 3585 }
3548 3586
3549 return state; 3587 return state;
3550} 3588}
3551 3589
… …
3559 static const struct 3597 static const struct
3560 { 3598 {
3561 const int argval; 3599 const int argval;
3562 const unsigned long bit; 3600 const unsigned long bit;
3563 } argtopriv[] = { 3601 } argtopriv[] = {
3564 { 1, PrivMode_aplCUR }, 3602 { 1, PrivMode_aplCUR }, // DECCKM
3565 { 2, PrivMode_vt52 }, 3603 { 2, PrivMode_vt52 },
3566 { 3, PrivMode_132 }, 3604 { 3, PrivMode_132 }, // DECCOLM
3567 { 4, PrivMode_smoothScroll }, 3605 { 4, PrivMode_smoothScroll }, // DECSCLM
3568 { 5, PrivMode_rVideo }, 3606 { 5, PrivMode_rVideo }, // DECSCNM
3569 { 6, PrivMode_relOrigin }, 3607 { 6, PrivMode_relOrigin }, // DECOM
3570 { 7, PrivMode_Autowrap }, 3608 { 7, PrivMode_Autowrap }, // DECAWM
3571 // 8, bi-directional support mode 3609 // 8, auto-repeat keys // DECARM
3572 { 9, PrivMode_MouseX10 }, 3610 { 9, PrivMode_MouseX10 },
3573 // 18, 19 printing-related 3611 // 18 end FF to printer after print screen
3612 // 19 Print screen prints full screen/scroll region
3574 { 25, PrivMode_VisibleCursor }, 3613 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3575#ifdef scrollBar_esc 3614#ifdef scrollBar_esc
3576 { scrollBar_esc, PrivMode_scrollBar }, 3615 { scrollBar_esc, PrivMode_scrollBar },
3577#endif 3616#endif
3578 { 35, PrivMode_ShiftKeys }, // rxvt extension 3617 { 35, PrivMode_ShiftKeys }, // rxvt extension
3618 // 38, tektronix mode // DECTEK
3579 { 40, PrivMode_132OK }, 3619 { 40, PrivMode_132OK },
3580 // 41 xterm more fixes NYI 3620 // 41 xterm more fixes NYI
3581 // 45 margin bell NYI 3621 // 45 margin bell NYI
3582 // 46 start logging 3622 // 46 start logging
3583 { 47, PrivMode_Screen }, 3623 { 47, PrivMode_Screen },
3584 { 66, PrivMode_aplKP }, 3624 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3585#ifndef NO_BACKSPACE_KEY 3625#ifndef NO_BACKSPACE_KEY
3586 { 67, PrivMode_BackSpace }, 3626 { 67, PrivMode_BackSpace }, // DECBKM
3587#endif 3627#endif
3588 { 1000, PrivMode_MouseX11 }, 3628 { 1000, PrivMode_MouseX11 },
3589 { 1002, PrivMode_MouseBtnEvent }, 3629 { 1002, PrivMode_MouseBtnEvent },
3590 { 1003, PrivMode_MouseAnyEvent }, 3630 { 1003, PrivMode_MouseAnyEvent },
3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3631 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
… …
3630 3670
3631 scr_touch (true); 3671 scr_touch (true);
3632 break; 3672 break;
3633#endif 3673#endif
3634 case 1048: /* alternative cursor save */ 3674 case 1048: /* alternative cursor save */
3635 case 1049:
3636 if (option (Opt_secondaryScreen)) 3675 if (option (Opt_secondaryScreen))
3637 if (mode == 0) 3676 if (mode == 0)
3638 scr_cursor (RESTORE); 3677 scr_cursor (RESTORE);
3639 else if (mode == 1) 3678 else if (mode == 1)
3640 scr_cursor (SAVE); 3679 scr_cursor (SAVE);
… …
3649 case 2: /* VT52 mode */ 3688 case 2: /* VT52 mode */
3650 /* oddball mode. should be set regardless of set/reset 3689 /* oddball mode. should be set regardless of set/reset
3651 * parameter. Return from VT52 mode with an ESC < from 3690 * parameter. Return from VT52 mode with an ESC < from
3652 * within VT52 mode 3691 * within VT52 mode
3653 */ 3692 */
3654 PrivMode (1, PrivMode_vt52); 3693 set_privmode (PrivMode_vt52, 1);
3655 break; 3694 break;
3656 case 3: /* 80/132 */ 3695 case 3: /* 80/132 */
3657 if (priv_modes & PrivMode_132OK) 3696 if (priv_modes & PrivMode_132OK)
3658 {
3659 scr_poweron ();
3660 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3697 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3661 }
3662 break; 3698 break;
3663 case 4: /* smooth scrolling */ 3699 case 4: /* smooth scrolling */
3664 set_option (Opt_jumpScroll, !state); 3700 set_option (Opt_jumpScroll, !state);
3665 break; 3701 break;
3666 case 5: /* reverse video */ 3702 case 5: /* reverse video */
… …
3677 if (state) /* orthogonal */ 3713 if (state) /* orthogonal */
3678 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3714 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3679 break; 3715 break;
3680#ifdef scrollBar_esc 3716#ifdef scrollBar_esc
3681 case scrollBar_esc: 3717 case scrollBar_esc:
3682 if (scrollbar_mapping (state)) 3718 if (scrollBar.map (state))
3683 { 3719 {
3684 resize_all_windows (0, 0, 0); 3720 resize_all_windows (0, 0, 0);
3685 scr_touch (true); 3721 scr_touch (true);
3686 } 3722 }
3687 break; 3723 break;
… …
3708 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3744 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3709 vt_emask_mouse = PointerMotionMask; 3745 vt_emask_mouse = PointerMotionMask;
3710 } 3746 }
3711 else 3747 else
3712 vt_emask_mouse = NoEventMask; 3748 vt_emask_mouse = NoEventMask;
3749
3713 vt_select_input (); 3750 vt_select_input ();
3714 break; 3751 break;
3715 case 1010: /* scroll to bottom on TTY output inhibit */ 3752 case 1010: /* scroll to bottom on TTY output inhibit */
3716 set_option (Opt_scrollTtyOutput, !state); 3753 set_option (Opt_scrollTtyOutput, !state);
3717 break; 3754 break;
3718 case 1011: /* scroll to bottom on key press */ 3755 case 1011: /* scroll to bottom on key press */
3719 set_option (Opt_scrollTtyKeypress, state); 3756 set_option (Opt_scrollTtyKeypress, state);
3720 break; 3757 break;
3721 case 1047: /* secondary screen w/ clearing last */ 3758 case 1047: /* secondary screen w/ clearing last */
3722 if (option (Opt_secondaryScreen)) 3759 if (option (Opt_secondaryScreen))
3723 if (current_screen != PRIMARY) 3760 if (!state)
3724 scr_erase_screen (2); 3761 scr_erase_screen (2);
3762
3725 scr_change_screen (state); 3763 scr_change_screen (state);
3726 break; 3764 break;
3727 case 1049: /* secondary screen w/ clearing first */ 3765 case 1049: /* secondary screen w/ clearing first */
3766 if (option (Opt_secondaryScreen))
3767 if (state)
3768 scr_cursor (SAVE);
3769
3728 scr_change_screen (state); 3770 scr_change_screen (state);
3771
3729 if (option (Opt_secondaryScreen)) 3772 if (option (Opt_secondaryScreen))
3730 if (current_screen != PRIMARY) 3773 if (state)
3731 scr_erase_screen (2); 3774 scr_erase_screen (2);
3775 else
3776 scr_cursor (RESTORE);
3732 break; 3777 break;
3733 default: 3778 default:
3734 break; 3779 break;
3735 } 3780 }
3736 } 3781 }

Diff Legend

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