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.304 by root, Tue Jan 31 22:01:25 2006 UTC vs.
Revision 1.414 by ayin, Tue Feb 19 10:47:03 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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
303/*{{{ Convert the keypress event into a string */ 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
304void 398void
305rxvt_term::lookup_key (XKeyEvent &ev) 399rxvt_term::key_press (XKeyEvent &ev)
306{ 400{
307 int ctrl, meta, shft, len; 401 int ctrl, meta, shft, len;
308 unsigned int newlen;
309 KeySym keysym; 402 KeySym keysym;
310 int valid_keysym; 403 int valid_keysym;
311 char kbuf[KBUFSZ]; 404 char kbuf[KBUFSZ];
405
406#if ISO_14755
407 if (iso14755buf & ISO_14755_52)
408 return;
409#endif
312 410
313 /* 411 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 412 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 413 * escape sequence to toggle the Keypad.
316 * 414 *
… …
321 meta = ev.state & ModMetaMask; 419 meta = ev.state & ModMetaMask;
322 420
323 if (numlock_state || (ev.state & ModNumLockMask)) 421 if (numlock_state || (ev.state & ModNumLockMask))
324 { 422 {
325 numlock_state = (ev.state & ModNumLockMask); 423 numlock_state = (ev.state & ModNumLockMask);
326 PrivMode ((!numlock_state), PrivMode_aplKP); 424 set_privmode (PrivMode_aplKP, !numlock_state);
327 } 425 }
328 426
329 kbuf[0] = 0; 427 kbuf[0] = 0;
330 428
331#ifdef USE_XIM 429#ifdef USE_XIM
… …
496# if ISO_14755 594# if ISO_14755
497 iso14755_51 (0); 595 iso14755_51 (0);
498# endif 596# endif
499 return; 597 return;
500 } 598 }
599 else if (keysym == XK_BackSpace)
600 {
601 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
602# if ISO_14755
603 iso14755_51 (iso14755buf & ISO_14755_MASK);
604# endif
605 return;
606 }
501 else if ((hv = hex_keyval (ev)) >= 0) 607 else if ((hv = hex_keyval (ev)) >= 0)
502 { 608 {
503 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 609 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
504 | hv | ISO_14755_51; 610 | hv | ISO_14755_51;
505# if ISO_14755 611# if ISO_14755
… …
507# endif 613# endif
508 return; 614 return;
509 } 615 }
510 else 616 else
511 { 617 {
512# if ENABLE_OVERLAY 618# if ISO_14755
513 scr_overlay_off (); 619 scr_overlay_off ();
514# endif 620# endif
515 iso14755buf = 0; 621 iso14755buf = 0;
516 } 622 }
517 } 623 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 626 if (!(iso14755buf & ISO_14755_STARTED))
521 { 627 {
522 iso14755buf |= ISO_14755_STARTED; 628 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 629# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 631 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 632# endif
527 } 633 }
528#endif 634#endif
529 635
530#ifdef PRINTPIPE 636#ifdef PRINTPIPE
531 if (keysym == XK_Print) 637 if (keysym == XK_Print)
532 { 638 {
533 scr_printscreen (ctrl | shft); 639 scr_printscreen (ctrl | shft);
534 return; 640 return;
535 } 641 }
536#endif 642#endif
537 643
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 644 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 { 645 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1;
648
649 switch (translate_keypad (keysym, kp))
540 { 650 {
651#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace)
654 {
655 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
656 ^ !!ctrl) ? '\b' : '\177';
657 kbuf[1] = '\0';
658 }
659 else
660 strcpy (kbuf, rs[Rs_backspace_key]);
661 break;
662#endif
663#ifndef NO_DELETE_KEY
664 case XK_Delete:
665 strcpy (kbuf, rs[Rs_delete_key]);
666 break;
667#endif
668 case XK_Tab:
669 if (shft)
670 strcpy (kbuf, "\033[Z");
671 else
672 {
673#ifdef CTRL_TAB_MAKES_META
674 if (ctrl)
675 meta = 1;
676#endif
677#ifdef MOD4_TAB_MAKES_META
678 if (ev.state & Mod4Mask)
679 meta = 1;
680#endif
541 newlen = 1; 681 newlen = 0;
542 switch (keysym) 682 }
683 break;
684
685 case XK_Up: /* "\033[A" */
686 case XK_Down: /* "\033[B" */
687 case XK_Right: /* "\033[C" */
688 case XK_Left: /* "\033[D" */
689 strcpy (kbuf, "\033[Z");
690 kbuf[2] = "DACB"[keysym - XK_Left];
691 /* do Shift first */
692 if (shft)
693 kbuf[2] = "dacb"[keysym - XK_Left];
694 else if (ctrl)
695 {
696 kbuf[1] = 'O';
697 kbuf[2] = "dacb"[keysym - XK_Left];
698 }
699 else if (priv_modes & PrivMode_aplCUR)
700 kbuf[1] = 'O';
701 break;
702
703 case XK_KP_Enter:
704 /* allow shift to override */
705 if (kp)
706 {
707 strcpy (kbuf, "\033OM");
708 break;
709 }
710
711 /* FALLTHROUGH */
712
713 case XK_Return:
714 if (priv_modes & PrivMode_LFNL)
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\012';
718 kbuf[2] = '\0';
719 }
720 else
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\0';
724 }
725 break;
726
727 case XK_KP_F1: /* "\033OP" */
728 case XK_KP_F2: /* "\033OQ" */
729 case XK_KP_F3: /* "\033OR" */
730 case XK_KP_F4: /* "\033OS" */
731 strcpy (kbuf, "\033OP");
732 kbuf[2] += (keysym - XK_KP_F1);
733 break;
734
735 case XK_KP_Multiply: /* "\033Oj" : "*" */
736 case XK_KP_Add: /* "\033Ok" : "+" */
737 case XK_KP_Separator: /* "\033Ol" : "," */
738 case XK_KP_Subtract: /* "\033Om" : "-" */
739 case XK_KP_Decimal: /* "\033On" : "." */
740 case XK_KP_Divide: /* "\033Oo" : "/" */
741 case XK_KP_0: /* "\033Op" : "0" */
742 case XK_KP_1: /* "\033Oq" : "1" */
743 case XK_KP_2: /* "\033Or" : "2" */
744 case XK_KP_3: /* "\033Os" : "3" */
745 case XK_KP_4: /* "\033Ot" : "4" */
746 case XK_KP_5: /* "\033Ou" : "5" */
747 case XK_KP_6: /* "\033Ov" : "6" */
748 case XK_KP_7: /* "\033Ow" : "7" */
749 case XK_KP_8: /* "\033Ox" : "8" */
750 case XK_KP_9: /* "\033Oy" : "9" */
751 /* allow shift to override */
752 if (kp)
753 {
754 strcpy (kbuf, "\033Oj");
755 kbuf[2] += (keysym - XK_KP_Multiply);
756 }
757 else
758 {
759 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
760 kbuf[1] = '\0';
761 }
762 break;
763
764 default:
543 { 765 {
544#ifndef NO_BACKSPACE_KEY 766 int param = map_function_key (keysym);
545 case XK_BackSpace: 767 if (param > 0)
546 if (priv_modes & PrivMode_HaveBackSpace) 768 sprintf (kbuf,"\033[%d~", param);
547 {
548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
549 ^ !!ctrl) ? '\b' : '\177';
550 kbuf[1] = '\0';
551 }
552 else 769 else
553 strcpy (kbuf, key_backspace);
554 break;
555#endif
556#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 {
562 strcpy (kbuf, "\033On");
563 break;
564 }
565 /* FALLTHROUGH */
566# endif
567 case XK_Delete:
568 strcpy (kbuf, key_delete);
569 break;
570#endif
571 case XK_Tab:
572 if (shft)
573 strcpy (kbuf, "\033[Z");
574 else
575 {
576#ifdef CTRL_TAB_MAKES_META
577 if (ctrl)
578 meta = 1;
579#endif
580#ifdef MOD4_TAB_MAKES_META
581 if (ev.state & Mod4Mask)
582 meta = 1;
583#endif
584 newlen = 0;
585 }
586 break;
587
588#ifdef XK_KP_Left
589 case XK_KP_Up: /* \033Ox or standard */
590 case XK_KP_Down: /* \033Or or standard */
591 case XK_KP_Right: /* \033Ov or standard */
592 case XK_KP_Left: /* \033Ot or standard */
593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
594 {
595 strcpy (kbuf, "\033OZ");
596 kbuf[2] = "txvr"[keysym - XK_KP_Left];
597 break;
598 }
599 else
600 /* translate to std. cursor key */
601 keysym = XK_Left + (keysym - XK_KP_Left);
602 /* FALLTHROUGH */
603#endif
604 case XK_Up: /* "\033[A" */
605 case XK_Down: /* "\033[B" */
606 case XK_Right: /* "\033[C" */
607 case XK_Left: /* "\033[D" */
608 strcpy (kbuf, "\033[Z");
609 kbuf[2] = "DACB"[keysym - XK_Left];
610 /* do Shift first */
611 if (shft)
612 kbuf[2] = "dacb"[keysym - XK_Left];
613 else if (ctrl)
614 {
615 kbuf[1] = 'O';
616 kbuf[2] = "dacb"[keysym - XK_Left];
617 }
618 else if (priv_modes & PrivMode_aplCUR)
619 kbuf[1] = 'O';
620 break;
621
622#ifndef UNSHIFTED_SCROLLKEYS
623# ifdef XK_KP_Prior
624 case XK_KP_Prior:
625 /* allow shift to override */
626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
627 {
628 strcpy (kbuf, "\033Oy");
629 break;
630 }
631 /* FALLTHROUGH */
632# endif
633 case XK_Prior:
634 strcpy (kbuf, "\033[5~");
635 break;
636# ifdef XK_KP_Next
637 case XK_KP_Next:
638 /* allow shift to override */
639 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
640 {
641 strcpy (kbuf, "\033Os");
642 break;
643 }
644 /* FALLTHROUGH */
645# endif
646 case XK_Next:
647 strcpy (kbuf, "\033[6~");
648 break;
649#endif
650 case XK_KP_Enter:
651 /* allow shift to override */
652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
653 {
654 strcpy (kbuf, "\033OM");
655 break;
656 }
657
658 /* FALLTHROUGH */
659
660 case XK_Return:
661 if (priv_modes & PrivMode_LFNL)
662 {
663 kbuf[0] = '\015';
664 kbuf[1] = '\012';
665 kbuf[2] = '\0';
666 }
667 else
668 {
669 kbuf[0] = '\015';
670 kbuf[1] = '\0';
671 }
672 break;
673
674#ifdef XK_KP_Begin
675 case XK_KP_Begin:
676 strcpy (kbuf, "\033Ou");
677 break;
678
679#endif
680 case XK_KP_F1: /* "\033OP" */
681 case XK_KP_F2: /* "\033OQ" */
682 case XK_KP_F3: /* "\033OR" */
683 case XK_KP_F4: /* "\033OS" */
684 strcpy (kbuf, "\033OP");
685 kbuf[2] += (keysym - XK_KP_F1);
686 break;
687
688 case XK_KP_Multiply: /* "\033Oj" : "*" */
689 case XK_KP_Add: /* "\033Ok" : "+" */
690 case XK_KP_Separator: /* "\033Ol" : "," */
691 case XK_KP_Subtract: /* "\033Om" : "-" */
692 case XK_KP_Decimal: /* "\033On" : "." */
693 case XK_KP_Divide: /* "\033Oo" : "/" */
694 case XK_KP_0: /* "\033Op" : "0" */
695 case XK_KP_1: /* "\033Oq" : "1" */
696 case XK_KP_2: /* "\033Or" : "2" */
697 case XK_KP_3: /* "\033Os" : "3" */
698 case XK_KP_4: /* "\033Ot" : "4" */
699 case XK_KP_5: /* "\033Ou" : "5" */
700 case XK_KP_6: /* "\033Ov" : "6" */
701 case XK_KP_7: /* "\033Ow" : "7" */
702 case XK_KP_8: /* "\033Ox" : "8" */
703 case XK_KP_9: /* "\033Oy" : "9" */
704 /* allow shift to override */
705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
706 {
707 strcpy (kbuf, "\033Oj");
708 kbuf[2] += (keysym - XK_KP_Multiply);
709 }
710 else
711 {
712 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
713 kbuf[1] = '\0';
714 }
715 break;
716
717 case XK_Find:
718 strcpy (kbuf, "\033[1~");
719 break;
720
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
731 case XK_Insert:
732 strcpy (kbuf, "\033[2~");
733 break;
734#ifdef DXK_Remove /* support for DEC remove like key */
735 case DXK_Remove:
736 /* FALLTHROUGH */
737#endif
738 case XK_Execute:
739 strcpy (kbuf, "\033[3~");
740 break;
741 case XK_Select:
742 strcpy (kbuf, "\033[4~");
743 break;
744#ifdef XK_KP_End
745 case XK_KP_End:
746 /* allow shift to override */
747 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
748 {
749 strcpy (kbuf, "\033Oq");
750 break;
751 }
752 /* FALLTHROUGH */
753#endif
754 case XK_End:
755 strcpy (kbuf, KS_END);
756 break;
757#ifdef XK_KP_Home
758 case XK_KP_Home:
759 /* allow shift to override */
760 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
761 {
762 strcpy (kbuf, "\033Ow");
763 break;
764 }
765 /* FALLTHROUGH */
766#endif
767 case XK_Home:
768 strcpy (kbuf, KS_HOME);
769 break;
770
771#define FKEY(n, fkey) \
772 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
773
774 case XK_F1: /* "\033[11~" */
775 case XK_F2: /* "\033[12~" */
776 case XK_F3: /* "\033[13~" */
777 case XK_F4: /* "\033[14~" */
778 case XK_F5: /* "\033[15~" */
779 FKEY (11, XK_F1);
780 break;
781 case XK_F6: /* "\033[17~" */
782 case XK_F7: /* "\033[18~" */
783 case XK_F8: /* "\033[19~" */
784 case XK_F9: /* "\033[20~" */
785 case XK_F10: /* "\033[21~" */
786 FKEY (17, XK_F6);
787 break;
788 case XK_F11: /* "\033[23~" */
789 case XK_F12: /* "\033[24~" */
790 case XK_F13: /* "\033[25~" */
791 case XK_F14: /* "\033[26~" */
792 FKEY (23, XK_F11);
793 break;
794 case XK_F15: /* "\033[28~" */
795 case XK_F16: /* "\033[29~" */
796 FKEY (28, XK_F15);
797 break;
798 case XK_Help: /* "\033[28~" */
799 FKEY (28, XK_Help);
800 break;
801 case XK_Menu: /* "\033[29~" */
802 FKEY (29, XK_Menu);
803 break;
804 case XK_F17: /* "\033[31~" */
805 case XK_F18: /* "\033[32~" */
806 case XK_F19: /* "\033[33~" */
807 case XK_F20: /* "\033[34~" */
808 case XK_F21: /* "\033[35~" */
809 case XK_F22: /* "\033[36~" */
810 case XK_F23: /* "\033[37~" */
811 case XK_F24: /* "\033[38~" */
812 case XK_F25: /* "\033[39~" */
813 case XK_F26: /* "\033[40~" */
814 case XK_F27: /* "\033[41~" */
815 case XK_F28: /* "\033[42~" */
816 case XK_F29: /* "\033[43~" */
817 case XK_F30: /* "\033[44~" */
818 case XK_F31: /* "\033[45~" */
819 case XK_F32: /* "\033[46~" */
820 case XK_F33: /* "\033[47~" */
821 case XK_F34: /* "\033[48~" */
822 case XK_F35: /* "\033[49~" */
823 FKEY (31, XK_F17);
824 break;
825#undef FKEY
826 default:
827 newlen = 0; 770 newlen = 0;
828 break;
829 } 771 }
830 772 break;
831 if (newlen)
832 len = strlen (kbuf);
833 } 773 }
774
775 if (newlen)
776 len = strlen (kbuf);
834 777
835 /* 778 /*
836 * Pass meta for all function keys, if 'meta' option set 779 * Pass meta for all function keys, if 'meta' option set
837 */ 780 */
838#ifdef META8_OPTION 781#ifdef META8_OPTION
… …
873 return; 816 return;
874 817
875 if (len <= 0) 818 if (len <= 0)
876 return; /* not mapped */ 819 return; /* not mapped */
877 820
878 if (OPTION (Opt_scrollTtyKeypress)) 821 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 822 if (view_start)
880 { 823 {
881 view_start = 0; 824 view_start = 0;
882 want_refresh = 1; 825 want_refresh = 1;
883 } 826 }
… …
907 tt_write (&ch, 1); 850 tt_write (&ch, 1);
908 } 851 }
909 852
910 tt_write (kbuf, (unsigned int)len); 853 tt_write (kbuf, (unsigned int)len);
911} 854}
912/*}}} */ 855
856void
857rxvt_term::key_release (XKeyEvent &ev)
858{
859#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
860 KeySym keysym;
861
862 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
863#endif
864
865#if ENABLE_FRILLS || ISO_14755
866 // ISO 14755 support
867 if (iso14755buf)
868 if (iso14755buf & ISO_14755_52)
869 {
870# if ISO_14755
871 scr_overlay_off ();
872# endif
873# if ISO_14755
874 // iso14755 part 5.2 handling: release time
875 // first: controls
876 if ((ev.state & ControlMask)
877 && ((keysym >= 0x40 && keysym <= 0x5f)
878 || (keysym >= 0x61 && keysym <= 0x7f)))
879 {
880 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
881 commit_iso14755 ();
882
883 return;
884 }
885
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
887 if (i[0] == keysym)
888 {
889 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 ();
891
892 return;
893 }
894
895 scr_bell ();
896# endif
897 iso14755buf = 0;
898
899 return;
900 }
901 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
902 {
903# if ISO_14755
904 scr_overlay_off ();
905# endif
906 if (iso14755buf & ISO_14755_51)
907 commit_iso14755 ();
908#if ISO_14755
909 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
910 {
911 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
912
913 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
914 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
915 }
916# endif
917 else
918 iso14755buf = 0;
919 }
920#endif
921
922 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
923 return;
924
925#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
926 if (!(ev.state & ControlMask))
927 slip_wheel_ev.stop ();
928 else if (keysym == XK_Control_L || keysym == XK_Control_R)
929 mouse_slip_wheel_speed = 0;
930#endif
931}
913 932
914#if defined (KEYSYM_RESOURCE) 933#if defined (KEYSYM_RESOURCE)
915unsigned int 934unsigned int
916rxvt_term::cmd_write (const char *str, unsigned int count) 935rxvt_term::cmd_write (const char *str, unsigned int count)
917{ 936{
… …
947void 966void
948rxvt_term::flush () 967rxvt_term::flush ()
949{ 968{
950 flush_ev.stop (); 969 flush_ev.stop ();
951 970
952#ifdef TRANSPARENT 971#ifdef HAVE_BG_PIXMAP
953 if (want_full_refresh) 972 if (bgPixmap.check_clearChanged ())
954 { 973 {
955 want_full_refresh = 0; 974// scr_clear (true); This needs to be researched further!
956 scr_clear ();
957 scr_touch (false); 975 scr_touch (false);
958 } 976 }
959#endif 977#endif
960 978
961 if (want_refresh) 979 if (want_refresh)
… …
997 } 1015 }
998 while (row < end_row); 1016 while (row < end_row);
999 } 1017 }
1000 1018
1001 scr_refresh (); 1019 scr_refresh ();
1002 scrollbar_show (1); 1020 scrollBar.show (1);
1003#ifdef USE_XIM 1021#ifdef USE_XIM
1004 IMSendSpot (); 1022 IMSendSpot ();
1005#endif 1023#endif
1006 } 1024 }
1007 1025
1008 display->flush (); 1026 display->flush ();
1009} 1027}
1010 1028
1029/* checks wether a refresh is requested and starts the refresh timer */
1011void 1030void
1012rxvt_term::check_cb (check_watcher &w) 1031rxvt_term::refresh_check ()
1032{
1033 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1035
1036 display->flush ();
1037}
1038
1039void
1040rxvt_term::flush_cb (ev::timer &w, int revents)
1013{ 1041{
1014 make_current (); 1042 make_current ();
1015 1043
1016 display->flush ();
1017
1018 if (want_refresh && !flush_ev.active)
1019 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1020}
1021
1022void
1023rxvt_term::flush_cb (time_watcher &w)
1024{
1025 make_current ();
1026
1027 refresh_limit = 1;
1028 refresh_count = 0; 1044 refresh_count = 0;
1029 flush (); 1045 flush ();
1030} 1046}
1031 1047
1032#ifdef CURSOR_BLINK 1048#ifdef CURSOR_BLINK
1033void 1049void
1034rxvt_term::cursor_blink_cb (time_watcher &w) 1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1035{ 1051{
1036 hidden_cursor = !hidden_cursor; 1052 hidden_cursor = !hidden_cursor;
1037 want_refresh = 1; 1053 want_refresh = 1;
1038 1054 refresh_check ();
1039 w.start (w.at + CURSOR_BLINK_INTERVAL);
1040} 1055}
1041#endif 1056#endif
1042 1057
1043#ifdef TEXT_BLINK 1058#ifdef TEXT_BLINK
1044void 1059void
1045rxvt_term::text_blink_cb (time_watcher &w) 1060rxvt_term::text_blink_cb (ev::timer &w, int revents)
1046{ 1061{
1047 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1062 if (scr_refresh_rend (RS_Blink, RS_Blink))
1048 { 1063 {
1049 hidden_text = !hidden_text; 1064 hidden_text = !hidden_text;
1050 want_refresh = 1; 1065 want_refresh = 1;
1051 w.start (w.at + TEXT_BLINK_INTERVAL); 1066 refresh_check ();
1052 } 1067 }
1068 else
1069 w.stop ();
1053} 1070}
1054#endif 1071#endif
1055 1072
1056#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1057void 1074void
1058rxvt_term::cont_scroll_cb (time_watcher &w) 1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1059{ 1076{
1060 if ((scrollbar_isUp() || scrollbar_isDn()) && 1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1061 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1062 { 1079 {
1063 want_refresh = 1; 1080 want_refresh = 1;
1064 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1081 refresh_check ();
1065 } 1082 }
1083 else
1084 w.stop ();
1066} 1085}
1067#endif 1086#endif
1068 1087
1069#ifdef SELECTION_SCROLLING 1088#ifdef SELECTION_SCROLLING
1070void 1089void
1071rxvt_term::sel_scroll_cb (time_watcher &w) 1090rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1072{ 1091{
1073 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1092 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1074 { 1093 {
1075 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1094 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1076 want_refresh = 1; 1095 want_refresh = 1;
1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1078 } 1097 }
1098 else
1099 w.stop ();
1079} 1100}
1080#endif 1101#endif
1081 1102
1082#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1083void 1104void
1084rxvt_term::slip_wheel_cb (time_watcher &w) 1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1085{ 1106{
1086 if (mouse_slip_wheel_speed == 0 1107 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1087 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1088 : scr_page (UP, mouse_slip_wheel_speed))
1089 { 1108 {
1090 if (view_start == top_row || view_start == 0)
1091 mouse_slip_wheel_speed = 0;
1092
1093 want_refresh = 1; 1109 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1110 refresh_check ();
1111 }
1112
1113 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1114 {
1115 mouse_slip_wheel_speed = 0;
1116 w.stop ();
1095 } 1117 }
1096} 1118}
1097#endif 1119#endif
1098 1120
1099#if LINUX_YIELD_HACK 1121#if LINUX_YIELD_HACK
1100static struct event_handler 1122static struct event_handler
1101{ 1123{
1102 check_watcher yield_ev; 1124 ev::prepare yield_ev;
1103 1125
1104 void yield_cb (check_watcher &w) 1126 void yield_cb (ev::prepare &w, int revents)
1105 { 1127 {
1106 // this should really be sched_yield(), but the linux guys thought 1128 // this should really be sched_yield(), but the linux guys thought
1107 // that giving a process calling sched_yield () less cpu time than 1129 // that giving a process calling sched_yield () less cpu time than
1108 // ones with high nice levels is a useful thing to do. It surely is is 1130 // ones with high nice levels is a useful thing to do. It surely is is
1109 // allowed by the sus... as is returning ENOSYS. 1131 // allowed by the sus... as is returning ENOSYS.
… …
1152 } 1174 }
1153 else 1175 else
1154 { 1176 {
1155 pty_ev.stop (); 1177 pty_ev.stop ();
1156 1178
1157 if (!OPTION (Opt_hold)) 1179 if (!option (Opt_hold))
1158 destroy (); 1180 destroy ();
1159 } 1181 }
1160 1182
1161 return false; 1183 return false;
1162} 1184}
1163 1185
1164void 1186void
1165rxvt_term::pty_cb (io_watcher &w, short revents) 1187rxvt_term::pty_cb (ev::io &w, int revents)
1166{ 1188{
1167 make_current (); 1189 make_current ();
1168 1190
1169 if (revents & EVENT_READ) 1191 if (revents & ev::READ)
1170 // loop, but don't allow a single term to monopolize us 1192 // loop, but don't allow a single term to monopolize us
1171 while (pty_fill ()) 1193 while (pty_fill ())
1172 if (cmd_parse ()) 1194 if (cmd_parse ())
1173 break; 1195 break;
1174 1196
1175 if (revents & EVENT_WRITE) 1197 if (revents & ev::WRITE)
1176 pty_write (); 1198 pty_write ();
1199
1200 refresh_check ();
1177} 1201}
1178 1202
1179void 1203void
1180rxvt_term::pointer_unblank () 1204rxvt_term::pointer_unblank ()
1181{ 1205{
1182 XDefineCursor (xdisp, vt, TermWin_cursor); 1206 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1207 recolour_cursor ();
1184 1208
1185#ifdef POINTER_BLANK 1209#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1210 hidden_pointer = 0;
1187 1211
1188 if (OPTION (Opt_pointerBlank)) 1212 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1213 pointer_ev.start (pointerBlankDelay);
1190#endif 1214#endif
1191} 1215}
1192 1216
1193#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1194void 1218void
1195rxvt_term::pointer_blank () 1219rxvt_term::pointer_blank ()
1196{ 1220{
1197 if (!OPTION (Opt_pointerBlank)) 1221 if (!option (Opt_pointerBlank))
1198 return; 1222 return;
1199 1223
1200 XDefineCursor (xdisp, vt, display->blank_cursor); 1224 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (xdisp); 1225 XFlush (dpy);
1202 1226
1203 hidden_pointer = 1; 1227 hidden_pointer = 1;
1204} 1228}
1205 1229
1206void 1230void
1207rxvt_term::pointer_cb (time_watcher &w) 1231rxvt_term::pointer_cb (ev::timer &w, int revents)
1208{ 1232{
1209 make_current (); 1233 make_current ();
1210 1234
1211 pointer_blank (); 1235 pointer_blank ();
1212} 1236}
… …
1215void 1239void
1216rxvt_term::mouse_report (XButtonEvent &ev) 1240rxvt_term::mouse_report (XButtonEvent &ev)
1217{ 1241{
1218 int button_number, key_state = 0; 1242 int button_number, key_state = 0;
1219 int x, y; 1243 int x, y;
1244 int code = 32;
1220 1245
1221 x = ev.x; 1246 x = Pixel2Col (ev.x);
1222 y = ev.y; 1247 y = Pixel2Row (ev.y);
1223 pixel_position (&x, &y); 1248 if (ev.type == MotionNotify)
1249 {
1250 if (x == mouse_row && y == mouse_col)
1251 return;
1252 mouse_row = x;
1253 mouse_col = y;
1254 code += 32;
1255 }
1224 1256
1225 if (MEvent.button == AnyButton) 1257 if (MEvent.button == AnyButton)
1226 button_number = 3; 1258 button_number = 3;
1227 else 1259 else
1228 { 1260 {
… …
1274 x + 1, 1306 x + 1,
1275 y + 1); 1307 y + 1);
1276#endif 1308#endif
1277 1309
1278 tt_printf ("\033[M%c%c%c", 1310 tt_printf ("\033[M%c%c%c",
1279 (32 + button_number + key_state), 1311 (code + button_number + key_state),
1280 (32 + x + 1), 1312 (32 + x + 1),
1281 (32 + y + 1)); 1313 (32 + y + 1));
1282} 1314}
1283 1315
1284/*{{{ process an X event */ 1316/*{{{ process an X event */
1285void 1317void
1286rxvt_term::x_cb (XEvent &ev) 1318rxvt_term::x_cb (XEvent &ev)
1287{ 1319{
1288 make_current (); 1320 make_current ();
1289 1321
1290 dLocal (Display *, xdisp); 1322 dLocal (Display *, dpy);
1291 1323
1292 if (ev.xany.window == vt 1324 if (ev.xany.window == vt
1293 && SHOULD_INVOKE (HOOK_X_EVENT) 1325 && SHOULD_INVOKE (HOOK_X_EVENT)
1294 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1326 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1295 return; 1327 return;
… …
1300 unsigned int unused_mask; 1332 unsigned int unused_mask;
1301 1333
1302 switch (ev.type) 1334 switch (ev.type)
1303 { 1335 {
1304 case KeyPress: 1336 case KeyPress:
1305#if ISO_14755 1337 key_press (ev.xkey);
1306 if (!(iso14755buf & ISO_14755_52))
1307#endif
1308 lookup_key (ev.xkey);
1309
1310 break; 1338 break;
1311 1339
1312 case KeyRelease: 1340 case KeyRelease:
1313 { 1341 key_release (ev.xkey);
1314#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1315 KeySym keysym;
1316
1317 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1318#endif
1319
1320#if ENABLE_FRILLS || ISO_14755
1321 // ISO 14755 support
1322 if (iso14755buf)
1323 if (iso14755buf & ISO_14755_52)
1324 {
1325# if ENABLE_OVERLAY
1326 scr_overlay_off ();
1327# endif
1328# if ISO_14755
1329 // iso14755 part 5.2 handling: release time
1330 // first: controls
1331 if ((ev.xkey.state & ControlMask)
1332 && ((keysym >= 0x40 && keysym <= 0x5f)
1333 || (keysym >= 0x61 && keysym <= 0x7f)))
1334 {
1335 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1336 commit_iso14755 ();
1337 goto skip_switch;
1338 }
1339
1340 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1341 if (i[0] == keysym)
1342 {
1343 iso14755buf = ISO_14755_51 | i[1];
1344 commit_iso14755 ();
1345 goto skip_switch;
1346 }
1347
1348 scr_bell ();
1349# endif
1350 iso14755buf = 0;
1351 break;
1352 }
1353 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1354 {
1355# if ENABLE_OVERLAY
1356 scr_overlay_off ();
1357# endif
1358 if (iso14755buf & ISO_14755_51)
1359 commit_iso14755 ();
1360#if ISO_14755
1361 else if (iso14755buf & ISO_14755_STARTED)
1362 {
1363 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1364
1365 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1366 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1367 }
1368# endif
1369 else
1370 iso14755buf = 0;
1371 }
1372#endif
1373
1374 if (ev.xany.window == vt
1375 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1376 break;
1377
1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379 if (!(ev.xkey.state & ControlMask))
1380 slip_wheel_ev.stop ();
1381 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1382 mouse_slip_wheel_speed = 0;
1383#endif
1384 break; 1342 break;
1385 }
1386 1343
1387 case ButtonPress: 1344 case ButtonPress:
1388 button_press (ev.xbutton); 1345 button_press (ev.xbutton);
1389 break; 1346 break;
1390 1347
… …
1405 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1362 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1406 destroy (); 1363 destroy ();
1407 } 1364 }
1408#if ENABLE_EWMH 1365#if ENABLE_EWMH
1409 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1366 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1410 XSendEvent (xdisp, ev.xclient.window = display->root, 1367 XSendEvent (dpy, ev.xclient.window = display->root,
1411 False, SubstructureRedirectMask | SubstructureNotifyMask, 1368 False, SubstructureRedirectMask | SubstructureNotifyMask,
1412 &ev); 1369 &ev);
1413#endif 1370#endif
1414 } 1371 }
1415 } 1372 }
… …
1421 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1378 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1422 focus_out (); 1379 focus_out ();
1423 } 1380 }
1424#endif 1381#endif
1425 } 1382 }
1426 break;
1427
1428 case MappingNotify:
1429 XRefreshKeyboardMapping (&ev.xmapping);
1430 break; 1383 break;
1431 1384
1432 /* 1385 /*
1433 * XXX: this is not the _current_ arrangement 1386 * XXX: this is not the _current_ arrangement
1434 * Here's my conclusion: 1387 * Here's my conclusion:
… …
1453 break; 1406 break;
1454 } 1407 }
1455 break; 1408 break;
1456 1409
1457 case FocusIn: 1410 case FocusIn:
1411 if (ev.xfocus.detail != NotifyInferior
1412 && ev.xfocus.detail != NotifyPointer
1413 && ev.xfocus.mode != NotifyGrab)
1458 focus_in (); 1414 focus_in ();
1459 break; 1415 break;
1460 1416
1461 case FocusOut: 1417 case FocusOut:
1418 if (ev.xfocus.detail != NotifyInferior
1419 && ev.xfocus.detail != NotifyPointer
1420 && ev.xfocus.mode != NotifyGrab)
1462 focus_out (); 1421 focus_out ();
1463 break; 1422 break;
1464 1423
1465 case ConfigureNotify: 1424 case ConfigureNotify:
1425 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1426 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1427 szHint.width, szHint.height);*/
1466 if (ev.xconfigure.window == parent[0]) 1428 if (ev.xconfigure.window == parent[0])
1467 { 1429 {
1468 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1469 ; 1431 ;
1470 1432
1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1472 { 1434 {
1473 seen_resize = 1; 1435 seen_resize = 1;
1474 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1475 } 1437 }
1438 else
1439 {
1440#ifdef HAVE_BG_PIXMAP
1441 if (bgPixmap.window_position_sensitive ())
1442 {
1443 if (mapped)
1444 update_background ();
1445 else
1446 bgPixmap.invalidate ();
1447 }
1448#endif
1449 }
1476 1450
1477 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1478
1479#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1480 if (OPTION (Opt_transparent))
1481 check_our_parents ();
1482#endif
1483 } 1452 }
1484 break; 1453 break;
1485 1454
1486 case PropertyNotify: 1455 case PropertyNotify:
1487 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1456 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1503 case SelectionRequest: 1472 case SelectionRequest:
1504 selection_send (ev.xselectionrequest); 1473 selection_send (ev.xselectionrequest);
1505 break; 1474 break;
1506 1475
1507 case MapNotify: 1476 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a
1479 * non-reparenting window manager. In those cases we never get first
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does
1482 * reparenting.
1483 * We should not render background immidiately, as there could be several
1484 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1485 * by scheduling background redraw as soon as we can, but giving a short
1486 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results.
1489 */
1490 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1491 update_background_ev.start (0.025);
1492#endif
1508 mapped = 1; 1493 mapped = 1;
1509#ifdef TEXT_BLINK 1494#ifdef TEXT_BLINK
1510 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1495 text_blink_ev.start ();
1511#endif 1496#endif
1512 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1497 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1513 break; 1498 break;
1514 1499
1515 case UnmapNotify: 1500 case UnmapNotify:
… …
1517#ifdef TEXT_BLINK 1502#ifdef TEXT_BLINK
1518 text_blink_ev.stop (); 1503 text_blink_ev.stop ();
1519#endif 1504#endif
1520 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1505 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1521 break; 1506 break;
1522
1523#ifdef TRANSPARENT
1524 case ReparentNotify:
1525 rootwin_cb (ev);
1526 break;
1527#endif /* TRANSPARENT */
1528 1507
1529 case GraphicsExpose: 1508 case GraphicsExpose:
1530 case Expose: 1509 case Expose:
1531 if (ev.xany.window == vt) 1510 if (ev.xany.window == vt)
1532 { 1511 {
1533 do 1512 do
1513 {
1534 scr_expose (ev.xexpose.x, ev.xexpose.y, 1514 scr_expose (ev.xexpose.x, ev.xexpose.y,
1535 ev.xexpose.width, ev.xexpose.height, False); 1515 ev.xexpose.width, ev.xexpose.height, False);
1516 }
1536 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1537 1518
1538 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1539 1520
1540 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522 {
1541 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1542 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1525 }
1543 1526
1544 want_refresh = 1; 1527 want_refresh = 1;
1545 } 1528 }
1546 else 1529 else
1547 { 1530 {
1548 XEvent unused_event; 1531 XEvent unused_event;
1549 1532
1550 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1533 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1551 ; 1534 ;
1552 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1553 ; 1536 ;
1554 1537
1555 if (isScrollbarWindow (ev.xany.window)) 1538 if (scrollBar.state && ev.xany.window == scrollBar.win)
1556 { 1539 {
1557 scrollBar.setIdle (); 1540 scrollBar.state = STATE_IDLE;
1558 scrollbar_show (0); 1541 scrollBar.show (0);
1559 } 1542 }
1560
1561#ifdef TRANSPARENT
1562 if (am_transparent && ev.xany.window == parent[0])
1563 XClearWindow (xdisp, ev.xany.window);
1564#endif
1565 } 1543 }
1566 break; 1544 break;
1567 1545
1568 case MotionNotify: 1546 case MotionNotify:
1569#ifdef POINTER_BLANK 1547#ifdef POINTER_BLANK
1570 if (hidden_pointer) 1548 if (hidden_pointer)
1571 pointer_unblank (); 1549 pointer_unblank ();
1572#endif 1550#endif
1551 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1552 || priv_modes & PrivMode_MouseAnyEvent)
1553 mouse_report (ev.xbutton);
1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1554 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1574 break; 1555 break;
1575 1556
1576 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1577 { 1558 {
1578 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1559 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1579 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1560 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1580 ; // nop 1561 ; // nop
1581 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1562 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1582 { 1563 {
1583 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1564 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1584 ; 1565 ;
1585 1566
1586 XQueryPointer (xdisp, vt, 1567 XQueryPointer (dpy, vt,
1587 &unused_root, &unused_child, 1568 &unused_root, &unused_child,
1588 &unused_root_x, &unused_root_y, 1569 &unused_root_x, &unused_root_y,
1589 &ev.xbutton.x, &ev.xbutton.y, 1570 &ev.xbutton.x, &ev.xbutton.y,
1590 &ev.xbutton.state); 1571 &ev.xbutton.state);
1591#ifdef MOUSE_THRESHOLD 1572#ifdef MOUSE_THRESHOLD
… …
1611 int dist; 1592 int dist;
1612 1593
1613 /* don't clobber the current delay if we are 1594 /* don't clobber the current delay if we are
1614 * already in the middle of scrolling. 1595 * already in the middle of scrolling.
1615 */ 1596 */
1616 if (!sel_scroll_ev.active) 1597 if (!sel_scroll_ev.is_active ())
1617 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1598 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1618 1599
1619 /* save the event params so we can highlight 1600 /* save the event params so we can highlight
1620 * the selection in the pending-scroll loop 1601 * the selection in the pending-scroll loop
1621 */ 1602 */
1622 selection_save_x = ev.xbutton.x; 1603 selection_save_x = ev.xbutton.x;
… …
1644 else 1625 else
1645 { 1626 {
1646 /* we are within the text window, so we 1627 /* we are within the text window, so we
1647 * shouldn't be scrolling 1628 * shouldn't be scrolling
1648 */ 1629 */
1649 if (sel_scroll_ev.active)
1650 sel_scroll_ev.stop(); 1630 sel_scroll_ev.stop();
1651 } 1631 }
1652#endif 1632#endif
1653#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
1654 } 1634 }
1655#endif 1635#endif
1656 } 1636 }
1657 } 1637 }
1658 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1638 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1659 { 1639 {
1660 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1640 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1661 MotionNotify, &ev)) 1641 MotionNotify, &ev))
1662 ; 1642 ;
1663 1643
1664 XQueryPointer (xdisp, scrollBar.win, 1644 XQueryPointer (dpy, scrollBar.win,
1665 &unused_root, &unused_child, 1645 &unused_root, &unused_child,
1666 &unused_root_x, &unused_root_y, 1646 &unused_root_x, &unused_root_y,
1667 &ev.xbutton.x, &ev.xbutton.y, 1647 &ev.xbutton.x, &ev.xbutton.y,
1668 &unused_mask); 1648 &unused_mask);
1669 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1670 scrollbar_size ()); 1650 scrollBar.size ());
1671 want_refresh = 1; 1651 want_refresh = 1;
1672 refresh_limit = 0;
1673 scrollbar_show (1); 1652 scrollBar.show (1);
1674 } 1653 }
1675 break; 1654 break;
1676 } 1655 }
1677 1656
1678skip_switch: ;
1679
1680#if defined(CURSOR_BLINK) 1657#if defined(CURSOR_BLINK)
1681 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1658 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1682 { 1659 {
1683 if (hidden_cursor) 1660 if (hidden_cursor)
1684 { 1661 {
1685 hidden_cursor = 0; 1662 hidden_cursor = 0;
1686 want_refresh = 1; 1663 want_refresh = 1;
1687 } 1664 }
1688 1665
1689 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1666 cursor_blink_ev.again ();
1690 } 1667 }
1691#endif 1668#endif
1692 1669
1693#if defined(POINTER_BLANK) 1670#if defined(POINTER_BLANK)
1694 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1671 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1695 { 1672 {
1696 if (ev.type == MotionNotify 1673 if (ev.type == MotionNotify
1697 || ev.type == ButtonPress 1674 || ev.type == ButtonPress
1698 || ev.type == ButtonRelease) 1675 || ev.type == ButtonRelease)
1699 if (hidden_pointer) 1676 if (hidden_pointer)
… …
1701 1678
1702 if (ev.type == KeyPress && hidden_pointer == 0) 1679 if (ev.type == KeyPress && hidden_pointer == 0)
1703 pointer_blank (); 1680 pointer_blank ();
1704 } 1681 }
1705#endif 1682#endif
1683
1684 refresh_check ();
1706} 1685}
1707 1686
1708void 1687void
1709rxvt_term::focus_in () 1688rxvt_term::focus_in ()
1710{ 1689{
1711 if (!focus) 1690 if (!focus)
1712 { 1691 {
1713 focus = 1; 1692 focus = 1;
1714 want_refresh = 1; 1693 want_refresh = 1;
1715 1694
1716 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1695 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1717 1696
1718#if USE_XIM 1697#if USE_XIM
1719 if (Input_Context != NULL) 1698 if (Input_Context != NULL)
1720 { 1699 {
1721 IMSetStatusPosition (); 1700 IMSetPosition ();
1722 XSetICFocus (Input_Context); 1701 XSetICFocus (Input_Context);
1723 } 1702 }
1724#endif 1703#endif
1725#if CURSOR_BLINK 1704#if CURSOR_BLINK
1726 if (OPTION (Opt_cursorBlink)) 1705 if (option (Opt_cursorBlink))
1727 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1706 cursor_blink_ev.again ();
1728#endif 1707#endif
1729#if OFF_FOCUS_FADING 1708#if OFF_FOCUS_FADING
1730 if (rs[Rs_fade]) 1709 if (rs[Rs_fade])
1731 { 1710 {
1732 pix_colors = pix_colors_focused; 1711 pix_colors = pix_colors_focused;
1733 scr_recolour (); 1712 scr_recolour ();
1734 } 1713 }
1735#endif 1714#endif
1715#if ENABLE_FRILLS
1716 if (option (Opt_urgentOnBell))
1717 {
1718 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1719 {
1720 h->flags &= ~XUrgencyHint;
1721 XSetWMHints (dpy, parent[0], h);
1722 }
1723 }
1724#endif
1736 } 1725 }
1737} 1726}
1738 1727
1739void 1728void
1740rxvt_term::focus_out () 1729rxvt_term::focus_out ()
… …
1748 1737
1749#if ENABLE_FRILLS || ISO_14755 1738#if ENABLE_FRILLS || ISO_14755
1750 if (iso14755buf) 1739 if (iso14755buf)
1751 { 1740 {
1752 iso14755buf = 0; 1741 iso14755buf = 0;
1753# if ENABLE_OVERLAY 1742# if ISO_14755
1754 scr_overlay_off (); 1743 scr_overlay_off ();
1755# endif 1744# endif
1756 } 1745 }
1757#endif 1746#endif
1758#if USE_XIM 1747#if USE_XIM
1759 if (Input_Context != NULL) 1748 if (Input_Context != NULL)
1760 XUnsetICFocus (Input_Context); 1749 XUnsetICFocus (Input_Context);
1761#endif 1750#endif
1762#if CURSOR_BLINK 1751#if CURSOR_BLINK
1763 if (OPTION (Opt_cursorBlink)) 1752 if (option (Opt_cursorBlink))
1764 cursor_blink_ev.stop (); 1753 cursor_blink_ev.stop ();
1754
1765 hidden_cursor = 0; 1755 hidden_cursor = 0;
1766#endif 1756#endif
1767#if OFF_FOCUS_FADING 1757#if OFF_FOCUS_FADING
1768 if (rs[Rs_fade]) 1758 if (rs[Rs_fade])
1769 { 1759 {
… …
1772 } 1762 }
1773#endif 1763#endif
1774 } 1764 }
1775} 1765}
1776 1766
1777#if TRANSPARENT 1767void
1768rxvt_term::update_fade_color (unsigned int idx)
1769{
1770#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade])
1772 {
1773 rgba c;
1774 pix_colors [Color_fade].get (c);
1775 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1776 }
1777#endif
1778}
1779
1780#if ENABLE_TRANSPARENCY || ENABLE_PERL
1778void 1781void
1779rxvt_term::rootwin_cb (XEvent &ev) 1782rxvt_term::rootwin_cb (XEvent &ev)
1780{ 1783{
1781 make_current (); 1784 make_current ();
1782 1785
1786 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1787 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1788 return;
1789
1790# if ENABLE_TRANSPARENCY
1783 switch (ev.type) 1791 switch (ev.type)
1784 { 1792 {
1785 case PropertyNotify: 1793 case PropertyNotify:
1786 /* 1794 /*
1787 * if user used some Esetroot compatible prog to set the root bg, 1795 * if user used some Esetroot compatible prog to set the root bg,
1788 * use the property to determine the pixmap. We use it later on. 1796 * use the property to determine the pixmap. We use it later on.
1789 */ 1797 */
1790 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1798 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1791 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1799 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1792 return; 1800 {
1801 bgPixmap.set_root_pixmap ();
1802 update_background ();
1803 }
1793 1804
1794 /* FALLTHROUGH */
1795 case ReparentNotify:
1796 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1797 want_refresh = want_full_refresh = 1;
1798 break; 1805 break;
1799 } 1806 }
1807# endif
1808
1809 refresh_check ();
1800} 1810}
1801#endif 1811#endif
1802 1812
1803void 1813void
1804rxvt_term::button_press (XButtonEvent &ev) 1814rxvt_term::button_press (XButtonEvent &ev)
… …
1859 mouse_report (ev); 1869 mouse_report (ev);
1860 } 1870 }
1861#else 1871#else
1862 MEvent.button = ev.button; 1872 MEvent.button = ev.button;
1863 mouse_report (ev); 1873 mouse_report (ev);
1864#endif /* MOUSE_REPORT_DOUBLECLICK */ 1874#endif /* MOUSE_REPORT_DOUBLECLICK */
1865 1875
1866 } 1876 }
1867 else 1877 else
1868 { 1878 {
1869 if (ev.button != MEvent.button) 1879 if (ev.button != MEvent.button)
… …
1917 } 1927 }
1918 1928
1919 /* 1929 /*
1920 * Scrollbar window processing of button press 1930 * Scrollbar window processing of button press
1921 */ 1931 */
1922 if (isScrollbarWindow (ev.window)) 1932 if (scrollBar.state && ev.window == scrollBar.win)
1923 { 1933 {
1924 scrollBar.setIdle (); 1934 page_dirn direction = NO_DIR;
1935
1936 if (scrollBar.upButton (ev.y))
1937 direction = UP; /* up */
1938 else if (scrollBar.dnButton (ev.y))
1939 direction = DN; /* down */
1940
1941 scrollBar.state = STATE_IDLE;
1925 /* 1942 /*
1926 * Rxvt-style scrollbar: 1943 * Rxvt-style scrollbar:
1927 * move up if mouse is above slider 1944 * move up if mouse is above slider
1928 * move dn if mouse is below slider 1945 * move dn if mouse is below slider
1929 * 1946 *
… …
1938 /* 1955 /*
1939 * Mouse report disabled scrollbar: 1956 * Mouse report disabled scrollbar:
1940 * arrow buttons - send up/down 1957 * arrow buttons - send up/down
1941 * click on scrollbar - send pageup/down 1958 * click on scrollbar - send pageup/down
1942 */ 1959 */
1943 if ((scrollBar.style == R_SB_NEXT 1960 if (direction == UP)
1944 && scrollbarnext_upButton (ev.y))
1945 || (scrollBar.style == R_SB_RXVT
1946 && scrollbarrxvt_upButton (ev.y)))
1947 tt_printf ("\033[A"); 1961 tt_printf ("\033[A");
1948 else if ((scrollBar.style == R_SB_NEXT 1962 else if (direction == DN)
1949 && scrollbarnext_dnButton (ev.y))
1950 || (scrollBar.style == R_SB_RXVT
1951 && scrollbarrxvt_dnButton (ev.y)))
1952 tt_printf ("\033[B"); 1963 tt_printf ("\033[B");
1953 else 1964 else
1954 switch (ev.button) 1965 switch (ev.button)
1955 { 1966 {
1956 case Button2: 1967 case Button2:
… …
1963 tt_printf ("\033[5~"); 1974 tt_printf ("\033[5~");
1964 break; 1975 break;
1965 } 1976 }
1966 } 1977 }
1967 else 1978 else
1968#endif /* NO_SCROLLBAR_REPORT */ 1979#endif /* NO_SCROLLBAR_REPORT */
1969
1970 {
1971 char upordown = 0;
1972
1973 if (scrollBar.style == R_SB_NEXT)
1974 { 1980 {
1975 if (scrollbarnext_upButton (ev.y)) 1981 if (direction != NO_DIR)
1976 upordown = -1; /* up */
1977 else if (scrollbarnext_dnButton (ev.y))
1978 upordown = 1; /* down */
1979 }
1980 else if (scrollBar.style == R_SB_RXVT)
1981 {
1982 if (scrollbarrxvt_upButton (ev.y))
1983 upordown = -1; /* up */
1984 else if (scrollbarrxvt_dnButton (ev.y))
1985 upordown = 1; /* down */
1986 }
1987 if (upordown)
1988 { 1982 {
1989#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1983#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1984 if (!cont_scroll_ev.is_active ())
1990 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1985 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1991#endif 1986#endif
1992 if (scr_page (upordown < 0 ? UP : DN, 1)) 1987 if (scr_page (direction, 1))
1993 { 1988 {
1994 if (upordown < 0) 1989 if (direction == UP)
1995 scrollBar.setUp (); 1990 scrollBar.state = STATE_UP;
1996 else 1991 else
1997 scrollBar.setDn (); 1992 scrollBar.state = STATE_DOWN;
1998 } 1993 }
1999 } 1994 }
2000 else 1995 else
2001 switch (ev.button) 1996 switch (ev.button)
2002 { 1997 {
2003 case Button2: 1998 case Button2:
2004 switch (scrollbar_align) 1999 switch (scrollBar.align)
2005 { 2000 {
2006 case R_SB_ALIGN_TOP: 2001 case R_SB_ALIGN_TOP:
2007 csrO = 0; 2002 csrO = 0;
2008 break; 2003 break;
2009 case R_SB_ALIGN_CENTRE: 2004 case R_SB_ALIGN_CENTRE:
… …
2015 } 2010 }
2016 2011
2017 if (scrollBar.style == R_SB_XTERM 2012 if (scrollBar.style == R_SB_XTERM
2018 || scrollbar_above_slider (ev.y) 2013 || scrollbar_above_slider (ev.y)
2019 || scrollbar_below_slider (ev.y)) 2014 || scrollbar_below_slider (ev.y))
2020 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2021 2016
2022 scrollBar.setMotion (); 2017 scrollBar.state = STATE_MOTION;
2023 break; 2018 break;
2024 2019
2025 case Button1: 2020 case Button1:
2026 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2021 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2027 csrO = ev.y - scrollBar.top; 2022 csrO = ev.y - scrollBar.top;
2028 /* FALLTHROUGH */ 2023 /* FALLTHROUGH */
2029 2024
2030 case Button3: 2025 case Button3:
2031 if (scrollBar.style != R_SB_XTERM) 2026 if (scrollBar.style != R_SB_XTERM)
… …
2041 scr_page (DN, nrow - 1); 2036 scr_page (DN, nrow - 1);
2042# else 2037# else
2043 scr_page (DN, nrow / 4); 2038 scr_page (DN, nrow / 4);
2044# endif 2039# endif
2045 else 2040 else
2046 scrollBar.setMotion (); 2041 scrollBar.state = STATE_MOTION;
2047 } 2042 }
2048 else 2043 else
2049 { 2044 {
2050 scr_page ((ev.button == Button1 ? DN : UP), 2045 scr_page ((ev.button == Button1 ? DN : UP),
2051 (nrow 2046 (nrow
2052 * scrollbar_position (ev.y) 2047 * scrollbar_position (ev.y)
2053 / scrollbar_size ())); 2048 / scrollBar.size ()));
2054 } 2049 }
2055 2050
2056 break; 2051 break;
2057 } 2052 }
2058 } 2053 }
… …
2068 2063
2069 csrO = 0; /* reset csr Offset */ 2064 csrO = 0; /* reset csr Offset */
2070 if (!bypass_keystate) 2065 if (!bypass_keystate)
2071 reportmode = !! (priv_modes & PrivMode_mouse_report); 2066 reportmode = !! (priv_modes & PrivMode_mouse_report);
2072 2067
2073 if (scrollbar_isUpDn ()) 2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2074 { 2069 {
2075 scrollBar.setIdle (); 2070 scrollBar.state = STATE_IDLE;
2076 scrollbar_show (0); 2071 scrollBar.show (0);
2077 } 2072 }
2078 2073
2079#ifdef SELECTION_SCROLLING 2074#ifdef SELECTION_SCROLLING
2080 if (sel_scroll_ev.active)
2081 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
2082#endif 2076#endif
2083 2077
2084 if (ev.window == vt) 2078 if (ev.window == vt)
2085 { 2079 {
2086 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2080 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2110 mouse_report (ev); 2104 mouse_report (ev);
2111 } 2105 }
2112#else /* MOUSE_REPORT_DOUBLECLICK */ 2106#else /* MOUSE_REPORT_DOUBLECLICK */
2113 MEvent.button = AnyButton; 2107 MEvent.button = AnyButton;
2114 mouse_report (ev); 2108 mouse_report (ev);
2115#endif /* MOUSE_REPORT_DOUBLECLICK */ 2109#endif /* MOUSE_REPORT_DOUBLECLICK */
2116 return; 2110 return;
2117 } 2111 }
2118 2112
2119 /* 2113 /*
2120 * dumb hack to compensate for the failure of click-and-drag 2114 * dumb hack to compensate for the failure of click-and-drag
… …
2132 selection_make (ev.time); 2126 selection_make (ev.time);
2133 break; 2127 break;
2134 2128
2135 case Button2: 2129 case Button2:
2136 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2137 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2138 break; 2132 break;
2139 2133
2140#ifdef MOUSE_WHEEL 2134#ifdef MOUSE_WHEEL
2141 case Button4: 2135 case Button4:
2142 case Button5: 2136 case Button5:
… …
2146 2140
2147 v = ev.button == Button4 ? UP : DN; 2141 v = ev.button == Button4 ? UP : DN;
2148 2142
2149 if (ev.state & ShiftMask) 2143 if (ev.state & ShiftMask)
2150 i = 1; 2144 i = 1;
2151 else if (OPTION (Opt_mouseWheelScrollPage)) 2145 else if (option (Opt_mouseWheelScrollPage))
2152 i = nrow - 1; 2146 i = nrow - 1;
2153 else 2147 else
2154 i = 5; 2148 i = 5;
2155 2149
2156# ifdef MOUSE_SLIP_WHEELING 2150# ifdef MOUSE_SLIP_WHEELING
… …
2158 { 2152 {
2159 mouse_slip_wheel_speed += v ? -1 : 1; 2153 mouse_slip_wheel_speed += v ? -1 : 1;
2160 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2154 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2161 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2155 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2162 2156
2163 if (slip_wheel_ev.at < NOW) 2157 if (!slip_wheel_ev.is_active ())
2164 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2158 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2165
2166 slip_wheel_ev.start ();
2167 } 2159 }
2168 else 2160 else
2161# endif
2169 { 2162 {
2170# endif
2171 scr_page (v, i); 2163 scr_page (v, i);
2172 scrollbar_show (1); 2164 scrollBar.show (1);
2173# ifdef MOUSE_SLIP_WHEELING
2174 } 2165 }
2175# endif
2176 } 2166 }
2177 break; 2167 break;
2178#endif 2168#endif
2179 } 2169 }
2180 } 2170 }
2181} 2171}
2182
2183#ifdef TRANSPARENT
2184#if TINTING
2185/* taken from aterm-0.4.2 */
2186
2187typedef uint32_t RUINT32T;
2188
2189void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2190{
2191 int sh_r, sh_g, sh_b;
2192 RUINT32T mask_r, mask_g, mask_b;
2193 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2194 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2195 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2196 int i;
2197
2198 Visual *visual = term->visual;
2199
2200 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2201
2202 /* for convenience */
2203 mask_r = visual->red_mask;
2204 mask_g = visual->green_mask;
2205 mask_b = visual->blue_mask;
2206
2207 /* boring lookup table pre-initialization */
2208 switch (srcImage->bits_per_pixel) {
2209 case 15:
2210 if ((mask_r != 0x7c00) ||
2211 (mask_g != 0x03e0) ||
2212 (mask_b != 0x001f))
2213 return;
2214 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2215 lookup_r = lookup;
2216 lookup_g = lookup+32;
2217 lookup_b = lookup+32+32;
2218 sh_r = 10;
2219 sh_g = 5;
2220 sh_b = 0;
2221 break;
2222 case 16:
2223 if ((mask_r != 0xf800) ||
2224 (mask_g != 0x07e0) ||
2225 (mask_b != 0x001f))
2226 return;
2227 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2228 lookup_r = lookup;
2229 lookup_g = lookup+32;
2230 lookup_b = lookup+32+64;
2231 sh_r = 11;
2232 sh_g = 5;
2233 sh_b = 0;
2234 break;
2235 case 24:
2236 if ((mask_r != 0xff0000) ||
2237 (mask_g != 0x00ff00) ||
2238 (mask_b != 0x0000ff))
2239 return;
2240 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2241 lookup_r = lookup;
2242 lookup_g = lookup+256;
2243 lookup_b = lookup+256+256;
2244 sh_r = 16;
2245 sh_g = 8;
2246 sh_b = 0;
2247 break;
2248 case 32:
2249 if ((mask_r != 0xff0000) ||
2250 (mask_g != 0x00ff00) ||
2251 (mask_b != 0x0000ff))
2252 return;
2253 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2254 lookup_r = lookup;
2255 lookup_g = lookup+256;
2256 lookup_b = lookup+256+256;
2257 sh_r = 16;
2258 sh_g = 8;
2259 sh_b = 0;
2260 break;
2261 default:
2262 return; /* we do not support this color depth */
2263 }
2264
2265 /* prepare limits for color transformation (each channel is handled separately) */
2266 if (shade < 0) {
2267 shade = -shade;
2268 if (shade < 0) shade = 0;
2269 if (shade > 100) shade = 100;
2270
2271 lower_lim_r = 65535-rm;
2272 lower_lim_g = 65535-gm;
2273 lower_lim_b = 65535-bm;
2274
2275 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2276 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2277 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2278
2279 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2280 } else {
2281 if (shade < 0) shade = 0;
2282 if (shade > 100) shade = 100;
2283
2284 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2285
2286 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2287 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2288 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2289 }
2290
2291 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2292 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2293 {
2294 unsigned int tmp;
2295
2296 tmp = lower_lim_r;
2297 lower_lim_r = lower_lim_b;
2298 lower_lim_b = tmp;
2299
2300 tmp = upper_lim_r;
2301 upper_lim_r = upper_lim_b;
2302 upper_lim_b = tmp;
2303 }
2304
2305 /* fill our lookup tables */
2306 for (i = 0; i <= mask_r>>sh_r; i++)
2307 {
2308 RUINT32T tmp;
2309 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2310 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2311 lookup_r[i] = (tmp/65535)<<sh_r;
2312 }
2313 for (i = 0; i <= mask_g>>sh_g; i++)
2314 {
2315 RUINT32T tmp;
2316 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2317 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2318 lookup_g[i] = (tmp/65535)<<sh_g;
2319 }
2320 for (i = 0; i <= mask_b>>sh_b; i++)
2321 {
2322 RUINT32T tmp;
2323 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2324 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2325 lookup_b[i] = (tmp/65535)<<sh_b;
2326 }
2327
2328 /* apply table to input image (replacing colors by newly calculated ones) */
2329 switch (srcImage->bits_per_pixel)
2330 {
2331 case 15:
2332 {
2333 unsigned short *p1, *pf, *p, *pl;
2334 p1 = (unsigned short *) srcImage->data;
2335 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2336 while (p1 < pf)
2337 {
2338 p = p1;
2339 pl = p1 + srcImage->width;
2340 for (; p < pl; p++)
2341 {
2342 *p = lookup_r[(*p & 0x7c00)>>10] |
2343 lookup_g[(*p & 0x03e0)>> 5] |
2344 lookup_b[(*p & 0x001f)];
2345 }
2346 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2347 }
2348 break;
2349 }
2350 case 16:
2351 {
2352 unsigned short *p1, *pf, *p, *pl;
2353 p1 = (unsigned short *) srcImage->data;
2354 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2355 while (p1 < pf)
2356 {
2357 p = p1;
2358 pl = p1 + srcImage->width;
2359 for (; p < pl; p++)
2360 {
2361 *p = lookup_r[(*p & 0xf800)>>11] |
2362 lookup_g[(*p & 0x07e0)>> 5] |
2363 lookup_b[(*p & 0x001f)];
2364 }
2365 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2366 }
2367 break;
2368 }
2369 case 24:
2370 {
2371 unsigned char *p1, *pf, *p, *pl;
2372 p1 = (unsigned char *) srcImage->data;
2373 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2374 while (p1 < pf)
2375 {
2376 p = p1;
2377 pl = p1 + srcImage->width * 3;
2378 for (; p < pl; p += 3)
2379 {
2380 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2381 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2382 p[2] = lookup_r[(p[2] & 0x0000ff)];
2383 }
2384 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2385 }
2386 break;
2387 }
2388 case 32:
2389 {
2390 RUINT32T *p1, *pf, *p, *pl;
2391 p1 = (RUINT32T *) srcImage->data;
2392 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2393
2394 while (p1 < pf)
2395 {
2396 p = p1;
2397 pl = p1 + srcImage->width;
2398 for (; p < pl; p++)
2399 {
2400 *p = lookup_r[(*p & 0xff0000)>>16] |
2401 lookup_g[(*p & 0x00ff00)>> 8] |
2402 lookup_b[(*p & 0x0000ff)] |
2403 (*p & ~0xffffff);
2404 }
2405 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2406 }
2407 break;
2408 }
2409 }
2410
2411 free (lookup);
2412}
2413#endif
2414
2415/*
2416 * Check our parents are still who we think they are.
2417 * Do transparency updates if required
2418 */
2419int
2420rxvt_term::check_our_parents ()
2421{
2422 int i, pchanged, aformat, have_pixmap, rootdepth;
2423 unsigned long nitems, bytes_after;
2424 Atom atype;
2425 unsigned char *prop = NULL;
2426 Window root, oldp, *list;
2427 Pixmap rootpixmap = None;
2428 XWindowAttributes wattr, wrootattr;
2429
2430 pchanged = 0;
2431
2432 if (!OPTION (Opt_transparent))
2433 return pchanged; /* Don't try any more */
2434
2435 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2436 rootdepth = wrootattr.depth;
2437
2438 XGetWindowAttributes (xdisp, parent[0], &wattr);
2439
2440 if (rootdepth != wattr.depth)
2441 {
2442 if (am_transparent)
2443 {
2444 pchanged = 1;
2445 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2446 am_transparent = am_pixmap_trans = 0;
2447 }
2448
2449 return pchanged; /* Don't try any more */
2450 }
2451
2452 /* Get all X ops out of the queue so that our information is up-to-date. */
2453 XSync (xdisp, False);
2454
2455 /*
2456 * Make the frame window set by the window manager have
2457 * the root background. Some window managers put multiple nested frame
2458 * windows for each client, so we have to take care about that.
2459 */
2460 i = (xa[XA_XROOTPMAP_ID]
2461 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2463 &nitems, &bytes_after, &prop) == Success);
2464
2465 if (!i || prop == NULL)
2466 i = (xa[XA_ESETROOT_PMAP_ID]
2467 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2468 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2469 &nitems, &bytes_after, &prop) == Success);
2470
2471 if (!i || prop == NULL
2472#if TINTING
2473 || !ISSET_PIXCOLOR (Color_tint)
2474#endif
2475 )
2476 have_pixmap = 0;
2477 else
2478 {
2479 have_pixmap = 1;
2480 rootpixmap = *(Pixmap *)prop;
2481 XFree (prop);
2482 }
2483
2484 if (have_pixmap)
2485 {
2486 /*
2487 * Copy display->root pixmap transparency
2488 */
2489 int sx, sy, nx, ny;
2490 unsigned int nw, nh;
2491 Window cr;
2492 XImage *image;
2493 GC gc;
2494 XGCValues gcvalue;
2495
2496 XTranslateCoordinates (xdisp, parent[0], display->root,
2497 0, 0, &sx, &sy, &cr);
2498 nw = (unsigned int)szHint.width;
2499 nh = (unsigned int)szHint.height;
2500 nx = ny = 0;
2501
2502 if (sx < 0)
2503 {
2504 nw += sx;
2505 nx = -sx;
2506 sx = 0;
2507 }
2508
2509 if (sy < 0)
2510 {
2511 nh += sy;
2512 ny = -sy;
2513 sy = 0;
2514 }
2515
2516 min_it (nw, (unsigned int) (wrootattr.width - sx));
2517 min_it (nh, (unsigned int) (wrootattr.height - sy));
2518
2519 XSync (xdisp, False);
2520 allowedxerror = -1;
2521 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2522
2523 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2524 /* XXX: may need a delay here? */
2525 allowedxerror = 0;
2526
2527 if (image == NULL)
2528 {
2529 if (am_transparent && am_pixmap_trans)
2530 {
2531 pchanged = 1;
2532 if (pixmap != None)
2533 {
2534 XFreePixmap (xdisp, pixmap);
2535 pixmap = None;
2536 }
2537 }
2538
2539 am_pixmap_trans = 0;
2540 }
2541 else
2542 {
2543 if (pixmap != None)
2544 XFreePixmap (xdisp, pixmap);
2545
2546#if TINTING
2547 if (ISSET_PIXCOLOR (Color_tint))
2548 {
2549 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2550
2551 rgba c;
2552 pix_colors_focused [Color_tint].get (c);
2553
2554 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2555 }
2556#endif
2557
2558 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2559 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2560 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2561 nx, ny, image->width, image->height);
2562 XFreeGC (xdisp, gc);
2563 XDestroyImage (image);
2564 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2565 XClearWindow (xdisp, parent[0]);
2566
2567 if (!am_transparent || !am_pixmap_trans)
2568 pchanged = 1;
2569
2570 am_transparent = am_pixmap_trans = 1;
2571 }
2572 }
2573
2574 if (am_pixmap_trans)
2575 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2576 else
2577 {
2578 unsigned int n;
2579 /*
2580 * InheritPixmap transparency
2581 */
2582 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2583 {
2584 oldp = parent[i];
2585 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2586 XFree (list);
2587
2588 if (parent[i] == display->root)
2589 {
2590 if (oldp != None)
2591 pchanged = 1;
2592
2593 break;
2594 }
2595
2596 if (oldp != parent[i])
2597 pchanged = 1;
2598 }
2599
2600 n = 0;
2601
2602 if (pchanged)
2603 for (; n < (unsigned int)i; n++)
2604 {
2605 XGetWindowAttributes (xdisp, parent[n], &wattr);
2606
2607 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2608 {
2609 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2610 break;
2611 }
2612 }
2613
2614 if (n > (sizeof (parent) / sizeof (parent[0])))
2615 {
2616 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2617 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2618 am_transparent = 0;
2619 /* XXX: also turn off Opt_transparent? */
2620 }
2621 else
2622 {
2623 for (n = 0; n < (unsigned int)i; n++)
2624 {
2625 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2626 XClearWindow (xdisp, parent[n]);
2627 }
2628
2629 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2630 am_transparent = 1;
2631 }
2632
2633 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2634 parent[i] = None;
2635 }
2636
2637 if (scrollBar.win)
2638 {
2639 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2640 scrollBar.setIdle ();
2641 scrollbar_show (0);
2642 }
2643
2644 if (am_transparent)
2645 {
2646 want_refresh = want_full_refresh = 1;
2647 if (am_pixmap_trans)
2648 flush ();
2649 }
2650
2651 return pchanged;
2652}
2653#endif
2654 2172
2655/*}}} */ 2173/*}}} */
2656 2174
2657bool 2175bool
2658rxvt_term::cmd_parse () 2176rxvt_term::cmd_parse ()
… …
2707 if (ch == C0_LF) 2225 if (ch == C0_LF)
2708 nlines++; 2226 nlines++;
2709 2227
2710 refresh_count++; 2228 refresh_count++;
2711 2229
2712 if (!OPTION (Opt_jumpScroll) 2230 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2713 || (refresh_count >= refresh_limit * (nrow - 1)))
2714 { 2231 {
2715 refreshnow = true;
2716 refresh_count = 0; 2232 refresh_count = 0;
2233
2234 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2235 {
2236 refreshnow = true;
2717 ch = NOCHAR; 2237 ch = NOCHAR;
2718 break; 2238 break;
2239 }
2719 } 2240 }
2720 2241
2721 // scr_add_lines only works for nlines <= nrow - 1. 2242 // scr_add_lines only works for nlines <= nrow - 1.
2722 if (nlines >= nrow - 1) 2243 if (nlines >= nrow - 1)
2723 { 2244 {
… …
2751 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2272 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2752 scr_add_lines (buf, str - buf, nlines); 2273 scr_add_lines (buf, str - buf, nlines);
2753 2274
2754 /* 2275 /*
2755 * If there have been a lot of new lines, then update the screen 2276 * If there have been a lot of new lines, then update the screen
2756 * What the heck I'll cheat and only refresh less than every page-full. 2277 * What the heck we'll cheat and only refresh less than every page-full.
2757 * the number of pages between refreshes is refresh_limit, which 2278 * if skipScroll is enabled.
2758 * is incremented here because we must be doing flat-out scrolling.
2759 */ 2279 */
2760 if (refreshnow) 2280 if (refreshnow)
2761 { 2281 {
2762 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2763 refresh_limit++;
2764 else
2765 {
2766 flag = true; 2282 flag = true;
2767 scr_refresh (); 2283 scr_refresh ();
2768 want_refresh = 1; 2284 want_refresh = 1;
2769 }
2770 } 2285 }
2771 2286
2772 } 2287 }
2773 else 2288 else
2774 { 2289 {
… …
2923 { 2438 {
2924 if ((buf[len++] = cmd_getc ()) == 'i') 2439 if ((buf[len++] = cmd_getc ()) == 'i')
2925 break; /* done = 1 */ 2440 break; /* done = 1 */
2926 } 2441 }
2927 } 2442 }
2928 2443
2929 for (i = 0; i < len; i++) 2444 for (i = 0; i < len; i++)
2930 if (putc (buf[i], fd) == EOF) 2445 if (putc (buf[i], fd) == EOF)
2931 { 2446 {
2932 done = 1; 2447 done = 1;
2933 break; 2448 break;
… …
2935 } 2450 }
2936 } 2451 }
2937 2452
2938 pclose_printer (fd); 2453 pclose_printer (fd);
2939} 2454}
2940#endif /* PRINTPIPE */ 2455#endif /* PRINTPIPE */
2941/*}}} */ 2456/*}}} */
2942 2457
2943/* *INDENT-OFF* */ 2458/* *INDENT-OFF* */
2944enum { 2459enum {
2945 C1_40 = 0x40, 2460 C1_40 = 0x40,
… …
2995 process_dcs_seq (); 2510 process_dcs_seq ();
2996 break; 2511 break;
2997 case 0x9b: /* CSI */ 2512 case 0x9b: /* CSI */
2998 process_csi_seq (); 2513 process_csi_seq ();
2999 break; 2514 break;
3000 case 0x9d: /* CSI */ 2515 case 0x9d: /* OSC */
3001 process_osc_seq (); 2516 process_osc_seq ();
3002 break; 2517 break;
3003#endif 2518#endif
3004 } 2519 }
3005} 2520}
… …
3049 break; 2564 break;
3050 case 'Z': /* identify the terminal type */ 2565 case 'Z': /* identify the terminal type */
3051 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2566 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3052 break; 2567 break;
3053 case '<': /* turn off VT52 mode */ 2568 case '<': /* turn off VT52 mode */
3054 PrivMode (0, PrivMode_vt52); 2569 set_privmode (PrivMode_vt52, 0);
3055 break; 2570 break;
3056 case 'F': /* use special graphics character set */ 2571 case 'F': /* use special graphics character set */
3057 case 'G': /* use regular character set */ 2572 case 'G': /* use regular character set */
3058 /* unimplemented */ 2573 /* unimplemented */
3059 break; 2574 break;
… …
3113 scr_forwardindex (); 2628 scr_forwardindex ();
3114 break; 2629 break;
3115#endif 2630#endif
3116 case '=': 2631 case '=':
3117 case '>': 2632 case '>':
3118 PrivMode ((ch == '='), PrivMode_aplKP); 2633 set_privmode (PrivMode_aplKP, ch == '=');
3119 break; 2634 break;
3120 2635
3121 case C1_40: 2636 case C1_40:
3122 cmd_getc (); 2637 cmd_getc ();
3123 break; 2638 break;
… …
3176 2691
3177 /* 8.3.106: RESET TO INITIAL STATE */ 2692 /* 8.3.106: RESET TO INITIAL STATE */
3178 case 'c': 2693 case 'c':
3179 mbstate.reset (); 2694 mbstate.reset ();
3180 scr_poweron (); 2695 scr_poweron ();
3181 scrollbar_show (1); 2696 scrollBar.show (1);
3182 break; 2697 break;
3183 2698
3184 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2699 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3185 case 'n': 2700 case 'n':
3186 scr_charset_choose (2); 2701 scr_charset_choose (2);
… …
3231rxvt_term::process_csi_seq () 2746rxvt_term::process_csi_seq ()
3232{ 2747{
3233 unicode_t ch, priv, i; 2748 unicode_t ch, priv, i;
3234 unsigned int nargs, p; 2749 unsigned int nargs, p;
3235 int n, ndef; 2750 int n, ndef;
3236 int arg[ESC_ARGS]; 2751 int arg[ESC_ARGS] = { };
3237 2752
3238 for (nargs = ESC_ARGS; nargs > 0;) 2753 nargs = 0;
3239 arg[--nargs] = 0;
3240 2754
3241 priv = 0; 2755 priv = 0;
3242 ch = cmd_getc (); 2756 ch = cmd_getc ();
3243 if (ch >= '<' && ch <= '?') 2757 if (ch >= '<' && ch <= '?')
2758 {
3244 { /* '<' '=' '>' '?' */ 2759 /* '<' '=' '>' '?' */
3245 priv = ch; 2760 priv = ch;
3246 ch = cmd_getc (); 2761 ch = cmd_getc ();
3247 } 2762 }
3248 2763
3249 /* read any numerical arguments */ 2764 /* read any numerical arguments */
… …
3288 switch (priv) 2803 switch (priv)
3289 { 2804 {
3290 case '>': 2805 case '>':
3291 if (ch == CSI_DA) /* secondary device attributes */ 2806 if (ch == CSI_DA) /* secondary device attributes */
3292 { 2807 {
3293 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2808 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3294 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2809 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3295 // 2810 //
3296 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2811 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3297 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2812 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3298 // that we do not support xterm mouse reporting (should be 95 when we do). 2813 // versions.
3299 // 2814 //
3300 tt_printf ("\033[>%d;94;0c", 'U'); 2815 tt_printf ("\033[>%d;95;0c", 'U');
3301 } 2816 }
3302 break; 2817 break;
2818
3303 case '?': 2819 case '?':
3304 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3305 process_terminal_mode (ch, priv, nargs, arg); 2821 process_terminal_mode (ch, priv, nargs, arg);
3306 break; 2822 break;
3307 } 2823 }
… …
3432 break; 2948 break;
3433 case 6: /* CPR requested */ 2949 case 6: /* CPR requested */
3434 scr_report_position (); 2950 scr_report_position ();
3435 break; 2951 break;
3436 case 7: /* unofficial extension */ 2952 case 7: /* unofficial extension */
3437 if (OPTION (Opt_insecure)) 2953 if (option (Opt_insecure))
3438 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2954 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3439 break; 2955 break;
3440 case 8: /* unofficial extension */ 2956 case 8: /* unofficial extension */
3441 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2957 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3442 break; 2958 break;
… …
3535{ 3051{
3536 int x, y; 3052 int x, y;
3537 XWindowAttributes wattr; 3053 XWindowAttributes wattr;
3538 Window wdummy; 3054 Window wdummy;
3539 3055
3540 dLocal (Display *, xdisp); 3056 dLocal (Display *, dpy);
3541 3057
3542 if (nargs == 0) 3058 if (nargs == 0)
3543 return; 3059 return;
3544 3060
3545 switch (args[0]) 3061 switch (args[0])
3546 { 3062 {
3547 /* 3063 /*
3548 * commands 3064 * commands
3549 */ 3065 */
3550 case 1: /* deiconify window */ 3066 case 1: /* deiconify window */
3551 XMapWindow (xdisp, parent[0]); 3067 XMapWindow (dpy, parent[0]);
3552 break; 3068 break;
3553 case 2: /* iconify window */ 3069 case 2: /* iconify window */
3554 XIconifyWindow (xdisp, parent[0], display->screen); 3070 XIconifyWindow (dpy, parent[0], display->screen);
3555 break; 3071 break;
3556 case 3: /* set position (pixels) */ 3072 case 3: /* set position (pixels) */
3557 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3073 XMoveWindow (dpy, parent[0], args[1], args[2]);
3558 break; 3074 break;
3559 case 4: /* set size (pixels) */ 3075 case 4: /* set size (pixels) */
3560 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3076 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3561 break; 3077 break;
3562 case 5: /* raise window */ 3078 case 5: /* raise window */
3563 XRaiseWindow (xdisp, parent[0]); 3079 XRaiseWindow (dpy, parent[0]);
3564 break; 3080 break;
3565 case 6: /* lower window */ 3081 case 6: /* lower window */
3566 XLowerWindow (xdisp, parent[0]); 3082 XLowerWindow (dpy, parent[0]);
3567 break; 3083 break;
3568 case 7: /* refresh window */ 3084 case 7: /* refresh window */
3569 scr_touch (true); 3085 scr_touch (true);
3570 break; 3086 break;
3571 case 8: /* set size (chars) */ 3087 case 8: /* set size (chars) */
… …
3582 3098
3583 /* 3099 /*
3584 * reports - some output format copied from XTerm 3100 * reports - some output format copied from XTerm
3585 */ 3101 */
3586 case 11: /* report window state */ 3102 case 11: /* report window state */
3587 XGetWindowAttributes (xdisp, parent[0], &wattr); 3103 XGetWindowAttributes (dpy, parent[0], &wattr);
3588 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3104 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3589 break; 3105 break;
3590 case 13: /* report window position */ 3106 case 13: /* report window position */
3591 XGetWindowAttributes (xdisp, parent[0], &wattr); 3107 XGetWindowAttributes (dpy, parent[0], &wattr);
3592 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3108 XTranslateCoordinates (dpy, parent[0], wattr.root,
3593 -wattr.border_width, -wattr.border_width, 3109 -wattr.border_width, -wattr.border_width,
3594 &x, &y, &wdummy); 3110 &x, &y, &wdummy);
3595 tt_printf ("\033[3;%d;%dt", x, y); 3111 tt_printf ("\033[3;%d;%dt", x, y);
3596 break; 3112 break;
3597 case 14: /* report window size (pixels) */ 3113 case 14: /* report window size (pixels) */
3598 XGetWindowAttributes (xdisp, parent[0], &wattr); 3114 XGetWindowAttributes (dpy, parent[0], &wattr);
3599 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3115 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3600 break; 3116 break;
3601 case 18: /* report text area size (chars) */ 3117 case 18: /* report text area size (chars) */
3602 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3118 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3603 break; 3119 break;
… …
3605 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3121 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3606 break; 3122 break;
3607 case 20: /* report icon label */ 3123 case 20: /* report icon label */
3608 { 3124 {
3609 char *s; 3125 char *s;
3610 XGetIconName (xdisp, parent[0], &s); 3126 XGetIconName (dpy, parent[0], &s);
3611 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3127 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3612 XFree (s); 3128 XFree (s);
3613 } 3129 }
3614 break; 3130 break;
3615 case 21: /* report window title */ 3131 case 21: /* report window title */
3616 { 3132 {
3617 char *s; 3133 char *s;
3618 XFetchName (xdisp, parent[0], &s); 3134 XFetchName (dpy, parent[0], &s);
3619 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3135 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3620 XFree (s); 3136 XFree (s);
3621 } 3137 }
3622 break; 3138 break;
3623 } 3139 }
3624} 3140}
… …
3651 seen_esc = true; 3167 seen_esc = true;
3652 continue; 3168 continue;
3653 } 3169 }
3654 else if (ch == C0_BEL || ch == CHAR_ST) 3170 else if (ch == C0_BEL || ch == CHAR_ST)
3655 break; 3171 break;
3172 else if (ch == C0_SYN)
3173 ch = cmd_get8 ();
3656 else if (ch < 0x20) 3174 else if (ch < 0x20)
3657 return NULL; /* other control character - exit */ 3175 return NULL; /* other control character - exit */
3658 3176
3659 seen_esc = false; 3177 seen_esc = false;
3660 3178
3661 if (n >= STRING_MAX - 1) 3179 if (n >= STRING_MAX - 1)
3662 // stop at some sane length 3180 // stop at some sane length
3663 return NULL; 3181 return NULL;
3664 3182
3665 if (ch == C0_SYN)
3666 string[n++] = cmd_get8 ();
3667 else
3668 string[n++] = ch; 3183 string[n++] = ch;
3669 } 3184 }
3670 3185
3671 string[n++] = '\0'; 3186 string[n++] = '\0';
3672 3187
3673 ends_how = (ch == 0x5c ? C0_ESC : ch); 3188 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3749 int color; 3264 int color;
3750 char *buf, *name; 3265 char *buf, *name;
3751 bool query = str[0] == '?' && !str[1]; 3266 bool query = str[0] == '?' && !str[1];
3752 int saveop = op; 3267 int saveop = op;
3753 3268
3754 dLocal (Display *, xdisp); 3269 dLocal (Display *, dpy);
3755 3270
3756 assert (str != NULL); 3271 assert (str != NULL);
3272
3273 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3274 return;
3275
3757 switch (op) 3276 switch (op)
3758 { 3277 {
3759 case XTerm_name: 3278 case XTerm_name:
3760 set_title (str); 3279 set_title (str);
3761 /* FALLTHROUGH */ 3280 /* FALLTHROUGH */
… …
3775 unsigned long bytes_after; 3294 unsigned long bytes_after;
3776 unsigned char *value = 0; 3295 unsigned char *value = 0;
3777 const char *str = ""; 3296 const char *str = "";
3778 3297
3779 if (prop 3298 if (prop
3780 && XGetWindowProperty (xdisp, parent[0], 3299 && XGetWindowProperty (dpy, parent[0],
3781 prop, 0, 1<<16, 0, AnyPropertyType, 3300 prop, 0, 1<<16, 0, AnyPropertyType,
3782 &actual_type, &actual_format, 3301 &actual_type, &actual_format,
3783 &nitems, &bytes_after, &value) == Success 3302 &nitems, &bytes_after, &value) == Success
3784 && actual_type != None 3303 && actual_type != None
3785 && actual_format == 8) 3304 && actual_format == 8)
… …
3797 { 3316 {
3798 *eq = 0; 3317 *eq = 0;
3799 set_utf8_property (display->atom (str), eq + 1); 3318 set_utf8_property (display->atom (str), eq + 1);
3800 } 3319 }
3801 else 3320 else
3802 XDeleteProperty (xdisp, parent[0], 3321 XDeleteProperty (dpy, parent[0],
3803 display->atom (str)); 3322 display->atom (str));
3804 } 3323 }
3805 break; 3324 break;
3806 3325
3807 case XTerm_Color: 3326 case XTerm_Color:
… …
3820 *buf++ = '\0'; 3339 *buf++ = '\0';
3821 3340
3822 process_color_seq (op, color, name, resp); 3341 process_color_seq (op, color, name, resp);
3823 } 3342 }
3824 break; 3343 break;
3344 case Rxvt_restoreFG:
3825 case XTerm_Color00: 3345 case XTerm_Color00:
3826 process_color_seq (op, Color_fg, str, resp); 3346 process_color_seq (op, Color_fg, str, resp);
3827 break; 3347 break;
3348 case Rxvt_restoreBG:
3828 case XTerm_Color01: 3349 case XTerm_Color01:
3829 process_color_seq (op, Color_bg, str, resp); 3350 process_color_seq (op, Color_bg, str, resp);
3830 break; 3351 break;
3831#ifndef NO_CURSORCOLOR 3352#ifndef NO_CURSORCOLOR
3832 case XTerm_Color_cursor: 3353 case XTerm_Color_cursor:
… …
3853 break; 3374 break;
3854 case URxvt_Color_IT: 3375 case URxvt_Color_IT:
3855 process_color_seq (op, Color_IT, str, resp); 3376 process_color_seq (op, Color_IT, str, resp);
3856 break; 3377 break;
3857#endif 3378#endif
3858#if TRANSPARENT && TINTING 3379#if ENABLE_TRANSPARENCY
3859 case URxvt_Color_tint: 3380 case URxvt_Color_tint:
3860 process_color_seq (op, Color_tint, str, resp); 3381 process_color_seq (op, Color_tint, str, resp);
3382 {
3383 bool changed = false;
3861 3384
3862 check_our_parents (); 3385 if (ISSET_PIXCOLOR (Color_tint))
3386 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3387 else
3388 changed = bgPixmap.unset_tint ();
3863 3389
3864 if (am_transparent) 3390 if (changed)
3865 want_full_refresh = want_refresh = 1; 3391 update_background ();
3392 }
3866 3393
3867 break; 3394 break;
3868#endif 3395#endif
3869 3396
3397#if BG_IMAGE_FROM_FILE
3870 case Rxvt_Pixmap: 3398 case Rxvt_Pixmap:
3871 { 3399 if (!strcmp (str, "?"))
3872 if (*str != ';')
3873 { 3400 {
3874#if XPM_BACKGROUND 3401 char str[256];
3875 scale_pixmap (""); /* reset to default scaling */ 3402
3876 set_bgPixmap (str); /* change pixmap */ 3403 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3877 scr_touch (true); 3404 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3878#endif 3405 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3406 process_xterm_seq (XTerm_title, str, CHAR_ST);
3879 } 3407 }
3880 3408 else
3409 {
3881 int changed = 0; 3410 int changed = 0;
3882 3411
3883 while ((str = strchr (str, ';')) != NULL) 3412 if (*str != ';')
3884 { 3413 {
3414 /* reset to default scaling :*/
3415 bgPixmap.unset_geometry ();
3416 if (bgPixmap.set_file (str)) /* change pixmap */
3417 changed++;
3418 str = strchr (str, ';');
3419 if (str == NULL)
3420 bgPixmap.set_defaultGeometry ();
3421 }
3422
3423 while (str)
3424 {
3885 str++; 3425 str++;
3886#if XPM_BACKGROUND 3426 if (bgPixmap.set_geometry (str))
3887 changed += scale_pixmap (str); 3427 changed++;
3888#endif 3428 str = strchr (str, ';');
3889 } 3429 }
3890 3430
3891 if (changed) 3431 if (changed)
3892 { 3432 update_background ();
3893#ifdef XPM_BACKGROUND
3894 resize_pixmap ();
3895 scr_touch (true);
3896#endif
3897 } 3433 }
3898 }
3899 break; 3434 break;
3900 3435#endif
3901 case Rxvt_restoreFG:
3902 set_window_color (Color_fg, str);
3903 break;
3904 case Rxvt_restoreBG:
3905 set_window_color (Color_bg, str);
3906 break;
3907 3436
3908 case XTerm_logfile: 3437 case XTerm_logfile:
3909 // TODO, when secure mode? 3438 // TODO, when secure mode?
3910 break; 3439 break;
3911 3440
… …
3929 case URxvt_italicFont: 3458 case URxvt_italicFont:
3930 case URxvt_boldItalicFont: 3459 case URxvt_boldItalicFont:
3931#endif 3460#endif
3932 if (query) 3461 if (query)
3933 tt_printf ("\33]%d;%-.250s%c", saveop, 3462 tt_printf ("\33]%d;%-.250s%c", saveop,
3934 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3463 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3935 ? fontset[op - URxvt_font]->fontdesc : "", 3464 ? fontset[op - URxvt_font]->fontdesc : "",
3936 resp); 3465 resp);
3937 else 3466 else
3938 { 3467 {
3939 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3468 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3953 break; 3482 break;
3954 3483
3955#if !ENABLE_MINIMAL 3484#if !ENABLE_MINIMAL
3956 case URxvt_locale: 3485 case URxvt_locale:
3957 if (query) 3486 if (query)
3958 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3487 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3959 else 3488 else
3960 { 3489 {
3961 set_locale (str); 3490 set_locale (str);
3962 pty->set_utf8_mode (enc_utf8); 3491 pty->set_utf8_mode (enc_utf8);
3963 init_xlocale (); 3492 init_xlocale ();
… …
3978 break; 3507 break;
3979#endif 3508#endif
3980 3509
3981#if ENABLE_PERL 3510#if ENABLE_PERL
3982 case URxvt_perl: 3511 case URxvt_perl:
3983 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3512 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3984 ; // no responses yet 3513 ; // no responses yet
3985 break; 3514 break;
3986#endif 3515#endif
3987 } 3516 }
3988} 3517}
… …
4012 { 3541 {
4013 if (mode == 'r') 3542 if (mode == 'r')
4014 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3543 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4015 else 3544 else
4016 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3545 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4017 PrivMode (state, bit); 3546 set_privmode (bit, state);
4018 } 3547 }
4019 3548
4020 return state; 3549 return state;
4021} 3550}
4022 3551
… …
4026{ 3555{
4027 unsigned int i, j; 3556 unsigned int i, j;
4028 int state; 3557 int state;
4029 3558
4030 static const struct 3559 static const struct
4031 { 3560 {
4032 const int argval; 3561 const int argval;
4033 const unsigned long bit; 3562 const unsigned long bit;
4034 }
4035
4036 argtopriv[] = { 3563 } argtopriv[] = {
4037 { 1, PrivMode_aplCUR }, 3564 { 1, PrivMode_aplCUR },
4038 { 2, PrivMode_vt52 }, 3565 { 2, PrivMode_vt52 },
4039 { 3, PrivMode_132 }, 3566 { 3, PrivMode_132 },
4040 { 4, PrivMode_smoothScroll }, 3567 { 4, PrivMode_smoothScroll },
4041 { 5, PrivMode_rVideo }, 3568 { 5, PrivMode_rVideo },
… …
4057 { 66, PrivMode_aplKP }, 3584 { 66, PrivMode_aplKP },
4058#ifndef NO_BACKSPACE_KEY 3585#ifndef NO_BACKSPACE_KEY
4059 { 67, PrivMode_BackSpace }, 3586 { 67, PrivMode_BackSpace },
4060#endif 3587#endif
4061 { 1000, PrivMode_MouseX11 }, 3588 { 1000, PrivMode_MouseX11 },
4062 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3589 { 1002, PrivMode_MouseBtnEvent },
4063 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3590 { 1003, PrivMode_MouseAnyEvent },
4064 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4065 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4066 { 1011, PrivMode_Keypress }, // rxvt extension 3592 { 1011, PrivMode_Keypress }, // rxvt extension
4067 // 1035 enable modifiers for alt, numlock NYI 3593 // 1035 enable modifiers for alt, numlock NYI
4068 // 1036 send ESC for meta keys NYI 3594 // 1036 send ESC for meta keys NYI
4069 // 1037 send DEL for keypad delete NYI 3595 // 1037 send DEL for keypad delete NYI
4070 { 1047, PrivMode_Screen }, 3596 { 1047, PrivMode_Screen },
4071 // 1048 save and restore cursor 3597 // 1048 save and restore cursor
4072 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3598 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4073 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3599 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3600 { 2004, PrivMode_BracketPaste },
4074 }; 3601 };
4075 3602
4076 if (nargs == 0) 3603 if (nargs == 0)
4077 return; 3604 return;
4078 3605
… …
4104 scr_touch (true); 3631 scr_touch (true);
4105 break; 3632 break;
4106#endif 3633#endif
4107 case 1048: /* alternative cursor save */ 3634 case 1048: /* alternative cursor save */
4108 case 1049: 3635 case 1049:
4109 if (OPTION (Opt_secondaryScreen)) 3636 if (option (Opt_secondaryScreen))
4110 if (mode == 0) 3637 if (mode == 0)
4111 scr_cursor (RESTORE); 3638 scr_cursor (RESTORE);
4112 else if (mode == 1) 3639 else if (mode == 1)
4113 scr_cursor (SAVE); 3640 scr_cursor (SAVE);
4114 break; 3641 break;
… …
4122 case 2: /* VT52 mode */ 3649 case 2: /* VT52 mode */
4123 /* oddball mode. should be set regardless of set/reset 3650 /* oddball mode. should be set regardless of set/reset
4124 * parameter. Return from VT52 mode with an ESC < from 3651 * parameter. Return from VT52 mode with an ESC < from
4125 * within VT52 mode 3652 * within VT52 mode
4126 */ 3653 */
4127 PrivMode (1, PrivMode_vt52); 3654 set_privmode (PrivMode_vt52, 1);
4128 break; 3655 break;
4129 case 3: /* 80/132 */ 3656 case 3: /* 80/132 */
4130 if (priv_modes & PrivMode_132OK) 3657 if (priv_modes & PrivMode_132OK)
3658 {
3659 scr_poweron ();
4131 set_widthheight (((state ? 132 : 80) * fwidth), height); 3660 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3661 }
4132 break; 3662 break;
4133 case 4: /* smooth scrolling */ 3663 case 4: /* smooth scrolling */
4134 set_option (Opt_jumpScroll, !state); 3664 set_option (Opt_jumpScroll, !state);
4135 break; 3665 break;
4136 case 5: /* reverse video */ 3666 case 5: /* reverse video */
… …
4143 scr_autowrap (state); 3673 scr_autowrap (state);
4144 break; 3674 break;
4145 /* case 8: - auto repeat, can't do on a per window basis */ 3675 /* case 8: - auto repeat, can't do on a per window basis */
4146 case 9: /* X10 mouse reporting */ 3676 case 9: /* X10 mouse reporting */
4147 if (state) /* orthogonal */ 3677 if (state) /* orthogonal */
4148 priv_modes &= ~PrivMode_MouseX11; 3678 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4149 break; 3679 break;
4150#ifdef scrollBar_esc 3680#ifdef scrollBar_esc
4151 case scrollBar_esc: 3681 case scrollBar_esc:
4152 if (scrollbar_mapping (state)) 3682 if (scrollBar.map (state))
4153 { 3683 {
4154 resize_all_windows (0, 0, 0); 3684 resize_all_windows (0, 0, 0);
4155 scr_touch (true); 3685 scr_touch (true);
4156 } 3686 }
4157 break; 3687 break;
… …
4166 break; 3696 break;
4167 /* case 66: - application key pad */ 3697 /* case 66: - application key pad */
4168 /* case 67: - backspace key */ 3698 /* case 67: - backspace key */
4169 case 1000: /* X11 mouse reporting */ 3699 case 1000: /* X11 mouse reporting */
4170 if (state) /* orthogonal */ 3700 if (state) /* orthogonal */
4171 priv_modes &= ~PrivMode_MouseX10; 3701 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4172 break; 3702 break;
4173#if 0
4174 case 1001: 3703 case 1002:
4175 break; /* X11 mouse highlighting */ 3704 case 1003:
4176#endif 3705 if (state)
3706 {
3707 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3708 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3709 vt_emask_mouse = PointerMotionMask;
3710 }
3711 else
3712 vt_emask_mouse = NoEventMask;
3713 vt_select_input ();
3714 break;
4177 case 1010: /* scroll to bottom on TTY output inhibit */ 3715 case 1010: /* scroll to bottom on TTY output inhibit */
4178 set_option (Opt_scrollTtyOutput, !state); 3716 set_option (Opt_scrollTtyOutput, !state);
4179 break; 3717 break;
4180 case 1011: /* scroll to bottom on key press */ 3718 case 1011: /* scroll to bottom on key press */
4181 set_option (Opt_scrollTtyKeypress, state); 3719 set_option (Opt_scrollTtyKeypress, state);
4182 break; 3720 break;
4183 case 1047: /* secondary screen w/ clearing last */ 3721 case 1047: /* secondary screen w/ clearing last */
4184 if (OPTION (Opt_secondaryScreen)) 3722 if (option (Opt_secondaryScreen))
4185 if (current_screen != PRIMARY) 3723 if (current_screen != PRIMARY)
4186 scr_erase_screen (2); 3724 scr_erase_screen (2);
4187 scr_change_screen (state); 3725 scr_change_screen (state);
4188 break; 3726 break;
4189 case 1049: /* secondary screen w/ clearing first */ 3727 case 1049: /* secondary screen w/ clearing first */
4190 scr_change_screen (state); 3728 scr_change_screen (state);
4191 if (OPTION (Opt_secondaryScreen)) 3729 if (option (Opt_secondaryScreen))
4192 if (current_screen != PRIMARY) 3730 if (current_screen != PRIMARY)
4193 scr_erase_screen (2); 3731 scr_erase_screen (2);
4194 break; 3732 break;
4195 default: 3733 default:
4196 break; 3734 break;
… …
4358rxvt_term::process_graphics () 3896rxvt_term::process_graphics ()
4359{ 3897{
4360 unicode_t ch, cmd = cmd_getc (); 3898 unicode_t ch, cmd = cmd_getc ();
4361 3899
4362 if (cmd == 'Q') 3900 if (cmd == 'Q')
3901 {
4363 { /* query graphics */ 3902 /* query graphics */
4364 tt_printf ("\033G0\012"); /* no graphics */ 3903 tt_printf ("\033G0\012"); /* no graphics */
4365 return; 3904 return;
4366 } 3905 }
4367 /* swallow other graphics sequences until terminating ':' */ 3906 /* swallow other graphics sequences until terminating ':' */
4368 do 3907 do
… …
4418 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3957 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4419 3958
4420 memcpy (v_buffer + v_buflen, data, len); 3959 memcpy (v_buffer + v_buflen, data, len);
4421 v_buflen += len; 3960 v_buflen += len;
4422 3961
4423 pty_ev.set (EVENT_READ | EVENT_WRITE); 3962 pty_ev.set (ev::READ | ev::WRITE);
4424} 3963}
4425 3964
4426void rxvt_term::pty_write () 3965void rxvt_term::pty_write ()
4427{ 3966{
4428 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3967 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4433 3972
4434 if (v_buflen == 0) 3973 if (v_buflen == 0)
4435 { 3974 {
4436 free (v_buffer); 3975 free (v_buffer);
4437 v_buffer = 0; 3976 v_buffer = 0;
4438 v_buflen = 0;
4439 3977
4440 pty_ev.set (EVENT_READ); 3978 pty_ev.set (ev::READ);
4441 return; 3979 return;
4442 } 3980 }
4443 3981
4444 memmove (v_buffer, v_buffer + written, v_buflen); 3982 memmove (v_buffer, v_buffer + written, v_buflen);
4445 } 3983 }
4446 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3984 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4447 pty_ev.set (EVENT_READ); 3985 pty_ev.set (ev::READ);
4448} 3986}
4449 3987
4450/*----------------------- end-of-file (C source) -----------------------*/ 3988/*----------------------- end-of-file (C source) -----------------------*/
4451 3989

Diff Legend

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