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.485 by sf-exg, Fri Apr 29 13:08:24 2011 UTC vs.
Revision 1.551 by sf-exg, Wed Jul 16 14:29:23 2014 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-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 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
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[2];
263
264 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
265 ch[1] = 0;
266 267
267 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
268 { 269 {
269 char mb[16]; 270 char mb[MB_LEN_MAX];
270 int len; 271 int len;
271 272
272 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
273 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
274 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
275 else 276 else
276 { 277 {
277 mb[0] = ch[0]; 278 mb[0] = ch;
278 len = 1; 279 len = 1;
279 } 280 }
280 281
281 if (len > 0) 282 if (len > 0)
282 tt_write (mb, len); 283 tt_write (mb, len);
285 } 286 }
286 287
287 iso14755buf = 0; 288 iso14755buf = 0;
288} 289}
289 290
290static int 291static int ecb_cold
291hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
292{ 293{
293 // check whether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
294 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
295 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
304 305
305 return -1; 306 return -1;
306} 307}
307#endif 308#endif
308 309
309static inline KeySym 310static inline KeySym ecb_cold
310translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
311{ 312{
312#ifdef XK_KP_Home 313#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
340# endif 341# endif
341#endif 342#endif
342 return keysym; 343 return keysym;
343} 344}
344 345
345static inline int 346static inline int ecb_cold
346map_function_key (KeySym keysym) 347map_function_key (KeySym keysym)
347{ 348{
348 int param = 0; 349 int param = 0;
349 350
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
399 break; 400 break;
400 } 401 }
401 return param; 402 return param;
402} 403}
403 404
404void 405static inline wchar_t *
406rxvt_wcsdup (const wchar_t *str, int len)
407{
408 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
409 memcpy (r, str, len * sizeof (wchar_t));
410 r[len] = 0;
411 return r;
412}
413
414void ecb_cold
405rxvt_term::key_press (XKeyEvent &ev) 415rxvt_term::key_press (XKeyEvent &ev)
406{ 416{
407 int ctrl, meta, shft, len; 417 int ctrl, meta, shft, len;
408 KeySym keysym; 418 KeySym keysym;
409 int valid_keysym; 419 int valid_keysym;
410 char kbuf[KBUFSZ]; 420 char rkbuf[KBUFSZ + 1];
421 char *kbuf = rkbuf + 1;
411 422
412#if ISO_14755 423#if ISO_14755
413 if (iso14755buf & ISO_14755_52) 424 if (iso14755buf & ISO_14755_52)
414 return; 425 return;
415#endif 426#endif
424 ctrl = ev.state & ControlMask; 435 ctrl = ev.state & ControlMask;
425 meta = ev.state & ModMetaMask; 436 meta = ev.state & ModMetaMask;
426 437
427 kbuf[0] = 0; 438 kbuf[0] = 0;
428 439
429#ifdef USE_XIM 440#if USE_XIM
430 if (Input_Context) 441 if (Input_Context)
431 { 442 {
432 Status status_return; 443 Status status_return;
433 444
434#if 0 445#if 0
485 valid_keysym = keysym != NoSymbol; 496 valid_keysym = keysym != NoSymbol;
486 } 497 }
487 498
488 if (valid_keysym) 499 if (valid_keysym)
489 { 500 {
501 KeySym orig_keysym = keysym;
502
503 /* Shift + F1 - F10 generates F11 - F20 */
504 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
505 {
506 keysym += (XK_F11 - XK_F1);
507 shft = 0; /* turn off Shift */
508 }
509
510 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
511 {
512 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
513 unsigned int newlen = 1;
514
515 if (ev.state & ModNumLockMask)
516 kp = false;
517
518 keysym = translate_keypad (keysym, kp);
519
520 switch (keysym)
521 {
522#ifndef NO_BACKSPACE_KEY
523 case XK_BackSpace:
524 if (priv_modes & PrivMode_HaveBackSpace)
525 {
526 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
527 ^ !!ctrl) ? '\b' : '\177';
528 kbuf[1] = '\0';
529 }
530 else
531 strcpy (kbuf, rs[Rs_backspace_key]);
532 break;
533#endif
534#ifndef NO_DELETE_KEY
535 case XK_Delete:
536 strcpy (kbuf, rs[Rs_delete_key]);
537 break;
538#endif
539 case XK_Tab:
540 if (shft)
541 strcpy (kbuf, "\033[Z");
542 else
543 {
544#ifdef CTRL_TAB_MAKES_META
545 if (ctrl)
546 meta = 1;
547#endif
548#ifdef MOD4_TAB_MAKES_META
549 if (ev.state & Mod4Mask)
550 meta = 1;
551#endif
552 newlen = 0;
553 }
554 break;
555
556 case XK_Up: /* "\033[A" */
557 case XK_Down: /* "\033[B" */
558 case XK_Right: /* "\033[C" */
559 case XK_Left: /* "\033[D" */
560 strcpy (kbuf, "\033[Z");
561 kbuf[2] = "DACB"[keysym - XK_Left];
562 /* do Shift first */
563 if (shft)
564 kbuf[2] = "dacb"[keysym - XK_Left];
565 else if (ctrl)
566 {
567 kbuf[1] = 'O';
568 kbuf[2] = "dacb"[keysym - XK_Left];
569 }
570 else if (priv_modes & PrivMode_aplCUR)
571 kbuf[1] = 'O';
572 break;
573
574 case XK_KP_Enter:
575 /* allow shift to override */
576 if (kp)
577 {
578 strcpy (kbuf, "\033OM");
579 break;
580 }
581
582 /* FALLTHROUGH */
583
584 case XK_Return:
585 if (priv_modes & PrivMode_LFNL)
586 {
587 kbuf[0] = '\015';
588 kbuf[1] = '\012';
589 kbuf[2] = '\0';
590 }
591 else
592 {
593 kbuf[0] = '\015';
594 kbuf[1] = '\0';
595 }
596 break;
597
598 case XK_KP_F1: /* "\033OP" */
599 case XK_KP_F2: /* "\033OQ" */
600 case XK_KP_F3: /* "\033OR" */
601 case XK_KP_F4: /* "\033OS" */
602 strcpy (kbuf, "\033OP");
603 kbuf[2] += (keysym - XK_KP_F1);
604 break;
605
606 case XK_KP_Multiply: /* "\033Oj" : "*" */
607 case XK_KP_Add: /* "\033Ok" : "+" */
608 case XK_KP_Separator: /* "\033Ol" : "," */
609 case XK_KP_Subtract: /* "\033Om" : "-" */
610 case XK_KP_Decimal: /* "\033On" : "." */
611 case XK_KP_Divide: /* "\033Oo" : "/" */
612 case XK_KP_0: /* "\033Op" : "0" */
613 case XK_KP_1: /* "\033Oq" : "1" */
614 case XK_KP_2: /* "\033Or" : "2" */
615 case XK_KP_3: /* "\033Os" : "3" */
616 case XK_KP_4: /* "\033Ot" : "4" */
617 case XK_KP_5: /* "\033Ou" : "5" */
618 case XK_KP_6: /* "\033Ov" : "6" */
619 case XK_KP_7: /* "\033Ow" : "7" */
620 case XK_KP_8: /* "\033Ox" : "8" */
621 case XK_KP_9: /* "\033Oy" : "9" */
622 /* allow shift to override */
623 if (kp)
624 {
625 strcpy (kbuf, "\033Oj");
626 kbuf[2] += (keysym - XK_KP_Multiply);
627 }
628 else
629 {
630 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
631 kbuf[1] = '\0';
632 }
633 break;
634
635 default:
636 {
637 int param = map_function_key (keysym);
638 if (param > 0)
639 sprintf (kbuf,"\033[%d~", param);
640 else
641 newlen = 0;
642 }
643 break;
644 }
645
646 if (newlen)
647 len = strlen (kbuf);
648
649 if (len > 0)
650 {
651 /*
652 * pass Shift/Control indicators for function keys ending with `~'
653 *
654 * eg,
655 * Prior = "ESC[5~"
656 * Shift+Prior = "ESC[5$"
657 * Ctrl+Prior = "ESC[5^"
658 * Ctrl+Shift+Prior = "ESC[5@"
659 */
660 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
661 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
662
663 /*
664 * Pass meta for all function keys, if 'meta' option set
665 */
666#ifdef META8_OPTION
667 if (meta && (meta_char == 0x80))
668 kbuf[len - 1] |= 0x80;
669#endif
670 }
671
672 }
673 else if (ctrl && keysym == XK_minus)
674 {
675 len = 1;
676 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
677 }
678 else if (keysym == XK_ISO_Left_Tab)
679 {
680 strcpy (kbuf, "\033[Z");
681 len = 3;
682 }
683 else
684 {
685#ifdef META8_OPTION
686 /* set 8-bit on */
687 if (meta && (meta_char == 0x80))
688 {
689 char *ch;
690
691 for (ch = kbuf; ch < kbuf + len; ch++)
692 *ch |= 0x80;
693
694 meta = 0;
695 }
696#endif
697 /* nil */ ;
698 }
699
700 keysym = orig_keysym;
701 }
702
703 /* escape prefix */
704 if (len && meta
705#ifdef META8_OPTION
706 && meta_char == C0_ESC
707#endif
708 )
709 {
710 *--kbuf = C0_ESC;
711 len++;
712 }
713
714 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
715 return;
716
717 if (valid_keysym)
718 {
490#ifdef KEYSYM_RESOURCE 719#ifdef KEYSYM_RESOURCE
491 if (keyboard->dispatch (this, keysym, ev.state)) 720 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
492 return; 721 return;
493#endif 722#endif
494 723
495 if (saveLines) 724 if (saveLines)
496 { 725 {
509#endif 738#endif
510 max_it (lnsppg, 1); 739 max_it (lnsppg, 1);
511 740
512 if (keysym == XK_Prior) 741 if (keysym == XK_Prior)
513 { 742 {
514 scr_page (UP, lnsppg); 743 scr_page (lnsppg);
515 return; 744 return;
516 } 745 }
517 else if (keysym == XK_Next) 746 else if (keysym == XK_Next)
518 { 747 {
519 scr_page (DN, lnsppg); 748 scr_page (-lnsppg);
520 return; 749 return;
521 } 750 }
522 } 751 }
523#ifdef SCROLL_ON_UPDOWN_KEYS 752#ifdef SCROLL_ON_UPDOWN_KEYS
524 if (IS_SCROLL_MOD) 753 if (IS_SCROLL_MOD)
525 { 754 {
526 if (keysym == XK_Up) 755 if (keysym == XK_Up)
527 { 756 {
528 scr_page (UP, 1); 757 scr_page (1);
529 return; 758 return;
530 } 759 }
531 else if (keysym == XK_Down) 760 else if (keysym == XK_Down)
532 { 761 {
533 scr_page (DN, 1); 762 scr_page (-1);
534 return; 763 return;
535 } 764 }
536 } 765 }
537#endif 766#endif
538#ifdef SCROLL_ON_HOMEEND_KEYS 767#ifdef SCROLL_ON_HOMEEND_KEYS
539 if (IS_SCROLL_MOD) 768 if (IS_SCROLL_MOD)
540 { 769 {
541 if (keysym == XK_Home) 770 if (keysym == XK_Home)
542 { 771 {
543 scr_move_to (0, 1); 772 scr_changeview (top_row);
544 return; 773 return;
545 } 774 }
546 else if (keysym == XK_End) 775 else if (keysym == XK_End)
547 { 776 {
548 scr_move_to (1, 1); 777 scr_changeview (0);
549 return; 778 return;
550 } 779 }
551 } 780 }
552#endif 781#endif
553 } 782 }
554 783
555 if (shft) 784 if (shft)
556 { 785 {
557 /* Shift + F1 - F10 generates F11 - F20 */
558 if (keysym >= XK_F1 && keysym <= XK_F10)
559 {
560 keysym += (XK_F11 - XK_F1);
561 shft = 0; /* turn off Shift */
562 }
563 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 786 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
564 { 787 {
565 switch (keysym) 788 switch (keysym)
566 { 789 {
567 /* normal XTerm key bindings */ 790 /* normal XTerm key bindings */
568 case XK_Insert: /* Shift+Insert = paste mouse selection */ 791 case XK_Insert: /* Shift+Insert = paste mouse selection */
575 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 798 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
576 return; 799 return;
577#endif 800#endif
578 } 801 }
579 } 802 }
803 }
804
805 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
806 {
807 if (keysym == XK_v)
808 selection_request (ev.time, Sel_Clipboard);
809 else if (selection.len > 0)
810 {
811 free (selection.clip_text);
812 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
813 selection.clip_len = selection.len;
814 selection_grab (CurrentTime, true);
815 }
816
817 return;
580 } 818 }
581 819
582#if ENABLE_FRILLS || ISO_14755 820#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 821 // ISO 14755 support
584 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 822 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
639 { 877 {
640 scr_printscreen (ctrl | shft); 878 scr_printscreen (ctrl | shft);
641 return; 879 return;
642 } 880 }
643#endif 881#endif
644
645 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
646 {
647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
648 unsigned int newlen = 1;
649
650 if (ev.state & ModNumLockMask)
651 kp = false;
652
653 keysym = translate_keypad (keysym, kp);
654
655 switch (keysym)
656 {
657#ifndef NO_BACKSPACE_KEY
658 case XK_BackSpace:
659 if (priv_modes & PrivMode_HaveBackSpace)
660 {
661 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
662 ^ !!ctrl) ? '\b' : '\177';
663 kbuf[1] = '\0';
664 }
665 else
666 strcpy (kbuf, rs[Rs_backspace_key]);
667 break;
668#endif
669#ifndef NO_DELETE_KEY
670 case XK_Delete:
671 strcpy (kbuf, rs[Rs_delete_key]);
672 break;
673#endif
674 case XK_Tab:
675 if (shft)
676 strcpy (kbuf, "\033[Z");
677 else
678 {
679#ifdef CTRL_TAB_MAKES_META
680 if (ctrl)
681 meta = 1;
682#endif
683#ifdef MOD4_TAB_MAKES_META
684 if (ev.state & Mod4Mask)
685 meta = 1;
686#endif
687 newlen = 0;
688 }
689 break;
690
691 case XK_Up: /* "\033[A" */
692 case XK_Down: /* "\033[B" */
693 case XK_Right: /* "\033[C" */
694 case XK_Left: /* "\033[D" */
695 strcpy (kbuf, "\033[Z");
696 kbuf[2] = "DACB"[keysym - XK_Left];
697 /* do Shift first */
698 if (shft)
699 kbuf[2] = "dacb"[keysym - XK_Left];
700 else if (ctrl)
701 {
702 kbuf[1] = 'O';
703 kbuf[2] = "dacb"[keysym - XK_Left];
704 }
705 else if (priv_modes & PrivMode_aplCUR)
706 kbuf[1] = 'O';
707 break;
708
709 case XK_KP_Enter:
710 /* allow shift to override */
711 if (kp)
712 {
713 strcpy (kbuf, "\033OM");
714 break;
715 }
716
717 /* FALLTHROUGH */
718
719 case XK_Return:
720 if (priv_modes & PrivMode_LFNL)
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\012';
724 kbuf[2] = '\0';
725 }
726 else
727 {
728 kbuf[0] = '\015';
729 kbuf[1] = '\0';
730 }
731 break;
732
733 case XK_KP_F1: /* "\033OP" */
734 case XK_KP_F2: /* "\033OQ" */
735 case XK_KP_F3: /* "\033OR" */
736 case XK_KP_F4: /* "\033OS" */
737 strcpy (kbuf, "\033OP");
738 kbuf[2] += (keysym - XK_KP_F1);
739 break;
740
741 case XK_KP_Multiply: /* "\033Oj" : "*" */
742 case XK_KP_Add: /* "\033Ok" : "+" */
743 case XK_KP_Separator: /* "\033Ol" : "," */
744 case XK_KP_Subtract: /* "\033Om" : "-" */
745 case XK_KP_Decimal: /* "\033On" : "." */
746 case XK_KP_Divide: /* "\033Oo" : "/" */
747 case XK_KP_0: /* "\033Op" : "0" */
748 case XK_KP_1: /* "\033Oq" : "1" */
749 case XK_KP_2: /* "\033Or" : "2" */
750 case XK_KP_3: /* "\033Os" : "3" */
751 case XK_KP_4: /* "\033Ot" : "4" */
752 case XK_KP_5: /* "\033Ou" : "5" */
753 case XK_KP_6: /* "\033Ov" : "6" */
754 case XK_KP_7: /* "\033Ow" : "7" */
755 case XK_KP_8: /* "\033Ox" : "8" */
756 case XK_KP_9: /* "\033Oy" : "9" */
757 /* allow shift to override */
758 if (kp)
759 {
760 strcpy (kbuf, "\033Oj");
761 kbuf[2] += (keysym - XK_KP_Multiply);
762 }
763 else
764 {
765 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
766 kbuf[1] = '\0';
767 }
768 break;
769
770 default:
771 {
772 int param = map_function_key (keysym);
773 if (param > 0)
774 sprintf (kbuf,"\033[%d~", param);
775 else
776 newlen = 0;
777 }
778 break;
779 }
780
781 if (newlen)
782 len = strlen (kbuf);
783
784 /*
785 * Pass meta for all function keys, if 'meta' option set
786 */
787#ifdef META8_OPTION
788 if (meta && (meta_char == 0x80) && len > 0)
789 kbuf[len - 1] |= 0x80;
790#endif
791
792 }
793 else if (ctrl && keysym == XK_minus)
794 {
795 len = 1;
796 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
797 }
798 else if (keysym == XK_ISO_Left_Tab)
799 {
800 strcpy (kbuf, "\033[Z");
801 len = 3;
802 }
803 else
804 {
805#ifdef META8_OPTION
806 /* set 8-bit on */
807 if (meta && (meta_char == 0x80))
808 {
809 char *ch;
810
811 for (ch = kbuf; ch < kbuf + len; ch++)
812 *ch |= 0x80;
813
814 meta = 0;
815 }
816#endif
817 /* nil */ ;
818 }
819 } 882 }
820
821 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
822 return;
823 883
824 if (len <= 0) 884 if (len <= 0)
825 return; /* not mapped */ 885 return; /* not mapped */
826 886
827 if (option (Opt_scrollTtyKeypress))
828 if (view_start)
829 {
830 view_start = 0;
831 want_refresh = 1;
832 }
833
834 /*
835 * these modifications only affect the static keybuffer
836 * pass Shift/Control indicators for function keys ending with `~'
837 *
838 * eg,
839 * Prior = "ESC[5~"
840 * Shift+Prior = "ESC[5$"
841 * Ctrl+Prior = "ESC[5^"
842 * Ctrl+Shift+Prior = "ESC[5@"
843 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
844 */
845 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
846 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
847
848 /* escape prefix */
849 if (meta
850#ifdef META8_OPTION
851 && meta_char == C0_ESC
852#endif
853 )
854 {
855 const char ch = C0_ESC;
856 tt_write (&ch, 1);
857 }
858
859 tt_write (kbuf, (unsigned int)len); 887 tt_write_user_input (kbuf, (unsigned int)len);
860} 888}
861 889
862void 890void ecb_cold
863rxvt_term::key_release (XKeyEvent &ev) 891rxvt_term::key_release (XKeyEvent &ev)
864{ 892{
865#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 893#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
866 KeySym keysym; 894 KeySym keysym;
867 895
939void 967void
940rxvt_term::flush () 968rxvt_term::flush ()
941{ 969{
942 flush_ev.stop (); 970 flush_ev.stop ();
943 971
944#ifdef HAVE_BG_PIXMAP 972#ifdef HAVE_IMG
945 if (bg_flags & BG_NEEDS_REFRESH) 973 if (bg_flags & BG_NEEDS_REFRESH)
946 { 974 {
947 bg_flags &= ~BG_NEEDS_REFRESH; 975 bg_flags &= ~BG_NEEDS_REFRESH;
948 scr_touch (false); 976 scr_touch (false);
949 } 977 }
989 while (row < end_row); 1017 while (row < end_row);
990 } 1018 }
991 1019
992 scr_refresh (); 1020 scr_refresh ();
993 scrollBar.show (1); 1021 scrollBar.show (1);
994#ifdef USE_XIM 1022#if USE_XIM
995 IMSendSpot (); 1023 im_send_spot ();
996#endif 1024#endif
997 } 1025 }
998 1026
999 display->flush (); 1027 display->flush ();
1000} 1028}
1018 flush (); 1046 flush ();
1019} 1047}
1020 1048
1021#ifdef CURSOR_BLINK 1049#ifdef CURSOR_BLINK
1022void 1050void
1051rxvt_term::cursor_blink_reset ()
1052{
1053 if (hidden_cursor)
1054 {
1055 hidden_cursor = 0;
1056 want_refresh = 1;
1057 }
1058
1059 if (option (Opt_cursorBlink))
1060 cursor_blink_ev.again ();
1061 else
1062 cursor_blink_ev.stop ();
1063}
1064
1065void
1023rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1066rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1024{ 1067{
1025 hidden_cursor = !hidden_cursor; 1068 hidden_cursor = !hidden_cursor;
1026 want_refresh = 1; 1069 want_refresh = 1;
1027 refresh_check (); 1070 refresh_check ();
1045 1088
1046#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1047void 1090void
1048rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1049{ 1092{
1050 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1093 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1051 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1094 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1052 { 1095 {
1053 want_refresh = 1; 1096 want_refresh = 1;
1054 refresh_check (); 1097 refresh_check ();
1055 } 1098 }
1056 else 1099 else
1060 1103
1061#ifdef SELECTION_SCROLLING 1104#ifdef SELECTION_SCROLLING
1062void 1105void
1063rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1106rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1064{ 1107{
1065 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1108 if (scr_page (scroll_selection_lines))
1066 { 1109 {
1067 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1110 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1068 want_refresh = 1; 1111 want_refresh = 1;
1069 refresh_check (); 1112 refresh_check ();
1070 } 1113 }
1075 1118
1076#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1119#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1077void 1120void
1078rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1121rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1079{ 1122{
1080 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1123 if (scr_page (mouse_slip_wheel_speed))
1081 { 1124 {
1082 want_refresh = 1; 1125 want_refresh = 1;
1083 refresh_check (); 1126 refresh_check ();
1084 } 1127 }
1085 1128
1206 pty_write (); 1249 pty_write ();
1207 1250
1208 refresh_check (); 1251 refresh_check ();
1209} 1252}
1210 1253
1211void 1254void ecb_cold
1212rxvt_term::pointer_unblank () 1255rxvt_term::pointer_unblank ()
1213{ 1256{
1214 XDefineCursor (dpy, vt, TermWin_cursor); 1257 XDefineCursor (dpy, vt, TermWin_cursor);
1215 recolour_cursor (); 1258 recolour_cursor ();
1216 1259
1221 pointer_ev.start (pointerBlankDelay); 1264 pointer_ev.start (pointerBlankDelay);
1222#endif 1265#endif
1223} 1266}
1224 1267
1225#ifdef POINTER_BLANK 1268#ifdef POINTER_BLANK
1226void 1269void ecb_cold
1227rxvt_term::pointer_blank () 1270rxvt_term::pointer_blank ()
1228{ 1271{
1229 if (!option (Opt_pointerBlank)) 1272 if (!option (Opt_pointerBlank))
1230 return; 1273 return;
1231 1274
1233 XFlush (dpy); 1276 XFlush (dpy);
1234 1277
1235 hidden_pointer = 1; 1278 hidden_pointer = 1;
1236} 1279}
1237 1280
1238void 1281void ecb_cold
1239rxvt_term::pointer_cb (ev::timer &w, int revents) 1282rxvt_term::pointer_cb (ev::timer &w, int revents)
1240{ 1283{
1241 make_current (); 1284 make_current ();
1242 1285
1243 pointer_blank (); 1286 pointer_blank ();
1335 32 + x, 1378 32 + x,
1336 32 + y); 1379 32 + y);
1337} 1380}
1338 1381
1339/*{{{ process an X event */ 1382/*{{{ process an X event */
1340void 1383void ecb_hot
1341rxvt_term::x_cb (XEvent &ev) 1384rxvt_term::x_cb (XEvent &ev)
1342{ 1385{
1343 make_current (); 1386 make_current ();
1344 1387
1345 dLocal (Display *, dpy); 1388 dLocal (Display *, dpy);
1448 if (ev.xconfigure.window == parent) 1491 if (ev.xconfigure.window == parent)
1449 { 1492 {
1450 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1493 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1451 ; 1494 ;
1452 1495
1496 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1497
1498 bool moved = false;
1453#ifdef HAVE_BG_PIXMAP 1499#ifdef HAVE_BG_PIXMAP
1454 bool moved = false;
1455 if (bg_window_position_sensitive ()) 1500 if (bg_window_position_sensitive ())
1456 { 1501 {
1502 want_position_change = true;
1503 if (bg_img == 0)
1504 moved = true;
1505 }
1506#endif
1507
1508 if (want_position_change)
1509 {
1457 int x, y; 1510 int x, y;
1511
1458 if (ev.xconfigure.send_event) 1512 if (ev.xconfigure.send_event)
1459 { 1513 {
1460 x = ev.xconfigure.x; 1514 x = ev.xconfigure.x;
1461 y = ev.xconfigure.y; 1515 y = ev.xconfigure.y;
1462 } 1516 }
1463 else 1517 else
1464 get_window_origin (x, y); 1518 get_window_origin (x, y);
1465 1519
1466 if (bg_set_position (x, y) 1520 if (x != parent_x || y != parent_y)
1467 || !(bg_flags & BG_IS_VALID)) 1521 {
1522 parent_x = x;
1523 parent_y = y;
1524 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1468 moved = true; 1525 moved = true;
1526 }
1469 } 1527 }
1470#endif
1471 1528
1472 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1529 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1473 { 1530 {
1474 seen_resize = 1; 1531 seen_resize = 1;
1475 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1532 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1476 } 1533 }
1477 else 1534 else
1478 { 1535 {
1479#ifdef HAVE_BG_PIXMAP 1536#ifdef HAVE_BG_PIXMAP
1480 if (moved) 1537 if (moved)
1481 {
1482 if (mapped)
1483 update_background (); 1538 update_background ();
1484 else
1485 bg_invalidate ();
1486 }
1487#endif 1539#endif
1488 } 1540 }
1489 1541
1490 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1542 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1491 } 1543 }
1503 selection_send (ev.xselectionrequest); 1555 selection_send (ev.xselectionrequest);
1504 break; 1556 break;
1505 1557
1506 case MapNotify: 1558 case MapNotify:
1507#ifdef HAVE_BG_PIXMAP 1559#ifdef HAVE_BG_PIXMAP
1508 /* This is needed specifically to fix the case of no window manager or a 1560 // This is needed at startup for the case of no window manager
1509 * non-reparenting window manager. In those cases we never get first 1561 // or a non-reparenting window manager and also because we
1510 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1562 // defer bg image updates if the window is not mapped. The
1511 * care of multiplicity of ConfigureNotify events arriving while WM does 1563 // short delay is to optimize for multiple ConfigureNotify
1512 * reparenting. 1564 // events at startup when the window manager reparents the
1513 * We should not render background immediately, as there could be several 1565 // window, so as to perform the computation after we have
1514 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1566 // received all of them.
1515 * by scheduling background redraw as soon as we can, but giving a short 1567 if (bg_img == 0)
1516 * bit of time for ConfigureNotifies to arrive.
1517 * We should render background PRIOR to drawing any text, but AFTER all
1518 * of ConfigureNotifys for the best results.
1519 */
1520 if (!(bg_flags & BG_IS_VALID))
1521 update_background_ev.start (0.025); 1568 update_background_ev.start (0.025);
1522#endif 1569#endif
1523 mapped = 1; 1570 mapped = 1;
1524#ifdef TEXT_BLINK 1571#ifdef TEXT_BLINK
1525 text_blink_ev.start (); 1572 text_blink_ev.start ();
1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1612 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1566 ; 1613 ;
1567 1614
1568 if (scrollBar.state && ev.xany.window == scrollBar.win) 1615 if (scrollBar.state && ev.xany.window == scrollBar.win)
1569 { 1616 {
1570 scrollBar.state = STATE_IDLE; 1617 scrollBar.state = SB_STATE_IDLE;
1571 scrollBar.show (0); 1618 scrollBar.show (0);
1572 } 1619 }
1573 } 1620 }
1574 break; 1621 break;
1575 1622
1617 1664
1618#ifdef SELECTION_SCROLLING 1665#ifdef SELECTION_SCROLLING
1619 if (ev.xbutton.y < int_bwidth 1666 if (ev.xbutton.y < int_bwidth
1620 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1667 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1621 { 1668 {
1669 page_dirn scroll_selection_dir;
1622 int dist; 1670 int dist;
1623 1671
1624 /* don't clobber the current delay if we are 1672 /* don't clobber the current delay if we are
1625 * already in the middle of scrolling. 1673 * already in the middle of scrolling.
1626 */ 1674 */
1641 dist = int_bwidth - ev.xbutton.y; 1689 dist = int_bwidth - ev.xbutton.y;
1642 } 1690 }
1643 else 1691 else
1644 { 1692 {
1645 scroll_selection_dir = DN; 1693 scroll_selection_dir = DN;
1646 dist = ev.xbutton.y - (int_bwidth + height); 1694 dist = ev.xbutton.y - (int_bwidth + vt_height);
1647 } 1695 }
1648 1696
1649 scroll_selection_lines = Pixel2Height (dist) 1697 scroll_selection_lines = Pixel2Height (dist)
1650 / SELECTION_SCROLL_LINE_SPEEDUP 1698 / SELECTION_SCROLL_LINE_SPEEDUP
1651 + 1; 1699 + 1;
1652 min_it (scroll_selection_lines, 1700 min_it (scroll_selection_lines,
1653 SELECTION_SCROLL_MAX_LINES); 1701 SELECTION_SCROLL_MAX_LINES);
1702 scroll_selection_lines *= scroll_selection_dir;
1654 } 1703 }
1655 else 1704 else
1656 { 1705 {
1657 /* we are within the text window, so we 1706 /* we are within the text window, so we
1658 * shouldn't be scrolling 1707 * shouldn't be scrolling
1663#ifdef MOUSE_THRESHOLD 1712#ifdef MOUSE_THRESHOLD
1664 } 1713 }
1665#endif 1714#endif
1666 } 1715 }
1667 } 1716 }
1668 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1717 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1669 { 1718 {
1670 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1719 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1720 MotionNotify, &ev))
1672 ; 1721 ;
1673 1722
1674 XQueryPointer (dpy, scrollBar.win, 1723 XQueryPointer (dpy, scrollBar.win,
1675 &unused_root, &unused_child, 1724 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1725 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1726 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1727 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1728 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1680 scrollBar.size ()); 1729 scrollBar.size ());
1681 want_refresh = 1; 1730 want_refresh = 1;
1682 scrollBar.show (1); 1731 scrollBar.show (1);
1683 } 1732 }
1684 break; 1733 break;
1685 } 1734 }
1686 1735
1687#if defined(CURSOR_BLINK) 1736#if defined(CURSOR_BLINK)
1688 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1737 if (ev.type == KeyPress)
1689 {
1690 if (hidden_cursor)
1691 {
1692 hidden_cursor = 0;
1693 want_refresh = 1;
1694 }
1695
1696 cursor_blink_ev.again (); 1738 cursor_blink_reset ();
1697 }
1698#endif 1739#endif
1699 1740
1700#if defined(POINTER_BLANK) 1741#if defined(POINTER_BLANK)
1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1742 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1702 { 1743 {
1713 1754
1714 refresh_check (); 1755 refresh_check ();
1715} 1756}
1716 1757
1717#if ENABLE_FRILLS 1758#if ENABLE_FRILLS
1718void 1759void ecb_cold
1719rxvt_term::set_urgency (bool enable) 1760rxvt_term::set_urgency (bool enable)
1720{ 1761{
1721 if (enable == urgency_hint) 1762 if (enable == urgency_hint)
1722 return; 1763 return;
1723 1764
1724 if (XWMHints *h = XGetWMHints (dpy, parent)) 1765 if (XWMHints *h = XGetWMHints (dpy, parent))
1725 { 1766 {
1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1767 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1727 XSetWMHints (dpy, parent, h); 1768 XSetWMHints (dpy, parent, h);
1728 urgency_hint = enable; 1769 urgency_hint = enable;
1770 XFree (h);
1729 } 1771 }
1730} 1772}
1731#endif 1773#endif
1732 1774
1733void 1775void ecb_cold
1734rxvt_term::focus_in () 1776rxvt_term::focus_in ()
1735{ 1777{
1736 if (!focus) 1778 if (!focus)
1737 { 1779 {
1738 focus = 1; 1780 focus = 1;
1739 want_refresh = 1; 1781 want_refresh = 1;
1740 1782
1741#if USE_XIM 1783#if USE_XIM
1742 if (Input_Context != NULL) 1784 if (Input_Context != NULL)
1743 { 1785 {
1744 IMSetPosition (); 1786 im_set_position ();
1745 XSetICFocus (Input_Context); 1787 XSetICFocus (Input_Context);
1746 } 1788 }
1747#endif 1789#endif
1748#if CURSOR_BLINK 1790#if CURSOR_BLINK
1749 if (option (Opt_cursorBlink)) 1791 if (option (Opt_cursorBlink))
1763 1805
1764 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1806 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1765 } 1807 }
1766} 1808}
1767 1809
1768void 1810void ecb_cold
1769rxvt_term::focus_out () 1811rxvt_term::focus_out ()
1770{ 1812{
1771 if (focus) 1813 if (focus)
1772 { 1814 {
1773 focus = 0; 1815 focus = 0;
1806 1848
1807 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1849 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1808 } 1850 }
1809} 1851}
1810 1852
1811void 1853void ecb_cold
1812rxvt_term::update_fade_color (unsigned int idx) 1854rxvt_term::update_fade_color (unsigned int idx)
1813{ 1855{
1814#if OFF_FOCUS_FADING 1856#if OFF_FOCUS_FADING
1815 if (rs[Rs_fade]) 1857 if (rs[Rs_fade])
1816 { 1858 {
1819 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1861 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1820 } 1862 }
1821#endif 1863#endif
1822} 1864}
1823 1865
1824#if ENABLE_TRANSPARENCY || ENABLE_PERL 1866#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1825void 1867void ecb_hot
1826rxvt_term::rootwin_cb (XEvent &ev) 1868rxvt_term::rootwin_cb (XEvent &ev)
1827{ 1869{
1828 make_current (); 1870 make_current ();
1829 1871
1830 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1872 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1831 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1873 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1832 return; 1874 return;
1833 1875
1834# if ENABLE_TRANSPARENCY
1835 switch (ev.type) 1876 switch (ev.type)
1836 { 1877 {
1837 case PropertyNotify: 1878 case PropertyNotify:
1838 /* 1879 /*
1839 * if user used some Esetroot compatible prog to set the root bg, 1880 * if user used some Esetroot compatible prog to set the root bg,
1840 * use the property to determine the pixmap. We use it later on. 1881 * use the property to determine the pixmap. We use it later on.
1841 */ 1882 */
1842 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1883 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1843 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1884 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1844 { 1885 {
1845 bg_set_root_pixmap (); 1886#if BG_IMAGE_FROM_ROOT
1887 if (option (Opt_transparent))
1888 {
1889 rxvt_img::new_from_root (this)->replace (root_img);
1846 update_background (); 1890 update_background ();
1891 }
1892#endif
1893 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1847 } 1894 }
1848 1895
1849 break; 1896 break;
1850 } 1897 }
1851# endif
1852 1898
1853 refresh_check (); 1899 refresh_check ();
1854} 1900}
1855#endif 1901#endif
1856 1902
1980 if (scrollBar.upButton (ev.y)) 2026 if (scrollBar.upButton (ev.y))
1981 direction = UP; /* up */ 2027 direction = UP; /* up */
1982 else if (scrollBar.dnButton (ev.y)) 2028 else if (scrollBar.dnButton (ev.y))
1983 direction = DN; /* down */ 2029 direction = DN; /* down */
1984 2030
1985 scrollBar.state = STATE_IDLE; 2031 scrollBar.state = SB_STATE_IDLE;
1986 /* 2032 /*
1987 * Rxvt-style scrollbar: 2033 * Rxvt-style scrollbar:
1988 * move up if mouse is above slider 2034 * move up if mouse is above slider
1989 * move dn if mouse is below slider 2035 * move dn if mouse is below slider
1990 * 2036 *
2029 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2075 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2030#endif 2076#endif
2031 if (scr_page (direction, 1)) 2077 if (scr_page (direction, 1))
2032 { 2078 {
2033 if (direction == UP) 2079 if (direction == UP)
2034 scrollBar.state = STATE_UP; 2080 scrollBar.state = SB_STATE_UP;
2035 else 2081 else
2036 scrollBar.state = STATE_DOWN; 2082 scrollBar.state = SB_STATE_DOWN;
2037 } 2083 }
2038 } 2084 }
2039 else 2085 else
2040 switch (ev.button) 2086 switch (ev.button)
2041 { 2087 {
2042 case Button2: 2088 case Button2:
2043 switch (scrollBar.align) 2089 switch (scrollBar.align)
2044 { 2090 {
2045 case R_SB_ALIGN_TOP: 2091 case SB_ALIGN_TOP:
2046 csrO = 0; 2092 csrO = 0;
2047 break; 2093 break;
2048 case R_SB_ALIGN_CENTRE: 2094 case SB_ALIGN_CENTRE:
2049 csrO = (scrollBar.bot - scrollBar.top) / 2; 2095 csrO = (scrollBar.bot - scrollBar.top) / 2;
2050 break; 2096 break;
2051 case R_SB_ALIGN_BOTTOM: 2097 case SB_ALIGN_BOTTOM:
2052 csrO = scrollBar.bot - scrollBar.top; 2098 csrO = scrollBar.bot - scrollBar.top;
2053 break; 2099 break;
2054 } 2100 }
2055 2101
2056 if (scrollBar.style == R_SB_XTERM 2102 if (scrollBar.style == SB_STYLE_XTERM
2057 || scrollbar_above_slider (ev.y) 2103 || scrollBar.above_slider (ev.y)
2058 || scrollbar_below_slider (ev.y)) 2104 || scrollBar.below_slider (ev.y))
2059 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2105 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2060 2106
2061 scrollBar.state = STATE_MOTION; 2107 scrollBar.state = SB_STATE_MOTION;
2062 break; 2108 break;
2063 2109
2064 case Button1: 2110 case Button1:
2065 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2111 if (scrollBar.align == SB_ALIGN_CENTRE)
2066 csrO = ev.y - scrollBar.top; 2112 csrO = ev.y - scrollBar.top;
2067 /* FALLTHROUGH */ 2113 /* FALLTHROUGH */
2068 2114
2069 case Button3: 2115 case Button3:
2070 if (scrollBar.style != R_SB_XTERM) 2116 if (scrollBar.style != SB_STYLE_XTERM)
2071 { 2117 {
2072 if (scrollbar_above_slider (ev.y)) 2118 if (scrollBar.above_slider (ev.y))
2073# ifdef RXVT_SCROLL_FULL 2119# ifdef RXVT_SCROLL_FULL
2074 scr_page (UP, nrow - 1); 2120 scr_page (UP, nrow - 1);
2075# else 2121# else
2076 scr_page (UP, nrow / 4); 2122 scr_page (UP, nrow / 4);
2077# endif 2123# endif
2078 else if (scrollbar_below_slider (ev.y)) 2124 else if (scrollBar.below_slider (ev.y))
2079# ifdef RXVT_SCROLL_FULL 2125# ifdef RXVT_SCROLL_FULL
2080 scr_page (DN, nrow - 1); 2126 scr_page (DN, nrow - 1);
2081# else 2127# else
2082 scr_page (DN, nrow / 4); 2128 scr_page (DN, nrow / 4);
2083# endif 2129# endif
2084 else 2130 else
2085 scrollBar.state = STATE_MOTION; 2131 scrollBar.state = SB_STATE_MOTION;
2086 } 2132 }
2087 else 2133 else
2088 { 2134 {
2089 scr_page ((ev.button == Button1 ? DN : UP), 2135 scr_page ((ev.button == Button1 ? DN : UP),
2090 (nrow 2136 (nrow
2091 * scrollbar_position (ev.y) 2137 * scrollBar.position (ev.y)
2092 / scrollBar.size ())); 2138 / scrollBar.size ()));
2093 } 2139 }
2094 2140
2095 break; 2141 break;
2096 } 2142 }
2107 2153
2108 csrO = 0; /* reset csr Offset */ 2154 csrO = 0; /* reset csr Offset */
2109 if (!bypass_keystate) 2155 if (!bypass_keystate)
2110 reportmode = !! (priv_modes & PrivMode_mouse_report); 2156 reportmode = !! (priv_modes & PrivMode_mouse_report);
2111 2157
2112 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2158 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2113 { 2159 {
2114 scrollBar.state = STATE_IDLE; 2160 scrollBar.state = SB_STATE_IDLE;
2115 scrollBar.show (0); 2161 scrollBar.show (0);
2116 } 2162 }
2117 2163
2118#ifdef SELECTION_SCROLLING 2164#ifdef SELECTION_SCROLLING
2119 sel_scroll_ev.stop(); 2165 sel_scroll_ev.stop();
2169 case Button3: 2215 case Button3:
2170 selection_make (ev.time); 2216 selection_make (ev.time);
2171 break; 2217 break;
2172 2218
2173 case Button2: 2219 case Button2:
2174 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2220 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2175 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2221 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2176 break; 2222 break;
2177 2223
2178#ifdef MOUSE_WHEEL 2224#ifdef MOUSE_WHEEL
2179 case Button4: 2225 case Button4:
2180 case Button5: 2226 case Button5:
2181 { 2227 {
2182 int i; 2228 int lines;
2183 page_dirn v; 2229 page_dirn dirn;
2184 2230
2185 v = ev.button == Button4 ? UP : DN; 2231 dirn = ev.button == Button4 ? UP : DN;
2186 2232
2187 if (ev.state & ShiftMask) 2233 if (ev.state & ShiftMask)
2188 i = 1; 2234 lines = 1;
2189 else if (option (Opt_mouseWheelScrollPage)) 2235 else if (option (Opt_mouseWheelScrollPage))
2190 i = nrow - 1; 2236 lines = nrow - 1;
2191 else 2237 else
2192 i = 5; 2238 lines = 5;
2193 2239
2194# ifdef MOUSE_SLIP_WHEELING 2240# ifdef MOUSE_SLIP_WHEELING
2195 if (ev.state & ControlMask) 2241 if (ev.state & ControlMask)
2196 { 2242 {
2197 mouse_slip_wheel_speed += v ? -1 : 1; 2243 mouse_slip_wheel_speed += dirn;
2198 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2244 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2199 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2200 2245
2201 if (!slip_wheel_ev.is_active ()) 2246 if (!slip_wheel_ev.is_active ())
2202 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2247 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2203 } 2248 }
2204 else 2249 else
2205# endif 2250# endif
2206 { 2251 {
2207 scr_page (v, i); 2252 scr_page (dirn, lines);
2208 scrollBar.show (1); 2253 scrollBar.show (1);
2209 } 2254 }
2210 } 2255 }
2211 break; 2256 break;
2212#endif 2257#endif
2214 } 2259 }
2215} 2260}
2216 2261
2217/*}}} */ 2262/*}}} */
2218 2263
2219void 2264void ecb_hot
2220rxvt_term::cmd_parse () 2265rxvt_term::cmd_parse ()
2221{ 2266{
2222 wchar_t ch = NOCHAR; 2267 wchar_t ch = NOCHAR;
2223 char *seq_begin; // remember start of esc-sequence here 2268 char *seq_begin; // remember start of esc-sequence here
2224 2269
2225 for (;;) 2270 for (;;)
2226 { 2271 {
2227 if (expect_false (ch == NOCHAR)) 2272 if (ecb_unlikely (ch == NOCHAR))
2228 { 2273 {
2229 seq_begin = cmdbuf_ptr; 2274 seq_begin = cmdbuf_ptr;
2230 ch = next_char (); 2275 ch = next_char ();
2231 2276
2232 if (ch == NOCHAR) 2277 if (ch == NOCHAR)
2233 break; 2278 break;
2234 } 2279 }
2235 2280
2236 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2281 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2237 { 2282 {
2238 if (expect_false (!seen_input)) 2283 if (ecb_unlikely (!seen_input))
2239 { 2284 {
2240 seen_input = 1; 2285 seen_input = 1;
2241 // many badly-written programs (e.g. jed) contain a race condition: 2286 // many badly-written programs (e.g. jed) contain a race condition:
2242 // they first read the screensize and then install a SIGWINCH handler. 2287 // they first read the screensize and then install a SIGWINCH handler.
2243 // some window managers resize the window early, and these programs 2288 // some window managers resize the window early, and these programs
2256 wchar_t *str = buf; 2301 wchar_t *str = buf;
2257 wchar_t *eol = str + min (ncol, UBUFSIZ); 2302 wchar_t *eol = str + min (ncol, UBUFSIZ);
2258 2303
2259 for (;;) 2304 for (;;)
2260 { 2305 {
2261 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2306 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2262 break; 2307 break;
2263 2308
2264 *str++ = ch; 2309 *str++ = ch;
2265 2310
2266 if (expect_false (ch == C0_LF || str >= eol)) 2311 if (ecb_unlikely (ch == C0_LF || str >= eol))
2267 { 2312 {
2268 if (ch == C0_LF) 2313 if (ch == C0_LF)
2269 nlines++; 2314 nlines++;
2270 2315
2271 refresh_count++; 2316 refresh_count++;
2343 } 2388 }
2344 } 2389 }
2345} 2390}
2346 2391
2347// read the next character 2392// read the next character
2348wchar_t 2393wchar_t ecb_hot
2349rxvt_term::next_char () NOTHROW 2394rxvt_term::next_char () NOTHROW
2350{ 2395{
2351 while (cmdbuf_ptr < cmdbuf_endp) 2396 while (cmdbuf_ptr < cmdbuf_endp)
2352 { 2397 {
2353 // assume 7-bit to be ascii ALWAYS 2398 // assume 7-bit to be ascii ALWAYS
2354 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2399 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2355 return *cmdbuf_ptr++; 2400 return *cmdbuf_ptr++;
2356 2401
2357 wchar_t wc; 2402 wchar_t wc;
2358 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2403 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2359 2404
2365 } 2410 }
2366 2411
2367 if (len == (size_t)-1) 2412 if (len == (size_t)-1)
2368 { 2413 {
2369 mbstate.reset (); // reset now undefined conversion state 2414 mbstate.reset (); // reset now undefined conversion state
2415 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2416 // in which case we "erroneously" return the next byte which might be valid.
2370 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2417 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2371 } 2418 }
2372 2419
2373 // assume wchar == unicode 2420 // assume wchar == unicode
2374 cmdbuf_ptr += len; 2421 cmdbuf_ptr += len;
2377 2424
2378 return NOCHAR; 2425 return NOCHAR;
2379} 2426}
2380 2427
2381// read the next octet 2428// read the next octet
2382uint32_t 2429uint32_t ecb_hot
2383rxvt_term::next_octet () NOTHROW 2430rxvt_term::next_octet () NOTHROW
2384{ 2431{
2385 return cmdbuf_ptr < cmdbuf_endp 2432 return cmdbuf_ptr < cmdbuf_endp
2386 ? (unsigned char)*cmdbuf_ptr++ 2433 ? (unsigned char)*cmdbuf_ptr++
2387 : NOCHAR; 2434 : NOCHAR;
2388} 2435}
2389 2436
2390static class out_of_input out_of_input; 2437static class out_of_input out_of_input;
2391 2438
2392wchar_t 2439wchar_t ecb_hot
2393rxvt_term::cmd_getc () THROW ((class out_of_input)) 2440rxvt_term::cmd_getc () THROW ((class out_of_input))
2394{ 2441{
2395 wchar_t c = next_char (); 2442 wchar_t c = next_char ();
2396 2443
2397 if (c == NOCHAR) 2444 if (c == NOCHAR)
2398 throw out_of_input; 2445 throw out_of_input;
2399 2446
2400 return c; 2447 return c;
2401} 2448}
2402 2449
2403uint32_t 2450uint32_t ecb_hot
2404rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2451rxvt_term::cmd_get8 () THROW ((class out_of_input))
2405{ 2452{
2406 uint32_t c = next_octet (); 2453 uint32_t c = next_octet ();
2407 2454
2408 if (c == NOCHAR) 2455 if (c == NOCHAR)
2412} 2459}
2413 2460
2414/*{{{ print pipe */ 2461/*{{{ print pipe */
2415/*----------------------------------------------------------------------*/ 2462/*----------------------------------------------------------------------*/
2416#ifdef PRINTPIPE 2463#ifdef PRINTPIPE
2417FILE * 2464FILE * ecb_cold
2418rxvt_term::popen_printer () 2465rxvt_term::popen_printer ()
2419{ 2466{
2420 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2467 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2421 2468
2422 if (stream == NULL) 2469 if (stream == NULL)
2423 rxvt_warn ("can't open printer pipe, not printing.\n"); 2470 rxvt_warn ("can't open printer pipe, not printing.\n");
2424 2471
2425 return stream; 2472 return stream;
2426} 2473}
2427 2474
2428int 2475int ecb_cold
2429rxvt_term::pclose_printer (FILE *stream) 2476rxvt_term::pclose_printer (FILE *stream)
2430{ 2477{
2431 fflush (stream); 2478 fflush (stream);
2432 return pclose (stream); 2479 return pclose (stream);
2433} 2480}
2434 2481
2435/* 2482/*
2436 * simulate attached vt100 printer 2483 * simulate attached vt100 printer
2437 */ 2484 */
2438void 2485void ecb_cold
2439rxvt_term::process_print_pipe () 2486rxvt_term::process_print_pipe ()
2440{ 2487{
2441 FILE *fd = popen_printer (); 2488 FILE *fd = popen_printer ();
2442 2489
2443 if (!fd) 2490 if (!fd)
2498 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2545 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2499 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2546 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2500}; 2547};
2501 2548
2502/*{{{ process non-printing single characters */ 2549/*{{{ process non-printing single characters */
2503void 2550void ecb_hot
2504rxvt_term::process_nonprinting (unicode_t ch) 2551rxvt_term::process_nonprinting (unicode_t ch)
2505{ 2552{
2506 switch (ch) 2553 switch (ch)
2507 { 2554 {
2508 case C0_ESC: 2555 case C0_ESC:
2554} 2601}
2555/*}}} */ 2602/*}}} */
2556 2603
2557 2604
2558/*{{{ process VT52 escape sequences */ 2605/*{{{ process VT52 escape sequences */
2559void 2606void ecb_cold
2560rxvt_term::process_escape_vt52 (unicode_t ch) 2607rxvt_term::process_escape_vt52 (unicode_t ch)
2561{ 2608{
2562 int row, col; 2609 int row, col;
2563 2610
2564 switch (ch) 2611 switch (ch)
2598 break; 2645 break;
2599 case 'Z': /* identify the terminal type */ 2646 case 'Z': /* identify the terminal type */
2600 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2647 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2601 break; 2648 break;
2602 case '<': /* turn off VT52 mode */ 2649 case '<': /* turn off VT52 mode */
2603 set_privmode (PrivMode_vt52, 0); 2650 priv_modes &= ~PrivMode_vt52;
2604 break; 2651 break;
2605 case 'F': /* use special graphics character set */ 2652 case 'F': /* use special graphics character set */
2606 case 'G': /* use regular character set */ 2653 case 'G': /* use regular character set */
2607 /* unimplemented */ 2654 /* unimplemented */
2608 break; 2655 break;
2614} 2661}
2615/*}}} */ 2662/*}}} */
2616 2663
2617 2664
2618/*{{{ process escape sequences */ 2665/*{{{ process escape sequences */
2619void 2666void ecb_hot
2620rxvt_term::process_escape_seq () 2667rxvt_term::process_escape_seq ()
2621{ 2668{
2622 unicode_t ch = cmd_getc (); 2669 unicode_t ch = cmd_getc ();
2623 2670
2624 if (priv_modes & PrivMode_vt52) 2671 if (priv_modes & PrivMode_vt52)
2627 return; 2674 return;
2628 } 2675 }
2629 2676
2630 switch (ch) 2677 switch (ch)
2631 { 2678 {
2632 /* case 1: do_tek_mode (); break; */
2633 case '#': 2679 case '#':
2634 if (cmd_getc () == '8') 2680 if (cmd_getc () == '8')
2635 scr_E (); 2681 scr_E ();
2636 break; 2682 break;
2637 case '(': 2683 case '(':
2660#if !ENABLE_MINIMAL 2706#if !ENABLE_MINIMAL
2661 case '9': 2707 case '9':
2662 scr_forwardindex (); 2708 scr_forwardindex ();
2663 break; 2709 break;
2664#endif 2710#endif
2711 // DECPAM/DECPNM
2665 case '=': 2712 case '=':
2713 priv_modes |= PrivMode_aplKP;
2714 break;
2666 case '>': 2715 case '>':
2667 set_privmode (PrivMode_aplKP, ch == '='); 2716 priv_modes &= ~PrivMode_aplKP;
2668 break; 2717 break;
2669 2718
2670 case C1_40: 2719 case C1_40:
2671 cmd_getc (); 2720 cmd_getc ();
2672 break; 2721 break;
2676 2725
2677 /* 8.3.87: NEXT LINE */ 2726 /* 8.3.87: NEXT LINE */
2678 case C1_NEL: /* ESC E */ 2727 case C1_NEL: /* ESC E */
2679 { 2728 {
2680 wchar_t nlcr[] = { C0_LF, C0_CR }; 2729 wchar_t nlcr[] = { C0_LF, C0_CR };
2681 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2730 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2682 } 2731 }
2683 break; 2732 break;
2684 2733
2685 /* kidnapped escape sequence: Should be 8.3.48 */ 2734 /* kidnapped escape sequence: Should be 8.3.48 */
2686 case C1_ESA: /* ESC G */ 2735 case C1_ESA: /* ESC G */
2698 case C1_RI: /* ESC M */ 2747 case C1_RI: /* ESC M */
2699 scr_index (DN); 2748 scr_index (DN);
2700 break; 2749 break;
2701 2750
2702 /* 8.3.142: SINGLE-SHIFT TWO */ 2751 /* 8.3.142: SINGLE-SHIFT TWO */
2703 /*case C1_SS2: scr_single_shift (2); break; */ 2752 /* case C1_SS2: break; */
2704 2753
2705 /* 8.3.143: SINGLE-SHIFT THREE */ 2754 /* 8.3.143: SINGLE-SHIFT THREE */
2706 /*case C1_SS3: scr_single_shift (3); break; */ 2755 /* case C1_SS3: break; */
2707 2756
2708 /* 8.3.27: DEVICE CONTROL STRING */ 2757 /* 8.3.27: DEVICE CONTROL STRING */
2709 case C1_DCS: /* ESC P */ 2758 case C1_DCS: /* ESC P */
2710 process_dcs_seq (); 2759 process_dcs_seq ();
2711 break; 2760 break;
2774 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2823 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2775 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2824 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2776 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2825 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2777 }; 2826 };
2778 2827
2779void 2828void ecb_hot
2780rxvt_term::process_csi_seq () 2829rxvt_term::process_csi_seq ()
2781{ 2830{
2782 unicode_t ch, priv, i; 2831 unicode_t ch, priv, prev_ch, i;
2783 unsigned int nargs, p; 2832 unsigned int nargs, p;
2784 int n, ndef; 2833 int n, ndef;
2785 int arg[ESC_ARGS] = { }; 2834 int arg[ESC_ARGS] = { };
2786 2835
2787 nargs = 0; 2836 nargs = 0;
2793 /* '<' '=' '>' '?' '!' */ 2842 /* '<' '=' '>' '?' '!' */
2794 priv = ch; 2843 priv = ch;
2795 ch = cmd_getc (); 2844 ch = cmd_getc ();
2796 } 2845 }
2797 2846
2847 prev_ch = 0;
2798 /* read any numerical arguments */ 2848 /* read any numerical arguments */
2799 for (n = -1; ch < CSI_ICH; ) 2849 for (n = -1; ch < CSI_ICH; )
2800 { 2850 {
2801 if (isdigit (ch)) 2851 if (isdigit (ch))
2802 { 2852 {
2812 n = -1; 2862 n = -1;
2813 } 2863 }
2814 else if (IS_CONTROL (ch)) 2864 else if (IS_CONTROL (ch))
2815 process_nonprinting (ch); 2865 process_nonprinting (ch);
2816 2866
2867 prev_ch = ch;
2817 ch = cmd_getc (); 2868 ch = cmd_getc ();
2818 } 2869 }
2819 2870
2820 if (ch > CSI_7F) 2871 if (ch > CSI_7F)
2821 return; 2872 return;
2862 scr_soft_reset (); 2913 scr_soft_reset ();
2863 2914
2864 static const int pm_h[] = { 7, 25 }; 2915 static const int pm_h[] = { 7, 25 };
2865 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2916 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2866 2917
2867 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2918 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2868 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2919 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2869 } 2920 }
2870 break; 2921 break;
2871 } 2922 }
2872 2923
2873 return; 2924 return;
2891 } 2942 }
2892 break; 2943 break;
2893#endif 2944#endif
2894 2945
2895 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2946 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2896 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2947 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2897 arg[0] = -arg[0]; 2948 arg[0] = -arg[0];
2898 /* FALLTHROUGH */ 2949 /* FALLTHROUGH */
2899 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2950 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2900 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2951 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2901 scr_gotorc (arg[0], 0, RELATIVE); 2952 scr_gotorc (arg[0], 0, RELATIVE);
2902 break; 2953 break;
2903 2954
2904 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2955 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2905 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2956 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
3055 scr_insert_mode (1); 3106 scr_insert_mode (1);
3056 else if (arg[0] == 20) 3107 else if (arg[0] == 20)
3057 priv_modes |= PrivMode_LFNL; 3108 priv_modes |= PrivMode_LFNL;
3058 break; 3109 break;
3059 3110
3111 case CSI_71: // DESCUSR: set cursor style
3112 if (prev_ch == ' ')
3113 set_cursor_style (arg[0]);
3114 break;
3115
3060 /* 3116 /*
3061 * PRIVATE USE beyond this point. All CSI_7? sequences here 3117 * PRIVATE USE beyond this point. All CSI_7? sequences here
3062 */ 3118 */
3063 case CSI_72: /* DECSTBM: set top and bottom margins */ 3119 case CSI_72: /* DECSTBM: set top and bottom margins */
3064 if (nargs == 1) 3120 if (nargs == 1)
3138 break; 3194 break;
3139 3195
3140 //case 9: NYI, TODO, restore maximized window or maximize window 3196 //case 9: NYI, TODO, restore maximized window or maximize window
3141 default: 3197 default:
3142 if (args[0] >= 24) /* set height (chars) */ 3198 if (args[0] >= 24) /* set height (chars) */
3143 set_widthheight ((unsigned int)width, 3199 set_widthheight ((unsigned int)vt_width,
3144 (unsigned int) (args[1] * fheight)); 3200 (unsigned int) (args[1] * fheight));
3145 break; 3201 break;
3146 3202
3147 /* 3203 /*
3148 * reports - some output format copied from XTerm 3204 * reports - some output format copied from XTerm
3197rxvt_term::get_to_st (unicode_t &ends_how) 3253rxvt_term::get_to_st (unicode_t &ends_how)
3198{ 3254{
3199 unicode_t ch; 3255 unicode_t ch;
3200 bool seen_esc = false; 3256 bool seen_esc = false;
3201 unsigned int n = 0; 3257 unsigned int n = 0;
3202 wchar_t string[STRING_MAX]; 3258 wchar_t string[CBUFSIZ];
3203 3259
3204 while ((ch = cmd_getc ()) != NOCHAR) 3260 while ((ch = cmd_getc ()) != NOCHAR)
3205 { 3261 {
3206 if (seen_esc) 3262 if (seen_esc)
3207 { 3263 {
3222 else if (ch < 0x20) 3278 else if (ch < 0x20)
3223 return NULL; /* other control character - exit */ 3279 return NULL; /* other control character - exit */
3224 3280
3225 seen_esc = false; 3281 seen_esc = false;
3226 3282
3227 if (n >= STRING_MAX - 1) 3283 if (n >= sizeof (string) - 1)
3228 // stop at some sane length 3284 // stop at some sane length
3229 return NULL; 3285 return NULL;
3230 3286
3231 string[n++] = ch; 3287 string[n++] = ch;
3232 } 3288 }
3349 &nitems, &bytes_after, &value) == Success 3405 &nitems, &bytes_after, &value) == Success
3350 && actual_type != None 3406 && actual_type != None
3351 && actual_format == 8) 3407 && actual_format == 8)
3352 str = (const char *)(value); 3408 str = (const char *)(value);
3353 3409
3354 tt_printf ("\033]%d;%s%c", op, str, resp); 3410 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3355 3411
3356 XFree (value); 3412 XFree (value);
3357 } 3413 }
3358 else 3414 else
3359 { 3415 {
3427 break; 3483 break;
3428#endif 3484#endif
3429 case URxvt_Color_border: 3485 case URxvt_Color_border:
3430 process_color_seq (op, Color_border, str, resp); 3486 process_color_seq (op, Color_border, str, resp);
3431 break; 3487 break;
3432#if ENABLE_TRANSPARENCY 3488
3489#if BG_IMAGE_FROM_ROOT
3433 case URxvt_Color_tint: 3490 case URxvt_Color_tint:
3434 process_color_seq (op, Color_tint, str, resp); 3491 process_color_seq (op, Color_tint, str, resp);
3435 { 3492 {
3436 bool changed = false; 3493 bool changed = false;
3437 3494
3438 if (ISSET_PIXCOLOR (Color_tint)) 3495 if (ISSET_PIXCOLOR (Color_tint))
3439 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3496 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3440 3497
3441 if (changed) 3498 if (changed)
3442 update_background (); 3499 update_background ();
3443 } 3500 }
3444 3501
3448#if BG_IMAGE_FROM_FILE 3505#if BG_IMAGE_FROM_FILE
3449 case Rxvt_Pixmap: 3506 case Rxvt_Pixmap:
3450 if (!strcmp (str, "?")) 3507 if (!strcmp (str, "?"))
3451 { 3508 {
3452 char str[256]; 3509 char str[256];
3510 int h_scale = fimage.h_scale;
3511 int v_scale = fimage.v_scale;
3512 int h_align = fimage.h_align;
3513 int v_align = fimage.v_align;
3453 3514
3454 sprintf (str, "[%dx%d+%d+%d]", 3515 sprintf (str, "[%dx%d+%d+%d]",
3455 min (h_scale, 32767), min (v_scale, 32767), 3516 h_scale, v_scale,
3456 min (h_align, 32767), min (v_align, 32767)); 3517 h_align, v_align);
3457 process_xterm_seq (XTerm_title, str, CHAR_ST); 3518 process_xterm_seq (XTerm_title, str, CHAR_ST);
3458 } 3519 }
3459 else 3520 else
3460 { 3521 {
3461 int changed = 0; 3522 bool changed = false;
3462 3523
3463 if (*str != ';') 3524 if (*str != ';')
3464 { 3525 {
3465 if (bg_set_file (str)) /* change pixmap */ 3526 try
3466 { 3527 {
3528 fimage.set_file_geometry (this, str);
3467 changed++; 3529 changed = true;
3468 str = strchr (str, ';');
3469 if (str == NULL)
3470 bg_set_default_geometry ();
3471 else 3530 }
3472 bg_set_geometry (str+1); 3531 catch (const class rxvt_failure_exception &e)
3532 {
3473 } 3533 }
3474 } 3534 }
3475 else 3535 else
3476 { 3536 {
3477 str++; 3537 str++;
3478 if (bg_set_geometry (str, true)) 3538 if (fimage.set_geometry (str, true))
3479 changed++; 3539 changed = true;
3480 } 3540 }
3481 3541
3482 if (changed) 3542 if (changed)
3483 { 3543 {
3484 if (bg_window_position_sensitive ()) 3544 if (bg_window_position_sensitive ())
3485 { 3545 {
3486 int x, y; 3546 int x, y;
3487 get_window_origin (x, y); 3547 get_window_origin (x, y);
3488 bg_set_position (x, y); 3548 parent_x = x;
3549 parent_y = y;
3489 } 3550 }
3490 update_background (); 3551 update_background ();
3491 } 3552 }
3492 } 3553 }
3493 break; 3554 break;
3583 * 's' = save 3644 * 's' = save
3584 * 'r' = restore 3645 * 'r' = restore
3585 * 't' = toggle 3646 * 't' = toggle
3586 * so no need for fancy checking 3647 * so no need for fancy checking
3587 */ 3648 */
3588int 3649int ecb_cold
3589rxvt_term::privcases (int mode, unsigned long bit) 3650rxvt_term::privcases (int mode, unsigned long bit)
3590{ 3651{
3591 int state; 3652 int state;
3592 3653
3593 if (mode == 's') 3654 if (mode == 's')
3594 { 3655 {
3595 SavedModes |= (priv_modes & bit); 3656 if (priv_modes & bit)
3657 SavedModes |= bit;
3658 else
3659 SavedModes &= ~bit;
3596 return -1; 3660 return -1;
3597 } 3661 }
3598 else 3662 else
3599 { 3663 {
3600 if (mode == 'r') 3664 if (mode == 'r')
3601 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3665 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3602 else 3666 else
3603 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3667 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3604 3668
3605 set_privmode (bit, state); 3669 if (state)
3670 priv_modes |= bit;
3671 else
3672 priv_modes &= ~bit;
3606 } 3673 }
3607 3674
3608 return state; 3675 return state;
3609} 3676}
3610 3677
3611/* we're not using priv _yet_ */ 3678/* we're not using priv _yet_ */
3612void 3679void
3613rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3680rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3614{ 3681{
3615 unsigned int i, j; 3682 unsigned int i, j;
3616 int state; 3683 int state;
3617 3684
3618 static const struct 3685 static const struct
3619 { 3686 {
3620 const int argval; 3687 const int argval;
3621 const unsigned long bit; 3688 const unsigned long bit;
3622 } argtopriv[] = { 3689 } argtopriv[] = {
3623 { 1, PrivMode_aplCUR }, // DECCKM 3690 { 1, PrivMode_aplCUR }, // DECCKM
3624 { 2, PrivMode_vt52 }, 3691 { 2, PrivMode_vt52 }, // DECANM
3625 { 3, PrivMode_132 }, // DECCOLM 3692 { 3, PrivMode_132 }, // DECCOLM
3626 { 4, PrivMode_smoothScroll }, // DECSCLM 3693 { 4, PrivMode_smoothScroll }, // DECSCLM
3627 { 5, PrivMode_rVideo }, // DECSCNM 3694 { 5, PrivMode_rVideo }, // DECSCNM
3628 { 6, PrivMode_relOrigin }, // DECOM 3695 { 6, PrivMode_relOrigin }, // DECOM
3629 { 7, PrivMode_Autowrap }, // DECAWM 3696 { 7, PrivMode_Autowrap }, // DECAWM
3630 // 8, auto-repeat keys // DECARM 3697 // 8, auto-repeat keys // DECARM
3631 { 9, PrivMode_MouseX10 }, 3698 { 9, PrivMode_MouseX10 },
3632 // 18 end FF to printer after print screen 3699 // 18 end FF to printer after print screen
3633 // 19 Print screen prints full screen/scroll region 3700 // 19 Print screen prints full screen/scroll region
3634 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3701 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3635#ifdef scrollBar_esc 3702#ifdef scrollBar_esc
3636 { scrollBar_esc, PrivMode_scrollBar }, 3703 { scrollBar_esc, PrivMode_scrollBar },
3637#endif 3704#endif
3638 { 35, PrivMode_ShiftKeys }, // rxvt extension 3705 { 35, PrivMode_ShiftKeys }, // rxvt extension
3639 // 38, tektronix mode // DECTEK 3706 // 38, tektronix mode // DECTEK
3640 { 40, PrivMode_132OK }, 3707 { 40, PrivMode_132OK },
3641 // 41 xterm more fixes NYI 3708 // 41 xterm more fixes NYI
3642 // 45 margin bell NYI 3709 // 45 margin bell NYI
3643 // 46 start logging 3710 // 46 start logging
3644 { 47, PrivMode_Screen }, 3711 { 47, PrivMode_Screen },
3645 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3712 { 66, PrivMode_aplKP }, // DECNKM
3646#ifndef NO_BACKSPACE_KEY 3713#ifndef NO_BACKSPACE_KEY
3647 { 67, PrivMode_BackSpace }, // DECBKM 3714 { 67, PrivMode_BackSpace }, // DECBKM
3648#endif 3715#endif
3649 { 1000, PrivMode_MouseX11 }, 3716 { 1000, PrivMode_MouseX11 },
3650 { 1002, PrivMode_MouseBtnEvent }, 3717 { 1002, PrivMode_MouseBtnEvent },
3679 for (i = 0; i < nargs; i++) 3746 for (i = 0; i < nargs; i++)
3680 { 3747 {
3681 state = -1; 3748 state = -1;
3682 3749
3683 /* basic handling */ 3750 /* basic handling */
3684 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3751 for (j = 0; j < ecb_array_length (argtopriv); j++)
3685 if (argtopriv[j].argval == arg[i]) 3752 if (argtopriv[j].argval == arg[i])
3686 { 3753 {
3687 state = privcases (mode, argtopriv[j].bit); 3754 state = privcases (mode, argtopriv[j].bit);
3688 break; 3755 break;
3689 } 3756 }
3715 case 2: /* VT52 mode */ 3782 case 2: /* VT52 mode */
3716 /* oddball mode. should be set regardless of set/reset 3783 /* oddball mode. should be set regardless of set/reset
3717 * parameter. Return from VT52 mode with an ESC < from 3784 * parameter. Return from VT52 mode with an ESC < from
3718 * within VT52 mode 3785 * within VT52 mode
3719 */ 3786 */
3720 set_privmode (PrivMode_vt52, 1); 3787 priv_modes |= PrivMode_vt52;
3721 break; 3788 break;
3722 case 3: /* 80/132 */ 3789 case 3: /* 80/132 */
3723 if (priv_modes & PrivMode_132OK) 3790 if (priv_modes & PrivMode_132OK)
3724 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3791 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3725 break; 3792 break;
3740 if (state) /* orthogonal */ 3807 if (state) /* orthogonal */
3741 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3808 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3742 break; 3809 break;
3743#ifdef scrollBar_esc 3810#ifdef scrollBar_esc
3744 case scrollBar_esc: 3811 case scrollBar_esc:
3745 if (scrollBar.map (state)) 3812 scrollBar.map (state);
3746 {
3747 resize_all_windows (0, 0, 0); 3813 resize_all_windows (0, 0, 0);
3748 scr_touch (true); 3814 scr_touch (true);
3749 }
3750 break; 3815 break;
3751#endif 3816#endif
3752 case 25: /* visible/invisible cursor */ 3817 case 25: /* visible/invisible cursor */
3753 scr_cursor_visible (state); 3818 scr_cursor_visible (state);
3754 break; 3819 break;
3809 } 3874 }
3810} 3875}
3811/*}}} */ 3876/*}}} */
3812 3877
3813/*{{{ process sgr sequences */ 3878/*{{{ process sgr sequences */
3814void 3879void ecb_hot
3815rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3880rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3816{ 3881{
3817 unsigned int i; 3882 unsigned int i;
3818 short rendset; 3883 short rendset;
3819 int rendstyle; 3884 int rendstyle;
3960 break; 4025 break;
3961#endif 4026#endif
3962 } 4027 }
3963 } 4028 }
3964} 4029}
4030
4031void
4032rxvt_term::set_cursor_style (int style)
4033{
4034 if (!IN_RANGE_INC (style, 0, 4))
4035 return;
4036
4037 set_option (Opt_cursorUnderline, style >= 3);
4038
4039#ifdef CURSOR_BLINK
4040 set_option (Opt_cursorBlink, !style || (style & 1));
4041 cursor_blink_reset ();
4042#endif
4043
4044 want_refresh = 1;
4045}
3965/*}}} */ 4046/*}}} */
3966 4047
3967/* ------------------------------------------------------------------------- */ 4048/* ---------------------------------------------------------------------- */
4049/* Write data to the pty as typed by the user, pasted with the mouse,
4050 * or generated by us in response to a query ESC sequence.
4051 */
3968 4052
3969/* 4053/*
3970 * Send printf () formatted output to the command. 4054 * Send printf () formatted output to the command.
3971 * Only use for small amounts of data. 4055 * Only use for small amounts of data.
3972 */ 4056 */
3980 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4064 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3981 va_end (arg_ptr); 4065 va_end (arg_ptr);
3982 tt_write (buf, strlen (buf)); 4066 tt_write (buf, strlen (buf));
3983} 4067}
3984 4068
3985/* ---------------------------------------------------------------------- */
3986/* Write data to the pty as typed by the user, pasted with the mouse, 4069/* Write data to the pty as typed by the user. */
3987 * or generated by us in response to a query ESC sequence. 4070void
3988 */ 4071rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3989static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4072{
4073 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4074 return;
4075
4076 if (option (Opt_scrollTtyKeypress))
4077 if (view_start)
4078 {
4079 view_start = 0;
4080 want_refresh = 1;
4081 }
4082
4083 tt_write_ (data, len);
4084}
3990 4085
3991void 4086void
3992rxvt_term::tt_write (const char *data, unsigned int len) 4087rxvt_term::tt_write (const char *data, unsigned int len)
3993{ 4088{
3994 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4089 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3995 return; 4090 return;
3996 4091
4092 tt_write_ (data, len);
4093}
4094
4095static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4096
4097void
4098rxvt_term::tt_write_ (const char *data, unsigned int len)
4099{
3997 if (pty->pty < 0) 4100 if (pty->pty < 0)
3998 return; 4101 return;
3999 4102
4000 if (v_buflen == 0) 4103 if (v_buflen == 0)
4001 { 4104 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines