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.438 by root, Thu Feb 4 21:55:12 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
410#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 507#else
413 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
414#endif 509#endif
510 max_it (lnsppg, 1);
511
415 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
416 { 513 {
417 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
418 return; 515 return;
419 } 516 }
484 } 581 }
485 } 582 }
486 583
487#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 585 // ISO 14755 support
489 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 587 {
491 int hv; 588 int hv;
492 589
493 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
524 scr_overlay_off (); 621 scr_overlay_off ();
525# endif 622# endif
526 iso14755buf = 0; 623 iso14755buf = 0;
527 } 624 }
528 } 625 }
626 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
532 { 630 {
533 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 632# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
546 } 644 }
547#endif 645#endif
548 646
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1;
651
652 switch (translate_keypad (keysym, kp))
551 { 653 {
654#ifndef NO_BACKSPACE_KEY
655 case XK_BackSpace:
656 if (priv_modes & PrivMode_HaveBackSpace)
657 {
658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
659 ^ !!ctrl) ? '\b' : '\177';
660 kbuf[1] = '\0';
661 }
662 else
663 strcpy (kbuf, rs[Rs_backspace_key]);
664 break;
665#endif
666#ifndef NO_DELETE_KEY
667 case XK_Delete:
668 strcpy (kbuf, rs[Rs_delete_key]);
669 break;
670#endif
671 case XK_Tab:
672 if (shft)
673 strcpy (kbuf, "\033[Z");
674 else
675 {
676#ifdef CTRL_TAB_MAKES_META
677 if (ctrl)
678 meta = 1;
679#endif
680#ifdef MOD4_TAB_MAKES_META
681 if (ev.state & Mod4Mask)
682 meta = 1;
683#endif
552 newlen = 1; 684 newlen = 0;
553 switch (keysym) 685 }
686 break;
687
688 case XK_Up: /* "\033[A" */
689 case XK_Down: /* "\033[B" */
690 case XK_Right: /* "\033[C" */
691 case XK_Left: /* "\033[D" */
692 strcpy (kbuf, "\033[Z");
693 kbuf[2] = "DACB"[keysym - XK_Left];
694 /* do Shift first */
695 if (shft)
696 kbuf[2] = "dacb"[keysym - XK_Left];
697 else if (ctrl)
698 {
699 kbuf[1] = 'O';
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 }
702 else if (priv_modes & PrivMode_aplCUR)
703 kbuf[1] = 'O';
704 break;
705
706 case XK_KP_Enter:
707 /* allow shift to override */
708 if (kp)
709 {
710 strcpy (kbuf, "\033OM");
711 break;
712 }
713
714 /* FALLTHROUGH */
715
716 case XK_Return:
717 if (priv_modes & PrivMode_LFNL)
718 {
719 kbuf[0] = '\015';
720 kbuf[1] = '\012';
721 kbuf[2] = '\0';
722 }
723 else
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\0';
727 }
728 break;
729
730 case XK_KP_F1: /* "\033OP" */
731 case XK_KP_F2: /* "\033OQ" */
732 case XK_KP_F3: /* "\033OR" */
733 case XK_KP_F4: /* "\033OS" */
734 strcpy (kbuf, "\033OP");
735 kbuf[2] += (keysym - XK_KP_F1);
736 break;
737
738 case XK_KP_Multiply: /* "\033Oj" : "*" */
739 case XK_KP_Add: /* "\033Ok" : "+" */
740 case XK_KP_Separator: /* "\033Ol" : "," */
741 case XK_KP_Subtract: /* "\033Om" : "-" */
742 case XK_KP_Decimal: /* "\033On" : "." */
743 case XK_KP_Divide: /* "\033Oo" : "/" */
744 case XK_KP_0: /* "\033Op" : "0" */
745 case XK_KP_1: /* "\033Oq" : "1" */
746 case XK_KP_2: /* "\033Or" : "2" */
747 case XK_KP_3: /* "\033Os" : "3" */
748 case XK_KP_4: /* "\033Ot" : "4" */
749 case XK_KP_5: /* "\033Ou" : "5" */
750 case XK_KP_6: /* "\033Ov" : "6" */
751 case XK_KP_7: /* "\033Ow" : "7" */
752 case XK_KP_8: /* "\033Ox" : "8" */
753 case XK_KP_9: /* "\033Oy" : "9" */
754 /* allow shift to override */
755 if (kp)
756 {
757 strcpy (kbuf, "\033Oj");
758 kbuf[2] += (keysym - XK_KP_Multiply);
759 }
760 else
761 {
762 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
763 kbuf[1] = '\0';
764 }
765 break;
766
767 default:
554 { 768 {
555#ifndef NO_BACKSPACE_KEY 769 int param = map_function_key (keysym);
556 case XK_BackSpace: 770 if (param > 0)
557 if (priv_modes & PrivMode_HaveBackSpace) 771 sprintf (kbuf,"\033[%d~", param);
558 {
559 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
560 ^ !!ctrl) ? '\b' : '\177';
561 kbuf[1] = '\0';
562 }
563 else 772 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; 773 newlen = 0;
839 break;
840 } 774 }
841 775 break;
842 if (newlen)
843 len = strlen (kbuf);
844 } 776 }
777
778 if (newlen)
779 len = strlen (kbuf);
845 780
846 /* 781 /*
847 * Pass meta for all function keys, if 'meta' option set 782 * Pass meta for all function keys, if 'meta' option set
848 */ 783 */
849#ifdef META8_OPTION 784#ifdef META8_OPTION
1034void 969void
1035rxvt_term::flush () 970rxvt_term::flush ()
1036{ 971{
1037 flush_ev.stop (); 972 flush_ev.stop ();
1038 973
1039#ifdef ENABLE_TRANSPARENCY 974#ifdef HAVE_BG_PIXMAP
1040 if (want_full_refresh) 975 if (bgPixmap.check_clearChanged ())
1041 { 976 {
1042 want_full_refresh = 0; 977// scr_clear (true); This needs to be researched further!
1043 scr_clear ();
1044 scr_touch (false); 978 scr_touch (false);
1045 } 979 }
1046#endif 980#endif
1047 981
1048 if (want_refresh) 982 if (want_refresh)
1084 } 1018 }
1085 while (row < end_row); 1019 while (row < end_row);
1086 } 1020 }
1087 1021
1088 scr_refresh (); 1022 scr_refresh ();
1089 scrollbar_show (1); 1023 scrollBar.show (1);
1090#ifdef USE_XIM 1024#ifdef USE_XIM
1091 IMSendSpot (); 1025 IMSendSpot ();
1092#endif 1026#endif
1093 } 1027 }
1094 1028
1095 display->flush (); 1029 display->flush ();
1096} 1030}
1097 1031
1032/* checks wether a refresh is requested and starts the refresh timer */
1098void 1033void
1099rxvt_term::check_cb (check_watcher &w) 1034rxvt_term::refresh_check ()
1100{ 1035{
1101 make_current (); 1036 if (want_refresh && !flush_ev.is_active ())
1037 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102 1038
1103 display->flush (); 1039 display->flush ();
1104
1105 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107} 1040}
1108 1041
1109void 1042void
1110rxvt_term::flush_cb (time_watcher &w) 1043rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1044{
1112 make_current (); 1045 make_current ();
1113 1046
1114 refresh_count = 0; 1047 refresh_count = 0;
1115 flush (); 1048 flush ();
1116} 1049}
1117 1050
1118#ifdef CURSOR_BLINK 1051#ifdef CURSOR_BLINK
1119void 1052void
1120rxvt_term::cursor_blink_cb (time_watcher &w) 1053rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121{ 1054{
1122 hidden_cursor = !hidden_cursor; 1055 hidden_cursor = !hidden_cursor;
1123 want_refresh = 1; 1056 want_refresh = 1;
1124 1057 refresh_check ();
1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1126} 1058}
1127#endif 1059#endif
1128 1060
1129#ifdef TEXT_BLINK 1061#ifdef TEXT_BLINK
1130void 1062void
1131rxvt_term::text_blink_cb (time_watcher &w) 1063rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132{ 1064{
1133 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1065 if (scr_refresh_rend (RS_Blink, RS_Blink))
1134 { 1066 {
1135 hidden_text = !hidden_text; 1067 hidden_text = !hidden_text;
1136 want_refresh = 1; 1068 want_refresh = 1;
1137 w.start (w.at + TEXT_BLINK_INTERVAL); 1069 refresh_check ();
1138 } 1070 }
1071 else
1072 w.stop ();
1139} 1073}
1140#endif 1074#endif
1141 1075
1142#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1076#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143void 1077void
1144rxvt_term::cont_scroll_cb (time_watcher &w) 1078rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145{ 1079{
1146 if ((scrollbar_isUp() || scrollbar_isDn()) && 1080 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1147 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1081 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1148 { 1082 {
1149 want_refresh = 1; 1083 want_refresh = 1;
1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1084 refresh_check ();
1151 } 1085 }
1086 else
1087 w.stop ();
1152} 1088}
1153#endif 1089#endif
1154 1090
1155#ifdef SELECTION_SCROLLING 1091#ifdef SELECTION_SCROLLING
1156void 1092void
1157rxvt_term::sel_scroll_cb (time_watcher &w) 1093rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158{ 1094{
1159 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1095 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160 { 1096 {
1161 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1097 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162 want_refresh = 1; 1098 want_refresh = 1;
1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1099 refresh_check ();
1164 } 1100 }
1101 else
1102 w.stop ();
1165} 1103}
1166#endif 1104#endif
1167 1105
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1106#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169void 1107void
1170rxvt_term::slip_wheel_cb (time_watcher &w) 1108rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171{ 1109{
1172 if (mouse_slip_wheel_speed == 0 1110 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 { 1111 {
1176 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0;
1178
1179 want_refresh = 1; 1112 want_refresh = 1;
1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 refresh_check ();
1114 }
1115
1116 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1117 {
1118 mouse_slip_wheel_speed = 0;
1119 w.stop ();
1181 } 1120 }
1182} 1121}
1183#endif 1122#endif
1184 1123
1185#if LINUX_YIELD_HACK 1124#if LINUX_YIELD_HACK
1186static struct event_handler 1125static struct event_handler
1187{ 1126{
1188 check_watcher yield_ev; 1127 ev::prepare yield_ev;
1189 1128
1190 void yield_cb (check_watcher &w) 1129 void yield_cb (ev::prepare &w, int revents)
1191 { 1130 {
1192 // this should really be sched_yield(), but the linux guys thought 1131 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than 1132 // 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 1133 // ones with high nice levels is a useful thing to do. It surely is is
1195 // allowed by the sus... as is returning ENOSYS. 1134 // allowed by the sus... as is returning ENOSYS.
1135 // since the linux guys additionally thought that breaking the only
1136 // known workaroudn against their unusable sched_yield hack is cool,
1137 // we just nanosleep a bit and hope for the best.
1196 1138
1197 struct timespec ts = { 0, 0 }; 1139 struct timespec ts = { 0, 1000 };
1198 nanosleep (&ts, 0); 1140 nanosleep (&ts, 0);
1199 1141
1200 w.stop (); 1142 w.stop ();
1201 } 1143 }
1202 1144
1246 1188
1247 return false; 1189 return false;
1248} 1190}
1249 1191
1250void 1192void
1251rxvt_term::pty_cb (io_watcher &w, short revents) 1193rxvt_term::pty_cb (ev::io &w, int revents)
1252{ 1194{
1253 make_current (); 1195 make_current ();
1254 1196
1255 if (revents & EVENT_READ) 1197 if (revents & ev::READ)
1256 // loop, but don't allow a single term to monopolize us 1198 // loop, but don't allow a single term to monopolize us
1257 while (pty_fill ()) 1199 for (int i = CBUFCNT; i-- && pty_fill (); )
1258 if (cmd_parse ()) 1200 cmd_parse ();
1259 break;
1260 1201
1261 if (revents & EVENT_WRITE) 1202 if (revents & ev::WRITE)
1262 pty_write (); 1203 pty_write ();
1204
1205 refresh_check ();
1263} 1206}
1264 1207
1265void 1208void
1266rxvt_term::pointer_unblank () 1209rxvt_term::pointer_unblank ()
1267{ 1210{
1270 1213
1271#ifdef POINTER_BLANK 1214#ifdef POINTER_BLANK
1272 hidden_pointer = 0; 1215 hidden_pointer = 0;
1273 1216
1274 if (option (Opt_pointerBlank)) 1217 if (option (Opt_pointerBlank))
1275 pointer_ev.start (NOW + pointerBlankDelay); 1218 pointer_ev.start (pointerBlankDelay);
1276#endif 1219#endif
1277} 1220}
1278 1221
1279#ifdef POINTER_BLANK 1222#ifdef POINTER_BLANK
1280void 1223void
1288 1231
1289 hidden_pointer = 1; 1232 hidden_pointer = 1;
1290} 1233}
1291 1234
1292void 1235void
1293rxvt_term::pointer_cb (time_watcher &w) 1236rxvt_term::pointer_cb (ev::timer &w, int revents)
1294{ 1237{
1295 make_current (); 1238 make_current ();
1296 1239
1297 pointer_blank (); 1240 pointer_blank ();
1298} 1241}
1301void 1244void
1302rxvt_term::mouse_report (XButtonEvent &ev) 1245rxvt_term::mouse_report (XButtonEvent &ev)
1303{ 1246{
1304 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
1305 int x, y; 1248 int x, y;
1249 int code = 32;
1306 1250
1307 x = ev.x; 1251 x = Pixel2Col (ev.x);
1308 y = ev.y; 1252 y = Pixel2Row (ev.y);
1309 pixel_position (&x, &y); 1253 if (ev.type == MotionNotify)
1254 {
1255 if (x == mouse_row && y == mouse_col)
1256 return;
1257 mouse_row = x;
1258 mouse_col = y;
1259 code += 32;
1260 }
1310 1261
1311 if (MEvent.button == AnyButton) 1262 if (MEvent.button == AnyButton)
1312 button_number = 3; 1263 button_number = 3;
1313 else 1264 else
1314 { 1265 {
1360 x + 1, 1311 x + 1,
1361 y + 1); 1312 y + 1);
1362#endif 1313#endif
1363 1314
1364 tt_printf ("\033[M%c%c%c", 1315 tt_printf ("\033[M%c%c%c",
1365 (32 + button_number + key_state), 1316 (code + button_number + key_state),
1366 (32 + x + 1), 1317 (32 + x + 1),
1367 (32 + y + 1)); 1318 (32 + y + 1));
1368} 1319}
1369 1320
1370/*{{{ process an X event */ 1321/*{{{ process an X event */
1474 && ev.xfocus.mode != NotifyGrab) 1425 && ev.xfocus.mode != NotifyGrab)
1475 focus_out (); 1426 focus_out ();
1476 break; 1427 break;
1477 1428
1478 case ConfigureNotify: 1429 case ConfigureNotify:
1430 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1431 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1432 szHint.width, szHint.height);*/
1479 if (ev.xconfigure.window == parent[0]) 1433 if (ev.xconfigure.window == parent[0])
1480 { 1434 {
1481 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1435 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1482 ; 1436 ;
1483 1437
1486 seen_resize = 1; 1440 seen_resize = 1;
1487 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1441 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1488 } 1442 }
1489 else 1443 else
1490 { 1444 {
1491#ifdef ENABLE_TRANSPARENCY 1445#ifdef HAVE_BG_PIXMAP
1492 if (option (Opt_transparent)) 1446 if (bgPixmap.window_position_sensitive ())
1447 {
1493 if (bgPixmap.render ()) 1448 if (mapped)
1494 scr_touch (false); 1449 update_background ();
1450 else
1451 bgPixmap.invalidate ();
1452 }
1495#endif 1453#endif
1496 } 1454 }
1455
1497 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1456 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1498 } 1457 }
1499 break; 1458 break;
1500 1459
1501 case PropertyNotify: 1460 case PropertyNotify:
1505 selection_property (ev.xproperty.window, ev.xproperty.atom); 1464 selection_property (ev.xproperty.window, ev.xproperty.atom);
1506 1465
1507 break; 1466 break;
1508 1467
1509 case SelectionClear: 1468 case SelectionClear:
1510 selection_clear (); 1469 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1511 break; 1470 break;
1512 1471
1513 case SelectionNotify: 1472 case SelectionNotify:
1514 if (selection_wait == Sel_normal) 1473 if (selection_wait == Sel_normal)
1515 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1474 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1518 case SelectionRequest: 1477 case SelectionRequest:
1519 selection_send (ev.xselectionrequest); 1478 selection_send (ev.xselectionrequest);
1520 break; 1479 break;
1521 1480
1522 case MapNotify: 1481 case MapNotify:
1482#ifdef HAVE_BG_PIXMAP
1483 /* This is needed spcifically to fix the case of no window manager or a
1484 * non-reparenting window manager. In those cases we never get first
1485 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1486 * care of multiplicity of ConfigureNotify events arriwing while WM does
1487 * reparenting.
1488 * We should not render background immidiately, as there could be several
1489 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1490 * by scheduling background redraw as soon as we can, but giving a short
1491 * bit of time for ConfigureNotifies to arrive.
1492 * We should render background PRIOR to drawing any text, but AFTER all
1493 * of ConfigureNotifys for the best results.
1494 */
1495 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1496 update_background_ev.start (0.025);
1497#endif
1523 mapped = 1; 1498 mapped = 1;
1524#ifdef TEXT_BLINK 1499#ifdef TEXT_BLINK
1525 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1500 text_blink_ev.start ();
1526#endif 1501#endif
1527 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1502 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1528 break; 1503 break;
1529 1504
1530 case UnmapNotify: 1505 case UnmapNotify:
1532#ifdef TEXT_BLINK 1507#ifdef TEXT_BLINK
1533 text_blink_ev.stop (); 1508 text_blink_ev.stop ();
1534#endif 1509#endif
1535 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1510 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1536 break; 1511 break;
1537
1538#ifdef ENABLE_TRANSPARENCY
1539 case ReparentNotify:
1540 rootwin_cb (ev);
1541 break;
1542#endif /* ENABLE_TRANSPARENCY */
1543 1512
1544 case GraphicsExpose: 1513 case GraphicsExpose:
1545 case Expose: 1514 case Expose:
1546 if (ev.xany.window == vt) 1515 if (ev.xany.window == vt)
1547 { 1516 {
1548 do 1517 do
1518 {
1549 scr_expose (ev.xexpose.x, ev.xexpose.y, 1519 scr_expose (ev.xexpose.x, ev.xexpose.y,
1550 ev.xexpose.width, ev.xexpose.height, False); 1520 ev.xexpose.width, ev.xexpose.height, False);
1521 }
1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1522 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1552 1523
1553 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1524 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1554 1525
1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1526 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1527 {
1556 scr_expose (ev.xexpose.x, ev.xexpose.y, 1528 scr_expose (ev.xexpose.x, ev.xexpose.y,
1557 ev.xexpose.width, ev.xexpose.height, False); 1529 ev.xexpose.width, ev.xexpose.height, False);
1530 }
1558 1531
1559 want_refresh = 1; 1532 want_refresh = 1;
1560 } 1533 }
1561 else 1534 else
1562 { 1535 {
1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1538 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1566 ; 1539 ;
1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1540 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1568 ; 1541 ;
1569 1542
1570 if (isScrollbarWindow (ev.xany.window)) 1543 if (scrollBar.state && ev.xany.window == scrollBar.win)
1571 { 1544 {
1572 scrollBar.setIdle (); 1545 scrollBar.state = STATE_IDLE;
1573 scrollbar_show (0); 1546 scrollBar.show (0);
1574 } 1547 }
1575 } 1548 }
1576 break; 1549 break;
1577 1550
1578 case MotionNotify: 1551 case MotionNotify:
1579#ifdef POINTER_BLANK 1552#ifdef POINTER_BLANK
1580 if (hidden_pointer) 1553 if (hidden_pointer)
1581 pointer_unblank (); 1554 pointer_unblank ();
1582#endif 1555#endif
1556 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1557 || priv_modes & PrivMode_MouseAnyEvent)
1558 mouse_report (ev.xbutton);
1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1559 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1584 break; 1560 break;
1585 1561
1586 if (ev.xany.window == vt) 1562 if (ev.xany.window == vt)
1587 { 1563 {
1621 int dist; 1597 int dist;
1622 1598
1623 /* don't clobber the current delay if we are 1599 /* don't clobber the current delay if we are
1624 * already in the middle of scrolling. 1600 * already in the middle of scrolling.
1625 */ 1601 */
1626 if (!sel_scroll_ev.active) 1602 if (!sel_scroll_ev.is_active ())
1627 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1603 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1628 1604
1629 /* save the event params so we can highlight 1605 /* save the event params so we can highlight
1630 * the selection in the pending-scroll loop 1606 * the selection in the pending-scroll loop
1631 */ 1607 */
1632 selection_save_x = ev.xbutton.x; 1608 selection_save_x = ev.xbutton.x;
1654 else 1630 else
1655 { 1631 {
1656 /* we are within the text window, so we 1632 /* we are within the text window, so we
1657 * shouldn't be scrolling 1633 * shouldn't be scrolling
1658 */ 1634 */
1659 if (sel_scroll_ev.active)
1660 sel_scroll_ev.stop(); 1635 sel_scroll_ev.stop();
1661 } 1636 }
1662#endif 1637#endif
1663#ifdef MOUSE_THRESHOLD 1638#ifdef MOUSE_THRESHOLD
1664 } 1639 }
1665#endif 1640#endif
1666 } 1641 }
1667 } 1642 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1643 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1669 { 1644 {
1670 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1645 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1646 MotionNotify, &ev))
1672 ; 1647 ;
1673 1648
1675 &unused_root, &unused_child, 1650 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1651 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1652 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1653 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1654 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1680 scrollbar_size ()); 1655 scrollBar.size ());
1681 want_refresh = 1; 1656 want_refresh = 1;
1682 scrollbar_show (1); 1657 scrollBar.show (1);
1683 } 1658 }
1684 break; 1659 break;
1685 } 1660 }
1686 1661
1687#if defined(CURSOR_BLINK) 1662#if defined(CURSOR_BLINK)
1691 { 1666 {
1692 hidden_cursor = 0; 1667 hidden_cursor = 0;
1693 want_refresh = 1; 1668 want_refresh = 1;
1694 } 1669 }
1695 1670
1696 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1671 cursor_blink_ev.again ();
1697 } 1672 }
1698#endif 1673#endif
1699 1674
1700#if defined(POINTER_BLANK) 1675#if defined(POINTER_BLANK)
1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1676 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1708 1683
1709 if (ev.type == KeyPress && hidden_pointer == 0) 1684 if (ev.type == KeyPress && hidden_pointer == 0)
1710 pointer_blank (); 1685 pointer_blank ();
1711 } 1686 }
1712#endif 1687#endif
1688
1689 refresh_check ();
1713} 1690}
1691
1692#if ENABLE_FRILLS
1693void
1694rxvt_term::set_urgency (bool enable)
1695{
1696 if (enable == urgency_hint)
1697 return;
1698
1699 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1700 {
1701 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1702 XSetWMHints (dpy, parent[0], h);
1703 urgency_hint = enable;
1704 }
1705}
1706#endif
1714 1707
1715void 1708void
1716rxvt_term::focus_in () 1709rxvt_term::focus_in ()
1717{ 1710{
1718 if (!focus) 1711 if (!focus)
1719 { 1712 {
1720 focus = 1; 1713 focus = 1;
1721 want_refresh = 1; 1714 want_refresh = 1;
1722 1715
1723 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1724
1725#if USE_XIM 1716#if USE_XIM
1726 if (Input_Context != NULL) 1717 if (Input_Context != NULL)
1727 { 1718 {
1728 IMSetPosition (); 1719 IMSetPosition ();
1729 XSetICFocus (Input_Context); 1720 XSetICFocus (Input_Context);
1730 } 1721 }
1731#endif 1722#endif
1732#if CURSOR_BLINK 1723#if CURSOR_BLINK
1733 if (option (Opt_cursorBlink)) 1724 if (option (Opt_cursorBlink))
1734 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1725 cursor_blink_ev.again ();
1735#endif 1726#endif
1736#if OFF_FOCUS_FADING 1727#if OFF_FOCUS_FADING
1737 if (rs[Rs_fade]) 1728 if (rs[Rs_fade])
1738 { 1729 {
1739 pix_colors = pix_colors_focused; 1730 pix_colors = pix_colors_focused;
1740 scr_recolour (); 1731 scr_recolour ();
1741 } 1732 }
1742#endif 1733#endif
1743#if ENABLE_FRILLS 1734#if ENABLE_FRILLS
1744 if (option (Opt_urgentOnBell)) 1735 if (option (Opt_urgentOnBell))
1745 { 1736 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 1737#endif
1738
1739 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1756 } 1740 }
1757} 1741}
1758 1742
1759void 1743void
1760rxvt_term::focus_out () 1744rxvt_term::focus_out ()
1762 if (focus) 1746 if (focus)
1763 { 1747 {
1764 focus = 0; 1748 focus = 0;
1765 want_refresh = 1; 1749 want_refresh = 1;
1766 1750
1767 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1751#if ENABLE_FRILLS
1768 1752 if (option (Opt_urgentOnBell))
1753 set_urgency (0);
1754#endif
1769#if ENABLE_FRILLS || ISO_14755 1755#if ENABLE_FRILLS || ISO_14755
1770 if (iso14755buf) 1756 if (iso14755buf)
1771 { 1757 {
1772 iso14755buf = 0; 1758 iso14755buf = 0;
1773# if ISO_14755 1759# if ISO_14755
1780 XUnsetICFocus (Input_Context); 1766 XUnsetICFocus (Input_Context);
1781#endif 1767#endif
1782#if CURSOR_BLINK 1768#if CURSOR_BLINK
1783 if (option (Opt_cursorBlink)) 1769 if (option (Opt_cursorBlink))
1784 cursor_blink_ev.stop (); 1770 cursor_blink_ev.stop ();
1771
1785 hidden_cursor = 0; 1772 hidden_cursor = 0;
1786#endif 1773#endif
1787#if OFF_FOCUS_FADING 1774#if OFF_FOCUS_FADING
1788 if (rs[Rs_fade]) 1775 if (rs[Rs_fade])
1789 { 1776 {
1790 pix_colors = pix_colors_unfocused; 1777 pix_colors = pix_colors_unfocused;
1791 scr_recolour (); 1778 scr_recolour ();
1792 } 1779 }
1793#endif 1780#endif
1781
1782 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1794 } 1783 }
1795} 1784}
1796 1785
1797void 1786void
1798rxvt_term::update_fade_color (unsigned int idx) 1787rxvt_term::update_fade_color (unsigned int idx)
1827 */ 1816 */
1828 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1817 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1829 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1818 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1830 { 1819 {
1831 bgPixmap.set_root_pixmap (); 1820 bgPixmap.set_root_pixmap ();
1832 bgPixmap.render (); 1821 update_background ();
1833 } 1822 }
1823
1834 break; 1824 break;
1835 } 1825 }
1836# endif 1826# endif
1827
1828 refresh_check ();
1837} 1829}
1838#endif 1830#endif
1839 1831
1840void 1832void
1841rxvt_term::button_press (XButtonEvent &ev) 1833rxvt_term::button_press (XButtonEvent &ev)
1896 mouse_report (ev); 1888 mouse_report (ev);
1897 } 1889 }
1898#else 1890#else
1899 MEvent.button = ev.button; 1891 MEvent.button = ev.button;
1900 mouse_report (ev); 1892 mouse_report (ev);
1901#endif /* MOUSE_REPORT_DOUBLECLICK */ 1893#endif /* MOUSE_REPORT_DOUBLECLICK */
1902 1894
1903 } 1895 }
1904 else 1896 else
1905 { 1897 {
1906 if (ev.button != MEvent.button) 1898 if (ev.button != MEvent.button)
1954 } 1946 }
1955 1947
1956 /* 1948 /*
1957 * Scrollbar window processing of button press 1949 * Scrollbar window processing of button press
1958 */ 1950 */
1959 if (isScrollbarWindow (ev.window)) 1951 if (scrollBar.state && ev.window == scrollBar.win)
1960 { 1952 {
1961 scrollBar.setIdle (); 1953 page_dirn direction = NO_DIR;
1954
1955 if (scrollBar.upButton (ev.y))
1956 direction = UP; /* up */
1957 else if (scrollBar.dnButton (ev.y))
1958 direction = DN; /* down */
1959
1960 scrollBar.state = STATE_IDLE;
1962 /* 1961 /*
1963 * Rxvt-style scrollbar: 1962 * Rxvt-style scrollbar:
1964 * move up if mouse is above slider 1963 * move up if mouse is above slider
1965 * move dn if mouse is below slider 1964 * move dn if mouse is below slider
1966 * 1965 *
1975 /* 1974 /*
1976 * Mouse report disabled scrollbar: 1975 * Mouse report disabled scrollbar:
1977 * arrow buttons - send up/down 1976 * arrow buttons - send up/down
1978 * click on scrollbar - send pageup/down 1977 * click on scrollbar - send pageup/down
1979 */ 1978 */
1980 if ((scrollBar.style == R_SB_NEXT 1979 if (direction == UP)
1981 && scrollbarnext_upButton (ev.y))
1982 || (scrollBar.style == R_SB_RXVT
1983 && scrollbarrxvt_upButton (ev.y)))
1984 tt_printf ("\033[A"); 1980 tt_printf ("\033[A");
1985 else if ((scrollBar.style == R_SB_NEXT 1981 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"); 1982 tt_printf ("\033[B");
1990 else 1983 else
1991 switch (ev.button) 1984 switch (ev.button)
1992 { 1985 {
1993 case Button2: 1986 case Button2:
2000 tt_printf ("\033[5~"); 1993 tt_printf ("\033[5~");
2001 break; 1994 break;
2002 } 1995 }
2003 } 1996 }
2004 else 1997 else
2005#endif /* NO_SCROLLBAR_REPORT */ 1998#endif /* NO_SCROLLBAR_REPORT */
2006
2007 {
2008 char upordown = 0;
2009
2010 if (scrollBar.style == R_SB_NEXT)
2011 { 1999 {
2012 if (scrollbarnext_upButton (ev.y)) 2000 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 { 2001 {
2026#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2002#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2003 if (!cont_scroll_ev.is_active ())
2027 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2004 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2028#endif 2005#endif
2029 if (scr_page (upordown < 0 ? UP : DN, 1)) 2006 if (scr_page (direction, 1))
2030 { 2007 {
2031 if (upordown < 0) 2008 if (direction == UP)
2032 scrollBar.setUp (); 2009 scrollBar.state = STATE_UP;
2033 else 2010 else
2034 scrollBar.setDn (); 2011 scrollBar.state = STATE_DOWN;
2035 } 2012 }
2036 } 2013 }
2037 else 2014 else
2038 switch (ev.button) 2015 switch (ev.button)
2039 { 2016 {
2040 case Button2: 2017 case Button2:
2041 switch (scrollbar_align) 2018 switch (scrollBar.align)
2042 { 2019 {
2043 case R_SB_ALIGN_TOP: 2020 case R_SB_ALIGN_TOP:
2044 csrO = 0; 2021 csrO = 0;
2045 break; 2022 break;
2046 case R_SB_ALIGN_CENTRE: 2023 case R_SB_ALIGN_CENTRE:
2052 } 2029 }
2053 2030
2054 if (scrollBar.style == R_SB_XTERM 2031 if (scrollBar.style == R_SB_XTERM
2055 || scrollbar_above_slider (ev.y) 2032 || scrollbar_above_slider (ev.y)
2056 || scrollbar_below_slider (ev.y)) 2033 || scrollbar_below_slider (ev.y))
2057 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2034 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2058 2035
2059 scrollBar.setMotion (); 2036 scrollBar.state = STATE_MOTION;
2060 break; 2037 break;
2061 2038
2062 case Button1: 2039 case Button1:
2063 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2040 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2064 csrO = ev.y - scrollBar.top; 2041 csrO = ev.y - scrollBar.top;
2065 /* FALLTHROUGH */ 2042 /* FALLTHROUGH */
2066 2043
2067 case Button3: 2044 case Button3:
2068 if (scrollBar.style != R_SB_XTERM) 2045 if (scrollBar.style != R_SB_XTERM)
2078 scr_page (DN, nrow - 1); 2055 scr_page (DN, nrow - 1);
2079# else 2056# else
2080 scr_page (DN, nrow / 4); 2057 scr_page (DN, nrow / 4);
2081# endif 2058# endif
2082 else 2059 else
2083 scrollBar.setMotion (); 2060 scrollBar.state = STATE_MOTION;
2084 } 2061 }
2085 else 2062 else
2086 { 2063 {
2087 scr_page ((ev.button == Button1 ? DN : UP), 2064 scr_page ((ev.button == Button1 ? DN : UP),
2088 (nrow 2065 (nrow
2089 * scrollbar_position (ev.y) 2066 * scrollbar_position (ev.y)
2090 / scrollbar_size ())); 2067 / scrollBar.size ()));
2091 } 2068 }
2092 2069
2093 break; 2070 break;
2094 } 2071 }
2095 } 2072 }
2105 2082
2106 csrO = 0; /* reset csr Offset */ 2083 csrO = 0; /* reset csr Offset */
2107 if (!bypass_keystate) 2084 if (!bypass_keystate)
2108 reportmode = !! (priv_modes & PrivMode_mouse_report); 2085 reportmode = !! (priv_modes & PrivMode_mouse_report);
2109 2086
2110 if (scrollbar_isUpDn ()) 2087 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2111 { 2088 {
2112 scrollBar.setIdle (); 2089 scrollBar.state = STATE_IDLE;
2113 scrollbar_show (0); 2090 scrollBar.show (0);
2114 } 2091 }
2115 2092
2116#ifdef SELECTION_SCROLLING 2093#ifdef SELECTION_SCROLLING
2117 if (sel_scroll_ev.active)
2118 sel_scroll_ev.stop(); 2094 sel_scroll_ev.stop();
2119#endif 2095#endif
2120 2096
2121 if (ev.window == vt) 2097 if (ev.window == vt)
2122 { 2098 {
2123 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2099 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2147 mouse_report (ev); 2123 mouse_report (ev);
2148 } 2124 }
2149#else /* MOUSE_REPORT_DOUBLECLICK */ 2125#else /* MOUSE_REPORT_DOUBLECLICK */
2150 MEvent.button = AnyButton; 2126 MEvent.button = AnyButton;
2151 mouse_report (ev); 2127 mouse_report (ev);
2152#endif /* MOUSE_REPORT_DOUBLECLICK */ 2128#endif /* MOUSE_REPORT_DOUBLECLICK */
2153 return; 2129 return;
2154 } 2130 }
2155 2131
2156 /* 2132 /*
2157 * dumb hack to compensate for the failure of click-and-drag 2133 * dumb hack to compensate for the failure of click-and-drag
2195 { 2171 {
2196 mouse_slip_wheel_speed += v ? -1 : 1; 2172 mouse_slip_wheel_speed += v ? -1 : 1;
2197 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2173 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2198 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2174 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2199 2175
2200 if (slip_wheel_ev.at < NOW) 2176 if (!slip_wheel_ev.is_active ())
2201 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2177 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2202
2203 slip_wheel_ev.start ();
2204 } 2178 }
2205 else 2179 else
2180# endif
2206 { 2181 {
2207# endif
2208 scr_page (v, i); 2182 scr_page (v, i);
2209 scrollbar_show (1); 2183 scrollBar.show (1);
2210# ifdef MOUSE_SLIP_WHEELING
2211 } 2184 }
2212# endif
2213 } 2185 }
2214 break; 2186 break;
2215#endif 2187#endif
2216 } 2188 }
2217 } 2189 }
2218} 2190}
2219 2191
2220/*}}} */ 2192/*}}} */
2221 2193
2222bool 2194void
2223rxvt_term::cmd_parse () 2195rxvt_term::cmd_parse ()
2224{ 2196{
2225 bool flag = false;
2226 wchar_t ch = NOCHAR; 2197 wchar_t ch = NOCHAR;
2227 char *seq_begin; // remember start of esc-sequence here 2198 char *seq_begin; // remember start of esc-sequence here
2228 2199
2229 for (;;) 2200 for (;;)
2230 { 2201 {
2231 if (ch == NOCHAR) 2202 if (expect_false (ch == NOCHAR))
2232 { 2203 {
2233 seq_begin = cmdbuf_ptr; 2204 seq_begin = cmdbuf_ptr;
2234 ch = next_char (); 2205 ch = next_char ();
2235 2206
2236 if (ch == NOCHAR) 2207 if (ch == NOCHAR)
2237 break; 2208 break;
2238 } 2209 }
2239 2210
2240 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2211 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2241 { 2212 {
2242 if (!seen_input) 2213 if (expect_false (!seen_input))
2243 { 2214 {
2244 seen_input = 1; 2215 seen_input = 1;
2245 // many badly-written programs (e.g. jed) contain a race condition: 2216 // many badly-written programs (e.g. jed) contain a race condition:
2246 // they first read the screensize and then install a SIGWINCH handler. 2217 // they first read the screensize and then install a SIGWINCH handler.
2247 // some window managers resize the window early, and these programs 2218 // some window managers resize the window early, and these programs
2260 wchar_t *str = buf; 2231 wchar_t *str = buf;
2261 wchar_t *eol = str + min (ncol, UBUFSIZ); 2232 wchar_t *eol = str + min (ncol, UBUFSIZ);
2262 2233
2263 for (;;) 2234 for (;;)
2264 { 2235 {
2265 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2236 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2266 break; 2237 break;
2267 2238
2268 *str++ = ch; 2239 *str++ = ch;
2269 2240
2270 if (ch == C0_LF || str >= eol) 2241 if (expect_false (ch == C0_LF || str >= eol))
2271 { 2242 {
2272 if (ch == C0_LF) 2243 if (ch == C0_LF)
2273 nlines++; 2244 nlines++;
2274 2245
2275 refresh_count++; 2246 refresh_count++;
2276 2247
2277 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2248 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2278 { 2249 {
2279 refresh_count = 0; 2250 refresh_count = 0;
2280 2251
2281 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2252 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2282 { 2253 {
2283 refreshnow = true; 2254 refreshnow = true;
2284 ch = NOCHAR; 2255 ch = NOCHAR;
2285 break; 2256 break;
2286 } 2257 }
2324 * What the heck we'll cheat and only refresh less than every page-full. 2295 * What the heck we'll cheat and only refresh less than every page-full.
2325 * if skipScroll is enabled. 2296 * if skipScroll is enabled.
2326 */ 2297 */
2327 if (refreshnow) 2298 if (refreshnow)
2328 { 2299 {
2329 flag = true;
2330 scr_refresh (); 2300 scr_refresh ();
2331 want_refresh = 1; 2301 want_refresh = 1;
2332 } 2302 }
2333
2334 } 2303 }
2335 else 2304 else
2336 { 2305 {
2337 try 2306 try
2338 { 2307 {
2346 } 2315 }
2347 2316
2348 ch = NOCHAR; 2317 ch = NOCHAR;
2349 } 2318 }
2350 } 2319 }
2351
2352 return flag;
2353} 2320}
2354 2321
2355// read the next character 2322// read the next character
2356wchar_t 2323wchar_t
2357rxvt_term::next_char () NOTHROW 2324rxvt_term::next_char () NOTHROW
2358{ 2325{
2359 while (cmdbuf_ptr < cmdbuf_endp) 2326 while (cmdbuf_ptr < cmdbuf_endp)
2360 { 2327 {
2361 // assume 7-bit to be ascii ALWAYS 2328 // assume 7-bit to be ascii ALWAYS
2362 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2329 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2363 return *cmdbuf_ptr++; 2330 return *cmdbuf_ptr++;
2364 2331
2365 wchar_t wc; 2332 wchar_t wc;
2366 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2333 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2367 2334
2371 cmdbuf_ptr = cmdbuf_endp; 2338 cmdbuf_ptr = cmdbuf_endp;
2372 break; 2339 break;
2373 } 2340 }
2374 2341
2375 if (len == (size_t)-1) 2342 if (len == (size_t)-1)
2343 {
2344 mbstate.reset (); // reset now undefined conversion state
2376 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2345 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2346 }
2377 2347
2378 // assume wchar == unicode 2348 // assume wchar == unicode
2379 cmdbuf_ptr += len; 2349 cmdbuf_ptr += len;
2380 return wc & UNICODE_MASK; 2350 return wc & UNICODE_MASK;
2381 } 2351 }
2425/*----------------------------------------------------------------------*/ 2395/*----------------------------------------------------------------------*/
2426#ifdef PRINTPIPE 2396#ifdef PRINTPIPE
2427FILE * 2397FILE *
2428rxvt_term::popen_printer () 2398rxvt_term::popen_printer ()
2429{ 2399{
2430 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2400 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2431 2401
2432 if (stream == NULL) 2402 if (stream == NULL)
2433 rxvt_warn ("can't open printer pipe, not printing.\n"); 2403 rxvt_warn ("can't open printer pipe, not printing.\n");
2434 2404
2435 return stream; 2405 return stream;
2446 * simulate attached vt100 printer 2416 * simulate attached vt100 printer
2447 */ 2417 */
2448void 2418void
2449rxvt_term::process_print_pipe () 2419rxvt_term::process_print_pipe ()
2450{ 2420{
2451 int done; 2421 FILE *fd = popen_printer ();
2452 FILE *fd;
2453 2422
2454 if ((fd = popen_printer ()) == NULL) 2423 if (!fd)
2455 return; 2424 return;
2456 2425
2457 /* 2426 /*
2458 * Send all input to the printer until either ESC[4i or ESC[?4i 2427 * Send all input to the printer until either ESC[4i or ESC[?4i
2459 * is received. 2428 * is received.
2460 */ 2429 */
2461 for (done = 0; !done;) 2430 for (int done = 0; !done; )
2462 { 2431 {
2463 unsigned char buf[8]; 2432 unsigned char buf[8];
2464 unicode_t ch; 2433 unicode_t ch;
2465 unsigned int i, len; 2434 unsigned int i, len;
2466 2435
2497 } 2466 }
2498 } 2467 }
2499 2468
2500 pclose_printer (fd); 2469 pclose_printer (fd);
2501} 2470}
2502#endif /* PRINTPIPE */ 2471#endif /* PRINTPIPE */
2503/*}}} */ 2472/*}}} */
2504 2473
2505/* *INDENT-OFF* */ 2474/* *INDENT-OFF* */
2506enum { 2475enum {
2507 C1_40 = 0x40, 2476 C1_40 = 0x40,
2611 break; 2580 break;
2612 case 'Z': /* identify the terminal type */ 2581 case 'Z': /* identify the terminal type */
2613 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2582 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2614 break; 2583 break;
2615 case '<': /* turn off VT52 mode */ 2584 case '<': /* turn off VT52 mode */
2616 PrivMode (0, PrivMode_vt52); 2585 set_privmode (PrivMode_vt52, 0);
2617 break; 2586 break;
2618 case 'F': /* use special graphics character set */ 2587 case 'F': /* use special graphics character set */
2619 case 'G': /* use regular character set */ 2588 case 'G': /* use regular character set */
2620 /* unimplemented */ 2589 /* unimplemented */
2621 break; 2590 break;
2675 scr_forwardindex (); 2644 scr_forwardindex ();
2676 break; 2645 break;
2677#endif 2646#endif
2678 case '=': 2647 case '=':
2679 case '>': 2648 case '>':
2680 PrivMode ((ch == '='), PrivMode_aplKP); 2649 set_privmode (PrivMode_aplKP, ch == '=');
2681 break; 2650 break;
2682 2651
2683 case C1_40: 2652 case C1_40:
2684 cmd_getc (); 2653 cmd_getc ();
2685 break; 2654 break;
2724 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2693 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2725 case C1_SCI: /* ESC Z */ 2694 case C1_SCI: /* ESC Z */
2726 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2695 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2727 break; /* steal obsolete ESC [ c */ 2696 break; /* steal obsolete ESC [ c */
2728 2697
2729 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2698 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2730 case C1_CSI: /* ESC [ */ 2699 case C1_CSI: /* ESC [ */
2731 process_csi_seq (); 2700 process_csi_seq ();
2732 break; 2701 break;
2733 2702
2734 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2703 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2735 case C1_OSC: /* ESC ] */ 2704 case C1_OSC: /* ESC ] */
2736 process_osc_seq (); 2705 process_osc_seq ();
2737 break; 2706 break;
2738 2707
2739 /* 8.3.106: RESET TO INITIAL STATE */ 2708 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2740 case 'c': 2709 case 'c':
2741 mbstate.reset (); 2710 mbstate.reset ();
2742 scr_poweron (); 2711 scr_poweron ();
2743 scrollbar_show (1); 2712 scrollBar.show (1);
2744 break; 2713 break;
2745 2714
2746 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2715 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2747 case 'n': 2716 case 'n':
2748 scr_charset_choose (2); 2717 scr_charset_choose (2);
2793rxvt_term::process_csi_seq () 2762rxvt_term::process_csi_seq ()
2794{ 2763{
2795 unicode_t ch, priv, i; 2764 unicode_t ch, priv, i;
2796 unsigned int nargs, p; 2765 unsigned int nargs, p;
2797 int n, ndef; 2766 int n, ndef;
2798 int arg[ESC_ARGS]; 2767 int arg[ESC_ARGS] = { };
2799 2768
2800 memset (arg, 0, sizeof (arg));
2801 nargs = 0; 2769 nargs = 0;
2802 2770
2803 priv = 0; 2771 priv = 0;
2804 ch = cmd_getc (); 2772 ch = cmd_getc ();
2805 if (ch >= '<' && ch <= '?') 2773 if ((ch >= '<' && ch <= '?') || ch == '!')
2774 {
2806 { /* '<' '=' '>' '?' */ 2775 /* '<' '=' '>' '?' '!' */
2807 priv = ch; 2776 priv = ch;
2808 ch = cmd_getc (); 2777 ch = cmd_getc ();
2809 } 2778 }
2810 2779
2811 /* read any numerical arguments */ 2780 /* read any numerical arguments */
2854 { 2823 {
2855 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2824 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2856 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2825 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2857 // 2826 //
2858 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2827 // 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 2828 // 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). 2829 // versions.
2861 // 2830 //
2862 tt_printf ("\033[>%d;94;0c", 'U'); 2831 tt_printf ("\033[>%d;95;0c", 'U');
2863 } 2832 }
2864 break; 2833 break;
2834
2865 case '?': 2835 case '?':
2866 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2836 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2867 process_terminal_mode (ch, priv, nargs, arg); 2837 process_terminal_mode (ch, priv, nargs, arg);
2868 break; 2838 break;
2839
2840 case '!':
2841 if (ch == CSI_70)
2842 {
2843 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2844 scr_soft_reset ();
2845
2846 static const int pm_h[] = { 7, 25 };
2847 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2848
2849 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2850 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2869 } 2851 }
2852 break;
2853 }
2854
2870 return; 2855 return;
2871 } 2856 }
2872 2857
2873 switch (ch) 2858 switch (ch)
2874 { 2859 {
3303 3288
3304/* 3289/*
3305 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3290 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3306 */ 3291 */
3307void 3292void
3308rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3293rxvt_term::process_xterm_seq (int op, char *str, char resp)
3309{ 3294{
3310 int color; 3295 int color;
3311 char *buf, *name; 3296 char *buf, *name;
3312 bool query = str[0] == '?' && !str[1]; 3297 bool query = str[0] == '?' && !str[1];
3313 int saveop = op; 3298 int saveop = op;
3354 3339
3355 XFree (value); 3340 XFree (value);
3356 } 3341 }
3357 else 3342 else
3358 { 3343 {
3359 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3344 char *eq = strchr (str, '=');
3360 3345
3361 if (eq) 3346 if (eq)
3362 { 3347 {
3363 *eq = 0; 3348 *eq = 0;
3364 set_utf8_property (display->atom (str), eq + 1); 3349 set_utf8_property (display->atom (str), eq + 1);
3385 *buf++ = '\0'; 3370 *buf++ = '\0';
3386 3371
3387 process_color_seq (op, color, name, resp); 3372 process_color_seq (op, color, name, resp);
3388 } 3373 }
3389 break; 3374 break;
3375 case Rxvt_restoreFG:
3390 case XTerm_Color00: 3376 case XTerm_Color00:
3391 process_color_seq (op, Color_fg, str, resp); 3377 process_color_seq (op, Color_fg, str, resp);
3392 break; 3378 break;
3379 case Rxvt_restoreBG:
3393 case XTerm_Color01: 3380 case XTerm_Color01:
3394 process_color_seq (op, Color_bg, str, resp); 3381 process_color_seq (op, Color_bg, str, resp);
3395 break; 3382 break;
3396#ifndef NO_CURSORCOLOR 3383#ifndef NO_CURSORCOLOR
3397 case XTerm_Color_cursor: 3384 case XTerm_Color_cursor:
3418 break; 3405 break;
3419 case URxvt_Color_IT: 3406 case URxvt_Color_IT:
3420 process_color_seq (op, Color_IT, str, resp); 3407 process_color_seq (op, Color_IT, str, resp);
3421 break; 3408 break;
3422#endif 3409#endif
3410 case URxvt_Color_border:
3411 process_color_seq (op, Color_border, str, resp);
3412 break;
3423#if ENABLE_TRANSPARENCY 3413#if ENABLE_TRANSPARENCY
3424 case URxvt_Color_tint: 3414 case URxvt_Color_tint:
3425 process_color_seq (op, Color_tint, str, resp); 3415 process_color_seq (op, Color_tint, str, resp);
3426 { 3416 {
3427 bool changed = false; 3417 bool changed = false;
3418
3428 if (ISSET_PIXCOLOR (Color_tint)) 3419 if (ISSET_PIXCOLOR (Color_tint))
3429 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3420 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3430 else 3421 else
3431 changed = bgPixmap.unset_tint (); 3422 changed = bgPixmap.unset_tint ();
3423
3432 if (changed) 3424 if (changed)
3433 bgPixmap.render (); 3425 update_background ();
3434 } 3426 }
3435 3427
3436 break; 3428 break;
3437#endif 3429#endif
3438 3430
3439#if XPM_BACKGROUND 3431#if BG_IMAGE_FROM_FILE
3440 case Rxvt_Pixmap: 3432 case Rxvt_Pixmap:
3441 if (!strcmp (str, "?")) 3433 if (!strcmp (str, "?"))
3442 { 3434 {
3443 char str[256]; 3435 char str[256];
3444 3436
3445 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3437 sprintf (str, "[%dx%d+%d+%d]",
3446 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3438 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3447 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3439 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3448 process_xterm_seq (XTerm_title, str, CHAR_ST); 3440 process_xterm_seq (XTerm_title, str, CHAR_ST);
3449 } 3441 }
3450 else 3442 else
3459 changed++; 3451 changed++;
3460 str = strchr (str, ';'); 3452 str = strchr (str, ';');
3461 if (str == NULL) 3453 if (str == NULL)
3462 bgPixmap.set_defaultGeometry (); 3454 bgPixmap.set_defaultGeometry ();
3463 } 3455 }
3456
3464 while (str) 3457 while (str)
3465 { 3458 {
3466 str++; 3459 str++;
3467 if (bgPixmap.set_geometry (str)) 3460 if (bgPixmap.set_geometry (str))
3468 changed++; 3461 changed++;
3469 str = strchr (str, ';'); 3462 str = strchr (str, ';');
3470 } 3463 }
3464
3471 if (changed) 3465 if (changed)
3472 { 3466 update_background ();
3473 bgPixmap.render ();
3474 scr_touch (true);
3475 }
3476 } 3467 }
3477 break; 3468 break;
3478#endif 3469#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 3470
3487 case XTerm_logfile: 3471 case XTerm_logfile:
3488 // TODO, when secure mode? 3472 // TODO, when secure mode?
3489 break; 3473 break;
3490 3474
3557 break; 3541 break;
3558#endif 3542#endif
3559 3543
3560#if ENABLE_PERL 3544#if ENABLE_PERL
3561 case URxvt_perl: 3545 case URxvt_perl:
3562 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3546 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3563 ; // no responses yet
3564 break; 3547 break;
3565#endif 3548#endif
3566 } 3549 }
3567} 3550}
3568/*----------------------------------------------------------------------*/ 3551/*----------------------------------------------------------------------*/
3591 { 3574 {
3592 if (mode == 'r') 3575 if (mode == 'r')
3593 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3594 else 3577 else
3595 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3578 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3596 PrivMode (state, bit); 3579 set_privmode (bit, state);
3597 } 3580 }
3598 3581
3599 return state; 3582 return state;
3600} 3583}
3601 3584
3609 static const struct 3592 static const struct
3610 { 3593 {
3611 const int argval; 3594 const int argval;
3612 const unsigned long bit; 3595 const unsigned long bit;
3613 } argtopriv[] = { 3596 } argtopriv[] = {
3614 { 1, PrivMode_aplCUR }, 3597 { 1, PrivMode_aplCUR }, // DECCKM
3615 { 2, PrivMode_vt52 }, 3598 { 2, PrivMode_vt52 },
3616 { 3, PrivMode_132 }, 3599 { 3, PrivMode_132 }, // DECCOLM
3617 { 4, PrivMode_smoothScroll }, 3600 { 4, PrivMode_smoothScroll }, // DECSCLM
3618 { 5, PrivMode_rVideo }, 3601 { 5, PrivMode_rVideo }, // DECSCNM
3619 { 6, PrivMode_relOrigin }, 3602 { 6, PrivMode_relOrigin }, // DECOM
3620 { 7, PrivMode_Autowrap }, 3603 { 7, PrivMode_Autowrap }, // DECAWM
3621 // 8, bi-directional support mode 3604 // 8, auto-repeat keys // DECARM
3622 { 9, PrivMode_MouseX10 }, 3605 { 9, PrivMode_MouseX10 },
3623 // 18, 19 printing-related 3606 // 18 end FF to printer after print screen
3607 // 19 Print screen prints full screen/scorll region
3624 { 25, PrivMode_VisibleCursor }, 3608 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3625#ifdef scrollBar_esc 3609#ifdef scrollBar_esc
3626 { scrollBar_esc, PrivMode_scrollBar }, 3610 { scrollBar_esc, PrivMode_scrollBar },
3627#endif 3611#endif
3628 { 35, PrivMode_ShiftKeys }, // rxvt extension 3612 { 35, PrivMode_ShiftKeys }, // rxvt extension
3613 // 38, tektronix mode // DECTEK
3629 { 40, PrivMode_132OK }, 3614 { 40, PrivMode_132OK },
3630 // 41 xterm more fixes NYI 3615 // 41 xterm more fixes NYI
3631 // 45 margin bell NYI 3616 // 45 margin bell NYI
3632 // 46 start logging 3617 // 46 start logging
3633 { 47, PrivMode_Screen }, 3618 { 47, PrivMode_Screen },
3634 { 66, PrivMode_aplKP }, 3619 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3635#ifndef NO_BACKSPACE_KEY 3620#ifndef NO_BACKSPACE_KEY
3636 { 67, PrivMode_BackSpace }, 3621 { 67, PrivMode_BackSpace }, // DECBKM
3637#endif 3622#endif
3638 { 1000, PrivMode_MouseX11 }, 3623 { 1000, PrivMode_MouseX11 },
3639 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3624 { 1002, PrivMode_MouseBtnEvent },
3640 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3625 { 1003, PrivMode_MouseAnyEvent },
3641 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3642 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3626 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3643 { 1011, PrivMode_Keypress }, // rxvt extension 3627 { 1011, PrivMode_Keypress }, // rxvt extension
3644 // 1035 enable modifiers for alt, numlock NYI 3628 // 1035 enable modifiers for alt, numlock NYI
3645 // 1036 send ESC for meta keys NYI 3629 // 1036 send ESC for meta keys NYI
3646 // 1037 send DEL for keypad delete NYI 3630 // 1037 send DEL for keypad delete NYI
3647 { 1047, PrivMode_Screen }, 3631 { 1047, PrivMode_Screen },
3648 // 1048 save and restore cursor 3632 // 1048 save and restore cursor
3649 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3633 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3650 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3634 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3635 { 2004, PrivMode_BracketPaste },
3651 }; 3636 };
3652 3637
3653 if (nargs == 0) 3638 if (nargs == 0)
3654 return; 3639 return;
3655 3640
3680 3665
3681 scr_touch (true); 3666 scr_touch (true);
3682 break; 3667 break;
3683#endif 3668#endif
3684 case 1048: /* alternative cursor save */ 3669 case 1048: /* alternative cursor save */
3685 case 1049:
3686 if (option (Opt_secondaryScreen)) 3670 if (option (Opt_secondaryScreen))
3687 if (mode == 0) 3671 if (mode == 0)
3688 scr_cursor (RESTORE); 3672 scr_cursor (RESTORE);
3689 else if (mode == 1) 3673 else if (mode == 1)
3690 scr_cursor (SAVE); 3674 scr_cursor (SAVE);
3699 case 2: /* VT52 mode */ 3683 case 2: /* VT52 mode */
3700 /* oddball mode. should be set regardless of set/reset 3684 /* oddball mode. should be set regardless of set/reset
3701 * parameter. Return from VT52 mode with an ESC < from 3685 * parameter. Return from VT52 mode with an ESC < from
3702 * within VT52 mode 3686 * within VT52 mode
3703 */ 3687 */
3704 PrivMode (1, PrivMode_vt52); 3688 set_privmode (PrivMode_vt52, 1);
3705 break; 3689 break;
3706 case 3: /* 80/132 */ 3690 case 3: /* 80/132 */
3707 if (priv_modes & PrivMode_132OK) 3691 if (priv_modes & PrivMode_132OK)
3708 set_widthheight (((state ? 132 : 80) * fwidth), height); 3692 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3709 break; 3693 break;
3710 case 4: /* smooth scrolling */ 3694 case 4: /* smooth scrolling */
3711 set_option (Opt_jumpScroll, !state); 3695 set_option (Opt_jumpScroll, !state);
3712 break; 3696 break;
3713 case 5: /* reverse video */ 3697 case 5: /* reverse video */
3720 scr_autowrap (state); 3704 scr_autowrap (state);
3721 break; 3705 break;
3722 /* case 8: - auto repeat, can't do on a per window basis */ 3706 /* case 8: - auto repeat, can't do on a per window basis */
3723 case 9: /* X10 mouse reporting */ 3707 case 9: /* X10 mouse reporting */
3724 if (state) /* orthogonal */ 3708 if (state) /* orthogonal */
3725 priv_modes &= ~PrivMode_MouseX11; 3709 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3726 break; 3710 break;
3727#ifdef scrollBar_esc 3711#ifdef scrollBar_esc
3728 case scrollBar_esc: 3712 case scrollBar_esc:
3729 if (scrollbar_mapping (state)) 3713 if (scrollBar.map (state))
3730 { 3714 {
3731 resize_all_windows (0, 0, 0); 3715 resize_all_windows (0, 0, 0);
3732 scr_touch (true); 3716 scr_touch (true);
3733 } 3717 }
3734 break; 3718 break;
3743 break; 3727 break;
3744 /* case 66: - application key pad */ 3728 /* case 66: - application key pad */
3745 /* case 67: - backspace key */ 3729 /* case 67: - backspace key */
3746 case 1000: /* X11 mouse reporting */ 3730 case 1000: /* X11 mouse reporting */
3747 if (state) /* orthogonal */ 3731 if (state) /* orthogonal */
3748 priv_modes &= ~PrivMode_MouseX10; 3732 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3749 break; 3733 break;
3750#if 0
3751 case 1001: 3734 case 1002:
3752 break; /* X11 mouse highlighting */ 3735 case 1003:
3753#endif 3736 if (state)
3737 {
3738 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3739 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3740 vt_emask_mouse = PointerMotionMask;
3741 }
3742 else
3743 vt_emask_mouse = NoEventMask;
3744
3745 vt_select_input ();
3746 break;
3754 case 1010: /* scroll to bottom on TTY output inhibit */ 3747 case 1010: /* scroll to bottom on TTY output inhibit */
3755 set_option (Opt_scrollTtyOutput, !state); 3748 set_option (Opt_scrollTtyOutput, !state);
3756 break; 3749 break;
3757 case 1011: /* scroll to bottom on key press */ 3750 case 1011: /* scroll to bottom on key press */
3758 set_option (Opt_scrollTtyKeypress, state); 3751 set_option (Opt_scrollTtyKeypress, state);
3759 break; 3752 break;
3760 case 1047: /* secondary screen w/ clearing last */ 3753 case 1047: /* secondary screen w/ clearing last */
3761 if (option (Opt_secondaryScreen)) 3754 if (option (Opt_secondaryScreen))
3762 if (current_screen != PRIMARY) 3755 if (!state)
3763 scr_erase_screen (2); 3756 scr_erase_screen (2);
3757
3764 scr_change_screen (state); 3758 scr_change_screen (state);
3765 break; 3759 break;
3766 case 1049: /* secondary screen w/ clearing first */ 3760 case 1049: /* secondary screen w/ clearing first */
3761 if (option (Opt_secondaryScreen))
3762 if (state)
3763 scr_cursor (SAVE);
3764
3767 scr_change_screen (state); 3765 scr_change_screen (state);
3766
3768 if (option (Opt_secondaryScreen)) 3767 if (option (Opt_secondaryScreen))
3769 if (current_screen != PRIMARY) 3768 if (state)
3770 scr_erase_screen (2); 3769 scr_erase_screen (2);
3770 else
3771 scr_cursor (RESTORE);
3771 break; 3772 break;
3772 default: 3773 default:
3773 break; 3774 break;
3774 } 3775 }
3775 } 3776 }
3935rxvt_term::process_graphics () 3936rxvt_term::process_graphics ()
3936{ 3937{
3937 unicode_t ch, cmd = cmd_getc (); 3938 unicode_t ch, cmd = cmd_getc ();
3938 3939
3939 if (cmd == 'Q') 3940 if (cmd == 'Q')
3941 {
3940 { /* query graphics */ 3942 /* query graphics */
3941 tt_printf ("\033G0\012"); /* no graphics */ 3943 tt_printf ("\033G0\012"); /* no graphics */
3942 return; 3944 return;
3943 } 3945 }
3944 /* swallow other graphics sequences until terminating ':' */ 3946 /* swallow other graphics sequences until terminating ':' */
3945 do 3947 do
3995 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3997 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3996 3998
3997 memcpy (v_buffer + v_buflen, data, len); 3999 memcpy (v_buffer + v_buflen, data, len);
3998 v_buflen += len; 4000 v_buflen += len;
3999 4001
4000 pty_ev.set (EVENT_READ | EVENT_WRITE); 4002 pty_ev.set (ev::READ | ev::WRITE);
4001} 4003}
4002 4004
4003void rxvt_term::pty_write () 4005void rxvt_term::pty_write ()
4004{ 4006{
4005 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4007 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4010 4012
4011 if (v_buflen == 0) 4013 if (v_buflen == 0)
4012 { 4014 {
4013 free (v_buffer); 4015 free (v_buffer);
4014 v_buffer = 0; 4016 v_buffer = 0;
4015 v_buflen = 0;
4016 4017
4017 pty_ev.set (EVENT_READ); 4018 pty_ev.set (ev::READ);
4018 return; 4019 return;
4019 } 4020 }
4020 4021
4021 memmove (v_buffer, v_buffer + written, v_buflen); 4022 memmove (v_buffer, v_buffer + written, v_buflen);
4022 } 4023 }
4023 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4024 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4024 pty_ev.set (EVENT_READ); 4025 pty_ev.set (ev::READ);
4025} 4026}
4026 4027
4027/*----------------------- end-of-file (C source) -----------------------*/ 4028/*----------------------- end-of-file (C source) -----------------------*/
4028 4029

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines