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.324 by sasha, Fri Jun 8 20:04:12 2007 UTC vs.
Revision 1.431 by root, Tue Feb 24 11:51:51 2009 UTC

… …
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.
… …
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 201
202 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
203 203
204 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
206 206
207 if (y >= 0) 207 if (y >= 0)
208 { 208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
221 ch = *chr++; 221 ch = *chr++;
222 222
223 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
226# if !UNICODE3 226# if !UNICODE_3
227 if (ch >= 0x10000) 227 if (ch >= 0x10000)
228 ch = 0xfffd; 228 ch = 0xfffd;
229# endif 229# endif
230 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231 231
… …
279 } 279 }
280 280
281 iso14755buf = 0; 281 iso14755buf = 0;
282} 282}
283 283
284int 284static int
285rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
286{ 286{
287 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
290 { 290 {
… …
298 298
299 return -1; 299 return -1;
300} 300}
301#endif 301#endif
302 302
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
303void 398void
304rxvt_term::key_press (XKeyEvent &ev) 399rxvt_term::key_press (XKeyEvent &ev)
305{ 400{
306 int ctrl, meta, shft, len; 401 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 402 KeySym keysym;
309 int valid_keysym; 403 int valid_keysym;
310 char kbuf[KBUFSZ]; 404 char kbuf[KBUFSZ];
311 405
312#if ISO_14755 406#if ISO_14755
… …
325 meta = ev.state & ModMetaMask; 419 meta = ev.state & ModMetaMask;
326 420
327 if (numlock_state || (ev.state & ModNumLockMask)) 421 if (numlock_state || (ev.state & ModNumLockMask))
328 { 422 {
329 numlock_state = (ev.state & ModNumLockMask); 423 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP); 424 set_privmode (PrivMode_aplKP, !numlock_state);
331 } 425 }
332 426
333 kbuf[0] = 0; 427 kbuf[0] = 0;
334 428
335#ifdef USE_XIM 429#ifdef USE_XIM
… …
519# endif 613# endif
520 return; 614 return;
521 } 615 }
522 else 616 else
523 { 617 {
524# if ENABLE_OVERLAY 618# if ISO_14755
525 scr_overlay_off (); 619 scr_overlay_off ();
526# endif 620# endif
527 iso14755buf = 0; 621 iso14755buf = 0;
528 } 622 }
529 } 623 }
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
532 if (!(iso14755buf & ISO_14755_STARTED)) 626 if (!(iso14755buf & ISO_14755_STARTED))
533 { 627 {
534 iso14755buf |= ISO_14755_STARTED; 628 iso14755buf |= ISO_14755_STARTED;
535# if ENABLE_OVERLAY 629# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode"); 631 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif 632# endif
539 } 633 }
540#endif 634#endif
541 635
542#ifdef PRINTPIPE 636#ifdef PRINTPIPE
543 if (keysym == XK_Print) 637 if (keysym == XK_Print)
544 { 638 {
545 scr_printscreen (ctrl | shft); 639 scr_printscreen (ctrl | shft);
546 return; 640 return;
547 } 641 }
548#endif 642#endif
549 643
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 644 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 645 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1;
648
649 switch (translate_keypad (keysym, kp))
552 { 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
553 newlen = 1; 681 newlen = 0;
554 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:
555 { 765 {
556#ifndef NO_BACKSPACE_KEY 766 int param = map_function_key (keysym);
557 case XK_BackSpace: 767 if (param > 0)
558 if (priv_modes & PrivMode_HaveBackSpace) 768 sprintf (kbuf,"\033[%d~", param);
559 {
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0';
563 }
564 else 769 else
565 strcpy (kbuf, key_backspace);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, key_delete);
581 break;
582#endif
583 case XK_Tab:
584 if (shft)
585 strcpy (kbuf, "\033[Z");
586 else
587 {
588#ifdef CTRL_TAB_MAKES_META
589 if (ctrl)
590 meta = 1;
591#endif
592#ifdef MOD4_TAB_MAKES_META
593 if (ev.state & Mod4Mask)
594 meta = 1;
595#endif
596 newlen = 0;
597 }
598 break;
599
600#ifdef XK_KP_Left
601 case XK_KP_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */
605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z");
621 kbuf[2] = "DACB"[keysym - XK_Left];
622 /* do Shift first */
623 if (shft)
624 kbuf[2] = "dacb"[keysym - XK_Left];
625 else if (ctrl)
626 {
627 kbuf[1] = 'O';
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 }
630 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O';
632 break;
633
634#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next:
659 strcpy (kbuf, "\033[6~");
660 break;
661#endif
662 case XK_KP_Enter:
663 /* allow shift to override */
664 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
665 {
666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
678 }
679 else
680 {
681 kbuf[0] = '\015';
682 kbuf[1] = '\0';
683 }
684 break;
685
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP");
697 kbuf[2] += (keysym - XK_KP_F1);
698 break;
699
700 case XK_KP_Multiply: /* "\033Oj" : "*" */
701 case XK_KP_Add: /* "\033Ok" : "+" */
702 case XK_KP_Separator: /* "\033Ol" : "," */
703 case XK_KP_Subtract: /* "\033Om" : "-" */
704 case XK_KP_Decimal: /* "\033On" : "." */
705 case XK_KP_Divide: /* "\033Oo" : "/" */
706 case XK_KP_0: /* "\033Op" : "0" */
707 case XK_KP_1: /* "\033Oq" : "1" */
708 case XK_KP_2: /* "\033Or" : "2" */
709 case XK_KP_3: /* "\033Os" : "3" */
710 case XK_KP_4: /* "\033Ot" : "4" */
711 case XK_KP_5: /* "\033Ou" : "5" */
712 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */
717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
718 {
719 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply);
721 }
722 else
723 {
724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725 kbuf[1] = '\0';
726 }
727 break;
728
729 case XK_Find:
730 strcpy (kbuf, "\033[1~");
731 break;
732
733#ifdef XK_KP_End
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert:
744 strcpy (kbuf, "\033[2~");
745 break;
746#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove:
748 /* FALLTHROUGH */
749#endif
750 case XK_Execute:
751 strcpy (kbuf, "\033[3~");
752 break;
753 case XK_Select:
754 strcpy (kbuf, "\033[4~");
755 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End:
767 strcpy (kbuf, KS_END);
768 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home:
780 strcpy (kbuf, KS_HOME);
781 break;
782
783#define FKEY(n, fkey) \
784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
785
786 case XK_F1: /* "\033[11~" */
787 case XK_F2: /* "\033[12~" */
788 case XK_F3: /* "\033[13~" */
789 case XK_F4: /* "\033[14~" */
790 case XK_F5: /* "\033[15~" */
791 FKEY (11, XK_F1);
792 break;
793 case XK_F6: /* "\033[17~" */
794 case XK_F7: /* "\033[18~" */
795 case XK_F8: /* "\033[19~" */
796 case XK_F9: /* "\033[20~" */
797 case XK_F10: /* "\033[21~" */
798 FKEY (17, XK_F6);
799 break;
800 case XK_F11: /* "\033[23~" */
801 case XK_F12: /* "\033[24~" */
802 case XK_F13: /* "\033[25~" */
803 case XK_F14: /* "\033[26~" */
804 FKEY (23, XK_F11);
805 break;
806 case XK_F15: /* "\033[28~" */
807 case XK_F16: /* "\033[29~" */
808 FKEY (28, XK_F15);
809 break;
810 case XK_Help: /* "\033[28~" */
811 FKEY (28, XK_Help);
812 break;
813 case XK_Menu: /* "\033[29~" */
814 FKEY (29, XK_Menu);
815 break;
816 case XK_F17: /* "\033[31~" */
817 case XK_F18: /* "\033[32~" */
818 case XK_F19: /* "\033[33~" */
819 case XK_F20: /* "\033[34~" */
820 case XK_F21: /* "\033[35~" */
821 case XK_F22: /* "\033[36~" */
822 case XK_F23: /* "\033[37~" */
823 case XK_F24: /* "\033[38~" */
824 case XK_F25: /* "\033[39~" */
825 case XK_F26: /* "\033[40~" */
826 case XK_F27: /* "\033[41~" */
827 case XK_F28: /* "\033[42~" */
828 case XK_F29: /* "\033[43~" */
829 case XK_F30: /* "\033[44~" */
830 case XK_F31: /* "\033[45~" */
831 case XK_F32: /* "\033[46~" */
832 case XK_F33: /* "\033[47~" */
833 case XK_F34: /* "\033[48~" */
834 case XK_F35: /* "\033[49~" */
835 FKEY (31, XK_F17);
836 break;
837#undef FKEY
838 default:
839 newlen = 0; 770 newlen = 0;
840 break;
841 } 771 }
842 772 break;
843 if (newlen)
844 len = strlen (kbuf);
845 } 773 }
774
775 if (newlen)
776 len = strlen (kbuf);
846 777
847 /* 778 /*
848 * Pass meta for all function keys, if 'meta' option set 779 * Pass meta for all function keys, if 'meta' option set
849 */ 780 */
850#ifdef META8_OPTION 781#ifdef META8_OPTION
… …
934#if ENABLE_FRILLS || ISO_14755 865#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support 866 // ISO 14755 support
936 if (iso14755buf) 867 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52) 868 if (iso14755buf & ISO_14755_52)
938 { 869 {
939# if ENABLE_OVERLAY 870# if ISO_14755
940 scr_overlay_off (); 871 scr_overlay_off ();
941# endif 872# endif
942# if ISO_14755 873# if ISO_14755
943 // iso14755 part 5.2 handling: release time 874 // iso14755 part 5.2 handling: release time
944 // first: controls 875 // first: controls
… …
967 898
968 return; 899 return;
969 } 900 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 901 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 { 902 {
972# if ENABLE_OVERLAY 903# if ISO_14755
973 scr_overlay_off (); 904 scr_overlay_off ();
974# endif 905# endif
975 if (iso14755buf & ISO_14755_51) 906 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 (); 907 commit_iso14755 ();
977#if ISO_14755 908#if ISO_14755
978 else if (iso14755buf & ISO_14755_STARTED) 909 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 { 910 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 911 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981 912
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 913 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 914 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
1035void 966void
1036rxvt_term::flush () 967rxvt_term::flush ()
1037{ 968{
1038 flush_ev.stop (); 969 flush_ev.stop ();
1039 970
1040#ifdef TRANSPARENT 971#ifdef HAVE_BG_PIXMAP
1041 if (want_full_refresh) 972 if (bgPixmap.check_clearChanged ())
1042 { 973 {
1043 want_full_refresh = 0; 974// scr_clear (true); This needs to be researched further!
1044 scr_clear ();
1045 scr_touch (false); 975 scr_touch (false);
1046 } 976 }
1047#endif 977#endif
1048 978
1049 if (want_refresh) 979 if (want_refresh)
… …
1085 } 1015 }
1086 while (row < end_row); 1016 while (row < end_row);
1087 } 1017 }
1088 1018
1089 scr_refresh (); 1019 scr_refresh ();
1090 scrollbar_show (1); 1020 scrollBar.show (1);
1091#ifdef USE_XIM 1021#ifdef USE_XIM
1092 IMSendSpot (); 1022 IMSendSpot ();
1093#endif 1023#endif
1094 } 1024 }
1095 1025
1096 display->flush (); 1026 display->flush ();
1097} 1027}
1098 1028
1029/* checks wether a refresh is requested and starts the refresh timer */
1099void 1030void
1100rxvt_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)
1101{ 1041{
1102 make_current (); 1042 make_current ();
1103 1043
1104 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108}
1109
1110void
1111rxvt_term::flush_cb (time_watcher &w)
1112{
1113 make_current ();
1114
1115 refresh_limit = 1;
1116 refresh_count = 0; 1044 refresh_count = 0;
1117 flush (); 1045 flush ();
1118} 1046}
1119 1047
1120#ifdef CURSOR_BLINK 1048#ifdef CURSOR_BLINK
1121void 1049void
1122rxvt_term::cursor_blink_cb (time_watcher &w) 1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1123{ 1051{
1124 hidden_cursor = !hidden_cursor; 1052 hidden_cursor = !hidden_cursor;
1125 want_refresh = 1; 1053 want_refresh = 1;
1126 1054 refresh_check ();
1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
1128} 1055}
1129#endif 1056#endif
1130 1057
1131#ifdef TEXT_BLINK 1058#ifdef TEXT_BLINK
1132void 1059void
1133rxvt_term::text_blink_cb (time_watcher &w) 1060rxvt_term::text_blink_cb (ev::timer &w, int revents)
1134{ 1061{
1135 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1062 if (scr_refresh_rend (RS_Blink, RS_Blink))
1136 { 1063 {
1137 hidden_text = !hidden_text; 1064 hidden_text = !hidden_text;
1138 want_refresh = 1; 1065 want_refresh = 1;
1139 w.start (w.at + TEXT_BLINK_INTERVAL); 1066 refresh_check ();
1140 } 1067 }
1068 else
1069 w.stop ();
1141} 1070}
1142#endif 1071#endif
1143 1072
1144#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1145void 1074void
1146rxvt_term::cont_scroll_cb (time_watcher &w) 1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1147{ 1076{
1148 if ((scrollbar_isUp() || scrollbar_isDn()) && 1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1149 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1150 { 1079 {
1151 want_refresh = 1; 1080 want_refresh = 1;
1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1081 refresh_check ();
1153 } 1082 }
1083 else
1084 w.stop ();
1154} 1085}
1155#endif 1086#endif
1156 1087
1157#ifdef SELECTION_SCROLLING 1088#ifdef SELECTION_SCROLLING
1158void 1089void
1159rxvt_term::sel_scroll_cb (time_watcher &w) 1090rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1160{ 1091{
1161 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1092 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1162 { 1093 {
1163 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1094 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1164 want_refresh = 1; 1095 want_refresh = 1;
1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1166 } 1097 }
1098 else
1099 w.stop ();
1167} 1100}
1168#endif 1101#endif
1169 1102
1170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1171void 1104void
1172rxvt_term::slip_wheel_cb (time_watcher &w) 1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1173{ 1106{
1174 if (mouse_slip_wheel_speed == 0 1107 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1176 : scr_page (UP, mouse_slip_wheel_speed))
1177 { 1108 {
1178 if (view_start == top_row || view_start == 0)
1179 mouse_slip_wheel_speed = 0;
1180
1181 want_refresh = 1; 1109 want_refresh = 1;
1182 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)
1114 {
1115 mouse_slip_wheel_speed = 0;
1116 w.stop ();
1183 } 1117 }
1184} 1118}
1185#endif 1119#endif
1186 1120
1187#if LINUX_YIELD_HACK 1121#if LINUX_YIELD_HACK
1188static struct event_handler 1122static struct event_handler
1189{ 1123{
1190 check_watcher yield_ev; 1124 ev::prepare yield_ev;
1191 1125
1192 void yield_cb (check_watcher &w) 1126 void yield_cb (ev::prepare &w, int revents)
1193 { 1127 {
1194 // this should really be sched_yield(), but the linux guys thought 1128 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than 1129 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is 1130 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS. 1131 // allowed by the sus... as is returning ENOSYS.
1132 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best.
1198 1135
1199 struct timespec ts = { 0, 0 }; 1136 struct timespec ts = { 0, 1000 };
1200 nanosleep (&ts, 0); 1137 nanosleep (&ts, 0);
1201 1138
1202 w.stop (); 1139 w.stop ();
1203 } 1140 }
1204 1141
… …
1243 pty_ev.stop (); 1180 pty_ev.stop ();
1244 1181
1245 if (!option (Opt_hold)) 1182 if (!option (Opt_hold))
1246 destroy (); 1183 destroy ();
1247 } 1184 }
1248 1185
1249 return false; 1186 return false;
1250} 1187}
1251 1188
1252void 1189void
1253rxvt_term::pty_cb (io_watcher &w, short revents) 1190rxvt_term::pty_cb (ev::io &w, int revents)
1254{ 1191{
1255 make_current (); 1192 make_current ();
1256 1193
1257 if (revents & EVENT_READ) 1194 if (revents & ev::READ)
1258 // loop, but don't allow a single term to monopolize us 1195 // loop, but don't allow a single term to monopolize us
1259 while (pty_fill ()) 1196 for (int i = CBUFCNT; i-- && pty_fill (); )
1260 if (cmd_parse ()) 1197 cmd_parse ();
1261 break;
1262 1198
1263 if (revents & EVENT_WRITE) 1199 if (revents & ev::WRITE)
1264 pty_write (); 1200 pty_write ();
1201
1202 refresh_check ();
1265} 1203}
1266 1204
1267void 1205void
1268rxvt_term::pointer_unblank () 1206rxvt_term::pointer_unblank ()
1269{ 1207{
… …
1272 1210
1273#ifdef POINTER_BLANK 1211#ifdef POINTER_BLANK
1274 hidden_pointer = 0; 1212 hidden_pointer = 0;
1275 1213
1276 if (option (Opt_pointerBlank)) 1214 if (option (Opt_pointerBlank))
1277 pointer_ev.start (NOW + pointerBlankDelay); 1215 pointer_ev.start (pointerBlankDelay);
1278#endif 1216#endif
1279} 1217}
1280 1218
1281#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1282void 1220void
… …
1290 1228
1291 hidden_pointer = 1; 1229 hidden_pointer = 1;
1292} 1230}
1293 1231
1294void 1232void
1295rxvt_term::pointer_cb (time_watcher &w) 1233rxvt_term::pointer_cb (ev::timer &w, int revents)
1296{ 1234{
1297 make_current (); 1235 make_current ();
1298 1236
1299 pointer_blank (); 1237 pointer_blank ();
1300} 1238}
… …
1303void 1241void
1304rxvt_term::mouse_report (XButtonEvent &ev) 1242rxvt_term::mouse_report (XButtonEvent &ev)
1305{ 1243{
1306 int button_number, key_state = 0; 1244 int button_number, key_state = 0;
1307 int x, y; 1245 int x, y;
1246 int code = 32;
1308 1247
1309 x = ev.x; 1248 x = Pixel2Col (ev.x);
1310 y = ev.y; 1249 y = Pixel2Row (ev.y);
1311 pixel_position (&x, &y); 1250 if (ev.type == MotionNotify)
1251 {
1252 if (x == mouse_row && y == mouse_col)
1253 return;
1254 mouse_row = x;
1255 mouse_col = y;
1256 code += 32;
1257 }
1312 1258
1313 if (MEvent.button == AnyButton) 1259 if (MEvent.button == AnyButton)
1314 button_number = 3; 1260 button_number = 3;
1315 else 1261 else
1316 { 1262 {
… …
1362 x + 1, 1308 x + 1,
1363 y + 1); 1309 y + 1);
1364#endif 1310#endif
1365 1311
1366 tt_printf ("\033[M%c%c%c", 1312 tt_printf ("\033[M%c%c%c",
1367 (32 + button_number + key_state), 1313 (code + button_number + key_state),
1368 (32 + x + 1), 1314 (32 + x + 1),
1369 (32 + y + 1)); 1315 (32 + y + 1));
1370} 1316}
1371 1317
1372/*{{{ process an X event */ 1318/*{{{ process an X event */
… …
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1380 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out (); 1381 focus_out ();
1436 } 1382 }
1437#endif 1383#endif
1438 } 1384 }
1439 break;
1440
1441 case MappingNotify:
1442 XRefreshKeyboardMapping (&ev.xmapping);
1443 break; 1385 break;
1444 1386
1445 /* 1387 /*
1446 * XXX: this is not the _current_ arrangement 1388 * XXX: this is not the _current_ arrangement
1447 * Here's my conclusion: 1389 * Here's my conclusion:
… …
1480 && ev.xfocus.mode != NotifyGrab) 1422 && ev.xfocus.mode != NotifyGrab)
1481 focus_out (); 1423 focus_out ();
1482 break; 1424 break;
1483 1425
1484 case ConfigureNotify: 1426 case ConfigureNotify:
1427 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1428 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1429 szHint.width, szHint.height);*/
1485 if (ev.xconfigure.window == parent[0]) 1430 if (ev.xconfigure.window == parent[0])
1486 { 1431 {
1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1432 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1488 ; 1433 ;
1489 1434
1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1435 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1491 { 1436 {
1492 seen_resize = 1; 1437 seen_resize = 1;
1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1438 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND 1439 }
1495 if (!option(Opt_transparent) && bgPixmap.auto_resize) 1440 else
1441 {
1442#ifdef HAVE_BG_PIXMAP
1443 if (bgPixmap.window_position_sensitive ())
1496 { 1444 {
1445 if (mapped)
1446 update_background ();
1497 resize_pixmap (); 1447 else
1498 scr_touch (true); 1448 bgPixmap.invalidate ();
1499 } 1449 }
1500#endif 1450#endif
1501 } 1451 }
1502 1452
1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505#ifdef TRANSPARENT
1506 if (option (Opt_transparent))
1507 check_our_parents ();
1508#endif
1509 } 1454 }
1510 break; 1455 break;
1511 1456
1512 case PropertyNotify: 1457 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1529 case SelectionRequest: 1474 case SelectionRequest:
1530 selection_send (ev.xselectionrequest); 1475 selection_send (ev.xselectionrequest);
1531 break; 1476 break;
1532 1477
1533 case MapNotify: 1478 case MapNotify:
1479#ifdef HAVE_BG_PIXMAP
1480 /* This is needed spcifically to fix the case of no window manager or a
1481 * non-reparenting window manager. In those cases we never get first
1482 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1483 * care of multiplicity of ConfigureNotify events arriwing while WM does
1484 * reparenting.
1485 * We should not render background immidiately, as there could be several
1486 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1487 * by scheduling background redraw as soon as we can, but giving a short
1488 * bit of time for ConfigureNotifies to arrive.
1489 * We should render background PRIOR to drawing any text, but AFTER all
1490 * of ConfigureNotifys for the best results.
1491 */
1492 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1493 update_background_ev.start (0.025);
1494#endif
1534 mapped = 1; 1495 mapped = 1;
1535#ifdef TEXT_BLINK 1496#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1497 text_blink_ev.start ();
1537#endif 1498#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1499 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break; 1500 break;
1540 1501
1541 case UnmapNotify: 1502 case UnmapNotify:
… …
1543#ifdef TEXT_BLINK 1504#ifdef TEXT_BLINK
1544 text_blink_ev.stop (); 1505 text_blink_ev.stop ();
1545#endif 1506#endif
1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1507 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break; 1508 break;
1548
1549#ifdef TRANSPARENT
1550 case ReparentNotify:
1551 rootwin_cb (ev);
1552 break;
1553#endif /* TRANSPARENT */
1554 1509
1555 case GraphicsExpose: 1510 case GraphicsExpose:
1556 case Expose: 1511 case Expose:
1557 if (ev.xany.window == vt) 1512 if (ev.xany.window == vt)
1558 { 1513 {
1559 do 1514 do
1515 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1516 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1517 ev.xexpose.width, ev.xexpose.height, False);
1518 }
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1519 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1563 1520
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565 1522
1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1523 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1524 {
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1525 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1526 ev.xexpose.width, ev.xexpose.height, False);
1527 }
1569 1528
1570 want_refresh = 1; 1529 want_refresh = 1;
1571 } 1530 }
1572 else 1531 else
1573 { 1532 {
… …
1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1577 ; 1536 ;
1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1537 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1579 ; 1538 ;
1580 1539
1581 if (isScrollbarWindow (ev.xany.window)) 1540 if (scrollBar.state && ev.xany.window == scrollBar.win)
1582 { 1541 {
1583 scrollBar.setIdle (); 1542 scrollBar.state = STATE_IDLE;
1584 scrollbar_show (0); 1543 scrollBar.show (0);
1585 } 1544 }
1586
1587#ifdef TRANSPARENT
1588 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (dpy, ev.xany.window);
1590#endif
1591 } 1545 }
1592 break; 1546 break;
1593 1547
1594 case MotionNotify: 1548 case MotionNotify:
1595#ifdef POINTER_BLANK 1549#ifdef POINTER_BLANK
1596 if (hidden_pointer) 1550 if (hidden_pointer)
1597 pointer_unblank (); 1551 pointer_unblank ();
1598#endif 1552#endif
1553 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1554 || priv_modes & PrivMode_MouseAnyEvent)
1555 mouse_report (ev.xbutton);
1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1556 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1600 break; 1557 break;
1601 1558
1602 if (ev.xany.window == vt) 1559 if (ev.xany.window == vt)
1603 { 1560 {
… …
1637 int dist; 1594 int dist;
1638 1595
1639 /* don't clobber the current delay if we are 1596 /* don't clobber the current delay if we are
1640 * already in the middle of scrolling. 1597 * already in the middle of scrolling.
1641 */ 1598 */
1642 if (!sel_scroll_ev.active) 1599 if (!sel_scroll_ev.is_active ())
1643 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1600 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1644 1601
1645 /* save the event params so we can highlight 1602 /* save the event params so we can highlight
1646 * the selection in the pending-scroll loop 1603 * the selection in the pending-scroll loop
1647 */ 1604 */
1648 selection_save_x = ev.xbutton.x; 1605 selection_save_x = ev.xbutton.x;
… …
1670 else 1627 else
1671 { 1628 {
1672 /* we are within the text window, so we 1629 /* we are within the text window, so we
1673 * shouldn't be scrolling 1630 * shouldn't be scrolling
1674 */ 1631 */
1675 if (sel_scroll_ev.active)
1676 sel_scroll_ev.stop(); 1632 sel_scroll_ev.stop();
1677 } 1633 }
1678#endif 1634#endif
1679#ifdef MOUSE_THRESHOLD 1635#ifdef MOUSE_THRESHOLD
1680 } 1636 }
1681#endif 1637#endif
1682 } 1638 }
1683 } 1639 }
1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1640 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1685 { 1641 {
1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1642 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1687 MotionNotify, &ev)) 1643 MotionNotify, &ev))
1688 ; 1644 ;
1689 1645
… …
1691 &unused_root, &unused_child, 1647 &unused_root, &unused_child,
1692 &unused_root_x, &unused_root_y, 1648 &unused_root_x, &unused_root_y,
1693 &ev.xbutton.x, &ev.xbutton.y, 1649 &ev.xbutton.x, &ev.xbutton.y,
1694 &unused_mask); 1650 &unused_mask);
1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1651 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1696 scrollbar_size ()); 1652 scrollBar.size ());
1697 want_refresh = 1; 1653 want_refresh = 1;
1698 refresh_limit = 0;
1699 scrollbar_show (1); 1654 scrollBar.show (1);
1700 } 1655 }
1701 break; 1656 break;
1702 } 1657 }
1703 1658
1704#if defined(CURSOR_BLINK) 1659#if defined(CURSOR_BLINK)
… …
1708 { 1663 {
1709 hidden_cursor = 0; 1664 hidden_cursor = 0;
1710 want_refresh = 1; 1665 want_refresh = 1;
1711 } 1666 }
1712 1667
1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1668 cursor_blink_ev.again ();
1714 } 1669 }
1715#endif 1670#endif
1716 1671
1717#if defined(POINTER_BLANK) 1672#if defined(POINTER_BLANK)
1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1673 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1725 1680
1726 if (ev.type == KeyPress && hidden_pointer == 0) 1681 if (ev.type == KeyPress && hidden_pointer == 0)
1727 pointer_blank (); 1682 pointer_blank ();
1728 } 1683 }
1729#endif 1684#endif
1685
1686 refresh_check ();
1730} 1687}
1688
1689#if ENABLE_FRILLS
1690void
1691rxvt_term::set_urgency (bool enable)
1692{
1693 if (enable == urgency_hint)
1694 return;
1695
1696 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1697 {
1698 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1699 XSetWMHints (dpy, parent[0], h);
1700 urgency_hint = enable;
1701 }
1702}
1703#endif
1731 1704
1732void 1705void
1733rxvt_term::focus_in () 1706rxvt_term::focus_in ()
1734{ 1707{
1735 if (!focus) 1708 if (!focus)
1736 { 1709 {
1737 focus = 1; 1710 focus = 1;
1738 want_refresh = 1; 1711 want_refresh = 1;
1739 1712
1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1741
1742#if USE_XIM 1713#if USE_XIM
1743 if (Input_Context != NULL) 1714 if (Input_Context != NULL)
1744 { 1715 {
1745 IMSetPosition (); 1716 IMSetPosition ();
1746 XSetICFocus (Input_Context); 1717 XSetICFocus (Input_Context);
1747 } 1718 }
1748#endif 1719#endif
1749#if CURSOR_BLINK 1720#if CURSOR_BLINK
1750 if (option (Opt_cursorBlink)) 1721 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1722 cursor_blink_ev.again ();
1752#endif 1723#endif
1753#if OFF_FOCUS_FADING 1724#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade]) 1725 if (rs[Rs_fade])
1755 { 1726 {
1756 pix_colors = pix_colors_focused; 1727 pix_colors = pix_colors_focused;
1757 scr_recolour (); 1728 scr_recolour ();
1758 } 1729 }
1759#endif 1730#endif
1760#if ENABLE_FRILLS 1731#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell)) 1732 if (option (Opt_urgentOnBell))
1762 { 1733 set_urgency (0);
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]);
1766 if (h != NULL)
1767 {
1768 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h);
1770 }
1771 }
1772#endif 1734#endif
1735
1736 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1773 } 1737 }
1774} 1738}
1775 1739
1776void 1740void
1777rxvt_term::focus_out () 1741rxvt_term::focus_out ()
… …
1779 if (focus) 1743 if (focus)
1780 { 1744 {
1781 focus = 0; 1745 focus = 0;
1782 want_refresh = 1; 1746 want_refresh = 1;
1783 1747
1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1748#if ENABLE_FRILLS
1785 1749 if (option (Opt_urgentOnBell))
1750 set_urgency (0);
1751#endif
1786#if ENABLE_FRILLS || ISO_14755 1752#if ENABLE_FRILLS || ISO_14755
1787 if (iso14755buf) 1753 if (iso14755buf)
1788 { 1754 {
1789 iso14755buf = 0; 1755 iso14755buf = 0;
1790# if ENABLE_OVERLAY 1756# if ISO_14755
1791 scr_overlay_off (); 1757 scr_overlay_off ();
1792# endif 1758# endif
1793 } 1759 }
1794#endif 1760#endif
1795#if USE_XIM 1761#if USE_XIM
… …
1797 XUnsetICFocus (Input_Context); 1763 XUnsetICFocus (Input_Context);
1798#endif 1764#endif
1799#if CURSOR_BLINK 1765#if CURSOR_BLINK
1800 if (option (Opt_cursorBlink)) 1766 if (option (Opt_cursorBlink))
1801 cursor_blink_ev.stop (); 1767 cursor_blink_ev.stop ();
1768
1802 hidden_cursor = 0; 1769 hidden_cursor = 0;
1803#endif 1770#endif
1804#if OFF_FOCUS_FADING 1771#if OFF_FOCUS_FADING
1805 if (rs[Rs_fade]) 1772 if (rs[Rs_fade])
1806 { 1773 {
1807 pix_colors = pix_colors_unfocused; 1774 pix_colors = pix_colors_unfocused;
1808 scr_recolour (); 1775 scr_recolour ();
1809 } 1776 }
1810#endif 1777#endif
1778
1779 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1811 } 1780 }
1812} 1781}
1813 1782
1814void 1783void
1815rxvt_term::update_fade_color (unsigned int idx) 1784rxvt_term::update_fade_color (unsigned int idx)
… …
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1791 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 } 1792 }
1824#endif 1793#endif
1825} 1794}
1826 1795
1827#if TRANSPARENT || ENABLE_PERL 1796#if ENABLE_TRANSPARENCY || ENABLE_PERL
1828void 1797void
1829rxvt_term::rootwin_cb (XEvent &ev) 1798rxvt_term::rootwin_cb (XEvent &ev)
1830{ 1799{
1831 make_current (); 1800 make_current ();
1832 1801
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1802 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1803 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return; 1804 return;
1836 1805
1837# if TRANSPARENT 1806# if ENABLE_TRANSPARENCY
1838 switch (ev.type) 1807 switch (ev.type)
1839 { 1808 {
1840 case PropertyNotify: 1809 case PropertyNotify:
1841 /* 1810 /*
1842 * if user used some Esetroot compatible prog to set the root bg, 1811 * if user used some Esetroot compatible prog to set the root bg,
1843 * use the property to determine the pixmap. We use it later on. 1812 * use the property to determine the pixmap. We use it later on.
1844 */ 1813 */
1845 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1814 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1815 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1847 return; 1816 {
1817 bgPixmap.set_root_pixmap ();
1818 update_background ();
1819 }
1848 1820
1849 /* FALLTHROUGH */
1850 case ReparentNotify:
1851 if (option (Opt_transparent))
1852 check_our_parents ();
1853 break; 1821 break;
1854 } 1822 }
1855# endif 1823# endif
1824
1825 refresh_check ();
1856} 1826}
1857#endif 1827#endif
1858 1828
1859void 1829void
1860rxvt_term::button_press (XButtonEvent &ev) 1830rxvt_term::button_press (XButtonEvent &ev)
… …
1915 mouse_report (ev); 1885 mouse_report (ev);
1916 } 1886 }
1917#else 1887#else
1918 MEvent.button = ev.button; 1888 MEvent.button = ev.button;
1919 mouse_report (ev); 1889 mouse_report (ev);
1920#endif /* MOUSE_REPORT_DOUBLECLICK */ 1890#endif /* MOUSE_REPORT_DOUBLECLICK */
1921 1891
1922 } 1892 }
1923 else 1893 else
1924 { 1894 {
1925 if (ev.button != MEvent.button) 1895 if (ev.button != MEvent.button)
… …
1973 } 1943 }
1974 1944
1975 /* 1945 /*
1976 * Scrollbar window processing of button press 1946 * Scrollbar window processing of button press
1977 */ 1947 */
1978 if (isScrollbarWindow (ev.window)) 1948 if (scrollBar.state && ev.window == scrollBar.win)
1979 { 1949 {
1980 scrollBar.setIdle (); 1950 page_dirn direction = NO_DIR;
1951
1952 if (scrollBar.upButton (ev.y))
1953 direction = UP; /* up */
1954 else if (scrollBar.dnButton (ev.y))
1955 direction = DN; /* down */
1956
1957 scrollBar.state = STATE_IDLE;
1981 /* 1958 /*
1982 * Rxvt-style scrollbar: 1959 * Rxvt-style scrollbar:
1983 * move up if mouse is above slider 1960 * move up if mouse is above slider
1984 * move dn if mouse is below slider 1961 * move dn if mouse is below slider
1985 * 1962 *
… …
1994 /* 1971 /*
1995 * Mouse report disabled scrollbar: 1972 * Mouse report disabled scrollbar:
1996 * arrow buttons - send up/down 1973 * arrow buttons - send up/down
1997 * click on scrollbar - send pageup/down 1974 * click on scrollbar - send pageup/down
1998 */ 1975 */
1999 if ((scrollBar.style == R_SB_NEXT 1976 if (direction == UP)
2000 && scrollbarnext_upButton (ev.y))
2001 || (scrollBar.style == R_SB_RXVT
2002 && scrollbarrxvt_upButton (ev.y)))
2003 tt_printf ("\033[A"); 1977 tt_printf ("\033[A");
2004 else if ((scrollBar.style == R_SB_NEXT 1978 else if (direction == DN)
2005 && scrollbarnext_dnButton (ev.y))
2006 || (scrollBar.style == R_SB_RXVT
2007 && scrollbarrxvt_dnButton (ev.y)))
2008 tt_printf ("\033[B"); 1979 tt_printf ("\033[B");
2009 else 1980 else
2010 switch (ev.button) 1981 switch (ev.button)
2011 { 1982 {
2012 case Button2: 1983 case Button2:
… …
2019 tt_printf ("\033[5~"); 1990 tt_printf ("\033[5~");
2020 break; 1991 break;
2021 } 1992 }
2022 } 1993 }
2023 else 1994 else
2024#endif /* NO_SCROLLBAR_REPORT */ 1995#endif /* NO_SCROLLBAR_REPORT */
2025
2026 {
2027 char upordown = 0;
2028
2029 if (scrollBar.style == R_SB_NEXT)
2030 { 1996 {
2031 if (scrollbarnext_upButton (ev.y)) 1997 if (direction != NO_DIR)
2032 upordown = -1; /* up */
2033 else if (scrollbarnext_dnButton (ev.y))
2034 upordown = 1; /* down */
2035 }
2036 else if (scrollBar.style == R_SB_RXVT)
2037 {
2038 if (scrollbarrxvt_upButton (ev.y))
2039 upordown = -1; /* up */
2040 else if (scrollbarrxvt_dnButton (ev.y))
2041 upordown = 1; /* down */
2042 }
2043 if (upordown)
2044 { 1998 {
2045#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1999#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2000 if (!cont_scroll_ev.is_active ())
2046 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2001 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2047#endif 2002#endif
2048 if (scr_page (upordown < 0 ? UP : DN, 1)) 2003 if (scr_page (direction, 1))
2049 { 2004 {
2050 if (upordown < 0) 2005 if (direction == UP)
2051 scrollBar.setUp (); 2006 scrollBar.state = STATE_UP;
2052 else 2007 else
2053 scrollBar.setDn (); 2008 scrollBar.state = STATE_DOWN;
2054 } 2009 }
2055 } 2010 }
2056 else 2011 else
2057 switch (ev.button) 2012 switch (ev.button)
2058 { 2013 {
2059 case Button2: 2014 case Button2:
2060 switch (scrollbar_align) 2015 switch (scrollBar.align)
2061 { 2016 {
2062 case R_SB_ALIGN_TOP: 2017 case R_SB_ALIGN_TOP:
2063 csrO = 0; 2018 csrO = 0;
2064 break; 2019 break;
2065 case R_SB_ALIGN_CENTRE: 2020 case R_SB_ALIGN_CENTRE:
… …
2071 } 2026 }
2072 2027
2073 if (scrollBar.style == R_SB_XTERM 2028 if (scrollBar.style == R_SB_XTERM
2074 || scrollbar_above_slider (ev.y) 2029 || scrollbar_above_slider (ev.y)
2075 || scrollbar_below_slider (ev.y)) 2030 || scrollbar_below_slider (ev.y))
2076 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2031 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2077 2032
2078 scrollBar.setMotion (); 2033 scrollBar.state = STATE_MOTION;
2079 break; 2034 break;
2080 2035
2081 case Button1: 2036 case Button1:
2082 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2037 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2083 csrO = ev.y - scrollBar.top; 2038 csrO = ev.y - scrollBar.top;
2084 /* FALLTHROUGH */ 2039 /* FALLTHROUGH */
2085 2040
2086 case Button3: 2041 case Button3:
2087 if (scrollBar.style != R_SB_XTERM) 2042 if (scrollBar.style != R_SB_XTERM)
… …
2097 scr_page (DN, nrow - 1); 2052 scr_page (DN, nrow - 1);
2098# else 2053# else
2099 scr_page (DN, nrow / 4); 2054 scr_page (DN, nrow / 4);
2100# endif 2055# endif
2101 else 2056 else
2102 scrollBar.setMotion (); 2057 scrollBar.state = STATE_MOTION;
2103 } 2058 }
2104 else 2059 else
2105 { 2060 {
2106 scr_page ((ev.button == Button1 ? DN : UP), 2061 scr_page ((ev.button == Button1 ? DN : UP),
2107 (nrow 2062 (nrow
2108 * scrollbar_position (ev.y) 2063 * scrollbar_position (ev.y)
2109 / scrollbar_size ())); 2064 / scrollBar.size ()));
2110 } 2065 }
2111 2066
2112 break; 2067 break;
2113 } 2068 }
2114 } 2069 }
… …
2124 2079
2125 csrO = 0; /* reset csr Offset */ 2080 csrO = 0; /* reset csr Offset */
2126 if (!bypass_keystate) 2081 if (!bypass_keystate)
2127 reportmode = !! (priv_modes & PrivMode_mouse_report); 2082 reportmode = !! (priv_modes & PrivMode_mouse_report);
2128 2083
2129 if (scrollbar_isUpDn ()) 2084 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2130 { 2085 {
2131 scrollBar.setIdle (); 2086 scrollBar.state = STATE_IDLE;
2132 scrollbar_show (0); 2087 scrollBar.show (0);
2133 } 2088 }
2134 2089
2135#ifdef SELECTION_SCROLLING 2090#ifdef SELECTION_SCROLLING
2136 if (sel_scroll_ev.active)
2137 sel_scroll_ev.stop(); 2091 sel_scroll_ev.stop();
2138#endif 2092#endif
2139 2093
2140 if (ev.window == vt) 2094 if (ev.window == vt)
2141 { 2095 {
2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2096 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2166 mouse_report (ev); 2120 mouse_report (ev);
2167 } 2121 }
2168#else /* MOUSE_REPORT_DOUBLECLICK */ 2122#else /* MOUSE_REPORT_DOUBLECLICK */
2169 MEvent.button = AnyButton; 2123 MEvent.button = AnyButton;
2170 mouse_report (ev); 2124 mouse_report (ev);
2171#endif /* MOUSE_REPORT_DOUBLECLICK */ 2125#endif /* MOUSE_REPORT_DOUBLECLICK */
2172 return; 2126 return;
2173 } 2127 }
2174 2128
2175 /* 2129 /*
2176 * dumb hack to compensate for the failure of click-and-drag 2130 * dumb hack to compensate for the failure of click-and-drag
… …
2214 { 2168 {
2215 mouse_slip_wheel_speed += v ? -1 : 1; 2169 mouse_slip_wheel_speed += v ? -1 : 1;
2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2170 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2171 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2218 2172
2219 if (slip_wheel_ev.at < NOW) 2173 if (!slip_wheel_ev.is_active ())
2220 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2174 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2221
2222 slip_wheel_ev.start ();
2223 } 2175 }
2224 else 2176 else
2177# endif
2225 { 2178 {
2226# endif
2227 scr_page (v, i); 2179 scr_page (v, i);
2228 scrollbar_show (1); 2180 scrollBar.show (1);
2229# ifdef MOUSE_SLIP_WHEELING
2230 } 2181 }
2231# endif
2232 } 2182 }
2233 break; 2183 break;
2234#endif 2184#endif
2235 } 2185 }
2236 } 2186 }
2237} 2187}
2238 2188
2239#ifdef TRANSPARENT
2240#if TINTING && !defined(HAVE_AFTERIMAGE)
2241/* taken from aterm-0.4.2 */
2242
2243typedef uint32_t RUINT32T;
2244
2245void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2246{
2247 int sh_r, sh_g, sh_b;
2248 RUINT32T mask_r, mask_g, mask_b;
2249 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2250 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2251 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2252 int i;
2253
2254 Visual *visual = term->visual;
2255
2256 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2257
2258 /* for convenience */
2259 mask_r = visual->red_mask;
2260 mask_g = visual->green_mask;
2261 mask_b = visual->blue_mask;
2262
2263 /* boring lookup table pre-initialization */
2264 switch (srcImage->bits_per_pixel) {
2265 case 15:
2266 if ((mask_r != 0x7c00) ||
2267 (mask_g != 0x03e0) ||
2268 (mask_b != 0x001f))
2269 return;
2270 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2271 lookup_r = lookup;
2272 lookup_g = lookup+32;
2273 lookup_b = lookup+32+32;
2274 sh_r = 10;
2275 sh_g = 5;
2276 sh_b = 0;
2277 break;
2278 case 16:
2279 if ((mask_r != 0xf800) ||
2280 (mask_g != 0x07e0) ||
2281 (mask_b != 0x001f))
2282 return;
2283 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2284 lookup_r = lookup;
2285 lookup_g = lookup+32;
2286 lookup_b = lookup+32+64;
2287 sh_r = 11;
2288 sh_g = 5;
2289 sh_b = 0;
2290 break;
2291 case 24:
2292 if ((mask_r != 0xff0000) ||
2293 (mask_g != 0x00ff00) ||
2294 (mask_b != 0x0000ff))
2295 return;
2296 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2297 lookup_r = lookup;
2298 lookup_g = lookup+256;
2299 lookup_b = lookup+256+256;
2300 sh_r = 16;
2301 sh_g = 8;
2302 sh_b = 0;
2303 break;
2304 case 32:
2305 if ((mask_r != 0xff0000) ||
2306 (mask_g != 0x00ff00) ||
2307 (mask_b != 0x0000ff))
2308 return;
2309 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2310 lookup_r = lookup;
2311 lookup_g = lookup+256;
2312 lookup_b = lookup+256+256;
2313 sh_r = 16;
2314 sh_g = 8;
2315 sh_b = 0;
2316 break;
2317 default:
2318 return; /* we do not support this color depth */
2319 }
2320
2321 /* prepare limits for color transformation (each channel is handled separately) */
2322 if (shade < 0) {
2323 shade = -shade;
2324 if (shade < 0) shade = 0;
2325 if (shade > 100) shade = 100;
2326
2327 lower_lim_r = 65535-rm;
2328 lower_lim_g = 65535-gm;
2329 lower_lim_b = 65535-bm;
2330
2331 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2332 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2333 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2334
2335 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2336 } else {
2337 if (shade < 0) shade = 0;
2338 if (shade > 100) shade = 100;
2339
2340 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2341
2342 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2343 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2344 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2345 }
2346
2347 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2348 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2349 {
2350 unsigned int tmp;
2351
2352 tmp = lower_lim_r;
2353 lower_lim_r = lower_lim_b;
2354 lower_lim_b = tmp;
2355
2356 tmp = upper_lim_r;
2357 upper_lim_r = upper_lim_b;
2358 upper_lim_b = tmp;
2359 }
2360
2361 /* fill our lookup tables */
2362 for (i = 0; i <= mask_r>>sh_r; i++)
2363 {
2364 RUINT32T tmp;
2365 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2366 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2367 lookup_r[i] = (tmp/65535)<<sh_r;
2368 }
2369 for (i = 0; i <= mask_g>>sh_g; i++)
2370 {
2371 RUINT32T tmp;
2372 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2373 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2374 lookup_g[i] = (tmp/65535)<<sh_g;
2375 }
2376 for (i = 0; i <= mask_b>>sh_b; i++)
2377 {
2378 RUINT32T tmp;
2379 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2380 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2381 lookup_b[i] = (tmp/65535)<<sh_b;
2382 }
2383
2384 /* apply table to input image (replacing colors by newly calculated ones) */
2385 switch (srcImage->bits_per_pixel)
2386 {
2387 case 15:
2388 {
2389 unsigned short *p1, *pf, *p, *pl;
2390 p1 = (unsigned short *) srcImage->data;
2391 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2392 while (p1 < pf)
2393 {
2394 p = p1;
2395 pl = p1 + srcImage->width;
2396 for (; p < pl; p++)
2397 {
2398 *p = lookup_r[(*p & 0x7c00)>>10] |
2399 lookup_g[(*p & 0x03e0)>> 5] |
2400 lookup_b[(*p & 0x001f)];
2401 }
2402 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2403 }
2404 break;
2405 }
2406 case 16:
2407 {
2408 unsigned short *p1, *pf, *p, *pl;
2409 p1 = (unsigned short *) srcImage->data;
2410 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2411 while (p1 < pf)
2412 {
2413 p = p1;
2414 pl = p1 + srcImage->width;
2415 for (; p < pl; p++)
2416 {
2417 *p = lookup_r[(*p & 0xf800)>>11] |
2418 lookup_g[(*p & 0x07e0)>> 5] |
2419 lookup_b[(*p & 0x001f)];
2420 }
2421 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2422 }
2423 break;
2424 }
2425 case 24:
2426 {
2427 unsigned char *p1, *pf, *p, *pl;
2428 p1 = (unsigned char *) srcImage->data;
2429 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2430 while (p1 < pf)
2431 {
2432 p = p1;
2433 pl = p1 + srcImage->width * 3;
2434 for (; p < pl; p += 3)
2435 {
2436 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2437 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2438 p[2] = lookup_r[(p[2] & 0x0000ff)];
2439 }
2440 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2441 }
2442 break;
2443 }
2444 case 32:
2445 {
2446 RUINT32T *p1, *pf, *p, *pl;
2447 p1 = (RUINT32T *) srcImage->data;
2448 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2449
2450 while (p1 < pf)
2451 {
2452 p = p1;
2453 pl = p1 + srcImage->width;
2454 for (; p < pl; p++)
2455 {
2456 *p = lookup_r[(*p & 0xff0000)>>16] |
2457 lookup_g[(*p & 0x00ff00)>> 8] |
2458 lookup_b[(*p & 0x0000ff)] |
2459 (*p & ~0xffffff);
2460 }
2461 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2462 }
2463 break;
2464 }
2465 }
2466
2467 free (lookup);
2468}
2469#endif
2470
2471/*
2472 * Check our parents are still who we think they are.
2473 * Do transparency updates if required
2474 */
2475int
2476rxvt_term::check_our_parents ()
2477{
2478#if TRANSPARENT || ENABLE_PERL
2479 check_our_aprents_ev.stop();
2480 check_our_aprents_ev.start(NOW + 1./3.);
2481#endif
2482 return 0;
2483}
2484
2485void
2486rxvt_term::check_our_parents_cb (time_watcher &w)
2487{
2488 int i, pchanged, aformat, have_pixmap, rootdepth;
2489 unsigned long nitems, bytes_after;
2490 Atom atype;
2491 unsigned char *prop = NULL;
2492 Window root, oldp, *list;
2493 Pixmap rootpixmap = None;
2494 XWindowAttributes wattr, wrootattr;
2495 int sx, sy;
2496 Window cr;
2497
2498 pchanged = 0;
2499
2500 if (!option (Opt_transparent))
2501 return /*pchanged*/; /* Don't try any more */
2502
2503 XGetWindowAttributes (dpy, display->root, &wrootattr);
2504 rootdepth = wrootattr.depth;
2505
2506 XGetWindowAttributes (dpy, parent[0], &wattr);
2507
2508 if (rootdepth != wattr.depth)
2509 {
2510 if (am_transparent)
2511 {
2512 pchanged = 1;
2513 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2514 am_transparent = am_pixmap_trans = 0;
2515 }
2516
2517 return /*pchanged*/; /* Don't try any more */
2518 }
2519
2520 /* Get all X ops out of the queue so that our information is up-to-date. */
2521 XSync (dpy, False);
2522
2523 XTranslateCoordinates (dpy, parent[0], display->root,
2524 0, 0, &sx, &sy, &cr);
2525
2526 /* check if we are outside of the visible part of the virtual screen : */
2527 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
2528 || sx >= wrootattr.width || sy >= wrootattr.height )
2529 return /* 0 */ ;
2530 /*
2531 * Make the frame window set by the window manager have
2532 * the root background. Some window managers put multiple nested frame
2533 * windows for each client, so we have to take care about that.
2534 */
2535 i = (xa[XA_XROOTPMAP_ID]
2536 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2537 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2538 &nitems, &bytes_after, &prop) == Success);
2539
2540 if (!i || prop == NULL)
2541 i = (xa[XA_ESETROOT_PMAP_ID]
2542 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2543 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2544 &nitems, &bytes_after, &prop) == Success);
2545
2546 if (!i || prop == NULL
2547#if TINTING
2548 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
2549#ifdef HAVE_AFTERIMAGE
2550 && original_asim == NULL && rs[Rs_blurradius] == NULL
2551#endif
2552 )
2553#endif
2554 )
2555 have_pixmap = 0;
2556 else
2557 {
2558 have_pixmap = 1;
2559 rootpixmap = *(Pixmap *)prop;
2560 XFree (prop);
2561 }
2562
2563 if (have_pixmap)
2564 {
2565 Bool success = False ;
2566 GC gc;
2567 XGCValues gcvalue;
2568#ifdef HAVE_AFTERIMAGE
2569 {
2570 Pixmap tmp_pmap = None ;
2571 ShadingInfo shade;
2572 ARGB32 tint ;
2573 unsigned int pmap_w = 0, pmap_h = 0;
2574
2575 if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h ))
2576 {
2577 int root_x = 0, root_y = 0;
2578
2579 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2580 if (ISSET_PIXCOLOR (Color_tint))
2581 {
2582 rgba c;
2583 pix_colors_focused [Color_tint].get (c);
2584 shade.tintColor.red = c.r;
2585 shade.tintColor.green = c.g;
2586 shade.tintColor.blue = c.b;
2587 }
2588 else
2589 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF;
2590 tint = shading2tint32( &shade );
2591 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2592 if (GetWinPosition (parent[0], &root_x, &root_y) )
2593 {
2594 ASImageLayer *layers = create_image_layers( 2 );
2595 ASImage *merged_im = NULL;
2596 int back_x, back_y, back_w, back_h;
2597 /* merge_layers does good job at tiling background appropriately,
2598 so all we need is to cut out smallest possible piece : */
2599#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
2600 do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
2601 back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \
2602 if( pmap_##wh >= back_##xy + szHint.widthheight ) \
2603 back_##wh = szHint.widthheight;/* background is large - limit it by our size */ \
2604 else \
2605 { /* small background - need the whole of it for successfull tiling :*/ \
2606 back_##xy = 0; \
2607 back_##wh = pmap_##wh; \
2608 }}while(0)
2609
2610 MAKE_ROOTPMAP_GEOM(x,w,width);
2611 MAKE_ROOTPMAP_GEOM(y,h,height);
2612
2613 layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100);
2614 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
2615 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
2616 layers[0].clip_width = szHint.width;
2617 layers[0].clip_height = szHint.height;
2618 layers[0].tint = tint;
2619 if (rs[Rs_blurradius] && layers[0].im)
2620 {
2621 double r = atof(rs[Rs_blurradius]);
2622 ASImage* tmp = blur_asimage_gauss(display->asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT );
2623 if( tmp )
2624 {
2625 destroy_asimage( &layers[0].im );
2626 layers[0].im = tmp;
2627 }
2628 }
2629 if (original_asim != NULL)
2630 {
2631 int fore_w, fore_h;
2632 layers[1].im = original_asim;
2633 if( bgPixmap.auto_resize )
2634 {
2635 fore_w = szHint.width;
2636 fore_h = szHint.height;
2637 }
2638 else
2639 {
2640 fore_w = bgPixmap.w;
2641 fore_h = bgPixmap.h;
2642 }
2643 if (fore_w != original_asim->width
2644 || fore_h != original_asim->height)
2645 {
2646 layers[1].im = scale_asimage( display->asv,
2647 original_asim,
2648 fore_w, fore_h,
2649 ASA_ASImage, 100,
2650 ASIMAGE_QUALITY_DEFAULT );
2651 }
2652
2653 layers[1].clip_width = szHint.width;
2654 layers[1].clip_height = szHint.height;
2655
2656 if (rs[Rs_blendtype])
2657 {
2658 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]);
2659 if( layers[1].merge_scanlines == NULL )
2660 layers[1].merge_scanlines = alphablend_scanlines;
2661 }
2662 }
2663 merged_im = merge_layers( display->asv, layers, layers[1].im?2:1,
2664 szHint.width, szHint.height,
2665 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT );
2666 if (layers[1].im != original_asim)
2667 destroy_asimage( &(layers[1].im) );
2668 destroy_asimage( &(layers[0].im) );
2669 if (merged_im != NULL)
2670 {
2671 tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True );
2672 destroy_asimage( &merged_im );
2673 }
2674 free( layers );
2675 }
2676 }
2677 if (tmp_pmap != None)
2678 {
2679 success = True;
2680 if (pixmap != None)
2681 XFreePixmap (dpy, pixmap);
2682 pixmap = tmp_pmap;
2683 }
2684 }
2685#else /* HAVE_AFTERIMAGE */
2686 {
2687 /*
2688 * Copy display->root pixmap transparency
2689 */
2690 int nx, ny;
2691 unsigned int nw, nh;
2692 XImage *image;
2693
2694 nw = (unsigned int)szHint.width;
2695 nh = (unsigned int)szHint.height;
2696 nx = ny = 0;
2697
2698 if (sx < 0)
2699 {
2700 nw += sx;
2701 nx = -sx;
2702 sx = 0;
2703 }
2704
2705 if (sy < 0)
2706 {
2707 nh += sy;
2708 ny = -sy;
2709 sy = 0;
2710 }
2711
2712 min_it (nw, (unsigned int) (wrootattr.width - sx));
2713 min_it (nh, (unsigned int) (wrootattr.height - sy));
2714
2715 XSync (dpy, False);
2716 allowedxerror = -1;
2717 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2718
2719 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2720 /* XXX: may need a delay here? */
2721 allowedxerror = 0;
2722 if (image != NULL)
2723 {
2724 if (pixmap != None)
2725 XFreePixmap (dpy, pixmap);
2726
2727#if TINTING
2728 if (ISSET_PIXCOLOR (Color_tint))
2729 {
2730 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2731
2732 rgba c;
2733 pix_colors_focused [Color_tint].get (c);
2734 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2735 }
2736#endif
2737
2738 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2739 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2740 XPutImage (dpy, pixmap, gc, image, 0, 0,
2741 nx, ny, image->width, image->height);
2742 XDestroyImage (image);
2743 success = True ;
2744 }
2745 }
2746#endif /* HAVE_AFTERIMAGE */
2747 if (gc != NULL)
2748 XFreeGC (dpy, gc);
2749
2750 if (!success)
2751 {
2752 if (am_transparent && am_pixmap_trans)
2753 {
2754 pchanged = 1;
2755 if (pixmap != None)
2756 {
2757 XFreePixmap (dpy, pixmap);
2758 pixmap = None;
2759 }
2760 }
2761
2762 am_pixmap_trans = 0;
2763 }
2764 else
2765 {
2766 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2767 XClearWindow (dpy, parent[0]);
2768
2769 if (!am_transparent || !am_pixmap_trans)
2770 pchanged = 1;
2771
2772 am_transparent = am_pixmap_trans = 1;
2773 }
2774 }
2775
2776 if (am_pixmap_trans)
2777 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2778 else
2779 {
2780 unsigned int n;
2781 /*
2782 * InheritPixmap transparency
2783 */
2784 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2785 {
2786 oldp = parent[i];
2787 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2788 XFree (list);
2789
2790 if (parent[i] == display->root)
2791 {
2792 if (oldp != None)
2793 pchanged = 1;
2794
2795 break;
2796 }
2797
2798 if (oldp != parent[i])
2799 pchanged = 1;
2800 }
2801
2802 n = 0;
2803
2804 if (pchanged)
2805 for (; n < (unsigned int)i; n++)
2806 {
2807 XGetWindowAttributes (dpy, parent[n], &wattr);
2808
2809 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2810 {
2811 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2812 break;
2813 }
2814 }
2815
2816 if (n > (sizeof (parent) / sizeof (parent[0])))
2817 {
2818 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2819 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2820 am_transparent = 0;
2821 /* XXX: also turn off Opt_transparent? */
2822 }
2823 else
2824 {
2825 for (n = 0; n < (unsigned int)i; n++)
2826 {
2827 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2828 XClearWindow (dpy, parent[n]);
2829 }
2830
2831 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2832 am_transparent = 1;
2833 }
2834
2835 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2836 parent[i] = None;
2837 }
2838
2839 if (scrollBar.win)
2840 {
2841 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2842 scrollBar.setIdle ();
2843 scrollbar_show (0);
2844 }
2845
2846 if (am_transparent)
2847 {
2848 want_refresh = want_full_refresh = 1;
2849 if (am_pixmap_trans)
2850 flush ();
2851 }
2852
2853// return pchanged;
2854}
2855#endif
2856
2857/*}}} */ 2189/*}}} */
2858 2190
2859bool 2191void
2860rxvt_term::cmd_parse () 2192rxvt_term::cmd_parse ()
2861{ 2193{
2862 bool flag = false;
2863 wchar_t ch = NOCHAR; 2194 wchar_t ch = NOCHAR;
2864 char *seq_begin; // remember start of esc-sequence here 2195 char *seq_begin; // remember start of esc-sequence here
2865 2196
2866 for (;;) 2197 for (;;)
2867 { 2198 {
2868 if (ch == NOCHAR) 2199 if (expect_false (ch == NOCHAR))
2869 { 2200 {
2870 seq_begin = cmdbuf_ptr; 2201 seq_begin = cmdbuf_ptr;
2871 ch = next_char (); 2202 ch = next_char ();
2872 2203
2873 if (ch == NOCHAR) 2204 if (ch == NOCHAR)
2874 break; 2205 break;
2875 } 2206 }
2876 2207
2877 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2208 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2878 { 2209 {
2879 if (!seen_input) 2210 if (expect_false (!seen_input))
2880 { 2211 {
2881 seen_input = 1; 2212 seen_input = 1;
2882 // many badly-written programs (e.g. jed) contain a race condition: 2213 // many badly-written programs (e.g. jed) contain a race condition:
2883 // they first read the screensize and then install a SIGWINCH handler. 2214 // they first read the screensize and then install a SIGWINCH handler.
2884 // some window managers resize the window early, and these programs 2215 // some window managers resize the window early, and these programs
… …
2897 wchar_t *str = buf; 2228 wchar_t *str = buf;
2898 wchar_t *eol = str + min (ncol, UBUFSIZ); 2229 wchar_t *eol = str + min (ncol, UBUFSIZ);
2899 2230
2900 for (;;) 2231 for (;;)
2901 { 2232 {
2902 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2233 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2903 break; 2234 break;
2904 2235
2905 *str++ = ch; 2236 *str++ = ch;
2906 2237
2907 if (ch == C0_LF || str >= eol) 2238 if (expect_false (ch == C0_LF || str >= eol))
2908 { 2239 {
2909 if (ch == C0_LF) 2240 if (ch == C0_LF)
2910 nlines++; 2241 nlines++;
2911 2242
2912 refresh_count++; 2243 refresh_count++;
2913 2244
2914 if (!option (Opt_jumpScroll) 2245 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2915 || (refresh_count >= refresh_limit * (nrow - 1)))
2916 { 2246 {
2917 refreshnow = true;
2918 refresh_count = 0; 2247 refresh_count = 0;
2248
2249 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2250 {
2251 refreshnow = true;
2919 ch = NOCHAR; 2252 ch = NOCHAR;
2920 break; 2253 break;
2254 }
2921 } 2255 }
2922 2256
2923 // scr_add_lines only works for nlines <= nrow - 1. 2257 // scr_add_lines only works for nlines <= nrow - 1.
2924 if (nlines >= nrow - 1) 2258 if (nlines >= nrow - 1)
2925 { 2259 {
… …
2953 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2287 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2954 scr_add_lines (buf, str - buf, nlines); 2288 scr_add_lines (buf, str - buf, nlines);
2955 2289
2956 /* 2290 /*
2957 * If there have been a lot of new lines, then update the screen 2291 * If there have been a lot of new lines, then update the screen
2958 * What the heck I'll cheat and only refresh less than every page-full. 2292 * What the heck we'll cheat and only refresh less than every page-full.
2959 * the number of pages between refreshes is refresh_limit, which 2293 * if skipScroll is enabled.
2960 * is incremented here because we must be doing flat-out scrolling.
2961 */ 2294 */
2962 if (refreshnow) 2295 if (refreshnow)
2963 { 2296 {
2964 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2965 refresh_limit++;
2966 else
2967 {
2968 flag = true;
2969 //TODO: due to popular request, implement "skipscroll" option here
2970 scr_refresh (); 2297 scr_refresh ();
2971 want_refresh = 1; 2298 want_refresh = 1;
2972 }
2973 } 2299 }
2974
2975 } 2300 }
2976 else 2301 else
2977 { 2302 {
2978 try 2303 try
2979 { 2304 {
… …
2987 } 2312 }
2988 2313
2989 ch = NOCHAR; 2314 ch = NOCHAR;
2990 } 2315 }
2991 } 2316 }
2992
2993 return flag;
2994} 2317}
2995 2318
2996// read the next character 2319// read the next character
2997wchar_t 2320wchar_t
2998rxvt_term::next_char () NOTHROW 2321rxvt_term::next_char () NOTHROW
2999{ 2322{
3000 while (cmdbuf_ptr < cmdbuf_endp) 2323 while (cmdbuf_ptr < cmdbuf_endp)
3001 { 2324 {
3002 // assume 7-bit to be ascii ALWAYS 2325 // assume 7-bit to be ascii ALWAYS
3003 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2326 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
3004 return *cmdbuf_ptr++; 2327 return *cmdbuf_ptr++;
3005 2328
3006 wchar_t wc; 2329 wchar_t wc;
3007 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2330 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
3008 2331
… …
3012 cmdbuf_ptr = cmdbuf_endp; 2335 cmdbuf_ptr = cmdbuf_endp;
3013 break; 2336 break;
3014 } 2337 }
3015 2338
3016 if (len == (size_t)-1) 2339 if (len == (size_t)-1)
2340 {
2341 mbstate.reset (); // reset now undefined conversion state
3017 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2342 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2343 }
3018 2344
3019 // assume wchar == unicode 2345 // assume wchar == unicode
3020 cmdbuf_ptr += len; 2346 cmdbuf_ptr += len;
3021 return wc & UNICODE_MASK; 2347 return wc & UNICODE_MASK;
3022 } 2348 }
… …
3066/*----------------------------------------------------------------------*/ 2392/*----------------------------------------------------------------------*/
3067#ifdef PRINTPIPE 2393#ifdef PRINTPIPE
3068FILE * 2394FILE *
3069rxvt_term::popen_printer () 2395rxvt_term::popen_printer ()
3070{ 2396{
3071 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2397 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
3072 2398
3073 if (stream == NULL) 2399 if (stream == NULL)
3074 rxvt_warn ("can't open printer pipe, not printing.\n"); 2400 rxvt_warn ("can't open printer pipe, not printing.\n");
3075 2401
3076 return stream; 2402 return stream;
… …
3087 * simulate attached vt100 printer 2413 * simulate attached vt100 printer
3088 */ 2414 */
3089void 2415void
3090rxvt_term::process_print_pipe () 2416rxvt_term::process_print_pipe ()
3091{ 2417{
3092 int done; 2418 FILE *fd = popen_printer ();
3093 FILE *fd;
3094 2419
3095 if ((fd = popen_printer ()) == NULL) 2420 if (!fd)
3096 return; 2421 return;
3097 2422
3098 /* 2423 /*
3099 * Send all input to the printer until either ESC[4i or ESC[?4i 2424 * Send all input to the printer until either ESC[4i or ESC[?4i
3100 * is received. 2425 * is received.
3101 */ 2426 */
3102 for (done = 0; !done;) 2427 for (int done = 0; !done; )
3103 { 2428 {
3104 unsigned char buf[8]; 2429 unsigned char buf[8];
3105 unicode_t ch; 2430 unicode_t ch;
3106 unsigned int i, len; 2431 unsigned int i, len;
3107 2432
… …
3126 { 2451 {
3127 if ((buf[len++] = cmd_getc ()) == 'i') 2452 if ((buf[len++] = cmd_getc ()) == 'i')
3128 break; /* done = 1 */ 2453 break; /* done = 1 */
3129 } 2454 }
3130 } 2455 }
3131 2456
3132 for (i = 0; i < len; i++) 2457 for (i = 0; i < len; i++)
3133 if (putc (buf[i], fd) == EOF) 2458 if (putc (buf[i], fd) == EOF)
3134 { 2459 {
3135 done = 1; 2460 done = 1;
3136 break; 2461 break;
… …
3138 } 2463 }
3139 } 2464 }
3140 2465
3141 pclose_printer (fd); 2466 pclose_printer (fd);
3142} 2467}
3143#endif /* PRINTPIPE */ 2468#endif /* PRINTPIPE */
3144/*}}} */ 2469/*}}} */
3145 2470
3146/* *INDENT-OFF* */ 2471/* *INDENT-OFF* */
3147enum { 2472enum {
3148 C1_40 = 0x40, 2473 C1_40 = 0x40,
… …
3198 process_dcs_seq (); 2523 process_dcs_seq ();
3199 break; 2524 break;
3200 case 0x9b: /* CSI */ 2525 case 0x9b: /* CSI */
3201 process_csi_seq (); 2526 process_csi_seq ();
3202 break; 2527 break;
3203 case 0x9d: /* CSI */ 2528 case 0x9d: /* OSC */
3204 process_osc_seq (); 2529 process_osc_seq ();
3205 break; 2530 break;
3206#endif 2531#endif
3207 } 2532 }
3208} 2533}
… …
3252 break; 2577 break;
3253 case 'Z': /* identify the terminal type */ 2578 case 'Z': /* identify the terminal type */
3254 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2579 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3255 break; 2580 break;
3256 case '<': /* turn off VT52 mode */ 2581 case '<': /* turn off VT52 mode */
3257 PrivMode (0, PrivMode_vt52); 2582 set_privmode (PrivMode_vt52, 0);
3258 break; 2583 break;
3259 case 'F': /* use special graphics character set */ 2584 case 'F': /* use special graphics character set */
3260 case 'G': /* use regular character set */ 2585 case 'G': /* use regular character set */
3261 /* unimplemented */ 2586 /* unimplemented */
3262 break; 2587 break;
… …
3316 scr_forwardindex (); 2641 scr_forwardindex ();
3317 break; 2642 break;
3318#endif 2643#endif
3319 case '=': 2644 case '=':
3320 case '>': 2645 case '>':
3321 PrivMode ((ch == '='), PrivMode_aplKP); 2646 set_privmode (PrivMode_aplKP, ch == '=');
3322 break; 2647 break;
3323 2648
3324 case C1_40: 2649 case C1_40:
3325 cmd_getc (); 2650 cmd_getc ();
3326 break; 2651 break;
… …
3365 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2690 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3366 case C1_SCI: /* ESC Z */ 2691 case C1_SCI: /* ESC Z */
3367 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2692 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3368 break; /* steal obsolete ESC [ c */ 2693 break; /* steal obsolete ESC [ c */
3369 2694
3370 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2695 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3371 case C1_CSI: /* ESC [ */ 2696 case C1_CSI: /* ESC [ */
3372 process_csi_seq (); 2697 process_csi_seq ();
3373 break; 2698 break;
3374 2699
3375 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2700 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3376 case C1_OSC: /* ESC ] */ 2701 case C1_OSC: /* ESC ] */
3377 process_osc_seq (); 2702 process_osc_seq ();
3378 break; 2703 break;
3379 2704
3380 /* 8.3.106: RESET TO INITIAL STATE */ 2705 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3381 case 'c': 2706 case 'c':
3382 mbstate.reset (); 2707 mbstate.reset ();
3383 scr_poweron (); 2708 scr_poweron ();
3384 scrollbar_show (1); 2709 scrollBar.show (1);
3385 break; 2710 break;
3386 2711
3387 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2712 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3388 case 'n': 2713 case 'n':
3389 scr_charset_choose (2); 2714 scr_charset_choose (2);
… …
3434rxvt_term::process_csi_seq () 2759rxvt_term::process_csi_seq ()
3435{ 2760{
3436 unicode_t ch, priv, i; 2761 unicode_t ch, priv, i;
3437 unsigned int nargs, p; 2762 unsigned int nargs, p;
3438 int n, ndef; 2763 int n, ndef;
3439 int arg[ESC_ARGS]; 2764 int arg[ESC_ARGS] = { };
3440 2765
3441 for (nargs = ESC_ARGS; nargs > 0;) 2766 nargs = 0;
3442 arg[--nargs] = 0;
3443 2767
3444 priv = 0; 2768 priv = 0;
3445 ch = cmd_getc (); 2769 ch = cmd_getc ();
3446 if (ch >= '<' && ch <= '?') 2770 if ((ch >= '<' && ch <= '?') || ch == '!')
2771 {
3447 { /* '<' '=' '>' '?' */ 2772 /* '<' '=' '>' '?' '!' */
3448 priv = ch; 2773 priv = ch;
3449 ch = cmd_getc (); 2774 ch = cmd_getc ();
3450 } 2775 }
3451 2776
3452 /* read any numerical arguments */ 2777 /* read any numerical arguments */
… …
3491 switch (priv) 2816 switch (priv)
3492 { 2817 {
3493 case '>': 2818 case '>':
3494 if (ch == CSI_DA) /* secondary device attributes */ 2819 if (ch == CSI_DA) /* secondary device attributes */
3495 { 2820 {
3496 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2821 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3497 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2822 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3498 // 2823 //
3499 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2824 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3500 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2825 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3501 // that we do not support xterm mouse reporting (should be 95 when we do). 2826 // versions.
3502 // 2827 //
3503 tt_printf ("\033[>%d;94;0c", 'U'); 2828 tt_printf ("\033[>%d;95;0c", 'U');
3504 } 2829 }
3505 break; 2830 break;
2831
3506 case '?': 2832 case '?':
3507 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2833 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3508 process_terminal_mode (ch, priv, nargs, arg); 2834 process_terminal_mode (ch, priv, nargs, arg);
3509 break; 2835 break;
2836
2837 case '!':
2838 if (ch == CSI_70)
2839 {
2840 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2841 scr_soft_reset ();
2842
2843 static const int pm_h[] = { 7, 25 };
2844 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2845
2846 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2847 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
3510 } 2848 }
2849 break;
2850 }
2851
3511 return; 2852 return;
3512 } 2853 }
3513 2854
3514 switch (ch) 2855 switch (ch)
3515 { 2856 {
… …
3954 int saveop = op; 3295 int saveop = op;
3955 3296
3956 dLocal (Display *, dpy); 3297 dLocal (Display *, dpy);
3957 3298
3958 assert (str != NULL); 3299 assert (str != NULL);
3959 3300
3960 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3301 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3961 return; 3302 return;
3962 3303
3963 switch (op) 3304 switch (op)
3964 { 3305 {
… …
4026 *buf++ = '\0'; 3367 *buf++ = '\0';
4027 3368
4028 process_color_seq (op, color, name, resp); 3369 process_color_seq (op, color, name, resp);
4029 } 3370 }
4030 break; 3371 break;
3372 case Rxvt_restoreFG:
4031 case XTerm_Color00: 3373 case XTerm_Color00:
4032 process_color_seq (op, Color_fg, str, resp); 3374 process_color_seq (op, Color_fg, str, resp);
4033 break; 3375 break;
3376 case Rxvt_restoreBG:
4034 case XTerm_Color01: 3377 case XTerm_Color01:
4035 process_color_seq (op, Color_bg, str, resp); 3378 process_color_seq (op, Color_bg, str, resp);
4036 break; 3379 break;
4037#ifndef NO_CURSORCOLOR 3380#ifndef NO_CURSORCOLOR
4038 case XTerm_Color_cursor: 3381 case XTerm_Color_cursor:
… …
4059 break; 3402 break;
4060 case URxvt_Color_IT: 3403 case URxvt_Color_IT:
4061 process_color_seq (op, Color_IT, str, resp); 3404 process_color_seq (op, Color_IT, str, resp);
4062 break; 3405 break;
4063#endif 3406#endif
4064#if TRANSPARENT && TINTING 3407 case URxvt_Color_border:
3408 process_color_seq (op, Color_border, str, resp);
3409 break;
3410#if ENABLE_TRANSPARENCY
4065 case URxvt_Color_tint: 3411 case URxvt_Color_tint:
4066 process_color_seq (op, Color_tint, str, resp); 3412 process_color_seq (op, Color_tint, str, resp);
3413 {
3414 bool changed = false;
4067 3415
4068 check_our_parents (); 3416 if (ISSET_PIXCOLOR (Color_tint))
3417 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3418 else
3419 changed = bgPixmap.unset_tint ();
4069 3420
4070 if (am_transparent) 3421 if (changed)
4071 want_full_refresh = want_refresh = 1; 3422 update_background ();
3423 }
4072 3424
4073 break; 3425 break;
4074#endif 3426#endif
4075 3427
3428#if BG_IMAGE_FROM_FILE
4076 case Rxvt_Pixmap: 3429 case Rxvt_Pixmap:
4077 { 3430 if (!strcmp (str, "?"))
4078 if (*str != ';')
4079 { 3431 {
4080#if XPM_BACKGROUND 3432 char str[256];
4081 scale_pixmap (""); /* reset to default scaling */ 3433
4082 set_bgPixmap (str); /* change pixmap */ 3434 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
4083 scr_touch (true); 3435 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
4084#endif 3436 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3437 process_xterm_seq (XTerm_title, str, CHAR_ST);
4085 } 3438 }
4086 3439 else
3440 {
4087 int changed = 0; 3441 int changed = 0;
4088 3442
4089 while ((str = strchr (str, ';')) != NULL) 3443 if (*str != ';')
4090 { 3444 {
3445 /* reset to default scaling :*/
3446 bgPixmap.unset_geometry ();
3447 if (bgPixmap.set_file (str)) /* change pixmap */
3448 changed++;
3449 str = strchr (str, ';');
3450 if (str == NULL)
3451 bgPixmap.set_defaultGeometry ();
3452 }
3453
3454 while (str)
3455 {
4091 str++; 3456 str++;
4092#if XPM_BACKGROUND 3457 if (bgPixmap.set_geometry (str))
4093 changed += scale_pixmap (str); 3458 changed++;
4094#endif 3459 str = strchr (str, ';');
4095 } 3460 }
4096 3461
4097 if (changed) 3462 if (changed)
4098 { 3463 update_background ();
4099#ifdef XPM_BACKGROUND
4100 resize_pixmap ();
4101 scr_touch (true);
4102#endif
4103 } 3464 }
4104#if TRANSPARENT && defined(HAVE_AFTERIMAGE) 3465 break;
4105 if (option(Opt_transparent))
4106 check_our_parents ();
4107#endif 3466#endif
4108
4109 }
4110 break;
4111
4112 case Rxvt_restoreFG:
4113 set_window_color (Color_fg, str);
4114 break;
4115 case Rxvt_restoreBG:
4116 set_window_color (Color_bg, str);
4117 break;
4118 3467
4119 case XTerm_logfile: 3468 case XTerm_logfile:
4120 // TODO, when secure mode? 3469 // TODO, when secure mode?
4121 break; 3470 break;
4122 3471
… …
4189 break; 3538 break;
4190#endif 3539#endif
4191 3540
4192#if ENABLE_PERL 3541#if ENABLE_PERL
4193 case URxvt_perl: 3542 case URxvt_perl:
4194 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3543 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
4195 ; // no responses yet
4196 break; 3544 break;
4197#endif 3545#endif
4198 } 3546 }
4199} 3547}
4200/*----------------------------------------------------------------------*/ 3548/*----------------------------------------------------------------------*/
… …
4223 { 3571 {
4224 if (mode == 'r') 3572 if (mode == 'r')
4225 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3573 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4226 else 3574 else
4227 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3575 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4228 PrivMode (state, bit); 3576 set_privmode (bit, state);
4229 } 3577 }
4230 3578
4231 return state; 3579 return state;
4232} 3580}
4233 3581
… …
4237{ 3585{
4238 unsigned int i, j; 3586 unsigned int i, j;
4239 int state; 3587 int state;
4240 3588
4241 static const struct 3589 static const struct
4242 { 3590 {
4243 const int argval; 3591 const int argval;
4244 const unsigned long bit; 3592 const unsigned long bit;
4245 }
4246
4247 argtopriv[] = { 3593 } argtopriv[] = {
4248 { 1, PrivMode_aplCUR }, 3594 { 1, PrivMode_aplCUR }, // DECCKM
4249 { 2, PrivMode_vt52 }, 3595 { 2, PrivMode_vt52 },
4250 { 3, PrivMode_132 }, 3596 { 3, PrivMode_132 }, // DECCOLM
4251 { 4, PrivMode_smoothScroll }, 3597 { 4, PrivMode_smoothScroll }, // DECSCLM
4252 { 5, PrivMode_rVideo }, 3598 { 5, PrivMode_rVideo }, // DECSCNM
4253 { 6, PrivMode_relOrigin }, 3599 { 6, PrivMode_relOrigin }, // DECOM
4254 { 7, PrivMode_Autowrap }, 3600 { 7, PrivMode_Autowrap }, // DECAWM
4255 // 8, bi-directional support mode 3601 // 8, auto-repeat keys // DECARM
4256 { 9, PrivMode_MouseX10 }, 3602 { 9, PrivMode_MouseX10 },
4257 // 18, 19 printing-related 3603 // 18 end FF to printer after print screen
3604 // 19 Print screen prints full screen/scorll region
4258 { 25, PrivMode_VisibleCursor }, 3605 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4259#ifdef scrollBar_esc 3606#ifdef scrollBar_esc
4260 { scrollBar_esc, PrivMode_scrollBar }, 3607 { scrollBar_esc, PrivMode_scrollBar },
4261#endif 3608#endif
4262 { 35, PrivMode_ShiftKeys }, // rxvt extension 3609 { 35, PrivMode_ShiftKeys }, // rxvt extension
3610 // 38, tektronix mode // DECTEK
4263 { 40, PrivMode_132OK }, 3611 { 40, PrivMode_132OK },
4264 // 41 xterm more fixes NYI 3612 // 41 xterm more fixes NYI
4265 // 45 margin bell NYI 3613 // 45 margin bell NYI
4266 // 46 start logging 3614 // 46 start logging
4267 { 47, PrivMode_Screen }, 3615 { 47, PrivMode_Screen },
4268 { 66, PrivMode_aplKP }, 3616 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4269#ifndef NO_BACKSPACE_KEY 3617#ifndef NO_BACKSPACE_KEY
4270 { 67, PrivMode_BackSpace }, 3618 { 67, PrivMode_BackSpace }, // DECBKM
4271#endif 3619#endif
4272 { 1000, PrivMode_MouseX11 }, 3620 { 1000, PrivMode_MouseX11 },
4273 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3621 { 1002, PrivMode_MouseBtnEvent },
4274 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3622 { 1003, PrivMode_MouseAnyEvent },
4275 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4276 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3623 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4277 { 1011, PrivMode_Keypress }, // rxvt extension 3624 { 1011, PrivMode_Keypress }, // rxvt extension
4278 // 1035 enable modifiers for alt, numlock NYI 3625 // 1035 enable modifiers for alt, numlock NYI
4279 // 1036 send ESC for meta keys NYI 3626 // 1036 send ESC for meta keys NYI
4280 // 1037 send DEL for keypad delete NYI 3627 // 1037 send DEL for keypad delete NYI
4281 { 1047, PrivMode_Screen }, 3628 { 1047, PrivMode_Screen },
4282 // 1048 save and restore cursor 3629 // 1048 save and restore cursor
4283 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3630 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4284 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3631 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3632 { 2004, PrivMode_BracketPaste },
4285 }; 3633 };
4286 3634
4287 if (nargs == 0) 3635 if (nargs == 0)
4288 return; 3636 return;
4289 3637
… …
4314 3662
4315 scr_touch (true); 3663 scr_touch (true);
4316 break; 3664 break;
4317#endif 3665#endif
4318 case 1048: /* alternative cursor save */ 3666 case 1048: /* alternative cursor save */
4319 case 1049:
4320 if (option (Opt_secondaryScreen)) 3667 if (option (Opt_secondaryScreen))
4321 if (mode == 0) 3668 if (mode == 0)
4322 scr_cursor (RESTORE); 3669 scr_cursor (RESTORE);
4323 else if (mode == 1) 3670 else if (mode == 1)
4324 scr_cursor (SAVE); 3671 scr_cursor (SAVE);
… …
4333 case 2: /* VT52 mode */ 3680 case 2: /* VT52 mode */
4334 /* oddball mode. should be set regardless of set/reset 3681 /* oddball mode. should be set regardless of set/reset
4335 * parameter. Return from VT52 mode with an ESC < from 3682 * parameter. Return from VT52 mode with an ESC < from
4336 * within VT52 mode 3683 * within VT52 mode
4337 */ 3684 */
4338 PrivMode (1, PrivMode_vt52); 3685 set_privmode (PrivMode_vt52, 1);
4339 break; 3686 break;
4340 case 3: /* 80/132 */ 3687 case 3: /* 80/132 */
4341 if (priv_modes & PrivMode_132OK) 3688 if (priv_modes & PrivMode_132OK)
4342 set_widthheight (((state ? 132 : 80) * fwidth), height); 3689 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4343 break; 3690 break;
4344 case 4: /* smooth scrolling */ 3691 case 4: /* smooth scrolling */
4345 set_option (Opt_jumpScroll, !state); 3692 set_option (Opt_jumpScroll, !state);
4346 break; 3693 break;
4347 case 5: /* reverse video */ 3694 case 5: /* reverse video */
… …
4354 scr_autowrap (state); 3701 scr_autowrap (state);
4355 break; 3702 break;
4356 /* case 8: - auto repeat, can't do on a per window basis */ 3703 /* case 8: - auto repeat, can't do on a per window basis */
4357 case 9: /* X10 mouse reporting */ 3704 case 9: /* X10 mouse reporting */
4358 if (state) /* orthogonal */ 3705 if (state) /* orthogonal */
4359 priv_modes &= ~PrivMode_MouseX11; 3706 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4360 break; 3707 break;
4361#ifdef scrollBar_esc 3708#ifdef scrollBar_esc
4362 case scrollBar_esc: 3709 case scrollBar_esc:
4363 if (scrollbar_mapping (state)) 3710 if (scrollBar.map (state))
4364 { 3711 {
4365 resize_all_windows (0, 0, 0); 3712 resize_all_windows (0, 0, 0);
4366 scr_touch (true); 3713 scr_touch (true);
4367 } 3714 }
4368 break; 3715 break;
… …
4377 break; 3724 break;
4378 /* case 66: - application key pad */ 3725 /* case 66: - application key pad */
4379 /* case 67: - backspace key */ 3726 /* case 67: - backspace key */
4380 case 1000: /* X11 mouse reporting */ 3727 case 1000: /* X11 mouse reporting */
4381 if (state) /* orthogonal */ 3728 if (state) /* orthogonal */
4382 priv_modes &= ~PrivMode_MouseX10; 3729 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4383 break; 3730 break;
4384#if 0
4385 case 1001: 3731 case 1002:
4386 break; /* X11 mouse highlighting */ 3732 case 1003:
4387#endif 3733 if (state)
3734 {
3735 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3736 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3737 vt_emask_mouse = PointerMotionMask;
3738 }
3739 else
3740 vt_emask_mouse = NoEventMask;
3741
3742 vt_select_input ();
3743 break;
4388 case 1010: /* scroll to bottom on TTY output inhibit */ 3744 case 1010: /* scroll to bottom on TTY output inhibit */
4389 set_option (Opt_scrollTtyOutput, !state); 3745 set_option (Opt_scrollTtyOutput, !state);
4390 break; 3746 break;
4391 case 1011: /* scroll to bottom on key press */ 3747 case 1011: /* scroll to bottom on key press */
4392 set_option (Opt_scrollTtyKeypress, state); 3748 set_option (Opt_scrollTtyKeypress, state);
4393 break; 3749 break;
4394 case 1047: /* secondary screen w/ clearing last */ 3750 case 1047: /* secondary screen w/ clearing last */
4395 if (option (Opt_secondaryScreen)) 3751 if (option (Opt_secondaryScreen))
4396 if (current_screen != PRIMARY) 3752 if (!state)
4397 scr_erase_screen (2); 3753 scr_erase_screen (2);
3754
4398 scr_change_screen (state); 3755 scr_change_screen (state);
4399 break; 3756 break;
4400 case 1049: /* secondary screen w/ clearing first */ 3757 case 1049: /* secondary screen w/ clearing first */
3758 if (option (Opt_secondaryScreen))
3759 if (state)
3760 scr_cursor (SAVE);
3761
4401 scr_change_screen (state); 3762 scr_change_screen (state);
3763
4402 if (option (Opt_secondaryScreen)) 3764 if (option (Opt_secondaryScreen))
4403 if (current_screen != PRIMARY) 3765 if (state)
4404 scr_erase_screen (2); 3766 scr_erase_screen (2);
3767 else
3768 scr_cursor (RESTORE);
4405 break; 3769 break;
4406 default: 3770 default:
4407 break; 3771 break;
4408 } 3772 }
4409 } 3773 }
… …
4569rxvt_term::process_graphics () 3933rxvt_term::process_graphics ()
4570{ 3934{
4571 unicode_t ch, cmd = cmd_getc (); 3935 unicode_t ch, cmd = cmd_getc ();
4572 3936
4573 if (cmd == 'Q') 3937 if (cmd == 'Q')
3938 {
4574 { /* query graphics */ 3939 /* query graphics */
4575 tt_printf ("\033G0\012"); /* no graphics */ 3940 tt_printf ("\033G0\012"); /* no graphics */
4576 return; 3941 return;
4577 } 3942 }
4578 /* swallow other graphics sequences until terminating ':' */ 3943 /* swallow other graphics sequences until terminating ':' */
4579 do 3944 do
… …
4629 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3994 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4630 3995
4631 memcpy (v_buffer + v_buflen, data, len); 3996 memcpy (v_buffer + v_buflen, data, len);
4632 v_buflen += len; 3997 v_buflen += len;
4633 3998
4634 pty_ev.set (EVENT_READ | EVENT_WRITE); 3999 pty_ev.set (ev::READ | ev::WRITE);
4635} 4000}
4636 4001
4637void rxvt_term::pty_write () 4002void rxvt_term::pty_write ()
4638{ 4003{
4639 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4004 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4644 4009
4645 if (v_buflen == 0) 4010 if (v_buflen == 0)
4646 { 4011 {
4647 free (v_buffer); 4012 free (v_buffer);
4648 v_buffer = 0; 4013 v_buffer = 0;
4649 v_buflen = 0;
4650 4014
4651 pty_ev.set (EVENT_READ); 4015 pty_ev.set (ev::READ);
4652 return; 4016 return;
4653 } 4017 }
4654 4018
4655 memmove (v_buffer, v_buffer + written, v_buflen); 4019 memmove (v_buffer, v_buffer + written, v_buflen);
4656 } 4020 }
4657 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4021 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4658 pty_ev.set (EVENT_READ); 4022 pty_ev.set (ev::READ);
4659} 4023}
4660 4024
4661/*----------------------- end-of-file (C source) -----------------------*/ 4025/*----------------------- end-of-file (C source) -----------------------*/
4662 4026

Diff Legend

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