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.317 by root, Sat Jan 13 15:06:54 2007 UTC vs.
Revision 1.435 by sf-exg, Wed Jan 6 12:10:44 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
… …
485 } 579 }
486 } 580 }
487 581
488#if ENABLE_FRILLS || ISO_14755 582#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 583 // ISO 14755 support
490 if (shft && ctrl) 584 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 585 {
492 int hv; 586 int hv;
493 587
494 if (iso14755buf & ISO_14755_51 588 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 589 && (keysym == XK_space || keysym == XK_KP_Space
… …
497 { 591 {
498 commit_iso14755 (); 592 commit_iso14755 ();
499 iso14755buf = ISO_14755_51; 593 iso14755buf = ISO_14755_51;
500# if ISO_14755 594# if ISO_14755
501 iso14755_51 (0); 595 iso14755_51 (0);
596# endif
597 return;
598 }
599 else if (keysym == XK_BackSpace)
600 {
601 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
602# if ISO_14755
603 iso14755_51 (iso14755buf & ISO_14755_MASK);
502# endif 604# endif
503 return; 605 return;
504 } 606 }
505 else if ((hv = hex_keyval (ev)) >= 0) 607 else if ((hv = hex_keyval (ev)) >= 0)
506 { 608 {
… …
511# endif 613# endif
512 return; 614 return;
513 } 615 }
514 else 616 else
515 { 617 {
516# if ENABLE_OVERLAY 618# if ISO_14755
517 scr_overlay_off (); 619 scr_overlay_off ();
518# endif 620# endif
519 iso14755buf = 0; 621 iso14755buf = 0;
520 } 622 }
521 } 623 }
624 else if (option (Opt_iso14755) &&
522 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 625 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
523 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 626 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
524 if (!(iso14755buf & ISO_14755_STARTED)) 627 if (!(iso14755buf & ISO_14755_STARTED))
525 { 628 {
526 iso14755buf |= ISO_14755_STARTED; 629 iso14755buf |= ISO_14755_STARTED;
527# if ENABLE_OVERLAY 630# if ISO_14755
528 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 631 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
529 scr_overlay_set (0, 0, "ISO 14755 mode"); 632 scr_overlay_set (0, 0, "ISO 14755 mode");
530# endif 633# endif
531 } 634 }
532#endif 635#endif
533 636
534#ifdef PRINTPIPE 637#ifdef PRINTPIPE
535 if (keysym == XK_Print) 638 if (keysym == XK_Print)
536 { 639 {
537 scr_printscreen (ctrl | shft); 640 scr_printscreen (ctrl | shft);
538 return; 641 return;
539 } 642 }
540#endif 643#endif
541 644
542 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 645 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
543 { 646 {
647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
648 unsigned int newlen = 1;
649
650 switch (translate_keypad (keysym, kp))
544 { 651 {
652#ifndef NO_BACKSPACE_KEY
653 case XK_BackSpace:
654 if (priv_modes & PrivMode_HaveBackSpace)
655 {
656 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
657 ^ !!ctrl) ? '\b' : '\177';
658 kbuf[1] = '\0';
659 }
660 else
661 strcpy (kbuf, rs[Rs_backspace_key]);
662 break;
663#endif
664#ifndef NO_DELETE_KEY
665 case XK_Delete:
666 strcpy (kbuf, rs[Rs_delete_key]);
667 break;
668#endif
669 case XK_Tab:
670 if (shft)
671 strcpy (kbuf, "\033[Z");
672 else
673 {
674#ifdef CTRL_TAB_MAKES_META
675 if (ctrl)
676 meta = 1;
677#endif
678#ifdef MOD4_TAB_MAKES_META
679 if (ev.state & Mod4Mask)
680 meta = 1;
681#endif
545 newlen = 1; 682 newlen = 0;
546 switch (keysym) 683 }
684 break;
685
686 case XK_Up: /* "\033[A" */
687 case XK_Down: /* "\033[B" */
688 case XK_Right: /* "\033[C" */
689 case XK_Left: /* "\033[D" */
690 strcpy (kbuf, "\033[Z");
691 kbuf[2] = "DACB"[keysym - XK_Left];
692 /* do Shift first */
693 if (shft)
694 kbuf[2] = "dacb"[keysym - XK_Left];
695 else if (ctrl)
696 {
697 kbuf[1] = 'O';
698 kbuf[2] = "dacb"[keysym - XK_Left];
699 }
700 else if (priv_modes & PrivMode_aplCUR)
701 kbuf[1] = 'O';
702 break;
703
704 case XK_KP_Enter:
705 /* allow shift to override */
706 if (kp)
707 {
708 strcpy (kbuf, "\033OM");
709 break;
710 }
711
712 /* FALLTHROUGH */
713
714 case XK_Return:
715 if (priv_modes & PrivMode_LFNL)
716 {
717 kbuf[0] = '\015';
718 kbuf[1] = '\012';
719 kbuf[2] = '\0';
720 }
721 else
722 {
723 kbuf[0] = '\015';
724 kbuf[1] = '\0';
725 }
726 break;
727
728 case XK_KP_F1: /* "\033OP" */
729 case XK_KP_F2: /* "\033OQ" */
730 case XK_KP_F3: /* "\033OR" */
731 case XK_KP_F4: /* "\033OS" */
732 strcpy (kbuf, "\033OP");
733 kbuf[2] += (keysym - XK_KP_F1);
734 break;
735
736 case XK_KP_Multiply: /* "\033Oj" : "*" */
737 case XK_KP_Add: /* "\033Ok" : "+" */
738 case XK_KP_Separator: /* "\033Ol" : "," */
739 case XK_KP_Subtract: /* "\033Om" : "-" */
740 case XK_KP_Decimal: /* "\033On" : "." */
741 case XK_KP_Divide: /* "\033Oo" : "/" */
742 case XK_KP_0: /* "\033Op" : "0" */
743 case XK_KP_1: /* "\033Oq" : "1" */
744 case XK_KP_2: /* "\033Or" : "2" */
745 case XK_KP_3: /* "\033Os" : "3" */
746 case XK_KP_4: /* "\033Ot" : "4" */
747 case XK_KP_5: /* "\033Ou" : "5" */
748 case XK_KP_6: /* "\033Ov" : "6" */
749 case XK_KP_7: /* "\033Ow" : "7" */
750 case XK_KP_8: /* "\033Ox" : "8" */
751 case XK_KP_9: /* "\033Oy" : "9" */
752 /* allow shift to override */
753 if (kp)
754 {
755 strcpy (kbuf, "\033Oj");
756 kbuf[2] += (keysym - XK_KP_Multiply);
757 }
758 else
759 {
760 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
761 kbuf[1] = '\0';
762 }
763 break;
764
765 default:
547 { 766 {
548#ifndef NO_BACKSPACE_KEY 767 int param = map_function_key (keysym);
549 case XK_BackSpace: 768 if (param > 0)
550 if (priv_modes & PrivMode_HaveBackSpace) 769 sprintf (kbuf,"\033[%d~", param);
551 {
552 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
553 ^ !!ctrl) ? '\b' : '\177';
554 kbuf[1] = '\0';
555 }
556 else 770 else
557 strcpy (kbuf, key_backspace);
558 break;
559#endif
560#ifndef NO_DELETE_KEY
561# ifdef XK_KP_Prior
562 case XK_KP_Delete:
563 /* allow shift to override */
564 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
565 {
566 strcpy (kbuf, "\033On");
567 break;
568 }
569 /* FALLTHROUGH */
570# endif
571 case XK_Delete:
572 strcpy (kbuf, key_delete);
573 break;
574#endif
575 case XK_Tab:
576 if (shft)
577 strcpy (kbuf, "\033[Z");
578 else
579 {
580#ifdef CTRL_TAB_MAKES_META
581 if (ctrl)
582 meta = 1;
583#endif
584#ifdef MOD4_TAB_MAKES_META
585 if (ev.state & Mod4Mask)
586 meta = 1;
587#endif
588 newlen = 0;
589 }
590 break;
591
592#ifdef XK_KP_Left
593 case XK_KP_Up: /* \033Ox or standard */
594 case XK_KP_Down: /* \033Or or standard */
595 case XK_KP_Right: /* \033Ov or standard */
596 case XK_KP_Left: /* \033Ot or standard */
597 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
598 {
599 strcpy (kbuf, "\033OZ");
600 kbuf[2] = "txvr"[keysym - XK_KP_Left];
601 break;
602 }
603 else
604 /* translate to std. cursor key */
605 keysym = XK_Left + (keysym - XK_KP_Left);
606 /* FALLTHROUGH */
607#endif
608 case XK_Up: /* "\033[A" */
609 case XK_Down: /* "\033[B" */
610 case XK_Right: /* "\033[C" */
611 case XK_Left: /* "\033[D" */
612 strcpy (kbuf, "\033[Z");
613 kbuf[2] = "DACB"[keysym - XK_Left];
614 /* do Shift first */
615 if (shft)
616 kbuf[2] = "dacb"[keysym - XK_Left];
617 else if (ctrl)
618 {
619 kbuf[1] = 'O';
620 kbuf[2] = "dacb"[keysym - XK_Left];
621 }
622 else if (priv_modes & PrivMode_aplCUR)
623 kbuf[1] = 'O';
624 break;
625
626#ifndef UNSHIFTED_SCROLLKEYS
627# ifdef XK_KP_Prior
628 case XK_KP_Prior:
629 /* allow shift to override */
630 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
631 {
632 strcpy (kbuf, "\033Oy");
633 break;
634 }
635 /* FALLTHROUGH */
636# endif
637 case XK_Prior:
638 strcpy (kbuf, "\033[5~");
639 break;
640# ifdef XK_KP_Next
641 case XK_KP_Next:
642 /* allow shift to override */
643 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
644 {
645 strcpy (kbuf, "\033Os");
646 break;
647 }
648 /* FALLTHROUGH */
649# endif
650 case XK_Next:
651 strcpy (kbuf, "\033[6~");
652 break;
653#endif
654 case XK_KP_Enter:
655 /* allow shift to override */
656 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
657 {
658 strcpy (kbuf, "\033OM");
659 break;
660 }
661
662 /* FALLTHROUGH */
663
664 case XK_Return:
665 if (priv_modes & PrivMode_LFNL)
666 {
667 kbuf[0] = '\015';
668 kbuf[1] = '\012';
669 kbuf[2] = '\0';
670 }
671 else
672 {
673 kbuf[0] = '\015';
674 kbuf[1] = '\0';
675 }
676 break;
677
678#ifdef XK_KP_Begin
679 case XK_KP_Begin:
680 strcpy (kbuf, "\033Ou");
681 break;
682
683#endif
684 case XK_KP_F1: /* "\033OP" */
685 case XK_KP_F2: /* "\033OQ" */
686 case XK_KP_F3: /* "\033OR" */
687 case XK_KP_F4: /* "\033OS" */
688 strcpy (kbuf, "\033OP");
689 kbuf[2] += (keysym - XK_KP_F1);
690 break;
691
692 case XK_KP_Multiply: /* "\033Oj" : "*" */
693 case XK_KP_Add: /* "\033Ok" : "+" */
694 case XK_KP_Separator: /* "\033Ol" : "," */
695 case XK_KP_Subtract: /* "\033Om" : "-" */
696 case XK_KP_Decimal: /* "\033On" : "." */
697 case XK_KP_Divide: /* "\033Oo" : "/" */
698 case XK_KP_0: /* "\033Op" : "0" */
699 case XK_KP_1: /* "\033Oq" : "1" */
700 case XK_KP_2: /* "\033Or" : "2" */
701 case XK_KP_3: /* "\033Os" : "3" */
702 case XK_KP_4: /* "\033Ot" : "4" */
703 case XK_KP_5: /* "\033Ou" : "5" */
704 case XK_KP_6: /* "\033Ov" : "6" */
705 case XK_KP_7: /* "\033Ow" : "7" */
706 case XK_KP_8: /* "\033Ox" : "8" */
707 case XK_KP_9: /* "\033Oy" : "9" */
708 /* allow shift to override */
709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
710 {
711 strcpy (kbuf, "\033Oj");
712 kbuf[2] += (keysym - XK_KP_Multiply);
713 }
714 else
715 {
716 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
717 kbuf[1] = '\0';
718 }
719 break;
720
721 case XK_Find:
722 strcpy (kbuf, "\033[1~");
723 break;
724
725#ifdef XK_KP_End
726 case XK_KP_Insert:
727 /* allow shift to override */
728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
729 {
730 strcpy (kbuf, "\033Op");
731 break;
732 }
733 /* FALLTHROUGH */
734#endif
735 case XK_Insert:
736 strcpy (kbuf, "\033[2~");
737 break;
738#ifdef DXK_Remove /* support for DEC remove like key */
739 case DXK_Remove:
740 /* FALLTHROUGH */
741#endif
742 case XK_Execute:
743 strcpy (kbuf, "\033[3~");
744 break;
745 case XK_Select:
746 strcpy (kbuf, "\033[4~");
747 break;
748#ifdef XK_KP_End
749 case XK_KP_End:
750 /* allow shift to override */
751 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
752 {
753 strcpy (kbuf, "\033Oq");
754 break;
755 }
756 /* FALLTHROUGH */
757#endif
758 case XK_End:
759 strcpy (kbuf, KS_END);
760 break;
761#ifdef XK_KP_Home
762 case XK_KP_Home:
763 /* allow shift to override */
764 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
765 {
766 strcpy (kbuf, "\033Ow");
767 break;
768 }
769 /* FALLTHROUGH */
770#endif
771 case XK_Home:
772 strcpy (kbuf, KS_HOME);
773 break;
774
775#define FKEY(n, fkey) \
776 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
777
778 case XK_F1: /* "\033[11~" */
779 case XK_F2: /* "\033[12~" */
780 case XK_F3: /* "\033[13~" */
781 case XK_F4: /* "\033[14~" */
782 case XK_F5: /* "\033[15~" */
783 FKEY (11, XK_F1);
784 break;
785 case XK_F6: /* "\033[17~" */
786 case XK_F7: /* "\033[18~" */
787 case XK_F8: /* "\033[19~" */
788 case XK_F9: /* "\033[20~" */
789 case XK_F10: /* "\033[21~" */
790 FKEY (17, XK_F6);
791 break;
792 case XK_F11: /* "\033[23~" */
793 case XK_F12: /* "\033[24~" */
794 case XK_F13: /* "\033[25~" */
795 case XK_F14: /* "\033[26~" */
796 FKEY (23, XK_F11);
797 break;
798 case XK_F15: /* "\033[28~" */
799 case XK_F16: /* "\033[29~" */
800 FKEY (28, XK_F15);
801 break;
802 case XK_Help: /* "\033[28~" */
803 FKEY (28, XK_Help);
804 break;
805 case XK_Menu: /* "\033[29~" */
806 FKEY (29, XK_Menu);
807 break;
808 case XK_F17: /* "\033[31~" */
809 case XK_F18: /* "\033[32~" */
810 case XK_F19: /* "\033[33~" */
811 case XK_F20: /* "\033[34~" */
812 case XK_F21: /* "\033[35~" */
813 case XK_F22: /* "\033[36~" */
814 case XK_F23: /* "\033[37~" */
815 case XK_F24: /* "\033[38~" */
816 case XK_F25: /* "\033[39~" */
817 case XK_F26: /* "\033[40~" */
818 case XK_F27: /* "\033[41~" */
819 case XK_F28: /* "\033[42~" */
820 case XK_F29: /* "\033[43~" */
821 case XK_F30: /* "\033[44~" */
822 case XK_F31: /* "\033[45~" */
823 case XK_F32: /* "\033[46~" */
824 case XK_F33: /* "\033[47~" */
825 case XK_F34: /* "\033[48~" */
826 case XK_F35: /* "\033[49~" */
827 FKEY (31, XK_F17);
828 break;
829#undef FKEY
830 default:
831 newlen = 0; 771 newlen = 0;
832 break;
833 } 772 }
834 773 break;
835 if (newlen)
836 len = strlen (kbuf);
837 } 774 }
775
776 if (newlen)
777 len = strlen (kbuf);
838 778
839 /* 779 /*
840 * Pass meta for all function keys, if 'meta' option set 780 * Pass meta for all function keys, if 'meta' option set
841 */ 781 */
842#ifdef META8_OPTION 782#ifdef META8_OPTION
… …
877 return; 817 return;
878 818
879 if (len <= 0) 819 if (len <= 0)
880 return; /* not mapped */ 820 return; /* not mapped */
881 821
882 if (OPTION (Opt_scrollTtyKeypress)) 822 if (option (Opt_scrollTtyKeypress))
883 if (view_start) 823 if (view_start)
884 { 824 {
885 view_start = 0; 825 view_start = 0;
886 want_refresh = 1; 826 want_refresh = 1;
887 } 827 }
… …
926#if ENABLE_FRILLS || ISO_14755 866#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support 867 // ISO 14755 support
928 if (iso14755buf) 868 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52) 869 if (iso14755buf & ISO_14755_52)
930 { 870 {
931# if ENABLE_OVERLAY 871# if ISO_14755
932 scr_overlay_off (); 872 scr_overlay_off ();
933# endif 873# endif
934# if ISO_14755 874# if ISO_14755
935 // iso14755 part 5.2 handling: release time 875 // iso14755 part 5.2 handling: release time
936 // first: controls 876 // first: controls
… …
959 899
960 return; 900 return;
961 } 901 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 902 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 { 903 {
964# if ENABLE_OVERLAY 904# if ISO_14755
965 scr_overlay_off (); 905 scr_overlay_off ();
966# endif 906# endif
967 if (iso14755buf & ISO_14755_51) 907 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 (); 908 commit_iso14755 ();
969#if ISO_14755 909#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED) 910 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971 { 911 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 912 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973 913
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 914 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 915 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
1027void 967void
1028rxvt_term::flush () 968rxvt_term::flush ()
1029{ 969{
1030 flush_ev.stop (); 970 flush_ev.stop ();
1031 971
1032#ifdef TRANSPARENT 972#ifdef HAVE_BG_PIXMAP
1033 if (want_full_refresh) 973 if (bgPixmap.check_clearChanged ())
1034 { 974 {
1035 want_full_refresh = 0; 975// scr_clear (true); This needs to be researched further!
1036 scr_clear ();
1037 scr_touch (false); 976 scr_touch (false);
1038 } 977 }
1039#endif 978#endif
1040 979
1041 if (want_refresh) 980 if (want_refresh)
… …
1077 } 1016 }
1078 while (row < end_row); 1017 while (row < end_row);
1079 } 1018 }
1080 1019
1081 scr_refresh (); 1020 scr_refresh ();
1082 scrollbar_show (1); 1021 scrollBar.show (1);
1083#ifdef USE_XIM 1022#ifdef USE_XIM
1084 IMSendSpot (); 1023 IMSendSpot ();
1085#endif 1024#endif
1086 } 1025 }
1087 1026
1088 display->flush (); 1027 display->flush ();
1089} 1028}
1090 1029
1030/* checks wether a refresh is requested and starts the refresh timer */
1091void 1031void
1092rxvt_term::check_cb (check_watcher &w) 1032rxvt_term::refresh_check ()
1033{
1034 if (want_refresh && !flush_ev.is_active ())
1035 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1036
1037 display->flush ();
1038}
1039
1040void
1041rxvt_term::flush_cb (ev::timer &w, int revents)
1093{ 1042{
1094 make_current (); 1043 make_current ();
1095 1044
1096 display->flush ();
1097
1098 if (want_refresh && !flush_ev.active)
1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1100}
1101
1102void
1103rxvt_term::flush_cb (time_watcher &w)
1104{
1105 make_current ();
1106
1107 refresh_limit = 1;
1108 refresh_count = 0; 1045 refresh_count = 0;
1109 flush (); 1046 flush ();
1110} 1047}
1111 1048
1112#ifdef CURSOR_BLINK 1049#ifdef CURSOR_BLINK
1113void 1050void
1114rxvt_term::cursor_blink_cb (time_watcher &w) 1051rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1115{ 1052{
1116 hidden_cursor = !hidden_cursor; 1053 hidden_cursor = !hidden_cursor;
1117 want_refresh = 1; 1054 want_refresh = 1;
1118 1055 refresh_check ();
1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1120} 1056}
1121#endif 1057#endif
1122 1058
1123#ifdef TEXT_BLINK 1059#ifdef TEXT_BLINK
1124void 1060void
1125rxvt_term::text_blink_cb (time_watcher &w) 1061rxvt_term::text_blink_cb (ev::timer &w, int revents)
1126{ 1062{
1127 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1063 if (scr_refresh_rend (RS_Blink, RS_Blink))
1128 { 1064 {
1129 hidden_text = !hidden_text; 1065 hidden_text = !hidden_text;
1130 want_refresh = 1; 1066 want_refresh = 1;
1131 w.start (w.at + TEXT_BLINK_INTERVAL); 1067 refresh_check ();
1132 } 1068 }
1069 else
1070 w.stop ();
1133} 1071}
1134#endif 1072#endif
1135 1073
1136#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1074#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1137void 1075void
1138rxvt_term::cont_scroll_cb (time_watcher &w) 1076rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1139{ 1077{
1140 if ((scrollbar_isUp() || scrollbar_isDn()) && 1078 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1141 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1079 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1142 { 1080 {
1143 want_refresh = 1; 1081 want_refresh = 1;
1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1082 refresh_check ();
1145 } 1083 }
1084 else
1085 w.stop ();
1146} 1086}
1147#endif 1087#endif
1148 1088
1149#ifdef SELECTION_SCROLLING 1089#ifdef SELECTION_SCROLLING
1150void 1090void
1151rxvt_term::sel_scroll_cb (time_watcher &w) 1091rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1152{ 1092{
1153 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1093 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1154 { 1094 {
1155 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1095 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1156 want_refresh = 1; 1096 want_refresh = 1;
1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1097 refresh_check ();
1158 } 1098 }
1099 else
1100 w.stop ();
1159} 1101}
1160#endif 1102#endif
1161 1103
1162#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1104#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1163void 1105void
1164rxvt_term::slip_wheel_cb (time_watcher &w) 1106rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1165{ 1107{
1166 if (mouse_slip_wheel_speed == 0 1108 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1168 : scr_page (UP, mouse_slip_wheel_speed))
1169 { 1109 {
1170 if (view_start == top_row || view_start == 0)
1171 mouse_slip_wheel_speed = 0;
1172
1173 want_refresh = 1; 1110 want_refresh = 1;
1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1111 refresh_check ();
1112 }
1113
1114 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1115 {
1116 mouse_slip_wheel_speed = 0;
1117 w.stop ();
1175 } 1118 }
1176} 1119}
1177#endif 1120#endif
1178 1121
1179#if LINUX_YIELD_HACK 1122#if LINUX_YIELD_HACK
1180static struct event_handler 1123static struct event_handler
1181{ 1124{
1182 check_watcher yield_ev; 1125 ev::prepare yield_ev;
1183 1126
1184 void yield_cb (check_watcher &w) 1127 void yield_cb (ev::prepare &w, int revents)
1185 { 1128 {
1186 // this should really be sched_yield(), but the linux guys thought 1129 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1130 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is 1131 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS. 1132 // allowed by the sus... as is returning ENOSYS.
1133 // since the linux guys additionally thought that breaking the only
1134 // known workaroudn against their unusable sched_yield hack is cool,
1135 // we just nanosleep a bit and hope for the best.
1190 1136
1191 struct timespec ts = { 0, 0 }; 1137 struct timespec ts = { 0, 1000 };
1192 nanosleep (&ts, 0); 1138 nanosleep (&ts, 0);
1193 1139
1194 w.stop (); 1140 w.stop ();
1195 } 1141 }
1196 1142
… …
1232 } 1178 }
1233 else 1179 else
1234 { 1180 {
1235 pty_ev.stop (); 1181 pty_ev.stop ();
1236 1182
1237 if (!OPTION (Opt_hold)) 1183 if (!option (Opt_hold))
1238 destroy (); 1184 destroy ();
1239 } 1185 }
1240 1186
1241 return false; 1187 return false;
1242} 1188}
1243 1189
1244void 1190void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1191rxvt_term::pty_cb (ev::io &w, int revents)
1246{ 1192{
1247 make_current (); 1193 make_current ();
1248 1194
1249 if (revents & EVENT_READ) 1195 if (revents & ev::READ)
1250 // loop, but don't allow a single term to monopolize us 1196 // loop, but don't allow a single term to monopolize us
1251 while (pty_fill ()) 1197 for (int i = CBUFCNT; i-- && pty_fill (); )
1252 if (cmd_parse ()) 1198 cmd_parse ();
1253 break;
1254 1199
1255 if (revents & EVENT_WRITE) 1200 if (revents & ev::WRITE)
1256 pty_write (); 1201 pty_write ();
1202
1203 refresh_check ();
1257} 1204}
1258 1205
1259void 1206void
1260rxvt_term::pointer_unblank () 1207rxvt_term::pointer_unblank ()
1261{ 1208{
… …
1263 recolour_cursor (); 1210 recolour_cursor ();
1264 1211
1265#ifdef POINTER_BLANK 1212#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1213 hidden_pointer = 0;
1267 1214
1268 if (OPTION (Opt_pointerBlank)) 1215 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1216 pointer_ev.start (pointerBlankDelay);
1270#endif 1217#endif
1271} 1218}
1272 1219
1273#ifdef POINTER_BLANK 1220#ifdef POINTER_BLANK
1274void 1221void
1275rxvt_term::pointer_blank () 1222rxvt_term::pointer_blank ()
1276{ 1223{
1277 if (!OPTION (Opt_pointerBlank)) 1224 if (!option (Opt_pointerBlank))
1278 return; 1225 return;
1279 1226
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1227 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1228 XFlush (dpy);
1282 1229
1283 hidden_pointer = 1; 1230 hidden_pointer = 1;
1284} 1231}
1285 1232
1286void 1233void
1287rxvt_term::pointer_cb (time_watcher &w) 1234rxvt_term::pointer_cb (ev::timer &w, int revents)
1288{ 1235{
1289 make_current (); 1236 make_current ();
1290 1237
1291 pointer_blank (); 1238 pointer_blank ();
1292} 1239}
… …
1295void 1242void
1296rxvt_term::mouse_report (XButtonEvent &ev) 1243rxvt_term::mouse_report (XButtonEvent &ev)
1297{ 1244{
1298 int button_number, key_state = 0; 1245 int button_number, key_state = 0;
1299 int x, y; 1246 int x, y;
1247 int code = 32;
1300 1248
1301 x = ev.x; 1249 x = Pixel2Col (ev.x);
1302 y = ev.y; 1250 y = Pixel2Row (ev.y);
1303 pixel_position (&x, &y); 1251 if (ev.type == MotionNotify)
1252 {
1253 if (x == mouse_row && y == mouse_col)
1254 return;
1255 mouse_row = x;
1256 mouse_col = y;
1257 code += 32;
1258 }
1304 1259
1305 if (MEvent.button == AnyButton) 1260 if (MEvent.button == AnyButton)
1306 button_number = 3; 1261 button_number = 3;
1307 else 1262 else
1308 { 1263 {
… …
1354 x + 1, 1309 x + 1,
1355 y + 1); 1310 y + 1);
1356#endif 1311#endif
1357 1312
1358 tt_printf ("\033[M%c%c%c", 1313 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1314 (code + button_number + key_state),
1360 (32 + x + 1), 1315 (32 + x + 1),
1361 (32 + y + 1)); 1316 (32 + y + 1));
1362} 1317}
1363 1318
1364/*{{{ process an X event */ 1319/*{{{ process an X event */
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1381 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1382 focus_out ();
1428 } 1383 }
1429#endif 1384#endif
1430 } 1385 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1386 break;
1436 1387
1437 /* 1388 /*
1438 * XXX: this is not the _current_ arrangement 1389 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1390 * Here's my conclusion:
… …
1458 break; 1409 break;
1459 } 1410 }
1460 break; 1411 break;
1461 1412
1462 case FocusIn: 1413 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer) 1414 if (ev.xfocus.detail != NotifyInferior
1415 && ev.xfocus.detail != NotifyPointer
1416 && ev.xfocus.mode != NotifyGrab)
1464 focus_in (); 1417 focus_in ();
1465 break; 1418 break;
1466 1419
1467 case FocusOut: 1420 case FocusOut:
1468 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer) 1421 if (ev.xfocus.detail != NotifyInferior
1422 && ev.xfocus.detail != NotifyPointer
1423 && ev.xfocus.mode != NotifyGrab)
1469 focus_out (); 1424 focus_out ();
1470 break; 1425 break;
1471 1426
1472 case ConfigureNotify: 1427 case ConfigureNotify:
1428 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1429 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1430 szHint.width, szHint.height);*/
1473 if (ev.xconfigure.window == parent[0]) 1431 if (ev.xconfigure.window == parent[0])
1474 { 1432 {
1475 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1433 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1476 ; 1434 ;
1477 1435
1478 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1436 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1479 { 1437 {
1480 seen_resize = 1; 1438 seen_resize = 1;
1481 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1439 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1482 } 1440 }
1441 else
1442 {
1443#ifdef HAVE_BG_PIXMAP
1444 if (bgPixmap.window_position_sensitive ())
1445 {
1446 if (mapped)
1447 update_background ();
1448 else
1449 bgPixmap.invalidate ();
1450 }
1451#endif
1452 }
1483 1453
1484 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1454 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1485
1486#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1487#if 0
1488 if (OPTION (Opt_transparent))
1489 check_our_parents ();
1490#endif
1491#endif
1492 } 1455 }
1493 break; 1456 break;
1494 1457
1495 case PropertyNotify: 1458 case PropertyNotify:
1496 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1459 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1512 case SelectionRequest: 1475 case SelectionRequest:
1513 selection_send (ev.xselectionrequest); 1476 selection_send (ev.xselectionrequest);
1514 break; 1477 break;
1515 1478
1516 case MapNotify: 1479 case MapNotify:
1480#ifdef HAVE_BG_PIXMAP
1481 /* This is needed spcifically to fix the case of no window manager or a
1482 * non-reparenting window manager. In those cases we never get first
1483 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1484 * care of multiplicity of ConfigureNotify events arriwing while WM does
1485 * reparenting.
1486 * We should not render background immidiately, as there could be several
1487 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1488 * by scheduling background redraw as soon as we can, but giving a short
1489 * bit of time for ConfigureNotifies to arrive.
1490 * We should render background PRIOR to drawing any text, but AFTER all
1491 * of ConfigureNotifys for the best results.
1492 */
1493 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1494 update_background_ev.start (0.025);
1495#endif
1517 mapped = 1; 1496 mapped = 1;
1518#ifdef TEXT_BLINK 1497#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1498 text_blink_ev.start ();
1520#endif 1499#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1500 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break; 1501 break;
1523 1502
1524 case UnmapNotify: 1503 case UnmapNotify:
… …
1526#ifdef TEXT_BLINK 1505#ifdef TEXT_BLINK
1527 text_blink_ev.stop (); 1506 text_blink_ev.stop ();
1528#endif 1507#endif
1529 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1508 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1530 break; 1509 break;
1531
1532#ifdef TRANSPARENT
1533 case ReparentNotify:
1534 rootwin_cb (ev);
1535 break;
1536#endif /* TRANSPARENT */
1537 1510
1538 case GraphicsExpose: 1511 case GraphicsExpose:
1539 case Expose: 1512 case Expose:
1540 if (ev.xany.window == vt) 1513 if (ev.xany.window == vt)
1541 { 1514 {
1542 do 1515 do
1516 {
1543 scr_expose (ev.xexpose.x, ev.xexpose.y, 1517 scr_expose (ev.xexpose.x, ev.xexpose.y,
1544 ev.xexpose.width, ev.xexpose.height, False); 1518 ev.xexpose.width, ev.xexpose.height, False);
1519 }
1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1520 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1546 1521
1547 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1522 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1548 1523
1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1524 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1525 {
1550 scr_expose (ev.xexpose.x, ev.xexpose.y, 1526 scr_expose (ev.xexpose.x, ev.xexpose.y,
1551 ev.xexpose.width, ev.xexpose.height, False); 1527 ev.xexpose.width, ev.xexpose.height, False);
1528 }
1552 1529
1553 want_refresh = 1; 1530 want_refresh = 1;
1554 } 1531 }
1555 else 1532 else
1556 { 1533 {
… …
1559 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1536 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1560 ; 1537 ;
1561 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1538 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1562 ; 1539 ;
1563 1540
1564 if (isScrollbarWindow (ev.xany.window)) 1541 if (scrollBar.state && ev.xany.window == scrollBar.win)
1565 { 1542 {
1566 scrollBar.setIdle (); 1543 scrollBar.state = STATE_IDLE;
1567 scrollbar_show (0); 1544 scrollBar.show (0);
1568 } 1545 }
1569
1570#ifdef TRANSPARENT
1571 if (am_transparent && ev.xany.window == parent[0])
1572 XClearWindow (dpy, ev.xany.window);
1573#endif
1574 } 1546 }
1575 break; 1547 break;
1576 1548
1577 case MotionNotify: 1549 case MotionNotify:
1578#ifdef POINTER_BLANK 1550#ifdef POINTER_BLANK
1579 if (hidden_pointer) 1551 if (hidden_pointer)
1580 pointer_unblank (); 1552 pointer_unblank ();
1581#endif 1553#endif
1554 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1555 || priv_modes & PrivMode_MouseAnyEvent)
1556 mouse_report (ev.xbutton);
1582 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1557 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1583 break; 1558 break;
1584 1559
1585 if (ev.xany.window == vt) 1560 if (ev.xany.window == vt)
1586 { 1561 {
… …
1620 int dist; 1595 int dist;
1621 1596
1622 /* don't clobber the current delay if we are 1597 /* don't clobber the current delay if we are
1623 * already in the middle of scrolling. 1598 * already in the middle of scrolling.
1624 */ 1599 */
1625 if (!sel_scroll_ev.active) 1600 if (!sel_scroll_ev.is_active ())
1626 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1601 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1627 1602
1628 /* save the event params so we can highlight 1603 /* save the event params so we can highlight
1629 * the selection in the pending-scroll loop 1604 * the selection in the pending-scroll loop
1630 */ 1605 */
1631 selection_save_x = ev.xbutton.x; 1606 selection_save_x = ev.xbutton.x;
… …
1653 else 1628 else
1654 { 1629 {
1655 /* we are within the text window, so we 1630 /* we are within the text window, so we
1656 * shouldn't be scrolling 1631 * shouldn't be scrolling
1657 */ 1632 */
1658 if (sel_scroll_ev.active)
1659 sel_scroll_ev.stop(); 1633 sel_scroll_ev.stop();
1660 } 1634 }
1661#endif 1635#endif
1662#ifdef MOUSE_THRESHOLD 1636#ifdef MOUSE_THRESHOLD
1663 } 1637 }
1664#endif 1638#endif
1665 } 1639 }
1666 } 1640 }
1667 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1641 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1668 { 1642 {
1669 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1643 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1670 MotionNotify, &ev)) 1644 MotionNotify, &ev))
1671 ; 1645 ;
1672 1646
… …
1674 &unused_root, &unused_child, 1648 &unused_root, &unused_child,
1675 &unused_root_x, &unused_root_y, 1649 &unused_root_x, &unused_root_y,
1676 &ev.xbutton.x, &ev.xbutton.y, 1650 &ev.xbutton.x, &ev.xbutton.y,
1677 &unused_mask); 1651 &unused_mask);
1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1652 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1679 scrollbar_size ()); 1653 scrollBar.size ());
1680 want_refresh = 1; 1654 want_refresh = 1;
1681 refresh_limit = 0;
1682 scrollbar_show (1); 1655 scrollBar.show (1);
1683 } 1656 }
1684 break; 1657 break;
1685 } 1658 }
1686 1659
1687#if defined(CURSOR_BLINK) 1660#if defined(CURSOR_BLINK)
1688 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1661 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1689 { 1662 {
1690 if (hidden_cursor) 1663 if (hidden_cursor)
1691 { 1664 {
1692 hidden_cursor = 0; 1665 hidden_cursor = 0;
1693 want_refresh = 1; 1666 want_refresh = 1;
1694 } 1667 }
1695 1668
1696 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1669 cursor_blink_ev.again ();
1697 } 1670 }
1698#endif 1671#endif
1699 1672
1700#if defined(POINTER_BLANK) 1673#if defined(POINTER_BLANK)
1701 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1674 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1702 { 1675 {
1703 if (ev.type == MotionNotify 1676 if (ev.type == MotionNotify
1704 || ev.type == ButtonPress 1677 || ev.type == ButtonPress
1705 || ev.type == ButtonRelease) 1678 || ev.type == ButtonRelease)
1706 if (hidden_pointer) 1679 if (hidden_pointer)
… …
1708 1681
1709 if (ev.type == KeyPress && hidden_pointer == 0) 1682 if (ev.type == KeyPress && hidden_pointer == 0)
1710 pointer_blank (); 1683 pointer_blank ();
1711 } 1684 }
1712#endif 1685#endif
1686
1687 refresh_check ();
1713} 1688}
1689
1690#if ENABLE_FRILLS
1691void
1692rxvt_term::set_urgency (bool enable)
1693{
1694 if (enable == urgency_hint)
1695 return;
1696
1697 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1698 {
1699 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1700 XSetWMHints (dpy, parent[0], h);
1701 urgency_hint = enable;
1702 }
1703}
1704#endif
1714 1705
1715void 1706void
1716rxvt_term::focus_in () 1707rxvt_term::focus_in ()
1717{ 1708{
1718 if (!focus) 1709 if (!focus)
1719 { 1710 {
1720 focus = 1; 1711 focus = 1;
1721 want_refresh = 1; 1712 want_refresh = 1;
1722 1713
1723 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1724
1725#if USE_XIM 1714#if USE_XIM
1726 if (Input_Context != NULL) 1715 if (Input_Context != NULL)
1727 { 1716 {
1728 IMSetPosition (); 1717 IMSetPosition ();
1729 XSetICFocus (Input_Context); 1718 XSetICFocus (Input_Context);
1730 } 1719 }
1731#endif 1720#endif
1732#if CURSOR_BLINK 1721#if CURSOR_BLINK
1733 if (OPTION (Opt_cursorBlink)) 1722 if (option (Opt_cursorBlink))
1734 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1723 cursor_blink_ev.again ();
1735#endif 1724#endif
1736#if OFF_FOCUS_FADING 1725#if OFF_FOCUS_FADING
1737 if (rs[Rs_fade]) 1726 if (rs[Rs_fade])
1738 { 1727 {
1739 pix_colors = pix_colors_focused; 1728 pix_colors = pix_colors_focused;
1740 scr_recolour (); 1729 scr_recolour ();
1741 } 1730 }
1742#endif 1731#endif
1732#if ENABLE_FRILLS
1733 if (option (Opt_urgentOnBell))
1734 set_urgency (0);
1735#endif
1736
1737 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1743 } 1738 }
1744} 1739}
1745 1740
1746void 1741void
1747rxvt_term::focus_out () 1742rxvt_term::focus_out ()
… …
1749 if (focus) 1744 if (focus)
1750 { 1745 {
1751 focus = 0; 1746 focus = 0;
1752 want_refresh = 1; 1747 want_refresh = 1;
1753 1748
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1749#if ENABLE_FRILLS
1755 1750 if (option (Opt_urgentOnBell))
1751 set_urgency (0);
1752#endif
1756#if ENABLE_FRILLS || ISO_14755 1753#if ENABLE_FRILLS || ISO_14755
1757 if (iso14755buf) 1754 if (iso14755buf)
1758 { 1755 {
1759 iso14755buf = 0; 1756 iso14755buf = 0;
1760# if ENABLE_OVERLAY 1757# if ISO_14755
1761 scr_overlay_off (); 1758 scr_overlay_off ();
1762# endif 1759# endif
1763 } 1760 }
1764#endif 1761#endif
1765#if USE_XIM 1762#if USE_XIM
1766 if (Input_Context != NULL) 1763 if (Input_Context != NULL)
1767 XUnsetICFocus (Input_Context); 1764 XUnsetICFocus (Input_Context);
1768#endif 1765#endif
1769#if CURSOR_BLINK 1766#if CURSOR_BLINK
1770 if (OPTION (Opt_cursorBlink)) 1767 if (option (Opt_cursorBlink))
1771 cursor_blink_ev.stop (); 1768 cursor_blink_ev.stop ();
1769
1772 hidden_cursor = 0; 1770 hidden_cursor = 0;
1773#endif 1771#endif
1774#if OFF_FOCUS_FADING 1772#if OFF_FOCUS_FADING
1775 if (rs[Rs_fade]) 1773 if (rs[Rs_fade])
1776 { 1774 {
1777 pix_colors = pix_colors_unfocused; 1775 pix_colors = pix_colors_unfocused;
1778 scr_recolour (); 1776 scr_recolour ();
1779 } 1777 }
1780#endif 1778#endif
1779
1780 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1781 } 1781 }
1782} 1782}
1783 1783
1784void 1784void
1785rxvt_term::update_fade_color (unsigned int idx) 1785rxvt_term::update_fade_color (unsigned int idx)
… …
1792 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1792 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1793 } 1793 }
1794#endif 1794#endif
1795} 1795}
1796 1796
1797#if TRANSPARENT || ENABLE_PERL 1797#if ENABLE_TRANSPARENCY || ENABLE_PERL
1798void 1798void
1799rxvt_term::rootwin_cb (XEvent &ev) 1799rxvt_term::rootwin_cb (XEvent &ev)
1800{ 1800{
1801 make_current (); 1801 make_current ();
1802 1802
1803 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1803 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1804 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1804 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1805 return; 1805 return;
1806 1806
1807# if TRANSPARENT 1807# if ENABLE_TRANSPARENCY
1808 switch (ev.type) 1808 switch (ev.type)
1809 { 1809 {
1810 case PropertyNotify: 1810 case PropertyNotify:
1811 /* 1811 /*
1812 * if user used some Esetroot compatible prog to set the root bg, 1812 * if user used some Esetroot compatible prog to set the root bg,
1813 * use the property to determine the pixmap. We use it later on. 1813 * use the property to determine the pixmap. We use it later on.
1814 */ 1814 */
1815 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1815 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1816 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1816 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1817 return; 1817 {
1818 bgPixmap.set_root_pixmap ();
1819 update_background ();
1820 }
1818 1821
1819 /* FALLTHROUGH */
1820 case ReparentNotify:
1821 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1822 want_refresh = want_full_refresh = 1;
1823 break; 1822 break;
1824 } 1823 }
1825# endif 1824# endif
1825
1826 refresh_check ();
1826} 1827}
1827#endif 1828#endif
1828 1829
1829void 1830void
1830rxvt_term::button_press (XButtonEvent &ev) 1831rxvt_term::button_press (XButtonEvent &ev)
… …
1885 mouse_report (ev); 1886 mouse_report (ev);
1886 } 1887 }
1887#else 1888#else
1888 MEvent.button = ev.button; 1889 MEvent.button = ev.button;
1889 mouse_report (ev); 1890 mouse_report (ev);
1890#endif /* MOUSE_REPORT_DOUBLECLICK */ 1891#endif /* MOUSE_REPORT_DOUBLECLICK */
1891 1892
1892 } 1893 }
1893 else 1894 else
1894 { 1895 {
1895 if (ev.button != MEvent.button) 1896 if (ev.button != MEvent.button)
… …
1943 } 1944 }
1944 1945
1945 /* 1946 /*
1946 * Scrollbar window processing of button press 1947 * Scrollbar window processing of button press
1947 */ 1948 */
1948 if (isScrollbarWindow (ev.window)) 1949 if (scrollBar.state && ev.window == scrollBar.win)
1949 { 1950 {
1950 scrollBar.setIdle (); 1951 page_dirn direction = NO_DIR;
1952
1953 if (scrollBar.upButton (ev.y))
1954 direction = UP; /* up */
1955 else if (scrollBar.dnButton (ev.y))
1956 direction = DN; /* down */
1957
1958 scrollBar.state = STATE_IDLE;
1951 /* 1959 /*
1952 * Rxvt-style scrollbar: 1960 * Rxvt-style scrollbar:
1953 * move up if mouse is above slider 1961 * move up if mouse is above slider
1954 * move dn if mouse is below slider 1962 * move dn if mouse is below slider
1955 * 1963 *
… …
1964 /* 1972 /*
1965 * Mouse report disabled scrollbar: 1973 * Mouse report disabled scrollbar:
1966 * arrow buttons - send up/down 1974 * arrow buttons - send up/down
1967 * click on scrollbar - send pageup/down 1975 * click on scrollbar - send pageup/down
1968 */ 1976 */
1969 if ((scrollBar.style == R_SB_NEXT 1977 if (direction == UP)
1970 && scrollbarnext_upButton (ev.y))
1971 || (scrollBar.style == R_SB_RXVT
1972 && scrollbarrxvt_upButton (ev.y)))
1973 tt_printf ("\033[A"); 1978 tt_printf ("\033[A");
1974 else if ((scrollBar.style == R_SB_NEXT 1979 else if (direction == DN)
1975 && scrollbarnext_dnButton (ev.y))
1976 || (scrollBar.style == R_SB_RXVT
1977 && scrollbarrxvt_dnButton (ev.y)))
1978 tt_printf ("\033[B"); 1980 tt_printf ("\033[B");
1979 else 1981 else
1980 switch (ev.button) 1982 switch (ev.button)
1981 { 1983 {
1982 case Button2: 1984 case Button2:
… …
1989 tt_printf ("\033[5~"); 1991 tt_printf ("\033[5~");
1990 break; 1992 break;
1991 } 1993 }
1992 } 1994 }
1993 else 1995 else
1994#endif /* NO_SCROLLBAR_REPORT */ 1996#endif /* NO_SCROLLBAR_REPORT */
1995
1996 {
1997 char upordown = 0;
1998
1999 if (scrollBar.style == R_SB_NEXT)
2000 { 1997 {
2001 if (scrollbarnext_upButton (ev.y)) 1998 if (direction != NO_DIR)
2002 upordown = -1; /* up */
2003 else if (scrollbarnext_dnButton (ev.y))
2004 upordown = 1; /* down */
2005 }
2006 else if (scrollBar.style == R_SB_RXVT)
2007 {
2008 if (scrollbarrxvt_upButton (ev.y))
2009 upordown = -1; /* up */
2010 else if (scrollbarrxvt_dnButton (ev.y))
2011 upordown = 1; /* down */
2012 }
2013 if (upordown)
2014 { 1999 {
2015#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2000#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2001 if (!cont_scroll_ev.is_active ())
2016 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2002 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2017#endif 2003#endif
2018 if (scr_page (upordown < 0 ? UP : DN, 1)) 2004 if (scr_page (direction, 1))
2019 { 2005 {
2020 if (upordown < 0) 2006 if (direction == UP)
2021 scrollBar.setUp (); 2007 scrollBar.state = STATE_UP;
2022 else 2008 else
2023 scrollBar.setDn (); 2009 scrollBar.state = STATE_DOWN;
2024 } 2010 }
2025 } 2011 }
2026 else 2012 else
2027 switch (ev.button) 2013 switch (ev.button)
2028 { 2014 {
2029 case Button2: 2015 case Button2:
2030 switch (scrollbar_align) 2016 switch (scrollBar.align)
2031 { 2017 {
2032 case R_SB_ALIGN_TOP: 2018 case R_SB_ALIGN_TOP:
2033 csrO = 0; 2019 csrO = 0;
2034 break; 2020 break;
2035 case R_SB_ALIGN_CENTRE: 2021 case R_SB_ALIGN_CENTRE:
… …
2041 } 2027 }
2042 2028
2043 if (scrollBar.style == R_SB_XTERM 2029 if (scrollBar.style == R_SB_XTERM
2044 || scrollbar_above_slider (ev.y) 2030 || scrollbar_above_slider (ev.y)
2045 || scrollbar_below_slider (ev.y)) 2031 || scrollbar_below_slider (ev.y))
2046 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2032 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2047 2033
2048 scrollBar.setMotion (); 2034 scrollBar.state = STATE_MOTION;
2049 break; 2035 break;
2050 2036
2051 case Button1: 2037 case Button1:
2052 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2038 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2053 csrO = ev.y - scrollBar.top; 2039 csrO = ev.y - scrollBar.top;
2054 /* FALLTHROUGH */ 2040 /* FALLTHROUGH */
2055 2041
2056 case Button3: 2042 case Button3:
2057 if (scrollBar.style != R_SB_XTERM) 2043 if (scrollBar.style != R_SB_XTERM)
… …
2067 scr_page (DN, nrow - 1); 2053 scr_page (DN, nrow - 1);
2068# else 2054# else
2069 scr_page (DN, nrow / 4); 2055 scr_page (DN, nrow / 4);
2070# endif 2056# endif
2071 else 2057 else
2072 scrollBar.setMotion (); 2058 scrollBar.state = STATE_MOTION;
2073 } 2059 }
2074 else 2060 else
2075 { 2061 {
2076 scr_page ((ev.button == Button1 ? DN : UP), 2062 scr_page ((ev.button == Button1 ? DN : UP),
2077 (nrow 2063 (nrow
2078 * scrollbar_position (ev.y) 2064 * scrollbar_position (ev.y)
2079 / scrollbar_size ())); 2065 / scrollBar.size ()));
2080 } 2066 }
2081 2067
2082 break; 2068 break;
2083 } 2069 }
2084 } 2070 }
… …
2094 2080
2095 csrO = 0; /* reset csr Offset */ 2081 csrO = 0; /* reset csr Offset */
2096 if (!bypass_keystate) 2082 if (!bypass_keystate)
2097 reportmode = !! (priv_modes & PrivMode_mouse_report); 2083 reportmode = !! (priv_modes & PrivMode_mouse_report);
2098 2084
2099 if (scrollbar_isUpDn ()) 2085 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2100 { 2086 {
2101 scrollBar.setIdle (); 2087 scrollBar.state = STATE_IDLE;
2102 scrollbar_show (0); 2088 scrollBar.show (0);
2103 } 2089 }
2104 2090
2105#ifdef SELECTION_SCROLLING 2091#ifdef SELECTION_SCROLLING
2106 if (sel_scroll_ev.active)
2107 sel_scroll_ev.stop(); 2092 sel_scroll_ev.stop();
2108#endif 2093#endif
2109 2094
2110 if (ev.window == vt) 2095 if (ev.window == vt)
2111 { 2096 {
2112 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2097 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2136 mouse_report (ev); 2121 mouse_report (ev);
2137 } 2122 }
2138#else /* MOUSE_REPORT_DOUBLECLICK */ 2123#else /* MOUSE_REPORT_DOUBLECLICK */
2139 MEvent.button = AnyButton; 2124 MEvent.button = AnyButton;
2140 mouse_report (ev); 2125 mouse_report (ev);
2141#endif /* MOUSE_REPORT_DOUBLECLICK */ 2126#endif /* MOUSE_REPORT_DOUBLECLICK */
2142 return; 2127 return;
2143 } 2128 }
2144 2129
2145 /* 2130 /*
2146 * dumb hack to compensate for the failure of click-and-drag 2131 * dumb hack to compensate for the failure of click-and-drag
… …
2158 selection_make (ev.time); 2143 selection_make (ev.time);
2159 break; 2144 break;
2160 2145
2161 case Button2: 2146 case Button2:
2162 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2147 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2163 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2148 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2164 break; 2149 break;
2165 2150
2166#ifdef MOUSE_WHEEL 2151#ifdef MOUSE_WHEEL
2167 case Button4: 2152 case Button4:
2168 case Button5: 2153 case Button5:
… …
2172 2157
2173 v = ev.button == Button4 ? UP : DN; 2158 v = ev.button == Button4 ? UP : DN;
2174 2159
2175 if (ev.state & ShiftMask) 2160 if (ev.state & ShiftMask)
2176 i = 1; 2161 i = 1;
2177 else if (OPTION (Opt_mouseWheelScrollPage)) 2162 else if (option (Opt_mouseWheelScrollPage))
2178 i = nrow - 1; 2163 i = nrow - 1;
2179 else 2164 else
2180 i = 5; 2165 i = 5;
2181 2166
2182# ifdef MOUSE_SLIP_WHEELING 2167# ifdef MOUSE_SLIP_WHEELING
… …
2184 { 2169 {
2185 mouse_slip_wheel_speed += v ? -1 : 1; 2170 mouse_slip_wheel_speed += v ? -1 : 1;
2186 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2171 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2187 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2172 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2188 2173
2189 if (slip_wheel_ev.at < NOW) 2174 if (!slip_wheel_ev.is_active ())
2190 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2175 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2191
2192 slip_wheel_ev.start ();
2193 } 2176 }
2194 else 2177 else
2178# endif
2195 { 2179 {
2196# endif
2197 scr_page (v, i); 2180 scr_page (v, i);
2198 scrollbar_show (1); 2181 scrollBar.show (1);
2199# ifdef MOUSE_SLIP_WHEELING
2200 } 2182 }
2201# endif
2202 } 2183 }
2203 break; 2184 break;
2204#endif 2185#endif
2205 } 2186 }
2206 } 2187 }
2207} 2188}
2208 2189
2209#ifdef TRANSPARENT
2210#if TINTING
2211/* taken from aterm-0.4.2 */
2212
2213typedef uint32_t RUINT32T;
2214
2215void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2216{
2217 int sh_r, sh_g, sh_b;
2218 RUINT32T mask_r, mask_g, mask_b;
2219 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2220 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2221 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2222 int i;
2223
2224 Visual *visual = term->visual;
2225
2226 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2227
2228 /* for convenience */
2229 mask_r = visual->red_mask;
2230 mask_g = visual->green_mask;
2231 mask_b = visual->blue_mask;
2232
2233 /* boring lookup table pre-initialization */
2234 switch (srcImage->bits_per_pixel) {
2235 case 15:
2236 if ((mask_r != 0x7c00) ||
2237 (mask_g != 0x03e0) ||
2238 (mask_b != 0x001f))
2239 return;
2240 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2241 lookup_r = lookup;
2242 lookup_g = lookup+32;
2243 lookup_b = lookup+32+32;
2244 sh_r = 10;
2245 sh_g = 5;
2246 sh_b = 0;
2247 break;
2248 case 16:
2249 if ((mask_r != 0xf800) ||
2250 (mask_g != 0x07e0) ||
2251 (mask_b != 0x001f))
2252 return;
2253 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2254 lookup_r = lookup;
2255 lookup_g = lookup+32;
2256 lookup_b = lookup+32+64;
2257 sh_r = 11;
2258 sh_g = 5;
2259 sh_b = 0;
2260 break;
2261 case 24:
2262 if ((mask_r != 0xff0000) ||
2263 (mask_g != 0x00ff00) ||
2264 (mask_b != 0x0000ff))
2265 return;
2266 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2267 lookup_r = lookup;
2268 lookup_g = lookup+256;
2269 lookup_b = lookup+256+256;
2270 sh_r = 16;
2271 sh_g = 8;
2272 sh_b = 0;
2273 break;
2274 case 32:
2275 if ((mask_r != 0xff0000) ||
2276 (mask_g != 0x00ff00) ||
2277 (mask_b != 0x0000ff))
2278 return;
2279 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2280 lookup_r = lookup;
2281 lookup_g = lookup+256;
2282 lookup_b = lookup+256+256;
2283 sh_r = 16;
2284 sh_g = 8;
2285 sh_b = 0;
2286 break;
2287 default:
2288 return; /* we do not support this color depth */
2289 }
2290
2291 /* prepare limits for color transformation (each channel is handled separately) */
2292 if (shade < 0) {
2293 shade = -shade;
2294 if (shade < 0) shade = 0;
2295 if (shade > 100) shade = 100;
2296
2297 lower_lim_r = 65535-rm;
2298 lower_lim_g = 65535-gm;
2299 lower_lim_b = 65535-bm;
2300
2301 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2302 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2303 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2304
2305 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2306 } else {
2307 if (shade < 0) shade = 0;
2308 if (shade > 100) shade = 100;
2309
2310 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2311
2312 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2313 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2314 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2315 }
2316
2317 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2318 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2319 {
2320 unsigned int tmp;
2321
2322 tmp = lower_lim_r;
2323 lower_lim_r = lower_lim_b;
2324 lower_lim_b = tmp;
2325
2326 tmp = upper_lim_r;
2327 upper_lim_r = upper_lim_b;
2328 upper_lim_b = tmp;
2329 }
2330
2331 /* fill our lookup tables */
2332 for (i = 0; i <= mask_r>>sh_r; i++)
2333 {
2334 RUINT32T tmp;
2335 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2336 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2337 lookup_r[i] = (tmp/65535)<<sh_r;
2338 }
2339 for (i = 0; i <= mask_g>>sh_g; i++)
2340 {
2341 RUINT32T tmp;
2342 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2343 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2344 lookup_g[i] = (tmp/65535)<<sh_g;
2345 }
2346 for (i = 0; i <= mask_b>>sh_b; i++)
2347 {
2348 RUINT32T tmp;
2349 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2350 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2351 lookup_b[i] = (tmp/65535)<<sh_b;
2352 }
2353
2354 /* apply table to input image (replacing colors by newly calculated ones) */
2355 switch (srcImage->bits_per_pixel)
2356 {
2357 case 15:
2358 {
2359 unsigned short *p1, *pf, *p, *pl;
2360 p1 = (unsigned short *) srcImage->data;
2361 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2362 while (p1 < pf)
2363 {
2364 p = p1;
2365 pl = p1 + srcImage->width;
2366 for (; p < pl; p++)
2367 {
2368 *p = lookup_r[(*p & 0x7c00)>>10] |
2369 lookup_g[(*p & 0x03e0)>> 5] |
2370 lookup_b[(*p & 0x001f)];
2371 }
2372 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2373 }
2374 break;
2375 }
2376 case 16:
2377 {
2378 unsigned short *p1, *pf, *p, *pl;
2379 p1 = (unsigned short *) srcImage->data;
2380 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2381 while (p1 < pf)
2382 {
2383 p = p1;
2384 pl = p1 + srcImage->width;
2385 for (; p < pl; p++)
2386 {
2387 *p = lookup_r[(*p & 0xf800)>>11] |
2388 lookup_g[(*p & 0x07e0)>> 5] |
2389 lookup_b[(*p & 0x001f)];
2390 }
2391 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2392 }
2393 break;
2394 }
2395 case 24:
2396 {
2397 unsigned char *p1, *pf, *p, *pl;
2398 p1 = (unsigned char *) srcImage->data;
2399 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2400 while (p1 < pf)
2401 {
2402 p = p1;
2403 pl = p1 + srcImage->width * 3;
2404 for (; p < pl; p += 3)
2405 {
2406 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2407 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2408 p[2] = lookup_r[(p[2] & 0x0000ff)];
2409 }
2410 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2411 }
2412 break;
2413 }
2414 case 32:
2415 {
2416 RUINT32T *p1, *pf, *p, *pl;
2417 p1 = (RUINT32T *) srcImage->data;
2418 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2419
2420 while (p1 < pf)
2421 {
2422 p = p1;
2423 pl = p1 + srcImage->width;
2424 for (; p < pl; p++)
2425 {
2426 *p = lookup_r[(*p & 0xff0000)>>16] |
2427 lookup_g[(*p & 0x00ff00)>> 8] |
2428 lookup_b[(*p & 0x0000ff)] |
2429 (*p & ~0xffffff);
2430 }
2431 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2432 }
2433 break;
2434 }
2435 }
2436
2437 free (lookup);
2438}
2439#endif
2440
2441/*
2442 * Check our parents are still who we think they are.
2443 * Do transparency updates if required
2444 */
2445int
2446rxvt_term::check_our_parents ()
2447{
2448 int i, pchanged, aformat, have_pixmap, rootdepth;
2449 unsigned long nitems, bytes_after;
2450 Atom atype;
2451 unsigned char *prop = NULL;
2452 Window root, oldp, *list;
2453 Pixmap rootpixmap = None;
2454 XWindowAttributes wattr, wrootattr;
2455
2456 pchanged = 0;
2457
2458 if (!OPTION (Opt_transparent))
2459 return pchanged; /* Don't try any more */
2460
2461 XGetWindowAttributes (dpy, display->root, &wrootattr);
2462 rootdepth = wrootattr.depth;
2463
2464 XGetWindowAttributes (dpy, parent[0], &wattr);
2465
2466 if (rootdepth != wattr.depth)
2467 {
2468 if (am_transparent)
2469 {
2470 pchanged = 1;
2471 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2472 am_transparent = am_pixmap_trans = 0;
2473 }
2474
2475 return pchanged; /* Don't try any more */
2476 }
2477
2478 /* Get all X ops out of the queue so that our information is up-to-date. */
2479 XSync (dpy, False);
2480
2481 /*
2482 * Make the frame window set by the window manager have
2483 * the root background. Some window managers put multiple nested frame
2484 * windows for each client, so we have to take care about that.
2485 */
2486 i = (xa[XA_XROOTPMAP_ID]
2487 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2488 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2489 &nitems, &bytes_after, &prop) == Success);
2490
2491 if (!i || prop == NULL)
2492 i = (xa[XA_ESETROOT_PMAP_ID]
2493 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2494 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2495 &nitems, &bytes_after, &prop) == Success);
2496
2497 if (!i || prop == NULL
2498#if TINTING
2499 || !ISSET_PIXCOLOR (Color_tint)
2500#endif
2501 )
2502 have_pixmap = 0;
2503 else
2504 {
2505 have_pixmap = 1;
2506 rootpixmap = *(Pixmap *)prop;
2507 XFree (prop);
2508 }
2509
2510 if (have_pixmap)
2511 {
2512 /*
2513 * Copy display->root pixmap transparency
2514 */
2515 int sx, sy, nx, ny;
2516 unsigned int nw, nh;
2517 Window cr;
2518 XImage *image;
2519 GC gc;
2520 XGCValues gcvalue;
2521
2522 XTranslateCoordinates (dpy, parent[0], display->root,
2523 0, 0, &sx, &sy, &cr);
2524 nw = (unsigned int)szHint.width;
2525 nh = (unsigned int)szHint.height;
2526 nx = ny = 0;
2527
2528 if (sx < 0)
2529 {
2530 nw += sx;
2531 nx = -sx;
2532 sx = 0;
2533 }
2534
2535 if (sy < 0)
2536 {
2537 nh += sy;
2538 ny = -sy;
2539 sy = 0;
2540 }
2541
2542 min_it (nw, (unsigned int) (wrootattr.width - sx));
2543 min_it (nh, (unsigned int) (wrootattr.height - sy));
2544
2545 XSync (dpy, False);
2546 allowedxerror = -1;
2547 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2548
2549 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2550 /* XXX: may need a delay here? */
2551 allowedxerror = 0;
2552
2553 if (image == NULL)
2554 {
2555 if (am_transparent && am_pixmap_trans)
2556 {
2557 pchanged = 1;
2558 if (pixmap != None)
2559 {
2560 XFreePixmap (dpy, pixmap);
2561 pixmap = None;
2562 }
2563 }
2564
2565 am_pixmap_trans = 0;
2566 }
2567 else
2568 {
2569 if (pixmap != None)
2570 XFreePixmap (dpy, pixmap);
2571
2572#if TINTING
2573 if (ISSET_PIXCOLOR (Color_tint))
2574 {
2575 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2576
2577 rgba c;
2578 pix_colors_focused [Color_tint].get (c);
2579
2580 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2581 }
2582#endif
2583
2584 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2585 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2586 XPutImage (dpy, pixmap, gc, image, 0, 0,
2587 nx, ny, image->width, image->height);
2588 XFreeGC (dpy, gc);
2589 XDestroyImage (image);
2590 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2591 XClearWindow (dpy, parent[0]);
2592
2593 if (!am_transparent || !am_pixmap_trans)
2594 pchanged = 1;
2595
2596 am_transparent = am_pixmap_trans = 1;
2597 }
2598 }
2599
2600 if (am_pixmap_trans)
2601 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2602 else
2603 {
2604 unsigned int n;
2605 /*
2606 * InheritPixmap transparency
2607 */
2608 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2609 {
2610 oldp = parent[i];
2611 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2612 XFree (list);
2613
2614 if (parent[i] == display->root)
2615 {
2616 if (oldp != None)
2617 pchanged = 1;
2618
2619 break;
2620 }
2621
2622 if (oldp != parent[i])
2623 pchanged = 1;
2624 }
2625
2626 n = 0;
2627
2628 if (pchanged)
2629 for (; n < (unsigned int)i; n++)
2630 {
2631 XGetWindowAttributes (dpy, parent[n], &wattr);
2632
2633 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2634 {
2635 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2636 break;
2637 }
2638 }
2639
2640 if (n > (sizeof (parent) / sizeof (parent[0])))
2641 {
2642 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2643 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2644 am_transparent = 0;
2645 /* XXX: also turn off Opt_transparent? */
2646 }
2647 else
2648 {
2649 for (n = 0; n < (unsigned int)i; n++)
2650 {
2651 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2652 XClearWindow (dpy, parent[n]);
2653 }
2654
2655 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2656 am_transparent = 1;
2657 }
2658
2659 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2660 parent[i] = None;
2661 }
2662
2663 if (scrollBar.win)
2664 {
2665 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2666 scrollBar.setIdle ();
2667 scrollbar_show (0);
2668 }
2669
2670 if (am_transparent)
2671 {
2672 want_refresh = want_full_refresh = 1;
2673 if (am_pixmap_trans)
2674 flush ();
2675 }
2676
2677 return pchanged;
2678}
2679#endif
2680
2681/*}}} */ 2190/*}}} */
2682 2191
2683bool 2192void
2684rxvt_term::cmd_parse () 2193rxvt_term::cmd_parse ()
2685{ 2194{
2686 bool flag = false;
2687 wchar_t ch = NOCHAR; 2195 wchar_t ch = NOCHAR;
2688 char *seq_begin; // remember start of esc-sequence here 2196 char *seq_begin; // remember start of esc-sequence here
2689 2197
2690 for (;;) 2198 for (;;)
2691 { 2199 {
2692 if (ch == NOCHAR) 2200 if (expect_false (ch == NOCHAR))
2693 { 2201 {
2694 seq_begin = cmdbuf_ptr; 2202 seq_begin = cmdbuf_ptr;
2695 ch = next_char (); 2203 ch = next_char ();
2696 2204
2697 if (ch == NOCHAR) 2205 if (ch == NOCHAR)
2698 break; 2206 break;
2699 } 2207 }
2700 2208
2701 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2209 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2702 { 2210 {
2703 if (!seen_input) 2211 if (expect_false (!seen_input))
2704 { 2212 {
2705 seen_input = 1; 2213 seen_input = 1;
2706 // many badly-written programs (e.g. jed) contain a race condition: 2214 // many badly-written programs (e.g. jed) contain a race condition:
2707 // they first read the screensize and then install a SIGWINCH handler. 2215 // they first read the screensize and then install a SIGWINCH handler.
2708 // some window managers resize the window early, and these programs 2216 // some window managers resize the window early, and these programs
… …
2721 wchar_t *str = buf; 2229 wchar_t *str = buf;
2722 wchar_t *eol = str + min (ncol, UBUFSIZ); 2230 wchar_t *eol = str + min (ncol, UBUFSIZ);
2723 2231
2724 for (;;) 2232 for (;;)
2725 { 2233 {
2726 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2234 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2727 break; 2235 break;
2728 2236
2729 *str++ = ch; 2237 *str++ = ch;
2730 2238
2731 if (ch == C0_LF || str >= eol) 2239 if (expect_false (ch == C0_LF || str >= eol))
2732 { 2240 {
2733 if (ch == C0_LF) 2241 if (ch == C0_LF)
2734 nlines++; 2242 nlines++;
2735 2243
2736 refresh_count++; 2244 refresh_count++;
2737 2245
2738 if (!OPTION (Opt_jumpScroll) 2246 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2739 || (refresh_count >= refresh_limit * (nrow - 1)))
2740 { 2247 {
2741 refreshnow = true;
2742 refresh_count = 0; 2248 refresh_count = 0;
2249
2250 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2251 {
2252 refreshnow = true;
2743 ch = NOCHAR; 2253 ch = NOCHAR;
2744 break; 2254 break;
2255 }
2745 } 2256 }
2746 2257
2747 // scr_add_lines only works for nlines <= nrow - 1. 2258 // scr_add_lines only works for nlines <= nrow - 1.
2748 if (nlines >= nrow - 1) 2259 if (nlines >= nrow - 1)
2749 { 2260 {
… …
2777 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2288 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2778 scr_add_lines (buf, str - buf, nlines); 2289 scr_add_lines (buf, str - buf, nlines);
2779 2290
2780 /* 2291 /*
2781 * If there have been a lot of new lines, then update the screen 2292 * If there have been a lot of new lines, then update the screen
2782 * What the heck I'll cheat and only refresh less than every page-full. 2293 * What the heck we'll cheat and only refresh less than every page-full.
2783 * the number of pages between refreshes is refresh_limit, which 2294 * if skipScroll is enabled.
2784 * is incremented here because we must be doing flat-out scrolling.
2785 */ 2295 */
2786 if (refreshnow) 2296 if (refreshnow)
2787 { 2297 {
2788 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2789 refresh_limit++;
2790 else
2791 {
2792 flag = true;
2793 //TODO: due to popular request, implement "skipscroll" option here
2794 scr_refresh (); 2298 scr_refresh ();
2795 want_refresh = 1; 2299 want_refresh = 1;
2796 }
2797 } 2300 }
2798
2799 } 2301 }
2800 else 2302 else
2801 { 2303 {
2802 try 2304 try
2803 { 2305 {
… …
2811 } 2313 }
2812 2314
2813 ch = NOCHAR; 2315 ch = NOCHAR;
2814 } 2316 }
2815 } 2317 }
2816
2817 return flag;
2818} 2318}
2819 2319
2820// read the next character 2320// read the next character
2821wchar_t 2321wchar_t
2822rxvt_term::next_char () NOTHROW 2322rxvt_term::next_char () NOTHROW
2823{ 2323{
2824 while (cmdbuf_ptr < cmdbuf_endp) 2324 while (cmdbuf_ptr < cmdbuf_endp)
2825 { 2325 {
2826 // assume 7-bit to be ascii ALWAYS 2326 // assume 7-bit to be ascii ALWAYS
2827 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2327 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2828 return *cmdbuf_ptr++; 2328 return *cmdbuf_ptr++;
2829 2329
2830 wchar_t wc; 2330 wchar_t wc;
2831 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2331 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2832 2332
… …
2836 cmdbuf_ptr = cmdbuf_endp; 2336 cmdbuf_ptr = cmdbuf_endp;
2837 break; 2337 break;
2838 } 2338 }
2839 2339
2840 if (len == (size_t)-1) 2340 if (len == (size_t)-1)
2341 {
2342 mbstate.reset (); // reset now undefined conversion state
2841 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2343 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2344 }
2842 2345
2843 // assume wchar == unicode 2346 // assume wchar == unicode
2844 cmdbuf_ptr += len; 2347 cmdbuf_ptr += len;
2845 return wc & UNICODE_MASK; 2348 return wc & UNICODE_MASK;
2846 } 2349 }
… …
2890/*----------------------------------------------------------------------*/ 2393/*----------------------------------------------------------------------*/
2891#ifdef PRINTPIPE 2394#ifdef PRINTPIPE
2892FILE * 2395FILE *
2893rxvt_term::popen_printer () 2396rxvt_term::popen_printer ()
2894{ 2397{
2895 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2398 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2896 2399
2897 if (stream == NULL) 2400 if (stream == NULL)
2898 rxvt_warn ("can't open printer pipe, not printing.\n"); 2401 rxvt_warn ("can't open printer pipe, not printing.\n");
2899 2402
2900 return stream; 2403 return stream;
… …
2911 * simulate attached vt100 printer 2414 * simulate attached vt100 printer
2912 */ 2415 */
2913void 2416void
2914rxvt_term::process_print_pipe () 2417rxvt_term::process_print_pipe ()
2915{ 2418{
2916 int done; 2419 FILE *fd = popen_printer ();
2917 FILE *fd;
2918 2420
2919 if ((fd = popen_printer ()) == NULL) 2421 if (!fd)
2920 return; 2422 return;
2921 2423
2922 /* 2424 /*
2923 * Send all input to the printer until either ESC[4i or ESC[?4i 2425 * Send all input to the printer until either ESC[4i or ESC[?4i
2924 * is received. 2426 * is received.
2925 */ 2427 */
2926 for (done = 0; !done;) 2428 for (int done = 0; !done; )
2927 { 2429 {
2928 unsigned char buf[8]; 2430 unsigned char buf[8];
2929 unicode_t ch; 2431 unicode_t ch;
2930 unsigned int i, len; 2432 unsigned int i, len;
2931 2433
… …
2950 { 2452 {
2951 if ((buf[len++] = cmd_getc ()) == 'i') 2453 if ((buf[len++] = cmd_getc ()) == 'i')
2952 break; /* done = 1 */ 2454 break; /* done = 1 */
2953 } 2455 }
2954 } 2456 }
2955 2457
2956 for (i = 0; i < len; i++) 2458 for (i = 0; i < len; i++)
2957 if (putc (buf[i], fd) == EOF) 2459 if (putc (buf[i], fd) == EOF)
2958 { 2460 {
2959 done = 1; 2461 done = 1;
2960 break; 2462 break;
… …
2962 } 2464 }
2963 } 2465 }
2964 2466
2965 pclose_printer (fd); 2467 pclose_printer (fd);
2966} 2468}
2967#endif /* PRINTPIPE */ 2469#endif /* PRINTPIPE */
2968/*}}} */ 2470/*}}} */
2969 2471
2970/* *INDENT-OFF* */ 2472/* *INDENT-OFF* */
2971enum { 2473enum {
2972 C1_40 = 0x40, 2474 C1_40 = 0x40,
… …
3022 process_dcs_seq (); 2524 process_dcs_seq ();
3023 break; 2525 break;
3024 case 0x9b: /* CSI */ 2526 case 0x9b: /* CSI */
3025 process_csi_seq (); 2527 process_csi_seq ();
3026 break; 2528 break;
3027 case 0x9d: /* CSI */ 2529 case 0x9d: /* OSC */
3028 process_osc_seq (); 2530 process_osc_seq ();
3029 break; 2531 break;
3030#endif 2532#endif
3031 } 2533 }
3032} 2534}
… …
3076 break; 2578 break;
3077 case 'Z': /* identify the terminal type */ 2579 case 'Z': /* identify the terminal type */
3078 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2580 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3079 break; 2581 break;
3080 case '<': /* turn off VT52 mode */ 2582 case '<': /* turn off VT52 mode */
3081 PrivMode (0, PrivMode_vt52); 2583 set_privmode (PrivMode_vt52, 0);
3082 break; 2584 break;
3083 case 'F': /* use special graphics character set */ 2585 case 'F': /* use special graphics character set */
3084 case 'G': /* use regular character set */ 2586 case 'G': /* use regular character set */
3085 /* unimplemented */ 2587 /* unimplemented */
3086 break; 2588 break;
… …
3140 scr_forwardindex (); 2642 scr_forwardindex ();
3141 break; 2643 break;
3142#endif 2644#endif
3143 case '=': 2645 case '=':
3144 case '>': 2646 case '>':
3145 PrivMode ((ch == '='), PrivMode_aplKP); 2647 set_privmode (PrivMode_aplKP, ch == '=');
3146 break; 2648 break;
3147 2649
3148 case C1_40: 2650 case C1_40:
3149 cmd_getc (); 2651 cmd_getc ();
3150 break; 2652 break;
… …
3189 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2691 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3190 case C1_SCI: /* ESC Z */ 2692 case C1_SCI: /* ESC Z */
3191 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2693 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3192 break; /* steal obsolete ESC [ c */ 2694 break; /* steal obsolete ESC [ c */
3193 2695
3194 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2696 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3195 case C1_CSI: /* ESC [ */ 2697 case C1_CSI: /* ESC [ */
3196 process_csi_seq (); 2698 process_csi_seq ();
3197 break; 2699 break;
3198 2700
3199 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2701 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3200 case C1_OSC: /* ESC ] */ 2702 case C1_OSC: /* ESC ] */
3201 process_osc_seq (); 2703 process_osc_seq ();
3202 break; 2704 break;
3203 2705
3204 /* 8.3.106: RESET TO INITIAL STATE */ 2706 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3205 case 'c': 2707 case 'c':
3206 mbstate.reset (); 2708 mbstate.reset ();
3207 scr_poweron (); 2709 scr_poweron ();
3208 scrollbar_show (1); 2710 scrollBar.show (1);
3209 break; 2711 break;
3210 2712
3211 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2713 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3212 case 'n': 2714 case 'n':
3213 scr_charset_choose (2); 2715 scr_charset_choose (2);
… …
3258rxvt_term::process_csi_seq () 2760rxvt_term::process_csi_seq ()
3259{ 2761{
3260 unicode_t ch, priv, i; 2762 unicode_t ch, priv, i;
3261 unsigned int nargs, p; 2763 unsigned int nargs, p;
3262 int n, ndef; 2764 int n, ndef;
3263 int arg[ESC_ARGS]; 2765 int arg[ESC_ARGS] = { };
3264 2766
3265 for (nargs = ESC_ARGS; nargs > 0;) 2767 nargs = 0;
3266 arg[--nargs] = 0;
3267 2768
3268 priv = 0; 2769 priv = 0;
3269 ch = cmd_getc (); 2770 ch = cmd_getc ();
3270 if (ch >= '<' && ch <= '?') 2771 if ((ch >= '<' && ch <= '?') || ch == '!')
2772 {
3271 { /* '<' '=' '>' '?' */ 2773 /* '<' '=' '>' '?' '!' */
3272 priv = ch; 2774 priv = ch;
3273 ch = cmd_getc (); 2775 ch = cmd_getc ();
3274 } 2776 }
3275 2777
3276 /* read any numerical arguments */ 2778 /* read any numerical arguments */
… …
3315 switch (priv) 2817 switch (priv)
3316 { 2818 {
3317 case '>': 2819 case '>':
3318 if (ch == CSI_DA) /* secondary device attributes */ 2820 if (ch == CSI_DA) /* secondary device attributes */
3319 { 2821 {
3320 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2822 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3321 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2823 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3322 // 2824 //
3323 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2825 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3324 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2826 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3325 // that we do not support xterm mouse reporting (should be 95 when we do). 2827 // versions.
3326 // 2828 //
3327 tt_printf ("\033[>%d;94;0c", 'U'); 2829 tt_printf ("\033[>%d;95;0c", 'U');
3328 } 2830 }
3329 break; 2831 break;
2832
3330 case '?': 2833 case '?':
3331 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3332 process_terminal_mode (ch, priv, nargs, arg); 2835 process_terminal_mode (ch, priv, nargs, arg);
3333 break; 2836 break;
2837
2838 case '!':
2839 if (ch == CSI_70)
2840 {
2841 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2842 scr_soft_reset ();
2843
2844 static const int pm_h[] = { 7, 25 };
2845 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2846
2847 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2848 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
3334 } 2849 }
2850 break;
2851 }
2852
3335 return; 2853 return;
3336 } 2854 }
3337 2855
3338 switch (ch) 2856 switch (ch)
3339 { 2857 {
… …
3459 break; 2977 break;
3460 case 6: /* CPR requested */ 2978 case 6: /* CPR requested */
3461 scr_report_position (); 2979 scr_report_position ();
3462 break; 2980 break;
3463 case 7: /* unofficial extension */ 2981 case 7: /* unofficial extension */
3464 if (OPTION (Opt_insecure)) 2982 if (option (Opt_insecure))
3465 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2983 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3466 break; 2984 break;
3467 case 8: /* unofficial extension */ 2985 case 8: /* unofficial extension */
3468 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2986 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3469 break; 2987 break;
… …
3633 break; 3151 break;
3634 case 20: /* report icon label */ 3152 case 20: /* report icon label */
3635 { 3153 {
3636 char *s; 3154 char *s;
3637 XGetIconName (dpy, parent[0], &s); 3155 XGetIconName (dpy, parent[0], &s);
3638 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3156 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3639 XFree (s); 3157 XFree (s);
3640 } 3158 }
3641 break; 3159 break;
3642 case 21: /* report window title */ 3160 case 21: /* report window title */
3643 { 3161 {
3644 char *s; 3162 char *s;
3645 XFetchName (dpy, parent[0], &s); 3163 XFetchName (dpy, parent[0], &s);
3646 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3164 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3647 XFree (s); 3165 XFree (s);
3648 } 3166 }
3649 break; 3167 break;
3650 } 3168 }
3651} 3169}
… …
3768 3286
3769/* 3287/*
3770 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3288 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3771 */ 3289 */
3772void 3290void
3773rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3291rxvt_term::process_xterm_seq (int op, char *str, char resp)
3774{ 3292{
3775 int color; 3293 int color;
3776 char *buf, *name; 3294 char *buf, *name;
3777 bool query = str[0] == '?' && !str[1]; 3295 bool query = str[0] == '?' && !str[1];
3778 int saveop = op; 3296 int saveop = op;
3779 3297
3780 dLocal (Display *, dpy); 3298 dLocal (Display *, dpy);
3781 3299
3782 assert (str != NULL); 3300 assert (str != NULL);
3783 3301
3784 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3302 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3785 return; 3303 return;
3786 3304
3787 switch (op) 3305 switch (op)
3788 { 3306 {
… …
3819 3337
3820 XFree (value); 3338 XFree (value);
3821 } 3339 }
3822 else 3340 else
3823 { 3341 {
3824 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3342 char *eq = strchr (str, '=');
3825 3343
3826 if (eq) 3344 if (eq)
3827 { 3345 {
3828 *eq = 0; 3346 *eq = 0;
3829 set_utf8_property (display->atom (str), eq + 1); 3347 set_utf8_property (display->atom (str), eq + 1);
… …
3850 *buf++ = '\0'; 3368 *buf++ = '\0';
3851 3369
3852 process_color_seq (op, color, name, resp); 3370 process_color_seq (op, color, name, resp);
3853 } 3371 }
3854 break; 3372 break;
3373 case Rxvt_restoreFG:
3855 case XTerm_Color00: 3374 case XTerm_Color00:
3856 process_color_seq (op, Color_fg, str, resp); 3375 process_color_seq (op, Color_fg, str, resp);
3857 break; 3376 break;
3377 case Rxvt_restoreBG:
3858 case XTerm_Color01: 3378 case XTerm_Color01:
3859 process_color_seq (op, Color_bg, str, resp); 3379 process_color_seq (op, Color_bg, str, resp);
3860 break; 3380 break;
3861#ifndef NO_CURSORCOLOR 3381#ifndef NO_CURSORCOLOR
3862 case XTerm_Color_cursor: 3382 case XTerm_Color_cursor:
… …
3883 break; 3403 break;
3884 case URxvt_Color_IT: 3404 case URxvt_Color_IT:
3885 process_color_seq (op, Color_IT, str, resp); 3405 process_color_seq (op, Color_IT, str, resp);
3886 break; 3406 break;
3887#endif 3407#endif
3888#if TRANSPARENT && TINTING 3408 case URxvt_Color_border:
3409 process_color_seq (op, Color_border, str, resp);
3410 break;
3411#if ENABLE_TRANSPARENCY
3889 case URxvt_Color_tint: 3412 case URxvt_Color_tint:
3890 process_color_seq (op, Color_tint, str, resp); 3413 process_color_seq (op, Color_tint, str, resp);
3414 {
3415 bool changed = false;
3891 3416
3892 check_our_parents (); 3417 if (ISSET_PIXCOLOR (Color_tint))
3418 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3419 else
3420 changed = bgPixmap.unset_tint ();
3893 3421
3894 if (am_transparent) 3422 if (changed)
3895 want_full_refresh = want_refresh = 1; 3423 update_background ();
3424 }
3896 3425
3897 break; 3426 break;
3898#endif 3427#endif
3899 3428
3429#if BG_IMAGE_FROM_FILE
3900 case Rxvt_Pixmap: 3430 case Rxvt_Pixmap:
3901 { 3431 if (!strcmp (str, "?"))
3902 if (*str != ';')
3903 { 3432 {
3904#if XPM_BACKGROUND 3433 char str[256];
3905 scale_pixmap (""); /* reset to default scaling */ 3434
3906 set_bgPixmap (str); /* change pixmap */ 3435 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3907 scr_touch (true); 3436 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3908#endif 3437 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3438 process_xterm_seq (XTerm_title, str, CHAR_ST);
3909 } 3439 }
3910 3440 else
3441 {
3911 int changed = 0; 3442 int changed = 0;
3912 3443
3913 while ((str = strchr (str, ';')) != NULL) 3444 if (*str != ';')
3914 { 3445 {
3446 /* reset to default scaling :*/
3447 bgPixmap.unset_geometry ();
3448 if (bgPixmap.set_file (str)) /* change pixmap */
3449 changed++;
3450 str = strchr (str, ';');
3451 if (str == NULL)
3452 bgPixmap.set_defaultGeometry ();
3453 }
3454
3455 while (str)
3456 {
3915 str++; 3457 str++;
3916#if XPM_BACKGROUND 3458 if (bgPixmap.set_geometry (str))
3917 changed += scale_pixmap (str); 3459 changed++;
3918#endif 3460 str = strchr (str, ';');
3919 } 3461 }
3920 3462
3921 if (changed) 3463 if (changed)
3922 { 3464 update_background ();
3923#ifdef XPM_BACKGROUND
3924 resize_pixmap ();
3925 scr_touch (true);
3926#endif
3927 } 3465 }
3928 }
3929 break; 3466 break;
3930 3467#endif
3931 case Rxvt_restoreFG:
3932 set_window_color (Color_fg, str);
3933 break;
3934 case Rxvt_restoreBG:
3935 set_window_color (Color_bg, str);
3936 break;
3937 3468
3938 case XTerm_logfile: 3469 case XTerm_logfile:
3939 // TODO, when secure mode? 3470 // TODO, when secure mode?
3940 break; 3471 break;
3941 3472
… …
3959 case URxvt_italicFont: 3490 case URxvt_italicFont:
3960 case URxvt_boldItalicFont: 3491 case URxvt_boldItalicFont:
3961#endif 3492#endif
3962 if (query) 3493 if (query)
3963 tt_printf ("\33]%d;%-.250s%c", saveop, 3494 tt_printf ("\33]%d;%-.250s%c", saveop,
3964 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3495 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3965 ? fontset[op - URxvt_font]->fontdesc : "", 3496 ? fontset[op - URxvt_font]->fontdesc : "",
3966 resp); 3497 resp);
3967 else 3498 else
3968 { 3499 {
3969 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3500 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3983 break; 3514 break;
3984 3515
3985#if !ENABLE_MINIMAL 3516#if !ENABLE_MINIMAL
3986 case URxvt_locale: 3517 case URxvt_locale:
3987 if (query) 3518 if (query)
3988 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3519 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3989 else 3520 else
3990 { 3521 {
3991 set_locale (str); 3522 set_locale (str);
3992 pty->set_utf8_mode (enc_utf8); 3523 pty->set_utf8_mode (enc_utf8);
3993 init_xlocale (); 3524 init_xlocale ();
… …
4008 break; 3539 break;
4009#endif 3540#endif
4010 3541
4011#if ENABLE_PERL 3542#if ENABLE_PERL
4012 case URxvt_perl: 3543 case URxvt_perl:
4013 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3544 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
4014 ; // no responses yet
4015 break; 3545 break;
4016#endif 3546#endif
4017 } 3547 }
4018} 3548}
4019/*----------------------------------------------------------------------*/ 3549/*----------------------------------------------------------------------*/
… …
4042 { 3572 {
4043 if (mode == 'r') 3573 if (mode == 'r')
4044 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3574 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4045 else 3575 else
4046 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3576 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4047 PrivMode (state, bit); 3577 set_privmode (bit, state);
4048 } 3578 }
4049 3579
4050 return state; 3580 return state;
4051} 3581}
4052 3582
… …
4056{ 3586{
4057 unsigned int i, j; 3587 unsigned int i, j;
4058 int state; 3588 int state;
4059 3589
4060 static const struct 3590 static const struct
4061 { 3591 {
4062 const int argval; 3592 const int argval;
4063 const unsigned long bit; 3593 const unsigned long bit;
4064 }
4065
4066 argtopriv[] = { 3594 } argtopriv[] = {
4067 { 1, PrivMode_aplCUR }, 3595 { 1, PrivMode_aplCUR }, // DECCKM
4068 { 2, PrivMode_vt52 }, 3596 { 2, PrivMode_vt52 },
4069 { 3, PrivMode_132 }, 3597 { 3, PrivMode_132 }, // DECCOLM
4070 { 4, PrivMode_smoothScroll }, 3598 { 4, PrivMode_smoothScroll }, // DECSCLM
4071 { 5, PrivMode_rVideo }, 3599 { 5, PrivMode_rVideo }, // DECSCNM
4072 { 6, PrivMode_relOrigin }, 3600 { 6, PrivMode_relOrigin }, // DECOM
4073 { 7, PrivMode_Autowrap }, 3601 { 7, PrivMode_Autowrap }, // DECAWM
4074 // 8, bi-directional support mode 3602 // 8, auto-repeat keys // DECARM
4075 { 9, PrivMode_MouseX10 }, 3603 { 9, PrivMode_MouseX10 },
4076 // 18, 19 printing-related 3604 // 18 end FF to printer after print screen
3605 // 19 Print screen prints full screen/scorll region
4077 { 25, PrivMode_VisibleCursor }, 3606 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4078#ifdef scrollBar_esc 3607#ifdef scrollBar_esc
4079 { scrollBar_esc, PrivMode_scrollBar }, 3608 { scrollBar_esc, PrivMode_scrollBar },
4080#endif 3609#endif
4081 { 35, PrivMode_ShiftKeys }, // rxvt extension 3610 { 35, PrivMode_ShiftKeys }, // rxvt extension
3611 // 38, tektronix mode // DECTEK
4082 { 40, PrivMode_132OK }, 3612 { 40, PrivMode_132OK },
4083 // 41 xterm more fixes NYI 3613 // 41 xterm more fixes NYI
4084 // 45 margin bell NYI 3614 // 45 margin bell NYI
4085 // 46 start logging 3615 // 46 start logging
4086 { 47, PrivMode_Screen }, 3616 { 47, PrivMode_Screen },
4087 { 66, PrivMode_aplKP }, 3617 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4088#ifndef NO_BACKSPACE_KEY 3618#ifndef NO_BACKSPACE_KEY
4089 { 67, PrivMode_BackSpace }, 3619 { 67, PrivMode_BackSpace }, // DECBKM
4090#endif 3620#endif
4091 { 1000, PrivMode_MouseX11 }, 3621 { 1000, PrivMode_MouseX11 },
4092 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3622 { 1002, PrivMode_MouseBtnEvent },
4093 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3623 { 1003, PrivMode_MouseAnyEvent },
4094 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4095 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3624 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4096 { 1011, PrivMode_Keypress }, // rxvt extension 3625 { 1011, PrivMode_Keypress }, // rxvt extension
4097 // 1035 enable modifiers for alt, numlock NYI 3626 // 1035 enable modifiers for alt, numlock NYI
4098 // 1036 send ESC for meta keys NYI 3627 // 1036 send ESC for meta keys NYI
4099 // 1037 send DEL for keypad delete NYI 3628 // 1037 send DEL for keypad delete NYI
4100 { 1047, PrivMode_Screen }, 3629 { 1047, PrivMode_Screen },
4101 // 1048 save and restore cursor 3630 // 1048 save and restore cursor
4102 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3631 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4103 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3632 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3633 { 2004, PrivMode_BracketPaste },
4104 }; 3634 };
4105 3635
4106 if (nargs == 0) 3636 if (nargs == 0)
4107 return; 3637 return;
4108 3638
… …
4133 3663
4134 scr_touch (true); 3664 scr_touch (true);
4135 break; 3665 break;
4136#endif 3666#endif
4137 case 1048: /* alternative cursor save */ 3667 case 1048: /* alternative cursor save */
4138 case 1049:
4139 if (OPTION (Opt_secondaryScreen)) 3668 if (option (Opt_secondaryScreen))
4140 if (mode == 0) 3669 if (mode == 0)
4141 scr_cursor (RESTORE); 3670 scr_cursor (RESTORE);
4142 else if (mode == 1) 3671 else if (mode == 1)
4143 scr_cursor (SAVE); 3672 scr_cursor (SAVE);
4144 break; 3673 break;
… …
4152 case 2: /* VT52 mode */ 3681 case 2: /* VT52 mode */
4153 /* oddball mode. should be set regardless of set/reset 3682 /* oddball mode. should be set regardless of set/reset
4154 * parameter. Return from VT52 mode with an ESC < from 3683 * parameter. Return from VT52 mode with an ESC < from
4155 * within VT52 mode 3684 * within VT52 mode
4156 */ 3685 */
4157 PrivMode (1, PrivMode_vt52); 3686 set_privmode (PrivMode_vt52, 1);
4158 break; 3687 break;
4159 case 3: /* 80/132 */ 3688 case 3: /* 80/132 */
4160 if (priv_modes & PrivMode_132OK) 3689 if (priv_modes & PrivMode_132OK)
4161 set_widthheight (((state ? 132 : 80) * fwidth), height); 3690 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4162 break; 3691 break;
4163 case 4: /* smooth scrolling */ 3692 case 4: /* smooth scrolling */
4164 set_option (Opt_jumpScroll, !state); 3693 set_option (Opt_jumpScroll, !state);
4165 break; 3694 break;
4166 case 5: /* reverse video */ 3695 case 5: /* reverse video */
… …
4173 scr_autowrap (state); 3702 scr_autowrap (state);
4174 break; 3703 break;
4175 /* case 8: - auto repeat, can't do on a per window basis */ 3704 /* case 8: - auto repeat, can't do on a per window basis */
4176 case 9: /* X10 mouse reporting */ 3705 case 9: /* X10 mouse reporting */
4177 if (state) /* orthogonal */ 3706 if (state) /* orthogonal */
4178 priv_modes &= ~PrivMode_MouseX11; 3707 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4179 break; 3708 break;
4180#ifdef scrollBar_esc 3709#ifdef scrollBar_esc
4181 case scrollBar_esc: 3710 case scrollBar_esc:
4182 if (scrollbar_mapping (state)) 3711 if (scrollBar.map (state))
4183 { 3712 {
4184 resize_all_windows (0, 0, 0); 3713 resize_all_windows (0, 0, 0);
4185 scr_touch (true); 3714 scr_touch (true);
4186 } 3715 }
4187 break; 3716 break;
… …
4196 break; 3725 break;
4197 /* case 66: - application key pad */ 3726 /* case 66: - application key pad */
4198 /* case 67: - backspace key */ 3727 /* case 67: - backspace key */
4199 case 1000: /* X11 mouse reporting */ 3728 case 1000: /* X11 mouse reporting */
4200 if (state) /* orthogonal */ 3729 if (state) /* orthogonal */
4201 priv_modes &= ~PrivMode_MouseX10; 3730 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4202 break; 3731 break;
4203#if 0
4204 case 1001: 3732 case 1002:
4205 break; /* X11 mouse highlighting */ 3733 case 1003:
4206#endif 3734 if (state)
3735 {
3736 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3737 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3738 vt_emask_mouse = PointerMotionMask;
3739 }
3740 else
3741 vt_emask_mouse = NoEventMask;
3742
3743 vt_select_input ();
3744 break;
4207 case 1010: /* scroll to bottom on TTY output inhibit */ 3745 case 1010: /* scroll to bottom on TTY output inhibit */
4208 set_option (Opt_scrollTtyOutput, !state); 3746 set_option (Opt_scrollTtyOutput, !state);
4209 break; 3747 break;
4210 case 1011: /* scroll to bottom on key press */ 3748 case 1011: /* scroll to bottom on key press */
4211 set_option (Opt_scrollTtyKeypress, state); 3749 set_option (Opt_scrollTtyKeypress, state);
4212 break; 3750 break;
4213 case 1047: /* secondary screen w/ clearing last */ 3751 case 1047: /* secondary screen w/ clearing last */
4214 if (OPTION (Opt_secondaryScreen)) 3752 if (option (Opt_secondaryScreen))
4215 if (current_screen != PRIMARY) 3753 if (!state)
4216 scr_erase_screen (2); 3754 scr_erase_screen (2);
3755
4217 scr_change_screen (state); 3756 scr_change_screen (state);
4218 break; 3757 break;
4219 case 1049: /* secondary screen w/ clearing first */ 3758 case 1049: /* secondary screen w/ clearing first */
3759 if (option (Opt_secondaryScreen))
3760 if (state)
3761 scr_cursor (SAVE);
3762
4220 scr_change_screen (state); 3763 scr_change_screen (state);
3764
4221 if (OPTION (Opt_secondaryScreen)) 3765 if (option (Opt_secondaryScreen))
4222 if (current_screen != PRIMARY) 3766 if (state)
4223 scr_erase_screen (2); 3767 scr_erase_screen (2);
3768 else
3769 scr_cursor (RESTORE);
4224 break; 3770 break;
4225 default: 3771 default:
4226 break; 3772 break;
4227 } 3773 }
4228 } 3774 }
… …
4388rxvt_term::process_graphics () 3934rxvt_term::process_graphics ()
4389{ 3935{
4390 unicode_t ch, cmd = cmd_getc (); 3936 unicode_t ch, cmd = cmd_getc ();
4391 3937
4392 if (cmd == 'Q') 3938 if (cmd == 'Q')
3939 {
4393 { /* query graphics */ 3940 /* query graphics */
4394 tt_printf ("\033G0\012"); /* no graphics */ 3941 tt_printf ("\033G0\012"); /* no graphics */
4395 return; 3942 return;
4396 } 3943 }
4397 /* swallow other graphics sequences until terminating ':' */ 3944 /* swallow other graphics sequences until terminating ':' */
4398 do 3945 do
… …
4448 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3995 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4449 3996
4450 memcpy (v_buffer + v_buflen, data, len); 3997 memcpy (v_buffer + v_buflen, data, len);
4451 v_buflen += len; 3998 v_buflen += len;
4452 3999
4453 pty_ev.set (EVENT_READ | EVENT_WRITE); 4000 pty_ev.set (ev::READ | ev::WRITE);
4454} 4001}
4455 4002
4456void rxvt_term::pty_write () 4003void rxvt_term::pty_write ()
4457{ 4004{
4458 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4005 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4463 4010
4464 if (v_buflen == 0) 4011 if (v_buflen == 0)
4465 { 4012 {
4466 free (v_buffer); 4013 free (v_buffer);
4467 v_buffer = 0; 4014 v_buffer = 0;
4468 v_buflen = 0;
4469 4015
4470 pty_ev.set (EVENT_READ); 4016 pty_ev.set (ev::READ);
4471 return; 4017 return;
4472 } 4018 }
4473 4019
4474 memmove (v_buffer, v_buffer + written, v_buflen); 4020 memmove (v_buffer, v_buffer + written, v_buflen);
4475 } 4021 }
4476 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4022 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4477 pty_ev.set (EVENT_READ); 4023 pty_ev.set (ev::READ);
4478} 4024}
4479 4025
4480/*----------------------- end-of-file (C source) -----------------------*/ 4026/*----------------------- end-of-file (C source) -----------------------*/
4481 4027

Diff Legend

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