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.347 by sasha, Wed Aug 15 22:41:52 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.
198 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
200 201
201 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
202 203
203 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
205 206
206 if (y >= 0) 207 if (y >= 0)
207 { 208 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
220 ch = *chr++; 221 ch = *chr++;
221 222
222 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
225# if !UNICODE3 226# if !UNICODE_3
226 if (ch >= 0x10000) 227 if (ch >= 0x10000)
227 ch = 0xfffd; 228 ch = 0xfffd;
228# endif 229# endif
229 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
230 231
278 } 279 }
279 280
280 iso14755buf = 0; 281 iso14755buf = 0;
281} 282}
282 283
283int 284static int
284rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
285{ 286{
286 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
289 { 290 {
297 298
298 return -1; 299 return -1;
299} 300}
300#endif 301#endif
301 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
302void 398void
303rxvt_term::key_press (XKeyEvent &ev) 399rxvt_term::key_press (XKeyEvent &ev)
304{ 400{
305 int ctrl, meta, shft, len; 401 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 402 KeySym keysym;
308 int valid_keysym; 403 int valid_keysym;
309 char kbuf[KBUFSZ]; 404 char kbuf[KBUFSZ];
310 405
311#if ISO_14755 406#if ISO_14755
324 meta = ev.state & ModMetaMask; 419 meta = ev.state & ModMetaMask;
325 420
326 if (numlock_state || (ev.state & ModNumLockMask)) 421 if (numlock_state || (ev.state & ModNumLockMask))
327 { 422 {
328 numlock_state = (ev.state & ModNumLockMask); 423 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP); 424 set_privmode (PrivMode_aplKP, !numlock_state);
330 } 425 }
331 426
332 kbuf[0] = 0; 427 kbuf[0] = 0;
333 428
334#ifdef USE_XIM 429#ifdef USE_XIM
484 } 579 }
485 } 580 }
486 581
487#if ENABLE_FRILLS || ISO_14755 582#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 583 // ISO 14755 support
489 if (shft && ctrl) 584 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 585 {
491 int hv; 586 int hv;
492 587
493 if (iso14755buf & ISO_14755_51 588 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 589 && (keysym == XK_space || keysym == XK_KP_Space
524 scr_overlay_off (); 619 scr_overlay_off ();
525# endif 620# endif
526 iso14755buf = 0; 621 iso14755buf = 0;
527 } 622 }
528 } 623 }
624 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 625 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 626 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 627 if (!(iso14755buf & ISO_14755_STARTED))
532 { 628 {
533 iso14755buf |= ISO_14755_STARTED; 629 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 630# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 631 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
546 } 642 }
547#endif 643#endif
548 644
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 645 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 646 {
647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
648 unsigned int newlen = 1;
649
650 switch (translate_keypad (keysym, kp))
551 { 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
552 newlen = 1; 682 newlen = 0;
553 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:
554 { 766 {
555#ifndef NO_BACKSPACE_KEY 767 int param = map_function_key (keysym);
556 case XK_BackSpace: 768 if (param > 0)
557 if (priv_modes & PrivMode_HaveBackSpace) 769 sprintf (kbuf,"\033[%d~", param);
558 {
559 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
560 ^ !!ctrl) ? '\b' : '\177';
561 kbuf[1] = '\0';
562 }
563 else 770 else
564 strcpy (kbuf, key_backspace);
565 break;
566#endif
567#ifndef NO_DELETE_KEY
568# ifdef XK_KP_Prior
569 case XK_KP_Delete:
570 /* allow shift to override */
571 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
572 {
573 strcpy (kbuf, "\033On");
574 break;
575 }
576 /* FALLTHROUGH */
577# endif
578 case XK_Delete:
579 strcpy (kbuf, key_delete);
580 break;
581#endif
582 case XK_Tab:
583 if (shft)
584 strcpy (kbuf, "\033[Z");
585 else
586 {
587#ifdef CTRL_TAB_MAKES_META
588 if (ctrl)
589 meta = 1;
590#endif
591#ifdef MOD4_TAB_MAKES_META
592 if (ev.state & Mod4Mask)
593 meta = 1;
594#endif
595 newlen = 0;
596 }
597 break;
598
599#ifdef XK_KP_Left
600 case XK_KP_Up: /* \033Ox or standard */
601 case XK_KP_Down: /* \033Or or standard */
602 case XK_KP_Right: /* \033Ov or standard */
603 case XK_KP_Left: /* \033Ot or standard */
604 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
605 {
606 strcpy (kbuf, "\033OZ");
607 kbuf[2] = "txvr"[keysym - XK_KP_Left];
608 break;
609 }
610 else
611 /* translate to std. cursor key */
612 keysym = XK_Left + (keysym - XK_KP_Left);
613 /* FALLTHROUGH */
614#endif
615 case XK_Up: /* "\033[A" */
616 case XK_Down: /* "\033[B" */
617 case XK_Right: /* "\033[C" */
618 case XK_Left: /* "\033[D" */
619 strcpy (kbuf, "\033[Z");
620 kbuf[2] = "DACB"[keysym - XK_Left];
621 /* do Shift first */
622 if (shft)
623 kbuf[2] = "dacb"[keysym - XK_Left];
624 else if (ctrl)
625 {
626 kbuf[1] = 'O';
627 kbuf[2] = "dacb"[keysym - XK_Left];
628 }
629 else if (priv_modes & PrivMode_aplCUR)
630 kbuf[1] = 'O';
631 break;
632
633#ifndef UNSHIFTED_SCROLLKEYS
634# ifdef XK_KP_Prior
635 case XK_KP_Prior:
636 /* allow shift to override */
637 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
638 {
639 strcpy (kbuf, "\033Oy");
640 break;
641 }
642 /* FALLTHROUGH */
643# endif
644 case XK_Prior:
645 strcpy (kbuf, "\033[5~");
646 break;
647# ifdef XK_KP_Next
648 case XK_KP_Next:
649 /* allow shift to override */
650 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
651 {
652 strcpy (kbuf, "\033Os");
653 break;
654 }
655 /* FALLTHROUGH */
656# endif
657 case XK_Next:
658 strcpy (kbuf, "\033[6~");
659 break;
660#endif
661 case XK_KP_Enter:
662 /* allow shift to override */
663 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
664 {
665 strcpy (kbuf, "\033OM");
666 break;
667 }
668
669 /* FALLTHROUGH */
670
671 case XK_Return:
672 if (priv_modes & PrivMode_LFNL)
673 {
674 kbuf[0] = '\015';
675 kbuf[1] = '\012';
676 kbuf[2] = '\0';
677 }
678 else
679 {
680 kbuf[0] = '\015';
681 kbuf[1] = '\0';
682 }
683 break;
684
685#ifdef XK_KP_Begin
686 case XK_KP_Begin:
687 strcpy (kbuf, "\033Ou");
688 break;
689
690#endif
691 case XK_KP_F1: /* "\033OP" */
692 case XK_KP_F2: /* "\033OQ" */
693 case XK_KP_F3: /* "\033OR" */
694 case XK_KP_F4: /* "\033OS" */
695 strcpy (kbuf, "\033OP");
696 kbuf[2] += (keysym - XK_KP_F1);
697 break;
698
699 case XK_KP_Multiply: /* "\033Oj" : "*" */
700 case XK_KP_Add: /* "\033Ok" : "+" */
701 case XK_KP_Separator: /* "\033Ol" : "," */
702 case XK_KP_Subtract: /* "\033Om" : "-" */
703 case XK_KP_Decimal: /* "\033On" : "." */
704 case XK_KP_Divide: /* "\033Oo" : "/" */
705 case XK_KP_0: /* "\033Op" : "0" */
706 case XK_KP_1: /* "\033Oq" : "1" */
707 case XK_KP_2: /* "\033Or" : "2" */
708 case XK_KP_3: /* "\033Os" : "3" */
709 case XK_KP_4: /* "\033Ot" : "4" */
710 case XK_KP_5: /* "\033Ou" : "5" */
711 case XK_KP_6: /* "\033Ov" : "6" */
712 case XK_KP_7: /* "\033Ow" : "7" */
713 case XK_KP_8: /* "\033Ox" : "8" */
714 case XK_KP_9: /* "\033Oy" : "9" */
715 /* allow shift to override */
716 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
717 {
718 strcpy (kbuf, "\033Oj");
719 kbuf[2] += (keysym - XK_KP_Multiply);
720 }
721 else
722 {
723 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
724 kbuf[1] = '\0';
725 }
726 break;
727
728 case XK_Find:
729 strcpy (kbuf, "\033[1~");
730 break;
731
732#ifdef XK_KP_Insert
733 case XK_KP_Insert:
734 /* allow shift to override */
735 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
736 {
737 strcpy (kbuf, "\033Op");
738 break;
739 }
740 /* FALLTHROUGH */
741#endif
742 case XK_Insert:
743 strcpy (kbuf, "\033[2~");
744 break;
745#ifdef DXK_Remove /* support for DEC remove like key */
746 case DXK_Remove:
747 /* FALLTHROUGH */
748#endif
749 case XK_Execute:
750 strcpy (kbuf, "\033[3~");
751 break;
752 case XK_Select:
753 strcpy (kbuf, "\033[4~");
754 break;
755#ifdef XK_KP_End
756 case XK_KP_End:
757 /* allow shift to override */
758 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
759 {
760 strcpy (kbuf, "\033Oq");
761 break;
762 }
763 /* FALLTHROUGH */
764#endif
765 case XK_End:
766 strcpy (kbuf, KS_END);
767 break;
768#ifdef XK_KP_Home
769 case XK_KP_Home:
770 /* allow shift to override */
771 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
772 {
773 strcpy (kbuf, "\033Ow");
774 break;
775 }
776 /* FALLTHROUGH */
777#endif
778 case XK_Home:
779 strcpy (kbuf, KS_HOME);
780 break;
781
782#define FKEY(n, fkey) \
783 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
784
785 case XK_F1: /* "\033[11~" */
786 case XK_F2: /* "\033[12~" */
787 case XK_F3: /* "\033[13~" */
788 case XK_F4: /* "\033[14~" */
789 case XK_F5: /* "\033[15~" */
790 FKEY (11, XK_F1);
791 break;
792 case XK_F6: /* "\033[17~" */
793 case XK_F7: /* "\033[18~" */
794 case XK_F8: /* "\033[19~" */
795 case XK_F9: /* "\033[20~" */
796 case XK_F10: /* "\033[21~" */
797 FKEY (17, XK_F6);
798 break;
799 case XK_F11: /* "\033[23~" */
800 case XK_F12: /* "\033[24~" */
801 case XK_F13: /* "\033[25~" */
802 case XK_F14: /* "\033[26~" */
803 FKEY (23, XK_F11);
804 break;
805 case XK_F15: /* "\033[28~" */
806 case XK_F16: /* "\033[29~" */
807 FKEY (28, XK_F15);
808 break;
809 case XK_Help: /* "\033[28~" */
810 FKEY (28, XK_Help);
811 break;
812 case XK_Menu: /* "\033[29~" */
813 FKEY (29, XK_Menu);
814 break;
815 case XK_F17: /* "\033[31~" */
816 case XK_F18: /* "\033[32~" */
817 case XK_F19: /* "\033[33~" */
818 case XK_F20: /* "\033[34~" */
819 case XK_F21: /* "\033[35~" */
820 case XK_F22: /* "\033[36~" */
821 case XK_F23: /* "\033[37~" */
822 case XK_F24: /* "\033[38~" */
823 case XK_F25: /* "\033[39~" */
824 case XK_F26: /* "\033[40~" */
825 case XK_F27: /* "\033[41~" */
826 case XK_F28: /* "\033[42~" */
827 case XK_F29: /* "\033[43~" */
828 case XK_F30: /* "\033[44~" */
829 case XK_F31: /* "\033[45~" */
830 case XK_F32: /* "\033[46~" */
831 case XK_F33: /* "\033[47~" */
832 case XK_F34: /* "\033[48~" */
833 case XK_F35: /* "\033[49~" */
834 FKEY (31, XK_F17);
835 break;
836#undef FKEY
837 default:
838 newlen = 0; 771 newlen = 0;
839 break;
840 } 772 }
841 773 break;
842 if (newlen)
843 len = strlen (kbuf);
844 } 774 }
775
776 if (newlen)
777 len = strlen (kbuf);
845 778
846 /* 779 /*
847 * Pass meta for all function keys, if 'meta' option set 780 * Pass meta for all function keys, if 'meta' option set
848 */ 781 */
849#ifdef META8_OPTION 782#ifdef META8_OPTION
1034void 967void
1035rxvt_term::flush () 968rxvt_term::flush ()
1036{ 969{
1037 flush_ev.stop (); 970 flush_ev.stop ();
1038 971
1039#ifdef ENABLE_TRANSPARENCY 972#ifdef HAVE_BG_PIXMAP
1040 if (want_full_refresh) 973 if (bgPixmap.check_clearChanged ())
1041 { 974 {
1042 want_full_refresh = 0; 975// scr_clear (true); This needs to be researched further!
1043 scr_clear ();
1044 scr_touch (false); 976 scr_touch (false);
1045 } 977 }
1046#endif 978#endif
1047 979
1048 if (want_refresh) 980 if (want_refresh)
1084 } 1016 }
1085 while (row < end_row); 1017 while (row < end_row);
1086 } 1018 }
1087 1019
1088 scr_refresh (); 1020 scr_refresh ();
1089 scrollbar_show (1); 1021 scrollBar.show (1);
1090#ifdef USE_XIM 1022#ifdef USE_XIM
1091 IMSendSpot (); 1023 IMSendSpot ();
1092#endif 1024#endif
1093 } 1025 }
1094 1026
1095 display->flush (); 1027 display->flush ();
1096} 1028}
1097 1029
1030/* checks wether a refresh is requested and starts the refresh timer */
1098void 1031void
1099rxvt_term::check_cb (check_watcher &w) 1032rxvt_term::refresh_check ()
1100{ 1033{
1101 make_current (); 1034 if (want_refresh && !flush_ev.is_active ())
1035 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102 1036
1103 display->flush (); 1037 display->flush ();
1104
1105 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107} 1038}
1108 1039
1109void 1040void
1110rxvt_term::flush_cb (time_watcher &w) 1041rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1042{
1112 make_current (); 1043 make_current ();
1113 1044
1114 refresh_count = 0; 1045 refresh_count = 0;
1115 flush (); 1046 flush ();
1116} 1047}
1117 1048
1118#ifdef CURSOR_BLINK 1049#ifdef CURSOR_BLINK
1119void 1050void
1120rxvt_term::cursor_blink_cb (time_watcher &w) 1051rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121{ 1052{
1122 hidden_cursor = !hidden_cursor; 1053 hidden_cursor = !hidden_cursor;
1123 want_refresh = 1; 1054 want_refresh = 1;
1124 1055 refresh_check ();
1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1126} 1056}
1127#endif 1057#endif
1128 1058
1129#ifdef TEXT_BLINK 1059#ifdef TEXT_BLINK
1130void 1060void
1131rxvt_term::text_blink_cb (time_watcher &w) 1061rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132{ 1062{
1133 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1063 if (scr_refresh_rend (RS_Blink, RS_Blink))
1134 { 1064 {
1135 hidden_text = !hidden_text; 1065 hidden_text = !hidden_text;
1136 want_refresh = 1; 1066 want_refresh = 1;
1137 w.start (w.at + TEXT_BLINK_INTERVAL); 1067 refresh_check ();
1138 } 1068 }
1069 else
1070 w.stop ();
1139} 1071}
1140#endif 1072#endif
1141 1073
1142#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1074#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143void 1075void
1144rxvt_term::cont_scroll_cb (time_watcher &w) 1076rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145{ 1077{
1146 if ((scrollbar_isUp() || scrollbar_isDn()) && 1078 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1147 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1079 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1148 { 1080 {
1149 want_refresh = 1; 1081 want_refresh = 1;
1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1082 refresh_check ();
1151 } 1083 }
1084 else
1085 w.stop ();
1152} 1086}
1153#endif 1087#endif
1154 1088
1155#ifdef SELECTION_SCROLLING 1089#ifdef SELECTION_SCROLLING
1156void 1090void
1157rxvt_term::sel_scroll_cb (time_watcher &w) 1091rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158{ 1092{
1159 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1093 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160 { 1094 {
1161 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1095 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162 want_refresh = 1; 1096 want_refresh = 1;
1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1097 refresh_check ();
1164 } 1098 }
1099 else
1100 w.stop ();
1165} 1101}
1166#endif 1102#endif
1167 1103
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1104#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169void 1105void
1170rxvt_term::slip_wheel_cb (time_watcher &w) 1106rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171{ 1107{
1172 if (mouse_slip_wheel_speed == 0 1108 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174 : scr_page (UP, mouse_slip_wheel_speed))
1175 { 1109 {
1176 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0;
1178
1179 want_refresh = 1; 1110 want_refresh = 1;
1180 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 ();
1181 } 1118 }
1182} 1119}
1183#endif 1120#endif
1184 1121
1185#if LINUX_YIELD_HACK 1122#if LINUX_YIELD_HACK
1186static struct event_handler 1123static struct event_handler
1187{ 1124{
1188 check_watcher yield_ev; 1125 ev::prepare yield_ev;
1189 1126
1190 void yield_cb (check_watcher &w) 1127 void yield_cb (ev::prepare &w, int revents)
1191 { 1128 {
1192 // this should really be sched_yield(), but the linux guys thought 1129 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than 1130 // that giving a process calling sched_yield () less cpu time than
1194 // 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
1195 // 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.
1196 1136
1197 struct timespec ts = { 0, 0 }; 1137 struct timespec ts = { 0, 1000 };
1198 nanosleep (&ts, 0); 1138 nanosleep (&ts, 0);
1199 1139
1200 w.stop (); 1140 w.stop ();
1201 } 1141 }
1202 1142
1246 1186
1247 return false; 1187 return false;
1248} 1188}
1249 1189
1250void 1190void
1251rxvt_term::pty_cb (io_watcher &w, short revents) 1191rxvt_term::pty_cb (ev::io &w, int revents)
1252{ 1192{
1253 make_current (); 1193 make_current ();
1254 1194
1255 if (revents & EVENT_READ) 1195 if (revents & ev::READ)
1256 // loop, but don't allow a single term to monopolize us 1196 // loop, but don't allow a single term to monopolize us
1257 while (pty_fill ()) 1197 for (int i = CBUFCNT; i-- && pty_fill (); )
1258 if (cmd_parse ()) 1198 cmd_parse ();
1259 break;
1260 1199
1261 if (revents & EVENT_WRITE) 1200 if (revents & ev::WRITE)
1262 pty_write (); 1201 pty_write ();
1202
1203 refresh_check ();
1263} 1204}
1264 1205
1265void 1206void
1266rxvt_term::pointer_unblank () 1207rxvt_term::pointer_unblank ()
1267{ 1208{
1270 1211
1271#ifdef POINTER_BLANK 1212#ifdef POINTER_BLANK
1272 hidden_pointer = 0; 1213 hidden_pointer = 0;
1273 1214
1274 if (option (Opt_pointerBlank)) 1215 if (option (Opt_pointerBlank))
1275 pointer_ev.start (NOW + pointerBlankDelay); 1216 pointer_ev.start (pointerBlankDelay);
1276#endif 1217#endif
1277} 1218}
1278 1219
1279#ifdef POINTER_BLANK 1220#ifdef POINTER_BLANK
1280void 1221void
1288 1229
1289 hidden_pointer = 1; 1230 hidden_pointer = 1;
1290} 1231}
1291 1232
1292void 1233void
1293rxvt_term::pointer_cb (time_watcher &w) 1234rxvt_term::pointer_cb (ev::timer &w, int revents)
1294{ 1235{
1295 make_current (); 1236 make_current ();
1296 1237
1297 pointer_blank (); 1238 pointer_blank ();
1298} 1239}
1301void 1242void
1302rxvt_term::mouse_report (XButtonEvent &ev) 1243rxvt_term::mouse_report (XButtonEvent &ev)
1303{ 1244{
1304 int button_number, key_state = 0; 1245 int button_number, key_state = 0;
1305 int x, y; 1246 int x, y;
1247 int code = 32;
1306 1248
1307 x = ev.x; 1249 x = Pixel2Col (ev.x);
1308 y = ev.y; 1250 y = Pixel2Row (ev.y);
1309 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 }
1310 1259
1311 if (MEvent.button == AnyButton) 1260 if (MEvent.button == AnyButton)
1312 button_number = 3; 1261 button_number = 3;
1313 else 1262 else
1314 { 1263 {
1360 x + 1, 1309 x + 1,
1361 y + 1); 1310 y + 1);
1362#endif 1311#endif
1363 1312
1364 tt_printf ("\033[M%c%c%c", 1313 tt_printf ("\033[M%c%c%c",
1365 (32 + button_number + key_state), 1314 (code + button_number + key_state),
1366 (32 + x + 1), 1315 (32 + x + 1),
1367 (32 + y + 1)); 1316 (32 + y + 1));
1368} 1317}
1369 1318
1370/*{{{ process an X event */ 1319/*{{{ process an X event */
1474 && ev.xfocus.mode != NotifyGrab) 1423 && ev.xfocus.mode != NotifyGrab)
1475 focus_out (); 1424 focus_out ();
1476 break; 1425 break;
1477 1426
1478 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);*/
1479 if (ev.xconfigure.window == parent[0]) 1431 if (ev.xconfigure.window == parent[0])
1480 { 1432 {
1481 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1433 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1482 ; 1434 ;
1483 1435
1486 seen_resize = 1; 1438 seen_resize = 1;
1487 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1439 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1488 } 1440 }
1489 else 1441 else
1490 { 1442 {
1491#ifdef ENABLE_TRANSPARENCY 1443#ifdef HAVE_BG_PIXMAP
1492 if (option (Opt_transparent)) 1444 if (bgPixmap.window_position_sensitive ())
1445 {
1493 if (bgPixmap.render ()) 1446 if (mapped)
1494 scr_touch (false); 1447 update_background ();
1448 else
1449 bgPixmap.invalidate ();
1450 }
1495#endif 1451#endif
1496 } 1452 }
1453
1497 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1454 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1498 } 1455 }
1499 break; 1456 break;
1500 1457
1501 case PropertyNotify: 1458 case PropertyNotify:
1505 selection_property (ev.xproperty.window, ev.xproperty.atom); 1462 selection_property (ev.xproperty.window, ev.xproperty.atom);
1506 1463
1507 break; 1464 break;
1508 1465
1509 case SelectionClear: 1466 case SelectionClear:
1510 selection_clear (); 1467 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1511 break; 1468 break;
1512 1469
1513 case SelectionNotify: 1470 case SelectionNotify:
1514 if (selection_wait == Sel_normal) 1471 if (selection_wait == Sel_normal)
1515 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1472 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1518 case SelectionRequest: 1475 case SelectionRequest:
1519 selection_send (ev.xselectionrequest); 1476 selection_send (ev.xselectionrequest);
1520 break; 1477 break;
1521 1478
1522 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
1523 mapped = 1; 1496 mapped = 1;
1524#ifdef TEXT_BLINK 1497#ifdef TEXT_BLINK
1525 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1498 text_blink_ev.start ();
1526#endif 1499#endif
1527 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1500 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1528 break; 1501 break;
1529 1502
1530 case UnmapNotify: 1503 case UnmapNotify:
1532#ifdef TEXT_BLINK 1505#ifdef TEXT_BLINK
1533 text_blink_ev.stop (); 1506 text_blink_ev.stop ();
1534#endif 1507#endif
1535 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1508 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1536 break; 1509 break;
1537
1538#ifdef ENABLE_TRANSPARENCY
1539 case ReparentNotify:
1540 rootwin_cb (ev);
1541 break;
1542#endif /* ENABLE_TRANSPARENCY */
1543 1510
1544 case GraphicsExpose: 1511 case GraphicsExpose:
1545 case Expose: 1512 case Expose:
1546 if (ev.xany.window == vt) 1513 if (ev.xany.window == vt)
1547 { 1514 {
1548 do 1515 do
1516 {
1549 scr_expose (ev.xexpose.x, ev.xexpose.y, 1517 scr_expose (ev.xexpose.x, ev.xexpose.y,
1550 ev.xexpose.width, ev.xexpose.height, False); 1518 ev.xexpose.width, ev.xexpose.height, False);
1519 }
1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1520 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1552 1521
1553 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1522 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1554 1523
1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1524 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1525 {
1556 scr_expose (ev.xexpose.x, ev.xexpose.y, 1526 scr_expose (ev.xexpose.x, ev.xexpose.y,
1557 ev.xexpose.width, ev.xexpose.height, False); 1527 ev.xexpose.width, ev.xexpose.height, False);
1528 }
1558 1529
1559 want_refresh = 1; 1530 want_refresh = 1;
1560 } 1531 }
1561 else 1532 else
1562 { 1533 {
1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1536 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1566 ; 1537 ;
1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1538 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1568 ; 1539 ;
1569 1540
1570 if (isScrollbarWindow (ev.xany.window)) 1541 if (scrollBar.state && ev.xany.window == scrollBar.win)
1571 { 1542 {
1572 scrollBar.setIdle (); 1543 scrollBar.state = STATE_IDLE;
1573 scrollbar_show (0); 1544 scrollBar.show (0);
1574 } 1545 }
1575 } 1546 }
1576 break; 1547 break;
1577 1548
1578 case MotionNotify: 1549 case MotionNotify:
1579#ifdef POINTER_BLANK 1550#ifdef POINTER_BLANK
1580 if (hidden_pointer) 1551 if (hidden_pointer)
1581 pointer_unblank (); 1552 pointer_unblank ();
1582#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);
1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1557 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1584 break; 1558 break;
1585 1559
1586 if (ev.xany.window == vt) 1560 if (ev.xany.window == vt)
1587 { 1561 {
1621 int dist; 1595 int dist;
1622 1596
1623 /* don't clobber the current delay if we are 1597 /* don't clobber the current delay if we are
1624 * already in the middle of scrolling. 1598 * already in the middle of scrolling.
1625 */ 1599 */
1626 if (!sel_scroll_ev.active) 1600 if (!sel_scroll_ev.is_active ())
1627 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1601 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1628 1602
1629 /* save the event params so we can highlight 1603 /* save the event params so we can highlight
1630 * the selection in the pending-scroll loop 1604 * the selection in the pending-scroll loop
1631 */ 1605 */
1632 selection_save_x = ev.xbutton.x; 1606 selection_save_x = ev.xbutton.x;
1654 else 1628 else
1655 { 1629 {
1656 /* we are within the text window, so we 1630 /* we are within the text window, so we
1657 * shouldn't be scrolling 1631 * shouldn't be scrolling
1658 */ 1632 */
1659 if (sel_scroll_ev.active)
1660 sel_scroll_ev.stop(); 1633 sel_scroll_ev.stop();
1661 } 1634 }
1662#endif 1635#endif
1663#ifdef MOUSE_THRESHOLD 1636#ifdef MOUSE_THRESHOLD
1664 } 1637 }
1665#endif 1638#endif
1666 } 1639 }
1667 } 1640 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1641 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1669 { 1642 {
1670 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1643 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1644 MotionNotify, &ev))
1672 ; 1645 ;
1673 1646
1675 &unused_root, &unused_child, 1648 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1649 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1650 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1651 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1652 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1680 scrollbar_size ()); 1653 scrollBar.size ());
1681 want_refresh = 1; 1654 want_refresh = 1;
1682 scrollbar_show (1); 1655 scrollBar.show (1);
1683 } 1656 }
1684 break; 1657 break;
1685 } 1658 }
1686 1659
1687#if defined(CURSOR_BLINK) 1660#if defined(CURSOR_BLINK)
1691 { 1664 {
1692 hidden_cursor = 0; 1665 hidden_cursor = 0;
1693 want_refresh = 1; 1666 want_refresh = 1;
1694 } 1667 }
1695 1668
1696 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1669 cursor_blink_ev.again ();
1697 } 1670 }
1698#endif 1671#endif
1699 1672
1700#if defined(POINTER_BLANK) 1673#if defined(POINTER_BLANK)
1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1674 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1708 1681
1709 if (ev.type == KeyPress && hidden_pointer == 0) 1682 if (ev.type == KeyPress && hidden_pointer == 0)
1710 pointer_blank (); 1683 pointer_blank ();
1711 } 1684 }
1712#endif 1685#endif
1686
1687 refresh_check ();
1713} 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
1714 1705
1715void 1706void
1716rxvt_term::focus_in () 1707rxvt_term::focus_in ()
1717{ 1708{
1718 if (!focus) 1709 if (!focus)
1719 { 1710 {
1720 focus = 1; 1711 focus = 1;
1721 want_refresh = 1; 1712 want_refresh = 1;
1722 1713
1723 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1724
1725#if USE_XIM 1714#if USE_XIM
1726 if (Input_Context != NULL) 1715 if (Input_Context != NULL)
1727 { 1716 {
1728 IMSetPosition (); 1717 IMSetPosition ();
1729 XSetICFocus (Input_Context); 1718 XSetICFocus (Input_Context);
1730 } 1719 }
1731#endif 1720#endif
1732#if CURSOR_BLINK 1721#if CURSOR_BLINK
1733 if (option (Opt_cursorBlink)) 1722 if (option (Opt_cursorBlink))
1734 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1723 cursor_blink_ev.again ();
1735#endif 1724#endif
1736#if OFF_FOCUS_FADING 1725#if OFF_FOCUS_FADING
1737 if (rs[Rs_fade]) 1726 if (rs[Rs_fade])
1738 { 1727 {
1739 pix_colors = pix_colors_focused; 1728 pix_colors = pix_colors_focused;
1740 scr_recolour (); 1729 scr_recolour ();
1741 } 1730 }
1742#endif 1731#endif
1743#if ENABLE_FRILLS 1732#if ENABLE_FRILLS
1744 if (option (Opt_urgentOnBell)) 1733 if (option (Opt_urgentOnBell))
1745 { 1734 set_urgency (0);
1746 XWMHints *h;
1747
1748 h = XGetWMHints(dpy, parent[0]);
1749 if (h != NULL)
1750 {
1751 h->flags &= ~XUrgencyHint;
1752 XSetWMHints(dpy, parent[0], h);
1753 }
1754 }
1755#endif 1735#endif
1736
1737 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1756 } 1738 }
1757} 1739}
1758 1740
1759void 1741void
1760rxvt_term::focus_out () 1742rxvt_term::focus_out ()
1762 if (focus) 1744 if (focus)
1763 { 1745 {
1764 focus = 0; 1746 focus = 0;
1765 want_refresh = 1; 1747 want_refresh = 1;
1766 1748
1767 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1749#if ENABLE_FRILLS
1768 1750 if (option (Opt_urgentOnBell))
1751 set_urgency (0);
1752#endif
1769#if ENABLE_FRILLS || ISO_14755 1753#if ENABLE_FRILLS || ISO_14755
1770 if (iso14755buf) 1754 if (iso14755buf)
1771 { 1755 {
1772 iso14755buf = 0; 1756 iso14755buf = 0;
1773# if ISO_14755 1757# if ISO_14755
1780 XUnsetICFocus (Input_Context); 1764 XUnsetICFocus (Input_Context);
1781#endif 1765#endif
1782#if CURSOR_BLINK 1766#if CURSOR_BLINK
1783 if (option (Opt_cursorBlink)) 1767 if (option (Opt_cursorBlink))
1784 cursor_blink_ev.stop (); 1768 cursor_blink_ev.stop ();
1769
1785 hidden_cursor = 0; 1770 hidden_cursor = 0;
1786#endif 1771#endif
1787#if OFF_FOCUS_FADING 1772#if OFF_FOCUS_FADING
1788 if (rs[Rs_fade]) 1773 if (rs[Rs_fade])
1789 { 1774 {
1790 pix_colors = pix_colors_unfocused; 1775 pix_colors = pix_colors_unfocused;
1791 scr_recolour (); 1776 scr_recolour ();
1792 } 1777 }
1793#endif 1778#endif
1779
1780 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1794 } 1781 }
1795} 1782}
1796 1783
1797void 1784void
1798rxvt_term::update_fade_color (unsigned int idx) 1785rxvt_term::update_fade_color (unsigned int idx)
1827 */ 1814 */
1828 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1815 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1829 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1816 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1830 { 1817 {
1831 bgPixmap.set_root_pixmap (); 1818 bgPixmap.set_root_pixmap ();
1832 bgPixmap.render (); 1819 update_background ();
1833 } 1820 }
1821
1834 break; 1822 break;
1835 } 1823 }
1836# endif 1824# endif
1825
1826 refresh_check ();
1837} 1827}
1838#endif 1828#endif
1839 1829
1840void 1830void
1841rxvt_term::button_press (XButtonEvent &ev) 1831rxvt_term::button_press (XButtonEvent &ev)
1896 mouse_report (ev); 1886 mouse_report (ev);
1897 } 1887 }
1898#else 1888#else
1899 MEvent.button = ev.button; 1889 MEvent.button = ev.button;
1900 mouse_report (ev); 1890 mouse_report (ev);
1901#endif /* MOUSE_REPORT_DOUBLECLICK */ 1891#endif /* MOUSE_REPORT_DOUBLECLICK */
1902 1892
1903 } 1893 }
1904 else 1894 else
1905 { 1895 {
1906 if (ev.button != MEvent.button) 1896 if (ev.button != MEvent.button)
1954 } 1944 }
1955 1945
1956 /* 1946 /*
1957 * Scrollbar window processing of button press 1947 * Scrollbar window processing of button press
1958 */ 1948 */
1959 if (isScrollbarWindow (ev.window)) 1949 if (scrollBar.state && ev.window == scrollBar.win)
1960 { 1950 {
1961 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;
1962 /* 1959 /*
1963 * Rxvt-style scrollbar: 1960 * Rxvt-style scrollbar:
1964 * move up if mouse is above slider 1961 * move up if mouse is above slider
1965 * move dn if mouse is below slider 1962 * move dn if mouse is below slider
1966 * 1963 *
1975 /* 1972 /*
1976 * Mouse report disabled scrollbar: 1973 * Mouse report disabled scrollbar:
1977 * arrow buttons - send up/down 1974 * arrow buttons - send up/down
1978 * click on scrollbar - send pageup/down 1975 * click on scrollbar - send pageup/down
1979 */ 1976 */
1980 if ((scrollBar.style == R_SB_NEXT 1977 if (direction == UP)
1981 && scrollbarnext_upButton (ev.y))
1982 || (scrollBar.style == R_SB_RXVT
1983 && scrollbarrxvt_upButton (ev.y)))
1984 tt_printf ("\033[A"); 1978 tt_printf ("\033[A");
1985 else if ((scrollBar.style == R_SB_NEXT 1979 else if (direction == DN)
1986 && scrollbarnext_dnButton (ev.y))
1987 || (scrollBar.style == R_SB_RXVT
1988 && scrollbarrxvt_dnButton (ev.y)))
1989 tt_printf ("\033[B"); 1980 tt_printf ("\033[B");
1990 else 1981 else
1991 switch (ev.button) 1982 switch (ev.button)
1992 { 1983 {
1993 case Button2: 1984 case Button2:
2000 tt_printf ("\033[5~"); 1991 tt_printf ("\033[5~");
2001 break; 1992 break;
2002 } 1993 }
2003 } 1994 }
2004 else 1995 else
2005#endif /* NO_SCROLLBAR_REPORT */ 1996#endif /* NO_SCROLLBAR_REPORT */
2006
2007 {
2008 char upordown = 0;
2009
2010 if (scrollBar.style == R_SB_NEXT)
2011 { 1997 {
2012 if (scrollbarnext_upButton (ev.y)) 1998 if (direction != NO_DIR)
2013 upordown = -1; /* up */
2014 else if (scrollbarnext_dnButton (ev.y))
2015 upordown = 1; /* down */
2016 }
2017 else if (scrollBar.style == R_SB_RXVT)
2018 {
2019 if (scrollbarrxvt_upButton (ev.y))
2020 upordown = -1; /* up */
2021 else if (scrollbarrxvt_dnButton (ev.y))
2022 upordown = 1; /* down */
2023 }
2024 if (upordown)
2025 { 1999 {
2026#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2000#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2001 if (!cont_scroll_ev.is_active ())
2027 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2002 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2028#endif 2003#endif
2029 if (scr_page (upordown < 0 ? UP : DN, 1)) 2004 if (scr_page (direction, 1))
2030 { 2005 {
2031 if (upordown < 0) 2006 if (direction == UP)
2032 scrollBar.setUp (); 2007 scrollBar.state = STATE_UP;
2033 else 2008 else
2034 scrollBar.setDn (); 2009 scrollBar.state = STATE_DOWN;
2035 } 2010 }
2036 } 2011 }
2037 else 2012 else
2038 switch (ev.button) 2013 switch (ev.button)
2039 { 2014 {
2040 case Button2: 2015 case Button2:
2041 switch (scrollbar_align) 2016 switch (scrollBar.align)
2042 { 2017 {
2043 case R_SB_ALIGN_TOP: 2018 case R_SB_ALIGN_TOP:
2044 csrO = 0; 2019 csrO = 0;
2045 break; 2020 break;
2046 case R_SB_ALIGN_CENTRE: 2021 case R_SB_ALIGN_CENTRE:
2052 } 2027 }
2053 2028
2054 if (scrollBar.style == R_SB_XTERM 2029 if (scrollBar.style == R_SB_XTERM
2055 || scrollbar_above_slider (ev.y) 2030 || scrollbar_above_slider (ev.y)
2056 || scrollbar_below_slider (ev.y)) 2031 || scrollbar_below_slider (ev.y))
2057 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2032 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2058 2033
2059 scrollBar.setMotion (); 2034 scrollBar.state = STATE_MOTION;
2060 break; 2035 break;
2061 2036
2062 case Button1: 2037 case Button1:
2063 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2038 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2064 csrO = ev.y - scrollBar.top; 2039 csrO = ev.y - scrollBar.top;
2065 /* FALLTHROUGH */ 2040 /* FALLTHROUGH */
2066 2041
2067 case Button3: 2042 case Button3:
2068 if (scrollBar.style != R_SB_XTERM) 2043 if (scrollBar.style != R_SB_XTERM)
2078 scr_page (DN, nrow - 1); 2053 scr_page (DN, nrow - 1);
2079# else 2054# else
2080 scr_page (DN, nrow / 4); 2055 scr_page (DN, nrow / 4);
2081# endif 2056# endif
2082 else 2057 else
2083 scrollBar.setMotion (); 2058 scrollBar.state = STATE_MOTION;
2084 } 2059 }
2085 else 2060 else
2086 { 2061 {
2087 scr_page ((ev.button == Button1 ? DN : UP), 2062 scr_page ((ev.button == Button1 ? DN : UP),
2088 (nrow 2063 (nrow
2089 * scrollbar_position (ev.y) 2064 * scrollbar_position (ev.y)
2090 / scrollbar_size ())); 2065 / scrollBar.size ()));
2091 } 2066 }
2092 2067
2093 break; 2068 break;
2094 } 2069 }
2095 } 2070 }
2105 2080
2106 csrO = 0; /* reset csr Offset */ 2081 csrO = 0; /* reset csr Offset */
2107 if (!bypass_keystate) 2082 if (!bypass_keystate)
2108 reportmode = !! (priv_modes & PrivMode_mouse_report); 2083 reportmode = !! (priv_modes & PrivMode_mouse_report);
2109 2084
2110 if (scrollbar_isUpDn ()) 2085 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2111 { 2086 {
2112 scrollBar.setIdle (); 2087 scrollBar.state = STATE_IDLE;
2113 scrollbar_show (0); 2088 scrollBar.show (0);
2114 } 2089 }
2115 2090
2116#ifdef SELECTION_SCROLLING 2091#ifdef SELECTION_SCROLLING
2117 if (sel_scroll_ev.active)
2118 sel_scroll_ev.stop(); 2092 sel_scroll_ev.stop();
2119#endif 2093#endif
2120 2094
2121 if (ev.window == vt) 2095 if (ev.window == vt)
2122 { 2096 {
2123 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)))
2147 mouse_report (ev); 2121 mouse_report (ev);
2148 } 2122 }
2149#else /* MOUSE_REPORT_DOUBLECLICK */ 2123#else /* MOUSE_REPORT_DOUBLECLICK */
2150 MEvent.button = AnyButton; 2124 MEvent.button = AnyButton;
2151 mouse_report (ev); 2125 mouse_report (ev);
2152#endif /* MOUSE_REPORT_DOUBLECLICK */ 2126#endif /* MOUSE_REPORT_DOUBLECLICK */
2153 return; 2127 return;
2154 } 2128 }
2155 2129
2156 /* 2130 /*
2157 * dumb hack to compensate for the failure of click-and-drag 2131 * dumb hack to compensate for the failure of click-and-drag
2195 { 2169 {
2196 mouse_slip_wheel_speed += v ? -1 : 1; 2170 mouse_slip_wheel_speed += v ? -1 : 1;
2197 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2171 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2198 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2172 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2199 2173
2200 if (slip_wheel_ev.at < NOW) 2174 if (!slip_wheel_ev.is_active ())
2201 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2175 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2202
2203 slip_wheel_ev.start ();
2204 } 2176 }
2205 else 2177 else
2178# endif
2206 { 2179 {
2207# endif
2208 scr_page (v, i); 2180 scr_page (v, i);
2209 scrollbar_show (1); 2181 scrollBar.show (1);
2210# ifdef MOUSE_SLIP_WHEELING
2211 } 2182 }
2212# endif
2213 } 2183 }
2214 break; 2184 break;
2215#endif 2185#endif
2216 } 2186 }
2217 } 2187 }
2218} 2188}
2219 2189
2220/*}}} */ 2190/*}}} */
2221 2191
2222bool 2192void
2223rxvt_term::cmd_parse () 2193rxvt_term::cmd_parse ()
2224{ 2194{
2225 bool flag = false;
2226 wchar_t ch = NOCHAR; 2195 wchar_t ch = NOCHAR;
2227 char *seq_begin; // remember start of esc-sequence here 2196 char *seq_begin; // remember start of esc-sequence here
2228 2197
2229 for (;;) 2198 for (;;)
2230 { 2199 {
2231 if (ch == NOCHAR) 2200 if (expect_false (ch == NOCHAR))
2232 { 2201 {
2233 seq_begin = cmdbuf_ptr; 2202 seq_begin = cmdbuf_ptr;
2234 ch = next_char (); 2203 ch = next_char ();
2235 2204
2236 if (ch == NOCHAR) 2205 if (ch == NOCHAR)
2237 break; 2206 break;
2238 } 2207 }
2239 2208
2240 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))
2241 { 2210 {
2242 if (!seen_input) 2211 if (expect_false (!seen_input))
2243 { 2212 {
2244 seen_input = 1; 2213 seen_input = 1;
2245 // many badly-written programs (e.g. jed) contain a race condition: 2214 // many badly-written programs (e.g. jed) contain a race condition:
2246 // they first read the screensize and then install a SIGWINCH handler. 2215 // they first read the screensize and then install a SIGWINCH handler.
2247 // some window managers resize the window early, and these programs 2216 // some window managers resize the window early, and these programs
2260 wchar_t *str = buf; 2229 wchar_t *str = buf;
2261 wchar_t *eol = str + min (ncol, UBUFSIZ); 2230 wchar_t *eol = str + min (ncol, UBUFSIZ);
2262 2231
2263 for (;;) 2232 for (;;)
2264 { 2233 {
2265 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)))
2266 break; 2235 break;
2267 2236
2268 *str++ = ch; 2237 *str++ = ch;
2269 2238
2270 if (ch == C0_LF || str >= eol) 2239 if (expect_false (ch == C0_LF || str >= eol))
2271 { 2240 {
2272 if (ch == C0_LF) 2241 if (ch == C0_LF)
2273 nlines++; 2242 nlines++;
2274 2243
2275 refresh_count++; 2244 refresh_count++;
2276 2245
2277 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2246 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2278 { 2247 {
2279 refresh_count = 0; 2248 refresh_count = 0;
2280 2249
2281 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2250 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2282 { 2251 {
2283 refreshnow = true; 2252 refreshnow = true;
2284 ch = NOCHAR; 2253 ch = NOCHAR;
2285 break; 2254 break;
2286 } 2255 }
2324 * 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.
2325 * if skipScroll is enabled. 2294 * if skipScroll is enabled.
2326 */ 2295 */
2327 if (refreshnow) 2296 if (refreshnow)
2328 { 2297 {
2329 flag = true;
2330 scr_refresh (); 2298 scr_refresh ();
2331 want_refresh = 1; 2299 want_refresh = 1;
2332 } 2300 }
2333
2334 } 2301 }
2335 else 2302 else
2336 { 2303 {
2337 try 2304 try
2338 { 2305 {
2346 } 2313 }
2347 2314
2348 ch = NOCHAR; 2315 ch = NOCHAR;
2349 } 2316 }
2350 } 2317 }
2351
2352 return flag;
2353} 2318}
2354 2319
2355// read the next character 2320// read the next character
2356wchar_t 2321wchar_t
2357rxvt_term::next_char () NOTHROW 2322rxvt_term::next_char () NOTHROW
2358{ 2323{
2359 while (cmdbuf_ptr < cmdbuf_endp) 2324 while (cmdbuf_ptr < cmdbuf_endp)
2360 { 2325 {
2361 // assume 7-bit to be ascii ALWAYS 2326 // assume 7-bit to be ascii ALWAYS
2362 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2327 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2363 return *cmdbuf_ptr++; 2328 return *cmdbuf_ptr++;
2364 2329
2365 wchar_t wc; 2330 wchar_t wc;
2366 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);
2367 2332
2371 cmdbuf_ptr = cmdbuf_endp; 2336 cmdbuf_ptr = cmdbuf_endp;
2372 break; 2337 break;
2373 } 2338 }
2374 2339
2375 if (len == (size_t)-1) 2340 if (len == (size_t)-1)
2341 {
2342 mbstate.reset (); // reset now undefined conversion state
2376 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 }
2377 2345
2378 // assume wchar == unicode 2346 // assume wchar == unicode
2379 cmdbuf_ptr += len; 2347 cmdbuf_ptr += len;
2380 return wc & UNICODE_MASK; 2348 return wc & UNICODE_MASK;
2381 } 2349 }
2425/*----------------------------------------------------------------------*/ 2393/*----------------------------------------------------------------------*/
2426#ifdef PRINTPIPE 2394#ifdef PRINTPIPE
2427FILE * 2395FILE *
2428rxvt_term::popen_printer () 2396rxvt_term::popen_printer ()
2429{ 2397{
2430 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2398 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2431 2399
2432 if (stream == NULL) 2400 if (stream == NULL)
2433 rxvt_warn ("can't open printer pipe, not printing.\n"); 2401 rxvt_warn ("can't open printer pipe, not printing.\n");
2434 2402
2435 return stream; 2403 return stream;
2446 * simulate attached vt100 printer 2414 * simulate attached vt100 printer
2447 */ 2415 */
2448void 2416void
2449rxvt_term::process_print_pipe () 2417rxvt_term::process_print_pipe ()
2450{ 2418{
2451 int done; 2419 FILE *fd = popen_printer ();
2452 FILE *fd;
2453 2420
2454 if ((fd = popen_printer ()) == NULL) 2421 if (!fd)
2455 return; 2422 return;
2456 2423
2457 /* 2424 /*
2458 * 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
2459 * is received. 2426 * is received.
2460 */ 2427 */
2461 for (done = 0; !done;) 2428 for (int done = 0; !done; )
2462 { 2429 {
2463 unsigned char buf[8]; 2430 unsigned char buf[8];
2464 unicode_t ch; 2431 unicode_t ch;
2465 unsigned int i, len; 2432 unsigned int i, len;
2466 2433
2497 } 2464 }
2498 } 2465 }
2499 2466
2500 pclose_printer (fd); 2467 pclose_printer (fd);
2501} 2468}
2502#endif /* PRINTPIPE */ 2469#endif /* PRINTPIPE */
2503/*}}} */ 2470/*}}} */
2504 2471
2505/* *INDENT-OFF* */ 2472/* *INDENT-OFF* */
2506enum { 2473enum {
2507 C1_40 = 0x40, 2474 C1_40 = 0x40,
2611 break; 2578 break;
2612 case 'Z': /* identify the terminal type */ 2579 case 'Z': /* identify the terminal type */
2613 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2580 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2614 break; 2581 break;
2615 case '<': /* turn off VT52 mode */ 2582 case '<': /* turn off VT52 mode */
2616 PrivMode (0, PrivMode_vt52); 2583 set_privmode (PrivMode_vt52, 0);
2617 break; 2584 break;
2618 case 'F': /* use special graphics character set */ 2585 case 'F': /* use special graphics character set */
2619 case 'G': /* use regular character set */ 2586 case 'G': /* use regular character set */
2620 /* unimplemented */ 2587 /* unimplemented */
2621 break; 2588 break;
2675 scr_forwardindex (); 2642 scr_forwardindex ();
2676 break; 2643 break;
2677#endif 2644#endif
2678 case '=': 2645 case '=':
2679 case '>': 2646 case '>':
2680 PrivMode ((ch == '='), PrivMode_aplKP); 2647 set_privmode (PrivMode_aplKP, ch == '=');
2681 break; 2648 break;
2682 2649
2683 case C1_40: 2650 case C1_40:
2684 cmd_getc (); 2651 cmd_getc ();
2685 break; 2652 break;
2724 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2691 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2725 case C1_SCI: /* ESC Z */ 2692 case C1_SCI: /* ESC Z */
2726 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2693 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2727 break; /* steal obsolete ESC [ c */ 2694 break; /* steal obsolete ESC [ c */
2728 2695
2729 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2696 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2730 case C1_CSI: /* ESC [ */ 2697 case C1_CSI: /* ESC [ */
2731 process_csi_seq (); 2698 process_csi_seq ();
2732 break; 2699 break;
2733 2700
2734 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2701 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2735 case C1_OSC: /* ESC ] */ 2702 case C1_OSC: /* ESC ] */
2736 process_osc_seq (); 2703 process_osc_seq ();
2737 break; 2704 break;
2738 2705
2739 /* 8.3.106: RESET TO INITIAL STATE */ 2706 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2740 case 'c': 2707 case 'c':
2741 mbstate.reset (); 2708 mbstate.reset ();
2742 scr_poweron (); 2709 scr_poweron ();
2743 scrollbar_show (1); 2710 scrollBar.show (1);
2744 break; 2711 break;
2745 2712
2746 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2713 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2747 case 'n': 2714 case 'n':
2748 scr_charset_choose (2); 2715 scr_charset_choose (2);
2793rxvt_term::process_csi_seq () 2760rxvt_term::process_csi_seq ()
2794{ 2761{
2795 unicode_t ch, priv, i; 2762 unicode_t ch, priv, i;
2796 unsigned int nargs, p; 2763 unsigned int nargs, p;
2797 int n, ndef; 2764 int n, ndef;
2798 int arg[ESC_ARGS]; 2765 int arg[ESC_ARGS] = { };
2799 2766
2800 memset (arg, 0, sizeof (arg));
2801 nargs = 0; 2767 nargs = 0;
2802 2768
2803 priv = 0; 2769 priv = 0;
2804 ch = cmd_getc (); 2770 ch = cmd_getc ();
2805 if (ch >= '<' && ch <= '?') 2771 if ((ch >= '<' && ch <= '?') || ch == '!')
2772 {
2806 { /* '<' '=' '>' '?' */ 2773 /* '<' '=' '>' '?' '!' */
2807 priv = ch; 2774 priv = ch;
2808 ch = cmd_getc (); 2775 ch = cmd_getc ();
2809 } 2776 }
2810 2777
2811 /* read any numerical arguments */ 2778 /* read any numerical arguments */
2854 { 2821 {
2855 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2822 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2856 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2823 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2857 // 2824 //
2858 // 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
2859 // 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
2860 // that we do not support xterm mouse reporting (should be 95 when we do). 2827 // versions.
2861 // 2828 //
2862 tt_printf ("\033[>%d;94;0c", 'U'); 2829 tt_printf ("\033[>%d;95;0c", 'U');
2863 } 2830 }
2864 break; 2831 break;
2832
2865 case '?': 2833 case '?':
2866 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2867 process_terminal_mode (ch, priv, nargs, arg); 2835 process_terminal_mode (ch, priv, nargs, arg);
2868 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);
2869 } 2849 }
2850 break;
2851 }
2852
2870 return; 2853 return;
2871 } 2854 }
2872 2855
2873 switch (ch) 2856 switch (ch)
2874 { 2857 {
3303 3286
3304/* 3287/*
3305 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3288 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3306 */ 3289 */
3307void 3290void
3308rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3291rxvt_term::process_xterm_seq (int op, char *str, char resp)
3309{ 3292{
3310 int color; 3293 int color;
3311 char *buf, *name; 3294 char *buf, *name;
3312 bool query = str[0] == '?' && !str[1]; 3295 bool query = str[0] == '?' && !str[1];
3313 int saveop = op; 3296 int saveop = op;
3354 3337
3355 XFree (value); 3338 XFree (value);
3356 } 3339 }
3357 else 3340 else
3358 { 3341 {
3359 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3342 char *eq = strchr (str, '=');
3360 3343
3361 if (eq) 3344 if (eq)
3362 { 3345 {
3363 *eq = 0; 3346 *eq = 0;
3364 set_utf8_property (display->atom (str), eq + 1); 3347 set_utf8_property (display->atom (str), eq + 1);
3385 *buf++ = '\0'; 3368 *buf++ = '\0';
3386 3369
3387 process_color_seq (op, color, name, resp); 3370 process_color_seq (op, color, name, resp);
3388 } 3371 }
3389 break; 3372 break;
3373 case Rxvt_restoreFG:
3390 case XTerm_Color00: 3374 case XTerm_Color00:
3391 process_color_seq (op, Color_fg, str, resp); 3375 process_color_seq (op, Color_fg, str, resp);
3392 break; 3376 break;
3377 case Rxvt_restoreBG:
3393 case XTerm_Color01: 3378 case XTerm_Color01:
3394 process_color_seq (op, Color_bg, str, resp); 3379 process_color_seq (op, Color_bg, str, resp);
3395 break; 3380 break;
3396#ifndef NO_CURSORCOLOR 3381#ifndef NO_CURSORCOLOR
3397 case XTerm_Color_cursor: 3382 case XTerm_Color_cursor:
3418 break; 3403 break;
3419 case URxvt_Color_IT: 3404 case URxvt_Color_IT:
3420 process_color_seq (op, Color_IT, str, resp); 3405 process_color_seq (op, Color_IT, str, resp);
3421 break; 3406 break;
3422#endif 3407#endif
3408 case URxvt_Color_border:
3409 process_color_seq (op, Color_border, str, resp);
3410 break;
3423#if ENABLE_TRANSPARENCY 3411#if ENABLE_TRANSPARENCY
3424 case URxvt_Color_tint: 3412 case URxvt_Color_tint:
3425 process_color_seq (op, Color_tint, str, resp); 3413 process_color_seq (op, Color_tint, str, resp);
3426 { 3414 {
3427 bool changed = false; 3415 bool changed = false;
3416
3428 if (ISSET_PIXCOLOR (Color_tint)) 3417 if (ISSET_PIXCOLOR (Color_tint))
3429 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3418 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3430 else 3419 else
3431 changed = bgPixmap.unset_tint (); 3420 changed = bgPixmap.unset_tint ();
3421
3432 if (changed) 3422 if (changed)
3433 bgPixmap.render (); 3423 update_background ();
3434 } 3424 }
3435 3425
3436 break; 3426 break;
3437#endif 3427#endif
3438 3428
3439#if XPM_BACKGROUND 3429#if BG_IMAGE_FROM_FILE
3440 case Rxvt_Pixmap: 3430 case Rxvt_Pixmap:
3441 if (!strcmp (str, "?")) 3431 if (!strcmp (str, "?"))
3442 { 3432 {
3443 char str[256]; 3433 char str[256];
3444 3434
3459 changed++; 3449 changed++;
3460 str = strchr (str, ';'); 3450 str = strchr (str, ';');
3461 if (str == NULL) 3451 if (str == NULL)
3462 bgPixmap.set_defaultGeometry (); 3452 bgPixmap.set_defaultGeometry ();
3463 } 3453 }
3454
3464 while (str) 3455 while (str)
3465 { 3456 {
3466 str++; 3457 str++;
3467 if (bgPixmap.set_geometry (str)) 3458 if (bgPixmap.set_geometry (str))
3468 changed++; 3459 changed++;
3469 str = strchr (str, ';'); 3460 str = strchr (str, ';');
3470 } 3461 }
3462
3471 if (changed) 3463 if (changed)
3472 { 3464 update_background ();
3473 bgPixmap.render ();
3474 scr_touch (true);
3475 }
3476 } 3465 }
3477 break; 3466 break;
3478#endif 3467#endif
3479
3480 case Rxvt_restoreFG:
3481 set_window_color (Color_fg, str);
3482 break;
3483 case Rxvt_restoreBG:
3484 set_window_color (Color_bg, str);
3485 break;
3486 3468
3487 case XTerm_logfile: 3469 case XTerm_logfile:
3488 // TODO, when secure mode? 3470 // TODO, when secure mode?
3489 break; 3471 break;
3490 3472
3557 break; 3539 break;
3558#endif 3540#endif
3559 3541
3560#if ENABLE_PERL 3542#if ENABLE_PERL
3561 case URxvt_perl: 3543 case URxvt_perl:
3562 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));
3563 ; // no responses yet
3564 break; 3545 break;
3565#endif 3546#endif
3566 } 3547 }
3567} 3548}
3568/*----------------------------------------------------------------------*/ 3549/*----------------------------------------------------------------------*/
3591 { 3572 {
3592 if (mode == 'r') 3573 if (mode == 'r')
3593 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3574 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3594 else 3575 else
3595 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3576 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3596 PrivMode (state, bit); 3577 set_privmode (bit, state);
3597 } 3578 }
3598 3579
3599 return state; 3580 return state;
3600} 3581}
3601 3582
3609 static const struct 3590 static const struct
3610 { 3591 {
3611 const int argval; 3592 const int argval;
3612 const unsigned long bit; 3593 const unsigned long bit;
3613 } argtopriv[] = { 3594 } argtopriv[] = {
3614 { 1, PrivMode_aplCUR }, 3595 { 1, PrivMode_aplCUR }, // DECCKM
3615 { 2, PrivMode_vt52 }, 3596 { 2, PrivMode_vt52 },
3616 { 3, PrivMode_132 }, 3597 { 3, PrivMode_132 }, // DECCOLM
3617 { 4, PrivMode_smoothScroll }, 3598 { 4, PrivMode_smoothScroll }, // DECSCLM
3618 { 5, PrivMode_rVideo }, 3599 { 5, PrivMode_rVideo }, // DECSCNM
3619 { 6, PrivMode_relOrigin }, 3600 { 6, PrivMode_relOrigin }, // DECOM
3620 { 7, PrivMode_Autowrap }, 3601 { 7, PrivMode_Autowrap }, // DECAWM
3621 // 8, bi-directional support mode 3602 // 8, auto-repeat keys // DECARM
3622 { 9, PrivMode_MouseX10 }, 3603 { 9, PrivMode_MouseX10 },
3623 // 18, 19 printing-related 3604 // 18 end FF to printer after print screen
3605 // 19 Print screen prints full screen/scorll region
3624 { 25, PrivMode_VisibleCursor }, 3606 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3625#ifdef scrollBar_esc 3607#ifdef scrollBar_esc
3626 { scrollBar_esc, PrivMode_scrollBar }, 3608 { scrollBar_esc, PrivMode_scrollBar },
3627#endif 3609#endif
3628 { 35, PrivMode_ShiftKeys }, // rxvt extension 3610 { 35, PrivMode_ShiftKeys }, // rxvt extension
3611 // 38, tektronix mode // DECTEK
3629 { 40, PrivMode_132OK }, 3612 { 40, PrivMode_132OK },
3630 // 41 xterm more fixes NYI 3613 // 41 xterm more fixes NYI
3631 // 45 margin bell NYI 3614 // 45 margin bell NYI
3632 // 46 start logging 3615 // 46 start logging
3633 { 47, PrivMode_Screen }, 3616 { 47, PrivMode_Screen },
3634 { 66, PrivMode_aplKP }, 3617 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3635#ifndef NO_BACKSPACE_KEY 3618#ifndef NO_BACKSPACE_KEY
3636 { 67, PrivMode_BackSpace }, 3619 { 67, PrivMode_BackSpace }, // DECBKM
3637#endif 3620#endif
3638 { 1000, PrivMode_MouseX11 }, 3621 { 1000, PrivMode_MouseX11 },
3639 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3622 { 1002, PrivMode_MouseBtnEvent },
3640 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3623 { 1003, PrivMode_MouseAnyEvent },
3641 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3642 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3624 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3643 { 1011, PrivMode_Keypress }, // rxvt extension 3625 { 1011, PrivMode_Keypress }, // rxvt extension
3644 // 1035 enable modifiers for alt, numlock NYI 3626 // 1035 enable modifiers for alt, numlock NYI
3645 // 1036 send ESC for meta keys NYI 3627 // 1036 send ESC for meta keys NYI
3646 // 1037 send DEL for keypad delete NYI 3628 // 1037 send DEL for keypad delete NYI
3647 { 1047, PrivMode_Screen }, 3629 { 1047, PrivMode_Screen },
3648 // 1048 save and restore cursor 3630 // 1048 save and restore cursor
3649 { 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 */
3650 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3632 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3633 { 2004, PrivMode_BracketPaste },
3651 }; 3634 };
3652 3635
3653 if (nargs == 0) 3636 if (nargs == 0)
3654 return; 3637 return;
3655 3638
3680 3663
3681 scr_touch (true); 3664 scr_touch (true);
3682 break; 3665 break;
3683#endif 3666#endif
3684 case 1048: /* alternative cursor save */ 3667 case 1048: /* alternative cursor save */
3685 case 1049:
3686 if (option (Opt_secondaryScreen)) 3668 if (option (Opt_secondaryScreen))
3687 if (mode == 0) 3669 if (mode == 0)
3688 scr_cursor (RESTORE); 3670 scr_cursor (RESTORE);
3689 else if (mode == 1) 3671 else if (mode == 1)
3690 scr_cursor (SAVE); 3672 scr_cursor (SAVE);
3699 case 2: /* VT52 mode */ 3681 case 2: /* VT52 mode */
3700 /* oddball mode. should be set regardless of set/reset 3682 /* oddball mode. should be set regardless of set/reset
3701 * parameter. Return from VT52 mode with an ESC < from 3683 * parameter. Return from VT52 mode with an ESC < from
3702 * within VT52 mode 3684 * within VT52 mode
3703 */ 3685 */
3704 PrivMode (1, PrivMode_vt52); 3686 set_privmode (PrivMode_vt52, 1);
3705 break; 3687 break;
3706 case 3: /* 80/132 */ 3688 case 3: /* 80/132 */
3707 if (priv_modes & PrivMode_132OK) 3689 if (priv_modes & PrivMode_132OK)
3708 set_widthheight (((state ? 132 : 80) * fwidth), height); 3690 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3709 break; 3691 break;
3710 case 4: /* smooth scrolling */ 3692 case 4: /* smooth scrolling */
3711 set_option (Opt_jumpScroll, !state); 3693 set_option (Opt_jumpScroll, !state);
3712 break; 3694 break;
3713 case 5: /* reverse video */ 3695 case 5: /* reverse video */
3720 scr_autowrap (state); 3702 scr_autowrap (state);
3721 break; 3703 break;
3722 /* 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 */
3723 case 9: /* X10 mouse reporting */ 3705 case 9: /* X10 mouse reporting */
3724 if (state) /* orthogonal */ 3706 if (state) /* orthogonal */
3725 priv_modes &= ~PrivMode_MouseX11; 3707 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3726 break; 3708 break;
3727#ifdef scrollBar_esc 3709#ifdef scrollBar_esc
3728 case scrollBar_esc: 3710 case scrollBar_esc:
3729 if (scrollbar_mapping (state)) 3711 if (scrollBar.map (state))
3730 { 3712 {
3731 resize_all_windows (0, 0, 0); 3713 resize_all_windows (0, 0, 0);
3732 scr_touch (true); 3714 scr_touch (true);
3733 } 3715 }
3734 break; 3716 break;
3743 break; 3725 break;
3744 /* case 66: - application key pad */ 3726 /* case 66: - application key pad */
3745 /* case 67: - backspace key */ 3727 /* case 67: - backspace key */
3746 case 1000: /* X11 mouse reporting */ 3728 case 1000: /* X11 mouse reporting */
3747 if (state) /* orthogonal */ 3729 if (state) /* orthogonal */
3748 priv_modes &= ~PrivMode_MouseX10; 3730 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3749 break; 3731 break;
3750#if 0
3751 case 1001: 3732 case 1002:
3752 break; /* X11 mouse highlighting */ 3733 case 1003:
3753#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;
3754 case 1010: /* scroll to bottom on TTY output inhibit */ 3745 case 1010: /* scroll to bottom on TTY output inhibit */
3755 set_option (Opt_scrollTtyOutput, !state); 3746 set_option (Opt_scrollTtyOutput, !state);
3756 break; 3747 break;
3757 case 1011: /* scroll to bottom on key press */ 3748 case 1011: /* scroll to bottom on key press */
3758 set_option (Opt_scrollTtyKeypress, state); 3749 set_option (Opt_scrollTtyKeypress, state);
3759 break; 3750 break;
3760 case 1047: /* secondary screen w/ clearing last */ 3751 case 1047: /* secondary screen w/ clearing last */
3761 if (option (Opt_secondaryScreen)) 3752 if (option (Opt_secondaryScreen))
3762 if (current_screen != PRIMARY) 3753 if (!state)
3763 scr_erase_screen (2); 3754 scr_erase_screen (2);
3755
3764 scr_change_screen (state); 3756 scr_change_screen (state);
3765 break; 3757 break;
3766 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
3767 scr_change_screen (state); 3763 scr_change_screen (state);
3764
3768 if (option (Opt_secondaryScreen)) 3765 if (option (Opt_secondaryScreen))
3769 if (current_screen != PRIMARY) 3766 if (state)
3770 scr_erase_screen (2); 3767 scr_erase_screen (2);
3768 else
3769 scr_cursor (RESTORE);
3771 break; 3770 break;
3772 default: 3771 default:
3773 break; 3772 break;
3774 } 3773 }
3775 } 3774 }
3935rxvt_term::process_graphics () 3934rxvt_term::process_graphics ()
3936{ 3935{
3937 unicode_t ch, cmd = cmd_getc (); 3936 unicode_t ch, cmd = cmd_getc ();
3938 3937
3939 if (cmd == 'Q') 3938 if (cmd == 'Q')
3939 {
3940 { /* query graphics */ 3940 /* query graphics */
3941 tt_printf ("\033G0\012"); /* no graphics */ 3941 tt_printf ("\033G0\012"); /* no graphics */
3942 return; 3942 return;
3943 } 3943 }
3944 /* swallow other graphics sequences until terminating ':' */ 3944 /* swallow other graphics sequences until terminating ':' */
3945 do 3945 do
3995 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3995 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3996 3996
3997 memcpy (v_buffer + v_buflen, data, len); 3997 memcpy (v_buffer + v_buflen, data, len);
3998 v_buflen += len; 3998 v_buflen += len;
3999 3999
4000 pty_ev.set (EVENT_READ | EVENT_WRITE); 4000 pty_ev.set (ev::READ | ev::WRITE);
4001} 4001}
4002 4002
4003void rxvt_term::pty_write () 4003void rxvt_term::pty_write ()
4004{ 4004{
4005 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));
4010 4010
4011 if (v_buflen == 0) 4011 if (v_buflen == 0)
4012 { 4012 {
4013 free (v_buffer); 4013 free (v_buffer);
4014 v_buffer = 0; 4014 v_buffer = 0;
4015 v_buflen = 0;
4016 4015
4017 pty_ev.set (EVENT_READ); 4016 pty_ev.set (ev::READ);
4018 return; 4017 return;
4019 } 4018 }
4020 4019
4021 memmove (v_buffer, v_buffer + written, v_buflen); 4020 memmove (v_buffer, v_buffer + written, v_buflen);
4022 } 4021 }
4023 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4022 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4024 pty_ev.set (EVENT_READ); 4023 pty_ev.set (ev::READ);
4025} 4024}
4026 4025
4027/*----------------------- end-of-file (C source) -----------------------*/ 4026/*----------------------- end-of-file (C source) -----------------------*/
4028 4027

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines