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.363 by root, Sun Nov 11 04:08:00 2007 UTC vs.
Revision 1.438 by root, Thu Feb 4 21:55:12 2010 UTC

25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
198 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
200 201
201 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
202 203
203 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
205 206
206 if (y >= 0) 207 if (y >= 0)
207 { 208 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
220 ch = *chr++; 221 ch = *chr++;
221 222
222 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
225# if !UNICODE3 226# if !UNICODE_3
226 if (ch >= 0x10000) 227 if (ch >= 0x10000)
227 ch = 0xfffd; 228 ch = 0xfffd;
228# endif 229# endif
229 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
230 231
278 } 279 }
279 280
280 iso14755buf = 0; 281 iso14755buf = 0;
281} 282}
282 283
283int 284static int
284rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
285{ 286{
286 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
289 { 290 {
297 298
298 return -1; 299 return -1;
299} 300}
300#endif 301#endif
301 302
303static inline KeySym
304translate_keypad (KeySym keysym, bool kp)
305{
306#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin
322 };
323
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
325 {
326 unsigned int index = keysym - XK_KP_Home;
327 keysym = kp ? keypadtrans[index] : XK_Home + index;
328 }
329 else if (keysym == XK_KP_Insert)
330 keysym = kp ? XK_KP_0 : XK_Insert;
331# ifndef NO_DELETE_KEY
332 else if (keysym == XK_KP_Delete)
333 keysym = kp ? XK_KP_Decimal : XK_Delete;
334# endif
335#endif
336 return keysym;
337}
338
339static inline int
340map_function_key (KeySym keysym)
341{
342 int param = 0;
343
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
345 {
346 param = 11 + keysym - XK_F1;
347 if (keysym >= XK_F17)
348 param += 4;
349 else if (keysym >= XK_F15)
350 param += 3;
351 else if (keysym >= XK_F11)
352 param += 2;
353 else if (keysym >= XK_F6)
354 param += 1;
355 }
356 else
357 switch (keysym)
358 {
359 case XK_Find:
360 param = 1;
361 break;
362 case XK_Insert:
363 param = 2;
364 break;
365#ifdef DXK_Remove
366 case DXK_Remove:
367#endif
368 case XK_Execute:
369 param = 3;
370 break;
371 case XK_Select:
372 param = 4;
373 break;
374#ifndef UNSHIFTED_SCROLLKEYS
375 case XK_Prior:
376 param = 5;
377 break;
378 case XK_Next:
379 param = 6;
380 break;
381 case XK_Home:
382 param = 7;
383 break;
384 case XK_End:
385 param = 8;
386 break;
387#endif
388 case XK_Help:
389 param = 28;
390 break;
391 case XK_Menu:
392 param = 29;
393 break;
394 }
395 return param;
396}
397
302void 398void
303rxvt_term::key_press (XKeyEvent &ev) 399rxvt_term::key_press (XKeyEvent &ev)
304{ 400{
305 int ctrl, meta, shft, len; 401 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 402 KeySym keysym;
308 int valid_keysym; 403 int valid_keysym;
309 char kbuf[KBUFSZ]; 404 char kbuf[KBUFSZ];
310 405
311#if ISO_14755 406#if ISO_14755
324 meta = ev.state & ModMetaMask; 419 meta = ev.state & ModMetaMask;
325 420
326 if (numlock_state || (ev.state & ModNumLockMask)) 421 if (numlock_state || (ev.state & ModNumLockMask))
327 { 422 {
328 numlock_state = (ev.state & ModNumLockMask); 423 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP); 424 set_privmode (PrivMode_aplKP, !numlock_state);
330 } 425 }
331 426
332 kbuf[0] = 0; 427 kbuf[0] = 0;
333 428
334#ifdef USE_XIM 429#ifdef USE_XIM
410#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 507#else
413 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
414#endif 509#endif
510 max_it (lnsppg, 1);
511
415 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
416 { 513 {
417 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
418 return; 515 return;
419 } 516 }
484 } 581 }
485 } 582 }
486 583
487#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 585 // ISO 14755 support
489 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 587 {
491 int hv; 588 int hv;
492 589
493 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
524 scr_overlay_off (); 621 scr_overlay_off ();
525# endif 622# endif
526 iso14755buf = 0; 623 iso14755buf = 0;
527 } 624 }
528 } 625 }
626 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
532 { 630 {
533 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 632# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
546 } 644 }
547#endif 645#endif
548 646
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1;
651
652 switch (translate_keypad (keysym, kp))
551 { 653 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 654#ifndef NO_BACKSPACE_KEY
655 case XK_BackSpace:
656 if (priv_modes & PrivMode_HaveBackSpace)
657 {
658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
659 ^ !!ctrl) ? '\b' : '\177';
660 kbuf[1] = '\0';
661 }
662 else
663 strcpy (kbuf, rs[Rs_backspace_key]);
664 break;
665#endif
666#ifndef NO_DELETE_KEY
667 case XK_Delete:
668 strcpy (kbuf, rs[Rs_delete_key]);
669 break;
670#endif
671 case XK_Tab:
672 if (shft)
673 strcpy (kbuf, "\033[Z");
674 else
675 {
676#ifdef CTRL_TAB_MAKES_META
677 if (ctrl)
678 meta = 1;
679#endif
680#ifdef MOD4_TAB_MAKES_META
681 if (ev.state & Mod4Mask)
682 meta = 1;
683#endif
553 newlen = 1; 684 newlen = 0;
554 switch (keysym) 685 }
686 break;
687
688 case XK_Up: /* "\033[A" */
689 case XK_Down: /* "\033[B" */
690 case XK_Right: /* "\033[C" */
691 case XK_Left: /* "\033[D" */
692 strcpy (kbuf, "\033[Z");
693 kbuf[2] = "DACB"[keysym - XK_Left];
694 /* do Shift first */
695 if (shft)
696 kbuf[2] = "dacb"[keysym - XK_Left];
697 else if (ctrl)
698 {
699 kbuf[1] = 'O';
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 }
702 else if (priv_modes & PrivMode_aplCUR)
703 kbuf[1] = 'O';
704 break;
705
706 case XK_KP_Enter:
707 /* allow shift to override */
708 if (kp)
709 {
710 strcpy (kbuf, "\033OM");
711 break;
712 }
713
714 /* FALLTHROUGH */
715
716 case XK_Return:
717 if (priv_modes & PrivMode_LFNL)
718 {
719 kbuf[0] = '\015';
720 kbuf[1] = '\012';
721 kbuf[2] = '\0';
722 }
723 else
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\0';
727 }
728 break;
729
730 case XK_KP_F1: /* "\033OP" */
731 case XK_KP_F2: /* "\033OQ" */
732 case XK_KP_F3: /* "\033OR" */
733 case XK_KP_F4: /* "\033OS" */
734 strcpy (kbuf, "\033OP");
735 kbuf[2] += (keysym - XK_KP_F1);
736 break;
737
738 case XK_KP_Multiply: /* "\033Oj" : "*" */
739 case XK_KP_Add: /* "\033Ok" : "+" */
740 case XK_KP_Separator: /* "\033Ol" : "," */
741 case XK_KP_Subtract: /* "\033Om" : "-" */
742 case XK_KP_Decimal: /* "\033On" : "." */
743 case XK_KP_Divide: /* "\033Oo" : "/" */
744 case XK_KP_0: /* "\033Op" : "0" */
745 case XK_KP_1: /* "\033Oq" : "1" */
746 case XK_KP_2: /* "\033Or" : "2" */
747 case XK_KP_3: /* "\033Os" : "3" */
748 case XK_KP_4: /* "\033Ot" : "4" */
749 case XK_KP_5: /* "\033Ou" : "5" */
750 case XK_KP_6: /* "\033Ov" : "6" */
751 case XK_KP_7: /* "\033Ow" : "7" */
752 case XK_KP_8: /* "\033Ox" : "8" */
753 case XK_KP_9: /* "\033Oy" : "9" */
754 /* allow shift to override */
755 if (kp)
756 {
757 strcpy (kbuf, "\033Oj");
758 kbuf[2] += (keysym - XK_KP_Multiply);
759 }
760 else
761 {
762 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
763 kbuf[1] = '\0';
764 }
765 break;
766
767 default:
555 { 768 {
556#ifndef NO_BACKSPACE_KEY 769 int param = map_function_key (keysym);
557 case XK_BackSpace: 770 if (param > 0)
558 if (priv_modes & PrivMode_HaveBackSpace) 771 sprintf (kbuf,"\033[%d~", param);
559 {
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0';
563 }
564 else 772 else
565 strcpy (kbuf, rs[Rs_backspace_key]);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Delete
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if (kp)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, rs[Rs_delete_key]);
581 break;
582#endif
583 case XK_Tab:
584 if (shft)
585 strcpy (kbuf, "\033[Z");
586 else
587 {
588#ifdef CTRL_TAB_MAKES_META
589 if (ctrl)
590 meta = 1;
591#endif
592#ifdef MOD4_TAB_MAKES_META
593 if (ev.state & Mod4Mask)
594 meta = 1;
595#endif
596 newlen = 0;
597 }
598 break;
599
600#ifdef XK_KP_Left
601 case XK_KP_Left: /* \033Ot or standard */
602 case XK_KP_Up: /* \033Ox or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Down: /* \033Or or standard */
605 if (kp)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z");
621 kbuf[2] = "DACB"[keysym - XK_Left];
622 /* do Shift first */
623 if (shft)
624 kbuf[2] = "dacb"[keysym - XK_Left];
625 else if (ctrl)
626 {
627 kbuf[1] = 'O';
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 }
630 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O';
632 break;
633
634#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if (kp)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if (kp)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next:
659 strcpy (kbuf, "\033[6~");
660 break;
661#endif
662 case XK_KP_Enter:
663 /* allow shift to override */
664 if (kp)
665 {
666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
678 }
679 else
680 {
681 kbuf[0] = '\015';
682 kbuf[1] = '\0';
683 }
684 break;
685
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP");
697 kbuf[2] += (keysym - XK_KP_F1);
698 break;
699
700 case XK_KP_Multiply: /* "\033Oj" : "*" */
701 case XK_KP_Add: /* "\033Ok" : "+" */
702 case XK_KP_Separator: /* "\033Ol" : "," */
703 case XK_KP_Subtract: /* "\033Om" : "-" */
704 case XK_KP_Decimal: /* "\033On" : "." */
705 case XK_KP_Divide: /* "\033Oo" : "/" */
706 case XK_KP_0: /* "\033Op" : "0" */
707 case XK_KP_1: /* "\033Oq" : "1" */
708 case XK_KP_2: /* "\033Or" : "2" */
709 case XK_KP_3: /* "\033Os" : "3" */
710 case XK_KP_4: /* "\033Ot" : "4" */
711 case XK_KP_5: /* "\033Ou" : "5" */
712 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */
717 if (kp)
718 {
719 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply);
721 }
722 else
723 {
724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725 kbuf[1] = '\0';
726 }
727 break;
728
729 case XK_Find:
730 strcpy (kbuf, "\033[1~");
731 break;
732
733#ifdef XK_KP_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if (kp)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert:
744 strcpy (kbuf, "\033[2~");
745 break;
746#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove:
748 /* FALLTHROUGH */
749#endif
750 case XK_Execute:
751 strcpy (kbuf, "\033[3~");
752 break;
753 case XK_Select:
754 strcpy (kbuf, "\033[4~");
755 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if (kp)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End:
767 strcpy (kbuf, KS_END);
768 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if (kp)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home:
780 strcpy (kbuf, KS_HOME);
781 break;
782
783#define FKEY(n, fkey) \
784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
785
786 case XK_F1: /* "\033[11~" */
787 case XK_F2: /* "\033[12~" */
788 case XK_F3: /* "\033[13~" */
789 case XK_F4: /* "\033[14~" */
790 case XK_F5: /* "\033[15~" */
791 FKEY (11, XK_F1);
792 break;
793 case XK_F6: /* "\033[17~" */
794 case XK_F7: /* "\033[18~" */
795 case XK_F8: /* "\033[19~" */
796 case XK_F9: /* "\033[20~" */
797 case XK_F10: /* "\033[21~" */
798 FKEY (17, XK_F6);
799 break;
800 case XK_F11: /* "\033[23~" */
801 case XK_F12: /* "\033[24~" */
802 case XK_F13: /* "\033[25~" */
803 case XK_F14: /* "\033[26~" */
804 FKEY (23, XK_F11);
805 break;
806 case XK_F15: /* "\033[28~" */
807 case XK_F16: /* "\033[29~" */
808 FKEY (28, XK_F15);
809 break;
810 case XK_Help: /* "\033[28~" */
811 FKEY (28, XK_Help);
812 break;
813 case XK_Menu: /* "\033[29~" */
814 FKEY (29, XK_Menu);
815 break;
816 case XK_F17: /* "\033[31~" */
817 case XK_F18: /* "\033[32~" */
818 case XK_F19: /* "\033[33~" */
819 case XK_F20: /* "\033[34~" */
820 case XK_F21: /* "\033[35~" */
821 case XK_F22: /* "\033[36~" */
822 case XK_F23: /* "\033[37~" */
823 case XK_F24: /* "\033[38~" */
824 case XK_F25: /* "\033[39~" */
825 case XK_F26: /* "\033[40~" */
826 case XK_F27: /* "\033[41~" */
827 case XK_F28: /* "\033[42~" */
828 case XK_F29: /* "\033[43~" */
829 case XK_F30: /* "\033[44~" */
830 case XK_F31: /* "\033[45~" */
831 case XK_F32: /* "\033[46~" */
832 case XK_F33: /* "\033[47~" */
833 case XK_F34: /* "\033[48~" */
834 case XK_F35: /* "\033[49~" */
835 FKEY (31, XK_F17);
836 break;
837#undef FKEY
838 default:
839 newlen = 0; 773 newlen = 0;
840 break;
841 } 774 }
842 775 break;
843 if (newlen)
844 len = strlen (kbuf);
845 } 776 }
777
778 if (newlen)
779 len = strlen (kbuf);
846 780
847 /* 781 /*
848 * Pass meta for all function keys, if 'meta' option set 782 * Pass meta for all function keys, if 'meta' option set
849 */ 783 */
850#ifdef META8_OPTION 784#ifdef META8_OPTION
1084 } 1018 }
1085 while (row < end_row); 1019 while (row < end_row);
1086 } 1020 }
1087 1021
1088 scr_refresh (); 1022 scr_refresh ();
1089 scrollbar_show (1); 1023 scrollBar.show (1);
1090#ifdef USE_XIM 1024#ifdef USE_XIM
1091 IMSendSpot (); 1025 IMSendSpot ();
1092#endif 1026#endif
1093 } 1027 }
1094 1028
1095 display->flush (); 1029 display->flush ();
1096} 1030}
1097 1031
1032/* checks wether a refresh is requested and starts the refresh timer */
1098void 1033void
1099rxvt_term::prepare_cb (ev::prepare &w, int revents) 1034rxvt_term::refresh_check ()
1100{ 1035{
1101 make_current (); 1036 if (want_refresh && !flush_ev.is_active ())
1037 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102 1038
1103 display->flush (); 1039 display->flush ();
1104
1105 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
1107} 1040}
1108 1041
1109void 1042void
1110rxvt_term::flush_cb (ev::timer &w, int revents) 1043rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1044{
1119void 1052void
1120rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1053rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121{ 1054{
1122 hidden_cursor = !hidden_cursor; 1055 hidden_cursor = !hidden_cursor;
1123 want_refresh = 1; 1056 want_refresh = 1;
1057 refresh_check ();
1124} 1058}
1125#endif 1059#endif
1126 1060
1127#ifdef TEXT_BLINK 1061#ifdef TEXT_BLINK
1128void 1062void
1130{ 1064{
1131 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1065 if (scr_refresh_rend (RS_Blink, RS_Blink))
1132 { 1066 {
1133 hidden_text = !hidden_text; 1067 hidden_text = !hidden_text;
1134 want_refresh = 1; 1068 want_refresh = 1;
1069 refresh_check ();
1135 } 1070 }
1136}
1137#endif
1138
1139#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1140void
1141rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1142{
1143 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1144 scr_page (scrollbar_isUp() ? UP : DN, 1))
1145 want_refresh = 1;
1146 else 1071 else
1147 w.stop (); 1072 w.stop ();
1148} 1073}
1149#endif 1074#endif
1150 1075
1076#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1077void
1078rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1079{
1080 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1081 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1082 {
1083 want_refresh = 1;
1084 refresh_check ();
1085 }
1086 else
1087 w.stop ();
1088}
1089#endif
1090
1151#ifdef SELECTION_SCROLLING 1091#ifdef SELECTION_SCROLLING
1152void 1092void
1153rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1093rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1154{ 1094{
1155 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1095 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1156 { 1096 {
1157 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1097 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1158 want_refresh = 1; 1098 want_refresh = 1;
1099 refresh_check ();
1159 } 1100 }
1160 else 1101 else
1161 w.stop (); 1102 w.stop ();
1162} 1103}
1163#endif 1104#endif
1164 1105
1165#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1106#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1166void 1107void
1167rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1108rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1168{ 1109{
1169 if (mouse_slip_wheel_speed == 0 1110 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1170 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1171 : scr_page (UP, mouse_slip_wheel_speed))
1172 { 1111 {
1173 if (view_start == top_row || view_start == 0)
1174 mouse_slip_wheel_speed = 0;
1175
1176 want_refresh = 1; 1112 want_refresh = 1;
1113 refresh_check ();
1114 }
1115
1116 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1177 } 1117 {
1178 else 1118 mouse_slip_wheel_speed = 0;
1179 w.stop (); 1119 w.stop ();
1120 }
1180} 1121}
1181#endif 1122#endif
1182 1123
1183#if LINUX_YIELD_HACK 1124#if LINUX_YIELD_HACK
1184static struct event_handler 1125static struct event_handler
1189 { 1130 {
1190 // this should really be sched_yield(), but the linux guys thought 1131 // this should really be sched_yield(), but the linux guys thought
1191 // that giving a process calling sched_yield () less cpu time than 1132 // that giving a process calling sched_yield () less cpu time than
1192 // ones with high nice levels is a useful thing to do. It surely is is 1133 // ones with high nice levels is a useful thing to do. It surely is is
1193 // allowed by the sus... as is returning ENOSYS. 1134 // allowed by the sus... as is returning ENOSYS.
1135 // since the linux guys additionally thought that breaking the only
1136 // known workaroudn against their unusable sched_yield hack is cool,
1137 // we just nanosleep a bit and hope for the best.
1194 1138
1195 struct timespec ts = { 0, 0 }; 1139 struct timespec ts = { 0, 1000 };
1196 nanosleep (&ts, 0); 1140 nanosleep (&ts, 0);
1197 1141
1198 w.stop (); 1142 w.stop ();
1199 } 1143 }
1200 1144
1250{ 1194{
1251 make_current (); 1195 make_current ();
1252 1196
1253 if (revents & ev::READ) 1197 if (revents & ev::READ)
1254 // loop, but don't allow a single term to monopolize us 1198 // loop, but don't allow a single term to monopolize us
1255 while (pty_fill ()) 1199 for (int i = CBUFCNT; i-- && pty_fill (); )
1256 if (cmd_parse ()) 1200 cmd_parse ();
1257 break;
1258 1201
1259 if (revents & ev::WRITE) 1202 if (revents & ev::WRITE)
1260 pty_write (); 1203 pty_write ();
1204
1205 refresh_check ();
1261} 1206}
1262 1207
1263void 1208void
1264rxvt_term::pointer_unblank () 1209rxvt_term::pointer_unblank ()
1265{ 1210{
1303 int x, y; 1248 int x, y;
1304 int code = 32; 1249 int code = 32;
1305 1250
1306 x = Pixel2Col (ev.x); 1251 x = Pixel2Col (ev.x);
1307 y = Pixel2Row (ev.y); 1252 y = Pixel2Row (ev.y);
1308 if (ev.type == MotionNotify) { 1253 if (ev.type == MotionNotify)
1254 {
1309 if (x == mouse_row && y == mouse_col) 1255 if (x == mouse_row && y == mouse_col)
1310 return; 1256 return;
1311 mouse_row = x; 1257 mouse_row = x;
1312 mouse_col = y; 1258 mouse_col = y;
1313 code += 32; 1259 code += 32;
1314 } 1260 }
1315 1261
1316 if (MEvent.button == AnyButton) 1262 if (MEvent.button == AnyButton)
1317 button_number = 3; 1263 button_number = 3;
1318 else 1264 else
1319 { 1265 {
1479 && ev.xfocus.mode != NotifyGrab) 1425 && ev.xfocus.mode != NotifyGrab)
1480 focus_out (); 1426 focus_out ();
1481 break; 1427 break;
1482 1428
1483 case ConfigureNotify: 1429 case ConfigureNotify:
1484 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1430 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1485 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1431 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1486 szHint.width, szHint.height); */ 1432 szHint.width, szHint.height);*/
1487 if (ev.xconfigure.window == parent[0]) 1433 if (ev.xconfigure.window == parent[0])
1488 { 1434 {
1489 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1435 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1490 ; 1436 ;
1491 1437
1496 } 1442 }
1497 else 1443 else
1498 { 1444 {
1499#ifdef HAVE_BG_PIXMAP 1445#ifdef HAVE_BG_PIXMAP
1500 if (bgPixmap.window_position_sensitive ()) 1446 if (bgPixmap.window_position_sensitive ())
1447 {
1448 if (mapped)
1501 update_background (); 1449 update_background ();
1450 else
1451 bgPixmap.invalidate ();
1452 }
1502#endif 1453#endif
1503 } 1454 }
1455
1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1456 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1505 } 1457 }
1506 break; 1458 break;
1507 1459
1508 case PropertyNotify: 1460 case PropertyNotify:
1512 selection_property (ev.xproperty.window, ev.xproperty.atom); 1464 selection_property (ev.xproperty.window, ev.xproperty.atom);
1513 1465
1514 break; 1466 break;
1515 1467
1516 case SelectionClear: 1468 case SelectionClear:
1517 selection_clear (); 1469 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1518 break; 1470 break;
1519 1471
1520 case SelectionNotify: 1472 case SelectionNotify:
1521 if (selection_wait == Sel_normal) 1473 if (selection_wait == Sel_normal)
1522 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1474 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1525 case SelectionRequest: 1477 case SelectionRequest:
1526 selection_send (ev.xselectionrequest); 1478 selection_send (ev.xselectionrequest);
1527 break; 1479 break;
1528 1480
1529 case MapNotify: 1481 case MapNotify:
1482#ifdef HAVE_BG_PIXMAP
1483 /* This is needed spcifically to fix the case of no window manager or a
1484 * non-reparenting window manager. In those cases we never get first
1485 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1486 * care of multiplicity of ConfigureNotify events arriwing while WM does
1487 * reparenting.
1488 * We should not render background immidiately, as there could be several
1489 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1490 * by scheduling background redraw as soon as we can, but giving a short
1491 * bit of time for ConfigureNotifies to arrive.
1492 * We should render background PRIOR to drawing any text, but AFTER all
1493 * of ConfigureNotifys for the best results.
1494 */
1495 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1496 update_background_ev.start (0.025);
1497#endif
1530 mapped = 1; 1498 mapped = 1;
1531#ifdef TEXT_BLINK 1499#ifdef TEXT_BLINK
1532 text_blink_ev.start (TEXT_BLINK_INTERVAL); 1500 text_blink_ev.start ();
1533#endif 1501#endif
1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1502 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1535 break; 1503 break;
1536 1504
1537 case UnmapNotify: 1505 case UnmapNotify:
1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1526 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1559 { 1527 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1528 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1529 ev.xexpose.width, ev.xexpose.height, False);
1562 } 1530 }
1531
1563 want_refresh = 1; 1532 want_refresh = 1;
1564 } 1533 }
1565 else 1534 else
1566 { 1535 {
1567 XEvent unused_event; 1536 XEvent unused_event;
1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1538 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1570 ; 1539 ;
1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1540 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1572 ; 1541 ;
1573 1542
1574 if (isScrollbarWindow (ev.xany.window)) 1543 if (scrollBar.state && ev.xany.window == scrollBar.win)
1575 { 1544 {
1576 scrollBar.setIdle (); 1545 scrollBar.state = STATE_IDLE;
1577 scrollbar_show (0); 1546 scrollBar.show (0);
1578 } 1547 }
1579 } 1548 }
1580 break; 1549 break;
1581 1550
1582 case MotionNotify: 1551 case MotionNotify:
1628 int dist; 1597 int dist;
1629 1598
1630 /* don't clobber the current delay if we are 1599 /* don't clobber the current delay if we are
1631 * already in the middle of scrolling. 1600 * already in the middle of scrolling.
1632 */ 1601 */
1633 if (!sel_scroll_ev.active) 1602 if (!sel_scroll_ev.is_active ())
1634 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1603 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1635 1604
1636 /* save the event params so we can highlight 1605 /* save the event params so we can highlight
1637 * the selection in the pending-scroll loop 1606 * the selection in the pending-scroll loop
1638 */ 1607 */
1661 else 1630 else
1662 { 1631 {
1663 /* we are within the text window, so we 1632 /* we are within the text window, so we
1664 * shouldn't be scrolling 1633 * shouldn't be scrolling
1665 */ 1634 */
1666 if (sel_scroll_ev.active)
1667 sel_scroll_ev.stop(); 1635 sel_scroll_ev.stop();
1668 } 1636 }
1669#endif 1637#endif
1670#ifdef MOUSE_THRESHOLD 1638#ifdef MOUSE_THRESHOLD
1671 } 1639 }
1672#endif 1640#endif
1673 } 1641 }
1674 } 1642 }
1675 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1643 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1676 { 1644 {
1677 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1645 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1678 MotionNotify, &ev)) 1646 MotionNotify, &ev))
1679 ; 1647 ;
1680 1648
1682 &unused_root, &unused_child, 1650 &unused_root, &unused_child,
1683 &unused_root_x, &unused_root_y, 1651 &unused_root_x, &unused_root_y,
1684 &ev.xbutton.x, &ev.xbutton.y, 1652 &ev.xbutton.x, &ev.xbutton.y,
1685 &unused_mask); 1653 &unused_mask);
1686 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1654 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1687 scrollbar_size ()); 1655 scrollBar.size ());
1688 want_refresh = 1; 1656 want_refresh = 1;
1689 scrollbar_show (1); 1657 scrollBar.show (1);
1690 } 1658 }
1691 break; 1659 break;
1692 } 1660 }
1693 1661
1694#if defined(CURSOR_BLINK) 1662#if defined(CURSOR_BLINK)
1715 1683
1716 if (ev.type == KeyPress && hidden_pointer == 0) 1684 if (ev.type == KeyPress && hidden_pointer == 0)
1717 pointer_blank (); 1685 pointer_blank ();
1718 } 1686 }
1719#endif 1687#endif
1688
1689 refresh_check ();
1720} 1690}
1691
1692#if ENABLE_FRILLS
1693void
1694rxvt_term::set_urgency (bool enable)
1695{
1696 if (enable == urgency_hint)
1697 return;
1698
1699 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1700 {
1701 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1702 XSetWMHints (dpy, parent[0], h);
1703 urgency_hint = enable;
1704 }
1705}
1706#endif
1721 1707
1722void 1708void
1723rxvt_term::focus_in () 1709rxvt_term::focus_in ()
1724{ 1710{
1725 if (!focus) 1711 if (!focus)
1726 { 1712 {
1727 focus = 1; 1713 focus = 1;
1728 want_refresh = 1; 1714 want_refresh = 1;
1729 1715
1730 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1731
1732#if USE_XIM 1716#if USE_XIM
1733 if (Input_Context != NULL) 1717 if (Input_Context != NULL)
1734 { 1718 {
1735 IMSetPosition (); 1719 IMSetPosition ();
1736 XSetICFocus (Input_Context); 1720 XSetICFocus (Input_Context);
1737 } 1721 }
1738#endif 1722#endif
1739#if CURSOR_BLINK 1723#if CURSOR_BLINK
1740 if (option (Opt_cursorBlink)) 1724 if (option (Opt_cursorBlink))
1741 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL); 1725 cursor_blink_ev.again ();
1742#endif 1726#endif
1743#if OFF_FOCUS_FADING 1727#if OFF_FOCUS_FADING
1744 if (rs[Rs_fade]) 1728 if (rs[Rs_fade])
1745 { 1729 {
1746 pix_colors = pix_colors_focused; 1730 pix_colors = pix_colors_focused;
1747 scr_recolour (); 1731 scr_recolour ();
1748 } 1732 }
1749#endif 1733#endif
1750#if ENABLE_FRILLS 1734#if ENABLE_FRILLS
1751 if (option (Opt_urgentOnBell)) 1735 if (option (Opt_urgentOnBell))
1752 { 1736 set_urgency (0);
1753 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1754 {
1755 h->flags &= ~XUrgencyHint;
1756 XSetWMHints (dpy, parent[0], h);
1757 }
1758 }
1759#endif 1737#endif
1738
1739 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1760 } 1740 }
1761} 1741}
1762 1742
1763void 1743void
1764rxvt_term::focus_out () 1744rxvt_term::focus_out ()
1766 if (focus) 1746 if (focus)
1767 { 1747 {
1768 focus = 0; 1748 focus = 0;
1769 want_refresh = 1; 1749 want_refresh = 1;
1770 1750
1771 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1751#if ENABLE_FRILLS
1772 1752 if (option (Opt_urgentOnBell))
1753 set_urgency (0);
1754#endif
1773#if ENABLE_FRILLS || ISO_14755 1755#if ENABLE_FRILLS || ISO_14755
1774 if (iso14755buf) 1756 if (iso14755buf)
1775 { 1757 {
1776 iso14755buf = 0; 1758 iso14755buf = 0;
1777# if ISO_14755 1759# if ISO_14755
1794 { 1776 {
1795 pix_colors = pix_colors_unfocused; 1777 pix_colors = pix_colors_unfocused;
1796 scr_recolour (); 1778 scr_recolour ();
1797 } 1779 }
1798#endif 1780#endif
1781
1782 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1799 } 1783 }
1800} 1784}
1801 1785
1802void 1786void
1803rxvt_term::update_fade_color (unsigned int idx) 1787rxvt_term::update_fade_color (unsigned int idx)
1834 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1818 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1835 { 1819 {
1836 bgPixmap.set_root_pixmap (); 1820 bgPixmap.set_root_pixmap ();
1837 update_background (); 1821 update_background ();
1838 } 1822 }
1823
1839 break; 1824 break;
1840 } 1825 }
1841# endif 1826# endif
1827
1828 refresh_check ();
1842} 1829}
1843#endif 1830#endif
1844 1831
1845void 1832void
1846rxvt_term::button_press (XButtonEvent &ev) 1833rxvt_term::button_press (XButtonEvent &ev)
1901 mouse_report (ev); 1888 mouse_report (ev);
1902 } 1889 }
1903#else 1890#else
1904 MEvent.button = ev.button; 1891 MEvent.button = ev.button;
1905 mouse_report (ev); 1892 mouse_report (ev);
1906#endif /* MOUSE_REPORT_DOUBLECLICK */ 1893#endif /* MOUSE_REPORT_DOUBLECLICK */
1907 1894
1908 } 1895 }
1909 else 1896 else
1910 { 1897 {
1911 if (ev.button != MEvent.button) 1898 if (ev.button != MEvent.button)
1959 } 1946 }
1960 1947
1961 /* 1948 /*
1962 * Scrollbar window processing of button press 1949 * Scrollbar window processing of button press
1963 */ 1950 */
1964 if (isScrollbarWindow (ev.window)) 1951 if (scrollBar.state && ev.window == scrollBar.win)
1965 { 1952 {
1966 scrollBar.setIdle (); 1953 page_dirn direction = NO_DIR;
1954
1955 if (scrollBar.upButton (ev.y))
1956 direction = UP; /* up */
1957 else if (scrollBar.dnButton (ev.y))
1958 direction = DN; /* down */
1959
1960 scrollBar.state = STATE_IDLE;
1967 /* 1961 /*
1968 * Rxvt-style scrollbar: 1962 * Rxvt-style scrollbar:
1969 * move up if mouse is above slider 1963 * move up if mouse is above slider
1970 * move dn if mouse is below slider 1964 * move dn if mouse is below slider
1971 * 1965 *
1980 /* 1974 /*
1981 * Mouse report disabled scrollbar: 1975 * Mouse report disabled scrollbar:
1982 * arrow buttons - send up/down 1976 * arrow buttons - send up/down
1983 * click on scrollbar - send pageup/down 1977 * click on scrollbar - send pageup/down
1984 */ 1978 */
1985 if ((scrollBar.style == R_SB_NEXT 1979 if (direction == UP)
1986 && scrollbarnext_upButton (ev.y))
1987 || (scrollBar.style == R_SB_RXVT
1988 && scrollbarrxvt_upButton (ev.y)))
1989 tt_printf ("\033[A"); 1980 tt_printf ("\033[A");
1990 else if ((scrollBar.style == R_SB_NEXT 1981 else if (direction == DN)
1991 && scrollbarnext_dnButton (ev.y))
1992 || (scrollBar.style == R_SB_RXVT
1993 && scrollbarrxvt_dnButton (ev.y)))
1994 tt_printf ("\033[B"); 1982 tt_printf ("\033[B");
1995 else 1983 else
1996 switch (ev.button) 1984 switch (ev.button)
1997 { 1985 {
1998 case Button2: 1986 case Button2:
2005 tt_printf ("\033[5~"); 1993 tt_printf ("\033[5~");
2006 break; 1994 break;
2007 } 1995 }
2008 } 1996 }
2009 else 1997 else
2010#endif /* NO_SCROLLBAR_REPORT */ 1998#endif /* NO_SCROLLBAR_REPORT */
2011
2012 {
2013 char upordown = 0;
2014
2015 if (scrollBar.style == R_SB_NEXT)
2016 { 1999 {
2017 if (scrollbarnext_upButton (ev.y)) 2000 if (direction != NO_DIR)
2018 upordown = -1; /* up */
2019 else if (scrollbarnext_dnButton (ev.y))
2020 upordown = 1; /* down */
2021 }
2022 else if (scrollBar.style == R_SB_RXVT)
2023 {
2024 if (scrollbarrxvt_upButton (ev.y))
2025 upordown = -1; /* up */
2026 else if (scrollbarrxvt_dnButton (ev.y))
2027 upordown = 1; /* down */
2028 }
2029 if (upordown)
2030 { 2001 {
2031#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2002#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2003 if (!cont_scroll_ev.is_active ())
2032 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2004 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2033#endif 2005#endif
2034 if (scr_page (upordown < 0 ? UP : DN, 1)) 2006 if (scr_page (direction, 1))
2035 { 2007 {
2036 if (upordown < 0) 2008 if (direction == UP)
2037 scrollBar.setUp (); 2009 scrollBar.state = STATE_UP;
2038 else 2010 else
2039 scrollBar.setDn (); 2011 scrollBar.state = STATE_DOWN;
2040 } 2012 }
2041 } 2013 }
2042 else 2014 else
2043 switch (ev.button) 2015 switch (ev.button)
2044 { 2016 {
2045 case Button2: 2017 case Button2:
2046 switch (scrollbar_align) 2018 switch (scrollBar.align)
2047 { 2019 {
2048 case R_SB_ALIGN_TOP: 2020 case R_SB_ALIGN_TOP:
2049 csrO = 0; 2021 csrO = 0;
2050 break; 2022 break;
2051 case R_SB_ALIGN_CENTRE: 2023 case R_SB_ALIGN_CENTRE:
2057 } 2029 }
2058 2030
2059 if (scrollBar.style == R_SB_XTERM 2031 if (scrollBar.style == R_SB_XTERM
2060 || scrollbar_above_slider (ev.y) 2032 || scrollbar_above_slider (ev.y)
2061 || scrollbar_below_slider (ev.y)) 2033 || scrollbar_below_slider (ev.y))
2062 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2034 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2063 2035
2064 scrollBar.setMotion (); 2036 scrollBar.state = STATE_MOTION;
2065 break; 2037 break;
2066 2038
2067 case Button1: 2039 case Button1:
2068 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2040 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2069 csrO = ev.y - scrollBar.top; 2041 csrO = ev.y - scrollBar.top;
2070 /* FALLTHROUGH */ 2042 /* FALLTHROUGH */
2071 2043
2072 case Button3: 2044 case Button3:
2073 if (scrollBar.style != R_SB_XTERM) 2045 if (scrollBar.style != R_SB_XTERM)
2083 scr_page (DN, nrow - 1); 2055 scr_page (DN, nrow - 1);
2084# else 2056# else
2085 scr_page (DN, nrow / 4); 2057 scr_page (DN, nrow / 4);
2086# endif 2058# endif
2087 else 2059 else
2088 scrollBar.setMotion (); 2060 scrollBar.state = STATE_MOTION;
2089 } 2061 }
2090 else 2062 else
2091 { 2063 {
2092 scr_page ((ev.button == Button1 ? DN : UP), 2064 scr_page ((ev.button == Button1 ? DN : UP),
2093 (nrow 2065 (nrow
2094 * scrollbar_position (ev.y) 2066 * scrollbar_position (ev.y)
2095 / scrollbar_size ())); 2067 / scrollBar.size ()));
2096 } 2068 }
2097 2069
2098 break; 2070 break;
2099 } 2071 }
2100 } 2072 }
2110 2082
2111 csrO = 0; /* reset csr Offset */ 2083 csrO = 0; /* reset csr Offset */
2112 if (!bypass_keystate) 2084 if (!bypass_keystate)
2113 reportmode = !! (priv_modes & PrivMode_mouse_report); 2085 reportmode = !! (priv_modes & PrivMode_mouse_report);
2114 2086
2115 if (scrollbar_isUpDn ()) 2087 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2116 { 2088 {
2117 scrollBar.setIdle (); 2089 scrollBar.state = STATE_IDLE;
2118 scrollbar_show (0); 2090 scrollBar.show (0);
2119 } 2091 }
2120 2092
2121#ifdef SELECTION_SCROLLING 2093#ifdef SELECTION_SCROLLING
2122 if (sel_scroll_ev.active)
2123 sel_scroll_ev.stop(); 2094 sel_scroll_ev.stop();
2124#endif 2095#endif
2125 2096
2126 if (ev.window == vt) 2097 if (ev.window == vt)
2127 { 2098 {
2128 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2099 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152 mouse_report (ev); 2123 mouse_report (ev);
2153 } 2124 }
2154#else /* MOUSE_REPORT_DOUBLECLICK */ 2125#else /* MOUSE_REPORT_DOUBLECLICK */
2155 MEvent.button = AnyButton; 2126 MEvent.button = AnyButton;
2156 mouse_report (ev); 2127 mouse_report (ev);
2157#endif /* MOUSE_REPORT_DOUBLECLICK */ 2128#endif /* MOUSE_REPORT_DOUBLECLICK */
2158 return; 2129 return;
2159 } 2130 }
2160 2131
2161 /* 2132 /*
2162 * dumb hack to compensate for the failure of click-and-drag 2133 * dumb hack to compensate for the failure of click-and-drag
2200 { 2171 {
2201 mouse_slip_wheel_speed += v ? -1 : 1; 2172 mouse_slip_wheel_speed += v ? -1 : 1;
2202 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2173 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2203 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2174 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2204 2175
2176 if (!slip_wheel_ev.is_active ())
2205 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2177 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2206 } 2178 }
2207 else 2179 else
2180# endif
2208 { 2181 {
2209# endif
2210 scr_page (v, i); 2182 scr_page (v, i);
2211 scrollbar_show (1); 2183 scrollBar.show (1);
2212# ifdef MOUSE_SLIP_WHEELING
2213 } 2184 }
2214# endif
2215 } 2185 }
2216 break; 2186 break;
2217#endif 2187#endif
2218 } 2188 }
2219 } 2189 }
2220} 2190}
2221 2191
2222/*}}} */ 2192/*}}} */
2223 2193
2224bool 2194void
2225rxvt_term::cmd_parse () 2195rxvt_term::cmd_parse ()
2226{ 2196{
2227 bool flag = false;
2228 wchar_t ch = NOCHAR; 2197 wchar_t ch = NOCHAR;
2229 char *seq_begin; // remember start of esc-sequence here 2198 char *seq_begin; // remember start of esc-sequence here
2230 2199
2231 for (;;) 2200 for (;;)
2232 { 2201 {
2233 if (ch == NOCHAR) 2202 if (expect_false (ch == NOCHAR))
2234 { 2203 {
2235 seq_begin = cmdbuf_ptr; 2204 seq_begin = cmdbuf_ptr;
2236 ch = next_char (); 2205 ch = next_char ();
2237 2206
2238 if (ch == NOCHAR) 2207 if (ch == NOCHAR)
2239 break; 2208 break;
2240 } 2209 }
2241 2210
2242 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2211 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2243 { 2212 {
2244 if (!seen_input) 2213 if (expect_false (!seen_input))
2245 { 2214 {
2246 seen_input = 1; 2215 seen_input = 1;
2247 // many badly-written programs (e.g. jed) contain a race condition: 2216 // many badly-written programs (e.g. jed) contain a race condition:
2248 // they first read the screensize and then install a SIGWINCH handler. 2217 // they first read the screensize and then install a SIGWINCH handler.
2249 // some window managers resize the window early, and these programs 2218 // some window managers resize the window early, and these programs
2262 wchar_t *str = buf; 2231 wchar_t *str = buf;
2263 wchar_t *eol = str + min (ncol, UBUFSIZ); 2232 wchar_t *eol = str + min (ncol, UBUFSIZ);
2264 2233
2265 for (;;) 2234 for (;;)
2266 { 2235 {
2267 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2236 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2268 break; 2237 break;
2269 2238
2270 *str++ = ch; 2239 *str++ = ch;
2271 2240
2272 if (ch == C0_LF || str >= eol) 2241 if (expect_false (ch == C0_LF || str >= eol))
2273 { 2242 {
2274 if (ch == C0_LF) 2243 if (ch == C0_LF)
2275 nlines++; 2244 nlines++;
2276 2245
2277 refresh_count++; 2246 refresh_count++;
2278 2247
2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2248 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2280 { 2249 {
2281 refresh_count = 0; 2250 refresh_count = 0;
2282 2251
2283 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.) 2252 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2284 { 2253 {
2285 refreshnow = true; 2254 refreshnow = true;
2286 ch = NOCHAR; 2255 ch = NOCHAR;
2287 break; 2256 break;
2288 } 2257 }
2326 * What the heck we'll cheat and only refresh less than every page-full. 2295 * What the heck we'll cheat and only refresh less than every page-full.
2327 * if skipScroll is enabled. 2296 * if skipScroll is enabled.
2328 */ 2297 */
2329 if (refreshnow) 2298 if (refreshnow)
2330 { 2299 {
2331 flag = true;
2332 scr_refresh (); 2300 scr_refresh ();
2333 want_refresh = 1; 2301 want_refresh = 1;
2334 } 2302 }
2335
2336 } 2303 }
2337 else 2304 else
2338 { 2305 {
2339 try 2306 try
2340 { 2307 {
2348 } 2315 }
2349 2316
2350 ch = NOCHAR; 2317 ch = NOCHAR;
2351 } 2318 }
2352 } 2319 }
2353
2354 return flag;
2355} 2320}
2356 2321
2357// read the next character 2322// read the next character
2358wchar_t 2323wchar_t
2359rxvt_term::next_char () NOTHROW 2324rxvt_term::next_char () NOTHROW
2360{ 2325{
2361 while (cmdbuf_ptr < cmdbuf_endp) 2326 while (cmdbuf_ptr < cmdbuf_endp)
2362 { 2327 {
2363 // assume 7-bit to be ascii ALWAYS 2328 // assume 7-bit to be ascii ALWAYS
2364 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2329 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2365 return *cmdbuf_ptr++; 2330 return *cmdbuf_ptr++;
2366 2331
2367 wchar_t wc; 2332 wchar_t wc;
2368 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2333 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2369 2334
2373 cmdbuf_ptr = cmdbuf_endp; 2338 cmdbuf_ptr = cmdbuf_endp;
2374 break; 2339 break;
2375 } 2340 }
2376 2341
2377 if (len == (size_t)-1) 2342 if (len == (size_t)-1)
2343 {
2344 mbstate.reset (); // reset now undefined conversion state
2378 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2345 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2346 }
2379 2347
2380 // assume wchar == unicode 2348 // assume wchar == unicode
2381 cmdbuf_ptr += len; 2349 cmdbuf_ptr += len;
2382 return wc & UNICODE_MASK; 2350 return wc & UNICODE_MASK;
2383 } 2351 }
2427/*----------------------------------------------------------------------*/ 2395/*----------------------------------------------------------------------*/
2428#ifdef PRINTPIPE 2396#ifdef PRINTPIPE
2429FILE * 2397FILE *
2430rxvt_term::popen_printer () 2398rxvt_term::popen_printer ()
2431{ 2399{
2432 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2400 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2433 2401
2434 if (stream == NULL) 2402 if (stream == NULL)
2435 rxvt_warn ("can't open printer pipe, not printing.\n"); 2403 rxvt_warn ("can't open printer pipe, not printing.\n");
2436 2404
2437 return stream; 2405 return stream;
2448 * simulate attached vt100 printer 2416 * simulate attached vt100 printer
2449 */ 2417 */
2450void 2418void
2451rxvt_term::process_print_pipe () 2419rxvt_term::process_print_pipe ()
2452{ 2420{
2453 int done; 2421 FILE *fd = popen_printer ();
2454 FILE *fd;
2455 2422
2456 if ((fd = popen_printer ()) == NULL) 2423 if (!fd)
2457 return; 2424 return;
2458 2425
2459 /* 2426 /*
2460 * Send all input to the printer until either ESC[4i or ESC[?4i 2427 * Send all input to the printer until either ESC[4i or ESC[?4i
2461 * is received. 2428 * is received.
2462 */ 2429 */
2463 for (done = 0; !done;) 2430 for (int done = 0; !done; )
2464 { 2431 {
2465 unsigned char buf[8]; 2432 unsigned char buf[8];
2466 unicode_t ch; 2433 unicode_t ch;
2467 unsigned int i, len; 2434 unsigned int i, len;
2468 2435
2499 } 2466 }
2500 } 2467 }
2501 2468
2502 pclose_printer (fd); 2469 pclose_printer (fd);
2503} 2470}
2504#endif /* PRINTPIPE */ 2471#endif /* PRINTPIPE */
2505/*}}} */ 2472/*}}} */
2506 2473
2507/* *INDENT-OFF* */ 2474/* *INDENT-OFF* */
2508enum { 2475enum {
2509 C1_40 = 0x40, 2476 C1_40 = 0x40,
2613 break; 2580 break;
2614 case 'Z': /* identify the terminal type */ 2581 case 'Z': /* identify the terminal type */
2615 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2582 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2616 break; 2583 break;
2617 case '<': /* turn off VT52 mode */ 2584 case '<': /* turn off VT52 mode */
2618 PrivMode (0, PrivMode_vt52); 2585 set_privmode (PrivMode_vt52, 0);
2619 break; 2586 break;
2620 case 'F': /* use special graphics character set */ 2587 case 'F': /* use special graphics character set */
2621 case 'G': /* use regular character set */ 2588 case 'G': /* use regular character set */
2622 /* unimplemented */ 2589 /* unimplemented */
2623 break; 2590 break;
2677 scr_forwardindex (); 2644 scr_forwardindex ();
2678 break; 2645 break;
2679#endif 2646#endif
2680 case '=': 2647 case '=':
2681 case '>': 2648 case '>':
2682 PrivMode ((ch == '='), PrivMode_aplKP); 2649 set_privmode (PrivMode_aplKP, ch == '=');
2683 break; 2650 break;
2684 2651
2685 case C1_40: 2652 case C1_40:
2686 cmd_getc (); 2653 cmd_getc ();
2687 break; 2654 break;
2726 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2693 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2727 case C1_SCI: /* ESC Z */ 2694 case C1_SCI: /* ESC Z */
2728 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2695 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2729 break; /* steal obsolete ESC [ c */ 2696 break; /* steal obsolete ESC [ c */
2730 2697
2731 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2698 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2732 case C1_CSI: /* ESC [ */ 2699 case C1_CSI: /* ESC [ */
2733 process_csi_seq (); 2700 process_csi_seq ();
2734 break; 2701 break;
2735 2702
2736 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2703 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2737 case C1_OSC: /* ESC ] */ 2704 case C1_OSC: /* ESC ] */
2738 process_osc_seq (); 2705 process_osc_seq ();
2739 break; 2706 break;
2740 2707
2741 /* 8.3.106: RESET TO INITIAL STATE */ 2708 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2742 case 'c': 2709 case 'c':
2743 mbstate.reset (); 2710 mbstate.reset ();
2744 scr_poweron (); 2711 scr_poweron ();
2745 scrollbar_show (1); 2712 scrollBar.show (1);
2746 break; 2713 break;
2747 2714
2748 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2715 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2749 case 'n': 2716 case 'n':
2750 scr_charset_choose (2); 2717 scr_charset_choose (2);
2801 2768
2802 nargs = 0; 2769 nargs = 0;
2803 2770
2804 priv = 0; 2771 priv = 0;
2805 ch = cmd_getc (); 2772 ch = cmd_getc ();
2806 if (ch >= '<' && ch <= '?') 2773 if ((ch >= '<' && ch <= '?') || ch == '!')
2774 {
2807 { /* '<' '=' '>' '?' */ 2775 /* '<' '=' '>' '?' '!' */
2808 priv = ch; 2776 priv = ch;
2809 ch = cmd_getc (); 2777 ch = cmd_getc ();
2810 } 2778 }
2811 2779
2812 /* read any numerical arguments */ 2780 /* read any numerical arguments */
2861 // versions. 2829 // versions.
2862 // 2830 //
2863 tt_printf ("\033[>%d;95;0c", 'U'); 2831 tt_printf ("\033[>%d;95;0c", 'U');
2864 } 2832 }
2865 break; 2833 break;
2834
2866 case '?': 2835 case '?':
2867 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2836 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2868 process_terminal_mode (ch, priv, nargs, arg); 2837 process_terminal_mode (ch, priv, nargs, arg);
2869 break; 2838 break;
2839
2840 case '!':
2841 if (ch == CSI_70)
2842 {
2843 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2844 scr_soft_reset ();
2845
2846 static const int pm_h[] = { 7, 25 };
2847 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2848
2849 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2850 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2870 } 2851 }
2852 break;
2853 }
2854
2871 return; 2855 return;
2872 } 2856 }
2873 2857
2874 switch (ch) 2858 switch (ch)
2875 { 2859 {
3304 3288
3305/* 3289/*
3306 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3290 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3307 */ 3291 */
3308void 3292void
3309rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3293rxvt_term::process_xterm_seq (int op, char *str, char resp)
3310{ 3294{
3311 int color; 3295 int color;
3312 char *buf, *name; 3296 char *buf, *name;
3313 bool query = str[0] == '?' && !str[1]; 3297 bool query = str[0] == '?' && !str[1];
3314 int saveop = op; 3298 int saveop = op;
3355 3339
3356 XFree (value); 3340 XFree (value);
3357 } 3341 }
3358 else 3342 else
3359 { 3343 {
3360 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3344 char *eq = strchr (str, '=');
3361 3345
3362 if (eq) 3346 if (eq)
3363 { 3347 {
3364 *eq = 0; 3348 *eq = 0;
3365 set_utf8_property (display->atom (str), eq + 1); 3349 set_utf8_property (display->atom (str), eq + 1);
3386 *buf++ = '\0'; 3370 *buf++ = '\0';
3387 3371
3388 process_color_seq (op, color, name, resp); 3372 process_color_seq (op, color, name, resp);
3389 } 3373 }
3390 break; 3374 break;
3375 case Rxvt_restoreFG:
3391 case XTerm_Color00: 3376 case XTerm_Color00:
3392 process_color_seq (op, Color_fg, str, resp); 3377 process_color_seq (op, Color_fg, str, resp);
3393 break; 3378 break;
3379 case Rxvt_restoreBG:
3394 case XTerm_Color01: 3380 case XTerm_Color01:
3395 process_color_seq (op, Color_bg, str, resp); 3381 process_color_seq (op, Color_bg, str, resp);
3396 break; 3382 break;
3397#ifndef NO_CURSORCOLOR 3383#ifndef NO_CURSORCOLOR
3398 case XTerm_Color_cursor: 3384 case XTerm_Color_cursor:
3419 break; 3405 break;
3420 case URxvt_Color_IT: 3406 case URxvt_Color_IT:
3421 process_color_seq (op, Color_IT, str, resp); 3407 process_color_seq (op, Color_IT, str, resp);
3422 break; 3408 break;
3423#endif 3409#endif
3410 case URxvt_Color_border:
3411 process_color_seq (op, Color_border, str, resp);
3412 break;
3424#if ENABLE_TRANSPARENCY 3413#if ENABLE_TRANSPARENCY
3425 case URxvt_Color_tint: 3414 case URxvt_Color_tint:
3426 process_color_seq (op, Color_tint, str, resp); 3415 process_color_seq (op, Color_tint, str, resp);
3427 { 3416 {
3428 bool changed = false; 3417 bool changed = false;
3418
3429 if (ISSET_PIXCOLOR (Color_tint)) 3419 if (ISSET_PIXCOLOR (Color_tint))
3430 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3420 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3431 else 3421 else
3432 changed = bgPixmap.unset_tint (); 3422 changed = bgPixmap.unset_tint ();
3423
3433 if (changed) 3424 if (changed)
3434 update_background (); 3425 update_background ();
3435 } 3426 }
3436 3427
3437 break; 3428 break;
3441 case Rxvt_Pixmap: 3432 case Rxvt_Pixmap:
3442 if (!strcmp (str, "?")) 3433 if (!strcmp (str, "?"))
3443 { 3434 {
3444 char str[256]; 3435 char str[256];
3445 3436
3446 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3437 sprintf (str, "[%dx%d+%d+%d]",
3447 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3438 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3448 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3439 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3449 process_xterm_seq (XTerm_title, str, CHAR_ST); 3440 process_xterm_seq (XTerm_title, str, CHAR_ST);
3450 } 3441 }
3451 else 3442 else
3460 changed++; 3451 changed++;
3461 str = strchr (str, ';'); 3452 str = strchr (str, ';');
3462 if (str == NULL) 3453 if (str == NULL)
3463 bgPixmap.set_defaultGeometry (); 3454 bgPixmap.set_defaultGeometry ();
3464 } 3455 }
3456
3465 while (str) 3457 while (str)
3466 { 3458 {
3467 str++; 3459 str++;
3468 if (bgPixmap.set_geometry (str)) 3460 if (bgPixmap.set_geometry (str))
3469 changed++; 3461 changed++;
3470 str = strchr (str, ';'); 3462 str = strchr (str, ';');
3471 } 3463 }
3464
3472 if (changed) 3465 if (changed)
3473 update_background (); 3466 update_background ();
3474 } 3467 }
3475 break; 3468 break;
3476#endif 3469#endif
3477
3478 case Rxvt_restoreFG:
3479 set_window_color (Color_fg, str);
3480 break;
3481 case Rxvt_restoreBG:
3482 set_window_color (Color_bg, str);
3483 break;
3484 3470
3485 case XTerm_logfile: 3471 case XTerm_logfile:
3486 // TODO, when secure mode? 3472 // TODO, when secure mode?
3487 break; 3473 break;
3488 3474
3555 break; 3541 break;
3556#endif 3542#endif
3557 3543
3558#if ENABLE_PERL 3544#if ENABLE_PERL
3559 case URxvt_perl: 3545 case URxvt_perl:
3560 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3546 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3561 ; // no responses yet
3562 break; 3547 break;
3563#endif 3548#endif
3564 } 3549 }
3565} 3550}
3566/*----------------------------------------------------------------------*/ 3551/*----------------------------------------------------------------------*/
3589 { 3574 {
3590 if (mode == 'r') 3575 if (mode == 'r')
3591 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3592 else 3577 else
3593 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3578 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3594 PrivMode (state, bit); 3579 set_privmode (bit, state);
3595 } 3580 }
3596 3581
3597 return state; 3582 return state;
3598} 3583}
3599 3584
3607 static const struct 3592 static const struct
3608 { 3593 {
3609 const int argval; 3594 const int argval;
3610 const unsigned long bit; 3595 const unsigned long bit;
3611 } argtopriv[] = { 3596 } argtopriv[] = {
3612 { 1, PrivMode_aplCUR }, 3597 { 1, PrivMode_aplCUR }, // DECCKM
3613 { 2, PrivMode_vt52 }, 3598 { 2, PrivMode_vt52 },
3614 { 3, PrivMode_132 }, 3599 { 3, PrivMode_132 }, // DECCOLM
3615 { 4, PrivMode_smoothScroll }, 3600 { 4, PrivMode_smoothScroll }, // DECSCLM
3616 { 5, PrivMode_rVideo }, 3601 { 5, PrivMode_rVideo }, // DECSCNM
3617 { 6, PrivMode_relOrigin }, 3602 { 6, PrivMode_relOrigin }, // DECOM
3618 { 7, PrivMode_Autowrap }, 3603 { 7, PrivMode_Autowrap }, // DECAWM
3619 // 8, bi-directional support mode 3604 // 8, auto-repeat keys // DECARM
3620 { 9, PrivMode_MouseX10 }, 3605 { 9, PrivMode_MouseX10 },
3621 // 18, 19 printing-related 3606 // 18 end FF to printer after print screen
3607 // 19 Print screen prints full screen/scorll region
3622 { 25, PrivMode_VisibleCursor }, 3608 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3623#ifdef scrollBar_esc 3609#ifdef scrollBar_esc
3624 { scrollBar_esc, PrivMode_scrollBar }, 3610 { scrollBar_esc, PrivMode_scrollBar },
3625#endif 3611#endif
3626 { 35, PrivMode_ShiftKeys }, // rxvt extension 3612 { 35, PrivMode_ShiftKeys }, // rxvt extension
3613 // 38, tektronix mode // DECTEK
3627 { 40, PrivMode_132OK }, 3614 { 40, PrivMode_132OK },
3628 // 41 xterm more fixes NYI 3615 // 41 xterm more fixes NYI
3629 // 45 margin bell NYI 3616 // 45 margin bell NYI
3630 // 46 start logging 3617 // 46 start logging
3631 { 47, PrivMode_Screen }, 3618 { 47, PrivMode_Screen },
3632 { 66, PrivMode_aplKP }, 3619 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3633#ifndef NO_BACKSPACE_KEY 3620#ifndef NO_BACKSPACE_KEY
3634 { 67, PrivMode_BackSpace }, 3621 { 67, PrivMode_BackSpace }, // DECBKM
3635#endif 3622#endif
3636 { 1000, PrivMode_MouseX11 }, 3623 { 1000, PrivMode_MouseX11 },
3637 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3638 { 1002, PrivMode_MouseBtnEvent }, 3624 { 1002, PrivMode_MouseBtnEvent },
3639 { 1003, PrivMode_MouseAnyEvent }, 3625 { 1003, PrivMode_MouseAnyEvent },
3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3626 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3641 { 1011, PrivMode_Keypress }, // rxvt extension 3627 { 1011, PrivMode_Keypress }, // rxvt extension
3642 // 1035 enable modifiers for alt, numlock NYI 3628 // 1035 enable modifiers for alt, numlock NYI
3644 // 1037 send DEL for keypad delete NYI 3630 // 1037 send DEL for keypad delete NYI
3645 { 1047, PrivMode_Screen }, 3631 { 1047, PrivMode_Screen },
3646 // 1048 save and restore cursor 3632 // 1048 save and restore cursor
3647 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3633 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3648 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3634 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3635 { 2004, PrivMode_BracketPaste },
3649 }; 3636 };
3650 3637
3651 if (nargs == 0) 3638 if (nargs == 0)
3652 return; 3639 return;
3653 3640
3678 3665
3679 scr_touch (true); 3666 scr_touch (true);
3680 break; 3667 break;
3681#endif 3668#endif
3682 case 1048: /* alternative cursor save */ 3669 case 1048: /* alternative cursor save */
3683 case 1049:
3684 if (option (Opt_secondaryScreen)) 3670 if (option (Opt_secondaryScreen))
3685 if (mode == 0) 3671 if (mode == 0)
3686 scr_cursor (RESTORE); 3672 scr_cursor (RESTORE);
3687 else if (mode == 1) 3673 else if (mode == 1)
3688 scr_cursor (SAVE); 3674 scr_cursor (SAVE);
3697 case 2: /* VT52 mode */ 3683 case 2: /* VT52 mode */
3698 /* oddball mode. should be set regardless of set/reset 3684 /* oddball mode. should be set regardless of set/reset
3699 * parameter. Return from VT52 mode with an ESC < from 3685 * parameter. Return from VT52 mode with an ESC < from
3700 * within VT52 mode 3686 * within VT52 mode
3701 */ 3687 */
3702 PrivMode (1, PrivMode_vt52); 3688 set_privmode (PrivMode_vt52, 1);
3703 break; 3689 break;
3704 case 3: /* 80/132 */ 3690 case 3: /* 80/132 */
3705 if (priv_modes & PrivMode_132OK) 3691 if (priv_modes & PrivMode_132OK)
3706 set_widthheight (((state ? 132 : 80) * fwidth), height); 3692 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3707 break; 3693 break;
3708 case 4: /* smooth scrolling */ 3694 case 4: /* smooth scrolling */
3709 set_option (Opt_jumpScroll, !state); 3695 set_option (Opt_jumpScroll, !state);
3710 break; 3696 break;
3711 case 5: /* reverse video */ 3697 case 5: /* reverse video */
3722 if (state) /* orthogonal */ 3708 if (state) /* orthogonal */
3723 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3709 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3724 break; 3710 break;
3725#ifdef scrollBar_esc 3711#ifdef scrollBar_esc
3726 case scrollBar_esc: 3712 case scrollBar_esc:
3727 if (scrollbar_mapping (state)) 3713 if (scrollBar.map (state))
3728 { 3714 {
3729 resize_all_windows (0, 0, 0); 3715 resize_all_windows (0, 0, 0);
3730 scr_touch (true); 3716 scr_touch (true);
3731 } 3717 }
3732 break; 3718 break;
3743 /* case 67: - backspace key */ 3729 /* case 67: - backspace key */
3744 case 1000: /* X11 mouse reporting */ 3730 case 1000: /* X11 mouse reporting */
3745 if (state) /* orthogonal */ 3731 if (state) /* orthogonal */
3746 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3732 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3747 break; 3733 break;
3748#if 0
3749 case 1001:
3750 break; /* X11 mouse highlighting */
3751#endif
3752 case 1002: 3734 case 1002:
3753 case 1003: 3735 case 1003:
3754 if (state) { 3736 if (state)
3737 {
3755 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3738 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3756 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3739 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3757 vt_emask_mouse = PointerMotionMask; 3740 vt_emask_mouse = PointerMotionMask;
3741 }
3758 } else 3742 else
3759 vt_emask_mouse = NoEventMask; 3743 vt_emask_mouse = NoEventMask;
3744
3760 vt_select_input (); 3745 vt_select_input ();
3761 break; 3746 break;
3762 case 1010: /* scroll to bottom on TTY output inhibit */ 3747 case 1010: /* scroll to bottom on TTY output inhibit */
3763 set_option (Opt_scrollTtyOutput, !state); 3748 set_option (Opt_scrollTtyOutput, !state);
3764 break; 3749 break;
3765 case 1011: /* scroll to bottom on key press */ 3750 case 1011: /* scroll to bottom on key press */
3766 set_option (Opt_scrollTtyKeypress, state); 3751 set_option (Opt_scrollTtyKeypress, state);
3767 break; 3752 break;
3768 case 1047: /* secondary screen w/ clearing last */ 3753 case 1047: /* secondary screen w/ clearing last */
3769 if (option (Opt_secondaryScreen)) 3754 if (option (Opt_secondaryScreen))
3770 if (current_screen != PRIMARY) 3755 if (!state)
3771 scr_erase_screen (2); 3756 scr_erase_screen (2);
3757
3772 scr_change_screen (state); 3758 scr_change_screen (state);
3773 break; 3759 break;
3774 case 1049: /* secondary screen w/ clearing first */ 3760 case 1049: /* secondary screen w/ clearing first */
3761 if (option (Opt_secondaryScreen))
3762 if (state)
3763 scr_cursor (SAVE);
3764
3775 scr_change_screen (state); 3765 scr_change_screen (state);
3766
3776 if (option (Opt_secondaryScreen)) 3767 if (option (Opt_secondaryScreen))
3777 if (current_screen != PRIMARY) 3768 if (state)
3778 scr_erase_screen (2); 3769 scr_erase_screen (2);
3770 else
3771 scr_cursor (RESTORE);
3779 break; 3772 break;
3780 default: 3773 default:
3781 break; 3774 break;
3782 } 3775 }
3783 } 3776 }
3943rxvt_term::process_graphics () 3936rxvt_term::process_graphics ()
3944{ 3937{
3945 unicode_t ch, cmd = cmd_getc (); 3938 unicode_t ch, cmd = cmd_getc ();
3946 3939
3947 if (cmd == 'Q') 3940 if (cmd == 'Q')
3941 {
3948 { /* query graphics */ 3942 /* query graphics */
3949 tt_printf ("\033G0\012"); /* no graphics */ 3943 tt_printf ("\033G0\012"); /* no graphics */
3950 return; 3944 return;
3951 } 3945 }
3952 /* swallow other graphics sequences until terminating ':' */ 3946 /* swallow other graphics sequences until terminating ':' */
3953 do 3947 do

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines