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

Diff Legend

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