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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines