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.372 by root, Tue Dec 11 03:30:47 2007 UTC vs.
Revision 1.397 by root, Sat Jan 26 11:40:47 2008 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-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * 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
33 * 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
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
198 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
200 201
201 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
202 203
203 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
205 206
206 if (y >= 0) 207 if (y >= 0)
207 { 208 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
220 ch = *chr++; 221 ch = *chr++;
221 222
222 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
225# if !UNICODE3 226# if !UNICODE_3
226 if (ch >= 0x10000) 227 if (ch >= 0x10000)
227 ch = 0xfffd; 228 ch = 0xfffd;
228# endif 229# endif
229 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
230 231
… …
1041 } 1042 }
1042 1043
1043 display->flush (); 1044 display->flush ();
1044} 1045}
1045 1046
1047/* checks wether a refresh is requested and starts the refresh timer */
1046void 1048void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1049rxvt_term::refresh_check ()
1048{ 1050{
1049 make_current (); 1051 if (want_refresh && !flush_ev.is_active ())
1052 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1050 1053
1051 display->flush (); 1054 display->flush ();
1052
1053 if (want_refresh && !ev_is_active (&flush_ev))
1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1055} 1055}
1056 1056
1057void 1057void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1059{
… …
1067void 1067void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1069{
1070 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1071 want_refresh = 1;
1072 refresh_check ();
1072} 1073}
1073#endif 1074#endif
1074 1075
1075#ifdef TEXT_BLINK 1076#ifdef TEXT_BLINK
1076void 1077void
… …
1078{ 1079{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1080 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1081 {
1081 hidden_text = !hidden_text; 1082 hidden_text = !hidden_text;
1082 want_refresh = 1; 1083 want_refresh = 1;
1084 refresh_check ();
1083 } 1085 }
1086 else
1087 w.stop ();
1084} 1088}
1085#endif 1089#endif
1086 1090
1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1088void 1092void
1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1090{ 1094{
1091 if ((scrollbar_isUp() || scrollbar_isDn()) && 1095 if ((scrollbar_isUp () || scrollbar_isDn ())
1092 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1096 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1097 {
1093 want_refresh = 1; 1098 want_refresh = 1;
1099 refresh_check ();
1100 }
1094 else 1101 else
1095 w.stop (); 1102 w.stop ();
1096} 1103}
1097#endif 1104#endif
1098 1105
… …
1102{ 1109{
1103 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1110 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1104 { 1111 {
1105 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1112 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1106 want_refresh = 1; 1113 want_refresh = 1;
1114 refresh_check ();
1107 } 1115 }
1108 else 1116 else
1109 w.stop (); 1117 w.stop ();
1110} 1118}
1111#endif 1119#endif
1112 1120
1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1121#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1114void 1122void
1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1123rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1116{ 1124{
1117 if (mouse_slip_wheel_speed == 0 1125 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1118 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1119 : scr_page (UP, mouse_slip_wheel_speed))
1120 { 1126 {
1121 if (view_start == top_row || view_start == 0)
1122 mouse_slip_wheel_speed = 0;
1123
1124 want_refresh = 1; 1127 want_refresh = 1;
1128 refresh_check ();
1129 }
1130
1131 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1125 } 1132 {
1126 else 1133 mouse_slip_wheel_speed = 0;
1127 w.stop (); 1134 w.stop ();
1135 }
1128} 1136}
1129#endif 1137#endif
1130 1138
1131#if LINUX_YIELD_HACK 1139#if LINUX_YIELD_HACK
1132static struct event_handler 1140static struct event_handler
… …
1204 if (cmd_parse ()) 1212 if (cmd_parse ())
1205 break; 1213 break;
1206 1214
1207 if (revents & ev::WRITE) 1215 if (revents & ev::WRITE)
1208 pty_write (); 1216 pty_write ();
1217
1218 refresh_check ();
1209} 1219}
1210 1220
1211void 1221void
1212rxvt_term::pointer_unblank () 1222rxvt_term::pointer_unblank ()
1213{ 1223{
… …
1428 && ev.xfocus.mode != NotifyGrab) 1438 && ev.xfocus.mode != NotifyGrab)
1429 focus_out (); 1439 focus_out ();
1430 break; 1440 break;
1431 1441
1432 case ConfigureNotify: 1442 case ConfigureNotify:
1433 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1443 fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1434 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1435 szHint.width, szHint.height); */ 1445 szHint.width, szHint.height);
1436 if (ev.xconfigure.window == parent[0]) 1446 if (ev.xconfigure.window == parent[0])
1437 { 1447 {
1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1448 //while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1439 ; 1449 ;
1440 1450
1441 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1451 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1442 { 1452 {
1443 seen_resize = 1; 1453 seen_resize = 1;
… …
1445 } 1455 }
1446 else 1456 else
1447 { 1457 {
1448#ifdef HAVE_BG_PIXMAP 1458#ifdef HAVE_BG_PIXMAP
1449 if (bgPixmap.window_position_sensitive ()) 1459 if (bgPixmap.window_position_sensitive ())
1460 {
1461 if (mapped)
1450 update_background (); 1462 update_background ();
1463 else
1464 bgPixmap.invalidate ();
1465 }
1451#endif 1466#endif
1452 } 1467 }
1468
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1469 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454 } 1470 }
1455 break; 1471 break;
1456 1472
1457 case PropertyNotify: 1473 case PropertyNotify:
… …
1474 case SelectionRequest: 1490 case SelectionRequest:
1475 selection_send (ev.xselectionrequest); 1491 selection_send (ev.xselectionrequest);
1476 break; 1492 break;
1477 1493
1478 case MapNotify: 1494 case MapNotify:
1495#ifdef HAVE_BG_PIXMAP
1496 /* This is needed spcifically to fix the case of no window manager or a
1497 * non-reparenting window manager. In those cases we never get first
1498 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1499 * care of multiplicity of ConfigureNotify events arriwing while WM does
1500 * reparenting.
1501 * We should not render background immidiately, as there could be several
1502 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1503 * by scheduling background redraw as soon as we can, but giving a short
1504 * bit of time for ConfigureNotifies to arrive.
1505 * We should render background PRIOR to drawing any text, but AFTER all
1506 * of ConfigureNotifys for the best results.
1507 */
1508 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1509 update_background_ev.start (0.025);
1510#endif
1479 mapped = 1; 1511 mapped = 1;
1480#ifdef TEXT_BLINK 1512#ifdef TEXT_BLINK
1481 text_blink_ev.start (TEXT_BLINK_INTERVAL); 1513 text_blink_ev.start ();
1482#endif 1514#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break; 1516 break;
1485 1517
1486 case UnmapNotify: 1518 case UnmapNotify:
… …
1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 { 1540 {
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1511 } 1543 }
1544
1512 want_refresh = 1; 1545 want_refresh = 1;
1513 } 1546 }
1514 else 1547 else
1515 { 1548 {
1516 XEvent unused_event; 1549 XEvent unused_event;
… …
1518 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1551 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1519 ; 1552 ;
1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1521 ; 1554 ;
1522 1555
1523 if (isScrollbarWindow (ev.xany.window)) 1556 if (scrollBar.state && ev.xany.window == scrollBar.win)
1524 { 1557 {
1525 scrollBar.setIdle (); 1558 scrollBar.setIdle ();
1526 scrollbar_show (0); 1559 scrollbar_show (0);
1527 } 1560 }
1528 } 1561 }
… …
1577 int dist; 1610 int dist;
1578 1611
1579 /* don't clobber the current delay if we are 1612 /* don't clobber the current delay if we are
1580 * already in the middle of scrolling. 1613 * already in the middle of scrolling.
1581 */ 1614 */
1582 if (!ev_is_active (&sel_scroll_ev)) 1615 if (!sel_scroll_ev.is_active ())
1583 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1616 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1584 1617
1585 /* save the event params so we can highlight 1618 /* save the event params so we can highlight
1586 * the selection in the pending-scroll loop 1619 * the selection in the pending-scroll loop
1587 */ 1620 */
… …
1610 else 1643 else
1611 { 1644 {
1612 /* we are within the text window, so we 1645 /* we are within the text window, so we
1613 * shouldn't be scrolling 1646 * shouldn't be scrolling
1614 */ 1647 */
1615 if (ev_is_active (&sel_scroll_ev))
1616 sel_scroll_ev.stop(); 1648 sel_scroll_ev.stop();
1617 } 1649 }
1618#endif 1650#endif
1619#ifdef MOUSE_THRESHOLD 1651#ifdef MOUSE_THRESHOLD
1620 } 1652 }
1621#endif 1653#endif
1622 } 1654 }
1623 } 1655 }
1624 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)
1625 { 1657 {
1626 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1627 MotionNotify, &ev)) 1659 MotionNotify, &ev))
1628 ; 1660 ;
1629 1661
… …
1664 1696
1665 if (ev.type == KeyPress && hidden_pointer == 0) 1697 if (ev.type == KeyPress && hidden_pointer == 0)
1666 pointer_blank (); 1698 pointer_blank ();
1667 } 1699 }
1668#endif 1700#endif
1701
1702 refresh_check ();
1669} 1703}
1670 1704
1671void 1705void
1672rxvt_term::focus_in () 1706rxvt_term::focus_in ()
1673{ 1707{
… …
1685 XSetICFocus (Input_Context); 1719 XSetICFocus (Input_Context);
1686 } 1720 }
1687#endif 1721#endif
1688#if CURSOR_BLINK 1722#if CURSOR_BLINK
1689 if (option (Opt_cursorBlink)) 1723 if (option (Opt_cursorBlink))
1690 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL); 1724 cursor_blink_ev.again ();
1691#endif 1725#endif
1692#if OFF_FOCUS_FADING 1726#if OFF_FOCUS_FADING
1693 if (rs[Rs_fade]) 1727 if (rs[Rs_fade])
1694 { 1728 {
1695 pix_colors = pix_colors_focused; 1729 pix_colors = pix_colors_focused;
… …
1783 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1784 { 1818 {
1785 bgPixmap.set_root_pixmap (); 1819 bgPixmap.set_root_pixmap ();
1786 update_background (); 1820 update_background ();
1787 } 1821 }
1822
1788 break; 1823 break;
1789 } 1824 }
1790# endif 1825# endif
1826
1827 refresh_check ();
1791} 1828}
1792#endif 1829#endif
1793 1830
1794void 1831void
1795rxvt_term::button_press (XButtonEvent &ev) 1832rxvt_term::button_press (XButtonEvent &ev)
… …
1908 } 1945 }
1909 1946
1910 /* 1947 /*
1911 * Scrollbar window processing of button press 1948 * Scrollbar window processing of button press
1912 */ 1949 */
1913 if (isScrollbarWindow (ev.window)) 1950 if (scrollBar.state && ev.window == scrollBar.win)
1914 { 1951 {
1915 scrollBar.setIdle (); 1952 scrollBar.setIdle ();
1916 /* 1953 /*
1917 * Rxvt-style scrollbar: 1954 * Rxvt-style scrollbar:
1918 * move up if mouse is above slider 1955 * move up if mouse is above slider
… …
1973 if (scrollbarrxvt_upButton (ev.y)) 2010 if (scrollbarrxvt_upButton (ev.y))
1974 upordown = -1; /* up */ 2011 upordown = -1; /* up */
1975 else if (scrollbarrxvt_dnButton (ev.y)) 2012 else if (scrollbarrxvt_dnButton (ev.y))
1976 upordown = 1; /* down */ 2013 upordown = 1; /* down */
1977 } 2014 }
2015
1978 if (upordown) 2016 if (upordown)
1979 { 2017 {
1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2018#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2019 if (!cont_scroll_ev.is_active ())
1981 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2020 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1982#endif 2021#endif
1983 if (scr_page (upordown < 0 ? UP : DN, 1)) 2022 if (scr_page (upordown < 0 ? UP : DN, 1))
1984 { 2023 {
1985 if (upordown < 0) 2024 if (upordown < 0)
1986 scrollBar.setUp (); 2025 scrollBar.setUp ();
… …
1990 } 2029 }
1991 else 2030 else
1992 switch (ev.button) 2031 switch (ev.button)
1993 { 2032 {
1994 case Button2: 2033 case Button2:
1995 switch (scrollbar_align) 2034 switch (scrollBar.align)
1996 { 2035 {
1997 case R_SB_ALIGN_TOP: 2036 case R_SB_ALIGN_TOP:
1998 csrO = 0; 2037 csrO = 0;
1999 break; 2038 break;
2000 case R_SB_ALIGN_CENTRE: 2039 case R_SB_ALIGN_CENTRE:
… …
2012 2051
2013 scrollBar.setMotion (); 2052 scrollBar.setMotion ();
2014 break; 2053 break;
2015 2054
2016 case Button1: 2055 case Button1:
2017 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2056 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2018 csrO = ev.y - scrollBar.top; 2057 csrO = ev.y - scrollBar.top;
2019 /* FALLTHROUGH */ 2058 /* FALLTHROUGH */
2020 2059
2021 case Button3: 2060 case Button3:
2022 if (scrollBar.style != R_SB_XTERM) 2061 if (scrollBar.style != R_SB_XTERM)
… …
2066 scrollBar.setIdle (); 2105 scrollBar.setIdle ();
2067 scrollbar_show (0); 2106 scrollbar_show (0);
2068 } 2107 }
2069 2108
2070#ifdef SELECTION_SCROLLING 2109#ifdef SELECTION_SCROLLING
2071 if (ev_is_active (&sel_scroll_ev))
2072 sel_scroll_ev.stop(); 2110 sel_scroll_ev.stop();
2073#endif 2111#endif
2074 2112
2075 if (ev.window == vt) 2113 if (ev.window == vt)
2076 { 2114 {
2077 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2115 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2149 { 2187 {
2150 mouse_slip_wheel_speed += v ? -1 : 1; 2188 mouse_slip_wheel_speed += v ? -1 : 1;
2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2189 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2190 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2153 2191
2192 if (!slip_wheel_ev.is_active ())
2154 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2193 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2155 } 2194 }
2156 else 2195 else
2196# endif
2157 { 2197 {
2158# endif
2159 scr_page (v, i); 2198 scr_page (v, i);
2160 scrollbar_show (1); 2199 scrollbar_show (1);
2161# ifdef MOUSE_SLIP_WHEELING
2162 } 2200 }
2163# endif
2164 } 2201 }
2165 break; 2202 break;
2166#endif 2203#endif
2167 } 2204 }
2168 } 2205 }
… …
2811 // versions. 2848 // versions.
2812 // 2849 //
2813 tt_printf ("\033[>%d;95;0c", 'U'); 2850 tt_printf ("\033[>%d;95;0c", 'U');
2814 } 2851 }
2815 break; 2852 break;
2853
2816 case '?': 2854 case '?':
2817 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2855 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2818 process_terminal_mode (ch, priv, nargs, arg); 2856 process_terminal_mode (ch, priv, nargs, arg);
2819 break; 2857 break;
2820 } 2858 }
… …
3336 *buf++ = '\0'; 3374 *buf++ = '\0';
3337 3375
3338 process_color_seq (op, color, name, resp); 3376 process_color_seq (op, color, name, resp);
3339 } 3377 }
3340 break; 3378 break;
3379 case Rxvt_restoreFG:
3341 case XTerm_Color00: 3380 case XTerm_Color00:
3342 process_color_seq (op, Color_fg, str, resp); 3381 process_color_seq (op, Color_fg, str, resp);
3343 break; 3382 break;
3383 case Rxvt_restoreBG:
3344 case XTerm_Color01: 3384 case XTerm_Color01:
3345 process_color_seq (op, Color_bg, str, resp); 3385 process_color_seq (op, Color_bg, str, resp);
3346 break; 3386 break;
3347#ifndef NO_CURSORCOLOR 3387#ifndef NO_CURSORCOLOR
3348 case XTerm_Color_cursor: 3388 case XTerm_Color_cursor:
… …
3374#if ENABLE_TRANSPARENCY 3414#if ENABLE_TRANSPARENCY
3375 case URxvt_Color_tint: 3415 case URxvt_Color_tint:
3376 process_color_seq (op, Color_tint, str, resp); 3416 process_color_seq (op, Color_tint, str, resp);
3377 { 3417 {
3378 bool changed = false; 3418 bool changed = false;
3419
3379 if (ISSET_PIXCOLOR (Color_tint)) 3420 if (ISSET_PIXCOLOR (Color_tint))
3380 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3421 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3381 else 3422 else
3382 changed = bgPixmap.unset_tint (); 3423 changed = bgPixmap.unset_tint ();
3424
3383 if (changed) 3425 if (changed)
3384 update_background (); 3426 update_background ();
3385 } 3427 }
3386 3428
3387 break; 3429 break;
… …
3410 changed++; 3452 changed++;
3411 str = strchr (str, ';'); 3453 str = strchr (str, ';');
3412 if (str == NULL) 3454 if (str == NULL)
3413 bgPixmap.set_defaultGeometry (); 3455 bgPixmap.set_defaultGeometry ();
3414 } 3456 }
3457
3415 while (str) 3458 while (str)
3416 { 3459 {
3417 str++; 3460 str++;
3418 if (bgPixmap.set_geometry (str)) 3461 if (bgPixmap.set_geometry (str))
3419 changed++; 3462 changed++;
3420 str = strchr (str, ';'); 3463 str = strchr (str, ';');
3421 } 3464 }
3465
3422 if (changed) 3466 if (changed)
3423 update_background (); 3467 update_background ();
3424 } 3468 }
3425 break; 3469 break;
3426#endif 3470#endif
3427
3428 case Rxvt_restoreFG:
3429 set_window_color (Color_fg, str);
3430 break;
3431 case Rxvt_restoreBG:
3432 set_window_color (Color_bg, str);
3433 break;
3434 3471
3435 case XTerm_logfile: 3472 case XTerm_logfile:
3436 // TODO, when secure mode? 3473 // TODO, when secure mode?
3437 break; 3474 break;
3438 3475
… …
3593 // 1037 send DEL for keypad delete NYI 3630 // 1037 send DEL for keypad delete NYI
3594 { 1047, PrivMode_Screen }, 3631 { 1047, PrivMode_Screen },
3595 // 1048 save and restore cursor 3632 // 1048 save and restore cursor
3596 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3633 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3597 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3634 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3635 { 2004, PrivMode_BracketPaste },
3598 }; 3636 };
3599 3637
3600 if (nargs == 0) 3638 if (nargs == 0)
3601 return; 3639 return;
3602 3640
… …
3650 */ 3688 */
3651 PrivMode (1, PrivMode_vt52); 3689 PrivMode (1, PrivMode_vt52);
3652 break; 3690 break;
3653 case 3: /* 80/132 */ 3691 case 3: /* 80/132 */
3654 if (priv_modes & PrivMode_132OK) 3692 if (priv_modes & PrivMode_132OK)
3693 {
3694 scr_poweron ();
3655 set_widthheight (((state ? 132 : 80) * fwidth), height); 3695 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3696 }
3656 break; 3697 break;
3657 case 4: /* smooth scrolling */ 3698 case 4: /* smooth scrolling */
3658 set_option (Opt_jumpScroll, !state); 3699 set_option (Opt_jumpScroll, !state);
3659 break; 3700 break;
3660 case 5: /* reverse video */ 3701 case 5: /* reverse video */

Diff Legend

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