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

Diff Legend

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