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.316 by root, Thu Dec 7 20:59:59 2006 UTC vs.
Revision 1.417 by root, Mon Jul 21 16:51:31 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
… …
877 return; 816 return;
878 817
879 if (len <= 0) 818 if (len <= 0)
880 return; /* not mapped */ 819 return; /* not mapped */
881 820
882 if (OPTION (Opt_scrollTtyKeypress)) 821 if (option (Opt_scrollTtyKeypress))
883 if (view_start) 822 if (view_start)
884 { 823 {
885 view_start = 0; 824 view_start = 0;
886 want_refresh = 1; 825 want_refresh = 1;
887 } 826 }
… …
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.
… …
1232 } 1174 }
1233 else 1175 else
1234 { 1176 {
1235 pty_ev.stop (); 1177 pty_ev.stop ();
1236 1178
1237 if (!OPTION (Opt_hold)) 1179 if (!option (Opt_hold))
1238 destroy (); 1180 destroy ();
1239 } 1181 }
1240 1182
1241 return false; 1183 return false;
1242} 1184}
1243 1185
1244void 1186void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1187rxvt_term::pty_cb (ev::io &w, int revents)
1246{ 1188{
1247 make_current (); 1189 make_current ();
1248 1190
1249 if (revents & EVENT_READ) 1191 if (revents & ev::READ)
1250 // loop, but don't allow a single term to monopolize us 1192 // loop, but don't allow a single term to monopolize us
1251 while (pty_fill ()) 1193 while (pty_fill ())
1252 if (cmd_parse ()) 1194 if (cmd_parse ())
1253 break; 1195 break;
1254 1196
1255 if (revents & EVENT_WRITE) 1197 if (revents & ev::WRITE)
1256 pty_write (); 1198 pty_write ();
1199
1200 refresh_check ();
1257} 1201}
1258 1202
1259void 1203void
1260rxvt_term::pointer_unblank () 1204rxvt_term::pointer_unblank ()
1261{ 1205{
… …
1263 recolour_cursor (); 1207 recolour_cursor ();
1264 1208
1265#ifdef POINTER_BLANK 1209#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1210 hidden_pointer = 0;
1267 1211
1268 if (OPTION (Opt_pointerBlank)) 1212 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1213 pointer_ev.start (pointerBlankDelay);
1270#endif 1214#endif
1271} 1215}
1272 1216
1273#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1274void 1218void
1275rxvt_term::pointer_blank () 1219rxvt_term::pointer_blank ()
1276{ 1220{
1277 if (!OPTION (Opt_pointerBlank)) 1221 if (!option (Opt_pointerBlank))
1278 return; 1222 return;
1279 1223
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1224 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1225 XFlush (dpy);
1282 1226
1283 hidden_pointer = 1; 1227 hidden_pointer = 1;
1284} 1228}
1285 1229
1286void 1230void
1287rxvt_term::pointer_cb (time_watcher &w) 1231rxvt_term::pointer_cb (ev::timer &w, int revents)
1288{ 1232{
1289 make_current (); 1233 make_current ();
1290 1234
1291 pointer_blank (); 1235 pointer_blank ();
1292} 1236}
… …
1295void 1239void
1296rxvt_term::mouse_report (XButtonEvent &ev) 1240rxvt_term::mouse_report (XButtonEvent &ev)
1297{ 1241{
1298 int button_number, key_state = 0; 1242 int button_number, key_state = 0;
1299 int x, y; 1243 int x, y;
1244 int code = 32;
1300 1245
1301 x = ev.x; 1246 x = Pixel2Col (ev.x);
1302 y = ev.y; 1247 y = Pixel2Row (ev.y);
1303 pixel_position (&x, &y); 1248 if (ev.type == MotionNotify)
1249 {
1250 if (x == mouse_row && y == mouse_col)
1251 return;
1252 mouse_row = x;
1253 mouse_col = y;
1254 code += 32;
1255 }
1304 1256
1305 if (MEvent.button == AnyButton) 1257 if (MEvent.button == AnyButton)
1306 button_number = 3; 1258 button_number = 3;
1307 else 1259 else
1308 { 1260 {
… …
1354 x + 1, 1306 x + 1,
1355 y + 1); 1307 y + 1);
1356#endif 1308#endif
1357 1309
1358 tt_printf ("\033[M%c%c%c", 1310 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1311 (code + button_number + key_state),
1360 (32 + x + 1), 1312 (32 + x + 1),
1361 (32 + y + 1)); 1313 (32 + y + 1));
1362} 1314}
1363 1315
1364/*{{{ process an X event */ 1316/*{{{ process an X event */
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1378 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1379 focus_out ();
1428 } 1380 }
1429#endif 1381#endif
1430 } 1382 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1383 break;
1436 1384
1437 /* 1385 /*
1438 * XXX: this is not the _current_ arrangement 1386 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1387 * Here's my conclusion:
… …
1458 break; 1406 break;
1459 } 1407 }
1460 break; 1408 break;
1461 1409
1462 case FocusIn: 1410 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer) 1411 if (ev.xfocus.detail != NotifyInferior
1412 && ev.xfocus.detail != NotifyPointer
1413 && ev.xfocus.mode != NotifyGrab)
1464 focus_in (); 1414 focus_in ();
1465 break; 1415 break;
1466 1416
1467 case FocusOut: 1417 case FocusOut:
1468 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer) 1418 if (ev.xfocus.detail != NotifyInferior
1419 && ev.xfocus.detail != NotifyPointer
1420 && ev.xfocus.mode != NotifyGrab)
1469 focus_out (); 1421 focus_out ();
1470 break; 1422 break;
1471 1423
1472 case ConfigureNotify: 1424 case ConfigureNotify:
1425 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1426 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1427 szHint.width, szHint.height);*/
1473 if (ev.xconfigure.window == parent[0]) 1428 if (ev.xconfigure.window == parent[0])
1474 { 1429 {
1475 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1476 ; 1431 ;
1477 1432
1478 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1479 { 1434 {
1480 seen_resize = 1; 1435 seen_resize = 1;
1481 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1482 } 1437 }
1438 else
1439 {
1440#ifdef HAVE_BG_PIXMAP
1441 if (bgPixmap.window_position_sensitive ())
1442 {
1443 if (mapped)
1444 update_background ();
1445 else
1446 bgPixmap.invalidate ();
1447 }
1448#endif
1449 }
1483 1450
1484 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1485
1486#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1487 if (OPTION (Opt_transparent))
1488 check_our_parents ();
1489#endif
1490 } 1452 }
1491 break; 1453 break;
1492 1454
1493 case PropertyNotify: 1455 case PropertyNotify:
1494 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1456 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1510 case SelectionRequest: 1472 case SelectionRequest:
1511 selection_send (ev.xselectionrequest); 1473 selection_send (ev.xselectionrequest);
1512 break; 1474 break;
1513 1475
1514 case MapNotify: 1476 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a
1479 * non-reparenting window manager. In those cases we never get first
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does
1482 * reparenting.
1483 * We should not render background immidiately, as there could be several
1484 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1485 * by scheduling background redraw as soon as we can, but giving a short
1486 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results.
1489 */
1490 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1491 update_background_ev.start (0.025);
1492#endif
1515 mapped = 1; 1493 mapped = 1;
1516#ifdef TEXT_BLINK 1494#ifdef TEXT_BLINK
1517 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1495 text_blink_ev.start ();
1518#endif 1496#endif
1519 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1497 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1520 break; 1498 break;
1521 1499
1522 case UnmapNotify: 1500 case UnmapNotify:
… …
1524#ifdef TEXT_BLINK 1502#ifdef TEXT_BLINK
1525 text_blink_ev.stop (); 1503 text_blink_ev.stop ();
1526#endif 1504#endif
1527 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1505 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1528 break; 1506 break;
1529
1530#ifdef TRANSPARENT
1531 case ReparentNotify:
1532 rootwin_cb (ev);
1533 break;
1534#endif /* TRANSPARENT */
1535 1507
1536 case GraphicsExpose: 1508 case GraphicsExpose:
1537 case Expose: 1509 case Expose:
1538 if (ev.xany.window == vt) 1510 if (ev.xany.window == vt)
1539 { 1511 {
1540 do 1512 do
1513 {
1541 scr_expose (ev.xexpose.x, ev.xexpose.y, 1514 scr_expose (ev.xexpose.x, ev.xexpose.y,
1542 ev.xexpose.width, ev.xexpose.height, False); 1515 ev.xexpose.width, ev.xexpose.height, False);
1516 }
1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1544 1518
1545 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1546 1520
1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522 {
1548 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1549 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1525 }
1550 1526
1551 want_refresh = 1; 1527 want_refresh = 1;
1552 } 1528 }
1553 else 1529 else
1554 { 1530 {
… …
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1533 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1558 ; 1534 ;
1559 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1560 ; 1536 ;
1561 1537
1562 if (isScrollbarWindow (ev.xany.window)) 1538 if (scrollBar.state && ev.xany.window == scrollBar.win)
1563 { 1539 {
1564 scrollBar.setIdle (); 1540 scrollBar.state = STATE_IDLE;
1565 scrollbar_show (0); 1541 scrollBar.show (0);
1566 } 1542 }
1567
1568#ifdef TRANSPARENT
1569 if (am_transparent && ev.xany.window == parent[0])
1570 XClearWindow (dpy, ev.xany.window);
1571#endif
1572 } 1543 }
1573 break; 1544 break;
1574 1545
1575 case MotionNotify: 1546 case MotionNotify:
1576#ifdef POINTER_BLANK 1547#ifdef POINTER_BLANK
1577 if (hidden_pointer) 1548 if (hidden_pointer)
1578 pointer_unblank (); 1549 pointer_unblank ();
1579#endif 1550#endif
1551 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1552 || priv_modes & PrivMode_MouseAnyEvent)
1553 mouse_report (ev.xbutton);
1580 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1554 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1581 break; 1555 break;
1582 1556
1583 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1584 { 1558 {
… …
1618 int dist; 1592 int dist;
1619 1593
1620 /* don't clobber the current delay if we are 1594 /* don't clobber the current delay if we are
1621 * already in the middle of scrolling. 1595 * already in the middle of scrolling.
1622 */ 1596 */
1623 if (!sel_scroll_ev.active) 1597 if (!sel_scroll_ev.is_active ())
1624 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1598 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1625 1599
1626 /* save the event params so we can highlight 1600 /* save the event params so we can highlight
1627 * the selection in the pending-scroll loop 1601 * the selection in the pending-scroll loop
1628 */ 1602 */
1629 selection_save_x = ev.xbutton.x; 1603 selection_save_x = ev.xbutton.x;
… …
1651 else 1625 else
1652 { 1626 {
1653 /* we are within the text window, so we 1627 /* we are within the text window, so we
1654 * shouldn't be scrolling 1628 * shouldn't be scrolling
1655 */ 1629 */
1656 if (sel_scroll_ev.active)
1657 sel_scroll_ev.stop(); 1630 sel_scroll_ev.stop();
1658 } 1631 }
1659#endif 1632#endif
1660#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
1661 } 1634 }
1662#endif 1635#endif
1663 } 1636 }
1664 } 1637 }
1665 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1638 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1666 { 1639 {
1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1640 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1668 MotionNotify, &ev)) 1641 MotionNotify, &ev))
1669 ; 1642 ;
1670 1643
… …
1672 &unused_root, &unused_child, 1645 &unused_root, &unused_child,
1673 &unused_root_x, &unused_root_y, 1646 &unused_root_x, &unused_root_y,
1674 &ev.xbutton.x, &ev.xbutton.y, 1647 &ev.xbutton.x, &ev.xbutton.y,
1675 &unused_mask); 1648 &unused_mask);
1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1677 scrollbar_size ()); 1650 scrollBar.size ());
1678 want_refresh = 1; 1651 want_refresh = 1;
1679 refresh_limit = 0;
1680 scrollbar_show (1); 1652 scrollBar.show (1);
1681 } 1653 }
1682 break; 1654 break;
1683 } 1655 }
1684 1656
1685#if defined(CURSOR_BLINK) 1657#if defined(CURSOR_BLINK)
1686 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1658 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1687 { 1659 {
1688 if (hidden_cursor) 1660 if (hidden_cursor)
1689 { 1661 {
1690 hidden_cursor = 0; 1662 hidden_cursor = 0;
1691 want_refresh = 1; 1663 want_refresh = 1;
1692 } 1664 }
1693 1665
1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1666 cursor_blink_ev.again ();
1695 } 1667 }
1696#endif 1668#endif
1697 1669
1698#if defined(POINTER_BLANK) 1670#if defined(POINTER_BLANK)
1699 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1671 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1700 { 1672 {
1701 if (ev.type == MotionNotify 1673 if (ev.type == MotionNotify
1702 || ev.type == ButtonPress 1674 || ev.type == ButtonPress
1703 || ev.type == ButtonRelease) 1675 || ev.type == ButtonRelease)
1704 if (hidden_pointer) 1676 if (hidden_pointer)
… …
1706 1678
1707 if (ev.type == KeyPress && hidden_pointer == 0) 1679 if (ev.type == KeyPress && hidden_pointer == 0)
1708 pointer_blank (); 1680 pointer_blank ();
1709 } 1681 }
1710#endif 1682#endif
1683
1684 refresh_check ();
1711} 1685}
1712 1686
1713void 1687void
1714rxvt_term::focus_in () 1688rxvt_term::focus_in ()
1715{ 1689{
… …
1726 IMSetPosition (); 1700 IMSetPosition ();
1727 XSetICFocus (Input_Context); 1701 XSetICFocus (Input_Context);
1728 } 1702 }
1729#endif 1703#endif
1730#if CURSOR_BLINK 1704#if CURSOR_BLINK
1731 if (OPTION (Opt_cursorBlink)) 1705 if (option (Opt_cursorBlink))
1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1706 cursor_blink_ev.again ();
1733#endif 1707#endif
1734#if OFF_FOCUS_FADING 1708#if OFF_FOCUS_FADING
1735 if (rs[Rs_fade]) 1709 if (rs[Rs_fade])
1736 { 1710 {
1737 pix_colors = pix_colors_focused; 1711 pix_colors = pix_colors_focused;
1738 scr_recolour (); 1712 scr_recolour ();
1739 } 1713 }
1740#endif 1714#endif
1715#if ENABLE_FRILLS
1716 if (option (Opt_urgentOnBell))
1717 {
1718 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1719 {
1720 h->flags &= ~XUrgencyHint;
1721 XSetWMHints (dpy, parent[0], h);
1722 }
1723 }
1724#endif
1741 } 1725 }
1742} 1726}
1743 1727
1744void 1728void
1745rxvt_term::focus_out () 1729rxvt_term::focus_out ()
… …
1753 1737
1754#if ENABLE_FRILLS || ISO_14755 1738#if ENABLE_FRILLS || ISO_14755
1755 if (iso14755buf) 1739 if (iso14755buf)
1756 { 1740 {
1757 iso14755buf = 0; 1741 iso14755buf = 0;
1758# if ENABLE_OVERLAY 1742# if ISO_14755
1759 scr_overlay_off (); 1743 scr_overlay_off ();
1760# endif 1744# endif
1761 } 1745 }
1762#endif 1746#endif
1763#if USE_XIM 1747#if USE_XIM
1764 if (Input_Context != NULL) 1748 if (Input_Context != NULL)
1765 XUnsetICFocus (Input_Context); 1749 XUnsetICFocus (Input_Context);
1766#endif 1750#endif
1767#if CURSOR_BLINK 1751#if CURSOR_BLINK
1768 if (OPTION (Opt_cursorBlink)) 1752 if (option (Opt_cursorBlink))
1769 cursor_blink_ev.stop (); 1753 cursor_blink_ev.stop ();
1754
1770 hidden_cursor = 0; 1755 hidden_cursor = 0;
1771#endif 1756#endif
1772#if OFF_FOCUS_FADING 1757#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade]) 1758 if (rs[Rs_fade])
1774 { 1759 {
… …
1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1775 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791 } 1776 }
1792#endif 1777#endif
1793} 1778}
1794 1779
1795#if TRANSPARENT || ENABLE_PERL 1780#if ENABLE_TRANSPARENCY || ENABLE_PERL
1796void 1781void
1797rxvt_term::rootwin_cb (XEvent &ev) 1782rxvt_term::rootwin_cb (XEvent &ev)
1798{ 1783{
1799 make_current (); 1784 make_current ();
1800 1785
1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1786 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1787 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803 return; 1788 return;
1804 1789
1805# if TRANSPARENT 1790# if ENABLE_TRANSPARENCY
1806 switch (ev.type) 1791 switch (ev.type)
1807 { 1792 {
1808 case PropertyNotify: 1793 case PropertyNotify:
1809 /* 1794 /*
1810 * if user used some Esetroot compatible prog to set the root bg, 1795 * if user used some Esetroot compatible prog to set the root bg,
1811 * use the property to determine the pixmap. We use it later on. 1796 * use the property to determine the pixmap. We use it later on.
1812 */ 1797 */
1813 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1798 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1814 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1799 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1815 return; 1800 {
1801 bgPixmap.set_root_pixmap ();
1802 update_background ();
1803 }
1816 1804
1817 /* FALLTHROUGH */
1818 case ReparentNotify:
1819 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1820 want_refresh = want_full_refresh = 1;
1821 break; 1805 break;
1822 } 1806 }
1823# endif 1807# endif
1808
1809 refresh_check ();
1824} 1810}
1825#endif 1811#endif
1826 1812
1827void 1813void
1828rxvt_term::button_press (XButtonEvent &ev) 1814rxvt_term::button_press (XButtonEvent &ev)
… …
1883 mouse_report (ev); 1869 mouse_report (ev);
1884 } 1870 }
1885#else 1871#else
1886 MEvent.button = ev.button; 1872 MEvent.button = ev.button;
1887 mouse_report (ev); 1873 mouse_report (ev);
1888#endif /* MOUSE_REPORT_DOUBLECLICK */ 1874#endif /* MOUSE_REPORT_DOUBLECLICK */
1889 1875
1890 } 1876 }
1891 else 1877 else
1892 { 1878 {
1893 if (ev.button != MEvent.button) 1879 if (ev.button != MEvent.button)
… …
1941 } 1927 }
1942 1928
1943 /* 1929 /*
1944 * Scrollbar window processing of button press 1930 * Scrollbar window processing of button press
1945 */ 1931 */
1946 if (isScrollbarWindow (ev.window)) 1932 if (scrollBar.state && ev.window == scrollBar.win)
1947 { 1933 {
1948 scrollBar.setIdle (); 1934 page_dirn direction = NO_DIR;
1935
1936 if (scrollBar.upButton (ev.y))
1937 direction = UP; /* up */
1938 else if (scrollBar.dnButton (ev.y))
1939 direction = DN; /* down */
1940
1941 scrollBar.state = STATE_IDLE;
1949 /* 1942 /*
1950 * Rxvt-style scrollbar: 1943 * Rxvt-style scrollbar:
1951 * move up if mouse is above slider 1944 * move up if mouse is above slider
1952 * move dn if mouse is below slider 1945 * move dn if mouse is below slider
1953 * 1946 *
… …
1962 /* 1955 /*
1963 * Mouse report disabled scrollbar: 1956 * Mouse report disabled scrollbar:
1964 * arrow buttons - send up/down 1957 * arrow buttons - send up/down
1965 * click on scrollbar - send pageup/down 1958 * click on scrollbar - send pageup/down
1966 */ 1959 */
1967 if ((scrollBar.style == R_SB_NEXT 1960 if (direction == UP)
1968 && scrollbarnext_upButton (ev.y))
1969 || (scrollBar.style == R_SB_RXVT
1970 && scrollbarrxvt_upButton (ev.y)))
1971 tt_printf ("\033[A"); 1961 tt_printf ("\033[A");
1972 else if ((scrollBar.style == R_SB_NEXT 1962 else if (direction == DN)
1973 && scrollbarnext_dnButton (ev.y))
1974 || (scrollBar.style == R_SB_RXVT
1975 && scrollbarrxvt_dnButton (ev.y)))
1976 tt_printf ("\033[B"); 1963 tt_printf ("\033[B");
1977 else 1964 else
1978 switch (ev.button) 1965 switch (ev.button)
1979 { 1966 {
1980 case Button2: 1967 case Button2:
… …
1987 tt_printf ("\033[5~"); 1974 tt_printf ("\033[5~");
1988 break; 1975 break;
1989 } 1976 }
1990 } 1977 }
1991 else 1978 else
1992#endif /* NO_SCROLLBAR_REPORT */ 1979#endif /* NO_SCROLLBAR_REPORT */
1993
1994 {
1995 char upordown = 0;
1996
1997 if (scrollBar.style == R_SB_NEXT)
1998 { 1980 {
1999 if (scrollbarnext_upButton (ev.y)) 1981 if (direction != NO_DIR)
2000 upordown = -1; /* up */
2001 else if (scrollbarnext_dnButton (ev.y))
2002 upordown = 1; /* down */
2003 }
2004 else if (scrollBar.style == R_SB_RXVT)
2005 {
2006 if (scrollbarrxvt_upButton (ev.y))
2007 upordown = -1; /* up */
2008 else if (scrollbarrxvt_dnButton (ev.y))
2009 upordown = 1; /* down */
2010 }
2011 if (upordown)
2012 { 1982 {
2013#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1983#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1984 if (!cont_scroll_ev.is_active ())
2014 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1985 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2015#endif 1986#endif
2016 if (scr_page (upordown < 0 ? UP : DN, 1)) 1987 if (scr_page (direction, 1))
2017 { 1988 {
2018 if (upordown < 0) 1989 if (direction == UP)
2019 scrollBar.setUp (); 1990 scrollBar.state = STATE_UP;
2020 else 1991 else
2021 scrollBar.setDn (); 1992 scrollBar.state = STATE_DOWN;
2022 } 1993 }
2023 } 1994 }
2024 else 1995 else
2025 switch (ev.button) 1996 switch (ev.button)
2026 { 1997 {
2027 case Button2: 1998 case Button2:
2028 switch (scrollbar_align) 1999 switch (scrollBar.align)
2029 { 2000 {
2030 case R_SB_ALIGN_TOP: 2001 case R_SB_ALIGN_TOP:
2031 csrO = 0; 2002 csrO = 0;
2032 break; 2003 break;
2033 case R_SB_ALIGN_CENTRE: 2004 case R_SB_ALIGN_CENTRE:
… …
2039 } 2010 }
2040 2011
2041 if (scrollBar.style == R_SB_XTERM 2012 if (scrollBar.style == R_SB_XTERM
2042 || scrollbar_above_slider (ev.y) 2013 || scrollbar_above_slider (ev.y)
2043 || scrollbar_below_slider (ev.y)) 2014 || scrollbar_below_slider (ev.y))
2044 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2045 2016
2046 scrollBar.setMotion (); 2017 scrollBar.state = STATE_MOTION;
2047 break; 2018 break;
2048 2019
2049 case Button1: 2020 case Button1:
2050 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2021 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2051 csrO = ev.y - scrollBar.top; 2022 csrO = ev.y - scrollBar.top;
2052 /* FALLTHROUGH */ 2023 /* FALLTHROUGH */
2053 2024
2054 case Button3: 2025 case Button3:
2055 if (scrollBar.style != R_SB_XTERM) 2026 if (scrollBar.style != R_SB_XTERM)
… …
2065 scr_page (DN, nrow - 1); 2036 scr_page (DN, nrow - 1);
2066# else 2037# else
2067 scr_page (DN, nrow / 4); 2038 scr_page (DN, nrow / 4);
2068# endif 2039# endif
2069 else 2040 else
2070 scrollBar.setMotion (); 2041 scrollBar.state = STATE_MOTION;
2071 } 2042 }
2072 else 2043 else
2073 { 2044 {
2074 scr_page ((ev.button == Button1 ? DN : UP), 2045 scr_page ((ev.button == Button1 ? DN : UP),
2075 (nrow 2046 (nrow
2076 * scrollbar_position (ev.y) 2047 * scrollbar_position (ev.y)
2077 / scrollbar_size ())); 2048 / scrollBar.size ()));
2078 } 2049 }
2079 2050
2080 break; 2051 break;
2081 } 2052 }
2082 } 2053 }
… …
2092 2063
2093 csrO = 0; /* reset csr Offset */ 2064 csrO = 0; /* reset csr Offset */
2094 if (!bypass_keystate) 2065 if (!bypass_keystate)
2095 reportmode = !! (priv_modes & PrivMode_mouse_report); 2066 reportmode = !! (priv_modes & PrivMode_mouse_report);
2096 2067
2097 if (scrollbar_isUpDn ()) 2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2098 { 2069 {
2099 scrollBar.setIdle (); 2070 scrollBar.state = STATE_IDLE;
2100 scrollbar_show (0); 2071 scrollBar.show (0);
2101 } 2072 }
2102 2073
2103#ifdef SELECTION_SCROLLING 2074#ifdef SELECTION_SCROLLING
2104 if (sel_scroll_ev.active)
2105 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
2106#endif 2076#endif
2107 2077
2108 if (ev.window == vt) 2078 if (ev.window == vt)
2109 { 2079 {
2110 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2080 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2134 mouse_report (ev); 2104 mouse_report (ev);
2135 } 2105 }
2136#else /* MOUSE_REPORT_DOUBLECLICK */ 2106#else /* MOUSE_REPORT_DOUBLECLICK */
2137 MEvent.button = AnyButton; 2107 MEvent.button = AnyButton;
2138 mouse_report (ev); 2108 mouse_report (ev);
2139#endif /* MOUSE_REPORT_DOUBLECLICK */ 2109#endif /* MOUSE_REPORT_DOUBLECLICK */
2140 return; 2110 return;
2141 } 2111 }
2142 2112
2143 /* 2113 /*
2144 * dumb hack to compensate for the failure of click-and-drag 2114 * dumb hack to compensate for the failure of click-and-drag
… …
2156 selection_make (ev.time); 2126 selection_make (ev.time);
2157 break; 2127 break;
2158 2128
2159 case Button2: 2129 case Button2:
2160 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2161 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2162 break; 2132 break;
2163 2133
2164#ifdef MOUSE_WHEEL 2134#ifdef MOUSE_WHEEL
2165 case Button4: 2135 case Button4:
2166 case Button5: 2136 case Button5:
… …
2170 2140
2171 v = ev.button == Button4 ? UP : DN; 2141 v = ev.button == Button4 ? UP : DN;
2172 2142
2173 if (ev.state & ShiftMask) 2143 if (ev.state & ShiftMask)
2174 i = 1; 2144 i = 1;
2175 else if (OPTION (Opt_mouseWheelScrollPage)) 2145 else if (option (Opt_mouseWheelScrollPage))
2176 i = nrow - 1; 2146 i = nrow - 1;
2177 else 2147 else
2178 i = 5; 2148 i = 5;
2179 2149
2180# ifdef MOUSE_SLIP_WHEELING 2150# ifdef MOUSE_SLIP_WHEELING
… …
2182 { 2152 {
2183 mouse_slip_wheel_speed += v ? -1 : 1; 2153 mouse_slip_wheel_speed += v ? -1 : 1;
2184 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2154 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2185 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2155 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2186 2156
2187 if (slip_wheel_ev.at < NOW) 2157 if (!slip_wheel_ev.is_active ())
2188 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2158 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2189
2190 slip_wheel_ev.start ();
2191 } 2159 }
2192 else 2160 else
2161# endif
2193 { 2162 {
2194# endif
2195 scr_page (v, i); 2163 scr_page (v, i);
2196 scrollbar_show (1); 2164 scrollBar.show (1);
2197# ifdef MOUSE_SLIP_WHEELING
2198 } 2165 }
2199# endif
2200 } 2166 }
2201 break; 2167 break;
2202#endif 2168#endif
2203 } 2169 }
2204 } 2170 }
2205} 2171}
2206
2207#ifdef TRANSPARENT
2208#if TINTING
2209/* taken from aterm-0.4.2 */
2210
2211typedef uint32_t RUINT32T;
2212
2213void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2214{
2215 int sh_r, sh_g, sh_b;
2216 RUINT32T mask_r, mask_g, mask_b;
2217 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2218 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2219 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2220 int i;
2221
2222 Visual *visual = term->visual;
2223
2224 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2225
2226 /* for convenience */
2227 mask_r = visual->red_mask;
2228 mask_g = visual->green_mask;
2229 mask_b = visual->blue_mask;
2230
2231 /* boring lookup table pre-initialization */
2232 switch (srcImage->bits_per_pixel) {
2233 case 15:
2234 if ((mask_r != 0x7c00) ||
2235 (mask_g != 0x03e0) ||
2236 (mask_b != 0x001f))
2237 return;
2238 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2239 lookup_r = lookup;
2240 lookup_g = lookup+32;
2241 lookup_b = lookup+32+32;
2242 sh_r = 10;
2243 sh_g = 5;
2244 sh_b = 0;
2245 break;
2246 case 16:
2247 if ((mask_r != 0xf800) ||
2248 (mask_g != 0x07e0) ||
2249 (mask_b != 0x001f))
2250 return;
2251 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2252 lookup_r = lookup;
2253 lookup_g = lookup+32;
2254 lookup_b = lookup+32+64;
2255 sh_r = 11;
2256 sh_g = 5;
2257 sh_b = 0;
2258 break;
2259 case 24:
2260 if ((mask_r != 0xff0000) ||
2261 (mask_g != 0x00ff00) ||
2262 (mask_b != 0x0000ff))
2263 return;
2264 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2265 lookup_r = lookup;
2266 lookup_g = lookup+256;
2267 lookup_b = lookup+256+256;
2268 sh_r = 16;
2269 sh_g = 8;
2270 sh_b = 0;
2271 break;
2272 case 32:
2273 if ((mask_r != 0xff0000) ||
2274 (mask_g != 0x00ff00) ||
2275 (mask_b != 0x0000ff))
2276 return;
2277 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2278 lookup_r = lookup;
2279 lookup_g = lookup+256;
2280 lookup_b = lookup+256+256;
2281 sh_r = 16;
2282 sh_g = 8;
2283 sh_b = 0;
2284 break;
2285 default:
2286 return; /* we do not support this color depth */
2287 }
2288
2289 /* prepare limits for color transformation (each channel is handled separately) */
2290 if (shade < 0) {
2291 shade = -shade;
2292 if (shade < 0) shade = 0;
2293 if (shade > 100) shade = 100;
2294
2295 lower_lim_r = 65535-rm;
2296 lower_lim_g = 65535-gm;
2297 lower_lim_b = 65535-bm;
2298
2299 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2300 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2301 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2302
2303 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2304 } else {
2305 if (shade < 0) shade = 0;
2306 if (shade > 100) shade = 100;
2307
2308 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2309
2310 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2311 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2312 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2313 }
2314
2315 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2316 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2317 {
2318 unsigned int tmp;
2319
2320 tmp = lower_lim_r;
2321 lower_lim_r = lower_lim_b;
2322 lower_lim_b = tmp;
2323
2324 tmp = upper_lim_r;
2325 upper_lim_r = upper_lim_b;
2326 upper_lim_b = tmp;
2327 }
2328
2329 /* fill our lookup tables */
2330 for (i = 0; i <= mask_r>>sh_r; i++)
2331 {
2332 RUINT32T tmp;
2333 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2334 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2335 lookup_r[i] = (tmp/65535)<<sh_r;
2336 }
2337 for (i = 0; i <= mask_g>>sh_g; i++)
2338 {
2339 RUINT32T tmp;
2340 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2341 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2342 lookup_g[i] = (tmp/65535)<<sh_g;
2343 }
2344 for (i = 0; i <= mask_b>>sh_b; i++)
2345 {
2346 RUINT32T tmp;
2347 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2348 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2349 lookup_b[i] = (tmp/65535)<<sh_b;
2350 }
2351
2352 /* apply table to input image (replacing colors by newly calculated ones) */
2353 switch (srcImage->bits_per_pixel)
2354 {
2355 case 15:
2356 {
2357 unsigned short *p1, *pf, *p, *pl;
2358 p1 = (unsigned short *) srcImage->data;
2359 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2360 while (p1 < pf)
2361 {
2362 p = p1;
2363 pl = p1 + srcImage->width;
2364 for (; p < pl; p++)
2365 {
2366 *p = lookup_r[(*p & 0x7c00)>>10] |
2367 lookup_g[(*p & 0x03e0)>> 5] |
2368 lookup_b[(*p & 0x001f)];
2369 }
2370 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2371 }
2372 break;
2373 }
2374 case 16:
2375 {
2376 unsigned short *p1, *pf, *p, *pl;
2377 p1 = (unsigned short *) srcImage->data;
2378 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2379 while (p1 < pf)
2380 {
2381 p = p1;
2382 pl = p1 + srcImage->width;
2383 for (; p < pl; p++)
2384 {
2385 *p = lookup_r[(*p & 0xf800)>>11] |
2386 lookup_g[(*p & 0x07e0)>> 5] |
2387 lookup_b[(*p & 0x001f)];
2388 }
2389 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2390 }
2391 break;
2392 }
2393 case 24:
2394 {
2395 unsigned char *p1, *pf, *p, *pl;
2396 p1 = (unsigned char *) srcImage->data;
2397 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2398 while (p1 < pf)
2399 {
2400 p = p1;
2401 pl = p1 + srcImage->width * 3;
2402 for (; p < pl; p += 3)
2403 {
2404 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2405 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2406 p[2] = lookup_r[(p[2] & 0x0000ff)];
2407 }
2408 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2409 }
2410 break;
2411 }
2412 case 32:
2413 {
2414 RUINT32T *p1, *pf, *p, *pl;
2415 p1 = (RUINT32T *) srcImage->data;
2416 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2417
2418 while (p1 < pf)
2419 {
2420 p = p1;
2421 pl = p1 + srcImage->width;
2422 for (; p < pl; p++)
2423 {
2424 *p = lookup_r[(*p & 0xff0000)>>16] |
2425 lookup_g[(*p & 0x00ff00)>> 8] |
2426 lookup_b[(*p & 0x0000ff)] |
2427 (*p & ~0xffffff);
2428 }
2429 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2430 }
2431 break;
2432 }
2433 }
2434
2435 free (lookup);
2436}
2437#endif
2438
2439/*
2440 * Check our parents are still who we think they are.
2441 * Do transparency updates if required
2442 */
2443int
2444rxvt_term::check_our_parents ()
2445{
2446 int i, pchanged, aformat, have_pixmap, rootdepth;
2447 unsigned long nitems, bytes_after;
2448 Atom atype;
2449 unsigned char *prop = NULL;
2450 Window root, oldp, *list;
2451 Pixmap rootpixmap = None;
2452 XWindowAttributes wattr, wrootattr;
2453
2454 pchanged = 0;
2455
2456 if (!OPTION (Opt_transparent))
2457 return pchanged; /* Don't try any more */
2458
2459 XGetWindowAttributes (dpy, display->root, &wrootattr);
2460 rootdepth = wrootattr.depth;
2461
2462 XGetWindowAttributes (dpy, parent[0], &wattr);
2463
2464 if (rootdepth != wattr.depth)
2465 {
2466 if (am_transparent)
2467 {
2468 pchanged = 1;
2469 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2470 am_transparent = am_pixmap_trans = 0;
2471 }
2472
2473 return pchanged; /* Don't try any more */
2474 }
2475
2476 /* Get all X ops out of the queue so that our information is up-to-date. */
2477 XSync (dpy, False);
2478
2479 /*
2480 * Make the frame window set by the window manager have
2481 * the root background. Some window managers put multiple nested frame
2482 * windows for each client, so we have to take care about that.
2483 */
2484 i = (xa[XA_XROOTPMAP_ID]
2485 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2487 &nitems, &bytes_after, &prop) == Success);
2488
2489 if (!i || prop == NULL)
2490 i = (xa[XA_ESETROOT_PMAP_ID]
2491 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493 &nitems, &bytes_after, &prop) == Success);
2494
2495 if (!i || prop == NULL
2496#if TINTING
2497 || !ISSET_PIXCOLOR (Color_tint)
2498#endif
2499 )
2500 have_pixmap = 0;
2501 else
2502 {
2503 have_pixmap = 1;
2504 rootpixmap = *(Pixmap *)prop;
2505 XFree (prop);
2506 }
2507
2508 if (have_pixmap)
2509 {
2510 /*
2511 * Copy display->root pixmap transparency
2512 */
2513 int sx, sy, nx, ny;
2514 unsigned int nw, nh;
2515 Window cr;
2516 XImage *image;
2517 GC gc;
2518 XGCValues gcvalue;
2519
2520 XTranslateCoordinates (dpy, parent[0], display->root,
2521 0, 0, &sx, &sy, &cr);
2522 nw = (unsigned int)szHint.width;
2523 nh = (unsigned int)szHint.height;
2524 nx = ny = 0;
2525
2526 if (sx < 0)
2527 {
2528 nw += sx;
2529 nx = -sx;
2530 sx = 0;
2531 }
2532
2533 if (sy < 0)
2534 {
2535 nh += sy;
2536 ny = -sy;
2537 sy = 0;
2538 }
2539
2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2542
2543 XSync (dpy, False);
2544 allowedxerror = -1;
2545 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2546
2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2548 /* XXX: may need a delay here? */
2549 allowedxerror = 0;
2550
2551 if (image == NULL)
2552 {
2553 if (am_transparent && am_pixmap_trans)
2554 {
2555 pchanged = 1;
2556 if (pixmap != None)
2557 {
2558 XFreePixmap (dpy, pixmap);
2559 pixmap = None;
2560 }
2561 }
2562
2563 am_pixmap_trans = 0;
2564 }
2565 else
2566 {
2567 if (pixmap != None)
2568 XFreePixmap (dpy, pixmap);
2569
2570#if TINTING
2571 if (ISSET_PIXCOLOR (Color_tint))
2572 {
2573 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2574
2575 rgba c;
2576 pix_colors_focused [Color_tint].get (c);
2577
2578 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2579 }
2580#endif
2581
2582 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2583 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2584 XPutImage (dpy, pixmap, gc, image, 0, 0,
2585 nx, ny, image->width, image->height);
2586 XFreeGC (dpy, gc);
2587 XDestroyImage (image);
2588 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2589 XClearWindow (dpy, parent[0]);
2590
2591 if (!am_transparent || !am_pixmap_trans)
2592 pchanged = 1;
2593
2594 am_transparent = am_pixmap_trans = 1;
2595 }
2596 }
2597
2598 if (am_pixmap_trans)
2599 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2600 else
2601 {
2602 unsigned int n;
2603 /*
2604 * InheritPixmap transparency
2605 */
2606 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2607 {
2608 oldp = parent[i];
2609 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2610 XFree (list);
2611
2612 if (parent[i] == display->root)
2613 {
2614 if (oldp != None)
2615 pchanged = 1;
2616
2617 break;
2618 }
2619
2620 if (oldp != parent[i])
2621 pchanged = 1;
2622 }
2623
2624 n = 0;
2625
2626 if (pchanged)
2627 for (; n < (unsigned int)i; n++)
2628 {
2629 XGetWindowAttributes (dpy, parent[n], &wattr);
2630
2631 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2632 {
2633 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2634 break;
2635 }
2636 }
2637
2638 if (n > (sizeof (parent) / sizeof (parent[0])))
2639 {
2640 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2641 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2642 am_transparent = 0;
2643 /* XXX: also turn off Opt_transparent? */
2644 }
2645 else
2646 {
2647 for (n = 0; n < (unsigned int)i; n++)
2648 {
2649 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2650 XClearWindow (dpy, parent[n]);
2651 }
2652
2653 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2654 am_transparent = 1;
2655 }
2656
2657 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2658 parent[i] = None;
2659 }
2660
2661 if (scrollBar.win)
2662 {
2663 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2664 scrollBar.setIdle ();
2665 scrollbar_show (0);
2666 }
2667
2668 if (am_transparent)
2669 {
2670 want_refresh = want_full_refresh = 1;
2671 if (am_pixmap_trans)
2672 flush ();
2673 }
2674
2675 return pchanged;
2676}
2677#endif
2678 2172
2679/*}}} */ 2173/*}}} */
2680 2174
2681bool 2175bool
2682rxvt_term::cmd_parse () 2176rxvt_term::cmd_parse ()
… …
2685 wchar_t ch = NOCHAR; 2179 wchar_t ch = NOCHAR;
2686 char *seq_begin; // remember start of esc-sequence here 2180 char *seq_begin; // remember start of esc-sequence here
2687 2181
2688 for (;;) 2182 for (;;)
2689 { 2183 {
2690 if (ch == NOCHAR) 2184 if (expect_false (ch == NOCHAR))
2691 { 2185 {
2692 seq_begin = cmdbuf_ptr; 2186 seq_begin = cmdbuf_ptr;
2693 ch = next_char (); 2187 ch = next_char ();
2694 2188
2695 if (ch == NOCHAR) 2189 if (ch == NOCHAR)
2696 break; 2190 break;
2697 } 2191 }
2698 2192
2699 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2193 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2700 { 2194 {
2701 if (!seen_input) 2195 if (expect_false (!seen_input))
2702 { 2196 {
2703 seen_input = 1; 2197 seen_input = 1;
2704 // many badly-written programs (e.g. jed) contain a race condition: 2198 // many badly-written programs (e.g. jed) contain a race condition:
2705 // they first read the screensize and then install a SIGWINCH handler. 2199 // they first read the screensize and then install a SIGWINCH handler.
2706 // some window managers resize the window early, and these programs 2200 // some window managers resize the window early, and these programs
… …
2719 wchar_t *str = buf; 2213 wchar_t *str = buf;
2720 wchar_t *eol = str + min (ncol, UBUFSIZ); 2214 wchar_t *eol = str + min (ncol, UBUFSIZ);
2721 2215
2722 for (;;) 2216 for (;;)
2723 { 2217 {
2724 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2218 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2725 break; 2219 break;
2726 2220
2727 *str++ = ch; 2221 *str++ = ch;
2728 2222
2729 if (ch == C0_LF || str >= eol) 2223 if (expect_false (ch == C0_LF || str >= eol))
2730 { 2224 {
2731 if (ch == C0_LF) 2225 if (ch == C0_LF)
2732 nlines++; 2226 nlines++;
2733 2227
2734 refresh_count++; 2228 refresh_count++;
2735 2229
2736 if (!OPTION (Opt_jumpScroll) 2230 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2737 || (refresh_count >= refresh_limit * (nrow - 1)))
2738 { 2231 {
2739 refreshnow = true;
2740 refresh_count = 0; 2232 refresh_count = 0;
2233
2234 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2235 {
2236 refreshnow = true;
2741 ch = NOCHAR; 2237 ch = NOCHAR;
2742 break; 2238 break;
2239 }
2743 } 2240 }
2744 2241
2745 // scr_add_lines only works for nlines <= nrow - 1. 2242 // scr_add_lines only works for nlines <= nrow - 1.
2746 if (nlines >= nrow - 1) 2243 if (nlines >= nrow - 1)
2747 { 2244 {
… …
2775 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2272 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2776 scr_add_lines (buf, str - buf, nlines); 2273 scr_add_lines (buf, str - buf, nlines);
2777 2274
2778 /* 2275 /*
2779 * If there have been a lot of new lines, then update the screen 2276 * If there have been a lot of new lines, then update the screen
2780 * What the heck I'll cheat and only refresh less than every page-full. 2277 * What the heck we'll cheat and only refresh less than every page-full.
2781 * the number of pages between refreshes is refresh_limit, which 2278 * if skipScroll is enabled.
2782 * is incremented here because we must be doing flat-out scrolling.
2783 */ 2279 */
2784 if (refreshnow) 2280 if (refreshnow)
2785 { 2281 {
2786 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2787 refresh_limit++;
2788 else
2789 {
2790 flag = true; 2282 flag = true;
2791 //TODO: due to popular request, implement "skipscroll" option here
2792 scr_refresh (); 2283 scr_refresh ();
2793 want_refresh = 1; 2284 want_refresh = 1;
2794 }
2795 } 2285 }
2796 2286
2797 } 2287 }
2798 else 2288 else
2799 { 2289 {
… …
2820rxvt_term::next_char () NOTHROW 2310rxvt_term::next_char () NOTHROW
2821{ 2311{
2822 while (cmdbuf_ptr < cmdbuf_endp) 2312 while (cmdbuf_ptr < cmdbuf_endp)
2823 { 2313 {
2824 // assume 7-bit to be ascii ALWAYS 2314 // assume 7-bit to be ascii ALWAYS
2825 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2315 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2826 return *cmdbuf_ptr++; 2316 return *cmdbuf_ptr++;
2827 2317
2828 wchar_t wc; 2318 wchar_t wc;
2829 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2319 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2830 2320
… …
2834 cmdbuf_ptr = cmdbuf_endp; 2324 cmdbuf_ptr = cmdbuf_endp;
2835 break; 2325 break;
2836 } 2326 }
2837 2327
2838 if (len == (size_t)-1) 2328 if (len == (size_t)-1)
2329 {
2330 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2839 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2331 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2332 }
2840 2333
2841 // assume wchar == unicode 2334 // assume wchar == unicode
2842 cmdbuf_ptr += len; 2335 cmdbuf_ptr += len;
2843 return wc & UNICODE_MASK; 2336 return wc & UNICODE_MASK;
2844 } 2337 }
… …
2888/*----------------------------------------------------------------------*/ 2381/*----------------------------------------------------------------------*/
2889#ifdef PRINTPIPE 2382#ifdef PRINTPIPE
2890FILE * 2383FILE *
2891rxvt_term::popen_printer () 2384rxvt_term::popen_printer ()
2892{ 2385{
2893 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2386 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2894 2387
2895 if (stream == NULL) 2388 if (stream == NULL)
2896 rxvt_warn ("can't open printer pipe, not printing.\n"); 2389 rxvt_warn ("can't open printer pipe, not printing.\n");
2897 2390
2898 return stream; 2391 return stream;
… …
2909 * simulate attached vt100 printer 2402 * simulate attached vt100 printer
2910 */ 2403 */
2911void 2404void
2912rxvt_term::process_print_pipe () 2405rxvt_term::process_print_pipe ()
2913{ 2406{
2914 int done; 2407 FILE *fd = popen_printer ();
2915 FILE *fd;
2916 2408
2917 if ((fd = popen_printer ()) == NULL) 2409 if (!fd)
2918 return; 2410 return;
2919 2411
2920 /* 2412 /*
2921 * Send all input to the printer until either ESC[4i or ESC[?4i 2413 * Send all input to the printer until either ESC[4i or ESC[?4i
2922 * is received. 2414 * is received.
2923 */ 2415 */
2924 for (done = 0; !done;) 2416 for (int done = 0; !done; )
2925 { 2417 {
2926 unsigned char buf[8]; 2418 unsigned char buf[8];
2927 unicode_t ch; 2419 unicode_t ch;
2928 unsigned int i, len; 2420 unsigned int i, len;
2929 2421
… …
2948 { 2440 {
2949 if ((buf[len++] = cmd_getc ()) == 'i') 2441 if ((buf[len++] = cmd_getc ()) == 'i')
2950 break; /* done = 1 */ 2442 break; /* done = 1 */
2951 } 2443 }
2952 } 2444 }
2953 2445
2954 for (i = 0; i < len; i++) 2446 for (i = 0; i < len; i++)
2955 if (putc (buf[i], fd) == EOF) 2447 if (putc (buf[i], fd) == EOF)
2956 { 2448 {
2957 done = 1; 2449 done = 1;
2958 break; 2450 break;
… …
2960 } 2452 }
2961 } 2453 }
2962 2454
2963 pclose_printer (fd); 2455 pclose_printer (fd);
2964} 2456}
2965#endif /* PRINTPIPE */ 2457#endif /* PRINTPIPE */
2966/*}}} */ 2458/*}}} */
2967 2459
2968/* *INDENT-OFF* */ 2460/* *INDENT-OFF* */
2969enum { 2461enum {
2970 C1_40 = 0x40, 2462 C1_40 = 0x40,
… …
3020 process_dcs_seq (); 2512 process_dcs_seq ();
3021 break; 2513 break;
3022 case 0x9b: /* CSI */ 2514 case 0x9b: /* CSI */
3023 process_csi_seq (); 2515 process_csi_seq ();
3024 break; 2516 break;
3025 case 0x9d: /* CSI */ 2517 case 0x9d: /* OSC */
3026 process_osc_seq (); 2518 process_osc_seq ();
3027 break; 2519 break;
3028#endif 2520#endif
3029 } 2521 }
3030} 2522}
… …
3074 break; 2566 break;
3075 case 'Z': /* identify the terminal type */ 2567 case 'Z': /* identify the terminal type */
3076 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2568 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3077 break; 2569 break;
3078 case '<': /* turn off VT52 mode */ 2570 case '<': /* turn off VT52 mode */
3079 PrivMode (0, PrivMode_vt52); 2571 set_privmode (PrivMode_vt52, 0);
3080 break; 2572 break;
3081 case 'F': /* use special graphics character set */ 2573 case 'F': /* use special graphics character set */
3082 case 'G': /* use regular character set */ 2574 case 'G': /* use regular character set */
3083 /* unimplemented */ 2575 /* unimplemented */
3084 break; 2576 break;
… …
3138 scr_forwardindex (); 2630 scr_forwardindex ();
3139 break; 2631 break;
3140#endif 2632#endif
3141 case '=': 2633 case '=':
3142 case '>': 2634 case '>':
3143 PrivMode ((ch == '='), PrivMode_aplKP); 2635 set_privmode (PrivMode_aplKP, ch == '=');
3144 break; 2636 break;
3145 2637
3146 case C1_40: 2638 case C1_40:
3147 cmd_getc (); 2639 cmd_getc ();
3148 break; 2640 break;
… …
3201 2693
3202 /* 8.3.106: RESET TO INITIAL STATE */ 2694 /* 8.3.106: RESET TO INITIAL STATE */
3203 case 'c': 2695 case 'c':
3204 mbstate.reset (); 2696 mbstate.reset ();
3205 scr_poweron (); 2697 scr_poweron ();
3206 scrollbar_show (1); 2698 scrollBar.show (1);
3207 break; 2699 break;
3208 2700
3209 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2701 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3210 case 'n': 2702 case 'n':
3211 scr_charset_choose (2); 2703 scr_charset_choose (2);
… …
3256rxvt_term::process_csi_seq () 2748rxvt_term::process_csi_seq ()
3257{ 2749{
3258 unicode_t ch, priv, i; 2750 unicode_t ch, priv, i;
3259 unsigned int nargs, p; 2751 unsigned int nargs, p;
3260 int n, ndef; 2752 int n, ndef;
3261 int arg[ESC_ARGS]; 2753 int arg[ESC_ARGS] = { };
3262 2754
3263 for (nargs = ESC_ARGS; nargs > 0;) 2755 nargs = 0;
3264 arg[--nargs] = 0;
3265 2756
3266 priv = 0; 2757 priv = 0;
3267 ch = cmd_getc (); 2758 ch = cmd_getc ();
3268 if (ch >= '<' && ch <= '?') 2759 if (ch >= '<' && ch <= '?')
2760 {
3269 { /* '<' '=' '>' '?' */ 2761 /* '<' '=' '>' '?' */
3270 priv = ch; 2762 priv = ch;
3271 ch = cmd_getc (); 2763 ch = cmd_getc ();
3272 } 2764 }
3273 2765
3274 /* read any numerical arguments */ 2766 /* read any numerical arguments */
… …
3313 switch (priv) 2805 switch (priv)
3314 { 2806 {
3315 case '>': 2807 case '>':
3316 if (ch == CSI_DA) /* secondary device attributes */ 2808 if (ch == CSI_DA) /* secondary device attributes */
3317 { 2809 {
3318 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2810 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3319 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2811 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3320 // 2812 //
3321 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2813 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3322 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2814 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3323 // that we do not support xterm mouse reporting (should be 95 when we do). 2815 // versions.
3324 // 2816 //
3325 tt_printf ("\033[>%d;94;0c", 'U'); 2817 tt_printf ("\033[>%d;95;0c", 'U');
3326 } 2818 }
3327 break; 2819 break;
2820
3328 case '?': 2821 case '?':
3329 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2822 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3330 process_terminal_mode (ch, priv, nargs, arg); 2823 process_terminal_mode (ch, priv, nargs, arg);
3331 break; 2824 break;
3332 } 2825 }
… …
3457 break; 2950 break;
3458 case 6: /* CPR requested */ 2951 case 6: /* CPR requested */
3459 scr_report_position (); 2952 scr_report_position ();
3460 break; 2953 break;
3461 case 7: /* unofficial extension */ 2954 case 7: /* unofficial extension */
3462 if (OPTION (Opt_insecure)) 2955 if (option (Opt_insecure))
3463 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2956 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3464 break; 2957 break;
3465 case 8: /* unofficial extension */ 2958 case 8: /* unofficial extension */
3466 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2959 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3467 break; 2960 break;
… …
3631 break; 3124 break;
3632 case 20: /* report icon label */ 3125 case 20: /* report icon label */
3633 { 3126 {
3634 char *s; 3127 char *s;
3635 XGetIconName (dpy, parent[0], &s); 3128 XGetIconName (dpy, parent[0], &s);
3636 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3129 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3637 XFree (s); 3130 XFree (s);
3638 } 3131 }
3639 break; 3132 break;
3640 case 21: /* report window title */ 3133 case 21: /* report window title */
3641 { 3134 {
3642 char *s; 3135 char *s;
3643 XFetchName (dpy, parent[0], &s); 3136 XFetchName (dpy, parent[0], &s);
3644 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3137 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3645 XFree (s); 3138 XFree (s);
3646 } 3139 }
3647 break; 3140 break;
3648 } 3141 }
3649} 3142}
… …
3776 int saveop = op; 3269 int saveop = op;
3777 3270
3778 dLocal (Display *, dpy); 3271 dLocal (Display *, dpy);
3779 3272
3780 assert (str != NULL); 3273 assert (str != NULL);
3781 3274
3782 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3275 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3783 return; 3276 return;
3784 3277
3785 switch (op) 3278 switch (op)
3786 { 3279 {
… …
3848 *buf++ = '\0'; 3341 *buf++ = '\0';
3849 3342
3850 process_color_seq (op, color, name, resp); 3343 process_color_seq (op, color, name, resp);
3851 } 3344 }
3852 break; 3345 break;
3346 case Rxvt_restoreFG:
3853 case XTerm_Color00: 3347 case XTerm_Color00:
3854 process_color_seq (op, Color_fg, str, resp); 3348 process_color_seq (op, Color_fg, str, resp);
3855 break; 3349 break;
3350 case Rxvt_restoreBG:
3856 case XTerm_Color01: 3351 case XTerm_Color01:
3857 process_color_seq (op, Color_bg, str, resp); 3352 process_color_seq (op, Color_bg, str, resp);
3858 break; 3353 break;
3859#ifndef NO_CURSORCOLOR 3354#ifndef NO_CURSORCOLOR
3860 case XTerm_Color_cursor: 3355 case XTerm_Color_cursor:
… …
3881 break; 3376 break;
3882 case URxvt_Color_IT: 3377 case URxvt_Color_IT:
3883 process_color_seq (op, Color_IT, str, resp); 3378 process_color_seq (op, Color_IT, str, resp);
3884 break; 3379 break;
3885#endif 3380#endif
3886#if TRANSPARENT && TINTING 3381#if ENABLE_TRANSPARENCY
3887 case URxvt_Color_tint: 3382 case URxvt_Color_tint:
3888 process_color_seq (op, Color_tint, str, resp); 3383 process_color_seq (op, Color_tint, str, resp);
3384 {
3385 bool changed = false;
3889 3386
3890 check_our_parents (); 3387 if (ISSET_PIXCOLOR (Color_tint))
3388 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3389 else
3390 changed = bgPixmap.unset_tint ();
3891 3391
3892 if (am_transparent) 3392 if (changed)
3893 want_full_refresh = want_refresh = 1; 3393 update_background ();
3394 }
3894 3395
3895 break; 3396 break;
3896#endif 3397#endif
3897 3398
3399#if BG_IMAGE_FROM_FILE
3898 case Rxvt_Pixmap: 3400 case Rxvt_Pixmap:
3899 { 3401 if (!strcmp (str, "?"))
3900 if (*str != ';')
3901 { 3402 {
3902#if XPM_BACKGROUND 3403 char str[256];
3903 scale_pixmap (""); /* reset to default scaling */ 3404
3904 set_bgPixmap (str); /* change pixmap */ 3405 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3905 scr_touch (true); 3406 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3906#endif 3407 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3408 process_xterm_seq (XTerm_title, str, CHAR_ST);
3907 } 3409 }
3908 3410 else
3411 {
3909 int changed = 0; 3412 int changed = 0;
3910 3413
3911 while ((str = strchr (str, ';')) != NULL) 3414 if (*str != ';')
3912 { 3415 {
3416 /* reset to default scaling :*/
3417 bgPixmap.unset_geometry ();
3418 if (bgPixmap.set_file (str)) /* change pixmap */
3419 changed++;
3420 str = strchr (str, ';');
3421 if (str == NULL)
3422 bgPixmap.set_defaultGeometry ();
3423 }
3424
3425 while (str)
3426 {
3913 str++; 3427 str++;
3914#if XPM_BACKGROUND 3428 if (bgPixmap.set_geometry (str))
3915 changed += scale_pixmap (str); 3429 changed++;
3916#endif 3430 str = strchr (str, ';');
3917 } 3431 }
3918 3432
3919 if (changed) 3433 if (changed)
3920 { 3434 update_background ();
3921#ifdef XPM_BACKGROUND
3922 resize_pixmap ();
3923 scr_touch (true);
3924#endif
3925 } 3435 }
3926 }
3927 break; 3436 break;
3928 3437#endif
3929 case Rxvt_restoreFG:
3930 set_window_color (Color_fg, str);
3931 break;
3932 case Rxvt_restoreBG:
3933 set_window_color (Color_bg, str);
3934 break;
3935 3438
3936 case XTerm_logfile: 3439 case XTerm_logfile:
3937 // TODO, when secure mode? 3440 // TODO, when secure mode?
3938 break; 3441 break;
3939 3442
… …
3957 case URxvt_italicFont: 3460 case URxvt_italicFont:
3958 case URxvt_boldItalicFont: 3461 case URxvt_boldItalicFont:
3959#endif 3462#endif
3960 if (query) 3463 if (query)
3961 tt_printf ("\33]%d;%-.250s%c", saveop, 3464 tt_printf ("\33]%d;%-.250s%c", saveop,
3962 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3465 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3963 ? fontset[op - URxvt_font]->fontdesc : "", 3466 ? fontset[op - URxvt_font]->fontdesc : "",
3964 resp); 3467 resp);
3965 else 3468 else
3966 { 3469 {
3967 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3470 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3981 break; 3484 break;
3982 3485
3983#if !ENABLE_MINIMAL 3486#if !ENABLE_MINIMAL
3984 case URxvt_locale: 3487 case URxvt_locale:
3985 if (query) 3488 if (query)
3986 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3489 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3987 else 3490 else
3988 { 3491 {
3989 set_locale (str); 3492 set_locale (str);
3990 pty->set_utf8_mode (enc_utf8); 3493 pty->set_utf8_mode (enc_utf8);
3991 init_xlocale (); 3494 init_xlocale ();
… …
4040 { 3543 {
4041 if (mode == 'r') 3544 if (mode == 'r')
4042 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3545 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4043 else 3546 else
4044 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3547 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4045 PrivMode (state, bit); 3548 set_privmode (bit, state);
4046 } 3549 }
4047 3550
4048 return state; 3551 return state;
4049} 3552}
4050 3553
… …
4054{ 3557{
4055 unsigned int i, j; 3558 unsigned int i, j;
4056 int state; 3559 int state;
4057 3560
4058 static const struct 3561 static const struct
4059 { 3562 {
4060 const int argval; 3563 const int argval;
4061 const unsigned long bit; 3564 const unsigned long bit;
4062 }
4063
4064 argtopriv[] = { 3565 } argtopriv[] = {
4065 { 1, PrivMode_aplCUR }, 3566 { 1, PrivMode_aplCUR },
4066 { 2, PrivMode_vt52 }, 3567 { 2, PrivMode_vt52 },
4067 { 3, PrivMode_132 }, 3568 { 3, PrivMode_132 },
4068 { 4, PrivMode_smoothScroll }, 3569 { 4, PrivMode_smoothScroll },
4069 { 5, PrivMode_rVideo }, 3570 { 5, PrivMode_rVideo },
… …
4085 { 66, PrivMode_aplKP }, 3586 { 66, PrivMode_aplKP },
4086#ifndef NO_BACKSPACE_KEY 3587#ifndef NO_BACKSPACE_KEY
4087 { 67, PrivMode_BackSpace }, 3588 { 67, PrivMode_BackSpace },
4088#endif 3589#endif
4089 { 1000, PrivMode_MouseX11 }, 3590 { 1000, PrivMode_MouseX11 },
4090 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3591 { 1002, PrivMode_MouseBtnEvent },
4091 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3592 { 1003, PrivMode_MouseAnyEvent },
4092 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4093 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3593 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4094 { 1011, PrivMode_Keypress }, // rxvt extension 3594 { 1011, PrivMode_Keypress }, // rxvt extension
4095 // 1035 enable modifiers for alt, numlock NYI 3595 // 1035 enable modifiers for alt, numlock NYI
4096 // 1036 send ESC for meta keys NYI 3596 // 1036 send ESC for meta keys NYI
4097 // 1037 send DEL for keypad delete NYI 3597 // 1037 send DEL for keypad delete NYI
4098 { 1047, PrivMode_Screen }, 3598 { 1047, PrivMode_Screen },
4099 // 1048 save and restore cursor 3599 // 1048 save and restore cursor
4100 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3600 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4101 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3601 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3602 { 2004, PrivMode_BracketPaste },
4102 }; 3603 };
4103 3604
4104 if (nargs == 0) 3605 if (nargs == 0)
4105 return; 3606 return;
4106 3607
… …
4132 scr_touch (true); 3633 scr_touch (true);
4133 break; 3634 break;
4134#endif 3635#endif
4135 case 1048: /* alternative cursor save */ 3636 case 1048: /* alternative cursor save */
4136 case 1049: 3637 case 1049:
4137 if (OPTION (Opt_secondaryScreen)) 3638 if (option (Opt_secondaryScreen))
4138 if (mode == 0) 3639 if (mode == 0)
4139 scr_cursor (RESTORE); 3640 scr_cursor (RESTORE);
4140 else if (mode == 1) 3641 else if (mode == 1)
4141 scr_cursor (SAVE); 3642 scr_cursor (SAVE);
4142 break; 3643 break;
… …
4150 case 2: /* VT52 mode */ 3651 case 2: /* VT52 mode */
4151 /* oddball mode. should be set regardless of set/reset 3652 /* oddball mode. should be set regardless of set/reset
4152 * parameter. Return from VT52 mode with an ESC < from 3653 * parameter. Return from VT52 mode with an ESC < from
4153 * within VT52 mode 3654 * within VT52 mode
4154 */ 3655 */
4155 PrivMode (1, PrivMode_vt52); 3656 set_privmode (PrivMode_vt52, 1);
4156 break; 3657 break;
4157 case 3: /* 80/132 */ 3658 case 3: /* 80/132 */
4158 if (priv_modes & PrivMode_132OK) 3659 if (priv_modes & PrivMode_132OK)
3660 {
3661 scr_poweron ();
4159 set_widthheight (((state ? 132 : 80) * fwidth), height); 3662 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3663 }
4160 break; 3664 break;
4161 case 4: /* smooth scrolling */ 3665 case 4: /* smooth scrolling */
4162 set_option (Opt_jumpScroll, !state); 3666 set_option (Opt_jumpScroll, !state);
4163 break; 3667 break;
4164 case 5: /* reverse video */ 3668 case 5: /* reverse video */
… …
4171 scr_autowrap (state); 3675 scr_autowrap (state);
4172 break; 3676 break;
4173 /* case 8: - auto repeat, can't do on a per window basis */ 3677 /* case 8: - auto repeat, can't do on a per window basis */
4174 case 9: /* X10 mouse reporting */ 3678 case 9: /* X10 mouse reporting */
4175 if (state) /* orthogonal */ 3679 if (state) /* orthogonal */
4176 priv_modes &= ~PrivMode_MouseX11; 3680 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4177 break; 3681 break;
4178#ifdef scrollBar_esc 3682#ifdef scrollBar_esc
4179 case scrollBar_esc: 3683 case scrollBar_esc:
4180 if (scrollbar_mapping (state)) 3684 if (scrollBar.map (state))
4181 { 3685 {
4182 resize_all_windows (0, 0, 0); 3686 resize_all_windows (0, 0, 0);
4183 scr_touch (true); 3687 scr_touch (true);
4184 } 3688 }
4185 break; 3689 break;
… …
4194 break; 3698 break;
4195 /* case 66: - application key pad */ 3699 /* case 66: - application key pad */
4196 /* case 67: - backspace key */ 3700 /* case 67: - backspace key */
4197 case 1000: /* X11 mouse reporting */ 3701 case 1000: /* X11 mouse reporting */
4198 if (state) /* orthogonal */ 3702 if (state) /* orthogonal */
4199 priv_modes &= ~PrivMode_MouseX10; 3703 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4200 break; 3704 break;
4201#if 0
4202 case 1001: 3705 case 1002:
4203 break; /* X11 mouse highlighting */ 3706 case 1003:
4204#endif 3707 if (state)
3708 {
3709 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3710 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3711 vt_emask_mouse = PointerMotionMask;
3712 }
3713 else
3714 vt_emask_mouse = NoEventMask;
3715 vt_select_input ();
3716 break;
4205 case 1010: /* scroll to bottom on TTY output inhibit */ 3717 case 1010: /* scroll to bottom on TTY output inhibit */
4206 set_option (Opt_scrollTtyOutput, !state); 3718 set_option (Opt_scrollTtyOutput, !state);
4207 break; 3719 break;
4208 case 1011: /* scroll to bottom on key press */ 3720 case 1011: /* scroll to bottom on key press */
4209 set_option (Opt_scrollTtyKeypress, state); 3721 set_option (Opt_scrollTtyKeypress, state);
4210 break; 3722 break;
4211 case 1047: /* secondary screen w/ clearing last */ 3723 case 1047: /* secondary screen w/ clearing last */
4212 if (OPTION (Opt_secondaryScreen)) 3724 if (option (Opt_secondaryScreen))
4213 if (current_screen != PRIMARY) 3725 if (current_screen != PRIMARY)
4214 scr_erase_screen (2); 3726 scr_erase_screen (2);
4215 scr_change_screen (state); 3727 scr_change_screen (state);
4216 break; 3728 break;
4217 case 1049: /* secondary screen w/ clearing first */ 3729 case 1049: /* secondary screen w/ clearing first */
4218 scr_change_screen (state); 3730 scr_change_screen (state);
4219 if (OPTION (Opt_secondaryScreen)) 3731 if (option (Opt_secondaryScreen))
4220 if (current_screen != PRIMARY) 3732 if (current_screen != PRIMARY)
4221 scr_erase_screen (2); 3733 scr_erase_screen (2);
4222 break; 3734 break;
4223 default: 3735 default:
4224 break; 3736 break;
… …
4386rxvt_term::process_graphics () 3898rxvt_term::process_graphics ()
4387{ 3899{
4388 unicode_t ch, cmd = cmd_getc (); 3900 unicode_t ch, cmd = cmd_getc ();
4389 3901
4390 if (cmd == 'Q') 3902 if (cmd == 'Q')
3903 {
4391 { /* query graphics */ 3904 /* query graphics */
4392 tt_printf ("\033G0\012"); /* no graphics */ 3905 tt_printf ("\033G0\012"); /* no graphics */
4393 return; 3906 return;
4394 } 3907 }
4395 /* swallow other graphics sequences until terminating ':' */ 3908 /* swallow other graphics sequences until terminating ':' */
4396 do 3909 do
… …
4446 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3959 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4447 3960
4448 memcpy (v_buffer + v_buflen, data, len); 3961 memcpy (v_buffer + v_buflen, data, len);
4449 v_buflen += len; 3962 v_buflen += len;
4450 3963
4451 pty_ev.set (EVENT_READ | EVENT_WRITE); 3964 pty_ev.set (ev::READ | ev::WRITE);
4452} 3965}
4453 3966
4454void rxvt_term::pty_write () 3967void rxvt_term::pty_write ()
4455{ 3968{
4456 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3969 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4461 3974
4462 if (v_buflen == 0) 3975 if (v_buflen == 0)
4463 { 3976 {
4464 free (v_buffer); 3977 free (v_buffer);
4465 v_buffer = 0; 3978 v_buffer = 0;
4466 v_buflen = 0;
4467 3979
4468 pty_ev.set (EVENT_READ); 3980 pty_ev.set (ev::READ);
4469 return; 3981 return;
4470 } 3982 }
4471 3983
4472 memmove (v_buffer, v_buffer + written, v_buflen); 3984 memmove (v_buffer, v_buffer + written, v_buflen);
4473 } 3985 }
4474 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3986 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4475 pty_ev.set (EVENT_READ); 3987 pty_ev.set (ev::READ);
4476} 3988}
4477 3989
4478/*----------------------- end-of-file (C source) -----------------------*/ 3990/*----------------------- end-of-file (C source) -----------------------*/
4479 3991

Diff Legend

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