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.460 by sf-exg, Fri Nov 19 23:29:30 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 {
… …
967rxvt_term::flush () 975rxvt_term::flush ()
968{ 976{
969 flush_ev.stop (); 977 flush_ev.stop ();
970 978
971#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
972 if (bgPixmap.check_clearChanged ()) 980 if (bgPixmap.flags & bgPixmap_t::hasChanged)
973 { 981 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
974// scr_clear (true); This needs to be researched further! 983// scr_clear (true); This needs to be researched further!
975 scr_touch (false); 984 scr_touch (false);
976 } 985 }
977#endif 986#endif
978 987
… …
1015 } 1024 }
1016 while (row < end_row); 1025 while (row < end_row);
1017 } 1026 }
1018 1027
1019 scr_refresh (); 1028 scr_refresh ();
1020 scrollbar_show (1); 1029 scrollBar.show (1);
1021#ifdef USE_XIM 1030#ifdef USE_XIM
1022 IMSendSpot (); 1031 IMSendSpot ();
1023#endif 1032#endif
1024 } 1033 }
1025 1034
1026 display->flush (); 1035 display->flush ();
1027} 1036}
1028 1037
1029/* checks wether a refresh is requested and starts the refresh timer */ 1038/* checks whether a refresh is requested and starts the refresh timer */
1030void 1039void
1031rxvt_term::refresh_check () 1040rxvt_term::refresh_check ()
1032{ 1041{
1033 if (want_refresh && !flush_ev.is_active ()) 1042 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1043 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1127 { 1136 {
1128 // this should really be sched_yield(), but the linux guys thought 1137 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1138 // 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 1139 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1140 // allowed by the sus... as is returning ENOSYS.
1141 // since the linux guys additionally thought that breaking the only
1142 // known workaround against their unusable sched_yield hack is cool,
1143 // we just nanosleep a bit and hope for the best.
1132 1144
1133 struct timespec ts = { 0, 0 }; 1145 struct timespec ts = { 0, 1000 };
1134 nanosleep (&ts, 0); 1146 nanosleep (&ts, 0);
1135 1147
1136 w.stop (); 1148 w.stop ();
1137 } 1149 }
1138 1150
… …
1188{ 1200{
1189 make_current (); 1201 make_current ();
1190 1202
1191 if (revents & ev::READ) 1203 if (revents & ev::READ)
1192 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1193 while (pty_fill ()) 1205 for (int i = CBUFCNT; i-- && pty_fill (); )
1194 if (cmd_parse ()) 1206 cmd_parse ();
1195 break;
1196 1207
1197 if (revents & ev::WRITE) 1208 if (revents & ev::WRITE)
1198 pty_write (); 1209 pty_write ();
1199 1210
1200 refresh_check (); 1211 refresh_check ();
… …
1420 && ev.xfocus.mode != NotifyGrab) 1431 && ev.xfocus.mode != NotifyGrab)
1421 focus_out (); 1432 focus_out ();
1422 break; 1433 break;
1423 1434
1424 case ConfigureNotify: 1435 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]) 1436 if (ev.xconfigure.window == parent[0])
1429 { 1437 {
1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ; 1439 ;
1440
1441#ifdef HAVE_BG_PIXMAP
1442 bool moved = false;
1443 if (bgPixmap.window_position_sensitive ())
1444 {
1445 int x, y;
1446 if (ev.xconfigure.send_event)
1447 {
1448 x = ev.xconfigure.x;
1449 y = ev.xconfigure.y;
1450 }
1451 else
1452 get_window_origin (x, y);
1453
1454 if (bgPixmap.set_position (x, y)
1455 || (bgPixmap.flags & bgPixmap_t::isInvalid))
1456 moved = true;
1457 }
1458#endif
1432 1459
1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1461 {
1435 seen_resize = 1; 1462 seen_resize = 1;
1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1463 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1464 }
1438 else 1465 else
1439 { 1466 {
1440#ifdef HAVE_BG_PIXMAP 1467#ifdef HAVE_BG_PIXMAP
1441 if (bgPixmap.window_position_sensitive ()) 1468 if (moved)
1442 { 1469 {
1443 if (mapped) 1470 if (mapped)
1444 update_background (); 1471 update_background ();
1445 else 1472 else
1446 bgPixmap.invalidate (); 1473 bgPixmap.invalidate ();
… …
1459 selection_property (ev.xproperty.window, ev.xproperty.atom); 1486 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460 1487
1461 break; 1488 break;
1462 1489
1463 case SelectionClear: 1490 case SelectionClear:
1464 selection_clear (); 1491 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465 break; 1492 break;
1466 1493
1467 case SelectionNotify: 1494 case SelectionNotify:
1468 if (selection_wait == Sel_normal) 1495 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1496 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1473 selection_send (ev.xselectionrequest); 1500 selection_send (ev.xselectionrequest);
1474 break; 1501 break;
1475 1502
1476 case MapNotify: 1503 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP 1504#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a 1505 /* 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 1506 * non-reparenting window manager. In those cases we never get first
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1507 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does 1508 * care of multiplicity of ConfigureNotify events arriving while WM does
1482 * reparenting. 1509 * reparenting.
1483 * We should not render background immidiately, as there could be several 1510 * 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 1511 * 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 1512 * by scheduling background redraw as soon as we can, but giving a short
1486 * bit of time for ConfigureNotifies to arrive. 1513 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all 1514 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results. 1515 * of ConfigureNotifys for the best results.
… …
1536 ; 1563 ;
1537 1564
1538 if (scrollBar.state && ev.xany.window == scrollBar.win) 1565 if (scrollBar.state && ev.xany.window == scrollBar.win)
1539 { 1566 {
1540 scrollBar.state = STATE_IDLE; 1567 scrollBar.state = STATE_IDLE;
1541 scrollbar_show (0); 1568 scrollBar.show (0);
1542 } 1569 }
1543 } 1570 }
1544 break; 1571 break;
1545 1572
1546 case MotionNotify: 1573 case MotionNotify:
… …
1645 &unused_root, &unused_child, 1672 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1673 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1674 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1675 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1650 scrollbar_size ()); 1677 scrollBar.size ());
1651 want_refresh = 1; 1678 want_refresh = 1;
1652 scrollbar_show (1); 1679 scrollBar.show (1);
1653 } 1680 }
1654 break; 1681 break;
1655 } 1682 }
1656 1683
1657#if defined(CURSOR_BLINK) 1684#if defined(CURSOR_BLINK)
… …
1682#endif 1709#endif
1683 1710
1684 refresh_check (); 1711 refresh_check ();
1685} 1712}
1686 1713
1714#if ENABLE_FRILLS
1715void
1716rxvt_term::set_urgency (bool enable)
1717{
1718 if (enable == urgency_hint)
1719 return;
1720
1721 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1722 {
1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1724 XSetWMHints (dpy, parent[0], h);
1725 urgency_hint = enable;
1726 }
1727}
1728#endif
1729
1687void 1730void
1688rxvt_term::focus_in () 1731rxvt_term::focus_in ()
1689{ 1732{
1690 if (!focus) 1733 if (!focus)
1691 { 1734 {
1692 focus = 1; 1735 focus = 1;
1693 want_refresh = 1; 1736 want_refresh = 1;
1694
1695 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696 1737
1697#if USE_XIM 1738#if USE_XIM
1698 if (Input_Context != NULL) 1739 if (Input_Context != NULL)
1699 { 1740 {
1700 IMSetPosition (); 1741 IMSetPosition ();
… …
1712 scr_recolour (); 1753 scr_recolour ();
1713 } 1754 }
1714#endif 1755#endif
1715#if ENABLE_FRILLS 1756#if ENABLE_FRILLS
1716 if (option (Opt_urgentOnBell)) 1757 if (option (Opt_urgentOnBell))
1717 { 1758 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 1759#endif
1760
1761 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1725 } 1762 }
1726} 1763}
1727 1764
1728void 1765void
1729rxvt_term::focus_out () 1766rxvt_term::focus_out ()
… …
1731 if (focus) 1768 if (focus)
1732 { 1769 {
1733 focus = 0; 1770 focus = 0;
1734 want_refresh = 1; 1771 want_refresh = 1;
1735 1772
1736 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1773#if ENABLE_FRILLS
1737 1774 if (option (Opt_urgentOnBell))
1775 set_urgency (0);
1776#endif
1738#if ENABLE_FRILLS || ISO_14755 1777#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf) 1778 if (iso14755buf)
1740 { 1779 {
1741 iso14755buf = 0; 1780 iso14755buf = 0;
1742# if ISO_14755 1781# if ISO_14755
… …
1759 { 1798 {
1760 pix_colors = pix_colors_unfocused; 1799 pix_colors = pix_colors_unfocused;
1761 scr_recolour (); 1800 scr_recolour ();
1762 } 1801 }
1763#endif 1802#endif
1803
1804 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764 } 1805 }
1765} 1806}
1766 1807
1767void 1808void
1768rxvt_term::update_fade_color (unsigned int idx) 1809rxvt_term::update_fade_color (unsigned int idx)
… …
1845 /* save the xbutton state (for ButtonRelease) */ 1886 /* save the xbutton state (for ButtonRelease) */
1846 MEvent.state = ev.state; 1887 MEvent.state = ev.state;
1847#ifdef MOUSE_REPORT_DOUBLECLICK 1888#ifdef MOUSE_REPORT_DOUBLECLICK
1848 if (ev.button == MEvent.button && clickintime) 1889 if (ev.button == MEvent.button && clickintime)
1849 { 1890 {
1850 /* same button, within alloted time */ 1891 /* same button, within allowed time */
1851 MEvent.clicks++; 1892 MEvent.clicks++;
1852 1893
1853 if (MEvent.clicks > 1) 1894 if (MEvent.clicks > 1)
1854 { 1895 {
1855 /* only report double clicks */ 1896 /* only report double clicks */
… …
2010 } 2051 }
2011 2052
2012 if (scrollBar.style == R_SB_XTERM 2053 if (scrollBar.style == R_SB_XTERM
2013 || scrollbar_above_slider (ev.y) 2054 || scrollbar_above_slider (ev.y)
2014 || scrollbar_below_slider (ev.y)) 2055 || scrollbar_below_slider (ev.y))
2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2016 2057
2017 scrollBar.state = STATE_MOTION; 2058 scrollBar.state = STATE_MOTION;
2018 break; 2059 break;
2019 2060
2020 case Button1: 2061 case Button1:
… …
2043 else 2084 else
2044 { 2085 {
2045 scr_page ((ev.button == Button1 ? DN : UP), 2086 scr_page ((ev.button == Button1 ? DN : UP),
2046 (nrow 2087 (nrow
2047 * scrollbar_position (ev.y) 2088 * scrollbar_position (ev.y)
2048 / scrollbar_size ())); 2089 / scrollBar.size ()));
2049 } 2090 }
2050 2091
2051 break; 2092 break;
2052 } 2093 }
2053 } 2094 }
… …
2066 reportmode = !! (priv_modes & PrivMode_mouse_report); 2107 reportmode = !! (priv_modes & PrivMode_mouse_report);
2067 2108
2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2109 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2069 { 2110 {
2070 scrollBar.state = STATE_IDLE; 2111 scrollBar.state = STATE_IDLE;
2071 scrollbar_show (0); 2112 scrollBar.show (0);
2072 } 2113 }
2073 2114
2074#ifdef SELECTION_SCROLLING 2115#ifdef SELECTION_SCROLLING
2075 sel_scroll_ev.stop(); 2116 sel_scroll_ev.stop();
2076#endif 2117#endif
… …
2126 selection_make (ev.time); 2167 selection_make (ev.time);
2127 break; 2168 break;
2128 2169
2129 case Button2: 2170 case Button2:
2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2171 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); 2172 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132 break; 2173 break;
2133 2174
2134#ifdef MOUSE_WHEEL 2175#ifdef MOUSE_WHEEL
2135 case Button4: 2176 case Button4:
2136 case Button5: 2177 case Button5:
… …
2159 } 2200 }
2160 else 2201 else
2161# endif 2202# endif
2162 { 2203 {
2163 scr_page (v, i); 2204 scr_page (v, i);
2164 scrollbar_show (1); 2205 scrollBar.show (1);
2165 } 2206 }
2166 } 2207 }
2167 break; 2208 break;
2168#endif 2209#endif
2169 } 2210 }
2170 } 2211 }
2171} 2212}
2172 2213
2173/*}}} */ 2214/*}}} */
2174 2215
2175bool 2216void
2176rxvt_term::cmd_parse () 2217rxvt_term::cmd_parse ()
2177{ 2218{
2178 bool flag = false;
2179 wchar_t ch = NOCHAR; 2219 wchar_t ch = NOCHAR;
2180 char *seq_begin; // remember start of esc-sequence here 2220 char *seq_begin; // remember start of esc-sequence here
2181 2221
2182 for (;;) 2222 for (;;)
2183 { 2223 {
2184 if (ch == NOCHAR) 2224 if (expect_false (ch == NOCHAR))
2185 { 2225 {
2186 seq_begin = cmdbuf_ptr; 2226 seq_begin = cmdbuf_ptr;
2187 ch = next_char (); 2227 ch = next_char ();
2188 2228
2189 if (ch == NOCHAR) 2229 if (ch == NOCHAR)
2190 break; 2230 break;
2191 } 2231 }
2192 2232
2193 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2233 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2194 { 2234 {
2195 if (!seen_input) 2235 if (expect_false (!seen_input))
2196 { 2236 {
2197 seen_input = 1; 2237 seen_input = 1;
2198 // many badly-written programs (e.g. jed) contain a race condition: 2238 // many badly-written programs (e.g. jed) contain a race condition:
2199 // they first read the screensize and then install a SIGWINCH handler. 2239 // they first read the screensize and then install a SIGWINCH handler.
2200 // some window managers resize the window early, and these programs 2240 // some window managers resize the window early, and these programs
… …
2213 wchar_t *str = buf; 2253 wchar_t *str = buf;
2214 wchar_t *eol = str + min (ncol, UBUFSIZ); 2254 wchar_t *eol = str + min (ncol, UBUFSIZ);
2215 2255
2216 for (;;) 2256 for (;;)
2217 { 2257 {
2218 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2258 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2219 break; 2259 break;
2220 2260
2221 *str++ = ch; 2261 *str++ = ch;
2222 2262
2223 if (ch == C0_LF || str >= eol) 2263 if (expect_false (ch == C0_LF || str >= eol))
2224 { 2264 {
2225 if (ch == C0_LF) 2265 if (ch == C0_LF)
2226 nlines++; 2266 nlines++;
2227 2267
2228 refresh_count++; 2268 refresh_count++;
… …
2277 * What the heck we'll cheat and only refresh less than every page-full. 2317 * What the heck we'll cheat and only refresh less than every page-full.
2278 * if skipScroll is enabled. 2318 * if skipScroll is enabled.
2279 */ 2319 */
2280 if (refreshnow) 2320 if (refreshnow)
2281 { 2321 {
2282 flag = true;
2283 scr_refresh (); 2322 scr_refresh ();
2284 want_refresh = 1; 2323 want_refresh = 1;
2285 } 2324 }
2286
2287 } 2325 }
2288 else 2326 else
2289 { 2327 {
2290 try 2328 try
2291 { 2329 {
… …
2299 } 2337 }
2300 2338
2301 ch = NOCHAR; 2339 ch = NOCHAR;
2302 } 2340 }
2303 } 2341 }
2304
2305 return flag;
2306} 2342}
2307 2343
2308// read the next character 2344// read the next character
2309wchar_t 2345wchar_t
2310rxvt_term::next_char () NOTHROW 2346rxvt_term::next_char () NOTHROW
2311{ 2347{
2312 while (cmdbuf_ptr < cmdbuf_endp) 2348 while (cmdbuf_ptr < cmdbuf_endp)
2313 { 2349 {
2314 // assume 7-bit to be ascii ALWAYS 2350 // assume 7-bit to be ascii ALWAYS
2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2351 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2316 return *cmdbuf_ptr++; 2352 return *cmdbuf_ptr++;
2317 2353
2318 wchar_t wc; 2354 wchar_t wc;
2319 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2355 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2320 2356
… …
2324 cmdbuf_ptr = cmdbuf_endp; 2360 cmdbuf_ptr = cmdbuf_endp;
2325 break; 2361 break;
2326 } 2362 }
2327 2363
2328 if (len == (size_t)-1) 2364 if (len == (size_t)-1)
2365 {
2366 mbstate.reset (); // reset now undefined conversion state
2329 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2367 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2368 }
2330 2369
2331 // assume wchar == unicode 2370 // assume wchar == unicode
2332 cmdbuf_ptr += len; 2371 cmdbuf_ptr += len;
2333 return wc & UNICODE_MASK; 2372 return wc & UNICODE_MASK;
2334 } 2373 }
… …
2378/*----------------------------------------------------------------------*/ 2417/*----------------------------------------------------------------------*/
2379#ifdef PRINTPIPE 2418#ifdef PRINTPIPE
2380FILE * 2419FILE *
2381rxvt_term::popen_printer () 2420rxvt_term::popen_printer ()
2382{ 2421{
2383 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2422 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2384 2423
2385 if (stream == NULL) 2424 if (stream == NULL)
2386 rxvt_warn ("can't open printer pipe, not printing.\n"); 2425 rxvt_warn ("can't open printer pipe, not printing.\n");
2387 2426
2388 return stream; 2427 return stream;
… …
2399 * simulate attached vt100 printer 2438 * simulate attached vt100 printer
2400 */ 2439 */
2401void 2440void
2402rxvt_term::process_print_pipe () 2441rxvt_term::process_print_pipe ()
2403{ 2442{
2404 int done; 2443 FILE *fd = popen_printer ();
2405 FILE *fd;
2406 2444
2407 if ((fd = popen_printer ()) == NULL) 2445 if (!fd)
2408 return; 2446 return;
2409 2447
2410 /* 2448 /*
2411 * Send all input to the printer until either ESC[4i or ESC[?4i 2449 * Send all input to the printer until either ESC[4i or ESC[?4i
2412 * is received. 2450 * is received.
2413 */ 2451 */
2414 for (done = 0; !done;) 2452 for (int done = 0; !done; )
2415 { 2453 {
2416 unsigned char buf[8]; 2454 unsigned char buf[8];
2417 unicode_t ch; 2455 unicode_t ch;
2418 unsigned int i, len; 2456 unsigned int i, len;
2419 2457
… …
2564 break; 2602 break;
2565 case 'Z': /* identify the terminal type */ 2603 case 'Z': /* identify the terminal type */
2566 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2604 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2567 break; 2605 break;
2568 case '<': /* turn off VT52 mode */ 2606 case '<': /* turn off VT52 mode */
2569 PrivMode (0, PrivMode_vt52); 2607 set_privmode (PrivMode_vt52, 0);
2570 break; 2608 break;
2571 case 'F': /* use special graphics character set */ 2609 case 'F': /* use special graphics character set */
2572 case 'G': /* use regular character set */ 2610 case 'G': /* use regular character set */
2573 /* unimplemented */ 2611 /* unimplemented */
2574 break; 2612 break;
… …
2628 scr_forwardindex (); 2666 scr_forwardindex ();
2629 break; 2667 break;
2630#endif 2668#endif
2631 case '=': 2669 case '=':
2632 case '>': 2670 case '>':
2633 PrivMode ((ch == '='), PrivMode_aplKP); 2671 set_privmode (PrivMode_aplKP, ch == '=');
2634 break; 2672 break;
2635 2673
2636 case C1_40: 2674 case C1_40:
2637 cmd_getc (); 2675 cmd_getc ();
2638 break; 2676 break;
… …
2677 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2715 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2678 case C1_SCI: /* ESC Z */ 2716 case C1_SCI: /* ESC Z */
2679 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2717 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2680 break; /* steal obsolete ESC [ c */ 2718 break; /* steal obsolete ESC [ c */
2681 2719
2682 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2720 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2683 case C1_CSI: /* ESC [ */ 2721 case C1_CSI: /* ESC [ */
2684 process_csi_seq (); 2722 process_csi_seq ();
2685 break; 2723 break;
2686 2724
2687 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2725 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2688 case C1_OSC: /* ESC ] */ 2726 case C1_OSC: /* ESC ] */
2689 process_osc_seq (); 2727 process_osc_seq ();
2690 break; 2728 break;
2691 2729
2692 /* 8.3.106: RESET TO INITIAL STATE */ 2730 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2693 case 'c': 2731 case 'c':
2694 mbstate.reset (); 2732 mbstate.reset ();
2695 scr_poweron (); 2733 scr_poweron ();
2696 scrollbar_show (1); 2734 scrollBar.show (1);
2697 break; 2735 break;
2698 2736
2699 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2737 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2700 case 'n': 2738 case 'n':
2701 scr_charset_choose (2); 2739 scr_charset_choose (2);
… …
2752 2790
2753 nargs = 0; 2791 nargs = 0;
2754 2792
2755 priv = 0; 2793 priv = 0;
2756 ch = cmd_getc (); 2794 ch = cmd_getc ();
2757 if (ch >= '<' && ch <= '?') 2795 if ((ch >= '<' && ch <= '?') || ch == '!')
2758 { 2796 {
2759 /* '<' '=' '>' '?' */ 2797 /* '<' '=' '>' '?' '!' */
2760 priv = ch; 2798 priv = ch;
2761 ch = cmd_getc (); 2799 ch = cmd_getc ();
2762 } 2800 }
2763 2801
2764 /* read any numerical arguments */ 2802 /* read any numerical arguments */
… …
2818 2856
2819 case '?': 2857 case '?':
2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2858 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2821 process_terminal_mode (ch, priv, nargs, arg); 2859 process_terminal_mode (ch, priv, nargs, arg);
2822 break; 2860 break;
2861
2862 case '!':
2863 if (ch == CSI_70)
2864 {
2865 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2866 scr_soft_reset ();
2867
2868 static const int pm_h[] = { 7, 25 };
2869 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2870
2871 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2872 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2823 } 2873 }
2874 break;
2875 }
2876
2824 return; 2877 return;
2825 } 2878 }
2826 2879
2827 switch (ch) 2880 switch (ch)
2828 { 2881 {
… …
3195 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3248 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3196 */ 3249 */
3197void 3250void
3198rxvt_term::process_dcs_seq () 3251rxvt_term::process_dcs_seq ()
3199{ 3252{
3200 char *s;
3201 unicode_t eh;
3202
3203 /* 3253 /*
3204 * Not handled yet 3254 * Not handled yet
3205 */ 3255 */
3256
3257 unicode_t eh;
3206 s = get_to_st (eh); 3258 char *s = get_to_st (eh);
3207 if (s) 3259 if (s)
3208 free (s); 3260 free (s);
3209 3261
3210 return; 3262 return;
3211} 3263}
… …
3215 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3267 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3216 */ 3268 */
3217void 3269void
3218rxvt_term::process_osc_seq () 3270rxvt_term::process_osc_seq ()
3219{ 3271{
3220 unicode_t ch, eh;
3221 int arg; 3272 int arg;
3222 3273
3223 ch = cmd_getc (); 3274 unicode_t ch = cmd_getc ();
3224 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3275 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3225 arg = arg * 10 + (ch - '0'); 3276 arg = arg * 10 + (ch - '0');
3226 3277
3227 if (ch == ';') 3278 if (ch == ';')
3228 { 3279 {
3280 unicode_t eh;
3229 char *s = get_to_st (eh); 3281 char *s = get_to_st (eh);
3230 3282
3231 if (s) 3283 if (s)
3232 { 3284 {
3233 process_xterm_seq (arg, s, eh); 3285 process_xterm_seq (arg, s, eh);
… …
3257 3309
3258/* 3310/*
3259 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3311 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3260 */ 3312 */
3261void 3313void
3262rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3314rxvt_term::process_xterm_seq (int op, char *str, char resp)
3263{ 3315{
3264 int color; 3316 int color;
3265 char *buf, *name; 3317 char *buf, *name;
3266 bool query = str[0] == '?' && !str[1]; 3318 bool query = str[0] == '?' && !str[1];
3267 int saveop = op; 3319 int saveop = op;
… …
3308 3360
3309 XFree (value); 3361 XFree (value);
3310 } 3362 }
3311 else 3363 else
3312 { 3364 {
3313 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3365 char *eq = strchr (str, '=');
3314 3366
3315 if (eq) 3367 if (eq)
3316 { 3368 {
3317 *eq = 0; 3369 *eq = 0;
3318 set_utf8_property (display->atom (str), eq + 1); 3370 set_utf8_property (display->atom (str), eq + 1);
… …
3358 process_color_seq (op, Color_pointer_fg, str, resp); 3410 process_color_seq (op, Color_pointer_fg, str, resp);
3359 break; 3411 break;
3360 case XTerm_Color_pointer_bg: 3412 case XTerm_Color_pointer_bg:
3361 process_color_seq (op, Color_pointer_bg, str, resp); 3413 process_color_seq (op, Color_pointer_bg, str, resp);
3362 break; 3414 break;
3415#ifdef OPTION_HC
3416 case XTerm_Color_HC:
3417 process_color_seq (op, Color_HC, str, resp);
3418 break;
3419 case XTerm_Color_HTC:
3420 process_color_seq (op, Color_HTC, str, resp);
3421 break;
3422#endif
3363#ifndef NO_BOLD_UNDERLINE_REVERSE 3423#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: 3424 case URxvt_Color_BD:
3369 process_color_seq (op, Color_BD, str, resp); 3425 process_color_seq (op, Color_BD, str, resp);
3370 break; 3426 break;
3371 case Rxvt_Color_UL:
3372 case URxvt_Color_UL: 3427 case URxvt_Color_UL:
3373 process_color_seq (op, Color_UL, str, resp); 3428 process_color_seq (op, Color_UL, str, resp);
3374 break; 3429 break;
3375 case URxvt_Color_IT: 3430 case URxvt_Color_IT:
3376 process_color_seq (op, Color_IT, str, resp); 3431 process_color_seq (op, Color_IT, str, resp);
3377 break; 3432 break;
3378#endif 3433#endif
3434 case URxvt_Color_border:
3435 process_color_seq (op, Color_border, str, resp);
3436 break;
3379#if ENABLE_TRANSPARENCY 3437#if ENABLE_TRANSPARENCY
3380 case URxvt_Color_tint: 3438 case URxvt_Color_tint:
3381 process_color_seq (op, Color_tint, str, resp); 3439 process_color_seq (op, Color_tint, str, resp);
3382 { 3440 {
3383 bool changed = false; 3441 bool changed = false;
… …
3398 case Rxvt_Pixmap: 3456 case Rxvt_Pixmap:
3399 if (!strcmp (str, "?")) 3457 if (!strcmp (str, "?"))
3400 { 3458 {
3401 char str[256]; 3459 char str[256];
3402 3460
3403 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3461 sprintf (str, "[%dx%d+%d+%d]",
3404 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3462 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3405 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3463 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3406 process_xterm_seq (XTerm_title, str, CHAR_ST); 3464 process_xterm_seq (XTerm_title, str, CHAR_ST);
3407 } 3465 }
3408 else 3466 else
3409 { 3467 {
3410 int changed = 0; 3468 int changed = 0;
3411 3469
3412 if (*str != ';') 3470 if (*str != ';')
3413 { 3471 {
3414 /* reset to default scaling :*/
3415 bgPixmap.unset_geometry ();
3416 if (bgPixmap.set_file (str)) /* change pixmap */ 3472 if (bgPixmap.set_file (str)) /* change pixmap */
3473 {
3417 changed++; 3474 changed++;
3418 str = strchr (str, ';'); 3475 str = strchr (str, ';');
3419 if (str == NULL) 3476 if (str == NULL)
3420 bgPixmap.set_defaultGeometry (); 3477 bgPixmap.set_defaultGeometry ();
3478 else
3479 bgPixmap.set_geometry (str+1);
3480 }
3421 } 3481 }
3422 3482 else
3423 while (str)
3424 { 3483 {
3425 str++; 3484 str++;
3426 if (bgPixmap.set_geometry (str)) 3485 if (bgPixmap.set_geometry (str, true))
3427 changed++; 3486 changed++;
3428 str = strchr (str, ';');
3429 } 3487 }
3430 3488
3431 if (changed) 3489 if (changed)
3490 {
3491 if (bgPixmap.window_position_sensitive ())
3492 {
3493 int x, y;
3494 get_window_origin (x, y);
3495 bgPixmap.set_position (x, y);
3496 }
3432 update_background (); 3497 update_background ();
3498 }
3433 } 3499 }
3434 break; 3500 break;
3435#endif 3501#endif
3436 3502
3437 case XTerm_logfile: 3503 case XTerm_logfile:
… …
3507 break; 3573 break;
3508#endif 3574#endif
3509 3575
3510#if ENABLE_PERL 3576#if ENABLE_PERL
3511 case URxvt_perl: 3577 case URxvt_perl:
3512 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3578 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3513 ; // no responses yet
3514 break; 3579 break;
3515#endif 3580#endif
3516 } 3581 }
3517} 3582}
3518/*----------------------------------------------------------------------*/ 3583/*----------------------------------------------------------------------*/
… …
3541 { 3606 {
3542 if (mode == 'r') 3607 if (mode == 'r')
3543 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3544 else 3609 else
3545 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3610 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3546 PrivMode (state, bit); 3611
3612 set_privmode (bit, state);
3547 } 3613 }
3548 3614
3549 return state; 3615 return state;
3550} 3616}
3551 3617
… …
3559 static const struct 3625 static const struct
3560 { 3626 {
3561 const int argval; 3627 const int argval;
3562 const unsigned long bit; 3628 const unsigned long bit;
3563 } argtopriv[] = { 3629 } argtopriv[] = {
3564 { 1, PrivMode_aplCUR }, 3630 { 1, PrivMode_aplCUR }, // DECCKM
3565 { 2, PrivMode_vt52 }, 3631 { 2, PrivMode_vt52 },
3566 { 3, PrivMode_132 }, 3632 { 3, PrivMode_132 }, // DECCOLM
3567 { 4, PrivMode_smoothScroll }, 3633 { 4, PrivMode_smoothScroll }, // DECSCLM
3568 { 5, PrivMode_rVideo }, 3634 { 5, PrivMode_rVideo }, // DECSCNM
3569 { 6, PrivMode_relOrigin }, 3635 { 6, PrivMode_relOrigin }, // DECOM
3570 { 7, PrivMode_Autowrap }, 3636 { 7, PrivMode_Autowrap }, // DECAWM
3571 // 8, bi-directional support mode 3637 // 8, auto-repeat keys // DECARM
3572 { 9, PrivMode_MouseX10 }, 3638 { 9, PrivMode_MouseX10 },
3573 // 18, 19 printing-related 3639 // 18 end FF to printer after print screen
3640 // 19 Print screen prints full screen/scroll region
3574 { 25, PrivMode_VisibleCursor }, 3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3575#ifdef scrollBar_esc 3642#ifdef scrollBar_esc
3576 { scrollBar_esc, PrivMode_scrollBar }, 3643 { scrollBar_esc, PrivMode_scrollBar },
3577#endif 3644#endif
3578 { 35, PrivMode_ShiftKeys }, // rxvt extension 3645 { 35, PrivMode_ShiftKeys }, // rxvt extension
3646 // 38, tektronix mode // DECTEK
3579 { 40, PrivMode_132OK }, 3647 { 40, PrivMode_132OK },
3580 // 41 xterm more fixes NYI 3648 // 41 xterm more fixes NYI
3581 // 45 margin bell NYI 3649 // 45 margin bell NYI
3582 // 46 start logging 3650 // 46 start logging
3583 { 47, PrivMode_Screen }, 3651 { 47, PrivMode_Screen },
3584 { 66, PrivMode_aplKP }, 3652 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3585#ifndef NO_BACKSPACE_KEY 3653#ifndef NO_BACKSPACE_KEY
3586 { 67, PrivMode_BackSpace }, 3654 { 67, PrivMode_BackSpace }, // DECBKM
3587#endif 3655#endif
3588 { 1000, PrivMode_MouseX11 }, 3656 { 1000, PrivMode_MouseX11 },
3589 { 1002, PrivMode_MouseBtnEvent }, 3657 { 1002, PrivMode_MouseBtnEvent },
3590 { 1003, PrivMode_MouseAnyEvent }, 3658 { 1003, PrivMode_MouseAnyEvent },
3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3659 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
… …
3630 3698
3631 scr_touch (true); 3699 scr_touch (true);
3632 break; 3700 break;
3633#endif 3701#endif
3634 case 1048: /* alternative cursor save */ 3702 case 1048: /* alternative cursor save */
3635 case 1049:
3636 if (option (Opt_secondaryScreen)) 3703 if (option (Opt_secondaryScreen))
3637 if (mode == 0) 3704 if (mode == 0)
3638 scr_cursor (RESTORE); 3705 scr_cursor (RESTORE);
3639 else if (mode == 1) 3706 else if (mode == 1)
3640 scr_cursor (SAVE); 3707 scr_cursor (SAVE);
… …
3649 case 2: /* VT52 mode */ 3716 case 2: /* VT52 mode */
3650 /* oddball mode. should be set regardless of set/reset 3717 /* oddball mode. should be set regardless of set/reset
3651 * parameter. Return from VT52 mode with an ESC < from 3718 * parameter. Return from VT52 mode with an ESC < from
3652 * within VT52 mode 3719 * within VT52 mode
3653 */ 3720 */
3654 PrivMode (1, PrivMode_vt52); 3721 set_privmode (PrivMode_vt52, 1);
3655 break; 3722 break;
3656 case 3: /* 80/132 */ 3723 case 3: /* 80/132 */
3657 if (priv_modes & PrivMode_132OK) 3724 if (priv_modes & PrivMode_132OK)
3658 {
3659 scr_poweron ();
3660 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3725 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3661 }
3662 break; 3726 break;
3663 case 4: /* smooth scrolling */ 3727 case 4: /* smooth scrolling */
3664 set_option (Opt_jumpScroll, !state); 3728 set_option (Opt_jumpScroll, !state);
3665 break; 3729 break;
3666 case 5: /* reverse video */ 3730 case 5: /* reverse video */
… …
3677 if (state) /* orthogonal */ 3741 if (state) /* orthogonal */
3678 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3742 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3679 break; 3743 break;
3680#ifdef scrollBar_esc 3744#ifdef scrollBar_esc
3681 case scrollBar_esc: 3745 case scrollBar_esc:
3682 if (scrollbar_mapping (state)) 3746 if (scrollBar.map (state))
3683 { 3747 {
3684 resize_all_windows (0, 0, 0); 3748 resize_all_windows (0, 0, 0);
3685 scr_touch (true); 3749 scr_touch (true);
3686 } 3750 }
3687 break; 3751 break;
… …
3708 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3772 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3709 vt_emask_mouse = PointerMotionMask; 3773 vt_emask_mouse = PointerMotionMask;
3710 } 3774 }
3711 else 3775 else
3712 vt_emask_mouse = NoEventMask; 3776 vt_emask_mouse = NoEventMask;
3777
3713 vt_select_input (); 3778 vt_select_input ();
3714 break; 3779 break;
3715 case 1010: /* scroll to bottom on TTY output inhibit */ 3780 case 1010: /* scroll to bottom on TTY output inhibit */
3716 set_option (Opt_scrollTtyOutput, !state); 3781 set_option (Opt_scrollTtyOutput, !state);
3717 break; 3782 break;
3718 case 1011: /* scroll to bottom on key press */ 3783 case 1011: /* scroll to bottom on key press */
3719 set_option (Opt_scrollTtyKeypress, state); 3784 set_option (Opt_scrollTtyKeypress, state);
3720 break; 3785 break;
3721 case 1047: /* secondary screen w/ clearing last */ 3786 case 1047: /* secondary screen w/ clearing last */
3722 if (option (Opt_secondaryScreen)) 3787 if (option (Opt_secondaryScreen))
3723 if (current_screen != PRIMARY) 3788 if (!state)
3724 scr_erase_screen (2); 3789 scr_erase_screen (2);
3790
3725 scr_change_screen (state); 3791 scr_change_screen (state);
3726 break; 3792 break;
3727 case 1049: /* secondary screen w/ clearing first */ 3793 case 1049: /* secondary screen w/ clearing first */
3794 if (option (Opt_secondaryScreen))
3795 if (state)
3796 scr_cursor (SAVE);
3797
3728 scr_change_screen (state); 3798 scr_change_screen (state);
3799
3729 if (option (Opt_secondaryScreen)) 3800 if (option (Opt_secondaryScreen))
3730 if (current_screen != PRIMARY) 3801 if (state)
3731 scr_erase_screen (2); 3802 scr_erase_screen (2);
3803 else
3804 scr_cursor (RESTORE);
3732 break; 3805 break;
3733 default: 3806 default:
3734 break; 3807 break;
3735 } 3808 }
3736 } 3809 }

Diff Legend

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