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.275 by root, Fri Jan 20 10:35:25 2006 UTC vs.
Revision 1.419 by root, Fri Oct 10 13:23:56 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
49#include "rxvt.h" 50#include "rxvt.h"
50#include "rxvtperl.h" 51#include "rxvtperl.h"
51#include "version.h" 52#include "version.h"
52#include "command.h" 53#include "command.h"
53 54
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 56# include "keyboard.h"
61#endif 57#endif
62 58
63#include <csignal> 59#include <csignal>
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
… …
493# if ISO_14755 594# if ISO_14755
494 iso14755_51 (0); 595 iso14755_51 (0);
495# endif 596# endif
496 return; 597 return;
497 } 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);
604# endif
605 return;
606 }
498 else if ((hv = hex_keyval (ev)) >= 0) 607 else if ((hv = hex_keyval (ev)) >= 0)
499 { 608 {
500 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 609 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
501 | hv | ISO_14755_51; 610 | hv | ISO_14755_51;
502# if ISO_14755 611# if ISO_14755
… …
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 }
515 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
516 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
517 if (!(iso14755buf & ISO_14755_STARTED)) 626 if (!(iso14755buf & ISO_14755_STARTED))
518 { 627 {
519 iso14755buf |= ISO_14755_STARTED; 628 iso14755buf |= ISO_14755_STARTED;
520# if ENABLE_OVERLAY 629# if ISO_14755
521 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
522 scr_overlay_set (0, 0, "ISO 14755 mode"); 631 scr_overlay_set (0, 0, "ISO 14755 mode");
523# endif 632# endif
524 } 633 }
525#endif 634#endif
526 635
527#ifdef PRINTPIPE 636#ifdef PRINTPIPE
528 if (keysym == XK_Print) 637 if (keysym == XK_Print)
529 { 638 {
530 scr_printscreen (ctrl | shft); 639 scr_printscreen (ctrl | shft);
531 return; 640 return;
532 } 641 }
533#endif 642#endif
534 643
535 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 644 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
536 { 645 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1;
648
649 switch (translate_keypad (keysym, kp))
537 { 650 {
651#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace)
654 {
655 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
656 ^ !!ctrl) ? '\b' : '\177';
657 kbuf[1] = '\0';
658 }
659 else
660 strcpy (kbuf, rs[Rs_backspace_key]);
661 break;
662#endif
663#ifndef NO_DELETE_KEY
664 case XK_Delete:
665 strcpy (kbuf, rs[Rs_delete_key]);
666 break;
667#endif
668 case XK_Tab:
669 if (shft)
670 strcpy (kbuf, "\033[Z");
671 else
672 {
673#ifdef CTRL_TAB_MAKES_META
674 if (ctrl)
675 meta = 1;
676#endif
677#ifdef MOD4_TAB_MAKES_META
678 if (ev.state & Mod4Mask)
679 meta = 1;
680#endif
538 newlen = 1; 681 newlen = 0;
539 switch (keysym) 682 }
683 break;
684
685 case XK_Up: /* "\033[A" */
686 case XK_Down: /* "\033[B" */
687 case XK_Right: /* "\033[C" */
688 case XK_Left: /* "\033[D" */
689 strcpy (kbuf, "\033[Z");
690 kbuf[2] = "DACB"[keysym - XK_Left];
691 /* do Shift first */
692 if (shft)
693 kbuf[2] = "dacb"[keysym - XK_Left];
694 else if (ctrl)
695 {
696 kbuf[1] = 'O';
697 kbuf[2] = "dacb"[keysym - XK_Left];
698 }
699 else if (priv_modes & PrivMode_aplCUR)
700 kbuf[1] = 'O';
701 break;
702
703 case XK_KP_Enter:
704 /* allow shift to override */
705 if (kp)
706 {
707 strcpy (kbuf, "\033OM");
708 break;
709 }
710
711 /* FALLTHROUGH */
712
713 case XK_Return:
714 if (priv_modes & PrivMode_LFNL)
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\012';
718 kbuf[2] = '\0';
719 }
720 else
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\0';
724 }
725 break;
726
727 case XK_KP_F1: /* "\033OP" */
728 case XK_KP_F2: /* "\033OQ" */
729 case XK_KP_F3: /* "\033OR" */
730 case XK_KP_F4: /* "\033OS" */
731 strcpy (kbuf, "\033OP");
732 kbuf[2] += (keysym - XK_KP_F1);
733 break;
734
735 case XK_KP_Multiply: /* "\033Oj" : "*" */
736 case XK_KP_Add: /* "\033Ok" : "+" */
737 case XK_KP_Separator: /* "\033Ol" : "," */
738 case XK_KP_Subtract: /* "\033Om" : "-" */
739 case XK_KP_Decimal: /* "\033On" : "." */
740 case XK_KP_Divide: /* "\033Oo" : "/" */
741 case XK_KP_0: /* "\033Op" : "0" */
742 case XK_KP_1: /* "\033Oq" : "1" */
743 case XK_KP_2: /* "\033Or" : "2" */
744 case XK_KP_3: /* "\033Os" : "3" */
745 case XK_KP_4: /* "\033Ot" : "4" */
746 case XK_KP_5: /* "\033Ou" : "5" */
747 case XK_KP_6: /* "\033Ov" : "6" */
748 case XK_KP_7: /* "\033Ow" : "7" */
749 case XK_KP_8: /* "\033Ox" : "8" */
750 case XK_KP_9: /* "\033Oy" : "9" */
751 /* allow shift to override */
752 if (kp)
753 {
754 strcpy (kbuf, "\033Oj");
755 kbuf[2] += (keysym - XK_KP_Multiply);
756 }
757 else
758 {
759 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
760 kbuf[1] = '\0';
761 }
762 break;
763
764 default:
540 { 765 {
541#ifndef NO_BACKSPACE_KEY 766 int param = map_function_key (keysym);
542 case XK_BackSpace: 767 if (param > 0)
543 if (priv_modes & PrivMode_HaveBackSpace) 768 sprintf (kbuf,"\033[%d~", param);
544 {
545 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
546 ^ !!ctrl) ? '\b' : '\177';
547 kbuf[1] = '\0';
548 }
549 else 769 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; 770 newlen = 0;
825 break;
826 } 771 }
827 772 break;
828 if (newlen)
829 len = strlen (kbuf);
830 } 773 }
774
775 if (newlen)
776 len = strlen (kbuf);
831 777
832 /* 778 /*
833 * Pass meta for all function keys, if 'meta' option set 779 * Pass meta for all function keys, if 'meta' option set
834 */ 780 */
835#ifdef META8_OPTION 781#ifdef META8_OPTION
… …
870 return; 816 return;
871 817
872 if (len <= 0) 818 if (len <= 0)
873 return; /* not mapped */ 819 return; /* not mapped */
874 820
875 if (OPTION (Opt_scrollTtyKeypress)) 821 if (option (Opt_scrollTtyKeypress))
876 if (view_start) 822 if (view_start)
877 { 823 {
878 view_start = 0; 824 view_start = 0;
879 want_refresh = 1; 825 want_refresh = 1;
880 } 826 }
… …
902 { 848 {
903 const char ch = C0_ESC; 849 const char ch = C0_ESC;
904 tt_write (&ch, 1); 850 tt_write (&ch, 1);
905 } 851 }
906 852
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); 853 tt_write (kbuf, (unsigned int)len);
918} 854}
919/*}}} */ 855
856void
857rxvt_term::key_release (XKeyEvent &ev)
858{
859#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
860 KeySym keysym;
861
862 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
863#endif
864
865#if ENABLE_FRILLS || ISO_14755
866 // ISO 14755 support
867 if (iso14755buf)
868 if (iso14755buf & ISO_14755_52)
869 {
870# if ISO_14755
871 scr_overlay_off ();
872# endif
873# if ISO_14755
874 // iso14755 part 5.2 handling: release time
875 // first: controls
876 if ((ev.state & ControlMask)
877 && ((keysym >= 0x40 && keysym <= 0x5f)
878 || (keysym >= 0x61 && keysym <= 0x7f)))
879 {
880 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
881 commit_iso14755 ();
882
883 return;
884 }
885
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
887 if (i[0] == keysym)
888 {
889 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 ();
891
892 return;
893 }
894
895 scr_bell ();
896# endif
897 iso14755buf = 0;
898
899 return;
900 }
901 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
902 {
903# if ISO_14755
904 scr_overlay_off ();
905# endif
906 if (iso14755buf & ISO_14755_51)
907 commit_iso14755 ();
908#if ISO_14755
909 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
910 {
911 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
912
913 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
914 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
915 }
916# endif
917 else
918 iso14755buf = 0;
919 }
920#endif
921
922 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
923 return;
924
925#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
926 if (!(ev.state & ControlMask))
927 slip_wheel_ev.stop ();
928 else if (keysym == XK_Control_L || keysym == XK_Control_R)
929 mouse_slip_wheel_speed = 0;
930#endif
931}
920 932
921#if defined (KEYSYM_RESOURCE) 933#if defined (KEYSYM_RESOURCE)
922unsigned int 934unsigned int
923rxvt_term::cmd_write (const char *str, unsigned int count) 935rxvt_term::cmd_write (const char *str, unsigned int count)
924{ 936{
… …
954void 966void
955rxvt_term::flush () 967rxvt_term::flush ()
956{ 968{
957 flush_ev.stop (); 969 flush_ev.stop ();
958 970
959#ifdef TRANSPARENT 971#ifdef HAVE_BG_PIXMAP
960 if (want_full_refresh) 972 if (bgPixmap.check_clearChanged ())
961 { 973 {
962 want_full_refresh = 0; 974// scr_clear (true); This needs to be researched further!
963 scr_clear ();
964 scr_touch (false); 975 scr_touch (false);
965 } 976 }
966#endif 977#endif
967 978
968 if (want_refresh) 979 if (want_refresh)
… …
1004 } 1015 }
1005 while (row < end_row); 1016 while (row < end_row);
1006 } 1017 }
1007 1018
1008 scr_refresh (); 1019 scr_refresh ();
1009 scrollbar_show (1); 1020 scrollBar.show (1);
1010#ifdef USE_XIM 1021#ifdef USE_XIM
1011 IMSendSpot (); 1022 IMSendSpot ();
1012#endif 1023#endif
1013 } 1024 }
1014 1025
1015 display->flush (); 1026 display->flush ();
1016} 1027}
1017 1028
1029/* checks wether a refresh is requested and starts the refresh timer */
1018void 1030void
1019rxvt_term::check_cb (check_watcher &w) 1031rxvt_term::refresh_check ()
1032{
1033 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1035
1036 display->flush ();
1037}
1038
1039void
1040rxvt_term::flush_cb (ev::timer &w, int revents)
1020{ 1041{
1021 make_current (); 1042 make_current ();
1022 1043
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; 1044 refresh_count = 0;
1036 flush (); 1045 flush ();
1037} 1046}
1038 1047
1039#ifdef CURSOR_BLINK 1048#ifdef CURSOR_BLINK
1040void 1049void
1041rxvt_term::cursor_blink_cb (time_watcher &w) 1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1042{ 1051{
1043 hidden_cursor = !hidden_cursor; 1052 hidden_cursor = !hidden_cursor;
1044 want_refresh = 1; 1053 want_refresh = 1;
1045 1054 refresh_check ();
1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
1047} 1055}
1048#endif 1056#endif
1049 1057
1050#ifdef TEXT_BLINK 1058#ifdef TEXT_BLINK
1051void 1059void
1052rxvt_term::text_blink_cb (time_watcher &w) 1060rxvt_term::text_blink_cb (ev::timer &w, int revents)
1053{ 1061{
1054 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1062 if (scr_refresh_rend (RS_Blink, RS_Blink))
1055 { 1063 {
1056 hidden_text = !hidden_text; 1064 hidden_text = !hidden_text;
1057 want_refresh = 1; 1065 want_refresh = 1;
1058 w.start (w.at + TEXT_BLINK_INTERVAL); 1066 refresh_check ();
1059 } 1067 }
1068 else
1069 w.stop ();
1060} 1070}
1061#endif 1071#endif
1062 1072
1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1064void 1074void
1065rxvt_term::cont_scroll_cb (time_watcher &w) 1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1066{ 1076{
1067 if ((scrollbar_isUp() || scrollbar_isDn()) && 1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1068 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1069 { 1079 {
1070 want_refresh = 1; 1080 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1081 refresh_check ();
1072 } 1082 }
1083 else
1084 w.stop ();
1073} 1085}
1074#endif 1086#endif
1075 1087
1076#ifdef SELECTION_SCROLLING 1088#ifdef SELECTION_SCROLLING
1077void 1089void
1078rxvt_term::sel_scroll_cb (time_watcher &w) 1090rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1079{ 1091{
1080 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1092 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1081 { 1093 {
1082 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1094 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1083 want_refresh = 1; 1095 want_refresh = 1;
1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1085 } 1097 }
1098 else
1099 w.stop ();
1086} 1100}
1087#endif 1101#endif
1088 1102
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090void 1104void
1091rxvt_term::slip_wheel_cb (time_watcher &w) 1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1092{ 1106{
1093 if (mouse_slip_wheel_speed == 0 1107 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 { 1108 {
1097 if (view_start == top_row || view_start == 0)
1098 mouse_slip_wheel_speed = 0;
1099
1100 want_refresh = 1; 1109 want_refresh = 1;
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1110 refresh_check ();
1111 }
1112
1113 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1102 } 1114 {
1115 mouse_slip_wheel_speed = 0;
1116 w.stop ();
1117 }
1103} 1118}
1104#endif 1119#endif
1105 1120
1106#if HAVE_SCHED_YIELD 1121#if LINUX_YIELD_HACK
1107static struct event_handler 1122static struct event_handler
1108{ 1123{
1109 check_watcher cw_yield; 1124 ev::prepare yield_ev;
1110 1125
1111 void yield (check_watcher &w) 1126 void yield_cb (ev::prepare &w, int revents)
1112 { 1127 {
1113 sched_yield (); 1128 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS.
1132
1133 struct timespec ts = { 0, 0 };
1134 nanosleep (&ts, 0);
1135
1114 w.stop (); 1136 w.stop ();
1115 } 1137 }
1116 1138
1117 event_handler () 1139 event_handler ()
1118 : cw_yield (this, &event_handler::yield) 1140 : yield_ev (this, &event_handler::yield_cb)
1119 { 1141 {
1120 } 1142 }
1121} event_handler; 1143} event_handler;
1122#endif 1144#endif
1123 1145
… …
1143 cmdbuf_endp += r; 1165 cmdbuf_endp += r;
1144 return true; 1166 return true;
1145 } 1167 }
1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1168 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 { 1169 {
1148#if HAVE_SCHED_YIELD 1170#if LINUX_YIELD_HACK
1149 if (display->is_local) 1171 if (display->is_local)
1150 event_handler.cw_yield.start (); 1172 event_handler.yield_ev.start ();
1151#endif 1173#endif
1152 } 1174 }
1153 else 1175 else
1154 { 1176 {
1155 pty_ev.stop (); 1177 pty_ev.stop ();
1156 1178
1157 if (!OPTION (Opt_hold)) 1179 if (!option (Opt_hold))
1158 destroy (); 1180 destroy ();
1159 } 1181 }
1160 1182
1161 return false; 1183 return false;
1162} 1184}
1163 1185
1164void 1186void
1165rxvt_term::pty_cb (io_watcher &w, short revents) 1187rxvt_term::pty_cb (ev::io &w, int revents)
1166{ 1188{
1167 make_current (); 1189 make_current ();
1168 1190
1169 if (revents & EVENT_READ) 1191 if (revents & ev::READ)
1170 // loop, but don't allow a single term to monopolize us 1192 // loop, but don't allow a single term to monopolize us
1171 while (pty_fill ()) 1193 while (pty_fill ())
1172 if (cmd_parse ()) 1194 if (cmd_parse ())
1173 break; 1195 break;
1174 1196
1175 if (revents & EVENT_WRITE) 1197 if (revents & ev::WRITE)
1176 pty_write (); 1198 pty_write ();
1199
1200 refresh_check ();
1177} 1201}
1178 1202
1179void 1203void
1180rxvt_term::pointer_unblank () 1204rxvt_term::pointer_unblank ()
1181{ 1205{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1206 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1207 recolour_cursor ();
1184 1208
1185#ifdef POINTER_BLANK 1209#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1210 hidden_pointer = 0;
1187 1211
1188 if (OPTION (Opt_pointerBlank)) 1212 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1213 pointer_ev.start (pointerBlankDelay);
1190#endif 1214#endif
1191} 1215}
1192 1216
1193#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1194void 1218void
1195rxvt_term::pointer_blank () 1219rxvt_term::pointer_blank ()
1196{ 1220{
1197 if (!OPTION (Opt_pointerBlank)) 1221 if (!option (Opt_pointerBlank))
1198 return; 1222 return;
1199 1223
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1224 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (display->display); 1225 XFlush (dpy);
1202 1226
1203 hidden_pointer = 1; 1227 hidden_pointer = 1;
1204} 1228}
1205 1229
1206void 1230void
1207rxvt_term::pointer_cb (time_watcher &w) 1231rxvt_term::pointer_cb (ev::timer &w, int revents)
1208{ 1232{
1209 make_current (); 1233 make_current ();
1210 1234
1211 pointer_blank (); 1235 pointer_blank ();
1212} 1236}
… …
1215void 1239void
1216rxvt_term::mouse_report (XButtonEvent &ev) 1240rxvt_term::mouse_report (XButtonEvent &ev)
1217{ 1241{
1218 int button_number, key_state = 0; 1242 int button_number, key_state = 0;
1219 int x, y; 1243 int x, y;
1244 int code = 32;
1220 1245
1221 x = ev.x; 1246 x = Pixel2Col (ev.x);
1222 y = ev.y; 1247 y = Pixel2Row (ev.y);
1223 pixel_position (&x, &y); 1248 if (ev.type == MotionNotify)
1249 {
1250 if (x == mouse_row && y == mouse_col)
1251 return;
1252 mouse_row = x;
1253 mouse_col = y;
1254 code += 32;
1255 }
1224 1256
1225 if (MEvent.button == AnyButton) 1257 if (MEvent.button == AnyButton)
1226 button_number = 3; 1258 button_number = 3;
1227 else 1259 else
1228 { 1260 {
… …
1274 x + 1, 1306 x + 1,
1275 y + 1); 1307 y + 1);
1276#endif 1308#endif
1277 1309
1278 tt_printf ("\033[M%c%c%c", 1310 tt_printf ("\033[M%c%c%c",
1279 (32 + button_number + key_state), 1311 (code + button_number + key_state),
1280 (32 + x + 1), 1312 (32 + x + 1),
1281 (32 + y + 1)); 1313 (32 + y + 1));
1282} 1314}
1283
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 1315
1294/*{{{ process an X event */ 1316/*{{{ process an X event */
1295void 1317void
1296rxvt_term::x_cb (XEvent &ev) 1318rxvt_term::x_cb (XEvent &ev)
1297{ 1319{
1298 make_current (); 1320 make_current ();
1299 1321
1300 dDisp; 1322 dLocal (Display *, dpy);
1301 1323
1302 if (ev.xany.window == vt 1324 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1325 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1326 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1327 return;
… …
1310 unsigned int unused_mask; 1332 unsigned int unused_mask;
1311 1333
1312 switch (ev.type) 1334 switch (ev.type)
1313 { 1335 {
1314 case KeyPress: 1336 case KeyPress:
1315#if ISO_14755 1337 key_press (ev.xkey);
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
1318 lookup_key (ev.xkey);
1319
1320 break; 1338 break;
1321 1339
1322 case KeyRelease: 1340 case KeyRelease:
1323 { 1341 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; 1342 break;
1395 }
1396 1343
1397 case ButtonPress: 1344 case ButtonPress:
1398 button_press (ev.xbutton); 1345 button_press (ev.xbutton);
1399 break; 1346 break;
1400 1347
… …
1402 button_release (ev.xbutton); 1349 button_release (ev.xbutton);
1403 break; 1350 break;
1404 1351
1405 case ClientMessage: 1352 case ClientMessage:
1406 if (ev.xclient.format == 32 1353 if (ev.xclient.format == 32
1407 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1354 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1408 { 1355 {
1356 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1357 {
1358 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1359 {
1409 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1360 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1361 {
1362 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1410 destroy (); 1363 destroy ();
1364 }
1411#if ENABLE_EWMH 1365#if ENABLE_EWMH
1412 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1366 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1413 XSendEvent (disp, ev.xclient.window = display->root, 1367 XSendEvent (dpy, ev.xclient.window = display->root,
1414 False, SubstructureRedirectMask | SubstructureNotifyMask, 1368 False, SubstructureRedirectMask | SubstructureNotifyMask,
1415 &ev); 1369 &ev);
1370#endif
1371 }
1372 }
1373#if ENABLE_XEMBED
1374 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1375 {
1376 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1377 focus_in ();
1378 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1379 focus_out ();
1380 }
1416#endif 1381#endif
1417 } 1382 }
1418#if ENABLE_XEMBED
1419 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1420 {
1421 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1422 focus_in ();
1423 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1424 focus_out ();
1425 }
1426#endif
1427#ifdef OFFIX_DND
1428 /* OffiX Dnd (drag 'n' drop) protocol */
1429 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1430 && (ev.xclient.data.l[0] == DndFile
1431 || ev.xclient.data.l[0] == DndDir
1432 || ev.xclient.data.l[0] == DndLink))
1433 {
1434 /* Get Dnd data */
1435 Atom ActualType;
1436 int ActualFormat;
1437 unsigned char *data;
1438 unsigned long Size, RemainingBytes;
1439
1440 XGetWindowProperty (disp, display->root,
1441 xa[XA_DNDSELECTION],
1442 0L, 1000000L,
1443 False, AnyPropertyType,
1444 &ActualType, &ActualFormat,
1445 &Size, &RemainingBytes,
1446 &data);
1447 set_string_property (XA_CUT_BUFFER0, data);
1448 XFree (data);
1449 selection_paste (display->root, XA_CUT_BUFFER0, true);
1450 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1451 }
1452#endif /* OFFIX_DND */
1453 break;
1454
1455 case MappingNotify:
1456 XRefreshKeyboardMapping (&ev.xmapping);
1457 break; 1383 break;
1458 1384
1459 /* 1385 /*
1460 * XXX: this is not the _current_ arrangement 1386 * XXX: this is not the _current_ arrangement
1461 * Here's my conclusion: 1387 * Here's my conclusion:
… …
1480 break; 1406 break;
1481 } 1407 }
1482 break; 1408 break;
1483 1409
1484 case FocusIn: 1410 case FocusIn:
1411 if (ev.xfocus.detail != NotifyInferior
1412 && ev.xfocus.detail != NotifyPointer
1413 && ev.xfocus.mode != NotifyGrab)
1485 focus_in (); 1414 focus_in ();
1486 break; 1415 break;
1487 1416
1488 case FocusOut: 1417 case FocusOut:
1418 if (ev.xfocus.detail != NotifyInferior
1419 && ev.xfocus.detail != NotifyPointer
1420 && ev.xfocus.mode != NotifyGrab)
1489 focus_out (); 1421 focus_out ();
1490 break; 1422 break;
1491 1423
1492 case ConfigureNotify: 1424 case ConfigureNotify:
1425 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1426 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1427 szHint.width, szHint.height);*/
1493 if (ev.xconfigure.window == parent[0]) 1428 if (ev.xconfigure.window == parent[0])
1494 { 1429 {
1495 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1496 ; 1431 ;
1497 1432
1498 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1499 { 1434 {
1500 seen_resize = 1; 1435 seen_resize = 1;
1501 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1502 } 1437 }
1438 else
1439 {
1440#ifdef HAVE_BG_PIXMAP
1441 if (bgPixmap.window_position_sensitive ())
1442 {
1443 if (mapped)
1444 update_background ();
1445 else
1446 bgPixmap.invalidate ();
1447 }
1448#endif
1449 }
1503 1450
1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1505
1506#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1507 if (OPTION (Opt_transparent))
1508 check_our_parents ();
1509#endif
1510 } 1452 }
1511 break; 1453 break;
1512 1454
1513 case PropertyNotify: 1455 case PropertyNotify:
1456 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1515 && ev.xproperty.state == PropertyNewValue) 1458 && ev.xproperty.state == PropertyNewValue)
1516 selection_property (ev.xproperty.window, ev.xproperty.atom); 1459 selection_property (ev.xproperty.window, ev.xproperty.atom);
1517 1460
1518 break; 1461 break;
1519 1462
1520 case SelectionClear: 1463 case SelectionClear:
1521 selection_clear (); 1464 selection_clear ();
… …
1529 case SelectionRequest: 1472 case SelectionRequest:
1530 selection_send (ev.xselectionrequest); 1473 selection_send (ev.xselectionrequest);
1531 break; 1474 break;
1532 1475
1533 case MapNotify: 1476 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a
1479 * non-reparenting window manager. In those cases we never get first
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does
1482 * reparenting.
1483 * We should not render background immidiately, as there could be several
1484 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1485 * by scheduling background redraw as soon as we can, but giving a short
1486 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results.
1489 */
1490 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1491 update_background_ev.start (0.025);
1492#endif
1534 mapped = 1; 1493 mapped = 1;
1535#ifdef TEXT_BLINK 1494#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1495 text_blink_ev.start ();
1537#endif 1496#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1497 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break; 1498 break;
1540 1499
1541 case UnmapNotify: 1500 case UnmapNotify:
… …
1543#ifdef TEXT_BLINK 1502#ifdef TEXT_BLINK
1544 text_blink_ev.stop (); 1503 text_blink_ev.stop ();
1545#endif 1504#endif
1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1505 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break; 1506 break;
1548
1549#ifdef TRANSPARENT
1550 case ReparentNotify:
1551 rootwin_cb (ev);
1552 break;
1553#endif /* TRANSPARENT */
1554 1507
1555 case GraphicsExpose: 1508 case GraphicsExpose:
1556 case Expose: 1509 case Expose:
1557 if (ev.xany.window == vt) 1510 if (ev.xany.window == vt)
1558 { 1511 {
1559 do 1512 do
1513 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1514 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1515 ev.xexpose.width, ev.xexpose.height, False);
1516 }
1562 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1563 1518
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565 1520
1566 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522 {
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1525 }
1569 1526
1570 want_refresh = 1; 1527 want_refresh = 1;
1571 } 1528 }
1572 else 1529 else
1573 { 1530 {
1574 XEvent unused_event; 1531 XEvent unused_event;
1575 1532
1576 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1533 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1577 ; 1534 ;
1578 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1579 ; 1536 ;
1580 1537
1581 if (isScrollbarWindow (ev.xany.window)) 1538 if (scrollBar.state && ev.xany.window == scrollBar.win)
1582 { 1539 {
1583 scrollBar.setIdle (); 1540 scrollBar.state = STATE_IDLE;
1584 scrollbar_show (0); 1541 scrollBar.show (0);
1585 } 1542 }
1586
1587#ifdef TRANSPARENT
1588 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (disp, ev.xany.window);
1590#endif
1591 } 1543 }
1592 break; 1544 break;
1593 1545
1594 case MotionNotify: 1546 case MotionNotify:
1595#ifdef POINTER_BLANK 1547#ifdef POINTER_BLANK
1596 if (hidden_pointer) 1548 if (hidden_pointer)
1597 pointer_unblank (); 1549 pointer_unblank ();
1598#endif 1550#endif
1551 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1552 || priv_modes & PrivMode_MouseAnyEvent)
1553 mouse_report (ev.xbutton);
1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1554 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1600 break; 1555 break;
1601 1556
1602 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1603 { 1558 {
1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1559 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1560 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1606 ; // nop 1561 ; // nop
1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1562 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1608 { 1563 {
1609 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1564 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1610 ; 1565 ;
1611 1566
1612 XQueryPointer (disp, vt, 1567 XQueryPointer (dpy, vt,
1613 &unused_root, &unused_child, 1568 &unused_root, &unused_child,
1614 &unused_root_x, &unused_root_y, 1569 &unused_root_x, &unused_root_y,
1615 &ev.xbutton.x, &ev.xbutton.y, 1570 &ev.xbutton.x, &ev.xbutton.y,
1616 &ev.xbutton.state); 1571 &ev.xbutton.state);
1617#ifdef MOUSE_THRESHOLD 1572#ifdef MOUSE_THRESHOLD
… …
1637 int dist; 1592 int dist;
1638 1593
1639 /* don't clobber the current delay if we are 1594 /* don't clobber the current delay if we are
1640 * already in the middle of scrolling. 1595 * already in the middle of scrolling.
1641 */ 1596 */
1642 if (!sel_scroll_ev.active) 1597 if (!sel_scroll_ev.is_active ())
1643 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1598 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1644 1599
1645 /* save the event params so we can highlight 1600 /* save the event params so we can highlight
1646 * the selection in the pending-scroll loop 1601 * the selection in the pending-scroll loop
1647 */ 1602 */
1648 selection_save_x = ev.xbutton.x; 1603 selection_save_x = ev.xbutton.x;
… …
1670 else 1625 else
1671 { 1626 {
1672 /* we are within the text window, so we 1627 /* we are within the text window, so we
1673 * shouldn't be scrolling 1628 * shouldn't be scrolling
1674 */ 1629 */
1675 if (sel_scroll_ev.active)
1676 sel_scroll_ev.stop(); 1630 sel_scroll_ev.stop();
1677 } 1631 }
1678#endif 1632#endif
1679#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
1680 } 1634 }
1681#endif 1635#endif
1682 } 1636 }
1683 } 1637 }
1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1638 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1685 { 1639 {
1686 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1640 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1687 MotionNotify, &ev)) 1641 MotionNotify, &ev))
1688 ; 1642 ;
1689 1643
1690 XQueryPointer (disp, scrollBar.win, 1644 XQueryPointer (dpy, scrollBar.win,
1691 &unused_root, &unused_child, 1645 &unused_root, &unused_child,
1692 &unused_root_x, &unused_root_y, 1646 &unused_root_x, &unused_root_y,
1693 &ev.xbutton.x, &ev.xbutton.y, 1647 &ev.xbutton.x, &ev.xbutton.y,
1694 &unused_mask); 1648 &unused_mask);
1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1696 scrollbar_size ()); 1650 scrollBar.size ());
1697 want_refresh = 1; 1651 want_refresh = 1;
1698 refresh_limit = 0;
1699 scrollbar_show (1); 1652 scrollBar.show (1);
1700 } 1653 }
1701 break; 1654 break;
1702 } 1655 }
1703 1656
1704skip_switch: ;
1705
1706#if defined(CURSOR_BLINK) 1657#if defined(CURSOR_BLINK)
1707 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1658 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1708 { 1659 {
1709 if (hidden_cursor) 1660 if (hidden_cursor)
1710 { 1661 {
1711 hidden_cursor = 0; 1662 hidden_cursor = 0;
1712 want_refresh = 1; 1663 want_refresh = 1;
1713 } 1664 }
1714 1665
1715 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1666 cursor_blink_ev.again ();
1716 } 1667 }
1717#endif 1668#endif
1718 1669
1719#if defined(POINTER_BLANK) 1670#if defined(POINTER_BLANK)
1720 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1671 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1721 { 1672 {
1722 if (ev.type == MotionNotify 1673 if (ev.type == MotionNotify
1723 || ev.type == ButtonPress 1674 || ev.type == ButtonPress
1724 || ev.type == ButtonRelease) 1675 || ev.type == ButtonRelease)
1725 if (hidden_pointer) 1676 if (hidden_pointer)
… …
1727 1678
1728 if (ev.type == KeyPress && hidden_pointer == 0) 1679 if (ev.type == KeyPress && hidden_pointer == 0)
1729 pointer_blank (); 1680 pointer_blank ();
1730 } 1681 }
1731#endif 1682#endif
1683
1684 refresh_check ();
1732} 1685}
1733 1686
1734void 1687void
1735rxvt_term::focus_in () 1688rxvt_term::focus_in ()
1736{ 1689{
1737 if (!focus) 1690 if (!focus)
1738 { 1691 {
1739 focus = 1; 1692 focus = 1;
1740 want_refresh = 1; 1693 want_refresh = 1;
1741 1694
1742 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1695 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1743 1696
1744#if USE_XIM 1697#if USE_XIM
1745 if (Input_Context != NULL) 1698 if (Input_Context != NULL)
1746 { 1699 {
1747 IMSetStatusPosition (); 1700 IMSetPosition ();
1748 XSetICFocus (Input_Context); 1701 XSetICFocus (Input_Context);
1749 } 1702 }
1750#endif 1703#endif
1751#if CURSOR_BLINK 1704#if CURSOR_BLINK
1752 if (OPTION (Opt_cursorBlink)) 1705 if (option (Opt_cursorBlink))
1753 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1706 cursor_blink_ev.again ();
1754#endif 1707#endif
1755#if OFF_FOCUS_FADING 1708#if OFF_FOCUS_FADING
1756 if (rs[Rs_fade]) 1709 if (rs[Rs_fade])
1757 { 1710 {
1758 pix_colors = pix_colors_focused; 1711 pix_colors = pix_colors_focused;
1759 scr_recolour (); 1712 scr_recolour ();
1760 } 1713 }
1761#endif 1714#endif
1715#if ENABLE_FRILLS
1716 if (option (Opt_urgentOnBell))
1717 {
1718 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1719 {
1720 h->flags &= ~XUrgencyHint;
1721 XSetWMHints (dpy, parent[0], h);
1722 }
1723 }
1724#endif
1762 } 1725 }
1763} 1726}
1764 1727
1765void 1728void
1766rxvt_term::focus_out () 1729rxvt_term::focus_out ()
… …
1774 1737
1775#if ENABLE_FRILLS || ISO_14755 1738#if ENABLE_FRILLS || ISO_14755
1776 if (iso14755buf) 1739 if (iso14755buf)
1777 { 1740 {
1778 iso14755buf = 0; 1741 iso14755buf = 0;
1779# if ENABLE_OVERLAY 1742# if ISO_14755
1780 scr_overlay_off (); 1743 scr_overlay_off ();
1781# endif 1744# endif
1782 } 1745 }
1783#endif 1746#endif
1784#if USE_XIM 1747#if USE_XIM
1785 if (Input_Context != NULL) 1748 if (Input_Context != NULL)
1786 XUnsetICFocus (Input_Context); 1749 XUnsetICFocus (Input_Context);
1787#endif 1750#endif
1788#if CURSOR_BLINK 1751#if CURSOR_BLINK
1789 if (OPTION (Opt_cursorBlink)) 1752 if (option (Opt_cursorBlink))
1790 cursor_blink_ev.stop (); 1753 cursor_blink_ev.stop ();
1754
1791 hidden_cursor = 0; 1755 hidden_cursor = 0;
1792#endif 1756#endif
1793#if OFF_FOCUS_FADING 1757#if OFF_FOCUS_FADING
1794 if (rs[Rs_fade]) 1758 if (rs[Rs_fade])
1795 { 1759 {
… …
1798 } 1762 }
1799#endif 1763#endif
1800 } 1764 }
1801} 1765}
1802 1766
1803#if TRANSPARENT 1767void
1768rxvt_term::update_fade_color (unsigned int idx)
1769{
1770#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade])
1772 {
1773 rgba c;
1774 pix_colors [Color_fade].get (c);
1775 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1776 }
1777#endif
1778}
1779
1780#if ENABLE_TRANSPARENCY || ENABLE_PERL
1804void 1781void
1805rxvt_term::rootwin_cb (XEvent &ev) 1782rxvt_term::rootwin_cb (XEvent &ev)
1806{ 1783{
1807 make_current (); 1784 make_current ();
1808 1785
1786 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1787 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1788 return;
1789
1790# if ENABLE_TRANSPARENCY
1809 switch (ev.type) 1791 switch (ev.type)
1810 { 1792 {
1811 case PropertyNotify: 1793 case PropertyNotify:
1812 /* 1794 /*
1813 * if user used some Esetroot compatible prog to set the root bg, 1795 * if user used some Esetroot compatible prog to set the root bg,
1814 * use the property to determine the pixmap. We use it later on. 1796 * use the property to determine the pixmap. We use it later on.
1815 */ 1797 */
1816 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1798 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1817 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1799 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1818 return; 1800 {
1801 bgPixmap.set_root_pixmap ();
1802 update_background ();
1803 }
1819 1804
1820 /* FALLTHROUGH */
1821 case ReparentNotify:
1822 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1823 want_refresh = want_full_refresh = 1;
1824 break; 1805 break;
1825 } 1806 }
1807# endif
1808
1809 refresh_check ();
1826} 1810}
1827#endif 1811#endif
1828 1812
1829void 1813void
1830rxvt_term::button_press (XButtonEvent &ev) 1814rxvt_term::button_press (XButtonEvent &ev)
… …
1839 /* 1823 /*
1840 * VT window processing of button press 1824 * VT window processing of button press
1841 */ 1825 */
1842 if (ev.window == vt) 1826 if (ev.window == vt)
1843 { 1827 {
1828 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1829 return;
1830
1844#if ISO_14755 1831#if ISO_14755
1845 // 5.4 1832 // 5.4
1846 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1833 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1847 { 1834 {
1848 iso14755_54 (ev.x, ev.y); 1835 iso14755_54 (ev.x, ev.y);
… …
1882 mouse_report (ev); 1869 mouse_report (ev);
1883 } 1870 }
1884#else 1871#else
1885 MEvent.button = ev.button; 1872 MEvent.button = ev.button;
1886 mouse_report (ev); 1873 mouse_report (ev);
1887#endif /* MOUSE_REPORT_DOUBLECLICK */ 1874#endif /* MOUSE_REPORT_DOUBLECLICK */
1888 1875
1889 } 1876 }
1890 else 1877 else
1891 { 1878 {
1892 if (ev.button != MEvent.button) 1879 if (ev.button != MEvent.button)
1893 MEvent.clicks = 0; 1880 MEvent.clicks = 0;
1894 1881
1895 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1896 switch (ev.button) 1882 switch (ev.button)
1897 { 1883 {
1898 case Button1: 1884 case Button1:
1899 /* allow meta + click to select rectangular areas */ 1885 /* allow meta + click to select rectangular areas */
1900 /* should be done in screen.C */ 1886 /* should be done in screen.C */
1901#if ENABLE_FRILLS 1887#if ENABLE_FRILLS
1902 selection.rect = !!(ev.state & ModMetaMask); 1888 selection.rect = !!(ev.state & ModMetaMask);
1903#else 1889#else
1904 selection.rect = false; 1890 selection.rect = false;
1905#endif 1891#endif
1906 1892
1907 /* allow shift+left click to extend selection */ 1893 /* allow shift+left click to extend selection */
1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1894 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1909 { 1895 {
1910 if (MEvent.button == Button1 && clickintime) 1896 if (MEvent.button == Button1 && clickintime)
1911 selection_rotate (ev.x, ev.y); 1897 selection_rotate (ev.x, ev.y);
1912 else 1898 else
1913 selection_extend (ev.x, ev.y, 1); 1899 selection_extend (ev.x, ev.y, 1);
1914 } 1900 }
1915 else 1901 else
1916 { 1902 {
1917 if (MEvent.button == Button1 && clickintime) 1903 if (MEvent.button == Button1 && clickintime)
1918 MEvent.clicks++; 1904 MEvent.clicks++;
1919 else 1905 else
1920 MEvent.clicks = 1; 1906 MEvent.clicks = 1;
1921 1907
1922 selection_click (MEvent.clicks, ev.x, ev.y); 1908 selection_click (MEvent.clicks, ev.x, ev.y);
1923 } 1909 }
1924 1910
1925 MEvent.button = Button1; 1911 MEvent.button = Button1;
1926 break; 1912 break;
1927 1913
1928 case Button3: 1914 case Button3:
1929 if (MEvent.button == Button3 && clickintime) 1915 if (MEvent.button == Button3 && clickintime)
1930 selection_rotate (ev.x, ev.y); 1916 selection_rotate (ev.x, ev.y);
1931 else 1917 else
1932 selection_extend (ev.x, ev.y, 1); 1918 selection_extend (ev.x, ev.y, 1);
1933 1919
1934 MEvent.button = Button3; 1920 MEvent.button = Button3;
1935 break; 1921 break;
1936 } 1922 }
1937 } 1923 }
1938 1924
1939 MEvent.time = ev.time; 1925 MEvent.time = ev.time;
1940 return; 1926 return;
1941 } 1927 }
1942 1928
1943 /* 1929 /*
1944 * Scrollbar window processing of button press 1930 * Scrollbar window processing of button press
1945 */ 1931 */
1946 if (isScrollbarWindow (ev.window)) 1932 if (scrollBar.state && ev.window == scrollBar.win)
1947 { 1933 {
1948 scrollBar.setIdle (); 1934 page_dirn direction = NO_DIR;
1935
1936 if (scrollBar.upButton (ev.y))
1937 direction = UP; /* up */
1938 else if (scrollBar.dnButton (ev.y))
1939 direction = DN; /* down */
1940
1941 scrollBar.state = STATE_IDLE;
1949 /* 1942 /*
1950 * Rxvt-style scrollbar: 1943 * Rxvt-style scrollbar:
1951 * move up if mouse is above slider 1944 * move up if mouse is above slider
1952 * move dn if mouse is below slider 1945 * move dn if mouse is below slider
1953 * 1946 *
… …
1962 /* 1955 /*
1963 * Mouse report disabled scrollbar: 1956 * Mouse report disabled scrollbar:
1964 * arrow buttons - send up/down 1957 * arrow buttons - send up/down
1965 * click on scrollbar - send pageup/down 1958 * click on scrollbar - send pageup/down
1966 */ 1959 */
1967 if ((scrollBar.style == R_SB_NEXT 1960 if (direction == UP)
1968 && scrollbarnext_upButton (ev.y))
1969 || (scrollBar.style == R_SB_RXVT
1970 && scrollbarrxvt_upButton (ev.y)))
1971 tt_printf ("\033[A"); 1961 tt_printf ("\033[A");
1972 else if ((scrollBar.style == R_SB_NEXT 1962 else if (direction == DN)
1973 && scrollbarnext_dnButton (ev.y))
1974 || (scrollBar.style == R_SB_RXVT
1975 && scrollbarrxvt_dnButton (ev.y)))
1976 tt_printf ("\033[B"); 1963 tt_printf ("\033[B");
1977 else 1964 else
1978 switch (ev.button) 1965 switch (ev.button)
1979 { 1966 {
1980 case Button2: 1967 case Button2:
… …
1987 tt_printf ("\033[5~"); 1974 tt_printf ("\033[5~");
1988 break; 1975 break;
1989 } 1976 }
1990 } 1977 }
1991 else 1978 else
1992#endif /* NO_SCROLLBAR_REPORT */ 1979#endif /* NO_SCROLLBAR_REPORT */
1993
1994 {
1995 char upordown = 0;
1996
1997 if (scrollBar.style == R_SB_NEXT)
1998 { 1980 {
1999 if (scrollbarnext_upButton (ev.y)) 1981 if (direction != NO_DIR)
2000 upordown = -1; /* up */
2001 else if (scrollbarnext_dnButton (ev.y))
2002 upordown = 1; /* down */
2003 }
2004 else if (scrollBar.style == R_SB_RXVT)
2005 {
2006 if (scrollbarrxvt_upButton (ev.y))
2007 upordown = -1; /* up */
2008 else if (scrollbarrxvt_dnButton (ev.y))
2009 upordown = 1; /* down */
2010 }
2011 if (upordown)
2012 { 1982 {
2013#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1983#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1984 if (!cont_scroll_ev.is_active ())
2014 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1985 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2015#endif 1986#endif
2016 if (scr_page (upordown < 0 ? UP : DN, 1)) 1987 if (scr_page (direction, 1))
2017 { 1988 {
2018 if (upordown < 0) 1989 if (direction == UP)
2019 scrollBar.setUp (); 1990 scrollBar.state = STATE_UP;
2020 else 1991 else
2021 scrollBar.setDn (); 1992 scrollBar.state = STATE_DOWN;
2022 } 1993 }
2023 } 1994 }
2024 else 1995 else
2025 switch (ev.button) 1996 switch (ev.button)
2026 { 1997 {
2027 case Button2: 1998 case Button2:
2028 switch (scrollbar_align) 1999 switch (scrollBar.align)
2029 { 2000 {
2030 case R_SB_ALIGN_TOP: 2001 case R_SB_ALIGN_TOP:
2031 csrO = 0; 2002 csrO = 0;
2032 break; 2003 break;
2033 case R_SB_ALIGN_CENTRE: 2004 case R_SB_ALIGN_CENTRE:
… …
2039 } 2010 }
2040 2011
2041 if (scrollBar.style == R_SB_XTERM 2012 if (scrollBar.style == R_SB_XTERM
2042 || scrollbar_above_slider (ev.y) 2013 || scrollbar_above_slider (ev.y)
2043 || scrollbar_below_slider (ev.y)) 2014 || scrollbar_below_slider (ev.y))
2044 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2045 2016
2046 scrollBar.setMotion (); 2017 scrollBar.state = STATE_MOTION;
2047 break; 2018 break;
2048 2019
2049 case Button1: 2020 case Button1:
2050 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2021 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2051 csrO = ev.y - scrollBar.top; 2022 csrO = ev.y - scrollBar.top;
2052 /* FALLTHROUGH */ 2023 /* FALLTHROUGH */
2053 2024
2054 case Button3: 2025 case Button3:
2055 if (scrollBar.style != R_SB_XTERM) 2026 if (scrollBar.style != R_SB_XTERM)
… …
2065 scr_page (DN, nrow - 1); 2036 scr_page (DN, nrow - 1);
2066# else 2037# else
2067 scr_page (DN, nrow / 4); 2038 scr_page (DN, nrow / 4);
2068# endif 2039# endif
2069 else 2040 else
2070 scrollBar.setMotion (); 2041 scrollBar.state = STATE_MOTION;
2071 } 2042 }
2072 else 2043 else
2073 { 2044 {
2074 scr_page ((ev.button == Button1 ? DN : UP), 2045 scr_page ((ev.button == Button1 ? DN : UP),
2075 (nrow 2046 (nrow
2076 * scrollbar_position (ev.y) 2047 * scrollbar_position (ev.y)
2077 / scrollbar_size ())); 2048 / scrollBar.size ()));
2078 } 2049 }
2079 2050
2080 break; 2051 break;
2081 } 2052 }
2082 } 2053 }
… …
2092 2063
2093 csrO = 0; /* reset csr Offset */ 2064 csrO = 0; /* reset csr Offset */
2094 if (!bypass_keystate) 2065 if (!bypass_keystate)
2095 reportmode = !! (priv_modes & PrivMode_mouse_report); 2066 reportmode = !! (priv_modes & PrivMode_mouse_report);
2096 2067
2097 if (scrollbar_isUpDn ()) 2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2098 { 2069 {
2099 scrollBar.setIdle (); 2070 scrollBar.state = STATE_IDLE;
2100 scrollbar_show (0); 2071 scrollBar.show (0);
2101 } 2072 }
2102 2073
2103#ifdef SELECTION_SCROLLING 2074#ifdef SELECTION_SCROLLING
2104 if (sel_scroll_ev.active)
2105 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
2106#endif 2076#endif
2107 2077
2108 if (ev.window == vt) 2078 if (ev.window == vt)
2109 { 2079 {
2080 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2081 return;
2082
2110#if ISO_14755 2083#if ISO_14755
2111 // 5.4 2084 // 5.4
2112 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2085 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2113 return; 2086 return;
2114#endif 2087#endif
2088
2115 if (reportmode) 2089 if (reportmode)
2116 { 2090 {
2117 /* mouse report from vt window */ 2091 /* mouse report from vt window */
2118 /* don't report release of wheel "buttons" */ 2092 /* don't report release of wheel "buttons" */
2119 if (ev.button >= 4) 2093 if (ev.button >= 4)
… …
2130 mouse_report (ev); 2104 mouse_report (ev);
2131 } 2105 }
2132#else /* MOUSE_REPORT_DOUBLECLICK */ 2106#else /* MOUSE_REPORT_DOUBLECLICK */
2133 MEvent.button = AnyButton; 2107 MEvent.button = AnyButton;
2134 mouse_report (ev); 2108 mouse_report (ev);
2135#endif /* MOUSE_REPORT_DOUBLECLICK */ 2109#endif /* MOUSE_REPORT_DOUBLECLICK */
2136 return; 2110 return;
2137 } 2111 }
2138 2112
2139 /* 2113 /*
2140 * dumb hack to compensate for the failure of click-and-drag 2114 * dumb hack to compensate for the failure of click-and-drag
… …
2143 if (priv_modes & PrivMode_mouse_report 2117 if (priv_modes & PrivMode_mouse_report
2144 && bypass_keystate 2118 && bypass_keystate
2145 && ev.button == Button1 && MEvent.clicks <= 1) 2119 && ev.button == Button1 && MEvent.clicks <= 1)
2146 selection_extend (ev.x, ev.y, 0); 2120 selection_extend (ev.x, ev.y, 0);
2147 2121
2148 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2149 return;
2150
2151 switch (ev.button) 2122 switch (ev.button)
2152 { 2123 {
2153 case Button1: 2124 case Button1:
2154 case Button3: 2125 case Button3:
2155 selection_make (ev.time); 2126 selection_make (ev.time);
2156 break; 2127 break;
2157 2128
2158 case Button2: 2129 case Button2:
2159 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2160 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); 2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2161 break; 2132 break;
2162 2133
2163#ifdef MOUSE_WHEEL 2134#ifdef MOUSE_WHEEL
2164 case Button4: 2135 case Button4:
2165 case Button5: 2136 case Button5:
… …
2169 2140
2170 v = ev.button == Button4 ? UP : DN; 2141 v = ev.button == Button4 ? UP : DN;
2171 2142
2172 if (ev.state & ShiftMask) 2143 if (ev.state & ShiftMask)
2173 i = 1; 2144 i = 1;
2174 else if (OPTION (Opt_mouseWheelScrollPage)) 2145 else if (option (Opt_mouseWheelScrollPage))
2175 i = nrow - 1; 2146 i = nrow - 1;
2176 else 2147 else
2177 i = 5; 2148 i = 5;
2178 2149
2179# ifdef MOUSE_SLIP_WHEELING 2150# ifdef MOUSE_SLIP_WHEELING
… …
2181 { 2152 {
2182 mouse_slip_wheel_speed += v ? -1 : 1; 2153 mouse_slip_wheel_speed += v ? -1 : 1;
2183 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2154 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2184 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2155 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2185 2156
2186 if (slip_wheel_ev.at < NOW) 2157 if (!slip_wheel_ev.is_active ())
2187 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2158 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2188
2189 slip_wheel_ev.start ();
2190 } 2159 }
2191 else 2160 else
2161# endif
2192 { 2162 {
2193# endif
2194 scr_page (v, i); 2163 scr_page (v, i);
2195 scrollbar_show (1); 2164 scrollBar.show (1);
2196# ifdef MOUSE_SLIP_WHEELING
2197 } 2165 }
2198# endif
2199 } 2166 }
2200 break; 2167 break;
2201#endif 2168#endif
2202 } 2169 }
2203 } 2170 }
2204} 2171}
2205
2206#ifdef TRANSPARENT
2207#if TINTING
2208/* taken from aterm-0.4.2 */
2209
2210typedef uint32_t RUINT32T;
2211
2212void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2213{
2214 int sh_r, sh_g, sh_b;
2215 RUINT32T mask_r, mask_g, mask_b;
2216 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2217 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2218 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2219 int i;
2220
2221 Visual *visual = display->visual;
2222
2223 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2224
2225 /* for convenience */
2226 mask_r = visual->red_mask;
2227 mask_g = visual->green_mask;
2228 mask_b = visual->blue_mask;
2229
2230 /* boring lookup table pre-initialization */
2231 switch (srcImage->bits_per_pixel) {
2232 case 15:
2233 if ((mask_r != 0x7c00) ||
2234 (mask_g != 0x03e0) ||
2235 (mask_b != 0x001f))
2236 return;
2237 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2238 lookup_r = lookup;
2239 lookup_g = lookup+32;
2240 lookup_b = lookup+32+32;
2241 sh_r = 10;
2242 sh_g = 5;
2243 sh_b = 0;
2244 break;
2245 case 16:
2246 if ((mask_r != 0xf800) ||
2247 (mask_g != 0x07e0) ||
2248 (mask_b != 0x001f))
2249 return;
2250 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2251 lookup_r = lookup;
2252 lookup_g = lookup+32;
2253 lookup_b = lookup+32+64;
2254 sh_r = 11;
2255 sh_g = 5;
2256 sh_b = 0;
2257 break;
2258 case 24:
2259 if ((mask_r != 0xff0000) ||
2260 (mask_g != 0x00ff00) ||
2261 (mask_b != 0x0000ff))
2262 return;
2263 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2264 lookup_r = lookup;
2265 lookup_g = lookup+256;
2266 lookup_b = lookup+256+256;
2267 sh_r = 16;
2268 sh_g = 8;
2269 sh_b = 0;
2270 break;
2271 case 32:
2272 if ((mask_r != 0xff0000) ||
2273 (mask_g != 0x00ff00) ||
2274 (mask_b != 0x0000ff))
2275 return;
2276 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2277 lookup_r = lookup;
2278 lookup_g = lookup+256;
2279 lookup_b = lookup+256+256;
2280 sh_r = 16;
2281 sh_g = 8;
2282 sh_b = 0;
2283 break;
2284 default:
2285 return; /* we do not support this color depth */
2286 }
2287
2288 /* prepare limits for color transformation (each channel is handled separately) */
2289 if (shade < 0) {
2290 shade = -shade;
2291 if (shade < 0) shade = 0;
2292 if (shade > 100) shade = 100;
2293
2294 lower_lim_r = 65535-rm;
2295 lower_lim_g = 65535-gm;
2296 lower_lim_b = 65535-bm;
2297
2298 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2299 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2300 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2301
2302 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2303 } else {
2304 if (shade < 0) shade = 0;
2305 if (shade > 100) shade = 100;
2306
2307 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2308
2309 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2310 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2311 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2312 }
2313
2314 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2315 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2316 {
2317 unsigned int tmp;
2318
2319 tmp = lower_lim_r;
2320 lower_lim_r = lower_lim_b;
2321 lower_lim_b = tmp;
2322
2323 tmp = upper_lim_r;
2324 upper_lim_r = upper_lim_b;
2325 upper_lim_b = tmp;
2326 }
2327
2328 /* fill our lookup tables */
2329 for (i = 0; i <= mask_r>>sh_r; i++)
2330 {
2331 RUINT32T tmp;
2332 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2333 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2334 lookup_r[i] = (tmp/65535)<<sh_r;
2335 }
2336 for (i = 0; i <= mask_g>>sh_g; i++)
2337 {
2338 RUINT32T tmp;
2339 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2340 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2341 lookup_g[i] = (tmp/65535)<<sh_g;
2342 }
2343 for (i = 0; i <= mask_b>>sh_b; i++)
2344 {
2345 RUINT32T tmp;
2346 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2347 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2348 lookup_b[i] = (tmp/65535)<<sh_b;
2349 }
2350
2351 /* apply table to input image (replacing colors by newly calculated ones) */
2352 switch (srcImage->bits_per_pixel)
2353 {
2354 case 15:
2355 {
2356 unsigned short *p1, *pf, *p, *pl;
2357 p1 = (unsigned short *) srcImage->data;
2358 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2359 while (p1 < pf)
2360 {
2361 p = p1;
2362 pl = p1 + srcImage->width;
2363 for (; p < pl; p++)
2364 {
2365 *p = lookup_r[(*p & 0x7c00)>>10] |
2366 lookup_g[(*p & 0x03e0)>> 5] |
2367 lookup_b[(*p & 0x001f)];
2368 }
2369 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2370 }
2371 break;
2372 }
2373 case 16:
2374 {
2375 unsigned short *p1, *pf, *p, *pl;
2376 p1 = (unsigned short *) srcImage->data;
2377 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2378 while (p1 < pf)
2379 {
2380 p = p1;
2381 pl = p1 + srcImage->width;
2382 for (; p < pl; p++)
2383 {
2384 *p = lookup_r[(*p & 0xf800)>>11] |
2385 lookup_g[(*p & 0x07e0)>> 5] |
2386 lookup_b[(*p & 0x001f)];
2387 }
2388 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2389 }
2390 break;
2391 }
2392 case 24:
2393 {
2394 unsigned char *p1, *pf, *p, *pl;
2395 p1 = (unsigned char *) srcImage->data;
2396 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2397 while (p1 < pf)
2398 {
2399 p = p1;
2400 pl = p1 + srcImage->width * 3;
2401 for (; p < pl; p += 3)
2402 {
2403 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2404 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2405 p[2] = lookup_r[(p[2] & 0x0000ff)];
2406 }
2407 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2408 }
2409 break;
2410 }
2411 case 32:
2412 {
2413 RUINT32T *p1, *pf, *p, *pl;
2414 p1 = (RUINT32T *) srcImage->data;
2415 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2416
2417 while (p1 < pf)
2418 {
2419 p = p1;
2420 pl = p1 + srcImage->width;
2421 for (; p < pl; p++)
2422 {
2423 *p = lookup_r[(*p & 0xff0000)>>16] |
2424 lookup_g[(*p & 0x00ff00)>> 8] |
2425 lookup_b[(*p & 0x0000ff)] |
2426 (*p & ~0xffffff);
2427 }
2428 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2429 }
2430 break;
2431 }
2432 }
2433
2434 free (lookup);
2435}
2436#endif
2437
2438/*
2439 * Check our parents are still who we think they are.
2440 * Do transparency updates if required
2441 */
2442int
2443rxvt_term::check_our_parents ()
2444{
2445 int i, pchanged, aformat, have_pixmap, rootdepth;
2446 unsigned long nitems, bytes_after;
2447 Atom atype;
2448 unsigned char *prop = NULL;
2449 Window root, oldp, *list;
2450 Pixmap rootpixmap = None;
2451 XWindowAttributes wattr, wrootattr;
2452 dDisp;
2453
2454 pchanged = 0;
2455
2456 if (!OPTION (Opt_transparent))
2457 return pchanged; /* Don't try any more */
2458
2459 XGetWindowAttributes (disp, display->root, &wrootattr);
2460 rootdepth = wrootattr.depth;
2461
2462 XGetWindowAttributes (disp, parent[0], &wattr);
2463
2464 if (rootdepth != wattr.depth)
2465 {
2466 if (am_transparent)
2467 {
2468 pchanged = 1;
2469 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2470 am_transparent = am_pixmap_trans = 0;
2471 }
2472
2473 return pchanged; /* Don't try any more */
2474 }
2475
2476 /* Get all X ops out of the queue so that our information is up-to-date. */
2477 XSync (disp, False);
2478
2479 /*
2480 * Make the frame window set by the window manager have
2481 * the root background. Some window managers put multiple nested frame
2482 * windows for each client, so we have to take care about that.
2483 */
2484 i = (xa[XA_XROOTPMAP_ID]
2485 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2487 &nitems, &bytes_after, &prop) == Success);
2488
2489 if (!i || prop == NULL)
2490 i = (xa[XA_ESETROOT_PMAP_ID]
2491 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493 &nitems, &bytes_after, &prop) == Success);
2494
2495 if (!i || prop == NULL
2496#if TINTING
2497 || !rs[Rs_color + Color_tint]
2498#endif
2499 )
2500 have_pixmap = 0;
2501 else
2502 {
2503 have_pixmap = 1;
2504 rootpixmap = *(Pixmap *)prop;
2505 XFree (prop);
2506 }
2507
2508 if (have_pixmap)
2509 {
2510 /*
2511 * Copy display->root pixmap transparency
2512 */
2513 int sx, sy, nx, ny;
2514 unsigned int nw, nh;
2515 Window cr;
2516 XImage *image;
2517 GC gc;
2518 XGCValues gcvalue;
2519
2520 XTranslateCoordinates (disp, parent[0], display->root,
2521 0, 0, &sx, &sy, &cr);
2522 nw = (unsigned int)szHint.width;
2523 nh = (unsigned int)szHint.height;
2524 nx = ny = 0;
2525
2526 if (sx < 0)
2527 {
2528 nw += sx;
2529 nx = -sx;
2530 sx = 0;
2531 }
2532
2533 if (sy < 0)
2534 {
2535 nh += sy;
2536 ny = -sy;
2537 sy = 0;
2538 }
2539
2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2542
2543 XSync (disp, False);
2544 allowedxerror = -1;
2545 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2546
2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2548 /* XXX: may need a delay here? */
2549 allowedxerror = 0;
2550
2551 if (image == NULL)
2552 {
2553 if (am_transparent && am_pixmap_trans)
2554 {
2555 pchanged = 1;
2556 if (pixmap != None)
2557 {
2558 XFreePixmap (disp, pixmap);
2559 pixmap = None;
2560 }
2561 }
2562
2563 am_pixmap_trans = 0;
2564 }
2565 else
2566 {
2567 if (pixmap != None)
2568 XFreePixmap (disp, pixmap);
2569
2570#if TINTING
2571 if (ISSET_PIXCOLOR (Color_tint))
2572 {
2573 unsigned short rm, gm, bm;
2574 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2575
2576 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2577
2578 ShadeXImage (display, image, shade, rm, gm, bm);
2579 }
2580#endif
2581
2582 pixmap = XCreatePixmap (disp, vt,
2583 szHint.width, szHint.height, image->depth);
2584 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2585 XPutImage (disp, pixmap, gc, image, 0, 0,
2586 nx, ny, image->width, image->height);
2587 XFreeGC (disp, gc);
2588 XDestroyImage (image);
2589 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2590 XClearWindow (disp, parent[0]);
2591
2592 if (!am_transparent || !am_pixmap_trans)
2593 pchanged = 1;
2594
2595 am_transparent = am_pixmap_trans = 1;
2596 }
2597 }
2598
2599 if (am_pixmap_trans)
2600 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2601 else
2602 {
2603 unsigned int n;
2604 /*
2605 * InheritPixmap transparency
2606 */
2607 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2608 {
2609 oldp = parent[i];
2610 XQueryTree (disp, parent[i - 1], &root,
2611 &parent[i], &list, &n);
2612 XFree (list);
2613
2614 if (parent[i] == display->root)
2615 {
2616 if (oldp != None)
2617 pchanged = 1;
2618
2619 break;
2620 }
2621
2622 if (oldp != parent[i])
2623 pchanged = 1;
2624 }
2625
2626 n = 0;
2627
2628 if (pchanged)
2629 {
2630 for (; n < (unsigned int)i; n++)
2631 {
2632 XGetWindowAttributes (disp, parent[n], &wattr);
2633 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2634 {
2635 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2636 break;
2637 }
2638 }
2639 }
2640
2641 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2642 {
2643 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2644 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2645 am_transparent = 0;
2646 /* XXX: also turn off Opt_transparent? */
2647 }
2648 else
2649 {
2650#if WAIT_FOR_WM
2651 /* wait (an arbitrary period) for the WM to do its thing
2652 * needed for fvwm2.2.2 (and before?) */
2653 sleep (1);
2654#endif
2655 for (n = 0; n < (unsigned int)i; n++)
2656 {
2657 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2658 XClearWindow (disp, parent[n]);
2659 }
2660
2661 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2662 am_transparent = 1;
2663 }
2664
2665 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2666 parent[i] = None;
2667 }
2668
2669 if (scrollBar.win)
2670 {
2671 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2672 scrollBar.setIdle ();
2673 scrollbar_show (0);
2674 }
2675
2676 if (am_transparent)
2677 {
2678 want_refresh = want_full_refresh = 1;
2679 if (am_pixmap_trans)
2680 flush ();
2681 }
2682
2683 return pchanged;
2684}
2685#endif
2686 2172
2687/*}}} */ 2173/*}}} */
2688 2174
2689bool 2175bool
2690rxvt_term::cmd_parse () 2176rxvt_term::cmd_parse ()
… …
2693 wchar_t ch = NOCHAR; 2179 wchar_t ch = NOCHAR;
2694 char *seq_begin; // remember start of esc-sequence here 2180 char *seq_begin; // remember start of esc-sequence here
2695 2181
2696 for (;;) 2182 for (;;)
2697 { 2183 {
2698 if (ch == NOCHAR) 2184 if (expect_false (ch == NOCHAR))
2699 { 2185 {
2700 seq_begin = cmdbuf_ptr; 2186 seq_begin = cmdbuf_ptr;
2701 ch = next_char (); 2187 ch = next_char ();
2702 2188
2703 if (ch == NOCHAR) 2189 if (ch == NOCHAR)
2704 break; 2190 break;
2705 } 2191 }
2706 2192
2707 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2193 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2708 { 2194 {
2709 if (!seen_input) 2195 if (expect_false (!seen_input))
2710 { 2196 {
2711 seen_input = 1; 2197 seen_input = 1;
2712 // many badly-written programs (e.g. jed) contain a race condition: 2198 // many badly-written programs (e.g. jed) contain a race condition:
2713 // they first read the screensize and then install a SIGWINCH handler. 2199 // they first read the screensize and then install a SIGWINCH handler.
2714 // some window managers resize the window early, and these programs 2200 // some window managers resize the window early, and these programs
… …
2727 wchar_t *str = buf; 2213 wchar_t *str = buf;
2728 wchar_t *eol = str + min (ncol, UBUFSIZ); 2214 wchar_t *eol = str + min (ncol, UBUFSIZ);
2729 2215
2730 for (;;) 2216 for (;;)
2731 { 2217 {
2732 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2218 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2733 break; 2219 break;
2734 2220
2735 *str++ = ch; 2221 *str++ = ch;
2736 2222
2737 if (ch == C0_LF || str >= eol) 2223 if (expect_false (ch == C0_LF || str >= eol))
2738 { 2224 {
2739 if (ch == C0_LF) 2225 if (ch == C0_LF)
2740 nlines++; 2226 nlines++;
2741 2227
2742 refresh_count++; 2228 refresh_count++;
2743 2229
2744 if (!OPTION (Opt_jumpScroll) 2230 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2745 || (refresh_count >= refresh_limit * (nrow - 1)))
2746 { 2231 {
2747 refreshnow = true;
2748 refresh_count = 0; 2232 refresh_count = 0;
2233
2234 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2235 {
2236 refreshnow = true;
2749 ch = NOCHAR; 2237 ch = NOCHAR;
2750 break; 2238 break;
2239 }
2751 } 2240 }
2752 2241
2753 // scr_add_lines only works for nlines <= nrow - 1. 2242 // scr_add_lines only works for nlines <= nrow - 1.
2754 if (nlines >= nrow - 1) 2243 if (nlines >= nrow - 1)
2755 { 2244 {
… …
2783 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2272 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2784 scr_add_lines (buf, str - buf, nlines); 2273 scr_add_lines (buf, str - buf, nlines);
2785 2274
2786 /* 2275 /*
2787 * If there have been a lot of new lines, then update the screen 2276 * If there have been a lot of new lines, then update the screen
2788 * What the heck I'll cheat and only refresh less than every page-full. 2277 * What the heck we'll cheat and only refresh less than every page-full.
2789 * the number of pages between refreshes is refresh_limit, which 2278 * if skipScroll is enabled.
2790 * is incremented here because we must be doing flat-out scrolling.
2791 */ 2279 */
2792 if (refreshnow) 2280 if (refreshnow)
2793 { 2281 {
2794 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2795 refresh_limit++;
2796 else
2797 {
2798 flag = true; 2282 flag = true;
2799 scr_refresh (); 2283 scr_refresh ();
2800 want_refresh = 1; 2284 want_refresh = 1;
2801 }
2802 } 2285 }
2803 2286
2804 } 2287 }
2805 else 2288 else
2806 { 2289 {
… …
2827rxvt_term::next_char () NOTHROW 2310rxvt_term::next_char () NOTHROW
2828{ 2311{
2829 while (cmdbuf_ptr < cmdbuf_endp) 2312 while (cmdbuf_ptr < cmdbuf_endp)
2830 { 2313 {
2831 // assume 7-bit to be ascii ALWAYS 2314 // assume 7-bit to be ascii ALWAYS
2832 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2315 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2833 return *cmdbuf_ptr++; 2316 return *cmdbuf_ptr++;
2834 2317
2835 wchar_t wc; 2318 wchar_t wc;
2836 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2319 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2837 2320
… …
2841 cmdbuf_ptr = cmdbuf_endp; 2324 cmdbuf_ptr = cmdbuf_endp;
2842 break; 2325 break;
2843 } 2326 }
2844 2327
2845 if (len == (size_t)-1) 2328 if (len == (size_t)-1)
2329 {
2330 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2846 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2331 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2332 }
2847 2333
2848 // assume wchar == unicode 2334 // assume wchar == unicode
2849 cmdbuf_ptr += len; 2335 cmdbuf_ptr += len;
2850 return wc & UNICODE_MASK; 2336 return wc & UNICODE_MASK;
2851 } 2337 }
… …
2895/*----------------------------------------------------------------------*/ 2381/*----------------------------------------------------------------------*/
2896#ifdef PRINTPIPE 2382#ifdef PRINTPIPE
2897FILE * 2383FILE *
2898rxvt_term::popen_printer () 2384rxvt_term::popen_printer ()
2899{ 2385{
2900 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2386 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2901 2387
2902 if (stream == NULL) 2388 if (stream == NULL)
2903 rxvt_warn ("can't open printer pipe, not printing.\n"); 2389 rxvt_warn ("can't open printer pipe, not printing.\n");
2904 2390
2905 return stream; 2391 return stream;
… …
2916 * simulate attached vt100 printer 2402 * simulate attached vt100 printer
2917 */ 2403 */
2918void 2404void
2919rxvt_term::process_print_pipe () 2405rxvt_term::process_print_pipe ()
2920{ 2406{
2921 int done; 2407 FILE *fd = popen_printer ();
2922 FILE *fd;
2923 2408
2924 if ((fd = popen_printer ()) == NULL) 2409 if (!fd)
2925 return; 2410 return;
2926 2411
2927 /* 2412 /*
2928 * Send all input to the printer until either ESC[4i or ESC[?4i 2413 * Send all input to the printer until either ESC[4i or ESC[?4i
2929 * is received. 2414 * is received.
2930 */ 2415 */
2931 for (done = 0; !done;) 2416 for (int done = 0; !done; )
2932 { 2417 {
2933 unsigned char buf[8]; 2418 unsigned char buf[8];
2934 unicode_t ch; 2419 unicode_t ch;
2935 unsigned int i, len; 2420 unsigned int i, len;
2936 2421
… …
2955 { 2440 {
2956 if ((buf[len++] = cmd_getc ()) == 'i') 2441 if ((buf[len++] = cmd_getc ()) == 'i')
2957 break; /* done = 1 */ 2442 break; /* done = 1 */
2958 } 2443 }
2959 } 2444 }
2960 2445
2961 for (i = 0; i < len; i++) 2446 for (i = 0; i < len; i++)
2962 if (putc (buf[i], fd) == EOF) 2447 if (putc (buf[i], fd) == EOF)
2963 { 2448 {
2964 done = 1; 2449 done = 1;
2965 break; 2450 break;
… …
2967 } 2452 }
2968 } 2453 }
2969 2454
2970 pclose_printer (fd); 2455 pclose_printer (fd);
2971} 2456}
2972#endif /* PRINTPIPE */ 2457#endif /* PRINTPIPE */
2973/*}}} */ 2458/*}}} */
2974 2459
2975/* *INDENT-OFF* */ 2460/* *INDENT-OFF* */
2976enum { 2461enum {
2977 C1_40 = 0x40, 2462 C1_40 = 0x40,
… …
3027 process_dcs_seq (); 2512 process_dcs_seq ();
3028 break; 2513 break;
3029 case 0x9b: /* CSI */ 2514 case 0x9b: /* CSI */
3030 process_csi_seq (); 2515 process_csi_seq ();
3031 break; 2516 break;
3032 case 0x9d: /* CSI */ 2517 case 0x9d: /* OSC */
3033 process_osc_seq (); 2518 process_osc_seq ();
3034 break; 2519 break;
3035#endif 2520#endif
3036 } 2521 }
3037} 2522}
… …
3081 break; 2566 break;
3082 case 'Z': /* identify the terminal type */ 2567 case 'Z': /* identify the terminal type */
3083 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2568 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3084 break; 2569 break;
3085 case '<': /* turn off VT52 mode */ 2570 case '<': /* turn off VT52 mode */
3086 PrivMode (0, PrivMode_vt52); 2571 set_privmode (PrivMode_vt52, 0);
3087 break; 2572 break;
3088 case 'F': /* use special graphics character set */ 2573 case 'F': /* use special graphics character set */
3089 case 'G': /* use regular character set */ 2574 case 'G': /* use regular character set */
3090 /* unimplemented */ 2575 /* unimplemented */
3091 break; 2576 break;
… …
3127 scr_charset_set (2, (unsigned int)cmd_getc ()); 2612 scr_charset_set (2, (unsigned int)cmd_getc ());
3128 break; 2613 break;
3129 case '+': 2614 case '+':
3130 scr_charset_set (3, (unsigned int)cmd_getc ()); 2615 scr_charset_set (3, (unsigned int)cmd_getc ());
3131 break; 2616 break;
3132#if ENABLE_FRILLS 2617#if !ENABLE_MINIMAL
3133 case '6': 2618 case '6':
3134 scr_backindex (); 2619 scr_backindex ();
3135 break; 2620 break;
3136#endif 2621#endif
3137 case '7': 2622 case '7':
3138 scr_cursor (SAVE); 2623 scr_cursor (SAVE);
3139 break; 2624 break;
3140 case '8': 2625 case '8':
3141 scr_cursor (RESTORE); 2626 scr_cursor (RESTORE);
3142 break; 2627 break;
3143#if ENABLE_FRILLS 2628#if !ENABLE_MINIMAL
3144 case '9': 2629 case '9':
3145 scr_forwardindex (); 2630 scr_forwardindex ();
3146 break; 2631 break;
3147#endif 2632#endif
3148 case '=': 2633 case '=':
3149 case '>': 2634 case '>':
3150 PrivMode ((ch == '='), PrivMode_aplKP); 2635 set_privmode (PrivMode_aplKP, ch == '=');
3151 break; 2636 break;
3152 2637
3153 case C1_40: 2638 case C1_40:
3154 cmd_getc (); 2639 cmd_getc ();
3155 break; 2640 break;
… …
3208 2693
3209 /* 8.3.106: RESET TO INITIAL STATE */ 2694 /* 8.3.106: RESET TO INITIAL STATE */
3210 case 'c': 2695 case 'c':
3211 mbstate.reset (); 2696 mbstate.reset ();
3212 scr_poweron (); 2697 scr_poweron ();
3213 scrollbar_show (1); 2698 scrollBar.show (1);
3214 break; 2699 break;
3215 2700
3216 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2701 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3217 case 'n': 2702 case 'n':
3218 scr_charset_choose (2); 2703 scr_charset_choose (2);
… …
3263rxvt_term::process_csi_seq () 2748rxvt_term::process_csi_seq ()
3264{ 2749{
3265 unicode_t ch, priv, i; 2750 unicode_t ch, priv, i;
3266 unsigned int nargs, p; 2751 unsigned int nargs, p;
3267 int n, ndef; 2752 int n, ndef;
3268 int arg[ESC_ARGS]; 2753 int arg[ESC_ARGS] = { };
3269 2754
3270 for (nargs = ESC_ARGS; nargs > 0;) 2755 nargs = 0;
3271 arg[--nargs] = 0;
3272 2756
3273 priv = 0; 2757 priv = 0;
3274 ch = cmd_getc (); 2758 ch = cmd_getc ();
3275 if (ch >= '<' && ch <= '?') 2759 if (ch >= '<' && ch <= '?')
2760 {
3276 { /* '<' '=' '>' '?' */ 2761 /* '<' '=' '>' '?' */
3277 priv = ch; 2762 priv = ch;
3278 ch = cmd_getc (); 2763 ch = cmd_getc ();
3279 } 2764 }
3280 2765
3281 /* read any numerical arguments */ 2766 /* read any numerical arguments */
… …
3310 ndef = get_byte_array_bit (csi_defaults, i); 2795 ndef = get_byte_array_bit (csi_defaults, i);
3311 for (p = 0; p < nargs; p++) 2796 for (p = 0; p < nargs; p++)
3312 if (arg[p] == -1) 2797 if (arg[p] == -1)
3313 arg[p] = ndef; 2798 arg[p] = ndef;
3314 2799
3315#ifdef DEBUG_CMD
3316 fprintf (stderr, "CSI ");
3317 for (p = 0; p < nargs; p++)
3318 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3319 fprintf (stderr, "%c\n", ch);
3320#endif
3321
3322 /* 2800 /*
3323 * private mode handling 2801 * private mode handling
3324 */ 2802 */
3325 if (priv) 2803 if (priv)
3326 { 2804 {
3327 switch (priv) 2805 switch (priv)
3328 { 2806 {
3329 case '>': 2807 case '>':
3330 if (ch == CSI_DA) /* secondary device attributes */ 2808 if (ch == CSI_DA) /* secondary device attributes */
3331 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2809 {
2810 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2811 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2812 //
2813 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2814 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2815 // versions.
2816 //
2817 tt_printf ("\033[>%d;95;0c", 'U');
2818 }
3332 break; 2819 break;
2820
3333 case '?': 2821 case '?':
3334 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2822 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3335 process_terminal_mode (ch, priv, nargs, arg); 2823 process_terminal_mode (ch, priv, nargs, arg);
3336 break; 2824 break;
3337 } 2825 }
… …
3462 break; 2950 break;
3463 case 6: /* CPR requested */ 2951 case 6: /* CPR requested */
3464 scr_report_position (); 2952 scr_report_position ();
3465 break; 2953 break;
3466 case 7: /* unofficial extension */ 2954 case 7: /* unofficial extension */
3467 if (OPTION (Opt_insecure)) 2955 if (option (Opt_insecure))
3468 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2956 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3469 break; 2957 break;
3470 case 8: /* unofficial extension */ 2958 case 8: /* unofficial extension */
3471 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2959 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3472 break; 2960 break;
… …
3539 break; 3027 break;
3540 case CSI_75: 3028 case CSI_75:
3541 scr_cursor (RESTORE); 3029 scr_cursor (RESTORE);
3542 break; 3030 break;
3543 3031
3544#if ENABLE_FRILLS 3032#if !ENABLE_MINIMAL
3545 case CSI_74: 3033 case CSI_74:
3546 process_window_ops (arg, nargs); 3034 process_window_ops (arg, nargs);
3547 break; 3035 break;
3548#endif 3036#endif
3549 3037
… …
3556 break; 3044 break;
3557 } 3045 }
3558} 3046}
3559/*}}} */ 3047/*}}} */
3560 3048
3561#if ENABLE_FRILLS 3049#if !ENABLE_MINIMAL
3562/* ARGSUSED */ 3050/* ARGSUSED */
3563void 3051void
3564rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3052rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3565{ 3053{
3566 int x, y; 3054 int x, y;
3567 XWindowAttributes wattr; 3055 XWindowAttributes wattr;
3568 Window wdummy; 3056 Window wdummy;
3569 dDisp; 3057
3058 dLocal (Display *, dpy);
3570 3059
3571 if (nargs == 0) 3060 if (nargs == 0)
3572 return; 3061 return;
3573 3062
3574 switch (args[0]) 3063 switch (args[0])
3575 { 3064 {
3576 /* 3065 /*
3577 * commands 3066 * commands
3578 */ 3067 */
3579 case 1: /* deiconify window */ 3068 case 1: /* deiconify window */
3580 XMapWindow (disp, parent[0]); 3069 XMapWindow (dpy, parent[0]);
3581 break; 3070 break;
3582 case 2: /* iconify window */ 3071 case 2: /* iconify window */
3583 XIconifyWindow (disp, parent[0], display->screen); 3072 XIconifyWindow (dpy, parent[0], display->screen);
3584 break; 3073 break;
3585 case 3: /* set position (pixels) */ 3074 case 3: /* set position (pixels) */
3586 XMoveWindow (disp, parent[0], args[1], args[2]); 3075 XMoveWindow (dpy, parent[0], args[1], args[2]);
3587 break; 3076 break;
3588 case 4: /* set size (pixels) */ 3077 case 4: /* set size (pixels) */
3589 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3078 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3590 break; 3079 break;
3591 case 5: /* raise window */ 3080 case 5: /* raise window */
3592 XRaiseWindow (disp, parent[0]); 3081 XRaiseWindow (dpy, parent[0]);
3593 break; 3082 break;
3594 case 6: /* lower window */ 3083 case 6: /* lower window */
3595 XLowerWindow (disp, parent[0]); 3084 XLowerWindow (dpy, parent[0]);
3596 break; 3085 break;
3597 case 7: /* refresh window */ 3086 case 7: /* refresh window */
3598 scr_touch (true); 3087 scr_touch (true);
3599 break; 3088 break;
3600 case 8: /* set size (chars) */ 3089 case 8: /* set size (chars) */
… …
3607 if (args[0] >= 24) /* set height (chars) */ 3096 if (args[0] >= 24) /* set height (chars) */
3608 set_widthheight ((unsigned int)width, 3097 set_widthheight ((unsigned int)width,
3609 (unsigned int) (args[1] * fheight)); 3098 (unsigned int) (args[1] * fheight));
3610 break; 3099 break;
3611 3100
3612
3613 /* 3101 /*
3614 * reports - some output format copied from XTerm 3102 * reports - some output format copied from XTerm
3615 */ 3103 */
3616 case 11: /* report window state */ 3104 case 11: /* report window state */
3617 XGetWindowAttributes (disp, parent[0], &wattr); 3105 XGetWindowAttributes (dpy, parent[0], &wattr);
3618 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3106 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3619 break; 3107 break;
3620 case 13: /* report window position */ 3108 case 13: /* report window position */
3621 XGetWindowAttributes (disp, parent[0], &wattr); 3109 XGetWindowAttributes (dpy, parent[0], &wattr);
3622 XTranslateCoordinates (disp, parent[0], wattr.root, 3110 XTranslateCoordinates (dpy, parent[0], wattr.root,
3623 -wattr.border_width, -wattr.border_width, 3111 -wattr.border_width, -wattr.border_width,
3624 &x, &y, &wdummy); 3112 &x, &y, &wdummy);
3625 tt_printf ("\033[3;%d;%dt", x, y); 3113 tt_printf ("\033[3;%d;%dt", x, y);
3626 break; 3114 break;
3627 case 14: /* report window size (pixels) */ 3115 case 14: /* report window size (pixels) */
3628 XGetWindowAttributes (disp, parent[0], &wattr); 3116 XGetWindowAttributes (dpy, parent[0], &wattr);
3629 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3117 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3630 break; 3118 break;
3631 case 18: /* report text area size (chars) */ 3119 case 18: /* report text area size (chars) */
3632 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3120 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3633 break; 3121 break;
… …
3635 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3123 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3636 break; 3124 break;
3637 case 20: /* report icon label */ 3125 case 20: /* report icon label */
3638 { 3126 {
3639 char *s; 3127 char *s;
3640 XGetIconName (disp, parent[0], &s); 3128 XGetIconName (dpy, parent[0], &s);
3641 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3129 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3642 XFree (s); 3130 XFree (s);
3643 } 3131 }
3644 break; 3132 break;
3645 case 21: /* report window title */ 3133 case 21: /* report window title */
3646 { 3134 {
3647 char *s; 3135 char *s;
3648 XFetchName (disp, parent[0], &s); 3136 XFetchName (dpy, parent[0], &s);
3649 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3137 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3650 XFree (s); 3138 XFree (s);
3651 } 3139 }
3652 break; 3140 break;
3653 } 3141 }
3654} 3142}
… …
3681 seen_esc = true; 3169 seen_esc = true;
3682 continue; 3170 continue;
3683 } 3171 }
3684 else if (ch == C0_BEL || ch == CHAR_ST) 3172 else if (ch == C0_BEL || ch == CHAR_ST)
3685 break; 3173 break;
3174 else if (ch == C0_SYN)
3175 ch = cmd_get8 ();
3686 else if (ch < 0x20) 3176 else if (ch < 0x20)
3687 return NULL; /* other control character - exit */ 3177 return NULL; /* other control character - exit */
3688 3178
3689 seen_esc = false; 3179 seen_esc = false;
3690 3180
3691 if (n >= STRING_MAX - 1) 3181 if (n >= STRING_MAX - 1)
3692 // stop at some sane length 3182 // stop at some sane length
3693 return NULL; 3183 return NULL;
3694 3184
3695 if (ch == C0_SYN)
3696 string[n++] = cmd_get8 ();
3697 else
3698 string[n++] = ch; 3185 string[n++] = ch;
3699 } 3186 }
3700 3187
3701 string[n++] = '\0'; 3188 string[n++] = '\0';
3702 3189
3703 ends_how = (ch == 0x5c ? C0_ESC : ch); 3190 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3754void 3241void
3755rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3242rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3756{ 3243{
3757 if (str[0] == '?' && !str[1]) 3244 if (str[0] == '?' && !str[1])
3758 { 3245 {
3759 unsigned short r, g, b; 3246 rgba c;
3760 pix_colors_focused[color].get (display, r, g, b); 3247 pix_colors_focused[color].get (c);
3248
3249#if XFT
3250 if (c.a != rgba::MAX_CC)
3251 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3252 else
3253#endif
3761 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3254 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3762 } 3255 }
3763 else 3256 else
3764 set_window_color (color, str); 3257 set_window_color (color, str);
3765} 3258}
3766 3259
… …
3772{ 3265{
3773 int color; 3266 int color;
3774 char *buf, *name; 3267 char *buf, *name;
3775 bool query = str[0] == '?' && !str[1]; 3268 bool query = str[0] == '?' && !str[1];
3776 int saveop = op; 3269 int saveop = op;
3777 dDisp; 3270
3271 dLocal (Display *, dpy);
3778 3272
3779 assert (str != NULL); 3273 assert (str != NULL);
3274
3275 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3276 return;
3277
3780 switch (op) 3278 switch (op)
3781 { 3279 {
3782 case XTerm_name: 3280 case XTerm_name:
3783 set_title (str); 3281 set_title (str);
3784 /* FALLTHROUGH */ 3282 /* FALLTHROUGH */
… …
3798 unsigned long bytes_after; 3296 unsigned long bytes_after;
3799 unsigned char *value = 0; 3297 unsigned char *value = 0;
3800 const char *str = ""; 3298 const char *str = "";
3801 3299
3802 if (prop 3300 if (prop
3803 && XGetWindowProperty (disp, parent[0], 3301 && XGetWindowProperty (dpy, parent[0],
3804 prop, 0, 1<<16, 0, AnyPropertyType, 3302 prop, 0, 1<<16, 0, AnyPropertyType,
3805 &actual_type, &actual_format, 3303 &actual_type, &actual_format,
3806 &nitems, &bytes_after, &value) == Success 3304 &nitems, &bytes_after, &value) == Success
3807 && actual_type != None 3305 && actual_type != None
3808 && actual_format == 8) 3306 && actual_format == 8)
3809 str = (const char *)(value); 3307 str = (const char *)(value);
3810 3308
3811 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3309 tt_printf ("\033]%d;%s%c", op, str, resp);
3812 3310
3813 XFree (value); 3311 XFree (value);
3814 } 3312 }
3815 else 3313 else
3816 { 3314 {
… …
3820 { 3318 {
3821 *eq = 0; 3319 *eq = 0;
3822 set_utf8_property (display->atom (str), eq + 1); 3320 set_utf8_property (display->atom (str), eq + 1);
3823 } 3321 }
3824 else 3322 else
3825 XDeleteProperty (disp, parent[0], 3323 XDeleteProperty (dpy, parent[0],
3826 display->atom (str)); 3324 display->atom (str));
3827 } 3325 }
3828 break; 3326 break;
3829 3327
3830 case XTerm_Color: 3328 case XTerm_Color:
… …
3840 break; 3338 break;
3841 3339
3842 if ((buf = strchr (name, ';')) != NULL) 3340 if ((buf = strchr (name, ';')) != NULL)
3843 *buf++ = '\0'; 3341 *buf++ = '\0';
3844 3342
3845 if (name[0] == '?' && !name[1]) 3343 process_color_seq (op, color, name, resp);
3846 {
3847 unsigned short r, g, b;
3848 pix_colors_focused[color].get (display, r, g, b);
3849 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3850 }
3851 else
3852 set_window_color (color, name);
3853 } 3344 }
3854 break; 3345 break;
3346 case Rxvt_restoreFG:
3855 case XTerm_Color00: 3347 case XTerm_Color00:
3856 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3348 process_color_seq (op, Color_fg, str, resp);
3857 break; 3349 break;
3350 case Rxvt_restoreBG:
3858 case XTerm_Color01: 3351 case XTerm_Color01:
3859 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3352 process_color_seq (op, Color_bg, str, resp);
3860 break; 3353 break;
3861#ifndef NO_CURSORCOLOR 3354#ifndef NO_CURSORCOLOR
3862 case XTerm_Color_cursor: 3355 case XTerm_Color_cursor:
3863 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3356 process_color_seq (op, Color_cursor, str, resp);
3864 break; 3357 break;
3865#endif 3358#endif
3866 case XTerm_Color_pointer_fg: 3359 case XTerm_Color_pointer_fg:
3867 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3360 process_color_seq (op, Color_pointer_fg, str, resp);
3868 break; 3361 break;
3869 case XTerm_Color_pointer_bg: 3362 case XTerm_Color_pointer_bg:
3870 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3363 process_color_seq (op, Color_pointer_bg, str, resp);
3871 break; 3364 break;
3872#ifndef NO_BOLD_UNDERLINE_REVERSE 3365#ifndef NO_BOLD_UNDERLINE_REVERSE
3873 case XTerm_Color_RV: 3366 case XTerm_Color_RV:
3874 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3367 process_color_seq (op, Color_RV, str, resp);
3875 break; 3368 break;
3876 case Rxvt_Color_BD: 3369 case Rxvt_Color_BD:
3877 case URxvt_Color_BD: 3370 case URxvt_Color_BD:
3878 process_color_seq (op, Color_BD, str, resp); 3371 process_color_seq (op, Color_BD, str, resp);
3879 break; 3372 break;
3880 case Rxvt_Color_UL: 3373 case Rxvt_Color_UL:
3881 case URxvt_Color_UL: 3374 case URxvt_Color_UL:
3882 process_color_seq (op, Color_UL, str, resp); 3375 process_color_seq (op, Color_UL, str, resp);
3883 break; 3376 break;
3884 case URxvt_Color_IT: 3377 case URxvt_Color_IT:
3885 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3378 process_color_seq (op, Color_IT, str, resp);
3886 break; 3379 break;
3887#endif 3380#endif
3888#if TRANSPARENT && TINTING 3381#if ENABLE_TRANSPARENCY
3889 case URxvt_Color_tint: 3382 case URxvt_Color_tint:
3890 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3383 process_color_seq (op, Color_tint, str, resp);
3891 check_our_parents (); 3384 {
3892 if (am_transparent) 3385 bool changed = false;
3893 want_full_refresh = want_refresh = 1;
3894 break;
3895#endif
3896 3386
3387 if (ISSET_PIXCOLOR (Color_tint))
3388 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3389 else
3390 changed = bgPixmap.unset_tint ();
3391
3392 if (changed)
3393 update_background ();
3394 }
3395
3396 break;
3397#endif
3398
3399#if BG_IMAGE_FROM_FILE
3897 case Rxvt_Pixmap: 3400 case Rxvt_Pixmap:
3898 { 3401 if (!strcmp (str, "?"))
3899 if (*str != ';')
3900 { 3402 {
3901#if XPM_BACKGROUND 3403 char str[256];
3902 scale_pixmap (""); /* reset to default scaling */ 3404
3903 set_bgPixmap (str); /* change pixmap */ 3405 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3904 scr_touch (true); 3406 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3905#endif 3407 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3408 process_xterm_seq (XTerm_title, str, CHAR_ST);
3906 } 3409 }
3907 3410 else
3411 {
3908 int changed = 0; 3412 int changed = 0;
3909 3413
3910 while ((str = strchr (str, ';')) != NULL) 3414 if (*str != ';')
3911 { 3415 {
3416 /* reset to default scaling :*/
3417 bgPixmap.unset_geometry ();
3418 if (bgPixmap.set_file (str)) /* change pixmap */
3419 changed++;
3420 str = strchr (str, ';');
3421 if (str == NULL)
3422 bgPixmap.set_defaultGeometry ();
3423 }
3424
3425 while (str)
3426 {
3912 str++; 3427 str++;
3913#if XPM_BACKGROUND 3428 if (bgPixmap.set_geometry (str))
3914 changed += scale_pixmap (str); 3429 changed++;
3915#endif 3430 str = strchr (str, ';');
3916 } 3431 }
3917 3432
3918 if (changed) 3433 if (changed)
3919 { 3434 update_background ();
3920#ifdef XPM_BACKGROUND
3921 resize_pixmap ();
3922 scr_touch (true);
3923#endif
3924 } 3435 }
3925 }
3926 break; 3436 break;
3927 3437#endif
3928 case Rxvt_restoreFG:
3929 set_window_color (Color_fg, str);
3930 break;
3931 case Rxvt_restoreBG:
3932 set_window_color (Color_bg, str);
3933 break;
3934 3438
3935 case XTerm_logfile: 3439 case XTerm_logfile:
3936 // TODO, when secure mode? 3440 // TODO, when secure mode?
3937 break; 3441 break;
3938 3442
… …
3956 case URxvt_italicFont: 3460 case URxvt_italicFont:
3957 case URxvt_boldItalicFont: 3461 case URxvt_boldItalicFont:
3958#endif 3462#endif
3959 if (query) 3463 if (query)
3960 tt_printf ("\33]%d;%-.250s%c", saveop, 3464 tt_printf ("\33]%d;%-.250s%c", saveop,
3961 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3465 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3962 ? fontset[op - URxvt_font]->fontdesc : "", 3466 ? fontset[op - URxvt_font]->fontdesc : "",
3963 resp); 3467 resp);
3964 else 3468 else
3965 { 3469 {
3966 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3470 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3969 allocated.push_back ((void *)res); 3473 allocated.push_back ((void *)res);
3970 set_fonts (); 3474 set_fonts ();
3971 } 3475 }
3972 break; 3476 break;
3973 3477
3974#if ENABLE_FRILLS 3478 case URxvt_version:
3479 if (query)
3480 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3481 op,
3482 rs[Rs_name], VERSION[0], VERSION[2],
3483 resp);
3484 break;
3485
3486#if !ENABLE_MINIMAL
3975 case URxvt_locale: 3487 case URxvt_locale:
3976 if (query) 3488 if (query)
3977 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3489 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3978 else 3490 else
3979 { 3491 {
3980 set_locale (str); 3492 set_locale (str);
3981 pty->set_utf8_mode (enc_utf8); 3493 pty->set_utf8_mode (enc_utf8);
3982 init_xlocale (); 3494 init_xlocale ();
… …
3997 break; 3509 break;
3998#endif 3510#endif
3999 3511
4000#if ENABLE_PERL 3512#if ENABLE_PERL
4001 case URxvt_perl: 3513 case URxvt_perl:
4002 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3514 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
4003 ; // no responses yet
4004 break; 3515 break;
4005#endif 3516#endif
4006 } 3517 }
4007} 3518}
4008/*----------------------------------------------------------------------*/ 3519/*----------------------------------------------------------------------*/
… …
4031 { 3542 {
4032 if (mode == 'r') 3543 if (mode == 'r')
4033 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3544 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4034 else 3545 else
4035 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3546 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4036 PrivMode (state, bit); 3547 set_privmode (bit, state);
4037 } 3548 }
4038 3549
4039 return state; 3550 return state;
4040} 3551}
4041 3552
… …
4045{ 3556{
4046 unsigned int i, j; 3557 unsigned int i, j;
4047 int state; 3558 int state;
4048 3559
4049 static const struct 3560 static const struct
4050 { 3561 {
4051 const int argval; 3562 const int argval;
4052 const unsigned long bit; 3563 const unsigned long bit;
4053 }
4054
4055 argtopriv[] = { 3564 } argtopriv[] = {
4056 { 1, PrivMode_aplCUR }, 3565 { 1, PrivMode_aplCUR },
4057 { 2, PrivMode_vt52 }, 3566 { 2, PrivMode_vt52 },
4058 { 3, PrivMode_132 }, 3567 { 3, PrivMode_132 },
4059 { 4, PrivMode_smoothScroll }, 3568 { 4, PrivMode_smoothScroll },
4060 { 5, PrivMode_rVideo }, 3569 { 5, PrivMode_rVideo },
… …
4076 { 66, PrivMode_aplKP }, 3585 { 66, PrivMode_aplKP },
4077#ifndef NO_BACKSPACE_KEY 3586#ifndef NO_BACKSPACE_KEY
4078 { 67, PrivMode_BackSpace }, 3587 { 67, PrivMode_BackSpace },
4079#endif 3588#endif
4080 { 1000, PrivMode_MouseX11 }, 3589 { 1000, PrivMode_MouseX11 },
4081 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3590 { 1002, PrivMode_MouseBtnEvent },
4082 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3591 { 1003, PrivMode_MouseAnyEvent },
4083 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4084 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4085 { 1011, PrivMode_Keypress }, // rxvt extension 3593 { 1011, PrivMode_Keypress }, // rxvt extension
4086 // 1035 enable modifiers for alt, numlock NYI 3594 // 1035 enable modifiers for alt, numlock NYI
4087 // 1036 send ESC for meta keys NYI 3595 // 1036 send ESC for meta keys NYI
4088 // 1037 send DEL for keypad delete NYI 3596 // 1037 send DEL for keypad delete NYI
4089 { 1047, PrivMode_Screen }, 3597 { 1047, PrivMode_Screen },
4090 // 1048 save and restore cursor 3598 // 1048 save and restore cursor
4091 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3599 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4092 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3600 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3601 { 2004, PrivMode_BracketPaste },
4093 }; 3602 };
4094 3603
4095 if (nargs == 0) 3604 if (nargs == 0)
4096 return; 3605 return;
4097 3606
… …
4123 scr_touch (true); 3632 scr_touch (true);
4124 break; 3633 break;
4125#endif 3634#endif
4126 case 1048: /* alternative cursor save */ 3635 case 1048: /* alternative cursor save */
4127 case 1049: 3636 case 1049:
4128 if (OPTION (Opt_secondaryScreen)) 3637 if (option (Opt_secondaryScreen))
4129 if (mode == 0) 3638 if (mode == 0)
4130 scr_cursor (RESTORE); 3639 scr_cursor (RESTORE);
4131 else if (mode == 1) 3640 else if (mode == 1)
4132 scr_cursor (SAVE); 3641 scr_cursor (SAVE);
4133 break; 3642 break;
… …
4141 case 2: /* VT52 mode */ 3650 case 2: /* VT52 mode */
4142 /* oddball mode. should be set regardless of set/reset 3651 /* oddball mode. should be set regardless of set/reset
4143 * parameter. Return from VT52 mode with an ESC < from 3652 * parameter. Return from VT52 mode with an ESC < from
4144 * within VT52 mode 3653 * within VT52 mode
4145 */ 3654 */
4146 PrivMode (1, PrivMode_vt52); 3655 set_privmode (PrivMode_vt52, 1);
4147 break; 3656 break;
4148 case 3: /* 80/132 */ 3657 case 3: /* 80/132 */
4149 if (priv_modes & PrivMode_132OK) 3658 if (priv_modes & PrivMode_132OK)
3659 {
3660 scr_poweron ();
4150 set_widthheight (((state ? 132 : 80) * fwidth), height); 3661 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3662 }
4151 break; 3663 break;
4152 case 4: /* smooth scrolling */ 3664 case 4: /* smooth scrolling */
4153 set_option (Opt_jumpScroll, !state); 3665 set_option (Opt_jumpScroll, !state);
4154 break; 3666 break;
4155 case 5: /* reverse video */ 3667 case 5: /* reverse video */
… …
4162 scr_autowrap (state); 3674 scr_autowrap (state);
4163 break; 3675 break;
4164 /* case 8: - auto repeat, can't do on a per window basis */ 3676 /* case 8: - auto repeat, can't do on a per window basis */
4165 case 9: /* X10 mouse reporting */ 3677 case 9: /* X10 mouse reporting */
4166 if (state) /* orthogonal */ 3678 if (state) /* orthogonal */
4167 priv_modes &= ~PrivMode_MouseX11; 3679 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4168 break; 3680 break;
4169#ifdef scrollBar_esc 3681#ifdef scrollBar_esc
4170 case scrollBar_esc: 3682 case scrollBar_esc:
4171 if (scrollbar_mapping (state)) 3683 if (scrollBar.map (state))
4172 { 3684 {
4173 resize_all_windows (0, 0, 0); 3685 resize_all_windows (0, 0, 0);
4174 scr_touch (true); 3686 scr_touch (true);
4175 } 3687 }
4176 break; 3688 break;
… …
4185 break; 3697 break;
4186 /* case 66: - application key pad */ 3698 /* case 66: - application key pad */
4187 /* case 67: - backspace key */ 3699 /* case 67: - backspace key */
4188 case 1000: /* X11 mouse reporting */ 3700 case 1000: /* X11 mouse reporting */
4189 if (state) /* orthogonal */ 3701 if (state) /* orthogonal */
4190 priv_modes &= ~PrivMode_MouseX10; 3702 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4191 break; 3703 break;
4192#if 0
4193 case 1001: 3704 case 1002:
4194 break; /* X11 mouse highlighting */ 3705 case 1003:
4195#endif 3706 if (state)
3707 {
3708 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3709 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3710 vt_emask_mouse = PointerMotionMask;
3711 }
3712 else
3713 vt_emask_mouse = NoEventMask;
3714 vt_select_input ();
3715 break;
4196 case 1010: /* scroll to bottom on TTY output inhibit */ 3716 case 1010: /* scroll to bottom on TTY output inhibit */
4197 set_option (Opt_scrollTtyOutput, !state); 3717 set_option (Opt_scrollTtyOutput, !state);
4198 break; 3718 break;
4199 case 1011: /* scroll to bottom on key press */ 3719 case 1011: /* scroll to bottom on key press */
4200 set_option (Opt_scrollTtyKeypress, state); 3720 set_option (Opt_scrollTtyKeypress, state);
4201 break; 3721 break;
4202 case 1047: /* secondary screen w/ clearing last */ 3722 case 1047: /* secondary screen w/ clearing last */
4203 if (OPTION (Opt_secondaryScreen)) 3723 if (option (Opt_secondaryScreen))
4204 if (current_screen != PRIMARY) 3724 if (current_screen != PRIMARY)
4205 scr_erase_screen (2); 3725 scr_erase_screen (2);
4206 scr_change_screen (state); 3726 scr_change_screen (state);
4207 break; 3727 break;
4208 case 1049: /* secondary screen w/ clearing first */ 3728 case 1049: /* secondary screen w/ clearing first */
4209 scr_change_screen (state); 3729 scr_change_screen (state);
4210 if (OPTION (Opt_secondaryScreen)) 3730 if (option (Opt_secondaryScreen))
4211 if (current_screen != PRIMARY) 3731 if (current_screen != PRIMARY)
4212 scr_erase_screen (2); 3732 scr_erase_screen (2);
4213 break; 3733 break;
4214 default: 3734 default:
4215 break; 3735 break;
… …
4343 scr_color (Color_bg, Color_bg); 3863 scr_color (Color_bg, Color_bg);
4344 break; 3864 break;
4345 3865
4346 //case 50: // not variable spacing 3866 //case 50: // not variable spacing
4347 3867
4348#if ENABLE_FRILLS 3868#if !ENABLE_MINIMAL
4349 case 90: 3869 case 90:
4350 case 91: /* set bright fg color */ 3870 case 91: /* set bright fg color */
4351 case 92: 3871 case 92:
4352 case 93: 3872 case 93:
4353 case 94: 3873 case 94:
… …
4377rxvt_term::process_graphics () 3897rxvt_term::process_graphics ()
4378{ 3898{
4379 unicode_t ch, cmd = cmd_getc (); 3899 unicode_t ch, cmd = cmd_getc ();
4380 3900
4381 if (cmd == 'Q') 3901 if (cmd == 'Q')
3902 {
4382 { /* query graphics */ 3903 /* query graphics */
4383 tt_printf ("\033G0\012"); /* no graphics */ 3904 tt_printf ("\033G0\012"); /* no graphics */
4384 return; 3905 return;
4385 } 3906 }
4386 /* swallow other graphics sequences until terminating ':' */ 3907 /* swallow other graphics sequences until terminating ':' */
4387 do 3908 do
… …
4437 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3958 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4438 3959
4439 memcpy (v_buffer + v_buflen, data, len); 3960 memcpy (v_buffer + v_buflen, data, len);
4440 v_buflen += len; 3961 v_buflen += len;
4441 3962
4442 pty_ev.set (EVENT_READ | EVENT_WRITE); 3963 pty_ev.set (ev::READ | ev::WRITE);
4443} 3964}
4444 3965
4445void rxvt_term::pty_write () 3966void rxvt_term::pty_write ()
4446{ 3967{
4447 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3968 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4452 3973
4453 if (v_buflen == 0) 3974 if (v_buflen == 0)
4454 { 3975 {
4455 free (v_buffer); 3976 free (v_buffer);
4456 v_buffer = 0; 3977 v_buffer = 0;
4457 v_buflen = 0;
4458 3978
4459 pty_ev.set (EVENT_READ); 3979 pty_ev.set (ev::READ);
4460 return; 3980 return;
4461 } 3981 }
4462 3982
4463 memmove (v_buffer, v_buffer + written, v_buflen); 3983 memmove (v_buffer, v_buffer + written, v_buflen);
4464 } 3984 }
4465 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3985 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4466 pty_ev.set (EVENT_READ); 3986 pty_ev.set (ev::READ);
4467} 3987}
4468 3988
4469/*----------------------- end-of-file (C source) -----------------------*/ 3989/*----------------------- end-of-file (C source) -----------------------*/
4470 3990

Diff Legend

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