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

Diff Legend

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