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.552 by sf-exg, Fri Jul 25 17:03:38 2014 UTC vs.
Revision 1.595 by root, Sun Nov 21 23:34:23 2021 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de> 30 * Copyright (c) 2003-2021 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 3 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
36 * (at your option) any later version. 36 * (at your option) any later version.
… …
168 int len; 168 int len;
169 169
170# if ENABLE_COMBINING 170# if ENABLE_COMBINING
171 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
172 { 172 {
173 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch);
174 alloc = chr = new wchar_t[len]; 174 alloc = chr = new wchar_t[len];
175 rxvt_composite.expand (ch, chr); 175 rxvt_composite.expand (ch, chr);
176 } 176 }
177 else 177 else
178# endif 178# endif
… …
210 210
211 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
212 212
213 if (y >= 0) 213 if (y >= 0)
214 { 214 {
215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
216 x = 0; 216 x = 0;
217 } 217 }
218 218
219 scr_overlay_new (x, y, width, len * 2 + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220 220
… …
315 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left 316 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up 317 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right 318 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down 319 XK_KP_2, // XK_KP_Down
320# ifndef UNSHIFTED_SCROLLKEYS
321 XK_KP_9, // XK_KP_Prior 320 XK_KP_9, // XK_KP_Prior
322 XK_KP_3, // XK_KP_Next 321 XK_KP_3, // XK_KP_Next
323# else
324 XK_Prior,
325 XK_Next,
326# endif
327 XK_KP_1, // XK_KP_End 322 XK_KP_1, // XK_KP_End
328 XK_KP_5, // XK_KP_Begin 323 XK_KP_5, // XK_KP_Begin
329 }; 324 };
330 325
331 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 326 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
… …
376 param = 3; 371 param = 3;
377 break; 372 break;
378 case XK_Select: 373 case XK_Select:
379 param = 4; 374 param = 4;
380 break; 375 break;
381#ifndef UNSHIFTED_SCROLLKEYS
382 case XK_Prior: 376 case XK_Prior:
383 param = 5; 377 param = 5;
384 break; 378 break;
385 case XK_Next: 379 case XK_Next:
386 param = 6; 380 param = 6;
… …
389 param = 7; 383 param = 7;
390 break; 384 break;
391 case XK_End: 385 case XK_End:
392 param = 8; 386 param = 8;
393 break; 387 break;
394#endif
395 case XK_Help: 388 case XK_Help:
396 param = 28; 389 param = 28;
397 break; 390 break;
398 case XK_Menu: 391 case XK_Menu:
399 param = 29; 392 param = 29;
… …
683 { 676 {
684 char *ch; 677 char *ch;
685 678
686 for (ch = kbuf; ch < kbuf + len; ch++) 679 for (ch = kbuf; ch < kbuf + len; ch++)
687 *ch |= 0x80; 680 *ch |= 0x80;
688
689 meta = 0;
690 } 681 }
691#endif 682#endif
692 /* nil */ ; 683 /* nil */ ;
693 } 684 }
694 685
… …
1043 1034
1044#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1045void 1036void
1046rxvt_term::cursor_blink_reset () 1037rxvt_term::cursor_blink_reset ()
1047{ 1038{
1039 if (!focus)
1040 return;
1041
1048 if (hidden_cursor) 1042 if (hidden_cursor)
1049 { 1043 {
1050 hidden_cursor = 0; 1044 hidden_cursor = 0;
1051 want_refresh = 1; 1045 want_refresh = 1;
1052 } 1046 }
1053 1047
1054 if (option (Opt_cursorBlink)) 1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1055 cursor_blink_ev.again (); 1049 cursor_blink_ev.again ();
1056 else 1050 else
1057 cursor_blink_ev.stop (); 1051 cursor_blink_ev.stop ();
1058} 1052}
1059 1053
… …
1248 1242
1249void ecb_cold 1243void ecb_cold
1250rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1251{ 1245{
1252 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1253 recolour_cursor (); 1247 recolor_cursor ();
1254 1248
1255#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1256 hidden_pointer = 0; 1250 hidden_pointer = 0;
1257 1251
1258 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
… …
1283#endif 1277#endif
1284 1278
1285void 1279void
1286rxvt_term::mouse_report (XButtonEvent &ev) 1280rxvt_term::mouse_report (XButtonEvent &ev)
1287{ 1281{
1288 int button_number, key_state = 0; 1282 int button_number, state = 0;
1289 int x, y; 1283 int x, y;
1290 int code = 32; 1284 bool release = ev.type == ButtonRelease;
1291 1285
1292 x = Pixel2Col (ev.x) + 1; 1286 x = Pixel2Col (ev.x) + 1;
1293 y = Pixel2Row (ev.y) + 1; 1287 y = Pixel2Row (ev.y) + 1;
1294 1288
1295 if (ev.type == MotionNotify) 1289 if (ev.type == MotionNotify)
… …
1297 if (x == mouse_row && y == mouse_col) 1291 if (x == mouse_row && y == mouse_col)
1298 return; 1292 return;
1299 1293
1300 mouse_row = x; 1294 mouse_row = x;
1301 mouse_col = y; 1295 mouse_col = y;
1302 code += 32; 1296 state += 32;
1303 }
1304
1305 if (MEvent.button == AnyButton)
1306 button_number = 3;
1307 else
1308 { 1297 }
1298
1309 button_number = MEvent.button - Button1; 1299 button_number = MEvent.button - Button1;
1310 /* add 0x3D for wheel events, like xterm does */ 1300 /* add 0x3D for wheel events, like xterm does */
1311 if (button_number >= 3) 1301 if (button_number >= 3)
1312 button_number += 64 - 3; 1302 button_number += 64 - 3;
1313 }
1314 1303
1315 if (priv_modes & PrivMode_MouseX10) 1304 if (priv_modes & PrivMode_MouseX10)
1316 { 1305 {
1317 /* 1306 /*
1318 * do not report ButtonRelease 1307 * do not report ButtonRelease
1319 * no state info allowed 1308 * no state info allowed
1320 */ 1309 */
1321 key_state = 0; 1310 if (release)
1322 if (button_number == 3)
1323 return; 1311 return;
1324 } 1312 }
1325 else 1313 else
1326 { 1314 {
1327 /* XTerm mouse reporting needs these values: 1315 /* XTerm mouse reporting needs these values:
… …
1329 * 8 = Meta 1317 * 8 = Meta
1330 * 16 = Control 1318 * 16 = Control
1331 * plus will add in our own Double-Click reporting 1319 * plus will add in our own Double-Click reporting
1332 * 32 = Double Click 1320 * 32 = Double Click
1333 */ 1321 */
1334 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1322 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1335 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1323 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1336 + ((MEvent.state & ControlMask) ? 16 : 0); 1324 + ((MEvent.state & ControlMask) ? 16 : 0);
1337#ifdef MOUSE_REPORT_DOUBLECLICK 1325#ifdef MOUSE_REPORT_DOUBLECLICK
1338 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1326 state += ((MEvent.clicks > 1) ? 32 : 0);
1339#endif 1327#endif
1340 } 1328 }
1329
1330 int code = 32 + (release ? 3 : button_number) + state;
1341 1331
1342#if DEBUG_MOUSEREPORT 1332#if DEBUG_MOUSEREPORT
1343 fprintf (stderr, "Mouse ["); 1333 fprintf (stderr, "Mouse [");
1344 if (key_state & 16) 1334 if (state & 16)
1345 fputc ('C', stderr); 1335 fputc ('C', stderr);
1346 if (key_state & 4) 1336 if (state & 4)
1347 fputc ('S', stderr); 1337 fputc ('S', stderr);
1348 if (key_state & 8) 1338 if (state & 8)
1349 fputc ('A', stderr); 1339 fputc ('A', stderr);
1350 if (key_state & 32) 1340 if (state & 32)
1351 fputc ('2', stderr); 1341 fputc ('2', stderr);
1352 fprintf (stderr, "]: <%d>, %d/%d\n", 1342 fprintf (stderr, "]: <%d>, %d/%d\n",
1353 button_number, 1343 button_number,
1354 x, 1344 x,
1355 y); 1345 y);
1356#endif 1346#endif
1357 1347
1358#if ENABLE_FRILLS 1348#if ENABLE_FRILLS
1359 if (priv_modes & PrivMode_ExtMouseRight) 1349 if (priv_modes & PrivMode_ExtMouseSGR)
1350 tt_printf ("\033[<%d;%d;%d%c",
1351 button_number + state,
1352 x,
1353 y,
1354 release ? 'm' : 'M');
1355 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1360 tt_printf ("\033[%d;%d;%dM", 1356 tt_printf ("\033[%d;%d;%dM",
1361 code + button_number + key_state, 1357 code,
1362 x, 1358 x,
1363 y); 1359 y);
1364 else if (priv_modes & PrivMode_ExtModeMouse) 1360 else if (priv_modes & PrivMode_ExtMouseUTF8)
1365 tt_printf ("\033[M%c%lc%lc", 1361 tt_printf ("\033[M%c%lc%lc",
1366 code + button_number + key_state, 1362 code,
1367 wint_t (32 + x), 1363 wint_t (32 + x),
1368 wint_t (32 + y)); 1364 wint_t (32 + y));
1369 else 1365 else
1370#endif 1366#endif
1371 tt_printf ("\033[M%c%c%c", 1367 tt_printf ("\033[M%c%c%c",
1372 code + button_number + key_state, 1368 code,
1373 32 + x, 1369 32 + x,
1374 32 + y); 1370 32 + y);
1375} 1371}
1376 1372
1377/*{{{ process an X event */ 1373/*{{{ process an X event */
… …
1488 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1489 ; 1485 ;
1490 1486
1491 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE); 1487 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1492 1488
1493 bool moved = false;
1494#ifdef HAVE_BG_PIXMAP
1495 if (bg_window_position_sensitive ())
1496 {
1497 want_position_change = true;
1498 if (bg_img == 0)
1499 moved = true;
1500 }
1501#endif
1502
1503 if (want_position_change) 1489 if (want_position_change)
1504 { 1490 {
1505 int x, y; 1491 int x, y;
1506 1492
1507 if (ev.xconfigure.send_event) 1493 if (ev.xconfigure.send_event)
… …
1515 if (x != parent_x || y != parent_y) 1501 if (x != parent_x || y != parent_y)
1516 { 1502 {
1517 parent_x = x; 1503 parent_x = x;
1518 parent_y = y; 1504 parent_y = y;
1519 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END)); 1505 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1520 moved = true;
1521 } 1506 }
1522 } 1507 }
1523 1508
1524 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1509 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1525 { 1510 {
1526 seen_resize = 1; 1511 seen_resize = 1;
1527 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1512 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1528 } 1513 }
1529 else
1530 {
1531#ifdef HAVE_BG_PIXMAP
1532 if (moved)
1533 update_background ();
1534#endif
1535 }
1536 1514
1537 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1538 } 1516 }
1539 break; 1517 break;
1540 1518
… …
1549 case SelectionRequest: 1527 case SelectionRequest:
1550 selection_send (ev.xselectionrequest); 1528 selection_send (ev.xselectionrequest);
1551 break; 1529 break;
1552 1530
1553 case MapNotify: 1531 case MapNotify:
1554#ifdef HAVE_BG_PIXMAP
1555 // This is needed at startup for the case of no window manager
1556 // or a non-reparenting window manager and also because we
1557 // defer bg image updates if the window is not mapped. The
1558 // short delay is to optimize for multiple ConfigureNotify
1559 // events at startup when the window manager reparents the
1560 // window, so as to perform the computation after we have
1561 // received all of them.
1562 if (bg_img == 0)
1563 update_background_ev.start (0.025);
1564#endif
1565 mapped = 1; 1532 mapped = 1;
1566#ifdef TEXT_BLINK 1533#ifdef TEXT_BLINK
1567 text_blink_ev.start (); 1534 text_blink_ev.start ();
1568#endif 1535#endif
1569 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1536 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1618 case MotionNotify: 1585 case MotionNotify:
1619#ifdef POINTER_BLANK 1586#ifdef POINTER_BLANK
1620 if (hidden_pointer) 1587 if (hidden_pointer)
1621 pointer_unblank (); 1588 pointer_unblank ();
1622#endif 1589#endif
1590 if (!bypass_keystate
1623 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1591 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1624 || priv_modes & PrivMode_MouseAnyEvent) 1592 || priv_modes & PrivMode_MouseAnyEvent))
1625 mouse_report (ev.xbutton); 1593 mouse_report (ev.xbutton);
1626 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1627 break; 1595 break;
1628 1596
1629 if (ev.xany.window == vt) 1597 if (ev.xany.window == vt)
… …
1641 &unused_root_x, &unused_root_y, 1609 &unused_root_x, &unused_root_y,
1642 &ev.xbutton.x, &ev.xbutton.y, 1610 &ev.xbutton.x, &ev.xbutton.y,
1643 &ev.xbutton.state); 1611 &ev.xbutton.state);
1644#ifdef MOUSE_THRESHOLD 1612#ifdef MOUSE_THRESHOLD
1645 /* deal with a `jumpy' mouse */ 1613 /* deal with a `jumpy' mouse */
1646 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1614 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1615#endif
1647 { 1616 {
1648#endif
1649#if ISO_14755 1617#if ISO_14755
1650 // 5.4 1618 // 5.4
1651 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1619 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1652 { 1620 {
1653 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1621 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1702 * shouldn't be scrolling 1670 * shouldn't be scrolling
1703 */ 1671 */
1704 sel_scroll_ev.stop(); 1672 sel_scroll_ev.stop();
1705 } 1673 }
1706#endif 1674#endif
1707#ifdef MOUSE_THRESHOLD
1708 } 1675 }
1709#endif
1710 } 1676 }
1711 } 1677 }
1712 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win) 1678 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1713 { 1679 {
1714 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1680 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
… …
1788#endif 1754#endif
1789#if OFF_FOCUS_FADING 1755#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade]) 1756 if (rs[Rs_fade])
1791 { 1757 {
1792 pix_colors = pix_colors_focused; 1758 pix_colors = pix_colors_focused;
1793 scr_recolour (); 1759 scr_recolor ();
1794 } 1760 }
1795#endif 1761#endif
1796#if ENABLE_FRILLS 1762#if ENABLE_FRILLS
1797 if (option (Opt_urgentOnBell)) 1763 if (option (Opt_urgentOnBell))
1798 set_urgency (0); 1764 set_urgency (0);
1765
1766 if (priv_modes & PrivMode_FocusEvent)
1767 tt_printf ("\x1b[I");
1799#endif 1768#endif
1800 1769
1801 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1770 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1802 } 1771 }
1803} 1772}
… …
1811 want_refresh = 1; 1780 want_refresh = 1;
1812 1781
1813#if ENABLE_FRILLS 1782#if ENABLE_FRILLS
1814 if (option (Opt_urgentOnBell)) 1783 if (option (Opt_urgentOnBell))
1815 set_urgency (0); 1784 set_urgency (0);
1785
1786 if (priv_modes & PrivMode_FocusEvent)
1787 tt_printf ("\x1b[O");
1816#endif 1788#endif
1817#if ENABLE_FRILLS || ISO_14755 1789#if ENABLE_FRILLS || ISO_14755
1818 if (iso14755buf) 1790 if (iso14755buf)
1819 { 1791 {
1820 iso14755buf = 0; 1792 iso14755buf = 0;
… …
1835#endif 1807#endif
1836#if OFF_FOCUS_FADING 1808#if OFF_FOCUS_FADING
1837 if (rs[Rs_fade]) 1809 if (rs[Rs_fade])
1838 { 1810 {
1839 pix_colors = pix_colors_unfocused; 1811 pix_colors = pix_colors_unfocused;
1840 scr_recolour (); 1812 scr_recolor ();
1841 } 1813 }
1842#endif 1814#endif
1843 1815
1844 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1816 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1845 } 1817 }
1846} 1818}
1847 1819
1848void ecb_cold 1820void ecb_cold
1849rxvt_term::update_fade_color (unsigned int idx) 1821rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1850{ 1822{
1851#if OFF_FOCUS_FADING 1823#if OFF_FOCUS_FADING
1852 if (rs[Rs_fade]) 1824 if (rs[Rs_fade])
1853 { 1825 {
1826 if (!first_time)
1827 pix_colors_focused [idx].free (this);
1828
1854 rgba c; 1829 rgba c;
1855 pix_colors [Color_fade].get (c); 1830 pix_colors [Color_fade].get (c);
1856 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1831 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1857 } 1832 }
1858#endif 1833#endif
1859} 1834}
1860 1835
1861#if BG_IMAGE_FROM_ROOT || ENABLE_PERL 1836#if ENABLE_PERL
1862void ecb_hot 1837void ecb_hot
1863rxvt_term::rootwin_cb (XEvent &ev) 1838rxvt_term::rootwin_cb (XEvent &ev)
1864{ 1839{
1865 make_current (); 1840 make_current ();
1866 1841
… …
1876 * use the property to determine the pixmap. We use it later on. 1851 * use the property to determine the pixmap. We use it later on.
1877 */ 1852 */
1878 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1853 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1879 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1854 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1880 { 1855 {
1881#if BG_IMAGE_FROM_ROOT
1882 if (option (Opt_transparent))
1883 {
1884 rxvt_img::new_from_root (this)->replace (root_img);
1885 update_background ();
1886 }
1887#endif
1888 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END)); 1856 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1889 } 1857 }
1890 1858
1891 break; 1859 break;
1892 } 1860 }
… …
1920 iso14755_54 (ev.x, ev.y); 1888 iso14755_54 (ev.x, ev.y);
1921 return; 1889 return;
1922 } 1890 }
1923#endif 1891#endif
1924 1892
1925 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1893 clickintime = ev.time - MEvent.time < multiClickTime;
1926 1894
1927 if (reportmode) 1895 if (reportmode)
1928 { 1896 {
1929 /* mouse report from vt window */ 1897 /* mouse report from vt window */
1930 /* save the xbutton state (for ButtonRelease) */ 1898 /* save the xbutton state (for ButtonRelease) */
… …
2180#ifdef MOUSE_REPORT_DOUBLECLICK 2148#ifdef MOUSE_REPORT_DOUBLECLICK
2181 /* only report the release of 'slow' single clicks */ 2149 /* only report the release of 'slow' single clicks */
2182 if (MEvent.button != AnyButton 2150 if (MEvent.button != AnyButton
2183 && (ev.button != MEvent.button 2151 && (ev.button != MEvent.button
2184 || (ev.time - MEvent.time 2152 || (ev.time - MEvent.time
2185 > MULTICLICK_TIME / 2))) 2153 > multiClickTime / 2)))
2186 { 2154 {
2187 MEvent.clicks = 0; 2155 MEvent.clicks = 0;
2188 MEvent.button = AnyButton; 2156 MEvent.button = ev.button;
2189 mouse_report (ev); 2157 mouse_report (ev);
2190 } 2158 }
2191#else /* MOUSE_REPORT_DOUBLECLICK */ 2159#else /* MOUSE_REPORT_DOUBLECLICK */
2192 MEvent.button = AnyButton; 2160 MEvent.button = ev.button;
2193 mouse_report (ev); 2161 mouse_report (ev);
2194#endif /* MOUSE_REPORT_DOUBLECLICK */ 2162#endif /* MOUSE_REPORT_DOUBLECLICK */
2195 return; 2163 return;
2196 } 2164 }
2197 2165
… …
2384 } 2352 }
2385} 2353}
2386 2354
2387// read the next character 2355// read the next character
2388wchar_t ecb_hot 2356wchar_t ecb_hot
2389rxvt_term::next_char () NOTHROW 2357rxvt_term::next_char () noexcept
2390{ 2358{
2391 while (cmdbuf_ptr < cmdbuf_endp) 2359 while (cmdbuf_ptr < cmdbuf_endp)
2392 { 2360 {
2393 // assume 7-bit to be ascii ALWAYS 2361 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2394 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2362 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2395 return *cmdbuf_ptr++; 2363 return *cmdbuf_ptr++;
2396 2364
2397 wchar_t wc; 2365 wchar_t wc;
2398 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2366 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2399 2367
… …
2420 return NOCHAR; 2388 return NOCHAR;
2421} 2389}
2422 2390
2423// read the next octet 2391// read the next octet
2424uint32_t ecb_hot 2392uint32_t ecb_hot
2425rxvt_term::next_octet () NOTHROW 2393rxvt_term::next_octet () noexcept
2426{ 2394{
2427 return cmdbuf_ptr < cmdbuf_endp 2395 return cmdbuf_ptr < cmdbuf_endp
2428 ? (unsigned char)*cmdbuf_ptr++ 2396 ? (unsigned char)*cmdbuf_ptr++
2429 : NOCHAR; 2397 : NOCHAR;
2430} 2398}
2431 2399
2432static class out_of_input out_of_input; 2400static class out_of_input out_of_input;
2433 2401
2434wchar_t ecb_hot 2402wchar_t ecb_hot
2435rxvt_term::cmd_getc () THROW ((class out_of_input)) 2403rxvt_term::cmd_getc ()
2436{ 2404{
2437 wchar_t c = next_char (); 2405 wchar_t c = next_char ();
2438 2406
2439 if (c == NOCHAR) 2407 if (c == NOCHAR)
2440 throw out_of_input; 2408 throw out_of_input;
2441 2409
2442 return c; 2410 return c;
2443} 2411}
2444 2412
2445uint32_t ecb_hot 2413uint32_t ecb_hot
2446rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2414rxvt_term::cmd_get8 ()
2447{ 2415{
2448 uint32_t c = next_octet (); 2416 uint32_t c = next_octet ();
2449 2417
2450 if (c == NOCHAR) 2418 if (c == NOCHAR)
2451 throw out_of_input; 2419 throw out_of_input;
… …
2580 scr_charset_choose (0); 2548 scr_charset_choose (0);
2581 break; 2549 break;
2582 2550
2583#ifdef EIGHT_BIT_CONTROLS 2551#ifdef EIGHT_BIT_CONTROLS
2584 // 8-bit controls 2552 // 8-bit controls
2585 case 0x90: /* DCS */ 2553 case 0x90: /* DCS */
2586 process_dcs_seq (); 2554 process_dcs_seq ();
2587 break; 2555 break;
2588 case 0x9b: /* CSI */ 2556 case 0x9b: /* CSI */
2589 process_csi_seq (); 2557 process_csi_seq ();
2590 break; 2558 break;
2591 case 0x9d: /* OSC */ 2559 case 0x9d: /* OSC */
2592 process_osc_seq (); 2560 process_osc_seq ();
2593 break; 2561 break;
2594#endif 2562#endif
2595 } 2563 }
2596} 2564}
… …
2724 wchar_t nlcr[] = { C0_LF, C0_CR }; 2692 wchar_t nlcr[] = { C0_LF, C0_CR };
2725 scr_add_lines (nlcr, ecb_array_length (nlcr), 1); 2693 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2726 } 2694 }
2727 break; 2695 break;
2728 2696
2697#if 0 // disabled because embedded newlines can make exploits easier
2729 /* kidnapped escape sequence: Should be 8.3.48 */ 2698 /* kidnapped escape sequence: Should be 8.3.48 */
2730 case C1_ESA: /* ESC G */ 2699 case C1_ESA: /* ESC G */
2731 // used by original rxvt for rob nations own graphics mode 2700 // used by original rxvt for rob nations own graphics mode
2732 if (cmd_getc () == 'Q') 2701 if (cmd_getc () == 'Q' && option (Opt_insecure))
2733 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2702 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2734 break; 2703 break;
2704#endif
2735 2705
2736 /* 8.3.63: CHARACTER TABULATION SET */ 2706 /* 8.3.63: CHARACTER TABULATION SET */
2737 case C1_HTS: /* ESC H */ 2707 case C1_HTS: /* ESC H */
2738 scr_set_tab (1); 2708 scr_set_tab (1);
2739 break; 2709 break;
… …
2897 break; 2867 break;
2898 2868
2899 case '?': 2869 case '?':
2900 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2870 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2901 process_terminal_mode (ch, priv, nargs, arg); 2871 process_terminal_mode (ch, priv, nargs, arg);
2872 if (prev_ch == '$' && ch == 'p')
2873 process_terminal_mode (ch, priv, nargs, arg);
2902 break; 2874 break;
2903 2875
2904 case '!': 2876 case '!':
2905 if (ch == CSI_70) 2877 if (ch == CSI_70)
2906 { 2878 {
2907 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2879 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2908 scr_soft_reset (); 2880 scr_soft_reset ();
2909 2881
2910 static const int pm_h[] = { 7, 25 }; 2882 static const int pm_h[] = { 7, 25 };
2911 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2883 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2912 2884
2913 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h); 2885 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2914 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l); 2886 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2915 } 2887 }
2916 break; 2888 break;
… …
2946 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2918 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2947 scr_gotorc (arg[0], 0, RELATIVE); 2919 scr_gotorc (arg[0], 0, RELATIVE);
2948 break; 2920 break;
2949 2921
2950 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2922 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2951 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2923 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2952#ifdef ISO6429 2924#ifdef ISO6429
2953 arg[0] = -arg[0]; 2925 arg[0] = -arg[0];
2954#else /* emulate common DEC VTs */ 2926#else /* emulate common DEC VTs */
2955 arg[0] = arg[0] ? -arg[0] : -1; 2927 arg[0] = arg[0] ? -arg[0] : -1;
2956#endif 2928#endif
… …
3047 case 7: /* unofficial extension */ 3019 case 7: /* unofficial extension */
3048 if (option (Opt_insecure)) 3020 if (option (Opt_insecure))
3049 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3021 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3050 break; 3022 break;
3051 case 8: /* unofficial extension */ 3023 case 8: /* unofficial extension */
3052 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3024 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, CHAR_ST); // char * cast verified
3053 break; 3025 break;
3054 } 3026 }
3055 break; 3027 break;
3056 3028
3057 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3029 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
3101 scr_insert_mode (1); 3073 scr_insert_mode (1);
3102 else if (arg[0] == 20) 3074 else if (arg[0] == 20)
3103 priv_modes |= PrivMode_LFNL; 3075 priv_modes |= PrivMode_LFNL;
3104 break; 3076 break;
3105 3077
3106 case CSI_71: // DESCUSR: set cursor style 3078 case CSI_71: // DECSCUSR: set cursor style
3107 if (prev_ch == ' ') 3079 if (prev_ch == ' ')
3108 set_cursor_style (arg[0]); 3080 set_cursor_style (arg[0]);
3109 break; 3081 break;
3110 3082
3111 /* 3083 /*
… …
3332 free (s); 3304 free (s);
3333 } 3305 }
3334 } 3306 }
3335} 3307}
3336 3308
3309static unsigned int
3310colorcube_index (unsigned int idx_r,
3311 unsigned int idx_g,
3312 unsigned int idx_b)
3313{
3314 assert (idx_r < Red_levels);
3315 assert (idx_g < Green_levels);
3316 assert (idx_b < Blue_levels);
3317
3318 return idx_r * Blue_levels * Green_levels +
3319 idx_g * Blue_levels +
3320 idx_b;
3321}
3322
3323/*
3324 * Find the nearest color slot in the hidden color cube,
3325 * adapt its value to the 32bit RGBA color.
3326 */
3327unsigned int
3328rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3329{
3330 r &= 0xff;
3331 g &= 0xff;
3332 b &= 0xff;
3333 a &= 0xff;
3334
3335 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3336
3337 /* we allow one of the 6 closest neighbouring colours */
3338 /* to replace the current color, if they not used recently */
3339 static const signed char dxyz[][3] = {
3340 0, 0, 0,
3341 0, 0, 4,
3342 0, 4, 0,
3343 4, 0, 0,
3344 0, 4, 4,
3345 4, 4, 0,
3346 4, 0, 4,
3347 };
3348
3349 static const unsigned char color_level[8][32] = {
3350 // neighbour index
3351 {0, 0, 1, 0, 0, 1, 1, 2, 2, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3352 {0, 1, 0, 1, 1, 2, 1, 1, 2, 2, 3, 3, 2, 2, 2, 3, 3, 3, 4, 4, 4, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4},
3353 {0, 0, 1, 2, 1, 1, 2, 3, 3, 2, 2, 3, 3, 4, 4, 3, 3, 3, 4, 4, 5, 5, 5, 4, 4, 4, 5, 5, 5, 5, 5, 5},
3354 {0, 0, 2, 1, 2, 3, 2, 2, 3, 4, 4, 3, 3, 4, 4, 5, 5, 4, 4, 5, 5, 5, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6},
3355 // Red_levels/Green_levels/Blue_levels index
3356 {0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3357 {0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4},
3358 {0, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5},
3359 {0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6},
3360 };
3361
3362 unsigned int idx;
3363
3364 for (int n = 0; n < ecb_array_length (dxyz); ++n)
3365 {
3366 unsigned int idx_r = color_level[ Red_levels - dxyz[n][0]][r / 8];
3367 unsigned int idx_g = color_level[Green_levels - dxyz[n][1]][g / 8];
3368 unsigned int idx_b = color_level[ Blue_levels - dxyz[n][2]][b / 8];
3369 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3370
3371 if (n == 0)
3372 idx = index;
3373
3374 if (rgb24_color[index] == color)
3375 {
3376 rgb24_seqno[index] = ++rgb24_sequence;
3377 return index + minTermCOLOR24;
3378 }
3379
3380 // minor issue: could update index 0 few more times
3381 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3382 {
3383 idx = index;
3384 goto update;
3385 }
3386
3387 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3388 // but also handles wrap around values good enough
3389 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3390 idx = index;
3391 }
3392
3393update:
3394 rgb24_color[idx] = color;
3395 rgb24_seqno[idx] = ++rgb24_sequence;
3396
3397 idx += minTermCOLOR24;
3398 pix_colors_focused [idx].free (this);
3399 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3400 update_fade_color (idx, false);
3401
3402 return idx;
3403}
3404
3337void 3405void
3338rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3406rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3339{ 3407{
3340 if (str[0] == '?' && !str[1]) 3408 if (str[0] == '?' && !str[1])
3341 { 3409 {
3410 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3411 return;
3412
3342 rgba c; 3413 rgba c;
3343 pix_colors_focused[color].get (c); 3414 pix_colors_focused[color].get (c);
3415 color -= minCOLOR;
3344 3416
3345#if XFT 3417#if XFT
3346 if (c.a != rgba::MAX_CC) 3418 if (c.a != rgba::MAX_CC)
3347 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3419 tt_printf ("\033]%d;%d;rgba:%04x/%04x/%04x/%04x%c", report, color, c.r, c.g, c.b, c.a, resp);
3348 else 3420 else
3349#endif 3421#endif
3350 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3422 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", report, color, c.r, c.g, c.b, resp);
3351 } 3423 }
3352 else 3424 else
3353 set_window_color (color, str); 3425 set_window_color (color, str);
3354} 3426}
3355 3427
… …
3479#endif 3551#endif
3480 case URxvt_Color_border: 3552 case URxvt_Color_border:
3481 process_color_seq (op, Color_border, str, resp); 3553 process_color_seq (op, Color_border, str, resp);
3482 break; 3554 break;
3483 3555
3484#if BG_IMAGE_FROM_ROOT
3485 case URxvt_Color_tint:
3486 process_color_seq (op, Color_tint, str, resp);
3487 {
3488 bool changed = false;
3489
3490 if (ISSET_PIXCOLOR (Color_tint))
3491 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3492
3493 if (changed)
3494 update_background ();
3495 }
3496
3497 break;
3498#endif
3499
3500#if BG_IMAGE_FROM_FILE
3501 case Rxvt_Pixmap:
3502 if (!strcmp (str, "?"))
3503 {
3504 char str[256];
3505 int h_scale = fimage.h_scale;
3506 int v_scale = fimage.v_scale;
3507 int h_align = fimage.h_align;
3508 int v_align = fimage.v_align;
3509
3510 sprintf (str, "[%dx%d+%d+%d]",
3511 h_scale, v_scale,
3512 h_align, v_align);
3513 process_xterm_seq (XTerm_title, str, CHAR_ST);
3514 }
3515 else
3516 {
3517 bool changed = false;
3518
3519 if (*str != ';')
3520 {
3521 try
3522 {
3523 fimage.set_file_geometry (this, str);
3524 changed = true;
3525 }
3526 catch (const class rxvt_failure_exception &e)
3527 {
3528 }
3529 }
3530 else
3531 {
3532 str++;
3533 if (fimage.set_geometry (str, true))
3534 changed = true;
3535 }
3536
3537 if (changed)
3538 {
3539 if (bg_window_position_sensitive ())
3540 {
3541 int x, y;
3542 get_window_origin (x, y);
3543 parent_x = x;
3544 parent_y = y;
3545 }
3546 update_background ();
3547 }
3548 }
3549 break;
3550#endif
3551
3552 case XTerm_logfile: 3556 case XTerm_logfile:
3553 // TODO, when secure mode? 3557 // TODO, when secure mode?
3554 break; 3558 break;
3555 3559
3556#if 0 3560#if 0
… …
3591 case URxvt_version: 3595 case URxvt_version:
3592 if (query) 3596 if (query)
3593 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3597 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3594 op, 3598 op,
3595 rs[Rs_name], VERSION[0], VERSION[2], 3599 rs[Rs_name], VERSION[0], VERSION[2],
3600 resp);
3601 break;
3602
3603 case URxvt_cellinfo:
3604 if (query)
3605 tt_printf ("\33]%d;%d;%d;%d%c", saveop,
3606 fwidth, fheight, fbase,
3596 resp); 3607 resp);
3597 break; 3608 break;
3598 3609
3599#if !ENABLE_MINIMAL 3610#if !ENABLE_MINIMAL
3600 case URxvt_locale: 3611 case URxvt_locale:
… …
3689 { 5, PrivMode_rVideo }, // DECSCNM 3700 { 5, PrivMode_rVideo }, // DECSCNM
3690 { 6, PrivMode_relOrigin }, // DECOM 3701 { 6, PrivMode_relOrigin }, // DECOM
3691 { 7, PrivMode_Autowrap }, // DECAWM 3702 { 7, PrivMode_Autowrap }, // DECAWM
3692 // 8, auto-repeat keys // DECARM 3703 // 8, auto-repeat keys // DECARM
3693 { 9, PrivMode_MouseX10 }, 3704 { 9, PrivMode_MouseX10 },
3705 { 12, PrivMode_BlinkingCursor },
3694 // 18 end FF to printer after print screen 3706 // 18 end FF to printer after print screen
3695 // 19 Print screen prints full screen/scroll region 3707 // 19 Print screen prints full screen/scroll region
3696 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3708 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3697#ifdef scrollBar_esc 3709#ifdef scrollBar_esc
3698 { scrollBar_esc, PrivMode_scrollBar }, 3710 { scrollBar_esc, PrivMode_scrollBar },
… …
3710#endif 3722#endif
3711 { 1000, PrivMode_MouseX11 }, 3723 { 1000, PrivMode_MouseX11 },
3712 { 1002, PrivMode_MouseBtnEvent }, 3724 { 1002, PrivMode_MouseBtnEvent },
3713 { 1003, PrivMode_MouseAnyEvent }, 3725 { 1003, PrivMode_MouseAnyEvent },
3714#if ENABLE_FRILLS 3726#if ENABLE_FRILLS
3727 { 1004, PrivMode_FocusEvent },
3715 { 1005, PrivMode_ExtModeMouse }, 3728 { 1005, PrivMode_ExtMouseUTF8 },
3729 { 1006, PrivMode_ExtMouseSGR },
3716#endif 3730#endif
3717 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3731 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3718 { 1011, PrivMode_Keypress }, // rxvt extension 3732 { 1011, PrivMode_Keypress }, // rxvt extension
3719#if ENABLE_FRILLS 3733#if ENABLE_FRILLS
3720 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 3734 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3721#endif 3735#endif
3722 // 1035 enable modifiers for alt, numlock NYI 3736 // 1035 enable modifiers for alt, numlock NYI
3723 // 1036 send ESC for meta keys NYI 3737 // 1036 send ESC for meta keys NYI
3724 // 1037 send DEL for keypad delete NYI 3738 // 1037 send DEL for keypad delete NYI
3725 { 1047, PrivMode_Screen }, 3739 { 1047, PrivMode_Screen },
3726 // 1048 save and restore cursor, implemented in code 3740 // 1048 save and restore cursor, implemented in code
3727 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3741 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3728 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3742 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3743#if ENABLE_FRILLS
3729 { 2004, PrivMode_BracketPaste }, 3744 { 2004, PrivMode_BracketPaste },
3745#endif
3730 }; 3746 };
3731 3747
3732 if (nargs == 0) 3748 if (nargs == 0)
3733 return; 3749 return;
3750
3751 // DECRQM
3752 if (mode == 'p')
3753 {
3754 int status = 0;
3755 if (nargs != 1)
3756 return;
3757
3758 for (j = 0; j < ecb_array_length (argtopriv); j++)
3759 if (argtopriv[j].argval == arg[0])
3760 {
3761 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3762 break;
3763 }
3764
3765 tt_printf ("\33[?%d;%d$y", arg[0], status);
3766 return;
3767 }
3734 3768
3735 /* make lo/hi boolean */ 3769 /* make lo/hi boolean */
3736 if (mode == 'l') 3770 if (mode == 'l')
3737 mode = 0; /* reset */ 3771 mode = 0; /* reset */
3738 else if (mode == 'h') 3772 else if (mode == 'h')
… …
3807 scrollBar.map (state); 3841 scrollBar.map (state);
3808 resize_all_windows (0, 0, 0); 3842 resize_all_windows (0, 0, 0);
3809 scr_touch (true); 3843 scr_touch (true);
3810 break; 3844 break;
3811#endif 3845#endif
3846#ifdef CURSOR_BLINK
3847 case 12:
3848 cursor_blink_reset ();
3849 break;
3850#endif
3812 case 25: /* visible/invisible cursor */ 3851 case 25: /* visible/invisible cursor */
3813 scr_cursor_visible (state); 3852 scr_cursor_visible (state);
3814 break; 3853 break;
3815 /* case 35: - shift keys */ 3854 /* case 35: - shift keys */
3816 /* case 40: - 80 <--> 132 mode */ 3855 /* case 40: - 80 <--> 132 mode */
… …
3921 //case 19: // ninth alt font 3960 //case 19: // ninth alt font
3922 //case 20: // gothic 3961 //case 20: // gothic
3923 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3962 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3924 rendset = 0, rendstyle = RS_Bold; 3963 rendset = 0, rendstyle = RS_Bold;
3925 break; 3964 break;
3926 case 22: // normal intensity 3965 case 22: // bold off (vt220)
3927 rendset = 0, rendstyle = RS_Bold; 3966 rendset = 0, rendstyle = RS_Bold;
3928 break; 3967 break;
3929 case 23: // disable italic 3968 case 23: // disable italic
3930 rendset = 0, rendstyle = RS_Italic; 3969 rendset = 0, rendstyle = RS_Italic;
3931 break; 3970 break;
3932 case 24: 3971 case 24: // underline off (vt220)
3933 rendset = 0, rendstyle = RS_Uline; 3972 rendset = 0, rendstyle = RS_Uline;
3934 break; 3973 break;
3935 case 25: 3974 case 25: // blink off (vt220)
3936 rendset = 0, rendstyle = RS_Blink; 3975 rendset = 0, rendstyle = RS_Blink;
3937 break; 3976 break;
3938 case 26: // variable spacing (iso 8613) 3977 case 26: // variable spacing (iso 8613)
3939 rendset = 0, rendstyle = RS_Blink; 3978 rendset = 0, rendstyle = RS_Blink;
3940 break; 3979 break;
3941 case 27: 3980 case 27: // reverse off (vt220)
3942 rendset = 0, rendstyle = RS_RVid; 3981 rendset = 0, rendstyle = RS_RVid;
3943 break; 3982 break;
3944 //case 28: // visible. NYI 3983 //case 28: // visible. NYI
3945 //case 29: // not crossed-out 3984 //case 29: // not crossed-out
3946 } 3985 }
… …
3961 case 35: 4000 case 35:
3962 case 36: 4001 case 36:
3963 case 37: 4002 case 37:
3964 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4003 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3965 break; 4004 break;
3966 case 38: // set fg color, ISO 8613-6
3967 if (nargs > i + 2 && arg[i + 1] == 5)
3968 {
3969 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3970 i += 2;
3971 }
3972 break;
3973 case 39: /* default fg */ 4005 case 39: /* default fg */
3974 scr_color (Color_fg, Color_fg); 4006 scr_color (Color_fg, Color_fg);
3975 break; 4007 break;
3976 4008
3977 case 40: 4009 case 40:
… …
3982 case 45: 4014 case 45:
3983 case 46: 4015 case 46:
3984 case 47: 4016 case 47:
3985 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4017 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3986 break; 4018 break;
3987 case 48: // set bg color, ISO 8613-6
3988 if (nargs > i + 2 && arg[i + 1] == 5)
3989 {
3990 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3991 i += 2;
3992 }
3993 break;
3994 case 49: /* default bg */ 4019 case 49: /* default bg */
3995 scr_color (Color_bg, Color_bg); 4020 scr_color (Color_bg, Color_bg);
4021 break;
4022
4023 case 38: // set fg color, ISO 8613-6
4024 case 48: // set bg color, ISO 8613-6
4025 {
4026 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4027 unsigned int idx;
4028
4029 if (nargs > i + 2 && arg[i + 1] == 5)
4030 {
4031 idx = minCOLOR + arg[i + 2];
4032 i += 2;
4033
4034 scr_color (idx, fgbg);
4035 }
4036 else if (nargs > i + 4 && arg[i + 1] == 2)
4037 {
4038 unsigned int r = arg[i + 2];
4039 unsigned int g = arg[i + 3];
4040 unsigned int b = arg[i + 4];
4041 unsigned int a = 0xff;
4042
4043 idx = map_rgb24_color (r, g, b, a);
4044
4045 i += 4;
4046
4047 scr_color (idx, fgbg);
4048 }
4049 }
3996 break; 4050 break;
3997 4051
3998 //case 50: // not variable spacing 4052 //case 50: // not variable spacing
3999 4053
4000#if !ENABLE_MINIMAL 4054#if !ENABLE_MINIMAL
… …
4024} 4078}
4025 4079
4026void 4080void
4027rxvt_term::set_cursor_style (int style) 4081rxvt_term::set_cursor_style (int style)
4028{ 4082{
4029 if (!IN_RANGE_INC (style, 0, 4)) 4083 if (!IN_RANGE_INC (style, 0, 6))
4030 return; 4084 return;
4031 4085
4086 if (style == 0)
4087 style = 1;
4088
4089 cursor_type = (style - 1) / 2;
4032 set_option (Opt_cursorUnderline, style >= 3); 4090 set_option (Opt_cursorUnderline, cursor_type == 1);
4033 4091
4034#ifdef CURSOR_BLINK 4092#ifdef CURSOR_BLINK
4035 set_option (Opt_cursorBlink, !style || (style & 1)); 4093 set_option (Opt_cursorBlink, style & 1);
4036 cursor_blink_reset (); 4094 cursor_blink_reset ();
4037#endif 4095#endif
4038 4096
4039 want_refresh = 1; 4097 want_refresh = 1;
4040} 4098}

Diff Legend

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