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.323 by ayin, Mon May 28 18:38:03 2007 UTC vs.
Revision 1.416 by root, Tue Jul 15 16:41:22 2008 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.
… …
1243 pty_ev.stop (); 1177 pty_ev.stop ();
1244 1178
1245 if (!option (Opt_hold)) 1179 if (!option (Opt_hold))
1246 destroy (); 1180 destroy ();
1247 } 1181 }
1248 1182
1249 return false; 1183 return false;
1250} 1184}
1251 1185
1252void 1186void
1253rxvt_term::pty_cb (io_watcher &w, short revents) 1187rxvt_term::pty_cb (ev::io &w, int revents)
1254{ 1188{
1255 make_current (); 1189 make_current ();
1256 1190
1257 if (revents & EVENT_READ) 1191 if (revents & ev::READ)
1258 // loop, but don't allow a single term to monopolize us 1192 // loop, but don't allow a single term to monopolize us
1259 while (pty_fill ()) 1193 while (pty_fill ())
1260 if (cmd_parse ()) 1194 if (cmd_parse ())
1261 break; 1195 break;
1262 1196
1263 if (revents & EVENT_WRITE) 1197 if (revents & ev::WRITE)
1264 pty_write (); 1198 pty_write ();
1199
1200 refresh_check ();
1265} 1201}
1266 1202
1267void 1203void
1268rxvt_term::pointer_unblank () 1204rxvt_term::pointer_unblank ()
1269{ 1205{
… …
1272 1208
1273#ifdef POINTER_BLANK 1209#ifdef POINTER_BLANK
1274 hidden_pointer = 0; 1210 hidden_pointer = 0;
1275 1211
1276 if (option (Opt_pointerBlank)) 1212 if (option (Opt_pointerBlank))
1277 pointer_ev.start (NOW + pointerBlankDelay); 1213 pointer_ev.start (pointerBlankDelay);
1278#endif 1214#endif
1279} 1215}
1280 1216
1281#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1282void 1218void
… …
1290 1226
1291 hidden_pointer = 1; 1227 hidden_pointer = 1;
1292} 1228}
1293 1229
1294void 1230void
1295rxvt_term::pointer_cb (time_watcher &w) 1231rxvt_term::pointer_cb (ev::timer &w, int revents)
1296{ 1232{
1297 make_current (); 1233 make_current ();
1298 1234
1299 pointer_blank (); 1235 pointer_blank ();
1300} 1236}
… …
1303void 1239void
1304rxvt_term::mouse_report (XButtonEvent &ev) 1240rxvt_term::mouse_report (XButtonEvent &ev)
1305{ 1241{
1306 int button_number, key_state = 0; 1242 int button_number, key_state = 0;
1307 int x, y; 1243 int x, y;
1244 int code = 32;
1308 1245
1309 x = ev.x; 1246 x = Pixel2Col (ev.x);
1310 y = ev.y; 1247 y = Pixel2Row (ev.y);
1311 pixel_position (&x, &y); 1248 if (ev.type == MotionNotify)
1249 {
1250 if (x == mouse_row && y == mouse_col)
1251 return;
1252 mouse_row = x;
1253 mouse_col = y;
1254 code += 32;
1255 }
1312 1256
1313 if (MEvent.button == AnyButton) 1257 if (MEvent.button == AnyButton)
1314 button_number = 3; 1258 button_number = 3;
1315 else 1259 else
1316 { 1260 {
… …
1362 x + 1, 1306 x + 1,
1363 y + 1); 1307 y + 1);
1364#endif 1308#endif
1365 1309
1366 tt_printf ("\033[M%c%c%c", 1310 tt_printf ("\033[M%c%c%c",
1367 (32 + button_number + key_state), 1311 (code + button_number + key_state),
1368 (32 + x + 1), 1312 (32 + x + 1),
1369 (32 + y + 1)); 1313 (32 + y + 1));
1370} 1314}
1371 1315
1372/*{{{ process an X event */ 1316/*{{{ process an X event */
… …
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1378 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out (); 1379 focus_out ();
1436 } 1380 }
1437#endif 1381#endif
1438 } 1382 }
1439 break;
1440
1441 case MappingNotify:
1442 XRefreshKeyboardMapping (&ev.xmapping);
1443 break; 1383 break;
1444 1384
1445 /* 1385 /*
1446 * XXX: this is not the _current_ arrangement 1386 * XXX: this is not the _current_ arrangement
1447 * Here's my conclusion: 1387 * Here's my conclusion:
… …
1480 && ev.xfocus.mode != NotifyGrab) 1420 && ev.xfocus.mode != NotifyGrab)
1481 focus_out (); 1421 focus_out ();
1482 break; 1422 break;
1483 1423
1484 case ConfigureNotify: 1424 case ConfigureNotify:
1425 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1426 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1427 szHint.width, szHint.height);*/
1485 if (ev.xconfigure.window == parent[0]) 1428 if (ev.xconfigure.window == parent[0])
1486 { 1429 {
1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1488 ; 1431 ;
1489 1432
1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1491 { 1434 {
1492 seen_resize = 1; 1435 seen_resize = 1;
1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494 } 1437 }
1438 else
1439 {
1440#ifdef HAVE_BG_PIXMAP
1441 if (bgPixmap.window_position_sensitive ())
1442 {
1443 if (mapped)
1444 update_background ();
1445 else
1446 bgPixmap.invalidate ();
1447 }
1448#endif
1449 }
1495 1450
1496 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1497
1498#ifdef TRANSPARENT
1499 if (option (Opt_transparent))
1500 check_our_parents ();
1501#endif
1502 } 1452 }
1503 break; 1453 break;
1504 1454
1505 case PropertyNotify: 1455 case PropertyNotify:
1506 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1456 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1522 case SelectionRequest: 1472 case SelectionRequest:
1523 selection_send (ev.xselectionrequest); 1473 selection_send (ev.xselectionrequest);
1524 break; 1474 break;
1525 1475
1526 case MapNotify: 1476 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a
1479 * non-reparenting window manager. In those cases we never get first
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does
1482 * reparenting.
1483 * We should not render background immidiately, as there could be several
1484 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1485 * by scheduling background redraw as soon as we can, but giving a short
1486 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results.
1489 */
1490 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1491 update_background_ev.start (0.025);
1492#endif
1527 mapped = 1; 1493 mapped = 1;
1528#ifdef TEXT_BLINK 1494#ifdef TEXT_BLINK
1529 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1495 text_blink_ev.start ();
1530#endif 1496#endif
1531 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1497 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1532 break; 1498 break;
1533 1499
1534 case UnmapNotify: 1500 case UnmapNotify:
… …
1536#ifdef TEXT_BLINK 1502#ifdef TEXT_BLINK
1537 text_blink_ev.stop (); 1503 text_blink_ev.stop ();
1538#endif 1504#endif
1539 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1505 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1540 break; 1506 break;
1541
1542#ifdef TRANSPARENT
1543 case ReparentNotify:
1544 rootwin_cb (ev);
1545 break;
1546#endif /* TRANSPARENT */
1547 1507
1548 case GraphicsExpose: 1508 case GraphicsExpose:
1549 case Expose: 1509 case Expose:
1550 if (ev.xany.window == vt) 1510 if (ev.xany.window == vt)
1551 { 1511 {
1552 do 1512 do
1513 {
1553 scr_expose (ev.xexpose.x, ev.xexpose.y, 1514 scr_expose (ev.xexpose.x, ev.xexpose.y,
1554 ev.xexpose.width, ev.xexpose.height, False); 1515 ev.xexpose.width, ev.xexpose.height, False);
1516 }
1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1556 1518
1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1558 1520
1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1525 }
1562 1526
1563 want_refresh = 1; 1527 want_refresh = 1;
1564 } 1528 }
1565 else 1529 else
1566 { 1530 {
… …
1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1533 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1570 ; 1534 ;
1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1572 ; 1536 ;
1573 1537
1574 if (isScrollbarWindow (ev.xany.window)) 1538 if (scrollBar.state && ev.xany.window == scrollBar.win)
1575 { 1539 {
1576 scrollBar.setIdle (); 1540 scrollBar.state = STATE_IDLE;
1577 scrollbar_show (0); 1541 scrollBar.show (0);
1578 } 1542 }
1579
1580#ifdef TRANSPARENT
1581 if (am_transparent && ev.xany.window == parent[0])
1582 XClearWindow (dpy, ev.xany.window);
1583#endif
1584 } 1543 }
1585 break; 1544 break;
1586 1545
1587 case MotionNotify: 1546 case MotionNotify:
1588#ifdef POINTER_BLANK 1547#ifdef POINTER_BLANK
1589 if (hidden_pointer) 1548 if (hidden_pointer)
1590 pointer_unblank (); 1549 pointer_unblank ();
1591#endif 1550#endif
1551 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1552 || priv_modes & PrivMode_MouseAnyEvent)
1553 mouse_report (ev.xbutton);
1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1554 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1593 break; 1555 break;
1594 1556
1595 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1596 { 1558 {
… …
1630 int dist; 1592 int dist;
1631 1593
1632 /* don't clobber the current delay if we are 1594 /* don't clobber the current delay if we are
1633 * already in the middle of scrolling. 1595 * already in the middle of scrolling.
1634 */ 1596 */
1635 if (!sel_scroll_ev.active) 1597 if (!sel_scroll_ev.is_active ())
1636 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1598 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1637 1599
1638 /* save the event params so we can highlight 1600 /* save the event params so we can highlight
1639 * the selection in the pending-scroll loop 1601 * the selection in the pending-scroll loop
1640 */ 1602 */
1641 selection_save_x = ev.xbutton.x; 1603 selection_save_x = ev.xbutton.x;
… …
1663 else 1625 else
1664 { 1626 {
1665 /* we are within the text window, so we 1627 /* we are within the text window, so we
1666 * shouldn't be scrolling 1628 * shouldn't be scrolling
1667 */ 1629 */
1668 if (sel_scroll_ev.active)
1669 sel_scroll_ev.stop(); 1630 sel_scroll_ev.stop();
1670 } 1631 }
1671#endif 1632#endif
1672#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
1673 } 1634 }
1674#endif 1635#endif
1675 } 1636 }
1676 } 1637 }
1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1638 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1678 { 1639 {
1679 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1640 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1680 MotionNotify, &ev)) 1641 MotionNotify, &ev))
1681 ; 1642 ;
1682 1643
… …
1684 &unused_root, &unused_child, 1645 &unused_root, &unused_child,
1685 &unused_root_x, &unused_root_y, 1646 &unused_root_x, &unused_root_y,
1686 &ev.xbutton.x, &ev.xbutton.y, 1647 &ev.xbutton.x, &ev.xbutton.y,
1687 &unused_mask); 1648 &unused_mask);
1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1689 scrollbar_size ()); 1650 scrollBar.size ());
1690 want_refresh = 1; 1651 want_refresh = 1;
1691 refresh_limit = 0;
1692 scrollbar_show (1); 1652 scrollBar.show (1);
1693 } 1653 }
1694 break; 1654 break;
1695 } 1655 }
1696 1656
1697#if defined(CURSOR_BLINK) 1657#if defined(CURSOR_BLINK)
… …
1701 { 1661 {
1702 hidden_cursor = 0; 1662 hidden_cursor = 0;
1703 want_refresh = 1; 1663 want_refresh = 1;
1704 } 1664 }
1705 1665
1706 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1666 cursor_blink_ev.again ();
1707 } 1667 }
1708#endif 1668#endif
1709 1669
1710#if defined(POINTER_BLANK) 1670#if defined(POINTER_BLANK)
1711 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1671 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1718 1678
1719 if (ev.type == KeyPress && hidden_pointer == 0) 1679 if (ev.type == KeyPress && hidden_pointer == 0)
1720 pointer_blank (); 1680 pointer_blank ();
1721 } 1681 }
1722#endif 1682#endif
1683
1684 refresh_check ();
1723} 1685}
1724 1686
1725void 1687void
1726rxvt_term::focus_in () 1688rxvt_term::focus_in ()
1727{ 1689{
… …
1739 XSetICFocus (Input_Context); 1701 XSetICFocus (Input_Context);
1740 } 1702 }
1741#endif 1703#endif
1742#if CURSOR_BLINK 1704#if CURSOR_BLINK
1743 if (option (Opt_cursorBlink)) 1705 if (option (Opt_cursorBlink))
1744 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1706 cursor_blink_ev.again ();
1745#endif 1707#endif
1746#if OFF_FOCUS_FADING 1708#if OFF_FOCUS_FADING
1747 if (rs[Rs_fade]) 1709 if (rs[Rs_fade])
1748 { 1710 {
1749 pix_colors = pix_colors_focused; 1711 pix_colors = pix_colors_focused;
… …
1751 } 1713 }
1752#endif 1714#endif
1753#if ENABLE_FRILLS 1715#if ENABLE_FRILLS
1754 if (option (Opt_urgentOnBell)) 1716 if (option (Opt_urgentOnBell))
1755 { 1717 {
1756 XWMHints *h;
1757
1758 h = XGetWMHints(dpy, parent[0]); 1718 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1759 if (h != NULL)
1760 { 1719 {
1761 h->flags &= ~XUrgencyHint; 1720 h->flags &= ~XUrgencyHint;
1762 XSetWMHints(dpy, parent[0], h); 1721 XSetWMHints (dpy, parent[0], h);
1763 } 1722 }
1764 } 1723 }
1765#endif 1724#endif
1766 } 1725 }
1767} 1726}
… …
1778 1737
1779#if ENABLE_FRILLS || ISO_14755 1738#if ENABLE_FRILLS || ISO_14755
1780 if (iso14755buf) 1739 if (iso14755buf)
1781 { 1740 {
1782 iso14755buf = 0; 1741 iso14755buf = 0;
1783# if ENABLE_OVERLAY 1742# if ISO_14755
1784 scr_overlay_off (); 1743 scr_overlay_off ();
1785# endif 1744# endif
1786 } 1745 }
1787#endif 1746#endif
1788#if USE_XIM 1747#if USE_XIM
… …
1790 XUnsetICFocus (Input_Context); 1749 XUnsetICFocus (Input_Context);
1791#endif 1750#endif
1792#if CURSOR_BLINK 1751#if CURSOR_BLINK
1793 if (option (Opt_cursorBlink)) 1752 if (option (Opt_cursorBlink))
1794 cursor_blink_ev.stop (); 1753 cursor_blink_ev.stop ();
1754
1795 hidden_cursor = 0; 1755 hidden_cursor = 0;
1796#endif 1756#endif
1797#if OFF_FOCUS_FADING 1757#if OFF_FOCUS_FADING
1798 if (rs[Rs_fade]) 1758 if (rs[Rs_fade])
1799 { 1759 {
… …
1815 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1775 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1816 } 1776 }
1817#endif 1777#endif
1818} 1778}
1819 1779
1820#if TRANSPARENT || ENABLE_PERL 1780#if ENABLE_TRANSPARENCY || ENABLE_PERL
1821void 1781void
1822rxvt_term::rootwin_cb (XEvent &ev) 1782rxvt_term::rootwin_cb (XEvent &ev)
1823{ 1783{
1824 make_current (); 1784 make_current ();
1825 1785
1826 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1786 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1827 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1787 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1828 return; 1788 return;
1829 1789
1830# if TRANSPARENT 1790# if ENABLE_TRANSPARENCY
1831 switch (ev.type) 1791 switch (ev.type)
1832 { 1792 {
1833 case PropertyNotify: 1793 case PropertyNotify:
1834 /* 1794 /*
1835 * if user used some Esetroot compatible prog to set the root bg, 1795 * if user used some Esetroot compatible prog to set the root bg,
1836 * use the property to determine the pixmap. We use it later on. 1796 * use the property to determine the pixmap. We use it later on.
1837 */ 1797 */
1838 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1798 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1799 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1840 return; 1800 {
1801 bgPixmap.set_root_pixmap ();
1802 update_background ();
1803 }
1841 1804
1842 /* FALLTHROUGH */
1843 case ReparentNotify:
1844 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1845 want_refresh = want_full_refresh = 1;
1846 break; 1805 break;
1847 } 1806 }
1848# endif 1807# endif
1808
1809 refresh_check ();
1849} 1810}
1850#endif 1811#endif
1851 1812
1852void 1813void
1853rxvt_term::button_press (XButtonEvent &ev) 1814rxvt_term::button_press (XButtonEvent &ev)
… …
1908 mouse_report (ev); 1869 mouse_report (ev);
1909 } 1870 }
1910#else 1871#else
1911 MEvent.button = ev.button; 1872 MEvent.button = ev.button;
1912 mouse_report (ev); 1873 mouse_report (ev);
1913#endif /* MOUSE_REPORT_DOUBLECLICK */ 1874#endif /* MOUSE_REPORT_DOUBLECLICK */
1914 1875
1915 } 1876 }
1916 else 1877 else
1917 { 1878 {
1918 if (ev.button != MEvent.button) 1879 if (ev.button != MEvent.button)
… …
1966 } 1927 }
1967 1928
1968 /* 1929 /*
1969 * Scrollbar window processing of button press 1930 * Scrollbar window processing of button press
1970 */ 1931 */
1971 if (isScrollbarWindow (ev.window)) 1932 if (scrollBar.state && ev.window == scrollBar.win)
1972 { 1933 {
1973 scrollBar.setIdle (); 1934 page_dirn direction = NO_DIR;
1935
1936 if (scrollBar.upButton (ev.y))
1937 direction = UP; /* up */
1938 else if (scrollBar.dnButton (ev.y))
1939 direction = DN; /* down */
1940
1941 scrollBar.state = STATE_IDLE;
1974 /* 1942 /*
1975 * Rxvt-style scrollbar: 1943 * Rxvt-style scrollbar:
1976 * move up if mouse is above slider 1944 * move up if mouse is above slider
1977 * move dn if mouse is below slider 1945 * move dn if mouse is below slider
1978 * 1946 *
… …
1987 /* 1955 /*
1988 * Mouse report disabled scrollbar: 1956 * Mouse report disabled scrollbar:
1989 * arrow buttons - send up/down 1957 * arrow buttons - send up/down
1990 * click on scrollbar - send pageup/down 1958 * click on scrollbar - send pageup/down
1991 */ 1959 */
1992 if ((scrollBar.style == R_SB_NEXT 1960 if (direction == UP)
1993 && scrollbarnext_upButton (ev.y))
1994 || (scrollBar.style == R_SB_RXVT
1995 && scrollbarrxvt_upButton (ev.y)))
1996 tt_printf ("\033[A"); 1961 tt_printf ("\033[A");
1997 else if ((scrollBar.style == R_SB_NEXT 1962 else if (direction == DN)
1998 && scrollbarnext_dnButton (ev.y))
1999 || (scrollBar.style == R_SB_RXVT
2000 && scrollbarrxvt_dnButton (ev.y)))
2001 tt_printf ("\033[B"); 1963 tt_printf ("\033[B");
2002 else 1964 else
2003 switch (ev.button) 1965 switch (ev.button)
2004 { 1966 {
2005 case Button2: 1967 case Button2:
… …
2012 tt_printf ("\033[5~"); 1974 tt_printf ("\033[5~");
2013 break; 1975 break;
2014 } 1976 }
2015 } 1977 }
2016 else 1978 else
2017#endif /* NO_SCROLLBAR_REPORT */ 1979#endif /* NO_SCROLLBAR_REPORT */
2018
2019 {
2020 char upordown = 0;
2021
2022 if (scrollBar.style == R_SB_NEXT)
2023 { 1980 {
2024 if (scrollbarnext_upButton (ev.y)) 1981 if (direction != NO_DIR)
2025 upordown = -1; /* up */
2026 else if (scrollbarnext_dnButton (ev.y))
2027 upordown = 1; /* down */
2028 }
2029 else if (scrollBar.style == R_SB_RXVT)
2030 {
2031 if (scrollbarrxvt_upButton (ev.y))
2032 upordown = -1; /* up */
2033 else if (scrollbarrxvt_dnButton (ev.y))
2034 upordown = 1; /* down */
2035 }
2036 if (upordown)
2037 { 1982 {
2038#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1983#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1984 if (!cont_scroll_ev.is_active ())
2039 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1985 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2040#endif 1986#endif
2041 if (scr_page (upordown < 0 ? UP : DN, 1)) 1987 if (scr_page (direction, 1))
2042 { 1988 {
2043 if (upordown < 0) 1989 if (direction == UP)
2044 scrollBar.setUp (); 1990 scrollBar.state = STATE_UP;
2045 else 1991 else
2046 scrollBar.setDn (); 1992 scrollBar.state = STATE_DOWN;
2047 } 1993 }
2048 } 1994 }
2049 else 1995 else
2050 switch (ev.button) 1996 switch (ev.button)
2051 { 1997 {
2052 case Button2: 1998 case Button2:
2053 switch (scrollbar_align) 1999 switch (scrollBar.align)
2054 { 2000 {
2055 case R_SB_ALIGN_TOP: 2001 case R_SB_ALIGN_TOP:
2056 csrO = 0; 2002 csrO = 0;
2057 break; 2003 break;
2058 case R_SB_ALIGN_CENTRE: 2004 case R_SB_ALIGN_CENTRE:
… …
2064 } 2010 }
2065 2011
2066 if (scrollBar.style == R_SB_XTERM 2012 if (scrollBar.style == R_SB_XTERM
2067 || scrollbar_above_slider (ev.y) 2013 || scrollbar_above_slider (ev.y)
2068 || scrollbar_below_slider (ev.y)) 2014 || scrollbar_below_slider (ev.y))
2069 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2070 2016
2071 scrollBar.setMotion (); 2017 scrollBar.state = STATE_MOTION;
2072 break; 2018 break;
2073 2019
2074 case Button1: 2020 case Button1:
2075 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2021 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2076 csrO = ev.y - scrollBar.top; 2022 csrO = ev.y - scrollBar.top;
2077 /* FALLTHROUGH */ 2023 /* FALLTHROUGH */
2078 2024
2079 case Button3: 2025 case Button3:
2080 if (scrollBar.style != R_SB_XTERM) 2026 if (scrollBar.style != R_SB_XTERM)
… …
2090 scr_page (DN, nrow - 1); 2036 scr_page (DN, nrow - 1);
2091# else 2037# else
2092 scr_page (DN, nrow / 4); 2038 scr_page (DN, nrow / 4);
2093# endif 2039# endif
2094 else 2040 else
2095 scrollBar.setMotion (); 2041 scrollBar.state = STATE_MOTION;
2096 } 2042 }
2097 else 2043 else
2098 { 2044 {
2099 scr_page ((ev.button == Button1 ? DN : UP), 2045 scr_page ((ev.button == Button1 ? DN : UP),
2100 (nrow 2046 (nrow
2101 * scrollbar_position (ev.y) 2047 * scrollbar_position (ev.y)
2102 / scrollbar_size ())); 2048 / scrollBar.size ()));
2103 } 2049 }
2104 2050
2105 break; 2051 break;
2106 } 2052 }
2107 } 2053 }
… …
2117 2063
2118 csrO = 0; /* reset csr Offset */ 2064 csrO = 0; /* reset csr Offset */
2119 if (!bypass_keystate) 2065 if (!bypass_keystate)
2120 reportmode = !! (priv_modes & PrivMode_mouse_report); 2066 reportmode = !! (priv_modes & PrivMode_mouse_report);
2121 2067
2122 if (scrollbar_isUpDn ()) 2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2123 { 2069 {
2124 scrollBar.setIdle (); 2070 scrollBar.state = STATE_IDLE;
2125 scrollbar_show (0); 2071 scrollBar.show (0);
2126 } 2072 }
2127 2073
2128#ifdef SELECTION_SCROLLING 2074#ifdef SELECTION_SCROLLING
2129 if (sel_scroll_ev.active)
2130 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
2131#endif 2076#endif
2132 2077
2133 if (ev.window == vt) 2078 if (ev.window == vt)
2134 { 2079 {
2135 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2080 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2159 mouse_report (ev); 2104 mouse_report (ev);
2160 } 2105 }
2161#else /* MOUSE_REPORT_DOUBLECLICK */ 2106#else /* MOUSE_REPORT_DOUBLECLICK */
2162 MEvent.button = AnyButton; 2107 MEvent.button = AnyButton;
2163 mouse_report (ev); 2108 mouse_report (ev);
2164#endif /* MOUSE_REPORT_DOUBLECLICK */ 2109#endif /* MOUSE_REPORT_DOUBLECLICK */
2165 return; 2110 return;
2166 } 2111 }
2167 2112
2168 /* 2113 /*
2169 * dumb hack to compensate for the failure of click-and-drag 2114 * dumb hack to compensate for the failure of click-and-drag
… …
2207 { 2152 {
2208 mouse_slip_wheel_speed += v ? -1 : 1; 2153 mouse_slip_wheel_speed += v ? -1 : 1;
2209 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2154 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2210 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2155 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2211 2156
2212 if (slip_wheel_ev.at < NOW) 2157 if (!slip_wheel_ev.is_active ())
2213 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2158 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2214
2215 slip_wheel_ev.start ();
2216 } 2159 }
2217 else 2160 else
2161# endif
2218 { 2162 {
2219# endif
2220 scr_page (v, i); 2163 scr_page (v, i);
2221 scrollbar_show (1); 2164 scrollBar.show (1);
2222# ifdef MOUSE_SLIP_WHEELING
2223 } 2165 }
2224# endif
2225 } 2166 }
2226 break; 2167 break;
2227#endif 2168#endif
2228 } 2169 }
2229 } 2170 }
2230} 2171}
2231
2232#ifdef TRANSPARENT
2233#if TINTING
2234/* taken from aterm-0.4.2 */
2235
2236typedef uint32_t RUINT32T;
2237
2238void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2239{
2240 int sh_r, sh_g, sh_b;
2241 RUINT32T mask_r, mask_g, mask_b;
2242 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2243 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2244 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2245 int i;
2246
2247 Visual *visual = term->visual;
2248
2249 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2250
2251 /* for convenience */
2252 mask_r = visual->red_mask;
2253 mask_g = visual->green_mask;
2254 mask_b = visual->blue_mask;
2255
2256 /* boring lookup table pre-initialization */
2257 switch (srcImage->bits_per_pixel) {
2258 case 15:
2259 if ((mask_r != 0x7c00) ||
2260 (mask_g != 0x03e0) ||
2261 (mask_b != 0x001f))
2262 return;
2263 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2264 lookup_r = lookup;
2265 lookup_g = lookup+32;
2266 lookup_b = lookup+32+32;
2267 sh_r = 10;
2268 sh_g = 5;
2269 sh_b = 0;
2270 break;
2271 case 16:
2272 if ((mask_r != 0xf800) ||
2273 (mask_g != 0x07e0) ||
2274 (mask_b != 0x001f))
2275 return;
2276 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2277 lookup_r = lookup;
2278 lookup_g = lookup+32;
2279 lookup_b = lookup+32+64;
2280 sh_r = 11;
2281 sh_g = 5;
2282 sh_b = 0;
2283 break;
2284 case 24:
2285 if ((mask_r != 0xff0000) ||
2286 (mask_g != 0x00ff00) ||
2287 (mask_b != 0x0000ff))
2288 return;
2289 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2290 lookup_r = lookup;
2291 lookup_g = lookup+256;
2292 lookup_b = lookup+256+256;
2293 sh_r = 16;
2294 sh_g = 8;
2295 sh_b = 0;
2296 break;
2297 case 32:
2298 if ((mask_r != 0xff0000) ||
2299 (mask_g != 0x00ff00) ||
2300 (mask_b != 0x0000ff))
2301 return;
2302 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2303 lookup_r = lookup;
2304 lookup_g = lookup+256;
2305 lookup_b = lookup+256+256;
2306 sh_r = 16;
2307 sh_g = 8;
2308 sh_b = 0;
2309 break;
2310 default:
2311 return; /* we do not support this color depth */
2312 }
2313
2314 /* prepare limits for color transformation (each channel is handled separately) */
2315 if (shade < 0) {
2316 shade = -shade;
2317 if (shade < 0) shade = 0;
2318 if (shade > 100) shade = 100;
2319
2320 lower_lim_r = 65535-rm;
2321 lower_lim_g = 65535-gm;
2322 lower_lim_b = 65535-bm;
2323
2324 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2325 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2326 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2327
2328 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2329 } else {
2330 if (shade < 0) shade = 0;
2331 if (shade > 100) shade = 100;
2332
2333 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2334
2335 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2336 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2337 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2338 }
2339
2340 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2341 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2342 {
2343 unsigned int tmp;
2344
2345 tmp = lower_lim_r;
2346 lower_lim_r = lower_lim_b;
2347 lower_lim_b = tmp;
2348
2349 tmp = upper_lim_r;
2350 upper_lim_r = upper_lim_b;
2351 upper_lim_b = tmp;
2352 }
2353
2354 /* fill our lookup tables */
2355 for (i = 0; i <= mask_r>>sh_r; i++)
2356 {
2357 RUINT32T tmp;
2358 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2359 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2360 lookup_r[i] = (tmp/65535)<<sh_r;
2361 }
2362 for (i = 0; i <= mask_g>>sh_g; i++)
2363 {
2364 RUINT32T tmp;
2365 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2366 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2367 lookup_g[i] = (tmp/65535)<<sh_g;
2368 }
2369 for (i = 0; i <= mask_b>>sh_b; i++)
2370 {
2371 RUINT32T tmp;
2372 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2373 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2374 lookup_b[i] = (tmp/65535)<<sh_b;
2375 }
2376
2377 /* apply table to input image (replacing colors by newly calculated ones) */
2378 switch (srcImage->bits_per_pixel)
2379 {
2380 case 15:
2381 {
2382 unsigned short *p1, *pf, *p, *pl;
2383 p1 = (unsigned short *) srcImage->data;
2384 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2385 while (p1 < pf)
2386 {
2387 p = p1;
2388 pl = p1 + srcImage->width;
2389 for (; p < pl; p++)
2390 {
2391 *p = lookup_r[(*p & 0x7c00)>>10] |
2392 lookup_g[(*p & 0x03e0)>> 5] |
2393 lookup_b[(*p & 0x001f)];
2394 }
2395 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2396 }
2397 break;
2398 }
2399 case 16:
2400 {
2401 unsigned short *p1, *pf, *p, *pl;
2402 p1 = (unsigned short *) srcImage->data;
2403 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2404 while (p1 < pf)
2405 {
2406 p = p1;
2407 pl = p1 + srcImage->width;
2408 for (; p < pl; p++)
2409 {
2410 *p = lookup_r[(*p & 0xf800)>>11] |
2411 lookup_g[(*p & 0x07e0)>> 5] |
2412 lookup_b[(*p & 0x001f)];
2413 }
2414 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2415 }
2416 break;
2417 }
2418 case 24:
2419 {
2420 unsigned char *p1, *pf, *p, *pl;
2421 p1 = (unsigned char *) srcImage->data;
2422 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2423 while (p1 < pf)
2424 {
2425 p = p1;
2426 pl = p1 + srcImage->width * 3;
2427 for (; p < pl; p += 3)
2428 {
2429 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2430 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2431 p[2] = lookup_r[(p[2] & 0x0000ff)];
2432 }
2433 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2434 }
2435 break;
2436 }
2437 case 32:
2438 {
2439 RUINT32T *p1, *pf, *p, *pl;
2440 p1 = (RUINT32T *) srcImage->data;
2441 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2442
2443 while (p1 < pf)
2444 {
2445 p = p1;
2446 pl = p1 + srcImage->width;
2447 for (; p < pl; p++)
2448 {
2449 *p = lookup_r[(*p & 0xff0000)>>16] |
2450 lookup_g[(*p & 0x00ff00)>> 8] |
2451 lookup_b[(*p & 0x0000ff)] |
2452 (*p & ~0xffffff);
2453 }
2454 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2455 }
2456 break;
2457 }
2458 }
2459
2460 free (lookup);
2461}
2462#endif
2463
2464/*
2465 * Check our parents are still who we think they are.
2466 * Do transparency updates if required
2467 */
2468int
2469rxvt_term::check_our_parents ()
2470{
2471 int i, pchanged, aformat, have_pixmap, rootdepth;
2472 unsigned long nitems, bytes_after;
2473 Atom atype;
2474 unsigned char *prop = NULL;
2475 Window root, oldp, *list;
2476 Pixmap rootpixmap = None;
2477 XWindowAttributes wattr, wrootattr;
2478
2479 pchanged = 0;
2480
2481 if (!option (Opt_transparent))
2482 return pchanged; /* Don't try any more */
2483
2484 XGetWindowAttributes (dpy, display->root, &wrootattr);
2485 rootdepth = wrootattr.depth;
2486
2487 XGetWindowAttributes (dpy, parent[0], &wattr);
2488
2489 if (rootdepth != wattr.depth)
2490 {
2491 if (am_transparent)
2492 {
2493 pchanged = 1;
2494 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2495 am_transparent = am_pixmap_trans = 0;
2496 }
2497
2498 return pchanged; /* Don't try any more */
2499 }
2500
2501 /* Get all X ops out of the queue so that our information is up-to-date. */
2502 XSync (dpy, False);
2503
2504 /*
2505 * Make the frame window set by the window manager have
2506 * the root background. Some window managers put multiple nested frame
2507 * windows for each client, so we have to take care about that.
2508 */
2509 i = (xa[XA_XROOTPMAP_ID]
2510 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2511 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2512 &nitems, &bytes_after, &prop) == Success);
2513
2514 if (!i || prop == NULL)
2515 i = (xa[XA_ESETROOT_PMAP_ID]
2516 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2517 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2518 &nitems, &bytes_after, &prop) == Success);
2519
2520 if (!i || prop == NULL
2521#if TINTING
2522 || !ISSET_PIXCOLOR (Color_tint)
2523#endif
2524 )
2525 have_pixmap = 0;
2526 else
2527 {
2528 have_pixmap = 1;
2529 rootpixmap = *(Pixmap *)prop;
2530 XFree (prop);
2531 }
2532
2533 if (have_pixmap)
2534 {
2535 /*
2536 * Copy display->root pixmap transparency
2537 */
2538 int sx, sy, nx, ny;
2539 unsigned int nw, nh;
2540 Window cr;
2541 XImage *image;
2542 GC gc;
2543 XGCValues gcvalue;
2544
2545 XTranslateCoordinates (dpy, parent[0], display->root,
2546 0, 0, &sx, &sy, &cr);
2547 nw = (unsigned int)szHint.width;
2548 nh = (unsigned int)szHint.height;
2549 nx = ny = 0;
2550
2551 if (sx < 0)
2552 {
2553 nw += sx;
2554 nx = -sx;
2555 sx = 0;
2556 }
2557
2558 if (sy < 0)
2559 {
2560 nh += sy;
2561 ny = -sy;
2562 sy = 0;
2563 }
2564
2565 min_it (nw, (unsigned int) (wrootattr.width - sx));
2566 min_it (nh, (unsigned int) (wrootattr.height - sy));
2567
2568 XSync (dpy, False);
2569 allowedxerror = -1;
2570 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2571
2572 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2573 /* XXX: may need a delay here? */
2574 allowedxerror = 0;
2575
2576 if (image == NULL)
2577 {
2578 if (am_transparent && am_pixmap_trans)
2579 {
2580 pchanged = 1;
2581 if (pixmap != None)
2582 {
2583 XFreePixmap (dpy, pixmap);
2584 pixmap = None;
2585 }
2586 }
2587
2588 am_pixmap_trans = 0;
2589 }
2590 else
2591 {
2592 if (pixmap != None)
2593 XFreePixmap (dpy, pixmap);
2594
2595#if TINTING
2596 if (ISSET_PIXCOLOR (Color_tint))
2597 {
2598 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2599
2600 rgba c;
2601 pix_colors_focused [Color_tint].get (c);
2602
2603 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2604 }
2605#endif
2606
2607 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2608 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2609 XPutImage (dpy, pixmap, gc, image, 0, 0,
2610 nx, ny, image->width, image->height);
2611 XFreeGC (dpy, gc);
2612 XDestroyImage (image);
2613 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2614 XClearWindow (dpy, parent[0]);
2615
2616 if (!am_transparent || !am_pixmap_trans)
2617 pchanged = 1;
2618
2619 am_transparent = am_pixmap_trans = 1;
2620 }
2621 }
2622
2623 if (am_pixmap_trans)
2624 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2625 else
2626 {
2627 unsigned int n;
2628 /*
2629 * InheritPixmap transparency
2630 */
2631 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2632 {
2633 oldp = parent[i];
2634 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2635 XFree (list);
2636
2637 if (parent[i] == display->root)
2638 {
2639 if (oldp != None)
2640 pchanged = 1;
2641
2642 break;
2643 }
2644
2645 if (oldp != parent[i])
2646 pchanged = 1;
2647 }
2648
2649 n = 0;
2650
2651 if (pchanged)
2652 for (; n < (unsigned int)i; n++)
2653 {
2654 XGetWindowAttributes (dpy, parent[n], &wattr);
2655
2656 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2657 {
2658 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2659 break;
2660 }
2661 }
2662
2663 if (n > (sizeof (parent) / sizeof (parent[0])))
2664 {
2665 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2666 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2667 am_transparent = 0;
2668 /* XXX: also turn off Opt_transparent? */
2669 }
2670 else
2671 {
2672 for (n = 0; n < (unsigned int)i; n++)
2673 {
2674 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2675 XClearWindow (dpy, parent[n]);
2676 }
2677
2678 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2679 am_transparent = 1;
2680 }
2681
2682 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2683 parent[i] = None;
2684 }
2685
2686 if (scrollBar.win)
2687 {
2688 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2689 scrollBar.setIdle ();
2690 scrollbar_show (0);
2691 }
2692
2693 if (am_transparent)
2694 {
2695 want_refresh = want_full_refresh = 1;
2696 if (am_pixmap_trans)
2697 flush ();
2698 }
2699
2700 return pchanged;
2701}
2702#endif
2703 2172
2704/*}}} */ 2173/*}}} */
2705 2174
2706bool 2175bool
2707rxvt_term::cmd_parse () 2176rxvt_term::cmd_parse ()
… …
2756 if (ch == C0_LF) 2225 if (ch == C0_LF)
2757 nlines++; 2226 nlines++;
2758 2227
2759 refresh_count++; 2228 refresh_count++;
2760 2229
2761 if (!option (Opt_jumpScroll) 2230 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2762 || (refresh_count >= refresh_limit * (nrow - 1)))
2763 { 2231 {
2764 refreshnow = true;
2765 refresh_count = 0; 2232 refresh_count = 0;
2233
2234 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2235 {
2236 refreshnow = true;
2766 ch = NOCHAR; 2237 ch = NOCHAR;
2767 break; 2238 break;
2239 }
2768 } 2240 }
2769 2241
2770 // scr_add_lines only works for nlines <= nrow - 1. 2242 // scr_add_lines only works for nlines <= nrow - 1.
2771 if (nlines >= nrow - 1) 2243 if (nlines >= nrow - 1)
2772 { 2244 {
… …
2800 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2272 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2801 scr_add_lines (buf, str - buf, nlines); 2273 scr_add_lines (buf, str - buf, nlines);
2802 2274
2803 /* 2275 /*
2804 * If there have been a lot of new lines, then update the screen 2276 * If there have been a lot of new lines, then update the screen
2805 * What the heck I'll cheat and only refresh less than every page-full. 2277 * What the heck we'll cheat and only refresh less than every page-full.
2806 * the number of pages between refreshes is refresh_limit, which 2278 * if skipScroll is enabled.
2807 * is incremented here because we must be doing flat-out scrolling.
2808 */ 2279 */
2809 if (refreshnow) 2280 if (refreshnow)
2810 { 2281 {
2811 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2812 refresh_limit++;
2813 else
2814 {
2815 flag = true; 2282 flag = true;
2816 //TODO: due to popular request, implement "skipscroll" option here
2817 scr_refresh (); 2283 scr_refresh ();
2818 want_refresh = 1; 2284 want_refresh = 1;
2819 }
2820 } 2285 }
2821 2286
2822 } 2287 }
2823 else 2288 else
2824 { 2289 {
… …
2859 cmdbuf_ptr = cmdbuf_endp; 2324 cmdbuf_ptr = cmdbuf_endp;
2860 break; 2325 break;
2861 } 2326 }
2862 2327
2863 if (len == (size_t)-1) 2328 if (len == (size_t)-1)
2329 {
2330 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2864 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2331 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2332 }
2865 2333
2866 // assume wchar == unicode 2334 // assume wchar == unicode
2867 cmdbuf_ptr += len; 2335 cmdbuf_ptr += len;
2868 return wc & UNICODE_MASK; 2336 return wc & UNICODE_MASK;
2869 } 2337 }
… …
2913/*----------------------------------------------------------------------*/ 2381/*----------------------------------------------------------------------*/
2914#ifdef PRINTPIPE 2382#ifdef PRINTPIPE
2915FILE * 2383FILE *
2916rxvt_term::popen_printer () 2384rxvt_term::popen_printer ()
2917{ 2385{
2918 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2386 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2919 2387
2920 if (stream == NULL) 2388 if (stream == NULL)
2921 rxvt_warn ("can't open printer pipe, not printing.\n"); 2389 rxvt_warn ("can't open printer pipe, not printing.\n");
2922 2390
2923 return stream; 2391 return stream;
… …
2934 * simulate attached vt100 printer 2402 * simulate attached vt100 printer
2935 */ 2403 */
2936void 2404void
2937rxvt_term::process_print_pipe () 2405rxvt_term::process_print_pipe ()
2938{ 2406{
2939 int done; 2407 FILE *fd = popen_printer ();
2940 FILE *fd;
2941 2408
2942 if ((fd = popen_printer ()) == NULL) 2409 if (!fd)
2943 return; 2410 return;
2944 2411
2945 /* 2412 /*
2946 * Send all input to the printer until either ESC[4i or ESC[?4i 2413 * Send all input to the printer until either ESC[4i or ESC[?4i
2947 * is received. 2414 * is received.
2948 */ 2415 */
2949 for (done = 0; !done;) 2416 for (int done = 0; !done; )
2950 { 2417 {
2951 unsigned char buf[8]; 2418 unsigned char buf[8];
2952 unicode_t ch; 2419 unicode_t ch;
2953 unsigned int i, len; 2420 unsigned int i, len;
2954 2421
… …
2973 { 2440 {
2974 if ((buf[len++] = cmd_getc ()) == 'i') 2441 if ((buf[len++] = cmd_getc ()) == 'i')
2975 break; /* done = 1 */ 2442 break; /* done = 1 */
2976 } 2443 }
2977 } 2444 }
2978 2445
2979 for (i = 0; i < len; i++) 2446 for (i = 0; i < len; i++)
2980 if (putc (buf[i], fd) == EOF) 2447 if (putc (buf[i], fd) == EOF)
2981 { 2448 {
2982 done = 1; 2449 done = 1;
2983 break; 2450 break;
… …
2985 } 2452 }
2986 } 2453 }
2987 2454
2988 pclose_printer (fd); 2455 pclose_printer (fd);
2989} 2456}
2990#endif /* PRINTPIPE */ 2457#endif /* PRINTPIPE */
2991/*}}} */ 2458/*}}} */
2992 2459
2993/* *INDENT-OFF* */ 2460/* *INDENT-OFF* */
2994enum { 2461enum {
2995 C1_40 = 0x40, 2462 C1_40 = 0x40,
… …
3045 process_dcs_seq (); 2512 process_dcs_seq ();
3046 break; 2513 break;
3047 case 0x9b: /* CSI */ 2514 case 0x9b: /* CSI */
3048 process_csi_seq (); 2515 process_csi_seq ();
3049 break; 2516 break;
3050 case 0x9d: /* CSI */ 2517 case 0x9d: /* OSC */
3051 process_osc_seq (); 2518 process_osc_seq ();
3052 break; 2519 break;
3053#endif 2520#endif
3054 } 2521 }
3055} 2522}
… …
3099 break; 2566 break;
3100 case 'Z': /* identify the terminal type */ 2567 case 'Z': /* identify the terminal type */
3101 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2568 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3102 break; 2569 break;
3103 case '<': /* turn off VT52 mode */ 2570 case '<': /* turn off VT52 mode */
3104 PrivMode (0, PrivMode_vt52); 2571 set_privmode (PrivMode_vt52, 0);
3105 break; 2572 break;
3106 case 'F': /* use special graphics character set */ 2573 case 'F': /* use special graphics character set */
3107 case 'G': /* use regular character set */ 2574 case 'G': /* use regular character set */
3108 /* unimplemented */ 2575 /* unimplemented */
3109 break; 2576 break;
… …
3163 scr_forwardindex (); 2630 scr_forwardindex ();
3164 break; 2631 break;
3165#endif 2632#endif
3166 case '=': 2633 case '=':
3167 case '>': 2634 case '>':
3168 PrivMode ((ch == '='), PrivMode_aplKP); 2635 set_privmode (PrivMode_aplKP, ch == '=');
3169 break; 2636 break;
3170 2637
3171 case C1_40: 2638 case C1_40:
3172 cmd_getc (); 2639 cmd_getc ();
3173 break; 2640 break;
… …
3226 2693
3227 /* 8.3.106: RESET TO INITIAL STATE */ 2694 /* 8.3.106: RESET TO INITIAL STATE */
3228 case 'c': 2695 case 'c':
3229 mbstate.reset (); 2696 mbstate.reset ();
3230 scr_poweron (); 2697 scr_poweron ();
3231 scrollbar_show (1); 2698 scrollBar.show (1);
3232 break; 2699 break;
3233 2700
3234 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2701 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3235 case 'n': 2702 case 'n':
3236 scr_charset_choose (2); 2703 scr_charset_choose (2);
… …
3281rxvt_term::process_csi_seq () 2748rxvt_term::process_csi_seq ()
3282{ 2749{
3283 unicode_t ch, priv, i; 2750 unicode_t ch, priv, i;
3284 unsigned int nargs, p; 2751 unsigned int nargs, p;
3285 int n, ndef; 2752 int n, ndef;
3286 int arg[ESC_ARGS]; 2753 int arg[ESC_ARGS] = { };
3287 2754
3288 for (nargs = ESC_ARGS; nargs > 0;) 2755 nargs = 0;
3289 arg[--nargs] = 0;
3290 2756
3291 priv = 0; 2757 priv = 0;
3292 ch = cmd_getc (); 2758 ch = cmd_getc ();
3293 if (ch >= '<' && ch <= '?') 2759 if (ch >= '<' && ch <= '?')
2760 {
3294 { /* '<' '=' '>' '?' */ 2761 /* '<' '=' '>' '?' */
3295 priv = ch; 2762 priv = ch;
3296 ch = cmd_getc (); 2763 ch = cmd_getc ();
3297 } 2764 }
3298 2765
3299 /* read any numerical arguments */ 2766 /* read any numerical arguments */
… …
3338 switch (priv) 2805 switch (priv)
3339 { 2806 {
3340 case '>': 2807 case '>':
3341 if (ch == CSI_DA) /* secondary device attributes */ 2808 if (ch == CSI_DA) /* secondary device attributes */
3342 { 2809 {
3343 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2810 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3344 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2811 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3345 // 2812 //
3346 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2813 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3347 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2814 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3348 // that we do not support xterm mouse reporting (should be 95 when we do). 2815 // versions.
3349 // 2816 //
3350 tt_printf ("\033[>%d;94;0c", 'U'); 2817 tt_printf ("\033[>%d;95;0c", 'U');
3351 } 2818 }
3352 break; 2819 break;
2820
3353 case '?': 2821 case '?':
3354 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2822 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3355 process_terminal_mode (ch, priv, nargs, arg); 2823 process_terminal_mode (ch, priv, nargs, arg);
3356 break; 2824 break;
3357 } 2825 }
… …
3801 int saveop = op; 3269 int saveop = op;
3802 3270
3803 dLocal (Display *, dpy); 3271 dLocal (Display *, dpy);
3804 3272
3805 assert (str != NULL); 3273 assert (str != NULL);
3806 3274
3807 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3275 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3808 return; 3276 return;
3809 3277
3810 switch (op) 3278 switch (op)
3811 { 3279 {
… …
3873 *buf++ = '\0'; 3341 *buf++ = '\0';
3874 3342
3875 process_color_seq (op, color, name, resp); 3343 process_color_seq (op, color, name, resp);
3876 } 3344 }
3877 break; 3345 break;
3346 case Rxvt_restoreFG:
3878 case XTerm_Color00: 3347 case XTerm_Color00:
3879 process_color_seq (op, Color_fg, str, resp); 3348 process_color_seq (op, Color_fg, str, resp);
3880 break; 3349 break;
3350 case Rxvt_restoreBG:
3881 case XTerm_Color01: 3351 case XTerm_Color01:
3882 process_color_seq (op, Color_bg, str, resp); 3352 process_color_seq (op, Color_bg, str, resp);
3883 break; 3353 break;
3884#ifndef NO_CURSORCOLOR 3354#ifndef NO_CURSORCOLOR
3885 case XTerm_Color_cursor: 3355 case XTerm_Color_cursor:
… …
3906 break; 3376 break;
3907 case URxvt_Color_IT: 3377 case URxvt_Color_IT:
3908 process_color_seq (op, Color_IT, str, resp); 3378 process_color_seq (op, Color_IT, str, resp);
3909 break; 3379 break;
3910#endif 3380#endif
3911#if TRANSPARENT && TINTING 3381#if ENABLE_TRANSPARENCY
3912 case URxvt_Color_tint: 3382 case URxvt_Color_tint:
3913 process_color_seq (op, Color_tint, str, resp); 3383 process_color_seq (op, Color_tint, str, resp);
3384 {
3385 bool changed = false;
3914 3386
3915 check_our_parents (); 3387 if (ISSET_PIXCOLOR (Color_tint))
3388 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3389 else
3390 changed = bgPixmap.unset_tint ();
3916 3391
3917 if (am_transparent) 3392 if (changed)
3918 want_full_refresh = want_refresh = 1; 3393 update_background ();
3394 }
3919 3395
3920 break; 3396 break;
3921#endif 3397#endif
3922 3398
3399#if BG_IMAGE_FROM_FILE
3923 case Rxvt_Pixmap: 3400 case Rxvt_Pixmap:
3924 { 3401 if (!strcmp (str, "?"))
3925 if (*str != ';')
3926 { 3402 {
3927#if XPM_BACKGROUND 3403 char str[256];
3928 scale_pixmap (""); /* reset to default scaling */ 3404
3929 set_bgPixmap (str); /* change pixmap */ 3405 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3930 scr_touch (true); 3406 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3931#endif 3407 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3408 process_xterm_seq (XTerm_title, str, CHAR_ST);
3932 } 3409 }
3933 3410 else
3411 {
3934 int changed = 0; 3412 int changed = 0;
3935 3413
3936 while ((str = strchr (str, ';')) != NULL) 3414 if (*str != ';')
3937 { 3415 {
3416 /* reset to default scaling :*/
3417 bgPixmap.unset_geometry ();
3418 if (bgPixmap.set_file (str)) /* change pixmap */
3419 changed++;
3420 str = strchr (str, ';');
3421 if (str == NULL)
3422 bgPixmap.set_defaultGeometry ();
3423 }
3424
3425 while (str)
3426 {
3938 str++; 3427 str++;
3939#if XPM_BACKGROUND 3428 if (bgPixmap.set_geometry (str))
3940 changed += scale_pixmap (str); 3429 changed++;
3941#endif 3430 str = strchr (str, ';');
3942 } 3431 }
3943 3432
3944 if (changed) 3433 if (changed)
3945 { 3434 update_background ();
3946#ifdef XPM_BACKGROUND
3947 resize_pixmap ();
3948 scr_touch (true);
3949#endif
3950 } 3435 }
3951 }
3952 break; 3436 break;
3953 3437#endif
3954 case Rxvt_restoreFG:
3955 set_window_color (Color_fg, str);
3956 break;
3957 case Rxvt_restoreBG:
3958 set_window_color (Color_bg, str);
3959 break;
3960 3438
3961 case XTerm_logfile: 3439 case XTerm_logfile:
3962 // TODO, when secure mode? 3440 // TODO, when secure mode?
3963 break; 3441 break;
3964 3442
… …
4065 { 3543 {
4066 if (mode == 'r') 3544 if (mode == 'r')
4067 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3545 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4068 else 3546 else
4069 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3547 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4070 PrivMode (state, bit); 3548 set_privmode (bit, state);
4071 } 3549 }
4072 3550
4073 return state; 3551 return state;
4074} 3552}
4075 3553
… …
4079{ 3557{
4080 unsigned int i, j; 3558 unsigned int i, j;
4081 int state; 3559 int state;
4082 3560
4083 static const struct 3561 static const struct
4084 { 3562 {
4085 const int argval; 3563 const int argval;
4086 const unsigned long bit; 3564 const unsigned long bit;
4087 }
4088
4089 argtopriv[] = { 3565 } argtopriv[] = {
4090 { 1, PrivMode_aplCUR }, 3566 { 1, PrivMode_aplCUR },
4091 { 2, PrivMode_vt52 }, 3567 { 2, PrivMode_vt52 },
4092 { 3, PrivMode_132 }, 3568 { 3, PrivMode_132 },
4093 { 4, PrivMode_smoothScroll }, 3569 { 4, PrivMode_smoothScroll },
4094 { 5, PrivMode_rVideo }, 3570 { 5, PrivMode_rVideo },
… …
4110 { 66, PrivMode_aplKP }, 3586 { 66, PrivMode_aplKP },
4111#ifndef NO_BACKSPACE_KEY 3587#ifndef NO_BACKSPACE_KEY
4112 { 67, PrivMode_BackSpace }, 3588 { 67, PrivMode_BackSpace },
4113#endif 3589#endif
4114 { 1000, PrivMode_MouseX11 }, 3590 { 1000, PrivMode_MouseX11 },
4115 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3591 { 1002, PrivMode_MouseBtnEvent },
4116 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3592 { 1003, PrivMode_MouseAnyEvent },
4117 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4118 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3593 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4119 { 1011, PrivMode_Keypress }, // rxvt extension 3594 { 1011, PrivMode_Keypress }, // rxvt extension
4120 // 1035 enable modifiers for alt, numlock NYI 3595 // 1035 enable modifiers for alt, numlock NYI
4121 // 1036 send ESC for meta keys NYI 3596 // 1036 send ESC for meta keys NYI
4122 // 1037 send DEL for keypad delete NYI 3597 // 1037 send DEL for keypad delete NYI
4123 { 1047, PrivMode_Screen }, 3598 { 1047, PrivMode_Screen },
4124 // 1048 save and restore cursor 3599 // 1048 save and restore cursor
4125 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3600 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4126 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3601 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3602 { 2004, PrivMode_BracketPaste },
4127 }; 3603 };
4128 3604
4129 if (nargs == 0) 3605 if (nargs == 0)
4130 return; 3606 return;
4131 3607
… …
4175 case 2: /* VT52 mode */ 3651 case 2: /* VT52 mode */
4176 /* oddball mode. should be set regardless of set/reset 3652 /* oddball mode. should be set regardless of set/reset
4177 * parameter. Return from VT52 mode with an ESC < from 3653 * parameter. Return from VT52 mode with an ESC < from
4178 * within VT52 mode 3654 * within VT52 mode
4179 */ 3655 */
4180 PrivMode (1, PrivMode_vt52); 3656 set_privmode (PrivMode_vt52, 1);
4181 break; 3657 break;
4182 case 3: /* 80/132 */ 3658 case 3: /* 80/132 */
4183 if (priv_modes & PrivMode_132OK) 3659 if (priv_modes & PrivMode_132OK)
3660 {
3661 scr_poweron ();
4184 set_widthheight (((state ? 132 : 80) * fwidth), height); 3662 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3663 }
4185 break; 3664 break;
4186 case 4: /* smooth scrolling */ 3665 case 4: /* smooth scrolling */
4187 set_option (Opt_jumpScroll, !state); 3666 set_option (Opt_jumpScroll, !state);
4188 break; 3667 break;
4189 case 5: /* reverse video */ 3668 case 5: /* reverse video */
… …
4196 scr_autowrap (state); 3675 scr_autowrap (state);
4197 break; 3676 break;
4198 /* case 8: - auto repeat, can't do on a per window basis */ 3677 /* case 8: - auto repeat, can't do on a per window basis */
4199 case 9: /* X10 mouse reporting */ 3678 case 9: /* X10 mouse reporting */
4200 if (state) /* orthogonal */ 3679 if (state) /* orthogonal */
4201 priv_modes &= ~PrivMode_MouseX11; 3680 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4202 break; 3681 break;
4203#ifdef scrollBar_esc 3682#ifdef scrollBar_esc
4204 case scrollBar_esc: 3683 case scrollBar_esc:
4205 if (scrollbar_mapping (state)) 3684 if (scrollBar.map (state))
4206 { 3685 {
4207 resize_all_windows (0, 0, 0); 3686 resize_all_windows (0, 0, 0);
4208 scr_touch (true); 3687 scr_touch (true);
4209 } 3688 }
4210 break; 3689 break;
… …
4219 break; 3698 break;
4220 /* case 66: - application key pad */ 3699 /* case 66: - application key pad */
4221 /* case 67: - backspace key */ 3700 /* case 67: - backspace key */
4222 case 1000: /* X11 mouse reporting */ 3701 case 1000: /* X11 mouse reporting */
4223 if (state) /* orthogonal */ 3702 if (state) /* orthogonal */
4224 priv_modes &= ~PrivMode_MouseX10; 3703 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4225 break; 3704 break;
4226#if 0
4227 case 1001: 3705 case 1002:
4228 break; /* X11 mouse highlighting */ 3706 case 1003:
4229#endif 3707 if (state)
3708 {
3709 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3710 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3711 vt_emask_mouse = PointerMotionMask;
3712 }
3713 else
3714 vt_emask_mouse = NoEventMask;
3715 vt_select_input ();
3716 break;
4230 case 1010: /* scroll to bottom on TTY output inhibit */ 3717 case 1010: /* scroll to bottom on TTY output inhibit */
4231 set_option (Opt_scrollTtyOutput, !state); 3718 set_option (Opt_scrollTtyOutput, !state);
4232 break; 3719 break;
4233 case 1011: /* scroll to bottom on key press */ 3720 case 1011: /* scroll to bottom on key press */
4234 set_option (Opt_scrollTtyKeypress, state); 3721 set_option (Opt_scrollTtyKeypress, state);
… …
4411rxvt_term::process_graphics () 3898rxvt_term::process_graphics ()
4412{ 3899{
4413 unicode_t ch, cmd = cmd_getc (); 3900 unicode_t ch, cmd = cmd_getc ();
4414 3901
4415 if (cmd == 'Q') 3902 if (cmd == 'Q')
3903 {
4416 { /* query graphics */ 3904 /* query graphics */
4417 tt_printf ("\033G0\012"); /* no graphics */ 3905 tt_printf ("\033G0\012"); /* no graphics */
4418 return; 3906 return;
4419 } 3907 }
4420 /* swallow other graphics sequences until terminating ':' */ 3908 /* swallow other graphics sequences until terminating ':' */
4421 do 3909 do
… …
4471 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3959 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4472 3960
4473 memcpy (v_buffer + v_buflen, data, len); 3961 memcpy (v_buffer + v_buflen, data, len);
4474 v_buflen += len; 3962 v_buflen += len;
4475 3963
4476 pty_ev.set (EVENT_READ | EVENT_WRITE); 3964 pty_ev.set (ev::READ | ev::WRITE);
4477} 3965}
4478 3966
4479void rxvt_term::pty_write () 3967void rxvt_term::pty_write ()
4480{ 3968{
4481 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3969 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4486 3974
4487 if (v_buflen == 0) 3975 if (v_buflen == 0)
4488 { 3976 {
4489 free (v_buffer); 3977 free (v_buffer);
4490 v_buffer = 0; 3978 v_buffer = 0;
4491 v_buflen = 0;
4492 3979
4493 pty_ev.set (EVENT_READ); 3980 pty_ev.set (ev::READ);
4494 return; 3981 return;
4495 } 3982 }
4496 3983
4497 memmove (v_buffer, v_buffer + written, v_buflen); 3984 memmove (v_buffer, v_buffer + written, v_buflen);
4498 } 3985 }
4499 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3986 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4500 pty_ev.set (EVENT_READ); 3987 pty_ev.set (ev::READ);
4501} 3988}
4502 3989
4503/*----------------------- end-of-file (C source) -----------------------*/ 3990/*----------------------- end-of-file (C source) -----------------------*/
4504 3991

Diff Legend

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