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.333 by ayin, Tue Jun 26 09:55:22 2007 UTC vs.
Revision 1.436 by sf-exg, Sun Jan 24 21:53:13 2010 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
485 } 579 }
486 } 580 }
487 581
488#if ENABLE_FRILLS || ISO_14755 582#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 583 // ISO 14755 support
490 if (shft && ctrl) 584 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 585 {
492 int hv; 586 int hv;
493 587
494 if (iso14755buf & ISO_14755_51 588 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 589 && (keysym == XK_space || keysym == XK_KP_Space
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 }
624 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 625 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 626 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 627 if (!(iso14755buf & ISO_14755_STARTED))
533 { 628 {
534 iso14755buf |= ISO_14755_STARTED; 629 iso14755buf |= ISO_14755_STARTED;
535# if ENABLE_OVERLAY 630# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 631 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode"); 632 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif 633# endif
539 } 634 }
540#endif 635#endif
547 } 642 }
548#endif 643#endif
549 644
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 645 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 646 {
647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
648 unsigned int newlen = 1;
649
650 switch (translate_keypad (keysym, kp))
552 { 651 {
652#ifndef NO_BACKSPACE_KEY
653 case XK_BackSpace:
654 if (priv_modes & PrivMode_HaveBackSpace)
655 {
656 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
657 ^ !!ctrl) ? '\b' : '\177';
658 kbuf[1] = '\0';
659 }
660 else
661 strcpy (kbuf, rs[Rs_backspace_key]);
662 break;
663#endif
664#ifndef NO_DELETE_KEY
665 case XK_Delete:
666 strcpy (kbuf, rs[Rs_delete_key]);
667 break;
668#endif
669 case XK_Tab:
670 if (shft)
671 strcpy (kbuf, "\033[Z");
672 else
673 {
674#ifdef CTRL_TAB_MAKES_META
675 if (ctrl)
676 meta = 1;
677#endif
678#ifdef MOD4_TAB_MAKES_META
679 if (ev.state & Mod4Mask)
680 meta = 1;
681#endif
553 newlen = 1; 682 newlen = 0;
554 switch (keysym) 683 }
684 break;
685
686 case XK_Up: /* "\033[A" */
687 case XK_Down: /* "\033[B" */
688 case XK_Right: /* "\033[C" */
689 case XK_Left: /* "\033[D" */
690 strcpy (kbuf, "\033[Z");
691 kbuf[2] = "DACB"[keysym - XK_Left];
692 /* do Shift first */
693 if (shft)
694 kbuf[2] = "dacb"[keysym - XK_Left];
695 else if (ctrl)
696 {
697 kbuf[1] = 'O';
698 kbuf[2] = "dacb"[keysym - XK_Left];
699 }
700 else if (priv_modes & PrivMode_aplCUR)
701 kbuf[1] = 'O';
702 break;
703
704 case XK_KP_Enter:
705 /* allow shift to override */
706 if (kp)
707 {
708 strcpy (kbuf, "\033OM");
709 break;
710 }
711
712 /* FALLTHROUGH */
713
714 case XK_Return:
715 if (priv_modes & PrivMode_LFNL)
716 {
717 kbuf[0] = '\015';
718 kbuf[1] = '\012';
719 kbuf[2] = '\0';
720 }
721 else
722 {
723 kbuf[0] = '\015';
724 kbuf[1] = '\0';
725 }
726 break;
727
728 case XK_KP_F1: /* "\033OP" */
729 case XK_KP_F2: /* "\033OQ" */
730 case XK_KP_F3: /* "\033OR" */
731 case XK_KP_F4: /* "\033OS" */
732 strcpy (kbuf, "\033OP");
733 kbuf[2] += (keysym - XK_KP_F1);
734 break;
735
736 case XK_KP_Multiply: /* "\033Oj" : "*" */
737 case XK_KP_Add: /* "\033Ok" : "+" */
738 case XK_KP_Separator: /* "\033Ol" : "," */
739 case XK_KP_Subtract: /* "\033Om" : "-" */
740 case XK_KP_Decimal: /* "\033On" : "." */
741 case XK_KP_Divide: /* "\033Oo" : "/" */
742 case XK_KP_0: /* "\033Op" : "0" */
743 case XK_KP_1: /* "\033Oq" : "1" */
744 case XK_KP_2: /* "\033Or" : "2" */
745 case XK_KP_3: /* "\033Os" : "3" */
746 case XK_KP_4: /* "\033Ot" : "4" */
747 case XK_KP_5: /* "\033Ou" : "5" */
748 case XK_KP_6: /* "\033Ov" : "6" */
749 case XK_KP_7: /* "\033Ow" : "7" */
750 case XK_KP_8: /* "\033Ox" : "8" */
751 case XK_KP_9: /* "\033Oy" : "9" */
752 /* allow shift to override */
753 if (kp)
754 {
755 strcpy (kbuf, "\033Oj");
756 kbuf[2] += (keysym - XK_KP_Multiply);
757 }
758 else
759 {
760 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
761 kbuf[1] = '\0';
762 }
763 break;
764
765 default:
555 { 766 {
556#ifndef NO_BACKSPACE_KEY 767 int param = map_function_key (keysym);
557 case XK_BackSpace: 768 if (param > 0)
558 if (priv_modes & PrivMode_HaveBackSpace) 769 sprintf (kbuf,"\033[%d~", param);
559 {
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0';
563 }
564 else 770 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; 771 newlen = 0;
840 break;
841 } 772 }
842 773 break;
843 if (newlen)
844 len = strlen (kbuf);
845 } 774 }
775
776 if (newlen)
777 len = strlen (kbuf);
846 778
847 /* 779 /*
848 * Pass meta for all function keys, if 'meta' option set 780 * Pass meta for all function keys, if 'meta' option set
849 */ 781 */
850#ifdef META8_OPTION 782#ifdef META8_OPTION
934#if ENABLE_FRILLS || ISO_14755 866#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support 867 // ISO 14755 support
936 if (iso14755buf) 868 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52) 869 if (iso14755buf & ISO_14755_52)
938 { 870 {
939# if ENABLE_OVERLAY 871# if ISO_14755
940 scr_overlay_off (); 872 scr_overlay_off ();
941# endif 873# endif
942# if ISO_14755 874# if ISO_14755
943 // iso14755 part 5.2 handling: release time 875 // iso14755 part 5.2 handling: release time
944 // first: controls 876 // first: controls
967 899
968 return; 900 return;
969 } 901 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 902 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 { 903 {
972# if ENABLE_OVERLAY 904# if ISO_14755
973 scr_overlay_off (); 905 scr_overlay_off ();
974# endif 906# endif
975 if (iso14755buf & ISO_14755_51) 907 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 (); 908 commit_iso14755 ();
977#if ISO_14755 909#if ISO_14755
1035void 967void
1036rxvt_term::flush () 968rxvt_term::flush ()
1037{ 969{
1038 flush_ev.stop (); 970 flush_ev.stop ();
1039 971
1040#ifdef ENABLE_TRANSPARENCY 972#ifdef HAVE_BG_PIXMAP
1041 if (want_full_refresh) 973 if (bgPixmap.check_clearChanged ())
1042 { 974 {
1043 want_full_refresh = 0; 975// scr_clear (true); This needs to be researched further!
1044 scr_clear ();
1045 scr_touch (false); 976 scr_touch (false);
1046 } 977 }
1047#endif 978#endif
1048 979
1049 if (want_refresh) 980 if (want_refresh)
1085 } 1016 }
1086 while (row < end_row); 1017 while (row < end_row);
1087 } 1018 }
1088 1019
1089 scr_refresh (); 1020 scr_refresh ();
1090 scrollbar_show (1); 1021 scrollBar.show (1);
1091#ifdef USE_XIM 1022#ifdef USE_XIM
1092 IMSendSpot (); 1023 IMSendSpot ();
1093#endif 1024#endif
1094 } 1025 }
1095 1026
1096 display->flush (); 1027 display->flush ();
1097} 1028}
1098 1029
1030/* checks wether a refresh is requested and starts the refresh timer */
1099void 1031void
1100rxvt_term::check_cb (check_watcher &w) 1032rxvt_term::refresh_check ()
1101{ 1033{
1102 make_current (); 1034 if (want_refresh && !flush_ev.is_active ())
1035 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1103 1036
1104 display->flush (); 1037 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108} 1038}
1109 1039
1110void 1040void
1111rxvt_term::flush_cb (time_watcher &w) 1041rxvt_term::flush_cb (ev::timer &w, int revents)
1112{ 1042{
1113 make_current (); 1043 make_current ();
1114 1044
1115 refresh_count = 0; 1045 refresh_count = 0;
1116 flush (); 1046 flush ();
1117} 1047}
1118 1048
1119#ifdef CURSOR_BLINK 1049#ifdef CURSOR_BLINK
1120void 1050void
1121rxvt_term::cursor_blink_cb (time_watcher &w) 1051rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1122{ 1052{
1123 hidden_cursor = !hidden_cursor; 1053 hidden_cursor = !hidden_cursor;
1124 want_refresh = 1; 1054 want_refresh = 1;
1125 1055 refresh_check ();
1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1127} 1056}
1128#endif 1057#endif
1129 1058
1130#ifdef TEXT_BLINK 1059#ifdef TEXT_BLINK
1131void 1060void
1132rxvt_term::text_blink_cb (time_watcher &w) 1061rxvt_term::text_blink_cb (ev::timer &w, int revents)
1133{ 1062{
1134 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1063 if (scr_refresh_rend (RS_Blink, RS_Blink))
1135 { 1064 {
1136 hidden_text = !hidden_text; 1065 hidden_text = !hidden_text;
1137 want_refresh = 1; 1066 want_refresh = 1;
1138 w.start (w.at + TEXT_BLINK_INTERVAL); 1067 refresh_check ();
1139 } 1068 }
1069 else
1070 w.stop ();
1140} 1071}
1141#endif 1072#endif
1142 1073
1143#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1074#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144void 1075void
1145rxvt_term::cont_scroll_cb (time_watcher &w) 1076rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1146{ 1077{
1147 if ((scrollbar_isUp() || scrollbar_isDn()) && 1078 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1148 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1079 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1149 { 1080 {
1150 want_refresh = 1; 1081 want_refresh = 1;
1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1082 refresh_check ();
1152 } 1083 }
1084 else
1085 w.stop ();
1153} 1086}
1154#endif 1087#endif
1155 1088
1156#ifdef SELECTION_SCROLLING 1089#ifdef SELECTION_SCROLLING
1157void 1090void
1158rxvt_term::sel_scroll_cb (time_watcher &w) 1091rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1159{ 1092{
1160 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1093 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1161 { 1094 {
1162 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1095 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163 want_refresh = 1; 1096 want_refresh = 1;
1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1097 refresh_check ();
1165 } 1098 }
1099 else
1100 w.stop ();
1166} 1101}
1167#endif 1102#endif
1168 1103
1169#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1104#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170void 1105void
1171rxvt_term::slip_wheel_cb (time_watcher &w) 1106rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1172{ 1107{
1173 if (mouse_slip_wheel_speed == 0 1108 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 { 1109 {
1177 if (view_start == top_row || view_start == 0)
1178 mouse_slip_wheel_speed = 0;
1179
1180 want_refresh = 1; 1110 want_refresh = 1;
1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1111 refresh_check ();
1112 }
1113
1114 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1115 {
1116 mouse_slip_wheel_speed = 0;
1117 w.stop ();
1182 } 1118 }
1183} 1119}
1184#endif 1120#endif
1185 1121
1186#if LINUX_YIELD_HACK 1122#if LINUX_YIELD_HACK
1187static struct event_handler 1123static struct event_handler
1188{ 1124{
1189 check_watcher yield_ev; 1125 ev::prepare yield_ev;
1190 1126
1191 void yield_cb (check_watcher &w) 1127 void yield_cb (ev::prepare &w, int revents)
1192 { 1128 {
1193 // this should really be sched_yield(), but the linux guys thought 1129 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than 1130 // 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 1131 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS. 1132 // allowed by the sus... as is returning ENOSYS.
1133 // since the linux guys additionally thought that breaking the only
1134 // known workaroudn against their unusable sched_yield hack is cool,
1135 // we just nanosleep a bit and hope for the best.
1197 1136
1198 struct timespec ts = { 0, 0 }; 1137 struct timespec ts = { 0, 1000 };
1199 nanosleep (&ts, 0); 1138 nanosleep (&ts, 0);
1200 1139
1201 w.stop (); 1140 w.stop ();
1202 } 1141 }
1203 1142
1247 1186
1248 return false; 1187 return false;
1249} 1188}
1250 1189
1251void 1190void
1252rxvt_term::pty_cb (io_watcher &w, short revents) 1191rxvt_term::pty_cb (ev::io &w, int revents)
1253{ 1192{
1254 make_current (); 1193 make_current ();
1255 1194
1256 if (revents & EVENT_READ) 1195 if (revents & ev::READ)
1257 // loop, but don't allow a single term to monopolize us 1196 // loop, but don't allow a single term to monopolize us
1258 while (pty_fill ()) 1197 for (int i = CBUFCNT; i-- && pty_fill (); )
1259 if (cmd_parse ()) 1198 cmd_parse ();
1260 break;
1261 1199
1262 if (revents & EVENT_WRITE) 1200 if (revents & ev::WRITE)
1263 pty_write (); 1201 pty_write ();
1202
1203 refresh_check ();
1264} 1204}
1265 1205
1266void 1206void
1267rxvt_term::pointer_unblank () 1207rxvt_term::pointer_unblank ()
1268{ 1208{
1271 1211
1272#ifdef POINTER_BLANK 1212#ifdef POINTER_BLANK
1273 hidden_pointer = 0; 1213 hidden_pointer = 0;
1274 1214
1275 if (option (Opt_pointerBlank)) 1215 if (option (Opt_pointerBlank))
1276 pointer_ev.start (NOW + pointerBlankDelay); 1216 pointer_ev.start (pointerBlankDelay);
1277#endif 1217#endif
1278} 1218}
1279 1219
1280#ifdef POINTER_BLANK 1220#ifdef POINTER_BLANK
1281void 1221void
1289 1229
1290 hidden_pointer = 1; 1230 hidden_pointer = 1;
1291} 1231}
1292 1232
1293void 1233void
1294rxvt_term::pointer_cb (time_watcher &w) 1234rxvt_term::pointer_cb (ev::timer &w, int revents)
1295{ 1235{
1296 make_current (); 1236 make_current ();
1297 1237
1298 pointer_blank (); 1238 pointer_blank ();
1299} 1239}
1302void 1242void
1303rxvt_term::mouse_report (XButtonEvent &ev) 1243rxvt_term::mouse_report (XButtonEvent &ev)
1304{ 1244{
1305 int button_number, key_state = 0; 1245 int button_number, key_state = 0;
1306 int x, y; 1246 int x, y;
1247 int code = 32;
1307 1248
1308 x = ev.x; 1249 x = Pixel2Col (ev.x);
1309 y = ev.y; 1250 y = Pixel2Row (ev.y);
1310 pixel_position (&x, &y); 1251 if (ev.type == MotionNotify)
1252 {
1253 if (x == mouse_row && y == mouse_col)
1254 return;
1255 mouse_row = x;
1256 mouse_col = y;
1257 code += 32;
1258 }
1311 1259
1312 if (MEvent.button == AnyButton) 1260 if (MEvent.button == AnyButton)
1313 button_number = 3; 1261 button_number = 3;
1314 else 1262 else
1315 { 1263 {
1361 x + 1, 1309 x + 1,
1362 y + 1); 1310 y + 1);
1363#endif 1311#endif
1364 1312
1365 tt_printf ("\033[M%c%c%c", 1313 tt_printf ("\033[M%c%c%c",
1366 (32 + button_number + key_state), 1314 (code + button_number + key_state),
1367 (32 + x + 1), 1315 (32 + x + 1),
1368 (32 + y + 1)); 1316 (32 + y + 1));
1369} 1317}
1370 1318
1371/*{{{ process an X event */ 1319/*{{{ process an X event */
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1381 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out (); 1382 focus_out ();
1435 } 1383 }
1436#endif 1384#endif
1437 } 1385 }
1438 break;
1439
1440 case MappingNotify:
1441 XRefreshKeyboardMapping (&ev.xmapping);
1442 break; 1386 break;
1443 1387
1444 /* 1388 /*
1445 * XXX: this is not the _current_ arrangement 1389 * XXX: this is not the _current_ arrangement
1446 * Here's my conclusion: 1390 * Here's my conclusion:
1479 && ev.xfocus.mode != NotifyGrab) 1423 && ev.xfocus.mode != NotifyGrab)
1480 focus_out (); 1424 focus_out ();
1481 break; 1425 break;
1482 1426
1483 case ConfigureNotify: 1427 case ConfigureNotify:
1428 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1429 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1430 szHint.width, szHint.height);*/
1484 if (ev.xconfigure.window == parent[0]) 1431 if (ev.xconfigure.window == parent[0])
1485 { 1432 {
1486 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1433 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1487 ; 1434 ;
1488 1435
1489 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1436 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1490 { 1437 {
1491 seen_resize = 1; 1438 seen_resize = 1;
1492 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1439 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1493#ifdef XPM_BACKGROUND 1440 }
1494 if (!option (Opt_transparent) && bgPixmap.auto_resize) 1441 else
1442 {
1443#ifdef HAVE_BG_PIXMAP
1444 if (bgPixmap.window_position_sensitive ())
1495 { 1445 {
1446 if (mapped)
1447 update_background ();
1496 resize_pixmap (); 1448 else
1497 scr_touch (true); 1449 bgPixmap.invalidate ();
1498 } 1450 }
1499#endif 1451#endif
1500 } 1452 }
1501 1453
1502 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1454 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1503
1504#ifdef ENABLE_TRANSPARENCY
1505 if (option (Opt_transparent))
1506 check_our_parents ();
1507#endif
1508 } 1455 }
1509 break; 1456 break;
1510 1457
1511 case PropertyNotify: 1458 case PropertyNotify:
1512 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1459 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1515 selection_property (ev.xproperty.window, ev.xproperty.atom); 1462 selection_property (ev.xproperty.window, ev.xproperty.atom);
1516 1463
1517 break; 1464 break;
1518 1465
1519 case SelectionClear: 1466 case SelectionClear:
1520 selection_clear (); 1467 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1521 break; 1468 break;
1522 1469
1523 case SelectionNotify: 1470 case SelectionNotify:
1524 if (selection_wait == Sel_normal) 1471 if (selection_wait == Sel_normal)
1525 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1472 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1528 case SelectionRequest: 1475 case SelectionRequest:
1529 selection_send (ev.xselectionrequest); 1476 selection_send (ev.xselectionrequest);
1530 break; 1477 break;
1531 1478
1532 case MapNotify: 1479 case MapNotify:
1480#ifdef HAVE_BG_PIXMAP
1481 /* This is needed spcifically to fix the case of no window manager or a
1482 * non-reparenting window manager. In those cases we never get first
1483 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1484 * care of multiplicity of ConfigureNotify events arriwing while WM does
1485 * reparenting.
1486 * We should not render background immidiately, as there could be several
1487 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1488 * by scheduling background redraw as soon as we can, but giving a short
1489 * bit of time for ConfigureNotifies to arrive.
1490 * We should render background PRIOR to drawing any text, but AFTER all
1491 * of ConfigureNotifys for the best results.
1492 */
1493 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1494 update_background_ev.start (0.025);
1495#endif
1533 mapped = 1; 1496 mapped = 1;
1534#ifdef TEXT_BLINK 1497#ifdef TEXT_BLINK
1535 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1498 text_blink_ev.start ();
1536#endif 1499#endif
1537 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1500 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1538 break; 1501 break;
1539 1502
1540 case UnmapNotify: 1503 case UnmapNotify:
1542#ifdef TEXT_BLINK 1505#ifdef TEXT_BLINK
1543 text_blink_ev.stop (); 1506 text_blink_ev.stop ();
1544#endif 1507#endif
1545 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1508 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1546 break; 1509 break;
1547
1548#ifdef ENABLE_TRANSPARENCY
1549 case ReparentNotify:
1550 rootwin_cb (ev);
1551 break;
1552#endif /* ENABLE_TRANSPARENCY */
1553 1510
1554 case GraphicsExpose: 1511 case GraphicsExpose:
1555 case Expose: 1512 case Expose:
1556 if (ev.xany.window == vt) 1513 if (ev.xany.window == vt)
1557 { 1514 {
1558 do 1515 do
1516 {
1559 scr_expose (ev.xexpose.x, ev.xexpose.y, 1517 scr_expose (ev.xexpose.x, ev.xexpose.y,
1560 ev.xexpose.width, ev.xexpose.height, False); 1518 ev.xexpose.width, ev.xexpose.height, False);
1519 }
1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1520 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1562 1521
1563 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1522 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1564 1523
1565 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1524 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1525 {
1566 scr_expose (ev.xexpose.x, ev.xexpose.y, 1526 scr_expose (ev.xexpose.x, ev.xexpose.y,
1567 ev.xexpose.width, ev.xexpose.height, False); 1527 ev.xexpose.width, ev.xexpose.height, False);
1528 }
1568 1529
1569 want_refresh = 1; 1530 want_refresh = 1;
1570 } 1531 }
1571 else 1532 else
1572 { 1533 {
1575 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1536 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1576 ; 1537 ;
1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1538 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1578 ; 1539 ;
1579 1540
1580 if (isScrollbarWindow (ev.xany.window)) 1541 if (scrollBar.state && ev.xany.window == scrollBar.win)
1581 { 1542 {
1582 scrollBar.setIdle (); 1543 scrollBar.state = STATE_IDLE;
1583 scrollbar_show (0); 1544 scrollBar.show (0);
1584 } 1545 }
1585
1586#ifdef ENABLE_TRANSPARENCY
1587 if (am_transparent && ev.xany.window == parent[0])
1588 XClearWindow (dpy, ev.xany.window);
1589#endif
1590 } 1546 }
1591 break; 1547 break;
1592 1548
1593 case MotionNotify: 1549 case MotionNotify:
1594#ifdef POINTER_BLANK 1550#ifdef POINTER_BLANK
1595 if (hidden_pointer) 1551 if (hidden_pointer)
1596 pointer_unblank (); 1552 pointer_unblank ();
1597#endif 1553#endif
1554 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1555 || priv_modes & PrivMode_MouseAnyEvent)
1556 mouse_report (ev.xbutton);
1598 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1557 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1599 break; 1558 break;
1600 1559
1601 if (ev.xany.window == vt) 1560 if (ev.xany.window == vt)
1602 { 1561 {
1636 int dist; 1595 int dist;
1637 1596
1638 /* don't clobber the current delay if we are 1597 /* don't clobber the current delay if we are
1639 * already in the middle of scrolling. 1598 * already in the middle of scrolling.
1640 */ 1599 */
1641 if (!sel_scroll_ev.active) 1600 if (!sel_scroll_ev.is_active ())
1642 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1601 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1643 1602
1644 /* save the event params so we can highlight 1603 /* save the event params so we can highlight
1645 * the selection in the pending-scroll loop 1604 * the selection in the pending-scroll loop
1646 */ 1605 */
1647 selection_save_x = ev.xbutton.x; 1606 selection_save_x = ev.xbutton.x;
1669 else 1628 else
1670 { 1629 {
1671 /* we are within the text window, so we 1630 /* we are within the text window, so we
1672 * shouldn't be scrolling 1631 * shouldn't be scrolling
1673 */ 1632 */
1674 if (sel_scroll_ev.active)
1675 sel_scroll_ev.stop(); 1633 sel_scroll_ev.stop();
1676 } 1634 }
1677#endif 1635#endif
1678#ifdef MOUSE_THRESHOLD 1636#ifdef MOUSE_THRESHOLD
1679 } 1637 }
1680#endif 1638#endif
1681 } 1639 }
1682 } 1640 }
1683 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1641 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1684 { 1642 {
1685 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1643 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1686 MotionNotify, &ev)) 1644 MotionNotify, &ev))
1687 ; 1645 ;
1688 1646
1690 &unused_root, &unused_child, 1648 &unused_root, &unused_child,
1691 &unused_root_x, &unused_root_y, 1649 &unused_root_x, &unused_root_y,
1692 &ev.xbutton.x, &ev.xbutton.y, 1650 &ev.xbutton.x, &ev.xbutton.y,
1693 &unused_mask); 1651 &unused_mask);
1694 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1652 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1695 scrollbar_size ()); 1653 scrollBar.size ());
1696 want_refresh = 1; 1654 want_refresh = 1;
1697 scrollbar_show (1); 1655 scrollBar.show (1);
1698 } 1656 }
1699 break; 1657 break;
1700 } 1658 }
1701 1659
1702#if defined(CURSOR_BLINK) 1660#if defined(CURSOR_BLINK)
1706 { 1664 {
1707 hidden_cursor = 0; 1665 hidden_cursor = 0;
1708 want_refresh = 1; 1666 want_refresh = 1;
1709 } 1667 }
1710 1668
1711 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1669 cursor_blink_ev.again ();
1712 } 1670 }
1713#endif 1671#endif
1714 1672
1715#if defined(POINTER_BLANK) 1673#if defined(POINTER_BLANK)
1716 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1674 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1723 1681
1724 if (ev.type == KeyPress && hidden_pointer == 0) 1682 if (ev.type == KeyPress && hidden_pointer == 0)
1725 pointer_blank (); 1683 pointer_blank ();
1726 } 1684 }
1727#endif 1685#endif
1686
1687 refresh_check ();
1728} 1688}
1689
1690#if ENABLE_FRILLS
1691void
1692rxvt_term::set_urgency (bool enable)
1693{
1694 if (enable == urgency_hint)
1695 return;
1696
1697 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1698 {
1699 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1700 XSetWMHints (dpy, parent[0], h);
1701 urgency_hint = enable;
1702 }
1703}
1704#endif
1729 1705
1730void 1706void
1731rxvt_term::focus_in () 1707rxvt_term::focus_in ()
1732{ 1708{
1733 if (!focus) 1709 if (!focus)
1734 { 1710 {
1735 focus = 1; 1711 focus = 1;
1736 want_refresh = 1; 1712 want_refresh = 1;
1737 1713
1738 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1739
1740#if USE_XIM 1714#if USE_XIM
1741 if (Input_Context != NULL) 1715 if (Input_Context != NULL)
1742 { 1716 {
1743 IMSetPosition (); 1717 IMSetPosition ();
1744 XSetICFocus (Input_Context); 1718 XSetICFocus (Input_Context);
1745 } 1719 }
1746#endif 1720#endif
1747#if CURSOR_BLINK 1721#if CURSOR_BLINK
1748 if (option (Opt_cursorBlink)) 1722 if (option (Opt_cursorBlink))
1749 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1723 cursor_blink_ev.again ();
1750#endif 1724#endif
1751#if OFF_FOCUS_FADING 1725#if OFF_FOCUS_FADING
1752 if (rs[Rs_fade]) 1726 if (rs[Rs_fade])
1753 { 1727 {
1754 pix_colors = pix_colors_focused; 1728 pix_colors = pix_colors_focused;
1755 scr_recolour (); 1729 scr_recolour ();
1756 } 1730 }
1757#endif 1731#endif
1758#if ENABLE_FRILLS 1732#if ENABLE_FRILLS
1759 if (option (Opt_urgentOnBell)) 1733 if (option (Opt_urgentOnBell))
1760 { 1734 set_urgency (0);
1761 XWMHints *h;
1762
1763 h = XGetWMHints(dpy, parent[0]);
1764 if (h != NULL)
1765 {
1766 h->flags &= ~XUrgencyHint;
1767 XSetWMHints(dpy, parent[0], h);
1768 }
1769 }
1770#endif 1735#endif
1736
1737 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1771 } 1738 }
1772} 1739}
1773 1740
1774void 1741void
1775rxvt_term::focus_out () 1742rxvt_term::focus_out ()
1777 if (focus) 1744 if (focus)
1778 { 1745 {
1779 focus = 0; 1746 focus = 0;
1780 want_refresh = 1; 1747 want_refresh = 1;
1781 1748
1782 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1749#if ENABLE_FRILLS
1783 1750 if (option (Opt_urgentOnBell))
1751 set_urgency (0);
1752#endif
1784#if ENABLE_FRILLS || ISO_14755 1753#if ENABLE_FRILLS || ISO_14755
1785 if (iso14755buf) 1754 if (iso14755buf)
1786 { 1755 {
1787 iso14755buf = 0; 1756 iso14755buf = 0;
1788# if ENABLE_OVERLAY 1757# if ISO_14755
1789 scr_overlay_off (); 1758 scr_overlay_off ();
1790# endif 1759# endif
1791 } 1760 }
1792#endif 1761#endif
1793#if USE_XIM 1762#if USE_XIM
1795 XUnsetICFocus (Input_Context); 1764 XUnsetICFocus (Input_Context);
1796#endif 1765#endif
1797#if CURSOR_BLINK 1766#if CURSOR_BLINK
1798 if (option (Opt_cursorBlink)) 1767 if (option (Opt_cursorBlink))
1799 cursor_blink_ev.stop (); 1768 cursor_blink_ev.stop ();
1769
1800 hidden_cursor = 0; 1770 hidden_cursor = 0;
1801#endif 1771#endif
1802#if OFF_FOCUS_FADING 1772#if OFF_FOCUS_FADING
1803 if (rs[Rs_fade]) 1773 if (rs[Rs_fade])
1804 { 1774 {
1805 pix_colors = pix_colors_unfocused; 1775 pix_colors = pix_colors_unfocused;
1806 scr_recolour (); 1776 scr_recolour ();
1807 } 1777 }
1808#endif 1778#endif
1779
1780 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1809 } 1781 }
1810} 1782}
1811 1783
1812void 1784void
1813rxvt_term::update_fade_color (unsigned int idx) 1785rxvt_term::update_fade_color (unsigned int idx)
1838 case PropertyNotify: 1810 case PropertyNotify:
1839 /* 1811 /*
1840 * if user used some Esetroot compatible prog to set the root bg, 1812 * if user used some Esetroot compatible prog to set the root bg,
1841 * use the property to determine the pixmap. We use it later on. 1813 * use the property to determine the pixmap. We use it later on.
1842 */ 1814 */
1843 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1815 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1844 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1816 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1845 return; 1817 {
1818 bgPixmap.set_root_pixmap ();
1819 update_background ();
1820 }
1846 1821
1847 /* FALLTHROUGH */
1848 case ReparentNotify:
1849 if (option (Opt_transparent))
1850 check_our_parents ();
1851 break; 1822 break;
1852 } 1823 }
1853# endif 1824# endif
1825
1826 refresh_check ();
1854} 1827}
1855#endif 1828#endif
1856 1829
1857void 1830void
1858rxvt_term::button_press (XButtonEvent &ev) 1831rxvt_term::button_press (XButtonEvent &ev)
1913 mouse_report (ev); 1886 mouse_report (ev);
1914 } 1887 }
1915#else 1888#else
1916 MEvent.button = ev.button; 1889 MEvent.button = ev.button;
1917 mouse_report (ev); 1890 mouse_report (ev);
1918#endif /* MOUSE_REPORT_DOUBLECLICK */ 1891#endif /* MOUSE_REPORT_DOUBLECLICK */
1919 1892
1920 } 1893 }
1921 else 1894 else
1922 { 1895 {
1923 if (ev.button != MEvent.button) 1896 if (ev.button != MEvent.button)
1971 } 1944 }
1972 1945
1973 /* 1946 /*
1974 * Scrollbar window processing of button press 1947 * Scrollbar window processing of button press
1975 */ 1948 */
1976 if (isScrollbarWindow (ev.window)) 1949 if (scrollBar.state && ev.window == scrollBar.win)
1977 { 1950 {
1978 scrollBar.setIdle (); 1951 page_dirn direction = NO_DIR;
1952
1953 if (scrollBar.upButton (ev.y))
1954 direction = UP; /* up */
1955 else if (scrollBar.dnButton (ev.y))
1956 direction = DN; /* down */
1957
1958 scrollBar.state = STATE_IDLE;
1979 /* 1959 /*
1980 * Rxvt-style scrollbar: 1960 * Rxvt-style scrollbar:
1981 * move up if mouse is above slider 1961 * move up if mouse is above slider
1982 * move dn if mouse is below slider 1962 * move dn if mouse is below slider
1983 * 1963 *
1992 /* 1972 /*
1993 * Mouse report disabled scrollbar: 1973 * Mouse report disabled scrollbar:
1994 * arrow buttons - send up/down 1974 * arrow buttons - send up/down
1995 * click on scrollbar - send pageup/down 1975 * click on scrollbar - send pageup/down
1996 */ 1976 */
1997 if ((scrollBar.style == R_SB_NEXT 1977 if (direction == UP)
1998 && scrollbarnext_upButton (ev.y))
1999 || (scrollBar.style == R_SB_RXVT
2000 && scrollbarrxvt_upButton (ev.y)))
2001 tt_printf ("\033[A"); 1978 tt_printf ("\033[A");
2002 else if ((scrollBar.style == R_SB_NEXT 1979 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"); 1980 tt_printf ("\033[B");
2007 else 1981 else
2008 switch (ev.button) 1982 switch (ev.button)
2009 { 1983 {
2010 case Button2: 1984 case Button2:
2017 tt_printf ("\033[5~"); 1991 tt_printf ("\033[5~");
2018 break; 1992 break;
2019 } 1993 }
2020 } 1994 }
2021 else 1995 else
2022#endif /* NO_SCROLLBAR_REPORT */ 1996#endif /* NO_SCROLLBAR_REPORT */
2023
2024 {
2025 char upordown = 0;
2026
2027 if (scrollBar.style == R_SB_NEXT)
2028 { 1997 {
2029 if (scrollbarnext_upButton (ev.y)) 1998 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 { 1999 {
2043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2000#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2001 if (!cont_scroll_ev.is_active ())
2044 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2002 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2045#endif 2003#endif
2046 if (scr_page (upordown < 0 ? UP : DN, 1)) 2004 if (scr_page (direction, 1))
2047 { 2005 {
2048 if (upordown < 0) 2006 if (direction == UP)
2049 scrollBar.setUp (); 2007 scrollBar.state = STATE_UP;
2050 else 2008 else
2051 scrollBar.setDn (); 2009 scrollBar.state = STATE_DOWN;
2052 } 2010 }
2053 } 2011 }
2054 else 2012 else
2055 switch (ev.button) 2013 switch (ev.button)
2056 { 2014 {
2057 case Button2: 2015 case Button2:
2058 switch (scrollbar_align) 2016 switch (scrollBar.align)
2059 { 2017 {
2060 case R_SB_ALIGN_TOP: 2018 case R_SB_ALIGN_TOP:
2061 csrO = 0; 2019 csrO = 0;
2062 break; 2020 break;
2063 case R_SB_ALIGN_CENTRE: 2021 case R_SB_ALIGN_CENTRE:
2069 } 2027 }
2070 2028
2071 if (scrollBar.style == R_SB_XTERM 2029 if (scrollBar.style == R_SB_XTERM
2072 || scrollbar_above_slider (ev.y) 2030 || scrollbar_above_slider (ev.y)
2073 || scrollbar_below_slider (ev.y)) 2031 || scrollbar_below_slider (ev.y))
2074 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2032 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2075 2033
2076 scrollBar.setMotion (); 2034 scrollBar.state = STATE_MOTION;
2077 break; 2035 break;
2078 2036
2079 case Button1: 2037 case Button1:
2080 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2038 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2081 csrO = ev.y - scrollBar.top; 2039 csrO = ev.y - scrollBar.top;
2082 /* FALLTHROUGH */ 2040 /* FALLTHROUGH */
2083 2041
2084 case Button3: 2042 case Button3:
2085 if (scrollBar.style != R_SB_XTERM) 2043 if (scrollBar.style != R_SB_XTERM)
2095 scr_page (DN, nrow - 1); 2053 scr_page (DN, nrow - 1);
2096# else 2054# else
2097 scr_page (DN, nrow / 4); 2055 scr_page (DN, nrow / 4);
2098# endif 2056# endif
2099 else 2057 else
2100 scrollBar.setMotion (); 2058 scrollBar.state = STATE_MOTION;
2101 } 2059 }
2102 else 2060 else
2103 { 2061 {
2104 scr_page ((ev.button == Button1 ? DN : UP), 2062 scr_page ((ev.button == Button1 ? DN : UP),
2105 (nrow 2063 (nrow
2106 * scrollbar_position (ev.y) 2064 * scrollbar_position (ev.y)
2107 / scrollbar_size ())); 2065 / scrollBar.size ()));
2108 } 2066 }
2109 2067
2110 break; 2068 break;
2111 } 2069 }
2112 } 2070 }
2122 2080
2123 csrO = 0; /* reset csr Offset */ 2081 csrO = 0; /* reset csr Offset */
2124 if (!bypass_keystate) 2082 if (!bypass_keystate)
2125 reportmode = !! (priv_modes & PrivMode_mouse_report); 2083 reportmode = !! (priv_modes & PrivMode_mouse_report);
2126 2084
2127 if (scrollbar_isUpDn ()) 2085 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2128 { 2086 {
2129 scrollBar.setIdle (); 2087 scrollBar.state = STATE_IDLE;
2130 scrollbar_show (0); 2088 scrollBar.show (0);
2131 } 2089 }
2132 2090
2133#ifdef SELECTION_SCROLLING 2091#ifdef SELECTION_SCROLLING
2134 if (sel_scroll_ev.active)
2135 sel_scroll_ev.stop(); 2092 sel_scroll_ev.stop();
2136#endif 2093#endif
2137 2094
2138 if (ev.window == vt) 2095 if (ev.window == vt)
2139 { 2096 {
2140 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2097 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2164 mouse_report (ev); 2121 mouse_report (ev);
2165 } 2122 }
2166#else /* MOUSE_REPORT_DOUBLECLICK */ 2123#else /* MOUSE_REPORT_DOUBLECLICK */
2167 MEvent.button = AnyButton; 2124 MEvent.button = AnyButton;
2168 mouse_report (ev); 2125 mouse_report (ev);
2169#endif /* MOUSE_REPORT_DOUBLECLICK */ 2126#endif /* MOUSE_REPORT_DOUBLECLICK */
2170 return; 2127 return;
2171 } 2128 }
2172 2129
2173 /* 2130 /*
2174 * dumb hack to compensate for the failure of click-and-drag 2131 * dumb hack to compensate for the failure of click-and-drag
2212 { 2169 {
2213 mouse_slip_wheel_speed += v ? -1 : 1; 2170 mouse_slip_wheel_speed += v ? -1 : 1;
2214 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2171 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2215 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2172 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2216 2173
2217 if (slip_wheel_ev.at < NOW) 2174 if (!slip_wheel_ev.is_active ())
2218 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2175 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2219
2220 slip_wheel_ev.start ();
2221 } 2176 }
2222 else 2177 else
2178# endif
2223 { 2179 {
2224# endif
2225 scr_page (v, i); 2180 scr_page (v, i);
2226 scrollbar_show (1); 2181 scrollBar.show (1);
2227# ifdef MOUSE_SLIP_WHEELING
2228 } 2182 }
2229# endif
2230 } 2183 }
2231 break; 2184 break;
2232#endif 2185#endif
2233 } 2186 }
2234 } 2187 }
2235} 2188}
2236 2189
2237/*}}} */ 2190/*}}} */
2238 2191
2239bool 2192void
2240rxvt_term::cmd_parse () 2193rxvt_term::cmd_parse ()
2241{ 2194{
2242 bool flag = false;
2243 wchar_t ch = NOCHAR; 2195 wchar_t ch = NOCHAR;
2244 char *seq_begin; // remember start of esc-sequence here 2196 char *seq_begin; // remember start of esc-sequence here
2245 2197
2246 for (;;) 2198 for (;;)
2247 { 2199 {
2248 if (ch == NOCHAR) 2200 if (expect_false (ch == NOCHAR))
2249 { 2201 {
2250 seq_begin = cmdbuf_ptr; 2202 seq_begin = cmdbuf_ptr;
2251 ch = next_char (); 2203 ch = next_char ();
2252 2204
2253 if (ch == NOCHAR) 2205 if (ch == NOCHAR)
2254 break; 2206 break;
2255 } 2207 }
2256 2208
2257 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2209 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2258 { 2210 {
2259 if (!seen_input) 2211 if (expect_false (!seen_input))
2260 { 2212 {
2261 seen_input = 1; 2213 seen_input = 1;
2262 // many badly-written programs (e.g. jed) contain a race condition: 2214 // many badly-written programs (e.g. jed) contain a race condition:
2263 // they first read the screensize and then install a SIGWINCH handler. 2215 // they first read the screensize and then install a SIGWINCH handler.
2264 // some window managers resize the window early, and these programs 2216 // some window managers resize the window early, and these programs
2277 wchar_t *str = buf; 2229 wchar_t *str = buf;
2278 wchar_t *eol = str + min (ncol, UBUFSIZ); 2230 wchar_t *eol = str + min (ncol, UBUFSIZ);
2279 2231
2280 for (;;) 2232 for (;;)
2281 { 2233 {
2282 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2234 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2283 break; 2235 break;
2284 2236
2285 *str++ = ch; 2237 *str++ = ch;
2286 2238
2287 if (ch == C0_LF || str >= eol) 2239 if (expect_false (ch == C0_LF || str >= eol))
2288 { 2240 {
2289 if (ch == C0_LF) 2241 if (ch == C0_LF)
2290 nlines++; 2242 nlines++;
2291 2243
2292 refresh_count++; 2244 refresh_count++;
2293 2245
2294 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2246 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2295 { 2247 {
2296 refresh_count = 0; 2248 refresh_count = 0;
2297 2249
2298 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2250 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2299 { 2251 {
2300 refreshnow = true; 2252 refreshnow = true;
2301 ch = NOCHAR; 2253 ch = NOCHAR;
2302 break; 2254 break;
2303 } 2255 }
2341 * What the heck we'll cheat and only refresh less than every page-full. 2293 * What the heck we'll cheat and only refresh less than every page-full.
2342 * if skipScroll is enabled. 2294 * if skipScroll is enabled.
2343 */ 2295 */
2344 if (refreshnow) 2296 if (refreshnow)
2345 { 2297 {
2346 flag = true;
2347 scr_refresh (); 2298 scr_refresh ();
2348 want_refresh = 1; 2299 want_refresh = 1;
2349 } 2300 }
2350
2351 } 2301 }
2352 else 2302 else
2353 { 2303 {
2354 try 2304 try
2355 { 2305 {
2363 } 2313 }
2364 2314
2365 ch = NOCHAR; 2315 ch = NOCHAR;
2366 } 2316 }
2367 } 2317 }
2368
2369 return flag;
2370} 2318}
2371 2319
2372// read the next character 2320// read the next character
2373wchar_t 2321wchar_t
2374rxvt_term::next_char () NOTHROW 2322rxvt_term::next_char () NOTHROW
2375{ 2323{
2376 while (cmdbuf_ptr < cmdbuf_endp) 2324 while (cmdbuf_ptr < cmdbuf_endp)
2377 { 2325 {
2378 // assume 7-bit to be ascii ALWAYS 2326 // assume 7-bit to be ascii ALWAYS
2379 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2327 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2380 return *cmdbuf_ptr++; 2328 return *cmdbuf_ptr++;
2381 2329
2382 wchar_t wc; 2330 wchar_t wc;
2383 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2331 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2384 2332
2388 cmdbuf_ptr = cmdbuf_endp; 2336 cmdbuf_ptr = cmdbuf_endp;
2389 break; 2337 break;
2390 } 2338 }
2391 2339
2392 if (len == (size_t)-1) 2340 if (len == (size_t)-1)
2341 {
2342 mbstate.reset (); // reset now undefined conversion state
2393 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2343 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2344 }
2394 2345
2395 // assume wchar == unicode 2346 // assume wchar == unicode
2396 cmdbuf_ptr += len; 2347 cmdbuf_ptr += len;
2397 return wc & UNICODE_MASK; 2348 return wc & UNICODE_MASK;
2398 } 2349 }
2442/*----------------------------------------------------------------------*/ 2393/*----------------------------------------------------------------------*/
2443#ifdef PRINTPIPE 2394#ifdef PRINTPIPE
2444FILE * 2395FILE *
2445rxvt_term::popen_printer () 2396rxvt_term::popen_printer ()
2446{ 2397{
2447 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2398 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2448 2399
2449 if (stream == NULL) 2400 if (stream == NULL)
2450 rxvt_warn ("can't open printer pipe, not printing.\n"); 2401 rxvt_warn ("can't open printer pipe, not printing.\n");
2451 2402
2452 return stream; 2403 return stream;
2463 * simulate attached vt100 printer 2414 * simulate attached vt100 printer
2464 */ 2415 */
2465void 2416void
2466rxvt_term::process_print_pipe () 2417rxvt_term::process_print_pipe ()
2467{ 2418{
2468 int done; 2419 FILE *fd = popen_printer ();
2469 FILE *fd;
2470 2420
2471 if ((fd = popen_printer ()) == NULL) 2421 if (!fd)
2472 return; 2422 return;
2473 2423
2474 /* 2424 /*
2475 * Send all input to the printer until either ESC[4i or ESC[?4i 2425 * Send all input to the printer until either ESC[4i or ESC[?4i
2476 * is received. 2426 * is received.
2477 */ 2427 */
2478 for (done = 0; !done;) 2428 for (int done = 0; !done; )
2479 { 2429 {
2480 unsigned char buf[8]; 2430 unsigned char buf[8];
2481 unicode_t ch; 2431 unicode_t ch;
2482 unsigned int i, len; 2432 unsigned int i, len;
2483 2433
2514 } 2464 }
2515 } 2465 }
2516 2466
2517 pclose_printer (fd); 2467 pclose_printer (fd);
2518} 2468}
2519#endif /* PRINTPIPE */ 2469#endif /* PRINTPIPE */
2520/*}}} */ 2470/*}}} */
2521 2471
2522/* *INDENT-OFF* */ 2472/* *INDENT-OFF* */
2523enum { 2473enum {
2524 C1_40 = 0x40, 2474 C1_40 = 0x40,
2628 break; 2578 break;
2629 case 'Z': /* identify the terminal type */ 2579 case 'Z': /* identify the terminal type */
2630 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2580 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2631 break; 2581 break;
2632 case '<': /* turn off VT52 mode */ 2582 case '<': /* turn off VT52 mode */
2633 PrivMode (0, PrivMode_vt52); 2583 set_privmode (PrivMode_vt52, 0);
2634 break; 2584 break;
2635 case 'F': /* use special graphics character set */ 2585 case 'F': /* use special graphics character set */
2636 case 'G': /* use regular character set */ 2586 case 'G': /* use regular character set */
2637 /* unimplemented */ 2587 /* unimplemented */
2638 break; 2588 break;
2692 scr_forwardindex (); 2642 scr_forwardindex ();
2693 break; 2643 break;
2694#endif 2644#endif
2695 case '=': 2645 case '=':
2696 case '>': 2646 case '>':
2697 PrivMode ((ch == '='), PrivMode_aplKP); 2647 set_privmode (PrivMode_aplKP, ch == '=');
2698 break; 2648 break;
2699 2649
2700 case C1_40: 2650 case C1_40:
2701 cmd_getc (); 2651 cmd_getc ();
2702 break; 2652 break;
2741 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2691 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2742 case C1_SCI: /* ESC Z */ 2692 case C1_SCI: /* ESC Z */
2743 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2693 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2744 break; /* steal obsolete ESC [ c */ 2694 break; /* steal obsolete ESC [ c */
2745 2695
2746 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2696 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2747 case C1_CSI: /* ESC [ */ 2697 case C1_CSI: /* ESC [ */
2748 process_csi_seq (); 2698 process_csi_seq ();
2749 break; 2699 break;
2750 2700
2751 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2701 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2752 case C1_OSC: /* ESC ] */ 2702 case C1_OSC: /* ESC ] */
2753 process_osc_seq (); 2703 process_osc_seq ();
2754 break; 2704 break;
2755 2705
2756 /* 8.3.106: RESET TO INITIAL STATE */ 2706 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2757 case 'c': 2707 case 'c':
2758 mbstate.reset (); 2708 mbstate.reset ();
2759 scr_poweron (); 2709 scr_poweron ();
2760 scrollbar_show (1); 2710 scrollBar.show (1);
2761 break; 2711 break;
2762 2712
2763 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2713 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2764 case 'n': 2714 case 'n':
2765 scr_charset_choose (2); 2715 scr_charset_choose (2);
2810rxvt_term::process_csi_seq () 2760rxvt_term::process_csi_seq ()
2811{ 2761{
2812 unicode_t ch, priv, i; 2762 unicode_t ch, priv, i;
2813 unsigned int nargs, p; 2763 unsigned int nargs, p;
2814 int n, ndef; 2764 int n, ndef;
2815 int arg[ESC_ARGS]; 2765 int arg[ESC_ARGS] = { };
2816 2766
2817 for (nargs = ESC_ARGS; nargs > 0;) 2767 nargs = 0;
2818 arg[--nargs] = 0;
2819 2768
2820 priv = 0; 2769 priv = 0;
2821 ch = cmd_getc (); 2770 ch = cmd_getc ();
2822 if (ch >= '<' && ch <= '?') 2771 if ((ch >= '<' && ch <= '?') || ch == '!')
2772 {
2823 { /* '<' '=' '>' '?' */ 2773 /* '<' '=' '>' '?' '!' */
2824 priv = ch; 2774 priv = ch;
2825 ch = cmd_getc (); 2775 ch = cmd_getc ();
2826 } 2776 }
2827 2777
2828 /* read any numerical arguments */ 2778 /* read any numerical arguments */
2867 switch (priv) 2817 switch (priv)
2868 { 2818 {
2869 case '>': 2819 case '>':
2870 if (ch == CSI_DA) /* secondary device attributes */ 2820 if (ch == CSI_DA) /* secondary device attributes */
2871 { 2821 {
2872 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2822 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2873 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2823 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2874 // 2824 //
2875 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2825 // 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 2826 // 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). 2827 // versions.
2878 // 2828 //
2879 tt_printf ("\033[>%d;94;0c", 'U'); 2829 tt_printf ("\033[>%d;95;0c", 'U');
2880 } 2830 }
2881 break; 2831 break;
2832
2882 case '?': 2833 case '?':
2883 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2884 process_terminal_mode (ch, priv, nargs, arg); 2835 process_terminal_mode (ch, priv, nargs, arg);
2885 break; 2836 break;
2837
2838 case '!':
2839 if (ch == CSI_70)
2840 {
2841 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2842 scr_soft_reset ();
2843
2844 static const int pm_h[] = { 7, 25 };
2845 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2846
2847 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2848 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2886 } 2849 }
2850 break;
2851 }
2852
2887 return; 2853 return;
2888 } 2854 }
2889 2855
2890 switch (ch) 2856 switch (ch)
2891 { 2857 {
3320 3286
3321/* 3287/*
3322 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3288 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3323 */ 3289 */
3324void 3290void
3325rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3291rxvt_term::process_xterm_seq (int op, char *str, char resp)
3326{ 3292{
3327 int color; 3293 int color;
3328 char *buf, *name; 3294 char *buf, *name;
3329 bool query = str[0] == '?' && !str[1]; 3295 bool query = str[0] == '?' && !str[1];
3330 int saveop = op; 3296 int saveop = op;
3371 3337
3372 XFree (value); 3338 XFree (value);
3373 } 3339 }
3374 else 3340 else
3375 { 3341 {
3376 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3342 char *eq = strchr (str, '=');
3377 3343
3378 if (eq) 3344 if (eq)
3379 { 3345 {
3380 *eq = 0; 3346 *eq = 0;
3381 set_utf8_property (display->atom (str), eq + 1); 3347 set_utf8_property (display->atom (str), eq + 1);
3402 *buf++ = '\0'; 3368 *buf++ = '\0';
3403 3369
3404 process_color_seq (op, color, name, resp); 3370 process_color_seq (op, color, name, resp);
3405 } 3371 }
3406 break; 3372 break;
3373 case Rxvt_restoreFG:
3407 case XTerm_Color00: 3374 case XTerm_Color00:
3408 process_color_seq (op, Color_fg, str, resp); 3375 process_color_seq (op, Color_fg, str, resp);
3409 break; 3376 break;
3377 case Rxvt_restoreBG:
3410 case XTerm_Color01: 3378 case XTerm_Color01:
3411 process_color_seq (op, Color_bg, str, resp); 3379 process_color_seq (op, Color_bg, str, resp);
3412 break; 3380 break;
3413#ifndef NO_CURSORCOLOR 3381#ifndef NO_CURSORCOLOR
3414 case XTerm_Color_cursor: 3382 case XTerm_Color_cursor:
3435 break; 3403 break;
3436 case URxvt_Color_IT: 3404 case URxvt_Color_IT:
3437 process_color_seq (op, Color_IT, str, resp); 3405 process_color_seq (op, Color_IT, str, resp);
3438 break; 3406 break;
3439#endif 3407#endif
3408 case URxvt_Color_border:
3409 process_color_seq (op, Color_border, str, resp);
3410 break;
3440#if ENABLE_TRANSPARENCY && TINTING 3411#if ENABLE_TRANSPARENCY
3441 case URxvt_Color_tint: 3412 case URxvt_Color_tint:
3442 process_color_seq (op, Color_tint, str, resp); 3413 process_color_seq (op, Color_tint, str, resp);
3414 {
3415 bool changed = false;
3443 3416
3444 check_our_parents (); 3417 if (ISSET_PIXCOLOR (Color_tint))
3418 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3419 else
3420 changed = bgPixmap.unset_tint ();
3445 3421
3446 if (am_transparent) 3422 if (changed)
3447 want_full_refresh = want_refresh = 1; 3423 update_background ();
3424 }
3448 3425
3449 break; 3426 break;
3450#endif 3427#endif
3451 3428
3429#if BG_IMAGE_FROM_FILE
3452 case Rxvt_Pixmap: 3430 case Rxvt_Pixmap:
3453 { 3431 if (!strcmp (str, "?"))
3454 if (*str != ';')
3455 { 3432 {
3456#if XPM_BACKGROUND 3433 char str[256];
3457 scale_pixmap (""); /* reset to default scaling */ 3434
3458 set_bgPixmap (str); /* change pixmap */ 3435 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3459 scr_touch (true); 3436 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3460#endif 3437 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3438 process_xterm_seq (XTerm_title, str, CHAR_ST);
3461 } 3439 }
3462 3440 else
3441 {
3463 int changed = 0; 3442 int changed = 0;
3464 3443
3465 while ((str = strchr (str, ';')) != NULL) 3444 if (*str != ';')
3466 { 3445 {
3446 /* reset to default scaling :*/
3447 bgPixmap.unset_geometry ();
3448 if (bgPixmap.set_file (str)) /* change pixmap */
3449 changed++;
3450 str = strchr (str, ';');
3451 if (str == NULL)
3452 bgPixmap.set_defaultGeometry ();
3453 }
3454
3455 while (str)
3456 {
3467 str++; 3457 str++;
3468#if XPM_BACKGROUND 3458 if (bgPixmap.set_geometry (str))
3469 changed += scale_pixmap (str); 3459 changed++;
3470#endif 3460 str = strchr (str, ';');
3471 } 3461 }
3472 3462
3473 if (changed) 3463 if (changed)
3474 { 3464 update_background ();
3475#ifdef XPM_BACKGROUND
3476 resize_pixmap ();
3477 scr_touch (true);
3478#endif
3479 } 3465 }
3480#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3481 if (option (Opt_transparent))
3482 check_our_parents ();
3483#endif
3484 }
3485 break; 3466 break;
3486 3467#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 3468
3494 case XTerm_logfile: 3469 case XTerm_logfile:
3495 // TODO, when secure mode? 3470 // TODO, when secure mode?
3496 break; 3471 break;
3497 3472
3564 break; 3539 break;
3565#endif 3540#endif
3566 3541
3567#if ENABLE_PERL 3542#if ENABLE_PERL
3568 case URxvt_perl: 3543 case URxvt_perl:
3569 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3544 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3570 ; // no responses yet
3571 break; 3545 break;
3572#endif 3546#endif
3573 } 3547 }
3574} 3548}
3575/*----------------------------------------------------------------------*/ 3549/*----------------------------------------------------------------------*/
3598 { 3572 {
3599 if (mode == 'r') 3573 if (mode == 'r')
3600 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3574 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3601 else 3575 else
3602 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3576 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3603 PrivMode (state, bit); 3577 set_privmode (bit, state);
3604 } 3578 }
3605 3579
3606 return state; 3580 return state;
3607} 3581}
3608 3582
3612{ 3586{
3613 unsigned int i, j; 3587 unsigned int i, j;
3614 int state; 3588 int state;
3615 3589
3616 static const struct 3590 static const struct
3617 { 3591 {
3618 const int argval; 3592 const int argval;
3619 const unsigned long bit; 3593 const unsigned long bit;
3620 }
3621
3622 argtopriv[] = { 3594 } argtopriv[] = {
3623 { 1, PrivMode_aplCUR }, 3595 { 1, PrivMode_aplCUR }, // DECCKM
3624 { 2, PrivMode_vt52 }, 3596 { 2, PrivMode_vt52 },
3625 { 3, PrivMode_132 }, 3597 { 3, PrivMode_132 }, // DECCOLM
3626 { 4, PrivMode_smoothScroll }, 3598 { 4, PrivMode_smoothScroll }, // DECSCLM
3627 { 5, PrivMode_rVideo }, 3599 { 5, PrivMode_rVideo }, // DECSCNM
3628 { 6, PrivMode_relOrigin }, 3600 { 6, PrivMode_relOrigin }, // DECOM
3629 { 7, PrivMode_Autowrap }, 3601 { 7, PrivMode_Autowrap }, // DECAWM
3630 // 8, bi-directional support mode 3602 // 8, auto-repeat keys // DECARM
3631 { 9, PrivMode_MouseX10 }, 3603 { 9, PrivMode_MouseX10 },
3632 // 18, 19 printing-related 3604 // 18 end FF to printer after print screen
3605 // 19 Print screen prints full screen/scorll region
3633 { 25, PrivMode_VisibleCursor }, 3606 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3634#ifdef scrollBar_esc 3607#ifdef scrollBar_esc
3635 { scrollBar_esc, PrivMode_scrollBar }, 3608 { scrollBar_esc, PrivMode_scrollBar },
3636#endif 3609#endif
3637 { 35, PrivMode_ShiftKeys }, // rxvt extension 3610 { 35, PrivMode_ShiftKeys }, // rxvt extension
3611 // 38, tektronix mode // DECTEK
3638 { 40, PrivMode_132OK }, 3612 { 40, PrivMode_132OK },
3639 // 41 xterm more fixes NYI 3613 // 41 xterm more fixes NYI
3640 // 45 margin bell NYI 3614 // 45 margin bell NYI
3641 // 46 start logging 3615 // 46 start logging
3642 { 47, PrivMode_Screen }, 3616 { 47, PrivMode_Screen },
3643 { 66, PrivMode_aplKP }, 3617 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3644#ifndef NO_BACKSPACE_KEY 3618#ifndef NO_BACKSPACE_KEY
3645 { 67, PrivMode_BackSpace }, 3619 { 67, PrivMode_BackSpace }, // DECBKM
3646#endif 3620#endif
3647 { 1000, PrivMode_MouseX11 }, 3621 { 1000, PrivMode_MouseX11 },
3648 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3622 { 1002, PrivMode_MouseBtnEvent },
3649 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3623 { 1003, PrivMode_MouseAnyEvent },
3650 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3651 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3624 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3652 { 1011, PrivMode_Keypress }, // rxvt extension 3625 { 1011, PrivMode_Keypress }, // rxvt extension
3653 // 1035 enable modifiers for alt, numlock NYI 3626 // 1035 enable modifiers for alt, numlock NYI
3654 // 1036 send ESC for meta keys NYI 3627 // 1036 send ESC for meta keys NYI
3655 // 1037 send DEL for keypad delete NYI 3628 // 1037 send DEL for keypad delete NYI
3656 { 1047, PrivMode_Screen }, 3629 { 1047, PrivMode_Screen },
3657 // 1048 save and restore cursor 3630 // 1048 save and restore cursor
3658 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3631 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3659 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3632 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3633 { 2004, PrivMode_BracketPaste },
3660 }; 3634 };
3661 3635
3662 if (nargs == 0) 3636 if (nargs == 0)
3663 return; 3637 return;
3664 3638
3689 3663
3690 scr_touch (true); 3664 scr_touch (true);
3691 break; 3665 break;
3692#endif 3666#endif
3693 case 1048: /* alternative cursor save */ 3667 case 1048: /* alternative cursor save */
3694 case 1049:
3695 if (option (Opt_secondaryScreen)) 3668 if (option (Opt_secondaryScreen))
3696 if (mode == 0) 3669 if (mode == 0)
3697 scr_cursor (RESTORE); 3670 scr_cursor (RESTORE);
3698 else if (mode == 1) 3671 else if (mode == 1)
3699 scr_cursor (SAVE); 3672 scr_cursor (SAVE);
3708 case 2: /* VT52 mode */ 3681 case 2: /* VT52 mode */
3709 /* oddball mode. should be set regardless of set/reset 3682 /* oddball mode. should be set regardless of set/reset
3710 * parameter. Return from VT52 mode with an ESC < from 3683 * parameter. Return from VT52 mode with an ESC < from
3711 * within VT52 mode 3684 * within VT52 mode
3712 */ 3685 */
3713 PrivMode (1, PrivMode_vt52); 3686 set_privmode (PrivMode_vt52, 1);
3714 break; 3687 break;
3715 case 3: /* 80/132 */ 3688 case 3: /* 80/132 */
3716 if (priv_modes & PrivMode_132OK) 3689 if (priv_modes & PrivMode_132OK)
3717 set_widthheight (((state ? 132 : 80) * fwidth), height); 3690 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3718 break; 3691 break;
3719 case 4: /* smooth scrolling */ 3692 case 4: /* smooth scrolling */
3720 set_option (Opt_jumpScroll, !state); 3693 set_option (Opt_jumpScroll, !state);
3721 break; 3694 break;
3722 case 5: /* reverse video */ 3695 case 5: /* reverse video */
3729 scr_autowrap (state); 3702 scr_autowrap (state);
3730 break; 3703 break;
3731 /* case 8: - auto repeat, can't do on a per window basis */ 3704 /* case 8: - auto repeat, can't do on a per window basis */
3732 case 9: /* X10 mouse reporting */ 3705 case 9: /* X10 mouse reporting */
3733 if (state) /* orthogonal */ 3706 if (state) /* orthogonal */
3734 priv_modes &= ~PrivMode_MouseX11; 3707 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3735 break; 3708 break;
3736#ifdef scrollBar_esc 3709#ifdef scrollBar_esc
3737 case scrollBar_esc: 3710 case scrollBar_esc:
3738 if (scrollbar_mapping (state)) 3711 if (scrollBar.map (state))
3739 { 3712 {
3740 resize_all_windows (0, 0, 0); 3713 resize_all_windows (0, 0, 0);
3741 scr_touch (true); 3714 scr_touch (true);
3742 } 3715 }
3743 break; 3716 break;
3752 break; 3725 break;
3753 /* case 66: - application key pad */ 3726 /* case 66: - application key pad */
3754 /* case 67: - backspace key */ 3727 /* case 67: - backspace key */
3755 case 1000: /* X11 mouse reporting */ 3728 case 1000: /* X11 mouse reporting */
3756 if (state) /* orthogonal */ 3729 if (state) /* orthogonal */
3757 priv_modes &= ~PrivMode_MouseX10; 3730 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3758 break; 3731 break;
3759#if 0
3760 case 1001: 3732 case 1002:
3761 break; /* X11 mouse highlighting */ 3733 case 1003:
3762#endif 3734 if (state)
3735 {
3736 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3737 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3738 vt_emask_mouse = PointerMotionMask;
3739 }
3740 else
3741 vt_emask_mouse = NoEventMask;
3742
3743 vt_select_input ();
3744 break;
3763 case 1010: /* scroll to bottom on TTY output inhibit */ 3745 case 1010: /* scroll to bottom on TTY output inhibit */
3764 set_option (Opt_scrollTtyOutput, !state); 3746 set_option (Opt_scrollTtyOutput, !state);
3765 break; 3747 break;
3766 case 1011: /* scroll to bottom on key press */ 3748 case 1011: /* scroll to bottom on key press */
3767 set_option (Opt_scrollTtyKeypress, state); 3749 set_option (Opt_scrollTtyKeypress, state);
3768 break; 3750 break;
3769 case 1047: /* secondary screen w/ clearing last */ 3751 case 1047: /* secondary screen w/ clearing last */
3770 if (option (Opt_secondaryScreen)) 3752 if (option (Opt_secondaryScreen))
3771 if (current_screen != PRIMARY) 3753 if (!state)
3772 scr_erase_screen (2); 3754 scr_erase_screen (2);
3755
3773 scr_change_screen (state); 3756 scr_change_screen (state);
3774 break; 3757 break;
3775 case 1049: /* secondary screen w/ clearing first */ 3758 case 1049: /* secondary screen w/ clearing first */
3759 if (option (Opt_secondaryScreen))
3760 if (state)
3761 scr_cursor (SAVE);
3762
3776 scr_change_screen (state); 3763 scr_change_screen (state);
3764
3777 if (option (Opt_secondaryScreen)) 3765 if (option (Opt_secondaryScreen))
3778 if (current_screen != PRIMARY) 3766 if (state)
3779 scr_erase_screen (2); 3767 scr_erase_screen (2);
3768 else
3769 scr_cursor (RESTORE);
3780 break; 3770 break;
3781 default: 3771 default:
3782 break; 3772 break;
3783 } 3773 }
3784 } 3774 }
3944rxvt_term::process_graphics () 3934rxvt_term::process_graphics ()
3945{ 3935{
3946 unicode_t ch, cmd = cmd_getc (); 3936 unicode_t ch, cmd = cmd_getc ();
3947 3937
3948 if (cmd == 'Q') 3938 if (cmd == 'Q')
3939 {
3949 { /* query graphics */ 3940 /* query graphics */
3950 tt_printf ("\033G0\012"); /* no graphics */ 3941 tt_printf ("\033G0\012"); /* no graphics */
3951 return; 3942 return;
3952 } 3943 }
3953 /* swallow other graphics sequences until terminating ':' */ 3944 /* swallow other graphics sequences until terminating ':' */
3954 do 3945 do
4004 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3995 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4005 3996
4006 memcpy (v_buffer + v_buflen, data, len); 3997 memcpy (v_buffer + v_buflen, data, len);
4007 v_buflen += len; 3998 v_buflen += len;
4008 3999
4009 pty_ev.set (EVENT_READ | EVENT_WRITE); 4000 pty_ev.set (ev::READ | ev::WRITE);
4010} 4001}
4011 4002
4012void rxvt_term::pty_write () 4003void rxvt_term::pty_write ()
4013{ 4004{
4014 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4005 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4019 4010
4020 if (v_buflen == 0) 4011 if (v_buflen == 0)
4021 { 4012 {
4022 free (v_buffer); 4013 free (v_buffer);
4023 v_buffer = 0; 4014 v_buffer = 0;
4024 v_buflen = 0;
4025 4015
4026 pty_ev.set (EVENT_READ); 4016 pty_ev.set (ev::READ);
4027 return; 4017 return;
4028 } 4018 }
4029 4019
4030 memmove (v_buffer, v_buffer + written, v_buflen); 4020 memmove (v_buffer, v_buffer + written, v_buflen);
4031 } 4021 }
4032 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4022 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4033 pty_ev.set (EVENT_READ); 4023 pty_ev.set (ev::READ);
4034} 4024}
4035 4025
4036/*----------------------- end-of-file (C source) -----------------------*/ 4026/*----------------------- end-of-file (C source) -----------------------*/
4037 4027

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines