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.229 by root, Tue Jan 3 17:34:44 2006 UTC vs.
Revision 1.406 by ayin, Thu Feb 14 23:53:05 2008 UTC

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

Diff Legend

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