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.549 by root, Sun May 11 06:38:39 2014 UTC vs.
Revision 1.581 by root, Tue Jul 5 16:42:21 2016 UTC

… …
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-2014 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 2 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.
37 * 37 *
38 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
39 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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;
… …
413 406
414void ecb_cold 407void ecb_cold
415rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
416{ 409{
417 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
418 KeySym keysym; 411 KeySym keysym = NoSymbol;
419 int valid_keysym;
420 char rkbuf[KBUFSZ + 1]; 412 char rkbuf[KBUFSZ + 1];
421 char *kbuf = rkbuf + 1; 413 char *kbuf = rkbuf + 1;
422 414
423#if ISO_14755 415#if ISO_14755
424 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
… …
483 } 475 }
484 } 476 }
485 else 477 else
486 len = 0; 478 len = 0;
487 } 479 }
488
489 valid_keysym = status_return == XLookupKeySym
490 || status_return == XLookupBoth;
491 } 480 }
492 else 481 else
493#endif 482#endif
494 { 483 {
495 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
496 valid_keysym = keysym != NoSymbol;
497 }
498
499 if (valid_keysym)
500 { 485 }
486
487 if (keysym != NoSymbol)
488 {
489 KeySym orig_keysym = keysym;
490
491 /* Shift + F1 - F10 generates F11 - F20 */
492 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
493 {
494 keysym += (XK_F11 - XK_F1);
495 shft = 0; /* turn off Shift */
496 }
497
501 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
502 { 499 {
503 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 500 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
504 unsigned int newlen = 1; 501 unsigned int newlen = 1;
505 502
… …
679 { 676 {
680 char *ch; 677 char *ch;
681 678
682 for (ch = kbuf; ch < kbuf + len; ch++) 679 for (ch = kbuf; ch < kbuf + len; ch++)
683 *ch |= 0x80; 680 *ch |= 0x80;
684
685 meta = 0;
686 } 681 }
687#endif 682#endif
688 /* nil */ ; 683 /* nil */ ;
689 } 684 }
685
686 keysym = orig_keysym;
690 } 687 }
691 688
692 /* escape prefix */ 689 /* escape prefix */
693 if (len && meta 690 if (len && meta
694#ifdef META8_OPTION 691#ifdef META8_OPTION
… …
701 } 698 }
702 699
703 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END))) 700 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
704 return; 701 return;
705 702
706 if (valid_keysym) 703 if (keysym != NoSymbol)
707 { 704 {
708#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
709 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
710 return; 707 return;
711#endif 708#endif
… …
770#endif 767#endif
771 } 768 }
772 769
773 if (shft) 770 if (shft)
774 { 771 {
775 /* Shift + F1 - F10 generates F11 - F20 */
776 if (keysym >= XK_F1 && keysym <= XK_F10)
777 {
778 keysym += (XK_F11 - XK_F1);
779 shft = 0; /* turn off Shift */
780 }
781 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
782 { 773 {
783 switch (keysym) 774 switch (keysym)
784 { 775 {
785 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
786 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
… …
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))
… …
1618 case MotionNotify: 1612 case MotionNotify:
1619#ifdef POINTER_BLANK 1613#ifdef POINTER_BLANK
1620 if (hidden_pointer) 1614 if (hidden_pointer)
1621 pointer_unblank (); 1615 pointer_unblank ();
1622#endif 1616#endif
1617 if (!bypass_keystate
1623 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1618 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1624 || priv_modes & PrivMode_MouseAnyEvent) 1619 || priv_modes & PrivMode_MouseAnyEvent))
1625 mouse_report (ev.xbutton); 1620 mouse_report (ev.xbutton);
1626 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1627 break; 1622 break;
1628 1623
1629 if (ev.xany.window == vt) 1624 if (ev.xany.window == vt)
… …
1641 &unused_root_x, &unused_root_y, 1636 &unused_root_x, &unused_root_y,
1642 &ev.xbutton.x, &ev.xbutton.y, 1637 &ev.xbutton.x, &ev.xbutton.y,
1643 &ev.xbutton.state); 1638 &ev.xbutton.state);
1644#ifdef MOUSE_THRESHOLD 1639#ifdef MOUSE_THRESHOLD
1645 /* deal with a `jumpy' mouse */ 1640 /* deal with a `jumpy' mouse */
1646 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1641 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1642#endif
1647 { 1643 {
1648#endif
1649#if ISO_14755 1644#if ISO_14755
1650 // 5.4 1645 // 5.4
1651 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1646 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1652 { 1647 {
1653 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1648 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1702 * shouldn't be scrolling 1697 * shouldn't be scrolling
1703 */ 1698 */
1704 sel_scroll_ev.stop(); 1699 sel_scroll_ev.stop();
1705 } 1700 }
1706#endif 1701#endif
1707#ifdef MOUSE_THRESHOLD
1708 } 1702 }
1709#endif
1710 } 1703 }
1711 } 1704 }
1712 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win) 1705 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1713 { 1706 {
1714 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
… …
1788#endif 1781#endif
1789#if OFF_FOCUS_FADING 1782#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade]) 1783 if (rs[Rs_fade])
1791 { 1784 {
1792 pix_colors = pix_colors_focused; 1785 pix_colors = pix_colors_focused;
1793 scr_recolour (); 1786 scr_recolor ();
1794 } 1787 }
1795#endif 1788#endif
1796#if ENABLE_FRILLS 1789#if ENABLE_FRILLS
1797 if (option (Opt_urgentOnBell)) 1790 if (option (Opt_urgentOnBell))
1798 set_urgency (0); 1791 set_urgency (0);
1792
1793 if (priv_modes & PrivMode_FocusEvent)
1794 tt_printf ("\x1b[I");
1799#endif 1795#endif
1800 1796
1801 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1797 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1802 } 1798 }
1803} 1799}
… …
1811 want_refresh = 1; 1807 want_refresh = 1;
1812 1808
1813#if ENABLE_FRILLS 1809#if ENABLE_FRILLS
1814 if (option (Opt_urgentOnBell)) 1810 if (option (Opt_urgentOnBell))
1815 set_urgency (0); 1811 set_urgency (0);
1812
1813 if (priv_modes & PrivMode_FocusEvent)
1814 tt_printf ("\x1b[O");
1816#endif 1815#endif
1817#if ENABLE_FRILLS || ISO_14755 1816#if ENABLE_FRILLS || ISO_14755
1818 if (iso14755buf) 1817 if (iso14755buf)
1819 { 1818 {
1820 iso14755buf = 0; 1819 iso14755buf = 0;
… …
1835#endif 1834#endif
1836#if OFF_FOCUS_FADING 1835#if OFF_FOCUS_FADING
1837 if (rs[Rs_fade]) 1836 if (rs[Rs_fade])
1838 { 1837 {
1839 pix_colors = pix_colors_unfocused; 1838 pix_colors = pix_colors_unfocused;
1840 scr_recolour (); 1839 scr_recolor ();
1841 } 1840 }
1842#endif 1841#endif
1843 1842
1844 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1843 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1845 } 1844 }
1846} 1845}
1847 1846
1848void ecb_cold 1847void ecb_cold
1849rxvt_term::update_fade_color (unsigned int idx) 1848rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1850{ 1849{
1851#if OFF_FOCUS_FADING 1850#if OFF_FOCUS_FADING
1852 if (rs[Rs_fade]) 1851 if (rs[Rs_fade])
1853 { 1852 {
1853 if (!first_time)
1854 pix_colors_focused [idx].free (this);
1855
1854 rgba c; 1856 rgba c;
1855 pix_colors [Color_fade].get (c); 1857 pix_colors [Color_fade].get (c);
1856 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1858 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1857 } 1859 }
1858#endif 1860#endif
… …
1920 iso14755_54 (ev.x, ev.y); 1922 iso14755_54 (ev.x, ev.y);
1921 return; 1923 return;
1922 } 1924 }
1923#endif 1925#endif
1924 1926
1925 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1927 clickintime = ev.time - MEvent.time < multiClickTime;
1926 1928
1927 if (reportmode) 1929 if (reportmode)
1928 { 1930 {
1929 /* mouse report from vt window */ 1931 /* mouse report from vt window */
1930 /* save the xbutton state (for ButtonRelease) */ 1932 /* save the xbutton state (for ButtonRelease) */
… …
2180#ifdef MOUSE_REPORT_DOUBLECLICK 2182#ifdef MOUSE_REPORT_DOUBLECLICK
2181 /* only report the release of 'slow' single clicks */ 2183 /* only report the release of 'slow' single clicks */
2182 if (MEvent.button != AnyButton 2184 if (MEvent.button != AnyButton
2183 && (ev.button != MEvent.button 2185 && (ev.button != MEvent.button
2184 || (ev.time - MEvent.time 2186 || (ev.time - MEvent.time
2185 > MULTICLICK_TIME / 2))) 2187 > multiClickTime / 2)))
2186 { 2188 {
2187 MEvent.clicks = 0; 2189 MEvent.clicks = 0;
2188 MEvent.button = AnyButton; 2190 MEvent.button = AnyButton;
2189 mouse_report (ev); 2191 mouse_report (ev);
2190 } 2192 }
… …
2580 scr_charset_choose (0); 2582 scr_charset_choose (0);
2581 break; 2583 break;
2582 2584
2583#ifdef EIGHT_BIT_CONTROLS 2585#ifdef EIGHT_BIT_CONTROLS
2584 // 8-bit controls 2586 // 8-bit controls
2585 case 0x90: /* DCS */ 2587 case 0x90: /* DCS */
2586 process_dcs_seq (); 2588 process_dcs_seq ();
2587 break; 2589 break;
2588 case 0x9b: /* CSI */ 2590 case 0x9b: /* CSI */
2589 process_csi_seq (); 2591 process_csi_seq ();
2590 break; 2592 break;
2591 case 0x9d: /* OSC */ 2593 case 0x9d: /* OSC */
2592 process_osc_seq (); 2594 process_osc_seq ();
2593 break; 2595 break;
2594#endif 2596#endif
2595 } 2597 }
2596} 2598}
… …
3101 scr_insert_mode (1); 3103 scr_insert_mode (1);
3102 else if (arg[0] == 20) 3104 else if (arg[0] == 20)
3103 priv_modes |= PrivMode_LFNL; 3105 priv_modes |= PrivMode_LFNL;
3104 break; 3106 break;
3105 3107
3106 case CSI_71: // DESCUSR: set cursor style 3108 case CSI_71: // DECSCUSR: set cursor style
3107 if (prev_ch == ' ') 3109 if (prev_ch == ' ')
3108 set_cursor_style (arg[0]); 3110 set_cursor_style (arg[0]);
3109 break; 3111 break;
3110 3112
3111 /* 3113 /*
… …
3332 free (s); 3334 free (s);
3333 } 3335 }
3334 } 3336 }
3335} 3337}
3336 3338
3339static unsigned int
3340colorcube_index (unsigned int idx_r,
3341 unsigned int idx_g,
3342 unsigned int idx_b)
3343{
3344 assert (idx_r < Red_levels);
3345 assert (idx_g < Green_levels);
3346 assert (idx_b < Blue_levels);
3347
3348 return idx_r * Blue_levels * Green_levels +
3349 idx_g * Blue_levels +
3350 idx_b;
3351}
3352
3353/*
3354 * Find the nearest color slot in the hidden color cube,
3355 * adapt its value to the 32bit RGBA color.
3356 */
3357unsigned int
3358rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3359{
3360 r &= 0xff;
3361 g &= 0xff;
3362 b &= 0xff;
3363 a &= 0xff;
3364
3365 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3366
3367 unsigned int idx_r = r * (Red_levels - 1) / 0xff;
3368 unsigned int idx_g = g * (Green_levels - 1) / 0xff;
3369 unsigned int idx_b = b * (Blue_levels - 1) / 0xff;
3370 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3371
3372 /* we allow one of the 6 directly neighbouring colours */
3373 /* to replace the current color, if they not used recently */
3374 static const signed char dxyz[][3] = {
3375 0, 0, 0,
3376 0, 0, +1,
3377 0, 0, -1,
3378 0, +1, 0,
3379 0, -1, 0,
3380 +1, 0, 0,
3381 -1, 0, 0,
3382 };
3383
3384 for (int n = 0; n < ecb_array_length (dxyz); ++n)
3385 {
3386 int r = idx_r + dxyz[n][0];
3387 int g = idx_g + dxyz[n][1];
3388 int b = idx_b + dxyz[n][2];
3389
3390 if (!IN_RANGE_EXC (r, 0, Red_levels )) continue;
3391 if (!IN_RANGE_EXC (g, 0, Green_levels)) continue;
3392 if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue;
3393
3394 unsigned int index = colorcube_index (r, g, b);
3395
3396 if (rgb24_color[index] == color)
3397 {
3398 rgb24_seqno[index] = ++rgb24_sequence;
3399 return index + minTermCOLOR24;
3400 }
3401
3402 // minor issue: could update index 0 few more times
3403 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3404 {
3405 idx = index;
3406 goto update;
3407 }
3408
3409 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3410 // but also handles wrap around values good enough
3411 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3412 idx = index;
3413 }
3414
3415update:
3416 rgb24_color[idx] = color;
3417 rgb24_seqno[idx] = ++rgb24_sequence;
3418
3419 idx += minTermCOLOR24;
3420 pix_colors_focused [idx].free (this);
3421 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3422 update_fade_color (idx, false);
3423
3424 return idx;
3425}
3426
3337void 3427void
3338rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3428rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3339{ 3429{
3340 if (str[0] == '?' && !str[1]) 3430 if (str[0] == '?' && !str[1])
3341 { 3431 {
3342 rgba c; 3432 rgba c;
3343 pix_colors_focused[color].get (c); 3433 pix_colors_focused[color].get (c);
3344 3434
3345#if XFT 3435#if XFT
3346 if (c.a != rgba::MAX_CC) 3436 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); 3437 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3348 else 3438 else
3349#endif 3439#endif
3350 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3440 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3351 } 3441 }
3352 else 3442 else
… …
3689 { 5, PrivMode_rVideo }, // DECSCNM 3779 { 5, PrivMode_rVideo }, // DECSCNM
3690 { 6, PrivMode_relOrigin }, // DECOM 3780 { 6, PrivMode_relOrigin }, // DECOM
3691 { 7, PrivMode_Autowrap }, // DECAWM 3781 { 7, PrivMode_Autowrap }, // DECAWM
3692 // 8, auto-repeat keys // DECARM 3782 // 8, auto-repeat keys // DECARM
3693 { 9, PrivMode_MouseX10 }, 3783 { 9, PrivMode_MouseX10 },
3784 { 12, PrivMode_BlinkingCursor },
3694 // 18 end FF to printer after print screen 3785 // 18 end FF to printer after print screen
3695 // 19 Print screen prints full screen/scroll region 3786 // 19 Print screen prints full screen/scroll region
3696 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3787 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3697#ifdef scrollBar_esc 3788#ifdef scrollBar_esc
3698 { scrollBar_esc, PrivMode_scrollBar }, 3789 { scrollBar_esc, PrivMode_scrollBar },
… …
3710#endif 3801#endif
3711 { 1000, PrivMode_MouseX11 }, 3802 { 1000, PrivMode_MouseX11 },
3712 { 1002, PrivMode_MouseBtnEvent }, 3803 { 1002, PrivMode_MouseBtnEvent },
3713 { 1003, PrivMode_MouseAnyEvent }, 3804 { 1003, PrivMode_MouseAnyEvent },
3714#if ENABLE_FRILLS 3805#if ENABLE_FRILLS
3806 { 1004, PrivMode_FocusEvent },
3715 { 1005, PrivMode_ExtModeMouse }, 3807 { 1005, PrivMode_ExtModeMouse },
3716#endif 3808#endif
3717 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3809 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3718 { 1011, PrivMode_Keypress }, // rxvt extension 3810 { 1011, PrivMode_Keypress }, // rxvt extension
3719#if ENABLE_FRILLS 3811#if ENABLE_FRILLS
… …
3807 scrollBar.map (state); 3899 scrollBar.map (state);
3808 resize_all_windows (0, 0, 0); 3900 resize_all_windows (0, 0, 0);
3809 scr_touch (true); 3901 scr_touch (true);
3810 break; 3902 break;
3811#endif 3903#endif
3904#ifdef CURSOR_BLINK
3905 case 12:
3906 cursor_blink_reset ();
3907 break;
3908#endif
3812 case 25: /* visible/invisible cursor */ 3909 case 25: /* visible/invisible cursor */
3813 scr_cursor_visible (state); 3910 scr_cursor_visible (state);
3814 break; 3911 break;
3815 /* case 35: - shift keys */ 3912 /* case 35: - shift keys */
3816 /* case 40: - 80 <--> 132 mode */ 3913 /* case 40: - 80 <--> 132 mode */
… …
3921 //case 19: // ninth alt font 4018 //case 19: // ninth alt font
3922 //case 20: // gothic 4019 //case 20: // gothic
3923 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 4020 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3924 rendset = 0, rendstyle = RS_Bold; 4021 rendset = 0, rendstyle = RS_Bold;
3925 break; 4022 break;
3926 case 22: // normal intensity 4023 case 22: // bold off (vt220)
3927 rendset = 0, rendstyle = RS_Bold; 4024 rendset = 0, rendstyle = RS_Bold;
3928 break; 4025 break;
3929 case 23: // disable italic 4026 case 23: // disable italic
3930 rendset = 0, rendstyle = RS_Italic; 4027 rendset = 0, rendstyle = RS_Italic;
3931 break; 4028 break;
3932 case 24: 4029 case 24: // underline off (vt220)
3933 rendset = 0, rendstyle = RS_Uline; 4030 rendset = 0, rendstyle = RS_Uline;
3934 break; 4031 break;
3935 case 25: 4032 case 25: // blink off (vt220)
3936 rendset = 0, rendstyle = RS_Blink; 4033 rendset = 0, rendstyle = RS_Blink;
3937 break; 4034 break;
3938 case 26: // variable spacing (iso 8613) 4035 case 26: // variable spacing (iso 8613)
3939 rendset = 0, rendstyle = RS_Blink; 4036 rendset = 0, rendstyle = RS_Blink;
3940 break; 4037 break;
3941 case 27: 4038 case 27: // reverse off (vt220)
3942 rendset = 0, rendstyle = RS_RVid; 4039 rendset = 0, rendstyle = RS_RVid;
3943 break; 4040 break;
3944 //case 28: // visible. NYI 4041 //case 28: // visible. NYI
3945 //case 29: // not crossed-out 4042 //case 29: // not crossed-out
3946 } 4043 }
… …
3961 case 35: 4058 case 35:
3962 case 36: 4059 case 36:
3963 case 37: 4060 case 37:
3964 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4061 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3965 break; 4062 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 */ 4063 case 39: /* default fg */
3974 scr_color (Color_fg, Color_fg); 4064 scr_color (Color_fg, Color_fg);
3975 break; 4065 break;
3976 4066
3977 case 40: 4067 case 40:
… …
3982 case 45: 4072 case 45:
3983 case 46: 4073 case 46:
3984 case 47: 4074 case 47:
3985 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4075 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3986 break; 4076 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 */ 4077 case 49: /* default bg */
3995 scr_color (Color_bg, Color_bg); 4078 scr_color (Color_bg, Color_bg);
4079 break;
4080
4081 case 38: // set fg color, ISO 8613-6
4082 case 48: // set bg color, ISO 8613-6
4083 {
4084 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4085 unsigned int idx;
4086
4087 if (nargs > i + 2 && arg[i + 1] == 5)
4088 {
4089 idx = minCOLOR + arg[i + 2];
4090 i += 2;
4091
4092 scr_color (idx, fgbg);
4093 }
4094 else if (nargs > i + 4 && arg[i + 1] == 2)
4095 {
4096 unsigned int r = arg[i + 2];
4097 unsigned int g = arg[i + 3];
4098 unsigned int b = arg[i + 4];
4099 unsigned int a = 0xff;
4100
4101 idx = map_rgb24_color (r, g, b, a);
4102
4103 i += 4;
4104
4105 scr_color (idx, fgbg);
4106 }
4107 }
3996 break; 4108 break;
3997 4109
3998 //case 50: // not variable spacing 4110 //case 50: // not variable spacing
3999 4111
4000#if !ENABLE_MINIMAL 4112#if !ENABLE_MINIMAL
… …
4024} 4136}
4025 4137
4026void 4138void
4027rxvt_term::set_cursor_style (int style) 4139rxvt_term::set_cursor_style (int style)
4028{ 4140{
4029 if (!IN_RANGE_INC (style, 0, 4)) 4141 if (!IN_RANGE_INC (style, 0, 6))
4030 return; 4142 return;
4031 4143
4144 if (style == 0)
4145 style = 1;
4146
4147 cursor_type = (style - 1) / 2;
4032 set_option (Opt_cursorUnderline, style >= 3); 4148 set_option (Opt_cursorUnderline, cursor_type == 1);
4033 4149
4034#ifdef CURSOR_BLINK 4150#ifdef CURSOR_BLINK
4035 set_option (Opt_cursorBlink, !style || (style & 1)); 4151 set_option (Opt_cursorBlink, style & 1);
4036 cursor_blink_reset (); 4152 cursor_blink_reset ();
4037#endif 4153#endif
4038 4154
4039 want_refresh = 1; 4155 want_refresh = 1;
4040} 4156}

Diff Legend

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