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.242 by root, Fri Jan 6 05:37:59 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-2006 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
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END))) 816 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return; 817 return;
874 818
875 if (len <= 0) 819 if (len <= 0)
876 return; /* not mapped */ 820 return; /* not mapped */
877 821
878 if (OPTION (Opt_scrollTtyKeypress)) 822 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 823 if (view_start)
880 { 824 {
881 view_start = 0; 825 view_start = 0;
882 want_refresh = 1; 826 want_refresh = 1;
883 } 827 }
… …
905 { 849 {
906 const char ch = C0_ESC; 850 const char ch = C0_ESC;
907 tt_write (&ch, 1); 851 tt_write (&ch, 1);
908 } 852 }
909 853
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 854 tt_write (kbuf, (unsigned int)len);
921} 855}
922/*}}} */
923 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
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 934#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 935unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 936rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 937{
930 unsigned int n, s; 938 unsigned int n, s;
931 939
… …
959void 967void
960rxvt_term::flush () 968rxvt_term::flush ()
961{ 969{
962 flush_ev.stop (); 970 flush_ev.stop ();
963 971
964#ifdef TRANSPARENT 972#ifdef HAVE_BG_PIXMAP
965 if (want_full_refresh) 973 if (bgPixmap.check_clearChanged ())
966 { 974 {
967 want_full_refresh = 0; 975// scr_clear (true); This needs to be researched further!
968 scr_clear ();
969 scr_touch (false); 976 scr_touch (false);
970 } 977 }
971#endif 978#endif
972 979
973 if (want_refresh) 980 if (want_refresh)
974 { 981 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 982 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 983 {
977 int row = -view_start; 984 int row = view_start;
985 int end_row = row + nrow;
978 986
979 while (row > -nsaved && ROW (row - 1).is_longer ()) 987 while (row > top_row && ROW (row - 1).is_longer ())
980 --row; 988 --row;
981 989
982 while (row < -view_start + nrow) 990 do
983 { 991 {
984 int start_row = row; 992 int start_row = row;
985 line_t *l; 993 line_t *l;
986 994
987 do 995 do
988 { 996 {
989 l = &ROW (row); 997 l = &ROW (row++);
990 998
991 if (!(l->f & LINE_FILTERED)) 999 if (!(l->f & LINE_FILTERED))
992 { 1000 {
993 // line not filtered, mark it as filtered 1001 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED; 1002 l->f |= LINE_FILTERED;
995 while (l->is_longer ()) 1003 while (l->is_longer ())
996 { 1004 {
997 l = &ROW (++row); 1005 l = &ROW (row++);
998 l->f |= LINE_FILTERED; 1006 l->f |= LINE_FILTERED;
999 } 1007 }
1000 1008
1001 // and filter it 1009 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 1010 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003 1011
1004 break; 1012 break;
1005 } 1013 }
1006 } 1014 }
1007 while (l->is_longer ()); 1015 while (l->is_longer () && row < end_row);
1008
1009 row++;
1010 } 1016 }
1017 while (row < end_row);
1011 1018 }
1012 }
1013 1019
1014 scr_refresh (refresh_type); 1020 scr_refresh ();
1015 scrollbar_show (1); 1021 scrollbar_show (1);
1016#ifdef USE_XIM 1022#ifdef USE_XIM
1017 IMSendSpot (); 1023 IMSendSpot ();
1018#endif 1024#endif
1019 } 1025 }
1020 1026
1021 display->flush (); 1027 display->flush ();
1022} 1028}
1023 1029
1030/* checks wether a refresh is requested and starts the refresh timer */
1024void 1031void
1025rxvt_term::check_cb (check_watcher &w) 1032rxvt_term::refresh_check ()
1026{ 1033{
1027 SET_R (this); 1034 if (want_refresh && !flush_ev.is_active ())
1028 SET_LOCALE (locale); 1035 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1029 1036
1030 display->flush (); 1037 display->flush ();
1031
1032 if (want_refresh && !flush_ev.active)
1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1034} 1038}
1035 1039
1036void 1040void
1037rxvt_term::flush_cb (time_watcher &w) 1041rxvt_term::flush_cb (ev::timer &w, int revents)
1038{ 1042{
1039 SET_R (this); 1043 make_current ();
1040 SET_LOCALE (locale);
1041 1044
1042 refresh_limit = 1;
1043 refresh_count = 0; 1045 refresh_count = 0;
1044 flush (); 1046 flush ();
1045} 1047}
1046 1048
1047#ifdef CURSOR_BLINK 1049#ifdef CURSOR_BLINK
1048void 1050void
1049rxvt_term::cursor_blink_cb (time_watcher &w) 1051rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1050{ 1052{
1051 hidden_cursor = !hidden_cursor; 1053 hidden_cursor = !hidden_cursor;
1052 want_refresh = 1; 1054 want_refresh = 1;
1053 1055 refresh_check ();
1054 w.start (w.at + BLINK_INTERVAL);
1055} 1056}
1056#endif 1057#endif
1057 1058
1058#ifdef TEXT_BLINK 1059#ifdef TEXT_BLINK
1059void 1060void
1060rxvt_term::text_blink_cb (time_watcher &w) 1061rxvt_term::text_blink_cb (ev::timer &w, int revents)
1061{ 1062{
1062 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1063 if (scr_refresh_rend (RS_Blink, RS_Blink))
1063 { 1064 {
1064 hidden_text = !hidden_text; 1065 hidden_text = !hidden_text;
1065 want_refresh = 1; 1066 want_refresh = 1;
1066 w.start (w.at + TEXT_BLINK_INTERVAL); 1067 refresh_check ();
1067 } 1068 }
1069 else
1070 w.stop ();
1068} 1071}
1069#endif 1072#endif
1070 1073
1071#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1074#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1072void 1075void
1073rxvt_term::cont_scroll_cb (time_watcher &w) 1076rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1074{ 1077{
1075 if ((scrollbar_isUp() || scrollbar_isDn()) && 1078 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1076 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1079 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1077 { 1080 {
1078 refresh_type |= SMOOTH_REFRESH;
1079 want_refresh = 1; 1081 want_refresh = 1;
1080 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1082 refresh_check ();
1081 } 1083 }
1084 else
1085 w.stop ();
1082} 1086}
1083#endif 1087#endif
1084 1088
1085#ifdef SELECTION_SCROLLING 1089#ifdef SELECTION_SCROLLING
1086void 1090void
1087rxvt_term::sel_scroll_cb (time_watcher &w) 1091rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1088{ 1092{
1089 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1093 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090 { 1094 {
1091 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1095 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092 refresh_type |= SMOOTH_REFRESH;
1093 want_refresh = 1; 1096 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1097 refresh_check ();
1095 } 1098 }
1099 else
1100 w.stop ();
1096} 1101}
1097#endif 1102#endif
1098 1103
1099#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1104#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1100void 1105void
1101rxvt_term::slip_wheel_cb (time_watcher &w) 1106rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1102{ 1107{
1103 if (mouse_slip_wheel_speed == 0 1108 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105 : scr_page (UP, mouse_slip_wheel_speed))
1106 { 1109 {
1107 if (view_start == nsaved ||
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0;
1110
1111 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1; 1110 want_refresh = 1;
1113 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)
1114 } 1115 {
1116 mouse_slip_wheel_speed = 0;
1117 w.stop ();
1118 }
1115} 1119}
1116#endif 1120#endif
1117 1121
1118#if HAVE_SCHED_YIELD 1122#if LINUX_YIELD_HACK
1119static struct event_handler 1123static struct event_handler
1120{ 1124{
1121 check_watcher cw_yield; 1125 ev::prepare yield_ev;
1122 1126
1123 void yield (check_watcher &w) 1127 void yield_cb (ev::prepare &w, int revents)
1124 { 1128 {
1125 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
1126 w.stop (); 1137 w.stop ();
1127 } 1138 }
1128 1139
1129 event_handler () 1140 event_handler ()
1130 : cw_yield (this, &event_handler::yield) 1141 : yield_ev (this, &event_handler::yield_cb)
1131 { 1142 {
1132 } 1143 }
1133} event_handler; 1144} event_handler;
1134#endif 1145#endif
1135 1146
… …
1146 1157
1147 memmove (cmdbuf_base, cmdbuf_ptr, n); 1158 memmove (cmdbuf_base, cmdbuf_ptr, n);
1148 cmdbuf_ptr = cmdbuf_base; 1159 cmdbuf_ptr = cmdbuf_base;
1149 cmdbuf_endp = cmdbuf_ptr + n; 1160 cmdbuf_endp = cmdbuf_ptr + n;
1150 1161
1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1162 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152 1163
1153 if (r > 0) 1164 if (r > 0)
1154 { 1165 {
1155 cmdbuf_endp += r; 1166 cmdbuf_endp += r;
1156 return true; 1167 return true;
1157 } 1168 }
1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1169 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 { 1170 {
1160#if HAVE_SCHED_YIELD 1171#if LINUX_YIELD_HACK
1161 if (display->is_local) 1172 if (display->is_local)
1162 event_handler.cw_yield.start (); 1173 event_handler.yield_ev.start ();
1163#endif 1174#endif
1164 } 1175 }
1165 else 1176 else
1166 { 1177 {
1167 pty_ev.stop (); 1178 pty_ev.stop ();
1168 1179
1169 if (!OPTION (Opt_hold)) 1180 if (!option (Opt_hold))
1170 destroy (); 1181 destroy ();
1171 } 1182 }
1172 1183
1173 return false; 1184 return false;
1174} 1185}
1175 1186
1176void 1187void
1177rxvt_term::pty_cb (io_watcher &w, short revents) 1188rxvt_term::pty_cb (ev::io &w, int revents)
1178{ 1189{
1179 SET_R (this); 1190 make_current ();
1180 SET_LOCALE (locale);
1181 1191
1182 if (revents & EVENT_READ) 1192 if (revents & ev::READ)
1183 // loop, but don't allow a single term to monopolize us 1193 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ()) 1194 while (pty_fill ())
1185 if (cmd_parse ()) 1195 if (cmd_parse ())
1186 break; 1196 break;
1187 1197
1188 if (revents & EVENT_WRITE) 1198 if (revents & ev::WRITE)
1189 pty_write (); 1199 pty_write ();
1200
1201 refresh_check ();
1190} 1202}
1191 1203
1192void 1204void
1193rxvt_term::pointer_unblank () 1205rxvt_term::pointer_unblank ()
1194{ 1206{
1195 XDefineCursor (display->display, vt, TermWin_cursor); 1207 XDefineCursor (dpy, vt, TermWin_cursor);
1196 recolour_cursor (); 1208 recolour_cursor ();
1197 1209
1198#ifdef POINTER_BLANK 1210#ifdef POINTER_BLANK
1199 hidden_pointer = 0; 1211 hidden_pointer = 0;
1200 1212
1201 if (OPTION (Opt_pointerBlank)) 1213 if (option (Opt_pointerBlank))
1202 pointer_ev.start (NOW + pointerBlankDelay); 1214 pointer_ev.start (pointerBlankDelay);
1203#endif 1215#endif
1204} 1216}
1205 1217
1206#ifdef POINTER_BLANK 1218#ifdef POINTER_BLANK
1207void 1219void
1208rxvt_term::pointer_blank () 1220rxvt_term::pointer_blank ()
1209{ 1221{
1210 if (!OPTION (Opt_pointerBlank)) 1222 if (!option (Opt_pointerBlank))
1211 return; 1223 return;
1212 1224
1213 XDefineCursor (display->display, vt, display->blank_cursor); 1225 XDefineCursor (dpy, vt, display->blank_cursor);
1214 XFlush (display->display); 1226 XFlush (dpy);
1215 1227
1216 hidden_pointer = 1; 1228 hidden_pointer = 1;
1217} 1229}
1218 1230
1219void 1231void
1220rxvt_term::pointer_cb (time_watcher &w) 1232rxvt_term::pointer_cb (ev::timer &w, int revents)
1221{ 1233{
1222 SET_R (this); 1234 make_current ();
1223 SET_LOCALE (locale);
1224 1235
1225 pointer_blank (); 1236 pointer_blank ();
1226} 1237}
1227#endif 1238#endif
1228 1239
1229void 1240void
1230rxvt_term::mouse_report (XButtonEvent &ev) 1241rxvt_term::mouse_report (XButtonEvent &ev)
1231{ 1242{
1232 int button_number, key_state = 0; 1243 int button_number, key_state = 0;
1233 int x, y; 1244 int x, y;
1245 int code = 32;
1234 1246
1235 x = ev.x; 1247 x = Pixel2Col (ev.x);
1236 y = ev.y; 1248 y = Pixel2Row (ev.y);
1237 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 }
1238 1257
1239 if (MEvent.button == AnyButton) 1258 if (MEvent.button == AnyButton)
1240 button_number = 3; 1259 button_number = 3;
1241 else 1260 else
1242 { 1261 {
… …
1288 x + 1, 1307 x + 1,
1289 y + 1); 1308 y + 1);
1290#endif 1309#endif
1291 1310
1292 tt_printf ("\033[M%c%c%c", 1311 tt_printf ("\033[M%c%c%c",
1293 (32 + button_number + key_state), 1312 (code + button_number + key_state),
1294 (32 + x + 1), 1313 (32 + x + 1),
1295 (32 + y + 1)); 1314 (32 + y + 1));
1296} 1315}
1297
1298#ifdef USING_W11LIB
1299void
1300rxvt_W11_process_x_event (XEvent *ev)
1301{
1302 rxvt_t *r = rxvt_get_r ();
1303
1304 x_cb (*ev);
1305}
1306#endif
1307 1316
1308/*{{{ process an X event */ 1317/*{{{ process an X event */
1309void 1318void
1310rxvt_term::x_cb (XEvent &ev) 1319rxvt_term::x_cb (XEvent &ev)
1311{ 1320{
1312 dDisp; 1321 make_current ();
1313 1322
1314 SET_R (this); 1323 dLocal (Display *, dpy);
1315 SET_LOCALE (locale);
1316 1324
1317#if defined(CURSOR_BLINK) 1325 if (ev.xany.window == vt
1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1326 && SHOULD_INVOKE (HOOK_X_EVENT)
1319 { 1327 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1320 if (hidden_cursor) 1328 return;
1321 {
1322 hidden_cursor = 0;
1323 want_refresh = 1;
1324 }
1325 1329
1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1330 // for XQueryPointer
1327 }
1328#endif
1329
1330#if defined(POINTER_BLANK)
1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1332 {
1333 if (ev.type == MotionNotify
1334 || ev.type == ButtonPress
1335 || ev.type == ButtonRelease)
1336 if (hidden_pointer)
1337 pointer_unblank ();
1338
1339 if (ev.type == KeyPress && hidden_pointer == 0)
1340 pointer_blank ();
1341 }
1342#endif
1343
1344 Window unused_root, unused_child; 1331 Window unused_root, unused_child;
1345 int unused_root_x, unused_root_y; 1332 int unused_root_x, unused_root_y;
1346 unsigned int unused_mask; 1333 unsigned int unused_mask;
1347 1334
1348 switch (ev.type) 1335 switch (ev.type)
1349 { 1336 {
1350 case KeyPress: 1337 case KeyPress:
1351#if ISO_14755 1338 key_press (ev.xkey);
1352 if (!(iso14755buf & ISO_14755_52))
1353#endif
1354 lookup_key (ev.xkey);
1355
1356 break; 1339 break;
1357 1340
1358 case KeyRelease: 1341 case KeyRelease:
1359 { 1342 key_release (ev.xkey);
1360#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1361 KeySym ks;
1362
1363 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364#endif
1365
1366#if ENABLE_FRILLS || ISO_14755
1367 // ISO 14755 support
1368 if (iso14755buf)
1369 if (iso14755buf & ISO_14755_52)
1370 {
1371# if ENABLE_OVERLAY
1372 scr_overlay_off ();
1373# endif
1374# if ISO_14755
1375 // iso14755 part 5.2 handling: release time
1376 // first: controls
1377 if ((ev.xkey.state & ControlMask)
1378 && ((ks >= 0x40 && ks <= 0x5f)
1379 || (ks >= 0x61 && ks <= 0x7f)))
1380 {
1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1382 commit_iso14755 ();
1383 return; // case-break;
1384 }
1385
1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387 if (i[0] == ks)
1388 {
1389 iso14755buf = ISO_14755_51 | i[1];
1390 commit_iso14755 ();
1391 return; // case-break;
1392 }
1393
1394 scr_bell ();
1395# endif
1396 iso14755buf = 0;
1397 break;
1398 }
1399 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1400 {
1401# if ENABLE_OVERLAY
1402 scr_overlay_off ();
1403# endif
1404 if (iso14755buf & ISO_14755_51)
1405 commit_iso14755 ();
1406#if ISO_14755
1407 else if (iso14755buf & ISO_14755_STARTED)
1408 {
1409 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1410
1411 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1412 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1413 }
1414# endif
1415 else
1416 iso14755buf = 0;
1417 }
1418#endif
1419
1420 if (ev.xany.window == vt && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1421 break;
1422
1423#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1424 if (!(ev.xkey.state & ControlMask))
1425 slip_wheel_ev.stop ();
1426 else if (ks == XK_Control_L || ks == XK_Control_R)
1427 mouse_slip_wheel_speed = 0;
1428#endif
1429 break; 1343 break;
1430 }
1431 1344
1432 case ButtonPress: 1345 case ButtonPress:
1433 button_press (ev.xbutton); 1346 button_press (ev.xbutton);
1434 break; 1347 break;
1435 1348
… …
1437 button_release (ev.xbutton); 1350 button_release (ev.xbutton);
1438 break; 1351 break;
1439 1352
1440 case ClientMessage: 1353 case ClientMessage:
1441 if (ev.xclient.format == 32 1354 if (ev.xclient.format == 32
1442 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1355 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1443 { 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 {
1444 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)))
1445 destroy (); 1364 destroy ();
1365 }
1446#if ENABLE_EWMH 1366#if ENABLE_EWMH
1447 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])
1448 XSendEvent (disp, ev.xclient.window = display->root, 1368 XSendEvent (dpy, ev.xclient.window = display->root,
1449 False, SubstructureRedirectMask | SubstructureNotifyMask, 1369 False, SubstructureRedirectMask | SubstructureNotifyMask,
1450 &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 }
1451#endif 1382#endif
1452 } 1383 }
1453#if ENABLE_XEMBED
1454 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1455 {
1456 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1457 focus_in ();
1458 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1459 focus_out ();
1460 }
1461#endif
1462#ifdef OFFIX_DND
1463 /* OffiX Dnd (drag 'n' drop) protocol */
1464 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1465 && (ev.xclient.data.l[0] == DndFile
1466 || ev.xclient.data.l[0] == DndDir
1467 || ev.xclient.data.l[0] == DndLink))
1468 {
1469 /* Get Dnd data */
1470 Atom ActualType;
1471 int ActualFormat;
1472 unsigned char *data;
1473 unsigned long Size, RemainingBytes;
1474
1475 XGetWindowProperty (disp, display->root,
1476 xa[XA_DNDSELECTION],
1477 0L, 1000000L,
1478 False, AnyPropertyType,
1479 &ActualType, &ActualFormat,
1480 &Size, &RemainingBytes,
1481 &data);
1482 set_string_property (XA_CUT_BUFFER0, data);
1483 XFree (data);
1484 selection_paste (display->root, XA_CUT_BUFFER0, true);
1485 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1486 }
1487#endif /* OFFIX_DND */
1488 break;
1489
1490 case MappingNotify:
1491 XRefreshKeyboardMapping (&ev.xmapping);
1492 break; 1384 break;
1493 1385
1494 /* 1386 /*
1495 * XXX: this is not the _current_ arrangement 1387 * XXX: this is not the _current_ arrangement
1496 * Here's my conclusion: 1388 * Here's my conclusion:
… …
1515 break; 1407 break;
1516 } 1408 }
1517 break; 1409 break;
1518 1410
1519 case FocusIn: 1411 case FocusIn:
1412 if (ev.xfocus.detail != NotifyInferior
1413 && ev.xfocus.detail != NotifyPointer
1414 && ev.xfocus.mode != NotifyGrab)
1520 focus_in (); 1415 focus_in ();
1521 break; 1416 break;
1522 1417
1523 case FocusOut: 1418 case FocusOut:
1419 if (ev.xfocus.detail != NotifyInferior
1420 && ev.xfocus.detail != NotifyPointer
1421 && ev.xfocus.mode != NotifyGrab)
1524 focus_out (); 1422 focus_out ();
1525 break; 1423 break;
1526 1424
1527 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);*/
1528 if (ev.xconfigure.window == parent[0]) 1429 if (ev.xconfigure.window == parent[0])
1529 { 1430 {
1530 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1431 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1531 ; 1432 ;
1532 1433
1533 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1434 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1534 { 1435 {
1535 seen_resize = 1; 1436 seen_resize = 1;
1536 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1437 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1537 } 1438 }
1538 1439 else
1539#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1440 {
1540 if (OPTION (Opt_transparent)) 1441#ifdef HAVE_BG_PIXMAP
1541 check_our_parents (); 1442 if (bgPixmap.window_position_sensitive ())
1443 {
1444 if (mapped)
1445 update_background ();
1446 else
1447 bgPixmap.invalidate ();
1448 }
1542#endif 1449#endif
1450 }
1451
1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1543 } 1453 }
1544 break; 1454 break;
1545 1455
1546 case PropertyNotify: 1456 case PropertyNotify:
1457 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1547 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1458 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1548 && ev.xproperty.state == PropertyNewValue) 1459 && ev.xproperty.state == PropertyNewValue)
1549 selection_property (ev.xproperty.window, ev.xproperty.atom); 1460 selection_property (ev.xproperty.window, ev.xproperty.atom);
1550 1461
1551 break; 1462 break;
1552 1463
1553 case SelectionClear: 1464 case SelectionClear:
1554 selection_clear (); 1465 selection_clear ();
… …
1559 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1470 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1560 break; 1471 break;
1561 1472
1562 case SelectionRequest: 1473 case SelectionRequest:
1563 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));
1564 break; 1499 break;
1565 1500
1566 case UnmapNotify: 1501 case UnmapNotify:
1567 mapped = 0; 1502 mapped = 0;
1568#ifdef TEXT_BLINK 1503#ifdef TEXT_BLINK
1569 text_blink_ev.stop (); 1504 text_blink_ev.stop ();
1570#endif 1505#endif
1506 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1571 break; 1507 break;
1572
1573 case MapNotify:
1574 mapped = 1;
1575#ifdef TEXT_BLINK
1576 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1577#endif
1578 break;
1579
1580#ifdef TRANSPARENT
1581 case ReparentNotify:
1582 rootwin_cb (ev);
1583 break;
1584#endif /* TRANSPARENT */
1585 1508
1586 case GraphicsExpose: 1509 case GraphicsExpose:
1587 case Expose: 1510 case Expose:
1588 if (ev.xany.window == vt) 1511 if (ev.xany.window == vt)
1589 { 1512 {
1590 do 1513 do
1514 {
1591 scr_expose (ev.xexpose.x, ev.xexpose.y, 1515 scr_expose (ev.xexpose.x, ev.xexpose.y,
1592 ev.xexpose.width, ev.xexpose.height, False); 1516 ev.xexpose.width, ev.xexpose.height, False);
1517 }
1593 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1518 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1594 1519
1595 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1520 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1596 1521
1597 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1522 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1523 {
1598 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1599 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1526 }
1600 1527
1601 scr_refresh (refresh_type); 1528 want_refresh = 1;
1602 } 1529 }
1603 else 1530 else
1604 { 1531 {
1605 XEvent unused_event; 1532 XEvent unused_event;
1606 1533
1607 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1534 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1608 ; 1535 ;
1609 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1536 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1610 ; 1537 ;
1611 1538
1612 if (isScrollbarWindow (ev.xany.window)) 1539 if (scrollBar.state && ev.xany.window == scrollBar.win)
1613 { 1540 {
1614 scrollBar.setIdle (); 1541 scrollBar.state = STATE_IDLE;
1615 scrollbar_show (0); 1542 scrollbar_show (0);
1616 } 1543 }
1617#ifdef MENUBAR
1618 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1619 menubar_expose ();
1620#endif
1621
1622#ifdef TRANSPARENT
1623 if (am_transparent && ev.xany.window == parent[0])
1624 XClearWindow (disp, ev.xany.window);
1625#endif
1626 } 1544 }
1627 break; 1545 break;
1628 1546
1629 case MotionNotify: 1547 case MotionNotify:
1630#ifdef POINTER_BLANK 1548#ifdef POINTER_BLANK
1631 if (hidden_pointer) 1549 if (hidden_pointer)
1632 pointer_unblank (); 1550 pointer_unblank ();
1633#endif 1551#endif
1634#if MENUBAR 1552 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1635 if (isMenuBarWindow (ev.xany.window)) 1553 || priv_modes & PrivMode_MouseAnyEvent)
1636 {
1637 menubar_control (ev.xbutton); 1554 mouse_report (ev.xbutton);
1638 break;
1639 }
1640#endif
1641 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1555 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1642 break; 1556 break;
1643 1557
1644 if (ev.xany.window == vt) 1558 if (ev.xany.window == vt)
1645 { 1559 {
1560 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1646 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1561 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1647 ; // nop 1562 ; // nop
1648 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1563 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1649 { 1564 {
1650 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1565 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1651 ; 1566 ;
1652 1567
1653 XQueryPointer (disp, vt, 1568 XQueryPointer (dpy, vt,
1654 &unused_root, &unused_child, 1569 &unused_root, &unused_child,
1655 &unused_root_x, &unused_root_y, 1570 &unused_root_x, &unused_root_y,
1656 &ev.xbutton.x, &ev.xbutton.y, 1571 &ev.xbutton.x, &ev.xbutton.y,
1657 &ev.xbutton.state); 1572 &ev.xbutton.state);
1658#ifdef MOUSE_THRESHOLD 1573#ifdef MOUSE_THRESHOLD
… …
1678 int dist; 1593 int dist;
1679 1594
1680 /* don't clobber the current delay if we are 1595 /* don't clobber the current delay if we are
1681 * already in the middle of scrolling. 1596 * already in the middle of scrolling.
1682 */ 1597 */
1683 if (!sel_scroll_ev.active) 1598 if (!sel_scroll_ev.is_active ())
1684 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1599 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1685 1600
1686 /* save the event params so we can highlight 1601 /* save the event params so we can highlight
1687 * the selection in the pending-scroll loop 1602 * the selection in the pending-scroll loop
1688 */ 1603 */
1689 selection_save_x = ev.xbutton.x; 1604 selection_save_x = ev.xbutton.x;
… …
1711 else 1626 else
1712 { 1627 {
1713 /* we are within the text window, so we 1628 /* we are within the text window, so we
1714 * shouldn't be scrolling 1629 * shouldn't be scrolling
1715 */ 1630 */
1716 if (sel_scroll_ev.active)
1717 sel_scroll_ev.stop(); 1631 sel_scroll_ev.stop();
1718 } 1632 }
1719#endif 1633#endif
1720#ifdef MOUSE_THRESHOLD 1634#ifdef MOUSE_THRESHOLD
1721 } 1635 }
1722#endif 1636#endif
1723 } 1637 }
1724 } 1638 }
1725 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1639 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1726 { 1640 {
1727 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1641 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1728 MotionNotify, &ev)) 1642 MotionNotify, &ev))
1729 ; 1643 ;
1730 1644
1731 XQueryPointer (disp, scrollBar.win, 1645 XQueryPointer (dpy, scrollBar.win,
1732 &unused_root, &unused_child, 1646 &unused_root, &unused_child,
1733 &unused_root_x, &unused_root_y, 1647 &unused_root_x, &unused_root_y,
1734 &ev.xbutton.x, &ev.xbutton.y, 1648 &ev.xbutton.x, &ev.xbutton.y,
1735 &unused_mask); 1649 &unused_mask);
1736 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1650 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1737 scrollbar_size ()); 1651 scrollbar_size ());
1738 scr_refresh (refresh_type);
1739 refresh_limit = 0; 1652 want_refresh = 1;
1740 scrollbar_show (1); 1653 scrollbar_show (1);
1741 } 1654 }
1742 break; 1655 break;
1743 } 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 ();
1744} 1686}
1745 1687
1746void 1688void
1747rxvt_term::focus_in () 1689rxvt_term::focus_in ()
1748{ 1690{
1749 if (!focus) 1691 if (!focus)
1750 { 1692 {
1751 focus = 1; 1693 focus = 1;
1752 want_refresh = 1; 1694 want_refresh = 1;
1753 1695
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1696 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1755 1697
1756#if USE_XIM 1698#if USE_XIM
1757 if (Input_Context != NULL) 1699 if (Input_Context != NULL)
1758 { 1700 {
1759 IMSetStatusPosition (); 1701 IMSetPosition ();
1760 XSetICFocus (Input_Context); 1702 XSetICFocus (Input_Context);
1761 } 1703 }
1762#endif 1704#endif
1763#if CURSOR_BLINK 1705#if CURSOR_BLINK
1764 if (OPTION (Opt_cursorBlink)) 1706 if (option (Opt_cursorBlink))
1765 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1707 cursor_blink_ev.again ();
1766#endif 1708#endif
1767#if OFF_FOCUS_FADING 1709#if OFF_FOCUS_FADING
1768 if (rs[Rs_fade]) 1710 if (rs[Rs_fade])
1769 { 1711 {
1770 pix_colors = pix_colors_focused; 1712 pix_colors = pix_colors_focused;
1771 scr_recolour (); 1713 scr_recolour ();
1772 } 1714 }
1773#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
1774 } 1726 }
1775} 1727}
1776 1728
1777void 1729void
1778rxvt_term::focus_out () 1730rxvt_term::focus_out ()
… …
1786 1738
1787#if ENABLE_FRILLS || ISO_14755 1739#if ENABLE_FRILLS || ISO_14755
1788 if (iso14755buf) 1740 if (iso14755buf)
1789 { 1741 {
1790 iso14755buf = 0; 1742 iso14755buf = 0;
1791# if ENABLE_OVERLAY 1743# if ISO_14755
1792 scr_overlay_off (); 1744 scr_overlay_off ();
1793# endif 1745# endif
1794 } 1746 }
1795#endif 1747#endif
1796#if USE_XIM 1748#if USE_XIM
1797 if (Input_Context != NULL) 1749 if (Input_Context != NULL)
1798 XUnsetICFocus (Input_Context); 1750 XUnsetICFocus (Input_Context);
1799#endif 1751#endif
1800#if CURSOR_BLINK 1752#if CURSOR_BLINK
1801 if (OPTION (Opt_cursorBlink)) 1753 if (option (Opt_cursorBlink))
1802 cursor_blink_ev.stop (); 1754 cursor_blink_ev.stop ();
1755
1803 hidden_cursor = 0; 1756 hidden_cursor = 0;
1804#endif 1757#endif
1805#if OFF_FOCUS_FADING 1758#if OFF_FOCUS_FADING
1806 if (rs[Rs_fade]) 1759 if (rs[Rs_fade])
1807 { 1760 {
… …
1810 } 1763 }
1811#endif 1764#endif
1812 } 1765 }
1813} 1766}
1814 1767
1815#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
1816void 1782void
1817rxvt_term::rootwin_cb (XEvent &ev) 1783rxvt_term::rootwin_cb (XEvent &ev)
1818{ 1784{
1819 SET_R (this); 1785 make_current ();
1820 SET_LOCALE (locale);
1821 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
1822 switch (ev.type) 1792 switch (ev.type)
1823 { 1793 {
1824 case PropertyNotify: 1794 case PropertyNotify:
1825 /* 1795 /*
1826 * 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,
1827 * 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.
1828 */ 1798 */
1829 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1799 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1830 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1800 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1831 return; 1801 {
1802 bgPixmap.set_root_pixmap ();
1803 update_background ();
1804 }
1832 1805
1833 /* FALLTHROUGH */
1834 case ReparentNotify:
1835 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1836 want_refresh = want_full_refresh = 1;
1837 break; 1806 break;
1838 } 1807 }
1808# endif
1809
1810 refresh_check ();
1839} 1811}
1840#endif 1812#endif
1841 1813
1842void 1814void
1843rxvt_term::button_press (XButtonEvent &ev) 1815rxvt_term::button_press (XButtonEvent &ev)
… …
1852 /* 1824 /*
1853 * VT window processing of button press 1825 * VT window processing of button press
1854 */ 1826 */
1855 if (ev.window == vt) 1827 if (ev.window == vt)
1856 { 1828 {
1829 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1830 return;
1831
1857#if ISO_14755 1832#if ISO_14755
1858 // 5.4 1833 // 5.4
1859 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1834 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1860 { 1835 {
1861 iso14755_54 (ev.x, ev.y); 1836 iso14755_54 (ev.x, ev.y);
… …
1873#ifdef MOUSE_REPORT_DOUBLECLICK 1848#ifdef MOUSE_REPORT_DOUBLECLICK
1874 if (ev.button == MEvent.button && clickintime) 1849 if (ev.button == MEvent.button && clickintime)
1875 { 1850 {
1876 /* same button, within alloted time */ 1851 /* same button, within alloted time */
1877 MEvent.clicks++; 1852 MEvent.clicks++;
1853
1878 if (MEvent.clicks > 1) 1854 if (MEvent.clicks > 1)
1879 { 1855 {
1880 /* only report double clicks */ 1856 /* only report double clicks */
1881 MEvent.clicks = 2; 1857 MEvent.clicks = 2;
1882 mouse_report (ev); 1858 mouse_report (ev);
… …
1894 mouse_report (ev); 1870 mouse_report (ev);
1895 } 1871 }
1896#else 1872#else
1897 MEvent.button = ev.button; 1873 MEvent.button = ev.button;
1898 mouse_report (ev); 1874 mouse_report (ev);
1899#endif /* MOUSE_REPORT_DOUBLECLICK */ 1875#endif /* MOUSE_REPORT_DOUBLECLICK */
1900 1876
1901 } 1877 }
1902 else 1878 else
1903 { 1879 {
1904 if (ev.button != MEvent.button) 1880 if (ev.button != MEvent.button)
1905 MEvent.clicks = 0; 1881 MEvent.clicks = 0;
1906 1882
1907 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1908 switch (ev.button) 1883 switch (ev.button)
1909 { 1884 {
1910 case Button1: 1885 case Button1:
1911 /* allow meta + click to select rectangular areas */ 1886 /* allow meta + click to select rectangular areas */
1912 /* should be done in screen.C */ 1887 /* should be done in screen.C */
1913#if ENABLE_FRILLS 1888#if ENABLE_FRILLS
1914 selection.rect = !!(ev.state & ModMetaMask); 1889 selection.rect = !!(ev.state & ModMetaMask);
1915#else 1890#else
1916 selection.rect = false; 1891 selection.rect = false;
1917#endif 1892#endif
1918 1893
1919 /* allow shift+left click to extend selection */ 1894 /* allow shift+left click to extend selection */
1920 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1895 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1921 { 1896 {
1922 if (MEvent.button == Button1 && clickintime) 1897 if (MEvent.button == Button1 && clickintime)
1923 selection_rotate (ev.x, ev.y); 1898 selection_rotate (ev.x, ev.y);
1924 else 1899 else
1925 selection_extend (ev.x, ev.y, 1); 1900 selection_extend (ev.x, ev.y, 1);
1926 } 1901 }
1927 else 1902 else
1928 { 1903 {
1929 if (MEvent.button == Button1 && clickintime) 1904 if (MEvent.button == Button1 && clickintime)
1930 MEvent.clicks++; 1905 MEvent.clicks++;
1931 else 1906 else
1932 MEvent.clicks = 1; 1907 MEvent.clicks = 1;
1933 1908
1934 selection_click (MEvent.clicks, ev.x, ev.y); 1909 selection_click (MEvent.clicks, ev.x, ev.y);
1935 } 1910 }
1936 1911
1937 MEvent.button = Button1; 1912 MEvent.button = Button1;
1938 break; 1913 break;
1939 1914
1940 case Button3: 1915 case Button3:
1941 if (MEvent.button == Button3 && clickintime) 1916 if (MEvent.button == Button3 && clickintime)
1942 selection_rotate (ev.x, ev.y); 1917 selection_rotate (ev.x, ev.y);
1943 else 1918 else
1944 selection_extend (ev.x, ev.y, 1); 1919 selection_extend (ev.x, ev.y, 1);
1945 1920
1946 MEvent.button = Button3; 1921 MEvent.button = Button3;
1947 break; 1922 break;
1948 } 1923 }
1949 } 1924 }
1950 1925
1951 MEvent.time = ev.time; 1926 MEvent.time = ev.time;
1952 return; 1927 return;
1953 } 1928 }
1954 1929
1955 /* 1930 /*
1956 * Scrollbar window processing of button press 1931 * Scrollbar window processing of button press
1957 */ 1932 */
1958 if (isScrollbarWindow (ev.window)) 1933 if (scrollBar.state && ev.window == scrollBar.win)
1959 { 1934 {
1960 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;
1961 /* 1943 /*
1962 * Rxvt-style scrollbar: 1944 * Rxvt-style scrollbar:
1963 * move up if mouse is above slider 1945 * move up if mouse is above slider
1964 * move dn if mouse is below slider 1946 * move dn if mouse is below slider
1965 * 1947 *
… …
1974 /* 1956 /*
1975 * Mouse report disabled scrollbar: 1957 * Mouse report disabled scrollbar:
1976 * arrow buttons - send up/down 1958 * arrow buttons - send up/down
1977 * click on scrollbar - send pageup/down 1959 * click on scrollbar - send pageup/down
1978 */ 1960 */
1979 if ((scrollBar.style == R_SB_NEXT 1961 if (direction == UP)
1980 && scrollbarnext_upButton (ev.y))
1981 || (scrollBar.style == R_SB_RXVT
1982 && scrollbarrxvt_upButton (ev.y)))
1983 tt_printf ("\033[A"); 1962 tt_printf ("\033[A");
1984 else if ((scrollBar.style == R_SB_NEXT 1963 else if (direction == DN)
1985 && scrollbarnext_dnButton (ev.y))
1986 || (scrollBar.style == R_SB_RXVT
1987 && scrollbarrxvt_dnButton (ev.y)))
1988 tt_printf ("\033[B"); 1964 tt_printf ("\033[B");
1989 else 1965 else
1990 switch (ev.button) 1966 switch (ev.button)
1991 { 1967 {
1992 case Button2: 1968 case Button2:
… …
1999 tt_printf ("\033[5~"); 1975 tt_printf ("\033[5~");
2000 break; 1976 break;
2001 } 1977 }
2002 } 1978 }
2003 else 1979 else
2004#endif /* NO_SCROLLBAR_REPORT */ 1980#endif /* NO_SCROLLBAR_REPORT */
2005
2006 {
2007 char upordown = 0;
2008
2009 if (scrollBar.style == R_SB_NEXT)
2010 { 1981 {
2011 if (scrollbarnext_upButton (ev.y)) 1982 if (direction != NO_DIR)
2012 upordown = -1; /* up */
2013 else if (scrollbarnext_dnButton (ev.y))
2014 upordown = 1; /* down */
2015 }
2016 else if (scrollBar.style == R_SB_RXVT)
2017 {
2018 if (scrollbarrxvt_upButton (ev.y))
2019 upordown = -1; /* up */
2020 else if (scrollbarrxvt_dnButton (ev.y))
2021 upordown = 1; /* down */
2022 }
2023 if (upordown)
2024 { 1983 {
2025#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1984#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1985 if (!cont_scroll_ev.is_active ())
2026 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1986 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2027#endif 1987#endif
2028 if (scr_page (upordown < 0 ? UP : DN, 1)) 1988 if (scr_page (direction, 1))
2029 { 1989 {
2030 if (upordown < 0) 1990 if (direction == UP)
2031 scrollBar.setUp (); 1991 scrollBar.state = STATE_UP;
2032 else 1992 else
2033 scrollBar.setDn (); 1993 scrollBar.state = STATE_DOWN;
2034 } 1994 }
2035 } 1995 }
2036 else 1996 else
2037 switch (ev.button) 1997 switch (ev.button)
2038 { 1998 {
2039 case Button2: 1999 case Button2:
2040 switch (scrollbar_align) 2000 switch (scrollBar.align)
2041 { 2001 {
2042 case R_SB_ALIGN_TOP: 2002 case R_SB_ALIGN_TOP:
2043 csrO = 0; 2003 csrO = 0;
2044 break; 2004 break;
2045 case R_SB_ALIGN_CENTRE: 2005 case R_SB_ALIGN_CENTRE:
… …
2053 if (scrollBar.style == R_SB_XTERM 2013 if (scrollBar.style == R_SB_XTERM
2054 || scrollbar_above_slider (ev.y) 2014 || scrollbar_above_slider (ev.y)
2055 || scrollbar_below_slider (ev.y)) 2015 || scrollbar_below_slider (ev.y))
2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2016 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2057 2017
2058 scrollBar.setMotion (); 2018 scrollBar.state = STATE_MOTION;
2059 break; 2019 break;
2060 2020
2061 case Button1: 2021 case Button1:
2062 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2022 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2063 csrO = ev.y - scrollBar.top; 2023 csrO = ev.y - scrollBar.top;
2064 /* FALLTHROUGH */ 2024 /* FALLTHROUGH */
2065 2025
2066 case Button3: 2026 case Button3:
2067 if (scrollBar.style != R_SB_XTERM) 2027 if (scrollBar.style != R_SB_XTERM)
… …
2077 scr_page (DN, nrow - 1); 2037 scr_page (DN, nrow - 1);
2078# else 2038# else
2079 scr_page (DN, nrow / 4); 2039 scr_page (DN, nrow / 4);
2080# endif 2040# endif
2081 else 2041 else
2082 scrollBar.setMotion (); 2042 scrollBar.state = STATE_MOTION;
2083 } 2043 }
2084 else 2044 else
2085 { 2045 {
2086 scr_page ((ev.button == Button1 ? DN : UP), 2046 scr_page ((ev.button == Button1 ? DN : UP),
2087 (nrow 2047 (nrow
… …
2090 } 2050 }
2091 2051
2092 break; 2052 break;
2093 } 2053 }
2094 } 2054 }
2055
2095 return; 2056 return;
2096 } 2057 }
2097#if MENUBAR
2098 /*
2099 * Menubar window processing of button press
2100 */
2101 if (isMenuBarWindow (ev.window))
2102 menubar_control (ev);
2103#endif
2104} 2058}
2105 2059
2106void 2060void
2107rxvt_term::button_release (XButtonEvent &ev) 2061rxvt_term::button_release (XButtonEvent &ev)
2108{ 2062{
… …
2110 2064
2111 csrO = 0; /* reset csr Offset */ 2065 csrO = 0; /* reset csr Offset */
2112 if (!bypass_keystate) 2066 if (!bypass_keystate)
2113 reportmode = !! (priv_modes & PrivMode_mouse_report); 2067 reportmode = !! (priv_modes & PrivMode_mouse_report);
2114 2068
2115 if (scrollbar_isUpDn ()) 2069 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2116 { 2070 {
2117 scrollBar.setIdle (); 2071 scrollBar.state = STATE_IDLE;
2118 scrollbar_show (0); 2072 scrollbar_show (0);
2119#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2120 refresh_type &= ~SMOOTH_REFRESH;
2121#endif
2122 } 2073 }
2123 2074
2124#ifdef SELECTION_SCROLLING 2075#ifdef SELECTION_SCROLLING
2125 if (sel_scroll_ev.active)
2126 sel_scroll_ev.stop(); 2076 sel_scroll_ev.stop();
2127#endif 2077#endif
2128 2078
2129 if (ev.window == vt) 2079 if (ev.window == vt)
2130 { 2080 {
2081 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2082 return;
2083
2131#if ISO_14755 2084#if ISO_14755
2132 // 5.4 2085 // 5.4
2133 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2086 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2134 return; 2087 return;
2135#endif 2088#endif
2089
2136 if (reportmode) 2090 if (reportmode)
2137 { 2091 {
2138 /* mouse report from vt window */ 2092 /* mouse report from vt window */
2139 /* don't report release of wheel "buttons" */ 2093 /* don't report release of wheel "buttons" */
2140 if (ev.button >= 4) 2094 if (ev.button >= 4)
… …
2151 mouse_report (ev); 2105 mouse_report (ev);
2152 } 2106 }
2153#else /* MOUSE_REPORT_DOUBLECLICK */ 2107#else /* MOUSE_REPORT_DOUBLECLICK */
2154 MEvent.button = AnyButton; 2108 MEvent.button = AnyButton;
2155 mouse_report (ev); 2109 mouse_report (ev);
2156#endif /* MOUSE_REPORT_DOUBLECLICK */ 2110#endif /* MOUSE_REPORT_DOUBLECLICK */
2157 return; 2111 return;
2158 } 2112 }
2159 2113
2160 /* 2114 /*
2161 * dumb hack to compensate for the failure of click-and-drag 2115 * dumb hack to compensate for the failure of click-and-drag
… …
2164 if (priv_modes & PrivMode_mouse_report 2118 if (priv_modes & PrivMode_mouse_report
2165 && bypass_keystate 2119 && bypass_keystate
2166 && ev.button == Button1 && MEvent.clicks <= 1) 2120 && ev.button == Button1 && MEvent.clicks <= 1)
2167 selection_extend (ev.x, ev.y, 0); 2121 selection_extend (ev.x, ev.y, 0);
2168 2122
2169 if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2170 return;
2171
2172 switch (ev.button) 2123 switch (ev.button)
2173 { 2124 {
2174 case Button1: 2125 case Button1:
2175 case Button3: 2126 case Button3:
2176 selection_make (ev.time); 2127 selection_make (ev.time);
2177 break; 2128 break;
2129
2178 case Button2: 2130 case Button2:
2179 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);
2180 break; 2133 break;
2134
2181#ifdef MOUSE_WHEEL 2135#ifdef MOUSE_WHEEL
2182 case Button4: 2136 case Button4:
2183 case Button5: 2137 case Button5:
2184 { 2138 {
2185 int i; 2139 int i;
… …
2187 2141
2188 v = ev.button == Button4 ? UP : DN; 2142 v = ev.button == Button4 ? UP : DN;
2189 2143
2190 if (ev.state & ShiftMask) 2144 if (ev.state & ShiftMask)
2191 i = 1; 2145 i = 1;
2192 else if (OPTION (Opt_mouseWheelScrollPage)) 2146 else if (option (Opt_mouseWheelScrollPage))
2193 i = nrow - 1; 2147 i = nrow - 1;
2194 else 2148 else
2195 i = 5; 2149 i = 5;
2196 2150
2197# ifdef MOUSE_SLIP_WHEELING 2151# ifdef MOUSE_SLIP_WHEELING
… …
2199 { 2153 {
2200 mouse_slip_wheel_speed += v ? -1 : 1; 2154 mouse_slip_wheel_speed += v ? -1 : 1;
2201 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2155 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2202 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2156 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2203 2157
2204 if (slip_wheel_ev.at < NOW) 2158 if (!slip_wheel_ev.is_active ())
2205 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2159 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2206
2207 slip_wheel_ev.start ();
2208 } 2160 }
2209 else 2161 else
2162# endif
2210 { 2163 {
2211# endif
2212# ifdef JUMP_MOUSE_WHEEL
2213 scr_page (v, i); 2164 scr_page (v, i);
2214 scr_refresh (SMOOTH_REFRESH);
2215 scrollbar_show (1); 2165 scrollbar_show (1);
2216# else
2217 while (i--)
2218 {
2219 scr_page (v, 1);
2220 scr_refresh (SMOOTH_REFRESH);
2221 scrollbar_show (1);
2222 }
2223# endif
2224# ifdef MOUSE_SLIP_WHEELING
2225 } 2166 }
2226#endif
2227 } 2167 }
2228 break; 2168 break;
2229#endif 2169#endif
2230 } 2170 }
2231 } 2171 }
2232#ifdef MENUBAR
2233 else if (isMenuBarWindow (ev.window))
2234 menubar_control (ev);
2235#endif
2236} 2172}
2237
2238#ifdef TRANSPARENT
2239#if TINTING
2240/* taken from aterm-0.4.2 */
2241
2242typedef uint32_t RUINT32T;
2243
2244void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2245{
2246 int sh_r, sh_g, sh_b;
2247 RUINT32T mask_r, mask_g, mask_b;
2248 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2249 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2250 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2251 int i;
2252
2253 Visual *visual = display->visual;
2254
2255 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2256
2257 /* for convenience */
2258 mask_r = visual->red_mask;
2259 mask_g = visual->green_mask;
2260 mask_b = visual->blue_mask;
2261
2262 /* boring lookup table pre-initialization */
2263 switch (srcImage->bits_per_pixel) {
2264 case 15:
2265 if ((mask_r != 0x7c00) ||
2266 (mask_g != 0x03e0) ||
2267 (mask_b != 0x001f))
2268 return;
2269 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2270 lookup_r = lookup;
2271 lookup_g = lookup+32;
2272 lookup_b = lookup+32+32;
2273 sh_r = 10;
2274 sh_g = 5;
2275 sh_b = 0;
2276 break;
2277 case 16:
2278 if ((mask_r != 0xf800) ||
2279 (mask_g != 0x07e0) ||
2280 (mask_b != 0x001f))
2281 return;
2282 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2283 lookup_r = lookup;
2284 lookup_g = lookup+32;
2285 lookup_b = lookup+32+64;
2286 sh_r = 11;
2287 sh_g = 5;
2288 sh_b = 0;
2289 break;
2290 case 24:
2291 if ((mask_r != 0xff0000) ||
2292 (mask_g != 0x00ff00) ||
2293 (mask_b != 0x0000ff))
2294 return;
2295 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2296 lookup_r = lookup;
2297 lookup_g = lookup+256;
2298 lookup_b = lookup+256+256;
2299 sh_r = 16;
2300 sh_g = 8;
2301 sh_b = 0;
2302 break;
2303 case 32:
2304 if ((mask_r != 0xff0000) ||
2305 (mask_g != 0x00ff00) ||
2306 (mask_b != 0x0000ff))
2307 return;
2308 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2309 lookup_r = lookup;
2310 lookup_g = lookup+256;
2311 lookup_b = lookup+256+256;
2312 sh_r = 16;
2313 sh_g = 8;
2314 sh_b = 0;
2315 break;
2316 default:
2317 return; /* we do not support this color depth */
2318 }
2319
2320 /* prepare limits for color transformation (each channel is handled separately) */
2321 if (shade < 0) {
2322 shade = -shade;
2323 if (shade < 0) shade = 0;
2324 if (shade > 100) shade = 100;
2325
2326 lower_lim_r = 65535-rm;
2327 lower_lim_g = 65535-gm;
2328 lower_lim_b = 65535-bm;
2329
2330 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2331 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2332 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2333
2334 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2335 } else {
2336 if (shade < 0) shade = 0;
2337 if (shade > 100) shade = 100;
2338
2339 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2340
2341 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2342 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2343 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2344 }
2345
2346 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2347 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2348 {
2349 unsigned int tmp;
2350
2351 tmp = lower_lim_r;
2352 lower_lim_r = lower_lim_b;
2353 lower_lim_b = tmp;
2354
2355 tmp = upper_lim_r;
2356 upper_lim_r = upper_lim_b;
2357 upper_lim_b = tmp;
2358 }
2359
2360 /* fill our lookup tables */
2361 for (i = 0; i <= mask_r>>sh_r; i++)
2362 {
2363 RUINT32T tmp;
2364 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2365 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2366 lookup_r[i] = (tmp/65535)<<sh_r;
2367 }
2368 for (i = 0; i <= mask_g>>sh_g; i++)
2369 {
2370 RUINT32T tmp;
2371 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2372 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2373 lookup_g[i] = (tmp/65535)<<sh_g;
2374 }
2375 for (i = 0; i <= mask_b>>sh_b; i++)
2376 {
2377 RUINT32T tmp;
2378 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2379 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2380 lookup_b[i] = (tmp/65535)<<sh_b;
2381 }
2382
2383 /* apply table to input image (replacing colors by newly calculated ones) */
2384 switch (srcImage->bits_per_pixel)
2385 {
2386 case 15:
2387 {
2388 unsigned short *p1, *pf, *p, *pl;
2389 p1 = (unsigned short *) srcImage->data;
2390 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2391 while (p1 < pf)
2392 {
2393 p = p1;
2394 pl = p1 + srcImage->width;
2395 for (; p < pl; p++)
2396 {
2397 *p = lookup_r[(*p & 0x7c00)>>10] |
2398 lookup_g[(*p & 0x03e0)>> 5] |
2399 lookup_b[(*p & 0x001f)];
2400 }
2401 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2402 }
2403 break;
2404 }
2405 case 16:
2406 {
2407 unsigned short *p1, *pf, *p, *pl;
2408 p1 = (unsigned short *) srcImage->data;
2409 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2410 while (p1 < pf)
2411 {
2412 p = p1;
2413 pl = p1 + srcImage->width;
2414 for (; p < pl; p++)
2415 {
2416 *p = lookup_r[(*p & 0xf800)>>11] |
2417 lookup_g[(*p & 0x07e0)>> 5] |
2418 lookup_b[(*p & 0x001f)];
2419 }
2420 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2421 }
2422 break;
2423 }
2424 case 24:
2425 {
2426 unsigned char *p1, *pf, *p, *pl;
2427 p1 = (unsigned char *) srcImage->data;
2428 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2429 while (p1 < pf)
2430 {
2431 p = p1;
2432 pl = p1 + srcImage->width * 3;
2433 for (; p < pl; p += 3)
2434 {
2435 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2436 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2437 p[2] = lookup_r[(p[2] & 0x0000ff)];
2438 }
2439 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2440 }
2441 break;
2442 }
2443 case 32:
2444 {
2445 RUINT32T *p1, *pf, *p, *pl;
2446 p1 = (RUINT32T *) srcImage->data;
2447 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2448
2449 while (p1 < pf)
2450 {
2451 p = p1;
2452 pl = p1 + srcImage->width;
2453 for (; p < pl; p++)
2454 {
2455 *p = lookup_r[(*p & 0xff0000)>>16] |
2456 lookup_g[(*p & 0x00ff00)>> 8] |
2457 lookup_b[(*p & 0x0000ff)] |
2458 (*p & ~0xffffff);
2459 }
2460 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2461 }
2462 break;
2463 }
2464 }
2465
2466 free (lookup);
2467}
2468#endif
2469
2470/*
2471 * Check our parents are still who we think they are.
2472 * Do transparency updates if required
2473 */
2474int
2475rxvt_term::check_our_parents ()
2476{
2477 int i, pchanged, aformat, have_pixmap, rootdepth;
2478 unsigned long nitems, bytes_after;
2479 Atom atype;
2480 unsigned char *prop = NULL;
2481 Window root, oldp, *list;
2482 Pixmap rootpixmap = None;
2483 XWindowAttributes wattr, wrootattr;
2484 dDisp;
2485
2486 pchanged = 0;
2487
2488 if (!OPTION (Opt_transparent))
2489 return pchanged; /* Don't try any more */
2490
2491 XGetWindowAttributes (disp, display->root, &wrootattr);
2492 rootdepth = wrootattr.depth;
2493
2494 XGetWindowAttributes (disp, parent[0], &wattr);
2495
2496 if (rootdepth != wattr.depth)
2497 {
2498 if (am_transparent)
2499 {
2500 pchanged = 1;
2501 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2502 am_transparent = am_pixmap_trans = 0;
2503 }
2504
2505 return pchanged; /* Don't try any more */
2506 }
2507
2508 /* Get all X ops out of the queue so that our information is up-to-date. */
2509 XSync (disp, False);
2510
2511 /*
2512 * Make the frame window set by the window manager have
2513 * the root background. Some window managers put multiple nested frame
2514 * windows for each client, so we have to take care about that.
2515 */
2516 i = (xa[XA_XROOTPMAP_ID]
2517 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2518 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2519 &nitems, &bytes_after, &prop) == Success);
2520
2521 if (!i || prop == NULL)
2522 i = (xa[XA_ESETROOT_PMAP_ID]
2523 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2524 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2525 &nitems, &bytes_after, &prop) == Success);
2526
2527 if (!i || prop == NULL
2528#if TINTING
2529 || !rs[Rs_color + Color_tint]
2530#endif
2531 )
2532 have_pixmap = 0;
2533 else
2534 {
2535 have_pixmap = 1;
2536 rootpixmap = *(Pixmap *)prop;
2537 XFree (prop);
2538 }
2539
2540 if (have_pixmap)
2541 {
2542 /*
2543 * Copy display->root pixmap transparency
2544 */
2545 int sx, sy, nx, ny;
2546 unsigned int nw, nh;
2547 Window cr;
2548 XImage *image;
2549 GC gc;
2550 XGCValues gcvalue;
2551
2552 XTranslateCoordinates (disp, parent[0], display->root,
2553 0, 0, &sx, &sy, &cr);
2554 nw = (unsigned int)szHint.width;
2555 nh = (unsigned int)szHint.height;
2556 nx = ny = 0;
2557
2558 if (sx < 0)
2559 {
2560 nw += sx;
2561 nx = -sx;
2562 sx = 0;
2563 }
2564
2565 if (sy < 0)
2566 {
2567 nh += sy;
2568 ny = -sy;
2569 sy = 0;
2570 }
2571
2572 min_it (nw, (unsigned int) (wrootattr.width - sx));
2573 min_it (nh, (unsigned int) (wrootattr.height - sy));
2574
2575 XSync (disp, False);
2576 allowedxerror = -1;
2577 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2578
2579 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2580 /* XXX: may need a delay here? */
2581 allowedxerror = 0;
2582
2583 if (image == NULL)
2584 {
2585 if (am_transparent && am_pixmap_trans)
2586 {
2587 pchanged = 1;
2588 if (pixmap != None)
2589 {
2590 XFreePixmap (disp, pixmap);
2591 pixmap = None;
2592 }
2593 }
2594
2595 am_pixmap_trans = 0;
2596 }
2597 else
2598 {
2599 if (pixmap != None)
2600 XFreePixmap (disp, pixmap);
2601
2602#if TINTING
2603 if (ISSET_PIXCOLOR (Color_tint))
2604 {
2605 unsigned short rm, gm, bm;
2606 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2607
2608 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2609
2610 ShadeXImage (display, image, shade, rm, gm, bm);
2611 }
2612#endif
2613
2614 pixmap = XCreatePixmap (disp, vt,
2615 szHint.width, szHint.height, image->depth);
2616 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2617 XPutImage (disp, pixmap, gc, image, 0, 0,
2618 nx, ny, image->width, image->height);
2619 XFreeGC (disp, gc);
2620 XDestroyImage (image);
2621 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2622 XClearWindow (disp, parent[0]);
2623
2624 if (!am_transparent || !am_pixmap_trans)
2625 pchanged = 1;
2626
2627 am_transparent = am_pixmap_trans = 1;
2628 }
2629 }
2630
2631 if (am_pixmap_trans)
2632 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2633 else
2634 {
2635 unsigned int n;
2636 /*
2637 * InheritPixmap transparency
2638 */
2639 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2640 {
2641 oldp = parent[i];
2642 XQueryTree (disp, parent[i - 1], &root,
2643 &parent[i], &list, &n);
2644 XFree (list);
2645
2646 if (parent[i] == display->root)
2647 {
2648 if (oldp != None)
2649 pchanged = 1;
2650
2651 break;
2652 }
2653
2654 if (oldp != parent[i])
2655 pchanged = 1;
2656 }
2657
2658 n = 0;
2659
2660 if (pchanged)
2661 {
2662 for (; n < (unsigned int)i; n++)
2663 {
2664 XGetWindowAttributes (disp, parent[n], &wattr);
2665 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2666 {
2667 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2668 break;
2669 }
2670 }
2671 }
2672
2673 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2674 {
2675 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2676 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2677 am_transparent = 0;
2678 /* XXX: also turn off Opt_transparent? */
2679 }
2680 else
2681 {
2682#if WAIT_FOR_WM
2683 /* wait (an arbitrary period) for the WM to do its thing
2684 * needed for fvwm2.2.2 (and before?) */
2685 sleep (1);
2686#endif
2687 for (n = 0; n < (unsigned int)i; n++)
2688 {
2689 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2690 XClearWindow (disp, parent[n]);
2691 }
2692
2693 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2694 am_transparent = 1;
2695 }
2696
2697 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2698 parent[i] = None;
2699 }
2700
2701 if (scrollBar.win)
2702 {
2703 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2704 scrollBar.setIdle ();
2705 scrollbar_show (0);
2706 }
2707
2708 if (am_transparent)
2709 {
2710 want_refresh = want_full_refresh = 1;
2711 if (am_pixmap_trans)
2712 flush ();
2713 }
2714
2715 return pchanged;
2716}
2717#endif
2718 2173
2719/*}}} */ 2174/*}}} */
2720 2175
2721bool 2176bool
2722rxvt_term::cmd_parse () 2177rxvt_term::cmd_parse ()
2723{ 2178{
2724 bool flag = false; 2179 bool flag = false;
2725 unicode_t ch = NOCHAR; 2180 wchar_t ch = NOCHAR;
2726 char *seq_begin; // remember start of esc-sequence here 2181 char *seq_begin; // remember start of esc-sequence here
2727 2182
2728 for (;;) 2183 for (;;)
2729 { 2184 {
2730 if (ch == NOCHAR) 2185 if (ch == NOCHAR)
… …
2751 if (seen_resize && cmd_pid) 2206 if (seen_resize && cmd_pid)
2752 kill (-cmd_pid, SIGWINCH); 2207 kill (-cmd_pid, SIGWINCH);
2753 } 2208 }
2754 2209
2755 /* Read a text string from the input buffer */ 2210 /* Read a text string from the input buffer */
2756 unicode_t buf[UBUFSIZ]; 2211 wchar_t buf[UBUFSIZ];
2757 bool refreshnow = false; 2212 bool refreshnow = false;
2758 int nlines = 0; 2213 int nlines = 0;
2759 unicode_t *str = buf; 2214 wchar_t *str = buf;
2760 unicode_t *eol = str + min (ncol, UBUFSIZ); 2215 wchar_t *eol = str + min (ncol, UBUFSIZ);
2761 2216
2762 for (;;) 2217 for (;;)
2763 { 2218 {
2764 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))
2765 break; 2220 break;
… …
2771 if (ch == C0_LF) 2226 if (ch == C0_LF)
2772 nlines++; 2227 nlines++;
2773 2228
2774 refresh_count++; 2229 refresh_count++;
2775 2230
2776 if (!OPTION (Opt_jumpScroll) 2231 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2777 || (refresh_count >= refresh_limit * (nrow - 1)))
2778 { 2232 {
2779 refreshnow = true;
2780 refresh_count = 0; 2233 refresh_count = 0;
2234
2235 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2236 {
2237 refreshnow = true;
2781 ch = NOCHAR; 2238 ch = NOCHAR;
2782 break; 2239 break;
2240 }
2783 } 2241 }
2784 2242
2785 // scr_add_lines only works for nlines <= nrow - 1. 2243 // scr_add_lines only works for nlines <= nrow - 1.
2786 if (nlines >= nrow - 1) 2244 if (nlines >= nrow - 1)
2787 { 2245 {
2246 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2788 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2247 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2789 scr_add_lines (buf, nlines, str - buf); 2248 scr_add_lines (buf, str - buf, nlines);
2790 2249
2791 nlines = 0; 2250 nlines = 0;
2792 str = buf; 2251 str = buf;
2793 eol = str + min (ncol, UBUFSIZ); 2252 eol = str + min (ncol, UBUFSIZ);
2794 } 2253 }
… …
2808 2267
2809 seq_begin = cmdbuf_ptr; 2268 seq_begin = cmdbuf_ptr;
2810 ch = next_char (); 2269 ch = next_char ();
2811 } 2270 }
2812 2271
2272 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2813 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2273 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2814 scr_add_lines (buf, nlines, str - buf); 2274 scr_add_lines (buf, str - buf, nlines);
2815 2275
2816 /* 2276 /*
2817 * 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
2818 * 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.
2819 * the number of pages between refreshes is refresh_limit, which 2279 * if skipScroll is enabled.
2820 * is incremented here because we must be doing flat-out scrolling.
2821 */ 2280 */
2822 if (refreshnow) 2281 if (refreshnow)
2823 { 2282 {
2824 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2825 refresh_limit++;
2826 else
2827 {
2828 flag = true; 2283 flag = true;
2829 scr_refresh (refresh_type); 2284 scr_refresh ();
2830 flush_ev.stop (); 2285 want_refresh = 1;
2831 }
2832 } 2286 }
2833 2287
2834 } 2288 }
2835 else 2289 else
2836 { 2290 {
… …
2850 } 2304 }
2851 2305
2852 return flag; 2306 return flag;
2853} 2307}
2854 2308
2855// read the next octet
2856unicode_t
2857rxvt_term::next_octet ()
2858{
2859 return cmdbuf_ptr < cmdbuf_endp
2860 ? *cmdbuf_ptr++
2861 : NOCHAR;
2862}
2863
2864// read the next character 2309// read the next character
2865unicode_t 2310wchar_t
2866rxvt_term::next_char () 2311rxvt_term::next_char () NOTHROW
2867{ 2312{
2868 while (cmdbuf_ptr < cmdbuf_endp) 2313 while (cmdbuf_ptr < cmdbuf_endp)
2869 { 2314 {
2870 // assume 7-bit to be ascii ALWAYS 2315 // assume 7-bit to be ascii ALWAYS
2871 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2316 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2880 cmdbuf_ptr = cmdbuf_endp; 2325 cmdbuf_ptr = cmdbuf_endp;
2881 break; 2326 break;
2882 } 2327 }
2883 2328
2884 if (len == (size_t)-1) 2329 if (len == (size_t)-1)
2885 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
2886 2331
2887 // assume wchar == unicode 2332 // assume wchar == unicode
2888 cmdbuf_ptr += len; 2333 cmdbuf_ptr += len;
2889 return wc & UNICODE_MASK; 2334 return wc & UNICODE_MASK;
2890 } 2335 }
2891 2336
2892 return NOCHAR; 2337 return NOCHAR;
2893} 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;
2894 2350
2895/* rxvt_cmd_getc () - Return next input character */ 2351/* rxvt_cmd_getc () - Return next input character */
2896/* 2352/*
2897 * Return the next input character after first passing any keyboard input 2353 * Return the next input character after first passing any keyboard input
2898 * to the command. 2354 * to the command.
2899 */ 2355 */
2900unicode_t 2356wchar_t
2901rxvt_term::cmd_getc () 2357rxvt_term::cmd_getc () THROW ((class out_of_input))
2902{ 2358{
2903 unicode_t c = next_char (); 2359 wchar_t c = next_char ();
2904 2360
2905 if (c == NOCHAR) 2361 if (c == NOCHAR)
2906 throw out_of_input; 2362 throw out_of_input;
2907 2363
2908 return c; 2364 return c;
2909} 2365}
2910 2366
2911unicode_t 2367uint32_t
2912rxvt_term::cmd_get8 () 2368rxvt_term::cmd_get8 () THROW ((class out_of_input))
2913{ 2369{
2914 unicode_t c = next_octet (); 2370 uint32_t c = next_octet ();
2915 2371
2916 if (c == NOCHAR) 2372 if (c == NOCHAR)
2917 throw out_of_input; 2373 throw out_of_input;
2918 2374
2919 return c; 2375 return c;
… …
2983 { 2439 {
2984 if ((buf[len++] = cmd_getc ()) == 'i') 2440 if ((buf[len++] = cmd_getc ()) == 'i')
2985 break; /* done = 1 */ 2441 break; /* done = 1 */
2986 } 2442 }
2987 } 2443 }
2988 2444
2989 for (i = 0; i < len; i++) 2445 for (i = 0; i < len; i++)
2990 if (putc (buf[i], fd) == EOF) 2446 if (putc (buf[i], fd) == EOF)
2991 { 2447 {
2992 done = 1; 2448 done = 1;
2993 break; 2449 break;
… …
2995 } 2451 }
2996 } 2452 }
2997 2453
2998 pclose_printer (fd); 2454 pclose_printer (fd);
2999} 2455}
3000#endif /* PRINTPIPE */ 2456#endif /* PRINTPIPE */
3001/*}}} */ 2457/*}}} */
3002 2458
3003/* *INDENT-OFF* */ 2459/* *INDENT-OFF* */
3004enum { 2460enum {
3005 C1_40 = 0x40, 2461 C1_40 = 0x40,
… …
3055 process_dcs_seq (); 2511 process_dcs_seq ();
3056 break; 2512 break;
3057 case 0x9b: /* CSI */ 2513 case 0x9b: /* CSI */
3058 process_csi_seq (); 2514 process_csi_seq ();
3059 break; 2515 break;
3060 case 0x9d: /* CSI */ 2516 case 0x9d: /* OSC */
3061 process_osc_seq (); 2517 process_osc_seq ();
3062 break; 2518 break;
3063#endif 2519#endif
3064 } 2520 }
3065} 2521}
… …
3155 scr_charset_set (2, (unsigned int)cmd_getc ()); 2611 scr_charset_set (2, (unsigned int)cmd_getc ());
3156 break; 2612 break;
3157 case '+': 2613 case '+':
3158 scr_charset_set (3, (unsigned int)cmd_getc ()); 2614 scr_charset_set (3, (unsigned int)cmd_getc ());
3159 break; 2615 break;
3160#if ENABLE_FRILLS 2616#if !ENABLE_MINIMAL
3161 case '6': 2617 case '6':
3162 scr_backindex (); 2618 scr_backindex ();
3163 break; 2619 break;
3164#endif 2620#endif
3165 case '7': 2621 case '7':
3166 scr_cursor (SAVE); 2622 scr_cursor (SAVE);
3167 break; 2623 break;
3168 case '8': 2624 case '8':
3169 scr_cursor (RESTORE); 2625 scr_cursor (RESTORE);
3170 break; 2626 break;
3171#if ENABLE_FRILLS 2627#if !ENABLE_MINIMAL
3172 case '9': 2628 case '9':
3173 scr_forwardindex (); 2629 scr_forwardindex ();
3174 break; 2630 break;
3175#endif 2631#endif
3176 case '=': 2632 case '=':
… …
3186 break; 2642 break;
3187 2643
3188 /* 8.3.87: NEXT LINE */ 2644 /* 8.3.87: NEXT LINE */
3189 case C1_NEL: /* ESC E */ 2645 case C1_NEL: /* ESC E */
3190 { 2646 {
3191 unicode_t nlcr[] = { C0_LF, C0_CR }; 2647 wchar_t nlcr[] = { C0_LF, C0_CR };
3192 scr_add_lines (nlcr, 1, 2); 2648 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3193 } 2649 }
3194 break; 2650 break;
3195 2651
3196 /* kidnapped escape sequence: Should be 8.3.48 */ 2652 /* kidnapped escape sequence: Should be 8.3.48 */
3197 case C1_ESA: /* ESC G */ 2653 case C1_ESA: /* ESC G */
… …
3291rxvt_term::process_csi_seq () 2747rxvt_term::process_csi_seq ()
3292{ 2748{
3293 unicode_t ch, priv, i; 2749 unicode_t ch, priv, i;
3294 unsigned int nargs, p; 2750 unsigned int nargs, p;
3295 int n, ndef; 2751 int n, ndef;
3296 int arg[ESC_ARGS]; 2752 int arg[ESC_ARGS] = { };
3297 2753
3298 for (nargs = ESC_ARGS; nargs > 0;) 2754 nargs = 0;
3299 arg[--nargs] = 0;
3300 2755
3301 priv = 0; 2756 priv = 0;
3302 ch = cmd_getc (); 2757 ch = cmd_getc ();
3303 if (ch >= '<' && ch <= '?') 2758 if (ch >= '<' && ch <= '?')
2759 {
3304 { /* '<' '=' '>' '?' */ 2760 /* '<' '=' '>' '?' */
3305 priv = ch; 2761 priv = ch;
3306 ch = cmd_getc (); 2762 ch = cmd_getc ();
3307 } 2763 }
3308 2764
3309 /* read any numerical arguments */ 2765 /* read any numerical arguments */
… …
3338 ndef = get_byte_array_bit (csi_defaults, i); 2794 ndef = get_byte_array_bit (csi_defaults, i);
3339 for (p = 0; p < nargs; p++) 2795 for (p = 0; p < nargs; p++)
3340 if (arg[p] == -1) 2796 if (arg[p] == -1)
3341 arg[p] = ndef; 2797 arg[p] = ndef;
3342 2798
3343#ifdef DEBUG_CMD
3344 fprintf (stderr, "CSI ");
3345 for (p = 0; p < nargs; p++)
3346 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3347 fprintf (stderr, "%c\n", ch);
3348#endif
3349
3350 /* 2799 /*
3351 * private mode handling 2800 * private mode handling
3352 */ 2801 */
3353 if (priv) 2802 if (priv)
3354 { 2803 {
3355 switch (priv) 2804 switch (priv)
3356 { 2805 {
3357 case '>': 2806 case '>':
3358 if (ch == CSI_DA) /* secondary device attributes */ 2807 if (ch == CSI_DA) /* secondary device attributes */
3359 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 }
3360 break; 2818 break;
2819
3361 case '?': 2820 case '?':
3362 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2821 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3363 process_terminal_mode (ch, priv, nargs, arg); 2822 process_terminal_mode (ch, priv, nargs, arg);
3364 break; 2823 break;
3365 } 2824 }
… …
3490 break; 2949 break;
3491 case 6: /* CPR requested */ 2950 case 6: /* CPR requested */
3492 scr_report_position (); 2951 scr_report_position ();
3493 break; 2952 break;
3494 case 7: /* unofficial extension */ 2953 case 7: /* unofficial extension */
3495 if (OPTION (Opt_insecure)) 2954 if (option (Opt_insecure))
3496 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2955 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3497 break; 2956 break;
3498 case 8: /* unofficial extension */ 2957 case 8: /* unofficial extension */
3499 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2958 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3500 break; 2959 break;
… …
3567 break; 3026 break;
3568 case CSI_75: 3027 case CSI_75:
3569 scr_cursor (RESTORE); 3028 scr_cursor (RESTORE);
3570 break; 3029 break;
3571 3030
3572#if ENABLE_FRILLS 3031#if !ENABLE_MINIMAL
3573 case CSI_74: 3032 case CSI_74:
3574 process_window_ops (arg, nargs); 3033 process_window_ops (arg, nargs);
3575 break; 3034 break;
3576#endif 3035#endif
3577 3036
… …
3584 break; 3043 break;
3585 } 3044 }
3586} 3045}
3587/*}}} */ 3046/*}}} */
3588 3047
3589#if ENABLE_FRILLS 3048#if !ENABLE_MINIMAL
3590/* ARGSUSED */ 3049/* ARGSUSED */
3591void 3050void
3592rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3051rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3593{ 3052{
3594 int x, y; 3053 int x, y;
3595 XWindowAttributes wattr; 3054 XWindowAttributes wattr;
3596 Window wdummy; 3055 Window wdummy;
3597 dDisp; 3056
3057 dLocal (Display *, dpy);
3598 3058
3599 if (nargs == 0) 3059 if (nargs == 0)
3600 return; 3060 return;
3601 3061
3602 switch (args[0]) 3062 switch (args[0])
3603 { 3063 {
3604 /* 3064 /*
3605 * commands 3065 * commands
3606 */ 3066 */
3607 case 1: /* deiconify window */ 3067 case 1: /* deiconify window */
3608 XMapWindow (disp, parent[0]); 3068 XMapWindow (dpy, parent[0]);
3609 break; 3069 break;
3610 case 2: /* iconify window */ 3070 case 2: /* iconify window */
3611 XIconifyWindow (disp, parent[0], display->screen); 3071 XIconifyWindow (dpy, parent[0], display->screen);
3612 break; 3072 break;
3613 case 3: /* set position (pixels) */ 3073 case 3: /* set position (pixels) */
3614 XMoveWindow (disp, parent[0], args[1], args[2]); 3074 XMoveWindow (dpy, parent[0], args[1], args[2]);
3615 break; 3075 break;
3616 case 4: /* set size (pixels) */ 3076 case 4: /* set size (pixels) */
3617 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3077 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3618 break; 3078 break;
3619 case 5: /* raise window */ 3079 case 5: /* raise window */
3620 XRaiseWindow (disp, parent[0]); 3080 XRaiseWindow (dpy, parent[0]);
3621 break; 3081 break;
3622 case 6: /* lower window */ 3082 case 6: /* lower window */
3623 XLowerWindow (disp, parent[0]); 3083 XLowerWindow (dpy, parent[0]);
3624 break; 3084 break;
3625 case 7: /* refresh window */ 3085 case 7: /* refresh window */
3626 scr_touch (true); 3086 scr_touch (true);
3627 break; 3087 break;
3628 case 8: /* set size (chars) */ 3088 case 8: /* set size (chars) */
… …
3635 if (args[0] >= 24) /* set height (chars) */ 3095 if (args[0] >= 24) /* set height (chars) */
3636 set_widthheight ((unsigned int)width, 3096 set_widthheight ((unsigned int)width,
3637 (unsigned int) (args[1] * fheight)); 3097 (unsigned int) (args[1] * fheight));
3638 break; 3098 break;
3639 3099
3640
3641 /* 3100 /*
3642 * reports - some output format copied from XTerm 3101 * reports - some output format copied from XTerm
3643 */ 3102 */
3644 case 11: /* report window state */ 3103 case 11: /* report window state */
3645 XGetWindowAttributes (disp, parent[0], &wattr); 3104 XGetWindowAttributes (dpy, parent[0], &wattr);
3646 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3105 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3647 break; 3106 break;
3648 case 13: /* report window position */ 3107 case 13: /* report window position */
3649 XGetWindowAttributes (disp, parent[0], &wattr); 3108 XGetWindowAttributes (dpy, parent[0], &wattr);
3650 XTranslateCoordinates (disp, parent[0], wattr.root, 3109 XTranslateCoordinates (dpy, parent[0], wattr.root,
3651 -wattr.border_width, -wattr.border_width, 3110 -wattr.border_width, -wattr.border_width,
3652 &x, &y, &wdummy); 3111 &x, &y, &wdummy);
3653 tt_printf ("\033[3;%d;%dt", x, y); 3112 tt_printf ("\033[3;%d;%dt", x, y);
3654 break; 3113 break;
3655 case 14: /* report window size (pixels) */ 3114 case 14: /* report window size (pixels) */
3656 XGetWindowAttributes (disp, parent[0], &wattr); 3115 XGetWindowAttributes (dpy, parent[0], &wattr);
3657 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3116 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3658 break; 3117 break;
3659 case 18: /* report text area size (chars) */ 3118 case 18: /* report text area size (chars) */
3660 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3119 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3661 break; 3120 break;
… …
3663 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3122 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3664 break; 3123 break;
3665 case 20: /* report icon label */ 3124 case 20: /* report icon label */
3666 { 3125 {
3667 char *s; 3126 char *s;
3668 XGetIconName (disp, parent[0], &s); 3127 XGetIconName (dpy, parent[0], &s);
3669 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 */
3670 XFree (s); 3129 XFree (s);
3671 } 3130 }
3672 break; 3131 break;
3673 case 21: /* report window title */ 3132 case 21: /* report window title */
3674 { 3133 {
3675 char *s; 3134 char *s;
3676 XFetchName (disp, parent[0], &s); 3135 XFetchName (dpy, parent[0], &s);
3677 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 */
3678 XFree (s); 3137 XFree (s);
3679 } 3138 }
3680 break; 3139 break;
3681 } 3140 }
3682} 3141}
… …
3709 seen_esc = true; 3168 seen_esc = true;
3710 continue; 3169 continue;
3711 } 3170 }
3712 else if (ch == C0_BEL || ch == CHAR_ST) 3171 else if (ch == C0_BEL || ch == CHAR_ST)
3713 break; 3172 break;
3173 else if (ch == C0_SYN)
3174 ch = cmd_get8 ();
3714 else if (ch < 0x20) 3175 else if (ch < 0x20)
3715 return NULL; /* other control character - exit */ 3176 return NULL; /* other control character - exit */
3716 3177
3717 seen_esc = false; 3178 seen_esc = false;
3718 3179
3719 if (n >= STRING_MAX - 1) 3180 if (n >= STRING_MAX - 1)
3720 // stop at some sane length 3181 // stop at some sane length
3721 return NULL; 3182 return NULL;
3722 3183
3723 if (ch == C0_SYN)
3724 string[n++] = cmd_get8 ();
3725 else
3726 string[n++] = ch; 3184 string[n++] = ch;
3727 } 3185 }
3728 3186
3729 string[n++] = '\0'; 3187 string[n++] = '\0';
3730 3188
3731 ends_how = (ch == 0x5c ? C0_ESC : ch); 3189 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3782void 3240void
3783rxvt_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)
3784{ 3242{
3785 if (str[0] == '?' && !str[1]) 3243 if (str[0] == '?' && !str[1])
3786 { 3244 {
3787 unsigned short r, g, b; 3245 rgba c;
3788 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
3789 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);
3790 } 3254 }
3791 else 3255 else
3792 set_window_color (color, str); 3256 set_window_color (color, str);
3793} 3257}
3794 3258
… …
3796 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3260 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3797 */ 3261 */
3798void 3262void
3799rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3263rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3800{ 3264{
3801 int changed = 0;
3802 int color; 3265 int color;
3803 char *buf, *name; 3266 char *buf, *name;
3804 bool query = str[0] == '?' && !str[1]; 3267 bool query = str[0] == '?' && !str[1];
3805 int saveop = op; 3268 int saveop = op;
3806 dDisp; 3269
3270 dLocal (Display *, dpy);
3807 3271
3808 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
3809 switch (op) 3277 switch (op)
3810 { 3278 {
3811 case XTerm_name: 3279 case XTerm_name:
3812 set_title (str); 3280 set_title (str);
3813 /* FALLTHROUGH */ 3281 /* FALLTHROUGH */
… …
3827 unsigned long bytes_after; 3295 unsigned long bytes_after;
3828 unsigned char *value = 0; 3296 unsigned char *value = 0;
3829 const char *str = ""; 3297 const char *str = "";
3830 3298
3831 if (prop 3299 if (prop
3832 && XGetWindowProperty (disp, parent[0], 3300 && XGetWindowProperty (dpy, parent[0],
3833 prop, 0, 1<<16, 0, AnyPropertyType, 3301 prop, 0, 1<<16, 0, AnyPropertyType,
3834 &actual_type, &actual_format, 3302 &actual_type, &actual_format,
3835 &nitems, &bytes_after, &value) == Success 3303 &nitems, &bytes_after, &value) == Success
3836 && actual_type != None 3304 && actual_type != None
3837 && actual_format == 8) 3305 && actual_format == 8)
3838 str = (const char *)(value); 3306 str = (const char *)(value);
3839 3307
3840 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3308 tt_printf ("\033]%d;%s%c", op, str, resp);
3841 3309
3842 XFree (value); 3310 XFree (value);
3843 } 3311 }
3844 else 3312 else
3845 { 3313 {
… …
3849 { 3317 {
3850 *eq = 0; 3318 *eq = 0;
3851 set_utf8_property (display->atom (str), eq + 1); 3319 set_utf8_property (display->atom (str), eq + 1);
3852 } 3320 }
3853 else 3321 else
3854 XDeleteProperty (disp, parent[0], 3322 XDeleteProperty (dpy, parent[0],
3855 display->atom (str)); 3323 display->atom (str));
3856 } 3324 }
3857 break; 3325 break;
3858 3326
3859 case XTerm_Color: 3327 case XTerm_Color:
… …
3861 { 3329 {
3862 if ((name = strchr (buf, ';')) == NULL) 3330 if ((name = strchr (buf, ';')) == NULL)
3863 break; 3331 break;
3864 3332
3865 *name++ = '\0'; 3333 *name++ = '\0';
3866 color = atoi (buf); 3334 color = atoi (buf) + minCOLOR;
3867 3335
3868 if (color < 0 || color >= TOTAL_COLORS) 3336 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3869 break; 3337 break;
3870 3338
3871 if ((buf = strchr (name, ';')) != NULL) 3339 if ((buf = strchr (name, ';')) != NULL)
3872 *buf++ = '\0'; 3340 *buf++ = '\0';
3873 3341
3874 if (name[0] == '?' && !name[1]) 3342 process_color_seq (op, color, name, resp);
3875 {
3876 unsigned short r, g, b;
3877 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3878 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3879 }
3880 else
3881 set_window_color (color + minCOLOR, name);
3882 } 3343 }
3883 break; 3344 break;
3345 case Rxvt_restoreFG:
3884 case XTerm_Color00: 3346 case XTerm_Color00:
3885 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3347 process_color_seq (op, Color_fg, str, resp);
3886 break; 3348 break;
3349 case Rxvt_restoreBG:
3887 case XTerm_Color01: 3350 case XTerm_Color01:
3888 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3351 process_color_seq (op, Color_bg, str, resp);
3889 break; 3352 break;
3890#ifndef NO_CURSORCOLOR 3353#ifndef NO_CURSORCOLOR
3891 case XTerm_Color_cursor: 3354 case XTerm_Color_cursor:
3892 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3355 process_color_seq (op, Color_cursor, str, resp);
3893 break; 3356 break;
3894#endif 3357#endif
3895 case XTerm_Color_pointer_fg: 3358 case XTerm_Color_pointer_fg:
3896 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3359 process_color_seq (op, Color_pointer_fg, str, resp);
3897 break; 3360 break;
3898 case XTerm_Color_pointer_bg: 3361 case XTerm_Color_pointer_bg:
3899 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3362 process_color_seq (op, Color_pointer_bg, str, resp);
3900 break; 3363 break;
3901#ifndef NO_BOLD_UNDERLINE_REVERSE 3364#ifndef NO_BOLD_UNDERLINE_REVERSE
3902 case XTerm_Color_BD:
3903 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3904 break;
3905 case XTerm_Color_UL:
3906 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3907 break;
3908 case XTerm_Color_RV: 3365 case XTerm_Color_RV:
3909 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);
3910 break; 3375 break;
3911 case URxvt_Color_IT: 3376 case URxvt_Color_IT:
3912 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3377 process_color_seq (op, Color_IT, str, resp);
3913 break; 3378 break;
3914#endif 3379#endif
3915#if TRANSPARENT && TINTING 3380#if ENABLE_TRANSPARENCY
3916 case URxvt_Color_tint: 3381 case URxvt_Color_tint:
3917 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3382 process_color_seq (op, Color_tint, str, resp);
3918 check_our_parents (); 3383 {
3919 if (am_transparent) 3384 bool changed = false;
3920 want_full_refresh = want_refresh = 1;
3921 break;
3922#endif
3923 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
3924 case XTerm_Pixmap: 3399 case Rxvt_Pixmap:
3925 if (*str != ';') 3400 if (!strcmp (str, "?"))
3926 { 3401 {
3927#if XPM_BACKGROUND 3402 char str[256];
3928 scale_pixmap (""); /* reset to default scaling */ 3403
3929 set_bgPixmap (str); /* change pixmap */ 3404 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3930#endif 3405 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3931 scr_touch (true); 3406 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3407 process_xterm_seq (XTerm_title, str, CHAR_ST);
3932 } 3408 }
3933 while ((str = strchr (str, ';')) != NULL) 3409 else
3934 { 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 {
3935 str++; 3426 str++;
3936#if XPM_BACKGROUND 3427 if (bgPixmap.set_geometry (str))
3937 changed += scale_pixmap (str); 3428 changed++;
3938#endif 3429 str = strchr (str, ';');
3430 }
3431
3432 if (changed)
3433 update_background ();
3939 } 3434 }
3940
3941 if (changed)
3942 {
3943#ifdef XPM_BACKGROUND
3944 resize_pixmap ();
3945#endif
3946 scr_touch (true);
3947 }
3948 break; 3435 break;
3949 3436#endif
3950 case XTerm_restoreFG:
3951 set_window_color (Color_fg, str);
3952 break;
3953 case XTerm_restoreBG:
3954 set_window_color (Color_bg, str);
3955 break;
3956 3437
3957 case XTerm_logfile: 3438 case XTerm_logfile:
3958 // TODO, when secure mode? 3439 // TODO, when secure mode?
3959 break; 3440 break;
3960 3441
3961#ifdef MENUBAR
3962 case URxvt_Menu:
3963 if (OPTION (Opt_insecure))
3964 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3965 break;
3966#endif
3967#if 0 3442#if 0
3968 case XTerm_dumpscreen: /* no error notices */ 3443 case Rxvt_dumpscreen: /* no error notices */
3969 { 3444 {
3970 int fd; 3445 int fd;
3971 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)
3972 { 3447 {
3973 scr_dump (fd); 3448 scr_dump (fd);
… …
3984 case URxvt_italicFont: 3459 case URxvt_italicFont:
3985 case URxvt_boldItalicFont: 3460 case URxvt_boldItalicFont:
3986#endif 3461#endif
3987 if (query) 3462 if (query)
3988 tt_printf ("\33]%d;%-.250s%c", saveop, 3463 tt_printf ("\33]%d;%-.250s%c", saveop,
3989 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3464 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3990 ? fontset[op - URxvt_font]->fontdesc : "", 3465 ? fontset[op - URxvt_font]->fontdesc : "",
3991 resp); 3466 resp);
3992 else 3467 else
3993 { 3468 {
3994 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3469 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3997 allocated.push_back ((void *)res); 3472 allocated.push_back ((void *)res);
3998 set_fonts (); 3473 set_fonts ();
3999 } 3474 }
4000 break; 3475 break;
4001 3476
4002#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
4003 case URxvt_locale: 3486 case URxvt_locale:
4004 if (query) 3487 if (query)
4005 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);
4006 else 3489 else
4007 { 3490 {
4008 set_locale (str); 3491 set_locale (str);
4009 pty.set_utf8_mode (enc_utf8); 3492 pty->set_utf8_mode (enc_utf8);
4010 init_xlocale (); 3493 init_xlocale ();
4011 } 3494 }
4012 break; 3495 break;
4013 3496
4014 case URxvt_view_up: 3497 case URxvt_view_up:
… …
4025 break; 3508 break;
4026#endif 3509#endif
4027 3510
4028#if ENABLE_PERL 3511#if ENABLE_PERL
4029 case URxvt_perl: 3512 case URxvt_perl:
4030 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 3513 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4031 ; // no responses yet 3514 ; // no responses yet
4032 break; 3515 break;
4033#endif 3516#endif
4034 } 3517 }
4035} 3518}
… …
4067 return state; 3550 return state;
4068} 3551}
4069 3552
4070/* we're not using priv _yet_ */ 3553/* we're not using priv _yet_ */
4071void 3554void
4072rxvt_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)
4073{ 3556{
4074 unsigned int i, j; 3557 unsigned int i, j;
4075 int state; 3558 int state;
4076 3559
4077 static const struct 3560 static const struct
4078 { 3561 {
4079 const int argval; 3562 const int argval;
4080 const unsigned long bit; 3563 const unsigned long bit;
4081 }
4082
4083 argtopriv[] = { 3564 } argtopriv[] = {
4084 { 1, PrivMode_aplCUR }, 3565 { 1, PrivMode_aplCUR },
4085 { 2, PrivMode_vt52 }, 3566 { 2, PrivMode_vt52 },
4086 { 3, PrivMode_132 }, 3567 { 3, PrivMode_132 },
4087 { 4, PrivMode_smoothScroll }, 3568 { 4, PrivMode_smoothScroll },
4088 { 5, PrivMode_rVideo }, 3569 { 5, PrivMode_rVideo },
4089 { 6, PrivMode_relOrigin }, 3570 { 6, PrivMode_relOrigin },
4090 { 7, PrivMode_Autowrap }, 3571 { 7, PrivMode_Autowrap },
4091 // 8, bi-directional support mode 3572 // 8, bi-directional support mode
4092 { 9, PrivMode_MouseX10 }, 3573 { 9, PrivMode_MouseX10 },
4093#ifdef menuBar_esc
4094 { menuBar_esc, PrivMode_menuBar },
4095#endif
4096 // 18, 19 printing-related 3574 // 18, 19 printing-related
4097 { 25, PrivMode_VisibleCursor }, 3575 { 25, PrivMode_VisibleCursor },
4098#ifdef scrollBar_esc 3576#ifdef scrollBar_esc
4099 { scrollBar_esc, PrivMode_scrollBar }, 3577 { scrollBar_esc, PrivMode_scrollBar },
4100#endif 3578#endif
… …
4107 { 66, PrivMode_aplKP }, 3585 { 66, PrivMode_aplKP },
4108#ifndef NO_BACKSPACE_KEY 3586#ifndef NO_BACKSPACE_KEY
4109 { 67, PrivMode_BackSpace }, 3587 { 67, PrivMode_BackSpace },
4110#endif 3588#endif
4111 { 1000, PrivMode_MouseX11 }, 3589 { 1000, PrivMode_MouseX11 },
4112 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3590 { 1002, PrivMode_MouseBtnEvent },
4113 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3591 { 1003, PrivMode_MouseAnyEvent },
4114 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4115 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4116 { 1011, PrivMode_Keypress }, // rxvt extension 3593 { 1011, PrivMode_Keypress }, // rxvt extension
4117 // 1035 enable modifiers for alt, numlock NYI 3594 // 1035 enable modifiers for alt, numlock NYI
4118 // 1036 send ESC for meta keys NYI 3595 // 1036 send ESC for meta keys NYI
4119 // 1037 send DEL for keypad delete NYI 3596 // 1037 send DEL for keypad delete NYI
4120 { 1047, PrivMode_Screen }, 3597 { 1047, PrivMode_Screen },
4121 // 1048 save and restore cursor 3598 // 1048 save and restore cursor
4122 { 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 */
4123 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3600 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3601 { 2004, PrivMode_BracketPaste },
4124 }; 3602 };
4125 3603
4126 if (nargs == 0) 3604 if (nargs == 0)
4127 return; 3605 return;
4128 3606
… …
4147 /* extra handling for values with state unkept */ 3625 /* extra handling for values with state unkept */
4148 switch (arg[i]) 3626 switch (arg[i])
4149 { 3627 {
4150#if ENABLE_STYLES 3628#if ENABLE_STYLES
4151 case 1021: 3629 case 1021:
4152 if (mode) 3630 set_option (Opt_intensityStyles, mode);
4153 SET_OPTION (Opt_intensityStyles);
4154 else
4155 CLR_OPTION (Opt_intensityStyles);
4156 3631
4157 scr_touch (true); 3632 scr_touch (true);
4158 break; 3633 break;
4159#endif 3634#endif
4160 case 1048: /* alternative cursor save */ 3635 case 1048: /* alternative cursor save */
4161 case 1049: 3636 case 1049:
4162 if (OPTION (Opt_secondaryScreen)) 3637 if (option (Opt_secondaryScreen))
4163 if (mode == 0) 3638 if (mode == 0)
4164 scr_cursor (RESTORE); 3639 scr_cursor (RESTORE);
4165 else if (mode == 1) 3640 else if (mode == 1)
4166 scr_cursor (SAVE); 3641 scr_cursor (SAVE);
4167 break; 3642 break;
… …
4179 */ 3654 */
4180 PrivMode (1, PrivMode_vt52); 3655 PrivMode (1, PrivMode_vt52);
4181 break; 3656 break;
4182 case 3: /* 80/132 */ 3657 case 3: /* 80/132 */
4183 if (priv_modes & PrivMode_132OK) 3658 if (priv_modes & PrivMode_132OK)
3659 {
3660 scr_poweron ();
4184 set_widthheight (((state ? 132 : 80) * fwidth), height); 3661 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3662 }
4185 break; 3663 break;
4186 case 4: /* smooth scrolling */ 3664 case 4: /* smooth scrolling */
4187 if (!state) 3665 set_option (Opt_jumpScroll, !state);
4188 SET_OPTION (Opt_jumpScroll);
4189 else
4190 CLR_OPTION (Opt_jumpScroll);
4191 break; 3666 break;
4192 case 5: /* reverse video */ 3667 case 5: /* reverse video */
4193 scr_rvideo_mode (state); 3668 scr_rvideo_mode (state);
4194 break; 3669 break;
4195 case 6: /* relative/absolute origins */ 3670 case 6: /* relative/absolute origins */
… …
4199 scr_autowrap (state); 3674 scr_autowrap (state);
4200 break; 3675 break;
4201 /* 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 */
4202 case 9: /* X10 mouse reporting */ 3677 case 9: /* X10 mouse reporting */
4203 if (state) /* orthogonal */ 3678 if (state) /* orthogonal */
4204 priv_modes &= ~PrivMode_MouseX11; 3679 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4205 break; 3680 break;
4206#ifdef menuBar_esc
4207 case menuBar_esc:
4208#ifdef MENUBAR
4209 map_menuBar (state);
4210#endif
4211 break;
4212#endif
4213#ifdef scrollBar_esc 3681#ifdef scrollBar_esc
4214 case scrollBar_esc: 3682 case scrollBar_esc:
4215 if (scrollbar_mapping (state)) 3683 if (scrollbar_mapping (state))
4216 { 3684 {
4217 resize_all_windows (0, 0, 0); 3685 resize_all_windows (0, 0, 0);
… …
4229 break; 3697 break;
4230 /* case 66: - application key pad */ 3698 /* case 66: - application key pad */
4231 /* case 67: - backspace key */ 3699 /* case 67: - backspace key */
4232 case 1000: /* X11 mouse reporting */ 3700 case 1000: /* X11 mouse reporting */
4233 if (state) /* orthogonal */ 3701 if (state) /* orthogonal */
4234 priv_modes &= ~PrivMode_MouseX10; 3702 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4235 break; 3703 break;
4236#if 0
4237 case 1001: 3704 case 1002:
4238 break; /* X11 mouse highlighting */ 3705 case 1003:
4239#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;
4240 case 1010: /* scroll to bottom on TTY output inhibit */ 3716 case 1010: /* scroll to bottom on TTY output inhibit */
4241 if (!state) 3717 set_option (Opt_scrollTtyOutput, !state);
4242 SET_OPTION (Opt_scrollTtyOutput);
4243 else
4244 CLR_OPTION (Opt_scrollTtyOutput);
4245 break; 3718 break;
4246 case 1011: /* scroll to bottom on key press */ 3719 case 1011: /* scroll to bottom on key press */
4247 if (state) 3720 set_option (Opt_scrollTtyKeypress, state);
4248 SET_OPTION (Opt_scrollTtyKeypress);
4249 else
4250 CLR_OPTION (Opt_scrollTtyKeypress);
4251 break; 3721 break;
4252 case 1047: /* secondary screen w/ clearing last */ 3722 case 1047: /* secondary screen w/ clearing last */
4253 if (OPTION (Opt_secondaryScreen)) 3723 if (option (Opt_secondaryScreen))
4254 if (current_screen != PRIMARY) 3724 if (current_screen != PRIMARY)
4255 scr_erase_screen (2); 3725 scr_erase_screen (2);
4256 scr_change_screen (state); 3726 scr_change_screen (state);
4257 break; 3727 break;
4258 case 1049: /* secondary screen w/ clearing first */ 3728 case 1049: /* secondary screen w/ clearing first */
4259 scr_change_screen (state); 3729 scr_change_screen (state);
4260 if (OPTION (Opt_secondaryScreen)) 3730 if (option (Opt_secondaryScreen))
4261 if (current_screen != PRIMARY) 3731 if (current_screen != PRIMARY)
4262 scr_erase_screen (2); 3732 scr_erase_screen (2);
4263 break; 3733 break;
4264 default: 3734 default:
4265 break; 3735 break;
… …
4393 scr_color (Color_bg, Color_bg); 3863 scr_color (Color_bg, Color_bg);
4394 break; 3864 break;
4395 3865
4396 //case 50: // not variable spacing 3866 //case 50: // not variable spacing
4397 3867
4398#if ENABLE_FRILLS 3868#if !ENABLE_MINIMAL
4399 case 90: 3869 case 90:
4400 case 91: /* set bright fg color */ 3870 case 91: /* set bright fg color */
4401 case 92: 3871 case 92:
4402 case 93: 3872 case 93:
4403 case 94: 3873 case 94:
… …
4427rxvt_term::process_graphics () 3897rxvt_term::process_graphics ()
4428{ 3898{
4429 unicode_t ch, cmd = cmd_getc (); 3899 unicode_t ch, cmd = cmd_getc ();
4430 3900
4431 if (cmd == 'Q') 3901 if (cmd == 'Q')
3902 {
4432 { /* query graphics */ 3903 /* query graphics */
4433 tt_printf ("\033G0\012"); /* no graphics */ 3904 tt_printf ("\033G0\012"); /* no graphics */
4434 return; 3905 return;
4435 } 3906 }
4436 /* swallow other graphics sequences until terminating ':' */ 3907 /* swallow other graphics sequences until terminating ':' */
4437 do 3908 do
… …
4465const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3936const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4466 3937
4467void 3938void
4468rxvt_term::tt_write (const char *data, unsigned int len) 3939rxvt_term::tt_write (const char *data, unsigned int len)
4469{ 3940{
4470 if (pty.pty < 0) 3941 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4471 return; 3942 return;
4472 3943
3944 if (pty->pty < 0)
3945 return;
3946
4473 if (v_buflen == 0) 3947 if (v_buflen == 0)
4474 { 3948 {
4475 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));
4476 3950
4477 if ((unsigned int)written == len) 3951 if ((unsigned int)written == len)
4478 return; 3952 return;
4479 3953
4480 data += written; 3954 data += written;
… …
4484 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3958 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4485 3959
4486 memcpy (v_buffer + v_buflen, data, len); 3960 memcpy (v_buffer + v_buflen, data, len);
4487 v_buflen += len; 3961 v_buflen += len;
4488 3962
4489 pty_ev.set (EVENT_READ | EVENT_WRITE); 3963 pty_ev.set (ev::READ | ev::WRITE);
4490} 3964}
4491 3965
4492void rxvt_term::pty_write () 3966void rxvt_term::pty_write ()
4493{ 3967{
4494 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));
4495 3969
4496 if (written > 0) 3970 if (written > 0)
4497 { 3971 {
4498 v_buflen -= written; 3972 v_buflen -= written;
4499 3973
4500 if (v_buflen == 0) 3974 if (v_buflen == 0)
4501 { 3975 {
4502 free (v_buffer); 3976 free (v_buffer);
4503 v_buffer = 0; 3977 v_buffer = 0;
4504 v_buflen = 0;
4505 3978
4506 pty_ev.set (EVENT_READ); 3979 pty_ev.set (ev::READ);
4507 return; 3980 return;
4508 } 3981 }
4509 3982
4510 memmove (v_buffer, v_buffer + written, v_buflen); 3983 memmove (v_buffer, v_buffer + written, v_buflen);
4511 } 3984 }
4512 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3985 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4513 pty_ev.set (EVENT_READ); 3986 pty_ev.set (ev::READ);
4514} 3987}
4515 3988
4516/*----------------------- end-of-file (C source) -----------------------*/ 3989/*----------------------- end-of-file (C source) -----------------------*/
4517 3990

Diff Legend

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