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.232 by root, Wed Jan 4 01:10:08 2006 UTC vs.
Revision 1.405 by ayin, Thu Feb 14 23:51:46 2008 UTC

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

Diff Legend

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