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.279 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.436 by sf-exg, Sun Jan 24 21:53:13 2010 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>
60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 68
… …
96 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
97 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
98 98
99 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
101 XK_ISO_Lock, 0x21eb,
102 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
103 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
104 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
105 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
106 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
200 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
202 201
203 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
204 203
205 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
206 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
207 206
208 if (y >= 0) 207 if (y >= 0)
209 { 208 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
222 ch = *chr++; 221 ch = *chr++;
223 222
224 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
225 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
226 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
227# if !UNICODE3 226# if !UNICODE_3
228 if (ch >= 0x10000) 227 if (ch >= 0x10000)
229 ch = 0xfffd; 228 ch = 0xfffd;
230# endif 229# endif
231 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
233 } 234 }
234 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// }
235 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
237 243
238 free (fname); 244 free (fname);
239 245
… …
273 } 279 }
274 280
275 iso14755buf = 0; 281 iso14755buf = 0;
276} 282}
277 283
278int 284static int
279rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
280{ 286{
281 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
282 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
283 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
284 { 290 {
… …
292 298
293 return -1; 299 return -1;
294} 300}
295#endif 301#endif
296 302
297/*{{{ 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 case XK_Home:
382 param = 7;
383 break;
384 case XK_End:
385 param = 8;
386 break;
387#endif
388 case XK_Help:
389 param = 28;
390 break;
391 case XK_Menu:
392 param = 29;
393 break;
394 }
395 return param;
396}
397
298void 398void
299rxvt_term::lookup_key (XKeyEvent &ev) 399rxvt_term::key_press (XKeyEvent &ev)
300{ 400{
301 int ctrl, meta, shft, len; 401 int ctrl, meta, shft, len;
302 unsigned int newlen;
303 KeySym keysym; 402 KeySym keysym;
304#ifdef DEBUG_CMD
305 static int debug_key = 1; /* accessible by a debugger only */
306#endif
307 int valid_keysym; 403 int valid_keysym;
308 char kbuf[KBUFSZ]; 404 char kbuf[KBUFSZ];
405
406#if ISO_14755
407 if (iso14755buf & ISO_14755_52)
408 return;
409#endif
309 410
310 /* 411 /*
311 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 412 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
312 * escape sequence to toggle the Keypad. 413 * escape sequence to toggle the Keypad.
313 * 414 *
… …
318 meta = ev.state & ModMetaMask; 419 meta = ev.state & ModMetaMask;
319 420
320 if (numlock_state || (ev.state & ModNumLockMask)) 421 if (numlock_state || (ev.state & ModNumLockMask))
321 { 422 {
322 numlock_state = (ev.state & ModNumLockMask); 423 numlock_state = (ev.state & ModNumLockMask);
323 PrivMode ((!numlock_state), PrivMode_aplKP); 424 set_privmode (PrivMode_aplKP, !numlock_state);
324 } 425 }
325 426
326 kbuf[0] = 0; 427 kbuf[0] = 0;
327 428
328#ifdef USE_XIM 429#ifdef USE_XIM
… …
478 } 579 }
479 } 580 }
480 581
481#if ENABLE_FRILLS || ISO_14755 582#if ENABLE_FRILLS || ISO_14755
482 // ISO 14755 support 583 // ISO 14755 support
483 if (shft && ctrl) 584 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
484 { 585 {
485 int hv; 586 int hv;
486 587
487 if (iso14755buf & ISO_14755_51 588 if (iso14755buf & ISO_14755_51
488 && (keysym == XK_space || keysym == XK_KP_Space 589 && (keysym == XK_space || keysym == XK_KP_Space
… …
490 { 591 {
491 commit_iso14755 (); 592 commit_iso14755 ();
492 iso14755buf = ISO_14755_51; 593 iso14755buf = ISO_14755_51;
493# if ISO_14755 594# if ISO_14755
494 iso14755_51 (0); 595 iso14755_51 (0);
596# endif
597 return;
598 }
599 else if (keysym == XK_BackSpace)
600 {
601 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
602# if ISO_14755
603 iso14755_51 (iso14755buf & ISO_14755_MASK);
495# endif 604# endif
496 return; 605 return;
497 } 606 }
498 else if ((hv = hex_keyval (ev)) >= 0) 607 else if ((hv = hex_keyval (ev)) >= 0)
499 { 608 {
… …
504# endif 613# endif
505 return; 614 return;
506 } 615 }
507 else 616 else
508 { 617 {
509# if ENABLE_OVERLAY 618# if ISO_14755
510 scr_overlay_off (); 619 scr_overlay_off ();
511# endif 620# endif
512 iso14755buf = 0; 621 iso14755buf = 0;
513 } 622 }
514 } 623 }
624 else if (option (Opt_iso14755) &&
515 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 625 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
516 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 626 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
517 if (!(iso14755buf & ISO_14755_STARTED)) 627 if (!(iso14755buf & ISO_14755_STARTED))
518 { 628 {
519 iso14755buf |= ISO_14755_STARTED; 629 iso14755buf |= ISO_14755_STARTED;
520# if ENABLE_OVERLAY 630# if ISO_14755
521 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 631 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
522 scr_overlay_set (0, 0, "ISO 14755 mode"); 632 scr_overlay_set (0, 0, "ISO 14755 mode");
523# endif 633# endif
524 } 634 }
525#endif 635#endif
526 636
527#ifdef PRINTPIPE 637#ifdef PRINTPIPE
528 if (keysym == XK_Print) 638 if (keysym == XK_Print)
529 { 639 {
530 scr_printscreen (ctrl | shft); 640 scr_printscreen (ctrl | shft);
531 return; 641 return;
532 } 642 }
533#endif 643#endif
534 644
535 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 645 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
536 { 646 {
647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
648 unsigned int newlen = 1;
649
650 switch (translate_keypad (keysym, kp))
537 { 651 {
652#ifndef NO_BACKSPACE_KEY
653 case XK_BackSpace:
654 if (priv_modes & PrivMode_HaveBackSpace)
655 {
656 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
657 ^ !!ctrl) ? '\b' : '\177';
658 kbuf[1] = '\0';
659 }
660 else
661 strcpy (kbuf, rs[Rs_backspace_key]);
662 break;
663#endif
664#ifndef NO_DELETE_KEY
665 case XK_Delete:
666 strcpy (kbuf, rs[Rs_delete_key]);
667 break;
668#endif
669 case XK_Tab:
670 if (shft)
671 strcpy (kbuf, "\033[Z");
672 else
673 {
674#ifdef CTRL_TAB_MAKES_META
675 if (ctrl)
676 meta = 1;
677#endif
678#ifdef MOD4_TAB_MAKES_META
679 if (ev.state & Mod4Mask)
680 meta = 1;
681#endif
538 newlen = 1; 682 newlen = 0;
539 switch (keysym) 683 }
684 break;
685
686 case XK_Up: /* "\033[A" */
687 case XK_Down: /* "\033[B" */
688 case XK_Right: /* "\033[C" */
689 case XK_Left: /* "\033[D" */
690 strcpy (kbuf, "\033[Z");
691 kbuf[2] = "DACB"[keysym - XK_Left];
692 /* do Shift first */
693 if (shft)
694 kbuf[2] = "dacb"[keysym - XK_Left];
695 else if (ctrl)
696 {
697 kbuf[1] = 'O';
698 kbuf[2] = "dacb"[keysym - XK_Left];
699 }
700 else if (priv_modes & PrivMode_aplCUR)
701 kbuf[1] = 'O';
702 break;
703
704 case XK_KP_Enter:
705 /* allow shift to override */
706 if (kp)
707 {
708 strcpy (kbuf, "\033OM");
709 break;
710 }
711
712 /* FALLTHROUGH */
713
714 case XK_Return:
715 if (priv_modes & PrivMode_LFNL)
716 {
717 kbuf[0] = '\015';
718 kbuf[1] = '\012';
719 kbuf[2] = '\0';
720 }
721 else
722 {
723 kbuf[0] = '\015';
724 kbuf[1] = '\0';
725 }
726 break;
727
728 case XK_KP_F1: /* "\033OP" */
729 case XK_KP_F2: /* "\033OQ" */
730 case XK_KP_F3: /* "\033OR" */
731 case XK_KP_F4: /* "\033OS" */
732 strcpy (kbuf, "\033OP");
733 kbuf[2] += (keysym - XK_KP_F1);
734 break;
735
736 case XK_KP_Multiply: /* "\033Oj" : "*" */
737 case XK_KP_Add: /* "\033Ok" : "+" */
738 case XK_KP_Separator: /* "\033Ol" : "," */
739 case XK_KP_Subtract: /* "\033Om" : "-" */
740 case XK_KP_Decimal: /* "\033On" : "." */
741 case XK_KP_Divide: /* "\033Oo" : "/" */
742 case XK_KP_0: /* "\033Op" : "0" */
743 case XK_KP_1: /* "\033Oq" : "1" */
744 case XK_KP_2: /* "\033Or" : "2" */
745 case XK_KP_3: /* "\033Os" : "3" */
746 case XK_KP_4: /* "\033Ot" : "4" */
747 case XK_KP_5: /* "\033Ou" : "5" */
748 case XK_KP_6: /* "\033Ov" : "6" */
749 case XK_KP_7: /* "\033Ow" : "7" */
750 case XK_KP_8: /* "\033Ox" : "8" */
751 case XK_KP_9: /* "\033Oy" : "9" */
752 /* allow shift to override */
753 if (kp)
754 {
755 strcpy (kbuf, "\033Oj");
756 kbuf[2] += (keysym - XK_KP_Multiply);
757 }
758 else
759 {
760 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
761 kbuf[1] = '\0';
762 }
763 break;
764
765 default:
540 { 766 {
541#ifndef NO_BACKSPACE_KEY 767 int param = map_function_key (keysym);
542 case XK_BackSpace: 768 if (param > 0)
543 if (priv_modes & PrivMode_HaveBackSpace) 769 sprintf (kbuf,"\033[%d~", param);
544 {
545 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
546 ^ !!ctrl) ? '\b' : '\177';
547 kbuf[1] = '\0';
548 }
549 else 770 else
550 strcpy (kbuf, key_backspace);
551 break;
552#endif
553#ifndef NO_DELETE_KEY
554# ifdef XK_KP_Prior
555 case XK_KP_Delete:
556 /* allow shift to override */
557 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
558 {
559 strcpy (kbuf, "\033On");
560 break;
561 }
562 /* FALLTHROUGH */
563# endif
564 case XK_Delete:
565 strcpy (kbuf, key_delete);
566 break;
567#endif
568 case XK_Tab:
569 if (shft)
570 strcpy (kbuf, "\033[Z");
571 else
572 {
573#ifdef CTRL_TAB_MAKES_META
574 if (ctrl)
575 meta = 1;
576#endif
577#ifdef MOD4_TAB_MAKES_META
578 if (ev.state & Mod4Mask)
579 meta = 1;
580#endif
581 newlen = 0;
582 }
583 break;
584
585#ifdef XK_KP_Left
586 case XK_KP_Up: /* \033Ox or standard */
587 case XK_KP_Down: /* \033Or or standard */
588 case XK_KP_Right: /* \033Ov or standard */
589 case XK_KP_Left: /* \033Ot or standard */
590 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
591 {
592 strcpy (kbuf, "\033OZ");
593 kbuf[2] = "txvr"[keysym - XK_KP_Left];
594 break;
595 }
596 else
597 /* translate to std. cursor key */
598 keysym = XK_Left + (keysym - XK_KP_Left);
599 /* FALLTHROUGH */
600#endif
601 case XK_Up: /* "\033[A" */
602 case XK_Down: /* "\033[B" */
603 case XK_Right: /* "\033[C" */
604 case XK_Left: /* "\033[D" */
605 strcpy (kbuf, "\033[Z");
606 kbuf[2] = "DACB"[keysym - XK_Left];
607 /* do Shift first */
608 if (shft)
609 kbuf[2] = "dacb"[keysym - XK_Left];
610 else if (ctrl)
611 {
612 kbuf[1] = 'O';
613 kbuf[2] = "dacb"[keysym - XK_Left];
614 }
615 else if (priv_modes & PrivMode_aplCUR)
616 kbuf[1] = 'O';
617 break;
618
619#ifndef UNSHIFTED_SCROLLKEYS
620# ifdef XK_KP_Prior
621 case XK_KP_Prior:
622 /* allow shift to override */
623 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
624 {
625 strcpy (kbuf, "\033Oy");
626 break;
627 }
628 /* FALLTHROUGH */
629# endif
630 case XK_Prior:
631 strcpy (kbuf, "\033[5~");
632 break;
633# ifdef XK_KP_Next
634 case XK_KP_Next:
635 /* allow shift to override */
636 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
637 {
638 strcpy (kbuf, "\033Os");
639 break;
640 }
641 /* FALLTHROUGH */
642# endif
643 case XK_Next:
644 strcpy (kbuf, "\033[6~");
645 break;
646#endif
647 case XK_KP_Enter:
648 /* allow shift to override */
649 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
650 {
651 strcpy (kbuf, "\033OM");
652 break;
653 }
654
655 /* FALLTHROUGH */
656
657 case XK_Return:
658 if (priv_modes & PrivMode_LFNL)
659 {
660 kbuf[0] = '\015';
661 kbuf[1] = '\012';
662 kbuf[2] = '\0';
663 }
664 else
665 {
666 kbuf[0] = '\015';
667 kbuf[1] = '\0';
668 }
669 break;
670
671#ifdef XK_KP_Begin
672 case XK_KP_Begin:
673 strcpy (kbuf, "\033Ou");
674 break;
675
676#endif
677 case XK_KP_F1: /* "\033OP" */
678 case XK_KP_F2: /* "\033OQ" */
679 case XK_KP_F3: /* "\033OR" */
680 case XK_KP_F4: /* "\033OS" */
681 strcpy (kbuf, "\033OP");
682 kbuf[2] += (keysym - XK_KP_F1);
683 break;
684
685 case XK_KP_Multiply: /* "\033Oj" : "*" */
686 case XK_KP_Add: /* "\033Ok" : "+" */
687 case XK_KP_Separator: /* "\033Ol" : "," */
688 case XK_KP_Subtract: /* "\033Om" : "-" */
689 case XK_KP_Decimal: /* "\033On" : "." */
690 case XK_KP_Divide: /* "\033Oo" : "/" */
691 case XK_KP_0: /* "\033Op" : "0" */
692 case XK_KP_1: /* "\033Oq" : "1" */
693 case XK_KP_2: /* "\033Or" : "2" */
694 case XK_KP_3: /* "\033Os" : "3" */
695 case XK_KP_4: /* "\033Ot" : "4" */
696 case XK_KP_5: /* "\033Ou" : "5" */
697 case XK_KP_6: /* "\033Ov" : "6" */
698 case XK_KP_7: /* "\033Ow" : "7" */
699 case XK_KP_8: /* "\033Ox" : "8" */
700 case XK_KP_9: /* "\033Oy" : "9" */
701 /* allow shift to override */
702 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
703 {
704 strcpy (kbuf, "\033Oj");
705 kbuf[2] += (keysym - XK_KP_Multiply);
706 }
707 else
708 {
709 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
710 kbuf[1] = '\0';
711 }
712 break;
713
714 case XK_Find:
715 strcpy (kbuf, "\033[1~");
716 break;
717
718#ifdef XK_KP_End
719 case XK_KP_Insert:
720 /* allow shift to override */
721 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
722 {
723 strcpy (kbuf, "\033Op");
724 break;
725 }
726 /* FALLTHROUGH */
727#endif
728 case XK_Insert:
729 strcpy (kbuf, "\033[2~");
730 break;
731#ifdef DXK_Remove /* support for DEC remove like key */
732 case DXK_Remove:
733 /* FALLTHROUGH */
734#endif
735 case XK_Execute:
736 strcpy (kbuf, "\033[3~");
737 break;
738 case XK_Select:
739 strcpy (kbuf, "\033[4~");
740 break;
741#ifdef XK_KP_End
742 case XK_KP_End:
743 /* allow shift to override */
744 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
745 {
746 strcpy (kbuf, "\033Oq");
747 break;
748 }
749 /* FALLTHROUGH */
750#endif
751 case XK_End:
752 strcpy (kbuf, KS_END);
753 break;
754#ifdef XK_KP_Home
755 case XK_KP_Home:
756 /* allow shift to override */
757 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
758 {
759 strcpy (kbuf, "\033Ow");
760 break;
761 }
762 /* FALLTHROUGH */
763#endif
764 case XK_Home:
765 strcpy (kbuf, KS_HOME);
766 break;
767
768#define FKEY(n, fkey) \
769 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
770
771 case XK_F1: /* "\033[11~" */
772 case XK_F2: /* "\033[12~" */
773 case XK_F3: /* "\033[13~" */
774 case XK_F4: /* "\033[14~" */
775 case XK_F5: /* "\033[15~" */
776 FKEY (11, XK_F1);
777 break;
778 case XK_F6: /* "\033[17~" */
779 case XK_F7: /* "\033[18~" */
780 case XK_F8: /* "\033[19~" */
781 case XK_F9: /* "\033[20~" */
782 case XK_F10: /* "\033[21~" */
783 FKEY (17, XK_F6);
784 break;
785 case XK_F11: /* "\033[23~" */
786 case XK_F12: /* "\033[24~" */
787 case XK_F13: /* "\033[25~" */
788 case XK_F14: /* "\033[26~" */
789 FKEY (23, XK_F11);
790 break;
791 case XK_F15: /* "\033[28~" */
792 case XK_F16: /* "\033[29~" */
793 FKEY (28, XK_F15);
794 break;
795 case XK_Help: /* "\033[28~" */
796 FKEY (28, XK_Help);
797 break;
798 case XK_Menu: /* "\033[29~" */
799 FKEY (29, XK_Menu);
800 break;
801 case XK_F17: /* "\033[31~" */
802 case XK_F18: /* "\033[32~" */
803 case XK_F19: /* "\033[33~" */
804 case XK_F20: /* "\033[34~" */
805 case XK_F21: /* "\033[35~" */
806 case XK_F22: /* "\033[36~" */
807 case XK_F23: /* "\033[37~" */
808 case XK_F24: /* "\033[38~" */
809 case XK_F25: /* "\033[39~" */
810 case XK_F26: /* "\033[40~" */
811 case XK_F27: /* "\033[41~" */
812 case XK_F28: /* "\033[42~" */
813 case XK_F29: /* "\033[43~" */
814 case XK_F30: /* "\033[44~" */
815 case XK_F31: /* "\033[45~" */
816 case XK_F32: /* "\033[46~" */
817 case XK_F33: /* "\033[47~" */
818 case XK_F34: /* "\033[48~" */
819 case XK_F35: /* "\033[49~" */
820 FKEY (31, XK_F17);
821 break;
822#undef FKEY
823 default:
824 newlen = 0; 771 newlen = 0;
825 break;
826 } 772 }
827 773 break;
828 if (newlen)
829 len = strlen (kbuf);
830 } 774 }
775
776 if (newlen)
777 len = strlen (kbuf);
831 778
832 /* 779 /*
833 * Pass meta for all function keys, if 'meta' option set 780 * Pass meta for all function keys, if 'meta' option set
834 */ 781 */
835#ifdef META8_OPTION 782#ifdef META8_OPTION
… …
870 return; 817 return;
871 818
872 if (len <= 0) 819 if (len <= 0)
873 return; /* not mapped */ 820 return; /* not mapped */
874 821
875 if (OPTION (Opt_scrollTtyKeypress)) 822 if (option (Opt_scrollTtyKeypress))
876 if (view_start) 823 if (view_start)
877 { 824 {
878 view_start = 0; 825 view_start = 0;
879 want_refresh = 1; 826 want_refresh = 1;
880 } 827 }
… …
902 { 849 {
903 const char ch = C0_ESC; 850 const char ch = C0_ESC;
904 tt_write (&ch, 1); 851 tt_write (&ch, 1);
905 } 852 }
906 853
907#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */
909 unsigned char *p;
910 int i;
911
912 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913 for (i = 0, p = kbuf; i < len; i++, p++)
914 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915 fprintf (stderr, "'\n");
916#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 854 tt_write (kbuf, (unsigned int)len);
918} 855}
919/*}}} */ 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}
920 933
921#if defined (KEYSYM_RESOURCE) 934#if defined (KEYSYM_RESOURCE)
922unsigned int 935unsigned int
923rxvt_term::cmd_write (const char *str, unsigned int count) 936rxvt_term::cmd_write (const char *str, unsigned int count)
924{ 937{
… …
954void 967void
955rxvt_term::flush () 968rxvt_term::flush ()
956{ 969{
957 flush_ev.stop (); 970 flush_ev.stop ();
958 971
959#ifdef TRANSPARENT 972#ifdef HAVE_BG_PIXMAP
960 if (want_full_refresh) 973 if (bgPixmap.check_clearChanged ())
961 { 974 {
962 want_full_refresh = 0; 975// scr_clear (true); This needs to be researched further!
963 scr_clear ();
964 scr_touch (false); 976 scr_touch (false);
965 } 977 }
966#endif 978#endif
967 979
968 if (want_refresh) 980 if (want_refresh)
… …
1004 } 1016 }
1005 while (row < end_row); 1017 while (row < end_row);
1006 } 1018 }
1007 1019
1008 scr_refresh (); 1020 scr_refresh ();
1009 scrollbar_show (1); 1021 scrollBar.show (1);
1010#ifdef USE_XIM 1022#ifdef USE_XIM
1011 IMSendSpot (); 1023 IMSendSpot ();
1012#endif 1024#endif
1013 } 1025 }
1014 1026
1015 display->flush (); 1027 display->flush ();
1016} 1028}
1017 1029
1030/* checks wether a refresh is requested and starts the refresh timer */
1018void 1031void
1019rxvt_term::check_cb (check_watcher &w) 1032rxvt_term::refresh_check ()
1033{
1034 if (want_refresh && !flush_ev.is_active ())
1035 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1036
1037 display->flush ();
1038}
1039
1040void
1041rxvt_term::flush_cb (ev::timer &w, int revents)
1020{ 1042{
1021 make_current (); 1043 make_current ();
1022 1044
1023 display->flush ();
1024
1025 if (want_refresh && !flush_ev.active)
1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1027}
1028
1029void
1030rxvt_term::flush_cb (time_watcher &w)
1031{
1032 make_current ();
1033
1034 refresh_limit = 1;
1035 refresh_count = 0; 1045 refresh_count = 0;
1036 flush (); 1046 flush ();
1037} 1047}
1038 1048
1039#ifdef CURSOR_BLINK 1049#ifdef CURSOR_BLINK
1040void 1050void
1041rxvt_term::cursor_blink_cb (time_watcher &w) 1051rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1042{ 1052{
1043 hidden_cursor = !hidden_cursor; 1053 hidden_cursor = !hidden_cursor;
1044 want_refresh = 1; 1054 want_refresh = 1;
1045 1055 refresh_check ();
1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
1047} 1056}
1048#endif 1057#endif
1049 1058
1050#ifdef TEXT_BLINK 1059#ifdef TEXT_BLINK
1051void 1060void
1052rxvt_term::text_blink_cb (time_watcher &w) 1061rxvt_term::text_blink_cb (ev::timer &w, int revents)
1053{ 1062{
1054 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1063 if (scr_refresh_rend (RS_Blink, RS_Blink))
1055 { 1064 {
1056 hidden_text = !hidden_text; 1065 hidden_text = !hidden_text;
1057 want_refresh = 1; 1066 want_refresh = 1;
1058 w.start (w.at + TEXT_BLINK_INTERVAL); 1067 refresh_check ();
1059 } 1068 }
1069 else
1070 w.stop ();
1060} 1071}
1061#endif 1072#endif
1062 1073
1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1074#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1064void 1075void
1065rxvt_term::cont_scroll_cb (time_watcher &w) 1076rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1066{ 1077{
1067 if ((scrollbar_isUp() || scrollbar_isDn()) && 1078 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1068 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1079 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1069 { 1080 {
1070 want_refresh = 1; 1081 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1082 refresh_check ();
1072 } 1083 }
1084 else
1085 w.stop ();
1073} 1086}
1074#endif 1087#endif
1075 1088
1076#ifdef SELECTION_SCROLLING 1089#ifdef SELECTION_SCROLLING
1077void 1090void
1078rxvt_term::sel_scroll_cb (time_watcher &w) 1091rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1079{ 1092{
1080 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1093 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1081 { 1094 {
1082 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1095 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1083 want_refresh = 1; 1096 want_refresh = 1;
1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1097 refresh_check ();
1085 } 1098 }
1099 else
1100 w.stop ();
1086} 1101}
1087#endif 1102#endif
1088 1103
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1104#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090void 1105void
1091rxvt_term::slip_wheel_cb (time_watcher &w) 1106rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1092{ 1107{
1093 if (mouse_slip_wheel_speed == 0 1108 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1094 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1095 : scr_page (UP, mouse_slip_wheel_speed))
1096 { 1109 {
1097 if (view_start == top_row || view_start == 0)
1098 mouse_slip_wheel_speed = 0;
1099
1100 want_refresh = 1; 1110 want_refresh = 1;
1101 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)
1102 } 1115 {
1116 mouse_slip_wheel_speed = 0;
1117 w.stop ();
1118 }
1103} 1119}
1104#endif 1120#endif
1105 1121
1106#if HAVE_SCHED_YIELD 1122#if LINUX_YIELD_HACK
1107static struct event_handler 1123static struct event_handler
1108{ 1124{
1109 check_watcher cw_yield; 1125 ev::prepare yield_ev;
1110 1126
1111 void yield (check_watcher &w) 1127 void yield_cb (ev::prepare &w, int revents)
1112 { 1128 {
1113 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 // since the linux guys additionally thought that breaking the only
1134 // known workaroudn against their unusable sched_yield hack is cool,
1135 // we just nanosleep a bit and hope for the best.
1136
1137 struct timespec ts = { 0, 1000 };
1138 nanosleep (&ts, 0);
1139
1114 w.stop (); 1140 w.stop ();
1115 } 1141 }
1116 1142
1117 event_handler () 1143 event_handler ()
1118 : cw_yield (this, &event_handler::yield) 1144 : yield_ev (this, &event_handler::yield_cb)
1119 { 1145 {
1120 } 1146 }
1121} event_handler; 1147} event_handler;
1122#endif 1148#endif
1123 1149
… …
1143 cmdbuf_endp += r; 1169 cmdbuf_endp += r;
1144 return true; 1170 return true;
1145 } 1171 }
1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1172 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 { 1173 {
1148#if HAVE_SCHED_YIELD 1174#if LINUX_YIELD_HACK
1149 if (display->is_local) 1175 if (display->is_local)
1150 event_handler.cw_yield.start (); 1176 event_handler.yield_ev.start ();
1151#endif 1177#endif
1152 } 1178 }
1153 else 1179 else
1154 { 1180 {
1155 pty_ev.stop (); 1181 pty_ev.stop ();
1156 1182
1157 if (!OPTION (Opt_hold)) 1183 if (!option (Opt_hold))
1158 destroy (); 1184 destroy ();
1159 } 1185 }
1160 1186
1161 return false; 1187 return false;
1162} 1188}
1163 1189
1164void 1190void
1165rxvt_term::pty_cb (io_watcher &w, short revents) 1191rxvt_term::pty_cb (ev::io &w, int revents)
1166{ 1192{
1167 make_current (); 1193 make_current ();
1168 1194
1169 if (revents & EVENT_READ) 1195 if (revents & ev::READ)
1170 // loop, but don't allow a single term to monopolize us 1196 // loop, but don't allow a single term to monopolize us
1171 while (pty_fill ()) 1197 for (int i = CBUFCNT; i-- && pty_fill (); )
1172 if (cmd_parse ()) 1198 cmd_parse ();
1173 break;
1174 1199
1175 if (revents & EVENT_WRITE) 1200 if (revents & ev::WRITE)
1176 pty_write (); 1201 pty_write ();
1202
1203 refresh_check ();
1177} 1204}
1178 1205
1179void 1206void
1180rxvt_term::pointer_unblank () 1207rxvt_term::pointer_unblank ()
1181{ 1208{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1209 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1210 recolour_cursor ();
1184 1211
1185#ifdef POINTER_BLANK 1212#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1213 hidden_pointer = 0;
1187 1214
1188 if (OPTION (Opt_pointerBlank)) 1215 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1216 pointer_ev.start (pointerBlankDelay);
1190#endif 1217#endif
1191} 1218}
1192 1219
1193#ifdef POINTER_BLANK 1220#ifdef POINTER_BLANK
1194void 1221void
1195rxvt_term::pointer_blank () 1222rxvt_term::pointer_blank ()
1196{ 1223{
1197 if (!OPTION (Opt_pointerBlank)) 1224 if (!option (Opt_pointerBlank))
1198 return; 1225 return;
1199 1226
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1227 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (display->display); 1228 XFlush (dpy);
1202 1229
1203 hidden_pointer = 1; 1230 hidden_pointer = 1;
1204} 1231}
1205 1232
1206void 1233void
1207rxvt_term::pointer_cb (time_watcher &w) 1234rxvt_term::pointer_cb (ev::timer &w, int revents)
1208{ 1235{
1209 make_current (); 1236 make_current ();
1210 1237
1211 pointer_blank (); 1238 pointer_blank ();
1212} 1239}
… …
1215void 1242void
1216rxvt_term::mouse_report (XButtonEvent &ev) 1243rxvt_term::mouse_report (XButtonEvent &ev)
1217{ 1244{
1218 int button_number, key_state = 0; 1245 int button_number, key_state = 0;
1219 int x, y; 1246 int x, y;
1247 int code = 32;
1220 1248
1221 x = ev.x; 1249 x = Pixel2Col (ev.x);
1222 y = ev.y; 1250 y = Pixel2Row (ev.y);
1223 pixel_position (&x, &y); 1251 if (ev.type == MotionNotify)
1252 {
1253 if (x == mouse_row && y == mouse_col)
1254 return;
1255 mouse_row = x;
1256 mouse_col = y;
1257 code += 32;
1258 }
1224 1259
1225 if (MEvent.button == AnyButton) 1260 if (MEvent.button == AnyButton)
1226 button_number = 3; 1261 button_number = 3;
1227 else 1262 else
1228 { 1263 {
… …
1274 x + 1, 1309 x + 1,
1275 y + 1); 1310 y + 1);
1276#endif 1311#endif
1277 1312
1278 tt_printf ("\033[M%c%c%c", 1313 tt_printf ("\033[M%c%c%c",
1279 (32 + button_number + key_state), 1314 (code + button_number + key_state),
1280 (32 + x + 1), 1315 (32 + x + 1),
1281 (32 + y + 1)); 1316 (32 + y + 1));
1282} 1317}
1283 1318
1284#ifdef USING_W11LIB
1285void
1286rxvt_W11_process_x_event (XEvent *ev)
1287{
1288 rxvt_t *r = rxvt_get_r ();
1289
1290 x_cb (*ev);
1291}
1292#endif
1293
1294/*{{{ process an X event */ 1319/*{{{ process an X event */
1295void 1320void
1296rxvt_term::x_cb (XEvent &ev) 1321rxvt_term::x_cb (XEvent &ev)
1297{ 1322{
1298 make_current (); 1323 make_current ();
1299 1324
1300 dDisp; 1325 dLocal (Display *, dpy);
1301 1326
1302 if (ev.xany.window == vt 1327 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1328 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1329 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1330 return;
… …
1310 unsigned int unused_mask; 1335 unsigned int unused_mask;
1311 1336
1312 switch (ev.type) 1337 switch (ev.type)
1313 { 1338 {
1314 case KeyPress: 1339 case KeyPress:
1315#if ISO_14755 1340 key_press (ev.xkey);
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
1318 lookup_key (ev.xkey);
1319
1320 break; 1341 break;
1321 1342
1322 case KeyRelease: 1343 case KeyRelease:
1323 { 1344 key_release (ev.xkey);
1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1325 KeySym keysym;
1326
1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1328#endif
1329
1330#if ENABLE_FRILLS || ISO_14755
1331 // ISO 14755 support
1332 if (iso14755buf)
1333 if (iso14755buf & ISO_14755_52)
1334 {
1335# if ENABLE_OVERLAY
1336 scr_overlay_off ();
1337# endif
1338# if ISO_14755
1339 // iso14755 part 5.2 handling: release time
1340 // first: controls
1341 if ((ev.xkey.state & ControlMask)
1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1344 {
1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1346 commit_iso14755 ();
1347 goto skip_switch;
1348 }
1349
1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1351 if (i[0] == keysym)
1352 {
1353 iso14755buf = ISO_14755_51 | i[1];
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 scr_bell ();
1359# endif
1360 iso14755buf = 0;
1361 break;
1362 }
1363 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1364 {
1365# if ENABLE_OVERLAY
1366 scr_overlay_off ();
1367# endif
1368 if (iso14755buf & ISO_14755_51)
1369 commit_iso14755 ();
1370#if ISO_14755
1371 else if (iso14755buf & ISO_14755_STARTED)
1372 {
1373 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1374
1375 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1376 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1377 }
1378# endif
1379 else
1380 iso14755buf = 0;
1381 }
1382#endif
1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386 break;
1387
1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1389 if (!(ev.xkey.state & ControlMask))
1390 slip_wheel_ev.stop ();
1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1392 mouse_slip_wheel_speed = 0;
1393#endif
1394 break; 1345 break;
1395 }
1396 1346
1397 case ButtonPress: 1347 case ButtonPress:
1398 button_press (ev.xbutton); 1348 button_press (ev.xbutton);
1399 break; 1349 break;
1400 1350
… …
1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1365 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416 destroy (); 1366 destroy ();
1417 } 1367 }
1418#if ENABLE_EWMH 1368#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1369 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1370 XSendEvent (dpy, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1371 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1372 &ev);
1423#endif 1373#endif
1424 } 1374 }
1425 } 1375 }
… …
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1381 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out (); 1382 focus_out ();
1433 } 1383 }
1434#endif 1384#endif
1435 } 1385 }
1436 break;
1437
1438 case MappingNotify:
1439 XRefreshKeyboardMapping (&ev.xmapping);
1440 break; 1386 break;
1441 1387
1442 /* 1388 /*
1443 * XXX: this is not the _current_ arrangement 1389 * XXX: this is not the _current_ arrangement
1444 * Here's my conclusion: 1390 * Here's my conclusion:
… …
1463 break; 1409 break;
1464 } 1410 }
1465 break; 1411 break;
1466 1412
1467 case FocusIn: 1413 case FocusIn:
1414 if (ev.xfocus.detail != NotifyInferior
1415 && ev.xfocus.detail != NotifyPointer
1416 && ev.xfocus.mode != NotifyGrab)
1468 focus_in (); 1417 focus_in ();
1469 break; 1418 break;
1470 1419
1471 case FocusOut: 1420 case FocusOut:
1421 if (ev.xfocus.detail != NotifyInferior
1422 && ev.xfocus.detail != NotifyPointer
1423 && ev.xfocus.mode != NotifyGrab)
1472 focus_out (); 1424 focus_out ();
1473 break; 1425 break;
1474 1426
1475 case ConfigureNotify: 1427 case ConfigureNotify:
1428 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1429 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1430 szHint.width, szHint.height);*/
1476 if (ev.xconfigure.window == parent[0]) 1431 if (ev.xconfigure.window == parent[0])
1477 { 1432 {
1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1433 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ; 1434 ;
1480 1435
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1436 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 { 1437 {
1483 seen_resize = 1; 1438 seen_resize = 1;
1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1439 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1485 } 1440 }
1441 else
1442 {
1443#ifdef HAVE_BG_PIXMAP
1444 if (bgPixmap.window_position_sensitive ())
1445 {
1446 if (mapped)
1447 update_background ();
1448 else
1449 bgPixmap.invalidate ();
1450 }
1451#endif
1452 }
1486 1453
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1454 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488
1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1490 if (OPTION (Opt_transparent))
1491 check_our_parents ();
1492#endif
1493 } 1455 }
1494 break; 1456 break;
1495 1457
1496 case PropertyNotify: 1458 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1459 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1500 selection_property (ev.xproperty.window, ev.xproperty.atom); 1462 selection_property (ev.xproperty.window, ev.xproperty.atom);
1501 1463
1502 break; 1464 break;
1503 1465
1504 case SelectionClear: 1466 case SelectionClear:
1505 selection_clear (); 1467 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1506 break; 1468 break;
1507 1469
1508 case SelectionNotify: 1470 case SelectionNotify:
1509 if (selection_wait == Sel_normal) 1471 if (selection_wait == Sel_normal)
1510 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1472 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1513 case SelectionRequest: 1475 case SelectionRequest:
1514 selection_send (ev.xselectionrequest); 1476 selection_send (ev.xselectionrequest);
1515 break; 1477 break;
1516 1478
1517 case MapNotify: 1479 case MapNotify:
1480#ifdef HAVE_BG_PIXMAP
1481 /* This is needed spcifically to fix the case of no window manager or a
1482 * non-reparenting window manager. In those cases we never get first
1483 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1484 * care of multiplicity of ConfigureNotify events arriwing while WM does
1485 * reparenting.
1486 * We should not render background immidiately, as there could be several
1487 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1488 * by scheduling background redraw as soon as we can, but giving a short
1489 * bit of time for ConfigureNotifies to arrive.
1490 * We should render background PRIOR to drawing any text, but AFTER all
1491 * of ConfigureNotifys for the best results.
1492 */
1493 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1494 update_background_ev.start (0.025);
1495#endif
1518 mapped = 1; 1496 mapped = 1;
1519#ifdef TEXT_BLINK 1497#ifdef TEXT_BLINK
1520 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1498 text_blink_ev.start ();
1521#endif 1499#endif
1522 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1500 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1523 break; 1501 break;
1524 1502
1525 case UnmapNotify: 1503 case UnmapNotify:
… …
1527#ifdef TEXT_BLINK 1505#ifdef TEXT_BLINK
1528 text_blink_ev.stop (); 1506 text_blink_ev.stop ();
1529#endif 1507#endif
1530 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1508 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1531 break; 1509 break;
1532
1533#ifdef TRANSPARENT
1534 case ReparentNotify:
1535 rootwin_cb (ev);
1536 break;
1537#endif /* TRANSPARENT */
1538 1510
1539 case GraphicsExpose: 1511 case GraphicsExpose:
1540 case Expose: 1512 case Expose:
1541 if (ev.xany.window == vt) 1513 if (ev.xany.window == vt)
1542 { 1514 {
1543 do 1515 do
1516 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1517 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1518 ev.xexpose.width, ev.xexpose.height, False);
1519 }
1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1520 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1547 1521
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1522 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549 1523
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1524 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1525 {
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1526 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1527 ev.xexpose.width, ev.xexpose.height, False);
1528 }
1553 1529
1554 want_refresh = 1; 1530 want_refresh = 1;
1555 } 1531 }
1556 else 1532 else
1557 { 1533 {
1558 XEvent unused_event; 1534 XEvent unused_event;
1559 1535
1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1536 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1561 ; 1537 ;
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1538 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1539 ;
1564 1540
1565 if (isScrollbarWindow (ev.xany.window)) 1541 if (scrollBar.state && ev.xany.window == scrollBar.win)
1566 { 1542 {
1567 scrollBar.setIdle (); 1543 scrollBar.state = STATE_IDLE;
1568 scrollbar_show (0); 1544 scrollBar.show (0);
1569 } 1545 }
1570
1571#ifdef TRANSPARENT
1572 if (am_transparent && ev.xany.window == parent[0])
1573 XClearWindow (disp, ev.xany.window);
1574#endif
1575 } 1546 }
1576 break; 1547 break;
1577 1548
1578 case MotionNotify: 1549 case MotionNotify:
1579#ifdef POINTER_BLANK 1550#ifdef POINTER_BLANK
1580 if (hidden_pointer) 1551 if (hidden_pointer)
1581 pointer_unblank (); 1552 pointer_unblank ();
1582#endif 1553#endif
1554 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1555 || priv_modes & PrivMode_MouseAnyEvent)
1556 mouse_report (ev.xbutton);
1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1557 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1584 break; 1558 break;
1585 1559
1586 if (ev.xany.window == vt) 1560 if (ev.xany.window == vt)
1587 { 1561 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1562 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1563 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop 1564 ; // nop
1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1565 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1592 { 1566 {
1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1567 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1594 ; 1568 ;
1595 1569
1596 XQueryPointer (disp, vt, 1570 XQueryPointer (dpy, vt,
1597 &unused_root, &unused_child, 1571 &unused_root, &unused_child,
1598 &unused_root_x, &unused_root_y, 1572 &unused_root_x, &unused_root_y,
1599 &ev.xbutton.x, &ev.xbutton.y, 1573 &ev.xbutton.x, &ev.xbutton.y,
1600 &ev.xbutton.state); 1574 &ev.xbutton.state);
1601#ifdef MOUSE_THRESHOLD 1575#ifdef MOUSE_THRESHOLD
… …
1621 int dist; 1595 int dist;
1622 1596
1623 /* don't clobber the current delay if we are 1597 /* don't clobber the current delay if we are
1624 * already in the middle of scrolling. 1598 * already in the middle of scrolling.
1625 */ 1599 */
1626 if (!sel_scroll_ev.active) 1600 if (!sel_scroll_ev.is_active ())
1627 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1601 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1628 1602
1629 /* save the event params so we can highlight 1603 /* save the event params so we can highlight
1630 * the selection in the pending-scroll loop 1604 * the selection in the pending-scroll loop
1631 */ 1605 */
1632 selection_save_x = ev.xbutton.x; 1606 selection_save_x = ev.xbutton.x;
… …
1654 else 1628 else
1655 { 1629 {
1656 /* we are within the text window, so we 1630 /* we are within the text window, so we
1657 * shouldn't be scrolling 1631 * shouldn't be scrolling
1658 */ 1632 */
1659 if (sel_scroll_ev.active)
1660 sel_scroll_ev.stop(); 1633 sel_scroll_ev.stop();
1661 } 1634 }
1662#endif 1635#endif
1663#ifdef MOUSE_THRESHOLD 1636#ifdef MOUSE_THRESHOLD
1664 } 1637 }
1665#endif 1638#endif
1666 } 1639 }
1667 } 1640 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1641 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1669 { 1642 {
1670 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1643 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1644 MotionNotify, &ev))
1672 ; 1645 ;
1673 1646
1674 XQueryPointer (disp, scrollBar.win, 1647 XQueryPointer (dpy, scrollBar.win,
1675 &unused_root, &unused_child, 1648 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1649 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1650 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1651 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1652 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1680 scrollbar_size ()); 1653 scrollBar.size ());
1681 want_refresh = 1; 1654 want_refresh = 1;
1682 refresh_limit = 0;
1683 scrollbar_show (1); 1655 scrollBar.show (1);
1684 } 1656 }
1685 break; 1657 break;
1686 } 1658 }
1687 1659
1688skip_switch: ;
1689
1690#if defined(CURSOR_BLINK) 1660#if defined(CURSOR_BLINK)
1691 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1661 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1692 { 1662 {
1693 if (hidden_cursor) 1663 if (hidden_cursor)
1694 { 1664 {
1695 hidden_cursor = 0; 1665 hidden_cursor = 0;
1696 want_refresh = 1; 1666 want_refresh = 1;
1697 } 1667 }
1698 1668
1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1669 cursor_blink_ev.again ();
1700 } 1670 }
1701#endif 1671#endif
1702 1672
1703#if defined(POINTER_BLANK) 1673#if defined(POINTER_BLANK)
1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1674 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1705 { 1675 {
1706 if (ev.type == MotionNotify 1676 if (ev.type == MotionNotify
1707 || ev.type == ButtonPress 1677 || ev.type == ButtonPress
1708 || ev.type == ButtonRelease) 1678 || ev.type == ButtonRelease)
1709 if (hidden_pointer) 1679 if (hidden_pointer)
… …
1711 1681
1712 if (ev.type == KeyPress && hidden_pointer == 0) 1682 if (ev.type == KeyPress && hidden_pointer == 0)
1713 pointer_blank (); 1683 pointer_blank ();
1714 } 1684 }
1715#endif 1685#endif
1686
1687 refresh_check ();
1716} 1688}
1689
1690#if ENABLE_FRILLS
1691void
1692rxvt_term::set_urgency (bool enable)
1693{
1694 if (enable == urgency_hint)
1695 return;
1696
1697 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1698 {
1699 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1700 XSetWMHints (dpy, parent[0], h);
1701 urgency_hint = enable;
1702 }
1703}
1704#endif
1717 1705
1718void 1706void
1719rxvt_term::focus_in () 1707rxvt_term::focus_in ()
1720{ 1708{
1721 if (!focus) 1709 if (!focus)
1722 { 1710 {
1723 focus = 1; 1711 focus = 1;
1724 want_refresh = 1; 1712 want_refresh = 1;
1725 1713
1726 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1727
1728#if USE_XIM 1714#if USE_XIM
1729 if (Input_Context != NULL) 1715 if (Input_Context != NULL)
1730 { 1716 {
1731 IMSetStatusPosition (); 1717 IMSetPosition ();
1732 XSetICFocus (Input_Context); 1718 XSetICFocus (Input_Context);
1733 } 1719 }
1734#endif 1720#endif
1735#if CURSOR_BLINK 1721#if CURSOR_BLINK
1736 if (OPTION (Opt_cursorBlink)) 1722 if (option (Opt_cursorBlink))
1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1723 cursor_blink_ev.again ();
1738#endif 1724#endif
1739#if OFF_FOCUS_FADING 1725#if OFF_FOCUS_FADING
1740 if (rs[Rs_fade]) 1726 if (rs[Rs_fade])
1741 { 1727 {
1742 pix_colors = pix_colors_focused; 1728 pix_colors = pix_colors_focused;
1743 scr_recolour (); 1729 scr_recolour ();
1744 } 1730 }
1745#endif 1731#endif
1732#if ENABLE_FRILLS
1733 if (option (Opt_urgentOnBell))
1734 set_urgency (0);
1735#endif
1736
1737 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1746 } 1738 }
1747} 1739}
1748 1740
1749void 1741void
1750rxvt_term::focus_out () 1742rxvt_term::focus_out ()
… …
1752 if (focus) 1744 if (focus)
1753 { 1745 {
1754 focus = 0; 1746 focus = 0;
1755 want_refresh = 1; 1747 want_refresh = 1;
1756 1748
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1749#if ENABLE_FRILLS
1758 1750 if (option (Opt_urgentOnBell))
1751 set_urgency (0);
1752#endif
1759#if ENABLE_FRILLS || ISO_14755 1753#if ENABLE_FRILLS || ISO_14755
1760 if (iso14755buf) 1754 if (iso14755buf)
1761 { 1755 {
1762 iso14755buf = 0; 1756 iso14755buf = 0;
1763# if ENABLE_OVERLAY 1757# if ISO_14755
1764 scr_overlay_off (); 1758 scr_overlay_off ();
1765# endif 1759# endif
1766 } 1760 }
1767#endif 1761#endif
1768#if USE_XIM 1762#if USE_XIM
1769 if (Input_Context != NULL) 1763 if (Input_Context != NULL)
1770 XUnsetICFocus (Input_Context); 1764 XUnsetICFocus (Input_Context);
1771#endif 1765#endif
1772#if CURSOR_BLINK 1766#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink)) 1767 if (option (Opt_cursorBlink))
1774 cursor_blink_ev.stop (); 1768 cursor_blink_ev.stop ();
1769
1775 hidden_cursor = 0; 1770 hidden_cursor = 0;
1776#endif 1771#endif
1777#if OFF_FOCUS_FADING 1772#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade]) 1773 if (rs[Rs_fade])
1779 { 1774 {
1780 pix_colors = pix_colors_unfocused; 1775 pix_colors = pix_colors_unfocused;
1781 scr_recolour (); 1776 scr_recolour ();
1782 } 1777 }
1783#endif 1778#endif
1779
1780 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1781 }
1782}
1783
1784void
1785rxvt_term::update_fade_color (unsigned int idx)
1786{
1787#if OFF_FOCUS_FADING
1788 if (rs[Rs_fade])
1784 } 1789 {
1790 rgba c;
1791 pix_colors [Color_fade].get (c);
1792 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1793 }
1794#endif
1785} 1795}
1786 1796
1787#if TRANSPARENT 1797#if ENABLE_TRANSPARENCY || ENABLE_PERL
1788void 1798void
1789rxvt_term::rootwin_cb (XEvent &ev) 1799rxvt_term::rootwin_cb (XEvent &ev)
1790{ 1800{
1791 make_current (); 1801 make_current ();
1792 1802
1803 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1804 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1805 return;
1806
1807# if ENABLE_TRANSPARENCY
1793 switch (ev.type) 1808 switch (ev.type)
1794 { 1809 {
1795 case PropertyNotify: 1810 case PropertyNotify:
1796 /* 1811 /*
1797 * if user used some Esetroot compatible prog to set the root bg, 1812 * if user used some Esetroot compatible prog to set the root bg,
1798 * use the property to determine the pixmap. We use it later on. 1813 * use the property to determine the pixmap. We use it later on.
1799 */ 1814 */
1800 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1815 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1801 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1816 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1802 return; 1817 {
1818 bgPixmap.set_root_pixmap ();
1819 update_background ();
1820 }
1803 1821
1804 /* FALLTHROUGH */
1805 case ReparentNotify:
1806 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1807 want_refresh = want_full_refresh = 1;
1808 break; 1822 break;
1809 } 1823 }
1824# endif
1825
1826 refresh_check ();
1810} 1827}
1811#endif 1828#endif
1812 1829
1813void 1830void
1814rxvt_term::button_press (XButtonEvent &ev) 1831rxvt_term::button_press (XButtonEvent &ev)
… …
1823 /* 1840 /*
1824 * VT window processing of button press 1841 * VT window processing of button press
1825 */ 1842 */
1826 if (ev.window == vt) 1843 if (ev.window == vt)
1827 { 1844 {
1845 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1846 return;
1847
1828#if ISO_14755 1848#if ISO_14755
1829 // 5.4 1849 // 5.4
1830 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1850 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1831 { 1851 {
1832 iso14755_54 (ev.x, ev.y); 1852 iso14755_54 (ev.x, ev.y);
… …
1866 mouse_report (ev); 1886 mouse_report (ev);
1867 } 1887 }
1868#else 1888#else
1869 MEvent.button = ev.button; 1889 MEvent.button = ev.button;
1870 mouse_report (ev); 1890 mouse_report (ev);
1871#endif /* MOUSE_REPORT_DOUBLECLICK */ 1891#endif /* MOUSE_REPORT_DOUBLECLICK */
1872 1892
1873 } 1893 }
1874 else 1894 else
1875 { 1895 {
1876 if (ev.button != MEvent.button) 1896 if (ev.button != MEvent.button)
1877 MEvent.clicks = 0; 1897 MEvent.clicks = 0;
1878 1898
1879 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1880 switch (ev.button) 1899 switch (ev.button)
1881 { 1900 {
1882 case Button1: 1901 case Button1:
1883 /* allow meta + click to select rectangular areas */ 1902 /* allow meta + click to select rectangular areas */
1884 /* should be done in screen.C */ 1903 /* should be done in screen.C */
1885#if ENABLE_FRILLS 1904#if ENABLE_FRILLS
1886 selection.rect = !!(ev.state & ModMetaMask); 1905 selection.rect = !!(ev.state & ModMetaMask);
1887#else 1906#else
1888 selection.rect = false; 1907 selection.rect = false;
1889#endif 1908#endif
1890 1909
1891 /* allow shift+left click to extend selection */ 1910 /* allow shift+left click to extend selection */
1892 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1911 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1893 { 1912 {
1894 if (MEvent.button == Button1 && clickintime) 1913 if (MEvent.button == Button1 && clickintime)
1895 selection_rotate (ev.x, ev.y); 1914 selection_rotate (ev.x, ev.y);
1896 else 1915 else
1897 selection_extend (ev.x, ev.y, 1); 1916 selection_extend (ev.x, ev.y, 1);
1898 } 1917 }
1899 else 1918 else
1900 { 1919 {
1901 if (MEvent.button == Button1 && clickintime) 1920 if (MEvent.button == Button1 && clickintime)
1902 MEvent.clicks++; 1921 MEvent.clicks++;
1903 else 1922 else
1904 MEvent.clicks = 1; 1923 MEvent.clicks = 1;
1905 1924
1906 selection_click (MEvent.clicks, ev.x, ev.y); 1925 selection_click (MEvent.clicks, ev.x, ev.y);
1907 } 1926 }
1908 1927
1909 MEvent.button = Button1; 1928 MEvent.button = Button1;
1910 break; 1929 break;
1911 1930
1912 case Button3: 1931 case Button3:
1913 if (MEvent.button == Button3 && clickintime) 1932 if (MEvent.button == Button3 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1933 selection_rotate (ev.x, ev.y);
1915 else 1934 else
1916 selection_extend (ev.x, ev.y, 1); 1935 selection_extend (ev.x, ev.y, 1);
1917 1936
1918 MEvent.button = Button3; 1937 MEvent.button = Button3;
1919 break; 1938 break;
1920 } 1939 }
1921 } 1940 }
1922 1941
1923 MEvent.time = ev.time; 1942 MEvent.time = ev.time;
1924 return; 1943 return;
1925 } 1944 }
1926 1945
1927 /* 1946 /*
1928 * Scrollbar window processing of button press 1947 * Scrollbar window processing of button press
1929 */ 1948 */
1930 if (isScrollbarWindow (ev.window)) 1949 if (scrollBar.state && ev.window == scrollBar.win)
1931 { 1950 {
1932 scrollBar.setIdle (); 1951 page_dirn direction = NO_DIR;
1952
1953 if (scrollBar.upButton (ev.y))
1954 direction = UP; /* up */
1955 else if (scrollBar.dnButton (ev.y))
1956 direction = DN; /* down */
1957
1958 scrollBar.state = STATE_IDLE;
1933 /* 1959 /*
1934 * Rxvt-style scrollbar: 1960 * Rxvt-style scrollbar:
1935 * move up if mouse is above slider 1961 * move up if mouse is above slider
1936 * move dn if mouse is below slider 1962 * move dn if mouse is below slider
1937 * 1963 *
… …
1946 /* 1972 /*
1947 * Mouse report disabled scrollbar: 1973 * Mouse report disabled scrollbar:
1948 * arrow buttons - send up/down 1974 * arrow buttons - send up/down
1949 * click on scrollbar - send pageup/down 1975 * click on scrollbar - send pageup/down
1950 */ 1976 */
1951 if ((scrollBar.style == R_SB_NEXT 1977 if (direction == UP)
1952 && scrollbarnext_upButton (ev.y))
1953 || (scrollBar.style == R_SB_RXVT
1954 && scrollbarrxvt_upButton (ev.y)))
1955 tt_printf ("\033[A"); 1978 tt_printf ("\033[A");
1956 else if ((scrollBar.style == R_SB_NEXT 1979 else if (direction == DN)
1957 && scrollbarnext_dnButton (ev.y))
1958 || (scrollBar.style == R_SB_RXVT
1959 && scrollbarrxvt_dnButton (ev.y)))
1960 tt_printf ("\033[B"); 1980 tt_printf ("\033[B");
1961 else 1981 else
1962 switch (ev.button) 1982 switch (ev.button)
1963 { 1983 {
1964 case Button2: 1984 case Button2:
… …
1971 tt_printf ("\033[5~"); 1991 tt_printf ("\033[5~");
1972 break; 1992 break;
1973 } 1993 }
1974 } 1994 }
1975 else 1995 else
1976#endif /* NO_SCROLLBAR_REPORT */ 1996#endif /* NO_SCROLLBAR_REPORT */
1977
1978 {
1979 char upordown = 0;
1980
1981 if (scrollBar.style == R_SB_NEXT)
1982 { 1997 {
1983 if (scrollbarnext_upButton (ev.y)) 1998 if (direction != NO_DIR)
1984 upordown = -1; /* up */
1985 else if (scrollbarnext_dnButton (ev.y))
1986 upordown = 1; /* down */
1987 }
1988 else if (scrollBar.style == R_SB_RXVT)
1989 {
1990 if (scrollbarrxvt_upButton (ev.y))
1991 upordown = -1; /* up */
1992 else if (scrollbarrxvt_dnButton (ev.y))
1993 upordown = 1; /* down */
1994 }
1995 if (upordown)
1996 { 1999 {
1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2000#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2001 if (!cont_scroll_ev.is_active ())
1998 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2002 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1999#endif 2003#endif
2000 if (scr_page (upordown < 0 ? UP : DN, 1)) 2004 if (scr_page (direction, 1))
2001 { 2005 {
2002 if (upordown < 0) 2006 if (direction == UP)
2003 scrollBar.setUp (); 2007 scrollBar.state = STATE_UP;
2004 else 2008 else
2005 scrollBar.setDn (); 2009 scrollBar.state = STATE_DOWN;
2006 } 2010 }
2007 } 2011 }
2008 else 2012 else
2009 switch (ev.button) 2013 switch (ev.button)
2010 { 2014 {
2011 case Button2: 2015 case Button2:
2012 switch (scrollbar_align) 2016 switch (scrollBar.align)
2013 { 2017 {
2014 case R_SB_ALIGN_TOP: 2018 case R_SB_ALIGN_TOP:
2015 csrO = 0; 2019 csrO = 0;
2016 break; 2020 break;
2017 case R_SB_ALIGN_CENTRE: 2021 case R_SB_ALIGN_CENTRE:
… …
2023 } 2027 }
2024 2028
2025 if (scrollBar.style == R_SB_XTERM 2029 if (scrollBar.style == R_SB_XTERM
2026 || scrollbar_above_slider (ev.y) 2030 || scrollbar_above_slider (ev.y)
2027 || scrollbar_below_slider (ev.y)) 2031 || scrollbar_below_slider (ev.y))
2028 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2032 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2029 2033
2030 scrollBar.setMotion (); 2034 scrollBar.state = STATE_MOTION;
2031 break; 2035 break;
2032 2036
2033 case Button1: 2037 case Button1:
2034 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2038 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2035 csrO = ev.y - scrollBar.top; 2039 csrO = ev.y - scrollBar.top;
2036 /* FALLTHROUGH */ 2040 /* FALLTHROUGH */
2037 2041
2038 case Button3: 2042 case Button3:
2039 if (scrollBar.style != R_SB_XTERM) 2043 if (scrollBar.style != R_SB_XTERM)
… …
2049 scr_page (DN, nrow - 1); 2053 scr_page (DN, nrow - 1);
2050# else 2054# else
2051 scr_page (DN, nrow / 4); 2055 scr_page (DN, nrow / 4);
2052# endif 2056# endif
2053 else 2057 else
2054 scrollBar.setMotion (); 2058 scrollBar.state = STATE_MOTION;
2055 } 2059 }
2056 else 2060 else
2057 { 2061 {
2058 scr_page ((ev.button == Button1 ? DN : UP), 2062 scr_page ((ev.button == Button1 ? DN : UP),
2059 (nrow 2063 (nrow
2060 * scrollbar_position (ev.y) 2064 * scrollbar_position (ev.y)
2061 / scrollbar_size ())); 2065 / scrollBar.size ()));
2062 } 2066 }
2063 2067
2064 break; 2068 break;
2065 } 2069 }
2066 } 2070 }
… …
2076 2080
2077 csrO = 0; /* reset csr Offset */ 2081 csrO = 0; /* reset csr Offset */
2078 if (!bypass_keystate) 2082 if (!bypass_keystate)
2079 reportmode = !! (priv_modes & PrivMode_mouse_report); 2083 reportmode = !! (priv_modes & PrivMode_mouse_report);
2080 2084
2081 if (scrollbar_isUpDn ()) 2085 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2082 { 2086 {
2083 scrollBar.setIdle (); 2087 scrollBar.state = STATE_IDLE;
2084 scrollbar_show (0); 2088 scrollBar.show (0);
2085 } 2089 }
2086 2090
2087#ifdef SELECTION_SCROLLING 2091#ifdef SELECTION_SCROLLING
2088 if (sel_scroll_ev.active)
2089 sel_scroll_ev.stop(); 2092 sel_scroll_ev.stop();
2090#endif 2093#endif
2091 2094
2092 if (ev.window == vt) 2095 if (ev.window == vt)
2093 { 2096 {
2097 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2098 return;
2099
2094#if ISO_14755 2100#if ISO_14755
2095 // 5.4 2101 // 5.4
2096 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2102 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2097 return; 2103 return;
2098#endif 2104#endif
2105
2099 if (reportmode) 2106 if (reportmode)
2100 { 2107 {
2101 /* mouse report from vt window */ 2108 /* mouse report from vt window */
2102 /* don't report release of wheel "buttons" */ 2109 /* don't report release of wheel "buttons" */
2103 if (ev.button >= 4) 2110 if (ev.button >= 4)
… …
2114 mouse_report (ev); 2121 mouse_report (ev);
2115 } 2122 }
2116#else /* MOUSE_REPORT_DOUBLECLICK */ 2123#else /* MOUSE_REPORT_DOUBLECLICK */
2117 MEvent.button = AnyButton; 2124 MEvent.button = AnyButton;
2118 mouse_report (ev); 2125 mouse_report (ev);
2119#endif /* MOUSE_REPORT_DOUBLECLICK */ 2126#endif /* MOUSE_REPORT_DOUBLECLICK */
2120 return; 2127 return;
2121 } 2128 }
2122 2129
2123 /* 2130 /*
2124 * dumb hack to compensate for the failure of click-and-drag 2131 * dumb hack to compensate for the failure of click-and-drag
… …
2127 if (priv_modes & PrivMode_mouse_report 2134 if (priv_modes & PrivMode_mouse_report
2128 && bypass_keystate 2135 && bypass_keystate
2129 && ev.button == Button1 && MEvent.clicks <= 1) 2136 && ev.button == Button1 && MEvent.clicks <= 1)
2130 selection_extend (ev.x, ev.y, 0); 2137 selection_extend (ev.x, ev.y, 0);
2131 2138
2132 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2133 return;
2134
2135 switch (ev.button) 2139 switch (ev.button)
2136 { 2140 {
2137 case Button1: 2141 case Button1:
2138 case Button3: 2142 case Button3:
2139 selection_make (ev.time); 2143 selection_make (ev.time);
2140 break; 2144 break;
2141 2145
2142 case Button2: 2146 case Button2:
2143 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2147 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2144 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); 2148 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2145 break; 2149 break;
2146 2150
2147#ifdef MOUSE_WHEEL 2151#ifdef MOUSE_WHEEL
2148 case Button4: 2152 case Button4:
2149 case Button5: 2153 case Button5:
… …
2153 2157
2154 v = ev.button == Button4 ? UP : DN; 2158 v = ev.button == Button4 ? UP : DN;
2155 2159
2156 if (ev.state & ShiftMask) 2160 if (ev.state & ShiftMask)
2157 i = 1; 2161 i = 1;
2158 else if (OPTION (Opt_mouseWheelScrollPage)) 2162 else if (option (Opt_mouseWheelScrollPage))
2159 i = nrow - 1; 2163 i = nrow - 1;
2160 else 2164 else
2161 i = 5; 2165 i = 5;
2162 2166
2163# ifdef MOUSE_SLIP_WHEELING 2167# ifdef MOUSE_SLIP_WHEELING
… …
2165 { 2169 {
2166 mouse_slip_wheel_speed += v ? -1 : 1; 2170 mouse_slip_wheel_speed += v ? -1 : 1;
2167 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2171 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2168 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2172 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2169 2173
2170 if (slip_wheel_ev.at < NOW) 2174 if (!slip_wheel_ev.is_active ())
2171 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2175 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2172
2173 slip_wheel_ev.start ();
2174 } 2176 }
2175 else 2177 else
2178# endif
2176 { 2179 {
2177# endif
2178 scr_page (v, i); 2180 scr_page (v, i);
2179 scrollbar_show (1); 2181 scrollBar.show (1);
2180# ifdef MOUSE_SLIP_WHEELING
2181 } 2182 }
2182# endif
2183 } 2183 }
2184 break; 2184 break;
2185#endif 2185#endif
2186 } 2186 }
2187 } 2187 }
2188} 2188}
2189 2189
2190#ifdef TRANSPARENT
2191#if TINTING
2192/* taken from aterm-0.4.2 */
2193
2194typedef uint32_t RUINT32T;
2195
2196void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2197{
2198 int sh_r, sh_g, sh_b;
2199 RUINT32T mask_r, mask_g, mask_b;
2200 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2201 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2202 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2203 int i;
2204
2205 Visual *visual = display->visual;
2206
2207 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2208
2209 /* for convenience */
2210 mask_r = visual->red_mask;
2211 mask_g = visual->green_mask;
2212 mask_b = visual->blue_mask;
2213
2214 /* boring lookup table pre-initialization */
2215 switch (srcImage->bits_per_pixel) {
2216 case 15:
2217 if ((mask_r != 0x7c00) ||
2218 (mask_g != 0x03e0) ||
2219 (mask_b != 0x001f))
2220 return;
2221 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2222 lookup_r = lookup;
2223 lookup_g = lookup+32;
2224 lookup_b = lookup+32+32;
2225 sh_r = 10;
2226 sh_g = 5;
2227 sh_b = 0;
2228 break;
2229 case 16:
2230 if ((mask_r != 0xf800) ||
2231 (mask_g != 0x07e0) ||
2232 (mask_b != 0x001f))
2233 return;
2234 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2235 lookup_r = lookup;
2236 lookup_g = lookup+32;
2237 lookup_b = lookup+32+64;
2238 sh_r = 11;
2239 sh_g = 5;
2240 sh_b = 0;
2241 break;
2242 case 24:
2243 if ((mask_r != 0xff0000) ||
2244 (mask_g != 0x00ff00) ||
2245 (mask_b != 0x0000ff))
2246 return;
2247 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2248 lookup_r = lookup;
2249 lookup_g = lookup+256;
2250 lookup_b = lookup+256+256;
2251 sh_r = 16;
2252 sh_g = 8;
2253 sh_b = 0;
2254 break;
2255 case 32:
2256 if ((mask_r != 0xff0000) ||
2257 (mask_g != 0x00ff00) ||
2258 (mask_b != 0x0000ff))
2259 return;
2260 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2261 lookup_r = lookup;
2262 lookup_g = lookup+256;
2263 lookup_b = lookup+256+256;
2264 sh_r = 16;
2265 sh_g = 8;
2266 sh_b = 0;
2267 break;
2268 default:
2269 return; /* we do not support this color depth */
2270 }
2271
2272 /* prepare limits for color transformation (each channel is handled separately) */
2273 if (shade < 0) {
2274 shade = -shade;
2275 if (shade < 0) shade = 0;
2276 if (shade > 100) shade = 100;
2277
2278 lower_lim_r = 65535-rm;
2279 lower_lim_g = 65535-gm;
2280 lower_lim_b = 65535-bm;
2281
2282 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2283 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2284 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2285
2286 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2287 } else {
2288 if (shade < 0) shade = 0;
2289 if (shade > 100) shade = 100;
2290
2291 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2292
2293 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2294 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2295 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2296 }
2297
2298 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2299 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2300 {
2301 unsigned int tmp;
2302
2303 tmp = lower_lim_r;
2304 lower_lim_r = lower_lim_b;
2305 lower_lim_b = tmp;
2306
2307 tmp = upper_lim_r;
2308 upper_lim_r = upper_lim_b;
2309 upper_lim_b = tmp;
2310 }
2311
2312 /* fill our lookup tables */
2313 for (i = 0; i <= mask_r>>sh_r; i++)
2314 {
2315 RUINT32T tmp;
2316 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2317 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2318 lookup_r[i] = (tmp/65535)<<sh_r;
2319 }
2320 for (i = 0; i <= mask_g>>sh_g; i++)
2321 {
2322 RUINT32T tmp;
2323 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2324 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2325 lookup_g[i] = (tmp/65535)<<sh_g;
2326 }
2327 for (i = 0; i <= mask_b>>sh_b; i++)
2328 {
2329 RUINT32T tmp;
2330 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2331 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2332 lookup_b[i] = (tmp/65535)<<sh_b;
2333 }
2334
2335 /* apply table to input image (replacing colors by newly calculated ones) */
2336 switch (srcImage->bits_per_pixel)
2337 {
2338 case 15:
2339 {
2340 unsigned short *p1, *pf, *p, *pl;
2341 p1 = (unsigned short *) srcImage->data;
2342 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2343 while (p1 < pf)
2344 {
2345 p = p1;
2346 pl = p1 + srcImage->width;
2347 for (; p < pl; p++)
2348 {
2349 *p = lookup_r[(*p & 0x7c00)>>10] |
2350 lookup_g[(*p & 0x03e0)>> 5] |
2351 lookup_b[(*p & 0x001f)];
2352 }
2353 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2354 }
2355 break;
2356 }
2357 case 16:
2358 {
2359 unsigned short *p1, *pf, *p, *pl;
2360 p1 = (unsigned short *) srcImage->data;
2361 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2362 while (p1 < pf)
2363 {
2364 p = p1;
2365 pl = p1 + srcImage->width;
2366 for (; p < pl; p++)
2367 {
2368 *p = lookup_r[(*p & 0xf800)>>11] |
2369 lookup_g[(*p & 0x07e0)>> 5] |
2370 lookup_b[(*p & 0x001f)];
2371 }
2372 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2373 }
2374 break;
2375 }
2376 case 24:
2377 {
2378 unsigned char *p1, *pf, *p, *pl;
2379 p1 = (unsigned char *) srcImage->data;
2380 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2381 while (p1 < pf)
2382 {
2383 p = p1;
2384 pl = p1 + srcImage->width * 3;
2385 for (; p < pl; p += 3)
2386 {
2387 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2388 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2389 p[2] = lookup_r[(p[2] & 0x0000ff)];
2390 }
2391 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2392 }
2393 break;
2394 }
2395 case 32:
2396 {
2397 RUINT32T *p1, *pf, *p, *pl;
2398 p1 = (RUINT32T *) srcImage->data;
2399 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2400
2401 while (p1 < pf)
2402 {
2403 p = p1;
2404 pl = p1 + srcImage->width;
2405 for (; p < pl; p++)
2406 {
2407 *p = lookup_r[(*p & 0xff0000)>>16] |
2408 lookup_g[(*p & 0x00ff00)>> 8] |
2409 lookup_b[(*p & 0x0000ff)] |
2410 (*p & ~0xffffff);
2411 }
2412 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2413 }
2414 break;
2415 }
2416 }
2417
2418 free (lookup);
2419}
2420#endif
2421
2422/*
2423 * Check our parents are still who we think they are.
2424 * Do transparency updates if required
2425 */
2426int
2427rxvt_term::check_our_parents ()
2428{
2429 int i, pchanged, aformat, have_pixmap, rootdepth;
2430 unsigned long nitems, bytes_after;
2431 Atom atype;
2432 unsigned char *prop = NULL;
2433 Window root, oldp, *list;
2434 Pixmap rootpixmap = None;
2435 XWindowAttributes wattr, wrootattr;
2436 dDisp;
2437
2438 pchanged = 0;
2439
2440 if (!OPTION (Opt_transparent))
2441 return pchanged; /* Don't try any more */
2442
2443 XGetWindowAttributes (disp, display->root, &wrootattr);
2444 rootdepth = wrootattr.depth;
2445
2446 XGetWindowAttributes (disp, parent[0], &wattr);
2447
2448 if (rootdepth != wattr.depth)
2449 {
2450 if (am_transparent)
2451 {
2452 pchanged = 1;
2453 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2454 am_transparent = am_pixmap_trans = 0;
2455 }
2456
2457 return pchanged; /* Don't try any more */
2458 }
2459
2460 /* Get all X ops out of the queue so that our information is up-to-date. */
2461 XSync (disp, False);
2462
2463 /*
2464 * Make the frame window set by the window manager have
2465 * the root background. Some window managers put multiple nested frame
2466 * windows for each client, so we have to take care about that.
2467 */
2468 i = (xa[XA_XROOTPMAP_ID]
2469 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2470 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2471 &nitems, &bytes_after, &prop) == Success);
2472
2473 if (!i || prop == NULL)
2474 i = (xa[XA_ESETROOT_PMAP_ID]
2475 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2476 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2477 &nitems, &bytes_after, &prop) == Success);
2478
2479 if (!i || prop == NULL
2480#if TINTING
2481 || !rs[Rs_color + Color_tint]
2482#endif
2483 )
2484 have_pixmap = 0;
2485 else
2486 {
2487 have_pixmap = 1;
2488 rootpixmap = *(Pixmap *)prop;
2489 XFree (prop);
2490 }
2491
2492 if (have_pixmap)
2493 {
2494 /*
2495 * Copy display->root pixmap transparency
2496 */
2497 int sx, sy, nx, ny;
2498 unsigned int nw, nh;
2499 Window cr;
2500 XImage *image;
2501 GC gc;
2502 XGCValues gcvalue;
2503
2504 XTranslateCoordinates (disp, parent[0], display->root,
2505 0, 0, &sx, &sy, &cr);
2506 nw = (unsigned int)szHint.width;
2507 nh = (unsigned int)szHint.height;
2508 nx = ny = 0;
2509
2510 if (sx < 0)
2511 {
2512 nw += sx;
2513 nx = -sx;
2514 sx = 0;
2515 }
2516
2517 if (sy < 0)
2518 {
2519 nh += sy;
2520 ny = -sy;
2521 sy = 0;
2522 }
2523
2524 min_it (nw, (unsigned int) (wrootattr.width - sx));
2525 min_it (nh, (unsigned int) (wrootattr.height - sy));
2526
2527 XSync (disp, False);
2528 allowedxerror = -1;
2529 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2530
2531 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2532 /* XXX: may need a delay here? */
2533 allowedxerror = 0;
2534
2535 if (image == NULL)
2536 {
2537 if (am_transparent && am_pixmap_trans)
2538 {
2539 pchanged = 1;
2540 if (pixmap != None)
2541 {
2542 XFreePixmap (disp, pixmap);
2543 pixmap = None;
2544 }
2545 }
2546
2547 am_pixmap_trans = 0;
2548 }
2549 else
2550 {
2551 if (pixmap != None)
2552 XFreePixmap (disp, pixmap);
2553
2554#if TINTING
2555 if (ISSET_PIXCOLOR (Color_tint))
2556 {
2557 unsigned short rm, gm, bm;
2558 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2559
2560 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2561
2562 ShadeXImage (display, image, shade, rm, gm, bm);
2563 }
2564#endif
2565
2566 pixmap = XCreatePixmap (disp, vt,
2567 szHint.width, szHint.height, image->depth);
2568 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2569 XPutImage (disp, pixmap, gc, image, 0, 0,
2570 nx, ny, image->width, image->height);
2571 XFreeGC (disp, gc);
2572 XDestroyImage (image);
2573 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2574 XClearWindow (disp, parent[0]);
2575
2576 if (!am_transparent || !am_pixmap_trans)
2577 pchanged = 1;
2578
2579 am_transparent = am_pixmap_trans = 1;
2580 }
2581 }
2582
2583 if (am_pixmap_trans)
2584 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2585 else
2586 {
2587 unsigned int n;
2588 /*
2589 * InheritPixmap transparency
2590 */
2591 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2592 {
2593 oldp = parent[i];
2594 XQueryTree (disp, parent[i - 1], &root,
2595 &parent[i], &list, &n);
2596 XFree (list);
2597
2598 if (parent[i] == display->root)
2599 {
2600 if (oldp != None)
2601 pchanged = 1;
2602
2603 break;
2604 }
2605
2606 if (oldp != parent[i])
2607 pchanged = 1;
2608 }
2609
2610 n = 0;
2611
2612 if (pchanged)
2613 {
2614 for (; n < (unsigned int)i; n++)
2615 {
2616 XGetWindowAttributes (disp, parent[n], &wattr);
2617 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2618 {
2619 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2620 break;
2621 }
2622 }
2623 }
2624
2625 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2626 {
2627 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2628 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2629 am_transparent = 0;
2630 /* XXX: also turn off Opt_transparent? */
2631 }
2632 else
2633 {
2634 for (n = 0; n < (unsigned int)i; n++)
2635 {
2636 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2637 XClearWindow (disp, parent[n]);
2638 }
2639
2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2641 am_transparent = 1;
2642 }
2643
2644 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2645 parent[i] = None;
2646 }
2647
2648 if (scrollBar.win)
2649 {
2650 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2651 scrollBar.setIdle ();
2652 scrollbar_show (0);
2653 }
2654
2655 if (am_transparent)
2656 {
2657 want_refresh = want_full_refresh = 1;
2658 if (am_pixmap_trans)
2659 flush ();
2660 }
2661
2662 return pchanged;
2663}
2664#endif
2665
2666/*}}} */ 2190/*}}} */
2667 2191
2668bool 2192void
2669rxvt_term::cmd_parse () 2193rxvt_term::cmd_parse ()
2670{ 2194{
2671 bool flag = false;
2672 wchar_t ch = NOCHAR; 2195 wchar_t ch = NOCHAR;
2673 char *seq_begin; // remember start of esc-sequence here 2196 char *seq_begin; // remember start of esc-sequence here
2674 2197
2675 for (;;) 2198 for (;;)
2676 { 2199 {
2677 if (ch == NOCHAR) 2200 if (expect_false (ch == NOCHAR))
2678 { 2201 {
2679 seq_begin = cmdbuf_ptr; 2202 seq_begin = cmdbuf_ptr;
2680 ch = next_char (); 2203 ch = next_char ();
2681 2204
2682 if (ch == NOCHAR) 2205 if (ch == NOCHAR)
2683 break; 2206 break;
2684 } 2207 }
2685 2208
2686 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2209 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2687 { 2210 {
2688 if (!seen_input) 2211 if (expect_false (!seen_input))
2689 { 2212 {
2690 seen_input = 1; 2213 seen_input = 1;
2691 // many badly-written programs (e.g. jed) contain a race condition: 2214 // many badly-written programs (e.g. jed) contain a race condition:
2692 // they first read the screensize and then install a SIGWINCH handler. 2215 // they first read the screensize and then install a SIGWINCH handler.
2693 // some window managers resize the window early, and these programs 2216 // some window managers resize the window early, and these programs
… …
2706 wchar_t *str = buf; 2229 wchar_t *str = buf;
2707 wchar_t *eol = str + min (ncol, UBUFSIZ); 2230 wchar_t *eol = str + min (ncol, UBUFSIZ);
2708 2231
2709 for (;;) 2232 for (;;)
2710 { 2233 {
2711 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2234 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2712 break; 2235 break;
2713 2236
2714 *str++ = ch; 2237 *str++ = ch;
2715 2238
2716 if (ch == C0_LF || str >= eol) 2239 if (expect_false (ch == C0_LF || str >= eol))
2717 { 2240 {
2718 if (ch == C0_LF) 2241 if (ch == C0_LF)
2719 nlines++; 2242 nlines++;
2720 2243
2721 refresh_count++; 2244 refresh_count++;
2722 2245
2723 if (!OPTION (Opt_jumpScroll) 2246 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2724 || (refresh_count >= refresh_limit * (nrow - 1)))
2725 { 2247 {
2726 refreshnow = true;
2727 refresh_count = 0; 2248 refresh_count = 0;
2249
2250 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2251 {
2252 refreshnow = true;
2728 ch = NOCHAR; 2253 ch = NOCHAR;
2729 break; 2254 break;
2255 }
2730 } 2256 }
2731 2257
2732 // scr_add_lines only works for nlines <= nrow - 1. 2258 // scr_add_lines only works for nlines <= nrow - 1.
2733 if (nlines >= nrow - 1) 2259 if (nlines >= nrow - 1)
2734 { 2260 {
… …
2762 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2288 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2763 scr_add_lines (buf, str - buf, nlines); 2289 scr_add_lines (buf, str - buf, nlines);
2764 2290
2765 /* 2291 /*
2766 * If there have been a lot of new lines, then update the screen 2292 * If there have been a lot of new lines, then update the screen
2767 * What the heck I'll cheat and only refresh less than every page-full. 2293 * What the heck we'll cheat and only refresh less than every page-full.
2768 * the number of pages between refreshes is refresh_limit, which 2294 * if skipScroll is enabled.
2769 * is incremented here because we must be doing flat-out scrolling.
2770 */ 2295 */
2771 if (refreshnow) 2296 if (refreshnow)
2772 { 2297 {
2773 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2774 refresh_limit++;
2775 else
2776 {
2777 flag = true;
2778 scr_refresh (); 2298 scr_refresh ();
2779 want_refresh = 1; 2299 want_refresh = 1;
2780 }
2781 } 2300 }
2782
2783 } 2301 }
2784 else 2302 else
2785 { 2303 {
2786 try 2304 try
2787 { 2305 {
… …
2795 } 2313 }
2796 2314
2797 ch = NOCHAR; 2315 ch = NOCHAR;
2798 } 2316 }
2799 } 2317 }
2800
2801 return flag;
2802} 2318}
2803 2319
2804// read the next character 2320// read the next character
2805wchar_t 2321wchar_t
2806rxvt_term::next_char () NOTHROW 2322rxvt_term::next_char () NOTHROW
2807{ 2323{
2808 while (cmdbuf_ptr < cmdbuf_endp) 2324 while (cmdbuf_ptr < cmdbuf_endp)
2809 { 2325 {
2810 // assume 7-bit to be ascii ALWAYS 2326 // assume 7-bit to be ascii ALWAYS
2811 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2327 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2812 return *cmdbuf_ptr++; 2328 return *cmdbuf_ptr++;
2813 2329
2814 wchar_t wc; 2330 wchar_t wc;
2815 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2331 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2816 2332
… …
2820 cmdbuf_ptr = cmdbuf_endp; 2336 cmdbuf_ptr = cmdbuf_endp;
2821 break; 2337 break;
2822 } 2338 }
2823 2339
2824 if (len == (size_t)-1) 2340 if (len == (size_t)-1)
2341 {
2342 mbstate.reset (); // reset now undefined conversion state
2825 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2343 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2344 }
2826 2345
2827 // assume wchar == unicode 2346 // assume wchar == unicode
2828 cmdbuf_ptr += len; 2347 cmdbuf_ptr += len;
2829 return wc & UNICODE_MASK; 2348 return wc & UNICODE_MASK;
2830 } 2349 }
… …
2874/*----------------------------------------------------------------------*/ 2393/*----------------------------------------------------------------------*/
2875#ifdef PRINTPIPE 2394#ifdef PRINTPIPE
2876FILE * 2395FILE *
2877rxvt_term::popen_printer () 2396rxvt_term::popen_printer ()
2878{ 2397{
2879 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2398 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2880 2399
2881 if (stream == NULL) 2400 if (stream == NULL)
2882 rxvt_warn ("can't open printer pipe, not printing.\n"); 2401 rxvt_warn ("can't open printer pipe, not printing.\n");
2883 2402
2884 return stream; 2403 return stream;
… …
2895 * simulate attached vt100 printer 2414 * simulate attached vt100 printer
2896 */ 2415 */
2897void 2416void
2898rxvt_term::process_print_pipe () 2417rxvt_term::process_print_pipe ()
2899{ 2418{
2900 int done; 2419 FILE *fd = popen_printer ();
2901 FILE *fd;
2902 2420
2903 if ((fd = popen_printer ()) == NULL) 2421 if (!fd)
2904 return; 2422 return;
2905 2423
2906 /* 2424 /*
2907 * Send all input to the printer until either ESC[4i or ESC[?4i 2425 * Send all input to the printer until either ESC[4i or ESC[?4i
2908 * is received. 2426 * is received.
2909 */ 2427 */
2910 for (done = 0; !done;) 2428 for (int done = 0; !done; )
2911 { 2429 {
2912 unsigned char buf[8]; 2430 unsigned char buf[8];
2913 unicode_t ch; 2431 unicode_t ch;
2914 unsigned int i, len; 2432 unsigned int i, len;
2915 2433
… …
2934 { 2452 {
2935 if ((buf[len++] = cmd_getc ()) == 'i') 2453 if ((buf[len++] = cmd_getc ()) == 'i')
2936 break; /* done = 1 */ 2454 break; /* done = 1 */
2937 } 2455 }
2938 } 2456 }
2939 2457
2940 for (i = 0; i < len; i++) 2458 for (i = 0; i < len; i++)
2941 if (putc (buf[i], fd) == EOF) 2459 if (putc (buf[i], fd) == EOF)
2942 { 2460 {
2943 done = 1; 2461 done = 1;
2944 break; 2462 break;
… …
2946 } 2464 }
2947 } 2465 }
2948 2466
2949 pclose_printer (fd); 2467 pclose_printer (fd);
2950} 2468}
2951#endif /* PRINTPIPE */ 2469#endif /* PRINTPIPE */
2952/*}}} */ 2470/*}}} */
2953 2471
2954/* *INDENT-OFF* */ 2472/* *INDENT-OFF* */
2955enum { 2473enum {
2956 C1_40 = 0x40, 2474 C1_40 = 0x40,
… …
3006 process_dcs_seq (); 2524 process_dcs_seq ();
3007 break; 2525 break;
3008 case 0x9b: /* CSI */ 2526 case 0x9b: /* CSI */
3009 process_csi_seq (); 2527 process_csi_seq ();
3010 break; 2528 break;
3011 case 0x9d: /* CSI */ 2529 case 0x9d: /* OSC */
3012 process_osc_seq (); 2530 process_osc_seq ();
3013 break; 2531 break;
3014#endif 2532#endif
3015 } 2533 }
3016} 2534}
… …
3060 break; 2578 break;
3061 case 'Z': /* identify the terminal type */ 2579 case 'Z': /* identify the terminal type */
3062 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2580 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3063 break; 2581 break;
3064 case '<': /* turn off VT52 mode */ 2582 case '<': /* turn off VT52 mode */
3065 PrivMode (0, PrivMode_vt52); 2583 set_privmode (PrivMode_vt52, 0);
3066 break; 2584 break;
3067 case 'F': /* use special graphics character set */ 2585 case 'F': /* use special graphics character set */
3068 case 'G': /* use regular character set */ 2586 case 'G': /* use regular character set */
3069 /* unimplemented */ 2587 /* unimplemented */
3070 break; 2588 break;
… …
3106 scr_charset_set (2, (unsigned int)cmd_getc ()); 2624 scr_charset_set (2, (unsigned int)cmd_getc ());
3107 break; 2625 break;
3108 case '+': 2626 case '+':
3109 scr_charset_set (3, (unsigned int)cmd_getc ()); 2627 scr_charset_set (3, (unsigned int)cmd_getc ());
3110 break; 2628 break;
3111#if ENABLE_FRILLS 2629#if !ENABLE_MINIMAL
3112 case '6': 2630 case '6':
3113 scr_backindex (); 2631 scr_backindex ();
3114 break; 2632 break;
3115#endif 2633#endif
3116 case '7': 2634 case '7':
3117 scr_cursor (SAVE); 2635 scr_cursor (SAVE);
3118 break; 2636 break;
3119 case '8': 2637 case '8':
3120 scr_cursor (RESTORE); 2638 scr_cursor (RESTORE);
3121 break; 2639 break;
3122#if ENABLE_FRILLS 2640#if !ENABLE_MINIMAL
3123 case '9': 2641 case '9':
3124 scr_forwardindex (); 2642 scr_forwardindex ();
3125 break; 2643 break;
3126#endif 2644#endif
3127 case '=': 2645 case '=':
3128 case '>': 2646 case '>':
3129 PrivMode ((ch == '='), PrivMode_aplKP); 2647 set_privmode (PrivMode_aplKP, ch == '=');
3130 break; 2648 break;
3131 2649
3132 case C1_40: 2650 case C1_40:
3133 cmd_getc (); 2651 cmd_getc ();
3134 break; 2652 break;
… …
3173 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2691 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3174 case C1_SCI: /* ESC Z */ 2692 case C1_SCI: /* ESC Z */
3175 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2693 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3176 break; /* steal obsolete ESC [ c */ 2694 break; /* steal obsolete ESC [ c */
3177 2695
3178 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2696 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3179 case C1_CSI: /* ESC [ */ 2697 case C1_CSI: /* ESC [ */
3180 process_csi_seq (); 2698 process_csi_seq ();
3181 break; 2699 break;
3182 2700
3183 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2701 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3184 case C1_OSC: /* ESC ] */ 2702 case C1_OSC: /* ESC ] */
3185 process_osc_seq (); 2703 process_osc_seq ();
3186 break; 2704 break;
3187 2705
3188 /* 8.3.106: RESET TO INITIAL STATE */ 2706 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3189 case 'c': 2707 case 'c':
3190 mbstate.reset (); 2708 mbstate.reset ();
3191 scr_poweron (); 2709 scr_poweron ();
3192 scrollbar_show (1); 2710 scrollBar.show (1);
3193 break; 2711 break;
3194 2712
3195 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2713 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3196 case 'n': 2714 case 'n':
3197 scr_charset_choose (2); 2715 scr_charset_choose (2);
… …
3242rxvt_term::process_csi_seq () 2760rxvt_term::process_csi_seq ()
3243{ 2761{
3244 unicode_t ch, priv, i; 2762 unicode_t ch, priv, i;
3245 unsigned int nargs, p; 2763 unsigned int nargs, p;
3246 int n, ndef; 2764 int n, ndef;
3247 int arg[ESC_ARGS]; 2765 int arg[ESC_ARGS] = { };
3248 2766
3249 for (nargs = ESC_ARGS; nargs > 0;) 2767 nargs = 0;
3250 arg[--nargs] = 0;
3251 2768
3252 priv = 0; 2769 priv = 0;
3253 ch = cmd_getc (); 2770 ch = cmd_getc ();
3254 if (ch >= '<' && ch <= '?') 2771 if ((ch >= '<' && ch <= '?') || ch == '!')
2772 {
3255 { /* '<' '=' '>' '?' */ 2773 /* '<' '=' '>' '?' '!' */
3256 priv = ch; 2774 priv = ch;
3257 ch = cmd_getc (); 2775 ch = cmd_getc ();
3258 } 2776 }
3259 2777
3260 /* read any numerical arguments */ 2778 /* read any numerical arguments */
… …
3289 ndef = get_byte_array_bit (csi_defaults, i); 2807 ndef = get_byte_array_bit (csi_defaults, i);
3290 for (p = 0; p < nargs; p++) 2808 for (p = 0; p < nargs; p++)
3291 if (arg[p] == -1) 2809 if (arg[p] == -1)
3292 arg[p] = ndef; 2810 arg[p] = ndef;
3293 2811
3294#ifdef DEBUG_CMD
3295 fprintf (stderr, "CSI ");
3296 for (p = 0; p < nargs; p++)
3297 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3298 fprintf (stderr, "%c\n", ch);
3299#endif
3300
3301 /* 2812 /*
3302 * private mode handling 2813 * private mode handling
3303 */ 2814 */
3304 if (priv) 2815 if (priv)
3305 { 2816 {
3306 switch (priv) 2817 switch (priv)
3307 { 2818 {
3308 case '>': 2819 case '>':
3309 if (ch == CSI_DA) /* secondary device attributes */ 2820 if (ch == CSI_DA) /* secondary device attributes */
3310 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2821 {
2822 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2823 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2824 //
2825 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2826 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2827 // versions.
2828 //
2829 tt_printf ("\033[>%d;95;0c", 'U');
2830 }
3311 break; 2831 break;
2832
3312 case '?': 2833 case '?':
3313 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3314 process_terminal_mode (ch, priv, nargs, arg); 2835 process_terminal_mode (ch, priv, nargs, arg);
3315 break; 2836 break;
2837
2838 case '!':
2839 if (ch == CSI_70)
2840 {
2841 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2842 scr_soft_reset ();
2843
2844 static const int pm_h[] = { 7, 25 };
2845 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2846
2847 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2848 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
3316 } 2849 }
2850 break;
2851 }
2852
3317 return; 2853 return;
3318 } 2854 }
3319 2855
3320 switch (ch) 2856 switch (ch)
3321 { 2857 {
… …
3441 break; 2977 break;
3442 case 6: /* CPR requested */ 2978 case 6: /* CPR requested */
3443 scr_report_position (); 2979 scr_report_position ();
3444 break; 2980 break;
3445 case 7: /* unofficial extension */ 2981 case 7: /* unofficial extension */
3446 if (OPTION (Opt_insecure)) 2982 if (option (Opt_insecure))
3447 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2983 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3448 break; 2984 break;
3449 case 8: /* unofficial extension */ 2985 case 8: /* unofficial extension */
3450 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2986 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3451 break; 2987 break;
… …
3518 break; 3054 break;
3519 case CSI_75: 3055 case CSI_75:
3520 scr_cursor (RESTORE); 3056 scr_cursor (RESTORE);
3521 break; 3057 break;
3522 3058
3523#if ENABLE_FRILLS 3059#if !ENABLE_MINIMAL
3524 case CSI_74: 3060 case CSI_74:
3525 process_window_ops (arg, nargs); 3061 process_window_ops (arg, nargs);
3526 break; 3062 break;
3527#endif 3063#endif
3528 3064
… …
3535 break; 3071 break;
3536 } 3072 }
3537} 3073}
3538/*}}} */ 3074/*}}} */
3539 3075
3540#if ENABLE_FRILLS 3076#if !ENABLE_MINIMAL
3541/* ARGSUSED */ 3077/* ARGSUSED */
3542void 3078void
3543rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3079rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3544{ 3080{
3545 int x, y; 3081 int x, y;
3546 XWindowAttributes wattr; 3082 XWindowAttributes wattr;
3547 Window wdummy; 3083 Window wdummy;
3548 dDisp; 3084
3085 dLocal (Display *, dpy);
3549 3086
3550 if (nargs == 0) 3087 if (nargs == 0)
3551 return; 3088 return;
3552 3089
3553 switch (args[0]) 3090 switch (args[0])
3554 { 3091 {
3555 /* 3092 /*
3556 * commands 3093 * commands
3557 */ 3094 */
3558 case 1: /* deiconify window */ 3095 case 1: /* deiconify window */
3559 XMapWindow (disp, parent[0]); 3096 XMapWindow (dpy, parent[0]);
3560 break; 3097 break;
3561 case 2: /* iconify window */ 3098 case 2: /* iconify window */
3562 XIconifyWindow (disp, parent[0], display->screen); 3099 XIconifyWindow (dpy, parent[0], display->screen);
3563 break; 3100 break;
3564 case 3: /* set position (pixels) */ 3101 case 3: /* set position (pixels) */
3565 XMoveWindow (disp, parent[0], args[1], args[2]); 3102 XMoveWindow (dpy, parent[0], args[1], args[2]);
3566 break; 3103 break;
3567 case 4: /* set size (pixels) */ 3104 case 4: /* set size (pixels) */
3568 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3105 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3569 break; 3106 break;
3570 case 5: /* raise window */ 3107 case 5: /* raise window */
3571 XRaiseWindow (disp, parent[0]); 3108 XRaiseWindow (dpy, parent[0]);
3572 break; 3109 break;
3573 case 6: /* lower window */ 3110 case 6: /* lower window */
3574 XLowerWindow (disp, parent[0]); 3111 XLowerWindow (dpy, parent[0]);
3575 break; 3112 break;
3576 case 7: /* refresh window */ 3113 case 7: /* refresh window */
3577 scr_touch (true); 3114 scr_touch (true);
3578 break; 3115 break;
3579 case 8: /* set size (chars) */ 3116 case 8: /* set size (chars) */
… …
3586 if (args[0] >= 24) /* set height (chars) */ 3123 if (args[0] >= 24) /* set height (chars) */
3587 set_widthheight ((unsigned int)width, 3124 set_widthheight ((unsigned int)width,
3588 (unsigned int) (args[1] * fheight)); 3125 (unsigned int) (args[1] * fheight));
3589 break; 3126 break;
3590 3127
3591
3592 /* 3128 /*
3593 * reports - some output format copied from XTerm 3129 * reports - some output format copied from XTerm
3594 */ 3130 */
3595 case 11: /* report window state */ 3131 case 11: /* report window state */
3596 XGetWindowAttributes (disp, parent[0], &wattr); 3132 XGetWindowAttributes (dpy, parent[0], &wattr);
3597 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3133 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3598 break; 3134 break;
3599 case 13: /* report window position */ 3135 case 13: /* report window position */
3600 XGetWindowAttributes (disp, parent[0], &wattr); 3136 XGetWindowAttributes (dpy, parent[0], &wattr);
3601 XTranslateCoordinates (disp, parent[0], wattr.root, 3137 XTranslateCoordinates (dpy, parent[0], wattr.root,
3602 -wattr.border_width, -wattr.border_width, 3138 -wattr.border_width, -wattr.border_width,
3603 &x, &y, &wdummy); 3139 &x, &y, &wdummy);
3604 tt_printf ("\033[3;%d;%dt", x, y); 3140 tt_printf ("\033[3;%d;%dt", x, y);
3605 break; 3141 break;
3606 case 14: /* report window size (pixels) */ 3142 case 14: /* report window size (pixels) */
3607 XGetWindowAttributes (disp, parent[0], &wattr); 3143 XGetWindowAttributes (dpy, parent[0], &wattr);
3608 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3144 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3609 break; 3145 break;
3610 case 18: /* report text area size (chars) */ 3146 case 18: /* report text area size (chars) */
3611 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3147 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3612 break; 3148 break;
… …
3614 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3150 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3615 break; 3151 break;
3616 case 20: /* report icon label */ 3152 case 20: /* report icon label */
3617 { 3153 {
3618 char *s; 3154 char *s;
3619 XGetIconName (disp, parent[0], &s); 3155 XGetIconName (dpy, parent[0], &s);
3620 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3156 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3621 XFree (s); 3157 XFree (s);
3622 } 3158 }
3623 break; 3159 break;
3624 case 21: /* report window title */ 3160 case 21: /* report window title */
3625 { 3161 {
3626 char *s; 3162 char *s;
3627 XFetchName (disp, parent[0], &s); 3163 XFetchName (dpy, parent[0], &s);
3628 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3164 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3629 XFree (s); 3165 XFree (s);
3630 } 3166 }
3631 break; 3167 break;
3632 } 3168 }
3633} 3169}
… …
3660 seen_esc = true; 3196 seen_esc = true;
3661 continue; 3197 continue;
3662 } 3198 }
3663 else if (ch == C0_BEL || ch == CHAR_ST) 3199 else if (ch == C0_BEL || ch == CHAR_ST)
3664 break; 3200 break;
3201 else if (ch == C0_SYN)
3202 ch = cmd_get8 ();
3665 else if (ch < 0x20) 3203 else if (ch < 0x20)
3666 return NULL; /* other control character - exit */ 3204 return NULL; /* other control character - exit */
3667 3205
3668 seen_esc = false; 3206 seen_esc = false;
3669 3207
3670 if (n >= STRING_MAX - 1) 3208 if (n >= STRING_MAX - 1)
3671 // stop at some sane length 3209 // stop at some sane length
3672 return NULL; 3210 return NULL;
3673 3211
3674 if (ch == C0_SYN)
3675 string[n++] = cmd_get8 ();
3676 else
3677 string[n++] = ch; 3212 string[n++] = ch;
3678 } 3213 }
3679 3214
3680 string[n++] = '\0'; 3215 string[n++] = '\0';
3681 3216
3682 ends_how = (ch == 0x5c ? C0_ESC : ch); 3217 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3733void 3268void
3734rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3269rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3735{ 3270{
3736 if (str[0] == '?' && !str[1]) 3271 if (str[0] == '?' && !str[1])
3737 { 3272 {
3738 unsigned short r, g, b; 3273 rgba c;
3739 pix_colors_focused[color].get (display, r, g, b); 3274 pix_colors_focused[color].get (c);
3275
3276#if XFT
3277 if (c.a != rgba::MAX_CC)
3278 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3279 else
3280#endif
3740 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3281 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3741 } 3282 }
3742 else 3283 else
3743 set_window_color (color, str); 3284 set_window_color (color, str);
3744} 3285}
3745 3286
3746/* 3287/*
3747 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3288 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3748 */ 3289 */
3749void 3290void
3750rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3291rxvt_term::process_xterm_seq (int op, char *str, char resp)
3751{ 3292{
3752 int color; 3293 int color;
3753 char *buf, *name; 3294 char *buf, *name;
3754 bool query = str[0] == '?' && !str[1]; 3295 bool query = str[0] == '?' && !str[1];
3755 int saveop = op; 3296 int saveop = op;
3756 dDisp; 3297
3298 dLocal (Display *, dpy);
3757 3299
3758 assert (str != NULL); 3300 assert (str != NULL);
3301
3302 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3303 return;
3304
3759 switch (op) 3305 switch (op)
3760 { 3306 {
3761 case XTerm_name: 3307 case XTerm_name:
3762 set_title (str); 3308 set_title (str);
3763 /* FALLTHROUGH */ 3309 /* FALLTHROUGH */
… …
3777 unsigned long bytes_after; 3323 unsigned long bytes_after;
3778 unsigned char *value = 0; 3324 unsigned char *value = 0;
3779 const char *str = ""; 3325 const char *str = "";
3780 3326
3781 if (prop 3327 if (prop
3782 && XGetWindowProperty (disp, parent[0], 3328 && XGetWindowProperty (dpy, parent[0],
3783 prop, 0, 1<<16, 0, AnyPropertyType, 3329 prop, 0, 1<<16, 0, AnyPropertyType,
3784 &actual_type, &actual_format, 3330 &actual_type, &actual_format,
3785 &nitems, &bytes_after, &value) == Success 3331 &nitems, &bytes_after, &value) == Success
3786 && actual_type != None 3332 && actual_type != None
3787 && actual_format == 8) 3333 && actual_format == 8)
3788 str = (const char *)(value); 3334 str = (const char *)(value);
3789 3335
3790 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3336 tt_printf ("\033]%d;%s%c", op, str, resp);
3791 3337
3792 XFree (value); 3338 XFree (value);
3793 } 3339 }
3794 else 3340 else
3795 { 3341 {
3796 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3342 char *eq = strchr (str, '=');
3797 3343
3798 if (eq) 3344 if (eq)
3799 { 3345 {
3800 *eq = 0; 3346 *eq = 0;
3801 set_utf8_property (display->atom (str), eq + 1); 3347 set_utf8_property (display->atom (str), eq + 1);
3802 } 3348 }
3803 else 3349 else
3804 XDeleteProperty (disp, parent[0], 3350 XDeleteProperty (dpy, parent[0],
3805 display->atom (str)); 3351 display->atom (str));
3806 } 3352 }
3807 break; 3353 break;
3808 3354
3809 case XTerm_Color: 3355 case XTerm_Color:
… …
3819 break; 3365 break;
3820 3366
3821 if ((buf = strchr (name, ';')) != NULL) 3367 if ((buf = strchr (name, ';')) != NULL)
3822 *buf++ = '\0'; 3368 *buf++ = '\0';
3823 3369
3824 if (name[0] == '?' && !name[1]) 3370 process_color_seq (op, color, name, resp);
3825 {
3826 unsigned short r, g, b;
3827 pix_colors_focused[color].get (display, r, g, b);
3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3829 }
3830 else
3831 set_window_color (color, name);
3832 } 3371 }
3833 break; 3372 break;
3373 case Rxvt_restoreFG:
3834 case XTerm_Color00: 3374 case XTerm_Color00:
3835 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3375 process_color_seq (op, Color_fg, str, resp);
3836 break; 3376 break;
3377 case Rxvt_restoreBG:
3837 case XTerm_Color01: 3378 case XTerm_Color01:
3838 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3379 process_color_seq (op, Color_bg, str, resp);
3839 break; 3380 break;
3840#ifndef NO_CURSORCOLOR 3381#ifndef NO_CURSORCOLOR
3841 case XTerm_Color_cursor: 3382 case XTerm_Color_cursor:
3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3383 process_color_seq (op, Color_cursor, str, resp);
3843 break; 3384 break;
3844#endif 3385#endif
3845 case XTerm_Color_pointer_fg: 3386 case XTerm_Color_pointer_fg:
3846 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3387 process_color_seq (op, Color_pointer_fg, str, resp);
3847 break; 3388 break;
3848 case XTerm_Color_pointer_bg: 3389 case XTerm_Color_pointer_bg:
3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3390 process_color_seq (op, Color_pointer_bg, str, resp);
3850 break; 3391 break;
3851#ifndef NO_BOLD_UNDERLINE_REVERSE 3392#ifndef NO_BOLD_UNDERLINE_REVERSE
3852 case XTerm_Color_RV: 3393 case XTerm_Color_RV:
3853 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3394 process_color_seq (op, Color_RV, str, resp);
3854 break; 3395 break;
3855 case Rxvt_Color_BD: 3396 case Rxvt_Color_BD:
3856 case URxvt_Color_BD: 3397 case URxvt_Color_BD:
3857 process_color_seq (op, Color_BD, str, resp); 3398 process_color_seq (op, Color_BD, str, resp);
3858 break; 3399 break;
3859 case Rxvt_Color_UL: 3400 case Rxvt_Color_UL:
3860 case URxvt_Color_UL: 3401 case URxvt_Color_UL:
3861 process_color_seq (op, Color_UL, str, resp); 3402 process_color_seq (op, Color_UL, str, resp);
3862 break; 3403 break;
3863 case URxvt_Color_IT: 3404 case URxvt_Color_IT:
3864 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3405 process_color_seq (op, Color_IT, str, resp);
3865 break; 3406 break;
3866#endif 3407#endif
3867#if TRANSPARENT && TINTING 3408 case URxvt_Color_border:
3409 process_color_seq (op, Color_border, str, resp);
3410 break;
3411#if ENABLE_TRANSPARENCY
3868 case URxvt_Color_tint: 3412 case URxvt_Color_tint:
3869 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3413 process_color_seq (op, Color_tint, str, resp);
3870 check_our_parents (); 3414 {
3871 if (am_transparent) 3415 bool changed = false;
3872 want_full_refresh = want_refresh = 1;
3873 break;
3874#endif
3875 3416
3417 if (ISSET_PIXCOLOR (Color_tint))
3418 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3419 else
3420 changed = bgPixmap.unset_tint ();
3421
3422 if (changed)
3423 update_background ();
3424 }
3425
3426 break;
3427#endif
3428
3429#if BG_IMAGE_FROM_FILE
3876 case Rxvt_Pixmap: 3430 case Rxvt_Pixmap:
3877 { 3431 if (!strcmp (str, "?"))
3878 if (*str != ';')
3879 { 3432 {
3880#if XPM_BACKGROUND 3433 char str[256];
3881 scale_pixmap (""); /* reset to default scaling */ 3434
3882 set_bgPixmap (str); /* change pixmap */ 3435 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3883 scr_touch (true); 3436 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3884#endif 3437 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3438 process_xterm_seq (XTerm_title, str, CHAR_ST);
3885 } 3439 }
3886 3440 else
3441 {
3887 int changed = 0; 3442 int changed = 0;
3888 3443
3889 while ((str = strchr (str, ';')) != NULL) 3444 if (*str != ';')
3890 { 3445 {
3446 /* reset to default scaling :*/
3447 bgPixmap.unset_geometry ();
3448 if (bgPixmap.set_file (str)) /* change pixmap */
3449 changed++;
3450 str = strchr (str, ';');
3451 if (str == NULL)
3452 bgPixmap.set_defaultGeometry ();
3453 }
3454
3455 while (str)
3456 {
3891 str++; 3457 str++;
3892#if XPM_BACKGROUND 3458 if (bgPixmap.set_geometry (str))
3893 changed += scale_pixmap (str); 3459 changed++;
3894#endif 3460 str = strchr (str, ';');
3895 } 3461 }
3896 3462
3897 if (changed) 3463 if (changed)
3898 { 3464 update_background ();
3899#ifdef XPM_BACKGROUND
3900 resize_pixmap ();
3901 scr_touch (true);
3902#endif
3903 } 3465 }
3904 }
3905 break; 3466 break;
3906 3467#endif
3907 case Rxvt_restoreFG:
3908 set_window_color (Color_fg, str);
3909 break;
3910 case Rxvt_restoreBG:
3911 set_window_color (Color_bg, str);
3912 break;
3913 3468
3914 case XTerm_logfile: 3469 case XTerm_logfile:
3915 // TODO, when secure mode? 3470 // TODO, when secure mode?
3916 break; 3471 break;
3917 3472
… …
3935 case URxvt_italicFont: 3490 case URxvt_italicFont:
3936 case URxvt_boldItalicFont: 3491 case URxvt_boldItalicFont:
3937#endif 3492#endif
3938 if (query) 3493 if (query)
3939 tt_printf ("\33]%d;%-.250s%c", saveop, 3494 tt_printf ("\33]%d;%-.250s%c", saveop,
3940 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3495 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3941 ? fontset[op - URxvt_font]->fontdesc : "", 3496 ? fontset[op - URxvt_font]->fontdesc : "",
3942 resp); 3497 resp);
3943 else 3498 else
3944 { 3499 {
3945 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3500 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3948 allocated.push_back ((void *)res); 3503 allocated.push_back ((void *)res);
3949 set_fonts (); 3504 set_fonts ();
3950 } 3505 }
3951 break; 3506 break;
3952 3507
3953#if ENABLE_FRILLS 3508 case URxvt_version:
3509 if (query)
3510 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3511 op,
3512 rs[Rs_name], VERSION[0], VERSION[2],
3513 resp);
3514 break;
3515
3516#if !ENABLE_MINIMAL
3954 case URxvt_locale: 3517 case URxvt_locale:
3955 if (query) 3518 if (query)
3956 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3519 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3957 else 3520 else
3958 { 3521 {
3959 set_locale (str); 3522 set_locale (str);
3960 pty->set_utf8_mode (enc_utf8); 3523 pty->set_utf8_mode (enc_utf8);
3961 init_xlocale (); 3524 init_xlocale ();
… …
3976 break; 3539 break;
3977#endif 3540#endif
3978 3541
3979#if ENABLE_PERL 3542#if ENABLE_PERL
3980 case URxvt_perl: 3543 case URxvt_perl:
3981 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3544 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3982 ; // no responses yet
3983 break; 3545 break;
3984#endif 3546#endif
3985 } 3547 }
3986} 3548}
3987/*----------------------------------------------------------------------*/ 3549/*----------------------------------------------------------------------*/
… …
4010 { 3572 {
4011 if (mode == 'r') 3573 if (mode == 'r')
4012 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3574 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4013 else 3575 else
4014 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3576 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4015 PrivMode (state, bit); 3577 set_privmode (bit, state);
4016 } 3578 }
4017 3579
4018 return state; 3580 return state;
4019} 3581}
4020 3582
… …
4024{ 3586{
4025 unsigned int i, j; 3587 unsigned int i, j;
4026 int state; 3588 int state;
4027 3589
4028 static const struct 3590 static const struct
4029 { 3591 {
4030 const int argval; 3592 const int argval;
4031 const unsigned long bit; 3593 const unsigned long bit;
4032 }
4033
4034 argtopriv[] = { 3594 } argtopriv[] = {
4035 { 1, PrivMode_aplCUR }, 3595 { 1, PrivMode_aplCUR }, // DECCKM
4036 { 2, PrivMode_vt52 }, 3596 { 2, PrivMode_vt52 },
4037 { 3, PrivMode_132 }, 3597 { 3, PrivMode_132 }, // DECCOLM
4038 { 4, PrivMode_smoothScroll }, 3598 { 4, PrivMode_smoothScroll }, // DECSCLM
4039 { 5, PrivMode_rVideo }, 3599 { 5, PrivMode_rVideo }, // DECSCNM
4040 { 6, PrivMode_relOrigin }, 3600 { 6, PrivMode_relOrigin }, // DECOM
4041 { 7, PrivMode_Autowrap }, 3601 { 7, PrivMode_Autowrap }, // DECAWM
4042 // 8, bi-directional support mode 3602 // 8, auto-repeat keys // DECARM
4043 { 9, PrivMode_MouseX10 }, 3603 { 9, PrivMode_MouseX10 },
4044 // 18, 19 printing-related 3604 // 18 end FF to printer after print screen
3605 // 19 Print screen prints full screen/scorll region
4045 { 25, PrivMode_VisibleCursor }, 3606 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4046#ifdef scrollBar_esc 3607#ifdef scrollBar_esc
4047 { scrollBar_esc, PrivMode_scrollBar }, 3608 { scrollBar_esc, PrivMode_scrollBar },
4048#endif 3609#endif
4049 { 35, PrivMode_ShiftKeys }, // rxvt extension 3610 { 35, PrivMode_ShiftKeys }, // rxvt extension
3611 // 38, tektronix mode // DECTEK
4050 { 40, PrivMode_132OK }, 3612 { 40, PrivMode_132OK },
4051 // 41 xterm more fixes NYI 3613 // 41 xterm more fixes NYI
4052 // 45 margin bell NYI 3614 // 45 margin bell NYI
4053 // 46 start logging 3615 // 46 start logging
4054 { 47, PrivMode_Screen }, 3616 { 47, PrivMode_Screen },
4055 { 66, PrivMode_aplKP }, 3617 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4056#ifndef NO_BACKSPACE_KEY 3618#ifndef NO_BACKSPACE_KEY
4057 { 67, PrivMode_BackSpace }, 3619 { 67, PrivMode_BackSpace }, // DECBKM
4058#endif 3620#endif
4059 { 1000, PrivMode_MouseX11 }, 3621 { 1000, PrivMode_MouseX11 },
4060 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3622 { 1002, PrivMode_MouseBtnEvent },
4061 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3623 { 1003, PrivMode_MouseAnyEvent },
4062 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4063 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3624 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4064 { 1011, PrivMode_Keypress }, // rxvt extension 3625 { 1011, PrivMode_Keypress }, // rxvt extension
4065 // 1035 enable modifiers for alt, numlock NYI 3626 // 1035 enable modifiers for alt, numlock NYI
4066 // 1036 send ESC for meta keys NYI 3627 // 1036 send ESC for meta keys NYI
4067 // 1037 send DEL for keypad delete NYI 3628 // 1037 send DEL for keypad delete NYI
4068 { 1047, PrivMode_Screen }, 3629 { 1047, PrivMode_Screen },
4069 // 1048 save and restore cursor 3630 // 1048 save and restore cursor
4070 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3631 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4071 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3632 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3633 { 2004, PrivMode_BracketPaste },
4072 }; 3634 };
4073 3635
4074 if (nargs == 0) 3636 if (nargs == 0)
4075 return; 3637 return;
4076 3638
… …
4101 3663
4102 scr_touch (true); 3664 scr_touch (true);
4103 break; 3665 break;
4104#endif 3666#endif
4105 case 1048: /* alternative cursor save */ 3667 case 1048: /* alternative cursor save */
4106 case 1049:
4107 if (OPTION (Opt_secondaryScreen)) 3668 if (option (Opt_secondaryScreen))
4108 if (mode == 0) 3669 if (mode == 0)
4109 scr_cursor (RESTORE); 3670 scr_cursor (RESTORE);
4110 else if (mode == 1) 3671 else if (mode == 1)
4111 scr_cursor (SAVE); 3672 scr_cursor (SAVE);
4112 break; 3673 break;
… …
4120 case 2: /* VT52 mode */ 3681 case 2: /* VT52 mode */
4121 /* oddball mode. should be set regardless of set/reset 3682 /* oddball mode. should be set regardless of set/reset
4122 * parameter. Return from VT52 mode with an ESC < from 3683 * parameter. Return from VT52 mode with an ESC < from
4123 * within VT52 mode 3684 * within VT52 mode
4124 */ 3685 */
4125 PrivMode (1, PrivMode_vt52); 3686 set_privmode (PrivMode_vt52, 1);
4126 break; 3687 break;
4127 case 3: /* 80/132 */ 3688 case 3: /* 80/132 */
4128 if (priv_modes & PrivMode_132OK) 3689 if (priv_modes & PrivMode_132OK)
4129 set_widthheight (((state ? 132 : 80) * fwidth), height); 3690 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4130 break; 3691 break;
4131 case 4: /* smooth scrolling */ 3692 case 4: /* smooth scrolling */
4132 set_option (Opt_jumpScroll, !state); 3693 set_option (Opt_jumpScroll, !state);
4133 break; 3694 break;
4134 case 5: /* reverse video */ 3695 case 5: /* reverse video */
… …
4141 scr_autowrap (state); 3702 scr_autowrap (state);
4142 break; 3703 break;
4143 /* case 8: - auto repeat, can't do on a per window basis */ 3704 /* case 8: - auto repeat, can't do on a per window basis */
4144 case 9: /* X10 mouse reporting */ 3705 case 9: /* X10 mouse reporting */
4145 if (state) /* orthogonal */ 3706 if (state) /* orthogonal */
4146 priv_modes &= ~PrivMode_MouseX11; 3707 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4147 break; 3708 break;
4148#ifdef scrollBar_esc 3709#ifdef scrollBar_esc
4149 case scrollBar_esc: 3710 case scrollBar_esc:
4150 if (scrollbar_mapping (state)) 3711 if (scrollBar.map (state))
4151 { 3712 {
4152 resize_all_windows (0, 0, 0); 3713 resize_all_windows (0, 0, 0);
4153 scr_touch (true); 3714 scr_touch (true);
4154 } 3715 }
4155 break; 3716 break;
… …
4164 break; 3725 break;
4165 /* case 66: - application key pad */ 3726 /* case 66: - application key pad */
4166 /* case 67: - backspace key */ 3727 /* case 67: - backspace key */
4167 case 1000: /* X11 mouse reporting */ 3728 case 1000: /* X11 mouse reporting */
4168 if (state) /* orthogonal */ 3729 if (state) /* orthogonal */
4169 priv_modes &= ~PrivMode_MouseX10; 3730 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4170 break; 3731 break;
4171#if 0
4172 case 1001: 3732 case 1002:
4173 break; /* X11 mouse highlighting */ 3733 case 1003:
4174#endif 3734 if (state)
3735 {
3736 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3737 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3738 vt_emask_mouse = PointerMotionMask;
3739 }
3740 else
3741 vt_emask_mouse = NoEventMask;
3742
3743 vt_select_input ();
3744 break;
4175 case 1010: /* scroll to bottom on TTY output inhibit */ 3745 case 1010: /* scroll to bottom on TTY output inhibit */
4176 set_option (Opt_scrollTtyOutput, !state); 3746 set_option (Opt_scrollTtyOutput, !state);
4177 break; 3747 break;
4178 case 1011: /* scroll to bottom on key press */ 3748 case 1011: /* scroll to bottom on key press */
4179 set_option (Opt_scrollTtyKeypress, state); 3749 set_option (Opt_scrollTtyKeypress, state);
4180 break; 3750 break;
4181 case 1047: /* secondary screen w/ clearing last */ 3751 case 1047: /* secondary screen w/ clearing last */
4182 if (OPTION (Opt_secondaryScreen)) 3752 if (option (Opt_secondaryScreen))
4183 if (current_screen != PRIMARY) 3753 if (!state)
4184 scr_erase_screen (2); 3754 scr_erase_screen (2);
3755
4185 scr_change_screen (state); 3756 scr_change_screen (state);
4186 break; 3757 break;
4187 case 1049: /* secondary screen w/ clearing first */ 3758 case 1049: /* secondary screen w/ clearing first */
3759 if (option (Opt_secondaryScreen))
3760 if (state)
3761 scr_cursor (SAVE);
3762
4188 scr_change_screen (state); 3763 scr_change_screen (state);
3764
4189 if (OPTION (Opt_secondaryScreen)) 3765 if (option (Opt_secondaryScreen))
4190 if (current_screen != PRIMARY) 3766 if (state)
4191 scr_erase_screen (2); 3767 scr_erase_screen (2);
3768 else
3769 scr_cursor (RESTORE);
4192 break; 3770 break;
4193 default: 3771 default:
4194 break; 3772 break;
4195 } 3773 }
4196 } 3774 }
… …
4322 scr_color (Color_bg, Color_bg); 3900 scr_color (Color_bg, Color_bg);
4323 break; 3901 break;
4324 3902
4325 //case 50: // not variable spacing 3903 //case 50: // not variable spacing
4326 3904
4327#if ENABLE_FRILLS 3905#if !ENABLE_MINIMAL
4328 case 90: 3906 case 90:
4329 case 91: /* set bright fg color */ 3907 case 91: /* set bright fg color */
4330 case 92: 3908 case 92:
4331 case 93: 3909 case 93:
4332 case 94: 3910 case 94:
… …
4356rxvt_term::process_graphics () 3934rxvt_term::process_graphics ()
4357{ 3935{
4358 unicode_t ch, cmd = cmd_getc (); 3936 unicode_t ch, cmd = cmd_getc ();
4359 3937
4360 if (cmd == 'Q') 3938 if (cmd == 'Q')
3939 {
4361 { /* query graphics */ 3940 /* query graphics */
4362 tt_printf ("\033G0\012"); /* no graphics */ 3941 tt_printf ("\033G0\012"); /* no graphics */
4363 return; 3942 return;
4364 } 3943 }
4365 /* swallow other graphics sequences until terminating ':' */ 3944 /* swallow other graphics sequences until terminating ':' */
4366 do 3945 do
… …
4416 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3995 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4417 3996
4418 memcpy (v_buffer + v_buflen, data, len); 3997 memcpy (v_buffer + v_buflen, data, len);
4419 v_buflen += len; 3998 v_buflen += len;
4420 3999
4421 pty_ev.set (EVENT_READ | EVENT_WRITE); 4000 pty_ev.set (ev::READ | ev::WRITE);
4422} 4001}
4423 4002
4424void rxvt_term::pty_write () 4003void rxvt_term::pty_write ()
4425{ 4004{
4426 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4005 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4431 4010
4432 if (v_buflen == 0) 4011 if (v_buflen == 0)
4433 { 4012 {
4434 free (v_buffer); 4013 free (v_buffer);
4435 v_buffer = 0; 4014 v_buffer = 0;
4436 v_buflen = 0;
4437 4015
4438 pty_ev.set (EVENT_READ); 4016 pty_ev.set (ev::READ);
4439 return; 4017 return;
4440 } 4018 }
4441 4019
4442 memmove (v_buffer, v_buffer + written, v_buflen); 4020 memmove (v_buffer, v_buffer + written, v_buflen);
4443 } 4021 }
4444 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4022 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4445 pty_ev.set (EVENT_READ); 4023 pty_ev.set (ev::READ);
4446} 4024}
4447 4025
4448/*----------------------- end-of-file (C source) -----------------------*/ 4026/*----------------------- end-of-file (C source) -----------------------*/
4449 4027

Diff Legend

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