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.603 by root, Mon Jun 5 13:39:34 2023 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.
… …
84 XK_Right, 0x2192, 84 XK_Right, 0x2192,
85 XK_KP_Right, 0x2192, 85 XK_KP_Right, 0x2192,
86 XK_Down, 0x2193, 86 XK_Down, 0x2193,
87 XK_KP_Down, 0x2193, 87 XK_KP_Down, 0x2193,
88 XK_Linefeed, 0x21b4, 88 XK_Linefeed, 0x21b4,
89 XK_Return, 0x21b5,
90 XK_KP_Enter, 0x21b5,
91 89
92 XK_Prior, 0x21de, 90 XK_Prior, 0x21de,
93 XK_Next, 0x21df, 91 XK_Next, 0x21df,
94 XK_Tab, 0x21e5, 92 XK_Tab, 0x21e5,
95 XK_ISO_Left_Tab, 0x21e6, 93 XK_ISO_Left_Tab, 0x21e6,
… …
110 XK_Begin, 0x2320, 108 XK_Begin, 0x2320,
111 XK_Delete, 0x2326, 109 XK_Delete, 0x2326,
112 XK_Clear, 0x2327, 110 XK_Clear, 0x2327,
113 XK_BackSpace, 0x232b, 111 XK_BackSpace, 0x232b,
114 XK_Insert, 0x2380, 112 XK_Insert, 0x2380,
113 XK_KP_Enter, 0x2386,
114 XK_Alt_L, 0x2387,
115 XK_Alt_R, 0x2387,
115 XK_Control_L, 0x2388, 116 XK_Control_L, 0x2388,
116 XK_Control_R, 0x2388, 117 XK_Control_R, 0x2388,
117 XK_Pause, 0x2389, 118 XK_Pause, 0x2389,
118 XK_Break, 0x238a, 119 XK_Break, 0x238a,
119 XK_Escape, 0x238b, 120 XK_Escape, 0x238b,
120 XK_Undo, 0x238c, 121 XK_Undo, 0x238c,
121 XK_Print, 0x2399, 122 XK_Print, 0x2399,
123 XK_Return, 0x23ce,
122 124
123 XK_space, 0x2423, 125 XK_space, 0x2423,
124 126
125#ifdef XK_KP_Begin 127#ifdef XK_KP_Begin
126 XK_KP_Prior, 0x21de, 128 XK_KP_Prior, 0x21de,
… …
168 int len; 170 int len;
169 171
170# if ENABLE_COMBINING 172# if ENABLE_COMBINING
171 if (IS_COMPOSE (ch)) 173 if (IS_COMPOSE (ch))
172 { 174 {
173 len = rxvt_composite.expand (ch, 0); 175 len = rxvt_composite.expand (ch);
174 alloc = chr = new wchar_t[len]; 176 alloc = chr = new wchar_t[len];
175 rxvt_composite.expand (ch, chr); 177 rxvt_composite.expand (ch, chr);
176 } 178 }
177 else 179 else
178# endif 180# endif
… …
210 212
211 max_it (width, strlen (attr)); 213 max_it (width, strlen (attr));
212 214
213 if (y >= 0) 215 if (y >= 0)
214 { 216 {
215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 217 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
216 x = 0; 218 x = 0;
217 } 219 }
218 220
219 scr_overlay_new (x, y, width, len * 2 + 2); 221 scr_overlay_new (x, y, width, len * 2 + 2);
220 222
… …
315 XK_KP_7, // XK_KP_Home 317 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left 318 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up 319 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right 320 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down 321 XK_KP_2, // XK_KP_Down
320# ifndef UNSHIFTED_SCROLLKEYS
321 XK_KP_9, // XK_KP_Prior 322 XK_KP_9, // XK_KP_Prior
322 XK_KP_3, // XK_KP_Next 323 XK_KP_3, // XK_KP_Next
323# else
324 XK_Prior,
325 XK_Next,
326# endif
327 XK_KP_1, // XK_KP_End 324 XK_KP_1, // XK_KP_End
328 XK_KP_5, // XK_KP_Begin 325 XK_KP_5, // XK_KP_Begin
329 }; 326 };
330 327
331 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 328 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
… …
376 param = 3; 373 param = 3;
377 break; 374 break;
378 case XK_Select: 375 case XK_Select:
379 param = 4; 376 param = 4;
380 break; 377 break;
381#ifndef UNSHIFTED_SCROLLKEYS
382 case XK_Prior: 378 case XK_Prior:
383 param = 5; 379 param = 5;
384 break; 380 break;
385 case XK_Next: 381 case XK_Next:
386 param = 6; 382 param = 6;
… …
389 param = 7; 385 param = 7;
390 break; 386 break;
391 case XK_End: 387 case XK_End:
392 param = 8; 388 param = 8;
393 break; 389 break;
394#endif
395 case XK_Help: 390 case XK_Help:
396 param = 28; 391 param = 28;
397 break; 392 break;
398 case XK_Menu: 393 case XK_Menu:
399 param = 29; 394 param = 29;
… …
683 { 678 {
684 char *ch; 679 char *ch;
685 680
686 for (ch = kbuf; ch < kbuf + len; ch++) 681 for (ch = kbuf; ch < kbuf + len; ch++)
687 *ch |= 0x80; 682 *ch |= 0x80;
688
689 meta = 0;
690 } 683 }
691#endif 684#endif
692 /* nil */ ; 685 /* nil */ ;
693 } 686 }
694 687
… …
1025/* checks whether a refresh is requested and starts the refresh timer */ 1018/* checks whether a refresh is requested and starts the refresh timer */
1026void 1019void
1027rxvt_term::refresh_check () 1020rxvt_term::refresh_check ()
1028{ 1021{
1029 if (want_refresh && !flush_ev.is_active ()) 1022 if (want_refresh && !flush_ev.is_active ())
1030 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1023 flush_ev.start ();
1031 1024
1032 display->flush (); 1025 display->flush ();
1033} 1026}
1034 1027
1035void 1028void
… …
1043 1036
1044#ifdef CURSOR_BLINK 1037#ifdef CURSOR_BLINK
1045void 1038void
1046rxvt_term::cursor_blink_reset () 1039rxvt_term::cursor_blink_reset ()
1047{ 1040{
1041 if (!focus)
1042 return;
1043
1048 if (hidden_cursor) 1044 if (hidden_cursor)
1049 { 1045 {
1050 hidden_cursor = 0; 1046 hidden_cursor = 0;
1051 want_refresh = 1; 1047 want_refresh = 1;
1052 } 1048 }
1053 1049
1054 if (option (Opt_cursorBlink)) 1050 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1055 cursor_blink_ev.again (); 1051 cursor_blink_ev.again ();
1056 else 1052 else
1057 cursor_blink_ev.stop (); 1053 cursor_blink_ev.stop ();
1058} 1054}
1059 1055
… …
1248 1244
1249void ecb_cold 1245void ecb_cold
1250rxvt_term::pointer_unblank () 1246rxvt_term::pointer_unblank ()
1251{ 1247{
1252 XDefineCursor (dpy, vt, TermWin_cursor); 1248 XDefineCursor (dpy, vt, TermWin_cursor);
1253 recolour_cursor (); 1249 recolor_cursor ();
1254 1250
1255#ifdef POINTER_BLANK 1251#ifdef POINTER_BLANK
1256 hidden_pointer = 0; 1252 hidden_pointer = 0;
1257 1253
1258 if (option (Opt_pointerBlank)) 1254 if (option (Opt_pointerBlank))
… …
1283#endif 1279#endif
1284 1280
1285void 1281void
1286rxvt_term::mouse_report (XButtonEvent &ev) 1282rxvt_term::mouse_report (XButtonEvent &ev)
1287{ 1283{
1288 int button_number, key_state = 0; 1284 int button_number, state = 0;
1289 int x, y; 1285 int x, y;
1290 int code = 32; 1286 bool release = ev.type == ButtonRelease;
1291 1287
1292 x = Pixel2Col (ev.x) + 1; 1288 x = 1 + clamp (Pixel2Col (ev.x), 0, ncol - 1);
1293 y = Pixel2Row (ev.y) + 1; 1289 y = 1 + clamp (Pixel2Row (ev.y), 0, nrow - 1);
1294 1290
1295 if (ev.type == MotionNotify) 1291 if (ev.type == MotionNotify)
1296 { 1292 {
1297 if (x == mouse_row && y == mouse_col) 1293 if (x == mouse_row && y == mouse_col)
1298 return; 1294 return;
1299 1295
1300 mouse_row = x; 1296 mouse_row = x;
1301 mouse_col = y; 1297 mouse_col = y;
1302 code += 32; 1298 state += 32;
1303 }
1304
1305 if (MEvent.button == AnyButton)
1306 button_number = 3;
1307 else
1308 { 1299 }
1300
1309 button_number = MEvent.button - Button1; 1301 button_number = MEvent.button - Button1;
1310 /* add 0x3D for wheel events, like xterm does */ 1302 if (button_number > 10)
1303 return;
1304 else if (button_number >= 7)
1305 button_number += 128 - 7;
1311 if (button_number >= 3) 1306 else if (button_number >= 3)
1312 button_number += 64 - 3; 1307 button_number += 64 - 3;
1313 }
1314 1308
1315 if (priv_modes & PrivMode_MouseX10) 1309 if (priv_modes & PrivMode_MouseX10)
1316 { 1310 {
1317 /* 1311 /*
1318 * do not report ButtonRelease 1312 * do not report ButtonRelease
1319 * no state info allowed 1313 * no state info allowed
1320 */ 1314 */
1321 key_state = 0; 1315 if (release)
1322 if (button_number == 3)
1323 return; 1316 return;
1324 } 1317 }
1325 else 1318 else
1326 { 1319 {
1327 /* XTerm mouse reporting needs these values: 1320 /* XTerm mouse reporting needs these values:
… …
1329 * 8 = Meta 1322 * 8 = Meta
1330 * 16 = Control 1323 * 16 = Control
1331 * plus will add in our own Double-Click reporting 1324 * plus will add in our own Double-Click reporting
1332 * 32 = Double Click 1325 * 32 = Double Click
1333 */ 1326 */
1334 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1327 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1335 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1328 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1336 + ((MEvent.state & ControlMask) ? 16 : 0); 1329 + ((MEvent.state & ControlMask) ? 16 : 0);
1337#ifdef MOUSE_REPORT_DOUBLECLICK 1330#ifdef MOUSE_REPORT_DOUBLECLICK
1338 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1331 state += ((MEvent.clicks > 1) ? 32 : 0);
1339#endif 1332#endif
1340 } 1333 }
1334
1335 int code = 32 + (release ? 3 : button_number) + state;
1341 1336
1342#if DEBUG_MOUSEREPORT 1337#if DEBUG_MOUSEREPORT
1343 fprintf (stderr, "Mouse ["); 1338 fprintf (stderr, "Mouse [");
1344 if (key_state & 16) 1339 if (state & 16)
1345 fputc ('C', stderr); 1340 fputc ('C', stderr);
1346 if (key_state & 4) 1341 if (state & 4)
1347 fputc ('S', stderr); 1342 fputc ('S', stderr);
1348 if (key_state & 8) 1343 if (state & 8)
1349 fputc ('A', stderr); 1344 fputc ('A', stderr);
1350 if (key_state & 32) 1345 if (state & 32)
1351 fputc ('2', stderr); 1346 fputc ('2', stderr);
1352 fprintf (stderr, "]: <%d>, %d/%d\n", 1347 fprintf (stderr, "]: <%d>, %d/%d\n",
1353 button_number, 1348 button_number,
1354 x, 1349 x,
1355 y); 1350 y);
1356#endif 1351#endif
1357 1352
1358#if ENABLE_FRILLS 1353#if ENABLE_FRILLS
1359 if (priv_modes & PrivMode_ExtMouseRight) 1354 if (priv_modes & PrivMode_ExtMouseSGR)
1355 tt_printf ("\033[<%d;%d;%d%c",
1356 button_number + state,
1357 x,
1358 y,
1359 release ? 'm' : 'M');
1360 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1360 tt_printf ("\033[%d;%d;%dM", 1361 tt_printf ("\033[%d;%d;%dM",
1361 code + button_number + key_state, 1362 code,
1362 x, 1363 x,
1363 y); 1364 y);
1364 else if (priv_modes & PrivMode_ExtModeMouse) 1365 else if (priv_modes & PrivMode_ExtMouseUTF8)
1366 if (code < 128)
1365 tt_printf ("\033[M%c%lc%lc", 1367 tt_printf ("\033[M%c%lc%lc",
1366 code + button_number + key_state, 1368 code,
1367 wint_t (32 + x), 1369 wint_t (32 + x),
1368 wint_t (32 + y)); 1370 wint_t (32 + y));
1371 else
1372 tt_printf ("\033[M%c%c%lc%lc",
1373 0xc0 + (code >> 6),
1374 0x80 + (code & 0x3f),
1375 wint_t (32 + x),
1376 wint_t (32 + y));
1369 else 1377 else
1370#endif 1378#endif
1371 tt_printf ("\033[M%c%c%c", 1379 tt_printf ("\033[M%c%c%c",
1372 code + button_number + key_state, 1380 code,
1373 32 + x, 1381 32 + x,
1374 32 + y); 1382 32 + y);
1375} 1383}
1376 1384
1377/*{{{ process an X event */ 1385/*{{{ process an X event */
… …
1488 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1496 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1489 ; 1497 ;
1490 1498
1491 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE); 1499 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1492 1500
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) 1501 if (want_position_change)
1504 { 1502 {
1505 int x, y; 1503 int x, y;
1506 1504
1507 if (ev.xconfigure.send_event) 1505 if (ev.xconfigure.send_event)
… …
1515 if (x != parent_x || y != parent_y) 1513 if (x != parent_x || y != parent_y)
1516 { 1514 {
1517 parent_x = x; 1515 parent_x = x;
1518 parent_y = y; 1516 parent_y = y;
1519 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END)); 1517 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1520 moved = true;
1521 } 1518 }
1522 } 1519 }
1523 1520
1524 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1521 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1525 { 1522 {
1526 seen_resize = 1; 1523 seen_resize = 1;
1527 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1524 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1528 } 1525 }
1529 else
1530 {
1531#ifdef HAVE_BG_PIXMAP
1532 if (moved)
1533 update_background ();
1534#endif
1535 }
1536 1526
1537 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1527 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1538 } 1528 }
1539 break; 1529 break;
1540 1530
… …
1549 case SelectionRequest: 1539 case SelectionRequest:
1550 selection_send (ev.xselectionrequest); 1540 selection_send (ev.xselectionrequest);
1551 break; 1541 break;
1552 1542
1553 case MapNotify: 1543 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; 1544 mapped = 1;
1566#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
1567 text_blink_ev.start (); 1546 text_blink_ev.start ();
1568#endif 1547#endif
1569 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1618 case MotionNotify: 1597 case MotionNotify:
1619#ifdef POINTER_BLANK 1598#ifdef POINTER_BLANK
1620 if (hidden_pointer) 1599 if (hidden_pointer)
1621 pointer_unblank (); 1600 pointer_unblank ();
1622#endif 1601#endif
1602 if (!bypass_keystate
1623 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1603 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1624 || priv_modes & PrivMode_MouseAnyEvent) 1604 || priv_modes & PrivMode_MouseAnyEvent))
1625 mouse_report (ev.xbutton); 1605 mouse_report (ev.xbutton);
1626 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1606 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1627 break; 1607 break;
1628 1608
1629 if (ev.xany.window == vt) 1609 if (ev.xany.window == vt)
… …
1641 &unused_root_x, &unused_root_y, 1621 &unused_root_x, &unused_root_y,
1642 &ev.xbutton.x, &ev.xbutton.y, 1622 &ev.xbutton.x, &ev.xbutton.y,
1643 &ev.xbutton.state); 1623 &ev.xbutton.state);
1644#ifdef MOUSE_THRESHOLD 1624#ifdef MOUSE_THRESHOLD
1645 /* deal with a `jumpy' mouse */ 1625 /* deal with a `jumpy' mouse */
1646 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1626 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1627#endif
1647 { 1628 {
1648#endif
1649#if ISO_14755 1629#if ISO_14755
1650 // 5.4 1630 // 5.4
1651 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1631 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1652 { 1632 {
1653 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1633 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1702 * shouldn't be scrolling 1682 * shouldn't be scrolling
1703 */ 1683 */
1704 sel_scroll_ev.stop(); 1684 sel_scroll_ev.stop();
1705 } 1685 }
1706#endif 1686#endif
1707#ifdef MOUSE_THRESHOLD
1708 } 1687 }
1709#endif
1710 } 1688 }
1711 } 1689 }
1712 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win) 1690 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1713 { 1691 {
1714 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1692 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
… …
1788#endif 1766#endif
1789#if OFF_FOCUS_FADING 1767#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade]) 1768 if (rs[Rs_fade])
1791 { 1769 {
1792 pix_colors = pix_colors_focused; 1770 pix_colors = pix_colors_focused;
1793 scr_recolour (); 1771 scr_recolor ();
1794 } 1772 }
1795#endif 1773#endif
1796#if ENABLE_FRILLS 1774#if ENABLE_FRILLS
1797 if (option (Opt_urgentOnBell)) 1775 if (option (Opt_urgentOnBell))
1798 set_urgency (0); 1776 set_urgency (0);
1777
1778 if (priv_modes & PrivMode_FocusEvent)
1779 tt_printf ("\x1b[I");
1799#endif 1780#endif
1800 1781
1801 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1782 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1802 } 1783 }
1803} 1784}
… …
1811 want_refresh = 1; 1792 want_refresh = 1;
1812 1793
1813#if ENABLE_FRILLS 1794#if ENABLE_FRILLS
1814 if (option (Opt_urgentOnBell)) 1795 if (option (Opt_urgentOnBell))
1815 set_urgency (0); 1796 set_urgency (0);
1797
1798 if (priv_modes & PrivMode_FocusEvent)
1799 tt_printf ("\x1b[O");
1816#endif 1800#endif
1817#if ENABLE_FRILLS || ISO_14755 1801#if ENABLE_FRILLS || ISO_14755
1818 if (iso14755buf) 1802 if (iso14755buf)
1819 { 1803 {
1820 iso14755buf = 0; 1804 iso14755buf = 0;
… …
1835#endif 1819#endif
1836#if OFF_FOCUS_FADING 1820#if OFF_FOCUS_FADING
1837 if (rs[Rs_fade]) 1821 if (rs[Rs_fade])
1838 { 1822 {
1839 pix_colors = pix_colors_unfocused; 1823 pix_colors = pix_colors_unfocused;
1840 scr_recolour (); 1824 scr_recolor ();
1841 } 1825 }
1842#endif 1826#endif
1843 1827
1844 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1828 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1845 } 1829 }
1846} 1830}
1847 1831
1848void ecb_cold 1832void ecb_cold
1849rxvt_term::update_fade_color (unsigned int idx) 1833rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1850{ 1834{
1851#if OFF_FOCUS_FADING 1835#if OFF_FOCUS_FADING
1852 if (rs[Rs_fade]) 1836 if (rs[Rs_fade])
1853 { 1837 {
1838 if (!first_time)
1839 pix_colors_focused [idx].free (this);
1840
1854 rgba c; 1841 rgba c;
1855 pix_colors [Color_fade].get (c); 1842 pix_colors [Color_fade].get (c);
1856 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1843 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1857 } 1844 }
1858#endif 1845#endif
1859} 1846}
1860 1847
1861#if BG_IMAGE_FROM_ROOT || ENABLE_PERL 1848#if ENABLE_PERL
1862void ecb_hot 1849void ecb_hot
1863rxvt_term::rootwin_cb (XEvent &ev) 1850rxvt_term::rootwin_cb (XEvent &ev)
1864{ 1851{
1865 make_current (); 1852 make_current ();
1866 1853
… …
1876 * use the property to determine the pixmap. We use it later on. 1863 * use the property to determine the pixmap. We use it later on.
1877 */ 1864 */
1878 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1865 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1879 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1866 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1880 { 1867 {
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)); 1868 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1889 } 1869 }
1890 1870
1891 break; 1871 break;
1892 } 1872 }
… …
1920 iso14755_54 (ev.x, ev.y); 1900 iso14755_54 (ev.x, ev.y);
1921 return; 1901 return;
1922 } 1902 }
1923#endif 1903#endif
1924 1904
1925 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1905 clickintime = ev.time - MEvent.time < multiClickTime;
1926 1906
1927 if (reportmode) 1907 if (reportmode)
1928 { 1908 {
1929 /* mouse report from vt window */ 1909 /* mouse report from vt window */
1930 /* save the xbutton state (for ButtonRelease) */ 1910 /* save the xbutton state (for ButtonRelease) */
… …
2173 2153
2174 if (reportmode) 2154 if (reportmode)
2175 { 2155 {
2176 /* mouse report from vt window */ 2156 /* mouse report from vt window */
2177 /* don't report release of wheel "buttons" */ 2157 /* don't report release of wheel "buttons" */
2178 if (ev.button >= 4) 2158 if (ev.button >= 4 && ev.button <= 7)
2179 return; 2159 return;
2180#ifdef MOUSE_REPORT_DOUBLECLICK 2160#ifdef MOUSE_REPORT_DOUBLECLICK
2181 /* only report the release of 'slow' single clicks */ 2161 /* only report the release of 'slow' single clicks */
2182 if (MEvent.button != AnyButton 2162 if (MEvent.button != AnyButton
2183 && (ev.button != MEvent.button 2163 && (ev.button != MEvent.button
2184 || (ev.time - MEvent.time 2164 || (ev.time - MEvent.time
2185 > MULTICLICK_TIME / 2))) 2165 > multiClickTime / 2)))
2186 { 2166 {
2187 MEvent.clicks = 0; 2167 MEvent.clicks = 0;
2188 MEvent.button = AnyButton; 2168 MEvent.button = ev.button;
2189 mouse_report (ev); 2169 mouse_report (ev);
2190 } 2170 }
2191#else /* MOUSE_REPORT_DOUBLECLICK */ 2171#else /* MOUSE_REPORT_DOUBLECLICK */
2192 MEvent.button = AnyButton; 2172 MEvent.button = ev.button;
2193 mouse_report (ev); 2173 mouse_report (ev);
2194#endif /* MOUSE_REPORT_DOUBLECLICK */ 2174#endif /* MOUSE_REPORT_DOUBLECLICK */
2195 return; 2175 return;
2196 } 2176 }
2197 2177
… …
2384 } 2364 }
2385} 2365}
2386 2366
2387// read the next character 2367// read the next character
2388wchar_t ecb_hot 2368wchar_t ecb_hot
2389rxvt_term::next_char () NOTHROW 2369rxvt_term::next_char () noexcept
2390{ 2370{
2391 while (cmdbuf_ptr < cmdbuf_endp) 2371 while (cmdbuf_ptr < cmdbuf_endp)
2392 { 2372 {
2393 // assume 7-bit to be ascii ALWAYS 2373 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2394 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2374 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2395 return *cmdbuf_ptr++; 2375 return *cmdbuf_ptr++;
2396 2376
2397 wchar_t wc; 2377 wchar_t wc;
2398 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2378 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2399 2379
… …
2420 return NOCHAR; 2400 return NOCHAR;
2421} 2401}
2422 2402
2423// read the next octet 2403// read the next octet
2424uint32_t ecb_hot 2404uint32_t ecb_hot
2425rxvt_term::next_octet () NOTHROW 2405rxvt_term::next_octet () noexcept
2426{ 2406{
2427 return cmdbuf_ptr < cmdbuf_endp 2407 return cmdbuf_ptr < cmdbuf_endp
2428 ? (unsigned char)*cmdbuf_ptr++ 2408 ? (unsigned char)*cmdbuf_ptr++
2429 : NOCHAR; 2409 : NOCHAR;
2430} 2410}
2431 2411
2432static class out_of_input out_of_input; 2412static class out_of_input out_of_input;
2433 2413
2434wchar_t ecb_hot 2414wchar_t ecb_hot
2435rxvt_term::cmd_getc () THROW ((class out_of_input)) 2415rxvt_term::cmd_getc ()
2436{ 2416{
2437 wchar_t c = next_char (); 2417 wchar_t c = next_char ();
2438 2418
2439 if (c == NOCHAR) 2419 if (c == NOCHAR)
2440 throw out_of_input; 2420 throw out_of_input;
2441 2421
2442 return c; 2422 return c;
2443} 2423}
2444 2424
2445uint32_t ecb_hot 2425uint32_t ecb_hot
2446rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2426rxvt_term::cmd_get8 ()
2447{ 2427{
2448 uint32_t c = next_octet (); 2428 uint32_t c = next_octet ();
2449 2429
2450 if (c == NOCHAR) 2430 if (c == NOCHAR)
2451 throw out_of_input; 2431 throw out_of_input;
… …
2580 scr_charset_choose (0); 2560 scr_charset_choose (0);
2581 break; 2561 break;
2582 2562
2583#ifdef EIGHT_BIT_CONTROLS 2563#ifdef EIGHT_BIT_CONTROLS
2584 // 8-bit controls 2564 // 8-bit controls
2585 case 0x90: /* DCS */ 2565 case 0x90: /* DCS */
2586 process_dcs_seq (); 2566 process_dcs_seq ();
2587 break; 2567 break;
2588 case 0x9b: /* CSI */ 2568 case 0x9b: /* CSI */
2589 process_csi_seq (); 2569 process_csi_seq ();
2590 break; 2570 break;
2591 case 0x9d: /* OSC */ 2571 case 0x9d: /* OSC */
2592 process_osc_seq (); 2572 process_osc_seq ();
2593 break; 2573 break;
2594#endif 2574#endif
2595 } 2575 }
2596} 2576}
… …
2724 wchar_t nlcr[] = { C0_LF, C0_CR }; 2704 wchar_t nlcr[] = { C0_LF, C0_CR };
2725 scr_add_lines (nlcr, ecb_array_length (nlcr), 1); 2705 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2726 } 2706 }
2727 break; 2707 break;
2728 2708
2709#if 0 // disabled because embedded newlines can make exploits easier
2729 /* kidnapped escape sequence: Should be 8.3.48 */ 2710 /* kidnapped escape sequence: Should be 8.3.48 */
2730 case C1_ESA: /* ESC G */ 2711 case C1_ESA: /* ESC G */
2731 // used by original rxvt for rob nations own graphics mode 2712 // used by original rxvt for rob nations own graphics mode
2732 if (cmd_getc () == 'Q') 2713 if (cmd_getc () == 'Q' && option (Opt_insecure))
2733 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2714 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2734 break; 2715 break;
2716#endif
2735 2717
2736 /* 8.3.63: CHARACTER TABULATION SET */ 2718 /* 8.3.63: CHARACTER TABULATION SET */
2737 case C1_HTS: /* ESC H */ 2719 case C1_HTS: /* ESC H */
2738 scr_set_tab (1); 2720 scr_set_tab (1);
2739 break; 2721 break;
… …
2897 break; 2879 break;
2898 2880
2899 case '?': 2881 case '?':
2900 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2882 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2901 process_terminal_mode (ch, priv, nargs, arg); 2883 process_terminal_mode (ch, priv, nargs, arg);
2884 if (prev_ch == '$' && ch == 'p')
2885 process_terminal_mode (ch, priv, nargs, arg);
2902 break; 2886 break;
2903 2887
2904 case '!': 2888 case '!':
2905 if (ch == CSI_70) 2889 if (ch == CSI_70)
2906 { 2890 {
2907 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2891 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2908 scr_soft_reset (); 2892 scr_soft_reset ();
2909 2893
2910 static const int pm_h[] = { 7, 25 }; 2894 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 }; 2895 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2912 2896
2913 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h); 2897 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); 2898 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2915 } 2899 }
2916 break; 2900 break;
… …
2946 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2930 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2947 scr_gotorc (arg[0], 0, RELATIVE); 2931 scr_gotorc (arg[0], 0, RELATIVE);
2948 break; 2932 break;
2949 2933
2950 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2934 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2951 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2935 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2952#ifdef ISO6429 2936#ifdef ISO6429
2953 arg[0] = -arg[0]; 2937 arg[0] = -arg[0];
2954#else /* emulate common DEC VTs */ 2938#else /* emulate common DEC VTs */
2955 arg[0] = arg[0] ? -arg[0] : -1; 2939 arg[0] = arg[0] ? -arg[0] : -1;
2956#endif 2940#endif
… …
3047 case 7: /* unofficial extension */ 3031 case 7: /* unofficial extension */
3048 if (option (Opt_insecure)) 3032 if (option (Opt_insecure))
3049 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3033 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3050 break; 3034 break;
3051 case 8: /* unofficial extension */ 3035 case 8: /* unofficial extension */
3036 {
3037 string_term st;
3038 st.v[0] = CHAR_ST;
3039 st.v[1] = '\0';
3052 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3040 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
3053 break; 3041 break;
3042 }
3054 } 3043 }
3055 break; 3044 break;
3056 3045
3057 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3046 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
3058 switch (arg[0]) 3047 switch (arg[0])
… …
3101 scr_insert_mode (1); 3090 scr_insert_mode (1);
3102 else if (arg[0] == 20) 3091 else if (arg[0] == 20)
3103 priv_modes |= PrivMode_LFNL; 3092 priv_modes |= PrivMode_LFNL;
3104 break; 3093 break;
3105 3094
3106 case CSI_71: // DESCUSR: set cursor style 3095 case CSI_71: // DECSCUSR: set cursor style
3107 if (prev_ch == ' ') 3096 if (prev_ch == ' ')
3108 set_cursor_style (arg[0]); 3097 set_cursor_style (arg[0]);
3109 break; 3098 break;
3110 3099
3111 /* 3100 /*
… …
3243/* 3232/*
3244 * get input up until STRING TERMINATOR (or BEL) 3233 * get input up until STRING TERMINATOR (or BEL)
3245 * ends_how is terminator used. returned input must be free()'d 3234 * ends_how is terminator used. returned input must be free()'d
3246 */ 3235 */
3247char * 3236char *
3248rxvt_term::get_to_st (unicode_t &ends_how) 3237rxvt_term::get_to_st (string_term &st)
3249{ 3238{
3250 unicode_t ch; 3239 unicode_t ch;
3251 bool seen_esc = false; 3240 bool seen_esc = false;
3252 unsigned int n = 0; 3241 unsigned int n = 0;
3253 wchar_t string[CBUFSIZ]; 3242 wchar_t string[CBUFSIZ];
… …
3282 string[n++] = ch; 3271 string[n++] = ch;
3283 } 3272 }
3284 3273
3285 string[n++] = '\0'; 3274 string[n++] = '\0';
3286 3275
3287 ends_how = (ch == 0x5c ? C0_ESC : ch); 3276 n = 0;
3277 if (ch == 0x5c)
3278 st.v[n++] = C0_ESC;
3279 st.v[n++] = ch;
3280 st.v[n] = '\0';
3288 3281
3289 return rxvt_wcstombs (string); 3282 return rxvt_wcstombs (string);
3290} 3283}
3291 3284
3292/*----------------------------------------------------------------------*/ 3285/*----------------------------------------------------------------------*/
… …
3298{ 3291{
3299 /* 3292 /*
3300 * Not handled yet 3293 * Not handled yet
3301 */ 3294 */
3302 3295
3303 unicode_t eh; 3296 string_term st;
3304 char *s = get_to_st (eh); 3297 char *s = get_to_st (st);
3305 if (s) 3298 if (s)
3306 free (s); 3299 free (s);
3307 3300
3308 return; 3301 return;
3309} 3302}
… …
3321 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3314 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3322 arg = arg * 10 + (ch - '0'); 3315 arg = arg * 10 + (ch - '0');
3323 3316
3324 if (ch == ';') 3317 if (ch == ';')
3325 { 3318 {
3326 unicode_t eh; 3319 string_term st;
3327 char *s = get_to_st (eh); 3320 char *s = get_to_st (st);
3328 3321
3329 if (s) 3322 if (s)
3330 { 3323 {
3331 process_xterm_seq (arg, s, eh); 3324 process_xterm_seq (arg, s, st);
3332 free (s); 3325 free (s);
3333 } 3326 }
3334 } 3327 }
3335} 3328}
3336 3329
3330static unsigned int
3331colorcube_index (unsigned int idx_r,
3332 unsigned int idx_g,
3333 unsigned int idx_b)
3334{
3335 assert (idx_r < Red_levels);
3336 assert (idx_g < Green_levels);
3337 assert (idx_b < Blue_levels);
3338
3339 return idx_r * Blue_levels * Green_levels +
3340 idx_g * Blue_levels +
3341 idx_b;
3342}
3343
3344/*
3345 * Find the nearest color slot in the hidden color cube,
3346 * adapt its value to the 32bit RGBA color.
3347 */
3348unsigned int
3349rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3350{
3351 r &= 0xff;
3352 g &= 0xff;
3353 b &= 0xff;
3354 a &= 0xff;
3355
3356 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3357
3358 /* we allow one of the 6 closest neighbouring colours */
3359 /* to replace the current color, if they not used recently */
3360 #if 0
3361 static const unsigned char dxyz[][3] = {
3362 0, 0, 0,
3363 0, 0, 4,
3364 0, 4, 4,
3365 4, 4, 0,
3366 4, 0, 4,
3367 0, 4, 0,
3368 4, 0, 0,
3369 };
3370 #else
3371 // silly compressed verlapping triplets version of above
3372 static const unsigned char dxyz[] = {
3373 0, 0, 0, 4, 4, 0, 4, 0, 0,
3374 };
3375 #endif
3376
3377 static const unsigned char color_level[8][32] = {
3378 // neighbour index
3379 {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},
3380 {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},
3381 {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},
3382 {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},
3383 // Red_levels/Green_levels/Blue_levels index
3384 {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},
3385 {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},
3386 {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},
3387 {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},
3388 };
3389
3390 unsigned int idx;
3391
3392 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3393 {
3394 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3395 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3396 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3397 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3398
3399 if (n == 0)
3400 idx = index;
3401
3402 if (rgb24_color[index] == color)
3403 {
3404 rgb24_seqno[index] = ++rgb24_sequence;
3405 return index + minTermCOLOR24;
3406 }
3407
3408 // minor issue: could update index 0 few more times
3409 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3410 {
3411 idx = index;
3412 goto update;
3413 }
3414
3415 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3416 // but also handles wrap around values well enough
3417 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3418 idx = index;
3419 }
3420
3421update:
3422 rgb24_color[idx] = color;
3423 rgb24_seqno[idx] = ++rgb24_sequence;
3424
3425 idx += minTermCOLOR24;
3426 pix_colors_focused [idx].free (this);
3427 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3428 update_fade_color (idx, false);
3429
3430 return idx;
3431}
3432
3337void 3433void
3338rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3434rxvt_term::process_color_seq (int report, int color, const char *str, string_term &st)
3339{ 3435{
3340 if (str[0] == '?' && !str[1]) 3436 if (str[0] == '?' && !str[1])
3341 { 3437 {
3342 rgba c; 3438 rgba c;
3343 pix_colors_focused[color].get (c); 3439 pix_colors_focused[color].get (c);
3440 char rgba_str[32];
3344 3441
3345#if XFT 3442#if XFT
3346 if (c.a != rgba::MAX_CC) 3443 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); 3444 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3348 else 3445 else
3349#endif 3446#endif
3350 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3447 snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
3448
3449 if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3450 tt_printf ("\033]%d;%d;%s%s", report, color - minCOLOR, rgba_str, st.v);
3451 else
3452 tt_printf ("\033]%d;%s%s", report, rgba_str, st.v);
3351 } 3453 }
3352 else 3454 else
3353 set_window_color (color, str); 3455 set_window_color (color, str);
3354} 3456}
3355 3457
3356/* 3458/*
3357 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3459 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3358 */ 3460 */
3359void 3461void
3360rxvt_term::process_xterm_seq (int op, char *str, char resp) 3462rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3361{ 3463{
3362 int color; 3464 int color;
3363 char *buf, *name; 3465 char *buf, *name;
3364 bool query = str[0] == '?' && !str[1]; 3466 bool query = str[0] == '?' && !str[1];
3365 int saveop = op; 3467 int saveop = op;
… …
3400 &nitems, &bytes_after, &value) == Success 3502 &nitems, &bytes_after, &value) == Success
3401 && actual_type != None 3503 && actual_type != None
3402 && actual_format == 8) 3504 && actual_format == 8)
3403 str = (const char *)(value); 3505 str = (const char *)(value);
3404 3506
3405 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp); 3507 tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
3406 3508
3407 XFree (value); 3509 XFree (value);
3408 } 3510 }
3409 else 3511 else
3410 { 3512 {
… …
3434 break; 3536 break;
3435 3537
3436 if ((buf = strchr (name, ';')) != NULL) 3538 if ((buf = strchr (name, ';')) != NULL)
3437 *buf++ = '\0'; 3539 *buf++ = '\0';
3438 3540
3439 process_color_seq (op, color, name, resp); 3541 process_color_seq (op, color, name, st);
3440 } 3542 }
3441 break; 3543 break;
3442 case Rxvt_restoreFG: 3544 case Rxvt_restoreFG:
3443 case XTerm_Color00: 3545 case XTerm_Color00:
3444 process_color_seq (op, Color_fg, str, resp); 3546 process_color_seq (op, Color_fg, str, st);
3445 break; 3547 break;
3446 case Rxvt_restoreBG: 3548 case Rxvt_restoreBG:
3447 case XTerm_Color01: 3549 case XTerm_Color01:
3448 process_color_seq (op, Color_bg, str, resp); 3550 process_color_seq (op, Color_bg, str, st);
3449 break; 3551 break;
3450#ifndef NO_CURSORCOLOR 3552#ifndef NO_CURSORCOLOR
3451 case XTerm_Color_cursor: 3553 case XTerm_Color_cursor:
3452 process_color_seq (op, Color_cursor, str, resp); 3554 process_color_seq (op, Color_cursor, str, st);
3453 break; 3555 break;
3454#endif 3556#endif
3455 case XTerm_Color_pointer_fg: 3557 case XTerm_Color_pointer_fg:
3456 process_color_seq (op, Color_pointer_fg, str, resp); 3558 process_color_seq (op, Color_pointer_fg, str, st);
3457 break; 3559 break;
3458 case XTerm_Color_pointer_bg: 3560 case XTerm_Color_pointer_bg:
3459 process_color_seq (op, Color_pointer_bg, str, resp); 3561 process_color_seq (op, Color_pointer_bg, str, st);
3460 break; 3562 break;
3461#ifdef OPTION_HC 3563#ifdef OPTION_HC
3462 case XTerm_Color_HC: 3564 case XTerm_Color_HC:
3463 process_color_seq (op, Color_HC, str, resp); 3565 process_color_seq (op, Color_HC, str, st);
3464 break; 3566 break;
3465 case XTerm_Color_HTC: 3567 case XTerm_Color_HTC:
3466 process_color_seq (op, Color_HTC, str, resp); 3568 process_color_seq (op, Color_HTC, str, st);
3467 break; 3569 break;
3468#endif 3570#endif
3469#ifndef NO_BOLD_UNDERLINE_REVERSE 3571#ifndef NO_BOLD_UNDERLINE_REVERSE
3470 case URxvt_Color_BD: 3572 case URxvt_Color_BD:
3471 process_color_seq (op, Color_BD, str, resp); 3573 process_color_seq (op, Color_BD, str, st);
3472 break; 3574 break;
3473 case URxvt_Color_UL: 3575 case URxvt_Color_UL:
3474 process_color_seq (op, Color_UL, str, resp); 3576 process_color_seq (op, Color_UL, str, st);
3475 break; 3577 break;
3476 case URxvt_Color_IT: 3578 case URxvt_Color_IT:
3477 process_color_seq (op, Color_IT, str, resp); 3579 process_color_seq (op, Color_IT, str, st);
3478 break; 3580 break;
3479#endif 3581#endif
3480 case URxvt_Color_border: 3582 case URxvt_Color_border:
3481 process_color_seq (op, Color_border, str, resp); 3583 process_color_seq (op, Color_border, str, st);
3482 break; 3584 break;
3483
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 3585
3552 case XTerm_logfile: 3586 case XTerm_logfile:
3553 // TODO, when secure mode? 3587 // TODO, when secure mode?
3554 break; 3588 break;
3555 3589
… …
3572 case URxvt_boldFont: 3606 case URxvt_boldFont:
3573 case URxvt_italicFont: 3607 case URxvt_italicFont:
3574 case URxvt_boldItalicFont: 3608 case URxvt_boldItalicFont:
3575#endif 3609#endif
3576 if (query) 3610 if (query)
3577 tt_printf ("\33]%d;%-.250s%c", saveop, 3611 tt_printf ("\33]%d;%-.250s%s", saveop,
3578 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3612 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3579 ? fontset[op - URxvt_font]->fontdesc : "", 3613 ? fontset[op - URxvt_font]->fontdesc : "",
3580 resp); 3614 st.v);
3581 else 3615 else
3582 { 3616 {
3583 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3617 const char *&res = rs[Rs_font + (op - URxvt_font)];
3584 3618
3585 res = strdup (str); 3619 res = strdup (str);
… …
3588 } 3622 }
3589 break; 3623 break;
3590 3624
3591 case URxvt_version: 3625 case URxvt_version:
3592 if (query) 3626 if (query)
3593 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3627 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3594 op, 3628 op,
3595 rs[Rs_name], VERSION[0], VERSION[2], 3629 rs[Rs_name], VERSION[0], VERSION[2],
3596 resp); 3630 st.v);
3597 break; 3631 break;
3598 3632
3599#if !ENABLE_MINIMAL 3633#if !ENABLE_MINIMAL
3634 case URxvt_cellinfo:
3635 if (query)
3636 tt_printf ("\33]%d;%d;%d;%d%s", saveop,
3637 fwidth, fheight, fbase,
3638 st.v);
3639 break;
3640
3600 case URxvt_locale: 3641 case URxvt_locale:
3601 if (query) 3642 if (query)
3602 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp); 3643 tt_printf ("\33]%d;%-.250s%s", op, option (Opt_insecure) ? locale : "", st.v);
3603 else 3644 else
3604 { 3645 {
3605 set_locale (str); 3646 set_locale (str);
3606 pty->set_utf8_mode (enc_utf8); 3647 pty->set_utf8_mode (enc_utf8);
3607 init_xlocale (); 3648 init_xlocale ();
… …
3622 break; 3663 break;
3623#endif 3664#endif
3624 3665
3625#if ENABLE_PERL 3666#if ENABLE_PERL
3626 case URxvt_perl: 3667 case URxvt_perl:
3627 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END)); 3668 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END));
3628 break; 3669 break;
3629#endif 3670#endif
3630 } 3671 }
3631} 3672}
3632/*----------------------------------------------------------------------*/ 3673/*----------------------------------------------------------------------*/
… …
3689 { 5, PrivMode_rVideo }, // DECSCNM 3730 { 5, PrivMode_rVideo }, // DECSCNM
3690 { 6, PrivMode_relOrigin }, // DECOM 3731 { 6, PrivMode_relOrigin }, // DECOM
3691 { 7, PrivMode_Autowrap }, // DECAWM 3732 { 7, PrivMode_Autowrap }, // DECAWM
3692 // 8, auto-repeat keys // DECARM 3733 // 8, auto-repeat keys // DECARM
3693 { 9, PrivMode_MouseX10 }, 3734 { 9, PrivMode_MouseX10 },
3735 { 12, PrivMode_BlinkingCursor },
3694 // 18 end FF to printer after print screen 3736 // 18 end FF to printer after print screen
3695 // 19 Print screen prints full screen/scroll region 3737 // 19 Print screen prints full screen/scroll region
3696 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3738 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3697#ifdef scrollBar_esc 3739#ifdef scrollBar_esc
3698 { scrollBar_esc, PrivMode_scrollBar }, 3740 { scrollBar_esc, PrivMode_scrollBar },
… …
3710#endif 3752#endif
3711 { 1000, PrivMode_MouseX11 }, 3753 { 1000, PrivMode_MouseX11 },
3712 { 1002, PrivMode_MouseBtnEvent }, 3754 { 1002, PrivMode_MouseBtnEvent },
3713 { 1003, PrivMode_MouseAnyEvent }, 3755 { 1003, PrivMode_MouseAnyEvent },
3714#if ENABLE_FRILLS 3756#if ENABLE_FRILLS
3757 { 1004, PrivMode_FocusEvent },
3715 { 1005, PrivMode_ExtModeMouse }, 3758 { 1005, PrivMode_ExtMouseUTF8 },
3759 { 1006, PrivMode_ExtMouseSGR },
3716#endif 3760#endif
3717 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3761 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3718 { 1011, PrivMode_Keypress }, // rxvt extension 3762 { 1011, PrivMode_Keypress }, // rxvt extension
3719#if ENABLE_FRILLS 3763#if ENABLE_FRILLS
3720 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 3764 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3721#endif 3765#endif
3722 // 1035 enable modifiers for alt, numlock NYI 3766 // 1035 enable modifiers for alt, numlock NYI
3723 // 1036 send ESC for meta keys NYI 3767 // 1036 send ESC for meta keys NYI
3724 // 1037 send DEL for keypad delete NYI 3768 // 1037 send DEL for keypad delete NYI
3725 { 1047, PrivMode_Screen }, 3769 { 1047, PrivMode_Screen },
3726 // 1048 save and restore cursor, implemented in code 3770 // 1048 save and restore cursor, implemented in code
3727 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3771 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3728 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3772 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3773#if ENABLE_FRILLS
3729 { 2004, PrivMode_BracketPaste }, 3774 { 2004, PrivMode_BracketPaste },
3775#endif
3730 }; 3776 };
3731 3777
3732 if (nargs == 0) 3778 if (nargs == 0)
3733 return; 3779 return;
3780
3781 // DECRQM
3782 if (mode == 'p')
3783 {
3784 int status = 0;
3785 if (nargs != 1)
3786 return;
3787
3788 for (j = 0; j < ecb_array_length (argtopriv); j++)
3789 if (argtopriv[j].argval == arg[0])
3790 {
3791 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3792 break;
3793 }
3794
3795 tt_printf ("\33[?%d;%d$y", arg[0], status);
3796 return;
3797 }
3734 3798
3735 /* make lo/hi boolean */ 3799 /* make lo/hi boolean */
3736 if (mode == 'l') 3800 if (mode == 'l')
3737 mode = 0; /* reset */ 3801 mode = 0; /* reset */
3738 else if (mode == 'h') 3802 else if (mode == 'h')
… …
3807 scrollBar.map (state); 3871 scrollBar.map (state);
3808 resize_all_windows (0, 0, 0); 3872 resize_all_windows (0, 0, 0);
3809 scr_touch (true); 3873 scr_touch (true);
3810 break; 3874 break;
3811#endif 3875#endif
3876#ifdef CURSOR_BLINK
3877 case 12:
3878 cursor_blink_reset ();
3879 break;
3880#endif
3812 case 25: /* visible/invisible cursor */ 3881 case 25: /* visible/invisible cursor */
3813 scr_cursor_visible (state); 3882 scr_cursor_visible (state);
3814 break; 3883 break;
3815 /* case 35: - shift keys */ 3884 /* case 35: - shift keys */
3816 /* case 40: - 80 <--> 132 mode */ 3885 /* case 40: - 80 <--> 132 mode */
… …
3921 //case 19: // ninth alt font 3990 //case 19: // ninth alt font
3922 //case 20: // gothic 3991 //case 20: // gothic
3923 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3992 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3924 rendset = 0, rendstyle = RS_Bold; 3993 rendset = 0, rendstyle = RS_Bold;
3925 break; 3994 break;
3926 case 22: // normal intensity 3995 case 22: // bold off (vt220)
3927 rendset = 0, rendstyle = RS_Bold; 3996 rendset = 0, rendstyle = RS_Bold;
3928 break; 3997 break;
3929 case 23: // disable italic 3998 case 23: // disable italic
3930 rendset = 0, rendstyle = RS_Italic; 3999 rendset = 0, rendstyle = RS_Italic;
3931 break; 4000 break;
3932 case 24: 4001 case 24: // underline off (vt220)
3933 rendset = 0, rendstyle = RS_Uline; 4002 rendset = 0, rendstyle = RS_Uline;
3934 break; 4003 break;
3935 case 25: 4004 case 25: // blink off (vt220)
3936 rendset = 0, rendstyle = RS_Blink; 4005 rendset = 0, rendstyle = RS_Blink;
3937 break; 4006 break;
3938 case 26: // variable spacing (iso 8613) 4007 case 26: // variable spacing (iso 8613)
3939 rendset = 0, rendstyle = RS_Blink; 4008 rendset = 0, rendstyle = RS_Blink;
3940 break; 4009 break;
3941 case 27: 4010 case 27: // reverse off (vt220)
3942 rendset = 0, rendstyle = RS_RVid; 4011 rendset = 0, rendstyle = RS_RVid;
3943 break; 4012 break;
3944 //case 28: // visible. NYI 4013 //case 28: // visible. NYI
3945 //case 29: // not crossed-out 4014 //case 29: // not crossed-out
3946 } 4015 }
… …
3961 case 35: 4030 case 35:
3962 case 36: 4031 case 36:
3963 case 37: 4032 case 37:
3964 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4033 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3965 break; 4034 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 */ 4035 case 39: /* default fg */
3974 scr_color (Color_fg, Color_fg); 4036 scr_color (Color_fg, Color_fg);
3975 break; 4037 break;
3976 4038
3977 case 40: 4039 case 40:
… …
3982 case 45: 4044 case 45:
3983 case 46: 4045 case 46:
3984 case 47: 4046 case 47:
3985 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4047 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3986 break; 4048 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 */ 4049 case 49: /* default bg */
3995 scr_color (Color_bg, Color_bg); 4050 scr_color (Color_bg, Color_bg);
4051 break;
4052
4053 case 38: // set fg color, ISO 8613-6
4054 case 48: // set bg color, ISO 8613-6
4055 {
4056 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4057 unsigned int idx;
4058
4059 if (nargs > i + 2 && arg[i + 1] == 5)
4060 {
4061 idx = minCOLOR + arg[i + 2];
4062 i += 2;
4063
4064 scr_color (idx, fgbg);
4065 }
4066 else if (nargs > i + 4 && arg[i + 1] == 2)
4067 {
4068 unsigned int r = arg[i + 2];
4069 unsigned int g = arg[i + 3];
4070 unsigned int b = arg[i + 4];
4071 unsigned int a = 0xff;
4072
4073 idx = map_rgb24_color (r, g, b, a);
4074
4075 i += 4;
4076
4077 scr_color (idx, fgbg);
4078 }
4079 }
3996 break; 4080 break;
3997 4081
3998 //case 50: // not variable spacing 4082 //case 50: // not variable spacing
3999 4083
4000#if !ENABLE_MINIMAL 4084#if !ENABLE_MINIMAL
… …
4024} 4108}
4025 4109
4026void 4110void
4027rxvt_term::set_cursor_style (int style) 4111rxvt_term::set_cursor_style (int style)
4028{ 4112{
4029 if (!IN_RANGE_INC (style, 0, 4)) 4113 if (!IN_RANGE_INC (style, 0, 6))
4030 return; 4114 return;
4031 4115
4116 if (style == 0)
4117 style = 1;
4118
4119 cursor_type = (style - 1) / 2;
4032 set_option (Opt_cursorUnderline, style >= 3); 4120 set_option (Opt_cursorUnderline, cursor_type == 1);
4033 4121
4034#ifdef CURSOR_BLINK 4122#ifdef CURSOR_BLINK
4035 set_option (Opt_cursorBlink, !style || (style & 1)); 4123 set_option (Opt_cursorBlink, style & 1);
4036 cursor_blink_reset (); 4124 cursor_blink_reset ();
4037#endif 4125#endif
4038 4126
4039 want_refresh = 1; 4127 want_refresh = 1;
4040} 4128}

Diff Legend

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