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.329 by ayin, Mon Jun 11 19:57:28 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.
… …
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
… …
411#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 507#else
414 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
415#endif 509#endif
510 max_it (lnsppg, 1);
511
416 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
417 { 513 {
418 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
419 return; 515 return;
420 } 516 }
… …
485 } 581 }
486 } 582 }
487 583
488#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 585 // ISO 14755 support
490 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 587 {
492 int hv; 588 int hv;
493 589
494 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
… …
519# endif 615# endif
520 return; 616 return;
521 } 617 }
522 else 618 else
523 { 619 {
524# if ENABLE_OVERLAY 620# if ISO_14755
525 scr_overlay_off (); 621 scr_overlay_off ();
526# endif 622# endif
527 iso14755buf = 0; 623 iso14755buf = 0;
528 } 624 }
529 } 625 }
626 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
533 { 630 {
534 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
535# if ENABLE_OVERLAY 632# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode"); 634 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif 635# endif
539 } 636 }
540#endif 637#endif
… …
547 } 644 }
548#endif 645#endif
549 646
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1;
651
652 switch (translate_keypad (keysym, kp))
552 { 653 {
654#ifndef NO_BACKSPACE_KEY
655 case XK_BackSpace:
656 if (priv_modes & PrivMode_HaveBackSpace)
657 {
658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
659 ^ !!ctrl) ? '\b' : '\177';
660 kbuf[1] = '\0';
661 }
662 else
663 strcpy (kbuf, rs[Rs_backspace_key]);
664 break;
665#endif
666#ifndef NO_DELETE_KEY
667 case XK_Delete:
668 strcpy (kbuf, rs[Rs_delete_key]);
669 break;
670#endif
671 case XK_Tab:
672 if (shft)
673 strcpy (kbuf, "\033[Z");
674 else
675 {
676#ifdef CTRL_TAB_MAKES_META
677 if (ctrl)
678 meta = 1;
679#endif
680#ifdef MOD4_TAB_MAKES_META
681 if (ev.state & Mod4Mask)
682 meta = 1;
683#endif
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, key_backspace);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, key_delete);
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_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */
605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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_End
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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
… …
934#if ENABLE_FRILLS || ISO_14755 868#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support 869 // ISO 14755 support
936 if (iso14755buf) 870 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52) 871 if (iso14755buf & ISO_14755_52)
938 { 872 {
939# if ENABLE_OVERLAY 873# if ISO_14755
940 scr_overlay_off (); 874 scr_overlay_off ();
941# endif 875# endif
942# if ISO_14755 876# if ISO_14755
943 // iso14755 part 5.2 handling: release time 877 // iso14755 part 5.2 handling: release time
944 // first: controls 878 // first: controls
… …
967 901
968 return; 902 return;
969 } 903 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 904 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 { 905 {
972# if ENABLE_OVERLAY 906# if ISO_14755
973 scr_overlay_off (); 907 scr_overlay_off ();
974# endif 908# endif
975 if (iso14755buf & ISO_14755_51) 909 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 (); 910 commit_iso14755 ();
977#if ISO_14755 911#if ISO_14755
… …
1035void 969void
1036rxvt_term::flush () 970rxvt_term::flush ()
1037{ 971{
1038 flush_ev.stop (); 972 flush_ev.stop ();
1039 973
1040#ifdef TRANSPARENT 974#ifdef HAVE_BG_PIXMAP
1041 if (want_full_refresh) 975 if (bgPixmap.check_clearChanged ())
1042 { 976 {
1043 want_full_refresh = 0; 977// scr_clear (true); This needs to be researched further!
1044 scr_clear ();
1045 scr_touch (false); 978 scr_touch (false);
1046 } 979 }
1047#endif 980#endif
1048 981
1049 if (want_refresh) 982 if (want_refresh)
… …
1085 } 1018 }
1086 while (row < end_row); 1019 while (row < end_row);
1087 } 1020 }
1088 1021
1089 scr_refresh (); 1022 scr_refresh ();
1090 scrollbar_show (1); 1023 scrollBar.show (1);
1091#ifdef USE_XIM 1024#ifdef USE_XIM
1092 IMSendSpot (); 1025 IMSendSpot ();
1093#endif 1026#endif
1094 } 1027 }
1095 1028
1096 display->flush (); 1029 display->flush ();
1097} 1030}
1098 1031
1032/* checks wether a refresh is requested and starts the refresh timer */
1099void 1033void
1100rxvt_term::check_cb (check_watcher &w) 1034rxvt_term::refresh_check ()
1035{
1036 if (want_refresh && !flush_ev.is_active ())
1037 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1038
1039 display->flush ();
1040}
1041
1042void
1043rxvt_term::flush_cb (ev::timer &w, int revents)
1101{ 1044{
1102 make_current (); 1045 make_current ();
1103 1046
1104 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108}
1109
1110void
1111rxvt_term::flush_cb (time_watcher &w)
1112{
1113 make_current ();
1114
1115 refresh_limit = 1;
1116 refresh_count = 0; 1047 refresh_count = 0;
1117 flush (); 1048 flush ();
1118} 1049}
1119 1050
1120#ifdef CURSOR_BLINK 1051#ifdef CURSOR_BLINK
1121void 1052void
1122rxvt_term::cursor_blink_cb (time_watcher &w) 1053rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1123{ 1054{
1124 hidden_cursor = !hidden_cursor; 1055 hidden_cursor = !hidden_cursor;
1125 want_refresh = 1; 1056 want_refresh = 1;
1126 1057 refresh_check ();
1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
1128} 1058}
1129#endif 1059#endif
1130 1060
1131#ifdef TEXT_BLINK 1061#ifdef TEXT_BLINK
1132void 1062void
1133rxvt_term::text_blink_cb (time_watcher &w) 1063rxvt_term::text_blink_cb (ev::timer &w, int revents)
1134{ 1064{
1135 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1065 if (scr_refresh_rend (RS_Blink, RS_Blink))
1136 { 1066 {
1137 hidden_text = !hidden_text; 1067 hidden_text = !hidden_text;
1138 want_refresh = 1; 1068 want_refresh = 1;
1139 w.start (w.at + TEXT_BLINK_INTERVAL); 1069 refresh_check ();
1140 } 1070 }
1071 else
1072 w.stop ();
1141} 1073}
1142#endif 1074#endif
1143 1075
1144#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1076#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1145void 1077void
1146rxvt_term::cont_scroll_cb (time_watcher &w) 1078rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1147{ 1079{
1148 if ((scrollbar_isUp() || scrollbar_isDn()) && 1080 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1149 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1081 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1150 { 1082 {
1151 want_refresh = 1; 1083 want_refresh = 1;
1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1084 refresh_check ();
1153 } 1085 }
1086 else
1087 w.stop ();
1154} 1088}
1155#endif 1089#endif
1156 1090
1157#ifdef SELECTION_SCROLLING 1091#ifdef SELECTION_SCROLLING
1158void 1092void
1159rxvt_term::sel_scroll_cb (time_watcher &w) 1093rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1160{ 1094{
1161 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1095 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1162 { 1096 {
1163 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1097 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1164 want_refresh = 1; 1098 want_refresh = 1;
1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1099 refresh_check ();
1166 } 1100 }
1101 else
1102 w.stop ();
1167} 1103}
1168#endif 1104#endif
1169 1105
1170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1106#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1171void 1107void
1172rxvt_term::slip_wheel_cb (time_watcher &w) 1108rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1173{ 1109{
1174 if (mouse_slip_wheel_speed == 0 1110 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1176 : scr_page (UP, mouse_slip_wheel_speed))
1177 { 1111 {
1178 if (view_start == top_row || view_start == 0)
1179 mouse_slip_wheel_speed = 0;
1180
1181 want_refresh = 1; 1112 want_refresh = 1;
1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 refresh_check ();
1114 }
1115
1116 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1117 {
1118 mouse_slip_wheel_speed = 0;
1119 w.stop ();
1183 } 1120 }
1184} 1121}
1185#endif 1122#endif
1186 1123
1187#if LINUX_YIELD_HACK 1124#if LINUX_YIELD_HACK
1188static struct event_handler 1125static struct event_handler
1189{ 1126{
1190 check_watcher yield_ev; 1127 ev::prepare yield_ev;
1191 1128
1192 void yield_cb (check_watcher &w) 1129 void yield_cb (ev::prepare &w, int revents)
1193 { 1130 {
1194 // this should really be sched_yield(), but the linux guys thought 1131 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than 1132 // that giving a process calling sched_yield () less cpu time than
1196 // 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
1197 // 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.
1198 1138
1199 struct timespec ts = { 0, 0 }; 1139 struct timespec ts = { 0, 1000 };
1200 nanosleep (&ts, 0); 1140 nanosleep (&ts, 0);
1201 1141
1202 w.stop (); 1142 w.stop ();
1203 } 1143 }
1204 1144
… …
1248 1188
1249 return false; 1189 return false;
1250} 1190}
1251 1191
1252void 1192void
1253rxvt_term::pty_cb (io_watcher &w, short revents) 1193rxvt_term::pty_cb (ev::io &w, int revents)
1254{ 1194{
1255 make_current (); 1195 make_current ();
1256 1196
1257 if (revents & EVENT_READ) 1197 if (revents & ev::READ)
1258 // loop, but don't allow a single term to monopolize us 1198 // loop, but don't allow a single term to monopolize us
1259 while (pty_fill ()) 1199 for (int i = CBUFCNT; i-- && pty_fill (); )
1260 if (cmd_parse ()) 1200 cmd_parse ();
1261 break;
1262 1201
1263 if (revents & EVENT_WRITE) 1202 if (revents & ev::WRITE)
1264 pty_write (); 1203 pty_write ();
1204
1205 refresh_check ();
1265} 1206}
1266 1207
1267void 1208void
1268rxvt_term::pointer_unblank () 1209rxvt_term::pointer_unblank ()
1269{ 1210{
… …
1272 1213
1273#ifdef POINTER_BLANK 1214#ifdef POINTER_BLANK
1274 hidden_pointer = 0; 1215 hidden_pointer = 0;
1275 1216
1276 if (option (Opt_pointerBlank)) 1217 if (option (Opt_pointerBlank))
1277 pointer_ev.start (NOW + pointerBlankDelay); 1218 pointer_ev.start (pointerBlankDelay);
1278#endif 1219#endif
1279} 1220}
1280 1221
1281#ifdef POINTER_BLANK 1222#ifdef POINTER_BLANK
1282void 1223void
… …
1290 1231
1291 hidden_pointer = 1; 1232 hidden_pointer = 1;
1292} 1233}
1293 1234
1294void 1235void
1295rxvt_term::pointer_cb (time_watcher &w) 1236rxvt_term::pointer_cb (ev::timer &w, int revents)
1296{ 1237{
1297 make_current (); 1238 make_current ();
1298 1239
1299 pointer_blank (); 1240 pointer_blank ();
1300} 1241}
… …
1303void 1244void
1304rxvt_term::mouse_report (XButtonEvent &ev) 1245rxvt_term::mouse_report (XButtonEvent &ev)
1305{ 1246{
1306 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
1307 int x, y; 1248 int x, y;
1249 int code = 32;
1308 1250
1309 x = ev.x; 1251 x = Pixel2Col (ev.x);
1310 y = ev.y; 1252 y = Pixel2Row (ev.y);
1311 pixel_position (&x, &y); 1253 if (ev.type == MotionNotify)
1254 {
1255 if (x == mouse_row && y == mouse_col)
1256 return;
1257 mouse_row = x;
1258 mouse_col = y;
1259 code += 32;
1260 }
1312 1261
1313 if (MEvent.button == AnyButton) 1262 if (MEvent.button == AnyButton)
1314 button_number = 3; 1263 button_number = 3;
1315 else 1264 else
1316 { 1265 {
… …
1362 x + 1, 1311 x + 1,
1363 y + 1); 1312 y + 1);
1364#endif 1313#endif
1365 1314
1366 tt_printf ("\033[M%c%c%c", 1315 tt_printf ("\033[M%c%c%c",
1367 (32 + button_number + key_state), 1316 (code + button_number + key_state),
1368 (32 + x + 1), 1317 (32 + x + 1),
1369 (32 + y + 1)); 1318 (32 + y + 1));
1370} 1319}
1371 1320
1372/*{{{ process an X event */ 1321/*{{{ process an X event */
… …
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1383 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out (); 1384 focus_out ();
1436 } 1385 }
1437#endif 1386#endif
1438 } 1387 }
1439 break;
1440
1441 case MappingNotify:
1442 XRefreshKeyboardMapping (&ev.xmapping);
1443 break; 1388 break;
1444 1389
1445 /* 1390 /*
1446 * XXX: this is not the _current_ arrangement 1391 * XXX: this is not the _current_ arrangement
1447 * Here's my conclusion: 1392 * Here's my conclusion:
… …
1480 && ev.xfocus.mode != NotifyGrab) 1425 && ev.xfocus.mode != NotifyGrab)
1481 focus_out (); 1426 focus_out ();
1482 break; 1427 break;
1483 1428
1484 case ConfigureNotify: 1429 case ConfigureNotify:
1430 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1431 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1432 szHint.width, szHint.height);*/
1485 if (ev.xconfigure.window == parent[0]) 1433 if (ev.xconfigure.window == parent[0])
1486 { 1434 {
1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1435 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1488 ; 1436 ;
1489 1437
1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1438 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1491 { 1439 {
1492 seen_resize = 1; 1440 seen_resize = 1;
1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1441 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND 1442 }
1495 if (!option (Opt_transparent) && bgPixmap.auto_resize) 1443 else
1444 {
1445#ifdef HAVE_BG_PIXMAP
1446 if (bgPixmap.window_position_sensitive ())
1496 { 1447 {
1448 if (mapped)
1449 update_background ();
1497 resize_pixmap (); 1450 else
1498 scr_touch (true); 1451 bgPixmap.invalidate ();
1499 } 1452 }
1500#endif 1453#endif
1501 } 1454 }
1502 1455
1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1456 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505#ifdef TRANSPARENT
1506 if (option (Opt_transparent))
1507 check_our_parents ();
1508#endif
1509 } 1457 }
1510 break; 1458 break;
1511 1459
1512 case PropertyNotify: 1460 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1461 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1516 selection_property (ev.xproperty.window, ev.xproperty.atom); 1464 selection_property (ev.xproperty.window, ev.xproperty.atom);
1517 1465
1518 break; 1466 break;
1519 1467
1520 case SelectionClear: 1468 case SelectionClear:
1521 selection_clear (); 1469 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1522 break; 1470 break;
1523 1471
1524 case SelectionNotify: 1472 case SelectionNotify:
1525 if (selection_wait == Sel_normal) 1473 if (selection_wait == Sel_normal)
1526 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1474 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1529 case SelectionRequest: 1477 case SelectionRequest:
1530 selection_send (ev.xselectionrequest); 1478 selection_send (ev.xselectionrequest);
1531 break; 1479 break;
1532 1480
1533 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
1534 mapped = 1; 1498 mapped = 1;
1535#ifdef TEXT_BLINK 1499#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1500 text_blink_ev.start ();
1537#endif 1501#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1502 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break; 1503 break;
1540 1504
1541 case UnmapNotify: 1505 case UnmapNotify:
… …
1543#ifdef TEXT_BLINK 1507#ifdef TEXT_BLINK
1544 text_blink_ev.stop (); 1508 text_blink_ev.stop ();
1545#endif 1509#endif
1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1510 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break; 1511 break;
1548
1549#ifdef TRANSPARENT
1550 case ReparentNotify:
1551 rootwin_cb (ev);
1552 break;
1553#endif /* TRANSPARENT */
1554 1512
1555 case GraphicsExpose: 1513 case GraphicsExpose:
1556 case Expose: 1514 case Expose:
1557 if (ev.xany.window == vt) 1515 if (ev.xany.window == vt)
1558 { 1516 {
1559 do 1517 do
1518 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1519 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1520 ev.xexpose.width, ev.xexpose.height, False);
1521 }
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1522 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1563 1523
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1524 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565 1525
1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1526 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1527 {
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1528 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1529 ev.xexpose.width, ev.xexpose.height, False);
1530 }
1569 1531
1570 want_refresh = 1; 1532 want_refresh = 1;
1571 } 1533 }
1572 else 1534 else
1573 { 1535 {
… …
1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1538 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1577 ; 1539 ;
1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1540 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1579 ; 1541 ;
1580 1542
1581 if (isScrollbarWindow (ev.xany.window)) 1543 if (scrollBar.state && ev.xany.window == scrollBar.win)
1582 { 1544 {
1583 scrollBar.setIdle (); 1545 scrollBar.state = STATE_IDLE;
1584 scrollbar_show (0); 1546 scrollBar.show (0);
1585 } 1547 }
1586
1587#ifdef TRANSPARENT
1588 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (dpy, ev.xany.window);
1590#endif
1591 } 1548 }
1592 break; 1549 break;
1593 1550
1594 case MotionNotify: 1551 case MotionNotify:
1595#ifdef POINTER_BLANK 1552#ifdef POINTER_BLANK
1596 if (hidden_pointer) 1553 if (hidden_pointer)
1597 pointer_unblank (); 1554 pointer_unblank ();
1598#endif 1555#endif
1556 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1557 || priv_modes & PrivMode_MouseAnyEvent)
1558 mouse_report (ev.xbutton);
1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1559 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1600 break; 1560 break;
1601 1561
1602 if (ev.xany.window == vt) 1562 if (ev.xany.window == vt)
1603 { 1563 {
… …
1637 int dist; 1597 int dist;
1638 1598
1639 /* don't clobber the current delay if we are 1599 /* don't clobber the current delay if we are
1640 * already in the middle of scrolling. 1600 * already in the middle of scrolling.
1641 */ 1601 */
1642 if (!sel_scroll_ev.active) 1602 if (!sel_scroll_ev.is_active ())
1643 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1603 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1644 1604
1645 /* save the event params so we can highlight 1605 /* save the event params so we can highlight
1646 * the selection in the pending-scroll loop 1606 * the selection in the pending-scroll loop
1647 */ 1607 */
1648 selection_save_x = ev.xbutton.x; 1608 selection_save_x = ev.xbutton.x;
… …
1670 else 1630 else
1671 { 1631 {
1672 /* we are within the text window, so we 1632 /* we are within the text window, so we
1673 * shouldn't be scrolling 1633 * shouldn't be scrolling
1674 */ 1634 */
1675 if (sel_scroll_ev.active)
1676 sel_scroll_ev.stop(); 1635 sel_scroll_ev.stop();
1677 } 1636 }
1678#endif 1637#endif
1679#ifdef MOUSE_THRESHOLD 1638#ifdef MOUSE_THRESHOLD
1680 } 1639 }
1681#endif 1640#endif
1682 } 1641 }
1683 } 1642 }
1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1643 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1685 { 1644 {
1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1645 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1687 MotionNotify, &ev)) 1646 MotionNotify, &ev))
1688 ; 1647 ;
1689 1648
… …
1691 &unused_root, &unused_child, 1650 &unused_root, &unused_child,
1692 &unused_root_x, &unused_root_y, 1651 &unused_root_x, &unused_root_y,
1693 &ev.xbutton.x, &ev.xbutton.y, 1652 &ev.xbutton.x, &ev.xbutton.y,
1694 &unused_mask); 1653 &unused_mask);
1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1654 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1696 scrollbar_size ()); 1655 scrollBar.size ());
1697 want_refresh = 1; 1656 want_refresh = 1;
1698 refresh_limit = 0;
1699 scrollbar_show (1); 1657 scrollBar.show (1);
1700 } 1658 }
1701 break; 1659 break;
1702 } 1660 }
1703 1661
1704#if defined(CURSOR_BLINK) 1662#if defined(CURSOR_BLINK)
… …
1708 { 1666 {
1709 hidden_cursor = 0; 1667 hidden_cursor = 0;
1710 want_refresh = 1; 1668 want_refresh = 1;
1711 } 1669 }
1712 1670
1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1671 cursor_blink_ev.again ();
1714 } 1672 }
1715#endif 1673#endif
1716 1674
1717#if defined(POINTER_BLANK) 1675#if defined(POINTER_BLANK)
1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1676 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1725 1683
1726 if (ev.type == KeyPress && hidden_pointer == 0) 1684 if (ev.type == KeyPress && hidden_pointer == 0)
1727 pointer_blank (); 1685 pointer_blank ();
1728 } 1686 }
1729#endif 1687#endif
1688
1689 refresh_check ();
1730} 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
1731 1707
1732void 1708void
1733rxvt_term::focus_in () 1709rxvt_term::focus_in ()
1734{ 1710{
1735 if (!focus) 1711 if (!focus)
1736 { 1712 {
1737 focus = 1; 1713 focus = 1;
1738 want_refresh = 1; 1714 want_refresh = 1;
1739 1715
1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1741
1742#if USE_XIM 1716#if USE_XIM
1743 if (Input_Context != NULL) 1717 if (Input_Context != NULL)
1744 { 1718 {
1745 IMSetPosition (); 1719 IMSetPosition ();
1746 XSetICFocus (Input_Context); 1720 XSetICFocus (Input_Context);
1747 } 1721 }
1748#endif 1722#endif
1749#if CURSOR_BLINK 1723#if CURSOR_BLINK
1750 if (option (Opt_cursorBlink)) 1724 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1725 cursor_blink_ev.again ();
1752#endif 1726#endif
1753#if OFF_FOCUS_FADING 1727#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade]) 1728 if (rs[Rs_fade])
1755 { 1729 {
1756 pix_colors = pix_colors_focused; 1730 pix_colors = pix_colors_focused;
1757 scr_recolour (); 1731 scr_recolour ();
1758 } 1732 }
1759#endif 1733#endif
1760#if ENABLE_FRILLS 1734#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell)) 1735 if (option (Opt_urgentOnBell))
1762 { 1736 set_urgency (0);
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]);
1766 if (h != NULL)
1767 {
1768 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h);
1770 }
1771 }
1772#endif 1737#endif
1738
1739 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1773 } 1740 }
1774} 1741}
1775 1742
1776void 1743void
1777rxvt_term::focus_out () 1744rxvt_term::focus_out ()
… …
1779 if (focus) 1746 if (focus)
1780 { 1747 {
1781 focus = 0; 1748 focus = 0;
1782 want_refresh = 1; 1749 want_refresh = 1;
1783 1750
1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1751#if ENABLE_FRILLS
1785 1752 if (option (Opt_urgentOnBell))
1753 set_urgency (0);
1754#endif
1786#if ENABLE_FRILLS || ISO_14755 1755#if ENABLE_FRILLS || ISO_14755
1787 if (iso14755buf) 1756 if (iso14755buf)
1788 { 1757 {
1789 iso14755buf = 0; 1758 iso14755buf = 0;
1790# if ENABLE_OVERLAY 1759# if ISO_14755
1791 scr_overlay_off (); 1760 scr_overlay_off ();
1792# endif 1761# endif
1793 } 1762 }
1794#endif 1763#endif
1795#if USE_XIM 1764#if USE_XIM
… …
1797 XUnsetICFocus (Input_Context); 1766 XUnsetICFocus (Input_Context);
1798#endif 1767#endif
1799#if CURSOR_BLINK 1768#if CURSOR_BLINK
1800 if (option (Opt_cursorBlink)) 1769 if (option (Opt_cursorBlink))
1801 cursor_blink_ev.stop (); 1770 cursor_blink_ev.stop ();
1771
1802 hidden_cursor = 0; 1772 hidden_cursor = 0;
1803#endif 1773#endif
1804#if OFF_FOCUS_FADING 1774#if OFF_FOCUS_FADING
1805 if (rs[Rs_fade]) 1775 if (rs[Rs_fade])
1806 { 1776 {
1807 pix_colors = pix_colors_unfocused; 1777 pix_colors = pix_colors_unfocused;
1808 scr_recolour (); 1778 scr_recolour ();
1809 } 1779 }
1810#endif 1780#endif
1781
1782 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1811 } 1783 }
1812} 1784}
1813 1785
1814void 1786void
1815rxvt_term::update_fade_color (unsigned int idx) 1787rxvt_term::update_fade_color (unsigned int idx)
… …
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1794 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 } 1795 }
1824#endif 1796#endif
1825} 1797}
1826 1798
1827#if TRANSPARENT || ENABLE_PERL 1799#if ENABLE_TRANSPARENCY || ENABLE_PERL
1828void 1800void
1829rxvt_term::rootwin_cb (XEvent &ev) 1801rxvt_term::rootwin_cb (XEvent &ev)
1830{ 1802{
1831 make_current (); 1803 make_current ();
1832 1804
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1805 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1806 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return; 1807 return;
1836 1808
1837# if TRANSPARENT 1809# if ENABLE_TRANSPARENCY
1838 switch (ev.type) 1810 switch (ev.type)
1839 { 1811 {
1840 case PropertyNotify: 1812 case PropertyNotify:
1841 /* 1813 /*
1842 * if user used some Esetroot compatible prog to set the root bg, 1814 * if user used some Esetroot compatible prog to set the root bg,
1843 * use the property to determine the pixmap. We use it later on. 1815 * use the property to determine the pixmap. We use it later on.
1844 */ 1816 */
1845 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1817 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1818 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1847 return; 1819 {
1820 bgPixmap.set_root_pixmap ();
1821 update_background ();
1822 }
1848 1823
1849 /* FALLTHROUGH */
1850 case ReparentNotify:
1851 if (option (Opt_transparent))
1852 check_our_parents ();
1853 break; 1824 break;
1854 } 1825 }
1855# endif 1826# endif
1827
1828 refresh_check ();
1856} 1829}
1857#endif 1830#endif
1858 1831
1859void 1832void
1860rxvt_term::button_press (XButtonEvent &ev) 1833rxvt_term::button_press (XButtonEvent &ev)
… …
1915 mouse_report (ev); 1888 mouse_report (ev);
1916 } 1889 }
1917#else 1890#else
1918 MEvent.button = ev.button; 1891 MEvent.button = ev.button;
1919 mouse_report (ev); 1892 mouse_report (ev);
1920#endif /* MOUSE_REPORT_DOUBLECLICK */ 1893#endif /* MOUSE_REPORT_DOUBLECLICK */
1921 1894
1922 } 1895 }
1923 else 1896 else
1924 { 1897 {
1925 if (ev.button != MEvent.button) 1898 if (ev.button != MEvent.button)
… …
1973 } 1946 }
1974 1947
1975 /* 1948 /*
1976 * Scrollbar window processing of button press 1949 * Scrollbar window processing of button press
1977 */ 1950 */
1978 if (isScrollbarWindow (ev.window)) 1951 if (scrollBar.state && ev.window == scrollBar.win)
1979 { 1952 {
1980 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;
1981 /* 1961 /*
1982 * Rxvt-style scrollbar: 1962 * Rxvt-style scrollbar:
1983 * move up if mouse is above slider 1963 * move up if mouse is above slider
1984 * move dn if mouse is below slider 1964 * move dn if mouse is below slider
1985 * 1965 *
… …
1994 /* 1974 /*
1995 * Mouse report disabled scrollbar: 1975 * Mouse report disabled scrollbar:
1996 * arrow buttons - send up/down 1976 * arrow buttons - send up/down
1997 * click on scrollbar - send pageup/down 1977 * click on scrollbar - send pageup/down
1998 */ 1978 */
1999 if ((scrollBar.style == R_SB_NEXT 1979 if (direction == UP)
2000 && scrollbarnext_upButton (ev.y))
2001 || (scrollBar.style == R_SB_RXVT
2002 && scrollbarrxvt_upButton (ev.y)))
2003 tt_printf ("\033[A"); 1980 tt_printf ("\033[A");
2004 else if ((scrollBar.style == R_SB_NEXT 1981 else if (direction == DN)
2005 && scrollbarnext_dnButton (ev.y))
2006 || (scrollBar.style == R_SB_RXVT
2007 && scrollbarrxvt_dnButton (ev.y)))
2008 tt_printf ("\033[B"); 1982 tt_printf ("\033[B");
2009 else 1983 else
2010 switch (ev.button) 1984 switch (ev.button)
2011 { 1985 {
2012 case Button2: 1986 case Button2:
… …
2019 tt_printf ("\033[5~"); 1993 tt_printf ("\033[5~");
2020 break; 1994 break;
2021 } 1995 }
2022 } 1996 }
2023 else 1997 else
2024#endif /* NO_SCROLLBAR_REPORT */ 1998#endif /* NO_SCROLLBAR_REPORT */
2025
2026 {
2027 char upordown = 0;
2028
2029 if (scrollBar.style == R_SB_NEXT)
2030 { 1999 {
2031 if (scrollbarnext_upButton (ev.y)) 2000 if (direction != NO_DIR)
2032 upordown = -1; /* up */
2033 else if (scrollbarnext_dnButton (ev.y))
2034 upordown = 1; /* down */
2035 }
2036 else if (scrollBar.style == R_SB_RXVT)
2037 {
2038 if (scrollbarrxvt_upButton (ev.y))
2039 upordown = -1; /* up */
2040 else if (scrollbarrxvt_dnButton (ev.y))
2041 upordown = 1; /* down */
2042 }
2043 if (upordown)
2044 { 2001 {
2045#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2002#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2003 if (!cont_scroll_ev.is_active ())
2046 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2004 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2047#endif 2005#endif
2048 if (scr_page (upordown < 0 ? UP : DN, 1)) 2006 if (scr_page (direction, 1))
2049 { 2007 {
2050 if (upordown < 0) 2008 if (direction == UP)
2051 scrollBar.setUp (); 2009 scrollBar.state = STATE_UP;
2052 else 2010 else
2053 scrollBar.setDn (); 2011 scrollBar.state = STATE_DOWN;
2054 } 2012 }
2055 } 2013 }
2056 else 2014 else
2057 switch (ev.button) 2015 switch (ev.button)
2058 { 2016 {
2059 case Button2: 2017 case Button2:
2060 switch (scrollbar_align) 2018 switch (scrollBar.align)
2061 { 2019 {
2062 case R_SB_ALIGN_TOP: 2020 case R_SB_ALIGN_TOP:
2063 csrO = 0; 2021 csrO = 0;
2064 break; 2022 break;
2065 case R_SB_ALIGN_CENTRE: 2023 case R_SB_ALIGN_CENTRE:
… …
2071 } 2029 }
2072 2030
2073 if (scrollBar.style == R_SB_XTERM 2031 if (scrollBar.style == R_SB_XTERM
2074 || scrollbar_above_slider (ev.y) 2032 || scrollbar_above_slider (ev.y)
2075 || scrollbar_below_slider (ev.y)) 2033 || scrollbar_below_slider (ev.y))
2076 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2034 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2077 2035
2078 scrollBar.setMotion (); 2036 scrollBar.state = STATE_MOTION;
2079 break; 2037 break;
2080 2038
2081 case Button1: 2039 case Button1:
2082 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2040 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2083 csrO = ev.y - scrollBar.top; 2041 csrO = ev.y - scrollBar.top;
2084 /* FALLTHROUGH */ 2042 /* FALLTHROUGH */
2085 2043
2086 case Button3: 2044 case Button3:
2087 if (scrollBar.style != R_SB_XTERM) 2045 if (scrollBar.style != R_SB_XTERM)
… …
2097 scr_page (DN, nrow - 1); 2055 scr_page (DN, nrow - 1);
2098# else 2056# else
2099 scr_page (DN, nrow / 4); 2057 scr_page (DN, nrow / 4);
2100# endif 2058# endif
2101 else 2059 else
2102 scrollBar.setMotion (); 2060 scrollBar.state = STATE_MOTION;
2103 } 2061 }
2104 else 2062 else
2105 { 2063 {
2106 scr_page ((ev.button == Button1 ? DN : UP), 2064 scr_page ((ev.button == Button1 ? DN : UP),
2107 (nrow 2065 (nrow
2108 * scrollbar_position (ev.y) 2066 * scrollbar_position (ev.y)
2109 / scrollbar_size ())); 2067 / scrollBar.size ()));
2110 } 2068 }
2111 2069
2112 break; 2070 break;
2113 } 2071 }
2114 } 2072 }
… …
2124 2082
2125 csrO = 0; /* reset csr Offset */ 2083 csrO = 0; /* reset csr Offset */
2126 if (!bypass_keystate) 2084 if (!bypass_keystate)
2127 reportmode = !! (priv_modes & PrivMode_mouse_report); 2085 reportmode = !! (priv_modes & PrivMode_mouse_report);
2128 2086
2129 if (scrollbar_isUpDn ()) 2087 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2130 { 2088 {
2131 scrollBar.setIdle (); 2089 scrollBar.state = STATE_IDLE;
2132 scrollbar_show (0); 2090 scrollBar.show (0);
2133 } 2091 }
2134 2092
2135#ifdef SELECTION_SCROLLING 2093#ifdef SELECTION_SCROLLING
2136 if (sel_scroll_ev.active)
2137 sel_scroll_ev.stop(); 2094 sel_scroll_ev.stop();
2138#endif 2095#endif
2139 2096
2140 if (ev.window == vt) 2097 if (ev.window == vt)
2141 { 2098 {
2142 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)))
… …
2166 mouse_report (ev); 2123 mouse_report (ev);
2167 } 2124 }
2168#else /* MOUSE_REPORT_DOUBLECLICK */ 2125#else /* MOUSE_REPORT_DOUBLECLICK */
2169 MEvent.button = AnyButton; 2126 MEvent.button = AnyButton;
2170 mouse_report (ev); 2127 mouse_report (ev);
2171#endif /* MOUSE_REPORT_DOUBLECLICK */ 2128#endif /* MOUSE_REPORT_DOUBLECLICK */
2172 return; 2129 return;
2173 } 2130 }
2174 2131
2175 /* 2132 /*
2176 * dumb hack to compensate for the failure of click-and-drag 2133 * dumb hack to compensate for the failure of click-and-drag
… …
2214 { 2171 {
2215 mouse_slip_wheel_speed += v ? -1 : 1; 2172 mouse_slip_wheel_speed += v ? -1 : 1;
2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2173 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2174 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2218 2175
2219 if (slip_wheel_ev.at < NOW) 2176 if (!slip_wheel_ev.is_active ())
2220 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2177 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2221
2222 slip_wheel_ev.start ();
2223 } 2178 }
2224 else 2179 else
2180# endif
2225 { 2181 {
2226# endif
2227 scr_page (v, i); 2182 scr_page (v, i);
2228 scrollbar_show (1); 2183 scrollBar.show (1);
2229# ifdef MOUSE_SLIP_WHEELING
2230 } 2184 }
2231# endif
2232 } 2185 }
2233 break; 2186 break;
2234#endif 2187#endif
2235 } 2188 }
2236 } 2189 }
2237} 2190}
2238 2191
2239/*}}} */ 2192/*}}} */
2240 2193
2241bool 2194void
2242rxvt_term::cmd_parse () 2195rxvt_term::cmd_parse ()
2243{ 2196{
2244 bool flag = false;
2245 wchar_t ch = NOCHAR; 2197 wchar_t ch = NOCHAR;
2246 char *seq_begin; // remember start of esc-sequence here 2198 char *seq_begin; // remember start of esc-sequence here
2247 2199
2248 for (;;) 2200 for (;;)
2249 { 2201 {
2250 if (ch == NOCHAR) 2202 if (expect_false (ch == NOCHAR))
2251 { 2203 {
2252 seq_begin = cmdbuf_ptr; 2204 seq_begin = cmdbuf_ptr;
2253 ch = next_char (); 2205 ch = next_char ();
2254 2206
2255 if (ch == NOCHAR) 2207 if (ch == NOCHAR)
2256 break; 2208 break;
2257 } 2209 }
2258 2210
2259 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))
2260 { 2212 {
2261 if (!seen_input) 2213 if (expect_false (!seen_input))
2262 { 2214 {
2263 seen_input = 1; 2215 seen_input = 1;
2264 // many badly-written programs (e.g. jed) contain a race condition: 2216 // many badly-written programs (e.g. jed) contain a race condition:
2265 // they first read the screensize and then install a SIGWINCH handler. 2217 // they first read the screensize and then install a SIGWINCH handler.
2266 // some window managers resize the window early, and these programs 2218 // some window managers resize the window early, and these programs
… …
2279 wchar_t *str = buf; 2231 wchar_t *str = buf;
2280 wchar_t *eol = str + min (ncol, UBUFSIZ); 2232 wchar_t *eol = str + min (ncol, UBUFSIZ);
2281 2233
2282 for (;;) 2234 for (;;)
2283 { 2235 {
2284 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)))
2285 break; 2237 break;
2286 2238
2287 *str++ = ch; 2239 *str++ = ch;
2288 2240
2289 if (ch == C0_LF || str >= eol) 2241 if (expect_false (ch == C0_LF || str >= eol))
2290 { 2242 {
2291 if (ch == C0_LF) 2243 if (ch == C0_LF)
2292 nlines++; 2244 nlines++;
2293 2245
2294 refresh_count++; 2246 refresh_count++;
2295 2247
2296 if (!option (Opt_jumpScroll) 2248 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2297 || (refresh_count >= refresh_limit * (nrow - 1)))
2298 { 2249 {
2299 refreshnow = true;
2300 refresh_count = 0; 2250 refresh_count = 0;
2251
2252 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2253 {
2254 refreshnow = true;
2301 ch = NOCHAR; 2255 ch = NOCHAR;
2302 break; 2256 break;
2257 }
2303 } 2258 }
2304 2259
2305 // scr_add_lines only works for nlines <= nrow - 1. 2260 // scr_add_lines only works for nlines <= nrow - 1.
2306 if (nlines >= nrow - 1) 2261 if (nlines >= nrow - 1)
2307 { 2262 {
… …
2335 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2290 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2336 scr_add_lines (buf, str - buf, nlines); 2291 scr_add_lines (buf, str - buf, nlines);
2337 2292
2338 /* 2293 /*
2339 * If there have been a lot of new lines, then update the screen 2294 * If there have been a lot of new lines, then update the screen
2340 * What the heck I'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.
2341 * the number of pages between refreshes is refresh_limit, which 2296 * if skipScroll is enabled.
2342 * is incremented here because we must be doing flat-out scrolling.
2343 */ 2297 */
2344 if (refreshnow) 2298 if (refreshnow)
2345 { 2299 {
2346 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2347 refresh_limit++;
2348 else
2349 {
2350 flag = true;
2351 //TODO: due to popular request, implement "skipscroll" option here
2352 scr_refresh (); 2300 scr_refresh ();
2353 want_refresh = 1; 2301 want_refresh = 1;
2354 }
2355 } 2302 }
2356
2357 } 2303 }
2358 else 2304 else
2359 { 2305 {
2360 try 2306 try
2361 { 2307 {
… …
2369 } 2315 }
2370 2316
2371 ch = NOCHAR; 2317 ch = NOCHAR;
2372 } 2318 }
2373 } 2319 }
2374
2375 return flag;
2376} 2320}
2377 2321
2378// read the next character 2322// read the next character
2379wchar_t 2323wchar_t
2380rxvt_term::next_char () NOTHROW 2324rxvt_term::next_char () NOTHROW
2381{ 2325{
2382 while (cmdbuf_ptr < cmdbuf_endp) 2326 while (cmdbuf_ptr < cmdbuf_endp)
2383 { 2327 {
2384 // assume 7-bit to be ascii ALWAYS 2328 // assume 7-bit to be ascii ALWAYS
2385 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2329 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2386 return *cmdbuf_ptr++; 2330 return *cmdbuf_ptr++;
2387 2331
2388 wchar_t wc; 2332 wchar_t wc;
2389 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);
2390 2334
… …
2394 cmdbuf_ptr = cmdbuf_endp; 2338 cmdbuf_ptr = cmdbuf_endp;
2395 break; 2339 break;
2396 } 2340 }
2397 2341
2398 if (len == (size_t)-1) 2342 if (len == (size_t)-1)
2343 {
2344 mbstate.reset (); // reset now undefined conversion state
2399 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 }
2400 2347
2401 // assume wchar == unicode 2348 // assume wchar == unicode
2402 cmdbuf_ptr += len; 2349 cmdbuf_ptr += len;
2403 return wc & UNICODE_MASK; 2350 return wc & UNICODE_MASK;
2404 } 2351 }
… …
2448/*----------------------------------------------------------------------*/ 2395/*----------------------------------------------------------------------*/
2449#ifdef PRINTPIPE 2396#ifdef PRINTPIPE
2450FILE * 2397FILE *
2451rxvt_term::popen_printer () 2398rxvt_term::popen_printer ()
2452{ 2399{
2453 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2400 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2454 2401
2455 if (stream == NULL) 2402 if (stream == NULL)
2456 rxvt_warn ("can't open printer pipe, not printing.\n"); 2403 rxvt_warn ("can't open printer pipe, not printing.\n");
2457 2404
2458 return stream; 2405 return stream;
… …
2469 * simulate attached vt100 printer 2416 * simulate attached vt100 printer
2470 */ 2417 */
2471void 2418void
2472rxvt_term::process_print_pipe () 2419rxvt_term::process_print_pipe ()
2473{ 2420{
2474 int done; 2421 FILE *fd = popen_printer ();
2475 FILE *fd;
2476 2422
2477 if ((fd = popen_printer ()) == NULL) 2423 if (!fd)
2478 return; 2424 return;
2479 2425
2480 /* 2426 /*
2481 * 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
2482 * is received. 2428 * is received.
2483 */ 2429 */
2484 for (done = 0; !done;) 2430 for (int done = 0; !done; )
2485 { 2431 {
2486 unsigned char buf[8]; 2432 unsigned char buf[8];
2487 unicode_t ch; 2433 unicode_t ch;
2488 unsigned int i, len; 2434 unsigned int i, len;
2489 2435
… …
2520 } 2466 }
2521 } 2467 }
2522 2468
2523 pclose_printer (fd); 2469 pclose_printer (fd);
2524} 2470}
2525#endif /* PRINTPIPE */ 2471#endif /* PRINTPIPE */
2526/*}}} */ 2472/*}}} */
2527 2473
2528/* *INDENT-OFF* */ 2474/* *INDENT-OFF* */
2529enum { 2475enum {
2530 C1_40 = 0x40, 2476 C1_40 = 0x40,
… …
2580 process_dcs_seq (); 2526 process_dcs_seq ();
2581 break; 2527 break;
2582 case 0x9b: /* CSI */ 2528 case 0x9b: /* CSI */
2583 process_csi_seq (); 2529 process_csi_seq ();
2584 break; 2530 break;
2585 case 0x9d: /* CSI */ 2531 case 0x9d: /* OSC */
2586 process_osc_seq (); 2532 process_osc_seq ();
2587 break; 2533 break;
2588#endif 2534#endif
2589 } 2535 }
2590} 2536}
… …
2634 break; 2580 break;
2635 case 'Z': /* identify the terminal type */ 2581 case 'Z': /* identify the terminal type */
2636 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2582 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2637 break; 2583 break;
2638 case '<': /* turn off VT52 mode */ 2584 case '<': /* turn off VT52 mode */
2639 PrivMode (0, PrivMode_vt52); 2585 set_privmode (PrivMode_vt52, 0);
2640 break; 2586 break;
2641 case 'F': /* use special graphics character set */ 2587 case 'F': /* use special graphics character set */
2642 case 'G': /* use regular character set */ 2588 case 'G': /* use regular character set */
2643 /* unimplemented */ 2589 /* unimplemented */
2644 break; 2590 break;
… …
2698 scr_forwardindex (); 2644 scr_forwardindex ();
2699 break; 2645 break;
2700#endif 2646#endif
2701 case '=': 2647 case '=':
2702 case '>': 2648 case '>':
2703 PrivMode ((ch == '='), PrivMode_aplKP); 2649 set_privmode (PrivMode_aplKP, ch == '=');
2704 break; 2650 break;
2705 2651
2706 case C1_40: 2652 case C1_40:
2707 cmd_getc (); 2653 cmd_getc ();
2708 break; 2654 break;
… …
2747 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2693 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2748 case C1_SCI: /* ESC Z */ 2694 case C1_SCI: /* ESC Z */
2749 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2695 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2750 break; /* steal obsolete ESC [ c */ 2696 break; /* steal obsolete ESC [ c */
2751 2697
2752 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2698 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2753 case C1_CSI: /* ESC [ */ 2699 case C1_CSI: /* ESC [ */
2754 process_csi_seq (); 2700 process_csi_seq ();
2755 break; 2701 break;
2756 2702
2757 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2703 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2758 case C1_OSC: /* ESC ] */ 2704 case C1_OSC: /* ESC ] */
2759 process_osc_seq (); 2705 process_osc_seq ();
2760 break; 2706 break;
2761 2707
2762 /* 8.3.106: RESET TO INITIAL STATE */ 2708 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2763 case 'c': 2709 case 'c':
2764 mbstate.reset (); 2710 mbstate.reset ();
2765 scr_poweron (); 2711 scr_poweron ();
2766 scrollbar_show (1); 2712 scrollBar.show (1);
2767 break; 2713 break;
2768 2714
2769 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2715 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2770 case 'n': 2716 case 'n':
2771 scr_charset_choose (2); 2717 scr_charset_choose (2);
… …
2816rxvt_term::process_csi_seq () 2762rxvt_term::process_csi_seq ()
2817{ 2763{
2818 unicode_t ch, priv, i; 2764 unicode_t ch, priv, i;
2819 unsigned int nargs, p; 2765 unsigned int nargs, p;
2820 int n, ndef; 2766 int n, ndef;
2821 int arg[ESC_ARGS]; 2767 int arg[ESC_ARGS] = { };
2822 2768
2823 for (nargs = ESC_ARGS; nargs > 0;) 2769 nargs = 0;
2824 arg[--nargs] = 0;
2825 2770
2826 priv = 0; 2771 priv = 0;
2827 ch = cmd_getc (); 2772 ch = cmd_getc ();
2828 if (ch >= '<' && ch <= '?') 2773 if ((ch >= '<' && ch <= '?') || ch == '!')
2774 {
2829 { /* '<' '=' '>' '?' */ 2775 /* '<' '=' '>' '?' '!' */
2830 priv = ch; 2776 priv = ch;
2831 ch = cmd_getc (); 2777 ch = cmd_getc ();
2832 } 2778 }
2833 2779
2834 /* read any numerical arguments */ 2780 /* read any numerical arguments */
… …
2873 switch (priv) 2819 switch (priv)
2874 { 2820 {
2875 case '>': 2821 case '>':
2876 if (ch == CSI_DA) /* secondary device attributes */ 2822 if (ch == CSI_DA) /* secondary device attributes */
2877 { 2823 {
2878 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2824 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2879 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2825 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2880 // 2826 //
2881 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2827 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2882 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2828 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2883 // that we do not support xterm mouse reporting (should be 95 when we do). 2829 // versions.
2884 // 2830 //
2885 tt_printf ("\033[>%d;94;0c", 'U'); 2831 tt_printf ("\033[>%d;95;0c", 'U');
2886 } 2832 }
2887 break; 2833 break;
2834
2888 case '?': 2835 case '?':
2889 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2836 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2890 process_terminal_mode (ch, priv, nargs, arg); 2837 process_terminal_mode (ch, priv, nargs, arg);
2891 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);
2892 } 2851 }
2852 break;
2853 }
2854
2893 return; 2855 return;
2894 } 2856 }
2895 2857
2896 switch (ch) 2858 switch (ch)
2897 { 2859 {
… …
3326 3288
3327/* 3289/*
3328 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3290 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3329 */ 3291 */
3330void 3292void
3331rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3293rxvt_term::process_xterm_seq (int op, char *str, char resp)
3332{ 3294{
3333 int color; 3295 int color;
3334 char *buf, *name; 3296 char *buf, *name;
3335 bool query = str[0] == '?' && !str[1]; 3297 bool query = str[0] == '?' && !str[1];
3336 int saveop = op; 3298 int saveop = op;
… …
3377 3339
3378 XFree (value); 3340 XFree (value);
3379 } 3341 }
3380 else 3342 else
3381 { 3343 {
3382 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3344 char *eq = strchr (str, '=');
3383 3345
3384 if (eq) 3346 if (eq)
3385 { 3347 {
3386 *eq = 0; 3348 *eq = 0;
3387 set_utf8_property (display->atom (str), eq + 1); 3349 set_utf8_property (display->atom (str), eq + 1);
… …
3408 *buf++ = '\0'; 3370 *buf++ = '\0';
3409 3371
3410 process_color_seq (op, color, name, resp); 3372 process_color_seq (op, color, name, resp);
3411 } 3373 }
3412 break; 3374 break;
3375 case Rxvt_restoreFG:
3413 case XTerm_Color00: 3376 case XTerm_Color00:
3414 process_color_seq (op, Color_fg, str, resp); 3377 process_color_seq (op, Color_fg, str, resp);
3415 break; 3378 break;
3379 case Rxvt_restoreBG:
3416 case XTerm_Color01: 3380 case XTerm_Color01:
3417 process_color_seq (op, Color_bg, str, resp); 3381 process_color_seq (op, Color_bg, str, resp);
3418 break; 3382 break;
3419#ifndef NO_CURSORCOLOR 3383#ifndef NO_CURSORCOLOR
3420 case XTerm_Color_cursor: 3384 case XTerm_Color_cursor:
… …
3441 break; 3405 break;
3442 case URxvt_Color_IT: 3406 case URxvt_Color_IT:
3443 process_color_seq (op, Color_IT, str, resp); 3407 process_color_seq (op, Color_IT, str, resp);
3444 break; 3408 break;
3445#endif 3409#endif
3446#if TRANSPARENT && TINTING 3410 case URxvt_Color_border:
3411 process_color_seq (op, Color_border, str, resp);
3412 break;
3413#if ENABLE_TRANSPARENCY
3447 case URxvt_Color_tint: 3414 case URxvt_Color_tint:
3448 process_color_seq (op, Color_tint, str, resp); 3415 process_color_seq (op, Color_tint, str, resp);
3416 {
3417 bool changed = false;
3449 3418
3450 check_our_parents (); 3419 if (ISSET_PIXCOLOR (Color_tint))
3420 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3421 else
3422 changed = bgPixmap.unset_tint ();
3451 3423
3452 if (am_transparent) 3424 if (changed)
3453 want_full_refresh = want_refresh = 1; 3425 update_background ();
3426 }
3454 3427
3455 break; 3428 break;
3456#endif 3429#endif
3457 3430
3431#if BG_IMAGE_FROM_FILE
3458 case Rxvt_Pixmap: 3432 case Rxvt_Pixmap:
3459 { 3433 if (!strcmp (str, "?"))
3460 if (*str != ';')
3461 { 3434 {
3462#if XPM_BACKGROUND 3435 char str[256];
3463 scale_pixmap (""); /* reset to default scaling */ 3436
3464 set_bgPixmap (str); /* change pixmap */ 3437 sprintf (str, "[%dx%d+%d+%d]",
3465 scr_touch (true); 3438 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3466#endif 3439 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3440 process_xterm_seq (XTerm_title, str, CHAR_ST);
3467 } 3441 }
3468 3442 else
3443 {
3469 int changed = 0; 3444 int changed = 0;
3470 3445
3471 while ((str = strchr (str, ';')) != NULL) 3446 if (*str != ';')
3472 { 3447 {
3448 /* reset to default scaling :*/
3449 bgPixmap.unset_geometry ();
3450 if (bgPixmap.set_file (str)) /* change pixmap */
3451 changed++;
3452 str = strchr (str, ';');
3453 if (str == NULL)
3454 bgPixmap.set_defaultGeometry ();
3455 }
3456
3457 while (str)
3458 {
3473 str++; 3459 str++;
3474#if XPM_BACKGROUND 3460 if (bgPixmap.set_geometry (str))
3475 changed += scale_pixmap (str); 3461 changed++;
3476#endif 3462 str = strchr (str, ';');
3477 } 3463 }
3478 3464
3479 if (changed) 3465 if (changed)
3480 { 3466 update_background ();
3481#ifdef XPM_BACKGROUND
3482 resize_pixmap ();
3483 scr_touch (true);
3484#endif
3485 } 3467 }
3486#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
3487 if (option (Opt_transparent))
3488 check_our_parents ();
3489#endif
3490 }
3491 break; 3468 break;
3492 3469#endif
3493 case Rxvt_restoreFG:
3494 set_window_color (Color_fg, str);
3495 break;
3496 case Rxvt_restoreBG:
3497 set_window_color (Color_bg, str);
3498 break;
3499 3470
3500 case XTerm_logfile: 3471 case XTerm_logfile:
3501 // TODO, when secure mode? 3472 // TODO, when secure mode?
3502 break; 3473 break;
3503 3474
… …
3570 break; 3541 break;
3571#endif 3542#endif
3572 3543
3573#if ENABLE_PERL 3544#if ENABLE_PERL
3574 case URxvt_perl: 3545 case URxvt_perl:
3575 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));
3576 ; // no responses yet
3577 break; 3547 break;
3578#endif 3548#endif
3579 } 3549 }
3580} 3550}
3581/*----------------------------------------------------------------------*/ 3551/*----------------------------------------------------------------------*/
… …
3604 { 3574 {
3605 if (mode == 'r') 3575 if (mode == 'r')
3606 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3607 else 3577 else
3608 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3578 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3609 PrivMode (state, bit); 3579 set_privmode (bit, state);
3610 } 3580 }
3611 3581
3612 return state; 3582 return state;
3613} 3583}
3614 3584
… …
3618{ 3588{
3619 unsigned int i, j; 3589 unsigned int i, j;
3620 int state; 3590 int state;
3621 3591
3622 static const struct 3592 static const struct
3623 { 3593 {
3624 const int argval; 3594 const int argval;
3625 const unsigned long bit; 3595 const unsigned long bit;
3626 }
3627
3628 argtopriv[] = { 3596 } argtopriv[] = {
3629 { 1, PrivMode_aplCUR }, 3597 { 1, PrivMode_aplCUR }, // DECCKM
3630 { 2, PrivMode_vt52 }, 3598 { 2, PrivMode_vt52 },
3631 { 3, PrivMode_132 }, 3599 { 3, PrivMode_132 }, // DECCOLM
3632 { 4, PrivMode_smoothScroll }, 3600 { 4, PrivMode_smoothScroll }, // DECSCLM
3633 { 5, PrivMode_rVideo }, 3601 { 5, PrivMode_rVideo }, // DECSCNM
3634 { 6, PrivMode_relOrigin }, 3602 { 6, PrivMode_relOrigin }, // DECOM
3635 { 7, PrivMode_Autowrap }, 3603 { 7, PrivMode_Autowrap }, // DECAWM
3636 // 8, bi-directional support mode 3604 // 8, auto-repeat keys // DECARM
3637 { 9, PrivMode_MouseX10 }, 3605 { 9, PrivMode_MouseX10 },
3638 // 18, 19 printing-related 3606 // 18 end FF to printer after print screen
3607 // 19 Print screen prints full screen/scorll region
3639 { 25, PrivMode_VisibleCursor }, 3608 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3640#ifdef scrollBar_esc 3609#ifdef scrollBar_esc
3641 { scrollBar_esc, PrivMode_scrollBar }, 3610 { scrollBar_esc, PrivMode_scrollBar },
3642#endif 3611#endif
3643 { 35, PrivMode_ShiftKeys }, // rxvt extension 3612 { 35, PrivMode_ShiftKeys }, // rxvt extension
3613 // 38, tektronix mode // DECTEK
3644 { 40, PrivMode_132OK }, 3614 { 40, PrivMode_132OK },
3645 // 41 xterm more fixes NYI 3615 // 41 xterm more fixes NYI
3646 // 45 margin bell NYI 3616 // 45 margin bell NYI
3647 // 46 start logging 3617 // 46 start logging
3648 { 47, PrivMode_Screen }, 3618 { 47, PrivMode_Screen },
3649 { 66, PrivMode_aplKP }, 3619 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3650#ifndef NO_BACKSPACE_KEY 3620#ifndef NO_BACKSPACE_KEY
3651 { 67, PrivMode_BackSpace }, 3621 { 67, PrivMode_BackSpace }, // DECBKM
3652#endif 3622#endif
3653 { 1000, PrivMode_MouseX11 }, 3623 { 1000, PrivMode_MouseX11 },
3654 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3624 { 1002, PrivMode_MouseBtnEvent },
3655 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3625 { 1003, PrivMode_MouseAnyEvent },
3656 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3657 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3626 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3658 { 1011, PrivMode_Keypress }, // rxvt extension 3627 { 1011, PrivMode_Keypress }, // rxvt extension
3659 // 1035 enable modifiers for alt, numlock NYI 3628 // 1035 enable modifiers for alt, numlock NYI
3660 // 1036 send ESC for meta keys NYI 3629 // 1036 send ESC for meta keys NYI
3661 // 1037 send DEL for keypad delete NYI 3630 // 1037 send DEL for keypad delete NYI
3662 { 1047, PrivMode_Screen }, 3631 { 1047, PrivMode_Screen },
3663 // 1048 save and restore cursor 3632 // 1048 save and restore cursor
3664 { 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 */
3665 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3634 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3635 { 2004, PrivMode_BracketPaste },
3666 }; 3636 };
3667 3637
3668 if (nargs == 0) 3638 if (nargs == 0)
3669 return; 3639 return;
3670 3640
… …
3695 3665
3696 scr_touch (true); 3666 scr_touch (true);
3697 break; 3667 break;
3698#endif 3668#endif
3699 case 1048: /* alternative cursor save */ 3669 case 1048: /* alternative cursor save */
3700 case 1049:
3701 if (option (Opt_secondaryScreen)) 3670 if (option (Opt_secondaryScreen))
3702 if (mode == 0) 3671 if (mode == 0)
3703 scr_cursor (RESTORE); 3672 scr_cursor (RESTORE);
3704 else if (mode == 1) 3673 else if (mode == 1)
3705 scr_cursor (SAVE); 3674 scr_cursor (SAVE);
… …
3714 case 2: /* VT52 mode */ 3683 case 2: /* VT52 mode */
3715 /* oddball mode. should be set regardless of set/reset 3684 /* oddball mode. should be set regardless of set/reset
3716 * parameter. Return from VT52 mode with an ESC < from 3685 * parameter. Return from VT52 mode with an ESC < from
3717 * within VT52 mode 3686 * within VT52 mode
3718 */ 3687 */
3719 PrivMode (1, PrivMode_vt52); 3688 set_privmode (PrivMode_vt52, 1);
3720 break; 3689 break;
3721 case 3: /* 80/132 */ 3690 case 3: /* 80/132 */
3722 if (priv_modes & PrivMode_132OK) 3691 if (priv_modes & PrivMode_132OK)
3723 set_widthheight (((state ? 132 : 80) * fwidth), height); 3692 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3724 break; 3693 break;
3725 case 4: /* smooth scrolling */ 3694 case 4: /* smooth scrolling */
3726 set_option (Opt_jumpScroll, !state); 3695 set_option (Opt_jumpScroll, !state);
3727 break; 3696 break;
3728 case 5: /* reverse video */ 3697 case 5: /* reverse video */
… …
3735 scr_autowrap (state); 3704 scr_autowrap (state);
3736 break; 3705 break;
3737 /* case 8: - auto repeat, can't do on a per window basis */ 3706 /* case 8: - auto repeat, can't do on a per window basis */
3738 case 9: /* X10 mouse reporting */ 3707 case 9: /* X10 mouse reporting */
3739 if (state) /* orthogonal */ 3708 if (state) /* orthogonal */
3740 priv_modes &= ~PrivMode_MouseX11; 3709 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3741 break; 3710 break;
3742#ifdef scrollBar_esc 3711#ifdef scrollBar_esc
3743 case scrollBar_esc: 3712 case scrollBar_esc:
3744 if (scrollbar_mapping (state)) 3713 if (scrollBar.map (state))
3745 { 3714 {
3746 resize_all_windows (0, 0, 0); 3715 resize_all_windows (0, 0, 0);
3747 scr_touch (true); 3716 scr_touch (true);
3748 } 3717 }
3749 break; 3718 break;
… …
3758 break; 3727 break;
3759 /* case 66: - application key pad */ 3728 /* case 66: - application key pad */
3760 /* case 67: - backspace key */ 3729 /* case 67: - backspace key */
3761 case 1000: /* X11 mouse reporting */ 3730 case 1000: /* X11 mouse reporting */
3762 if (state) /* orthogonal */ 3731 if (state) /* orthogonal */
3763 priv_modes &= ~PrivMode_MouseX10; 3732 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3764 break; 3733 break;
3765#if 0
3766 case 1001: 3734 case 1002:
3767 break; /* X11 mouse highlighting */ 3735 case 1003:
3768#endif 3736 if (state)
3737 {
3738 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3739 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3740 vt_emask_mouse = PointerMotionMask;
3741 }
3742 else
3743 vt_emask_mouse = NoEventMask;
3744
3745 vt_select_input ();
3746 break;
3769 case 1010: /* scroll to bottom on TTY output inhibit */ 3747 case 1010: /* scroll to bottom on TTY output inhibit */
3770 set_option (Opt_scrollTtyOutput, !state); 3748 set_option (Opt_scrollTtyOutput, !state);
3771 break; 3749 break;
3772 case 1011: /* scroll to bottom on key press */ 3750 case 1011: /* scroll to bottom on key press */
3773 set_option (Opt_scrollTtyKeypress, state); 3751 set_option (Opt_scrollTtyKeypress, state);
3774 break; 3752 break;
3775 case 1047: /* secondary screen w/ clearing last */ 3753 case 1047: /* secondary screen w/ clearing last */
3776 if (option (Opt_secondaryScreen)) 3754 if (option (Opt_secondaryScreen))
3777 if (current_screen != PRIMARY) 3755 if (!state)
3778 scr_erase_screen (2); 3756 scr_erase_screen (2);
3757
3779 scr_change_screen (state); 3758 scr_change_screen (state);
3780 break; 3759 break;
3781 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
3782 scr_change_screen (state); 3765 scr_change_screen (state);
3766
3783 if (option (Opt_secondaryScreen)) 3767 if (option (Opt_secondaryScreen))
3784 if (current_screen != PRIMARY) 3768 if (state)
3785 scr_erase_screen (2); 3769 scr_erase_screen (2);
3770 else
3771 scr_cursor (RESTORE);
3786 break; 3772 break;
3787 default: 3773 default:
3788 break; 3774 break;
3789 } 3775 }
3790 } 3776 }
… …
3950rxvt_term::process_graphics () 3936rxvt_term::process_graphics ()
3951{ 3937{
3952 unicode_t ch, cmd = cmd_getc (); 3938 unicode_t ch, cmd = cmd_getc ();
3953 3939
3954 if (cmd == 'Q') 3940 if (cmd == 'Q')
3941 {
3955 { /* query graphics */ 3942 /* query graphics */
3956 tt_printf ("\033G0\012"); /* no graphics */ 3943 tt_printf ("\033G0\012"); /* no graphics */
3957 return; 3944 return;
3958 } 3945 }
3959 /* swallow other graphics sequences until terminating ':' */ 3946 /* swallow other graphics sequences until terminating ':' */
3960 do 3947 do
… …
4010 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3997 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4011 3998
4012 memcpy (v_buffer + v_buflen, data, len); 3999 memcpy (v_buffer + v_buflen, data, len);
4013 v_buflen += len; 4000 v_buflen += len;
4014 4001
4015 pty_ev.set (EVENT_READ | EVENT_WRITE); 4002 pty_ev.set (ev::READ | ev::WRITE);
4016} 4003}
4017 4004
4018void rxvt_term::pty_write () 4005void rxvt_term::pty_write ()
4019{ 4006{
4020 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4007 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4025 4012
4026 if (v_buflen == 0) 4013 if (v_buflen == 0)
4027 { 4014 {
4028 free (v_buffer); 4015 free (v_buffer);
4029 v_buffer = 0; 4016 v_buffer = 0;
4030 v_buflen = 0;
4031 4017
4032 pty_ev.set (EVENT_READ); 4018 pty_ev.set (ev::READ);
4033 return; 4019 return;
4034 } 4020 }
4035 4021
4036 memmove (v_buffer, v_buffer + written, v_buflen); 4022 memmove (v_buffer, v_buffer + written, v_buflen);
4037 } 4023 }
4038 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4024 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4039 pty_ev.set (EVENT_READ); 4025 pty_ev.set (ev::READ);
4040} 4026}
4041 4027
4042/*----------------------- end-of-file (C source) -----------------------*/ 4028/*----------------------- end-of-file (C source) -----------------------*/
4043 4029

Diff Legend

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