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.217 by root, Sat Dec 31 16:30:42 2005 UTC vs.
Revision 1.355 by ayin, Fri Sep 14 09:46:18 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
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>
… …
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-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 55# include "keyboard.h"
55#endif 56#endif
56 57
57#include <csignal> 58#include <csignal>
58 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
59/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
60 65
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 67
66#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
67 69
68#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
93 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
94 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
95 97
96 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
97 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
98 XK_ISO_Lock, 0x21eb,
99 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
100 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
101 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
102 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
103 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
141 || !IN_RANGE_EXC (y, 0, nrow)) 142 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 143 return;
143 144
144 for (;;) 145 for (;;)
145 { 146 {
146 const line_t &l = ROW(y - view_start); 147 const line_t &l = ROW(y + view_start);
147 148
148 text_t t = l.t[x]; 149 text_t t = l.t[x];
149 150
150 if (t != NOCHAR || !x) 151 if (t != NOCHAR || !x)
151 { 152 {
… …
155 } 156 }
156 157
157 x--; 158 x--;
158 } 159 }
159} 160}
160#endif
161 161
162void 162void
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
164{ 164{
165#if ENABLE_OVERLAY
166 rxvt_fontset *fs = FONTSET (r); 165 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 166 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 168 int len;
170 169
… …
189 188
190 char attr[80]; // plenty 189 char attr[80]; // plenty
191 190
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 191 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 192 (int)r,
194 GET_FGCOLOR (r), GET_BGCOLOR (r), 193 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "", 194 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "", 195 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "", 196 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 197 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 198 r & RS_Uline ? " uline" : "",
… …
226# if !UNICODE3 225# if !UNICODE3
227 if (ch >= 0x10000) 226 if (ch >= 0x10000)
228 ch = 0xfffd; 227 ch = 0xfffd;
229# endif 228# endif
230 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
231 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
232 } 233 }
233 234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
234 scr_overlay_set (0, len , attr); 240 scr_overlay_set (0, len , attr);
235 scr_overlay_set (0, len + 1, fname); 241 scr_overlay_set (0, len + 1, fname);
236 242
237 free (fname); 243 free (fname);
238 244
239# if ENABLE_COMBINING 245# if ENABLE_COMBINING
240 if (alloc) 246 if (alloc)
241 delete [] alloc; 247 delete [] alloc;
242# endif 248# endif
243#endif
244} 249}
250#endif
245 251
246void 252void
247rxvt_term::commit_iso14755 () 253rxvt_term::commit_iso14755 ()
248{ 254{
249 wchar_t ch[2]; 255 wchar_t ch[2];
… …
264 mb[0] = ch[0]; 270 mb[0] = ch[0];
265 len = 1; 271 len = 1;
266 } 272 }
267 273
268 if (len > 0) 274 if (len > 0)
269 tt_write ((unsigned char *)mb, len); 275 tt_write (mb, len);
270 else 276 else
271 scr_bell (); 277 scr_bell ();
272 } 278 }
273 279
274 iso14755buf = 0; 280 iso14755buf = 0;
… …
291 297
292 return -1; 298 return -1;
293} 299}
294#endif 300#endif
295 301
296/*{{{ Convert the keypress event into a string */
297void 302void
298rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
299{ 304{
300 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
301 unsigned int newlen; 306 unsigned int newlen;
302 KeySym keysym; 307 KeySym keysym;
303#ifdef DEBUG_CMD
304 static int debug_key = 1; /* accessible by a debugger only */
305#endif
306 int valid_keysym; 308 int valid_keysym;
307 unsigned char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
308 315
309 /* 316 /*
310 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
311 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
312 * 319 *
… …
330 Status status_return; 337 Status status_return;
331 338
332#if 0 339#if 0
333#ifdef X_HAVE_UTF8_STRING 340#ifdef X_HAVE_UTF8_STRING
334 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 341 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
335 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 342 len = Xutf8LookupString (Input_Context, &ev, kbuf,
336 KBUFSZ, &keysym, &status_return); 343 KBUFSZ, &keysym, &status_return);
337 else 344 else
338#endif 345#endif
339#endif 346#endif
340 { 347 {
… …
377 || status_return == XLookupBoth; 384 || status_return == XLookupBoth;
378 } 385 }
379 else 386 else
380#endif 387#endif
381 { 388 {
382 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 389 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
383 valid_keysym = keysym != NoSymbol; 390 valid_keysym = keysym != NoSymbol;
384 } 391 }
385 392
386 if (valid_keysym) 393 if (valid_keysym)
387 { 394 {
… …
439 scr_move_to (0, 1); 446 scr_move_to (0, 1);
440 return; 447 return;
441 } 448 }
442 else if (keysym == XK_End) 449 else if (keysym == XK_End)
443 { 450 {
444 scr_move_to (1, 0); 451 scr_move_to (1, 1);
445 return; 452 return;
446 } 453 }
447 } 454 }
448#endif 455#endif
449 } 456 }
… …
460 { 467 {
461 switch (keysym) 468 switch (keysym)
462 { 469 {
463 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
464 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
465 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
466 return; 473 return;
467#if TODO 474#if TODO
468 /* rxvt extras */ 475 /* rxvt extras */
469 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
470 change_font (FONT_UP); 477 change_font (FONT_UP);
… …
489 { 496 {
490 commit_iso14755 (); 497 commit_iso14755 ();
491 iso14755buf = ISO_14755_51; 498 iso14755buf = ISO_14755_51;
492# if ISO_14755 499# if ISO_14755
493 iso14755_51 (0); 500 iso14755_51 (0);
501# endif
502 return;
503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
494# endif 509# endif
495 return; 510 return;
496 } 511 }
497 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
498 { 513 {
… …
503# endif 518# endif
504 return; 519 return;
505 } 520 }
506 else 521 else
507 { 522 {
508# if ENABLE_OVERLAY 523# if ISO_14755
509 scr_overlay_off (); 524 scr_overlay_off ();
510# endif 525# endif
511 iso14755buf = 0; 526 iso14755buf = 0;
512 } 527 }
513 } 528 }
514 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
515 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
516 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
517 { 532 {
518 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
519# if ENABLE_OVERLAY 534# if ISO_14755
520 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
521 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
522# endif 537# endif
523 } 538 }
524#endif 539#endif
525 540
526#ifdef PRINTPIPE 541#ifdef PRINTPIPE
527 if (keysym == XK_Print) 542 if (keysym == XK_Print)
528 { 543 {
529 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
530 return; 545 return;
… …
532#endif 547#endif
533 548
534 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
535 { 550 {
536 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
537 newlen = 1; 553 newlen = 1;
538 switch (keysym) 554 switch (keysym)
539 { 555 {
540#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
541 case XK_BackSpace: 557 case XK_BackSpace:
… …
544 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
545 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
546 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
547 } 563 }
548 else 564 else
549 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
550 break; 566 break;
551#endif 567#endif
552#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
553# ifdef XK_KP_Prior 569# ifdef XK_KP_Delete
554 case XK_KP_Delete: 570 case XK_KP_Delete:
555 /* allow shift to override */ 571 /* allow shift to override */
556 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 572 if (kp)
557 { 573 {
558 strcpy (kbuf, "\033On"); 574 strcpy (kbuf, "\033On");
559 break; 575 break;
560 } 576 }
561 /* FALLTHROUGH */ 577 /* FALLTHROUGH */
562# endif 578# endif
563 case XK_Delete: 579 case XK_Delete:
564 strcpy (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
565 break; 581 break;
566#endif 582#endif
567 case XK_Tab: 583 case XK_Tab:
568 if (shft) 584 if (shft)
569 strcpy (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
… …
584#ifdef XK_KP_Left 600#ifdef XK_KP_Left
585 case XK_KP_Up: /* \033Ox or standard */ 601 case XK_KP_Up: /* \033Ox or standard */
586 case XK_KP_Down: /* \033Or or standard */ 602 case XK_KP_Down: /* \033Or or standard */
587 case XK_KP_Right: /* \033Ov or standard */ 603 case XK_KP_Right: /* \033Ov or standard */
588 case XK_KP_Left: /* \033Ot or standard */ 604 case XK_KP_Left: /* \033Ot or standard */
589 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 605 if (kp)
590 { 606 {
591 strcpy (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
592 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
593 break; 609 break;
594 } 610 }
… …
617 633
618#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
619# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
620 case XK_KP_Prior: 636 case XK_KP_Prior:
621 /* allow shift to override */ 637 /* allow shift to override */
622 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
623 { 639 {
624 strcpy (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
625 break; 641 break;
626 } 642 }
627 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
… …
630 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
631 break; 647 break;
632# ifdef XK_KP_Next 648# ifdef XK_KP_Next
633 case XK_KP_Next: 649 case XK_KP_Next:
634 /* allow shift to override */ 650 /* allow shift to override */
635 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
636 { 652 {
637 strcpy (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
638 break; 654 break;
639 } 655 }
640 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
… …
643 strcpy (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
644 break; 660 break;
645#endif 661#endif
646 case XK_KP_Enter: 662 case XK_KP_Enter:
647 /* allow shift to override */ 663 /* allow shift to override */
648 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
649 { 665 {
650 strcpy (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
651 break; 667 break;
652 } 668 }
653 669
… …
696 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
697 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
698 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
699 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
700 /* allow shift to override */ 716 /* allow shift to override */
701 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
702 { 718 {
703 strcpy (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
704 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
705 } 721 }
706 else 722 else
… …
712 728
713 case XK_Find: 729 case XK_Find:
714 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
715 break; 731 break;
716 732
717#ifdef XK_KP_End 733#ifdef XK_KP_Insert
718 case XK_KP_Insert: 734 case XK_KP_Insert:
719 /* allow shift to override */ 735 /* allow shift to override */
720 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if (kp)
721 { 737 {
722 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
723 break; 739 break;
724 } 740 }
725 /* FALLTHROUGH */ 741 /* FALLTHROUGH */
… …
738 strcpy (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
739 break; 755 break;
740#ifdef XK_KP_End 756#ifdef XK_KP_End
741 case XK_KP_End: 757 case XK_KP_End:
742 /* allow shift to override */ 758 /* allow shift to override */
743 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
744 { 760 {
745 strcpy (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
746 break; 762 break;
747 } 763 }
748 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
… …
751 strcpy (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
752 break; 768 break;
753#ifdef XK_KP_Home 769#ifdef XK_KP_Home
754 case XK_KP_Home: 770 case XK_KP_Home:
755 /* allow shift to override */ 771 /* allow shift to override */
756 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
757 { 773 {
758 strcpy (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
759 break; 775 break;
760 } 776 }
761 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
… …
851 { 867 {
852#ifdef META8_OPTION 868#ifdef META8_OPTION
853 /* set 8-bit on */ 869 /* set 8-bit on */
854 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
855 { 871 {
856 unsigned char *ch; 872 char *ch;
857 873
858 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
859 *ch |= 0x80; 875 *ch |= 0x80;
860 876
861 meta = 0; 877 meta = 0;
… …
863#endif 879#endif
864 /* nil */ ; 880 /* nil */ ;
865 } 881 }
866 } 882 }
867 883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886
868 if (len <= 0) 887 if (len <= 0)
869 return; /* not mapped */ 888 return; /* not mapped */
870 889
871 if (options & Opt_scrollTtyKeypress) 890 if (option (Opt_scrollTtyKeypress))
872 if (view_start) 891 if (view_start)
873 { 892 {
874 view_start = 0; 893 view_start = 0;
875 want_refresh = 1; 894 want_refresh = 1;
876 } 895 }
… …
894#ifdef META8_OPTION 913#ifdef META8_OPTION
895 && meta_char == C0_ESC 914 && meta_char == C0_ESC
896#endif 915#endif
897 ) 916 )
898 { 917 {
899 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
900 tt_write (&ch, 1); 919 tt_write (&ch, 1);
901 } 920 }
902 921
903#if defined(DEBUG_CMD)
904 /* Display keyboard buffer contents */
905 unsigned char *p;
906 int i;
907
908 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
909 for (i = 0, p = kbuf; i < len; i++, p++)
910 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
911 fprintf (stderr, "'\n");
912#endif /* DEBUG_CMD */
913 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
914} 923}
915/*}}} */
916 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ISO_14755
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ISO_14755
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
917#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
918/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
919/* attempt to `write' count to the input buffer */
920unsigned int 1003unsigned int
921rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
922{ 1005{
923 unsigned int n, s; 1006 unsigned int n, s;
924 1007
925 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
926 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
952void 1035void
953rxvt_term::flush () 1036rxvt_term::flush ()
954{ 1037{
955 flush_ev.stop (); 1038 flush_ev.stop ();
956 1039
957#ifdef TRANSPARENT
958 if (want_full_refresh)
959 {
960 want_full_refresh = 0;
961 scr_clear ();
962 scr_touch (false);
963 }
964#endif
965
966 if (want_refresh) 1040 if (want_refresh)
967 { 1041 {
1042 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1043 {
1044 int row = view_start;
1045 int end_row = row + nrow;
1046
1047 while (row > top_row && ROW (row - 1).is_longer ())
1048 --row;
1049
1050 do
1051 {
1052 int start_row = row;
1053 line_t *l;
1054
1055 do
1056 {
1057 l = &ROW (row++);
1058
1059 if (!(l->f & LINE_FILTERED))
1060 {
1061 // line not filtered, mark it as filtered
1062 l->f |= LINE_FILTERED;
1063 while (l->is_longer ())
1064 {
1065 l = &ROW (row++);
1066 l->f |= LINE_FILTERED;
1067 }
1068
1069 // and filter it
1070 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1071
1072 break;
1073 }
1074 }
1075 while (l->is_longer () && row < end_row);
1076 }
1077 while (row < end_row);
1078 }
1079
968 scr_refresh (refresh_type); 1080 scr_refresh ();
969 scrollbar_show (1); 1081 scrollbar_show (1);
970#ifdef USE_XIM 1082#ifdef USE_XIM
971 IMSendSpot (); 1083 IMSendSpot ();
972#endif 1084#endif
973 } 1085 }
… …
976} 1088}
977 1089
978void 1090void
979rxvt_term::check_cb (check_watcher &w) 1091rxvt_term::check_cb (check_watcher &w)
980{ 1092{
981 SET_R (this); 1093 make_current ();
982 SET_LOCALE (locale);
983 1094
984 display->flush (); 1095 display->flush ();
985 1096
986 if (want_refresh && !flush_ev.active) 1097 if (want_refresh && !flush_ev.active)
987 flush_ev.start (NOW + 0.01); 1098 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
988} 1099}
989 1100
990void 1101void
991rxvt_term::flush_cb (time_watcher &w) 1102rxvt_term::flush_cb (time_watcher &w)
992{ 1103{
993 SET_R (this); 1104 make_current ();
994 SET_LOCALE (locale);
995 1105
996 refresh_limit = 1;
997 refresh_count = 0; 1106 refresh_count = 0;
998 flush (); 1107 flush ();
999} 1108}
1000 1109
1001#ifdef CURSOR_BLINK 1110#ifdef CURSOR_BLINK
… …
1003rxvt_term::cursor_blink_cb (time_watcher &w) 1112rxvt_term::cursor_blink_cb (time_watcher &w)
1004{ 1113{
1005 hidden_cursor = !hidden_cursor; 1114 hidden_cursor = !hidden_cursor;
1006 want_refresh = 1; 1115 want_refresh = 1;
1007 1116
1008 w.start (w.at + BLINK_INTERVAL); 1117 w.start (w.at + CURSOR_BLINK_INTERVAL);
1009} 1118}
1010#endif 1119#endif
1011 1120
1012#ifdef TEXT_BLINK 1121#ifdef TEXT_BLINK
1013void 1122void
… …
1027rxvt_term::cont_scroll_cb (time_watcher &w) 1136rxvt_term::cont_scroll_cb (time_watcher &w)
1028{ 1137{
1029 if ((scrollbar_isUp() || scrollbar_isDn()) && 1138 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1030 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1139 scr_page (scrollbar_isUp() ? UP : DN, 1))
1031 { 1140 {
1032 refresh_type |= SMOOTH_REFRESH;
1033 want_refresh = 1; 1141 want_refresh = 1;
1034 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1142 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1035 } 1143 }
1036} 1144}
1037#endif 1145#endif
… …
1041rxvt_term::sel_scroll_cb (time_watcher &w) 1149rxvt_term::sel_scroll_cb (time_watcher &w)
1042{ 1150{
1043 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1151 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1044 { 1152 {
1045 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1153 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1046 refresh_type |= SMOOTH_REFRESH;
1047 want_refresh = 1; 1154 want_refresh = 1;
1048 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1155 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1049 } 1156 }
1050} 1157}
1051#endif 1158#endif
… …
1056{ 1163{
1057 if (mouse_slip_wheel_speed == 0 1164 if (mouse_slip_wheel_speed == 0
1058 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1165 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1059 : scr_page (UP, mouse_slip_wheel_speed)) 1166 : scr_page (UP, mouse_slip_wheel_speed))
1060 { 1167 {
1061 if (view_start == nsaved || 1168 if (view_start == top_row || view_start == 0)
1062 view_start == 0)
1063 mouse_slip_wheel_speed = 0; 1169 mouse_slip_wheel_speed = 0;
1064 1170
1065 refresh_type |= SMOOTH_REFRESH;
1066 want_refresh = 1; 1171 want_refresh = 1;
1067 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1172 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1068 } 1173 }
1069} 1174}
1070#endif 1175#endif
1071 1176
1177#if LINUX_YIELD_HACK
1178static struct event_handler
1179{
1180 check_watcher yield_ev;
1181
1182 void yield_cb (check_watcher &w)
1183 {
1184 // this should really be sched_yield(), but the linux guys thought
1185 // that giving a process calling sched_yield () less cpu time than
1186 // ones with high nice levels is a useful thing to do. It surely is is
1187 // allowed by the sus... as is returning ENOSYS.
1188
1189 struct timespec ts = { 0, 0 };
1190 nanosleep (&ts, 0);
1191
1192 w.stop ();
1193 }
1194
1195 event_handler ()
1196 : yield_ev (this, &event_handler::yield_cb)
1197 {
1198 }
1199} event_handler;
1200#endif
1201
1072bool 1202bool
1073rxvt_term::pty_fill () 1203rxvt_term::pty_fill ()
1074{ 1204{
1075 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1205 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1076 1206
1077 if (CBUFSIZ == n) 1207 if (CBUFSIZ == n)
1078 { 1208 {
1079 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1209 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1080 n = 0; 1210 n = 0;
1081 } 1211 }
1082 1212
1083 memmove (cmdbuf_base, cmdbuf_ptr, n); 1213 memmove (cmdbuf_base, cmdbuf_ptr, n);
1084 cmdbuf_ptr = cmdbuf_base; 1214 cmdbuf_ptr = cmdbuf_base;
1085 cmdbuf_endp = cmdbuf_ptr + n; 1215 cmdbuf_endp = cmdbuf_ptr + n;
1086 1216
1087 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1217 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1088 1218
1089 if (n > 0) 1219 if (r > 0)
1090 { 1220 {
1091 cmdbuf_endp += n; 1221 cmdbuf_endp += r;
1092 return true; 1222 return true;
1093 } 1223 }
1094 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1224 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1225 {
1226#if LINUX_YIELD_HACK
1227 if (display->is_local)
1228 event_handler.yield_ev.start ();
1229#endif
1230 }
1231 else
1095 { 1232 {
1096 pty_ev.stop (); 1233 pty_ev.stop ();
1097 1234
1098 if (!(options & Opt_hold)) 1235 if (!option (Opt_hold))
1099 destroy (); 1236 destroy ();
1100 } 1237 }
1101 1238
1102 return false; 1239 return false;
1103} 1240}
1104 1241
1105void 1242void
1106rxvt_term::pty_cb (io_watcher &w, short revents) 1243rxvt_term::pty_cb (io_watcher &w, short revents)
1107{ 1244{
1108 SET_R (this); 1245 make_current ();
1109 SET_LOCALE (locale);
1110 1246
1111 if (revents & EVENT_READ) 1247 if (revents & EVENT_READ)
1112 // loop, but don't allow a single term to monopolize us 1248 // loop, but don't allow a single term to monopolize us
1113 while (pty_fill ()) 1249 while (pty_fill ())
1114 if (cmd_parse ()) 1250 if (cmd_parse ())
… …
1119} 1255}
1120 1256
1121void 1257void
1122rxvt_term::pointer_unblank () 1258rxvt_term::pointer_unblank ()
1123{ 1259{
1124 XDefineCursor (display->display, vt, TermWin_cursor); 1260 XDefineCursor (dpy, vt, TermWin_cursor);
1125 recolour_cursor (); 1261 recolour_cursor ();
1126 1262
1127#ifdef POINTER_BLANK 1263#ifdef POINTER_BLANK
1128 hidden_pointer = 0; 1264 hidden_pointer = 0;
1129 1265
1130 if (options & Opt_pointerBlank) 1266 if (option (Opt_pointerBlank))
1131 pointer_ev.start (NOW + pointerBlankDelay); 1267 pointer_ev.start (NOW + pointerBlankDelay);
1132#endif 1268#endif
1133} 1269}
1134 1270
1135#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1136void 1272void
1137rxvt_term::pointer_blank () 1273rxvt_term::pointer_blank ()
1138{ 1274{
1139 if (! (options & Opt_pointerBlank)) 1275 if (!option (Opt_pointerBlank))
1140 return; 1276 return;
1141 1277
1142 XDefineCursor (display->display, vt, display->blank_cursor); 1278 XDefineCursor (dpy, vt, display->blank_cursor);
1143 XFlush (display->display); 1279 XFlush (dpy);
1144 1280
1145 hidden_pointer = 1; 1281 hidden_pointer = 1;
1146} 1282}
1147 1283
1148void 1284void
1149rxvt_term::pointer_cb (time_watcher &w) 1285rxvt_term::pointer_cb (time_watcher &w)
1150{ 1286{
1151 SET_R (this); 1287 make_current ();
1152 SET_LOCALE (locale);
1153 1288
1154 pointer_blank (); 1289 pointer_blank ();
1155} 1290}
1156#endif 1291#endif
1157 1292
… …
1222 (32 + button_number + key_state), 1357 (32 + button_number + key_state),
1223 (32 + x + 1), 1358 (32 + x + 1),
1224 (32 + y + 1)); 1359 (32 + y + 1));
1225} 1360}
1226 1361
1227#ifdef USING_W11LIB
1228void
1229rxvt_W11_process_x_event (XEvent *ev)
1230{
1231 rxvt_t *r = rxvt_get_r ();
1232
1233 x_cb (*ev);
1234}
1235#endif
1236
1237/*{{{ process an X event */ 1362/*{{{ process an X event */
1238void 1363void
1239rxvt_term::x_cb (XEvent &ev) 1364rxvt_term::x_cb (XEvent &ev)
1240{ 1365{
1241 dDisp; 1366 make_current ();
1242 1367
1243 SET_R (this); 1368 dLocal (Display *, dpy);
1244 SET_LOCALE (locale);
1245 1369
1246#if defined(CURSOR_BLINK) 1370 if (ev.xany.window == vt
1247 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1371 && SHOULD_INVOKE (HOOK_X_EVENT)
1248 { 1372 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1249 if (hidden_cursor) 1373 return;
1250 {
1251 hidden_cursor = 0;
1252 want_refresh = 1;
1253 }
1254 1374
1255 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1375 // for XQueryPointer
1256 }
1257#endif
1258
1259#if defined(POINTER_BLANK)
1260 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1261 {
1262 if (ev.type == MotionNotify
1263 || ev.type == ButtonPress
1264 || ev.type == ButtonRelease)
1265 if (hidden_pointer)
1266 pointer_unblank ();
1267
1268 if (ev.type == KeyPress && hidden_pointer == 0)
1269 pointer_blank ();
1270 }
1271#endif
1272
1273 Window unused_root, unused_child; 1376 Window unused_root, unused_child;
1274 int unused_root_x, unused_root_y; 1377 int unused_root_x, unused_root_y;
1275 unsigned int unused_mask; 1378 unsigned int unused_mask;
1276 1379
1277 switch (ev.type) 1380 switch (ev.type)
1278 { 1381 {
1279 case KeyPress: 1382 case KeyPress:
1280#if ISO_14755 1383 key_press (ev.xkey);
1281 if (!(iso14755buf & ISO_14755_52))
1282#endif
1283 lookup_key (ev.xkey);
1284
1285 break; 1384 break;
1286 1385
1287 case KeyRelease: 1386 case KeyRelease:
1288 { 1387 key_release (ev.xkey);
1289#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1290 KeySym ks;
1291
1292 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1293#endif
1294
1295#if ENABLE_FRILLS || ISO_14755
1296 // ISO 14755 support
1297 if (iso14755buf)
1298 if (iso14755buf & ISO_14755_52)
1299 {
1300# if ENABLE_OVERLAY
1301 scr_overlay_off ();
1302# endif
1303# if ISO_14755
1304 // iso14755 part 5.2 handling: release time
1305 // first: controls
1306 if ((ev.xkey.state & ControlMask)
1307 && ((ks >= 0x40 && ks <= 0x5f)
1308 || (ks >= 0x61 && ks <= 0x7f)))
1309 {
1310 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1311 commit_iso14755 ();
1312 return; // case-break;
1313 }
1314
1315 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1316 if (i[0] == ks)
1317 {
1318 iso14755buf = ISO_14755_51 | i[1];
1319 commit_iso14755 ();
1320 return; // case-break;
1321 }
1322
1323 scr_bell ();
1324# endif
1325 iso14755buf = 0;
1326 break;
1327 }
1328 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1329 {
1330# if ENABLE_OVERLAY
1331 scr_overlay_off ();
1332# endif
1333 if (iso14755buf & ISO_14755_51)
1334 commit_iso14755 ();
1335#if ISO_14755
1336 else if (iso14755buf & ISO_14755_STARTED)
1337 {
1338 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1339
1340 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1341 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1342 }
1343# endif
1344 else
1345 iso14755buf = 0;
1346 }
1347#endif
1348
1349#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1350 if (!(ev.xkey.state & ControlMask))
1351 slip_wheel_ev.stop ();
1352 else if (ks == XK_Control_L || ks == XK_Control_R)
1353 mouse_slip_wheel_speed = 0;
1354#endif
1355 break; 1388 break;
1356 }
1357 1389
1358 case ButtonPress: 1390 case ButtonPress:
1359 button_press (ev.xbutton); 1391 button_press (ev.xbutton);
1360 break; 1392 break;
1361 1393
… …
1363 button_release (ev.xbutton); 1395 button_release (ev.xbutton);
1364 break; 1396 break;
1365 1397
1366 case ClientMessage: 1398 case ClientMessage:
1367 if (ev.xclient.format == 32 1399 if (ev.xclient.format == 32
1368 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1400 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1369 { 1401 {
1402 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1403 {
1404 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1405 {
1370 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1406 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1407 {
1408 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1371 destroy (); 1409 destroy ();
1410 }
1372#if ENABLE_EWMH 1411#if ENABLE_EWMH
1373 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1412 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1374 XSendEvent (disp, ev.xclient.window = display->root, 1413 XSendEvent (dpy, ev.xclient.window = display->root,
1375 False, SubstructureRedirectMask | SubstructureNotifyMask, 1414 False, SubstructureRedirectMask | SubstructureNotifyMask,
1376 &ev); 1415 &ev);
1416#endif
1417 }
1418 }
1419#if ENABLE_XEMBED
1420 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1421 {
1422 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1423 focus_in ();
1424 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1425 focus_out ();
1426 }
1377#endif 1427#endif
1378 } 1428 }
1379#if ENABLE_XEMBED
1380 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1381 {
1382 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1383 focus_in ();
1384 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1385 focus_out ();
1386 }
1387#endif
1388#ifdef OFFIX_DND
1389 /* OffiX Dnd (drag 'n' drop) protocol */
1390 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1391 && (ev.xclient.data.l[0] == DndFile
1392 || ev.xclient.data.l[0] == DndDir
1393 || ev.xclient.data.l[0] == DndLink))
1394 {
1395 /* Get Dnd data */
1396 Atom ActualType;
1397 int ActualFormat;
1398 unsigned char *data;
1399 unsigned long Size, RemainingBytes;
1400
1401 XGetWindowProperty (disp, display->root,
1402 xa[XA_DNDSELECTION],
1403 0L, 1000000L,
1404 False, AnyPropertyType,
1405 &ActualType, &ActualFormat,
1406 &Size, &RemainingBytes,
1407 &data);
1408 set_string_property (XA_CUT_BUFFER0, data);
1409 XFree (data);
1410 selection_paste (display->root, XA_CUT_BUFFER0, true);
1411 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1412 }
1413#endif /* OFFIX_DND */
1414 break;
1415
1416 case MappingNotify:
1417 XRefreshKeyboardMapping (&ev.xmapping);
1418 break; 1429 break;
1419 1430
1420 /* 1431 /*
1421 * XXX: this is not the _current_ arrangement 1432 * XXX: this is not the _current_ arrangement
1422 * Here's my conclusion: 1433 * Here's my conclusion:
… …
1441 break; 1452 break;
1442 } 1453 }
1443 break; 1454 break;
1444 1455
1445 case FocusIn: 1456 case FocusIn:
1457 if (ev.xfocus.detail != NotifyInferior
1458 && ev.xfocus.detail != NotifyPointer
1459 && ev.xfocus.mode != NotifyGrab)
1446 focus_in (); 1460 focus_in ();
1447 break; 1461 break;
1448 1462
1449 case FocusOut: 1463 case FocusOut:
1464 if (ev.xfocus.detail != NotifyInferior
1465 && ev.xfocus.detail != NotifyPointer
1466 && ev.xfocus.mode != NotifyGrab)
1450 focus_out (); 1467 focus_out ();
1451 break; 1468 break;
1452 1469
1453 case ConfigureNotify: 1470 case ConfigureNotify:
1471/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1472 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1473 szHint.width, szHint.height);*/
1454 if (ev.xconfigure.window == parent[0]) 1474 if (ev.xconfigure.window == parent[0])
1455 { 1475 {
1456 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1476 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1457 ; 1477 ;
1458 1478
1459 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1479 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1460 { 1480 {
1461 seen_resize = 1; 1481 seen_resize = 1;
1462 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1482 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1463 } 1483 }
1464 1484 else
1465#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1485 {
1466 if (options & Opt_transparent) 1486#ifdef HAVE_BG_PIXMAP
1467 check_our_parents (); 1487 if (bgPixmap.window_position_sensitive ())
1488 update_background ();
1468#endif 1489#endif
1490 }
1491 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1469 } 1492 }
1470 break; 1493 break;
1471 1494
1472 case PropertyNotify: 1495 case PropertyNotify:
1496 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1473 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1497 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1474 && ev.xproperty.state == PropertyNewValue) 1498 && ev.xproperty.state == PropertyNewValue)
1475 selection_property (ev.xproperty.window, ev.xproperty.atom); 1499 selection_property (ev.xproperty.window, ev.xproperty.atom);
1476 1500
1477 break; 1501 break;
1478 1502
1479 case SelectionClear: 1503 case SelectionClear:
1480 selection_clear (); 1504 selection_clear ();
… …
1485 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1509 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1486 break; 1510 break;
1487 1511
1488 case SelectionRequest: 1512 case SelectionRequest:
1489 selection_send (ev.xselectionrequest); 1513 selection_send (ev.xselectionrequest);
1514 break;
1515
1516 case MapNotify:
1517 mapped = 1;
1518#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1520#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1490 break; 1522 break;
1491 1523
1492 case UnmapNotify: 1524 case UnmapNotify:
1493 mapped = 0; 1525 mapped = 0;
1494#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1495 text_blink_ev.stop (); 1527 text_blink_ev.stop ();
1496#endif 1528#endif
1529 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1497 break; 1530 break;
1498
1499 case MapNotify:
1500 mapped = 1;
1501#ifdef TEXT_BLINK
1502 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1503#endif
1504 break;
1505
1506#ifdef TRANSPARENT
1507 case ReparentNotify:
1508 rootwin_cb (ev);
1509 break;
1510#endif /* TRANSPARENT */
1511 1531
1512 case GraphicsExpose: 1532 case GraphicsExpose:
1513 case Expose: 1533 case Expose:
1514 if (ev.xany.window == vt) 1534 if (ev.xany.window == vt)
1515 { 1535 {
1516 do 1536 do
1517 scr_expose (ev.xexpose.x, ev.xexpose.y, 1537 scr_expose (ev.xexpose.x, ev.xexpose.y,
1518 ev.xexpose.width, ev.xexpose.height, False); 1538 ev.xexpose.width, ev.xexpose.height, False);
1519 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1520 1540
1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522 1542
1523 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1524 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1525 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, False);
1526 1546
1527 scr_refresh (refresh_type); 1547 want_refresh = 1;
1528 } 1548 }
1529 else 1549 else
1530 { 1550 {
1531 XEvent unused_event; 1551 XEvent unused_event;
1532 1552
1533 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1534 ; 1554 ;
1535 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1536 ; 1556 ;
1537 1557
1538 if (isScrollbarWindow (ev.xany.window)) 1558 if (isScrollbarWindow (ev.xany.window))
1539 { 1559 {
1540 scrollBar.setIdle (); 1560 scrollBar.setIdle ();
1541 scrollbar_show (0); 1561 scrollbar_show (0);
1542 } 1562 }
1543#ifdef MENUBAR
1544 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1545 menubar_expose ();
1546#endif
1547
1548#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == parent[0])
1550 XClearWindow (disp, ev.xany.window);
1551#endif
1552 } 1563 }
1553 break; 1564 break;
1554 1565
1555 case MotionNotify: 1566 case MotionNotify:
1556#ifdef POINTER_BLANK 1567#ifdef POINTER_BLANK
1557 if (hidden_pointer) 1568 if (hidden_pointer)
1558 pointer_unblank (); 1569 pointer_unblank ();
1559#endif 1570#endif
1560#if MENUBAR
1561 if (isMenuBarWindow (ev.xany.window))
1562 {
1563 menubar_control (ev.xbutton);
1564 break;
1565 }
1566#endif
1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1571 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1568 break; 1572 break;
1569 1573
1570 if (ev.xany.window == vt) 1574 if (ev.xany.window == vt)
1571 { 1575 {
1576 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1577 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1578 ; // nop
1572 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1579 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1573 { 1580 {
1574 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1581 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1575 ; 1582 ;
1576 1583
1577 XQueryPointer (disp, vt, 1584 XQueryPointer (dpy, vt,
1578 &unused_root, &unused_child, 1585 &unused_root, &unused_child,
1579 &unused_root_x, &unused_root_y, 1586 &unused_root_x, &unused_root_y,
1580 &ev.xbutton.x, &ev.xbutton.y, 1587 &ev.xbutton.x, &ev.xbutton.y,
1581 &ev.xbutton.state); 1588 &ev.xbutton.state);
1582#ifdef MOUSE_THRESHOLD 1589#ifdef MOUSE_THRESHOLD
… …
1646#endif 1653#endif
1647 } 1654 }
1648 } 1655 }
1649 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1650 { 1657 {
1651 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1652 MotionNotify, &ev)) 1659 MotionNotify, &ev))
1653 ; 1660 ;
1654 1661
1655 XQueryPointer (disp, scrollBar.win, 1662 XQueryPointer (dpy, scrollBar.win,
1656 &unused_root, &unused_child, 1663 &unused_root, &unused_child,
1657 &unused_root_x, &unused_root_y, 1664 &unused_root_x, &unused_root_y,
1658 &ev.xbutton.x, &ev.xbutton.y, 1665 &ev.xbutton.x, &ev.xbutton.y,
1659 &unused_mask); 1666 &unused_mask);
1660 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1661 scrollbar_size ()); 1668 scrollbar_size ());
1662 scr_refresh (refresh_type);
1663 refresh_limit = 0; 1669 want_refresh = 1;
1664 scrollbar_show (1); 1670 scrollbar_show (1);
1665 } 1671 }
1666 break; 1672 break;
1667 } 1673 }
1674
1675#if defined(CURSOR_BLINK)
1676 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1677 {
1678 if (hidden_cursor)
1679 {
1680 hidden_cursor = 0;
1681 want_refresh = 1;
1682 }
1683
1684 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1685 }
1686#endif
1687
1688#if defined(POINTER_BLANK)
1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1690 {
1691 if (ev.type == MotionNotify
1692 || ev.type == ButtonPress
1693 || ev.type == ButtonRelease)
1694 if (hidden_pointer)
1695 pointer_unblank ();
1696
1697 if (ev.type == KeyPress && hidden_pointer == 0)
1698 pointer_blank ();
1699 }
1700#endif
1668} 1701}
1669 1702
1670void 1703void
1671rxvt_term::focus_in () 1704rxvt_term::focus_in ()
1672{ 1705{
1673 if (!focus) 1706 if (!focus)
1674 { 1707 {
1675 focus = 1; 1708 focus = 1;
1676 want_refresh = 1; 1709 want_refresh = 1;
1710
1711 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1712
1677#if USE_XIM 1713#if USE_XIM
1678 if (Input_Context != NULL) 1714 if (Input_Context != NULL)
1679 { 1715 {
1680 IMSetStatusPosition (); 1716 IMSetPosition ();
1681 XSetICFocus (Input_Context); 1717 XSetICFocus (Input_Context);
1682 } 1718 }
1683#endif 1719#endif
1684#if CURSOR_BLINK 1720#if CURSOR_BLINK
1685 if (options & Opt_cursorBlink) 1721 if (option (Opt_cursorBlink))
1686 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1722 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1687#endif 1723#endif
1688#if OFF_FOCUS_FADING 1724#if OFF_FOCUS_FADING
1689 if (rs[Rs_fade]) 1725 if (rs[Rs_fade])
1690 { 1726 {
1691 pix_colors = pix_colors_focused; 1727 pix_colors = pix_colors_focused;
1692 scr_recolour (); 1728 scr_recolour ();
1693 } 1729 }
1694#endif 1730#endif
1731#if ENABLE_FRILLS
1732 if (option (Opt_urgentOnBell))
1733 {
1734 XWMHints *h;
1735
1736 h = XGetWMHints(dpy, parent[0]);
1737 if (h != NULL)
1738 {
1739 h->flags &= ~XUrgencyHint;
1740 XSetWMHints(dpy, parent[0], h);
1741 }
1742 }
1743#endif
1695 } 1744 }
1696} 1745}
1697 1746
1698void 1747void
1699rxvt_term::focus_out () 1748rxvt_term::focus_out ()
… …
1701 if (focus) 1750 if (focus)
1702 { 1751 {
1703 focus = 0; 1752 focus = 0;
1704 want_refresh = 1; 1753 want_refresh = 1;
1705 1754
1755 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1756
1706#if ENABLE_FRILLS || ISO_14755 1757#if ENABLE_FRILLS || ISO_14755
1758 if (iso14755buf)
1759 {
1707 iso14755buf = 0; 1760 iso14755buf = 0;
1708#endif 1761# if ISO_14755
1709#if ENABLE_OVERLAY
1710 scr_overlay_off (); 1762 scr_overlay_off ();
1763# endif
1764 }
1711#endif 1765#endif
1712#if USE_XIM 1766#if USE_XIM
1713 if (Input_Context != NULL) 1767 if (Input_Context != NULL)
1714 XUnsetICFocus (Input_Context); 1768 XUnsetICFocus (Input_Context);
1715#endif 1769#endif
1716#if CURSOR_BLINK 1770#if CURSOR_BLINK
1717 if (options & Opt_cursorBlink) 1771 if (option (Opt_cursorBlink))
1718 cursor_blink_ev.stop (); 1772 cursor_blink_ev.stop ();
1719 hidden_cursor = 0; 1773 hidden_cursor = 0;
1720#endif 1774#endif
1721#if OFF_FOCUS_FADING 1775#if OFF_FOCUS_FADING
1722 if (rs[Rs_fade]) 1776 if (rs[Rs_fade])
… …
1726 } 1780 }
1727#endif 1781#endif
1728 } 1782 }
1729} 1783}
1730 1784
1731#if TRANSPARENT 1785void
1786rxvt_term::update_fade_color (unsigned int idx)
1787{
1788#if OFF_FOCUS_FADING
1789 if (rs[Rs_fade])
1790 {
1791 rgba c;
1792 pix_colors [Color_fade].get (c);
1793 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1794 }
1795#endif
1796}
1797
1798#if ENABLE_TRANSPARENCY || ENABLE_PERL
1732void 1799void
1733rxvt_term::rootwin_cb (XEvent &ev) 1800rxvt_term::rootwin_cb (XEvent &ev)
1734{ 1801{
1735 SET_R (this); 1802 make_current ();
1736 SET_LOCALE (locale);
1737 1803
1804 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1805 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1806 return;
1807
1808# if ENABLE_TRANSPARENCY
1738 switch (ev.type) 1809 switch (ev.type)
1739 { 1810 {
1740 case PropertyNotify: 1811 case PropertyNotify:
1741 /* 1812 /*
1742 * if user used some Esetroot compatible prog to set the root bg, 1813 * if user used some Esetroot compatible prog to set the root bg,
1743 * use the property to determine the pixmap. We use it later on. 1814 * use the property to determine the pixmap. We use it later on.
1744 */ 1815 */
1745 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1746 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1747 return; 1818 {
1748 1819 bgPixmap.set_root_pixmap ();
1749 /* FALLTHROUGH */ 1820 update_background ();
1750 case ReparentNotify: 1821 }
1751 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1752 want_refresh = want_full_refresh = 1;
1753 break; 1822 break;
1754 } 1823 }
1824# endif
1755} 1825}
1756#endif 1826#endif
1757 1827
1758void 1828void
1759rxvt_term::button_press (XButtonEvent &ev) 1829rxvt_term::button_press (XButtonEvent &ev)
1760{ 1830{
1761 int reportmode = 0, clickintime; 1831 int reportmode = 0, clickintime;
1762 1832
1763 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1833 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1834
1764 if (!bypass_keystate) 1835 if (!bypass_keystate)
1765 reportmode = !! (priv_modes & PrivMode_mouse_report); 1836 reportmode = !! (priv_modes & PrivMode_mouse_report);
1766 1837
1767 /* 1838 /*
1768 * VT window processing of button press 1839 * VT window processing of button press
1769 */ 1840 */
1770 if (ev.window == vt) 1841 if (ev.window == vt)
1771 { 1842 {
1843 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1844 return;
1845
1772#if ISO_14755 1846#if ISO_14755
1773 // 5.4 1847 // 5.4
1774 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1848 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1775 { 1849 {
1776 iso14755_54 (ev.x, ev.y); 1850 iso14755_54 (ev.x, ev.y);
… …
1788#ifdef MOUSE_REPORT_DOUBLECLICK 1862#ifdef MOUSE_REPORT_DOUBLECLICK
1789 if (ev.button == MEvent.button && clickintime) 1863 if (ev.button == MEvent.button && clickintime)
1790 { 1864 {
1791 /* same button, within alloted time */ 1865 /* same button, within alloted time */
1792 MEvent.clicks++; 1866 MEvent.clicks++;
1867
1793 if (MEvent.clicks > 1) 1868 if (MEvent.clicks > 1)
1794 { 1869 {
1795 /* only report double clicks */ 1870 /* only report double clicks */
1796 MEvent.clicks = 2; 1871 MEvent.clicks = 2;
1797 mouse_report (ev); 1872 mouse_report (ev);
… …
1829#else 1904#else
1830 selection.rect = false; 1905 selection.rect = false;
1831#endif 1906#endif
1832 1907
1833 /* allow shift+left click to extend selection */ 1908 /* allow shift+left click to extend selection */
1834 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1909 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1835 { 1910 {
1836 if (MEvent.button == Button1 && clickintime) 1911 if (MEvent.button == Button1 && clickintime)
1837 selection_rotate (ev.x, ev.y); 1912 selection_rotate (ev.x, ev.y);
1838 else 1913 else
1839 selection_extend (ev.x, ev.y, 1); 1914 selection_extend (ev.x, ev.y, 1);
… …
2004 } 2079 }
2005 2080
2006 break; 2081 break;
2007 } 2082 }
2008 } 2083 }
2084
2009 return; 2085 return;
2010 } 2086 }
2011#if MENUBAR
2012 /*
2013 * Menubar window processing of button press
2014 */
2015 if (isMenuBarWindow (ev.window))
2016 menubar_control (ev);
2017#endif
2018} 2087}
2019 2088
2020void 2089void
2021rxvt_term::button_release (XButtonEvent &ev) 2090rxvt_term::button_release (XButtonEvent &ev)
2022{ 2091{
… …
2028 2097
2029 if (scrollbar_isUpDn ()) 2098 if (scrollbar_isUpDn ())
2030 { 2099 {
2031 scrollBar.setIdle (); 2100 scrollBar.setIdle ();
2032 scrollbar_show (0); 2101 scrollbar_show (0);
2033#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2034 refresh_type &= ~SMOOTH_REFRESH;
2035#endif
2036 } 2102 }
2037 2103
2038#ifdef SELECTION_SCROLLING 2104#ifdef SELECTION_SCROLLING
2039 if (sel_scroll_ev.active) 2105 if (sel_scroll_ev.active)
2040 sel_scroll_ev.stop(); 2106 sel_scroll_ev.stop();
2041#endif 2107#endif
2042 2108
2043 if (ev.window == vt) 2109 if (ev.window == vt)
2044 { 2110 {
2111 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2112 return;
2113
2045#if ISO_14755 2114#if ISO_14755
2046 // 5.4 2115 // 5.4
2047 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2116 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2048 return; 2117 return;
2049#endif 2118#endif
2119
2050 if (reportmode) 2120 if (reportmode)
2051 { 2121 {
2052 /* mouse report from vt window */ 2122 /* mouse report from vt window */
2053 /* don't report release of wheel "buttons" */ 2123 /* don't report release of wheel "buttons" */
2054 if (ev.button >= 4) 2124 if (ev.button >= 4)
… …
2084 { 2154 {
2085 case Button1: 2155 case Button1:
2086 case Button3: 2156 case Button3:
2087 selection_make (ev.time); 2157 selection_make (ev.time);
2088 break; 2158 break;
2159
2089 case Button2: 2160 case Button2:
2090 selection_request (ev.time, ev.x, ev.y); 2161 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2162 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2091 break; 2163 break;
2164
2092#ifdef MOUSE_WHEEL 2165#ifdef MOUSE_WHEEL
2093 case Button4: 2166 case Button4:
2094 case Button5: 2167 case Button5:
2095 { 2168 {
2096 int i; 2169 int i;
… …
2098 2171
2099 v = ev.button == Button4 ? UP : DN; 2172 v = ev.button == Button4 ? UP : DN;
2100 2173
2101 if (ev.state & ShiftMask) 2174 if (ev.state & ShiftMask)
2102 i = 1; 2175 i = 1;
2103 else if (options & Opt_mouseWheelScrollPage) 2176 else if (option (Opt_mouseWheelScrollPage))
2104 i = nrow - 1; 2177 i = nrow - 1;
2105 else 2178 else
2106 i = 5; 2179 i = 5;
2107 2180
2108# ifdef MOUSE_SLIP_WHEELING 2181# ifdef MOUSE_SLIP_WHEELING
… …
2118 slip_wheel_ev.start (); 2191 slip_wheel_ev.start ();
2119 } 2192 }
2120 else 2193 else
2121 { 2194 {
2122# endif 2195# endif
2123# ifdef JUMP_MOUSE_WHEEL
2124 scr_page (v, i); 2196 scr_page (v, i);
2125 scr_refresh (SMOOTH_REFRESH);
2126 scrollbar_show (1); 2197 scrollbar_show (1);
2127# else
2128 while (i--)
2129 {
2130 scr_page (v, 1);
2131 scr_refresh (SMOOTH_REFRESH);
2132 scrollbar_show (1);
2133 }
2134# endif
2135# ifdef MOUSE_SLIP_WHEELING 2198# ifdef MOUSE_SLIP_WHEELING
2136 } 2199 }
2137#endif 2200# endif
2138 } 2201 }
2139 break; 2202 break;
2140#endif 2203#endif
2141 } 2204 }
2142 } 2205 }
2143#ifdef MENUBAR
2144 else if (isMenuBarWindow (ev.window))
2145 menubar_control (ev);
2146#endif
2147} 2206}
2148
2149#ifdef TRANSPARENT
2150#if TINTING
2151/* taken from aterm-0.4.2 */
2152
2153typedef uint32_t RUINT32T;
2154
2155void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2156{
2157 int sh_r, sh_g, sh_b;
2158 RUINT32T mask_r, mask_g, mask_b;
2159 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2160 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2161 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2162 int i;
2163
2164 Visual *visual = display->visual;
2165
2166 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2167
2168 /* for convenience */
2169 mask_r = visual->red_mask;
2170 mask_g = visual->green_mask;
2171 mask_b = visual->blue_mask;
2172
2173 /* boring lookup table pre-initialization */
2174 switch (srcImage->bits_per_pixel) {
2175 case 15:
2176 if ((mask_r != 0x7c00) ||
2177 (mask_g != 0x03e0) ||
2178 (mask_b != 0x001f))
2179 return;
2180 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2181 lookup_r = lookup;
2182 lookup_g = lookup+32;
2183 lookup_b = lookup+32+32;
2184 sh_r = 10;
2185 sh_g = 5;
2186 sh_b = 0;
2187 break;
2188 case 16:
2189 if ((mask_r != 0xf800) ||
2190 (mask_g != 0x07e0) ||
2191 (mask_b != 0x001f))
2192 return;
2193 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2194 lookup_r = lookup;
2195 lookup_g = lookup+32;
2196 lookup_b = lookup+32+64;
2197 sh_r = 11;
2198 sh_g = 5;
2199 sh_b = 0;
2200 break;
2201 case 24:
2202 if ((mask_r != 0xff0000) ||
2203 (mask_g != 0x00ff00) ||
2204 (mask_b != 0x0000ff))
2205 return;
2206 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2207 lookup_r = lookup;
2208 lookup_g = lookup+256;
2209 lookup_b = lookup+256+256;
2210 sh_r = 16;
2211 sh_g = 8;
2212 sh_b = 0;
2213 break;
2214 case 32:
2215 if ((mask_r != 0xff0000) ||
2216 (mask_g != 0x00ff00) ||
2217 (mask_b != 0x0000ff))
2218 return;
2219 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2220 lookup_r = lookup;
2221 lookup_g = lookup+256;
2222 lookup_b = lookup+256+256;
2223 sh_r = 16;
2224 sh_g = 8;
2225 sh_b = 0;
2226 break;
2227 default:
2228 return; /* we do not support this color depth */
2229 }
2230
2231 /* prepare limits for color transformation (each channel is handled separately) */
2232 if (shade < 0) {
2233 shade = -shade;
2234 if (shade < 0) shade = 0;
2235 if (shade > 100) shade = 100;
2236
2237 lower_lim_r = 65535-rm;
2238 lower_lim_g = 65535-gm;
2239 lower_lim_b = 65535-bm;
2240
2241 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2242 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2243 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2244
2245 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2246 } else {
2247 if (shade < 0) shade = 0;
2248 if (shade > 100) shade = 100;
2249
2250 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2251
2252 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2253 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2254 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2255 }
2256
2257 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2258 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2259 {
2260 unsigned int tmp;
2261
2262 tmp = lower_lim_r;
2263 lower_lim_r = lower_lim_b;
2264 lower_lim_b = tmp;
2265
2266 tmp = upper_lim_r;
2267 upper_lim_r = upper_lim_b;
2268 upper_lim_b = tmp;
2269 }
2270
2271 /* fill our lookup tables */
2272 for (i = 0; i <= mask_r>>sh_r; i++)
2273 {
2274 RUINT32T tmp;
2275 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2276 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2277 lookup_r[i] = (tmp/65535)<<sh_r;
2278 }
2279 for (i = 0; i <= mask_g>>sh_g; i++)
2280 {
2281 RUINT32T tmp;
2282 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2283 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2284 lookup_g[i] = (tmp/65535)<<sh_g;
2285 }
2286 for (i = 0; i <= mask_b>>sh_b; i++)
2287 {
2288 RUINT32T tmp;
2289 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2290 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2291 lookup_b[i] = (tmp/65535)<<sh_b;
2292 }
2293
2294 /* apply table to input image (replacing colors by newly calculated ones) */
2295 switch (srcImage->bits_per_pixel)
2296 {
2297 case 15:
2298 {
2299 unsigned short *p1, *pf, *p, *pl;
2300 p1 = (unsigned short *) srcImage->data;
2301 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2302 while (p1 < pf)
2303 {
2304 p = p1;
2305 pl = p1 + srcImage->width;
2306 for (; p < pl; p++)
2307 {
2308 *p = lookup_r[(*p & 0x7c00)>>10] |
2309 lookup_g[(*p & 0x03e0)>> 5] |
2310 lookup_b[(*p & 0x001f)];
2311 }
2312 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2313 }
2314 break;
2315 }
2316 case 16:
2317 {
2318 unsigned short *p1, *pf, *p, *pl;
2319 p1 = (unsigned short *) srcImage->data;
2320 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2321 while (p1 < pf)
2322 {
2323 p = p1;
2324 pl = p1 + srcImage->width;
2325 for (; p < pl; p++)
2326 {
2327 *p = lookup_r[(*p & 0xf800)>>11] |
2328 lookup_g[(*p & 0x07e0)>> 5] |
2329 lookup_b[(*p & 0x001f)];
2330 }
2331 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2332 }
2333 break;
2334 }
2335 case 24:
2336 {
2337 unsigned char *p1, *pf, *p, *pl;
2338 p1 = (unsigned char *) srcImage->data;
2339 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2340 while (p1 < pf)
2341 {
2342 p = p1;
2343 pl = p1 + srcImage->width * 3;
2344 for (; p < pl; p += 3)
2345 {
2346 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2347 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2348 p[2] = lookup_r[(p[2] & 0x0000ff)];
2349 }
2350 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2351 }
2352 break;
2353 }
2354 case 32:
2355 {
2356 RUINT32T *p1, *pf, *p, *pl;
2357 p1 = (RUINT32T *) srcImage->data;
2358 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2359
2360 while (p1 < pf)
2361 {
2362 p = p1;
2363 pl = p1 + srcImage->width;
2364 for (; p < pl; p++)
2365 {
2366 *p = lookup_r[(*p & 0xff0000)>>16] |
2367 lookup_g[(*p & 0x00ff00)>> 8] |
2368 lookup_b[(*p & 0x0000ff)] |
2369 (*p & ~0xffffff);
2370 }
2371 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2372 }
2373 break;
2374 }
2375 }
2376
2377 free (lookup);
2378}
2379#endif
2380
2381/*
2382 * Check our parents are still who we think they are.
2383 * Do transparency updates if required
2384 */
2385int
2386rxvt_term::check_our_parents ()
2387{
2388 int i, pchanged, aformat, have_pixmap, rootdepth;
2389 unsigned long nitems, bytes_after;
2390 Atom atype;
2391 unsigned char *prop = NULL;
2392 Window root, oldp, *list;
2393 Pixmap rootpixmap = None;
2394 XWindowAttributes wattr, wrootattr;
2395 dDisp;
2396
2397 pchanged = 0;
2398
2399 if (!(options & Opt_transparent))
2400 return pchanged; /* Don't try any more */
2401
2402 XGetWindowAttributes (disp, display->root, &wrootattr);
2403 rootdepth = wrootattr.depth;
2404
2405 XGetWindowAttributes (disp, parent[0], &wattr);
2406
2407 if (rootdepth != wattr.depth)
2408 {
2409 if (am_transparent)
2410 {
2411 pchanged = 1;
2412 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2413 am_transparent = am_pixmap_trans = 0;
2414 }
2415
2416 return pchanged; /* Don't try any more */
2417 }
2418
2419 /* Get all X ops out of the queue so that our information is up-to-date. */
2420 XSync (disp, False);
2421
2422 /*
2423 * Make the frame window set by the window manager have
2424 * the root background. Some window managers put multiple nested frame
2425 * windows for each client, so we have to take care about that.
2426 */
2427 i = (xa[XA_XROOTPMAP_ID]
2428 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2429 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2430 &nitems, &bytes_after, &prop) == Success);
2431
2432 if (!i || prop == NULL)
2433 i = (xa[XA_ESETROOT_PMAP_ID]
2434 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2435 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2436 &nitems, &bytes_after, &prop) == Success);
2437
2438 if (!i || prop == NULL
2439#if TINTING
2440 || !rs[Rs_color + Color_tint]
2441#endif
2442 )
2443 have_pixmap = 0;
2444 else
2445 {
2446 have_pixmap = 1;
2447 rootpixmap = *(Pixmap *)prop;
2448 XFree (prop);
2449 }
2450
2451 if (have_pixmap)
2452 {
2453 /*
2454 * Copy display->root pixmap transparency
2455 */
2456 int sx, sy, nx, ny;
2457 unsigned int nw, nh;
2458 Window cr;
2459 XImage *image;
2460 GC gc;
2461 XGCValues gcvalue;
2462
2463 XTranslateCoordinates (disp, parent[0], display->root,
2464 0, 0, &sx, &sy, &cr);
2465 nw = (unsigned int)szHint.width;
2466 nh = (unsigned int)szHint.height;
2467 nx = ny = 0;
2468
2469 if (sx < 0)
2470 {
2471 nw += sx;
2472 nx = -sx;
2473 sx = 0;
2474 }
2475
2476 if (sy < 0)
2477 {
2478 nh += sy;
2479 ny = -sy;
2480 sy = 0;
2481 }
2482
2483 min_it (nw, (unsigned int) (wrootattr.width - sx));
2484 min_it (nh, (unsigned int) (wrootattr.height - sy));
2485
2486 XSync (disp, False);
2487 allowedxerror = -1;
2488 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2489
2490 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2491 /* XXX: may need a delay here? */
2492 allowedxerror = 0;
2493
2494 if (image == NULL)
2495 {
2496 if (am_transparent && am_pixmap_trans)
2497 {
2498 pchanged = 1;
2499 if (pixmap != None)
2500 {
2501 XFreePixmap (disp, pixmap);
2502 pixmap = None;
2503 }
2504 }
2505
2506 am_pixmap_trans = 0;
2507 }
2508 else
2509 {
2510 if (pixmap != None)
2511 XFreePixmap (disp, pixmap);
2512
2513#if TINTING
2514 if (ISSET_PIXCOLOR (Color_tint))
2515 {
2516 unsigned short rm, gm, bm;
2517 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2518
2519 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2520
2521 ShadeXImage (display, image, shade, rm, gm, bm);
2522 }
2523#endif
2524
2525 pixmap = XCreatePixmap (disp, vt,
2526 szHint.width, szHint.height, image->depth);
2527 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2528 XPutImage (disp, pixmap, gc, image, 0, 0,
2529 nx, ny, image->width, image->height);
2530 XFreeGC (disp, gc);
2531 XDestroyImage (image);
2532 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2533 XClearWindow (disp, parent[0]);
2534
2535 if (!am_transparent || !am_pixmap_trans)
2536 pchanged = 1;
2537
2538 am_transparent = am_pixmap_trans = 1;
2539 }
2540 }
2541
2542 if (am_pixmap_trans)
2543 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2544 else
2545 {
2546 unsigned int n;
2547 /*
2548 * InheritPixmap transparency
2549 */
2550 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2551 {
2552 oldp = parent[i];
2553 XQueryTree (disp, parent[i - 1], &root,
2554 &parent[i], &list, &n);
2555 XFree (list);
2556
2557 if (parent[i] == display->root)
2558 {
2559 if (oldp != None)
2560 pchanged = 1;
2561
2562 break;
2563 }
2564
2565 if (oldp != parent[i])
2566 pchanged = 1;
2567 }
2568
2569 n = 0;
2570
2571 if (pchanged)
2572 {
2573 for (; n < (unsigned int)i; n++)
2574 {
2575 XGetWindowAttributes (disp, parent[n], &wattr);
2576 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2577 {
2578 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2579 break;
2580 }
2581 }
2582 }
2583
2584 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2585 {
2586 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2587 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2588 am_transparent = 0;
2589 /* XXX: also turn off Opt_transparent? */
2590 }
2591 else
2592 {
2593#if WAIT_FOR_WM
2594 /* wait (an arbitrary period) for the WM to do its thing
2595 * needed for fvwm2.2.2 (and before?) */
2596 sleep (1);
2597#endif
2598 for (n = 0; n < (unsigned int)i; n++)
2599 {
2600 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2601 XClearWindow (disp, parent[n]);
2602 }
2603
2604 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2605 am_transparent = 1;
2606 }
2607
2608 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2609 parent[i] = None;
2610 }
2611
2612 if (scrollBar.win)
2613 {
2614 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2615 scrollBar.setIdle ();
2616 scrollbar_show (0);
2617 }
2618
2619 if (am_transparent)
2620 {
2621 want_refresh = want_full_refresh = 1;
2622 if (am_pixmap_trans)
2623 flush ();
2624 }
2625
2626 return pchanged;
2627}
2628#endif
2629 2207
2630/*}}} */ 2208/*}}} */
2631 2209
2632bool 2210bool
2633rxvt_term::cmd_parse () 2211rxvt_term::cmd_parse ()
2634{ 2212{
2635 bool flag = false; 2213 bool flag = false;
2636 unicode_t ch = NOCHAR; 2214 wchar_t ch = NOCHAR;
2637 unsigned char *seq_begin; // remember start of esc-sequence here 2215 char *seq_begin; // remember start of esc-sequence here
2638 2216
2639 for (;;) 2217 for (;;)
2640 { 2218 {
2641 if (ch == NOCHAR) 2219 if (ch == NOCHAR)
2642 { 2220 {
2643 seq_begin = cmdbuf_ptr; 2221 seq_begin = cmdbuf_ptr;
2644 ch = next_char (); 2222 ch = next_char ();
2645 }
2646 2223
2647 if (ch == NOCHAR) // TODO: improve 2224 if (ch == NOCHAR)
2648 break; 2225 break;
2226 }
2649 2227
2650 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2228 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2651 { 2229 {
2652 if (!seen_input) 2230 if (!seen_input)
2653 { 2231 {
… …
2662 if (seen_resize && cmd_pid) 2240 if (seen_resize && cmd_pid)
2663 kill (-cmd_pid, SIGWINCH); 2241 kill (-cmd_pid, SIGWINCH);
2664 } 2242 }
2665 2243
2666 /* Read a text string from the input buffer */ 2244 /* Read a text string from the input buffer */
2667 unicode_t buf[UBUFSIZ]; 2245 wchar_t buf[UBUFSIZ];
2668 bool refreshnow = false; 2246 bool refreshnow = false;
2669 int nlines = 0; 2247 int nlines = 0;
2670 unicode_t *str = buf; 2248 wchar_t *str = buf;
2671 unicode_t *eol = str + min (ncol, UBUFSIZ); 2249 wchar_t *eol = str + min (ncol, UBUFSIZ);
2672 2250
2673 for (;;) 2251 for (;;)
2674 { 2252 {
2675 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2253 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2676 break; 2254 break;
… …
2682 if (ch == C0_LF) 2260 if (ch == C0_LF)
2683 nlines++; 2261 nlines++;
2684 2262
2685 refresh_count++; 2263 refresh_count++;
2686 2264
2687 if (!(options & Opt_jumpScroll) 2265 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2688 || (refresh_count >= refresh_limit * (nrow - 1)))
2689 { 2266 {
2267 refresh_count = 0;
2268
2269 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2270 {
2690 refreshnow = true; 2271 refreshnow = true;
2691 ch = NOCHAR; 2272 ch = NOCHAR;
2692 break; 2273 break;
2274 }
2693 } 2275 }
2694 2276
2695 // scr_add_lines only works for nlines <= nrow - 1. 2277 // scr_add_lines only works for nlines <= nrow - 1.
2696 if (nlines >= nrow - 1) 2278 if (nlines >= nrow - 1)
2697 { 2279 {
2280 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2281 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2698 scr_add_lines (buf, nlines, str - buf); 2282 scr_add_lines (buf, str - buf, nlines);
2283
2699 nlines = 0; 2284 nlines = 0;
2700 str = buf; 2285 str = buf;
2701 eol = str + min (ncol, UBUFSIZ); 2286 eol = str + min (ncol, UBUFSIZ);
2702 } 2287 }
2703 2288
… …
2716 2301
2717 seq_begin = cmdbuf_ptr; 2302 seq_begin = cmdbuf_ptr;
2718 ch = next_char (); 2303 ch = next_char ();
2719 } 2304 }
2720 2305
2306 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2307 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2721 scr_add_lines (buf, nlines, str - buf); 2308 scr_add_lines (buf, str - buf, nlines);
2722 2309
2723 /* 2310 /*
2724 * If there have been a lot of new lines, then update the screen 2311 * If there have been a lot of new lines, then update the screen
2725 * What the heck I'll cheat and only refresh less than every page-full. 2312 * What the heck we'll cheat and only refresh less than every page-full.
2726 * the number of pages between refreshes is refresh_limit, which 2313 * if skipScroll is enabled.
2727 * is incremented here because we must be doing flat-out scrolling.
2728 */ 2314 */
2729 if (refreshnow) 2315 if (refreshnow)
2730 { 2316 {
2731 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2732 refresh_limit++;
2733 else
2734 {
2735 flag = true; 2317 flag = true;
2736 scr_refresh (refresh_type); 2318 scr_refresh ();
2737 } 2319 want_refresh = 1;
2738 } 2320 }
2739 2321
2740 } 2322 }
2741 else 2323 else
2742 { 2324 {
… …
2756 } 2338 }
2757 2339
2758 return flag; 2340 return flag;
2759} 2341}
2760 2342
2761// read the next octet
2762unicode_t
2763rxvt_term::next_octet ()
2764{
2765 return cmdbuf_ptr < cmdbuf_endp
2766 ? *cmdbuf_ptr++
2767 : NOCHAR;
2768}
2769
2770// read the next character 2343// read the next character
2771unicode_t 2344wchar_t
2772rxvt_term::next_char () 2345rxvt_term::next_char () NOTHROW
2773{ 2346{
2774 while (cmdbuf_ptr < cmdbuf_endp) 2347 while (cmdbuf_ptr < cmdbuf_endp)
2775 { 2348 {
2776 // assume 7-bit to be ascii ALWAYS 2349 // assume 7-bit to be ascii ALWAYS
2777 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2350 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2778 return *cmdbuf_ptr++; 2351 return *cmdbuf_ptr++;
2779 2352
2780 wchar_t wc; 2353 wchar_t wc;
2781 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2354 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2782 2355
2783 if (len == (size_t)-2) 2356 if (len == (size_t)-2)
2784 { 2357 {
2785 // the mbstate stores incomplete sequences. didn't know this :/ 2358 // the mbstate stores incomplete sequences. didn't know this :/
2786 cmdbuf_ptr = cmdbuf_endp; 2359 cmdbuf_ptr = cmdbuf_endp;
2787 break; 2360 break;
2788 } 2361 }
2789 2362
2790 if (len == (size_t)-1) 2363 if (len == (size_t)-1)
2791 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2364 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2792 2365
2793 // assume wchar == unicode 2366 // assume wchar == unicode
2794 cmdbuf_ptr += len; 2367 cmdbuf_ptr += len;
2795 return wc & UNICODE_MASK; 2368 return wc & UNICODE_MASK;
2796 } 2369 }
2797 2370
2798 return NOCHAR; 2371 return NOCHAR;
2799} 2372}
2373
2374// read the next octet
2375uint32_t
2376rxvt_term::next_octet () NOTHROW
2377{
2378 return cmdbuf_ptr < cmdbuf_endp
2379 ? (unsigned char)*cmdbuf_ptr++
2380 : NOCHAR;
2381}
2382
2383static class out_of_input out_of_input;
2800 2384
2801/* rxvt_cmd_getc () - Return next input character */ 2385/* rxvt_cmd_getc () - Return next input character */
2802/* 2386/*
2803 * Return the next input character after first passing any keyboard input 2387 * Return the next input character after first passing any keyboard input
2804 * to the command. 2388 * to the command.
2805 */ 2389 */
2806unicode_t 2390wchar_t
2807rxvt_term::cmd_getc () 2391rxvt_term::cmd_getc () THROW ((class out_of_input))
2808{ 2392{
2809 unicode_t c = next_char (); 2393 wchar_t c = next_char ();
2810 2394
2811 if (c == NOCHAR) 2395 if (c == NOCHAR)
2812 throw out_of_input; 2396 throw out_of_input;
2813 2397
2814 return c; 2398 return c;
2815} 2399}
2816 2400
2817unicode_t 2401uint32_t
2818rxvt_term::cmd_get8 () 2402rxvt_term::cmd_get8 () THROW ((class out_of_input))
2819{ 2403{
2820 unicode_t c = next_octet (); 2404 uint32_t c = next_octet ();
2821 2405
2822 if (c == NOCHAR) 2406 if (c == NOCHAR)
2823 throw out_of_input; 2407 throw out_of_input;
2824 2408
2825 return c; 2409 return c;
… …
2889 { 2473 {
2890 if ((buf[len++] = cmd_getc ()) == 'i') 2474 if ((buf[len++] = cmd_getc ()) == 'i')
2891 break; /* done = 1 */ 2475 break; /* done = 1 */
2892 } 2476 }
2893 } 2477 }
2894 2478
2895 for (i = 0; i < len; i++) 2479 for (i = 0; i < len; i++)
2896 if (putc (buf[i], fd) == EOF) 2480 if (putc (buf[i], fd) == EOF)
2897 { 2481 {
2898 done = 1; 2482 done = 1;
2899 break; 2483 break;
… …
2925 case C0_ESC: 2509 case C0_ESC:
2926 process_escape_seq (); 2510 process_escape_seq ();
2927 break; 2511 break;
2928 case C0_ENQ: /* terminal Status */ 2512 case C0_ENQ: /* terminal Status */
2929 if (rs[Rs_answerbackstring]) 2513 if (rs[Rs_answerbackstring])
2930 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2514 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2931 (unsigned int)strlen (rs[Rs_answerbackstring]));
2932 else 2515 else
2933 tt_write ((unsigned char *)VT100_ANS, 2516 tt_write (VT100_ANS, strlen (VT100_ANS));
2934 (unsigned int)strlen (VT100_ANS));
2935 break; 2517 break;
2936 case C0_BEL: /* bell */ 2518 case C0_BEL: /* bell */
2937 scr_bell (); 2519 scr_bell ();
2938 break; 2520 break;
2939 case C0_BS: /* backspace */ 2521 case C0_BS: /* backspace */
… …
2963 process_dcs_seq (); 2545 process_dcs_seq ();
2964 break; 2546 break;
2965 case 0x9b: /* CSI */ 2547 case 0x9b: /* CSI */
2966 process_csi_seq (); 2548 process_csi_seq ();
2967 break; 2549 break;
2968 case 0x9d: /* CSI */ 2550 case 0x9d: /* OSC */
2969 process_osc_seq (); 2551 process_osc_seq ();
2970 break; 2552 break;
2971#endif 2553#endif
2972 } 2554 }
2973} 2555}
… …
3063 scr_charset_set (2, (unsigned int)cmd_getc ()); 2645 scr_charset_set (2, (unsigned int)cmd_getc ());
3064 break; 2646 break;
3065 case '+': 2647 case '+':
3066 scr_charset_set (3, (unsigned int)cmd_getc ()); 2648 scr_charset_set (3, (unsigned int)cmd_getc ());
3067 break; 2649 break;
3068#if ENABLE_FRILLS 2650#if !ENABLE_MINIMAL
3069 case '6': 2651 case '6':
3070 scr_backindex (); 2652 scr_backindex ();
3071 break; 2653 break;
3072#endif 2654#endif
3073 case '7': 2655 case '7':
3074 scr_cursor (SAVE); 2656 scr_cursor (SAVE);
3075 break; 2657 break;
3076 case '8': 2658 case '8':
3077 scr_cursor (RESTORE); 2659 scr_cursor (RESTORE);
3078 break; 2660 break;
3079#if ENABLE_FRILLS 2661#if !ENABLE_MINIMAL
3080 case '9': 2662 case '9':
3081 scr_forwardindex (); 2663 scr_forwardindex ();
3082 break; 2664 break;
3083#endif 2665#endif
3084 case '=': 2666 case '=':
… …
3094 break; 2676 break;
3095 2677
3096 /* 8.3.87: NEXT LINE */ 2678 /* 8.3.87: NEXT LINE */
3097 case C1_NEL: /* ESC E */ 2679 case C1_NEL: /* ESC E */
3098 { 2680 {
3099 unicode_t nlcr[] = { C0_LF, C0_CR }; 2681 wchar_t nlcr[] = { C0_LF, C0_CR };
3100 scr_add_lines (nlcr, 1, 2); 2682 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3101 } 2683 }
3102 break; 2684 break;
3103 2685
3104 /* kidnapped escape sequence: Should be 8.3.48 */ 2686 /* kidnapped escape sequence: Should be 8.3.48 */
3105 case C1_ESA: /* ESC G */ 2687 case C1_ESA: /* ESC G */
… …
3127 process_dcs_seq (); 2709 process_dcs_seq ();
3128 break; 2710 break;
3129 2711
3130 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2712 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3131 case C1_SCI: /* ESC Z */ 2713 case C1_SCI: /* ESC Z */
3132 tt_write ((const unsigned char *)ESCZ_ANSWER, 2714 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3133 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3134 break; /* steal obsolete ESC [ c */ 2715 break; /* steal obsolete ESC [ c */
3135 2716
3136 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2717 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3137 case C1_CSI: /* ESC [ */ 2718 case C1_CSI: /* ESC [ */
3138 process_csi_seq (); 2719 process_csi_seq ();
… …
3200rxvt_term::process_csi_seq () 2781rxvt_term::process_csi_seq ()
3201{ 2782{
3202 unicode_t ch, priv, i; 2783 unicode_t ch, priv, i;
3203 unsigned int nargs, p; 2784 unsigned int nargs, p;
3204 int n, ndef; 2785 int n, ndef;
3205 int arg[ESC_ARGS]; 2786 int arg[ESC_ARGS] = { };
3206 2787
3207 for (nargs = ESC_ARGS; nargs > 0;) 2788 nargs = 0;
3208 arg[--nargs] = 0;
3209 2789
3210 priv = 0; 2790 priv = 0;
3211 ch = cmd_getc (); 2791 ch = cmd_getc ();
3212 if (ch >= '<' && ch <= '?') 2792 if (ch >= '<' && ch <= '?')
3213 { /* '<' '=' '>' '?' */ 2793 { /* '<' '=' '>' '?' */
… …
3247 ndef = get_byte_array_bit (csi_defaults, i); 2827 ndef = get_byte_array_bit (csi_defaults, i);
3248 for (p = 0; p < nargs; p++) 2828 for (p = 0; p < nargs; p++)
3249 if (arg[p] == -1) 2829 if (arg[p] == -1)
3250 arg[p] = ndef; 2830 arg[p] = ndef;
3251 2831
3252#ifdef DEBUG_CMD
3253 fprintf (stderr, "CSI ");
3254 for (p = 0; p < nargs; p++)
3255 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3256 fprintf (stderr, "%c\n", ch);
3257#endif
3258
3259 /* 2832 /*
3260 * private mode handling 2833 * private mode handling
3261 */ 2834 */
3262 if (priv) 2835 if (priv)
3263 { 2836 {
3264 switch (priv) 2837 switch (priv)
3265 { 2838 {
3266 case '>': 2839 case '>':
3267 if (ch == CSI_DA) /* secondary device attributes */ 2840 if (ch == CSI_DA) /* secondary device attributes */
3268 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2841 {
2842 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2843 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2844 //
2845 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2846 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2847 // that we do not support xterm mouse reporting (should be 95 when we do).
2848 //
2849 tt_printf ("\033[>%d;94;0c", 'U');
2850 }
3269 break; 2851 break;
3270 case '?': 2852 case '?':
3271 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2853 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3272 process_terminal_mode (ch, priv, nargs, arg); 2854 process_terminal_mode (ch, priv, nargs, arg);
3273 break; 2855 break;
… …
3382 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2964 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3383 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 2965 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3384 break; 2966 break;
3385 2967
3386 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2968 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3387 tt_write ((const unsigned char *)VT100_ANS, 2969 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3388 (unsigned int) (sizeof (VT100_ANS) - 1));
3389 break; 2970 break;
3390 2971
3391 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2972 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3392 process_sgr_mode (nargs, arg); 2973 process_sgr_mode (nargs, arg);
3393 break; 2974 break;
… …
3400 break; 2981 break;
3401 case 6: /* CPR requested */ 2982 case 6: /* CPR requested */
3402 scr_report_position (); 2983 scr_report_position ();
3403 break; 2984 break;
3404 case 7: /* unofficial extension */ 2985 case 7: /* unofficial extension */
3405 if (options & Opt_insecure) 2986 if (option (Opt_insecure))
3406 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2987 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3407 break; 2988 break;
3408 case 8: /* unofficial extension */ 2989 case 8: /* unofficial extension */
3409 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2990 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3410 break; 2991 break;
… …
3477 break; 3058 break;
3478 case CSI_75: 3059 case CSI_75:
3479 scr_cursor (RESTORE); 3060 scr_cursor (RESTORE);
3480 break; 3061 break;
3481 3062
3482#if ENABLE_FRILLS 3063#if !ENABLE_MINIMAL
3483 case CSI_74: 3064 case CSI_74:
3484 process_window_ops (arg, nargs); 3065 process_window_ops (arg, nargs);
3485 break; 3066 break;
3486#endif 3067#endif
3487 3068
… …
3494 break; 3075 break;
3495 } 3076 }
3496} 3077}
3497/*}}} */ 3078/*}}} */
3498 3079
3499#if ENABLE_FRILLS 3080#if !ENABLE_MINIMAL
3500/* ARGSUSED */ 3081/* ARGSUSED */
3501void 3082void
3502rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3083rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3503{ 3084{
3504 int x, y; 3085 int x, y;
3505 XWindowAttributes wattr; 3086 XWindowAttributes wattr;
3506 Window wdummy; 3087 Window wdummy;
3507 dDisp; 3088
3089 dLocal (Display *, dpy);
3508 3090
3509 if (nargs == 0) 3091 if (nargs == 0)
3510 return; 3092 return;
3511 3093
3512 switch (args[0]) 3094 switch (args[0])
3513 { 3095 {
3514 /* 3096 /*
3515 * commands 3097 * commands
3516 */ 3098 */
3517 case 1: /* deiconify window */ 3099 case 1: /* deiconify window */
3518 XMapWindow (disp, parent[0]); 3100 XMapWindow (dpy, parent[0]);
3519 break; 3101 break;
3520 case 2: /* iconify window */ 3102 case 2: /* iconify window */
3521 XIconifyWindow (disp, parent[0], display->screen); 3103 XIconifyWindow (dpy, parent[0], display->screen);
3522 break; 3104 break;
3523 case 3: /* set position (pixels) */ 3105 case 3: /* set position (pixels) */
3524 XMoveWindow (disp, parent[0], args[1], args[2]); 3106 XMoveWindow (dpy, parent[0], args[1], args[2]);
3525 break; 3107 break;
3526 case 4: /* set size (pixels) */ 3108 case 4: /* set size (pixels) */
3527 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3109 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3528 break; 3110 break;
3529 case 5: /* raise window */ 3111 case 5: /* raise window */
3530 XRaiseWindow (disp, parent[0]); 3112 XRaiseWindow (dpy, parent[0]);
3531 break; 3113 break;
3532 case 6: /* lower window */ 3114 case 6: /* lower window */
3533 XLowerWindow (disp, parent[0]); 3115 XLowerWindow (dpy, parent[0]);
3534 break; 3116 break;
3535 case 7: /* refresh window */ 3117 case 7: /* refresh window */
3536 scr_touch (true); 3118 scr_touch (true);
3537 break; 3119 break;
3538 case 8: /* set size (chars) */ 3120 case 8: /* set size (chars) */
… …
3545 if (args[0] >= 24) /* set height (chars) */ 3127 if (args[0] >= 24) /* set height (chars) */
3546 set_widthheight ((unsigned int)width, 3128 set_widthheight ((unsigned int)width,
3547 (unsigned int) (args[1] * fheight)); 3129 (unsigned int) (args[1] * fheight));
3548 break; 3130 break;
3549 3131
3550
3551 /* 3132 /*
3552 * reports - some output format copied from XTerm 3133 * reports - some output format copied from XTerm
3553 */ 3134 */
3554 case 11: /* report window state */ 3135 case 11: /* report window state */
3555 XGetWindowAttributes (disp, parent[0], &wattr); 3136 XGetWindowAttributes (dpy, parent[0], &wattr);
3556 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3137 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3557 break; 3138 break;
3558 case 13: /* report window position */ 3139 case 13: /* report window position */
3559 XGetWindowAttributes (disp, parent[0], &wattr); 3140 XGetWindowAttributes (dpy, parent[0], &wattr);
3560 XTranslateCoordinates (disp, parent[0], wattr.root, 3141 XTranslateCoordinates (dpy, parent[0], wattr.root,
3561 -wattr.border_width, -wattr.border_width, 3142 -wattr.border_width, -wattr.border_width,
3562 &x, &y, &wdummy); 3143 &x, &y, &wdummy);
3563 tt_printf ("\033[3;%d;%dt", x, y); 3144 tt_printf ("\033[3;%d;%dt", x, y);
3564 break; 3145 break;
3565 case 14: /* report window size (pixels) */ 3146 case 14: /* report window size (pixels) */
3566 XGetWindowAttributes (disp, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent[0], &wattr);
3567 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3148 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3568 break; 3149 break;
3569 case 18: /* report text area size (chars) */ 3150 case 18: /* report text area size (chars) */
3570 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3151 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3571 break; 3152 break;
… …
3573 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3154 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3574 break; 3155 break;
3575 case 20: /* report icon label */ 3156 case 20: /* report icon label */
3576 { 3157 {
3577 char *s; 3158 char *s;
3578 XGetIconName (disp, parent[0], &s); 3159 XGetIconName (dpy, parent[0], &s);
3579 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3160 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3580 XFree (s); 3161 XFree (s);
3581 } 3162 }
3582 break; 3163 break;
3583 case 21: /* report window title */ 3164 case 21: /* report window title */
3584 { 3165 {
3585 char *s; 3166 char *s;
3586 XFetchName (disp, parent[0], &s); 3167 XFetchName (dpy, parent[0], &s);
3587 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3168 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3588 XFree (s); 3169 XFree (s);
3589 } 3170 }
3590 break; 3171 break;
3591 } 3172 }
3592} 3173}
… …
3595/*----------------------------------------------------------------------*/ 3176/*----------------------------------------------------------------------*/
3596/* 3177/*
3597 * get input up until STRING TERMINATOR (or BEL) 3178 * get input up until STRING TERMINATOR (or BEL)
3598 * ends_how is terminator used. returned input must be free()'d 3179 * ends_how is terminator used. returned input must be free()'d
3599 */ 3180 */
3600unsigned char * 3181char *
3601rxvt_term::get_to_st (unicode_t &ends_how) 3182rxvt_term::get_to_st (unicode_t &ends_how)
3602{ 3183{
3603 unicode_t ch; 3184 unicode_t ch;
3604 bool seen_esc = false; 3185 bool seen_esc = false;
3605 unsigned int n = 0; 3186 unsigned int n = 0;
… …
3619 seen_esc = true; 3200 seen_esc = true;
3620 continue; 3201 continue;
3621 } 3202 }
3622 else if (ch == C0_BEL || ch == CHAR_ST) 3203 else if (ch == C0_BEL || ch == CHAR_ST)
3623 break; 3204 break;
3205 else if (ch == C0_SYN)
3206 ch = cmd_get8 ();
3624 else if (ch < 0x20) 3207 else if (ch < 0x20)
3625 return NULL; /* other control character - exit */ 3208 return NULL; /* other control character - exit */
3626 3209
3627 seen_esc = false; 3210 seen_esc = false;
3628 3211
3629 if (n >= STRING_MAX - 1) 3212 if (n >= STRING_MAX - 1)
3630 // stop at some sane length 3213 // stop at some sane length
3631 return NULL; 3214 return NULL;
3632 3215
3633 if (ch == C0_SYN)
3634 string[n++] = cmd_get8 ();
3635 else
3636 string[n++] = ch; 3216 string[n++] = ch;
3637 } 3217 }
3638 3218
3639 string[n++] = '\0'; 3219 string[n++] = '\0';
3640 3220
3641 ends_how = (ch == 0x5c ? C0_ESC : ch); 3221 ends_how = (ch == 0x5c ? C0_ESC : ch);
3642 3222
3643 return (unsigned char *)rxvt_wcstombs (string); 3223 return rxvt_wcstombs (string);
3644} 3224}
3645 3225
3646/*----------------------------------------------------------------------*/ 3226/*----------------------------------------------------------------------*/
3647/* 3227/*
3648 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3228 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3649 */ 3229 */
3650void 3230void
3651rxvt_term::process_dcs_seq () 3231rxvt_term::process_dcs_seq ()
3652{ 3232{
3653 unsigned char *s; 3233 char *s;
3654 unicode_t eh; 3234 unicode_t eh;
3655 3235
3656 /* 3236 /*
3657 * Not handled yet 3237 * Not handled yet
3658 */ 3238 */
… …
3677 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3257 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3678 arg = arg * 10 + (ch - '0'); 3258 arg = arg * 10 + (ch - '0');
3679 3259
3680 if (ch == ';') 3260 if (ch == ';')
3681 { 3261 {
3682 unsigned char *s = get_to_st (eh); 3262 char *s = get_to_st (eh);
3683 3263
3684 if (s) 3264 if (s)
3685 { 3265 {
3686 process_xterm_seq (arg, (char *)s, eh); 3266 process_xterm_seq (arg, s, eh);
3687 free (s); 3267 free (s);
3688 } 3268 }
3689 } 3269 }
3690} 3270}
3691 3271
3692void 3272void
3693rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3273rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3694{ 3274{
3695 if (str[0] == '?' && !str[1]) 3275 if (str[0] == '?' && !str[1])
3696 { 3276 {
3697 unsigned short r, g, b; 3277 rgba c;
3698 pix_colors_focused[color].get (display, r, g, b); 3278 pix_colors_focused[color].get (c);
3279
3280#if XFT
3281 if (c.a != rgba::MAX_CC)
3282 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3283 else
3284#endif
3699 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3285 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3700 } 3286 }
3701 else 3287 else
3702 set_window_color (color, str); 3288 set_window_color (color, str);
3703} 3289}
3704 3290
3705/* 3291/*
3706 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3292 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3707 */ 3293 */
3708void 3294void
3709rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3295rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3710{ 3296{
3711 int changed = 0;
3712 int color; 3297 int color;
3713 char *buf, *name; 3298 char *buf, *name;
3714 bool query = str[0] == '?' && !str[1]; 3299 bool query = str[0] == '?' && !str[1];
3715 int saveop = op; 3300 int saveop = op;
3716 dDisp; 3301
3302 dLocal (Display *, dpy);
3717 3303
3718 assert (str != NULL); 3304 assert (str != NULL);
3305
3306 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3307 return;
3308
3719 switch (op) 3309 switch (op)
3720 { 3310 {
3721 case XTerm_name: 3311 case XTerm_name:
3722 set_title (str); 3312 set_title (str);
3723 /* FALLTHROUGH */ 3313 /* FALLTHROUGH */
… …
3737 unsigned long bytes_after; 3327 unsigned long bytes_after;
3738 unsigned char *value = 0; 3328 unsigned char *value = 0;
3739 const char *str = ""; 3329 const char *str = "";
3740 3330
3741 if (prop 3331 if (prop
3742 && XGetWindowProperty (disp, parent[0], 3332 && XGetWindowProperty (dpy, parent[0],
3743 prop, 0, 1<<16, 0, AnyPropertyType, 3333 prop, 0, 1<<16, 0, AnyPropertyType,
3744 &actual_type, &actual_format, 3334 &actual_type, &actual_format,
3745 &nitems, &bytes_after, &value) == Success 3335 &nitems, &bytes_after, &value) == Success
3746 && actual_type != None 3336 && actual_type != None
3747 && actual_format == 8) 3337 && actual_format == 8)
3748 str = (const char *)(value); 3338 str = (const char *)(value);
3749 3339
3750 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3340 tt_printf ("\033]%d;%s%c", op, str, resp);
3751 3341
3752 XFree (value); 3342 XFree (value);
3753 } 3343 }
3754 else 3344 else
3755 { 3345 {
… …
3759 { 3349 {
3760 *eq = 0; 3350 *eq = 0;
3761 set_utf8_property (display->atom (str), eq + 1); 3351 set_utf8_property (display->atom (str), eq + 1);
3762 } 3352 }
3763 else 3353 else
3764 XDeleteProperty (disp, parent[0], 3354 XDeleteProperty (dpy, parent[0],
3765 display->atom (str)); 3355 display->atom (str));
3766 } 3356 }
3767 break; 3357 break;
3768 3358
3769 case XTerm_Color: 3359 case XTerm_Color:
… …
3771 { 3361 {
3772 if ((name = strchr (buf, ';')) == NULL) 3362 if ((name = strchr (buf, ';')) == NULL)
3773 break; 3363 break;
3774 3364
3775 *name++ = '\0'; 3365 *name++ = '\0';
3776 color = atoi (buf); 3366 color = atoi (buf) + minCOLOR;
3777 3367
3778 if (color < 0 || color >= TOTAL_COLORS) 3368 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3779 break; 3369 break;
3780 3370
3781 if ((buf = strchr (name, ';')) != NULL) 3371 if ((buf = strchr (name, ';')) != NULL)
3782 *buf++ = '\0'; 3372 *buf++ = '\0';
3783 3373
3784 if (name[0] == '?' && !name[1]) 3374 process_color_seq (op, color, name, resp);
3785 {
3786 unsigned short r, g, b;
3787 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3788 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3789 }
3790 else
3791 set_window_color (color + minCOLOR, name);
3792 } 3375 }
3793 break; 3376 break;
3794 case XTerm_Color00: 3377 case XTerm_Color00:
3795 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3378 process_color_seq (op, Color_fg, str, resp);
3796 break; 3379 break;
3797 case XTerm_Color01: 3380 case XTerm_Color01:
3798 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3381 process_color_seq (op, Color_bg, str, resp);
3799 break; 3382 break;
3800#ifndef NO_CURSORCOLOR 3383#ifndef NO_CURSORCOLOR
3801 case XTerm_Color_cursor: 3384 case XTerm_Color_cursor:
3802 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3385 process_color_seq (op, Color_cursor, str, resp);
3803 break; 3386 break;
3804#endif 3387#endif
3805 case XTerm_Color_pointer_fg: 3388 case XTerm_Color_pointer_fg:
3806 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3389 process_color_seq (op, Color_pointer_fg, str, resp);
3807 break; 3390 break;
3808 case XTerm_Color_pointer_bg: 3391 case XTerm_Color_pointer_bg:
3809 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3392 process_color_seq (op, Color_pointer_bg, str, resp);
3810 break; 3393 break;
3811#ifndef NO_BOLD_UNDERLINE_REVERSE 3394#ifndef NO_BOLD_UNDERLINE_REVERSE
3812 case XTerm_Color_BD:
3813 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3814 break;
3815 case XTerm_Color_UL:
3816 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3817 break;
3818 case XTerm_Color_RV: 3395 case XTerm_Color_RV:
3819 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3396 process_color_seq (op, Color_RV, str, resp);
3397 break;
3398 case Rxvt_Color_BD:
3399 case URxvt_Color_BD:
3400 process_color_seq (op, Color_BD, str, resp);
3401 break;
3402 case Rxvt_Color_UL:
3403 case URxvt_Color_UL:
3404 process_color_seq (op, Color_UL, str, resp);
3820 break; 3405 break;
3821 case URxvt_Color_IT: 3406 case URxvt_Color_IT:
3822 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3407 process_color_seq (op, Color_IT, str, resp);
3823 break; 3408 break;
3824#endif 3409#endif
3825#if TRANSPARENT && TINTING 3410#if ENABLE_TRANSPARENCY
3826 case URxvt_Color_tint: 3411 case URxvt_Color_tint:
3827 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3412 process_color_seq (op, Color_tint, str, resp);
3828 check_our_parents (); 3413 {
3829 if (am_transparent) 3414 bool changed = false;
3830 want_full_refresh = want_refresh = 1; 3415 if (ISSET_PIXCOLOR (Color_tint))
3831 break; 3416 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3832#endif 3417 else
3418 changed = bgPixmap.unset_tint ();
3419 if (changed)
3420 update_background ();
3421 }
3833 3422
3423 break;
3424#endif
3425
3426#if BG_IMAGE_FROM_FILE
3834 case XTerm_Pixmap: 3427 case Rxvt_Pixmap:
3835 if (*str != ';') 3428 if (!strcmp (str, "?"))
3836 { 3429 {
3837#if XPM_BACKGROUND 3430 char str[256];
3838 scale_pixmap (""); /* reset to default scaling */ 3431
3839 set_bgPixmap (str); /* change pixmap */ 3432 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3840#endif 3433 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3841 scr_touch (true); 3434 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3435 process_xterm_seq (XTerm_title, str, CHAR_ST);
3842 } 3436 }
3843 while ((str = strchr (str, ';')) != NULL) 3437 else
3844 { 3438 {
3439 int changed = 0;
3440
3441 if (*str != ';')
3442 {
3443 /* reset to default scaling :*/
3444 bgPixmap.unset_geometry ();
3445 if (bgPixmap.set_file (str)) /* change pixmap */
3446 changed++;
3447 str = strchr (str, ';');
3448 if (str == NULL)
3449 bgPixmap.set_defaultGeometry ();
3450 }
3451 while (str)
3452 {
3845 str++; 3453 str++;
3846#if XPM_BACKGROUND 3454 if (bgPixmap.set_geometry (str))
3847 changed += scale_pixmap (str); 3455 changed++;
3848#endif 3456 str = strchr (str, ';');
3457 }
3458 if (changed)
3459 update_background ();
3849 } 3460 }
3850
3851 if (changed)
3852 {
3853#ifdef XPM_BACKGROUND
3854 resize_pixmap ();
3855#endif
3856 scr_touch (true);
3857 }
3858 break; 3461 break;
3462#endif
3859 3463
3860 case XTerm_restoreFG: 3464 case Rxvt_restoreFG:
3861 set_window_color (Color_fg, str); 3465 set_window_color (Color_fg, str);
3862 break; 3466 break;
3863 case XTerm_restoreBG: 3467 case Rxvt_restoreBG:
3864 set_window_color (Color_bg, str); 3468 set_window_color (Color_bg, str);
3865 break; 3469 break;
3866 3470
3867 case XTerm_logfile: 3471 case XTerm_logfile:
3868 // TODO, when secure mode? 3472 // TODO, when secure mode?
3869 break; 3473 break;
3870 3474
3871#ifdef MENUBAR
3872 case URxvt_Menu:
3873 if (options & Opt_insecure)
3874 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3875 break;
3876#endif
3877#if 0 3475#if 0
3878 case XTerm_dumpscreen: /* no error notices */ 3476 case Rxvt_dumpscreen: /* no error notices */
3879 { 3477 {
3880 int fd; 3478 int fd;
3881 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3479 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3882 { 3480 {
3883 scr_dump (fd); 3481 scr_dump (fd);
… …
3894 case URxvt_italicFont: 3492 case URxvt_italicFont:
3895 case URxvt_boldItalicFont: 3493 case URxvt_boldItalicFont:
3896#endif 3494#endif
3897 if (query) 3495 if (query)
3898 tt_printf ("\33]%d;%-.250s%c", saveop, 3496 tt_printf ("\33]%d;%-.250s%c", saveop,
3899 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3497 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3900 ? fontset[op - URxvt_font]->fontdesc : "", 3498 ? fontset[op - URxvt_font]->fontdesc : "",
3901 resp); 3499 resp);
3902 else 3500 else
3903 { 3501 {
3904 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3502 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3907 allocated.push_back ((void *)res); 3505 allocated.push_back ((void *)res);
3908 set_fonts (); 3506 set_fonts ();
3909 } 3507 }
3910 break; 3508 break;
3911 3509
3912#if ENABLE_FRILLS 3510 case URxvt_version:
3511 if (query)
3512 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3513 op,
3514 rs[Rs_name], VERSION[0], VERSION[2],
3515 resp);
3516 break;
3517
3518#if !ENABLE_MINIMAL
3913 case URxvt_locale: 3519 case URxvt_locale:
3914 if (query) 3520 if (query)
3915 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3521 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3916 else 3522 else
3917 { 3523 {
3918 set_locale (str); 3524 set_locale (str);
3919 pty.set_utf8_mode (enc_utf8); 3525 pty->set_utf8_mode (enc_utf8);
3920 init_xlocale (); 3526 init_xlocale ();
3921 } 3527 }
3922 break; 3528 break;
3923 3529
3924 case URxvt_view_up: 3530 case URxvt_view_up:
3925 case URxvt_view_down: 3531 case URxvt_view_down:
3532 {
3926 int lines = atoi (str); 3533 int lines = atoi (str);
3927 3534
3928 if (lines) 3535 if (lines)
3929 scr_page (op == URxvt_view_up ? UP : DN, lines); 3536 scr_page (op == URxvt_view_up ? UP : DN, lines);
3930 else 3537 else
3931 {
3932 scr_erase_savelines (); 3538 scr_erase_savelines ();
3933 } 3539 }
3934 3540
3541 break;
3542#endif
3543
3544#if ENABLE_PERL
3545 case URxvt_perl:
3546 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3547 ; // no responses yet
3935 break; 3548 break;
3936#endif 3549#endif
3937 } 3550 }
3938} 3551}
3939/*----------------------------------------------------------------------*/ 3552/*----------------------------------------------------------------------*/
… …
3970 return state; 3583 return state;
3971} 3584}
3972 3585
3973/* we're not using priv _yet_ */ 3586/* we're not using priv _yet_ */
3974void 3587void
3975rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3588rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3976{ 3589{
3977 unsigned int i, j; 3590 unsigned int i, j;
3978 int state; 3591 int state;
3979 3592
3980 static const struct 3593 static const struct
3981 { 3594 {
3982 const int argval; 3595 const int argval;
3983 const unsigned long bit; 3596 const unsigned long bit;
3984 }
3985
3986 argtopriv[] = { 3597 } argtopriv[] = {
3987 { 1, PrivMode_aplCUR }, 3598 { 1, PrivMode_aplCUR },
3988 { 2, PrivMode_vt52 }, 3599 { 2, PrivMode_vt52 },
3989 { 3, PrivMode_132 }, 3600 { 3, PrivMode_132 },
3990 { 4, PrivMode_smoothScroll }, 3601 { 4, PrivMode_smoothScroll },
3991 { 5, PrivMode_rVideo }, 3602 { 5, PrivMode_rVideo },
3992 { 6, PrivMode_relOrigin }, 3603 { 6, PrivMode_relOrigin },
3993 { 7, PrivMode_Autowrap }, 3604 { 7, PrivMode_Autowrap },
3994 // 8, bi-directional support mode 3605 // 8, bi-directional support mode
3995 { 9, PrivMode_MouseX10 }, 3606 { 9, PrivMode_MouseX10 },
3996#ifdef menuBar_esc
3997 { menuBar_esc, PrivMode_menuBar },
3998#endif
3999 // 18, 19 printing-related 3607 // 18, 19 printing-related
4000 { 25, PrivMode_VisibleCursor }, 3608 { 25, PrivMode_VisibleCursor },
4001#ifdef scrollBar_esc 3609#ifdef scrollBar_esc
4002 { scrollBar_esc, PrivMode_scrollBar }, 3610 { scrollBar_esc, PrivMode_scrollBar },
4003#endif 3611#endif
… …
4048 } 3656 }
4049 3657
4050 /* extra handling for values with state unkept */ 3658 /* extra handling for values with state unkept */
4051 switch (arg[i]) 3659 switch (arg[i])
4052 { 3660 {
3661#if ENABLE_STYLES
3662 case 1021:
3663 set_option (Opt_intensityStyles, mode);
3664
3665 scr_touch (true);
3666 break;
3667#endif
4053 case 1048: /* alternative cursor save */ 3668 case 1048: /* alternative cursor save */
4054 case 1049: 3669 case 1049:
4055 if (options & Opt_secondaryScreen) 3670 if (option (Opt_secondaryScreen))
4056 if (mode == 0) 3671 if (mode == 0)
4057 scr_cursor (RESTORE); 3672 scr_cursor (RESTORE);
4058 else if (mode == 1) 3673 else if (mode == 1)
4059 scr_cursor (SAVE); 3674 scr_cursor (SAVE);
4060 break; 3675 break;
… …
4075 case 3: /* 80/132 */ 3690 case 3: /* 80/132 */
4076 if (priv_modes & PrivMode_132OK) 3691 if (priv_modes & PrivMode_132OK)
4077 set_widthheight (((state ? 132 : 80) * fwidth), height); 3692 set_widthheight (((state ? 132 : 80) * fwidth), height);
4078 break; 3693 break;
4079 case 4: /* smooth scrolling */ 3694 case 4: /* smooth scrolling */
4080 if (state)
4081 options &= ~Opt_jumpScroll;
4082 else
4083 options |= Opt_jumpScroll; 3695 set_option (Opt_jumpScroll, !state);
4084 break; 3696 break;
4085 case 5: /* reverse video */ 3697 case 5: /* reverse video */
4086 scr_rvideo_mode (state); 3698 scr_rvideo_mode (state);
4087 break; 3699 break;
4088 case 6: /* relative/absolute origins */ 3700 case 6: /* relative/absolute origins */
… …
4094 /* case 8: - auto repeat, can't do on a per window basis */ 3706 /* case 8: - auto repeat, can't do on a per window basis */
4095 case 9: /* X10 mouse reporting */ 3707 case 9: /* X10 mouse reporting */
4096 if (state) /* orthogonal */ 3708 if (state) /* orthogonal */
4097 priv_modes &= ~PrivMode_MouseX11; 3709 priv_modes &= ~PrivMode_MouseX11;
4098 break; 3710 break;
4099#ifdef menuBar_esc
4100 case menuBar_esc:
4101#ifdef MENUBAR
4102 map_menuBar (state);
4103#endif
4104 break;
4105#endif
4106#ifdef scrollBar_esc 3711#ifdef scrollBar_esc
4107 case scrollBar_esc: 3712 case scrollBar_esc:
4108 if (scrollbar_mapping (state)) 3713 if (scrollbar_mapping (state))
4109 { 3714 {
4110 resize_all_windows (0, 0, 0); 3715 resize_all_windows (0, 0, 0);
… …
4129#if 0 3734#if 0
4130 case 1001: 3735 case 1001:
4131 break; /* X11 mouse highlighting */ 3736 break; /* X11 mouse highlighting */
4132#endif 3737#endif
4133 case 1010: /* scroll to bottom on TTY output inhibit */ 3738 case 1010: /* scroll to bottom on TTY output inhibit */
4134 if (state)
4135 options &= ~Opt_scrollTtyOutput;
4136 else
4137 options |= Opt_scrollTtyOutput; 3739 set_option (Opt_scrollTtyOutput, !state);
4138 break; 3740 break;
4139 case 1011: /* scroll to bottom on key press */ 3741 case 1011: /* scroll to bottom on key press */
4140 if (state)
4141 options |= Opt_scrollTtyKeypress; 3742 set_option (Opt_scrollTtyKeypress, state);
4142 else
4143 options &= ~Opt_scrollTtyKeypress;
4144 break; 3743 break;
4145 case 1047: /* secondary screen w/ clearing last */ 3744 case 1047: /* secondary screen w/ clearing last */
4146 if (options & Opt_secondaryScreen) 3745 if (option (Opt_secondaryScreen))
4147 if (current_screen != PRIMARY) 3746 if (current_screen != PRIMARY)
4148 scr_erase_screen (2); 3747 scr_erase_screen (2);
4149 scr_change_screen (state); 3748 scr_change_screen (state);
4150 break; 3749 break;
4151 case 1049: /* secondary screen w/ clearing first */ 3750 case 1049: /* secondary screen w/ clearing first */
4152 scr_change_screen (state); 3751 scr_change_screen (state);
4153 if (options & Opt_secondaryScreen) 3752 if (option (Opt_secondaryScreen))
4154 if (current_screen != PRIMARY) 3753 if (current_screen != PRIMARY)
4155 scr_erase_screen (2); 3754 scr_erase_screen (2);
4156 break; 3755 break;
4157 default: 3756 default:
4158 break; 3757 break;
… …
4286 scr_color (Color_bg, Color_bg); 3885 scr_color (Color_bg, Color_bg);
4287 break; 3886 break;
4288 3887
4289 //case 50: // not variable spacing 3888 //case 50: // not variable spacing
4290 3889
4291#ifndef NO_BRIGHTCOLOR 3890#if !ENABLE_MINIMAL
4292 case 90: 3891 case 90:
4293 case 91: /* set bright fg color */ 3892 case 91: /* set bright fg color */
4294 case 92: 3893 case 92:
4295 case 93: 3894 case 93:
4296 case 94: 3895 case 94:
… …
4308 case 106: 3907 case 106:
4309 case 107: 3908 case 107:
4310 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3909 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4311 break; 3910 break;
4312#endif 3911#endif
4313
4314 } 3912 }
4315 } 3913 }
4316} 3914}
4317/*}}} */ 3915/*}}} */
4318 3916
… …
4342 */ 3940 */
4343void 3941void
4344rxvt_term::tt_printf (const char *fmt,...) 3942rxvt_term::tt_printf (const char *fmt,...)
4345{ 3943{
4346 va_list arg_ptr; 3944 va_list arg_ptr;
4347 unsigned char buf[256]; 3945 char buf[256];
4348 3946
4349 va_start (arg_ptr, fmt); 3947 va_start (arg_ptr, fmt);
4350 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3948 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4351 va_end (arg_ptr); 3949 va_end (arg_ptr);
4352 tt_write (buf, strlen (buf)); 3950 tt_write (buf, strlen (buf));
… …
4357 * or generated by us in response to a query ESC sequence. 3955 * or generated by us in response to a query ESC sequence.
4358 */ 3956 */
4359const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3957const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4360 3958
4361void 3959void
4362rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3960rxvt_term::tt_write (const char *data, unsigned int len)
4363{ 3961{
3962 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3963 return;
3964
3965 if (pty->pty < 0)
3966 return;
3967
4364 if (v_buflen == 0) 3968 if (v_buflen == 0)
4365 { 3969 {
4366 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3970 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4367 3971
4368 if ((unsigned int)written == len) 3972 if ((unsigned int)written == len)
4369 return; 3973 return;
4370 3974
4371 data += written; 3975 data += written;
4372 len -= written; 3976 len -= written;
4373 } 3977 }
4374 3978
4375 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 3979 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4376 3980
4377 memcpy (v_buffer + v_buflen, data, len); 3981 memcpy (v_buffer + v_buflen, data, len);
4378 v_buflen += len; 3982 v_buflen += len;
4379 3983
4380 pty_ev.set (EVENT_READ | EVENT_WRITE); 3984 pty_ev.set (EVENT_READ | EVENT_WRITE);
4381} 3985}
4382 3986
4383void rxvt_term::pty_write () 3987void rxvt_term::pty_write ()
4384{ 3988{
4385 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3989 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4386 3990
4387 if (written > 0) 3991 if (written > 0)
4388 { 3992 {
4389 v_buflen -= written; 3993 v_buflen -= written;
4390 3994
4391 if (v_buflen == 0) 3995 if (v_buflen == 0)
4392 { 3996 {
4393 free (v_buffer); 3997 free (v_buffer);
4394 v_buffer = 0; 3998 v_buffer = 0;
4395 v_buflen = 0;
4396 3999
4397 pty_ev.set (EVENT_READ); 4000 pty_ev.set (EVENT_READ);
4398 return; 4001 return;
4399 } 4002 }
4400 4003

Diff Legend

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