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

Diff Legend

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