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.331 by root, Mon Jun 18 13:38:12 2007 UTC vs.
Revision 1.415 by root, Sat Apr 26 03:37:18 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
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
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 ()
1101{ 1032{
1102 make_current (); 1033 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1103 1035
1104 display->flush (); 1036 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108} 1037}
1109 1038
1110void 1039void
1111rxvt_term::flush_cb (time_watcher &w) 1040rxvt_term::flush_cb (ev::timer &w, int revents)
1112{ 1041{
1113 make_current (); 1042 make_current ();
1114 1043
1115 refresh_count = 0; 1044 refresh_count = 0;
1116 flush (); 1045 flush ();
1117} 1046}
1118 1047
1119#ifdef CURSOR_BLINK 1048#ifdef CURSOR_BLINK
1120void 1049void
1121rxvt_term::cursor_blink_cb (time_watcher &w) 1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1122{ 1051{
1123 hidden_cursor = !hidden_cursor; 1052 hidden_cursor = !hidden_cursor;
1124 want_refresh = 1; 1053 want_refresh = 1;
1125 1054 refresh_check ();
1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1127} 1055}
1128#endif 1056#endif
1129 1057
1130#ifdef TEXT_BLINK 1058#ifdef TEXT_BLINK
1131void 1059void
1132rxvt_term::text_blink_cb (time_watcher &w) 1060rxvt_term::text_blink_cb (ev::timer &w, int revents)
1133{ 1061{
1134 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1062 if (scr_refresh_rend (RS_Blink, RS_Blink))
1135 { 1063 {
1136 hidden_text = !hidden_text; 1064 hidden_text = !hidden_text;
1137 want_refresh = 1; 1065 want_refresh = 1;
1138 w.start (w.at + TEXT_BLINK_INTERVAL); 1066 refresh_check ();
1139 } 1067 }
1068 else
1069 w.stop ();
1140} 1070}
1141#endif 1071#endif
1142 1072
1143#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144void 1074void
1145rxvt_term::cont_scroll_cb (time_watcher &w) 1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1146{ 1076{
1147 if ((scrollbar_isUp() || scrollbar_isDn()) && 1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1148 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1149 { 1079 {
1150 want_refresh = 1; 1080 want_refresh = 1;
1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1081 refresh_check ();
1152 } 1082 }
1083 else
1084 w.stop ();
1153} 1085}
1154#endif 1086#endif
1155 1087
1156#ifdef SELECTION_SCROLLING 1088#ifdef SELECTION_SCROLLING
1157void 1089void
1158rxvt_term::sel_scroll_cb (time_watcher &w) 1090rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1159{ 1091{
1160 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1092 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1161 { 1093 {
1162 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1094 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163 want_refresh = 1; 1095 want_refresh = 1;
1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1165 } 1097 }
1098 else
1099 w.stop ();
1166} 1100}
1167#endif 1101#endif
1168 1102
1169#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170void 1104void
1171rxvt_term::slip_wheel_cb (time_watcher &w) 1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1172{ 1106{
1173 if (mouse_slip_wheel_speed == 0 1107 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1174 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1175 : scr_page (UP, mouse_slip_wheel_speed))
1176 { 1108 {
1177 if (view_start == top_row || view_start == 0)
1178 mouse_slip_wheel_speed = 0;
1179
1180 want_refresh = 1; 1109 want_refresh = 1;
1181 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 ();
1182 } 1117 }
1183} 1118}
1184#endif 1119#endif
1185 1120
1186#if LINUX_YIELD_HACK 1121#if LINUX_YIELD_HACK
1187static struct event_handler 1122static struct event_handler
1188{ 1123{
1189 check_watcher yield_ev; 1124 ev::prepare yield_ev;
1190 1125
1191 void yield_cb (check_watcher &w) 1126 void yield_cb (ev::prepare &w, int revents)
1192 { 1127 {
1193 // this should really be sched_yield(), but the linux guys thought 1128 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than 1129 // that giving a process calling sched_yield () less cpu time than
1195 // 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
1196 // allowed by the sus... as is returning ENOSYS. 1131 // allowed by the sus... as is returning ENOSYS.
1247 1182
1248 return false; 1183 return false;
1249} 1184}
1250 1185
1251void 1186void
1252rxvt_term::pty_cb (io_watcher &w, short revents) 1187rxvt_term::pty_cb (ev::io &w, int revents)
1253{ 1188{
1254 make_current (); 1189 make_current ();
1255 1190
1256 if (revents & EVENT_READ) 1191 if (revents & ev::READ)
1257 // loop, but don't allow a single term to monopolize us 1192 // loop, but don't allow a single term to monopolize us
1258 while (pty_fill ()) 1193 while (pty_fill ())
1259 if (cmd_parse ()) 1194 if (cmd_parse ())
1260 break; 1195 break;
1261 1196
1262 if (revents & EVENT_WRITE) 1197 if (revents & ev::WRITE)
1263 pty_write (); 1198 pty_write ();
1199
1200 refresh_check ();
1264} 1201}
1265 1202
1266void 1203void
1267rxvt_term::pointer_unblank () 1204rxvt_term::pointer_unblank ()
1268{ 1205{
1271 1208
1272#ifdef POINTER_BLANK 1209#ifdef POINTER_BLANK
1273 hidden_pointer = 0; 1210 hidden_pointer = 0;
1274 1211
1275 if (option (Opt_pointerBlank)) 1212 if (option (Opt_pointerBlank))
1276 pointer_ev.start (NOW + pointerBlankDelay); 1213 pointer_ev.start (pointerBlankDelay);
1277#endif 1214#endif
1278} 1215}
1279 1216
1280#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1281void 1218void
1289 1226
1290 hidden_pointer = 1; 1227 hidden_pointer = 1;
1291} 1228}
1292 1229
1293void 1230void
1294rxvt_term::pointer_cb (time_watcher &w) 1231rxvt_term::pointer_cb (ev::timer &w, int revents)
1295{ 1232{
1296 make_current (); 1233 make_current ();
1297 1234
1298 pointer_blank (); 1235 pointer_blank ();
1299} 1236}
1302void 1239void
1303rxvt_term::mouse_report (XButtonEvent &ev) 1240rxvt_term::mouse_report (XButtonEvent &ev)
1304{ 1241{
1305 int button_number, key_state = 0; 1242 int button_number, key_state = 0;
1306 int x, y; 1243 int x, y;
1244 int code = 32;
1307 1245
1308 x = ev.x; 1246 x = Pixel2Col (ev.x);
1309 y = ev.y; 1247 y = Pixel2Row (ev.y);
1310 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 }
1311 1256
1312 if (MEvent.button == AnyButton) 1257 if (MEvent.button == AnyButton)
1313 button_number = 3; 1258 button_number = 3;
1314 else 1259 else
1315 { 1260 {
1361 x + 1, 1306 x + 1,
1362 y + 1); 1307 y + 1);
1363#endif 1308#endif
1364 1309
1365 tt_printf ("\033[M%c%c%c", 1310 tt_printf ("\033[M%c%c%c",
1366 (32 + button_number + key_state), 1311 (code + button_number + key_state),
1367 (32 + x + 1), 1312 (32 + x + 1),
1368 (32 + y + 1)); 1313 (32 + y + 1));
1369} 1314}
1370 1315
1371/*{{{ process an X event */ 1316/*{{{ process an X event */
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1378 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out (); 1379 focus_out ();
1435 } 1380 }
1436#endif 1381#endif
1437 } 1382 }
1438 break;
1439
1440 case MappingNotify:
1441 XRefreshKeyboardMapping (&ev.xmapping);
1442 break; 1383 break;
1443 1384
1444 /* 1385 /*
1445 * XXX: this is not the _current_ arrangement 1386 * XXX: this is not the _current_ arrangement
1446 * Here's my conclusion: 1387 * Here's my conclusion:
1479 && ev.xfocus.mode != NotifyGrab) 1420 && ev.xfocus.mode != NotifyGrab)
1480 focus_out (); 1421 focus_out ();
1481 break; 1422 break;
1482 1423
1483 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);*/
1484 if (ev.xconfigure.window == parent[0]) 1428 if (ev.xconfigure.window == parent[0])
1485 { 1429 {
1486 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1487 ; 1431 ;
1488 1432
1489 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1490 { 1434 {
1491 seen_resize = 1; 1435 seen_resize = 1;
1492 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1493#ifdef XPM_BACKGROUND 1437 }
1494 if (!option (Opt_transparent) && bgPixmap.auto_resize) 1438 else
1439 {
1440#ifdef HAVE_BG_PIXMAP
1441 if (bgPixmap.window_position_sensitive ())
1495 { 1442 {
1443 if (mapped)
1444 update_background ();
1496 resize_pixmap (); 1445 else
1497 scr_touch (true); 1446 bgPixmap.invalidate ();
1498 } 1447 }
1499#endif 1448#endif
1500 } 1449 }
1501 1450
1502 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1503
1504#ifdef TRANSPARENT
1505 if (option (Opt_transparent))
1506 check_our_parents ();
1507#endif
1508 } 1452 }
1509 break; 1453 break;
1510 1454
1511 case PropertyNotify: 1455 case PropertyNotify:
1512 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)))
1528 case SelectionRequest: 1472 case SelectionRequest:
1529 selection_send (ev.xselectionrequest); 1473 selection_send (ev.xselectionrequest);
1530 break; 1474 break;
1531 1475
1532 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
1533 mapped = 1; 1493 mapped = 1;
1534#ifdef TEXT_BLINK 1494#ifdef TEXT_BLINK
1535 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1495 text_blink_ev.start ();
1536#endif 1496#endif
1537 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1497 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1538 break; 1498 break;
1539 1499
1540 case UnmapNotify: 1500 case UnmapNotify:
1542#ifdef TEXT_BLINK 1502#ifdef TEXT_BLINK
1543 text_blink_ev.stop (); 1503 text_blink_ev.stop ();
1544#endif 1504#endif
1545 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1505 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1546 break; 1506 break;
1547
1548#ifdef TRANSPARENT
1549 case ReparentNotify:
1550 rootwin_cb (ev);
1551 break;
1552#endif /* TRANSPARENT */
1553 1507
1554 case GraphicsExpose: 1508 case GraphicsExpose:
1555 case Expose: 1509 case Expose:
1556 if (ev.xany.window == vt) 1510 if (ev.xany.window == vt)
1557 { 1511 {
1558 do 1512 do
1513 {
1559 scr_expose (ev.xexpose.x, ev.xexpose.y, 1514 scr_expose (ev.xexpose.x, ev.xexpose.y,
1560 ev.xexpose.width, ev.xexpose.height, False); 1515 ev.xexpose.width, ev.xexpose.height, False);
1516 }
1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1562 1518
1563 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1564 1520
1565 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522 {
1566 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1567 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1525 }
1568 1526
1569 want_refresh = 1; 1527 want_refresh = 1;
1570 } 1528 }
1571 else 1529 else
1572 { 1530 {
1575 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1533 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1576 ; 1534 ;
1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1578 ; 1536 ;
1579 1537
1580 if (isScrollbarWindow (ev.xany.window)) 1538 if (scrollBar.state && ev.xany.window == scrollBar.win)
1581 { 1539 {
1582 scrollBar.setIdle (); 1540 scrollBar.state = STATE_IDLE;
1583 scrollbar_show (0); 1541 scrollBar.show (0);
1584 } 1542 }
1585
1586#ifdef TRANSPARENT
1587 if (am_transparent && ev.xany.window == parent[0])
1588 XClearWindow (dpy, ev.xany.window);
1589#endif
1590 } 1543 }
1591 break; 1544 break;
1592 1545
1593 case MotionNotify: 1546 case MotionNotify:
1594#ifdef POINTER_BLANK 1547#ifdef POINTER_BLANK
1595 if (hidden_pointer) 1548 if (hidden_pointer)
1596 pointer_unblank (); 1549 pointer_unblank ();
1597#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);
1598 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1554 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1599 break; 1555 break;
1600 1556
1601 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1602 { 1558 {
1636 int dist; 1592 int dist;
1637 1593
1638 /* don't clobber the current delay if we are 1594 /* don't clobber the current delay if we are
1639 * already in the middle of scrolling. 1595 * already in the middle of scrolling.
1640 */ 1596 */
1641 if (!sel_scroll_ev.active) 1597 if (!sel_scroll_ev.is_active ())
1642 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1598 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1643 1599
1644 /* save the event params so we can highlight 1600 /* save the event params so we can highlight
1645 * the selection in the pending-scroll loop 1601 * the selection in the pending-scroll loop
1646 */ 1602 */
1647 selection_save_x = ev.xbutton.x; 1603 selection_save_x = ev.xbutton.x;
1669 else 1625 else
1670 { 1626 {
1671 /* we are within the text window, so we 1627 /* we are within the text window, so we
1672 * shouldn't be scrolling 1628 * shouldn't be scrolling
1673 */ 1629 */
1674 if (sel_scroll_ev.active)
1675 sel_scroll_ev.stop(); 1630 sel_scroll_ev.stop();
1676 } 1631 }
1677#endif 1632#endif
1678#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
1679 } 1634 }
1680#endif 1635#endif
1681 } 1636 }
1682 } 1637 }
1683 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1638 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1684 { 1639 {
1685 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1640 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1686 MotionNotify, &ev)) 1641 MotionNotify, &ev))
1687 ; 1642 ;
1688 1643
1690 &unused_root, &unused_child, 1645 &unused_root, &unused_child,
1691 &unused_root_x, &unused_root_y, 1646 &unused_root_x, &unused_root_y,
1692 &ev.xbutton.x, &ev.xbutton.y, 1647 &ev.xbutton.x, &ev.xbutton.y,
1693 &unused_mask); 1648 &unused_mask);
1694 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1695 scrollbar_size ()); 1650 scrollBar.size ());
1696 want_refresh = 1; 1651 want_refresh = 1;
1697 scrollbar_show (1); 1652 scrollBar.show (1);
1698 } 1653 }
1699 break; 1654 break;
1700 } 1655 }
1701 1656
1702#if defined(CURSOR_BLINK) 1657#if defined(CURSOR_BLINK)
1706 { 1661 {
1707 hidden_cursor = 0; 1662 hidden_cursor = 0;
1708 want_refresh = 1; 1663 want_refresh = 1;
1709 } 1664 }
1710 1665
1711 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1666 cursor_blink_ev.again ();
1712 } 1667 }
1713#endif 1668#endif
1714 1669
1715#if defined(POINTER_BLANK) 1670#if defined(POINTER_BLANK)
1716 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1671 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1723 1678
1724 if (ev.type == KeyPress && hidden_pointer == 0) 1679 if (ev.type == KeyPress && hidden_pointer == 0)
1725 pointer_blank (); 1680 pointer_blank ();
1726 } 1681 }
1727#endif 1682#endif
1683
1684 refresh_check ();
1728} 1685}
1729 1686
1730void 1687void
1731rxvt_term::focus_in () 1688rxvt_term::focus_in ()
1732{ 1689{
1744 XSetICFocus (Input_Context); 1701 XSetICFocus (Input_Context);
1745 } 1702 }
1746#endif 1703#endif
1747#if CURSOR_BLINK 1704#if CURSOR_BLINK
1748 if (option (Opt_cursorBlink)) 1705 if (option (Opt_cursorBlink))
1749 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1706 cursor_blink_ev.again ();
1750#endif 1707#endif
1751#if OFF_FOCUS_FADING 1708#if OFF_FOCUS_FADING
1752 if (rs[Rs_fade]) 1709 if (rs[Rs_fade])
1753 { 1710 {
1754 pix_colors = pix_colors_focused; 1711 pix_colors = pix_colors_focused;
1756 } 1713 }
1757#endif 1714#endif
1758#if ENABLE_FRILLS 1715#if ENABLE_FRILLS
1759 if (option (Opt_urgentOnBell)) 1716 if (option (Opt_urgentOnBell))
1760 { 1717 {
1761 XWMHints *h;
1762
1763 h = XGetWMHints(dpy, parent[0]); 1718 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1764 if (h != NULL)
1765 { 1719 {
1766 h->flags &= ~XUrgencyHint; 1720 h->flags &= ~XUrgencyHint;
1767 XSetWMHints(dpy, parent[0], h); 1721 XSetWMHints (dpy, parent[0], h);
1768 } 1722 }
1769 } 1723 }
1770#endif 1724#endif
1771 } 1725 }
1772} 1726}
1783 1737
1784#if ENABLE_FRILLS || ISO_14755 1738#if ENABLE_FRILLS || ISO_14755
1785 if (iso14755buf) 1739 if (iso14755buf)
1786 { 1740 {
1787 iso14755buf = 0; 1741 iso14755buf = 0;
1788# if ENABLE_OVERLAY 1742# if ISO_14755
1789 scr_overlay_off (); 1743 scr_overlay_off ();
1790# endif 1744# endif
1791 } 1745 }
1792#endif 1746#endif
1793#if USE_XIM 1747#if USE_XIM
1795 XUnsetICFocus (Input_Context); 1749 XUnsetICFocus (Input_Context);
1796#endif 1750#endif
1797#if CURSOR_BLINK 1751#if CURSOR_BLINK
1798 if (option (Opt_cursorBlink)) 1752 if (option (Opt_cursorBlink))
1799 cursor_blink_ev.stop (); 1753 cursor_blink_ev.stop ();
1754
1800 hidden_cursor = 0; 1755 hidden_cursor = 0;
1801#endif 1756#endif
1802#if OFF_FOCUS_FADING 1757#if OFF_FOCUS_FADING
1803 if (rs[Rs_fade]) 1758 if (rs[Rs_fade])
1804 { 1759 {
1820 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);
1821 } 1776 }
1822#endif 1777#endif
1823} 1778}
1824 1779
1825#if TRANSPARENT || ENABLE_PERL 1780#if ENABLE_TRANSPARENCY || ENABLE_PERL
1826void 1781void
1827rxvt_term::rootwin_cb (XEvent &ev) 1782rxvt_term::rootwin_cb (XEvent &ev)
1828{ 1783{
1829 make_current (); 1784 make_current ();
1830 1785
1831 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1786 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1832 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1787 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1833 return; 1788 return;
1834 1789
1835# if TRANSPARENT 1790# if ENABLE_TRANSPARENCY
1836 switch (ev.type) 1791 switch (ev.type)
1837 { 1792 {
1838 case PropertyNotify: 1793 case PropertyNotify:
1839 /* 1794 /*
1840 * 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,
1841 * 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.
1842 */ 1797 */
1843 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1798 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1844 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1799 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1845 return; 1800 {
1801 bgPixmap.set_root_pixmap ();
1802 update_background ();
1803 }
1846 1804
1847 /* FALLTHROUGH */
1848 case ReparentNotify:
1849 if (option (Opt_transparent))
1850 check_our_parents ();
1851 break; 1805 break;
1852 } 1806 }
1853# endif 1807# endif
1808
1809 refresh_check ();
1854} 1810}
1855#endif 1811#endif
1856 1812
1857void 1813void
1858rxvt_term::button_press (XButtonEvent &ev) 1814rxvt_term::button_press (XButtonEvent &ev)
1913 mouse_report (ev); 1869 mouse_report (ev);
1914 } 1870 }
1915#else 1871#else
1916 MEvent.button = ev.button; 1872 MEvent.button = ev.button;
1917 mouse_report (ev); 1873 mouse_report (ev);
1918#endif /* MOUSE_REPORT_DOUBLECLICK */ 1874#endif /* MOUSE_REPORT_DOUBLECLICK */
1919 1875
1920 } 1876 }
1921 else 1877 else
1922 { 1878 {
1923 if (ev.button != MEvent.button) 1879 if (ev.button != MEvent.button)
1971 } 1927 }
1972 1928
1973 /* 1929 /*
1974 * Scrollbar window processing of button press 1930 * Scrollbar window processing of button press
1975 */ 1931 */
1976 if (isScrollbarWindow (ev.window)) 1932 if (scrollBar.state && ev.window == scrollBar.win)
1977 { 1933 {
1978 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;
1979 /* 1942 /*
1980 * Rxvt-style scrollbar: 1943 * Rxvt-style scrollbar:
1981 * move up if mouse is above slider 1944 * move up if mouse is above slider
1982 * move dn if mouse is below slider 1945 * move dn if mouse is below slider
1983 * 1946 *
1992 /* 1955 /*
1993 * Mouse report disabled scrollbar: 1956 * Mouse report disabled scrollbar:
1994 * arrow buttons - send up/down 1957 * arrow buttons - send up/down
1995 * click on scrollbar - send pageup/down 1958 * click on scrollbar - send pageup/down
1996 */ 1959 */
1997 if ((scrollBar.style == R_SB_NEXT 1960 if (direction == UP)
1998 && scrollbarnext_upButton (ev.y))
1999 || (scrollBar.style == R_SB_RXVT
2000 && scrollbarrxvt_upButton (ev.y)))
2001 tt_printf ("\033[A"); 1961 tt_printf ("\033[A");
2002 else if ((scrollBar.style == R_SB_NEXT 1962 else if (direction == DN)
2003 && scrollbarnext_dnButton (ev.y))
2004 || (scrollBar.style == R_SB_RXVT
2005 && scrollbarrxvt_dnButton (ev.y)))
2006 tt_printf ("\033[B"); 1963 tt_printf ("\033[B");
2007 else 1964 else
2008 switch (ev.button) 1965 switch (ev.button)
2009 { 1966 {
2010 case Button2: 1967 case Button2:
2017 tt_printf ("\033[5~"); 1974 tt_printf ("\033[5~");
2018 break; 1975 break;
2019 } 1976 }
2020 } 1977 }
2021 else 1978 else
2022#endif /* NO_SCROLLBAR_REPORT */ 1979#endif /* NO_SCROLLBAR_REPORT */
2023
2024 {
2025 char upordown = 0;
2026
2027 if (scrollBar.style == R_SB_NEXT)
2028 { 1980 {
2029 if (scrollbarnext_upButton (ev.y)) 1981 if (direction != NO_DIR)
2030 upordown = -1; /* up */
2031 else if (scrollbarnext_dnButton (ev.y))
2032 upordown = 1; /* down */
2033 }
2034 else if (scrollBar.style == R_SB_RXVT)
2035 {
2036 if (scrollbarrxvt_upButton (ev.y))
2037 upordown = -1; /* up */
2038 else if (scrollbarrxvt_dnButton (ev.y))
2039 upordown = 1; /* down */
2040 }
2041 if (upordown)
2042 { 1982 {
2043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1983#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1984 if (!cont_scroll_ev.is_active ())
2044 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1985 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2045#endif 1986#endif
2046 if (scr_page (upordown < 0 ? UP : DN, 1)) 1987 if (scr_page (direction, 1))
2047 { 1988 {
2048 if (upordown < 0) 1989 if (direction == UP)
2049 scrollBar.setUp (); 1990 scrollBar.state = STATE_UP;
2050 else 1991 else
2051 scrollBar.setDn (); 1992 scrollBar.state = STATE_DOWN;
2052 } 1993 }
2053 } 1994 }
2054 else 1995 else
2055 switch (ev.button) 1996 switch (ev.button)
2056 { 1997 {
2057 case Button2: 1998 case Button2:
2058 switch (scrollbar_align) 1999 switch (scrollBar.align)
2059 { 2000 {
2060 case R_SB_ALIGN_TOP: 2001 case R_SB_ALIGN_TOP:
2061 csrO = 0; 2002 csrO = 0;
2062 break; 2003 break;
2063 case R_SB_ALIGN_CENTRE: 2004 case R_SB_ALIGN_CENTRE:
2069 } 2010 }
2070 2011
2071 if (scrollBar.style == R_SB_XTERM 2012 if (scrollBar.style == R_SB_XTERM
2072 || scrollbar_above_slider (ev.y) 2013 || scrollbar_above_slider (ev.y)
2073 || scrollbar_below_slider (ev.y)) 2014 || scrollbar_below_slider (ev.y))
2074 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2075 2016
2076 scrollBar.setMotion (); 2017 scrollBar.state = STATE_MOTION;
2077 break; 2018 break;
2078 2019
2079 case Button1: 2020 case Button1:
2080 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2021 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2081 csrO = ev.y - scrollBar.top; 2022 csrO = ev.y - scrollBar.top;
2082 /* FALLTHROUGH */ 2023 /* FALLTHROUGH */
2083 2024
2084 case Button3: 2025 case Button3:
2085 if (scrollBar.style != R_SB_XTERM) 2026 if (scrollBar.style != R_SB_XTERM)
2095 scr_page (DN, nrow - 1); 2036 scr_page (DN, nrow - 1);
2096# else 2037# else
2097 scr_page (DN, nrow / 4); 2038 scr_page (DN, nrow / 4);
2098# endif 2039# endif
2099 else 2040 else
2100 scrollBar.setMotion (); 2041 scrollBar.state = STATE_MOTION;
2101 } 2042 }
2102 else 2043 else
2103 { 2044 {
2104 scr_page ((ev.button == Button1 ? DN : UP), 2045 scr_page ((ev.button == Button1 ? DN : UP),
2105 (nrow 2046 (nrow
2106 * scrollbar_position (ev.y) 2047 * scrollbar_position (ev.y)
2107 / scrollbar_size ())); 2048 / scrollBar.size ()));
2108 } 2049 }
2109 2050
2110 break; 2051 break;
2111 } 2052 }
2112 } 2053 }
2122 2063
2123 csrO = 0; /* reset csr Offset */ 2064 csrO = 0; /* reset csr Offset */
2124 if (!bypass_keystate) 2065 if (!bypass_keystate)
2125 reportmode = !! (priv_modes & PrivMode_mouse_report); 2066 reportmode = !! (priv_modes & PrivMode_mouse_report);
2126 2067
2127 if (scrollbar_isUpDn ()) 2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2128 { 2069 {
2129 scrollBar.setIdle (); 2070 scrollBar.state = STATE_IDLE;
2130 scrollbar_show (0); 2071 scrollBar.show (0);
2131 } 2072 }
2132 2073
2133#ifdef SELECTION_SCROLLING 2074#ifdef SELECTION_SCROLLING
2134 if (sel_scroll_ev.active)
2135 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
2136#endif 2076#endif
2137 2077
2138 if (ev.window == vt) 2078 if (ev.window == vt)
2139 { 2079 {
2140 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)))
2164 mouse_report (ev); 2104 mouse_report (ev);
2165 } 2105 }
2166#else /* MOUSE_REPORT_DOUBLECLICK */ 2106#else /* MOUSE_REPORT_DOUBLECLICK */
2167 MEvent.button = AnyButton; 2107 MEvent.button = AnyButton;
2168 mouse_report (ev); 2108 mouse_report (ev);
2169#endif /* MOUSE_REPORT_DOUBLECLICK */ 2109#endif /* MOUSE_REPORT_DOUBLECLICK */
2170 return; 2110 return;
2171 } 2111 }
2172 2112
2173 /* 2113 /*
2174 * dumb hack to compensate for the failure of click-and-drag 2114 * dumb hack to compensate for the failure of click-and-drag
2212 { 2152 {
2213 mouse_slip_wheel_speed += v ? -1 : 1; 2153 mouse_slip_wheel_speed += v ? -1 : 1;
2214 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2154 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2215 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2155 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2216 2156
2217 if (slip_wheel_ev.at < NOW) 2157 if (!slip_wheel_ev.is_active ())
2218 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2158 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2219
2220 slip_wheel_ev.start ();
2221 } 2159 }
2222 else 2160 else
2161# endif
2223 { 2162 {
2224# endif
2225 scr_page (v, i); 2163 scr_page (v, i);
2226 scrollbar_show (1); 2164 scrollBar.show (1);
2227# ifdef MOUSE_SLIP_WHEELING
2228 } 2165 }
2229# endif
2230 } 2166 }
2231 break; 2167 break;
2232#endif 2168#endif
2233 } 2169 }
2234 } 2170 }
2293 2229
2294 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2230 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2295 { 2231 {
2296 refresh_count = 0; 2232 refresh_count = 0;
2297 2233
2298 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2234 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2299 { 2235 {
2300 refreshnow = true; 2236 refreshnow = true;
2301 ch = NOCHAR; 2237 ch = NOCHAR;
2302 break; 2238 break;
2303 } 2239 }
2388 cmdbuf_ptr = cmdbuf_endp; 2324 cmdbuf_ptr = cmdbuf_endp;
2389 break; 2325 break;
2390 } 2326 }
2391 2327
2392 if (len == (size_t)-1) 2328 if (len == (size_t)-1)
2329 {
2330 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2393 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 }
2394 2333
2395 // assume wchar == unicode 2334 // assume wchar == unicode
2396 cmdbuf_ptr += len; 2335 cmdbuf_ptr += len;
2397 return wc & UNICODE_MASK; 2336 return wc & UNICODE_MASK;
2398 } 2337 }
2514 } 2453 }
2515 } 2454 }
2516 2455
2517 pclose_printer (fd); 2456 pclose_printer (fd);
2518} 2457}
2519#endif /* PRINTPIPE */ 2458#endif /* PRINTPIPE */
2520/*}}} */ 2459/*}}} */
2521 2460
2522/* *INDENT-OFF* */ 2461/* *INDENT-OFF* */
2523enum { 2462enum {
2524 C1_40 = 0x40, 2463 C1_40 = 0x40,
2574 process_dcs_seq (); 2513 process_dcs_seq ();
2575 break; 2514 break;
2576 case 0x9b: /* CSI */ 2515 case 0x9b: /* CSI */
2577 process_csi_seq (); 2516 process_csi_seq ();
2578 break; 2517 break;
2579 case 0x9d: /* CSI */ 2518 case 0x9d: /* OSC */
2580 process_osc_seq (); 2519 process_osc_seq ();
2581 break; 2520 break;
2582#endif 2521#endif
2583 } 2522 }
2584} 2523}
2628 break; 2567 break;
2629 case 'Z': /* identify the terminal type */ 2568 case 'Z': /* identify the terminal type */
2630 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2569 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2631 break; 2570 break;
2632 case '<': /* turn off VT52 mode */ 2571 case '<': /* turn off VT52 mode */
2633 PrivMode (0, PrivMode_vt52); 2572 set_privmode (PrivMode_vt52, 0);
2634 break; 2573 break;
2635 case 'F': /* use special graphics character set */ 2574 case 'F': /* use special graphics character set */
2636 case 'G': /* use regular character set */ 2575 case 'G': /* use regular character set */
2637 /* unimplemented */ 2576 /* unimplemented */
2638 break; 2577 break;
2692 scr_forwardindex (); 2631 scr_forwardindex ();
2693 break; 2632 break;
2694#endif 2633#endif
2695 case '=': 2634 case '=':
2696 case '>': 2635 case '>':
2697 PrivMode ((ch == '='), PrivMode_aplKP); 2636 set_privmode (PrivMode_aplKP, ch == '=');
2698 break; 2637 break;
2699 2638
2700 case C1_40: 2639 case C1_40:
2701 cmd_getc (); 2640 cmd_getc ();
2702 break; 2641 break;
2755 2694
2756 /* 8.3.106: RESET TO INITIAL STATE */ 2695 /* 8.3.106: RESET TO INITIAL STATE */
2757 case 'c': 2696 case 'c':
2758 mbstate.reset (); 2697 mbstate.reset ();
2759 scr_poweron (); 2698 scr_poweron ();
2760 scrollbar_show (1); 2699 scrollBar.show (1);
2761 break; 2700 break;
2762 2701
2763 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2702 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2764 case 'n': 2703 case 'n':
2765 scr_charset_choose (2); 2704 scr_charset_choose (2);
2810rxvt_term::process_csi_seq () 2749rxvt_term::process_csi_seq ()
2811{ 2750{
2812 unicode_t ch, priv, i; 2751 unicode_t ch, priv, i;
2813 unsigned int nargs, p; 2752 unsigned int nargs, p;
2814 int n, ndef; 2753 int n, ndef;
2815 int arg[ESC_ARGS]; 2754 int arg[ESC_ARGS] = { };
2816 2755
2817 for (nargs = ESC_ARGS; nargs > 0;) 2756 nargs = 0;
2818 arg[--nargs] = 0;
2819 2757
2820 priv = 0; 2758 priv = 0;
2821 ch = cmd_getc (); 2759 ch = cmd_getc ();
2822 if (ch >= '<' && ch <= '?') 2760 if (ch >= '<' && ch <= '?')
2761 {
2823 { /* '<' '=' '>' '?' */ 2762 /* '<' '=' '>' '?' */
2824 priv = ch; 2763 priv = ch;
2825 ch = cmd_getc (); 2764 ch = cmd_getc ();
2826 } 2765 }
2827 2766
2828 /* read any numerical arguments */ 2767 /* read any numerical arguments */
2867 switch (priv) 2806 switch (priv)
2868 { 2807 {
2869 case '>': 2808 case '>':
2870 if (ch == CSI_DA) /* secondary device attributes */ 2809 if (ch == CSI_DA) /* secondary device attributes */
2871 { 2810 {
2872 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2811 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2873 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2812 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2874 // 2813 //
2875 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2814 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2876 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2815 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2877 // that we do not support xterm mouse reporting (should be 95 when we do). 2816 // versions.
2878 // 2817 //
2879 tt_printf ("\033[>%d;94;0c", 'U'); 2818 tt_printf ("\033[>%d;95;0c", 'U');
2880 } 2819 }
2881 break; 2820 break;
2821
2882 case '?': 2822 case '?':
2883 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2823 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2884 process_terminal_mode (ch, priv, nargs, arg); 2824 process_terminal_mode (ch, priv, nargs, arg);
2885 break; 2825 break;
2886 } 2826 }
3402 *buf++ = '\0'; 3342 *buf++ = '\0';
3403 3343
3404 process_color_seq (op, color, name, resp); 3344 process_color_seq (op, color, name, resp);
3405 } 3345 }
3406 break; 3346 break;
3347 case Rxvt_restoreFG:
3407 case XTerm_Color00: 3348 case XTerm_Color00:
3408 process_color_seq (op, Color_fg, str, resp); 3349 process_color_seq (op, Color_fg, str, resp);
3409 break; 3350 break;
3351 case Rxvt_restoreBG:
3410 case XTerm_Color01: 3352 case XTerm_Color01:
3411 process_color_seq (op, Color_bg, str, resp); 3353 process_color_seq (op, Color_bg, str, resp);
3412 break; 3354 break;
3413#ifndef NO_CURSORCOLOR 3355#ifndef NO_CURSORCOLOR
3414 case XTerm_Color_cursor: 3356 case XTerm_Color_cursor:
3435 break; 3377 break;
3436 case URxvt_Color_IT: 3378 case URxvt_Color_IT:
3437 process_color_seq (op, Color_IT, str, resp); 3379 process_color_seq (op, Color_IT, str, resp);
3438 break; 3380 break;
3439#endif 3381#endif
3440#if TRANSPARENT && TINTING 3382#if ENABLE_TRANSPARENCY
3441 case URxvt_Color_tint: 3383 case URxvt_Color_tint:
3442 process_color_seq (op, Color_tint, str, resp); 3384 process_color_seq (op, Color_tint, str, resp);
3385 {
3386 bool changed = false;
3443 3387
3444 check_our_parents (); 3388 if (ISSET_PIXCOLOR (Color_tint))
3389 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3390 else
3391 changed = bgPixmap.unset_tint ();
3445 3392
3446 if (am_transparent) 3393 if (changed)
3447 want_full_refresh = want_refresh = 1; 3394 update_background ();
3395 }
3448 3396
3449 break; 3397 break;
3450#endif 3398#endif
3451 3399
3400#if BG_IMAGE_FROM_FILE
3452 case Rxvt_Pixmap: 3401 case Rxvt_Pixmap:
3453 { 3402 if (!strcmp (str, "?"))
3454 if (*str != ';')
3455 { 3403 {
3456#if XPM_BACKGROUND 3404 char str[256];
3457 scale_pixmap (""); /* reset to default scaling */ 3405
3458 set_bgPixmap (str); /* change pixmap */ 3406 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3459 scr_touch (true); 3407 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3460#endif 3408 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3409 process_xterm_seq (XTerm_title, str, CHAR_ST);
3461 } 3410 }
3462 3411 else
3412 {
3463 int changed = 0; 3413 int changed = 0;
3464 3414
3465 while ((str = strchr (str, ';')) != NULL) 3415 if (*str != ';')
3466 { 3416 {
3417 /* reset to default scaling :*/
3418 bgPixmap.unset_geometry ();
3419 if (bgPixmap.set_file (str)) /* change pixmap */
3420 changed++;
3421 str = strchr (str, ';');
3422 if (str == NULL)
3423 bgPixmap.set_defaultGeometry ();
3424 }
3425
3426 while (str)
3427 {
3467 str++; 3428 str++;
3468#if XPM_BACKGROUND 3429 if (bgPixmap.set_geometry (str))
3469 changed += scale_pixmap (str); 3430 changed++;
3470#endif 3431 str = strchr (str, ';');
3471 } 3432 }
3472 3433
3473 if (changed) 3434 if (changed)
3474 { 3435 update_background ();
3475#ifdef XPM_BACKGROUND
3476 resize_pixmap ();
3477 scr_touch (true);
3478#endif
3479 } 3436 }
3480#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
3481 if (option (Opt_transparent))
3482 check_our_parents ();
3483#endif
3484 }
3485 break; 3437 break;
3486 3438#endif
3487 case Rxvt_restoreFG:
3488 set_window_color (Color_fg, str);
3489 break;
3490 case Rxvt_restoreBG:
3491 set_window_color (Color_bg, str);
3492 break;
3493 3439
3494 case XTerm_logfile: 3440 case XTerm_logfile:
3495 // TODO, when secure mode? 3441 // TODO, when secure mode?
3496 break; 3442 break;
3497 3443
3598 { 3544 {
3599 if (mode == 'r') 3545 if (mode == 'r')
3600 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3546 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3601 else 3547 else
3602 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3548 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3603 PrivMode (state, bit); 3549 set_privmode (bit, state);
3604 } 3550 }
3605 3551
3606 return state; 3552 return state;
3607} 3553}
3608 3554
3612{ 3558{
3613 unsigned int i, j; 3559 unsigned int i, j;
3614 int state; 3560 int state;
3615 3561
3616 static const struct 3562 static const struct
3617 { 3563 {
3618 const int argval; 3564 const int argval;
3619 const unsigned long bit; 3565 const unsigned long bit;
3620 }
3621
3622 argtopriv[] = { 3566 } argtopriv[] = {
3623 { 1, PrivMode_aplCUR }, 3567 { 1, PrivMode_aplCUR },
3624 { 2, PrivMode_vt52 }, 3568 { 2, PrivMode_vt52 },
3625 { 3, PrivMode_132 }, 3569 { 3, PrivMode_132 },
3626 { 4, PrivMode_smoothScroll }, 3570 { 4, PrivMode_smoothScroll },
3627 { 5, PrivMode_rVideo }, 3571 { 5, PrivMode_rVideo },
3643 { 66, PrivMode_aplKP }, 3587 { 66, PrivMode_aplKP },
3644#ifndef NO_BACKSPACE_KEY 3588#ifndef NO_BACKSPACE_KEY
3645 { 67, PrivMode_BackSpace }, 3589 { 67, PrivMode_BackSpace },
3646#endif 3590#endif
3647 { 1000, PrivMode_MouseX11 }, 3591 { 1000, PrivMode_MouseX11 },
3648 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3592 { 1002, PrivMode_MouseBtnEvent },
3649 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3593 { 1003, PrivMode_MouseAnyEvent },
3650 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3651 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3594 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3652 { 1011, PrivMode_Keypress }, // rxvt extension 3595 { 1011, PrivMode_Keypress }, // rxvt extension
3653 // 1035 enable modifiers for alt, numlock NYI 3596 // 1035 enable modifiers for alt, numlock NYI
3654 // 1036 send ESC for meta keys NYI 3597 // 1036 send ESC for meta keys NYI
3655 // 1037 send DEL for keypad delete NYI 3598 // 1037 send DEL for keypad delete NYI
3656 { 1047, PrivMode_Screen }, 3599 { 1047, PrivMode_Screen },
3657 // 1048 save and restore cursor 3600 // 1048 save and restore cursor
3658 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3601 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3659 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3602 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3603 { 2004, PrivMode_BracketPaste },
3660 }; 3604 };
3661 3605
3662 if (nargs == 0) 3606 if (nargs == 0)
3663 return; 3607 return;
3664 3608
3708 case 2: /* VT52 mode */ 3652 case 2: /* VT52 mode */
3709 /* oddball mode. should be set regardless of set/reset 3653 /* oddball mode. should be set regardless of set/reset
3710 * parameter. Return from VT52 mode with an ESC < from 3654 * parameter. Return from VT52 mode with an ESC < from
3711 * within VT52 mode 3655 * within VT52 mode
3712 */ 3656 */
3713 PrivMode (1, PrivMode_vt52); 3657 set_privmode (PrivMode_vt52, 1);
3714 break; 3658 break;
3715 case 3: /* 80/132 */ 3659 case 3: /* 80/132 */
3716 if (priv_modes & PrivMode_132OK) 3660 if (priv_modes & PrivMode_132OK)
3661 {
3662 scr_poweron ();
3717 set_widthheight (((state ? 132 : 80) * fwidth), height); 3663 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3664 }
3718 break; 3665 break;
3719 case 4: /* smooth scrolling */ 3666 case 4: /* smooth scrolling */
3720 set_option (Opt_jumpScroll, !state); 3667 set_option (Opt_jumpScroll, !state);
3721 break; 3668 break;
3722 case 5: /* reverse video */ 3669 case 5: /* reverse video */
3729 scr_autowrap (state); 3676 scr_autowrap (state);
3730 break; 3677 break;
3731 /* case 8: - auto repeat, can't do on a per window basis */ 3678 /* case 8: - auto repeat, can't do on a per window basis */
3732 case 9: /* X10 mouse reporting */ 3679 case 9: /* X10 mouse reporting */
3733 if (state) /* orthogonal */ 3680 if (state) /* orthogonal */
3734 priv_modes &= ~PrivMode_MouseX11; 3681 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3735 break; 3682 break;
3736#ifdef scrollBar_esc 3683#ifdef scrollBar_esc
3737 case scrollBar_esc: 3684 case scrollBar_esc:
3738 if (scrollbar_mapping (state)) 3685 if (scrollBar.map (state))
3739 { 3686 {
3740 resize_all_windows (0, 0, 0); 3687 resize_all_windows (0, 0, 0);
3741 scr_touch (true); 3688 scr_touch (true);
3742 } 3689 }
3743 break; 3690 break;
3752 break; 3699 break;
3753 /* case 66: - application key pad */ 3700 /* case 66: - application key pad */
3754 /* case 67: - backspace key */ 3701 /* case 67: - backspace key */
3755 case 1000: /* X11 mouse reporting */ 3702 case 1000: /* X11 mouse reporting */
3756 if (state) /* orthogonal */ 3703 if (state) /* orthogonal */
3757 priv_modes &= ~PrivMode_MouseX10; 3704 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3758 break; 3705 break;
3759#if 0
3760 case 1001: 3706 case 1002:
3761 break; /* X11 mouse highlighting */ 3707 case 1003:
3762#endif 3708 if (state)
3709 {
3710 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3711 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3712 vt_emask_mouse = PointerMotionMask;
3713 }
3714 else
3715 vt_emask_mouse = NoEventMask;
3716 vt_select_input ();
3717 break;
3763 case 1010: /* scroll to bottom on TTY output inhibit */ 3718 case 1010: /* scroll to bottom on TTY output inhibit */
3764 set_option (Opt_scrollTtyOutput, !state); 3719 set_option (Opt_scrollTtyOutput, !state);
3765 break; 3720 break;
3766 case 1011: /* scroll to bottom on key press */ 3721 case 1011: /* scroll to bottom on key press */
3767 set_option (Opt_scrollTtyKeypress, state); 3722 set_option (Opt_scrollTtyKeypress, state);
3944rxvt_term::process_graphics () 3899rxvt_term::process_graphics ()
3945{ 3900{
3946 unicode_t ch, cmd = cmd_getc (); 3901 unicode_t ch, cmd = cmd_getc ();
3947 3902
3948 if (cmd == 'Q') 3903 if (cmd == 'Q')
3904 {
3949 { /* query graphics */ 3905 /* query graphics */
3950 tt_printf ("\033G0\012"); /* no graphics */ 3906 tt_printf ("\033G0\012"); /* no graphics */
3951 return; 3907 return;
3952 } 3908 }
3953 /* swallow other graphics sequences until terminating ':' */ 3909 /* swallow other graphics sequences until terminating ':' */
3954 do 3910 do
4004 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3960 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4005 3961
4006 memcpy (v_buffer + v_buflen, data, len); 3962 memcpy (v_buffer + v_buflen, data, len);
4007 v_buflen += len; 3963 v_buflen += len;
4008 3964
4009 pty_ev.set (EVENT_READ | EVENT_WRITE); 3965 pty_ev.set (ev::READ | ev::WRITE);
4010} 3966}
4011 3967
4012void rxvt_term::pty_write () 3968void rxvt_term::pty_write ()
4013{ 3969{
4014 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3970 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4019 3975
4020 if (v_buflen == 0) 3976 if (v_buflen == 0)
4021 { 3977 {
4022 free (v_buffer); 3978 free (v_buffer);
4023 v_buffer = 0; 3979 v_buffer = 0;
4024 v_buflen = 0;
4025 3980
4026 pty_ev.set (EVENT_READ); 3981 pty_ev.set (ev::READ);
4027 return; 3982 return;
4028 } 3983 }
4029 3984
4030 memmove (v_buffer, v_buffer + written, v_buflen); 3985 memmove (v_buffer, v_buffer + written, v_buflen);
4031 } 3986 }
4032 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3987 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4033 pty_ev.set (EVENT_READ); 3988 pty_ev.set (ev::READ);
4034} 3989}
4035 3990
4036/*----------------------- end-of-file (C source) -----------------------*/ 3991/*----------------------- end-of-file (C source) -----------------------*/
4037 3992

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines