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.220 by root, Sat Dec 31 18:19:06 2005 UTC vs.
Revision 1.405 by ayin, Thu Feb 14 23:51:46 2008 UTC

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

Diff Legend

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