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.320 by root, Mon Apr 30 15:07:09 2007 UTC vs.
Revision 1.438 by root, Thu Feb 4 21:55:12 2010 UTC

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

Diff Legend

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