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.234 by root, Wed Jan 4 04:42:45 2006 UTC vs.
Revision 1.409 by ayin, Sat Feb 16 15:39:20 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
… …
276 } 279 }
277 280
278 iso14755buf = 0; 281 iso14755buf = 0;
279} 282}
280 283
281int 284static int
282rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
283{ 286{
284 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
285 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
286 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
287 { 290 {
… …
295 298
296 return -1; 299 return -1;
297} 300}
298#endif 301#endif
299 302
300/*{{{ Convert the keypress event into a string */ 303static inline KeySym
304translate_keypad (KeySym keysym, bool kp)
305{
306#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin
322 };
323
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
325 {
326 unsigned int index = keysym - XK_KP_Home;
327 keysym = kp ? keypadtrans[index] : XK_Home + index;
328 }
329 else if (keysym == XK_KP_Insert)
330 keysym = kp ? XK_KP_0 : XK_Insert;
331# ifndef NO_DELETE_KEY
332 else if (keysym == XK_KP_Delete)
333 keysym = kp ? XK_KP_Decimal : XK_Delete;
334# endif
335#endif
336 return keysym;
337}
338
339static inline int
340map_function_key (KeySym keysym)
341{
342 int param = 0;
343
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
345 {
346 param = 11 + keysym - XK_F1;
347 if (keysym >= XK_F17)
348 param += 4;
349 else if (keysym >= XK_F15)
350 param += 3;
351 else if (keysym >= XK_F11)
352 param += 2;
353 else if (keysym >= XK_F6)
354 param += 1;
355 }
356 else
357 switch (keysym)
358 {
359 case XK_Find:
360 param = 1;
361 break;
362 case XK_Insert:
363 param = 2;
364 break;
365#ifdef DXK_Remove
366 case DXK_Remove:
367#endif
368 case XK_Execute:
369 param = 3;
370 break;
371 case XK_Select:
372 param = 4;
373 break;
374#ifndef UNSHIFTED_SCROLLKEYS
375 case XK_Prior:
376 param = 5;
377 break;
378 case XK_Next:
379 param = 6;
380 break;
381#endif
382 case XK_Help:
383 param = 28;
384 break;
385 case XK_Menu:
386 param = 29;
387 break;
388 }
389 return param;
390}
391
301void 392void
302rxvt_term::lookup_key (XKeyEvent &ev) 393rxvt_term::key_press (XKeyEvent &ev)
303{ 394{
304 int ctrl, meta, shft, len; 395 int ctrl, meta, shft, len;
305 unsigned int newlen;
306 KeySym keysym; 396 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 397 int valid_keysym;
311 char kbuf[KBUFSZ]; 398 char kbuf[KBUFSZ];
399
400#if ISO_14755
401 if (iso14755buf & ISO_14755_52)
402 return;
403#endif
312 404
313 /* 405 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 406 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 407 * escape sequence to toggle the Keypad.
316 * 408 *
… …
443 scr_move_to (0, 1); 535 scr_move_to (0, 1);
444 return; 536 return;
445 } 537 }
446 else if (keysym == XK_End) 538 else if (keysym == XK_End)
447 { 539 {
448 scr_move_to (1, 0); 540 scr_move_to (1, 1);
449 return; 541 return;
450 } 542 }
451 } 543 }
452#endif 544#endif
453 } 545 }
… …
464 { 556 {
465 switch (keysym) 557 switch (keysym)
466 { 558 {
467 /* normal XTerm key bindings */ 559 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 560 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 561 selection_request (ev.time);
470 return; 562 return;
471#if TODO 563#if TODO
472 /* rxvt extras */ 564 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 565 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 566 change_font (FONT_UP);
… …
493 { 585 {
494 commit_iso14755 (); 586 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 587 iso14755buf = ISO_14755_51;
496# if ISO_14755 588# if ISO_14755
497 iso14755_51 (0); 589 iso14755_51 (0);
590# endif
591 return;
592 }
593 else if (keysym == XK_BackSpace)
594 {
595 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
596# if ISO_14755
597 iso14755_51 (iso14755buf & ISO_14755_MASK);
498# endif 598# endif
499 return; 599 return;
500 } 600 }
501 else if ((hv = hex_keyval (ev)) >= 0) 601 else if ((hv = hex_keyval (ev)) >= 0)
502 { 602 {
… …
507# endif 607# endif
508 return; 608 return;
509 } 609 }
510 else 610 else
511 { 611 {
512# if ENABLE_OVERLAY 612# if ISO_14755
513 scr_overlay_off (); 613 scr_overlay_off ();
514# endif 614# endif
515 iso14755buf = 0; 615 iso14755buf = 0;
516 } 616 }
517 } 617 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 618 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 619 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 620 if (!(iso14755buf & ISO_14755_STARTED))
521 { 621 {
522 iso14755buf |= ISO_14755_STARTED; 622 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 623# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 624 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 625 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 626# endif
527 } 627 }
528#endif 628#endif
529 629
530#ifdef PRINTPIPE 630#ifdef PRINTPIPE
531 if (keysym == XK_Print) 631 if (keysym == XK_Print)
532 { 632 {
533 scr_printscreen (ctrl | shft); 633 scr_printscreen (ctrl | shft);
534 return; 634 return;
535 } 635 }
536#endif 636#endif
537 637
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 638 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 { 639 {
540 { 640 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
541 newlen = 1; 641 unsigned int newlen = 1;
542 switch (keysym) 642
643 switch (translate_keypad (keysym, kp))
543 { 644 {
544#ifndef NO_BACKSPACE_KEY 645#ifndef NO_BACKSPACE_KEY
545 case XK_BackSpace: 646 case XK_BackSpace:
546 if (priv_modes & PrivMode_HaveBackSpace) 647 if (priv_modes & PrivMode_HaveBackSpace)
547 { 648 {
548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 649 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
549 ^ !!ctrl) ? '\b' : '\177'; 650 ^ !!ctrl) ? '\b' : '\177';
550 kbuf[1] = '\0'; 651 kbuf[1] = '\0';
551 } 652 }
552 else 653 else
553 strcpy (kbuf, key_backspace); 654 strcpy (kbuf, rs[Rs_backspace_key]);
554 break; 655 break;
555#endif 656#endif
556#ifndef NO_DELETE_KEY 657#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: 658 case XK_Delete:
568 strcpy (kbuf, key_delete); 659 strcpy (kbuf, rs[Rs_delete_key]);
569 break; 660 break;
570#endif 661#endif
571 case XK_Tab: 662 case XK_Tab:
572 if (shft) 663 if (shft)
573 strcpy (kbuf, "\033[Z"); 664 strcpy (kbuf, "\033[Z");
… …
583#endif 674#endif
584 newlen = 0; 675 newlen = 0;
585 } 676 }
586 break; 677 break;
587 678
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" */ 679 case XK_Up: /* "\033[A" */
605 case XK_Down: /* "\033[B" */ 680 case XK_Down: /* "\033[B" */
606 case XK_Right: /* "\033[C" */ 681 case XK_Right: /* "\033[C" */
607 case XK_Left: /* "\033[D" */ 682 case XK_Left: /* "\033[D" */
608 strcpy (kbuf, "\033[Z"); 683 strcpy (kbuf, "\033[Z");
… …
617 } 692 }
618 else if (priv_modes & PrivMode_aplCUR) 693 else if (priv_modes & PrivMode_aplCUR)
619 kbuf[1] = 'O'; 694 kbuf[1] = 'O';
620 break; 695 break;
621 696
622#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:
634 strcpy (kbuf, "\033[5~");
635 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:
647 strcpy (kbuf, "\033[6~");
648 break;
649#endif
650 case XK_KP_Enter: 697 case XK_KP_Enter:
651 /* allow shift to override */ 698 /* allow shift to override */
652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 699 if (kp)
653 { 700 {
654 strcpy (kbuf, "\033OM"); 701 strcpy (kbuf, "\033OM");
655 break; 702 break;
656 } 703 }
657 704
… …
669 kbuf[0] = '\015'; 716 kbuf[0] = '\015';
670 kbuf[1] = '\0'; 717 kbuf[1] = '\0';
671 } 718 }
672 break; 719 break;
673 720
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" */ 721 case XK_KP_F1: /* "\033OP" */
681 case XK_KP_F2: /* "\033OQ" */ 722 case XK_KP_F2: /* "\033OQ" */
682 case XK_KP_F3: /* "\033OR" */ 723 case XK_KP_F3: /* "\033OR" */
683 case XK_KP_F4: /* "\033OS" */ 724 case XK_KP_F4: /* "\033OS" */
684 strcpy (kbuf, "\033OP"); 725 strcpy (kbuf, "\033OP");
… …
700 case XK_KP_6: /* "\033Ov" : "6" */ 741 case XK_KP_6: /* "\033Ov" : "6" */
701 case XK_KP_7: /* "\033Ow" : "7" */ 742 case XK_KP_7: /* "\033Ow" : "7" */
702 case XK_KP_8: /* "\033Ox" : "8" */ 743 case XK_KP_8: /* "\033Ox" : "8" */
703 case XK_KP_9: /* "\033Oy" : "9" */ 744 case XK_KP_9: /* "\033Oy" : "9" */
704 /* allow shift to override */ 745 /* allow shift to override */
705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 746 if (kp)
706 { 747 {
707 strcpy (kbuf, "\033Oj"); 748 strcpy (kbuf, "\033Oj");
708 kbuf[2] += (keysym - XK_KP_Multiply); 749 kbuf[2] += (keysym - XK_KP_Multiply);
709 } 750 }
710 else 751 else
… …
712 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 753 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
713 kbuf[1] = '\0'; 754 kbuf[1] = '\0';
714 } 755 }
715 break; 756 break;
716 757
717 case XK_Find:
718 strcpy (kbuf, "\033[1~");
719 break;
720
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:
732 strcpy (kbuf, "\033[2~");
733 break;
734#ifdef DXK_Remove /* support for DEC remove like key */
735 case DXK_Remove:
736 /* FALLTHROUGH */
737#endif
738 case XK_Execute:
739 strcpy (kbuf, "\033[3~");
740 break;
741 case XK_Select:
742 strcpy (kbuf, "\033[4~");
743 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: 758 case XK_End:
755 strcpy (kbuf, KS_END); 759 strcpy (kbuf, KS_END);
756 break; 760 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: 761 case XK_Home:
768 strcpy (kbuf, KS_HOME); 762 strcpy (kbuf, KS_HOME);
769 break; 763 break;
770 764
771#define FKEY(n, fkey) \
772 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
773
774 case XK_F1: /* "\033[11~" */
775 case XK_F2: /* "\033[12~" */
776 case XK_F3: /* "\033[13~" */
777 case XK_F4: /* "\033[14~" */
778 case XK_F5: /* "\033[15~" */
779 FKEY (11, XK_F1);
780 break;
781 case XK_F6: /* "\033[17~" */
782 case XK_F7: /* "\033[18~" */
783 case XK_F8: /* "\033[19~" */
784 case XK_F9: /* "\033[20~" */
785 case XK_F10: /* "\033[21~" */
786 FKEY (17, XK_F6);
787 break;
788 case XK_F11: /* "\033[23~" */
789 case XK_F12: /* "\033[24~" */
790 case XK_F13: /* "\033[25~" */
791 case XK_F14: /* "\033[26~" */
792 FKEY (23, XK_F11);
793 break;
794 case XK_F15: /* "\033[28~" */
795 case XK_F16: /* "\033[29~" */
796 FKEY (28, XK_F15);
797 break;
798 case XK_Help: /* "\033[28~" */
799 FKEY (28, XK_Help);
800 break;
801 case XK_Menu: /* "\033[29~" */
802 FKEY (29, XK_Menu);
803 break;
804 case XK_F17: /* "\033[31~" */
805 case XK_F18: /* "\033[32~" */
806 case XK_F19: /* "\033[33~" */
807 case XK_F20: /* "\033[34~" */
808 case XK_F21: /* "\033[35~" */
809 case XK_F22: /* "\033[36~" */
810 case XK_F23: /* "\033[37~" */
811 case XK_F24: /* "\033[38~" */
812 case XK_F25: /* "\033[39~" */
813 case XK_F26: /* "\033[40~" */
814 case XK_F27: /* "\033[41~" */
815 case XK_F28: /* "\033[42~" */
816 case XK_F29: /* "\033[43~" */
817 case XK_F30: /* "\033[44~" */
818 case XK_F31: /* "\033[45~" */
819 case XK_F32: /* "\033[46~" */
820 case XK_F33: /* "\033[47~" */
821 case XK_F34: /* "\033[48~" */
822 case XK_F35: /* "\033[49~" */
823 FKEY (31, XK_F17);
824 break;
825#undef FKEY
826 default: 765 default:
766 {
767 int param = map_function_key (keysym);
768 if (param > 0)
769 sprintf (kbuf,"\033[%d~", param);
770 else
827 newlen = 0; 771 newlen = 0;
772 }
828 break; 773 break;
829 } 774 }
830 775
831 if (newlen) 776 if (newlen)
832 len = strlen (kbuf); 777 len = strlen (kbuf);
833 }
834 778
835 /* 779 /*
836 * Pass meta for all function keys, if 'meta' option set 780 * Pass meta for all function keys, if 'meta' option set
837 */ 781 */
838#ifdef META8_OPTION 782#ifdef META8_OPTION
… …
867#endif 811#endif
868 /* nil */ ; 812 /* nil */ ;
869 } 813 }
870 } 814 }
871 815
816 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
817 return;
818
872 if (len <= 0) 819 if (len <= 0)
873 return; /* not mapped */ 820 return; /* not mapped */
874 821
875 if (OPTION (Opt_scrollTtyKeypress)) 822 if (option (Opt_scrollTtyKeypress))
876 if (view_start) 823 if (view_start)
877 { 824 {
878 view_start = 0; 825 view_start = 0;
879 want_refresh = 1; 826 want_refresh = 1;
880 } 827 }
… …
902 { 849 {
903 const char ch = C0_ESC; 850 const char ch = C0_ESC;
904 tt_write (&ch, 1); 851 tt_write (&ch, 1);
905 } 852 }
906 853
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); 854 tt_write (kbuf, (unsigned int)len);
918} 855}
919/*}}} */
920 856
857void
858rxvt_term::key_release (XKeyEvent &ev)
859{
860#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
861 KeySym keysym;
862
863 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
864#endif
865
866#if ENABLE_FRILLS || ISO_14755
867 // ISO 14755 support
868 if (iso14755buf)
869 if (iso14755buf & ISO_14755_52)
870 {
871# if ISO_14755
872 scr_overlay_off ();
873# endif
874# if ISO_14755
875 // iso14755 part 5.2 handling: release time
876 // first: controls
877 if ((ev.state & ControlMask)
878 && ((keysym >= 0x40 && keysym <= 0x5f)
879 || (keysym >= 0x61 && keysym <= 0x7f)))
880 {
881 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
882 commit_iso14755 ();
883
884 return;
885 }
886
887 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
888 if (i[0] == keysym)
889 {
890 iso14755buf = ISO_14755_51 | i[1];
891 commit_iso14755 ();
892
893 return;
894 }
895
896 scr_bell ();
897# endif
898 iso14755buf = 0;
899
900 return;
901 }
902 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
903 {
904# if ISO_14755
905 scr_overlay_off ();
906# endif
907 if (iso14755buf & ISO_14755_51)
908 commit_iso14755 ();
909#if ISO_14755
910 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
911 {
912 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
913
914 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
915 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
916 }
917# endif
918 else
919 iso14755buf = 0;
920 }
921#endif
922
923 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
924 return;
925
926#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
927 if (!(ev.state & ControlMask))
928 slip_wheel_ev.stop ();
929 else if (keysym == XK_Control_L || keysym == XK_Control_R)
930 mouse_slip_wheel_speed = 0;
931#endif
932}
933
921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 934#if defined (KEYSYM_RESOURCE)
922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
923/* attempt to `write' count to the input buffer */
924unsigned int 935unsigned int
925rxvt_term::cmd_write (const char *str, unsigned int count) 936rxvt_term::cmd_write (const char *str, unsigned int count)
926{ 937{
927 unsigned int n, s; 938 unsigned int n, s;
928 939
… …
956void 967void
957rxvt_term::flush () 968rxvt_term::flush ()
958{ 969{
959 flush_ev.stop (); 970 flush_ev.stop ();
960 971
961#ifdef TRANSPARENT 972#ifdef HAVE_BG_PIXMAP
962 if (want_full_refresh) 973 if (bgPixmap.check_clearChanged ())
963 { 974 {
964 want_full_refresh = 0; 975// scr_clear (true); This needs to be researched further!
965 scr_clear ();
966 scr_touch (false); 976 scr_touch (false);
967 } 977 }
968#endif 978#endif
969 979
970 if (want_refresh) 980 if (want_refresh)
971 { 981 {
982 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
983 {
984 int row = view_start;
985 int end_row = row + nrow;
986
987 while (row > top_row && ROW (row - 1).is_longer ())
988 --row;
989
990 do
991 {
992 int start_row = row;
993 line_t *l;
994
995 do
996 {
997 l = &ROW (row++);
998
999 if (!(l->f & LINE_FILTERED))
1000 {
1001 // line not filtered, mark it as filtered
1002 l->f |= LINE_FILTERED;
1003 while (l->is_longer ())
1004 {
1005 l = &ROW (row++);
1006 l->f |= LINE_FILTERED;
1007 }
1008
1009 // and filter it
1010 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1011
1012 break;
1013 }
1014 }
1015 while (l->is_longer () && row < end_row);
1016 }
1017 while (row < end_row);
1018 }
1019
972 scr_refresh (refresh_type); 1020 scr_refresh ();
973 scrollbar_show (1); 1021 scrollbar_show (1);
974#ifdef USE_XIM 1022#ifdef USE_XIM
975 IMSendSpot (); 1023 IMSendSpot ();
976#endif 1024#endif
977 } 1025 }
978 1026
979 display->flush (); 1027 display->flush ();
980} 1028}
981 1029
1030/* checks wether a refresh is requested and starts the refresh timer */
982void 1031void
983rxvt_term::check_cb (check_watcher &w) 1032rxvt_term::refresh_check ()
984{ 1033{
985 SET_R (this); 1034 if (want_refresh && !flush_ev.is_active ())
986 SET_LOCALE (locale); 1035 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
987 1036
988 display->flush (); 1037 display->flush ();
989
990 if (want_refresh && !flush_ev.active)
991 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
992} 1038}
993 1039
994void 1040void
995rxvt_term::flush_cb (time_watcher &w) 1041rxvt_term::flush_cb (ev::timer &w, int revents)
996{ 1042{
997 SET_R (this); 1043 make_current ();
998 SET_LOCALE (locale);
999 1044
1000 refresh_limit = 1;
1001 refresh_count = 0; 1045 refresh_count = 0;
1002 flush (); 1046 flush ();
1003} 1047}
1004 1048
1005#ifdef CURSOR_BLINK 1049#ifdef CURSOR_BLINK
1006void 1050void
1007rxvt_term::cursor_blink_cb (time_watcher &w) 1051rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1008{ 1052{
1009 hidden_cursor = !hidden_cursor; 1053 hidden_cursor = !hidden_cursor;
1010 want_refresh = 1; 1054 want_refresh = 1;
1011 1055 refresh_check ();
1012 w.start (w.at + BLINK_INTERVAL);
1013} 1056}
1014#endif 1057#endif
1015 1058
1016#ifdef TEXT_BLINK 1059#ifdef TEXT_BLINK
1017void 1060void
1018rxvt_term::text_blink_cb (time_watcher &w) 1061rxvt_term::text_blink_cb (ev::timer &w, int revents)
1019{ 1062{
1020 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1063 if (scr_refresh_rend (RS_Blink, RS_Blink))
1021 { 1064 {
1022 hidden_text = !hidden_text; 1065 hidden_text = !hidden_text;
1023 want_refresh = 1; 1066 want_refresh = 1;
1024 w.start (w.at + TEXT_BLINK_INTERVAL); 1067 refresh_check ();
1025 } 1068 }
1069 else
1070 w.stop ();
1026} 1071}
1027#endif 1072#endif
1028 1073
1029#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1074#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1030void 1075void
1031rxvt_term::cont_scroll_cb (time_watcher &w) 1076rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1032{ 1077{
1033 if ((scrollbar_isUp() || scrollbar_isDn()) && 1078 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1034 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1079 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1035 { 1080 {
1036 refresh_type |= SMOOTH_REFRESH;
1037 want_refresh = 1; 1081 want_refresh = 1;
1038 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1082 refresh_check ();
1039 } 1083 }
1084 else
1085 w.stop ();
1040} 1086}
1041#endif 1087#endif
1042 1088
1043#ifdef SELECTION_SCROLLING 1089#ifdef SELECTION_SCROLLING
1044void 1090void
1045rxvt_term::sel_scroll_cb (time_watcher &w) 1091rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1046{ 1092{
1047 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1093 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1048 { 1094 {
1049 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1095 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1050 refresh_type |= SMOOTH_REFRESH;
1051 want_refresh = 1; 1096 want_refresh = 1;
1052 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1097 refresh_check ();
1053 } 1098 }
1099 else
1100 w.stop ();
1054} 1101}
1055#endif 1102#endif
1056 1103
1057#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1104#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1058void 1105void
1059rxvt_term::slip_wheel_cb (time_watcher &w) 1106rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1060{ 1107{
1061 if (mouse_slip_wheel_speed == 0 1108 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 { 1109 {
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; 1110 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1111 refresh_check ();
1112 }
1113
1114 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1072 } 1115 {
1116 mouse_slip_wheel_speed = 0;
1117 w.stop ();
1118 }
1073} 1119}
1074#endif 1120#endif
1075 1121
1076#if HAVE_SCHED_YIELD 1122#if LINUX_YIELD_HACK
1077static struct event_handler 1123static struct event_handler
1078{ 1124{
1079 check_watcher cw_yield; 1125 ev::prepare yield_ev;
1080 1126
1081 void yield (check_watcher &w) 1127 void yield_cb (ev::prepare &w, int revents)
1082 { 1128 {
1083 sched_yield (); 1129 // this should really be sched_yield(), but the linux guys thought
1130 // that giving a process calling sched_yield () less cpu time than
1131 // ones with high nice levels is a useful thing to do. It surely is is
1132 // allowed by the sus... as is returning ENOSYS.
1133
1134 struct timespec ts = { 0, 0 };
1135 nanosleep (&ts, 0);
1136
1084 w.stop (); 1137 w.stop ();
1085 } 1138 }
1086 1139
1087 event_handler () 1140 event_handler ()
1088 : cw_yield (this, &event_handler::yield) 1141 : yield_ev (this, &event_handler::yield_cb)
1089 { 1142 {
1090 } 1143 }
1091} event_handler; 1144} event_handler;
1092#endif 1145#endif
1093 1146
… …
1104 1157
1105 memmove (cmdbuf_base, cmdbuf_ptr, n); 1158 memmove (cmdbuf_base, cmdbuf_ptr, n);
1106 cmdbuf_ptr = cmdbuf_base; 1159 cmdbuf_ptr = cmdbuf_base;
1107 cmdbuf_endp = cmdbuf_ptr + n; 1160 cmdbuf_endp = cmdbuf_ptr + n;
1108 1161
1109 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1162 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1110 1163
1111 if (r > 0) 1164 if (r > 0)
1112 { 1165 {
1113 cmdbuf_endp += r; 1166 cmdbuf_endp += r;
1114 return true; 1167 return true;
1115 } 1168 }
1116 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1169 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1117 { 1170 {
1118#if HAVE_SCHED_YIELD 1171#if LINUX_YIELD_HACK
1119 if (display->is_local) 1172 if (display->is_local)
1120 event_handler.cw_yield.start (); 1173 event_handler.yield_ev.start ();
1121#endif 1174#endif
1122 } 1175 }
1123 else 1176 else
1124 { 1177 {
1125 pty_ev.stop (); 1178 pty_ev.stop ();
1126 1179
1127 if (!OPTION (Opt_hold)) 1180 if (!option (Opt_hold))
1128 destroy (); 1181 destroy ();
1129 } 1182 }
1130 1183
1131 return false; 1184 return false;
1132} 1185}
1133 1186
1134void 1187void
1135rxvt_term::pty_cb (io_watcher &w, short revents) 1188rxvt_term::pty_cb (ev::io &w, int revents)
1136{ 1189{
1137 SET_R (this); 1190 make_current ();
1138 SET_LOCALE (locale);
1139 1191
1140 if (revents & EVENT_READ) 1192 if (revents & ev::READ)
1141 // loop, but don't allow a single term to monopolize us 1193 // loop, but don't allow a single term to monopolize us
1142 while (pty_fill ()) 1194 while (pty_fill ())
1143 if (cmd_parse ()) 1195 if (cmd_parse ())
1144 break; 1196 break;
1145 1197
1146 if (revents & EVENT_WRITE) 1198 if (revents & ev::WRITE)
1147 pty_write (); 1199 pty_write ();
1200
1201 refresh_check ();
1148} 1202}
1149 1203
1150void 1204void
1151rxvt_term::pointer_unblank () 1205rxvt_term::pointer_unblank ()
1152{ 1206{
1153 XDefineCursor (display->display, vt, TermWin_cursor); 1207 XDefineCursor (dpy, vt, TermWin_cursor);
1154 recolour_cursor (); 1208 recolour_cursor ();
1155 1209
1156#ifdef POINTER_BLANK 1210#ifdef POINTER_BLANK
1157 hidden_pointer = 0; 1211 hidden_pointer = 0;
1158 1212
1159 if (OPTION (Opt_pointerBlank)) 1213 if (option (Opt_pointerBlank))
1160 pointer_ev.start (NOW + pointerBlankDelay); 1214 pointer_ev.start (pointerBlankDelay);
1161#endif 1215#endif
1162} 1216}
1163 1217
1164#ifdef POINTER_BLANK 1218#ifdef POINTER_BLANK
1165void 1219void
1166rxvt_term::pointer_blank () 1220rxvt_term::pointer_blank ()
1167{ 1221{
1168 if (! OPTION (Opt_pointerBlank)) 1222 if (!option (Opt_pointerBlank))
1169 return; 1223 return;
1170 1224
1171 XDefineCursor (display->display, vt, display->blank_cursor); 1225 XDefineCursor (dpy, vt, display->blank_cursor);
1172 XFlush (display->display); 1226 XFlush (dpy);
1173 1227
1174 hidden_pointer = 1; 1228 hidden_pointer = 1;
1175} 1229}
1176 1230
1177void 1231void
1178rxvt_term::pointer_cb (time_watcher &w) 1232rxvt_term::pointer_cb (ev::timer &w, int revents)
1179{ 1233{
1180 SET_R (this); 1234 make_current ();
1181 SET_LOCALE (locale);
1182 1235
1183 pointer_blank (); 1236 pointer_blank ();
1184} 1237}
1185#endif 1238#endif
1186 1239
1187void 1240void
1188rxvt_term::mouse_report (XButtonEvent &ev) 1241rxvt_term::mouse_report (XButtonEvent &ev)
1189{ 1242{
1190 int button_number, key_state = 0; 1243 int button_number, key_state = 0;
1191 int x, y; 1244 int x, y;
1245 int code = 32;
1192 1246
1193 x = ev.x; 1247 x = Pixel2Col (ev.x);
1194 y = ev.y; 1248 y = Pixel2Row (ev.y);
1195 pixel_position (&x, &y); 1249 if (ev.type == MotionNotify)
1250 {
1251 if (x == mouse_row && y == mouse_col)
1252 return;
1253 mouse_row = x;
1254 mouse_col = y;
1255 code += 32;
1256 }
1196 1257
1197 if (MEvent.button == AnyButton) 1258 if (MEvent.button == AnyButton)
1198 button_number = 3; 1259 button_number = 3;
1199 else 1260 else
1200 { 1261 {
… …
1246 x + 1, 1307 x + 1,
1247 y + 1); 1308 y + 1);
1248#endif 1309#endif
1249 1310
1250 tt_printf ("\033[M%c%c%c", 1311 tt_printf ("\033[M%c%c%c",
1251 (32 + button_number + key_state), 1312 (code + button_number + key_state),
1252 (32 + x + 1), 1313 (32 + x + 1),
1253 (32 + y + 1)); 1314 (32 + y + 1));
1254} 1315}
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 1316
1266/*{{{ process an X event */ 1317/*{{{ process an X event */
1267void 1318void
1268rxvt_term::x_cb (XEvent &ev) 1319rxvt_term::x_cb (XEvent &ev)
1269{ 1320{
1270 dDisp; 1321 make_current ();
1271 1322
1272 SET_R (this); 1323 dLocal (Display *, dpy);
1273 SET_LOCALE (locale);
1274 1324
1275#if defined(CURSOR_BLINK) 1325 if (ev.xany.window == vt
1276 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1326 && SHOULD_INVOKE (HOOK_X_EVENT)
1277 { 1327 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1278 if (hidden_cursor) 1328 return;
1279 {
1280 hidden_cursor = 0;
1281 want_refresh = 1;
1282 }
1283 1329
1284 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1330 // 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; 1331 Window unused_root, unused_child;
1303 int unused_root_x, unused_root_y; 1332 int unused_root_x, unused_root_y;
1304 unsigned int unused_mask; 1333 unsigned int unused_mask;
1305 1334
1306 switch (ev.type) 1335 switch (ev.type)
1307 { 1336 {
1308 case KeyPress: 1337 case KeyPress:
1309#if ISO_14755 1338 key_press (ev.xkey);
1310 if (!(iso14755buf & ISO_14755_52))
1311#endif
1312 lookup_key (ev.xkey);
1313
1314 break; 1339 break;
1315 1340
1316 case KeyRelease: 1341 case KeyRelease:
1317 { 1342 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; 1343 break;
1385 }
1386 1344
1387 case ButtonPress: 1345 case ButtonPress:
1388 button_press (ev.xbutton); 1346 button_press (ev.xbutton);
1389 break; 1347 break;
1390 1348
… …
1392 button_release (ev.xbutton); 1350 button_release (ev.xbutton);
1393 break; 1351 break;
1394 1352
1395 case ClientMessage: 1353 case ClientMessage:
1396 if (ev.xclient.format == 32 1354 if (ev.xclient.format == 32
1397 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1355 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1398 { 1356 {
1357 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1358 {
1359 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1360 {
1399 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1361 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1362 {
1363 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1400 destroy (); 1364 destroy ();
1365 }
1401#if ENABLE_EWMH 1366#if ENABLE_EWMH
1402 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1367 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1403 XSendEvent (disp, ev.xclient.window = display->root, 1368 XSendEvent (dpy, ev.xclient.window = display->root,
1404 False, SubstructureRedirectMask | SubstructureNotifyMask, 1369 False, SubstructureRedirectMask | SubstructureNotifyMask,
1405 &ev); 1370 &ev);
1371#endif
1372 }
1373 }
1374#if ENABLE_XEMBED
1375 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1376 {
1377 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1378 focus_in ();
1379 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1380 focus_out ();
1381 }
1406#endif 1382#endif
1407 } 1383 }
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; 1384 break;
1448 1385
1449 /* 1386 /*
1450 * XXX: this is not the _current_ arrangement 1387 * XXX: this is not the _current_ arrangement
1451 * Here's my conclusion: 1388 * Here's my conclusion:
… …
1470 break; 1407 break;
1471 } 1408 }
1472 break; 1409 break;
1473 1410
1474 case FocusIn: 1411 case FocusIn:
1412 if (ev.xfocus.detail != NotifyInferior
1413 && ev.xfocus.detail != NotifyPointer
1414 && ev.xfocus.mode != NotifyGrab)
1475 focus_in (); 1415 focus_in ();
1476 break; 1416 break;
1477 1417
1478 case FocusOut: 1418 case FocusOut:
1419 if (ev.xfocus.detail != NotifyInferior
1420 && ev.xfocus.detail != NotifyPointer
1421 && ev.xfocus.mode != NotifyGrab)
1479 focus_out (); 1422 focus_out ();
1480 break; 1423 break;
1481 1424
1482 case ConfigureNotify: 1425 case ConfigureNotify:
1426 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1427 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1428 szHint.width, szHint.height);*/
1483 if (ev.xconfigure.window == parent[0]) 1429 if (ev.xconfigure.window == parent[0])
1484 { 1430 {
1485 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1431 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1486 ; 1432 ;
1487 1433
1488 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1434 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1489 { 1435 {
1490 seen_resize = 1; 1436 seen_resize = 1;
1491 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1437 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1492 } 1438 }
1493 1439 else
1494#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1440 {
1495 if (OPTION (Opt_transparent)) 1441#ifdef HAVE_BG_PIXMAP
1496 check_our_parents (); 1442 if (bgPixmap.window_position_sensitive ())
1443 {
1444 if (mapped)
1445 update_background ();
1446 else
1447 bgPixmap.invalidate ();
1448 }
1497#endif 1449#endif
1450 }
1451
1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1498 } 1453 }
1499 break; 1454 break;
1500 1455
1501 case PropertyNotify: 1456 case PropertyNotify:
1457 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1502 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1458 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1503 && ev.xproperty.state == PropertyNewValue) 1459 && ev.xproperty.state == PropertyNewValue)
1504 selection_property (ev.xproperty.window, ev.xproperty.atom); 1460 selection_property (ev.xproperty.window, ev.xproperty.atom);
1505 1461
1506 break; 1462 break;
1507 1463
1508 case SelectionClear: 1464 case SelectionClear:
1509 selection_clear (); 1465 selection_clear ();
… …
1514 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1470 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1515 break; 1471 break;
1516 1472
1517 case SelectionRequest: 1473 case SelectionRequest:
1518 selection_send (ev.xselectionrequest); 1474 selection_send (ev.xselectionrequest);
1475 break;
1476
1477 case MapNotify:
1478#ifdef HAVE_BG_PIXMAP
1479 /* This is needed spcifically to fix the case of no window manager or a
1480 * non-reparenting window manager. In those cases we never get first
1481 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1482 * care of multiplicity of ConfigureNotify events arriwing while WM does
1483 * reparenting.
1484 * We should not render background immidiately, as there could be several
1485 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1486 * by scheduling background redraw as soon as we can, but giving a short
1487 * bit of time for ConfigureNotifies to arrive.
1488 * We should render background PRIOR to drawing any text, but AFTER all
1489 * of ConfigureNotifys for the best results.
1490 */
1491 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1492 update_background_ev.start (0.025);
1493#endif
1494 mapped = 1;
1495#ifdef TEXT_BLINK
1496 text_blink_ev.start ();
1497#endif
1498 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1519 break; 1499 break;
1520 1500
1521 case UnmapNotify: 1501 case UnmapNotify:
1522 mapped = 0; 1502 mapped = 0;
1523#ifdef TEXT_BLINK 1503#ifdef TEXT_BLINK
1524 text_blink_ev.stop (); 1504 text_blink_ev.stop ();
1525#endif 1505#endif
1506 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1507 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 1508
1541 case GraphicsExpose: 1509 case GraphicsExpose:
1542 case Expose: 1510 case Expose:
1543 if (ev.xany.window == vt) 1511 if (ev.xany.window == vt)
1544 { 1512 {
1545 do 1513 do
1514 {
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1515 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1516 ev.xexpose.width, ev.xexpose.height, False);
1517 }
1548 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1518 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1549 1519
1550 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1520 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1551 1521
1552 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1522 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1523 {
1553 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1554 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1526 }
1555 1527
1556 scr_refresh (refresh_type); 1528 want_refresh = 1;
1557 } 1529 }
1558 else 1530 else
1559 { 1531 {
1560 XEvent unused_event; 1532 XEvent unused_event;
1561 1533
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1534 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1563 ; 1535 ;
1564 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1536 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1565 ; 1537 ;
1566 1538
1567 if (isScrollbarWindow (ev.xany.window)) 1539 if (scrollBar.state && ev.xany.window == scrollBar.win)
1568 { 1540 {
1569 scrollBar.setIdle (); 1541 scrollBar.state = STATE_IDLE;
1570 scrollbar_show (0); 1542 scrollbar_show (0);
1571 } 1543 }
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 } 1544 }
1582 break; 1545 break;
1583 1546
1584 case MotionNotify: 1547 case MotionNotify:
1585#ifdef POINTER_BLANK 1548#ifdef POINTER_BLANK
1586 if (hidden_pointer) 1549 if (hidden_pointer)
1587 pointer_unblank (); 1550 pointer_unblank ();
1588#endif 1551#endif
1589#if MENUBAR 1552 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1590 if (isMenuBarWindow (ev.xany.window)) 1553 || priv_modes & PrivMode_MouseAnyEvent)
1591 {
1592 menubar_control (ev.xbutton); 1554 mouse_report (ev.xbutton);
1593 break;
1594 }
1595#endif
1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1555 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1597 break; 1556 break;
1598 1557
1599 if (ev.xany.window == vt) 1558 if (ev.xany.window == vt)
1600 { 1559 {
1560 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1561 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1562 ; // nop
1601 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1563 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1602 { 1564 {
1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1565 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1604 ; 1566 ;
1605 1567
1606 XQueryPointer (disp, vt, 1568 XQueryPointer (dpy, vt,
1607 &unused_root, &unused_child, 1569 &unused_root, &unused_child,
1608 &unused_root_x, &unused_root_y, 1570 &unused_root_x, &unused_root_y,
1609 &ev.xbutton.x, &ev.xbutton.y, 1571 &ev.xbutton.x, &ev.xbutton.y,
1610 &ev.xbutton.state); 1572 &ev.xbutton.state);
1611#ifdef MOUSE_THRESHOLD 1573#ifdef MOUSE_THRESHOLD
… …
1631 int dist; 1593 int dist;
1632 1594
1633 /* don't clobber the current delay if we are 1595 /* don't clobber the current delay if we are
1634 * already in the middle of scrolling. 1596 * already in the middle of scrolling.
1635 */ 1597 */
1636 if (!sel_scroll_ev.active) 1598 if (!sel_scroll_ev.is_active ())
1637 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1599 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1638 1600
1639 /* save the event params so we can highlight 1601 /* save the event params so we can highlight
1640 * the selection in the pending-scroll loop 1602 * the selection in the pending-scroll loop
1641 */ 1603 */
1642 selection_save_x = ev.xbutton.x; 1604 selection_save_x = ev.xbutton.x;
… …
1664 else 1626 else
1665 { 1627 {
1666 /* we are within the text window, so we 1628 /* we are within the text window, so we
1667 * shouldn't be scrolling 1629 * shouldn't be scrolling
1668 */ 1630 */
1669 if (sel_scroll_ev.active)
1670 sel_scroll_ev.stop(); 1631 sel_scroll_ev.stop();
1671 } 1632 }
1672#endif 1633#endif
1673#ifdef MOUSE_THRESHOLD 1634#ifdef MOUSE_THRESHOLD
1674 } 1635 }
1675#endif 1636#endif
1676 } 1637 }
1677 } 1638 }
1678 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1639 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1679 { 1640 {
1680 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1641 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1681 MotionNotify, &ev)) 1642 MotionNotify, &ev))
1682 ; 1643 ;
1683 1644
1684 XQueryPointer (disp, scrollBar.win, 1645 XQueryPointer (dpy, scrollBar.win,
1685 &unused_root, &unused_child, 1646 &unused_root, &unused_child,
1686 &unused_root_x, &unused_root_y, 1647 &unused_root_x, &unused_root_y,
1687 &ev.xbutton.x, &ev.xbutton.y, 1648 &ev.xbutton.x, &ev.xbutton.y,
1688 &unused_mask); 1649 &unused_mask);
1689 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1650 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1690 scrollbar_size ()); 1651 scrollbar_size ());
1691 scr_refresh (refresh_type);
1692 refresh_limit = 0; 1652 want_refresh = 1;
1693 scrollbar_show (1); 1653 scrollbar_show (1);
1694 } 1654 }
1695 break; 1655 break;
1696 } 1656 }
1657
1658#if defined(CURSOR_BLINK)
1659 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1660 {
1661 if (hidden_cursor)
1662 {
1663 hidden_cursor = 0;
1664 want_refresh = 1;
1665 }
1666
1667 cursor_blink_ev.again ();
1668 }
1669#endif
1670
1671#if defined(POINTER_BLANK)
1672 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1673 {
1674 if (ev.type == MotionNotify
1675 || ev.type == ButtonPress
1676 || ev.type == ButtonRelease)
1677 if (hidden_pointer)
1678 pointer_unblank ();
1679
1680 if (ev.type == KeyPress && hidden_pointer == 0)
1681 pointer_blank ();
1682 }
1683#endif
1684
1685 refresh_check ();
1697} 1686}
1698 1687
1699void 1688void
1700rxvt_term::focus_in () 1689rxvt_term::focus_in ()
1701{ 1690{
1702 if (!focus) 1691 if (!focus)
1703 { 1692 {
1704 focus = 1; 1693 focus = 1;
1705 want_refresh = 1; 1694 want_refresh = 1;
1706 1695
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1696 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1708 1697
1709#if USE_XIM 1698#if USE_XIM
1710 if (Input_Context != NULL) 1699 if (Input_Context != NULL)
1711 { 1700 {
1712 IMSetStatusPosition (); 1701 IMSetPosition ();
1713 XSetICFocus (Input_Context); 1702 XSetICFocus (Input_Context);
1714 } 1703 }
1715#endif 1704#endif
1716#if CURSOR_BLINK 1705#if CURSOR_BLINK
1717 if (OPTION (Opt_cursorBlink)) 1706 if (option (Opt_cursorBlink))
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1707 cursor_blink_ev.again ();
1719#endif 1708#endif
1720#if OFF_FOCUS_FADING 1709#if OFF_FOCUS_FADING
1721 if (rs[Rs_fade]) 1710 if (rs[Rs_fade])
1722 { 1711 {
1723 pix_colors = pix_colors_focused; 1712 pix_colors = pix_colors_focused;
1724 scr_recolour (); 1713 scr_recolour ();
1725 } 1714 }
1726#endif 1715#endif
1716#if ENABLE_FRILLS
1717 if (option (Opt_urgentOnBell))
1718 {
1719 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1720 {
1721 h->flags &= ~XUrgencyHint;
1722 XSetWMHints (dpy, parent[0], h);
1723 }
1724 }
1725#endif
1727 } 1726 }
1728} 1727}
1729 1728
1730void 1729void
1731rxvt_term::focus_out () 1730rxvt_term::focus_out ()
… …
1733 if (focus) 1732 if (focus)
1734 { 1733 {
1735 focus = 0; 1734 focus = 0;
1736 want_refresh = 1; 1735 want_refresh = 1;
1737 1736
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1737 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739 1738
1740#if ENABLE_FRILLS || ISO_14755 1739#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf) 1740 if (iso14755buf)
1742 { 1741 {
1743 iso14755buf = 0; 1742 iso14755buf = 0;
1744# if ENABLE_OVERLAY 1743# if ISO_14755
1745 scr_overlay_off (); 1744 scr_overlay_off ();
1746# endif 1745# endif
1747 } 1746 }
1748#endif 1747#endif
1749#if USE_XIM 1748#if USE_XIM
1750 if (Input_Context != NULL) 1749 if (Input_Context != NULL)
1751 XUnsetICFocus (Input_Context); 1750 XUnsetICFocus (Input_Context);
1752#endif 1751#endif
1753#if CURSOR_BLINK 1752#if CURSOR_BLINK
1754 if (OPTION (Opt_cursorBlink)) 1753 if (option (Opt_cursorBlink))
1755 cursor_blink_ev.stop (); 1754 cursor_blink_ev.stop ();
1755
1756 hidden_cursor = 0; 1756 hidden_cursor = 0;
1757#endif 1757#endif
1758#if OFF_FOCUS_FADING 1758#if OFF_FOCUS_FADING
1759 if (rs[Rs_fade]) 1759 if (rs[Rs_fade])
1760 { 1760 {
… …
1763 } 1763 }
1764#endif 1764#endif
1765 } 1765 }
1766} 1766}
1767 1767
1768#if TRANSPARENT 1768void
1769rxvt_term::update_fade_color (unsigned int idx)
1770{
1771#if OFF_FOCUS_FADING
1772 if (rs[Rs_fade])
1773 {
1774 rgba c;
1775 pix_colors [Color_fade].get (c);
1776 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1777 }
1778#endif
1779}
1780
1781#if ENABLE_TRANSPARENCY || ENABLE_PERL
1769void 1782void
1770rxvt_term::rootwin_cb (XEvent &ev) 1783rxvt_term::rootwin_cb (XEvent &ev)
1771{ 1784{
1772 SET_R (this); 1785 make_current ();
1773 SET_LOCALE (locale);
1774 1786
1787 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1788 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1789 return;
1790
1791# if ENABLE_TRANSPARENCY
1775 switch (ev.type) 1792 switch (ev.type)
1776 { 1793 {
1777 case PropertyNotify: 1794 case PropertyNotify:
1778 /* 1795 /*
1779 * if user used some Esetroot compatible prog to set the root bg, 1796 * 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. 1797 * use the property to determine the pixmap. We use it later on.
1781 */ 1798 */
1782 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1799 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1783 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1800 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1784 return; 1801 {
1802 bgPixmap.set_root_pixmap ();
1803 update_background ();
1804 }
1785 1805
1786 /* FALLTHROUGH */
1787 case ReparentNotify:
1788 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1789 want_refresh = want_full_refresh = 1;
1790 break; 1806 break;
1791 } 1807 }
1808# endif
1809
1810 refresh_check ();
1792} 1811}
1793#endif 1812#endif
1794 1813
1795void 1814void
1796rxvt_term::button_press (XButtonEvent &ev) 1815rxvt_term::button_press (XButtonEvent &ev)
… …
1805 /* 1824 /*
1806 * VT window processing of button press 1825 * VT window processing of button press
1807 */ 1826 */
1808 if (ev.window == vt) 1827 if (ev.window == vt)
1809 { 1828 {
1829 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1830 return;
1831
1810#if ISO_14755 1832#if ISO_14755
1811 // 5.4 1833 // 5.4
1812 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1834 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1813 { 1835 {
1814 iso14755_54 (ev.x, ev.y); 1836 iso14755_54 (ev.x, ev.y);
… …
1826#ifdef MOUSE_REPORT_DOUBLECLICK 1848#ifdef MOUSE_REPORT_DOUBLECLICK
1827 if (ev.button == MEvent.button && clickintime) 1849 if (ev.button == MEvent.button && clickintime)
1828 { 1850 {
1829 /* same button, within alloted time */ 1851 /* same button, within alloted time */
1830 MEvent.clicks++; 1852 MEvent.clicks++;
1853
1831 if (MEvent.clicks > 1) 1854 if (MEvent.clicks > 1)
1832 { 1855 {
1833 /* only report double clicks */ 1856 /* only report double clicks */
1834 MEvent.clicks = 2; 1857 MEvent.clicks = 2;
1835 mouse_report (ev); 1858 mouse_report (ev);
… …
1847 mouse_report (ev); 1870 mouse_report (ev);
1848 } 1871 }
1849#else 1872#else
1850 MEvent.button = ev.button; 1873 MEvent.button = ev.button;
1851 mouse_report (ev); 1874 mouse_report (ev);
1852#endif /* MOUSE_REPORT_DOUBLECLICK */ 1875#endif /* MOUSE_REPORT_DOUBLECLICK */
1853 1876
1854 } 1877 }
1855 else 1878 else
1856 { 1879 {
1857 if (ev.button != MEvent.button) 1880 if (ev.button != MEvent.button)
1858 MEvent.clicks = 0; 1881 MEvent.clicks = 0;
1859 1882
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1861 switch (ev.button) 1883 switch (ev.button)
1862 { 1884 {
1863 case Button1: 1885 case Button1:
1864 /* allow meta + click to select rectangular areas */ 1886 /* allow meta + click to select rectangular areas */
1865 /* should be done in screen.C */ 1887 /* should be done in screen.C */
1866#if ENABLE_FRILLS 1888#if ENABLE_FRILLS
1867 selection.rect = !!(ev.state & ModMetaMask); 1889 selection.rect = !!(ev.state & ModMetaMask);
1868#else 1890#else
1869 selection.rect = false; 1891 selection.rect = false;
1870#endif 1892#endif
1871 1893
1872 /* allow shift+left click to extend selection */ 1894 /* allow shift+left click to extend selection */
1873 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1895 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1874 { 1896 {
1875 if (MEvent.button == Button1 && clickintime) 1897 if (MEvent.button == Button1 && clickintime)
1876 selection_rotate (ev.x, ev.y); 1898 selection_rotate (ev.x, ev.y);
1877 else 1899 else
1878 selection_extend (ev.x, ev.y, 1); 1900 selection_extend (ev.x, ev.y, 1);
1879 } 1901 }
1880 else 1902 else
1881 { 1903 {
1882 if (MEvent.button == Button1 && clickintime) 1904 if (MEvent.button == Button1 && clickintime)
1883 MEvent.clicks++; 1905 MEvent.clicks++;
1884 else 1906 else
1885 MEvent.clicks = 1; 1907 MEvent.clicks = 1;
1886 1908
1887 selection_click (MEvent.clicks, ev.x, ev.y); 1909 selection_click (MEvent.clicks, ev.x, ev.y);
1888 } 1910 }
1889 1911
1890 MEvent.button = Button1; 1912 MEvent.button = Button1;
1891 break; 1913 break;
1892 1914
1893 case Button3: 1915 case Button3:
1894 if (MEvent.button == Button3 && clickintime) 1916 if (MEvent.button == Button3 && clickintime)
1895 selection_rotate (ev.x, ev.y); 1917 selection_rotate (ev.x, ev.y);
1896 else 1918 else
1897 selection_extend (ev.x, ev.y, 1); 1919 selection_extend (ev.x, ev.y, 1);
1898 1920
1899 MEvent.button = Button3; 1921 MEvent.button = Button3;
1900 break; 1922 break;
1901 } 1923 }
1902 } 1924 }
1903 1925
1904 MEvent.time = ev.time; 1926 MEvent.time = ev.time;
1905 return; 1927 return;
1906 } 1928 }
1907 1929
1908 /* 1930 /*
1909 * Scrollbar window processing of button press 1931 * Scrollbar window processing of button press
1910 */ 1932 */
1911 if (isScrollbarWindow (ev.window)) 1933 if (scrollBar.state && ev.window == scrollBar.win)
1912 { 1934 {
1913 scrollBar.setIdle (); 1935 page_dirn direction = NO_DIR;
1936
1937 if (scrollBar.upButton (ev.y))
1938 direction = UP; /* up */
1939 else if (scrollBar.dnButton (ev.y))
1940 direction = DN; /* down */
1941
1942 scrollBar.state = STATE_IDLE;
1914 /* 1943 /*
1915 * Rxvt-style scrollbar: 1944 * Rxvt-style scrollbar:
1916 * move up if mouse is above slider 1945 * move up if mouse is above slider
1917 * move dn if mouse is below slider 1946 * move dn if mouse is below slider
1918 * 1947 *
… …
1927 /* 1956 /*
1928 * Mouse report disabled scrollbar: 1957 * Mouse report disabled scrollbar:
1929 * arrow buttons - send up/down 1958 * arrow buttons - send up/down
1930 * click on scrollbar - send pageup/down 1959 * click on scrollbar - send pageup/down
1931 */ 1960 */
1932 if ((scrollBar.style == R_SB_NEXT 1961 if (direction == UP)
1933 && scrollbarnext_upButton (ev.y))
1934 || (scrollBar.style == R_SB_RXVT
1935 && scrollbarrxvt_upButton (ev.y)))
1936 tt_printf ("\033[A"); 1962 tt_printf ("\033[A");
1937 else if ((scrollBar.style == R_SB_NEXT 1963 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"); 1964 tt_printf ("\033[B");
1942 else 1965 else
1943 switch (ev.button) 1966 switch (ev.button)
1944 { 1967 {
1945 case Button2: 1968 case Button2:
… …
1952 tt_printf ("\033[5~"); 1975 tt_printf ("\033[5~");
1953 break; 1976 break;
1954 } 1977 }
1955 } 1978 }
1956 else 1979 else
1957#endif /* NO_SCROLLBAR_REPORT */ 1980#endif /* NO_SCROLLBAR_REPORT */
1958
1959 {
1960 char upordown = 0;
1961
1962 if (scrollBar.style == R_SB_NEXT)
1963 { 1981 {
1964 if (scrollbarnext_upButton (ev.y)) 1982 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 { 1983 {
1978#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1984#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1985 if (!cont_scroll_ev.is_active ())
1979 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1986 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1980#endif 1987#endif
1981 if (scr_page (upordown < 0 ? UP : DN, 1)) 1988 if (scr_page (direction, 1))
1982 { 1989 {
1983 if (upordown < 0) 1990 if (direction == UP)
1984 scrollBar.setUp (); 1991 scrollBar.state = STATE_UP;
1985 else 1992 else
1986 scrollBar.setDn (); 1993 scrollBar.state = STATE_DOWN;
1987 } 1994 }
1988 } 1995 }
1989 else 1996 else
1990 switch (ev.button) 1997 switch (ev.button)
1991 { 1998 {
1992 case Button2: 1999 case Button2:
1993 switch (scrollbar_align) 2000 switch (scrollBar.align)
1994 { 2001 {
1995 case R_SB_ALIGN_TOP: 2002 case R_SB_ALIGN_TOP:
1996 csrO = 0; 2003 csrO = 0;
1997 break; 2004 break;
1998 case R_SB_ALIGN_CENTRE: 2005 case R_SB_ALIGN_CENTRE:
… …
2006 if (scrollBar.style == R_SB_XTERM 2013 if (scrollBar.style == R_SB_XTERM
2007 || scrollbar_above_slider (ev.y) 2014 || scrollbar_above_slider (ev.y)
2008 || scrollbar_below_slider (ev.y)) 2015 || scrollbar_below_slider (ev.y))
2009 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2016 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2010 2017
2011 scrollBar.setMotion (); 2018 scrollBar.state = STATE_MOTION;
2012 break; 2019 break;
2013 2020
2014 case Button1: 2021 case Button1:
2015 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2022 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2016 csrO = ev.y - scrollBar.top; 2023 csrO = ev.y - scrollBar.top;
2017 /* FALLTHROUGH */ 2024 /* FALLTHROUGH */
2018 2025
2019 case Button3: 2026 case Button3:
2020 if (scrollBar.style != R_SB_XTERM) 2027 if (scrollBar.style != R_SB_XTERM)
… …
2030 scr_page (DN, nrow - 1); 2037 scr_page (DN, nrow - 1);
2031# else 2038# else
2032 scr_page (DN, nrow / 4); 2039 scr_page (DN, nrow / 4);
2033# endif 2040# endif
2034 else 2041 else
2035 scrollBar.setMotion (); 2042 scrollBar.state = STATE_MOTION;
2036 } 2043 }
2037 else 2044 else
2038 { 2045 {
2039 scr_page ((ev.button == Button1 ? DN : UP), 2046 scr_page ((ev.button == Button1 ? DN : UP),
2040 (nrow 2047 (nrow
… …
2043 } 2050 }
2044 2051
2045 break; 2052 break;
2046 } 2053 }
2047 } 2054 }
2055
2048 return; 2056 return;
2049 } 2057 }
2050#if MENUBAR
2051 /*
2052 * Menubar window processing of button press
2053 */
2054 if (isMenuBarWindow (ev.window))
2055 menubar_control (ev);
2056#endif
2057} 2058}
2058 2059
2059void 2060void
2060rxvt_term::button_release (XButtonEvent &ev) 2061rxvt_term::button_release (XButtonEvent &ev)
2061{ 2062{
… …
2063 2064
2064 csrO = 0; /* reset csr Offset */ 2065 csrO = 0; /* reset csr Offset */
2065 if (!bypass_keystate) 2066 if (!bypass_keystate)
2066 reportmode = !! (priv_modes & PrivMode_mouse_report); 2067 reportmode = !! (priv_modes & PrivMode_mouse_report);
2067 2068
2068 if (scrollbar_isUpDn ()) 2069 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2069 { 2070 {
2070 scrollBar.setIdle (); 2071 scrollBar.state = STATE_IDLE;
2071 scrollbar_show (0); 2072 scrollbar_show (0);
2072#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2073 refresh_type &= ~SMOOTH_REFRESH;
2074#endif
2075 } 2073 }
2076 2074
2077#ifdef SELECTION_SCROLLING 2075#ifdef SELECTION_SCROLLING
2078 if (sel_scroll_ev.active)
2079 sel_scroll_ev.stop(); 2076 sel_scroll_ev.stop();
2080#endif 2077#endif
2081 2078
2082 if (ev.window == vt) 2079 if (ev.window == vt)
2083 { 2080 {
2081 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2082 return;
2083
2084#if ISO_14755 2084#if ISO_14755
2085 // 5.4 2085 // 5.4
2086 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2086 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2087 return; 2087 return;
2088#endif 2088#endif
2089
2089 if (reportmode) 2090 if (reportmode)
2090 { 2091 {
2091 /* mouse report from vt window */ 2092 /* mouse report from vt window */
2092 /* don't report release of wheel "buttons" */ 2093 /* don't report release of wheel "buttons" */
2093 if (ev.button >= 4) 2094 if (ev.button >= 4)
… …
2104 mouse_report (ev); 2105 mouse_report (ev);
2105 } 2106 }
2106#else /* MOUSE_REPORT_DOUBLECLICK */ 2107#else /* MOUSE_REPORT_DOUBLECLICK */
2107 MEvent.button = AnyButton; 2108 MEvent.button = AnyButton;
2108 mouse_report (ev); 2109 mouse_report (ev);
2109#endif /* MOUSE_REPORT_DOUBLECLICK */ 2110#endif /* MOUSE_REPORT_DOUBLECLICK */
2110 return; 2111 return;
2111 } 2112 }
2112 2113
2113 /* 2114 /*
2114 * dumb hack to compensate for the failure of click-and-drag 2115 * dumb hack to compensate for the failure of click-and-drag
… …
2123 { 2124 {
2124 case Button1: 2125 case Button1:
2125 case Button3: 2126 case Button3:
2126 selection_make (ev.time); 2127 selection_make (ev.time);
2127 break; 2128 break;
2129
2128 case Button2: 2130 case Button2:
2129 selection_request (ev.time, ev.x, ev.y); 2131 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2132 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2130 break; 2133 break;
2134
2131#ifdef MOUSE_WHEEL 2135#ifdef MOUSE_WHEEL
2132 case Button4: 2136 case Button4:
2133 case Button5: 2137 case Button5:
2134 { 2138 {
2135 int i; 2139 int i;
… …
2137 2141
2138 v = ev.button == Button4 ? UP : DN; 2142 v = ev.button == Button4 ? UP : DN;
2139 2143
2140 if (ev.state & ShiftMask) 2144 if (ev.state & ShiftMask)
2141 i = 1; 2145 i = 1;
2142 else if (OPTION (Opt_mouseWheelScrollPage)) 2146 else if (option (Opt_mouseWheelScrollPage))
2143 i = nrow - 1; 2147 i = nrow - 1;
2144 else 2148 else
2145 i = 5; 2149 i = 5;
2146 2150
2147# ifdef MOUSE_SLIP_WHEELING 2151# ifdef MOUSE_SLIP_WHEELING
… …
2149 { 2153 {
2150 mouse_slip_wheel_speed += v ? -1 : 1; 2154 mouse_slip_wheel_speed += v ? -1 : 1;
2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2155 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2156 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2153 2157
2154 if (slip_wheel_ev.at < NOW) 2158 if (!slip_wheel_ev.is_active ())
2155 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2159 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2156
2157 slip_wheel_ev.start ();
2158 } 2160 }
2159 else 2161 else
2162# endif
2160 { 2163 {
2161# endif
2162# ifdef JUMP_MOUSE_WHEEL
2163 scr_page (v, i); 2164 scr_page (v, i);
2164 scr_refresh (SMOOTH_REFRESH);
2165 scrollbar_show (1); 2165 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 } 2166 }
2176#endif
2177 } 2167 }
2178 break; 2168 break;
2179#endif 2169#endif
2180 } 2170 }
2181 } 2171 }
2182#ifdef MENUBAR
2183 else if (isMenuBarWindow (ev.window))
2184 menubar_control (ev);
2185#endif
2186} 2172}
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 2173
2669/*}}} */ 2174/*}}} */
2670 2175
2671bool 2176bool
2672rxvt_term::cmd_parse () 2177rxvt_term::cmd_parse ()
2673{ 2178{
2674 bool flag = false; 2179 bool flag = false;
2675 unicode_t ch = NOCHAR; 2180 wchar_t ch = NOCHAR;
2676 char *seq_begin; // remember start of esc-sequence here 2181 char *seq_begin; // remember start of esc-sequence here
2677 2182
2678 for (;;) 2183 for (;;)
2679 { 2184 {
2680 if (ch == NOCHAR) 2185 if (ch == NOCHAR)
2681 { 2186 {
2682 seq_begin = cmdbuf_ptr; 2187 seq_begin = cmdbuf_ptr;
2683 ch = next_char (); 2188 ch = next_char ();
2684 }
2685 2189
2686 if (ch == NOCHAR) // TODO: improve 2190 if (ch == NOCHAR)
2687 break; 2191 break;
2192 }
2688 2193
2689 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2194 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2690 { 2195 {
2691 if (!seen_input) 2196 if (!seen_input)
2692 { 2197 {
… …
2701 if (seen_resize && cmd_pid) 2206 if (seen_resize && cmd_pid)
2702 kill (-cmd_pid, SIGWINCH); 2207 kill (-cmd_pid, SIGWINCH);
2703 } 2208 }
2704 2209
2705 /* Read a text string from the input buffer */ 2210 /* Read a text string from the input buffer */
2706 unicode_t buf[UBUFSIZ]; 2211 wchar_t buf[UBUFSIZ];
2707 bool refreshnow = false; 2212 bool refreshnow = false;
2708 int nlines = 0; 2213 int nlines = 0;
2709 unicode_t *str = buf; 2214 wchar_t *str = buf;
2710 unicode_t *eol = str + min (ncol, UBUFSIZ); 2215 wchar_t *eol = str + min (ncol, UBUFSIZ);
2711 2216
2712 for (;;) 2217 for (;;)
2713 { 2218 {
2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2219 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2715 break; 2220 break;
… …
2721 if (ch == C0_LF) 2226 if (ch == C0_LF)
2722 nlines++; 2227 nlines++;
2723 2228
2724 refresh_count++; 2229 refresh_count++;
2725 2230
2726 if (!OPTION (Opt_jumpScroll) 2231 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2727 || (refresh_count >= refresh_limit * (nrow - 1)))
2728 { 2232 {
2729 refreshnow = true;
2730 refresh_count = 0; 2233 refresh_count = 0;
2234
2235 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2236 {
2237 refreshnow = true;
2731 ch = NOCHAR; 2238 ch = NOCHAR;
2732 break; 2239 break;
2240 }
2733 } 2241 }
2734 2242
2735 // scr_add_lines only works for nlines <= nrow - 1. 2243 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1) 2244 if (nlines >= nrow - 1)
2737 { 2245 {
2246 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2247 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2738 scr_add_lines (buf, nlines, str - buf); 2248 scr_add_lines (buf, str - buf, nlines);
2249
2739 nlines = 0; 2250 nlines = 0;
2740 str = buf; 2251 str = buf;
2741 eol = str + min (ncol, UBUFSIZ); 2252 eol = str + min (ncol, UBUFSIZ);
2742 } 2253 }
2743 2254
… …
2756 2267
2757 seq_begin = cmdbuf_ptr; 2268 seq_begin = cmdbuf_ptr;
2758 ch = next_char (); 2269 ch = next_char ();
2759 } 2270 }
2760 2271
2272 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2273 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2761 scr_add_lines (buf, nlines, str - buf); 2274 scr_add_lines (buf, str - buf, nlines);
2762 2275
2763 /* 2276 /*
2764 * If there have been a lot of new lines, then update the screen 2277 * 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. 2278 * 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 2279 * if skipScroll is enabled.
2767 * is incremented here because we must be doing flat-out scrolling.
2768 */ 2280 */
2769 if (refreshnow) 2281 if (refreshnow)
2770 { 2282 {
2771 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2772 refresh_limit++;
2773 else
2774 {
2775 flag = true; 2283 flag = true;
2776 scr_refresh (refresh_type); 2284 scr_refresh ();
2777 flush_ev.stop (); 2285 want_refresh = 1;
2778 }
2779 } 2286 }
2780 2287
2781 } 2288 }
2782 else 2289 else
2783 { 2290 {
… …
2797 } 2304 }
2798 2305
2799 return flag; 2306 return flag;
2800} 2307}
2801 2308
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 2309// read the next character
2812unicode_t 2310wchar_t
2813rxvt_term::next_char () 2311rxvt_term::next_char () NOTHROW
2814{ 2312{
2815 while (cmdbuf_ptr < cmdbuf_endp) 2313 while (cmdbuf_ptr < cmdbuf_endp)
2816 { 2314 {
2817 // assume 7-bit to be ascii ALWAYS 2315 // assume 7-bit to be ascii ALWAYS
2818 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2316 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2827 cmdbuf_ptr = cmdbuf_endp; 2325 cmdbuf_ptr = cmdbuf_endp;
2828 break; 2326 break;
2829 } 2327 }
2830 2328
2831 if (len == (size_t)-1) 2329 if (len == (size_t)-1)
2832 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2330 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2833 2331
2834 // assume wchar == unicode 2332 // assume wchar == unicode
2835 cmdbuf_ptr += len; 2333 cmdbuf_ptr += len;
2836 return wc & UNICODE_MASK; 2334 return wc & UNICODE_MASK;
2837 } 2335 }
2838 2336
2839 return NOCHAR; 2337 return NOCHAR;
2840} 2338}
2339
2340// read the next octet
2341uint32_t
2342rxvt_term::next_octet () NOTHROW
2343{
2344 return cmdbuf_ptr < cmdbuf_endp
2345 ? (unsigned char)*cmdbuf_ptr++
2346 : NOCHAR;
2347}
2348
2349static class out_of_input out_of_input;
2841 2350
2842/* rxvt_cmd_getc () - Return next input character */ 2351/* rxvt_cmd_getc () - Return next input character */
2843/* 2352/*
2844 * Return the next input character after first passing any keyboard input 2353 * Return the next input character after first passing any keyboard input
2845 * to the command. 2354 * to the command.
2846 */ 2355 */
2847unicode_t 2356wchar_t
2848rxvt_term::cmd_getc () 2357rxvt_term::cmd_getc () THROW ((class out_of_input))
2849{ 2358{
2850 unicode_t c = next_char (); 2359 wchar_t c = next_char ();
2851 2360
2852 if (c == NOCHAR) 2361 if (c == NOCHAR)
2853 throw out_of_input; 2362 throw out_of_input;
2854 2363
2855 return c; 2364 return c;
2856} 2365}
2857 2366
2858unicode_t 2367uint32_t
2859rxvt_term::cmd_get8 () 2368rxvt_term::cmd_get8 () THROW ((class out_of_input))
2860{ 2369{
2861 unicode_t c = next_octet (); 2370 uint32_t c = next_octet ();
2862 2371
2863 if (c == NOCHAR) 2372 if (c == NOCHAR)
2864 throw out_of_input; 2373 throw out_of_input;
2865 2374
2866 return c; 2375 return c;
… …
2930 { 2439 {
2931 if ((buf[len++] = cmd_getc ()) == 'i') 2440 if ((buf[len++] = cmd_getc ()) == 'i')
2932 break; /* done = 1 */ 2441 break; /* done = 1 */
2933 } 2442 }
2934 } 2443 }
2935 2444
2936 for (i = 0; i < len; i++) 2445 for (i = 0; i < len; i++)
2937 if (putc (buf[i], fd) == EOF) 2446 if (putc (buf[i], fd) == EOF)
2938 { 2447 {
2939 done = 1; 2448 done = 1;
2940 break; 2449 break;
… …
2942 } 2451 }
2943 } 2452 }
2944 2453
2945 pclose_printer (fd); 2454 pclose_printer (fd);
2946} 2455}
2947#endif /* PRINTPIPE */ 2456#endif /* PRINTPIPE */
2948/*}}} */ 2457/*}}} */
2949 2458
2950/* *INDENT-OFF* */ 2459/* *INDENT-OFF* */
2951enum { 2460enum {
2952 C1_40 = 0x40, 2461 C1_40 = 0x40,
… …
3002 process_dcs_seq (); 2511 process_dcs_seq ();
3003 break; 2512 break;
3004 case 0x9b: /* CSI */ 2513 case 0x9b: /* CSI */
3005 process_csi_seq (); 2514 process_csi_seq ();
3006 break; 2515 break;
3007 case 0x9d: /* CSI */ 2516 case 0x9d: /* OSC */
3008 process_osc_seq (); 2517 process_osc_seq ();
3009 break; 2518 break;
3010#endif 2519#endif
3011 } 2520 }
3012} 2521}
… …
3102 scr_charset_set (2, (unsigned int)cmd_getc ()); 2611 scr_charset_set (2, (unsigned int)cmd_getc ());
3103 break; 2612 break;
3104 case '+': 2613 case '+':
3105 scr_charset_set (3, (unsigned int)cmd_getc ()); 2614 scr_charset_set (3, (unsigned int)cmd_getc ());
3106 break; 2615 break;
3107#if ENABLE_FRILLS 2616#if !ENABLE_MINIMAL
3108 case '6': 2617 case '6':
3109 scr_backindex (); 2618 scr_backindex ();
3110 break; 2619 break;
3111#endif 2620#endif
3112 case '7': 2621 case '7':
3113 scr_cursor (SAVE); 2622 scr_cursor (SAVE);
3114 break; 2623 break;
3115 case '8': 2624 case '8':
3116 scr_cursor (RESTORE); 2625 scr_cursor (RESTORE);
3117 break; 2626 break;
3118#if ENABLE_FRILLS 2627#if !ENABLE_MINIMAL
3119 case '9': 2628 case '9':
3120 scr_forwardindex (); 2629 scr_forwardindex ();
3121 break; 2630 break;
3122#endif 2631#endif
3123 case '=': 2632 case '=':
… …
3133 break; 2642 break;
3134 2643
3135 /* 8.3.87: NEXT LINE */ 2644 /* 8.3.87: NEXT LINE */
3136 case C1_NEL: /* ESC E */ 2645 case C1_NEL: /* ESC E */
3137 { 2646 {
3138 unicode_t nlcr[] = { C0_LF, C0_CR }; 2647 wchar_t nlcr[] = { C0_LF, C0_CR };
3139 scr_add_lines (nlcr, 1, 2); 2648 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3140 } 2649 }
3141 break; 2650 break;
3142 2651
3143 /* kidnapped escape sequence: Should be 8.3.48 */ 2652 /* kidnapped escape sequence: Should be 8.3.48 */
3144 case C1_ESA: /* ESC G */ 2653 case C1_ESA: /* ESC G */
… …
3238rxvt_term::process_csi_seq () 2747rxvt_term::process_csi_seq ()
3239{ 2748{
3240 unicode_t ch, priv, i; 2749 unicode_t ch, priv, i;
3241 unsigned int nargs, p; 2750 unsigned int nargs, p;
3242 int n, ndef; 2751 int n, ndef;
3243 int arg[ESC_ARGS]; 2752 int arg[ESC_ARGS] = { };
3244 2753
3245 for (nargs = ESC_ARGS; nargs > 0;) 2754 nargs = 0;
3246 arg[--nargs] = 0;
3247 2755
3248 priv = 0; 2756 priv = 0;
3249 ch = cmd_getc (); 2757 ch = cmd_getc ();
3250 if (ch >= '<' && ch <= '?') 2758 if (ch >= '<' && ch <= '?')
2759 {
3251 { /* '<' '=' '>' '?' */ 2760 /* '<' '=' '>' '?' */
3252 priv = ch; 2761 priv = ch;
3253 ch = cmd_getc (); 2762 ch = cmd_getc ();
3254 } 2763 }
3255 2764
3256 /* read any numerical arguments */ 2765 /* read any numerical arguments */
… …
3285 ndef = get_byte_array_bit (csi_defaults, i); 2794 ndef = get_byte_array_bit (csi_defaults, i);
3286 for (p = 0; p < nargs; p++) 2795 for (p = 0; p < nargs; p++)
3287 if (arg[p] == -1) 2796 if (arg[p] == -1)
3288 arg[p] = ndef; 2797 arg[p] = ndef;
3289 2798
3290#ifdef DEBUG_CMD
3291 fprintf (stderr, "CSI ");
3292 for (p = 0; p < nargs; p++)
3293 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3294 fprintf (stderr, "%c\n", ch);
3295#endif
3296
3297 /* 2799 /*
3298 * private mode handling 2800 * private mode handling
3299 */ 2801 */
3300 if (priv) 2802 if (priv)
3301 { 2803 {
3302 switch (priv) 2804 switch (priv)
3303 { 2805 {
3304 case '>': 2806 case '>':
3305 if (ch == CSI_DA) /* secondary device attributes */ 2807 if (ch == CSI_DA) /* secondary device attributes */
3306 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2808 {
2809 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2810 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2811 //
2812 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2813 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2814 // versions.
2815 //
2816 tt_printf ("\033[>%d;95;0c", 'U');
2817 }
3307 break; 2818 break;
2819
3308 case '?': 2820 case '?':
3309 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2821 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3310 process_terminal_mode (ch, priv, nargs, arg); 2822 process_terminal_mode (ch, priv, nargs, arg);
3311 break; 2823 break;
3312 } 2824 }
… …
3437 break; 2949 break;
3438 case 6: /* CPR requested */ 2950 case 6: /* CPR requested */
3439 scr_report_position (); 2951 scr_report_position ();
3440 break; 2952 break;
3441 case 7: /* unofficial extension */ 2953 case 7: /* unofficial extension */
3442 if (OPTION (Opt_insecure)) 2954 if (option (Opt_insecure))
3443 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2955 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3444 break; 2956 break;
3445 case 8: /* unofficial extension */ 2957 case 8: /* unofficial extension */
3446 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2958 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3447 break; 2959 break;
… …
3514 break; 3026 break;
3515 case CSI_75: 3027 case CSI_75:
3516 scr_cursor (RESTORE); 3028 scr_cursor (RESTORE);
3517 break; 3029 break;
3518 3030
3519#if ENABLE_FRILLS 3031#if !ENABLE_MINIMAL
3520 case CSI_74: 3032 case CSI_74:
3521 process_window_ops (arg, nargs); 3033 process_window_ops (arg, nargs);
3522 break; 3034 break;
3523#endif 3035#endif
3524 3036
… …
3531 break; 3043 break;
3532 } 3044 }
3533} 3045}
3534/*}}} */ 3046/*}}} */
3535 3047
3536#if ENABLE_FRILLS 3048#if !ENABLE_MINIMAL
3537/* ARGSUSED */ 3049/* ARGSUSED */
3538void 3050void
3539rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3051rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3540{ 3052{
3541 int x, y; 3053 int x, y;
3542 XWindowAttributes wattr; 3054 XWindowAttributes wattr;
3543 Window wdummy; 3055 Window wdummy;
3544 dDisp; 3056
3057 dLocal (Display *, dpy);
3545 3058
3546 if (nargs == 0) 3059 if (nargs == 0)
3547 return; 3060 return;
3548 3061
3549 switch (args[0]) 3062 switch (args[0])
3550 { 3063 {
3551 /* 3064 /*
3552 * commands 3065 * commands
3553 */ 3066 */
3554 case 1: /* deiconify window */ 3067 case 1: /* deiconify window */
3555 XMapWindow (disp, parent[0]); 3068 XMapWindow (dpy, parent[0]);
3556 break; 3069 break;
3557 case 2: /* iconify window */ 3070 case 2: /* iconify window */
3558 XIconifyWindow (disp, parent[0], display->screen); 3071 XIconifyWindow (dpy, parent[0], display->screen);
3559 break; 3072 break;
3560 case 3: /* set position (pixels) */ 3073 case 3: /* set position (pixels) */
3561 XMoveWindow (disp, parent[0], args[1], args[2]); 3074 XMoveWindow (dpy, parent[0], args[1], args[2]);
3562 break; 3075 break;
3563 case 4: /* set size (pixels) */ 3076 case 4: /* set size (pixels) */
3564 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3077 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3565 break; 3078 break;
3566 case 5: /* raise window */ 3079 case 5: /* raise window */
3567 XRaiseWindow (disp, parent[0]); 3080 XRaiseWindow (dpy, parent[0]);
3568 break; 3081 break;
3569 case 6: /* lower window */ 3082 case 6: /* lower window */
3570 XLowerWindow (disp, parent[0]); 3083 XLowerWindow (dpy, parent[0]);
3571 break; 3084 break;
3572 case 7: /* refresh window */ 3085 case 7: /* refresh window */
3573 scr_touch (true); 3086 scr_touch (true);
3574 break; 3087 break;
3575 case 8: /* set size (chars) */ 3088 case 8: /* set size (chars) */
… …
3582 if (args[0] >= 24) /* set height (chars) */ 3095 if (args[0] >= 24) /* set height (chars) */
3583 set_widthheight ((unsigned int)width, 3096 set_widthheight ((unsigned int)width,
3584 (unsigned int) (args[1] * fheight)); 3097 (unsigned int) (args[1] * fheight));
3585 break; 3098 break;
3586 3099
3587
3588 /* 3100 /*
3589 * reports - some output format copied from XTerm 3101 * reports - some output format copied from XTerm
3590 */ 3102 */
3591 case 11: /* report window state */ 3103 case 11: /* report window state */
3592 XGetWindowAttributes (disp, parent[0], &wattr); 3104 XGetWindowAttributes (dpy, parent[0], &wattr);
3593 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3105 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3594 break; 3106 break;
3595 case 13: /* report window position */ 3107 case 13: /* report window position */
3596 XGetWindowAttributes (disp, parent[0], &wattr); 3108 XGetWindowAttributes (dpy, parent[0], &wattr);
3597 XTranslateCoordinates (disp, parent[0], wattr.root, 3109 XTranslateCoordinates (dpy, parent[0], wattr.root,
3598 -wattr.border_width, -wattr.border_width, 3110 -wattr.border_width, -wattr.border_width,
3599 &x, &y, &wdummy); 3111 &x, &y, &wdummy);
3600 tt_printf ("\033[3;%d;%dt", x, y); 3112 tt_printf ("\033[3;%d;%dt", x, y);
3601 break; 3113 break;
3602 case 14: /* report window size (pixels) */ 3114 case 14: /* report window size (pixels) */
3603 XGetWindowAttributes (disp, parent[0], &wattr); 3115 XGetWindowAttributes (dpy, parent[0], &wattr);
3604 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3116 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3605 break; 3117 break;
3606 case 18: /* report text area size (chars) */ 3118 case 18: /* report text area size (chars) */
3607 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3119 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3608 break; 3120 break;
… …
3610 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3122 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3611 break; 3123 break;
3612 case 20: /* report icon label */ 3124 case 20: /* report icon label */
3613 { 3125 {
3614 char *s; 3126 char *s;
3615 XGetIconName (disp, parent[0], &s); 3127 XGetIconName (dpy, parent[0], &s);
3616 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3128 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3617 XFree (s); 3129 XFree (s);
3618 } 3130 }
3619 break; 3131 break;
3620 case 21: /* report window title */ 3132 case 21: /* report window title */
3621 { 3133 {
3622 char *s; 3134 char *s;
3623 XFetchName (disp, parent[0], &s); 3135 XFetchName (dpy, parent[0], &s);
3624 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3136 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3625 XFree (s); 3137 XFree (s);
3626 } 3138 }
3627 break; 3139 break;
3628 } 3140 }
3629} 3141}
… …
3656 seen_esc = true; 3168 seen_esc = true;
3657 continue; 3169 continue;
3658 } 3170 }
3659 else if (ch == C0_BEL || ch == CHAR_ST) 3171 else if (ch == C0_BEL || ch == CHAR_ST)
3660 break; 3172 break;
3173 else if (ch == C0_SYN)
3174 ch = cmd_get8 ();
3661 else if (ch < 0x20) 3175 else if (ch < 0x20)
3662 return NULL; /* other control character - exit */ 3176 return NULL; /* other control character - exit */
3663 3177
3664 seen_esc = false; 3178 seen_esc = false;
3665 3179
3666 if (n >= STRING_MAX - 1) 3180 if (n >= STRING_MAX - 1)
3667 // stop at some sane length 3181 // stop at some sane length
3668 return NULL; 3182 return NULL;
3669 3183
3670 if (ch == C0_SYN)
3671 string[n++] = cmd_get8 ();
3672 else
3673 string[n++] = ch; 3184 string[n++] = ch;
3674 } 3185 }
3675 3186
3676 string[n++] = '\0'; 3187 string[n++] = '\0';
3677 3188
3678 ends_how = (ch == 0x5c ? C0_ESC : ch); 3189 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3729void 3240void
3730rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3241rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3731{ 3242{
3732 if (str[0] == '?' && !str[1]) 3243 if (str[0] == '?' && !str[1])
3733 { 3244 {
3734 unsigned short r, g, b; 3245 rgba c;
3735 pix_colors_focused[color].get (display, r, g, b); 3246 pix_colors_focused[color].get (c);
3247
3248#if XFT
3249 if (c.a != rgba::MAX_CC)
3250 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3251 else
3252#endif
3736 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3253 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3737 } 3254 }
3738 else 3255 else
3739 set_window_color (color, str); 3256 set_window_color (color, str);
3740} 3257}
3741 3258
… …
3743 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3260 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3744 */ 3261 */
3745void 3262void
3746rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3263rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3747{ 3264{
3748 int changed = 0;
3749 int color; 3265 int color;
3750 char *buf, *name; 3266 char *buf, *name;
3751 bool query = str[0] == '?' && !str[1]; 3267 bool query = str[0] == '?' && !str[1];
3752 int saveop = op; 3268 int saveop = op;
3753 dDisp; 3269
3270 dLocal (Display *, dpy);
3754 3271
3755 assert (str != NULL); 3272 assert (str != NULL);
3273
3274 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3275 return;
3276
3756 switch (op) 3277 switch (op)
3757 { 3278 {
3758 case XTerm_name: 3279 case XTerm_name:
3759 set_title (str); 3280 set_title (str);
3760 /* FALLTHROUGH */ 3281 /* FALLTHROUGH */
… …
3774 unsigned long bytes_after; 3295 unsigned long bytes_after;
3775 unsigned char *value = 0; 3296 unsigned char *value = 0;
3776 const char *str = ""; 3297 const char *str = "";
3777 3298
3778 if (prop 3299 if (prop
3779 && XGetWindowProperty (disp, parent[0], 3300 && XGetWindowProperty (dpy, parent[0],
3780 prop, 0, 1<<16, 0, AnyPropertyType, 3301 prop, 0, 1<<16, 0, AnyPropertyType,
3781 &actual_type, &actual_format, 3302 &actual_type, &actual_format,
3782 &nitems, &bytes_after, &value) == Success 3303 &nitems, &bytes_after, &value) == Success
3783 && actual_type != None 3304 && actual_type != None
3784 && actual_format == 8) 3305 && actual_format == 8)
3785 str = (const char *)(value); 3306 str = (const char *)(value);
3786 3307
3787 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3308 tt_printf ("\033]%d;%s%c", op, str, resp);
3788 3309
3789 XFree (value); 3310 XFree (value);
3790 } 3311 }
3791 else 3312 else
3792 { 3313 {
… …
3796 { 3317 {
3797 *eq = 0; 3318 *eq = 0;
3798 set_utf8_property (display->atom (str), eq + 1); 3319 set_utf8_property (display->atom (str), eq + 1);
3799 } 3320 }
3800 else 3321 else
3801 XDeleteProperty (disp, parent[0], 3322 XDeleteProperty (dpy, parent[0],
3802 display->atom (str)); 3323 display->atom (str));
3803 } 3324 }
3804 break; 3325 break;
3805 3326
3806 case XTerm_Color: 3327 case XTerm_Color:
… …
3808 { 3329 {
3809 if ((name = strchr (buf, ';')) == NULL) 3330 if ((name = strchr (buf, ';')) == NULL)
3810 break; 3331 break;
3811 3332
3812 *name++ = '\0'; 3333 *name++ = '\0';
3813 color = atoi (buf); 3334 color = atoi (buf) + minCOLOR;
3814 3335
3815 if (color < 0 || color >= TOTAL_COLORS) 3336 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3816 break; 3337 break;
3817 3338
3818 if ((buf = strchr (name, ';')) != NULL) 3339 if ((buf = strchr (name, ';')) != NULL)
3819 *buf++ = '\0'; 3340 *buf++ = '\0';
3820 3341
3821 if (name[0] == '?' && !name[1]) 3342 process_color_seq (op, color, name, resp);
3822 {
3823 unsigned short r, g, b;
3824 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3825 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3826 }
3827 else
3828 set_window_color (color + minCOLOR, name);
3829 } 3343 }
3830 break; 3344 break;
3345 case Rxvt_restoreFG:
3831 case XTerm_Color00: 3346 case XTerm_Color00:
3832 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3347 process_color_seq (op, Color_fg, str, resp);
3833 break; 3348 break;
3349 case Rxvt_restoreBG:
3834 case XTerm_Color01: 3350 case XTerm_Color01:
3835 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3351 process_color_seq (op, Color_bg, str, resp);
3836 break; 3352 break;
3837#ifndef NO_CURSORCOLOR 3353#ifndef NO_CURSORCOLOR
3838 case XTerm_Color_cursor: 3354 case XTerm_Color_cursor:
3839 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3355 process_color_seq (op, Color_cursor, str, resp);
3840 break; 3356 break;
3841#endif 3357#endif
3842 case XTerm_Color_pointer_fg: 3358 case XTerm_Color_pointer_fg:
3843 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3359 process_color_seq (op, Color_pointer_fg, str, resp);
3844 break; 3360 break;
3845 case XTerm_Color_pointer_bg: 3361 case XTerm_Color_pointer_bg:
3846 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3362 process_color_seq (op, Color_pointer_bg, str, resp);
3847 break; 3363 break;
3848#ifndef NO_BOLD_UNDERLINE_REVERSE 3364#ifndef NO_BOLD_UNDERLINE_REVERSE
3849 case XTerm_Color_BD:
3850 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3851 break;
3852 case XTerm_Color_UL:
3853 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3854 break;
3855 case XTerm_Color_RV: 3365 case XTerm_Color_RV:
3856 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3366 process_color_seq (op, Color_RV, str, resp);
3367 break;
3368 case Rxvt_Color_BD:
3369 case URxvt_Color_BD:
3370 process_color_seq (op, Color_BD, str, resp);
3371 break;
3372 case Rxvt_Color_UL:
3373 case URxvt_Color_UL:
3374 process_color_seq (op, Color_UL, str, resp);
3857 break; 3375 break;
3858 case URxvt_Color_IT: 3376 case URxvt_Color_IT:
3859 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3377 process_color_seq (op, Color_IT, str, resp);
3860 break; 3378 break;
3861#endif 3379#endif
3862#if TRANSPARENT && TINTING 3380#if ENABLE_TRANSPARENCY
3863 case URxvt_Color_tint: 3381 case URxvt_Color_tint:
3864 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3382 process_color_seq (op, Color_tint, str, resp);
3865 check_our_parents (); 3383 {
3866 if (am_transparent) 3384 bool changed = false;
3867 want_full_refresh = want_refresh = 1;
3868 break;
3869#endif
3870 3385
3386 if (ISSET_PIXCOLOR (Color_tint))
3387 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3388 else
3389 changed = bgPixmap.unset_tint ();
3390
3391 if (changed)
3392 update_background ();
3393 }
3394
3395 break;
3396#endif
3397
3398#if BG_IMAGE_FROM_FILE
3871 case XTerm_Pixmap: 3399 case Rxvt_Pixmap:
3872 if (*str != ';') 3400 if (!strcmp (str, "?"))
3873 { 3401 {
3874#if XPM_BACKGROUND 3402 char str[256];
3875 scale_pixmap (""); /* reset to default scaling */ 3403
3876 set_bgPixmap (str); /* change pixmap */ 3404 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3877#endif 3405 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3878 scr_touch (true); 3406 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3407 process_xterm_seq (XTerm_title, str, CHAR_ST);
3879 } 3408 }
3880 while ((str = strchr (str, ';')) != NULL) 3409 else
3881 { 3410 {
3411 int changed = 0;
3412
3413 if (*str != ';')
3414 {
3415 /* reset to default scaling :*/
3416 bgPixmap.unset_geometry ();
3417 if (bgPixmap.set_file (str)) /* change pixmap */
3418 changed++;
3419 str = strchr (str, ';');
3420 if (str == NULL)
3421 bgPixmap.set_defaultGeometry ();
3422 }
3423
3424 while (str)
3425 {
3882 str++; 3426 str++;
3883#if XPM_BACKGROUND 3427 if (bgPixmap.set_geometry (str))
3884 changed += scale_pixmap (str); 3428 changed++;
3885#endif 3429 str = strchr (str, ';');
3430 }
3431
3432 if (changed)
3433 update_background ();
3886 } 3434 }
3887
3888 if (changed)
3889 {
3890#ifdef XPM_BACKGROUND
3891 resize_pixmap ();
3892#endif
3893 scr_touch (true);
3894 }
3895 break; 3435 break;
3896 3436#endif
3897 case XTerm_restoreFG:
3898 set_window_color (Color_fg, str);
3899 break;
3900 case XTerm_restoreBG:
3901 set_window_color (Color_bg, str);
3902 break;
3903 3437
3904 case XTerm_logfile: 3438 case XTerm_logfile:
3905 // TODO, when secure mode? 3439 // TODO, when secure mode?
3906 break; 3440 break;
3907 3441
3908#ifdef MENUBAR
3909 case URxvt_Menu:
3910 if (OPTION (Opt_insecure))
3911 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3912 break;
3913#endif
3914#if 0 3442#if 0
3915 case XTerm_dumpscreen: /* no error notices */ 3443 case Rxvt_dumpscreen: /* no error notices */
3916 { 3444 {
3917 int fd; 3445 int fd;
3918 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3446 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3919 { 3447 {
3920 scr_dump (fd); 3448 scr_dump (fd);
… …
3931 case URxvt_italicFont: 3459 case URxvt_italicFont:
3932 case URxvt_boldItalicFont: 3460 case URxvt_boldItalicFont:
3933#endif 3461#endif
3934 if (query) 3462 if (query)
3935 tt_printf ("\33]%d;%-.250s%c", saveop, 3463 tt_printf ("\33]%d;%-.250s%c", saveop,
3936 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3464 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3937 ? fontset[op - URxvt_font]->fontdesc : "", 3465 ? fontset[op - URxvt_font]->fontdesc : "",
3938 resp); 3466 resp);
3939 else 3467 else
3940 { 3468 {
3941 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3469 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3944 allocated.push_back ((void *)res); 3472 allocated.push_back ((void *)res);
3945 set_fonts (); 3473 set_fonts ();
3946 } 3474 }
3947 break; 3475 break;
3948 3476
3949#if ENABLE_FRILLS 3477 case URxvt_version:
3478 if (query)
3479 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3480 op,
3481 rs[Rs_name], VERSION[0], VERSION[2],
3482 resp);
3483 break;
3484
3485#if !ENABLE_MINIMAL
3950 case URxvt_locale: 3486 case URxvt_locale:
3951 if (query) 3487 if (query)
3952 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3488 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3953 else 3489 else
3954 { 3490 {
3955 set_locale (str); 3491 set_locale (str);
3956 pty.set_utf8_mode (enc_utf8); 3492 pty->set_utf8_mode (enc_utf8);
3957 init_xlocale (); 3493 init_xlocale ();
3958 } 3494 }
3959 break; 3495 break;
3960 3496
3961 case URxvt_view_up: 3497 case URxvt_view_up:
… …
3972 break; 3508 break;
3973#endif 3509#endif
3974 3510
3975#if ENABLE_PERL 3511#if ENABLE_PERL
3976 case URxvt_perl: 3512 case URxvt_perl:
3977 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 3513 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3978 ; // no responses yet 3514 ; // no responses yet
3979 break; 3515 break;
3980#endif 3516#endif
3981 } 3517 }
3982} 3518}
… …
4014 return state; 3550 return state;
4015} 3551}
4016 3552
4017/* we're not using priv _yet_ */ 3553/* we're not using priv _yet_ */
4018void 3554void
4019rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3555rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4020{ 3556{
4021 unsigned int i, j; 3557 unsigned int i, j;
4022 int state; 3558 int state;
4023 3559
4024 static const struct 3560 static const struct
4025 { 3561 {
4026 const int argval; 3562 const int argval;
4027 const unsigned long bit; 3563 const unsigned long bit;
4028 }
4029
4030 argtopriv[] = { 3564 } argtopriv[] = {
4031 { 1, PrivMode_aplCUR }, 3565 { 1, PrivMode_aplCUR },
4032 { 2, PrivMode_vt52 }, 3566 { 2, PrivMode_vt52 },
4033 { 3, PrivMode_132 }, 3567 { 3, PrivMode_132 },
4034 { 4, PrivMode_smoothScroll }, 3568 { 4, PrivMode_smoothScroll },
4035 { 5, PrivMode_rVideo }, 3569 { 5, PrivMode_rVideo },
4036 { 6, PrivMode_relOrigin }, 3570 { 6, PrivMode_relOrigin },
4037 { 7, PrivMode_Autowrap }, 3571 { 7, PrivMode_Autowrap },
4038 // 8, bi-directional support mode 3572 // 8, bi-directional support mode
4039 { 9, PrivMode_MouseX10 }, 3573 { 9, PrivMode_MouseX10 },
4040#ifdef menuBar_esc
4041 { menuBar_esc, PrivMode_menuBar },
4042#endif
4043 // 18, 19 printing-related 3574 // 18, 19 printing-related
4044 { 25, PrivMode_VisibleCursor }, 3575 { 25, PrivMode_VisibleCursor },
4045#ifdef scrollBar_esc 3576#ifdef scrollBar_esc
4046 { scrollBar_esc, PrivMode_scrollBar }, 3577 { scrollBar_esc, PrivMode_scrollBar },
4047#endif 3578#endif
… …
4054 { 66, PrivMode_aplKP }, 3585 { 66, PrivMode_aplKP },
4055#ifndef NO_BACKSPACE_KEY 3586#ifndef NO_BACKSPACE_KEY
4056 { 67, PrivMode_BackSpace }, 3587 { 67, PrivMode_BackSpace },
4057#endif 3588#endif
4058 { 1000, PrivMode_MouseX11 }, 3589 { 1000, PrivMode_MouseX11 },
4059 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3590 { 1002, PrivMode_MouseBtnEvent },
4060 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3591 { 1003, PrivMode_MouseAnyEvent },
4061 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4062 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4063 { 1011, PrivMode_Keypress }, // rxvt extension 3593 { 1011, PrivMode_Keypress }, // rxvt extension
4064 // 1035 enable modifiers for alt, numlock NYI 3594 // 1035 enable modifiers for alt, numlock NYI
4065 // 1036 send ESC for meta keys NYI 3595 // 1036 send ESC for meta keys NYI
4066 // 1037 send DEL for keypad delete NYI 3596 // 1037 send DEL for keypad delete NYI
4067 { 1047, PrivMode_Screen }, 3597 { 1047, PrivMode_Screen },
4068 // 1048 save and restore cursor 3598 // 1048 save and restore cursor
4069 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3599 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4070 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3600 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3601 { 2004, PrivMode_BracketPaste },
4071 }; 3602 };
4072 3603
4073 if (nargs == 0) 3604 if (nargs == 0)
4074 return; 3605 return;
4075 3606
… …
4094 /* extra handling for values with state unkept */ 3625 /* extra handling for values with state unkept */
4095 switch (arg[i]) 3626 switch (arg[i])
4096 { 3627 {
4097#if ENABLE_STYLES 3628#if ENABLE_STYLES
4098 case 1021: 3629 case 1021:
4099 if (mode) 3630 set_option (Opt_intensityStyles, mode);
4100 SET_OPTION (Opt_intensityStyles);
4101 else
4102 CLR_OPTION (Opt_intensityStyles);
4103 3631
4104 scr_touch (true); 3632 scr_touch (true);
4105 break; 3633 break;
4106#endif 3634#endif
4107 case 1048: /* alternative cursor save */ 3635 case 1048: /* alternative cursor save */
4108 case 1049: 3636 case 1049:
4109 if (OPTION (Opt_secondaryScreen)) 3637 if (option (Opt_secondaryScreen))
4110 if (mode == 0) 3638 if (mode == 0)
4111 scr_cursor (RESTORE); 3639 scr_cursor (RESTORE);
4112 else if (mode == 1) 3640 else if (mode == 1)
4113 scr_cursor (SAVE); 3641 scr_cursor (SAVE);
4114 break; 3642 break;
… …
4126 */ 3654 */
4127 PrivMode (1, PrivMode_vt52); 3655 PrivMode (1, PrivMode_vt52);
4128 break; 3656 break;
4129 case 3: /* 80/132 */ 3657 case 3: /* 80/132 */
4130 if (priv_modes & PrivMode_132OK) 3658 if (priv_modes & PrivMode_132OK)
3659 {
3660 scr_poweron ();
4131 set_widthheight (((state ? 132 : 80) * fwidth), height); 3661 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3662 }
4132 break; 3663 break;
4133 case 4: /* smooth scrolling */ 3664 case 4: /* smooth scrolling */
4134 if (!state) 3665 set_option (Opt_jumpScroll, !state);
4135 SET_OPTION (Opt_jumpScroll);
4136 else
4137 CLR_OPTION (Opt_jumpScroll);
4138 break; 3666 break;
4139 case 5: /* reverse video */ 3667 case 5: /* reverse video */
4140 scr_rvideo_mode (state); 3668 scr_rvideo_mode (state);
4141 break; 3669 break;
4142 case 6: /* relative/absolute origins */ 3670 case 6: /* relative/absolute origins */
… …
4146 scr_autowrap (state); 3674 scr_autowrap (state);
4147 break; 3675 break;
4148 /* case 8: - auto repeat, can't do on a per window basis */ 3676 /* case 8: - auto repeat, can't do on a per window basis */
4149 case 9: /* X10 mouse reporting */ 3677 case 9: /* X10 mouse reporting */
4150 if (state) /* orthogonal */ 3678 if (state) /* orthogonal */
4151 priv_modes &= ~PrivMode_MouseX11; 3679 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4152 break; 3680 break;
4153#ifdef menuBar_esc
4154 case menuBar_esc:
4155#ifdef MENUBAR
4156 map_menuBar (state);
4157#endif
4158 break;
4159#endif
4160#ifdef scrollBar_esc 3681#ifdef scrollBar_esc
4161 case scrollBar_esc: 3682 case scrollBar_esc:
4162 if (scrollbar_mapping (state)) 3683 if (scrollbar_mapping (state))
4163 { 3684 {
4164 resize_all_windows (0, 0, 0); 3685 resize_all_windows (0, 0, 0);
… …
4176 break; 3697 break;
4177 /* case 66: - application key pad */ 3698 /* case 66: - application key pad */
4178 /* case 67: - backspace key */ 3699 /* case 67: - backspace key */
4179 case 1000: /* X11 mouse reporting */ 3700 case 1000: /* X11 mouse reporting */
4180 if (state) /* orthogonal */ 3701 if (state) /* orthogonal */
4181 priv_modes &= ~PrivMode_MouseX10; 3702 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4182 break; 3703 break;
4183#if 0
4184 case 1001: 3704 case 1002:
4185 break; /* X11 mouse highlighting */ 3705 case 1003:
4186#endif 3706 if (state)
3707 {
3708 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3709 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3710 vt_emask_mouse = PointerMotionMask;
3711 }
3712 else
3713 vt_emask_mouse = NoEventMask;
3714 vt_select_input ();
3715 break;
4187 case 1010: /* scroll to bottom on TTY output inhibit */ 3716 case 1010: /* scroll to bottom on TTY output inhibit */
4188 if (!state) 3717 set_option (Opt_scrollTtyOutput, !state);
4189 SET_OPTION (Opt_scrollTtyOutput);
4190 else
4191 CLR_OPTION (Opt_scrollTtyOutput);
4192 break; 3718 break;
4193 case 1011: /* scroll to bottom on key press */ 3719 case 1011: /* scroll to bottom on key press */
4194 if (state) 3720 set_option (Opt_scrollTtyKeypress, state);
4195 SET_OPTION (Opt_scrollTtyKeypress);
4196 else
4197 CLR_OPTION (Opt_scrollTtyKeypress);
4198 break; 3721 break;
4199 case 1047: /* secondary screen w/ clearing last */ 3722 case 1047: /* secondary screen w/ clearing last */
4200 if (OPTION (Opt_secondaryScreen)) 3723 if (option (Opt_secondaryScreen))
4201 if (current_screen != PRIMARY) 3724 if (current_screen != PRIMARY)
4202 scr_erase_screen (2); 3725 scr_erase_screen (2);
4203 scr_change_screen (state); 3726 scr_change_screen (state);
4204 break; 3727 break;
4205 case 1049: /* secondary screen w/ clearing first */ 3728 case 1049: /* secondary screen w/ clearing first */
4206 scr_change_screen (state); 3729 scr_change_screen (state);
4207 if (OPTION (Opt_secondaryScreen)) 3730 if (option (Opt_secondaryScreen))
4208 if (current_screen != PRIMARY) 3731 if (current_screen != PRIMARY)
4209 scr_erase_screen (2); 3732 scr_erase_screen (2);
4210 break; 3733 break;
4211 default: 3734 default:
4212 break; 3735 break;
… …
4340 scr_color (Color_bg, Color_bg); 3863 scr_color (Color_bg, Color_bg);
4341 break; 3864 break;
4342 3865
4343 //case 50: // not variable spacing 3866 //case 50: // not variable spacing
4344 3867
4345#ifndef NO_BRIGHTCOLOR 3868#if !ENABLE_MINIMAL
4346 case 90: 3869 case 90:
4347 case 91: /* set bright fg color */ 3870 case 91: /* set bright fg color */
4348 case 92: 3871 case 92:
4349 case 93: 3872 case 93:
4350 case 94: 3873 case 94:
… …
4374rxvt_term::process_graphics () 3897rxvt_term::process_graphics ()
4375{ 3898{
4376 unicode_t ch, cmd = cmd_getc (); 3899 unicode_t ch, cmd = cmd_getc ();
4377 3900
4378 if (cmd == 'Q') 3901 if (cmd == 'Q')
3902 {
4379 { /* query graphics */ 3903 /* query graphics */
4380 tt_printf ("\033G0\012"); /* no graphics */ 3904 tt_printf ("\033G0\012"); /* no graphics */
4381 return; 3905 return;
4382 } 3906 }
4383 /* swallow other graphics sequences until terminating ':' */ 3907 /* swallow other graphics sequences until terminating ':' */
4384 do 3908 do
… …
4412const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3936const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4413 3937
4414void 3938void
4415rxvt_term::tt_write (const char *data, unsigned int len) 3939rxvt_term::tt_write (const char *data, unsigned int len)
4416{ 3940{
3941 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3942 return;
3943
3944 if (pty->pty < 0)
3945 return;
3946
4417 if (v_buflen == 0) 3947 if (v_buflen == 0)
4418 { 3948 {
4419 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3949 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4420 3950
4421 if ((unsigned int)written == len) 3951 if ((unsigned int)written == len)
4422 return; 3952 return;
4423 3953
4424 data += written; 3954 data += written;
… …
4428 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3958 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4429 3959
4430 memcpy (v_buffer + v_buflen, data, len); 3960 memcpy (v_buffer + v_buflen, data, len);
4431 v_buflen += len; 3961 v_buflen += len;
4432 3962
4433 pty_ev.set (EVENT_READ | EVENT_WRITE); 3963 pty_ev.set (ev::READ | ev::WRITE);
4434} 3964}
4435 3965
4436void rxvt_term::pty_write () 3966void rxvt_term::pty_write ()
4437{ 3967{
4438 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3968 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4439 3969
4440 if (written > 0) 3970 if (written > 0)
4441 { 3971 {
4442 v_buflen -= written; 3972 v_buflen -= written;
4443 3973
4444 if (v_buflen == 0) 3974 if (v_buflen == 0)
4445 { 3975 {
4446 free (v_buffer); 3976 free (v_buffer);
4447 v_buffer = 0; 3977 v_buffer = 0;
4448 v_buflen = 0;
4449 3978
4450 pty_ev.set (EVENT_READ); 3979 pty_ev.set (ev::READ);
4451 return; 3980 return;
4452 } 3981 }
4453 3982
4454 memmove (v_buffer, v_buffer + written, v_buflen); 3983 memmove (v_buffer, v_buffer + written, v_buflen);
4455 } 3984 }
4456 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3985 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4457 pty_ev.set (EVENT_READ); 3986 pty_ev.set (ev::READ);
4458} 3987}
4459 3988
4460/*----------------------- end-of-file (C source) -----------------------*/ 3989/*----------------------- end-of-file (C source) -----------------------*/
4461 3990

Diff Legend

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