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.486 by sf-exg, Fri Apr 29 13:29:45 2011 UTC vs.
Revision 1.534 by sf-exg, Tue Mar 26 14:16:46 2013 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
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-2011 Marc Lehmann <schmorp@schmorp.de> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 wchar_t *chr, *alloc, ch2, **fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169 169
… …
181 181
182 alloc = 0; 182 alloc = 0;
183 chr = &ch2; 183 chr = &ch2;
184 len = 1; 184 len = 1;
185 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186 189
187 char attr[80]; // plenty 190 char attr[80]; // plenty
188 191
189 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
190 (int)r, 193 (int)r,
… …
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])]; 206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 207 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 209 }
207 210
208 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
210 212
211 if (y >= 0) 213 if (y >= 0)
212 { 214 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0; 216 x = 0;
215 } 217 }
216 218
217 scr_overlay_new (x, y, width, len * 2 + 1); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
218 222
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 224
221 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
222 { 226 {
223 char buf[9]; 227 char buf[9];
224 228
225 ch = *chr++; 229 ch = *chr++;
226 230
227 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
229 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
230# if !UNICODE_3 234# if !UNICODE_3
231 if (ch >= 0x10000) 235 if (ch >= 0x10000)
232 ch = 0xfffd; 236 ch = 0xfffd;
233# endif 237# endif
234 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
235 239
236 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
237 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
238 } 242 }
239 243
240// { 244// {
241// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
244// } 248// }
245 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
246 for (int i = 0; i < len; i++) 250 for (int i = 0; i < len; i++)
247 { 251 {
248 scr_overlay_set (0, len + 1 + i, fname[i]); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
249 free (fname[i]); 253 free (fname[i]);
250 } 254 }
251 255
252# if ENABLE_COMBINING 256# if ENABLE_COMBINING
253 if (alloc) 257 if (alloc)
254 delete [] alloc; 258 delete [] alloc;
255# endif 259# endif
256} 260}
257#endif 261#endif
258 262
259void 263void ecb_cold
260rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
261{ 265{
262 wchar_t ch = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
263 267
264 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
… …
282 } 286 }
283 287
284 iso14755buf = 0; 288 iso14755buf = 0;
285} 289}
286 290
287static int 291static int ecb_cold
288hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
289{ 293{
290 // check whether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
291 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
292 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
… …
301 305
302 return -1; 306 return -1;
303} 307}
304#endif 308#endif
305 309
306static inline KeySym 310static inline KeySym ecb_cold
307translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
308{ 312{
309#ifdef XK_KP_Home 313#ifdef XK_KP_Home
310 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
311 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
… …
337# endif 341# endif
338#endif 342#endif
339 return keysym; 343 return keysym;
340} 344}
341 345
342static inline int 346static inline int ecb_cold
343map_function_key (KeySym keysym) 347map_function_key (KeySym keysym)
344{ 348{
345 int param = 0; 349 int param = 0;
346 350
347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
396 break; 400 break;
397 } 401 }
398 return param; 402 return param;
399} 403}
400 404
401void 405void ecb_cold
402rxvt_term::key_press (XKeyEvent &ev) 406rxvt_term::key_press (XKeyEvent &ev)
403{ 407{
404 int ctrl, meta, shft, len; 408 int ctrl, meta, shft, len;
405 KeySym keysym; 409 KeySym keysym;
406 int valid_keysym; 410 int valid_keysym;
… …
421 ctrl = ev.state & ControlMask; 425 ctrl = ev.state & ControlMask;
422 meta = ev.state & ModMetaMask; 426 meta = ev.state & ModMetaMask;
423 427
424 kbuf[0] = 0; 428 kbuf[0] = 0;
425 429
426#ifdef USE_XIM 430#if USE_XIM
427 if (Input_Context) 431 if (Input_Context)
428 { 432 {
429 Status status_return; 433 Status status_return;
430 434
431#if 0 435#if 0
… …
776 } 780 }
777 781
778 if (newlen) 782 if (newlen)
779 len = strlen (kbuf); 783 len = strlen (kbuf);
780 784
785 if (len > 0)
786 {
781 /* 787 /*
788 * pass Shift/Control indicators for function keys ending with `~'
789 *
790 * eg,
791 * Prior = "ESC[5~"
792 * Shift+Prior = "ESC[5$"
793 * Ctrl+Prior = "ESC[5^"
794 * Ctrl+Shift+Prior = "ESC[5@"
795 */
796 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
797 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
798
799 /*
782 * Pass meta for all function keys, if 'meta' option set 800 * Pass meta for all function keys, if 'meta' option set
783 */ 801 */
784#ifdef META8_OPTION 802#ifdef META8_OPTION
785 if (meta && (meta_char == 0x80) && len > 0) 803 if (meta && (meta_char == 0x80))
786 kbuf[len - 1] |= 0x80; 804 kbuf[len - 1] |= 0x80;
787#endif 805#endif
806 }
788 807
789 } 808 }
790 else if (ctrl && keysym == XK_minus) 809 else if (ctrl && keysym == XK_minus)
791 { 810 {
792 len = 1; 811 len = 1;
… …
826 { 845 {
827 view_start = 0; 846 view_start = 0;
828 want_refresh = 1; 847 want_refresh = 1;
829 } 848 }
830 849
831 /*
832 * these modifications only affect the static keybuffer
833 * pass Shift/Control indicators for function keys ending with `~'
834 *
835 * eg,
836 * Prior = "ESC[5~"
837 * Shift+Prior = "ESC[5$"
838 * Ctrl+Prior = "ESC[5^"
839 * Ctrl+Shift+Prior = "ESC[5@"
840 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
841 */
842 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
843 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
844
845 /* escape prefix */ 850 /* escape prefix */
846 if (meta 851 if (meta
847#ifdef META8_OPTION 852#ifdef META8_OPTION
848 && meta_char == C0_ESC 853 && meta_char == C0_ESC
849#endif 854#endif
… …
854 } 859 }
855 860
856 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
857} 862}
858 863
859void 864void ecb_cold
860rxvt_term::key_release (XKeyEvent &ev) 865rxvt_term::key_release (XKeyEvent &ev)
861{ 866{
862#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
863 KeySym keysym; 868 KeySym keysym;
864 869
… …
936void 941void
937rxvt_term::flush () 942rxvt_term::flush ()
938{ 943{
939 flush_ev.stop (); 944 flush_ev.stop ();
940 945
941#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_IMG
942 if (bg_flags & BG_NEEDS_REFRESH) 947 if (bg_flags & BG_NEEDS_REFRESH)
943 { 948 {
944 bg_flags &= ~BG_NEEDS_REFRESH; 949 bg_flags &= ~BG_NEEDS_REFRESH;
945 scr_touch (false); 950 scr_touch (false);
946 } 951 }
… …
986 while (row < end_row); 991 while (row < end_row);
987 } 992 }
988 993
989 scr_refresh (); 994 scr_refresh ();
990 scrollBar.show (1); 995 scrollBar.show (1);
991#ifdef USE_XIM 996#if USE_XIM
992 IMSendSpot (); 997 im_send_spot ();
993#endif 998#endif
994 } 999 }
995 1000
996 display->flush (); 1001 display->flush ();
997} 1002}
… …
1015 flush (); 1020 flush ();
1016} 1021}
1017 1022
1018#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
1019void 1024void
1025rxvt_term::cursor_blink_reset ()
1026{
1027 if (hidden_cursor)
1028 {
1029 hidden_cursor = 0;
1030 want_refresh = 1;
1031 }
1032
1033 if (option (Opt_cursorBlink))
1034 cursor_blink_ev.again ();
1035 else
1036 cursor_blink_ev.stop ();
1037}
1038
1039void
1020rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1040rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1021{ 1041{
1022 hidden_cursor = !hidden_cursor; 1042 hidden_cursor = !hidden_cursor;
1023 want_refresh = 1; 1043 want_refresh = 1;
1024 refresh_check (); 1044 refresh_check ();
… …
1042 1062
1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1044void 1064void
1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1065rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1046{ 1066{
1047 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1067 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1048 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1068 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1049 { 1069 {
1050 want_refresh = 1; 1070 want_refresh = 1;
1051 refresh_check (); 1071 refresh_check ();
1052 } 1072 }
1053 else 1073 else
… …
1203 pty_write (); 1223 pty_write ();
1204 1224
1205 refresh_check (); 1225 refresh_check ();
1206} 1226}
1207 1227
1208void 1228void ecb_cold
1209rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
1210{ 1230{
1211 XDefineCursor (dpy, vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
1212 recolour_cursor (); 1232 recolour_cursor ();
1213 1233
… …
1218 pointer_ev.start (pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1219#endif 1239#endif
1220} 1240}
1221 1241
1222#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1223void 1243void ecb_cold
1224rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
1225{ 1245{
1226 if (!option (Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
1227 return; 1247 return;
1228 1248
… …
1230 XFlush (dpy); 1250 XFlush (dpy);
1231 1251
1232 hidden_pointer = 1; 1252 hidden_pointer = 1;
1233} 1253}
1234 1254
1235void 1255void ecb_cold
1236rxvt_term::pointer_cb (ev::timer &w, int revents) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
1237{ 1257{
1238 make_current (); 1258 make_current ();
1239 1259
1240 pointer_blank (); 1260 pointer_blank ();
… …
1332 32 + x, 1352 32 + x,
1333 32 + y); 1353 32 + y);
1334} 1354}
1335 1355
1336/*{{{ process an X event */ 1356/*{{{ process an X event */
1337void 1357void ecb_hot
1338rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1339{ 1359{
1340 make_current (); 1360 make_current ();
1341 1361
1342 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
… …
1445 if (ev.xconfigure.window == parent) 1465 if (ev.xconfigure.window == parent)
1446 { 1466 {
1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448 ; 1468 ;
1449 1469
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471
1472 bool moved = false;
1450#ifdef HAVE_BG_PIXMAP 1473#ifdef HAVE_BG_PIXMAP
1451 bool moved = false;
1452 if (bg_window_position_sensitive ()) 1474 if (bg_window_position_sensitive ())
1453 { 1475 {
1476 want_position_change = true;
1477 if (bg_img == 0)
1478 moved = true;
1479 }
1480#endif
1481
1482 if (want_position_change)
1483 {
1454 int x, y; 1484 int x, y;
1485
1455 if (ev.xconfigure.send_event) 1486 if (ev.xconfigure.send_event)
1456 { 1487 {
1457 x = ev.xconfigure.x; 1488 x = ev.xconfigure.x;
1458 y = ev.xconfigure.y; 1489 y = ev.xconfigure.y;
1459 } 1490 }
1460 else 1491 else
1461 get_window_origin (x, y); 1492 get_window_origin (x, y);
1462 1493
1463 if (bg_set_position (x, y) 1494 if (x != parent_x || y != parent_y)
1464 || !(bg_flags & BG_IS_VALID)) 1495 {
1496 parent_x = x;
1497 parent_y = y;
1498 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1465 moved = true; 1499 moved = true;
1500 }
1466 } 1501 }
1467#endif
1468 1502
1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1470 { 1504 {
1471 seen_resize = 1; 1505 seen_resize = 1;
1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1473 } 1507 }
1474 else 1508 else
1475 { 1509 {
1476#ifdef HAVE_BG_PIXMAP 1510#ifdef HAVE_BG_PIXMAP
1477 if (moved) 1511 if (moved)
1478 {
1479 if (mapped)
1480 update_background (); 1512 update_background ();
1481 else
1482 bg_invalidate ();
1483 }
1484#endif 1513#endif
1485 } 1514 }
1486 1515
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488 } 1517 }
… …
1500 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1501 break; 1530 break;
1502 1531
1503 case MapNotify: 1532 case MapNotify:
1504#ifdef HAVE_BG_PIXMAP 1533#ifdef HAVE_BG_PIXMAP
1505 /* This is needed specifically to fix the case of no window manager or a 1534 // This is needed at startup for the case of no window manager
1506 * non-reparenting window manager. In those cases we never get first 1535 // or a non-reparenting window manager and also because we
1507 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1536 // defer bg image updates if the window is not mapped. The
1508 * care of multiplicity of ConfigureNotify events arriving while WM does 1537 // short delay is to optimize for multiple ConfigureNotify
1509 * reparenting. 1538 // events at startup when the window manager reparents the
1510 * We should not render background immediately, as there could be several 1539 // window, so as to perform the computation after we have
1511 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1540 // received all of them.
1512 * by scheduling background redraw as soon as we can, but giving a short 1541 if (bg_img == 0)
1513 * bit of time for ConfigureNotifies to arrive.
1514 * We should render background PRIOR to drawing any text, but AFTER all
1515 * of ConfigureNotifys for the best results.
1516 */
1517 if (!(bg_flags & BG_IS_VALID))
1518 update_background_ev.start (0.025); 1542 update_background_ev.start (0.025);
1519#endif 1543#endif
1520 mapped = 1; 1544 mapped = 1;
1521#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
1522 text_blink_ev.start (); 1546 text_blink_ev.start ();
… …
1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1586 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1587 ;
1564 1588
1565 if (scrollBar.state && ev.xany.window == scrollBar.win) 1589 if (scrollBar.state && ev.xany.window == scrollBar.win)
1566 { 1590 {
1567 scrollBar.state = STATE_IDLE; 1591 scrollBar.state = SB_STATE_IDLE;
1568 scrollBar.show (0); 1592 scrollBar.show (0);
1569 } 1593 }
1570 } 1594 }
1571 break; 1595 break;
1572 1596
… …
1638 dist = int_bwidth - ev.xbutton.y; 1662 dist = int_bwidth - ev.xbutton.y;
1639 } 1663 }
1640 else 1664 else
1641 { 1665 {
1642 scroll_selection_dir = DN; 1666 scroll_selection_dir = DN;
1643 dist = ev.xbutton.y - (int_bwidth + height); 1667 dist = ev.xbutton.y - (int_bwidth + vt_height);
1644 } 1668 }
1645 1669
1646 scroll_selection_lines = Pixel2Height (dist) 1670 scroll_selection_lines = Pixel2Height (dist)
1647 / SELECTION_SCROLL_LINE_SPEEDUP 1671 / SELECTION_SCROLL_LINE_SPEEDUP
1648 + 1; 1672 + 1;
… …
1660#ifdef MOUSE_THRESHOLD 1684#ifdef MOUSE_THRESHOLD
1661 } 1685 }
1662#endif 1686#endif
1663 } 1687 }
1664 } 1688 }
1665 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1689 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1666 { 1690 {
1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1691 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1668 MotionNotify, &ev)) 1692 MotionNotify, &ev))
1669 ; 1693 ;
1670 1694
1671 XQueryPointer (dpy, scrollBar.win, 1695 XQueryPointer (dpy, scrollBar.win,
1672 &unused_root, &unused_child, 1696 &unused_root, &unused_child,
1673 &unused_root_x, &unused_root_y, 1697 &unused_root_x, &unused_root_y,
1674 &ev.xbutton.x, &ev.xbutton.y, 1698 &ev.xbutton.x, &ev.xbutton.y,
1675 &unused_mask); 1699 &unused_mask);
1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1700 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1677 scrollBar.size ()); 1701 scrollBar.size ());
1678 want_refresh = 1; 1702 want_refresh = 1;
1679 scrollBar.show (1); 1703 scrollBar.show (1);
1680 } 1704 }
1681 break; 1705 break;
1682 } 1706 }
1683 1707
1684#if defined(CURSOR_BLINK) 1708#if defined(CURSOR_BLINK)
1685 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1709 if (ev.type == KeyPress)
1686 {
1687 if (hidden_cursor)
1688 {
1689 hidden_cursor = 0;
1690 want_refresh = 1;
1691 }
1692
1693 cursor_blink_ev.again (); 1710 cursor_blink_reset ();
1694 }
1695#endif 1711#endif
1696 1712
1697#if defined(POINTER_BLANK) 1713#if defined(POINTER_BLANK)
1698 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1714 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1699 { 1715 {
… …
1710 1726
1711 refresh_check (); 1727 refresh_check ();
1712} 1728}
1713 1729
1714#if ENABLE_FRILLS 1730#if ENABLE_FRILLS
1715void 1731void ecb_cold
1716rxvt_term::set_urgency (bool enable) 1732rxvt_term::set_urgency (bool enable)
1717{ 1733{
1718 if (enable == urgency_hint) 1734 if (enable == urgency_hint)
1719 return; 1735 return;
1720 1736
1721 if (XWMHints *h = XGetWMHints (dpy, parent)) 1737 if (XWMHints *h = XGetWMHints (dpy, parent))
1722 { 1738 {
1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1739 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1724 XSetWMHints (dpy, parent, h); 1740 XSetWMHints (dpy, parent, h);
1725 urgency_hint = enable; 1741 urgency_hint = enable;
1742 XFree (h);
1726 } 1743 }
1727} 1744}
1728#endif 1745#endif
1729 1746
1730void 1747void ecb_cold
1731rxvt_term::focus_in () 1748rxvt_term::focus_in ()
1732{ 1749{
1733 if (!focus) 1750 if (!focus)
1734 { 1751 {
1735 focus = 1; 1752 focus = 1;
1736 want_refresh = 1; 1753 want_refresh = 1;
1737 1754
1738#if USE_XIM 1755#if USE_XIM
1739 if (Input_Context != NULL) 1756 if (Input_Context != NULL)
1740 { 1757 {
1741 IMSetPosition (); 1758 im_set_position ();
1742 XSetICFocus (Input_Context); 1759 XSetICFocus (Input_Context);
1743 } 1760 }
1744#endif 1761#endif
1745#if CURSOR_BLINK 1762#if CURSOR_BLINK
1746 if (option (Opt_cursorBlink)) 1763 if (option (Opt_cursorBlink))
… …
1760 1777
1761 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1778 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1762 } 1779 }
1763} 1780}
1764 1781
1765void 1782void ecb_cold
1766rxvt_term::focus_out () 1783rxvt_term::focus_out ()
1767{ 1784{
1768 if (focus) 1785 if (focus)
1769 { 1786 {
1770 focus = 0; 1787 focus = 0;
… …
1803 1820
1804 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1821 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1805 } 1822 }
1806} 1823}
1807 1824
1808void 1825void ecb_cold
1809rxvt_term::update_fade_color (unsigned int idx) 1826rxvt_term::update_fade_color (unsigned int idx)
1810{ 1827{
1811#if OFF_FOCUS_FADING 1828#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade]) 1829 if (rs[Rs_fade])
1813 { 1830 {
… …
1816 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1833 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1817 } 1834 }
1818#endif 1835#endif
1819} 1836}
1820 1837
1821#if ENABLE_TRANSPARENCY || ENABLE_PERL 1838#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1822void 1839void ecb_hot
1823rxvt_term::rootwin_cb (XEvent &ev) 1840rxvt_term::rootwin_cb (XEvent &ev)
1824{ 1841{
1825 make_current (); 1842 make_current ();
1826 1843
1827 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1844 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1828 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1845 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1829 return; 1846 return;
1830 1847
1831# if ENABLE_TRANSPARENCY
1832 switch (ev.type) 1848 switch (ev.type)
1833 { 1849 {
1834 case PropertyNotify: 1850 case PropertyNotify:
1835 /* 1851 /*
1836 * if user used some Esetroot compatible prog to set the root bg, 1852 * if user used some Esetroot compatible prog to set the root bg,
1837 * use the property to determine the pixmap. We use it later on. 1853 * use the property to determine the pixmap. We use it later on.
1838 */ 1854 */
1839 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1855 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1856 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841 { 1857 {
1842 bg_set_root_pixmap (); 1858#if BG_IMAGE_FROM_ROOT
1859 if (option (Opt_transparent))
1860 {
1861 rxvt_img::new_from_root (this)->replace (root_img);
1843 update_background (); 1862 update_background ();
1863 }
1864#endif
1865 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1844 } 1866 }
1845 1867
1846 break; 1868 break;
1847 } 1869 }
1848# endif
1849 1870
1850 refresh_check (); 1871 refresh_check ();
1851} 1872}
1852#endif 1873#endif
1853 1874
… …
1977 if (scrollBar.upButton (ev.y)) 1998 if (scrollBar.upButton (ev.y))
1978 direction = UP; /* up */ 1999 direction = UP; /* up */
1979 else if (scrollBar.dnButton (ev.y)) 2000 else if (scrollBar.dnButton (ev.y))
1980 direction = DN; /* down */ 2001 direction = DN; /* down */
1981 2002
1982 scrollBar.state = STATE_IDLE; 2003 scrollBar.state = SB_STATE_IDLE;
1983 /* 2004 /*
1984 * Rxvt-style scrollbar: 2005 * Rxvt-style scrollbar:
1985 * move up if mouse is above slider 2006 * move up if mouse is above slider
1986 * move dn if mouse is below slider 2007 * move dn if mouse is below slider
1987 * 2008 *
… …
2026 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2047 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2027#endif 2048#endif
2028 if (scr_page (direction, 1)) 2049 if (scr_page (direction, 1))
2029 { 2050 {
2030 if (direction == UP) 2051 if (direction == UP)
2031 scrollBar.state = STATE_UP; 2052 scrollBar.state = SB_STATE_UP;
2032 else 2053 else
2033 scrollBar.state = STATE_DOWN; 2054 scrollBar.state = SB_STATE_DOWN;
2034 } 2055 }
2035 } 2056 }
2036 else 2057 else
2037 switch (ev.button) 2058 switch (ev.button)
2038 { 2059 {
2039 case Button2: 2060 case Button2:
2040 switch (scrollBar.align) 2061 switch (scrollBar.align)
2041 { 2062 {
2042 case R_SB_ALIGN_TOP: 2063 case SB_ALIGN_TOP:
2043 csrO = 0; 2064 csrO = 0;
2044 break; 2065 break;
2045 case R_SB_ALIGN_CENTRE: 2066 case SB_ALIGN_CENTRE:
2046 csrO = (scrollBar.bot - scrollBar.top) / 2; 2067 csrO = (scrollBar.bot - scrollBar.top) / 2;
2047 break; 2068 break;
2048 case R_SB_ALIGN_BOTTOM: 2069 case SB_ALIGN_BOTTOM:
2049 csrO = scrollBar.bot - scrollBar.top; 2070 csrO = scrollBar.bot - scrollBar.top;
2050 break; 2071 break;
2051 } 2072 }
2052 2073
2053 if (scrollBar.style == R_SB_XTERM 2074 if (scrollBar.style == SB_STYLE_XTERM
2054 || scrollbar_above_slider (ev.y) 2075 || scrollBar.above_slider (ev.y)
2055 || scrollbar_below_slider (ev.y)) 2076 || scrollBar.below_slider (ev.y))
2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2077 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2057 2078
2058 scrollBar.state = STATE_MOTION; 2079 scrollBar.state = SB_STATE_MOTION;
2059 break; 2080 break;
2060 2081
2061 case Button1: 2082 case Button1:
2062 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2083 if (scrollBar.align == SB_ALIGN_CENTRE)
2063 csrO = ev.y - scrollBar.top; 2084 csrO = ev.y - scrollBar.top;
2064 /* FALLTHROUGH */ 2085 /* FALLTHROUGH */
2065 2086
2066 case Button3: 2087 case Button3:
2067 if (scrollBar.style != R_SB_XTERM) 2088 if (scrollBar.style != SB_STYLE_XTERM)
2068 { 2089 {
2069 if (scrollbar_above_slider (ev.y)) 2090 if (scrollBar.above_slider (ev.y))
2070# ifdef RXVT_SCROLL_FULL 2091# ifdef RXVT_SCROLL_FULL
2071 scr_page (UP, nrow - 1); 2092 scr_page (UP, nrow - 1);
2072# else 2093# else
2073 scr_page (UP, nrow / 4); 2094 scr_page (UP, nrow / 4);
2074# endif 2095# endif
2075 else if (scrollbar_below_slider (ev.y)) 2096 else if (scrollBar.below_slider (ev.y))
2076# ifdef RXVT_SCROLL_FULL 2097# ifdef RXVT_SCROLL_FULL
2077 scr_page (DN, nrow - 1); 2098 scr_page (DN, nrow - 1);
2078# else 2099# else
2079 scr_page (DN, nrow / 4); 2100 scr_page (DN, nrow / 4);
2080# endif 2101# endif
2081 else 2102 else
2082 scrollBar.state = STATE_MOTION; 2103 scrollBar.state = SB_STATE_MOTION;
2083 } 2104 }
2084 else 2105 else
2085 { 2106 {
2086 scr_page ((ev.button == Button1 ? DN : UP), 2107 scr_page ((ev.button == Button1 ? DN : UP),
2087 (nrow 2108 (nrow
2088 * scrollbar_position (ev.y) 2109 * scrollBar.position (ev.y)
2089 / scrollBar.size ())); 2110 / scrollBar.size ()));
2090 } 2111 }
2091 2112
2092 break; 2113 break;
2093 } 2114 }
… …
2104 2125
2105 csrO = 0; /* reset csr Offset */ 2126 csrO = 0; /* reset csr Offset */
2106 if (!bypass_keystate) 2127 if (!bypass_keystate)
2107 reportmode = !! (priv_modes & PrivMode_mouse_report); 2128 reportmode = !! (priv_modes & PrivMode_mouse_report);
2108 2129
2109 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2130 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2110 { 2131 {
2111 scrollBar.state = STATE_IDLE; 2132 scrollBar.state = SB_STATE_IDLE;
2112 scrollBar.show (0); 2133 scrollBar.show (0);
2113 } 2134 }
2114 2135
2115#ifdef SELECTION_SCROLLING 2136#ifdef SELECTION_SCROLLING
2116 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
… …
2166 case Button3: 2187 case Button3:
2167 selection_make (ev.time); 2188 selection_make (ev.time);
2168 break; 2189 break;
2169 2190
2170 case Button2: 2191 case Button2:
2171 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2192 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2172 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2173 break; 2194 break;
2174 2195
2175#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2176 case Button4: 2197 case Button4:
… …
2211 } 2232 }
2212} 2233}
2213 2234
2214/*}}} */ 2235/*}}} */
2215 2236
2216void 2237void ecb_hot
2217rxvt_term::cmd_parse () 2238rxvt_term::cmd_parse ()
2218{ 2239{
2219 wchar_t ch = NOCHAR; 2240 wchar_t ch = NOCHAR;
2220 char *seq_begin; // remember start of esc-sequence here 2241 char *seq_begin; // remember start of esc-sequence here
2221 2242
2222 for (;;) 2243 for (;;)
2223 { 2244 {
2224 if (expect_false (ch == NOCHAR)) 2245 if (ecb_unlikely (ch == NOCHAR))
2225 { 2246 {
2226 seq_begin = cmdbuf_ptr; 2247 seq_begin = cmdbuf_ptr;
2227 ch = next_char (); 2248 ch = next_char ();
2228 2249
2229 if (ch == NOCHAR) 2250 if (ch == NOCHAR)
2230 break; 2251 break;
2231 } 2252 }
2232 2253
2233 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2254 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2234 { 2255 {
2235 if (expect_false (!seen_input)) 2256 if (ecb_unlikely (!seen_input))
2236 { 2257 {
2237 seen_input = 1; 2258 seen_input = 1;
2238 // many badly-written programs (e.g. jed) contain a race condition: 2259 // many badly-written programs (e.g. jed) contain a race condition:
2239 // they first read the screensize and then install a SIGWINCH handler. 2260 // they first read the screensize and then install a SIGWINCH handler.
2240 // some window managers resize the window early, and these programs 2261 // some window managers resize the window early, and these programs
… …
2253 wchar_t *str = buf; 2274 wchar_t *str = buf;
2254 wchar_t *eol = str + min (ncol, UBUFSIZ); 2275 wchar_t *eol = str + min (ncol, UBUFSIZ);
2255 2276
2256 for (;;) 2277 for (;;)
2257 { 2278 {
2258 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2279 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2259 break; 2280 break;
2260 2281
2261 *str++ = ch; 2282 *str++ = ch;
2262 2283
2263 if (expect_false (ch == C0_LF || str >= eol)) 2284 if (ecb_unlikely (ch == C0_LF || str >= eol))
2264 { 2285 {
2265 if (ch == C0_LF) 2286 if (ch == C0_LF)
2266 nlines++; 2287 nlines++;
2267 2288
2268 refresh_count++; 2289 refresh_count++;
… …
2340 } 2361 }
2341 } 2362 }
2342} 2363}
2343 2364
2344// read the next character 2365// read the next character
2345wchar_t 2366wchar_t ecb_hot
2346rxvt_term::next_char () NOTHROW 2367rxvt_term::next_char () NOTHROW
2347{ 2368{
2348 while (cmdbuf_ptr < cmdbuf_endp) 2369 while (cmdbuf_ptr < cmdbuf_endp)
2349 { 2370 {
2350 // assume 7-bit to be ascii ALWAYS 2371 // assume 7-bit to be ascii ALWAYS
2351 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2372 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2352 return *cmdbuf_ptr++; 2373 return *cmdbuf_ptr++;
2353 2374
2354 wchar_t wc; 2375 wchar_t wc;
2355 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2376 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2356 2377
… …
2362 } 2383 }
2363 2384
2364 if (len == (size_t)-1) 2385 if (len == (size_t)-1)
2365 { 2386 {
2366 mbstate.reset (); // reset now undefined conversion state 2387 mbstate.reset (); // reset now undefined conversion state
2388 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2389 // in which case we "erroneously" return the next byte which might be valid.
2367 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2390 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2368 } 2391 }
2369 2392
2370 // assume wchar == unicode 2393 // assume wchar == unicode
2371 cmdbuf_ptr += len; 2394 cmdbuf_ptr += len;
… …
2374 2397
2375 return NOCHAR; 2398 return NOCHAR;
2376} 2399}
2377 2400
2378// read the next octet 2401// read the next octet
2379uint32_t 2402uint32_t ecb_hot
2380rxvt_term::next_octet () NOTHROW 2403rxvt_term::next_octet () NOTHROW
2381{ 2404{
2382 return cmdbuf_ptr < cmdbuf_endp 2405 return cmdbuf_ptr < cmdbuf_endp
2383 ? (unsigned char)*cmdbuf_ptr++ 2406 ? (unsigned char)*cmdbuf_ptr++
2384 : NOCHAR; 2407 : NOCHAR;
2385} 2408}
2386 2409
2387static class out_of_input out_of_input; 2410static class out_of_input out_of_input;
2388 2411
2389wchar_t 2412wchar_t ecb_hot
2390rxvt_term::cmd_getc () THROW ((class out_of_input)) 2413rxvt_term::cmd_getc () THROW ((class out_of_input))
2391{ 2414{
2392 wchar_t c = next_char (); 2415 wchar_t c = next_char ();
2393 2416
2394 if (c == NOCHAR) 2417 if (c == NOCHAR)
2395 throw out_of_input; 2418 throw out_of_input;
2396 2419
2397 return c; 2420 return c;
2398} 2421}
2399 2422
2400uint32_t 2423uint32_t ecb_hot
2401rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2424rxvt_term::cmd_get8 () THROW ((class out_of_input))
2402{ 2425{
2403 uint32_t c = next_octet (); 2426 uint32_t c = next_octet ();
2404 2427
2405 if (c == NOCHAR) 2428 if (c == NOCHAR)
… …
2409} 2432}
2410 2433
2411/*{{{ print pipe */ 2434/*{{{ print pipe */
2412/*----------------------------------------------------------------------*/ 2435/*----------------------------------------------------------------------*/
2413#ifdef PRINTPIPE 2436#ifdef PRINTPIPE
2414FILE * 2437FILE * ecb_cold
2415rxvt_term::popen_printer () 2438rxvt_term::popen_printer ()
2416{ 2439{
2417 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2440 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2418 2441
2419 if (stream == NULL) 2442 if (stream == NULL)
2420 rxvt_warn ("can't open printer pipe, not printing.\n"); 2443 rxvt_warn ("can't open printer pipe, not printing.\n");
2421 2444
2422 return stream; 2445 return stream;
2423} 2446}
2424 2447
2425int 2448int ecb_cold
2426rxvt_term::pclose_printer (FILE *stream) 2449rxvt_term::pclose_printer (FILE *stream)
2427{ 2450{
2428 fflush (stream); 2451 fflush (stream);
2429 return pclose (stream); 2452 return pclose (stream);
2430} 2453}
2431 2454
2432/* 2455/*
2433 * simulate attached vt100 printer 2456 * simulate attached vt100 printer
2434 */ 2457 */
2435void 2458void ecb_cold
2436rxvt_term::process_print_pipe () 2459rxvt_term::process_print_pipe ()
2437{ 2460{
2438 FILE *fd = popen_printer (); 2461 FILE *fd = popen_printer ();
2439 2462
2440 if (!fd) 2463 if (!fd)
… …
2495 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2518 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2496 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2519 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2497}; 2520};
2498 2521
2499/*{{{ process non-printing single characters */ 2522/*{{{ process non-printing single characters */
2500void 2523void ecb_hot
2501rxvt_term::process_nonprinting (unicode_t ch) 2524rxvt_term::process_nonprinting (unicode_t ch)
2502{ 2525{
2503 switch (ch) 2526 switch (ch)
2504 { 2527 {
2505 case C0_ESC: 2528 case C0_ESC:
… …
2551} 2574}
2552/*}}} */ 2575/*}}} */
2553 2576
2554 2577
2555/*{{{ process VT52 escape sequences */ 2578/*{{{ process VT52 escape sequences */
2556void 2579void ecb_cold
2557rxvt_term::process_escape_vt52 (unicode_t ch) 2580rxvt_term::process_escape_vt52 (unicode_t ch)
2558{ 2581{
2559 int row, col; 2582 int row, col;
2560 2583
2561 switch (ch) 2584 switch (ch)
… …
2595 break; 2618 break;
2596 case 'Z': /* identify the terminal type */ 2619 case 'Z': /* identify the terminal type */
2597 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2620 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2598 break; 2621 break;
2599 case '<': /* turn off VT52 mode */ 2622 case '<': /* turn off VT52 mode */
2600 set_privmode (PrivMode_vt52, 0); 2623 priv_modes &= ~PrivMode_vt52;
2601 break; 2624 break;
2602 case 'F': /* use special graphics character set */ 2625 case 'F': /* use special graphics character set */
2603 case 'G': /* use regular character set */ 2626 case 'G': /* use regular character set */
2604 /* unimplemented */ 2627 /* unimplemented */
2605 break; 2628 break;
… …
2611} 2634}
2612/*}}} */ 2635/*}}} */
2613 2636
2614 2637
2615/*{{{ process escape sequences */ 2638/*{{{ process escape sequences */
2616void 2639void ecb_hot
2617rxvt_term::process_escape_seq () 2640rxvt_term::process_escape_seq ()
2618{ 2641{
2619 unicode_t ch = cmd_getc (); 2642 unicode_t ch = cmd_getc ();
2620 2643
2621 if (priv_modes & PrivMode_vt52) 2644 if (priv_modes & PrivMode_vt52)
… …
2624 return; 2647 return;
2625 } 2648 }
2626 2649
2627 switch (ch) 2650 switch (ch)
2628 { 2651 {
2629 /* case 1: do_tek_mode (); break; */
2630 case '#': 2652 case '#':
2631 if (cmd_getc () == '8') 2653 if (cmd_getc () == '8')
2632 scr_E (); 2654 scr_E ();
2633 break; 2655 break;
2634 case '(': 2656 case '(':
… …
2657#if !ENABLE_MINIMAL 2679#if !ENABLE_MINIMAL
2658 case '9': 2680 case '9':
2659 scr_forwardindex (); 2681 scr_forwardindex ();
2660 break; 2682 break;
2661#endif 2683#endif
2684 // DECPAM/DECPNM
2662 case '=': 2685 case '=':
2686 priv_modes |= PrivMode_aplKP;
2687 break;
2663 case '>': 2688 case '>':
2664 set_privmode (PrivMode_aplKP, ch == '='); 2689 priv_modes &= ~PrivMode_aplKP;
2665 break; 2690 break;
2666 2691
2667 case C1_40: 2692 case C1_40:
2668 cmd_getc (); 2693 cmd_getc ();
2669 break; 2694 break;
… …
2673 2698
2674 /* 8.3.87: NEXT LINE */ 2699 /* 8.3.87: NEXT LINE */
2675 case C1_NEL: /* ESC E */ 2700 case C1_NEL: /* ESC E */
2676 { 2701 {
2677 wchar_t nlcr[] = { C0_LF, C0_CR }; 2702 wchar_t nlcr[] = { C0_LF, C0_CR };
2678 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2703 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2679 } 2704 }
2680 break; 2705 break;
2681 2706
2682 /* kidnapped escape sequence: Should be 8.3.48 */ 2707 /* kidnapped escape sequence: Should be 8.3.48 */
2683 case C1_ESA: /* ESC G */ 2708 case C1_ESA: /* ESC G */
… …
2695 case C1_RI: /* ESC M */ 2720 case C1_RI: /* ESC M */
2696 scr_index (DN); 2721 scr_index (DN);
2697 break; 2722 break;
2698 2723
2699 /* 8.3.142: SINGLE-SHIFT TWO */ 2724 /* 8.3.142: SINGLE-SHIFT TWO */
2700 /*case C1_SS2: scr_single_shift (2); break; */ 2725 /* case C1_SS2: break; */
2701 2726
2702 /* 8.3.143: SINGLE-SHIFT THREE */ 2727 /* 8.3.143: SINGLE-SHIFT THREE */
2703 /*case C1_SS3: scr_single_shift (3); break; */ 2728 /* case C1_SS3: break; */
2704 2729
2705 /* 8.3.27: DEVICE CONTROL STRING */ 2730 /* 8.3.27: DEVICE CONTROL STRING */
2706 case C1_DCS: /* ESC P */ 2731 case C1_DCS: /* ESC P */
2707 process_dcs_seq (); 2732 process_dcs_seq ();
2708 break; 2733 break;
… …
2771 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2796 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2772 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2797 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2773 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2798 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2774 }; 2799 };
2775 2800
2776void 2801void ecb_hot
2777rxvt_term::process_csi_seq () 2802rxvt_term::process_csi_seq ()
2778{ 2803{
2779 unicode_t ch, priv, i; 2804 unicode_t ch, priv, prev_ch, i;
2780 unsigned int nargs, p; 2805 unsigned int nargs, p;
2781 int n, ndef; 2806 int n, ndef;
2782 int arg[ESC_ARGS] = { }; 2807 int arg[ESC_ARGS] = { };
2783 2808
2784 nargs = 0; 2809 nargs = 0;
… …
2790 /* '<' '=' '>' '?' '!' */ 2815 /* '<' '=' '>' '?' '!' */
2791 priv = ch; 2816 priv = ch;
2792 ch = cmd_getc (); 2817 ch = cmd_getc ();
2793 } 2818 }
2794 2819
2820 prev_ch = 0;
2795 /* read any numerical arguments */ 2821 /* read any numerical arguments */
2796 for (n = -1; ch < CSI_ICH; ) 2822 for (n = -1; ch < CSI_ICH; )
2797 { 2823 {
2798 if (isdigit (ch)) 2824 if (isdigit (ch))
2799 { 2825 {
… …
2809 n = -1; 2835 n = -1;
2810 } 2836 }
2811 else if (IS_CONTROL (ch)) 2837 else if (IS_CONTROL (ch))
2812 process_nonprinting (ch); 2838 process_nonprinting (ch);
2813 2839
2840 prev_ch = ch;
2814 ch = cmd_getc (); 2841 ch = cmd_getc ();
2815 } 2842 }
2816 2843
2817 if (ch > CSI_7F) 2844 if (ch > CSI_7F)
2818 return; 2845 return;
… …
2859 scr_soft_reset (); 2886 scr_soft_reset ();
2860 2887
2861 static const int pm_h[] = { 7, 25 }; 2888 static const int pm_h[] = { 7, 25 };
2862 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2889 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2863 2890
2864 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2891 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2865 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2892 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2866 } 2893 }
2867 break; 2894 break;
2868 } 2895 }
2869 2896
2870 return; 2897 return;
… …
2888 } 2915 }
2889 break; 2916 break;
2890#endif 2917#endif
2891 2918
2892 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2919 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2893 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2920 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2894 arg[0] = -arg[0]; 2921 arg[0] = -arg[0];
2895 /* FALLTHROUGH */ 2922 /* FALLTHROUGH */
2896 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2923 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2897 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2924 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2898 scr_gotorc (arg[0], 0, RELATIVE); 2925 scr_gotorc (arg[0], 0, RELATIVE);
2899 break; 2926 break;
2900 2927
2901 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2928 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2902 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2929 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3052 scr_insert_mode (1); 3079 scr_insert_mode (1);
3053 else if (arg[0] == 20) 3080 else if (arg[0] == 20)
3054 priv_modes |= PrivMode_LFNL; 3081 priv_modes |= PrivMode_LFNL;
3055 break; 3082 break;
3056 3083
3084 case CSI_71: // DESCUSR: set cursor style
3085 if (prev_ch == ' ')
3086 set_cursor_style (arg[0]);
3087 break;
3088
3057 /* 3089 /*
3058 * PRIVATE USE beyond this point. All CSI_7? sequences here 3090 * PRIVATE USE beyond this point. All CSI_7? sequences here
3059 */ 3091 */
3060 case CSI_72: /* DECSTBM: set top and bottom margins */ 3092 case CSI_72: /* DECSTBM: set top and bottom margins */
3061 if (nargs == 1) 3093 if (nargs == 1)
… …
3135 break; 3167 break;
3136 3168
3137 //case 9: NYI, TODO, restore maximized window or maximize window 3169 //case 9: NYI, TODO, restore maximized window or maximize window
3138 default: 3170 default:
3139 if (args[0] >= 24) /* set height (chars) */ 3171 if (args[0] >= 24) /* set height (chars) */
3140 set_widthheight ((unsigned int)width, 3172 set_widthheight ((unsigned int)vt_width,
3141 (unsigned int) (args[1] * fheight)); 3173 (unsigned int) (args[1] * fheight));
3142 break; 3174 break;
3143 3175
3144 /* 3176 /*
3145 * reports - some output format copied from XTerm 3177 * reports - some output format copied from XTerm
… …
3424 break; 3456 break;
3425#endif 3457#endif
3426 case URxvt_Color_border: 3458 case URxvt_Color_border:
3427 process_color_seq (op, Color_border, str, resp); 3459 process_color_seq (op, Color_border, str, resp);
3428 break; 3460 break;
3429#if ENABLE_TRANSPARENCY 3461
3462#if BG_IMAGE_FROM_ROOT
3430 case URxvt_Color_tint: 3463 case URxvt_Color_tint:
3431 process_color_seq (op, Color_tint, str, resp); 3464 process_color_seq (op, Color_tint, str, resp);
3432 { 3465 {
3433 bool changed = false; 3466 bool changed = false;
3434 3467
3435 if (ISSET_PIXCOLOR (Color_tint)) 3468 if (ISSET_PIXCOLOR (Color_tint))
3436 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3469 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3437 3470
3438 if (changed) 3471 if (changed)
3439 update_background (); 3472 update_background ();
3440 } 3473 }
3441 3474
… …
3445#if BG_IMAGE_FROM_FILE 3478#if BG_IMAGE_FROM_FILE
3446 case Rxvt_Pixmap: 3479 case Rxvt_Pixmap:
3447 if (!strcmp (str, "?")) 3480 if (!strcmp (str, "?"))
3448 { 3481 {
3449 char str[256]; 3482 char str[256];
3483 int h_scale = fimage.h_scale;
3484 int v_scale = fimage.v_scale;
3485 int h_align = fimage.h_align;
3486 int v_align = fimage.v_align;
3450 3487
3451 sprintf (str, "[%dx%d+%d+%d]", 3488 sprintf (str, "[%dx%d+%d+%d]",
3452 min (h_scale, 32767), min (v_scale, 32767), 3489 h_scale, v_scale,
3453 min (h_align, 32767), min (v_align, 32767)); 3490 h_align, v_align);
3454 process_xterm_seq (XTerm_title, str, CHAR_ST); 3491 process_xterm_seq (XTerm_title, str, CHAR_ST);
3455 } 3492 }
3456 else 3493 else
3457 { 3494 {
3458 int changed = 0; 3495 bool changed = false;
3459 3496
3460 if (*str != ';') 3497 if (*str != ';')
3461 { 3498 {
3462 if (bg_set_file (str)) /* change pixmap */ 3499 try
3463 { 3500 {
3501 fimage.set_file_geometry (this, str);
3464 changed++; 3502 changed = true;
3465 str = strchr (str, ';');
3466 if (str == NULL)
3467 bg_set_default_geometry ();
3468 else 3503 }
3469 bg_set_geometry (str+1); 3504 catch (const class rxvt_failure_exception &e)
3505 {
3470 } 3506 }
3471 } 3507 }
3472 else 3508 else
3473 { 3509 {
3474 str++; 3510 str++;
3475 if (bg_set_geometry (str, true)) 3511 if (fimage.set_geometry (str, true))
3476 changed++; 3512 changed = true;
3477 } 3513 }
3478 3514
3479 if (changed) 3515 if (changed)
3480 { 3516 {
3481 if (bg_window_position_sensitive ()) 3517 if (bg_window_position_sensitive ())
3482 { 3518 {
3483 int x, y; 3519 int x, y;
3484 get_window_origin (x, y); 3520 get_window_origin (x, y);
3485 bg_set_position (x, y); 3521 parent_x = x;
3522 parent_y = y;
3486 } 3523 }
3487 update_background (); 3524 update_background ();
3488 } 3525 }
3489 } 3526 }
3490 break; 3527 break;
… …
3580 * 's' = save 3617 * 's' = save
3581 * 'r' = restore 3618 * 'r' = restore
3582 * 't' = toggle 3619 * 't' = toggle
3583 * so no need for fancy checking 3620 * so no need for fancy checking
3584 */ 3621 */
3585int 3622int ecb_cold
3586rxvt_term::privcases (int mode, unsigned long bit) 3623rxvt_term::privcases (int mode, unsigned long bit)
3587{ 3624{
3588 int state; 3625 int state;
3589 3626
3590 if (mode == 's') 3627 if (mode == 's')
3591 { 3628 {
3592 SavedModes |= (priv_modes & bit); 3629 if (priv_modes & bit)
3630 SavedModes |= bit;
3631 else
3632 SavedModes &= ~bit;
3593 return -1; 3633 return -1;
3594 } 3634 }
3595 else 3635 else
3596 { 3636 {
3597 if (mode == 'r') 3637 if (mode == 'r')
3598 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3638 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3599 else 3639 else
3600 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3640 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3601 3641
3602 set_privmode (bit, state); 3642 if (state)
3643 priv_modes |= bit;
3644 else
3645 priv_modes &= ~bit;
3603 } 3646 }
3604 3647
3605 return state; 3648 return state;
3606} 3649}
3607 3650
3608/* we're not using priv _yet_ */ 3651/* we're not using priv _yet_ */
3609void 3652void
3610rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3653rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3611{ 3654{
3612 unsigned int i, j; 3655 unsigned int i, j;
3613 int state; 3656 int state;
3614 3657
3615 static const struct 3658 static const struct
3616 { 3659 {
3617 const int argval; 3660 const int argval;
3618 const unsigned long bit; 3661 const unsigned long bit;
3619 } argtopriv[] = { 3662 } argtopriv[] = {
3620 { 1, PrivMode_aplCUR }, // DECCKM 3663 { 1, PrivMode_aplCUR }, // DECCKM
3621 { 2, PrivMode_vt52 }, 3664 { 2, PrivMode_vt52 }, // DECANM
3622 { 3, PrivMode_132 }, // DECCOLM 3665 { 3, PrivMode_132 }, // DECCOLM
3623 { 4, PrivMode_smoothScroll }, // DECSCLM 3666 { 4, PrivMode_smoothScroll }, // DECSCLM
3624 { 5, PrivMode_rVideo }, // DECSCNM 3667 { 5, PrivMode_rVideo }, // DECSCNM
3625 { 6, PrivMode_relOrigin }, // DECOM 3668 { 6, PrivMode_relOrigin }, // DECOM
3626 { 7, PrivMode_Autowrap }, // DECAWM 3669 { 7, PrivMode_Autowrap }, // DECAWM
3627 // 8, auto-repeat keys // DECARM 3670 // 8, auto-repeat keys // DECARM
3628 { 9, PrivMode_MouseX10 }, 3671 { 9, PrivMode_MouseX10 },
3629 // 18 end FF to printer after print screen 3672 // 18 end FF to printer after print screen
3630 // 19 Print screen prints full screen/scroll region 3673 // 19 Print screen prints full screen/scroll region
3631 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3674 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3632#ifdef scrollBar_esc 3675#ifdef scrollBar_esc
3633 { scrollBar_esc, PrivMode_scrollBar }, 3676 { scrollBar_esc, PrivMode_scrollBar },
3634#endif 3677#endif
3635 { 35, PrivMode_ShiftKeys }, // rxvt extension 3678 { 35, PrivMode_ShiftKeys }, // rxvt extension
3636 // 38, tektronix mode // DECTEK 3679 // 38, tektronix mode // DECTEK
3637 { 40, PrivMode_132OK }, 3680 { 40, PrivMode_132OK },
3638 // 41 xterm more fixes NYI 3681 // 41 xterm more fixes NYI
3639 // 45 margin bell NYI 3682 // 45 margin bell NYI
3640 // 46 start logging 3683 // 46 start logging
3641 { 47, PrivMode_Screen }, 3684 { 47, PrivMode_Screen },
3642 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3685 { 66, PrivMode_aplKP }, // DECNKM
3643#ifndef NO_BACKSPACE_KEY 3686#ifndef NO_BACKSPACE_KEY
3644 { 67, PrivMode_BackSpace }, // DECBKM 3687 { 67, PrivMode_BackSpace }, // DECBKM
3645#endif 3688#endif
3646 { 1000, PrivMode_MouseX11 }, 3689 { 1000, PrivMode_MouseX11 },
3647 { 1002, PrivMode_MouseBtnEvent }, 3690 { 1002, PrivMode_MouseBtnEvent },
… …
3676 for (i = 0; i < nargs; i++) 3719 for (i = 0; i < nargs; i++)
3677 { 3720 {
3678 state = -1; 3721 state = -1;
3679 3722
3680 /* basic handling */ 3723 /* basic handling */
3681 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3724 for (j = 0; j < ecb_array_length (argtopriv); j++)
3682 if (argtopriv[j].argval == arg[i]) 3725 if (argtopriv[j].argval == arg[i])
3683 { 3726 {
3684 state = privcases (mode, argtopriv[j].bit); 3727 state = privcases (mode, argtopriv[j].bit);
3685 break; 3728 break;
3686 } 3729 }
… …
3712 case 2: /* VT52 mode */ 3755 case 2: /* VT52 mode */
3713 /* oddball mode. should be set regardless of set/reset 3756 /* oddball mode. should be set regardless of set/reset
3714 * parameter. Return from VT52 mode with an ESC < from 3757 * parameter. Return from VT52 mode with an ESC < from
3715 * within VT52 mode 3758 * within VT52 mode
3716 */ 3759 */
3717 set_privmode (PrivMode_vt52, 1); 3760 priv_modes |= PrivMode_vt52;
3718 break; 3761 break;
3719 case 3: /* 80/132 */ 3762 case 3: /* 80/132 */
3720 if (priv_modes & PrivMode_132OK) 3763 if (priv_modes & PrivMode_132OK)
3721 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3764 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3722 break; 3765 break;
… …
3737 if (state) /* orthogonal */ 3780 if (state) /* orthogonal */
3738 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3781 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3739 break; 3782 break;
3740#ifdef scrollBar_esc 3783#ifdef scrollBar_esc
3741 case scrollBar_esc: 3784 case scrollBar_esc:
3742 if (scrollBar.map (state)) 3785 scrollBar.map (state);
3743 {
3744 resize_all_windows (0, 0, 0); 3786 resize_all_windows (0, 0, 0);
3745 scr_touch (true); 3787 scr_touch (true);
3746 }
3747 break; 3788 break;
3748#endif 3789#endif
3749 case 25: /* visible/invisible cursor */ 3790 case 25: /* visible/invisible cursor */
3750 scr_cursor_visible (state); 3791 scr_cursor_visible (state);
3751 break; 3792 break;
… …
3806 } 3847 }
3807} 3848}
3808/*}}} */ 3849/*}}} */
3809 3850
3810/*{{{ process sgr sequences */ 3851/*{{{ process sgr sequences */
3811void 3852void ecb_hot
3812rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3853rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3813{ 3854{
3814 unsigned int i; 3855 unsigned int i;
3815 short rendset; 3856 short rendset;
3816 int rendstyle; 3857 int rendstyle;
… …
3957 break; 3998 break;
3958#endif 3999#endif
3959 } 4000 }
3960 } 4001 }
3961} 4002}
4003
4004void
4005rxvt_term::set_cursor_style (int style)
4006{
4007 if (!IN_RANGE_INC (style, 0, 4))
4008 return;
4009
4010 set_option (Opt_cursorUnderline, style >= 3);
4011
4012#ifdef CURSOR_BLINK
4013 set_option (Opt_cursorBlink, !style || (style & 1));
4014 cursor_blink_reset ();
4015#endif
4016
4017 want_refresh = 1;
4018}
3962/*}}} */ 4019/*}}} */
3963 4020
3964/* ------------------------------------------------------------------------- */ 4021/* ------------------------------------------------------------------------- */
3965 4022
3966/* 4023/*

Diff Legend

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