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.322 by ayin, Wed May 2 23:06:32 2007 UTC vs.
Revision 1.426 by root, Wed Nov 5 13:49:36 2008 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 201
202 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
203 203
204 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
206 206
207 if (y >= 0) 207 if (y >= 0)
208 { 208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
221 ch = *chr++; 221 ch = *chr++;
222 222
223 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
226# if !UNICODE3 226# if !UNICODE_3
227 if (ch >= 0x10000) 227 if (ch >= 0x10000)
228 ch = 0xfffd; 228 ch = 0xfffd;
229# endif 229# endif
230 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231 231
… …
279 } 279 }
280 280
281 iso14755buf = 0; 281 iso14755buf = 0;
282} 282}
283 283
284int 284static int
285rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
286{ 286{
287 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
290 { 290 {
… …
298 298
299 return -1; 299 return -1;
300} 300}
301#endif 301#endif
302 302
303static inline KeySym
304translate_keypad (KeySym keysym, bool kp)
305{
306#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin
322 };
323
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
325 {
326 unsigned int index = keysym - XK_KP_Home;
327 keysym = kp ? keypadtrans[index] : XK_Home + index;
328 }
329 else if (keysym == XK_KP_Insert)
330 keysym = kp ? XK_KP_0 : XK_Insert;
331# ifndef NO_DELETE_KEY
332 else if (keysym == XK_KP_Delete)
333 keysym = kp ? XK_KP_Decimal : XK_Delete;
334# endif
335#endif
336 return keysym;
337}
338
339static inline int
340map_function_key (KeySym keysym)
341{
342 int param = 0;
343
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
345 {
346 param = 11 + keysym - XK_F1;
347 if (keysym >= XK_F17)
348 param += 4;
349 else if (keysym >= XK_F15)
350 param += 3;
351 else if (keysym >= XK_F11)
352 param += 2;
353 else if (keysym >= XK_F6)
354 param += 1;
355 }
356 else
357 switch (keysym)
358 {
359 case XK_Find:
360 param = 1;
361 break;
362 case XK_Insert:
363 param = 2;
364 break;
365#ifdef DXK_Remove
366 case DXK_Remove:
367#endif
368 case XK_Execute:
369 param = 3;
370 break;
371 case XK_Select:
372 param = 4;
373 break;
374#ifndef UNSHIFTED_SCROLLKEYS
375 case XK_Prior:
376 param = 5;
377 break;
378 case XK_Next:
379 param = 6;
380 break;
381 case XK_Home:
382 param = 7;
383 break;
384 case XK_End:
385 param = 8;
386 break;
387#endif
388 case XK_Help:
389 param = 28;
390 break;
391 case XK_Menu:
392 param = 29;
393 break;
394 }
395 return param;
396}
397
303void 398void
304rxvt_term::key_press (XKeyEvent &ev) 399rxvt_term::key_press (XKeyEvent &ev)
305{ 400{
306 int ctrl, meta, shft, len; 401 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 402 KeySym keysym;
309 int valid_keysym; 403 int valid_keysym;
310 char kbuf[KBUFSZ]; 404 char kbuf[KBUFSZ];
311 405
312#if ISO_14755 406#if ISO_14755
… …
325 meta = ev.state & ModMetaMask; 419 meta = ev.state & ModMetaMask;
326 420
327 if (numlock_state || (ev.state & ModNumLockMask)) 421 if (numlock_state || (ev.state & ModNumLockMask))
328 { 422 {
329 numlock_state = (ev.state & ModNumLockMask); 423 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP); 424 set_privmode (PrivMode_aplKP, !numlock_state);
331 } 425 }
332 426
333 kbuf[0] = 0; 427 kbuf[0] = 0;
334 428
335#ifdef USE_XIM 429#ifdef USE_XIM
… …
500# if ISO_14755 594# if ISO_14755
501 iso14755_51 (0); 595 iso14755_51 (0);
502# endif 596# endif
503 return; 597 return;
504 } 598 }
599 else if (keysym == XK_BackSpace)
600 {
601 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
602# if ISO_14755
603 iso14755_51 (iso14755buf & ISO_14755_MASK);
604# endif
605 return;
606 }
505 else if ((hv = hex_keyval (ev)) >= 0) 607 else if ((hv = hex_keyval (ev)) >= 0)
506 { 608 {
507 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 609 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
508 | hv | ISO_14755_51; 610 | hv | ISO_14755_51;
509# if ISO_14755 611# if ISO_14755
… …
511# endif 613# endif
512 return; 614 return;
513 } 615 }
514 else 616 else
515 { 617 {
516# if ENABLE_OVERLAY 618# if ISO_14755
517 scr_overlay_off (); 619 scr_overlay_off ();
518# endif 620# endif
519 iso14755buf = 0; 621 iso14755buf = 0;
520 } 622 }
521 } 623 }
522 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
523 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
524 if (!(iso14755buf & ISO_14755_STARTED)) 626 if (!(iso14755buf & ISO_14755_STARTED))
525 { 627 {
526 iso14755buf |= ISO_14755_STARTED; 628 iso14755buf |= ISO_14755_STARTED;
527# if ENABLE_OVERLAY 629# if ISO_14755
528 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
529 scr_overlay_set (0, 0, "ISO 14755 mode"); 631 scr_overlay_set (0, 0, "ISO 14755 mode");
530# endif 632# endif
531 } 633 }
532#endif 634#endif
533 635
534#ifdef PRINTPIPE 636#ifdef PRINTPIPE
535 if (keysym == XK_Print) 637 if (keysym == XK_Print)
536 { 638 {
537 scr_printscreen (ctrl | shft); 639 scr_printscreen (ctrl | shft);
538 return; 640 return;
539 } 641 }
540#endif 642#endif
541 643
542 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 644 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
543 { 645 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1;
648
649 switch (translate_keypad (keysym, kp))
544 { 650 {
651#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace)
654 {
655 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
656 ^ !!ctrl) ? '\b' : '\177';
657 kbuf[1] = '\0';
658 }
659 else
660 strcpy (kbuf, rs[Rs_backspace_key]);
661 break;
662#endif
663#ifndef NO_DELETE_KEY
664 case XK_Delete:
665 strcpy (kbuf, rs[Rs_delete_key]);
666 break;
667#endif
668 case XK_Tab:
669 if (shft)
670 strcpy (kbuf, "\033[Z");
671 else
672 {
673#ifdef CTRL_TAB_MAKES_META
674 if (ctrl)
675 meta = 1;
676#endif
677#ifdef MOD4_TAB_MAKES_META
678 if (ev.state & Mod4Mask)
679 meta = 1;
680#endif
545 newlen = 1; 681 newlen = 0;
546 switch (keysym) 682 }
683 break;
684
685 case XK_Up: /* "\033[A" */
686 case XK_Down: /* "\033[B" */
687 case XK_Right: /* "\033[C" */
688 case XK_Left: /* "\033[D" */
689 strcpy (kbuf, "\033[Z");
690 kbuf[2] = "DACB"[keysym - XK_Left];
691 /* do Shift first */
692 if (shft)
693 kbuf[2] = "dacb"[keysym - XK_Left];
694 else if (ctrl)
695 {
696 kbuf[1] = 'O';
697 kbuf[2] = "dacb"[keysym - XK_Left];
698 }
699 else if (priv_modes & PrivMode_aplCUR)
700 kbuf[1] = 'O';
701 break;
702
703 case XK_KP_Enter:
704 /* allow shift to override */
705 if (kp)
706 {
707 strcpy (kbuf, "\033OM");
708 break;
709 }
710
711 /* FALLTHROUGH */
712
713 case XK_Return:
714 if (priv_modes & PrivMode_LFNL)
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\012';
718 kbuf[2] = '\0';
719 }
720 else
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\0';
724 }
725 break;
726
727 case XK_KP_F1: /* "\033OP" */
728 case XK_KP_F2: /* "\033OQ" */
729 case XK_KP_F3: /* "\033OR" */
730 case XK_KP_F4: /* "\033OS" */
731 strcpy (kbuf, "\033OP");
732 kbuf[2] += (keysym - XK_KP_F1);
733 break;
734
735 case XK_KP_Multiply: /* "\033Oj" : "*" */
736 case XK_KP_Add: /* "\033Ok" : "+" */
737 case XK_KP_Separator: /* "\033Ol" : "," */
738 case XK_KP_Subtract: /* "\033Om" : "-" */
739 case XK_KP_Decimal: /* "\033On" : "." */
740 case XK_KP_Divide: /* "\033Oo" : "/" */
741 case XK_KP_0: /* "\033Op" : "0" */
742 case XK_KP_1: /* "\033Oq" : "1" */
743 case XK_KP_2: /* "\033Or" : "2" */
744 case XK_KP_3: /* "\033Os" : "3" */
745 case XK_KP_4: /* "\033Ot" : "4" */
746 case XK_KP_5: /* "\033Ou" : "5" */
747 case XK_KP_6: /* "\033Ov" : "6" */
748 case XK_KP_7: /* "\033Ow" : "7" */
749 case XK_KP_8: /* "\033Ox" : "8" */
750 case XK_KP_9: /* "\033Oy" : "9" */
751 /* allow shift to override */
752 if (kp)
753 {
754 strcpy (kbuf, "\033Oj");
755 kbuf[2] += (keysym - XK_KP_Multiply);
756 }
757 else
758 {
759 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
760 kbuf[1] = '\0';
761 }
762 break;
763
764 default:
547 { 765 {
548#ifndef NO_BACKSPACE_KEY 766 int param = map_function_key (keysym);
549 case XK_BackSpace: 767 if (param > 0)
550 if (priv_modes & PrivMode_HaveBackSpace) 768 sprintf (kbuf,"\033[%d~", param);
551 {
552 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
553 ^ !!ctrl) ? '\b' : '\177';
554 kbuf[1] = '\0';
555 }
556 else 769 else
557 strcpy (kbuf, key_backspace);
558 break;
559#endif
560#ifndef NO_DELETE_KEY
561# ifdef XK_KP_Prior
562 case XK_KP_Delete:
563 /* allow shift to override */
564 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
565 {
566 strcpy (kbuf, "\033On");
567 break;
568 }
569 /* FALLTHROUGH */
570# endif
571 case XK_Delete:
572 strcpy (kbuf, key_delete);
573 break;
574#endif
575 case XK_Tab:
576 if (shft)
577 strcpy (kbuf, "\033[Z");
578 else
579 {
580#ifdef CTRL_TAB_MAKES_META
581 if (ctrl)
582 meta = 1;
583#endif
584#ifdef MOD4_TAB_MAKES_META
585 if (ev.state & Mod4Mask)
586 meta = 1;
587#endif
588 newlen = 0;
589 }
590 break;
591
592#ifdef XK_KP_Left
593 case XK_KP_Up: /* \033Ox or standard */
594 case XK_KP_Down: /* \033Or or standard */
595 case XK_KP_Right: /* \033Ov or standard */
596 case XK_KP_Left: /* \033Ot or standard */
597 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
598 {
599 strcpy (kbuf, "\033OZ");
600 kbuf[2] = "txvr"[keysym - XK_KP_Left];
601 break;
602 }
603 else
604 /* translate to std. cursor key */
605 keysym = XK_Left + (keysym - XK_KP_Left);
606 /* FALLTHROUGH */
607#endif
608 case XK_Up: /* "\033[A" */
609 case XK_Down: /* "\033[B" */
610 case XK_Right: /* "\033[C" */
611 case XK_Left: /* "\033[D" */
612 strcpy (kbuf, "\033[Z");
613 kbuf[2] = "DACB"[keysym - XK_Left];
614 /* do Shift first */
615 if (shft)
616 kbuf[2] = "dacb"[keysym - XK_Left];
617 else if (ctrl)
618 {
619 kbuf[1] = 'O';
620 kbuf[2] = "dacb"[keysym - XK_Left];
621 }
622 else if (priv_modes & PrivMode_aplCUR)
623 kbuf[1] = 'O';
624 break;
625
626#ifndef UNSHIFTED_SCROLLKEYS
627# ifdef XK_KP_Prior
628 case XK_KP_Prior:
629 /* allow shift to override */
630 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
631 {
632 strcpy (kbuf, "\033Oy");
633 break;
634 }
635 /* FALLTHROUGH */
636# endif
637 case XK_Prior:
638 strcpy (kbuf, "\033[5~");
639 break;
640# ifdef XK_KP_Next
641 case XK_KP_Next:
642 /* allow shift to override */
643 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
644 {
645 strcpy (kbuf, "\033Os");
646 break;
647 }
648 /* FALLTHROUGH */
649# endif
650 case XK_Next:
651 strcpy (kbuf, "\033[6~");
652 break;
653#endif
654 case XK_KP_Enter:
655 /* allow shift to override */
656 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
657 {
658 strcpy (kbuf, "\033OM");
659 break;
660 }
661
662 /* FALLTHROUGH */
663
664 case XK_Return:
665 if (priv_modes & PrivMode_LFNL)
666 {
667 kbuf[0] = '\015';
668 kbuf[1] = '\012';
669 kbuf[2] = '\0';
670 }
671 else
672 {
673 kbuf[0] = '\015';
674 kbuf[1] = '\0';
675 }
676 break;
677
678#ifdef XK_KP_Begin
679 case XK_KP_Begin:
680 strcpy (kbuf, "\033Ou");
681 break;
682
683#endif
684 case XK_KP_F1: /* "\033OP" */
685 case XK_KP_F2: /* "\033OQ" */
686 case XK_KP_F3: /* "\033OR" */
687 case XK_KP_F4: /* "\033OS" */
688 strcpy (kbuf, "\033OP");
689 kbuf[2] += (keysym - XK_KP_F1);
690 break;
691
692 case XK_KP_Multiply: /* "\033Oj" : "*" */
693 case XK_KP_Add: /* "\033Ok" : "+" */
694 case XK_KP_Separator: /* "\033Ol" : "," */
695 case XK_KP_Subtract: /* "\033Om" : "-" */
696 case XK_KP_Decimal: /* "\033On" : "." */
697 case XK_KP_Divide: /* "\033Oo" : "/" */
698 case XK_KP_0: /* "\033Op" : "0" */
699 case XK_KP_1: /* "\033Oq" : "1" */
700 case XK_KP_2: /* "\033Or" : "2" */
701 case XK_KP_3: /* "\033Os" : "3" */
702 case XK_KP_4: /* "\033Ot" : "4" */
703 case XK_KP_5: /* "\033Ou" : "5" */
704 case XK_KP_6: /* "\033Ov" : "6" */
705 case XK_KP_7: /* "\033Ow" : "7" */
706 case XK_KP_8: /* "\033Ox" : "8" */
707 case XK_KP_9: /* "\033Oy" : "9" */
708 /* allow shift to override */
709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
710 {
711 strcpy (kbuf, "\033Oj");
712 kbuf[2] += (keysym - XK_KP_Multiply);
713 }
714 else
715 {
716 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
717 kbuf[1] = '\0';
718 }
719 break;
720
721 case XK_Find:
722 strcpy (kbuf, "\033[1~");
723 break;
724
725#ifdef XK_KP_End
726 case XK_KP_Insert:
727 /* allow shift to override */
728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
729 {
730 strcpy (kbuf, "\033Op");
731 break;
732 }
733 /* FALLTHROUGH */
734#endif
735 case XK_Insert:
736 strcpy (kbuf, "\033[2~");
737 break;
738#ifdef DXK_Remove /* support for DEC remove like key */
739 case DXK_Remove:
740 /* FALLTHROUGH */
741#endif
742 case XK_Execute:
743 strcpy (kbuf, "\033[3~");
744 break;
745 case XK_Select:
746 strcpy (kbuf, "\033[4~");
747 break;
748#ifdef XK_KP_End
749 case XK_KP_End:
750 /* allow shift to override */
751 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
752 {
753 strcpy (kbuf, "\033Oq");
754 break;
755 }
756 /* FALLTHROUGH */
757#endif
758 case XK_End:
759 strcpy (kbuf, KS_END);
760 break;
761#ifdef XK_KP_Home
762 case XK_KP_Home:
763 /* allow shift to override */
764 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
765 {
766 strcpy (kbuf, "\033Ow");
767 break;
768 }
769 /* FALLTHROUGH */
770#endif
771 case XK_Home:
772 strcpy (kbuf, KS_HOME);
773 break;
774
775#define FKEY(n, fkey) \
776 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
777
778 case XK_F1: /* "\033[11~" */
779 case XK_F2: /* "\033[12~" */
780 case XK_F3: /* "\033[13~" */
781 case XK_F4: /* "\033[14~" */
782 case XK_F5: /* "\033[15~" */
783 FKEY (11, XK_F1);
784 break;
785 case XK_F6: /* "\033[17~" */
786 case XK_F7: /* "\033[18~" */
787 case XK_F8: /* "\033[19~" */
788 case XK_F9: /* "\033[20~" */
789 case XK_F10: /* "\033[21~" */
790 FKEY (17, XK_F6);
791 break;
792 case XK_F11: /* "\033[23~" */
793 case XK_F12: /* "\033[24~" */
794 case XK_F13: /* "\033[25~" */
795 case XK_F14: /* "\033[26~" */
796 FKEY (23, XK_F11);
797 break;
798 case XK_F15: /* "\033[28~" */
799 case XK_F16: /* "\033[29~" */
800 FKEY (28, XK_F15);
801 break;
802 case XK_Help: /* "\033[28~" */
803 FKEY (28, XK_Help);
804 break;
805 case XK_Menu: /* "\033[29~" */
806 FKEY (29, XK_Menu);
807 break;
808 case XK_F17: /* "\033[31~" */
809 case XK_F18: /* "\033[32~" */
810 case XK_F19: /* "\033[33~" */
811 case XK_F20: /* "\033[34~" */
812 case XK_F21: /* "\033[35~" */
813 case XK_F22: /* "\033[36~" */
814 case XK_F23: /* "\033[37~" */
815 case XK_F24: /* "\033[38~" */
816 case XK_F25: /* "\033[39~" */
817 case XK_F26: /* "\033[40~" */
818 case XK_F27: /* "\033[41~" */
819 case XK_F28: /* "\033[42~" */
820 case XK_F29: /* "\033[43~" */
821 case XK_F30: /* "\033[44~" */
822 case XK_F31: /* "\033[45~" */
823 case XK_F32: /* "\033[46~" */
824 case XK_F33: /* "\033[47~" */
825 case XK_F34: /* "\033[48~" */
826 case XK_F35: /* "\033[49~" */
827 FKEY (31, XK_F17);
828 break;
829#undef FKEY
830 default:
831 newlen = 0; 770 newlen = 0;
832 break;
833 } 771 }
834 772 break;
835 if (newlen)
836 len = strlen (kbuf);
837 } 773 }
774
775 if (newlen)
776 len = strlen (kbuf);
838 777
839 /* 778 /*
840 * Pass meta for all function keys, if 'meta' option set 779 * Pass meta for all function keys, if 'meta' option set
841 */ 780 */
842#ifdef META8_OPTION 781#ifdef META8_OPTION
… …
926#if ENABLE_FRILLS || ISO_14755 865#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support 866 // ISO 14755 support
928 if (iso14755buf) 867 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52) 868 if (iso14755buf & ISO_14755_52)
930 { 869 {
931# if ENABLE_OVERLAY 870# if ISO_14755
932 scr_overlay_off (); 871 scr_overlay_off ();
933# endif 872# endif
934# if ISO_14755 873# if ISO_14755
935 // iso14755 part 5.2 handling: release time 874 // iso14755 part 5.2 handling: release time
936 // first: controls 875 // first: controls
… …
959 898
960 return; 899 return;
961 } 900 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 901 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 { 902 {
964# if ENABLE_OVERLAY 903# if ISO_14755
965 scr_overlay_off (); 904 scr_overlay_off ();
966# endif 905# endif
967 if (iso14755buf & ISO_14755_51) 906 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 (); 907 commit_iso14755 ();
969#if ISO_14755 908#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED) 909 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971 { 910 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 911 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973 912
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 913 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 914 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
1027void 966void
1028rxvt_term::flush () 967rxvt_term::flush ()
1029{ 968{
1030 flush_ev.stop (); 969 flush_ev.stop ();
1031 970
1032#ifdef TRANSPARENT 971#ifdef HAVE_BG_PIXMAP
1033 if (want_full_refresh) 972 if (bgPixmap.check_clearChanged ())
1034 { 973 {
1035 want_full_refresh = 0; 974// scr_clear (true); This needs to be researched further!
1036 scr_clear ();
1037 scr_touch (false); 975 scr_touch (false);
1038 } 976 }
1039#endif 977#endif
1040 978
1041 if (want_refresh) 979 if (want_refresh)
… …
1077 } 1015 }
1078 while (row < end_row); 1016 while (row < end_row);
1079 } 1017 }
1080 1018
1081 scr_refresh (); 1019 scr_refresh ();
1082 scrollbar_show (1); 1020 scrollBar.show (1);
1083#ifdef USE_XIM 1021#ifdef USE_XIM
1084 IMSendSpot (); 1022 IMSendSpot ();
1085#endif 1023#endif
1086 } 1024 }
1087 1025
1088 display->flush (); 1026 display->flush ();
1089} 1027}
1090 1028
1029/* checks wether a refresh is requested and starts the refresh timer */
1091void 1030void
1092rxvt_term::check_cb (check_watcher &w) 1031rxvt_term::refresh_check ()
1032{
1033 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1035
1036 display->flush ();
1037}
1038
1039void
1040rxvt_term::flush_cb (ev::timer &w, int revents)
1093{ 1041{
1094 make_current (); 1042 make_current ();
1095 1043
1096 display->flush ();
1097
1098 if (want_refresh && !flush_ev.active)
1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1100}
1101
1102void
1103rxvt_term::flush_cb (time_watcher &w)
1104{
1105 make_current ();
1106
1107 refresh_limit = 1;
1108 refresh_count = 0; 1044 refresh_count = 0;
1109 flush (); 1045 flush ();
1110} 1046}
1111 1047
1112#ifdef CURSOR_BLINK 1048#ifdef CURSOR_BLINK
1113void 1049void
1114rxvt_term::cursor_blink_cb (time_watcher &w) 1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1115{ 1051{
1116 hidden_cursor = !hidden_cursor; 1052 hidden_cursor = !hidden_cursor;
1117 want_refresh = 1; 1053 want_refresh = 1;
1118 1054 refresh_check ();
1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1120} 1055}
1121#endif 1056#endif
1122 1057
1123#ifdef TEXT_BLINK 1058#ifdef TEXT_BLINK
1124void 1059void
1125rxvt_term::text_blink_cb (time_watcher &w) 1060rxvt_term::text_blink_cb (ev::timer &w, int revents)
1126{ 1061{
1127 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1062 if (scr_refresh_rend (RS_Blink, RS_Blink))
1128 { 1063 {
1129 hidden_text = !hidden_text; 1064 hidden_text = !hidden_text;
1130 want_refresh = 1; 1065 want_refresh = 1;
1131 w.start (w.at + TEXT_BLINK_INTERVAL); 1066 refresh_check ();
1132 } 1067 }
1068 else
1069 w.stop ();
1133} 1070}
1134#endif 1071#endif
1135 1072
1136#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1137void 1074void
1138rxvt_term::cont_scroll_cb (time_watcher &w) 1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1139{ 1076{
1140 if ((scrollbar_isUp() || scrollbar_isDn()) && 1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1141 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1142 { 1079 {
1143 want_refresh = 1; 1080 want_refresh = 1;
1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1081 refresh_check ();
1145 } 1082 }
1083 else
1084 w.stop ();
1146} 1085}
1147#endif 1086#endif
1148 1087
1149#ifdef SELECTION_SCROLLING 1088#ifdef SELECTION_SCROLLING
1150void 1089void
1151rxvt_term::sel_scroll_cb (time_watcher &w) 1090rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1152{ 1091{
1153 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1092 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1154 { 1093 {
1155 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1094 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1156 want_refresh = 1; 1095 want_refresh = 1;
1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1158 } 1097 }
1098 else
1099 w.stop ();
1159} 1100}
1160#endif 1101#endif
1161 1102
1162#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1163void 1104void
1164rxvt_term::slip_wheel_cb (time_watcher &w) 1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1165{ 1106{
1166 if (mouse_slip_wheel_speed == 0 1107 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1168 : scr_page (UP, mouse_slip_wheel_speed))
1169 { 1108 {
1170 if (view_start == top_row || view_start == 0)
1171 mouse_slip_wheel_speed = 0;
1172
1173 want_refresh = 1; 1109 want_refresh = 1;
1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1110 refresh_check ();
1111 }
1112
1113 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1114 {
1115 mouse_slip_wheel_speed = 0;
1116 w.stop ();
1175 } 1117 }
1176} 1118}
1177#endif 1119#endif
1178 1120
1179#if LINUX_YIELD_HACK 1121#if LINUX_YIELD_HACK
1180static struct event_handler 1122static struct event_handler
1181{ 1123{
1182 check_watcher yield_ev; 1124 ev::prepare yield_ev;
1183 1125
1184 void yield_cb (check_watcher &w) 1126 void yield_cb (ev::prepare &w, int revents)
1185 { 1127 {
1186 // this should really be sched_yield(), but the linux guys thought 1128 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1129 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is 1130 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS. 1131 // allowed by the sus... as is returning ENOSYS.
1132 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best.
1190 1135
1191 struct timespec ts = { 0, 0 }; 1136 struct timespec ts = { 0, 1000 };
1192 nanosleep (&ts, 0); 1137 nanosleep (&ts, 0);
1193 1138
1194 w.stop (); 1139 w.stop ();
1195 } 1140 }
1196 1141
… …
1235 pty_ev.stop (); 1180 pty_ev.stop ();
1236 1181
1237 if (!option (Opt_hold)) 1182 if (!option (Opt_hold))
1238 destroy (); 1183 destroy ();
1239 } 1184 }
1240 1185
1241 return false; 1186 return false;
1242} 1187}
1243 1188
1244void 1189void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1190rxvt_term::pty_cb (ev::io &w, int revents)
1246{ 1191{
1247 make_current (); 1192 make_current ();
1248 1193
1249 if (revents & EVENT_READ) 1194 if (revents & ev::READ)
1250 // loop, but don't allow a single term to monopolize us 1195 // loop, but don't allow a single term to monopolize us
1251 while (pty_fill ()) 1196 for (int i = CBUFCNT; i-- && pty_fill (); )
1252 if (cmd_parse ()) 1197 cmd_parse ();
1253 break;
1254 1198
1255 if (revents & EVENT_WRITE) 1199 if (revents & ev::WRITE)
1256 pty_write (); 1200 pty_write ();
1201
1202 refresh_check ();
1257} 1203}
1258 1204
1259void 1205void
1260rxvt_term::pointer_unblank () 1206rxvt_term::pointer_unblank ()
1261{ 1207{
… …
1264 1210
1265#ifdef POINTER_BLANK 1211#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1212 hidden_pointer = 0;
1267 1213
1268 if (option (Opt_pointerBlank)) 1214 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1215 pointer_ev.start (pointerBlankDelay);
1270#endif 1216#endif
1271} 1217}
1272 1218
1273#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1274void 1220void
… …
1282 1228
1283 hidden_pointer = 1; 1229 hidden_pointer = 1;
1284} 1230}
1285 1231
1286void 1232void
1287rxvt_term::pointer_cb (time_watcher &w) 1233rxvt_term::pointer_cb (ev::timer &w, int revents)
1288{ 1234{
1289 make_current (); 1235 make_current ();
1290 1236
1291 pointer_blank (); 1237 pointer_blank ();
1292} 1238}
… …
1295void 1241void
1296rxvt_term::mouse_report (XButtonEvent &ev) 1242rxvt_term::mouse_report (XButtonEvent &ev)
1297{ 1243{
1298 int button_number, key_state = 0; 1244 int button_number, key_state = 0;
1299 int x, y; 1245 int x, y;
1246 int code = 32;
1300 1247
1301 x = ev.x; 1248 x = Pixel2Col (ev.x);
1302 y = ev.y; 1249 y = Pixel2Row (ev.y);
1303 pixel_position (&x, &y); 1250 if (ev.type == MotionNotify)
1251 {
1252 if (x == mouse_row && y == mouse_col)
1253 return;
1254 mouse_row = x;
1255 mouse_col = y;
1256 code += 32;
1257 }
1304 1258
1305 if (MEvent.button == AnyButton) 1259 if (MEvent.button == AnyButton)
1306 button_number = 3; 1260 button_number = 3;
1307 else 1261 else
1308 { 1262 {
… …
1354 x + 1, 1308 x + 1,
1355 y + 1); 1309 y + 1);
1356#endif 1310#endif
1357 1311
1358 tt_printf ("\033[M%c%c%c", 1312 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1313 (code + button_number + key_state),
1360 (32 + x + 1), 1314 (32 + x + 1),
1361 (32 + y + 1)); 1315 (32 + y + 1));
1362} 1316}
1363 1317
1364/*{{{ process an X event */ 1318/*{{{ process an X event */
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1380 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1381 focus_out ();
1428 } 1382 }
1429#endif 1383#endif
1430 } 1384 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1385 break;
1436 1386
1437 /* 1387 /*
1438 * XXX: this is not the _current_ arrangement 1388 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1389 * Here's my conclusion:
… …
1472 && ev.xfocus.mode != NotifyGrab) 1422 && ev.xfocus.mode != NotifyGrab)
1473 focus_out (); 1423 focus_out ();
1474 break; 1424 break;
1475 1425
1476 case ConfigureNotify: 1426 case ConfigureNotify:
1427 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1428 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1429 szHint.width, szHint.height);*/
1477 if (ev.xconfigure.window == parent[0]) 1430 if (ev.xconfigure.window == parent[0])
1478 { 1431 {
1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1432 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1480 ; 1433 ;
1481 1434
1482 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1435 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1483 { 1436 {
1484 seen_resize = 1; 1437 seen_resize = 1;
1485 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1438 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1486 } 1439 }
1440 else
1441 {
1442#ifdef HAVE_BG_PIXMAP
1443 if (bgPixmap.window_position_sensitive ())
1444 {
1445 if (mapped)
1446 update_background ();
1447 else
1448 bgPixmap.invalidate ();
1449 }
1450#endif
1451 }
1487 1452
1488 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1489
1490#ifdef TRANSPARENT
1491 if (option (Opt_transparent))
1492 check_our_parents ();
1493#endif
1494 } 1454 }
1495 break; 1455 break;
1496 1456
1497 case PropertyNotify: 1457 case PropertyNotify:
1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1514 case SelectionRequest: 1474 case SelectionRequest:
1515 selection_send (ev.xselectionrequest); 1475 selection_send (ev.xselectionrequest);
1516 break; 1476 break;
1517 1477
1518 case MapNotify: 1478 case MapNotify:
1479#ifdef HAVE_BG_PIXMAP
1480 /* This is needed spcifically to fix the case of no window manager or a
1481 * non-reparenting window manager. In those cases we never get first
1482 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1483 * care of multiplicity of ConfigureNotify events arriwing while WM does
1484 * reparenting.
1485 * We should not render background immidiately, as there could be several
1486 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1487 * by scheduling background redraw as soon as we can, but giving a short
1488 * bit of time for ConfigureNotifies to arrive.
1489 * We should render background PRIOR to drawing any text, but AFTER all
1490 * of ConfigureNotifys for the best results.
1491 */
1492 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1493 update_background_ev.start (0.025);
1494#endif
1519 mapped = 1; 1495 mapped = 1;
1520#ifdef TEXT_BLINK 1496#ifdef TEXT_BLINK
1521 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1497 text_blink_ev.start ();
1522#endif 1498#endif
1523 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1499 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1524 break; 1500 break;
1525 1501
1526 case UnmapNotify: 1502 case UnmapNotify:
… …
1528#ifdef TEXT_BLINK 1504#ifdef TEXT_BLINK
1529 text_blink_ev.stop (); 1505 text_blink_ev.stop ();
1530#endif 1506#endif
1531 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1507 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1532 break; 1508 break;
1533
1534#ifdef TRANSPARENT
1535 case ReparentNotify:
1536 rootwin_cb (ev);
1537 break;
1538#endif /* TRANSPARENT */
1539 1509
1540 case GraphicsExpose: 1510 case GraphicsExpose:
1541 case Expose: 1511 case Expose:
1542 if (ev.xany.window == vt) 1512 if (ev.xany.window == vt)
1543 { 1513 {
1544 do 1514 do
1515 {
1545 scr_expose (ev.xexpose.x, ev.xexpose.y, 1516 scr_expose (ev.xexpose.x, ev.xexpose.y,
1546 ev.xexpose.width, ev.xexpose.height, False); 1517 ev.xexpose.width, ev.xexpose.height, False);
1518 }
1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1519 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1548 1520
1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1550 1522
1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1523 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1524 {
1552 scr_expose (ev.xexpose.x, ev.xexpose.y, 1525 scr_expose (ev.xexpose.x, ev.xexpose.y,
1553 ev.xexpose.width, ev.xexpose.height, False); 1526 ev.xexpose.width, ev.xexpose.height, False);
1527 }
1554 1528
1555 want_refresh = 1; 1529 want_refresh = 1;
1556 } 1530 }
1557 else 1531 else
1558 { 1532 {
… …
1561 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1562 ; 1536 ;
1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1537 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1564 ; 1538 ;
1565 1539
1566 if (isScrollbarWindow (ev.xany.window)) 1540 if (scrollBar.state && ev.xany.window == scrollBar.win)
1567 { 1541 {
1568 scrollBar.setIdle (); 1542 scrollBar.state = STATE_IDLE;
1569 scrollbar_show (0); 1543 scrollBar.show (0);
1570 } 1544 }
1571
1572#ifdef TRANSPARENT
1573 if (am_transparent && ev.xany.window == parent[0])
1574 XClearWindow (dpy, ev.xany.window);
1575#endif
1576 } 1545 }
1577 break; 1546 break;
1578 1547
1579 case MotionNotify: 1548 case MotionNotify:
1580#ifdef POINTER_BLANK 1549#ifdef POINTER_BLANK
1581 if (hidden_pointer) 1550 if (hidden_pointer)
1582 pointer_unblank (); 1551 pointer_unblank ();
1583#endif 1552#endif
1553 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1554 || priv_modes & PrivMode_MouseAnyEvent)
1555 mouse_report (ev.xbutton);
1584 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1556 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1585 break; 1557 break;
1586 1558
1587 if (ev.xany.window == vt) 1559 if (ev.xany.window == vt)
1588 { 1560 {
… …
1622 int dist; 1594 int dist;
1623 1595
1624 /* don't clobber the current delay if we are 1596 /* don't clobber the current delay if we are
1625 * already in the middle of scrolling. 1597 * already in the middle of scrolling.
1626 */ 1598 */
1627 if (!sel_scroll_ev.active) 1599 if (!sel_scroll_ev.is_active ())
1628 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1600 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1629 1601
1630 /* save the event params so we can highlight 1602 /* save the event params so we can highlight
1631 * the selection in the pending-scroll loop 1603 * the selection in the pending-scroll loop
1632 */ 1604 */
1633 selection_save_x = ev.xbutton.x; 1605 selection_save_x = ev.xbutton.x;
… …
1655 else 1627 else
1656 { 1628 {
1657 /* we are within the text window, so we 1629 /* we are within the text window, so we
1658 * shouldn't be scrolling 1630 * shouldn't be scrolling
1659 */ 1631 */
1660 if (sel_scroll_ev.active)
1661 sel_scroll_ev.stop(); 1632 sel_scroll_ev.stop();
1662 } 1633 }
1663#endif 1634#endif
1664#ifdef MOUSE_THRESHOLD 1635#ifdef MOUSE_THRESHOLD
1665 } 1636 }
1666#endif 1637#endif
1667 } 1638 }
1668 } 1639 }
1669 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1640 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1670 { 1641 {
1671 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1642 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1672 MotionNotify, &ev)) 1643 MotionNotify, &ev))
1673 ; 1644 ;
1674 1645
… …
1676 &unused_root, &unused_child, 1647 &unused_root, &unused_child,
1677 &unused_root_x, &unused_root_y, 1648 &unused_root_x, &unused_root_y,
1678 &ev.xbutton.x, &ev.xbutton.y, 1649 &ev.xbutton.x, &ev.xbutton.y,
1679 &unused_mask); 1650 &unused_mask);
1680 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1651 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1681 scrollbar_size ()); 1652 scrollBar.size ());
1682 want_refresh = 1; 1653 want_refresh = 1;
1683 refresh_limit = 0;
1684 scrollbar_show (1); 1654 scrollBar.show (1);
1685 } 1655 }
1686 break; 1656 break;
1687 } 1657 }
1688 1658
1689#if defined(CURSOR_BLINK) 1659#if defined(CURSOR_BLINK)
… …
1693 { 1663 {
1694 hidden_cursor = 0; 1664 hidden_cursor = 0;
1695 want_refresh = 1; 1665 want_refresh = 1;
1696 } 1666 }
1697 1667
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1668 cursor_blink_ev.again ();
1699 } 1669 }
1700#endif 1670#endif
1701 1671
1702#if defined(POINTER_BLANK) 1672#if defined(POINTER_BLANK)
1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1673 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1710 1680
1711 if (ev.type == KeyPress && hidden_pointer == 0) 1681 if (ev.type == KeyPress && hidden_pointer == 0)
1712 pointer_blank (); 1682 pointer_blank ();
1713 } 1683 }
1714#endif 1684#endif
1685
1686 refresh_check ();
1687}
1688
1689void
1690rxvt_term::set_urgency (bool enable)
1691{
1692 if (enable == urgency_hint)
1693 return;
1694
1695 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1696 {
1697 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1698 XSetWMHints (dpy, parent[0], h);
1699 urgency_hint = enable;
1700 }
1715} 1701}
1716 1702
1717void 1703void
1718rxvt_term::focus_in () 1704rxvt_term::focus_in ()
1719{ 1705{
1720 if (!focus) 1706 if (!focus)
1721 { 1707 {
1722 focus = 1; 1708 focus = 1;
1723 want_refresh = 1; 1709 want_refresh = 1;
1724 1710
1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1726
1727#if USE_XIM 1711#if USE_XIM
1728 if (Input_Context != NULL) 1712 if (Input_Context != NULL)
1729 { 1713 {
1730 IMSetPosition (); 1714 IMSetPosition ();
1731 XSetICFocus (Input_Context); 1715 XSetICFocus (Input_Context);
1732 } 1716 }
1733#endif 1717#endif
1734#if CURSOR_BLINK 1718#if CURSOR_BLINK
1735 if (option (Opt_cursorBlink)) 1719 if (option (Opt_cursorBlink))
1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1720 cursor_blink_ev.again ();
1737#endif 1721#endif
1738#if OFF_FOCUS_FADING 1722#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1723 if (rs[Rs_fade])
1740 { 1724 {
1741 pix_colors = pix_colors_focused; 1725 pix_colors = pix_colors_focused;
1742 scr_recolour (); 1726 scr_recolour ();
1743 } 1727 }
1744#endif 1728#endif
1745#if ENABLE_FRILLS 1729#if ENABLE_FRILLS
1746 if (option (Opt_urgentOnBell)) 1730 if (option (Opt_urgentOnBell))
1747 { 1731 set_urgency (0);
1748 XWMHints *h;
1749
1750 h = XGetWMHints(dpy, parent[0]);
1751 if (h != NULL)
1752 {
1753 h->flags &= ~XUrgencyHint;
1754 XSetWMHints(dpy, parent[0], h);
1755 }
1756 }
1757#endif 1732#endif
1733
1734 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1758 } 1735 }
1759} 1736}
1760 1737
1761void 1738void
1762rxvt_term::focus_out () 1739rxvt_term::focus_out ()
… …
1764 if (focus) 1741 if (focus)
1765 { 1742 {
1766 focus = 0; 1743 focus = 0;
1767 want_refresh = 1; 1744 want_refresh = 1;
1768 1745
1769 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1746#if ENABLE_FRILLS
1770 1747 if (option (Opt_urgentOnBell))
1748 set_urgency (0);
1749#endif
1771#if ENABLE_FRILLS || ISO_14755 1750#if ENABLE_FRILLS || ISO_14755
1772 if (iso14755buf) 1751 if (iso14755buf)
1773 { 1752 {
1774 iso14755buf = 0; 1753 iso14755buf = 0;
1775# if ENABLE_OVERLAY 1754# if ISO_14755
1776 scr_overlay_off (); 1755 scr_overlay_off ();
1777# endif 1756# endif
1778 } 1757 }
1779#endif 1758#endif
1780#if USE_XIM 1759#if USE_XIM
… …
1782 XUnsetICFocus (Input_Context); 1761 XUnsetICFocus (Input_Context);
1783#endif 1762#endif
1784#if CURSOR_BLINK 1763#if CURSOR_BLINK
1785 if (option (Opt_cursorBlink)) 1764 if (option (Opt_cursorBlink))
1786 cursor_blink_ev.stop (); 1765 cursor_blink_ev.stop ();
1766
1787 hidden_cursor = 0; 1767 hidden_cursor = 0;
1788#endif 1768#endif
1789#if OFF_FOCUS_FADING 1769#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade]) 1770 if (rs[Rs_fade])
1791 { 1771 {
1792 pix_colors = pix_colors_unfocused; 1772 pix_colors = pix_colors_unfocused;
1793 scr_recolour (); 1773 scr_recolour ();
1794 } 1774 }
1795#endif 1775#endif
1776
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1796 } 1778 }
1797} 1779}
1798 1780
1799void 1781void
1800rxvt_term::update_fade_color (unsigned int idx) 1782rxvt_term::update_fade_color (unsigned int idx)
… …
1807 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1789 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1808 } 1790 }
1809#endif 1791#endif
1810} 1792}
1811 1793
1812#if TRANSPARENT || ENABLE_PERL 1794#if ENABLE_TRANSPARENCY || ENABLE_PERL
1813void 1795void
1814rxvt_term::rootwin_cb (XEvent &ev) 1796rxvt_term::rootwin_cb (XEvent &ev)
1815{ 1797{
1816 make_current (); 1798 make_current ();
1817 1799
1818 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1800 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1819 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1801 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1820 return; 1802 return;
1821 1803
1822# if TRANSPARENT 1804# if ENABLE_TRANSPARENCY
1823 switch (ev.type) 1805 switch (ev.type)
1824 { 1806 {
1825 case PropertyNotify: 1807 case PropertyNotify:
1826 /* 1808 /*
1827 * if user used some Esetroot compatible prog to set the root bg, 1809 * if user used some Esetroot compatible prog to set the root bg,
1828 * use the property to determine the pixmap. We use it later on. 1810 * use the property to determine the pixmap. We use it later on.
1829 */ 1811 */
1830 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1812 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1831 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1813 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1832 return; 1814 {
1815 bgPixmap.set_root_pixmap ();
1816 update_background ();
1817 }
1833 1818
1834 /* FALLTHROUGH */
1835 case ReparentNotify:
1836 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1837 want_refresh = want_full_refresh = 1;
1838 break; 1819 break;
1839 } 1820 }
1840# endif 1821# endif
1822
1823 refresh_check ();
1841} 1824}
1842#endif 1825#endif
1843 1826
1844void 1827void
1845rxvt_term::button_press (XButtonEvent &ev) 1828rxvt_term::button_press (XButtonEvent &ev)
… …
1900 mouse_report (ev); 1883 mouse_report (ev);
1901 } 1884 }
1902#else 1885#else
1903 MEvent.button = ev.button; 1886 MEvent.button = ev.button;
1904 mouse_report (ev); 1887 mouse_report (ev);
1905#endif /* MOUSE_REPORT_DOUBLECLICK */ 1888#endif /* MOUSE_REPORT_DOUBLECLICK */
1906 1889
1907 } 1890 }
1908 else 1891 else
1909 { 1892 {
1910 if (ev.button != MEvent.button) 1893 if (ev.button != MEvent.button)
… …
1958 } 1941 }
1959 1942
1960 /* 1943 /*
1961 * Scrollbar window processing of button press 1944 * Scrollbar window processing of button press
1962 */ 1945 */
1963 if (isScrollbarWindow (ev.window)) 1946 if (scrollBar.state && ev.window == scrollBar.win)
1964 { 1947 {
1965 scrollBar.setIdle (); 1948 page_dirn direction = NO_DIR;
1949
1950 if (scrollBar.upButton (ev.y))
1951 direction = UP; /* up */
1952 else if (scrollBar.dnButton (ev.y))
1953 direction = DN; /* down */
1954
1955 scrollBar.state = STATE_IDLE;
1966 /* 1956 /*
1967 * Rxvt-style scrollbar: 1957 * Rxvt-style scrollbar:
1968 * move up if mouse is above slider 1958 * move up if mouse is above slider
1969 * move dn if mouse is below slider 1959 * move dn if mouse is below slider
1970 * 1960 *
… …
1979 /* 1969 /*
1980 * Mouse report disabled scrollbar: 1970 * Mouse report disabled scrollbar:
1981 * arrow buttons - send up/down 1971 * arrow buttons - send up/down
1982 * click on scrollbar - send pageup/down 1972 * click on scrollbar - send pageup/down
1983 */ 1973 */
1984 if ((scrollBar.style == R_SB_NEXT 1974 if (direction == UP)
1985 && scrollbarnext_upButton (ev.y))
1986 || (scrollBar.style == R_SB_RXVT
1987 && scrollbarrxvt_upButton (ev.y)))
1988 tt_printf ("\033[A"); 1975 tt_printf ("\033[A");
1989 else if ((scrollBar.style == R_SB_NEXT 1976 else if (direction == DN)
1990 && scrollbarnext_dnButton (ev.y))
1991 || (scrollBar.style == R_SB_RXVT
1992 && scrollbarrxvt_dnButton (ev.y)))
1993 tt_printf ("\033[B"); 1977 tt_printf ("\033[B");
1994 else 1978 else
1995 switch (ev.button) 1979 switch (ev.button)
1996 { 1980 {
1997 case Button2: 1981 case Button2:
… …
2004 tt_printf ("\033[5~"); 1988 tt_printf ("\033[5~");
2005 break; 1989 break;
2006 } 1990 }
2007 } 1991 }
2008 else 1992 else
2009#endif /* NO_SCROLLBAR_REPORT */ 1993#endif /* NO_SCROLLBAR_REPORT */
2010
2011 {
2012 char upordown = 0;
2013
2014 if (scrollBar.style == R_SB_NEXT)
2015 { 1994 {
2016 if (scrollbarnext_upButton (ev.y)) 1995 if (direction != NO_DIR)
2017 upordown = -1; /* up */
2018 else if (scrollbarnext_dnButton (ev.y))
2019 upordown = 1; /* down */
2020 }
2021 else if (scrollBar.style == R_SB_RXVT)
2022 {
2023 if (scrollbarrxvt_upButton (ev.y))
2024 upordown = -1; /* up */
2025 else if (scrollbarrxvt_dnButton (ev.y))
2026 upordown = 1; /* down */
2027 }
2028 if (upordown)
2029 { 1996 {
2030#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1998 if (!cont_scroll_ev.is_active ())
2031 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1999 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2032#endif 2000#endif
2033 if (scr_page (upordown < 0 ? UP : DN, 1)) 2001 if (scr_page (direction, 1))
2034 { 2002 {
2035 if (upordown < 0) 2003 if (direction == UP)
2036 scrollBar.setUp (); 2004 scrollBar.state = STATE_UP;
2037 else 2005 else
2038 scrollBar.setDn (); 2006 scrollBar.state = STATE_DOWN;
2039 } 2007 }
2040 } 2008 }
2041 else 2009 else
2042 switch (ev.button) 2010 switch (ev.button)
2043 { 2011 {
2044 case Button2: 2012 case Button2:
2045 switch (scrollbar_align) 2013 switch (scrollBar.align)
2046 { 2014 {
2047 case R_SB_ALIGN_TOP: 2015 case R_SB_ALIGN_TOP:
2048 csrO = 0; 2016 csrO = 0;
2049 break; 2017 break;
2050 case R_SB_ALIGN_CENTRE: 2018 case R_SB_ALIGN_CENTRE:
… …
2056 } 2024 }
2057 2025
2058 if (scrollBar.style == R_SB_XTERM 2026 if (scrollBar.style == R_SB_XTERM
2059 || scrollbar_above_slider (ev.y) 2027 || scrollbar_above_slider (ev.y)
2060 || scrollbar_below_slider (ev.y)) 2028 || scrollbar_below_slider (ev.y))
2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2029 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2062 2030
2063 scrollBar.setMotion (); 2031 scrollBar.state = STATE_MOTION;
2064 break; 2032 break;
2065 2033
2066 case Button1: 2034 case Button1:
2067 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2035 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2068 csrO = ev.y - scrollBar.top; 2036 csrO = ev.y - scrollBar.top;
2069 /* FALLTHROUGH */ 2037 /* FALLTHROUGH */
2070 2038
2071 case Button3: 2039 case Button3:
2072 if (scrollBar.style != R_SB_XTERM) 2040 if (scrollBar.style != R_SB_XTERM)
… …
2082 scr_page (DN, nrow - 1); 2050 scr_page (DN, nrow - 1);
2083# else 2051# else
2084 scr_page (DN, nrow / 4); 2052 scr_page (DN, nrow / 4);
2085# endif 2053# endif
2086 else 2054 else
2087 scrollBar.setMotion (); 2055 scrollBar.state = STATE_MOTION;
2088 } 2056 }
2089 else 2057 else
2090 { 2058 {
2091 scr_page ((ev.button == Button1 ? DN : UP), 2059 scr_page ((ev.button == Button1 ? DN : UP),
2092 (nrow 2060 (nrow
2093 * scrollbar_position (ev.y) 2061 * scrollbar_position (ev.y)
2094 / scrollbar_size ())); 2062 / scrollBar.size ()));
2095 } 2063 }
2096 2064
2097 break; 2065 break;
2098 } 2066 }
2099 } 2067 }
… …
2109 2077
2110 csrO = 0; /* reset csr Offset */ 2078 csrO = 0; /* reset csr Offset */
2111 if (!bypass_keystate) 2079 if (!bypass_keystate)
2112 reportmode = !! (priv_modes & PrivMode_mouse_report); 2080 reportmode = !! (priv_modes & PrivMode_mouse_report);
2113 2081
2114 if (scrollbar_isUpDn ()) 2082 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2115 { 2083 {
2116 scrollBar.setIdle (); 2084 scrollBar.state = STATE_IDLE;
2117 scrollbar_show (0); 2085 scrollBar.show (0);
2118 } 2086 }
2119 2087
2120#ifdef SELECTION_SCROLLING 2088#ifdef SELECTION_SCROLLING
2121 if (sel_scroll_ev.active)
2122 sel_scroll_ev.stop(); 2089 sel_scroll_ev.stop();
2123#endif 2090#endif
2124 2091
2125 if (ev.window == vt) 2092 if (ev.window == vt)
2126 { 2093 {
2127 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2094 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2151 mouse_report (ev); 2118 mouse_report (ev);
2152 } 2119 }
2153#else /* MOUSE_REPORT_DOUBLECLICK */ 2120#else /* MOUSE_REPORT_DOUBLECLICK */
2154 MEvent.button = AnyButton; 2121 MEvent.button = AnyButton;
2155 mouse_report (ev); 2122 mouse_report (ev);
2156#endif /* MOUSE_REPORT_DOUBLECLICK */ 2123#endif /* MOUSE_REPORT_DOUBLECLICK */
2157 return; 2124 return;
2158 } 2125 }
2159 2126
2160 /* 2127 /*
2161 * dumb hack to compensate for the failure of click-and-drag 2128 * dumb hack to compensate for the failure of click-and-drag
… …
2199 { 2166 {
2200 mouse_slip_wheel_speed += v ? -1 : 1; 2167 mouse_slip_wheel_speed += v ? -1 : 1;
2201 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2168 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2202 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2169 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2203 2170
2204 if (slip_wheel_ev.at < NOW) 2171 if (!slip_wheel_ev.is_active ())
2205 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2172 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2206
2207 slip_wheel_ev.start ();
2208 } 2173 }
2209 else 2174 else
2175# endif
2210 { 2176 {
2211# endif
2212 scr_page (v, i); 2177 scr_page (v, i);
2213 scrollbar_show (1); 2178 scrollBar.show (1);
2214# ifdef MOUSE_SLIP_WHEELING
2215 } 2179 }
2216# endif
2217 } 2180 }
2218 break; 2181 break;
2219#endif 2182#endif
2220 } 2183 }
2221 } 2184 }
2222} 2185}
2223 2186
2224#ifdef TRANSPARENT
2225#if TINTING
2226/* taken from aterm-0.4.2 */
2227
2228typedef uint32_t RUINT32T;
2229
2230void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2231{
2232 int sh_r, sh_g, sh_b;
2233 RUINT32T mask_r, mask_g, mask_b;
2234 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2235 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2236 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2237 int i;
2238
2239 Visual *visual = term->visual;
2240
2241 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2242
2243 /* for convenience */
2244 mask_r = visual->red_mask;
2245 mask_g = visual->green_mask;
2246 mask_b = visual->blue_mask;
2247
2248 /* boring lookup table pre-initialization */
2249 switch (srcImage->bits_per_pixel) {
2250 case 15:
2251 if ((mask_r != 0x7c00) ||
2252 (mask_g != 0x03e0) ||
2253 (mask_b != 0x001f))
2254 return;
2255 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2256 lookup_r = lookup;
2257 lookup_g = lookup+32;
2258 lookup_b = lookup+32+32;
2259 sh_r = 10;
2260 sh_g = 5;
2261 sh_b = 0;
2262 break;
2263 case 16:
2264 if ((mask_r != 0xf800) ||
2265 (mask_g != 0x07e0) ||
2266 (mask_b != 0x001f))
2267 return;
2268 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2269 lookup_r = lookup;
2270 lookup_g = lookup+32;
2271 lookup_b = lookup+32+64;
2272 sh_r = 11;
2273 sh_g = 5;
2274 sh_b = 0;
2275 break;
2276 case 24:
2277 if ((mask_r != 0xff0000) ||
2278 (mask_g != 0x00ff00) ||
2279 (mask_b != 0x0000ff))
2280 return;
2281 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2282 lookup_r = lookup;
2283 lookup_g = lookup+256;
2284 lookup_b = lookup+256+256;
2285 sh_r = 16;
2286 sh_g = 8;
2287 sh_b = 0;
2288 break;
2289 case 32:
2290 if ((mask_r != 0xff0000) ||
2291 (mask_g != 0x00ff00) ||
2292 (mask_b != 0x0000ff))
2293 return;
2294 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2295 lookup_r = lookup;
2296 lookup_g = lookup+256;
2297 lookup_b = lookup+256+256;
2298 sh_r = 16;
2299 sh_g = 8;
2300 sh_b = 0;
2301 break;
2302 default:
2303 return; /* we do not support this color depth */
2304 }
2305
2306 /* prepare limits for color transformation (each channel is handled separately) */
2307 if (shade < 0) {
2308 shade = -shade;
2309 if (shade < 0) shade = 0;
2310 if (shade > 100) shade = 100;
2311
2312 lower_lim_r = 65535-rm;
2313 lower_lim_g = 65535-gm;
2314 lower_lim_b = 65535-bm;
2315
2316 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2317 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2318 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2319
2320 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2321 } else {
2322 if (shade < 0) shade = 0;
2323 if (shade > 100) shade = 100;
2324
2325 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2326
2327 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2328 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2329 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2330 }
2331
2332 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2333 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2334 {
2335 unsigned int tmp;
2336
2337 tmp = lower_lim_r;
2338 lower_lim_r = lower_lim_b;
2339 lower_lim_b = tmp;
2340
2341 tmp = upper_lim_r;
2342 upper_lim_r = upper_lim_b;
2343 upper_lim_b = tmp;
2344 }
2345
2346 /* fill our lookup tables */
2347 for (i = 0; i <= mask_r>>sh_r; i++)
2348 {
2349 RUINT32T tmp;
2350 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2351 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2352 lookup_r[i] = (tmp/65535)<<sh_r;
2353 }
2354 for (i = 0; i <= mask_g>>sh_g; i++)
2355 {
2356 RUINT32T tmp;
2357 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2358 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2359 lookup_g[i] = (tmp/65535)<<sh_g;
2360 }
2361 for (i = 0; i <= mask_b>>sh_b; i++)
2362 {
2363 RUINT32T tmp;
2364 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2365 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2366 lookup_b[i] = (tmp/65535)<<sh_b;
2367 }
2368
2369 /* apply table to input image (replacing colors by newly calculated ones) */
2370 switch (srcImage->bits_per_pixel)
2371 {
2372 case 15:
2373 {
2374 unsigned short *p1, *pf, *p, *pl;
2375 p1 = (unsigned short *) srcImage->data;
2376 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2377 while (p1 < pf)
2378 {
2379 p = p1;
2380 pl = p1 + srcImage->width;
2381 for (; p < pl; p++)
2382 {
2383 *p = lookup_r[(*p & 0x7c00)>>10] |
2384 lookup_g[(*p & 0x03e0)>> 5] |
2385 lookup_b[(*p & 0x001f)];
2386 }
2387 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2388 }
2389 break;
2390 }
2391 case 16:
2392 {
2393 unsigned short *p1, *pf, *p, *pl;
2394 p1 = (unsigned short *) srcImage->data;
2395 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2396 while (p1 < pf)
2397 {
2398 p = p1;
2399 pl = p1 + srcImage->width;
2400 for (; p < pl; p++)
2401 {
2402 *p = lookup_r[(*p & 0xf800)>>11] |
2403 lookup_g[(*p & 0x07e0)>> 5] |
2404 lookup_b[(*p & 0x001f)];
2405 }
2406 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2407 }
2408 break;
2409 }
2410 case 24:
2411 {
2412 unsigned char *p1, *pf, *p, *pl;
2413 p1 = (unsigned char *) srcImage->data;
2414 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2415 while (p1 < pf)
2416 {
2417 p = p1;
2418 pl = p1 + srcImage->width * 3;
2419 for (; p < pl; p += 3)
2420 {
2421 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2422 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2423 p[2] = lookup_r[(p[2] & 0x0000ff)];
2424 }
2425 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2426 }
2427 break;
2428 }
2429 case 32:
2430 {
2431 RUINT32T *p1, *pf, *p, *pl;
2432 p1 = (RUINT32T *) srcImage->data;
2433 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2434
2435 while (p1 < pf)
2436 {
2437 p = p1;
2438 pl = p1 + srcImage->width;
2439 for (; p < pl; p++)
2440 {
2441 *p = lookup_r[(*p & 0xff0000)>>16] |
2442 lookup_g[(*p & 0x00ff00)>> 8] |
2443 lookup_b[(*p & 0x0000ff)] |
2444 (*p & ~0xffffff);
2445 }
2446 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2447 }
2448 break;
2449 }
2450 }
2451
2452 free (lookup);
2453}
2454#endif
2455
2456/*
2457 * Check our parents are still who we think they are.
2458 * Do transparency updates if required
2459 */
2460int
2461rxvt_term::check_our_parents ()
2462{
2463 int i, pchanged, aformat, have_pixmap, rootdepth;
2464 unsigned long nitems, bytes_after;
2465 Atom atype;
2466 unsigned char *prop = NULL;
2467 Window root, oldp, *list;
2468 Pixmap rootpixmap = None;
2469 XWindowAttributes wattr, wrootattr;
2470
2471 pchanged = 0;
2472
2473 if (!option (Opt_transparent))
2474 return pchanged; /* Don't try any more */
2475
2476 XGetWindowAttributes (dpy, display->root, &wrootattr);
2477 rootdepth = wrootattr.depth;
2478
2479 XGetWindowAttributes (dpy, parent[0], &wattr);
2480
2481 if (rootdepth != wattr.depth)
2482 {
2483 if (am_transparent)
2484 {
2485 pchanged = 1;
2486 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2487 am_transparent = am_pixmap_trans = 0;
2488 }
2489
2490 return pchanged; /* Don't try any more */
2491 }
2492
2493 /* Get all X ops out of the queue so that our information is up-to-date. */
2494 XSync (dpy, False);
2495
2496 /*
2497 * Make the frame window set by the window manager have
2498 * the root background. Some window managers put multiple nested frame
2499 * windows for each client, so we have to take care about that.
2500 */
2501 i = (xa[XA_XROOTPMAP_ID]
2502 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2503 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2504 &nitems, &bytes_after, &prop) == Success);
2505
2506 if (!i || prop == NULL)
2507 i = (xa[XA_ESETROOT_PMAP_ID]
2508 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2509 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2510 &nitems, &bytes_after, &prop) == Success);
2511
2512 if (!i || prop == NULL
2513#if TINTING
2514 || !ISSET_PIXCOLOR (Color_tint)
2515#endif
2516 )
2517 have_pixmap = 0;
2518 else
2519 {
2520 have_pixmap = 1;
2521 rootpixmap = *(Pixmap *)prop;
2522 XFree (prop);
2523 }
2524
2525 if (have_pixmap)
2526 {
2527 /*
2528 * Copy display->root pixmap transparency
2529 */
2530 int sx, sy, nx, ny;
2531 unsigned int nw, nh;
2532 Window cr;
2533 XImage *image;
2534 GC gc;
2535 XGCValues gcvalue;
2536
2537 XTranslateCoordinates (dpy, parent[0], display->root,
2538 0, 0, &sx, &sy, &cr);
2539 nw = (unsigned int)szHint.width;
2540 nh = (unsigned int)szHint.height;
2541 nx = ny = 0;
2542
2543 if (sx < 0)
2544 {
2545 nw += sx;
2546 nx = -sx;
2547 sx = 0;
2548 }
2549
2550 if (sy < 0)
2551 {
2552 nh += sy;
2553 ny = -sy;
2554 sy = 0;
2555 }
2556
2557 min_it (nw, (unsigned int) (wrootattr.width - sx));
2558 min_it (nh, (unsigned int) (wrootattr.height - sy));
2559
2560 XSync (dpy, False);
2561 allowedxerror = -1;
2562 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2563
2564 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2565 /* XXX: may need a delay here? */
2566 allowedxerror = 0;
2567
2568 if (image == NULL)
2569 {
2570 if (am_transparent && am_pixmap_trans)
2571 {
2572 pchanged = 1;
2573 if (pixmap != None)
2574 {
2575 XFreePixmap (dpy, pixmap);
2576 pixmap = None;
2577 }
2578 }
2579
2580 am_pixmap_trans = 0;
2581 }
2582 else
2583 {
2584 if (pixmap != None)
2585 XFreePixmap (dpy, pixmap);
2586
2587#if TINTING
2588 if (ISSET_PIXCOLOR (Color_tint))
2589 {
2590 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2591
2592 rgba c;
2593 pix_colors_focused [Color_tint].get (c);
2594
2595 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2596 }
2597#endif
2598
2599 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2600 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2601 XPutImage (dpy, pixmap, gc, image, 0, 0,
2602 nx, ny, image->width, image->height);
2603 XFreeGC (dpy, gc);
2604 XDestroyImage (image);
2605 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2606 XClearWindow (dpy, parent[0]);
2607
2608 if (!am_transparent || !am_pixmap_trans)
2609 pchanged = 1;
2610
2611 am_transparent = am_pixmap_trans = 1;
2612 }
2613 }
2614
2615 if (am_pixmap_trans)
2616 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2617 else
2618 {
2619 unsigned int n;
2620 /*
2621 * InheritPixmap transparency
2622 */
2623 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2624 {
2625 oldp = parent[i];
2626 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2627 XFree (list);
2628
2629 if (parent[i] == display->root)
2630 {
2631 if (oldp != None)
2632 pchanged = 1;
2633
2634 break;
2635 }
2636
2637 if (oldp != parent[i])
2638 pchanged = 1;
2639 }
2640
2641 n = 0;
2642
2643 if (pchanged)
2644 for (; n < (unsigned int)i; n++)
2645 {
2646 XGetWindowAttributes (dpy, parent[n], &wattr);
2647
2648 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2649 {
2650 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2651 break;
2652 }
2653 }
2654
2655 if (n > (sizeof (parent) / sizeof (parent[0])))
2656 {
2657 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2658 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2659 am_transparent = 0;
2660 /* XXX: also turn off Opt_transparent? */
2661 }
2662 else
2663 {
2664 for (n = 0; n < (unsigned int)i; n++)
2665 {
2666 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2667 XClearWindow (dpy, parent[n]);
2668 }
2669
2670 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2671 am_transparent = 1;
2672 }
2673
2674 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2675 parent[i] = None;
2676 }
2677
2678 if (scrollBar.win)
2679 {
2680 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2681 scrollBar.setIdle ();
2682 scrollbar_show (0);
2683 }
2684
2685 if (am_transparent)
2686 {
2687 want_refresh = want_full_refresh = 1;
2688 if (am_pixmap_trans)
2689 flush ();
2690 }
2691
2692 return pchanged;
2693}
2694#endif
2695
2696/*}}} */ 2187/*}}} */
2697 2188
2698bool 2189void
2699rxvt_term::cmd_parse () 2190rxvt_term::cmd_parse ()
2700{ 2191{
2701 bool flag = false;
2702 wchar_t ch = NOCHAR; 2192 wchar_t ch = NOCHAR;
2703 char *seq_begin; // remember start of esc-sequence here 2193 char *seq_begin; // remember start of esc-sequence here
2704 2194
2705 for (;;) 2195 for (;;)
2706 { 2196 {
2707 if (ch == NOCHAR) 2197 if (expect_false (ch == NOCHAR))
2708 { 2198 {
2709 seq_begin = cmdbuf_ptr; 2199 seq_begin = cmdbuf_ptr;
2710 ch = next_char (); 2200 ch = next_char ();
2711 2201
2712 if (ch == NOCHAR) 2202 if (ch == NOCHAR)
2713 break; 2203 break;
2714 } 2204 }
2715 2205
2716 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2206 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2717 { 2207 {
2718 if (!seen_input) 2208 if (expect_false (!seen_input))
2719 { 2209 {
2720 seen_input = 1; 2210 seen_input = 1;
2721 // many badly-written programs (e.g. jed) contain a race condition: 2211 // many badly-written programs (e.g. jed) contain a race condition:
2722 // they first read the screensize and then install a SIGWINCH handler. 2212 // they first read the screensize and then install a SIGWINCH handler.
2723 // some window managers resize the window early, and these programs 2213 // some window managers resize the window early, and these programs
… …
2736 wchar_t *str = buf; 2226 wchar_t *str = buf;
2737 wchar_t *eol = str + min (ncol, UBUFSIZ); 2227 wchar_t *eol = str + min (ncol, UBUFSIZ);
2738 2228
2739 for (;;) 2229 for (;;)
2740 { 2230 {
2741 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2231 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2742 break; 2232 break;
2743 2233
2744 *str++ = ch; 2234 *str++ = ch;
2745 2235
2746 if (ch == C0_LF || str >= eol) 2236 if (expect_false (ch == C0_LF || str >= eol))
2747 { 2237 {
2748 if (ch == C0_LF) 2238 if (ch == C0_LF)
2749 nlines++; 2239 nlines++;
2750 2240
2751 refresh_count++; 2241 refresh_count++;
2752 2242
2753 if (!option (Opt_jumpScroll) 2243 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2754 || (refresh_count >= refresh_limit * (nrow - 1)))
2755 { 2244 {
2756 refreshnow = true;
2757 refresh_count = 0; 2245 refresh_count = 0;
2246
2247 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2248 {
2249 refreshnow = true;
2758 ch = NOCHAR; 2250 ch = NOCHAR;
2759 break; 2251 break;
2252 }
2760 } 2253 }
2761 2254
2762 // scr_add_lines only works for nlines <= nrow - 1. 2255 // scr_add_lines only works for nlines <= nrow - 1.
2763 if (nlines >= nrow - 1) 2256 if (nlines >= nrow - 1)
2764 { 2257 {
… …
2792 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2285 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2793 scr_add_lines (buf, str - buf, nlines); 2286 scr_add_lines (buf, str - buf, nlines);
2794 2287
2795 /* 2288 /*
2796 * If there have been a lot of new lines, then update the screen 2289 * If there have been a lot of new lines, then update the screen
2797 * What the heck I'll cheat and only refresh less than every page-full. 2290 * What the heck we'll cheat and only refresh less than every page-full.
2798 * the number of pages between refreshes is refresh_limit, which 2291 * if skipScroll is enabled.
2799 * is incremented here because we must be doing flat-out scrolling.
2800 */ 2292 */
2801 if (refreshnow) 2293 if (refreshnow)
2802 { 2294 {
2803 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2804 refresh_limit++;
2805 else
2806 {
2807 flag = true;
2808 //TODO: due to popular request, implement "skipscroll" option here
2809 scr_refresh (); 2295 scr_refresh ();
2810 want_refresh = 1; 2296 want_refresh = 1;
2811 }
2812 } 2297 }
2813
2814 } 2298 }
2815 else 2299 else
2816 { 2300 {
2817 try 2301 try
2818 { 2302 {
… …
2826 } 2310 }
2827 2311
2828 ch = NOCHAR; 2312 ch = NOCHAR;
2829 } 2313 }
2830 } 2314 }
2831
2832 return flag;
2833} 2315}
2834 2316
2835// read the next character 2317// read the next character
2836wchar_t 2318wchar_t
2837rxvt_term::next_char () NOTHROW 2319rxvt_term::next_char () NOTHROW
2838{ 2320{
2839 while (cmdbuf_ptr < cmdbuf_endp) 2321 while (cmdbuf_ptr < cmdbuf_endp)
2840 { 2322 {
2841 // assume 7-bit to be ascii ALWAYS 2323 // assume 7-bit to be ascii ALWAYS
2842 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2324 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2843 return *cmdbuf_ptr++; 2325 return *cmdbuf_ptr++;
2844 2326
2845 wchar_t wc; 2327 wchar_t wc;
2846 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2328 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2847 2329
… …
2851 cmdbuf_ptr = cmdbuf_endp; 2333 cmdbuf_ptr = cmdbuf_endp;
2852 break; 2334 break;
2853 } 2335 }
2854 2336
2855 if (len == (size_t)-1) 2337 if (len == (size_t)-1)
2338 {
2339 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2856 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2341 }
2857 2342
2858 // assume wchar == unicode 2343 // assume wchar == unicode
2859 cmdbuf_ptr += len; 2344 cmdbuf_ptr += len;
2860 return wc & UNICODE_MASK; 2345 return wc & UNICODE_MASK;
2861 } 2346 }
… …
2905/*----------------------------------------------------------------------*/ 2390/*----------------------------------------------------------------------*/
2906#ifdef PRINTPIPE 2391#ifdef PRINTPIPE
2907FILE * 2392FILE *
2908rxvt_term::popen_printer () 2393rxvt_term::popen_printer ()
2909{ 2394{
2910 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2395 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2911 2396
2912 if (stream == NULL) 2397 if (stream == NULL)
2913 rxvt_warn ("can't open printer pipe, not printing.\n"); 2398 rxvt_warn ("can't open printer pipe, not printing.\n");
2914 2399
2915 return stream; 2400 return stream;
… …
2926 * simulate attached vt100 printer 2411 * simulate attached vt100 printer
2927 */ 2412 */
2928void 2413void
2929rxvt_term::process_print_pipe () 2414rxvt_term::process_print_pipe ()
2930{ 2415{
2931 int done; 2416 FILE *fd = popen_printer ();
2932 FILE *fd;
2933 2417
2934 if ((fd = popen_printer ()) == NULL) 2418 if (!fd)
2935 return; 2419 return;
2936 2420
2937 /* 2421 /*
2938 * Send all input to the printer until either ESC[4i or ESC[?4i 2422 * Send all input to the printer until either ESC[4i or ESC[?4i
2939 * is received. 2423 * is received.
2940 */ 2424 */
2941 for (done = 0; !done;) 2425 for (int done = 0; !done; )
2942 { 2426 {
2943 unsigned char buf[8]; 2427 unsigned char buf[8];
2944 unicode_t ch; 2428 unicode_t ch;
2945 unsigned int i, len; 2429 unsigned int i, len;
2946 2430
… …
2965 { 2449 {
2966 if ((buf[len++] = cmd_getc ()) == 'i') 2450 if ((buf[len++] = cmd_getc ()) == 'i')
2967 break; /* done = 1 */ 2451 break; /* done = 1 */
2968 } 2452 }
2969 } 2453 }
2970 2454
2971 for (i = 0; i < len; i++) 2455 for (i = 0; i < len; i++)
2972 if (putc (buf[i], fd) == EOF) 2456 if (putc (buf[i], fd) == EOF)
2973 { 2457 {
2974 done = 1; 2458 done = 1;
2975 break; 2459 break;
… …
2977 } 2461 }
2978 } 2462 }
2979 2463
2980 pclose_printer (fd); 2464 pclose_printer (fd);
2981} 2465}
2982#endif /* PRINTPIPE */ 2466#endif /* PRINTPIPE */
2983/*}}} */ 2467/*}}} */
2984 2468
2985/* *INDENT-OFF* */ 2469/* *INDENT-OFF* */
2986enum { 2470enum {
2987 C1_40 = 0x40, 2471 C1_40 = 0x40,
… …
3037 process_dcs_seq (); 2521 process_dcs_seq ();
3038 break; 2522 break;
3039 case 0x9b: /* CSI */ 2523 case 0x9b: /* CSI */
3040 process_csi_seq (); 2524 process_csi_seq ();
3041 break; 2525 break;
3042 case 0x9d: /* CSI */ 2526 case 0x9d: /* OSC */
3043 process_osc_seq (); 2527 process_osc_seq ();
3044 break; 2528 break;
3045#endif 2529#endif
3046 } 2530 }
3047} 2531}
… …
3091 break; 2575 break;
3092 case 'Z': /* identify the terminal type */ 2576 case 'Z': /* identify the terminal type */
3093 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2577 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3094 break; 2578 break;
3095 case '<': /* turn off VT52 mode */ 2579 case '<': /* turn off VT52 mode */
3096 PrivMode (0, PrivMode_vt52); 2580 set_privmode (PrivMode_vt52, 0);
3097 break; 2581 break;
3098 case 'F': /* use special graphics character set */ 2582 case 'F': /* use special graphics character set */
3099 case 'G': /* use regular character set */ 2583 case 'G': /* use regular character set */
3100 /* unimplemented */ 2584 /* unimplemented */
3101 break; 2585 break;
… …
3155 scr_forwardindex (); 2639 scr_forwardindex ();
3156 break; 2640 break;
3157#endif 2641#endif
3158 case '=': 2642 case '=':
3159 case '>': 2643 case '>':
3160 PrivMode ((ch == '='), PrivMode_aplKP); 2644 set_privmode (PrivMode_aplKP, ch == '=');
3161 break; 2645 break;
3162 2646
3163 case C1_40: 2647 case C1_40:
3164 cmd_getc (); 2648 cmd_getc ();
3165 break; 2649 break;
… …
3204 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2688 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3205 case C1_SCI: /* ESC Z */ 2689 case C1_SCI: /* ESC Z */
3206 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2690 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3207 break; /* steal obsolete ESC [ c */ 2691 break; /* steal obsolete ESC [ c */
3208 2692
3209 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2693 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3210 case C1_CSI: /* ESC [ */ 2694 case C1_CSI: /* ESC [ */
3211 process_csi_seq (); 2695 process_csi_seq ();
3212 break; 2696 break;
3213 2697
3214 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2698 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3215 case C1_OSC: /* ESC ] */ 2699 case C1_OSC: /* ESC ] */
3216 process_osc_seq (); 2700 process_osc_seq ();
3217 break; 2701 break;
3218 2702
3219 /* 8.3.106: RESET TO INITIAL STATE */ 2703 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3220 case 'c': 2704 case 'c':
3221 mbstate.reset (); 2705 mbstate.reset ();
3222 scr_poweron (); 2706 scr_poweron ();
3223 scrollbar_show (1); 2707 scrollBar.show (1);
3224 break; 2708 break;
3225 2709
3226 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2710 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3227 case 'n': 2711 case 'n':
3228 scr_charset_choose (2); 2712 scr_charset_choose (2);
… …
3273rxvt_term::process_csi_seq () 2757rxvt_term::process_csi_seq ()
3274{ 2758{
3275 unicode_t ch, priv, i; 2759 unicode_t ch, priv, i;
3276 unsigned int nargs, p; 2760 unsigned int nargs, p;
3277 int n, ndef; 2761 int n, ndef;
3278 int arg[ESC_ARGS]; 2762 int arg[ESC_ARGS] = { };
3279 2763
3280 for (nargs = ESC_ARGS; nargs > 0;) 2764 nargs = 0;
3281 arg[--nargs] = 0;
3282 2765
3283 priv = 0; 2766 priv = 0;
3284 ch = cmd_getc (); 2767 ch = cmd_getc ();
3285 if (ch >= '<' && ch <= '?') 2768 if ((ch >= '<' && ch <= '?') || ch == '!')
2769 {
3286 { /* '<' '=' '>' '?' */ 2770 /* '<' '=' '>' '?' '!' */
3287 priv = ch; 2771 priv = ch;
3288 ch = cmd_getc (); 2772 ch = cmd_getc ();
3289 } 2773 }
3290 2774
3291 /* read any numerical arguments */ 2775 /* read any numerical arguments */
… …
3330 switch (priv) 2814 switch (priv)
3331 { 2815 {
3332 case '>': 2816 case '>':
3333 if (ch == CSI_DA) /* secondary device attributes */ 2817 if (ch == CSI_DA) /* secondary device attributes */
3334 { 2818 {
3335 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2819 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3336 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2820 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3337 // 2821 //
3338 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2822 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3339 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2823 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3340 // that we do not support xterm mouse reporting (should be 95 when we do). 2824 // versions.
3341 // 2825 //
3342 tt_printf ("\033[>%d;94;0c", 'U'); 2826 tt_printf ("\033[>%d;95;0c", 'U');
3343 } 2827 }
3344 break; 2828 break;
2829
3345 case '?': 2830 case '?':
3346 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2831 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3347 process_terminal_mode (ch, priv, nargs, arg); 2832 process_terminal_mode (ch, priv, nargs, arg);
3348 break; 2833 break;
2834
2835 case '!':
2836 if (ch == CSI_70)
2837 {
2838 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2839 scr_soft_reset ();
2840
2841 static const int pm_h[] = { 7, 25 };
2842 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2843
2844 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2845 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
3349 } 2846 }
2847 break;
2848 }
2849
3350 return; 2850 return;
3351 } 2851 }
3352 2852
3353 switch (ch) 2853 switch (ch)
3354 { 2854 {
… …
3793 int saveop = op; 3293 int saveop = op;
3794 3294
3795 dLocal (Display *, dpy); 3295 dLocal (Display *, dpy);
3796 3296
3797 assert (str != NULL); 3297 assert (str != NULL);
3798 3298
3799 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3299 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3800 return; 3300 return;
3801 3301
3802 switch (op) 3302 switch (op)
3803 { 3303 {
… …
3865 *buf++ = '\0'; 3365 *buf++ = '\0';
3866 3366
3867 process_color_seq (op, color, name, resp); 3367 process_color_seq (op, color, name, resp);
3868 } 3368 }
3869 break; 3369 break;
3370 case Rxvt_restoreFG:
3870 case XTerm_Color00: 3371 case XTerm_Color00:
3871 process_color_seq (op, Color_fg, str, resp); 3372 process_color_seq (op, Color_fg, str, resp);
3872 break; 3373 break;
3374 case Rxvt_restoreBG:
3873 case XTerm_Color01: 3375 case XTerm_Color01:
3874 process_color_seq (op, Color_bg, str, resp); 3376 process_color_seq (op, Color_bg, str, resp);
3875 break; 3377 break;
3876#ifndef NO_CURSORCOLOR 3378#ifndef NO_CURSORCOLOR
3877 case XTerm_Color_cursor: 3379 case XTerm_Color_cursor:
… …
3898 break; 3400 break;
3899 case URxvt_Color_IT: 3401 case URxvt_Color_IT:
3900 process_color_seq (op, Color_IT, str, resp); 3402 process_color_seq (op, Color_IT, str, resp);
3901 break; 3403 break;
3902#endif 3404#endif
3903#if TRANSPARENT && TINTING 3405#if ENABLE_TRANSPARENCY
3904 case URxvt_Color_tint: 3406 case URxvt_Color_tint:
3905 process_color_seq (op, Color_tint, str, resp); 3407 process_color_seq (op, Color_tint, str, resp);
3408 {
3409 bool changed = false;
3906 3410
3907 check_our_parents (); 3411 if (ISSET_PIXCOLOR (Color_tint))
3412 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3413 else
3414 changed = bgPixmap.unset_tint ();
3908 3415
3909 if (am_transparent) 3416 if (changed)
3910 want_full_refresh = want_refresh = 1; 3417 update_background ();
3418 }
3911 3419
3912 break; 3420 break;
3913#endif 3421#endif
3914 3422
3423#if BG_IMAGE_FROM_FILE
3915 case Rxvt_Pixmap: 3424 case Rxvt_Pixmap:
3916 { 3425 if (!strcmp (str, "?"))
3917 if (*str != ';')
3918 { 3426 {
3919#if XPM_BACKGROUND 3427 char str[256];
3920 scale_pixmap (""); /* reset to default scaling */ 3428
3921 set_bgPixmap (str); /* change pixmap */ 3429 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3922 scr_touch (true); 3430 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3923#endif 3431 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3432 process_xterm_seq (XTerm_title, str, CHAR_ST);
3924 } 3433 }
3925 3434 else
3435 {
3926 int changed = 0; 3436 int changed = 0;
3927 3437
3928 while ((str = strchr (str, ';')) != NULL) 3438 if (*str != ';')
3929 { 3439 {
3440 /* reset to default scaling :*/
3441 bgPixmap.unset_geometry ();
3442 if (bgPixmap.set_file (str)) /* change pixmap */
3443 changed++;
3444 str = strchr (str, ';');
3445 if (str == NULL)
3446 bgPixmap.set_defaultGeometry ();
3447 }
3448
3449 while (str)
3450 {
3930 str++; 3451 str++;
3931#if XPM_BACKGROUND 3452 if (bgPixmap.set_geometry (str))
3932 changed += scale_pixmap (str); 3453 changed++;
3933#endif 3454 str = strchr (str, ';');
3934 } 3455 }
3935 3456
3936 if (changed) 3457 if (changed)
3937 { 3458 update_background ();
3938#ifdef XPM_BACKGROUND
3939 resize_pixmap ();
3940 scr_touch (true);
3941#endif
3942 } 3459 }
3943 }
3944 break; 3460 break;
3945 3461#endif
3946 case Rxvt_restoreFG:
3947 set_window_color (Color_fg, str);
3948 break;
3949 case Rxvt_restoreBG:
3950 set_window_color (Color_bg, str);
3951 break;
3952 3462
3953 case XTerm_logfile: 3463 case XTerm_logfile:
3954 // TODO, when secure mode? 3464 // TODO, when secure mode?
3955 break; 3465 break;
3956 3466
… …
4023 break; 3533 break;
4024#endif 3534#endif
4025 3535
4026#if ENABLE_PERL 3536#if ENABLE_PERL
4027 case URxvt_perl: 3537 case URxvt_perl:
4028 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3538 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
4029 ; // no responses yet
4030 break; 3539 break;
4031#endif 3540#endif
4032 } 3541 }
4033} 3542}
4034/*----------------------------------------------------------------------*/ 3543/*----------------------------------------------------------------------*/
… …
4057 { 3566 {
4058 if (mode == 'r') 3567 if (mode == 'r')
4059 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3568 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4060 else 3569 else
4061 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3570 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4062 PrivMode (state, bit); 3571 set_privmode (bit, state);
4063 } 3572 }
4064 3573
4065 return state; 3574 return state;
4066} 3575}
4067 3576
… …
4071{ 3580{
4072 unsigned int i, j; 3581 unsigned int i, j;
4073 int state; 3582 int state;
4074 3583
4075 static const struct 3584 static const struct
4076 { 3585 {
4077 const int argval; 3586 const int argval;
4078 const unsigned long bit; 3587 const unsigned long bit;
4079 }
4080
4081 argtopriv[] = { 3588 } argtopriv[] = {
4082 { 1, PrivMode_aplCUR }, 3589 { 1, PrivMode_aplCUR }, // DECCKM
4083 { 2, PrivMode_vt52 }, 3590 { 2, PrivMode_vt52 },
4084 { 3, PrivMode_132 }, 3591 { 3, PrivMode_132 }, // DECCOLM
4085 { 4, PrivMode_smoothScroll }, 3592 { 4, PrivMode_smoothScroll }, // DECSCLM
4086 { 5, PrivMode_rVideo }, 3593 { 5, PrivMode_rVideo }, // DECSCNM
4087 { 6, PrivMode_relOrigin }, 3594 { 6, PrivMode_relOrigin }, // DECOM
4088 { 7, PrivMode_Autowrap }, 3595 { 7, PrivMode_Autowrap }, // DECAWM
4089 // 8, bi-directional support mode 3596 // 8, auto-repeat keys // DECARM
4090 { 9, PrivMode_MouseX10 }, 3597 { 9, PrivMode_MouseX10 },
4091 // 18, 19 printing-related 3598 // 18 end FF to printer after print screen
3599 // 19 Print screen prints full screen/scorll region
4092 { 25, PrivMode_VisibleCursor }, 3600 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4093#ifdef scrollBar_esc 3601#ifdef scrollBar_esc
4094 { scrollBar_esc, PrivMode_scrollBar }, 3602 { scrollBar_esc, PrivMode_scrollBar },
4095#endif 3603#endif
4096 { 35, PrivMode_ShiftKeys }, // rxvt extension 3604 { 35, PrivMode_ShiftKeys }, // rxvt extension
3605 // 38, tektronix mode // DECTEK
4097 { 40, PrivMode_132OK }, 3606 { 40, PrivMode_132OK },
4098 // 41 xterm more fixes NYI 3607 // 41 xterm more fixes NYI
4099 // 45 margin bell NYI 3608 // 45 margin bell NYI
4100 // 46 start logging 3609 // 46 start logging
4101 { 47, PrivMode_Screen }, 3610 { 47, PrivMode_Screen },
4102 { 66, PrivMode_aplKP }, 3611 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4103#ifndef NO_BACKSPACE_KEY 3612#ifndef NO_BACKSPACE_KEY
4104 { 67, PrivMode_BackSpace }, 3613 { 67, PrivMode_BackSpace }, // DECBKM
4105#endif 3614#endif
4106 { 1000, PrivMode_MouseX11 }, 3615 { 1000, PrivMode_MouseX11 },
4107 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3616 { 1002, PrivMode_MouseBtnEvent },
4108 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3617 { 1003, PrivMode_MouseAnyEvent },
4109 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4110 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3618 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4111 { 1011, PrivMode_Keypress }, // rxvt extension 3619 { 1011, PrivMode_Keypress }, // rxvt extension
4112 // 1035 enable modifiers for alt, numlock NYI 3620 // 1035 enable modifiers for alt, numlock NYI
4113 // 1036 send ESC for meta keys NYI 3621 // 1036 send ESC for meta keys NYI
4114 // 1037 send DEL for keypad delete NYI 3622 // 1037 send DEL for keypad delete NYI
4115 { 1047, PrivMode_Screen }, 3623 { 1047, PrivMode_Screen },
4116 // 1048 save and restore cursor 3624 // 1048 save and restore cursor
4117 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3625 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4118 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3626 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3627 { 2004, PrivMode_BracketPaste },
4119 }; 3628 };
4120 3629
4121 if (nargs == 0) 3630 if (nargs == 0)
4122 return; 3631 return;
4123 3632
… …
4167 case 2: /* VT52 mode */ 3676 case 2: /* VT52 mode */
4168 /* oddball mode. should be set regardless of set/reset 3677 /* oddball mode. should be set regardless of set/reset
4169 * parameter. Return from VT52 mode with an ESC < from 3678 * parameter. Return from VT52 mode with an ESC < from
4170 * within VT52 mode 3679 * within VT52 mode
4171 */ 3680 */
4172 PrivMode (1, PrivMode_vt52); 3681 set_privmode (PrivMode_vt52, 1);
4173 break; 3682 break;
4174 case 3: /* 80/132 */ 3683 case 3: /* 80/132 */
4175 if (priv_modes & PrivMode_132OK) 3684 if (priv_modes & PrivMode_132OK)
4176 set_widthheight (((state ? 132 : 80) * fwidth), height); 3685 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4177 break; 3686 break;
4178 case 4: /* smooth scrolling */ 3687 case 4: /* smooth scrolling */
4179 set_option (Opt_jumpScroll, !state); 3688 set_option (Opt_jumpScroll, !state);
4180 break; 3689 break;
4181 case 5: /* reverse video */ 3690 case 5: /* reverse video */
… …
4188 scr_autowrap (state); 3697 scr_autowrap (state);
4189 break; 3698 break;
4190 /* case 8: - auto repeat, can't do on a per window basis */ 3699 /* case 8: - auto repeat, can't do on a per window basis */
4191 case 9: /* X10 mouse reporting */ 3700 case 9: /* X10 mouse reporting */
4192 if (state) /* orthogonal */ 3701 if (state) /* orthogonal */
4193 priv_modes &= ~PrivMode_MouseX11; 3702 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4194 break; 3703 break;
4195#ifdef scrollBar_esc 3704#ifdef scrollBar_esc
4196 case scrollBar_esc: 3705 case scrollBar_esc:
4197 if (scrollbar_mapping (state)) 3706 if (scrollBar.map (state))
4198 { 3707 {
4199 resize_all_windows (0, 0, 0); 3708 resize_all_windows (0, 0, 0);
4200 scr_touch (true); 3709 scr_touch (true);
4201 } 3710 }
4202 break; 3711 break;
… …
4211 break; 3720 break;
4212 /* case 66: - application key pad */ 3721 /* case 66: - application key pad */
4213 /* case 67: - backspace key */ 3722 /* case 67: - backspace key */
4214 case 1000: /* X11 mouse reporting */ 3723 case 1000: /* X11 mouse reporting */
4215 if (state) /* orthogonal */ 3724 if (state) /* orthogonal */
4216 priv_modes &= ~PrivMode_MouseX10; 3725 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4217 break; 3726 break;
4218#if 0
4219 case 1001: 3727 case 1002:
4220 break; /* X11 mouse highlighting */ 3728 case 1003:
4221#endif 3729 if (state)
3730 {
3731 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3732 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3733 vt_emask_mouse = PointerMotionMask;
3734 }
3735 else
3736 vt_emask_mouse = NoEventMask;
3737
3738 vt_select_input ();
3739 break;
4222 case 1010: /* scroll to bottom on TTY output inhibit */ 3740 case 1010: /* scroll to bottom on TTY output inhibit */
4223 set_option (Opt_scrollTtyOutput, !state); 3741 set_option (Opt_scrollTtyOutput, !state);
4224 break; 3742 break;
4225 case 1011: /* scroll to bottom on key press */ 3743 case 1011: /* scroll to bottom on key press */
4226 set_option (Opt_scrollTtyKeypress, state); 3744 set_option (Opt_scrollTtyKeypress, state);
4227 break; 3745 break;
4228 case 1047: /* secondary screen w/ clearing last */ 3746 case 1047: /* secondary screen w/ clearing last */
4229 if (option (Opt_secondaryScreen)) 3747 if (option (Opt_secondaryScreen))
4230 if (current_screen != PRIMARY) 3748 if (current_screen != PRIMARY)
4231 scr_erase_screen (2); 3749 scr_erase_screen (2);
3750
4232 scr_change_screen (state); 3751 scr_change_screen (state);
4233 break; 3752 break;
4234 case 1049: /* secondary screen w/ clearing first */ 3753 case 1049: /* secondary screen w/ clearing first */
4235 scr_change_screen (state); 3754 scr_change_screen (state);
4236 if (option (Opt_secondaryScreen)) 3755 if (option (Opt_secondaryScreen))
… …
4403rxvt_term::process_graphics () 3922rxvt_term::process_graphics ()
4404{ 3923{
4405 unicode_t ch, cmd = cmd_getc (); 3924 unicode_t ch, cmd = cmd_getc ();
4406 3925
4407 if (cmd == 'Q') 3926 if (cmd == 'Q')
3927 {
4408 { /* query graphics */ 3928 /* query graphics */
4409 tt_printf ("\033G0\012"); /* no graphics */ 3929 tt_printf ("\033G0\012"); /* no graphics */
4410 return; 3930 return;
4411 } 3931 }
4412 /* swallow other graphics sequences until terminating ':' */ 3932 /* swallow other graphics sequences until terminating ':' */
4413 do 3933 do
… …
4463 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3983 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4464 3984
4465 memcpy (v_buffer + v_buflen, data, len); 3985 memcpy (v_buffer + v_buflen, data, len);
4466 v_buflen += len; 3986 v_buflen += len;
4467 3987
4468 pty_ev.set (EVENT_READ | EVENT_WRITE); 3988 pty_ev.set (ev::READ | ev::WRITE);
4469} 3989}
4470 3990
4471void rxvt_term::pty_write () 3991void rxvt_term::pty_write ()
4472{ 3992{
4473 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3993 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4478 3998
4479 if (v_buflen == 0) 3999 if (v_buflen == 0)
4480 { 4000 {
4481 free (v_buffer); 4001 free (v_buffer);
4482 v_buffer = 0; 4002 v_buffer = 0;
4483 v_buflen = 0;
4484 4003
4485 pty_ev.set (EVENT_READ); 4004 pty_ev.set (ev::READ);
4486 return; 4005 return;
4487 } 4006 }
4488 4007
4489 memmove (v_buffer, v_buffer + written, v_buflen); 4008 memmove (v_buffer, v_buffer + written, v_buflen);
4490 } 4009 }
4491 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4010 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4492 pty_ev.set (EVENT_READ); 4011 pty_ev.set (ev::READ);
4493} 4012}
4494 4013
4495/*----------------------- end-of-file (C source) -----------------------*/ 4014/*----------------------- end-of-file (C source) -----------------------*/
4496 4015

Diff Legend

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