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.301 by root, Tue Jan 31 21:23:13 2006 UTC vs.
Revision 1.435 by sf-exg, Wed Jan 6 12:10:44 2010 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.
… …
55# include "keyboard.h" 56# include "keyboard.h"
56#endif 57#endif
57 58
58#include <csignal> 59#include <csignal>
59 60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64
60/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
61 66
62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
63 68
64#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
… …
91 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
92 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
93 98
94 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
95 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
96 XK_ISO_Lock, 0x21eb,
97 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
98 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
99 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
100 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
101 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
195 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
196 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
197 201
198 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
199 203
200 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
201 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
202 206
203 if (y >= 0) 207 if (y >= 0)
204 { 208 {
205 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
217 ch = *chr++; 221 ch = *chr++;
218 222
219 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
220 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
221 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
222# if !UNICODE3 226# if !UNICODE_3
223 if (ch >= 0x10000) 227 if (ch >= 0x10000)
224 ch = 0xfffd; 228 ch = 0xfffd;
225# endif 229# endif
226 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
227 231
… …
275 } 279 }
276 280
277 iso14755buf = 0; 281 iso14755buf = 0;
278} 282}
279 283
280int 284static int
281rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
282{ 286{
283 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
284 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
285 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
286 { 290 {
… …
294 298
295 return -1; 299 return -1;
296} 300}
297#endif 301#endif
298 302
299/*{{{ 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
300void 398void
301rxvt_term::lookup_key (XKeyEvent &ev) 399rxvt_term::key_press (XKeyEvent &ev)
302{ 400{
303 int ctrl, meta, shft, len; 401 int ctrl, meta, shft, len;
304 unsigned int newlen;
305 KeySym keysym; 402 KeySym keysym;
306 int valid_keysym; 403 int valid_keysym;
307 char kbuf[KBUFSZ]; 404 char kbuf[KBUFSZ];
405
406#if ISO_14755
407 if (iso14755buf & ISO_14755_52)
408 return;
409#endif
308 410
309 /* 411 /*
310 * 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
311 * escape sequence to toggle the Keypad. 413 * escape sequence to toggle the Keypad.
312 * 414 *
… …
317 meta = ev.state & ModMetaMask; 419 meta = ev.state & ModMetaMask;
318 420
319 if (numlock_state || (ev.state & ModNumLockMask)) 421 if (numlock_state || (ev.state & ModNumLockMask))
320 { 422 {
321 numlock_state = (ev.state & ModNumLockMask); 423 numlock_state = (ev.state & ModNumLockMask);
322 PrivMode ((!numlock_state), PrivMode_aplKP); 424 set_privmode (PrivMode_aplKP, !numlock_state);
323 } 425 }
324 426
325 kbuf[0] = 0; 427 kbuf[0] = 0;
326 428
327#ifdef USE_XIM 429#ifdef USE_XIM
… …
477 } 579 }
478 } 580 }
479 581
480#if ENABLE_FRILLS || ISO_14755 582#if ENABLE_FRILLS || ISO_14755
481 // ISO 14755 support 583 // ISO 14755 support
482 if (shft && ctrl) 584 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
483 { 585 {
484 int hv; 586 int hv;
485 587
486 if (iso14755buf & ISO_14755_51 588 if (iso14755buf & ISO_14755_51
487 && (keysym == XK_space || keysym == XK_KP_Space 589 && (keysym == XK_space || keysym == XK_KP_Space
… …
489 { 591 {
490 commit_iso14755 (); 592 commit_iso14755 ();
491 iso14755buf = ISO_14755_51; 593 iso14755buf = ISO_14755_51;
492# if ISO_14755 594# if ISO_14755
493 iso14755_51 (0); 595 iso14755_51 (0);
596# endif
597 return;
598 }
599 else if (keysym == XK_BackSpace)
600 {
601 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
602# if ISO_14755
603 iso14755_51 (iso14755buf & ISO_14755_MASK);
494# endif 604# endif
495 return; 605 return;
496 } 606 }
497 else if ((hv = hex_keyval (ev)) >= 0) 607 else if ((hv = hex_keyval (ev)) >= 0)
498 { 608 {
… …
503# endif 613# endif
504 return; 614 return;
505 } 615 }
506 else 616 else
507 { 617 {
508# if ENABLE_OVERLAY 618# if ISO_14755
509 scr_overlay_off (); 619 scr_overlay_off ();
510# endif 620# endif
511 iso14755buf = 0; 621 iso14755buf = 0;
512 } 622 }
513 } 623 }
624 else if (option (Opt_iso14755) &&
514 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 625 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
515 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 626 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
516 if (!(iso14755buf & ISO_14755_STARTED)) 627 if (!(iso14755buf & ISO_14755_STARTED))
517 { 628 {
518 iso14755buf |= ISO_14755_STARTED; 629 iso14755buf |= ISO_14755_STARTED;
519# if ENABLE_OVERLAY 630# if ISO_14755
520 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 631 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
521 scr_overlay_set (0, 0, "ISO 14755 mode"); 632 scr_overlay_set (0, 0, "ISO 14755 mode");
522# endif 633# endif
523 } 634 }
524#endif 635#endif
525 636
526#ifdef PRINTPIPE 637#ifdef PRINTPIPE
527 if (keysym == XK_Print) 638 if (keysym == XK_Print)
528 { 639 {
529 scr_printscreen (ctrl | shft); 640 scr_printscreen (ctrl | shft);
530 return; 641 return;
531 } 642 }
532#endif 643#endif
533 644
534 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 645 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
535 { 646 {
647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
648 unsigned int newlen = 1;
649
650 switch (translate_keypad (keysym, kp))
536 { 651 {
652#ifndef NO_BACKSPACE_KEY
653 case XK_BackSpace:
654 if (priv_modes & PrivMode_HaveBackSpace)
655 {
656 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
657 ^ !!ctrl) ? '\b' : '\177';
658 kbuf[1] = '\0';
659 }
660 else
661 strcpy (kbuf, rs[Rs_backspace_key]);
662 break;
663#endif
664#ifndef NO_DELETE_KEY
665 case XK_Delete:
666 strcpy (kbuf, rs[Rs_delete_key]);
667 break;
668#endif
669 case XK_Tab:
670 if (shft)
671 strcpy (kbuf, "\033[Z");
672 else
673 {
674#ifdef CTRL_TAB_MAKES_META
675 if (ctrl)
676 meta = 1;
677#endif
678#ifdef MOD4_TAB_MAKES_META
679 if (ev.state & Mod4Mask)
680 meta = 1;
681#endif
537 newlen = 1; 682 newlen = 0;
538 switch (keysym) 683 }
684 break;
685
686 case XK_Up: /* "\033[A" */
687 case XK_Down: /* "\033[B" */
688 case XK_Right: /* "\033[C" */
689 case XK_Left: /* "\033[D" */
690 strcpy (kbuf, "\033[Z");
691 kbuf[2] = "DACB"[keysym - XK_Left];
692 /* do Shift first */
693 if (shft)
694 kbuf[2] = "dacb"[keysym - XK_Left];
695 else if (ctrl)
696 {
697 kbuf[1] = 'O';
698 kbuf[2] = "dacb"[keysym - XK_Left];
699 }
700 else if (priv_modes & PrivMode_aplCUR)
701 kbuf[1] = 'O';
702 break;
703
704 case XK_KP_Enter:
705 /* allow shift to override */
706 if (kp)
707 {
708 strcpy (kbuf, "\033OM");
709 break;
710 }
711
712 /* FALLTHROUGH */
713
714 case XK_Return:
715 if (priv_modes & PrivMode_LFNL)
716 {
717 kbuf[0] = '\015';
718 kbuf[1] = '\012';
719 kbuf[2] = '\0';
720 }
721 else
722 {
723 kbuf[0] = '\015';
724 kbuf[1] = '\0';
725 }
726 break;
727
728 case XK_KP_F1: /* "\033OP" */
729 case XK_KP_F2: /* "\033OQ" */
730 case XK_KP_F3: /* "\033OR" */
731 case XK_KP_F4: /* "\033OS" */
732 strcpy (kbuf, "\033OP");
733 kbuf[2] += (keysym - XK_KP_F1);
734 break;
735
736 case XK_KP_Multiply: /* "\033Oj" : "*" */
737 case XK_KP_Add: /* "\033Ok" : "+" */
738 case XK_KP_Separator: /* "\033Ol" : "," */
739 case XK_KP_Subtract: /* "\033Om" : "-" */
740 case XK_KP_Decimal: /* "\033On" : "." */
741 case XK_KP_Divide: /* "\033Oo" : "/" */
742 case XK_KP_0: /* "\033Op" : "0" */
743 case XK_KP_1: /* "\033Oq" : "1" */
744 case XK_KP_2: /* "\033Or" : "2" */
745 case XK_KP_3: /* "\033Os" : "3" */
746 case XK_KP_4: /* "\033Ot" : "4" */
747 case XK_KP_5: /* "\033Ou" : "5" */
748 case XK_KP_6: /* "\033Ov" : "6" */
749 case XK_KP_7: /* "\033Ow" : "7" */
750 case XK_KP_8: /* "\033Ox" : "8" */
751 case XK_KP_9: /* "\033Oy" : "9" */
752 /* allow shift to override */
753 if (kp)
754 {
755 strcpy (kbuf, "\033Oj");
756 kbuf[2] += (keysym - XK_KP_Multiply);
757 }
758 else
759 {
760 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
761 kbuf[1] = '\0';
762 }
763 break;
764
765 default:
539 { 766 {
540#ifndef NO_BACKSPACE_KEY 767 int param = map_function_key (keysym);
541 case XK_BackSpace: 768 if (param > 0)
542 if (priv_modes & PrivMode_HaveBackSpace) 769 sprintf (kbuf,"\033[%d~", param);
543 {
544 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
545 ^ !!ctrl) ? '\b' : '\177';
546 kbuf[1] = '\0';
547 }
548 else 770 else
549 strcpy (kbuf, key_backspace);
550 break;
551#endif
552#ifndef NO_DELETE_KEY
553# ifdef XK_KP_Prior
554 case XK_KP_Delete:
555 /* allow shift to override */
556 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
557 {
558 strcpy (kbuf, "\033On");
559 break;
560 }
561 /* FALLTHROUGH */
562# endif
563 case XK_Delete:
564 strcpy (kbuf, key_delete);
565 break;
566#endif
567 case XK_Tab:
568 if (shft)
569 strcpy (kbuf, "\033[Z");
570 else
571 {
572#ifdef CTRL_TAB_MAKES_META
573 if (ctrl)
574 meta = 1;
575#endif
576#ifdef MOD4_TAB_MAKES_META
577 if (ev.state & Mod4Mask)
578 meta = 1;
579#endif
580 newlen = 0;
581 }
582 break;
583
584#ifdef XK_KP_Left
585 case XK_KP_Up: /* \033Ox or standard */
586 case XK_KP_Down: /* \033Or or standard */
587 case XK_KP_Right: /* \033Ov or standard */
588 case XK_KP_Left: /* \033Ot or standard */
589 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
590 {
591 strcpy (kbuf, "\033OZ");
592 kbuf[2] = "txvr"[keysym - XK_KP_Left];
593 break;
594 }
595 else
596 /* translate to std. cursor key */
597 keysym = XK_Left + (keysym - XK_KP_Left);
598 /* FALLTHROUGH */
599#endif
600 case XK_Up: /* "\033[A" */
601 case XK_Down: /* "\033[B" */
602 case XK_Right: /* "\033[C" */
603 case XK_Left: /* "\033[D" */
604 strcpy (kbuf, "\033[Z");
605 kbuf[2] = "DACB"[keysym - XK_Left];
606 /* do Shift first */
607 if (shft)
608 kbuf[2] = "dacb"[keysym - XK_Left];
609 else if (ctrl)
610 {
611 kbuf[1] = 'O';
612 kbuf[2] = "dacb"[keysym - XK_Left];
613 }
614 else if (priv_modes & PrivMode_aplCUR)
615 kbuf[1] = 'O';
616 break;
617
618#ifndef UNSHIFTED_SCROLLKEYS
619# ifdef XK_KP_Prior
620 case XK_KP_Prior:
621 /* allow shift to override */
622 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
623 {
624 strcpy (kbuf, "\033Oy");
625 break;
626 }
627 /* FALLTHROUGH */
628# endif
629 case XK_Prior:
630 strcpy (kbuf, "\033[5~");
631 break;
632# ifdef XK_KP_Next
633 case XK_KP_Next:
634 /* allow shift to override */
635 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
636 {
637 strcpy (kbuf, "\033Os");
638 break;
639 }
640 /* FALLTHROUGH */
641# endif
642 case XK_Next:
643 strcpy (kbuf, "\033[6~");
644 break;
645#endif
646 case XK_KP_Enter:
647 /* allow shift to override */
648 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
649 {
650 strcpy (kbuf, "\033OM");
651 break;
652 }
653
654 /* FALLTHROUGH */
655
656 case XK_Return:
657 if (priv_modes & PrivMode_LFNL)
658 {
659 kbuf[0] = '\015';
660 kbuf[1] = '\012';
661 kbuf[2] = '\0';
662 }
663 else
664 {
665 kbuf[0] = '\015';
666 kbuf[1] = '\0';
667 }
668 break;
669
670#ifdef XK_KP_Begin
671 case XK_KP_Begin:
672 strcpy (kbuf, "\033Ou");
673 break;
674
675#endif
676 case XK_KP_F1: /* "\033OP" */
677 case XK_KP_F2: /* "\033OQ" */
678 case XK_KP_F3: /* "\033OR" */
679 case XK_KP_F4: /* "\033OS" */
680 strcpy (kbuf, "\033OP");
681 kbuf[2] += (keysym - XK_KP_F1);
682 break;
683
684 case XK_KP_Multiply: /* "\033Oj" : "*" */
685 case XK_KP_Add: /* "\033Ok" : "+" */
686 case XK_KP_Separator: /* "\033Ol" : "," */
687 case XK_KP_Subtract: /* "\033Om" : "-" */
688 case XK_KP_Decimal: /* "\033On" : "." */
689 case XK_KP_Divide: /* "\033Oo" : "/" */
690 case XK_KP_0: /* "\033Op" : "0" */
691 case XK_KP_1: /* "\033Oq" : "1" */
692 case XK_KP_2: /* "\033Or" : "2" */
693 case XK_KP_3: /* "\033Os" : "3" */
694 case XK_KP_4: /* "\033Ot" : "4" */
695 case XK_KP_5: /* "\033Ou" : "5" */
696 case XK_KP_6: /* "\033Ov" : "6" */
697 case XK_KP_7: /* "\033Ow" : "7" */
698 case XK_KP_8: /* "\033Ox" : "8" */
699 case XK_KP_9: /* "\033Oy" : "9" */
700 /* allow shift to override */
701 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
702 {
703 strcpy (kbuf, "\033Oj");
704 kbuf[2] += (keysym - XK_KP_Multiply);
705 }
706 else
707 {
708 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
709 kbuf[1] = '\0';
710 }
711 break;
712
713 case XK_Find:
714 strcpy (kbuf, "\033[1~");
715 break;
716
717#ifdef XK_KP_End
718 case XK_KP_Insert:
719 /* allow shift to override */
720 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
721 {
722 strcpy (kbuf, "\033Op");
723 break;
724 }
725 /* FALLTHROUGH */
726#endif
727 case XK_Insert:
728 strcpy (kbuf, "\033[2~");
729 break;
730#ifdef DXK_Remove /* support for DEC remove like key */
731 case DXK_Remove:
732 /* FALLTHROUGH */
733#endif
734 case XK_Execute:
735 strcpy (kbuf, "\033[3~");
736 break;
737 case XK_Select:
738 strcpy (kbuf, "\033[4~");
739 break;
740#ifdef XK_KP_End
741 case XK_KP_End:
742 /* allow shift to override */
743 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
744 {
745 strcpy (kbuf, "\033Oq");
746 break;
747 }
748 /* FALLTHROUGH */
749#endif
750 case XK_End:
751 strcpy (kbuf, KS_END);
752 break;
753#ifdef XK_KP_Home
754 case XK_KP_Home:
755 /* allow shift to override */
756 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
757 {
758 strcpy (kbuf, "\033Ow");
759 break;
760 }
761 /* FALLTHROUGH */
762#endif
763 case XK_Home:
764 strcpy (kbuf, KS_HOME);
765 break;
766
767#define FKEY(n, fkey) \
768 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
769
770 case XK_F1: /* "\033[11~" */
771 case XK_F2: /* "\033[12~" */
772 case XK_F3: /* "\033[13~" */
773 case XK_F4: /* "\033[14~" */
774 case XK_F5: /* "\033[15~" */
775 FKEY (11, XK_F1);
776 break;
777 case XK_F6: /* "\033[17~" */
778 case XK_F7: /* "\033[18~" */
779 case XK_F8: /* "\033[19~" */
780 case XK_F9: /* "\033[20~" */
781 case XK_F10: /* "\033[21~" */
782 FKEY (17, XK_F6);
783 break;
784 case XK_F11: /* "\033[23~" */
785 case XK_F12: /* "\033[24~" */
786 case XK_F13: /* "\033[25~" */
787 case XK_F14: /* "\033[26~" */
788 FKEY (23, XK_F11);
789 break;
790 case XK_F15: /* "\033[28~" */
791 case XK_F16: /* "\033[29~" */
792 FKEY (28, XK_F15);
793 break;
794 case XK_Help: /* "\033[28~" */
795 FKEY (28, XK_Help);
796 break;
797 case XK_Menu: /* "\033[29~" */
798 FKEY (29, XK_Menu);
799 break;
800 case XK_F17: /* "\033[31~" */
801 case XK_F18: /* "\033[32~" */
802 case XK_F19: /* "\033[33~" */
803 case XK_F20: /* "\033[34~" */
804 case XK_F21: /* "\033[35~" */
805 case XK_F22: /* "\033[36~" */
806 case XK_F23: /* "\033[37~" */
807 case XK_F24: /* "\033[38~" */
808 case XK_F25: /* "\033[39~" */
809 case XK_F26: /* "\033[40~" */
810 case XK_F27: /* "\033[41~" */
811 case XK_F28: /* "\033[42~" */
812 case XK_F29: /* "\033[43~" */
813 case XK_F30: /* "\033[44~" */
814 case XK_F31: /* "\033[45~" */
815 case XK_F32: /* "\033[46~" */
816 case XK_F33: /* "\033[47~" */
817 case XK_F34: /* "\033[48~" */
818 case XK_F35: /* "\033[49~" */
819 FKEY (31, XK_F17);
820 break;
821#undef FKEY
822 default:
823 newlen = 0; 771 newlen = 0;
824 break;
825 } 772 }
826 773 break;
827 if (newlen)
828 len = strlen (kbuf);
829 } 774 }
775
776 if (newlen)
777 len = strlen (kbuf);
830 778
831 /* 779 /*
832 * Pass meta for all function keys, if 'meta' option set 780 * Pass meta for all function keys, if 'meta' option set
833 */ 781 */
834#ifdef META8_OPTION 782#ifdef META8_OPTION
… …
869 return; 817 return;
870 818
871 if (len <= 0) 819 if (len <= 0)
872 return; /* not mapped */ 820 return; /* not mapped */
873 821
874 if (OPTION (Opt_scrollTtyKeypress)) 822 if (option (Opt_scrollTtyKeypress))
875 if (view_start) 823 if (view_start)
876 { 824 {
877 view_start = 0; 825 view_start = 0;
878 want_refresh = 1; 826 want_refresh = 1;
879 } 827 }
… …
903 tt_write (&ch, 1); 851 tt_write (&ch, 1);
904 } 852 }
905 853
906 tt_write (kbuf, (unsigned int)len); 854 tt_write (kbuf, (unsigned int)len);
907} 855}
908/*}}} */ 856
857void
858rxvt_term::key_release (XKeyEvent &ev)
859{
860#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
861 KeySym keysym;
862
863 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
864#endif
865
866#if ENABLE_FRILLS || ISO_14755
867 // ISO 14755 support
868 if (iso14755buf)
869 if (iso14755buf & ISO_14755_52)
870 {
871# if ISO_14755
872 scr_overlay_off ();
873# endif
874# if ISO_14755
875 // iso14755 part 5.2 handling: release time
876 // first: controls
877 if ((ev.state & ControlMask)
878 && ((keysym >= 0x40 && keysym <= 0x5f)
879 || (keysym >= 0x61 && keysym <= 0x7f)))
880 {
881 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
882 commit_iso14755 ();
883
884 return;
885 }
886
887 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
888 if (i[0] == keysym)
889 {
890 iso14755buf = ISO_14755_51 | i[1];
891 commit_iso14755 ();
892
893 return;
894 }
895
896 scr_bell ();
897# endif
898 iso14755buf = 0;
899
900 return;
901 }
902 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
903 {
904# if ISO_14755
905 scr_overlay_off ();
906# endif
907 if (iso14755buf & ISO_14755_51)
908 commit_iso14755 ();
909#if ISO_14755
910 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
911 {
912 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
913
914 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
915 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
916 }
917# endif
918 else
919 iso14755buf = 0;
920 }
921#endif
922
923 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
924 return;
925
926#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
927 if (!(ev.state & ControlMask))
928 slip_wheel_ev.stop ();
929 else if (keysym == XK_Control_L || keysym == XK_Control_R)
930 mouse_slip_wheel_speed = 0;
931#endif
932}
909 933
910#if defined (KEYSYM_RESOURCE) 934#if defined (KEYSYM_RESOURCE)
911unsigned int 935unsigned int
912rxvt_term::cmd_write (const char *str, unsigned int count) 936rxvt_term::cmd_write (const char *str, unsigned int count)
913{ 937{
… …
943void 967void
944rxvt_term::flush () 968rxvt_term::flush ()
945{ 969{
946 flush_ev.stop (); 970 flush_ev.stop ();
947 971
948#ifdef TRANSPARENT 972#ifdef HAVE_BG_PIXMAP
949 if (want_full_refresh) 973 if (bgPixmap.check_clearChanged ())
950 { 974 {
951 want_full_refresh = 0; 975// scr_clear (true); This needs to be researched further!
952 scr_clear ();
953 scr_touch (false); 976 scr_touch (false);
954 } 977 }
955#endif 978#endif
956 979
957 if (want_refresh) 980 if (want_refresh)
… …
993 } 1016 }
994 while (row < end_row); 1017 while (row < end_row);
995 } 1018 }
996 1019
997 scr_refresh (); 1020 scr_refresh ();
998 scrollbar_show (1); 1021 scrollBar.show (1);
999#ifdef USE_XIM 1022#ifdef USE_XIM
1000 IMSendSpot (); 1023 IMSendSpot ();
1001#endif 1024#endif
1002 } 1025 }
1003 1026
1004 display->flush (); 1027 display->flush ();
1005} 1028}
1006 1029
1030/* checks wether a refresh is requested and starts the refresh timer */
1007void 1031void
1008rxvt_term::check_cb (check_watcher &w) 1032rxvt_term::refresh_check ()
1033{
1034 if (want_refresh && !flush_ev.is_active ())
1035 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1036
1037 display->flush ();
1038}
1039
1040void
1041rxvt_term::flush_cb (ev::timer &w, int revents)
1009{ 1042{
1010 make_current (); 1043 make_current ();
1011 1044
1012 display->flush ();
1013
1014 if (want_refresh && !flush_ev.active)
1015 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1016}
1017
1018void
1019rxvt_term::flush_cb (time_watcher &w)
1020{
1021 make_current ();
1022
1023 refresh_limit = 1;
1024 refresh_count = 0; 1045 refresh_count = 0;
1025 flush (); 1046 flush ();
1026} 1047}
1027 1048
1028#ifdef CURSOR_BLINK 1049#ifdef CURSOR_BLINK
1029void 1050void
1030rxvt_term::cursor_blink_cb (time_watcher &w) 1051rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1031{ 1052{
1032 hidden_cursor = !hidden_cursor; 1053 hidden_cursor = !hidden_cursor;
1033 want_refresh = 1; 1054 want_refresh = 1;
1034 1055 refresh_check ();
1035 w.start (w.at + CURSOR_BLINK_INTERVAL);
1036} 1056}
1037#endif 1057#endif
1038 1058
1039#ifdef TEXT_BLINK 1059#ifdef TEXT_BLINK
1040void 1060void
1041rxvt_term::text_blink_cb (time_watcher &w) 1061rxvt_term::text_blink_cb (ev::timer &w, int revents)
1042{ 1062{
1043 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1063 if (scr_refresh_rend (RS_Blink, RS_Blink))
1044 { 1064 {
1045 hidden_text = !hidden_text; 1065 hidden_text = !hidden_text;
1046 want_refresh = 1; 1066 want_refresh = 1;
1047 w.start (w.at + TEXT_BLINK_INTERVAL); 1067 refresh_check ();
1048 } 1068 }
1069 else
1070 w.stop ();
1049} 1071}
1050#endif 1072#endif
1051 1073
1052#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1074#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1053void 1075void
1054rxvt_term::cont_scroll_cb (time_watcher &w) 1076rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1055{ 1077{
1056 if ((scrollbar_isUp() || scrollbar_isDn()) && 1078 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1057 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1079 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1058 { 1080 {
1059 want_refresh = 1; 1081 want_refresh = 1;
1060 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1082 refresh_check ();
1061 } 1083 }
1084 else
1085 w.stop ();
1062} 1086}
1063#endif 1087#endif
1064 1088
1065#ifdef SELECTION_SCROLLING 1089#ifdef SELECTION_SCROLLING
1066void 1090void
1067rxvt_term::sel_scroll_cb (time_watcher &w) 1091rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1068{ 1092{
1069 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1093 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1070 { 1094 {
1071 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1095 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1072 want_refresh = 1; 1096 want_refresh = 1;
1073 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1097 refresh_check ();
1074 } 1098 }
1099 else
1100 w.stop ();
1075} 1101}
1076#endif 1102#endif
1077 1103
1078#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1104#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1079void 1105void
1080rxvt_term::slip_wheel_cb (time_watcher &w) 1106rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1081{ 1107{
1082 if (mouse_slip_wheel_speed == 0 1108 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1083 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1084 : scr_page (UP, mouse_slip_wheel_speed))
1085 { 1109 {
1086 if (view_start == top_row || view_start == 0)
1087 mouse_slip_wheel_speed = 0;
1088
1089 want_refresh = 1; 1110 want_refresh = 1;
1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1111 refresh_check ();
1112 }
1113
1114 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1091 } 1115 {
1116 mouse_slip_wheel_speed = 0;
1117 w.stop ();
1118 }
1092} 1119}
1120#endif
1121
1122#if LINUX_YIELD_HACK
1123static struct event_handler
1124{
1125 ev::prepare yield_ev;
1126
1127 void yield_cb (ev::prepare &w, int revents)
1128 {
1129 // this should really be sched_yield(), but the linux guys thought
1130 // that giving a process calling sched_yield () less cpu time than
1131 // ones with high nice levels is a useful thing to do. It surely is is
1132 // allowed by the sus... as is returning ENOSYS.
1133 // since the linux guys additionally thought that breaking the only
1134 // known workaroudn against their unusable sched_yield hack is cool,
1135 // we just nanosleep a bit and hope for the best.
1136
1137 struct timespec ts = { 0, 1000 };
1138 nanosleep (&ts, 0);
1139
1140 w.stop ();
1141 }
1142
1143 event_handler ()
1144 : yield_ev (this, &event_handler::yield_cb)
1145 {
1146 }
1147} event_handler;
1093#endif 1148#endif
1094 1149
1095bool 1150bool
1096rxvt_term::pty_fill () 1151rxvt_term::pty_fill ()
1097{ 1152{
… …
1114 cmdbuf_endp += r; 1169 cmdbuf_endp += r;
1115 return true; 1170 return true;
1116 } 1171 }
1117 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1172 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1118 { 1173 {
1119#if HAVE_SCHED_YIELD 1174#if LINUX_YIELD_HACK
1120 if (display->is_local) 1175 if (display->is_local)
1121 event_handler.cw_yield.start (); 1176 event_handler.yield_ev.start ();
1122#endif 1177#endif
1123 } 1178 }
1124 else 1179 else
1125 { 1180 {
1126 pty_ev.stop (); 1181 pty_ev.stop ();
1127 1182
1128 if (!OPTION (Opt_hold)) 1183 if (!option (Opt_hold))
1129 destroy (); 1184 destroy ();
1130 } 1185 }
1131 1186
1132 return false; 1187 return false;
1133} 1188}
1134 1189
1135void 1190void
1136rxvt_term::pty_cb (io_watcher &w, short revents) 1191rxvt_term::pty_cb (ev::io &w, int revents)
1137{ 1192{
1138 make_current (); 1193 make_current ();
1139 1194
1140 if (revents & EVENT_READ) 1195 if (revents & ev::READ)
1141 // loop, but don't allow a single term to monopolize us 1196 // loop, but don't allow a single term to monopolize us
1142 while (pty_fill ()) 1197 for (int i = CBUFCNT; i-- && pty_fill (); )
1143 if (cmd_parse ()) 1198 cmd_parse ();
1144 break;
1145 1199
1146 if (revents & EVENT_WRITE) 1200 if (revents & ev::WRITE)
1147 pty_write (); 1201 pty_write ();
1202
1203 refresh_check ();
1148} 1204}
1149 1205
1150void 1206void
1151rxvt_term::pointer_unblank () 1207rxvt_term::pointer_unblank ()
1152{ 1208{
1153 XDefineCursor (xdisp, vt, TermWin_cursor); 1209 XDefineCursor (dpy, vt, TermWin_cursor);
1154 recolour_cursor (); 1210 recolour_cursor ();
1155 1211
1156#ifdef POINTER_BLANK 1212#ifdef POINTER_BLANK
1157 hidden_pointer = 0; 1213 hidden_pointer = 0;
1158 1214
1159 if (OPTION (Opt_pointerBlank)) 1215 if (option (Opt_pointerBlank))
1160 pointer_ev.start (NOW + pointerBlankDelay); 1216 pointer_ev.start (pointerBlankDelay);
1161#endif 1217#endif
1162} 1218}
1163 1219
1164#ifdef POINTER_BLANK 1220#ifdef POINTER_BLANK
1165void 1221void
1166rxvt_term::pointer_blank () 1222rxvt_term::pointer_blank ()
1167{ 1223{
1168 if (!OPTION (Opt_pointerBlank)) 1224 if (!option (Opt_pointerBlank))
1169 return; 1225 return;
1170 1226
1171 XDefineCursor (xdisp, vt, display->blank_cursor); 1227 XDefineCursor (dpy, vt, display->blank_cursor);
1172 XFlush (xdisp); 1228 XFlush (dpy);
1173 1229
1174 hidden_pointer = 1; 1230 hidden_pointer = 1;
1175} 1231}
1176 1232
1177void 1233void
1178rxvt_term::pointer_cb (time_watcher &w) 1234rxvt_term::pointer_cb (ev::timer &w, int revents)
1179{ 1235{
1180 make_current (); 1236 make_current ();
1181 1237
1182 pointer_blank (); 1238 pointer_blank ();
1183} 1239}
… …
1186void 1242void
1187rxvt_term::mouse_report (XButtonEvent &ev) 1243rxvt_term::mouse_report (XButtonEvent &ev)
1188{ 1244{
1189 int button_number, key_state = 0; 1245 int button_number, key_state = 0;
1190 int x, y; 1246 int x, y;
1247 int code = 32;
1191 1248
1192 x = ev.x; 1249 x = Pixel2Col (ev.x);
1193 y = ev.y; 1250 y = Pixel2Row (ev.y);
1194 pixel_position (&x, &y); 1251 if (ev.type == MotionNotify)
1252 {
1253 if (x == mouse_row && y == mouse_col)
1254 return;
1255 mouse_row = x;
1256 mouse_col = y;
1257 code += 32;
1258 }
1195 1259
1196 if (MEvent.button == AnyButton) 1260 if (MEvent.button == AnyButton)
1197 button_number = 3; 1261 button_number = 3;
1198 else 1262 else
1199 { 1263 {
… …
1245 x + 1, 1309 x + 1,
1246 y + 1); 1310 y + 1);
1247#endif 1311#endif
1248 1312
1249 tt_printf ("\033[M%c%c%c", 1313 tt_printf ("\033[M%c%c%c",
1250 (32 + button_number + key_state), 1314 (code + button_number + key_state),
1251 (32 + x + 1), 1315 (32 + x + 1),
1252 (32 + y + 1)); 1316 (32 + y + 1));
1253} 1317}
1254 1318
1255/*{{{ process an X event */ 1319/*{{{ process an X event */
1256void 1320void
1257rxvt_term::x_cb (XEvent &ev) 1321rxvt_term::x_cb (XEvent &ev)
1258{ 1322{
1259 make_current (); 1323 make_current ();
1260 1324
1261 dLocal (Display *, xdisp); 1325 dLocal (Display *, dpy);
1262 1326
1263 if (ev.xany.window == vt 1327 if (ev.xany.window == vt
1264 && SHOULD_INVOKE (HOOK_X_EVENT) 1328 && SHOULD_INVOKE (HOOK_X_EVENT)
1265 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1329 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1266 return; 1330 return;
… …
1271 unsigned int unused_mask; 1335 unsigned int unused_mask;
1272 1336
1273 switch (ev.type) 1337 switch (ev.type)
1274 { 1338 {
1275 case KeyPress: 1339 case KeyPress:
1276#if ISO_14755 1340 key_press (ev.xkey);
1277 if (!(iso14755buf & ISO_14755_52))
1278#endif
1279 lookup_key (ev.xkey);
1280
1281 break; 1341 break;
1282 1342
1283 case KeyRelease: 1343 case KeyRelease:
1284 { 1344 key_release (ev.xkey);
1285#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1286 KeySym keysym;
1287
1288 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1289#endif
1290
1291#if ENABLE_FRILLS || ISO_14755
1292 // ISO 14755 support
1293 if (iso14755buf)
1294 if (iso14755buf & ISO_14755_52)
1295 {
1296# if ENABLE_OVERLAY
1297 scr_overlay_off ();
1298# endif
1299# if ISO_14755
1300 // iso14755 part 5.2 handling: release time
1301 // first: controls
1302 if ((ev.xkey.state & ControlMask)
1303 && ((keysym >= 0x40 && keysym <= 0x5f)
1304 || (keysym >= 0x61 && keysym <= 0x7f)))
1305 {
1306 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1307 commit_iso14755 ();
1308 goto skip_switch;
1309 }
1310
1311 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1312 if (i[0] == keysym)
1313 {
1314 iso14755buf = ISO_14755_51 | i[1];
1315 commit_iso14755 ();
1316 goto skip_switch;
1317 }
1318
1319 scr_bell ();
1320# endif
1321 iso14755buf = 0;
1322 break;
1323 }
1324 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1325 {
1326# if ENABLE_OVERLAY
1327 scr_overlay_off ();
1328# endif
1329 if (iso14755buf & ISO_14755_51)
1330 commit_iso14755 ();
1331#if ISO_14755
1332 else if (iso14755buf & ISO_14755_STARTED)
1333 {
1334 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1335
1336 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1337 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1338 }
1339# endif
1340 else
1341 iso14755buf = 0;
1342 }
1343#endif
1344
1345 if (ev.xany.window == vt
1346 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1347 break;
1348
1349#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1350 if (!(ev.xkey.state & ControlMask))
1351 slip_wheel_ev.stop ();
1352 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1353 mouse_slip_wheel_speed = 0;
1354#endif
1355 break; 1345 break;
1356 }
1357 1346
1358 case ButtonPress: 1347 case ButtonPress:
1359 button_press (ev.xbutton); 1348 button_press (ev.xbutton);
1360 break; 1349 break;
1361 1350
… …
1376 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1365 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1377 destroy (); 1366 destroy ();
1378 } 1367 }
1379#if ENABLE_EWMH 1368#if ENABLE_EWMH
1380 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1369 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1381 XSendEvent (xdisp, ev.xclient.window = display->root, 1370 XSendEvent (dpy, ev.xclient.window = display->root,
1382 False, SubstructureRedirectMask | SubstructureNotifyMask, 1371 False, SubstructureRedirectMask | SubstructureNotifyMask,
1383 &ev); 1372 &ev);
1384#endif 1373#endif
1385 } 1374 }
1386 } 1375 }
… …
1392 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1381 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1393 focus_out (); 1382 focus_out ();
1394 } 1383 }
1395#endif 1384#endif
1396 } 1385 }
1397 break;
1398
1399 case MappingNotify:
1400 XRefreshKeyboardMapping (&ev.xmapping);
1401 break; 1386 break;
1402 1387
1403 /* 1388 /*
1404 * XXX: this is not the _current_ arrangement 1389 * XXX: this is not the _current_ arrangement
1405 * Here's my conclusion: 1390 * Here's my conclusion:
… …
1424 break; 1409 break;
1425 } 1410 }
1426 break; 1411 break;
1427 1412
1428 case FocusIn: 1413 case FocusIn:
1414 if (ev.xfocus.detail != NotifyInferior
1415 && ev.xfocus.detail != NotifyPointer
1416 && ev.xfocus.mode != NotifyGrab)
1429 focus_in (); 1417 focus_in ();
1430 break; 1418 break;
1431 1419
1432 case FocusOut: 1420 case FocusOut:
1421 if (ev.xfocus.detail != NotifyInferior
1422 && ev.xfocus.detail != NotifyPointer
1423 && ev.xfocus.mode != NotifyGrab)
1433 focus_out (); 1424 focus_out ();
1434 break; 1425 break;
1435 1426
1436 case ConfigureNotify: 1427 case ConfigureNotify:
1428 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1429 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1430 szHint.width, szHint.height);*/
1437 if (ev.xconfigure.window == parent[0]) 1431 if (ev.xconfigure.window == parent[0])
1438 { 1432 {
1439 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1433 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1440 ; 1434 ;
1441 1435
1442 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1436 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1443 { 1437 {
1444 seen_resize = 1; 1438 seen_resize = 1;
1445 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1439 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1446 } 1440 }
1441 else
1442 {
1443#ifdef HAVE_BG_PIXMAP
1444 if (bgPixmap.window_position_sensitive ())
1445 {
1446 if (mapped)
1447 update_background ();
1448 else
1449 bgPixmap.invalidate ();
1450 }
1451#endif
1452 }
1447 1453
1448 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1454 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1449
1450#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1451 if (OPTION (Opt_transparent))
1452 check_our_parents ();
1453#endif
1454 } 1455 }
1455 break; 1456 break;
1456 1457
1457 case PropertyNotify: 1458 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1459 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1474 case SelectionRequest: 1475 case SelectionRequest:
1475 selection_send (ev.xselectionrequest); 1476 selection_send (ev.xselectionrequest);
1476 break; 1477 break;
1477 1478
1478 case MapNotify: 1479 case MapNotify:
1480#ifdef HAVE_BG_PIXMAP
1481 /* This is needed spcifically to fix the case of no window manager or a
1482 * non-reparenting window manager. In those cases we never get first
1483 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1484 * care of multiplicity of ConfigureNotify events arriwing while WM does
1485 * reparenting.
1486 * We should not render background immidiately, as there could be several
1487 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1488 * by scheduling background redraw as soon as we can, but giving a short
1489 * bit of time for ConfigureNotifies to arrive.
1490 * We should render background PRIOR to drawing any text, but AFTER all
1491 * of ConfigureNotifys for the best results.
1492 */
1493 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1494 update_background_ev.start (0.025);
1495#endif
1479 mapped = 1; 1496 mapped = 1;
1480#ifdef TEXT_BLINK 1497#ifdef TEXT_BLINK
1481 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1498 text_blink_ev.start ();
1482#endif 1499#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1500 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break; 1501 break;
1485 1502
1486 case UnmapNotify: 1503 case UnmapNotify:
… …
1488#ifdef TEXT_BLINK 1505#ifdef TEXT_BLINK
1489 text_blink_ev.stop (); 1506 text_blink_ev.stop ();
1490#endif 1507#endif
1491 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1508 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1492 break; 1509 break;
1493
1494#ifdef TRANSPARENT
1495 case ReparentNotify:
1496 rootwin_cb (ev);
1497 break;
1498#endif /* TRANSPARENT */
1499 1510
1500 case GraphicsExpose: 1511 case GraphicsExpose:
1501 case Expose: 1512 case Expose:
1502 if (ev.xany.window == vt) 1513 if (ev.xany.window == vt)
1503 { 1514 {
1504 do 1515 do
1516 {
1505 scr_expose (ev.xexpose.x, ev.xexpose.y, 1517 scr_expose (ev.xexpose.x, ev.xexpose.y,
1506 ev.xexpose.width, ev.xexpose.height, False); 1518 ev.xexpose.width, ev.xexpose.height, False);
1519 }
1507 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1520 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1508 1521
1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1522 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1510 1523
1511 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1524 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1525 {
1512 scr_expose (ev.xexpose.x, ev.xexpose.y, 1526 scr_expose (ev.xexpose.x, ev.xexpose.y,
1513 ev.xexpose.width, ev.xexpose.height, False); 1527 ev.xexpose.width, ev.xexpose.height, False);
1528 }
1514 1529
1515 want_refresh = 1; 1530 want_refresh = 1;
1516 } 1531 }
1517 else 1532 else
1518 { 1533 {
1519 XEvent unused_event; 1534 XEvent unused_event;
1520 1535
1521 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1536 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1522 ; 1537 ;
1523 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1538 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1524 ; 1539 ;
1525 1540
1526 if (isScrollbarWindow (ev.xany.window)) 1541 if (scrollBar.state && ev.xany.window == scrollBar.win)
1527 { 1542 {
1528 scrollBar.setIdle (); 1543 scrollBar.state = STATE_IDLE;
1529 scrollbar_show (0); 1544 scrollBar.show (0);
1530 } 1545 }
1531
1532#ifdef TRANSPARENT
1533 if (am_transparent && ev.xany.window == parent[0])
1534 XClearWindow (xdisp, ev.xany.window);
1535#endif
1536 } 1546 }
1537 break; 1547 break;
1538 1548
1539 case MotionNotify: 1549 case MotionNotify:
1540#ifdef POINTER_BLANK 1550#ifdef POINTER_BLANK
1541 if (hidden_pointer) 1551 if (hidden_pointer)
1542 pointer_unblank (); 1552 pointer_unblank ();
1543#endif 1553#endif
1554 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1555 || priv_modes & PrivMode_MouseAnyEvent)
1556 mouse_report (ev.xbutton);
1544 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1557 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1545 break; 1558 break;
1546 1559
1547 if (ev.xany.window == vt) 1560 if (ev.xany.window == vt)
1548 { 1561 {
1549 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1562 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1550 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1563 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1551 ; // nop 1564 ; // nop
1552 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1565 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1566 {
1554 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1567 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1555 ; 1568 ;
1556 1569
1557 XQueryPointer (xdisp, vt, 1570 XQueryPointer (dpy, vt,
1558 &unused_root, &unused_child, 1571 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1572 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1573 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1574 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1575#ifdef MOUSE_THRESHOLD
… …
1582 int dist; 1595 int dist;
1583 1596
1584 /* don't clobber the current delay if we are 1597 /* don't clobber the current delay if we are
1585 * already in the middle of scrolling. 1598 * already in the middle of scrolling.
1586 */ 1599 */
1587 if (!sel_scroll_ev.active) 1600 if (!sel_scroll_ev.is_active ())
1588 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1601 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1589 1602
1590 /* save the event params so we can highlight 1603 /* save the event params so we can highlight
1591 * the selection in the pending-scroll loop 1604 * the selection in the pending-scroll loop
1592 */ 1605 */
1593 selection_save_x = ev.xbutton.x; 1606 selection_save_x = ev.xbutton.x;
… …
1615 else 1628 else
1616 { 1629 {
1617 /* we are within the text window, so we 1630 /* we are within the text window, so we
1618 * shouldn't be scrolling 1631 * shouldn't be scrolling
1619 */ 1632 */
1620 if (sel_scroll_ev.active)
1621 sel_scroll_ev.stop(); 1633 sel_scroll_ev.stop();
1622 } 1634 }
1623#endif 1635#endif
1624#ifdef MOUSE_THRESHOLD 1636#ifdef MOUSE_THRESHOLD
1625 } 1637 }
1626#endif 1638#endif
1627 } 1639 }
1628 } 1640 }
1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1641 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1630 { 1642 {
1631 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1643 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1632 MotionNotify, &ev)) 1644 MotionNotify, &ev))
1633 ; 1645 ;
1634 1646
1635 XQueryPointer (xdisp, scrollBar.win, 1647 XQueryPointer (dpy, scrollBar.win,
1636 &unused_root, &unused_child, 1648 &unused_root, &unused_child,
1637 &unused_root_x, &unused_root_y, 1649 &unused_root_x, &unused_root_y,
1638 &ev.xbutton.x, &ev.xbutton.y, 1650 &ev.xbutton.x, &ev.xbutton.y,
1639 &unused_mask); 1651 &unused_mask);
1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1652 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1641 scrollbar_size ()); 1653 scrollBar.size ());
1642 want_refresh = 1; 1654 want_refresh = 1;
1643 refresh_limit = 0;
1644 scrollbar_show (1); 1655 scrollBar.show (1);
1645 } 1656 }
1646 break; 1657 break;
1647 } 1658 }
1648 1659
1649skip_switch: ;
1650
1651#if defined(CURSOR_BLINK) 1660#if defined(CURSOR_BLINK)
1652 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1661 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1653 { 1662 {
1654 if (hidden_cursor) 1663 if (hidden_cursor)
1655 { 1664 {
1656 hidden_cursor = 0; 1665 hidden_cursor = 0;
1657 want_refresh = 1; 1666 want_refresh = 1;
1658 } 1667 }
1659 1668
1660 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1669 cursor_blink_ev.again ();
1661 } 1670 }
1662#endif 1671#endif
1663 1672
1664#if defined(POINTER_BLANK) 1673#if defined(POINTER_BLANK)
1665 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1674 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1666 { 1675 {
1667 if (ev.type == MotionNotify 1676 if (ev.type == MotionNotify
1668 || ev.type == ButtonPress 1677 || ev.type == ButtonPress
1669 || ev.type == ButtonRelease) 1678 || ev.type == ButtonRelease)
1670 if (hidden_pointer) 1679 if (hidden_pointer)
… …
1672 1681
1673 if (ev.type == KeyPress && hidden_pointer == 0) 1682 if (ev.type == KeyPress && hidden_pointer == 0)
1674 pointer_blank (); 1683 pointer_blank ();
1675 } 1684 }
1676#endif 1685#endif
1686
1687 refresh_check ();
1677} 1688}
1689
1690#if ENABLE_FRILLS
1691void
1692rxvt_term::set_urgency (bool enable)
1693{
1694 if (enable == urgency_hint)
1695 return;
1696
1697 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1698 {
1699 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1700 XSetWMHints (dpy, parent[0], h);
1701 urgency_hint = enable;
1702 }
1703}
1704#endif
1678 1705
1679void 1706void
1680rxvt_term::focus_in () 1707rxvt_term::focus_in ()
1681{ 1708{
1682 if (!focus) 1709 if (!focus)
1683 { 1710 {
1684 focus = 1; 1711 focus = 1;
1685 want_refresh = 1; 1712 want_refresh = 1;
1686 1713
1687 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1688
1689#if USE_XIM 1714#if USE_XIM
1690 if (Input_Context != NULL) 1715 if (Input_Context != NULL)
1691 { 1716 {
1692 IMSetStatusPosition (); 1717 IMSetPosition ();
1693 XSetICFocus (Input_Context); 1718 XSetICFocus (Input_Context);
1694 } 1719 }
1695#endif 1720#endif
1696#if CURSOR_BLINK 1721#if CURSOR_BLINK
1697 if (OPTION (Opt_cursorBlink)) 1722 if (option (Opt_cursorBlink))
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1723 cursor_blink_ev.again ();
1699#endif 1724#endif
1700#if OFF_FOCUS_FADING 1725#if OFF_FOCUS_FADING
1701 if (rs[Rs_fade]) 1726 if (rs[Rs_fade])
1702 { 1727 {
1703 pix_colors = pix_colors_focused; 1728 pix_colors = pix_colors_focused;
1704 scr_recolour (); 1729 scr_recolour ();
1705 } 1730 }
1706#endif 1731#endif
1732#if ENABLE_FRILLS
1733 if (option (Opt_urgentOnBell))
1734 set_urgency (0);
1735#endif
1736
1737 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1707 } 1738 }
1708} 1739}
1709 1740
1710void 1741void
1711rxvt_term::focus_out () 1742rxvt_term::focus_out ()
… …
1713 if (focus) 1744 if (focus)
1714 { 1745 {
1715 focus = 0; 1746 focus = 0;
1716 want_refresh = 1; 1747 want_refresh = 1;
1717 1748
1718 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1749#if ENABLE_FRILLS
1719 1750 if (option (Opt_urgentOnBell))
1751 set_urgency (0);
1752#endif
1720#if ENABLE_FRILLS || ISO_14755 1753#if ENABLE_FRILLS || ISO_14755
1721 if (iso14755buf) 1754 if (iso14755buf)
1722 { 1755 {
1723 iso14755buf = 0; 1756 iso14755buf = 0;
1724# if ENABLE_OVERLAY 1757# if ISO_14755
1725 scr_overlay_off (); 1758 scr_overlay_off ();
1726# endif 1759# endif
1727 } 1760 }
1728#endif 1761#endif
1729#if USE_XIM 1762#if USE_XIM
1730 if (Input_Context != NULL) 1763 if (Input_Context != NULL)
1731 XUnsetICFocus (Input_Context); 1764 XUnsetICFocus (Input_Context);
1732#endif 1765#endif
1733#if CURSOR_BLINK 1766#if CURSOR_BLINK
1734 if (OPTION (Opt_cursorBlink)) 1767 if (option (Opt_cursorBlink))
1735 cursor_blink_ev.stop (); 1768 cursor_blink_ev.stop ();
1769
1736 hidden_cursor = 0; 1770 hidden_cursor = 0;
1737#endif 1771#endif
1738#if OFF_FOCUS_FADING 1772#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1773 if (rs[Rs_fade])
1740 { 1774 {
1741 pix_colors = pix_colors_unfocused; 1775 pix_colors = pix_colors_unfocused;
1742 scr_recolour (); 1776 scr_recolour ();
1743 } 1777 }
1744#endif 1778#endif
1779
1780 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1781 }
1782}
1783
1784void
1785rxvt_term::update_fade_color (unsigned int idx)
1786{
1787#if OFF_FOCUS_FADING
1788 if (rs[Rs_fade])
1745 } 1789 {
1790 rgba c;
1791 pix_colors [Color_fade].get (c);
1792 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1793 }
1794#endif
1746} 1795}
1747 1796
1748#if TRANSPARENT 1797#if ENABLE_TRANSPARENCY || ENABLE_PERL
1749void 1798void
1750rxvt_term::rootwin_cb (XEvent &ev) 1799rxvt_term::rootwin_cb (XEvent &ev)
1751{ 1800{
1752 make_current (); 1801 make_current ();
1753 1802
1803 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1804 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1805 return;
1806
1807# if ENABLE_TRANSPARENCY
1754 switch (ev.type) 1808 switch (ev.type)
1755 { 1809 {
1756 case PropertyNotify: 1810 case PropertyNotify:
1757 /* 1811 /*
1758 * if user used some Esetroot compatible prog to set the root bg, 1812 * if user used some Esetroot compatible prog to set the root bg,
1759 * use the property to determine the pixmap. We use it later on. 1813 * use the property to determine the pixmap. We use it later on.
1760 */ 1814 */
1761 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1815 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1762 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1816 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1763 return; 1817 {
1818 bgPixmap.set_root_pixmap ();
1819 update_background ();
1820 }
1764 1821
1765 /* FALLTHROUGH */
1766 case ReparentNotify:
1767 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1768 want_refresh = want_full_refresh = 1;
1769 break; 1822 break;
1770 } 1823 }
1824# endif
1825
1826 refresh_check ();
1771} 1827}
1772#endif 1828#endif
1773 1829
1774void 1830void
1775rxvt_term::button_press (XButtonEvent &ev) 1831rxvt_term::button_press (XButtonEvent &ev)
… …
1830 mouse_report (ev); 1886 mouse_report (ev);
1831 } 1887 }
1832#else 1888#else
1833 MEvent.button = ev.button; 1889 MEvent.button = ev.button;
1834 mouse_report (ev); 1890 mouse_report (ev);
1835#endif /* MOUSE_REPORT_DOUBLECLICK */ 1891#endif /* MOUSE_REPORT_DOUBLECLICK */
1836 1892
1837 } 1893 }
1838 else 1894 else
1839 { 1895 {
1840 if (ev.button != MEvent.button) 1896 if (ev.button != MEvent.button)
… …
1888 } 1944 }
1889 1945
1890 /* 1946 /*
1891 * Scrollbar window processing of button press 1947 * Scrollbar window processing of button press
1892 */ 1948 */
1893 if (isScrollbarWindow (ev.window)) 1949 if (scrollBar.state && ev.window == scrollBar.win)
1894 { 1950 {
1895 scrollBar.setIdle (); 1951 page_dirn direction = NO_DIR;
1952
1953 if (scrollBar.upButton (ev.y))
1954 direction = UP; /* up */
1955 else if (scrollBar.dnButton (ev.y))
1956 direction = DN; /* down */
1957
1958 scrollBar.state = STATE_IDLE;
1896 /* 1959 /*
1897 * Rxvt-style scrollbar: 1960 * Rxvt-style scrollbar:
1898 * move up if mouse is above slider 1961 * move up if mouse is above slider
1899 * move dn if mouse is below slider 1962 * move dn if mouse is below slider
1900 * 1963 *
… …
1909 /* 1972 /*
1910 * Mouse report disabled scrollbar: 1973 * Mouse report disabled scrollbar:
1911 * arrow buttons - send up/down 1974 * arrow buttons - send up/down
1912 * click on scrollbar - send pageup/down 1975 * click on scrollbar - send pageup/down
1913 */ 1976 */
1914 if ((scrollBar.style == R_SB_NEXT 1977 if (direction == UP)
1915 && scrollbarnext_upButton (ev.y))
1916 || (scrollBar.style == R_SB_RXVT
1917 && scrollbarrxvt_upButton (ev.y)))
1918 tt_printf ("\033[A"); 1978 tt_printf ("\033[A");
1919 else if ((scrollBar.style == R_SB_NEXT 1979 else if (direction == DN)
1920 && scrollbarnext_dnButton (ev.y))
1921 || (scrollBar.style == R_SB_RXVT
1922 && scrollbarrxvt_dnButton (ev.y)))
1923 tt_printf ("\033[B"); 1980 tt_printf ("\033[B");
1924 else 1981 else
1925 switch (ev.button) 1982 switch (ev.button)
1926 { 1983 {
1927 case Button2: 1984 case Button2:
… …
1934 tt_printf ("\033[5~"); 1991 tt_printf ("\033[5~");
1935 break; 1992 break;
1936 } 1993 }
1937 } 1994 }
1938 else 1995 else
1939#endif /* NO_SCROLLBAR_REPORT */ 1996#endif /* NO_SCROLLBAR_REPORT */
1940
1941 {
1942 char upordown = 0;
1943
1944 if (scrollBar.style == R_SB_NEXT)
1945 { 1997 {
1946 if (scrollbarnext_upButton (ev.y)) 1998 if (direction != NO_DIR)
1947 upordown = -1; /* up */
1948 else if (scrollbarnext_dnButton (ev.y))
1949 upordown = 1; /* down */
1950 }
1951 else if (scrollBar.style == R_SB_RXVT)
1952 {
1953 if (scrollbarrxvt_upButton (ev.y))
1954 upordown = -1; /* up */
1955 else if (scrollbarrxvt_dnButton (ev.y))
1956 upordown = 1; /* down */
1957 }
1958 if (upordown)
1959 { 1999 {
1960#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2000#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2001 if (!cont_scroll_ev.is_active ())
1961 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2002 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1962#endif 2003#endif
1963 if (scr_page (upordown < 0 ? UP : DN, 1)) 2004 if (scr_page (direction, 1))
1964 { 2005 {
1965 if (upordown < 0) 2006 if (direction == UP)
1966 scrollBar.setUp (); 2007 scrollBar.state = STATE_UP;
1967 else 2008 else
1968 scrollBar.setDn (); 2009 scrollBar.state = STATE_DOWN;
1969 } 2010 }
1970 } 2011 }
1971 else 2012 else
1972 switch (ev.button) 2013 switch (ev.button)
1973 { 2014 {
1974 case Button2: 2015 case Button2:
1975 switch (scrollbar_align) 2016 switch (scrollBar.align)
1976 { 2017 {
1977 case R_SB_ALIGN_TOP: 2018 case R_SB_ALIGN_TOP:
1978 csrO = 0; 2019 csrO = 0;
1979 break; 2020 break;
1980 case R_SB_ALIGN_CENTRE: 2021 case R_SB_ALIGN_CENTRE:
… …
1986 } 2027 }
1987 2028
1988 if (scrollBar.style == R_SB_XTERM 2029 if (scrollBar.style == R_SB_XTERM
1989 || scrollbar_above_slider (ev.y) 2030 || scrollbar_above_slider (ev.y)
1990 || scrollbar_below_slider (ev.y)) 2031 || scrollbar_below_slider (ev.y))
1991 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2032 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
1992 2033
1993 scrollBar.setMotion (); 2034 scrollBar.state = STATE_MOTION;
1994 break; 2035 break;
1995 2036
1996 case Button1: 2037 case Button1:
1997 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2038 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1998 csrO = ev.y - scrollBar.top; 2039 csrO = ev.y - scrollBar.top;
1999 /* FALLTHROUGH */ 2040 /* FALLTHROUGH */
2000 2041
2001 case Button3: 2042 case Button3:
2002 if (scrollBar.style != R_SB_XTERM) 2043 if (scrollBar.style != R_SB_XTERM)
… …
2012 scr_page (DN, nrow - 1); 2053 scr_page (DN, nrow - 1);
2013# else 2054# else
2014 scr_page (DN, nrow / 4); 2055 scr_page (DN, nrow / 4);
2015# endif 2056# endif
2016 else 2057 else
2017 scrollBar.setMotion (); 2058 scrollBar.state = STATE_MOTION;
2018 } 2059 }
2019 else 2060 else
2020 { 2061 {
2021 scr_page ((ev.button == Button1 ? DN : UP), 2062 scr_page ((ev.button == Button1 ? DN : UP),
2022 (nrow 2063 (nrow
2023 * scrollbar_position (ev.y) 2064 * scrollbar_position (ev.y)
2024 / scrollbar_size ())); 2065 / scrollBar.size ()));
2025 } 2066 }
2026 2067
2027 break; 2068 break;
2028 } 2069 }
2029 } 2070 }
… …
2039 2080
2040 csrO = 0; /* reset csr Offset */ 2081 csrO = 0; /* reset csr Offset */
2041 if (!bypass_keystate) 2082 if (!bypass_keystate)
2042 reportmode = !! (priv_modes & PrivMode_mouse_report); 2083 reportmode = !! (priv_modes & PrivMode_mouse_report);
2043 2084
2044 if (scrollbar_isUpDn ()) 2085 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2045 { 2086 {
2046 scrollBar.setIdle (); 2087 scrollBar.state = STATE_IDLE;
2047 scrollbar_show (0); 2088 scrollBar.show (0);
2048 } 2089 }
2049 2090
2050#ifdef SELECTION_SCROLLING 2091#ifdef SELECTION_SCROLLING
2051 if (sel_scroll_ev.active)
2052 sel_scroll_ev.stop(); 2092 sel_scroll_ev.stop();
2053#endif 2093#endif
2054 2094
2055 if (ev.window == vt) 2095 if (ev.window == vt)
2056 { 2096 {
2057 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2097 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2081 mouse_report (ev); 2121 mouse_report (ev);
2082 } 2122 }
2083#else /* MOUSE_REPORT_DOUBLECLICK */ 2123#else /* MOUSE_REPORT_DOUBLECLICK */
2084 MEvent.button = AnyButton; 2124 MEvent.button = AnyButton;
2085 mouse_report (ev); 2125 mouse_report (ev);
2086#endif /* MOUSE_REPORT_DOUBLECLICK */ 2126#endif /* MOUSE_REPORT_DOUBLECLICK */
2087 return; 2127 return;
2088 } 2128 }
2089 2129
2090 /* 2130 /*
2091 * dumb hack to compensate for the failure of click-and-drag 2131 * dumb hack to compensate for the failure of click-and-drag
… …
2103 selection_make (ev.time); 2143 selection_make (ev.time);
2104 break; 2144 break;
2105 2145
2106 case Button2: 2146 case Button2:
2107 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2147 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2108 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2148 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2109 break; 2149 break;
2110 2150
2111#ifdef MOUSE_WHEEL 2151#ifdef MOUSE_WHEEL
2112 case Button4: 2152 case Button4:
2113 case Button5: 2153 case Button5:
… …
2117 2157
2118 v = ev.button == Button4 ? UP : DN; 2158 v = ev.button == Button4 ? UP : DN;
2119 2159
2120 if (ev.state & ShiftMask) 2160 if (ev.state & ShiftMask)
2121 i = 1; 2161 i = 1;
2122 else if (OPTION (Opt_mouseWheelScrollPage)) 2162 else if (option (Opt_mouseWheelScrollPage))
2123 i = nrow - 1; 2163 i = nrow - 1;
2124 else 2164 else
2125 i = 5; 2165 i = 5;
2126 2166
2127# ifdef MOUSE_SLIP_WHEELING 2167# ifdef MOUSE_SLIP_WHEELING
… …
2129 { 2169 {
2130 mouse_slip_wheel_speed += v ? -1 : 1; 2170 mouse_slip_wheel_speed += v ? -1 : 1;
2131 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2171 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2132 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2172 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2133 2173
2134 if (slip_wheel_ev.at < NOW) 2174 if (!slip_wheel_ev.is_active ())
2135 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2175 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2136
2137 slip_wheel_ev.start ();
2138 } 2176 }
2139 else 2177 else
2178# endif
2140 { 2179 {
2141# endif
2142 scr_page (v, i); 2180 scr_page (v, i);
2143 scrollbar_show (1); 2181 scrollBar.show (1);
2144# ifdef MOUSE_SLIP_WHEELING
2145 } 2182 }
2146# endif
2147 } 2183 }
2148 break; 2184 break;
2149#endif 2185#endif
2150 } 2186 }
2151 } 2187 }
2152} 2188}
2153 2189
2154#ifdef TRANSPARENT
2155#if TINTING
2156/* taken from aterm-0.4.2 */
2157
2158typedef uint32_t RUINT32T;
2159
2160void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2161{
2162 int sh_r, sh_g, sh_b;
2163 RUINT32T mask_r, mask_g, mask_b;
2164 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2165 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2166 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2167 int i;
2168
2169 Visual *visual = term->visual;
2170
2171 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2172
2173 /* for convenience */
2174 mask_r = visual->red_mask;
2175 mask_g = visual->green_mask;
2176 mask_b = visual->blue_mask;
2177
2178 /* boring lookup table pre-initialization */
2179 switch (srcImage->bits_per_pixel) {
2180 case 15:
2181 if ((mask_r != 0x7c00) ||
2182 (mask_g != 0x03e0) ||
2183 (mask_b != 0x001f))
2184 return;
2185 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2186 lookup_r = lookup;
2187 lookup_g = lookup+32;
2188 lookup_b = lookup+32+32;
2189 sh_r = 10;
2190 sh_g = 5;
2191 sh_b = 0;
2192 break;
2193 case 16:
2194 if ((mask_r != 0xf800) ||
2195 (mask_g != 0x07e0) ||
2196 (mask_b != 0x001f))
2197 return;
2198 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2199 lookup_r = lookup;
2200 lookup_g = lookup+32;
2201 lookup_b = lookup+32+64;
2202 sh_r = 11;
2203 sh_g = 5;
2204 sh_b = 0;
2205 break;
2206 case 24:
2207 if ((mask_r != 0xff0000) ||
2208 (mask_g != 0x00ff00) ||
2209 (mask_b != 0x0000ff))
2210 return;
2211 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2212 lookup_r = lookup;
2213 lookup_g = lookup+256;
2214 lookup_b = lookup+256+256;
2215 sh_r = 16;
2216 sh_g = 8;
2217 sh_b = 0;
2218 break;
2219 case 32:
2220 if ((mask_r != 0xff0000) ||
2221 (mask_g != 0x00ff00) ||
2222 (mask_b != 0x0000ff))
2223 return;
2224 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2225 lookup_r = lookup;
2226 lookup_g = lookup+256;
2227 lookup_b = lookup+256+256;
2228 sh_r = 16;
2229 sh_g = 8;
2230 sh_b = 0;
2231 break;
2232 default:
2233 return; /* we do not support this color depth */
2234 }
2235
2236 /* prepare limits for color transformation (each channel is handled separately) */
2237 if (shade < 0) {
2238 shade = -shade;
2239 if (shade < 0) shade = 0;
2240 if (shade > 100) shade = 100;
2241
2242 lower_lim_r = 65535-rm;
2243 lower_lim_g = 65535-gm;
2244 lower_lim_b = 65535-bm;
2245
2246 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2247 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2248 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2249
2250 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2251 } else {
2252 if (shade < 0) shade = 0;
2253 if (shade > 100) shade = 100;
2254
2255 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2256
2257 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2258 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2259 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2260 }
2261
2262 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2263 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2264 {
2265 unsigned int tmp;
2266
2267 tmp = lower_lim_r;
2268 lower_lim_r = lower_lim_b;
2269 lower_lim_b = tmp;
2270
2271 tmp = upper_lim_r;
2272 upper_lim_r = upper_lim_b;
2273 upper_lim_b = tmp;
2274 }
2275
2276 /* fill our lookup tables */
2277 for (i = 0; i <= mask_r>>sh_r; i++)
2278 {
2279 RUINT32T tmp;
2280 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2281 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2282 lookup_r[i] = (tmp/65535)<<sh_r;
2283 }
2284 for (i = 0; i <= mask_g>>sh_g; i++)
2285 {
2286 RUINT32T tmp;
2287 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2288 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2289 lookup_g[i] = (tmp/65535)<<sh_g;
2290 }
2291 for (i = 0; i <= mask_b>>sh_b; i++)
2292 {
2293 RUINT32T tmp;
2294 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2295 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2296 lookup_b[i] = (tmp/65535)<<sh_b;
2297 }
2298
2299 /* apply table to input image (replacing colors by newly calculated ones) */
2300 switch (srcImage->bits_per_pixel)
2301 {
2302 case 15:
2303 {
2304 unsigned short *p1, *pf, *p, *pl;
2305 p1 = (unsigned short *) srcImage->data;
2306 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2307 while (p1 < pf)
2308 {
2309 p = p1;
2310 pl = p1 + srcImage->width;
2311 for (; p < pl; p++)
2312 {
2313 *p = lookup_r[(*p & 0x7c00)>>10] |
2314 lookup_g[(*p & 0x03e0)>> 5] |
2315 lookup_b[(*p & 0x001f)];
2316 }
2317 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2318 }
2319 break;
2320 }
2321 case 16:
2322 {
2323 unsigned short *p1, *pf, *p, *pl;
2324 p1 = (unsigned short *) srcImage->data;
2325 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2326 while (p1 < pf)
2327 {
2328 p = p1;
2329 pl = p1 + srcImage->width;
2330 for (; p < pl; p++)
2331 {
2332 *p = lookup_r[(*p & 0xf800)>>11] |
2333 lookup_g[(*p & 0x07e0)>> 5] |
2334 lookup_b[(*p & 0x001f)];
2335 }
2336 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2337 }
2338 break;
2339 }
2340 case 24:
2341 {
2342 unsigned char *p1, *pf, *p, *pl;
2343 p1 = (unsigned char *) srcImage->data;
2344 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2345 while (p1 < pf)
2346 {
2347 p = p1;
2348 pl = p1 + srcImage->width * 3;
2349 for (; p < pl; p += 3)
2350 {
2351 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2352 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2353 p[2] = lookup_r[(p[2] & 0x0000ff)];
2354 }
2355 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2356 }
2357 break;
2358 }
2359 case 32:
2360 {
2361 RUINT32T *p1, *pf, *p, *pl;
2362 p1 = (RUINT32T *) srcImage->data;
2363 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2364
2365 while (p1 < pf)
2366 {
2367 p = p1;
2368 pl = p1 + srcImage->width;
2369 for (; p < pl; p++)
2370 {
2371 *p = lookup_r[(*p & 0xff0000)>>16] |
2372 lookup_g[(*p & 0x00ff00)>> 8] |
2373 lookup_b[(*p & 0x0000ff)] |
2374 (*p & ~0xffffff);
2375 }
2376 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2377 }
2378 break;
2379 }
2380 }
2381
2382 free (lookup);
2383}
2384#endif
2385
2386/*
2387 * Check our parents are still who we think they are.
2388 * Do transparency updates if required
2389 */
2390int
2391rxvt_term::check_our_parents ()
2392{
2393 int i, pchanged, aformat, have_pixmap, rootdepth;
2394 unsigned long nitems, bytes_after;
2395 Atom atype;
2396 unsigned char *prop = NULL;
2397 Window root, oldp, *list;
2398 Pixmap rootpixmap = None;
2399 XWindowAttributes wattr, wrootattr;
2400
2401 pchanged = 0;
2402
2403 if (!OPTION (Opt_transparent))
2404 return pchanged; /* Don't try any more */
2405
2406 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2407 rootdepth = wrootattr.depth;
2408
2409 XGetWindowAttributes (xdisp, parent[0], &wattr);
2410
2411 if (rootdepth != wattr.depth)
2412 {
2413 if (am_transparent)
2414 {
2415 pchanged = 1;
2416 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2417 am_transparent = am_pixmap_trans = 0;
2418 }
2419
2420 return pchanged; /* Don't try any more */
2421 }
2422
2423 /* Get all X ops out of the queue so that our information is up-to-date. */
2424 XSync (xdisp, False);
2425
2426 /*
2427 * Make the frame window set by the window manager have
2428 * the root background. Some window managers put multiple nested frame
2429 * windows for each client, so we have to take care about that.
2430 */
2431 i = (xa[XA_XROOTPMAP_ID]
2432 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2434 &nitems, &bytes_after, &prop) == Success);
2435
2436 if (!i || prop == NULL)
2437 i = (xa[XA_ESETROOT_PMAP_ID]
2438 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2439 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2440 &nitems, &bytes_after, &prop) == Success);
2441
2442 if (!i || prop == NULL
2443#if TINTING
2444 || !ISSET_PIXCOLOR (Color_tint)
2445#endif
2446 )
2447 have_pixmap = 0;
2448 else
2449 {
2450 have_pixmap = 1;
2451 rootpixmap = *(Pixmap *)prop;
2452 XFree (prop);
2453 }
2454
2455 if (have_pixmap)
2456 {
2457 /*
2458 * Copy display->root pixmap transparency
2459 */
2460 int sx, sy, nx, ny;
2461 unsigned int nw, nh;
2462 Window cr;
2463 XImage *image;
2464 GC gc;
2465 XGCValues gcvalue;
2466
2467 XTranslateCoordinates (xdisp, parent[0], display->root,
2468 0, 0, &sx, &sy, &cr);
2469 nw = (unsigned int)szHint.width;
2470 nh = (unsigned int)szHint.height;
2471 nx = ny = 0;
2472
2473 if (sx < 0)
2474 {
2475 nw += sx;
2476 nx = -sx;
2477 sx = 0;
2478 }
2479
2480 if (sy < 0)
2481 {
2482 nh += sy;
2483 ny = -sy;
2484 sy = 0;
2485 }
2486
2487 min_it (nw, (unsigned int) (wrootattr.width - sx));
2488 min_it (nh, (unsigned int) (wrootattr.height - sy));
2489
2490 XSync (xdisp, False);
2491 allowedxerror = -1;
2492 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2493
2494 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2495 /* XXX: may need a delay here? */
2496 allowedxerror = 0;
2497
2498 if (image == NULL)
2499 {
2500 if (am_transparent && am_pixmap_trans)
2501 {
2502 pchanged = 1;
2503 if (pixmap != None)
2504 {
2505 XFreePixmap (xdisp, pixmap);
2506 pixmap = None;
2507 }
2508 }
2509
2510 am_pixmap_trans = 0;
2511 }
2512 else
2513 {
2514 if (pixmap != None)
2515 XFreePixmap (xdisp, pixmap);
2516
2517#if TINTING
2518 if (ISSET_PIXCOLOR (Color_tint))
2519 {
2520 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2521
2522 rgba c;
2523 pix_colors_focused [Color_tint].get (c);
2524
2525 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2526 }
2527#endif
2528
2529 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2530 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2531 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2532 nx, ny, image->width, image->height);
2533 XFreeGC (xdisp, gc);
2534 XDestroyImage (image);
2535 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2536 XClearWindow (xdisp, parent[0]);
2537
2538 if (!am_transparent || !am_pixmap_trans)
2539 pchanged = 1;
2540
2541 am_transparent = am_pixmap_trans = 1;
2542 }
2543 }
2544
2545 if (am_pixmap_trans)
2546 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2547 else
2548 {
2549 unsigned int n;
2550 /*
2551 * InheritPixmap transparency
2552 */
2553 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2554 {
2555 oldp = parent[i];
2556 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2557 XFree (list);
2558
2559 if (parent[i] == display->root)
2560 {
2561 if (oldp != None)
2562 pchanged = 1;
2563
2564 break;
2565 }
2566
2567 if (oldp != parent[i])
2568 pchanged = 1;
2569 }
2570
2571 n = 0;
2572
2573 if (pchanged)
2574 for (; n < (unsigned int)i; n++)
2575 {
2576 XGetWindowAttributes (xdisp, parent[n], &wattr);
2577
2578 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2579 {
2580 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2581 break;
2582 }
2583 }
2584
2585 if (n > (sizeof (parent) / sizeof (parent[0])))
2586 {
2587 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2588 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2589 am_transparent = 0;
2590 /* XXX: also turn off Opt_transparent? */
2591 }
2592 else
2593 {
2594 for (n = 0; n < (unsigned int)i; n++)
2595 {
2596 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2597 XClearWindow (xdisp, parent[n]);
2598 }
2599
2600 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2601 am_transparent = 1;
2602 }
2603
2604 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2605 parent[i] = None;
2606 }
2607
2608 if (scrollBar.win)
2609 {
2610 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2611 scrollBar.setIdle ();
2612 scrollbar_show (0);
2613 }
2614
2615 if (am_transparent)
2616 {
2617 want_refresh = want_full_refresh = 1;
2618 if (am_pixmap_trans)
2619 flush ();
2620 }
2621
2622 return pchanged;
2623}
2624#endif
2625
2626/*}}} */ 2190/*}}} */
2627 2191
2628bool 2192void
2629rxvt_term::cmd_parse () 2193rxvt_term::cmd_parse ()
2630{ 2194{
2631 bool flag = false;
2632 wchar_t ch = NOCHAR; 2195 wchar_t ch = NOCHAR;
2633 char *seq_begin; // remember start of esc-sequence here 2196 char *seq_begin; // remember start of esc-sequence here
2634 2197
2635 for (;;) 2198 for (;;)
2636 { 2199 {
2637 if (ch == NOCHAR) 2200 if (expect_false (ch == NOCHAR))
2638 { 2201 {
2639 seq_begin = cmdbuf_ptr; 2202 seq_begin = cmdbuf_ptr;
2640 ch = next_char (); 2203 ch = next_char ();
2641 2204
2642 if (ch == NOCHAR) 2205 if (ch == NOCHAR)
2643 break; 2206 break;
2644 } 2207 }
2645 2208
2646 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2209 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2647 { 2210 {
2648 if (!seen_input) 2211 if (expect_false (!seen_input))
2649 { 2212 {
2650 seen_input = 1; 2213 seen_input = 1;
2651 // many badly-written programs (e.g. jed) contain a race condition: 2214 // many badly-written programs (e.g. jed) contain a race condition:
2652 // they first read the screensize and then install a SIGWINCH handler. 2215 // they first read the screensize and then install a SIGWINCH handler.
2653 // some window managers resize the window early, and these programs 2216 // some window managers resize the window early, and these programs
… …
2666 wchar_t *str = buf; 2229 wchar_t *str = buf;
2667 wchar_t *eol = str + min (ncol, UBUFSIZ); 2230 wchar_t *eol = str + min (ncol, UBUFSIZ);
2668 2231
2669 for (;;) 2232 for (;;)
2670 { 2233 {
2671 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2234 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2672 break; 2235 break;
2673 2236
2674 *str++ = ch; 2237 *str++ = ch;
2675 2238
2676 if (ch == C0_LF || str >= eol) 2239 if (expect_false (ch == C0_LF || str >= eol))
2677 { 2240 {
2678 if (ch == C0_LF) 2241 if (ch == C0_LF)
2679 nlines++; 2242 nlines++;
2680 2243
2681 refresh_count++; 2244 refresh_count++;
2682 2245
2683 if (!OPTION (Opt_jumpScroll) 2246 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2684 || (refresh_count >= refresh_limit * (nrow - 1)))
2685 { 2247 {
2686 refreshnow = true;
2687 refresh_count = 0; 2248 refresh_count = 0;
2249
2250 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2251 {
2252 refreshnow = true;
2688 ch = NOCHAR; 2253 ch = NOCHAR;
2689 break; 2254 break;
2255 }
2690 } 2256 }
2691 2257
2692 // scr_add_lines only works for nlines <= nrow - 1. 2258 // scr_add_lines only works for nlines <= nrow - 1.
2693 if (nlines >= nrow - 1) 2259 if (nlines >= nrow - 1)
2694 { 2260 {
… …
2722 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2288 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2723 scr_add_lines (buf, str - buf, nlines); 2289 scr_add_lines (buf, str - buf, nlines);
2724 2290
2725 /* 2291 /*
2726 * If there have been a lot of new lines, then update the screen 2292 * If there have been a lot of new lines, then update the screen
2727 * What the heck I'll cheat and only refresh less than every page-full. 2293 * What the heck we'll cheat and only refresh less than every page-full.
2728 * the number of pages between refreshes is refresh_limit, which 2294 * if skipScroll is enabled.
2729 * is incremented here because we must be doing flat-out scrolling.
2730 */ 2295 */
2731 if (refreshnow) 2296 if (refreshnow)
2732 { 2297 {
2733 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2734 refresh_limit++;
2735 else
2736 {
2737 flag = true;
2738 scr_refresh (); 2298 scr_refresh ();
2739 want_refresh = 1; 2299 want_refresh = 1;
2740 }
2741 } 2300 }
2742
2743 } 2301 }
2744 else 2302 else
2745 { 2303 {
2746 try 2304 try
2747 { 2305 {
… …
2755 } 2313 }
2756 2314
2757 ch = NOCHAR; 2315 ch = NOCHAR;
2758 } 2316 }
2759 } 2317 }
2760
2761 return flag;
2762} 2318}
2763 2319
2764// read the next character 2320// read the next character
2765wchar_t 2321wchar_t
2766rxvt_term::next_char () NOTHROW 2322rxvt_term::next_char () NOTHROW
2767{ 2323{
2768 while (cmdbuf_ptr < cmdbuf_endp) 2324 while (cmdbuf_ptr < cmdbuf_endp)
2769 { 2325 {
2770 // assume 7-bit to be ascii ALWAYS 2326 // assume 7-bit to be ascii ALWAYS
2771 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2327 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2772 return *cmdbuf_ptr++; 2328 return *cmdbuf_ptr++;
2773 2329
2774 wchar_t wc; 2330 wchar_t wc;
2775 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2331 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2776 2332
… …
2780 cmdbuf_ptr = cmdbuf_endp; 2336 cmdbuf_ptr = cmdbuf_endp;
2781 break; 2337 break;
2782 } 2338 }
2783 2339
2784 if (len == (size_t)-1) 2340 if (len == (size_t)-1)
2341 {
2342 mbstate.reset (); // reset now undefined conversion state
2785 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2343 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2344 }
2786 2345
2787 // assume wchar == unicode 2346 // assume wchar == unicode
2788 cmdbuf_ptr += len; 2347 cmdbuf_ptr += len;
2789 return wc & UNICODE_MASK; 2348 return wc & UNICODE_MASK;
2790 } 2349 }
… …
2834/*----------------------------------------------------------------------*/ 2393/*----------------------------------------------------------------------*/
2835#ifdef PRINTPIPE 2394#ifdef PRINTPIPE
2836FILE * 2395FILE *
2837rxvt_term::popen_printer () 2396rxvt_term::popen_printer ()
2838{ 2397{
2839 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2398 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2840 2399
2841 if (stream == NULL) 2400 if (stream == NULL)
2842 rxvt_warn ("can't open printer pipe, not printing.\n"); 2401 rxvt_warn ("can't open printer pipe, not printing.\n");
2843 2402
2844 return stream; 2403 return stream;
… …
2855 * simulate attached vt100 printer 2414 * simulate attached vt100 printer
2856 */ 2415 */
2857void 2416void
2858rxvt_term::process_print_pipe () 2417rxvt_term::process_print_pipe ()
2859{ 2418{
2860 int done; 2419 FILE *fd = popen_printer ();
2861 FILE *fd;
2862 2420
2863 if ((fd = popen_printer ()) == NULL) 2421 if (!fd)
2864 return; 2422 return;
2865 2423
2866 /* 2424 /*
2867 * Send all input to the printer until either ESC[4i or ESC[?4i 2425 * Send all input to the printer until either ESC[4i or ESC[?4i
2868 * is received. 2426 * is received.
2869 */ 2427 */
2870 for (done = 0; !done;) 2428 for (int done = 0; !done; )
2871 { 2429 {
2872 unsigned char buf[8]; 2430 unsigned char buf[8];
2873 unicode_t ch; 2431 unicode_t ch;
2874 unsigned int i, len; 2432 unsigned int i, len;
2875 2433
… …
2894 { 2452 {
2895 if ((buf[len++] = cmd_getc ()) == 'i') 2453 if ((buf[len++] = cmd_getc ()) == 'i')
2896 break; /* done = 1 */ 2454 break; /* done = 1 */
2897 } 2455 }
2898 } 2456 }
2899 2457
2900 for (i = 0; i < len; i++) 2458 for (i = 0; i < len; i++)
2901 if (putc (buf[i], fd) == EOF) 2459 if (putc (buf[i], fd) == EOF)
2902 { 2460 {
2903 done = 1; 2461 done = 1;
2904 break; 2462 break;
… …
2906 } 2464 }
2907 } 2465 }
2908 2466
2909 pclose_printer (fd); 2467 pclose_printer (fd);
2910} 2468}
2911#endif /* PRINTPIPE */ 2469#endif /* PRINTPIPE */
2912/*}}} */ 2470/*}}} */
2913 2471
2914/* *INDENT-OFF* */ 2472/* *INDENT-OFF* */
2915enum { 2473enum {
2916 C1_40 = 0x40, 2474 C1_40 = 0x40,
… …
2966 process_dcs_seq (); 2524 process_dcs_seq ();
2967 break; 2525 break;
2968 case 0x9b: /* CSI */ 2526 case 0x9b: /* CSI */
2969 process_csi_seq (); 2527 process_csi_seq ();
2970 break; 2528 break;
2971 case 0x9d: /* CSI */ 2529 case 0x9d: /* OSC */
2972 process_osc_seq (); 2530 process_osc_seq ();
2973 break; 2531 break;
2974#endif 2532#endif
2975 } 2533 }
2976} 2534}
… …
3020 break; 2578 break;
3021 case 'Z': /* identify the terminal type */ 2579 case 'Z': /* identify the terminal type */
3022 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2580 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3023 break; 2581 break;
3024 case '<': /* turn off VT52 mode */ 2582 case '<': /* turn off VT52 mode */
3025 PrivMode (0, PrivMode_vt52); 2583 set_privmode (PrivMode_vt52, 0);
3026 break; 2584 break;
3027 case 'F': /* use special graphics character set */ 2585 case 'F': /* use special graphics character set */
3028 case 'G': /* use regular character set */ 2586 case 'G': /* use regular character set */
3029 /* unimplemented */ 2587 /* unimplemented */
3030 break; 2588 break;
… …
3084 scr_forwardindex (); 2642 scr_forwardindex ();
3085 break; 2643 break;
3086#endif 2644#endif
3087 case '=': 2645 case '=':
3088 case '>': 2646 case '>':
3089 PrivMode ((ch == '='), PrivMode_aplKP); 2647 set_privmode (PrivMode_aplKP, ch == '=');
3090 break; 2648 break;
3091 2649
3092 case C1_40: 2650 case C1_40:
3093 cmd_getc (); 2651 cmd_getc ();
3094 break; 2652 break;
… …
3133 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2691 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3134 case C1_SCI: /* ESC Z */ 2692 case C1_SCI: /* ESC Z */
3135 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2693 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3136 break; /* steal obsolete ESC [ c */ 2694 break; /* steal obsolete ESC [ c */
3137 2695
3138 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2696 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3139 case C1_CSI: /* ESC [ */ 2697 case C1_CSI: /* ESC [ */
3140 process_csi_seq (); 2698 process_csi_seq ();
3141 break; 2699 break;
3142 2700
3143 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2701 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3144 case C1_OSC: /* ESC ] */ 2702 case C1_OSC: /* ESC ] */
3145 process_osc_seq (); 2703 process_osc_seq ();
3146 break; 2704 break;
3147 2705
3148 /* 8.3.106: RESET TO INITIAL STATE */ 2706 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3149 case 'c': 2707 case 'c':
3150 mbstate.reset (); 2708 mbstate.reset ();
3151 scr_poweron (); 2709 scr_poweron ();
3152 scrollbar_show (1); 2710 scrollBar.show (1);
3153 break; 2711 break;
3154 2712
3155 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2713 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3156 case 'n': 2714 case 'n':
3157 scr_charset_choose (2); 2715 scr_charset_choose (2);
… …
3202rxvt_term::process_csi_seq () 2760rxvt_term::process_csi_seq ()
3203{ 2761{
3204 unicode_t ch, priv, i; 2762 unicode_t ch, priv, i;
3205 unsigned int nargs, p; 2763 unsigned int nargs, p;
3206 int n, ndef; 2764 int n, ndef;
3207 int arg[ESC_ARGS]; 2765 int arg[ESC_ARGS] = { };
3208 2766
3209 for (nargs = ESC_ARGS; nargs > 0;) 2767 nargs = 0;
3210 arg[--nargs] = 0;
3211 2768
3212 priv = 0; 2769 priv = 0;
3213 ch = cmd_getc (); 2770 ch = cmd_getc ();
3214 if (ch >= '<' && ch <= '?') 2771 if ((ch >= '<' && ch <= '?') || ch == '!')
2772 {
3215 { /* '<' '=' '>' '?' */ 2773 /* '<' '=' '>' '?' '!' */
3216 priv = ch; 2774 priv = ch;
3217 ch = cmd_getc (); 2775 ch = cmd_getc ();
3218 } 2776 }
3219 2777
3220 /* read any numerical arguments */ 2778 /* read any numerical arguments */
… …
3259 switch (priv) 2817 switch (priv)
3260 { 2818 {
3261 case '>': 2819 case '>':
3262 if (ch == CSI_DA) /* secondary device attributes */ 2820 if (ch == CSI_DA) /* secondary device attributes */
3263 { 2821 {
3264 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2822 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3265 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2823 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3266 // 2824 //
3267 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2825 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3268 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2826 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3269 // that we do not support xterm mouse reporting (should be 95 when we do). 2827 // versions.
3270 // 2828 //
3271 tt_printf ("\033[>%d;94;0c", 'U'); 2829 tt_printf ("\033[>%d;95;0c", 'U');
3272 } 2830 }
3273 break; 2831 break;
2832
3274 case '?': 2833 case '?':
3275 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3276 process_terminal_mode (ch, priv, nargs, arg); 2835 process_terminal_mode (ch, priv, nargs, arg);
3277 break; 2836 break;
2837
2838 case '!':
2839 if (ch == CSI_70)
2840 {
2841 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2842 scr_soft_reset ();
2843
2844 static const int pm_h[] = { 7, 25 };
2845 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2846
2847 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2848 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
3278 } 2849 }
2850 break;
2851 }
2852
3279 return; 2853 return;
3280 } 2854 }
3281 2855
3282 switch (ch) 2856 switch (ch)
3283 { 2857 {
… …
3403 break; 2977 break;
3404 case 6: /* CPR requested */ 2978 case 6: /* CPR requested */
3405 scr_report_position (); 2979 scr_report_position ();
3406 break; 2980 break;
3407 case 7: /* unofficial extension */ 2981 case 7: /* unofficial extension */
3408 if (OPTION (Opt_insecure)) 2982 if (option (Opt_insecure))
3409 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2983 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3410 break; 2984 break;
3411 case 8: /* unofficial extension */ 2985 case 8: /* unofficial extension */
3412 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2986 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3413 break; 2987 break;
… …
3506{ 3080{
3507 int x, y; 3081 int x, y;
3508 XWindowAttributes wattr; 3082 XWindowAttributes wattr;
3509 Window wdummy; 3083 Window wdummy;
3510 3084
3511 dLocal (Display *, xdisp); 3085 dLocal (Display *, dpy);
3512 3086
3513 if (nargs == 0) 3087 if (nargs == 0)
3514 return; 3088 return;
3515 3089
3516 switch (args[0]) 3090 switch (args[0])
3517 { 3091 {
3518 /* 3092 /*
3519 * commands 3093 * commands
3520 */ 3094 */
3521 case 1: /* deiconify window */ 3095 case 1: /* deiconify window */
3522 XMapWindow (xdisp, parent[0]); 3096 XMapWindow (dpy, parent[0]);
3523 break; 3097 break;
3524 case 2: /* iconify window */ 3098 case 2: /* iconify window */
3525 XIconifyWindow (xdisp, parent[0], display->screen); 3099 XIconifyWindow (dpy, parent[0], display->screen);
3526 break; 3100 break;
3527 case 3: /* set position (pixels) */ 3101 case 3: /* set position (pixels) */
3528 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3102 XMoveWindow (dpy, parent[0], args[1], args[2]);
3529 break; 3103 break;
3530 case 4: /* set size (pixels) */ 3104 case 4: /* set size (pixels) */
3531 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3105 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3532 break; 3106 break;
3533 case 5: /* raise window */ 3107 case 5: /* raise window */
3534 XRaiseWindow (xdisp, parent[0]); 3108 XRaiseWindow (dpy, parent[0]);
3535 break; 3109 break;
3536 case 6: /* lower window */ 3110 case 6: /* lower window */
3537 XLowerWindow (xdisp, parent[0]); 3111 XLowerWindow (dpy, parent[0]);
3538 break; 3112 break;
3539 case 7: /* refresh window */ 3113 case 7: /* refresh window */
3540 scr_touch (true); 3114 scr_touch (true);
3541 break; 3115 break;
3542 case 8: /* set size (chars) */ 3116 case 8: /* set size (chars) */
… …
3553 3127
3554 /* 3128 /*
3555 * reports - some output format copied from XTerm 3129 * reports - some output format copied from XTerm
3556 */ 3130 */
3557 case 11: /* report window state */ 3131 case 11: /* report window state */
3558 XGetWindowAttributes (xdisp, parent[0], &wattr); 3132 XGetWindowAttributes (dpy, parent[0], &wattr);
3559 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3133 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3560 break; 3134 break;
3561 case 13: /* report window position */ 3135 case 13: /* report window position */
3562 XGetWindowAttributes (xdisp, parent[0], &wattr); 3136 XGetWindowAttributes (dpy, parent[0], &wattr);
3563 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3137 XTranslateCoordinates (dpy, parent[0], wattr.root,
3564 -wattr.border_width, -wattr.border_width, 3138 -wattr.border_width, -wattr.border_width,
3565 &x, &y, &wdummy); 3139 &x, &y, &wdummy);
3566 tt_printf ("\033[3;%d;%dt", x, y); 3140 tt_printf ("\033[3;%d;%dt", x, y);
3567 break; 3141 break;
3568 case 14: /* report window size (pixels) */ 3142 case 14: /* report window size (pixels) */
3569 XGetWindowAttributes (xdisp, parent[0], &wattr); 3143 XGetWindowAttributes (dpy, parent[0], &wattr);
3570 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3144 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3571 break; 3145 break;
3572 case 18: /* report text area size (chars) */ 3146 case 18: /* report text area size (chars) */
3573 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3147 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3574 break; 3148 break;
… …
3576 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3150 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3577 break; 3151 break;
3578 case 20: /* report icon label */ 3152 case 20: /* report icon label */
3579 { 3153 {
3580 char *s; 3154 char *s;
3581 XGetIconName (xdisp, parent[0], &s); 3155 XGetIconName (dpy, parent[0], &s);
3582 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3156 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3583 XFree (s); 3157 XFree (s);
3584 } 3158 }
3585 break; 3159 break;
3586 case 21: /* report window title */ 3160 case 21: /* report window title */
3587 { 3161 {
3588 char *s; 3162 char *s;
3589 XFetchName (xdisp, parent[0], &s); 3163 XFetchName (dpy, parent[0], &s);
3590 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3164 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3591 XFree (s); 3165 XFree (s);
3592 } 3166 }
3593 break; 3167 break;
3594 } 3168 }
3595} 3169}
… …
3622 seen_esc = true; 3196 seen_esc = true;
3623 continue; 3197 continue;
3624 } 3198 }
3625 else if (ch == C0_BEL || ch == CHAR_ST) 3199 else if (ch == C0_BEL || ch == CHAR_ST)
3626 break; 3200 break;
3201 else if (ch == C0_SYN)
3202 ch = cmd_get8 ();
3627 else if (ch < 0x20) 3203 else if (ch < 0x20)
3628 return NULL; /* other control character - exit */ 3204 return NULL; /* other control character - exit */
3629 3205
3630 seen_esc = false; 3206 seen_esc = false;
3631 3207
3632 if (n >= STRING_MAX - 1) 3208 if (n >= STRING_MAX - 1)
3633 // stop at some sane length 3209 // stop at some sane length
3634 return NULL; 3210 return NULL;
3635 3211
3636 if (ch == C0_SYN)
3637 string[n++] = cmd_get8 ();
3638 else
3639 string[n++] = ch; 3212 string[n++] = ch;
3640 } 3213 }
3641 3214
3642 string[n++] = '\0'; 3215 string[n++] = '\0';
3643 3216
3644 ends_how = (ch == 0x5c ? C0_ESC : ch); 3217 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3713 3286
3714/* 3287/*
3715 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3288 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3716 */ 3289 */
3717void 3290void
3718rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3291rxvt_term::process_xterm_seq (int op, char *str, char resp)
3719{ 3292{
3720 int color; 3293 int color;
3721 char *buf, *name; 3294 char *buf, *name;
3722 bool query = str[0] == '?' && !str[1]; 3295 bool query = str[0] == '?' && !str[1];
3723 int saveop = op; 3296 int saveop = op;
3724 3297
3725 dLocal (Display *, xdisp); 3298 dLocal (Display *, dpy);
3726 3299
3727 assert (str != NULL); 3300 assert (str != NULL);
3301
3302 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3303 return;
3304
3728 switch (op) 3305 switch (op)
3729 { 3306 {
3730 case XTerm_name: 3307 case XTerm_name:
3731 set_title (str); 3308 set_title (str);
3732 /* FALLTHROUGH */ 3309 /* FALLTHROUGH */
… …
3746 unsigned long bytes_after; 3323 unsigned long bytes_after;
3747 unsigned char *value = 0; 3324 unsigned char *value = 0;
3748 const char *str = ""; 3325 const char *str = "";
3749 3326
3750 if (prop 3327 if (prop
3751 && XGetWindowProperty (xdisp, parent[0], 3328 && XGetWindowProperty (dpy, parent[0],
3752 prop, 0, 1<<16, 0, AnyPropertyType, 3329 prop, 0, 1<<16, 0, AnyPropertyType,
3753 &actual_type, &actual_format, 3330 &actual_type, &actual_format,
3754 &nitems, &bytes_after, &value) == Success 3331 &nitems, &bytes_after, &value) == Success
3755 && actual_type != None 3332 && actual_type != None
3756 && actual_format == 8) 3333 && actual_format == 8)
… …
3760 3337
3761 XFree (value); 3338 XFree (value);
3762 } 3339 }
3763 else 3340 else
3764 { 3341 {
3765 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3342 char *eq = strchr (str, '=');
3766 3343
3767 if (eq) 3344 if (eq)
3768 { 3345 {
3769 *eq = 0; 3346 *eq = 0;
3770 set_utf8_property (display->atom (str), eq + 1); 3347 set_utf8_property (display->atom (str), eq + 1);
3771 } 3348 }
3772 else 3349 else
3773 XDeleteProperty (xdisp, parent[0], 3350 XDeleteProperty (dpy, parent[0],
3774 display->atom (str)); 3351 display->atom (str));
3775 } 3352 }
3776 break; 3353 break;
3777 3354
3778 case XTerm_Color: 3355 case XTerm_Color:
… …
3791 *buf++ = '\0'; 3368 *buf++ = '\0';
3792 3369
3793 process_color_seq (op, color, name, resp); 3370 process_color_seq (op, color, name, resp);
3794 } 3371 }
3795 break; 3372 break;
3373 case Rxvt_restoreFG:
3796 case XTerm_Color00: 3374 case XTerm_Color00:
3797 process_color_seq (op, Color_fg, str, resp); 3375 process_color_seq (op, Color_fg, str, resp);
3798 break; 3376 break;
3377 case Rxvt_restoreBG:
3799 case XTerm_Color01: 3378 case XTerm_Color01:
3800 process_color_seq (op, Color_bg, str, resp); 3379 process_color_seq (op, Color_bg, str, resp);
3801 break; 3380 break;
3802#ifndef NO_CURSORCOLOR 3381#ifndef NO_CURSORCOLOR
3803 case XTerm_Color_cursor: 3382 case XTerm_Color_cursor:
… …
3824 break; 3403 break;
3825 case URxvt_Color_IT: 3404 case URxvt_Color_IT:
3826 process_color_seq (op, Color_IT, str, resp); 3405 process_color_seq (op, Color_IT, str, resp);
3827 break; 3406 break;
3828#endif 3407#endif
3829#if TRANSPARENT && TINTING 3408 case URxvt_Color_border:
3409 process_color_seq (op, Color_border, str, resp);
3410 break;
3411#if ENABLE_TRANSPARENCY
3830 case URxvt_Color_tint: 3412 case URxvt_Color_tint:
3831 process_color_seq (op, Color_tint, str, resp); 3413 process_color_seq (op, Color_tint, str, resp);
3414 {
3415 bool changed = false;
3832 3416
3833 check_our_parents (); 3417 if (ISSET_PIXCOLOR (Color_tint))
3418 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3419 else
3420 changed = bgPixmap.unset_tint ();
3834 3421
3835 if (am_transparent) 3422 if (changed)
3836 want_full_refresh = want_refresh = 1; 3423 update_background ();
3424 }
3837 3425
3838 break; 3426 break;
3839#endif 3427#endif
3840 3428
3429#if BG_IMAGE_FROM_FILE
3841 case Rxvt_Pixmap: 3430 case Rxvt_Pixmap:
3842 { 3431 if (!strcmp (str, "?"))
3843 if (*str != ';')
3844 { 3432 {
3845#if XPM_BACKGROUND 3433 char str[256];
3846 scale_pixmap (""); /* reset to default scaling */ 3434
3847 set_bgPixmap (str); /* change pixmap */ 3435 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3848 scr_touch (true); 3436 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3849#endif 3437 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3438 process_xterm_seq (XTerm_title, str, CHAR_ST);
3850 } 3439 }
3851 3440 else
3441 {
3852 int changed = 0; 3442 int changed = 0;
3853 3443
3854 while ((str = strchr (str, ';')) != NULL) 3444 if (*str != ';')
3855 { 3445 {
3446 /* reset to default scaling :*/
3447 bgPixmap.unset_geometry ();
3448 if (bgPixmap.set_file (str)) /* change pixmap */
3449 changed++;
3450 str = strchr (str, ';');
3451 if (str == NULL)
3452 bgPixmap.set_defaultGeometry ();
3453 }
3454
3455 while (str)
3456 {
3856 str++; 3457 str++;
3857#if XPM_BACKGROUND 3458 if (bgPixmap.set_geometry (str))
3858 changed += scale_pixmap (str); 3459 changed++;
3859#endif 3460 str = strchr (str, ';');
3860 } 3461 }
3861 3462
3862 if (changed) 3463 if (changed)
3863 { 3464 update_background ();
3864#ifdef XPM_BACKGROUND
3865 resize_pixmap ();
3866 scr_touch (true);
3867#endif
3868 } 3465 }
3869 }
3870 break; 3466 break;
3871 3467#endif
3872 case Rxvt_restoreFG:
3873 set_window_color (Color_fg, str);
3874 break;
3875 case Rxvt_restoreBG:
3876 set_window_color (Color_bg, str);
3877 break;
3878 3468
3879 case XTerm_logfile: 3469 case XTerm_logfile:
3880 // TODO, when secure mode? 3470 // TODO, when secure mode?
3881 break; 3471 break;
3882 3472
… …
3900 case URxvt_italicFont: 3490 case URxvt_italicFont:
3901 case URxvt_boldItalicFont: 3491 case URxvt_boldItalicFont:
3902#endif 3492#endif
3903 if (query) 3493 if (query)
3904 tt_printf ("\33]%d;%-.250s%c", saveop, 3494 tt_printf ("\33]%d;%-.250s%c", saveop,
3905 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3495 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3906 ? fontset[op - URxvt_font]->fontdesc : "", 3496 ? fontset[op - URxvt_font]->fontdesc : "",
3907 resp); 3497 resp);
3908 else 3498 else
3909 { 3499 {
3910 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3500 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3924 break; 3514 break;
3925 3515
3926#if !ENABLE_MINIMAL 3516#if !ENABLE_MINIMAL
3927 case URxvt_locale: 3517 case URxvt_locale:
3928 if (query) 3518 if (query)
3929 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3519 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3930 else 3520 else
3931 { 3521 {
3932 set_locale (str); 3522 set_locale (str);
3933 pty->set_utf8_mode (enc_utf8); 3523 pty->set_utf8_mode (enc_utf8);
3934 init_xlocale (); 3524 init_xlocale ();
… …
3949 break; 3539 break;
3950#endif 3540#endif
3951 3541
3952#if ENABLE_PERL 3542#if ENABLE_PERL
3953 case URxvt_perl: 3543 case URxvt_perl:
3954 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3544 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3955 ; // no responses yet
3956 break; 3545 break;
3957#endif 3546#endif
3958 } 3547 }
3959} 3548}
3960/*----------------------------------------------------------------------*/ 3549/*----------------------------------------------------------------------*/
… …
3983 { 3572 {
3984 if (mode == 'r') 3573 if (mode == 'r')
3985 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3574 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3986 else 3575 else
3987 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3576 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3988 PrivMode (state, bit); 3577 set_privmode (bit, state);
3989 } 3578 }
3990 3579
3991 return state; 3580 return state;
3992} 3581}
3993 3582
… …
3997{ 3586{
3998 unsigned int i, j; 3587 unsigned int i, j;
3999 int state; 3588 int state;
4000 3589
4001 static const struct 3590 static const struct
4002 { 3591 {
4003 const int argval; 3592 const int argval;
4004 const unsigned long bit; 3593 const unsigned long bit;
4005 }
4006
4007 argtopriv[] = { 3594 } argtopriv[] = {
4008 { 1, PrivMode_aplCUR }, 3595 { 1, PrivMode_aplCUR }, // DECCKM
4009 { 2, PrivMode_vt52 }, 3596 { 2, PrivMode_vt52 },
4010 { 3, PrivMode_132 }, 3597 { 3, PrivMode_132 }, // DECCOLM
4011 { 4, PrivMode_smoothScroll }, 3598 { 4, PrivMode_smoothScroll }, // DECSCLM
4012 { 5, PrivMode_rVideo }, 3599 { 5, PrivMode_rVideo }, // DECSCNM
4013 { 6, PrivMode_relOrigin }, 3600 { 6, PrivMode_relOrigin }, // DECOM
4014 { 7, PrivMode_Autowrap }, 3601 { 7, PrivMode_Autowrap }, // DECAWM
4015 // 8, bi-directional support mode 3602 // 8, auto-repeat keys // DECARM
4016 { 9, PrivMode_MouseX10 }, 3603 { 9, PrivMode_MouseX10 },
4017 // 18, 19 printing-related 3604 // 18 end FF to printer after print screen
3605 // 19 Print screen prints full screen/scorll region
4018 { 25, PrivMode_VisibleCursor }, 3606 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4019#ifdef scrollBar_esc 3607#ifdef scrollBar_esc
4020 { scrollBar_esc, PrivMode_scrollBar }, 3608 { scrollBar_esc, PrivMode_scrollBar },
4021#endif 3609#endif
4022 { 35, PrivMode_ShiftKeys }, // rxvt extension 3610 { 35, PrivMode_ShiftKeys }, // rxvt extension
3611 // 38, tektronix mode // DECTEK
4023 { 40, PrivMode_132OK }, 3612 { 40, PrivMode_132OK },
4024 // 41 xterm more fixes NYI 3613 // 41 xterm more fixes NYI
4025 // 45 margin bell NYI 3614 // 45 margin bell NYI
4026 // 46 start logging 3615 // 46 start logging
4027 { 47, PrivMode_Screen }, 3616 { 47, PrivMode_Screen },
4028 { 66, PrivMode_aplKP }, 3617 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4029#ifndef NO_BACKSPACE_KEY 3618#ifndef NO_BACKSPACE_KEY
4030 { 67, PrivMode_BackSpace }, 3619 { 67, PrivMode_BackSpace }, // DECBKM
4031#endif 3620#endif
4032 { 1000, PrivMode_MouseX11 }, 3621 { 1000, PrivMode_MouseX11 },
4033 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3622 { 1002, PrivMode_MouseBtnEvent },
4034 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3623 { 1003, PrivMode_MouseAnyEvent },
4035 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4036 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3624 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4037 { 1011, PrivMode_Keypress }, // rxvt extension 3625 { 1011, PrivMode_Keypress }, // rxvt extension
4038 // 1035 enable modifiers for alt, numlock NYI 3626 // 1035 enable modifiers for alt, numlock NYI
4039 // 1036 send ESC for meta keys NYI 3627 // 1036 send ESC for meta keys NYI
4040 // 1037 send DEL for keypad delete NYI 3628 // 1037 send DEL for keypad delete NYI
4041 { 1047, PrivMode_Screen }, 3629 { 1047, PrivMode_Screen },
4042 // 1048 save and restore cursor 3630 // 1048 save and restore cursor
4043 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3631 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4044 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3632 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3633 { 2004, PrivMode_BracketPaste },
4045 }; 3634 };
4046 3635
4047 if (nargs == 0) 3636 if (nargs == 0)
4048 return; 3637 return;
4049 3638
… …
4074 3663
4075 scr_touch (true); 3664 scr_touch (true);
4076 break; 3665 break;
4077#endif 3666#endif
4078 case 1048: /* alternative cursor save */ 3667 case 1048: /* alternative cursor save */
4079 case 1049:
4080 if (OPTION (Opt_secondaryScreen)) 3668 if (option (Opt_secondaryScreen))
4081 if (mode == 0) 3669 if (mode == 0)
4082 scr_cursor (RESTORE); 3670 scr_cursor (RESTORE);
4083 else if (mode == 1) 3671 else if (mode == 1)
4084 scr_cursor (SAVE); 3672 scr_cursor (SAVE);
4085 break; 3673 break;
… …
4093 case 2: /* VT52 mode */ 3681 case 2: /* VT52 mode */
4094 /* oddball mode. should be set regardless of set/reset 3682 /* oddball mode. should be set regardless of set/reset
4095 * parameter. Return from VT52 mode with an ESC < from 3683 * parameter. Return from VT52 mode with an ESC < from
4096 * within VT52 mode 3684 * within VT52 mode
4097 */ 3685 */
4098 PrivMode (1, PrivMode_vt52); 3686 set_privmode (PrivMode_vt52, 1);
4099 break; 3687 break;
4100 case 3: /* 80/132 */ 3688 case 3: /* 80/132 */
4101 if (priv_modes & PrivMode_132OK) 3689 if (priv_modes & PrivMode_132OK)
4102 set_widthheight (((state ? 132 : 80) * fwidth), height); 3690 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4103 break; 3691 break;
4104 case 4: /* smooth scrolling */ 3692 case 4: /* smooth scrolling */
4105 set_option (Opt_jumpScroll, !state); 3693 set_option (Opt_jumpScroll, !state);
4106 break; 3694 break;
4107 case 5: /* reverse video */ 3695 case 5: /* reverse video */
… …
4114 scr_autowrap (state); 3702 scr_autowrap (state);
4115 break; 3703 break;
4116 /* case 8: - auto repeat, can't do on a per window basis */ 3704 /* case 8: - auto repeat, can't do on a per window basis */
4117 case 9: /* X10 mouse reporting */ 3705 case 9: /* X10 mouse reporting */
4118 if (state) /* orthogonal */ 3706 if (state) /* orthogonal */
4119 priv_modes &= ~PrivMode_MouseX11; 3707 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4120 break; 3708 break;
4121#ifdef scrollBar_esc 3709#ifdef scrollBar_esc
4122 case scrollBar_esc: 3710 case scrollBar_esc:
4123 if (scrollbar_mapping (state)) 3711 if (scrollBar.map (state))
4124 { 3712 {
4125 resize_all_windows (0, 0, 0); 3713 resize_all_windows (0, 0, 0);
4126 scr_touch (true); 3714 scr_touch (true);
4127 } 3715 }
4128 break; 3716 break;
… …
4137 break; 3725 break;
4138 /* case 66: - application key pad */ 3726 /* case 66: - application key pad */
4139 /* case 67: - backspace key */ 3727 /* case 67: - backspace key */
4140 case 1000: /* X11 mouse reporting */ 3728 case 1000: /* X11 mouse reporting */
4141 if (state) /* orthogonal */ 3729 if (state) /* orthogonal */
4142 priv_modes &= ~PrivMode_MouseX10; 3730 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4143 break; 3731 break;
4144#if 0
4145 case 1001: 3732 case 1002:
4146 break; /* X11 mouse highlighting */ 3733 case 1003:
4147#endif 3734 if (state)
3735 {
3736 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3737 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3738 vt_emask_mouse = PointerMotionMask;
3739 }
3740 else
3741 vt_emask_mouse = NoEventMask;
3742
3743 vt_select_input ();
3744 break;
4148 case 1010: /* scroll to bottom on TTY output inhibit */ 3745 case 1010: /* scroll to bottom on TTY output inhibit */
4149 set_option (Opt_scrollTtyOutput, !state); 3746 set_option (Opt_scrollTtyOutput, !state);
4150 break; 3747 break;
4151 case 1011: /* scroll to bottom on key press */ 3748 case 1011: /* scroll to bottom on key press */
4152 set_option (Opt_scrollTtyKeypress, state); 3749 set_option (Opt_scrollTtyKeypress, state);
4153 break; 3750 break;
4154 case 1047: /* secondary screen w/ clearing last */ 3751 case 1047: /* secondary screen w/ clearing last */
4155 if (OPTION (Opt_secondaryScreen)) 3752 if (option (Opt_secondaryScreen))
4156 if (current_screen != PRIMARY) 3753 if (!state)
4157 scr_erase_screen (2); 3754 scr_erase_screen (2);
3755
4158 scr_change_screen (state); 3756 scr_change_screen (state);
4159 break; 3757 break;
4160 case 1049: /* secondary screen w/ clearing first */ 3758 case 1049: /* secondary screen w/ clearing first */
3759 if (option (Opt_secondaryScreen))
3760 if (state)
3761 scr_cursor (SAVE);
3762
4161 scr_change_screen (state); 3763 scr_change_screen (state);
3764
4162 if (OPTION (Opt_secondaryScreen)) 3765 if (option (Opt_secondaryScreen))
4163 if (current_screen != PRIMARY) 3766 if (state)
4164 scr_erase_screen (2); 3767 scr_erase_screen (2);
3768 else
3769 scr_cursor (RESTORE);
4165 break; 3770 break;
4166 default: 3771 default:
4167 break; 3772 break;
4168 } 3773 }
4169 } 3774 }
… …
4329rxvt_term::process_graphics () 3934rxvt_term::process_graphics ()
4330{ 3935{
4331 unicode_t ch, cmd = cmd_getc (); 3936 unicode_t ch, cmd = cmd_getc ();
4332 3937
4333 if (cmd == 'Q') 3938 if (cmd == 'Q')
3939 {
4334 { /* query graphics */ 3940 /* query graphics */
4335 tt_printf ("\033G0\012"); /* no graphics */ 3941 tt_printf ("\033G0\012"); /* no graphics */
4336 return; 3942 return;
4337 } 3943 }
4338 /* swallow other graphics sequences until terminating ':' */ 3944 /* swallow other graphics sequences until terminating ':' */
4339 do 3945 do
… …
4389 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3995 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4390 3996
4391 memcpy (v_buffer + v_buflen, data, len); 3997 memcpy (v_buffer + v_buflen, data, len);
4392 v_buflen += len; 3998 v_buflen += len;
4393 3999
4394 pty_ev.set (EVENT_READ | EVENT_WRITE); 4000 pty_ev.set (ev::READ | ev::WRITE);
4395} 4001}
4396 4002
4397void rxvt_term::pty_write () 4003void rxvt_term::pty_write ()
4398{ 4004{
4399 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4005 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4404 4010
4405 if (v_buflen == 0) 4011 if (v_buflen == 0)
4406 { 4012 {
4407 free (v_buffer); 4013 free (v_buffer);
4408 v_buffer = 0; 4014 v_buffer = 0;
4409 v_buflen = 0;
4410 4015
4411 pty_ev.set (EVENT_READ); 4016 pty_ev.set (ev::READ);
4412 return; 4017 return;
4413 } 4018 }
4414 4019
4415 memmove (v_buffer, v_buffer + written, v_buflen); 4020 memmove (v_buffer, v_buffer + written, v_buflen);
4416 } 4021 }
4417 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4022 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4418 pty_ev.set (EVENT_READ); 4023 pty_ev.set (ev::READ);
4419} 4024}
4420 4025
4421/*----------------------- end-of-file (C source) -----------------------*/ 4026/*----------------------- end-of-file (C source) -----------------------*/
4422 4027

Diff Legend

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