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.293 by root, Mon Jan 30 04:27:17 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.
… …
49#include "rxvt.h" 50#include "rxvt.h"
50#include "rxvtperl.h" 51#include "rxvtperl.h"
51#include "version.h" 52#include "version.h"
52#include "command.h" 53#include "command.h"
53 54
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 56# include "keyboard.h"
61#endif 57#endif
62 58
63#include <csignal> 59#include <csignal>
60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 68
… …
96 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
97 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
98 98
99 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
101 XK_ISO_Lock, 0x21eb,
102 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
103 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
104 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
105 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
106 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
200 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
202 201
203 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
204 203
205 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
206 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
207 206
208 if (y >= 0) 207 if (y >= 0)
209 { 208 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
222 ch = *chr++; 221 ch = *chr++;
223 222
224 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
225 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
226 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
227# if !UNICODE3 226# if !UNICODE_3
228 if (ch >= 0x10000) 227 if (ch >= 0x10000)
229 ch = 0xfffd; 228 ch = 0xfffd;
230# endif 229# endif
231 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
232 231
… …
280 } 279 }
281 280
282 iso14755buf = 0; 281 iso14755buf = 0;
283} 282}
284 283
285int 284static int
286rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
287{ 286{
288 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
289 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
290 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
291 { 290 {
… …
299 298
300 return -1; 299 return -1;
301} 300}
302#endif 301#endif
303 302
304/*{{{ 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
305void 398void
306rxvt_term::lookup_key (XKeyEvent &ev) 399rxvt_term::key_press (XKeyEvent &ev)
307{ 400{
308 int ctrl, meta, shft, len; 401 int ctrl, meta, shft, len;
309 unsigned int newlen;
310 KeySym keysym; 402 KeySym keysym;
311 int valid_keysym; 403 int valid_keysym;
312 char kbuf[KBUFSZ]; 404 char kbuf[KBUFSZ];
405
406#if ISO_14755
407 if (iso14755buf & ISO_14755_52)
408 return;
409#endif
313 410
314 /* 411 /*
315 * 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
316 * escape sequence to toggle the Keypad. 413 * escape sequence to toggle the Keypad.
317 * 414 *
… …
322 meta = ev.state & ModMetaMask; 419 meta = ev.state & ModMetaMask;
323 420
324 if (numlock_state || (ev.state & ModNumLockMask)) 421 if (numlock_state || (ev.state & ModNumLockMask))
325 { 422 {
326 numlock_state = (ev.state & ModNumLockMask); 423 numlock_state = (ev.state & ModNumLockMask);
327 PrivMode ((!numlock_state), PrivMode_aplKP); 424 set_privmode (PrivMode_aplKP, !numlock_state);
328 } 425 }
329 426
330 kbuf[0] = 0; 427 kbuf[0] = 0;
331 428
332#ifdef USE_XIM 429#ifdef USE_XIM
… …
482 } 579 }
483 } 580 }
484 581
485#if ENABLE_FRILLS || ISO_14755 582#if ENABLE_FRILLS || ISO_14755
486 // ISO 14755 support 583 // ISO 14755 support
487 if (shft && ctrl) 584 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
488 { 585 {
489 int hv; 586 int hv;
490 587
491 if (iso14755buf & ISO_14755_51 588 if (iso14755buf & ISO_14755_51
492 && (keysym == XK_space || keysym == XK_KP_Space 589 && (keysym == XK_space || keysym == XK_KP_Space
… …
494 { 591 {
495 commit_iso14755 (); 592 commit_iso14755 ();
496 iso14755buf = ISO_14755_51; 593 iso14755buf = ISO_14755_51;
497# if ISO_14755 594# if ISO_14755
498 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);
499# endif 604# endif
500 return; 605 return;
501 } 606 }
502 else if ((hv = hex_keyval (ev)) >= 0) 607 else if ((hv = hex_keyval (ev)) >= 0)
503 { 608 {
… …
508# endif 613# endif
509 return; 614 return;
510 } 615 }
511 else 616 else
512 { 617 {
513# if ENABLE_OVERLAY 618# if ISO_14755
514 scr_overlay_off (); 619 scr_overlay_off ();
515# endif 620# endif
516 iso14755buf = 0; 621 iso14755buf = 0;
517 } 622 }
518 } 623 }
624 else if (option (Opt_iso14755) &&
519 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 625 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
520 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 626 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
521 if (!(iso14755buf & ISO_14755_STARTED)) 627 if (!(iso14755buf & ISO_14755_STARTED))
522 { 628 {
523 iso14755buf |= ISO_14755_STARTED; 629 iso14755buf |= ISO_14755_STARTED;
524# if ENABLE_OVERLAY 630# if ISO_14755
525 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 631 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
526 scr_overlay_set (0, 0, "ISO 14755 mode"); 632 scr_overlay_set (0, 0, "ISO 14755 mode");
527# endif 633# endif
528 } 634 }
529#endif 635#endif
530 636
531#ifdef PRINTPIPE 637#ifdef PRINTPIPE
532 if (keysym == XK_Print) 638 if (keysym == XK_Print)
533 { 639 {
534 scr_printscreen (ctrl | shft); 640 scr_printscreen (ctrl | shft);
535 return; 641 return;
536 } 642 }
537#endif 643#endif
538 644
539 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 645 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
540 { 646 {
647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
648 unsigned int newlen = 1;
649
650 switch (translate_keypad (keysym, kp))
541 { 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
542 newlen = 1; 682 newlen = 0;
543 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:
544 { 766 {
545#ifndef NO_BACKSPACE_KEY 767 int param = map_function_key (keysym);
546 case XK_BackSpace: 768 if (param > 0)
547 if (priv_modes & PrivMode_HaveBackSpace) 769 sprintf (kbuf,"\033[%d~", param);
548 {
549 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
550 ^ !!ctrl) ? '\b' : '\177';
551 kbuf[1] = '\0';
552 }
553 else 770 else
554 strcpy (kbuf, key_backspace);
555 break;
556#endif
557#ifndef NO_DELETE_KEY
558# ifdef XK_KP_Prior
559 case XK_KP_Delete:
560 /* allow shift to override */
561 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
562 {
563 strcpy (kbuf, "\033On");
564 break;
565 }
566 /* FALLTHROUGH */
567# endif
568 case XK_Delete:
569 strcpy (kbuf, key_delete);
570 break;
571#endif
572 case XK_Tab:
573 if (shft)
574 strcpy (kbuf, "\033[Z");
575 else
576 {
577#ifdef CTRL_TAB_MAKES_META
578 if (ctrl)
579 meta = 1;
580#endif
581#ifdef MOD4_TAB_MAKES_META
582 if (ev.state & Mod4Mask)
583 meta = 1;
584#endif
585 newlen = 0;
586 }
587 break;
588
589#ifdef XK_KP_Left
590 case XK_KP_Up: /* \033Ox or standard */
591 case XK_KP_Down: /* \033Or or standard */
592 case XK_KP_Right: /* \033Ov or standard */
593 case XK_KP_Left: /* \033Ot or standard */
594 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
595 {
596 strcpy (kbuf, "\033OZ");
597 kbuf[2] = "txvr"[keysym - XK_KP_Left];
598 break;
599 }
600 else
601 /* translate to std. cursor key */
602 keysym = XK_Left + (keysym - XK_KP_Left);
603 /* FALLTHROUGH */
604#endif
605 case XK_Up: /* "\033[A" */
606 case XK_Down: /* "\033[B" */
607 case XK_Right: /* "\033[C" */
608 case XK_Left: /* "\033[D" */
609 strcpy (kbuf, "\033[Z");
610 kbuf[2] = "DACB"[keysym - XK_Left];
611 /* do Shift first */
612 if (shft)
613 kbuf[2] = "dacb"[keysym - XK_Left];
614 else if (ctrl)
615 {
616 kbuf[1] = 'O';
617 kbuf[2] = "dacb"[keysym - XK_Left];
618 }
619 else if (priv_modes & PrivMode_aplCUR)
620 kbuf[1] = 'O';
621 break;
622
623#ifndef UNSHIFTED_SCROLLKEYS
624# ifdef XK_KP_Prior
625 case XK_KP_Prior:
626 /* allow shift to override */
627 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
628 {
629 strcpy (kbuf, "\033Oy");
630 break;
631 }
632 /* FALLTHROUGH */
633# endif
634 case XK_Prior:
635 strcpy (kbuf, "\033[5~");
636 break;
637# ifdef XK_KP_Next
638 case XK_KP_Next:
639 /* allow shift to override */
640 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
641 {
642 strcpy (kbuf, "\033Os");
643 break;
644 }
645 /* FALLTHROUGH */
646# endif
647 case XK_Next:
648 strcpy (kbuf, "\033[6~");
649 break;
650#endif
651 case XK_KP_Enter:
652 /* allow shift to override */
653 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
654 {
655 strcpy (kbuf, "\033OM");
656 break;
657 }
658
659 /* FALLTHROUGH */
660
661 case XK_Return:
662 if (priv_modes & PrivMode_LFNL)
663 {
664 kbuf[0] = '\015';
665 kbuf[1] = '\012';
666 kbuf[2] = '\0';
667 }
668 else
669 {
670 kbuf[0] = '\015';
671 kbuf[1] = '\0';
672 }
673 break;
674
675#ifdef XK_KP_Begin
676 case XK_KP_Begin:
677 strcpy (kbuf, "\033Ou");
678 break;
679
680#endif
681 case XK_KP_F1: /* "\033OP" */
682 case XK_KP_F2: /* "\033OQ" */
683 case XK_KP_F3: /* "\033OR" */
684 case XK_KP_F4: /* "\033OS" */
685 strcpy (kbuf, "\033OP");
686 kbuf[2] += (keysym - XK_KP_F1);
687 break;
688
689 case XK_KP_Multiply: /* "\033Oj" : "*" */
690 case XK_KP_Add: /* "\033Ok" : "+" */
691 case XK_KP_Separator: /* "\033Ol" : "," */
692 case XK_KP_Subtract: /* "\033Om" : "-" */
693 case XK_KP_Decimal: /* "\033On" : "." */
694 case XK_KP_Divide: /* "\033Oo" : "/" */
695 case XK_KP_0: /* "\033Op" : "0" */
696 case XK_KP_1: /* "\033Oq" : "1" */
697 case XK_KP_2: /* "\033Or" : "2" */
698 case XK_KP_3: /* "\033Os" : "3" */
699 case XK_KP_4: /* "\033Ot" : "4" */
700 case XK_KP_5: /* "\033Ou" : "5" */
701 case XK_KP_6: /* "\033Ov" : "6" */
702 case XK_KP_7: /* "\033Ow" : "7" */
703 case XK_KP_8: /* "\033Ox" : "8" */
704 case XK_KP_9: /* "\033Oy" : "9" */
705 /* allow shift to override */
706 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
707 {
708 strcpy (kbuf, "\033Oj");
709 kbuf[2] += (keysym - XK_KP_Multiply);
710 }
711 else
712 {
713 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
714 kbuf[1] = '\0';
715 }
716 break;
717
718 case XK_Find:
719 strcpy (kbuf, "\033[1~");
720 break;
721
722#ifdef XK_KP_End
723 case XK_KP_Insert:
724 /* allow shift to override */
725 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
726 {
727 strcpy (kbuf, "\033Op");
728 break;
729 }
730 /* FALLTHROUGH */
731#endif
732 case XK_Insert:
733 strcpy (kbuf, "\033[2~");
734 break;
735#ifdef DXK_Remove /* support for DEC remove like key */
736 case DXK_Remove:
737 /* FALLTHROUGH */
738#endif
739 case XK_Execute:
740 strcpy (kbuf, "\033[3~");
741 break;
742 case XK_Select:
743 strcpy (kbuf, "\033[4~");
744 break;
745#ifdef XK_KP_End
746 case XK_KP_End:
747 /* allow shift to override */
748 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
749 {
750 strcpy (kbuf, "\033Oq");
751 break;
752 }
753 /* FALLTHROUGH */
754#endif
755 case XK_End:
756 strcpy (kbuf, KS_END);
757 break;
758#ifdef XK_KP_Home
759 case XK_KP_Home:
760 /* allow shift to override */
761 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
762 {
763 strcpy (kbuf, "\033Ow");
764 break;
765 }
766 /* FALLTHROUGH */
767#endif
768 case XK_Home:
769 strcpy (kbuf, KS_HOME);
770 break;
771
772#define FKEY(n, fkey) \
773 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
774
775 case XK_F1: /* "\033[11~" */
776 case XK_F2: /* "\033[12~" */
777 case XK_F3: /* "\033[13~" */
778 case XK_F4: /* "\033[14~" */
779 case XK_F5: /* "\033[15~" */
780 FKEY (11, XK_F1);
781 break;
782 case XK_F6: /* "\033[17~" */
783 case XK_F7: /* "\033[18~" */
784 case XK_F8: /* "\033[19~" */
785 case XK_F9: /* "\033[20~" */
786 case XK_F10: /* "\033[21~" */
787 FKEY (17, XK_F6);
788 break;
789 case XK_F11: /* "\033[23~" */
790 case XK_F12: /* "\033[24~" */
791 case XK_F13: /* "\033[25~" */
792 case XK_F14: /* "\033[26~" */
793 FKEY (23, XK_F11);
794 break;
795 case XK_F15: /* "\033[28~" */
796 case XK_F16: /* "\033[29~" */
797 FKEY (28, XK_F15);
798 break;
799 case XK_Help: /* "\033[28~" */
800 FKEY (28, XK_Help);
801 break;
802 case XK_Menu: /* "\033[29~" */
803 FKEY (29, XK_Menu);
804 break;
805 case XK_F17: /* "\033[31~" */
806 case XK_F18: /* "\033[32~" */
807 case XK_F19: /* "\033[33~" */
808 case XK_F20: /* "\033[34~" */
809 case XK_F21: /* "\033[35~" */
810 case XK_F22: /* "\033[36~" */
811 case XK_F23: /* "\033[37~" */
812 case XK_F24: /* "\033[38~" */
813 case XK_F25: /* "\033[39~" */
814 case XK_F26: /* "\033[40~" */
815 case XK_F27: /* "\033[41~" */
816 case XK_F28: /* "\033[42~" */
817 case XK_F29: /* "\033[43~" */
818 case XK_F30: /* "\033[44~" */
819 case XK_F31: /* "\033[45~" */
820 case XK_F32: /* "\033[46~" */
821 case XK_F33: /* "\033[47~" */
822 case XK_F34: /* "\033[48~" */
823 case XK_F35: /* "\033[49~" */
824 FKEY (31, XK_F17);
825 break;
826#undef FKEY
827 default:
828 newlen = 0; 771 newlen = 0;
829 break;
830 } 772 }
831 773 break;
832 if (newlen)
833 len = strlen (kbuf);
834 } 774 }
775
776 if (newlen)
777 len = strlen (kbuf);
835 778
836 /* 779 /*
837 * Pass meta for all function keys, if 'meta' option set 780 * Pass meta for all function keys, if 'meta' option set
838 */ 781 */
839#ifdef META8_OPTION 782#ifdef META8_OPTION
… …
874 return; 817 return;
875 818
876 if (len <= 0) 819 if (len <= 0)
877 return; /* not mapped */ 820 return; /* not mapped */
878 821
879 if (OPTION (Opt_scrollTtyKeypress)) 822 if (option (Opt_scrollTtyKeypress))
880 if (view_start) 823 if (view_start)
881 { 824 {
882 view_start = 0; 825 view_start = 0;
883 want_refresh = 1; 826 want_refresh = 1;
884 } 827 }
… …
908 tt_write (&ch, 1); 851 tt_write (&ch, 1);
909 } 852 }
910 853
911 tt_write (kbuf, (unsigned int)len); 854 tt_write (kbuf, (unsigned int)len);
912} 855}
913/*}}} */ 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}
914 933
915#if defined (KEYSYM_RESOURCE) 934#if defined (KEYSYM_RESOURCE)
916unsigned int 935unsigned int
917rxvt_term::cmd_write (const char *str, unsigned int count) 936rxvt_term::cmd_write (const char *str, unsigned int count)
918{ 937{
… …
948void 967void
949rxvt_term::flush () 968rxvt_term::flush ()
950{ 969{
951 flush_ev.stop (); 970 flush_ev.stop ();
952 971
953#ifdef TRANSPARENT 972#ifdef HAVE_BG_PIXMAP
954 if (want_full_refresh) 973 if (bgPixmap.check_clearChanged ())
955 { 974 {
956 want_full_refresh = 0; 975// scr_clear (true); This needs to be researched further!
957 scr_clear ();
958 scr_touch (false); 976 scr_touch (false);
959 } 977 }
960#endif 978#endif
961 979
962 if (want_refresh) 980 if (want_refresh)
… …
998 } 1016 }
999 while (row < end_row); 1017 while (row < end_row);
1000 } 1018 }
1001 1019
1002 scr_refresh (); 1020 scr_refresh ();
1003 scrollbar_show (1); 1021 scrollBar.show (1);
1004#ifdef USE_XIM 1022#ifdef USE_XIM
1005 IMSendSpot (); 1023 IMSendSpot ();
1006#endif 1024#endif
1007 } 1025 }
1008 1026
1009 display->flush (); 1027 display->flush ();
1010} 1028}
1011 1029
1030/* checks wether a refresh is requested and starts the refresh timer */
1012void 1031void
1013rxvt_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)
1014{ 1042{
1015 make_current (); 1043 make_current ();
1016 1044
1017 display->flush ();
1018
1019 if (want_refresh && !flush_ev.active)
1020 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1021}
1022
1023void
1024rxvt_term::flush_cb (time_watcher &w)
1025{
1026 make_current ();
1027
1028 refresh_limit = 1;
1029 refresh_count = 0; 1045 refresh_count = 0;
1030 flush (); 1046 flush ();
1031} 1047}
1032 1048
1033#ifdef CURSOR_BLINK 1049#ifdef CURSOR_BLINK
1034void 1050void
1035rxvt_term::cursor_blink_cb (time_watcher &w) 1051rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1036{ 1052{
1037 hidden_cursor = !hidden_cursor; 1053 hidden_cursor = !hidden_cursor;
1038 want_refresh = 1; 1054 want_refresh = 1;
1039 1055 refresh_check ();
1040 w.start (w.at + CURSOR_BLINK_INTERVAL);
1041} 1056}
1042#endif 1057#endif
1043 1058
1044#ifdef TEXT_BLINK 1059#ifdef TEXT_BLINK
1045void 1060void
1046rxvt_term::text_blink_cb (time_watcher &w) 1061rxvt_term::text_blink_cb (ev::timer &w, int revents)
1047{ 1062{
1048 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1063 if (scr_refresh_rend (RS_Blink, RS_Blink))
1049 { 1064 {
1050 hidden_text = !hidden_text; 1065 hidden_text = !hidden_text;
1051 want_refresh = 1; 1066 want_refresh = 1;
1052 w.start (w.at + TEXT_BLINK_INTERVAL); 1067 refresh_check ();
1053 } 1068 }
1069 else
1070 w.stop ();
1054} 1071}
1055#endif 1072#endif
1056 1073
1057#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1074#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1058void 1075void
1059rxvt_term::cont_scroll_cb (time_watcher &w) 1076rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1060{ 1077{
1061 if ((scrollbar_isUp() || scrollbar_isDn()) && 1078 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1062 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1079 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1063 { 1080 {
1064 want_refresh = 1; 1081 want_refresh = 1;
1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1082 refresh_check ();
1066 } 1083 }
1084 else
1085 w.stop ();
1067} 1086}
1068#endif 1087#endif
1069 1088
1070#ifdef SELECTION_SCROLLING 1089#ifdef SELECTION_SCROLLING
1071void 1090void
1072rxvt_term::sel_scroll_cb (time_watcher &w) 1091rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1073{ 1092{
1074 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1093 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1075 { 1094 {
1076 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1095 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1077 want_refresh = 1; 1096 want_refresh = 1;
1078 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1097 refresh_check ();
1079 } 1098 }
1099 else
1100 w.stop ();
1080} 1101}
1081#endif 1102#endif
1082 1103
1083#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1104#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1084void 1105void
1085rxvt_term::slip_wheel_cb (time_watcher &w) 1106rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1086{ 1107{
1087 if (mouse_slip_wheel_speed == 0 1108 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1088 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1089 : scr_page (UP, mouse_slip_wheel_speed))
1090 { 1109 {
1091 if (view_start == top_row || view_start == 0)
1092 mouse_slip_wheel_speed = 0;
1093
1094 want_refresh = 1; 1110 want_refresh = 1;
1095 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)
1096 } 1115 {
1116 mouse_slip_wheel_speed = 0;
1117 w.stop ();
1118 }
1097} 1119}
1098#endif 1120#endif
1099 1121
1100#if HAVE_SCHED_YIELD 1122#if LINUX_YIELD_HACK
1101static struct event_handler 1123static struct event_handler
1102{ 1124{
1103 check_watcher cw_yield; 1125 ev::prepare yield_ev;
1104 1126
1105 void yield (check_watcher &w) 1127 void yield_cb (ev::prepare &w, int revents)
1106 { 1128 {
1107 sched_yield (); 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
1108 w.stop (); 1140 w.stop ();
1109 } 1141 }
1110 1142
1111 event_handler () 1143 event_handler ()
1112 : cw_yield (this, &event_handler::yield) 1144 : yield_ev (this, &event_handler::yield_cb)
1113 { 1145 {
1114 } 1146 }
1115} event_handler; 1147} event_handler;
1116#endif 1148#endif
1117 1149
… …
1137 cmdbuf_endp += r; 1169 cmdbuf_endp += r;
1138 return true; 1170 return true;
1139 } 1171 }
1140 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1172 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1141 { 1173 {
1142#if HAVE_SCHED_YIELD 1174#if LINUX_YIELD_HACK
1143 if (display->is_local) 1175 if (display->is_local)
1144 event_handler.cw_yield.start (); 1176 event_handler.yield_ev.start ();
1145#endif 1177#endif
1146 } 1178 }
1147 else 1179 else
1148 { 1180 {
1149 pty_ev.stop (); 1181 pty_ev.stop ();
1150 1182
1151 if (!OPTION (Opt_hold)) 1183 if (!option (Opt_hold))
1152 destroy (); 1184 destroy ();
1153 } 1185 }
1154 1186
1155 return false; 1187 return false;
1156} 1188}
1157 1189
1158void 1190void
1159rxvt_term::pty_cb (io_watcher &w, short revents) 1191rxvt_term::pty_cb (ev::io &w, int revents)
1160{ 1192{
1161 make_current (); 1193 make_current ();
1162 1194
1163 if (revents & EVENT_READ) 1195 if (revents & ev::READ)
1164 // loop, but don't allow a single term to monopolize us 1196 // loop, but don't allow a single term to monopolize us
1165 while (pty_fill ()) 1197 for (int i = CBUFCNT; i-- && pty_fill (); )
1166 if (cmd_parse ()) 1198 cmd_parse ();
1167 break;
1168 1199
1169 if (revents & EVENT_WRITE) 1200 if (revents & ev::WRITE)
1170 pty_write (); 1201 pty_write ();
1202
1203 refresh_check ();
1171} 1204}
1172 1205
1173void 1206void
1174rxvt_term::pointer_unblank () 1207rxvt_term::pointer_unblank ()
1175{ 1208{
1176 XDefineCursor (xdisp, vt, TermWin_cursor); 1209 XDefineCursor (dpy, vt, TermWin_cursor);
1177 recolour_cursor (); 1210 recolour_cursor ();
1178 1211
1179#ifdef POINTER_BLANK 1212#ifdef POINTER_BLANK
1180 hidden_pointer = 0; 1213 hidden_pointer = 0;
1181 1214
1182 if (OPTION (Opt_pointerBlank)) 1215 if (option (Opt_pointerBlank))
1183 pointer_ev.start (NOW + pointerBlankDelay); 1216 pointer_ev.start (pointerBlankDelay);
1184#endif 1217#endif
1185} 1218}
1186 1219
1187#ifdef POINTER_BLANK 1220#ifdef POINTER_BLANK
1188void 1221void
1189rxvt_term::pointer_blank () 1222rxvt_term::pointer_blank ()
1190{ 1223{
1191 if (!OPTION (Opt_pointerBlank)) 1224 if (!option (Opt_pointerBlank))
1192 return; 1225 return;
1193 1226
1194 XDefineCursor (xdisp, vt, display->blank_cursor); 1227 XDefineCursor (dpy, vt, display->blank_cursor);
1195 XFlush (xdisp); 1228 XFlush (dpy);
1196 1229
1197 hidden_pointer = 1; 1230 hidden_pointer = 1;
1198} 1231}
1199 1232
1200void 1233void
1201rxvt_term::pointer_cb (time_watcher &w) 1234rxvt_term::pointer_cb (ev::timer &w, int revents)
1202{ 1235{
1203 make_current (); 1236 make_current ();
1204 1237
1205 pointer_blank (); 1238 pointer_blank ();
1206} 1239}
… …
1209void 1242void
1210rxvt_term::mouse_report (XButtonEvent &ev) 1243rxvt_term::mouse_report (XButtonEvent &ev)
1211{ 1244{
1212 int button_number, key_state = 0; 1245 int button_number, key_state = 0;
1213 int x, y; 1246 int x, y;
1247 int code = 32;
1214 1248
1215 x = ev.x; 1249 x = Pixel2Col (ev.x);
1216 y = ev.y; 1250 y = Pixel2Row (ev.y);
1217 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 }
1218 1259
1219 if (MEvent.button == AnyButton) 1260 if (MEvent.button == AnyButton)
1220 button_number = 3; 1261 button_number = 3;
1221 else 1262 else
1222 { 1263 {
… …
1268 x + 1, 1309 x + 1,
1269 y + 1); 1310 y + 1);
1270#endif 1311#endif
1271 1312
1272 tt_printf ("\033[M%c%c%c", 1313 tt_printf ("\033[M%c%c%c",
1273 (32 + button_number + key_state), 1314 (code + button_number + key_state),
1274 (32 + x + 1), 1315 (32 + x + 1),
1275 (32 + y + 1)); 1316 (32 + y + 1));
1276} 1317}
1277 1318
1278/*{{{ process an X event */ 1319/*{{{ process an X event */
1279void 1320void
1280rxvt_term::x_cb (XEvent &ev) 1321rxvt_term::x_cb (XEvent &ev)
1281{ 1322{
1282 make_current (); 1323 make_current ();
1283 1324
1284 dLocal (Display *, xdisp); 1325 dLocal (Display *, dpy);
1285 1326
1286 if (ev.xany.window == vt 1327 if (ev.xany.window == vt
1287 && SHOULD_INVOKE (HOOK_X_EVENT) 1328 && SHOULD_INVOKE (HOOK_X_EVENT)
1288 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1329 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1289 return; 1330 return;
… …
1294 unsigned int unused_mask; 1335 unsigned int unused_mask;
1295 1336
1296 switch (ev.type) 1337 switch (ev.type)
1297 { 1338 {
1298 case KeyPress: 1339 case KeyPress:
1299#if ISO_14755 1340 key_press (ev.xkey);
1300 if (!(iso14755buf & ISO_14755_52))
1301#endif
1302 lookup_key (ev.xkey);
1303
1304 break; 1341 break;
1305 1342
1306 case KeyRelease: 1343 case KeyRelease:
1307 { 1344 key_release (ev.xkey);
1308#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1309 KeySym keysym;
1310
1311 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1312#endif
1313
1314#if ENABLE_FRILLS || ISO_14755
1315 // ISO 14755 support
1316 if (iso14755buf)
1317 if (iso14755buf & ISO_14755_52)
1318 {
1319# if ENABLE_OVERLAY
1320 scr_overlay_off ();
1321# endif
1322# if ISO_14755
1323 // iso14755 part 5.2 handling: release time
1324 // first: controls
1325 if ((ev.xkey.state & ControlMask)
1326 && ((keysym >= 0x40 && keysym <= 0x5f)
1327 || (keysym >= 0x61 && keysym <= 0x7f)))
1328 {
1329 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1330 commit_iso14755 ();
1331 goto skip_switch;
1332 }
1333
1334 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1335 if (i[0] == keysym)
1336 {
1337 iso14755buf = ISO_14755_51 | i[1];
1338 commit_iso14755 ();
1339 goto skip_switch;
1340 }
1341
1342 scr_bell ();
1343# endif
1344 iso14755buf = 0;
1345 break;
1346 }
1347 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1348 {
1349# if ENABLE_OVERLAY
1350 scr_overlay_off ();
1351# endif
1352 if (iso14755buf & ISO_14755_51)
1353 commit_iso14755 ();
1354#if ISO_14755
1355 else if (iso14755buf & ISO_14755_STARTED)
1356 {
1357 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1358
1359 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1360 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1361 }
1362# endif
1363 else
1364 iso14755buf = 0;
1365 }
1366#endif
1367
1368 if (ev.xany.window == vt
1369 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1370 break;
1371
1372#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1373 if (!(ev.xkey.state & ControlMask))
1374 slip_wheel_ev.stop ();
1375 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1376 mouse_slip_wheel_speed = 0;
1377#endif
1378 break; 1345 break;
1379 }
1380 1346
1381 case ButtonPress: 1347 case ButtonPress:
1382 button_press (ev.xbutton); 1348 button_press (ev.xbutton);
1383 break; 1349 break;
1384 1350
… …
1399 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)))
1400 destroy (); 1366 destroy ();
1401 } 1367 }
1402#if ENABLE_EWMH 1368#if ENABLE_EWMH
1403 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])
1404 XSendEvent (xdisp, ev.xclient.window = display->root, 1370 XSendEvent (dpy, ev.xclient.window = display->root,
1405 False, SubstructureRedirectMask | SubstructureNotifyMask, 1371 False, SubstructureRedirectMask | SubstructureNotifyMask,
1406 &ev); 1372 &ev);
1407#endif 1373#endif
1408 } 1374 }
1409 } 1375 }
… …
1415 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1381 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1416 focus_out (); 1382 focus_out ();
1417 } 1383 }
1418#endif 1384#endif
1419 } 1385 }
1420 break;
1421
1422 case MappingNotify:
1423 XRefreshKeyboardMapping (&ev.xmapping);
1424 break; 1386 break;
1425 1387
1426 /* 1388 /*
1427 * XXX: this is not the _current_ arrangement 1389 * XXX: this is not the _current_ arrangement
1428 * Here's my conclusion: 1390 * Here's my conclusion:
… …
1447 break; 1409 break;
1448 } 1410 }
1449 break; 1411 break;
1450 1412
1451 case FocusIn: 1413 case FocusIn:
1414 if (ev.xfocus.detail != NotifyInferior
1415 && ev.xfocus.detail != NotifyPointer
1416 && ev.xfocus.mode != NotifyGrab)
1452 focus_in (); 1417 focus_in ();
1453 break; 1418 break;
1454 1419
1455 case FocusOut: 1420 case FocusOut:
1421 if (ev.xfocus.detail != NotifyInferior
1422 && ev.xfocus.detail != NotifyPointer
1423 && ev.xfocus.mode != NotifyGrab)
1456 focus_out (); 1424 focus_out ();
1457 break; 1425 break;
1458 1426
1459 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);*/
1460 if (ev.xconfigure.window == parent[0]) 1431 if (ev.xconfigure.window == parent[0])
1461 { 1432 {
1462 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1433 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1463 ; 1434 ;
1464 1435
1465 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1436 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1466 { 1437 {
1467 seen_resize = 1; 1438 seen_resize = 1;
1468 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1439 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1469 } 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 }
1470 1453
1471 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1454 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1472
1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1474 if (OPTION (Opt_transparent))
1475 check_our_parents ();
1476#endif
1477 } 1455 }
1478 break; 1456 break;
1479 1457
1480 case PropertyNotify: 1458 case PropertyNotify:
1481 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)))
… …
1497 case SelectionRequest: 1475 case SelectionRequest:
1498 selection_send (ev.xselectionrequest); 1476 selection_send (ev.xselectionrequest);
1499 break; 1477 break;
1500 1478
1501 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
1502 mapped = 1; 1496 mapped = 1;
1503#ifdef TEXT_BLINK 1497#ifdef TEXT_BLINK
1504 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1498 text_blink_ev.start ();
1505#endif 1499#endif
1506 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1500 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1507 break; 1501 break;
1508 1502
1509 case UnmapNotify: 1503 case UnmapNotify:
… …
1511#ifdef TEXT_BLINK 1505#ifdef TEXT_BLINK
1512 text_blink_ev.stop (); 1506 text_blink_ev.stop ();
1513#endif 1507#endif
1514 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1508 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1515 break; 1509 break;
1516
1517#ifdef TRANSPARENT
1518 case ReparentNotify:
1519 rootwin_cb (ev);
1520 break;
1521#endif /* TRANSPARENT */
1522 1510
1523 case GraphicsExpose: 1511 case GraphicsExpose:
1524 case Expose: 1512 case Expose:
1525 if (ev.xany.window == vt) 1513 if (ev.xany.window == vt)
1526 { 1514 {
1527 do 1515 do
1516 {
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1517 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1518 ev.xexpose.width, ev.xexpose.height, False);
1519 }
1530 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1520 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1531 1521
1532 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1522 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1533 1523
1534 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1524 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1525 {
1535 scr_expose (ev.xexpose.x, ev.xexpose.y, 1526 scr_expose (ev.xexpose.x, ev.xexpose.y,
1536 ev.xexpose.width, ev.xexpose.height, False); 1527 ev.xexpose.width, ev.xexpose.height, False);
1528 }
1537 1529
1538 want_refresh = 1; 1530 want_refresh = 1;
1539 } 1531 }
1540 else 1532 else
1541 { 1533 {
1542 XEvent unused_event; 1534 XEvent unused_event;
1543 1535
1544 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1536 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1545 ; 1537 ;
1546 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1538 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1547 ; 1539 ;
1548 1540
1549 if (isScrollbarWindow (ev.xany.window)) 1541 if (scrollBar.state && ev.xany.window == scrollBar.win)
1550 { 1542 {
1551 scrollBar.setIdle (); 1543 scrollBar.state = STATE_IDLE;
1552 scrollbar_show (0); 1544 scrollBar.show (0);
1553 } 1545 }
1554
1555#ifdef TRANSPARENT
1556 if (am_transparent && ev.xany.window == parent[0])
1557 XClearWindow (xdisp, ev.xany.window);
1558#endif
1559 } 1546 }
1560 break; 1547 break;
1561 1548
1562 case MotionNotify: 1549 case MotionNotify:
1563#ifdef POINTER_BLANK 1550#ifdef POINTER_BLANK
1564 if (hidden_pointer) 1551 if (hidden_pointer)
1565 pointer_unblank (); 1552 pointer_unblank ();
1566#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);
1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1557 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1568 break; 1558 break;
1569 1559
1570 if (ev.xany.window == vt) 1560 if (ev.xany.window == vt)
1571 { 1561 {
1572 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1562 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1573 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1563 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1574 ; // nop 1564 ; // nop
1575 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1565 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1576 { 1566 {
1577 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1567 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1578 ; 1568 ;
1579 1569
1580 XQueryPointer (xdisp, vt, 1570 XQueryPointer (dpy, vt,
1581 &unused_root, &unused_child, 1571 &unused_root, &unused_child,
1582 &unused_root_x, &unused_root_y, 1572 &unused_root_x, &unused_root_y,
1583 &ev.xbutton.x, &ev.xbutton.y, 1573 &ev.xbutton.x, &ev.xbutton.y,
1584 &ev.xbutton.state); 1574 &ev.xbutton.state);
1585#ifdef MOUSE_THRESHOLD 1575#ifdef MOUSE_THRESHOLD
… …
1605 int dist; 1595 int dist;
1606 1596
1607 /* don't clobber the current delay if we are 1597 /* don't clobber the current delay if we are
1608 * already in the middle of scrolling. 1598 * already in the middle of scrolling.
1609 */ 1599 */
1610 if (!sel_scroll_ev.active) 1600 if (!sel_scroll_ev.is_active ())
1611 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1601 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1612 1602
1613 /* save the event params so we can highlight 1603 /* save the event params so we can highlight
1614 * the selection in the pending-scroll loop 1604 * the selection in the pending-scroll loop
1615 */ 1605 */
1616 selection_save_x = ev.xbutton.x; 1606 selection_save_x = ev.xbutton.x;
… …
1638 else 1628 else
1639 { 1629 {
1640 /* we are within the text window, so we 1630 /* we are within the text window, so we
1641 * shouldn't be scrolling 1631 * shouldn't be scrolling
1642 */ 1632 */
1643 if (sel_scroll_ev.active)
1644 sel_scroll_ev.stop(); 1633 sel_scroll_ev.stop();
1645 } 1634 }
1646#endif 1635#endif
1647#ifdef MOUSE_THRESHOLD 1636#ifdef MOUSE_THRESHOLD
1648 } 1637 }
1649#endif 1638#endif
1650 } 1639 }
1651 } 1640 }
1652 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1641 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1653 { 1642 {
1654 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1643 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1655 MotionNotify, &ev)) 1644 MotionNotify, &ev))
1656 ; 1645 ;
1657 1646
1658 XQueryPointer (xdisp, scrollBar.win, 1647 XQueryPointer (dpy, scrollBar.win,
1659 &unused_root, &unused_child, 1648 &unused_root, &unused_child,
1660 &unused_root_x, &unused_root_y, 1649 &unused_root_x, &unused_root_y,
1661 &ev.xbutton.x, &ev.xbutton.y, 1650 &ev.xbutton.x, &ev.xbutton.y,
1662 &unused_mask); 1651 &unused_mask);
1663 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1652 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1664 scrollbar_size ()); 1653 scrollBar.size ());
1665 want_refresh = 1; 1654 want_refresh = 1;
1666 refresh_limit = 0;
1667 scrollbar_show (1); 1655 scrollBar.show (1);
1668 } 1656 }
1669 break; 1657 break;
1670 } 1658 }
1671 1659
1672skip_switch: ;
1673
1674#if defined(CURSOR_BLINK) 1660#if defined(CURSOR_BLINK)
1675 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1661 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1676 { 1662 {
1677 if (hidden_cursor) 1663 if (hidden_cursor)
1678 { 1664 {
1679 hidden_cursor = 0; 1665 hidden_cursor = 0;
1680 want_refresh = 1; 1666 want_refresh = 1;
1681 } 1667 }
1682 1668
1683 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1669 cursor_blink_ev.again ();
1684 } 1670 }
1685#endif 1671#endif
1686 1672
1687#if defined(POINTER_BLANK) 1673#if defined(POINTER_BLANK)
1688 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1674 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1689 { 1675 {
1690 if (ev.type == MotionNotify 1676 if (ev.type == MotionNotify
1691 || ev.type == ButtonPress 1677 || ev.type == ButtonPress
1692 || ev.type == ButtonRelease) 1678 || ev.type == ButtonRelease)
1693 if (hidden_pointer) 1679 if (hidden_pointer)
… …
1695 1681
1696 if (ev.type == KeyPress && hidden_pointer == 0) 1682 if (ev.type == KeyPress && hidden_pointer == 0)
1697 pointer_blank (); 1683 pointer_blank ();
1698 } 1684 }
1699#endif 1685#endif
1686
1687 refresh_check ();
1700} 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
1701 1705
1702void 1706void
1703rxvt_term::focus_in () 1707rxvt_term::focus_in ()
1704{ 1708{
1705 if (!focus) 1709 if (!focus)
1706 { 1710 {
1707 focus = 1; 1711 focus = 1;
1708 want_refresh = 1; 1712 want_refresh = 1;
1709 1713
1710 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1711
1712#if USE_XIM 1714#if USE_XIM
1713 if (Input_Context != NULL) 1715 if (Input_Context != NULL)
1714 { 1716 {
1715 IMSetStatusPosition (); 1717 IMSetPosition ();
1716 XSetICFocus (Input_Context); 1718 XSetICFocus (Input_Context);
1717 } 1719 }
1718#endif 1720#endif
1719#if CURSOR_BLINK 1721#if CURSOR_BLINK
1720 if (OPTION (Opt_cursorBlink)) 1722 if (option (Opt_cursorBlink))
1721 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1723 cursor_blink_ev.again ();
1722#endif 1724#endif
1723#if OFF_FOCUS_FADING 1725#if OFF_FOCUS_FADING
1724 if (rs[Rs_fade]) 1726 if (rs[Rs_fade])
1725 { 1727 {
1726 pix_colors = pix_colors_focused; 1728 pix_colors = pix_colors_focused;
1727 scr_recolour (); 1729 scr_recolour ();
1728 } 1730 }
1729#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));
1730 } 1738 }
1731} 1739}
1732 1740
1733void 1741void
1734rxvt_term::focus_out () 1742rxvt_term::focus_out ()
… …
1736 if (focus) 1744 if (focus)
1737 { 1745 {
1738 focus = 0; 1746 focus = 0;
1739 want_refresh = 1; 1747 want_refresh = 1;
1740 1748
1741 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1749#if ENABLE_FRILLS
1742 1750 if (option (Opt_urgentOnBell))
1751 set_urgency (0);
1752#endif
1743#if ENABLE_FRILLS || ISO_14755 1753#if ENABLE_FRILLS || ISO_14755
1744 if (iso14755buf) 1754 if (iso14755buf)
1745 { 1755 {
1746 iso14755buf = 0; 1756 iso14755buf = 0;
1747# if ENABLE_OVERLAY 1757# if ISO_14755
1748 scr_overlay_off (); 1758 scr_overlay_off ();
1749# endif 1759# endif
1750 } 1760 }
1751#endif 1761#endif
1752#if USE_XIM 1762#if USE_XIM
1753 if (Input_Context != NULL) 1763 if (Input_Context != NULL)
1754 XUnsetICFocus (Input_Context); 1764 XUnsetICFocus (Input_Context);
1755#endif 1765#endif
1756#if CURSOR_BLINK 1766#if CURSOR_BLINK
1757 if (OPTION (Opt_cursorBlink)) 1767 if (option (Opt_cursorBlink))
1758 cursor_blink_ev.stop (); 1768 cursor_blink_ev.stop ();
1769
1759 hidden_cursor = 0; 1770 hidden_cursor = 0;
1760#endif 1771#endif
1761#if OFF_FOCUS_FADING 1772#if OFF_FOCUS_FADING
1762 if (rs[Rs_fade]) 1773 if (rs[Rs_fade])
1763 { 1774 {
1764 pix_colors = pix_colors_unfocused; 1775 pix_colors = pix_colors_unfocused;
1765 scr_recolour (); 1776 scr_recolour ();
1766 } 1777 }
1767#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])
1768 } 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
1769} 1795}
1770 1796
1771#if TRANSPARENT 1797#if ENABLE_TRANSPARENCY || ENABLE_PERL
1772void 1798void
1773rxvt_term::rootwin_cb (XEvent &ev) 1799rxvt_term::rootwin_cb (XEvent &ev)
1774{ 1800{
1775 make_current (); 1801 make_current ();
1776 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
1777 switch (ev.type) 1808 switch (ev.type)
1778 { 1809 {
1779 case PropertyNotify: 1810 case PropertyNotify:
1780 /* 1811 /*
1781 * 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,
1782 * 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.
1783 */ 1814 */
1784 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1815 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1785 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1816 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1786 return; 1817 {
1818 bgPixmap.set_root_pixmap ();
1819 update_background ();
1820 }
1787 1821
1788 /* FALLTHROUGH */
1789 case ReparentNotify:
1790 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1791 want_refresh = want_full_refresh = 1;
1792 break; 1822 break;
1793 } 1823 }
1824# endif
1825
1826 refresh_check ();
1794} 1827}
1795#endif 1828#endif
1796 1829
1797void 1830void
1798rxvt_term::button_press (XButtonEvent &ev) 1831rxvt_term::button_press (XButtonEvent &ev)
… …
1853 mouse_report (ev); 1886 mouse_report (ev);
1854 } 1887 }
1855#else 1888#else
1856 MEvent.button = ev.button; 1889 MEvent.button = ev.button;
1857 mouse_report (ev); 1890 mouse_report (ev);
1858#endif /* MOUSE_REPORT_DOUBLECLICK */ 1891#endif /* MOUSE_REPORT_DOUBLECLICK */
1859 1892
1860 } 1893 }
1861 else 1894 else
1862 { 1895 {
1863 if (ev.button != MEvent.button) 1896 if (ev.button != MEvent.button)
… …
1911 } 1944 }
1912 1945
1913 /* 1946 /*
1914 * Scrollbar window processing of button press 1947 * Scrollbar window processing of button press
1915 */ 1948 */
1916 if (isScrollbarWindow (ev.window)) 1949 if (scrollBar.state && ev.window == scrollBar.win)
1917 { 1950 {
1918 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;
1919 /* 1959 /*
1920 * Rxvt-style scrollbar: 1960 * Rxvt-style scrollbar:
1921 * move up if mouse is above slider 1961 * move up if mouse is above slider
1922 * move dn if mouse is below slider 1962 * move dn if mouse is below slider
1923 * 1963 *
… …
1932 /* 1972 /*
1933 * Mouse report disabled scrollbar: 1973 * Mouse report disabled scrollbar:
1934 * arrow buttons - send up/down 1974 * arrow buttons - send up/down
1935 * click on scrollbar - send pageup/down 1975 * click on scrollbar - send pageup/down
1936 */ 1976 */
1937 if ((scrollBar.style == R_SB_NEXT 1977 if (direction == UP)
1938 && scrollbarnext_upButton (ev.y))
1939 || (scrollBar.style == R_SB_RXVT
1940 && scrollbarrxvt_upButton (ev.y)))
1941 tt_printf ("\033[A"); 1978 tt_printf ("\033[A");
1942 else if ((scrollBar.style == R_SB_NEXT 1979 else if (direction == DN)
1943 && scrollbarnext_dnButton (ev.y))
1944 || (scrollBar.style == R_SB_RXVT
1945 && scrollbarrxvt_dnButton (ev.y)))
1946 tt_printf ("\033[B"); 1980 tt_printf ("\033[B");
1947 else 1981 else
1948 switch (ev.button) 1982 switch (ev.button)
1949 { 1983 {
1950 case Button2: 1984 case Button2:
… …
1957 tt_printf ("\033[5~"); 1991 tt_printf ("\033[5~");
1958 break; 1992 break;
1959 } 1993 }
1960 } 1994 }
1961 else 1995 else
1962#endif /* NO_SCROLLBAR_REPORT */ 1996#endif /* NO_SCROLLBAR_REPORT */
1963
1964 {
1965 char upordown = 0;
1966
1967 if (scrollBar.style == R_SB_NEXT)
1968 { 1997 {
1969 if (scrollbarnext_upButton (ev.y)) 1998 if (direction != NO_DIR)
1970 upordown = -1; /* up */
1971 else if (scrollbarnext_dnButton (ev.y))
1972 upordown = 1; /* down */
1973 }
1974 else if (scrollBar.style == R_SB_RXVT)
1975 {
1976 if (scrollbarrxvt_upButton (ev.y))
1977 upordown = -1; /* up */
1978 else if (scrollbarrxvt_dnButton (ev.y))
1979 upordown = 1; /* down */
1980 }
1981 if (upordown)
1982 { 1999 {
1983#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2000#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2001 if (!cont_scroll_ev.is_active ())
1984 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2002 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1985#endif 2003#endif
1986 if (scr_page (upordown < 0 ? UP : DN, 1)) 2004 if (scr_page (direction, 1))
1987 { 2005 {
1988 if (upordown < 0) 2006 if (direction == UP)
1989 scrollBar.setUp (); 2007 scrollBar.state = STATE_UP;
1990 else 2008 else
1991 scrollBar.setDn (); 2009 scrollBar.state = STATE_DOWN;
1992 } 2010 }
1993 } 2011 }
1994 else 2012 else
1995 switch (ev.button) 2013 switch (ev.button)
1996 { 2014 {
1997 case Button2: 2015 case Button2:
1998 switch (scrollbar_align) 2016 switch (scrollBar.align)
1999 { 2017 {
2000 case R_SB_ALIGN_TOP: 2018 case R_SB_ALIGN_TOP:
2001 csrO = 0; 2019 csrO = 0;
2002 break; 2020 break;
2003 case R_SB_ALIGN_CENTRE: 2021 case R_SB_ALIGN_CENTRE:
… …
2009 } 2027 }
2010 2028
2011 if (scrollBar.style == R_SB_XTERM 2029 if (scrollBar.style == R_SB_XTERM
2012 || scrollbar_above_slider (ev.y) 2030 || scrollbar_above_slider (ev.y)
2013 || scrollbar_below_slider (ev.y)) 2031 || scrollbar_below_slider (ev.y))
2014 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2032 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2015 2033
2016 scrollBar.setMotion (); 2034 scrollBar.state = STATE_MOTION;
2017 break; 2035 break;
2018 2036
2019 case Button1: 2037 case Button1:
2020 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2038 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2021 csrO = ev.y - scrollBar.top; 2039 csrO = ev.y - scrollBar.top;
2022 /* FALLTHROUGH */ 2040 /* FALLTHROUGH */
2023 2041
2024 case Button3: 2042 case Button3:
2025 if (scrollBar.style != R_SB_XTERM) 2043 if (scrollBar.style != R_SB_XTERM)
… …
2035 scr_page (DN, nrow - 1); 2053 scr_page (DN, nrow - 1);
2036# else 2054# else
2037 scr_page (DN, nrow / 4); 2055 scr_page (DN, nrow / 4);
2038# endif 2056# endif
2039 else 2057 else
2040 scrollBar.setMotion (); 2058 scrollBar.state = STATE_MOTION;
2041 } 2059 }
2042 else 2060 else
2043 { 2061 {
2044 scr_page ((ev.button == Button1 ? DN : UP), 2062 scr_page ((ev.button == Button1 ? DN : UP),
2045 (nrow 2063 (nrow
2046 * scrollbar_position (ev.y) 2064 * scrollbar_position (ev.y)
2047 / scrollbar_size ())); 2065 / scrollBar.size ()));
2048 } 2066 }
2049 2067
2050 break; 2068 break;
2051 } 2069 }
2052 } 2070 }
… …
2062 2080
2063 csrO = 0; /* reset csr Offset */ 2081 csrO = 0; /* reset csr Offset */
2064 if (!bypass_keystate) 2082 if (!bypass_keystate)
2065 reportmode = !! (priv_modes & PrivMode_mouse_report); 2083 reportmode = !! (priv_modes & PrivMode_mouse_report);
2066 2084
2067 if (scrollbar_isUpDn ()) 2085 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2068 { 2086 {
2069 scrollBar.setIdle (); 2087 scrollBar.state = STATE_IDLE;
2070 scrollbar_show (0); 2088 scrollBar.show (0);
2071 } 2089 }
2072 2090
2073#ifdef SELECTION_SCROLLING 2091#ifdef SELECTION_SCROLLING
2074 if (sel_scroll_ev.active)
2075 sel_scroll_ev.stop(); 2092 sel_scroll_ev.stop();
2076#endif 2093#endif
2077 2094
2078 if (ev.window == vt) 2095 if (ev.window == vt)
2079 { 2096 {
2080 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)))
… …
2104 mouse_report (ev); 2121 mouse_report (ev);
2105 } 2122 }
2106#else /* MOUSE_REPORT_DOUBLECLICK */ 2123#else /* MOUSE_REPORT_DOUBLECLICK */
2107 MEvent.button = AnyButton; 2124 MEvent.button = AnyButton;
2108 mouse_report (ev); 2125 mouse_report (ev);
2109#endif /* MOUSE_REPORT_DOUBLECLICK */ 2126#endif /* MOUSE_REPORT_DOUBLECLICK */
2110 return; 2127 return;
2111 } 2128 }
2112 2129
2113 /* 2130 /*
2114 * dumb hack to compensate for the failure of click-and-drag 2131 * dumb hack to compensate for the failure of click-and-drag
… …
2126 selection_make (ev.time); 2143 selection_make (ev.time);
2127 break; 2144 break;
2128 2145
2129 case Button2: 2146 case Button2:
2130 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?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2148 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132 break; 2149 break;
2133 2150
2134#ifdef MOUSE_WHEEL 2151#ifdef MOUSE_WHEEL
2135 case Button4: 2152 case Button4:
2136 case Button5: 2153 case Button5:
… …
2140 2157
2141 v = ev.button == Button4 ? UP : DN; 2158 v = ev.button == Button4 ? UP : DN;
2142 2159
2143 if (ev.state & ShiftMask) 2160 if (ev.state & ShiftMask)
2144 i = 1; 2161 i = 1;
2145 else if (OPTION (Opt_mouseWheelScrollPage)) 2162 else if (option (Opt_mouseWheelScrollPage))
2146 i = nrow - 1; 2163 i = nrow - 1;
2147 else 2164 else
2148 i = 5; 2165 i = 5;
2149 2166
2150# ifdef MOUSE_SLIP_WHEELING 2167# ifdef MOUSE_SLIP_WHEELING
… …
2152 { 2169 {
2153 mouse_slip_wheel_speed += v ? -1 : 1; 2170 mouse_slip_wheel_speed += v ? -1 : 1;
2154 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2171 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2155 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2172 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2156 2173
2157 if (slip_wheel_ev.at < NOW) 2174 if (!slip_wheel_ev.is_active ())
2158 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2175 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2159
2160 slip_wheel_ev.start ();
2161 } 2176 }
2162 else 2177 else
2178# endif
2163 { 2179 {
2164# endif
2165 scr_page (v, i); 2180 scr_page (v, i);
2166 scrollbar_show (1); 2181 scrollBar.show (1);
2167# ifdef MOUSE_SLIP_WHEELING
2168 } 2182 }
2169# endif
2170 } 2183 }
2171 break; 2184 break;
2172#endif 2185#endif
2173 } 2186 }
2174 } 2187 }
2175} 2188}
2176 2189
2177#ifdef TRANSPARENT
2178#if TINTING
2179/* taken from aterm-0.4.2 */
2180
2181typedef uint32_t RUINT32T;
2182
2183void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2184{
2185 int sh_r, sh_g, sh_b;
2186 RUINT32T mask_r, mask_g, mask_b;
2187 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2188 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2189 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2190 int i;
2191
2192 Visual *visual = term->visual;
2193
2194 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2195
2196 /* for convenience */
2197 mask_r = visual->red_mask;
2198 mask_g = visual->green_mask;
2199 mask_b = visual->blue_mask;
2200
2201 /* boring lookup table pre-initialization */
2202 switch (srcImage->bits_per_pixel) {
2203 case 15:
2204 if ((mask_r != 0x7c00) ||
2205 (mask_g != 0x03e0) ||
2206 (mask_b != 0x001f))
2207 return;
2208 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2209 lookup_r = lookup;
2210 lookup_g = lookup+32;
2211 lookup_b = lookup+32+32;
2212 sh_r = 10;
2213 sh_g = 5;
2214 sh_b = 0;
2215 break;
2216 case 16:
2217 if ((mask_r != 0xf800) ||
2218 (mask_g != 0x07e0) ||
2219 (mask_b != 0x001f))
2220 return;
2221 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2222 lookup_r = lookup;
2223 lookup_g = lookup+32;
2224 lookup_b = lookup+32+64;
2225 sh_r = 11;
2226 sh_g = 5;
2227 sh_b = 0;
2228 break;
2229 case 24:
2230 if ((mask_r != 0xff0000) ||
2231 (mask_g != 0x00ff00) ||
2232 (mask_b != 0x0000ff))
2233 return;
2234 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2235 lookup_r = lookup;
2236 lookup_g = lookup+256;
2237 lookup_b = lookup+256+256;
2238 sh_r = 16;
2239 sh_g = 8;
2240 sh_b = 0;
2241 break;
2242 case 32:
2243 if ((mask_r != 0xff0000) ||
2244 (mask_g != 0x00ff00) ||
2245 (mask_b != 0x0000ff))
2246 return;
2247 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2248 lookup_r = lookup;
2249 lookup_g = lookup+256;
2250 lookup_b = lookup+256+256;
2251 sh_r = 16;
2252 sh_g = 8;
2253 sh_b = 0;
2254 break;
2255 default:
2256 return; /* we do not support this color depth */
2257 }
2258
2259 /* prepare limits for color transformation (each channel is handled separately) */
2260 if (shade < 0) {
2261 shade = -shade;
2262 if (shade < 0) shade = 0;
2263 if (shade > 100) shade = 100;
2264
2265 lower_lim_r = 65535-rm;
2266 lower_lim_g = 65535-gm;
2267 lower_lim_b = 65535-bm;
2268
2269 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2270 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2271 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2272
2273 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2274 } else {
2275 if (shade < 0) shade = 0;
2276 if (shade > 100) shade = 100;
2277
2278 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2279
2280 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2281 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2282 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2283 }
2284
2285 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2286 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2287 {
2288 unsigned int tmp;
2289
2290 tmp = lower_lim_r;
2291 lower_lim_r = lower_lim_b;
2292 lower_lim_b = tmp;
2293
2294 tmp = upper_lim_r;
2295 upper_lim_r = upper_lim_b;
2296 upper_lim_b = tmp;
2297 }
2298
2299 /* fill our lookup tables */
2300 for (i = 0; i <= mask_r>>sh_r; i++)
2301 {
2302 RUINT32T tmp;
2303 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2304 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2305 lookup_r[i] = (tmp/65535)<<sh_r;
2306 }
2307 for (i = 0; i <= mask_g>>sh_g; i++)
2308 {
2309 RUINT32T tmp;
2310 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2311 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2312 lookup_g[i] = (tmp/65535)<<sh_g;
2313 }
2314 for (i = 0; i <= mask_b>>sh_b; i++)
2315 {
2316 RUINT32T tmp;
2317 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2318 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2319 lookup_b[i] = (tmp/65535)<<sh_b;
2320 }
2321
2322 /* apply table to input image (replacing colors by newly calculated ones) */
2323 switch (srcImage->bits_per_pixel)
2324 {
2325 case 15:
2326 {
2327 unsigned short *p1, *pf, *p, *pl;
2328 p1 = (unsigned short *) srcImage->data;
2329 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2330 while (p1 < pf)
2331 {
2332 p = p1;
2333 pl = p1 + srcImage->width;
2334 for (; p < pl; p++)
2335 {
2336 *p = lookup_r[(*p & 0x7c00)>>10] |
2337 lookup_g[(*p & 0x03e0)>> 5] |
2338 lookup_b[(*p & 0x001f)];
2339 }
2340 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2341 }
2342 break;
2343 }
2344 case 16:
2345 {
2346 unsigned short *p1, *pf, *p, *pl;
2347 p1 = (unsigned short *) srcImage->data;
2348 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2349 while (p1 < pf)
2350 {
2351 p = p1;
2352 pl = p1 + srcImage->width;
2353 for (; p < pl; p++)
2354 {
2355 *p = lookup_r[(*p & 0xf800)>>11] |
2356 lookup_g[(*p & 0x07e0)>> 5] |
2357 lookup_b[(*p & 0x001f)];
2358 }
2359 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2360 }
2361 break;
2362 }
2363 case 24:
2364 {
2365 unsigned char *p1, *pf, *p, *pl;
2366 p1 = (unsigned char *) srcImage->data;
2367 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2368 while (p1 < pf)
2369 {
2370 p = p1;
2371 pl = p1 + srcImage->width * 3;
2372 for (; p < pl; p += 3)
2373 {
2374 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2375 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2376 p[2] = lookup_r[(p[2] & 0x0000ff)];
2377 }
2378 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2379 }
2380 break;
2381 }
2382 case 32:
2383 {
2384 RUINT32T *p1, *pf, *p, *pl;
2385 p1 = (RUINT32T *) srcImage->data;
2386 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2387
2388 while (p1 < pf)
2389 {
2390 p = p1;
2391 pl = p1 + srcImage->width;
2392 for (; p < pl; p++)
2393 {
2394 *p = lookup_r[(*p & 0xff0000)>>16] |
2395 lookup_g[(*p & 0x00ff00)>> 8] |
2396 lookup_b[(*p & 0x0000ff)] |
2397 (*p & ~0xffffff);
2398 }
2399 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2400 }
2401 break;
2402 }
2403 }
2404
2405 free (lookup);
2406}
2407#endif
2408
2409/*
2410 * Check our parents are still who we think they are.
2411 * Do transparency updates if required
2412 */
2413int
2414rxvt_term::check_our_parents ()
2415{
2416 int i, pchanged, aformat, have_pixmap, rootdepth;
2417 unsigned long nitems, bytes_after;
2418 Atom atype;
2419 unsigned char *prop = NULL;
2420 Window root, oldp, *list;
2421 Pixmap rootpixmap = None;
2422 XWindowAttributes wattr, wrootattr;
2423
2424 pchanged = 0;
2425
2426 if (!OPTION (Opt_transparent))
2427 return pchanged; /* Don't try any more */
2428
2429 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2430 rootdepth = wrootattr.depth;
2431
2432 XGetWindowAttributes (xdisp, parent[0], &wattr);
2433
2434 if (rootdepth != wattr.depth)
2435 {
2436 if (am_transparent)
2437 {
2438 pchanged = 1;
2439 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2440 am_transparent = am_pixmap_trans = 0;
2441 }
2442
2443 return pchanged; /* Don't try any more */
2444 }
2445
2446 /* Get all X ops out of the queue so that our information is up-to-date. */
2447 XSync (xdisp, False);
2448
2449 /*
2450 * Make the frame window set by the window manager have
2451 * the root background. Some window managers put multiple nested frame
2452 * windows for each client, so we have to take care about that.
2453 */
2454 i = (xa[XA_XROOTPMAP_ID]
2455 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2456 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2457 &nitems, &bytes_after, &prop) == Success);
2458
2459 if (!i || prop == NULL)
2460 i = (xa[XA_ESETROOT_PMAP_ID]
2461 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2463 &nitems, &bytes_after, &prop) == Success);
2464
2465 if (!i || prop == NULL
2466#if TINTING
2467 || !rs[Rs_color + Color_tint]
2468#endif
2469 )
2470 have_pixmap = 0;
2471 else
2472 {
2473 have_pixmap = 1;
2474 rootpixmap = *(Pixmap *)prop;
2475 XFree (prop);
2476 }
2477
2478 if (have_pixmap)
2479 {
2480 /*
2481 * Copy display->root pixmap transparency
2482 */
2483 int sx, sy, nx, ny;
2484 unsigned int nw, nh;
2485 Window cr;
2486 XImage *image;
2487 GC gc;
2488 XGCValues gcvalue;
2489
2490 XTranslateCoordinates (xdisp, parent[0], display->root,
2491 0, 0, &sx, &sy, &cr);
2492 nw = (unsigned int)szHint.width;
2493 nh = (unsigned int)szHint.height;
2494 nx = ny = 0;
2495
2496 if (sx < 0)
2497 {
2498 nw += sx;
2499 nx = -sx;
2500 sx = 0;
2501 }
2502
2503 if (sy < 0)
2504 {
2505 nh += sy;
2506 ny = -sy;
2507 sy = 0;
2508 }
2509
2510 min_it (nw, (unsigned int) (wrootattr.width - sx));
2511 min_it (nh, (unsigned int) (wrootattr.height - sy));
2512
2513 XSync (xdisp, False);
2514 allowedxerror = -1;
2515 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2516
2517 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2518 /* XXX: may need a delay here? */
2519 allowedxerror = 0;
2520
2521 if (image == NULL)
2522 {
2523 if (am_transparent && am_pixmap_trans)
2524 {
2525 pchanged = 1;
2526 if (pixmap != None)
2527 {
2528 XFreePixmap (xdisp, pixmap);
2529 pixmap = None;
2530 }
2531 }
2532
2533 am_pixmap_trans = 0;
2534 }
2535 else
2536 {
2537 if (pixmap != None)
2538 XFreePixmap (xdisp, pixmap);
2539
2540#if TINTING
2541 if (ISSET_PIXCOLOR (Color_tint))
2542 {
2543 rxvt_rgba c;
2544 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2545
2546 pix_colors_focused[Color_tint].get (this, c);
2547
2548 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2549 }
2550#endif
2551
2552 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2553 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2554 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2555 nx, ny, image->width, image->height);
2556 XFreeGC (xdisp, gc);
2557 XDestroyImage (image);
2558 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2559 XClearWindow (xdisp, parent[0]);
2560
2561 if (!am_transparent || !am_pixmap_trans)
2562 pchanged = 1;
2563
2564 am_transparent = am_pixmap_trans = 1;
2565 }
2566 }
2567
2568 if (am_pixmap_trans)
2569 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2570 else
2571 {
2572 unsigned int n;
2573 /*
2574 * InheritPixmap transparency
2575 */
2576 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2577 {
2578 oldp = parent[i];
2579 XQueryTree (xdisp, parent[i - 1], &root,
2580 &parent[i], &list, &n);
2581 XFree (list);
2582
2583 if (parent[i] == display->root)
2584 {
2585 if (oldp != None)
2586 pchanged = 1;
2587
2588 break;
2589 }
2590
2591 if (oldp != parent[i])
2592 pchanged = 1;
2593 }
2594
2595 n = 0;
2596
2597 if (pchanged)
2598 {
2599 for (; n < (unsigned int)i; n++)
2600 {
2601 XGetWindowAttributes (xdisp, parent[n], &wattr);
2602 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2603 {
2604 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2605 break;
2606 }
2607 }
2608 }
2609
2610 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2611 {
2612 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2613 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2614 am_transparent = 0;
2615 /* XXX: also turn off Opt_transparent? */
2616 }
2617 else
2618 {
2619 for (n = 0; n < (unsigned int)i; n++)
2620 {
2621 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2622 XClearWindow (xdisp, parent[n]);
2623 }
2624
2625 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2626 am_transparent = 1;
2627 }
2628
2629 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2630 parent[i] = None;
2631 }
2632
2633 if (scrollBar.win)
2634 {
2635 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2636 scrollBar.setIdle ();
2637 scrollbar_show (0);
2638 }
2639
2640 if (am_transparent)
2641 {
2642 want_refresh = want_full_refresh = 1;
2643 if (am_pixmap_trans)
2644 flush ();
2645 }
2646
2647 return pchanged;
2648}
2649#endif
2650
2651/*}}} */ 2190/*}}} */
2652 2191
2653bool 2192void
2654rxvt_term::cmd_parse () 2193rxvt_term::cmd_parse ()
2655{ 2194{
2656 bool flag = false;
2657 wchar_t ch = NOCHAR; 2195 wchar_t ch = NOCHAR;
2658 char *seq_begin; // remember start of esc-sequence here 2196 char *seq_begin; // remember start of esc-sequence here
2659 2197
2660 for (;;) 2198 for (;;)
2661 { 2199 {
2662 if (ch == NOCHAR) 2200 if (expect_false (ch == NOCHAR))
2663 { 2201 {
2664 seq_begin = cmdbuf_ptr; 2202 seq_begin = cmdbuf_ptr;
2665 ch = next_char (); 2203 ch = next_char ();
2666 2204
2667 if (ch == NOCHAR) 2205 if (ch == NOCHAR)
2668 break; 2206 break;
2669 } 2207 }
2670 2208
2671 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))
2672 { 2210 {
2673 if (!seen_input) 2211 if (expect_false (!seen_input))
2674 { 2212 {
2675 seen_input = 1; 2213 seen_input = 1;
2676 // many badly-written programs (e.g. jed) contain a race condition: 2214 // many badly-written programs (e.g. jed) contain a race condition:
2677 // they first read the screensize and then install a SIGWINCH handler. 2215 // they first read the screensize and then install a SIGWINCH handler.
2678 // some window managers resize the window early, and these programs 2216 // some window managers resize the window early, and these programs
… …
2691 wchar_t *str = buf; 2229 wchar_t *str = buf;
2692 wchar_t *eol = str + min (ncol, UBUFSIZ); 2230 wchar_t *eol = str + min (ncol, UBUFSIZ);
2693 2231
2694 for (;;) 2232 for (;;)
2695 { 2233 {
2696 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)))
2697 break; 2235 break;
2698 2236
2699 *str++ = ch; 2237 *str++ = ch;
2700 2238
2701 if (ch == C0_LF || str >= eol) 2239 if (expect_false (ch == C0_LF || str >= eol))
2702 { 2240 {
2703 if (ch == C0_LF) 2241 if (ch == C0_LF)
2704 nlines++; 2242 nlines++;
2705 2243
2706 refresh_count++; 2244 refresh_count++;
2707 2245
2708 if (!OPTION (Opt_jumpScroll) 2246 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2709 || (refresh_count >= refresh_limit * (nrow - 1)))
2710 { 2247 {
2711 refreshnow = true;
2712 refresh_count = 0; 2248 refresh_count = 0;
2249
2250 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2251 {
2252 refreshnow = true;
2713 ch = NOCHAR; 2253 ch = NOCHAR;
2714 break; 2254 break;
2255 }
2715 } 2256 }
2716 2257
2717 // scr_add_lines only works for nlines <= nrow - 1. 2258 // scr_add_lines only works for nlines <= nrow - 1.
2718 if (nlines >= nrow - 1) 2259 if (nlines >= nrow - 1)
2719 { 2260 {
… …
2747 && 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))))
2748 scr_add_lines (buf, str - buf, nlines); 2289 scr_add_lines (buf, str - buf, nlines);
2749 2290
2750 /* 2291 /*
2751 * 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
2752 * 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.
2753 * the number of pages between refreshes is refresh_limit, which 2294 * if skipScroll is enabled.
2754 * is incremented here because we must be doing flat-out scrolling.
2755 */ 2295 */
2756 if (refreshnow) 2296 if (refreshnow)
2757 { 2297 {
2758 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2759 refresh_limit++;
2760 else
2761 {
2762 flag = true;
2763 scr_refresh (); 2298 scr_refresh ();
2764 want_refresh = 1; 2299 want_refresh = 1;
2765 }
2766 } 2300 }
2767
2768 } 2301 }
2769 else 2302 else
2770 { 2303 {
2771 try 2304 try
2772 { 2305 {
… …
2780 } 2313 }
2781 2314
2782 ch = NOCHAR; 2315 ch = NOCHAR;
2783 } 2316 }
2784 } 2317 }
2785
2786 return flag;
2787} 2318}
2788 2319
2789// read the next character 2320// read the next character
2790wchar_t 2321wchar_t
2791rxvt_term::next_char () NOTHROW 2322rxvt_term::next_char () NOTHROW
2792{ 2323{
2793 while (cmdbuf_ptr < cmdbuf_endp) 2324 while (cmdbuf_ptr < cmdbuf_endp)
2794 { 2325 {
2795 // assume 7-bit to be ascii ALWAYS 2326 // assume 7-bit to be ascii ALWAYS
2796 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2327 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2797 return *cmdbuf_ptr++; 2328 return *cmdbuf_ptr++;
2798 2329
2799 wchar_t wc; 2330 wchar_t wc;
2800 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);
2801 2332
… …
2805 cmdbuf_ptr = cmdbuf_endp; 2336 cmdbuf_ptr = cmdbuf_endp;
2806 break; 2337 break;
2807 } 2338 }
2808 2339
2809 if (len == (size_t)-1) 2340 if (len == (size_t)-1)
2341 {
2342 mbstate.reset (); // reset now undefined conversion state
2810 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 }
2811 2345
2812 // assume wchar == unicode 2346 // assume wchar == unicode
2813 cmdbuf_ptr += len; 2347 cmdbuf_ptr += len;
2814 return wc & UNICODE_MASK; 2348 return wc & UNICODE_MASK;
2815 } 2349 }
… …
2859/*----------------------------------------------------------------------*/ 2393/*----------------------------------------------------------------------*/
2860#ifdef PRINTPIPE 2394#ifdef PRINTPIPE
2861FILE * 2395FILE *
2862rxvt_term::popen_printer () 2396rxvt_term::popen_printer ()
2863{ 2397{
2864 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2398 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2865 2399
2866 if (stream == NULL) 2400 if (stream == NULL)
2867 rxvt_warn ("can't open printer pipe, not printing.\n"); 2401 rxvt_warn ("can't open printer pipe, not printing.\n");
2868 2402
2869 return stream; 2403 return stream;
… …
2880 * simulate attached vt100 printer 2414 * simulate attached vt100 printer
2881 */ 2415 */
2882void 2416void
2883rxvt_term::process_print_pipe () 2417rxvt_term::process_print_pipe ()
2884{ 2418{
2885 int done; 2419 FILE *fd = popen_printer ();
2886 FILE *fd;
2887 2420
2888 if ((fd = popen_printer ()) == NULL) 2421 if (!fd)
2889 return; 2422 return;
2890 2423
2891 /* 2424 /*
2892 * 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
2893 * is received. 2426 * is received.
2894 */ 2427 */
2895 for (done = 0; !done;) 2428 for (int done = 0; !done; )
2896 { 2429 {
2897 unsigned char buf[8]; 2430 unsigned char buf[8];
2898 unicode_t ch; 2431 unicode_t ch;
2899 unsigned int i, len; 2432 unsigned int i, len;
2900 2433
… …
2919 { 2452 {
2920 if ((buf[len++] = cmd_getc ()) == 'i') 2453 if ((buf[len++] = cmd_getc ()) == 'i')
2921 break; /* done = 1 */ 2454 break; /* done = 1 */
2922 } 2455 }
2923 } 2456 }
2924 2457
2925 for (i = 0; i < len; i++) 2458 for (i = 0; i < len; i++)
2926 if (putc (buf[i], fd) == EOF) 2459 if (putc (buf[i], fd) == EOF)
2927 { 2460 {
2928 done = 1; 2461 done = 1;
2929 break; 2462 break;
… …
2931 } 2464 }
2932 } 2465 }
2933 2466
2934 pclose_printer (fd); 2467 pclose_printer (fd);
2935} 2468}
2936#endif /* PRINTPIPE */ 2469#endif /* PRINTPIPE */
2937/*}}} */ 2470/*}}} */
2938 2471
2939/* *INDENT-OFF* */ 2472/* *INDENT-OFF* */
2940enum { 2473enum {
2941 C1_40 = 0x40, 2474 C1_40 = 0x40,
… …
2991 process_dcs_seq (); 2524 process_dcs_seq ();
2992 break; 2525 break;
2993 case 0x9b: /* CSI */ 2526 case 0x9b: /* CSI */
2994 process_csi_seq (); 2527 process_csi_seq ();
2995 break; 2528 break;
2996 case 0x9d: /* CSI */ 2529 case 0x9d: /* OSC */
2997 process_osc_seq (); 2530 process_osc_seq ();
2998 break; 2531 break;
2999#endif 2532#endif
3000 } 2533 }
3001} 2534}
… …
3045 break; 2578 break;
3046 case 'Z': /* identify the terminal type */ 2579 case 'Z': /* identify the terminal type */
3047 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2580 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3048 break; 2581 break;
3049 case '<': /* turn off VT52 mode */ 2582 case '<': /* turn off VT52 mode */
3050 PrivMode (0, PrivMode_vt52); 2583 set_privmode (PrivMode_vt52, 0);
3051 break; 2584 break;
3052 case 'F': /* use special graphics character set */ 2585 case 'F': /* use special graphics character set */
3053 case 'G': /* use regular character set */ 2586 case 'G': /* use regular character set */
3054 /* unimplemented */ 2587 /* unimplemented */
3055 break; 2588 break;
… …
3091 scr_charset_set (2, (unsigned int)cmd_getc ()); 2624 scr_charset_set (2, (unsigned int)cmd_getc ());
3092 break; 2625 break;
3093 case '+': 2626 case '+':
3094 scr_charset_set (3, (unsigned int)cmd_getc ()); 2627 scr_charset_set (3, (unsigned int)cmd_getc ());
3095 break; 2628 break;
3096#if ENABLE_FRILLS 2629#if !ENABLE_MINIMAL
3097 case '6': 2630 case '6':
3098 scr_backindex (); 2631 scr_backindex ();
3099 break; 2632 break;
3100#endif 2633#endif
3101 case '7': 2634 case '7':
3102 scr_cursor (SAVE); 2635 scr_cursor (SAVE);
3103 break; 2636 break;
3104 case '8': 2637 case '8':
3105 scr_cursor (RESTORE); 2638 scr_cursor (RESTORE);
3106 break; 2639 break;
3107#if ENABLE_FRILLS 2640#if !ENABLE_MINIMAL
3108 case '9': 2641 case '9':
3109 scr_forwardindex (); 2642 scr_forwardindex ();
3110 break; 2643 break;
3111#endif 2644#endif
3112 case '=': 2645 case '=':
3113 case '>': 2646 case '>':
3114 PrivMode ((ch == '='), PrivMode_aplKP); 2647 set_privmode (PrivMode_aplKP, ch == '=');
3115 break; 2648 break;
3116 2649
3117 case C1_40: 2650 case C1_40:
3118 cmd_getc (); 2651 cmd_getc ();
3119 break; 2652 break;
… …
3158 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2691 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3159 case C1_SCI: /* ESC Z */ 2692 case C1_SCI: /* ESC Z */
3160 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2693 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3161 break; /* steal obsolete ESC [ c */ 2694 break; /* steal obsolete ESC [ c */
3162 2695
3163 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2696 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3164 case C1_CSI: /* ESC [ */ 2697 case C1_CSI: /* ESC [ */
3165 process_csi_seq (); 2698 process_csi_seq ();
3166 break; 2699 break;
3167 2700
3168 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2701 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3169 case C1_OSC: /* ESC ] */ 2702 case C1_OSC: /* ESC ] */
3170 process_osc_seq (); 2703 process_osc_seq ();
3171 break; 2704 break;
3172 2705
3173 /* 8.3.106: RESET TO INITIAL STATE */ 2706 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3174 case 'c': 2707 case 'c':
3175 mbstate.reset (); 2708 mbstate.reset ();
3176 scr_poweron (); 2709 scr_poweron ();
3177 scrollbar_show (1); 2710 scrollBar.show (1);
3178 break; 2711 break;
3179 2712
3180 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2713 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3181 case 'n': 2714 case 'n':
3182 scr_charset_choose (2); 2715 scr_charset_choose (2);
… …
3227rxvt_term::process_csi_seq () 2760rxvt_term::process_csi_seq ()
3228{ 2761{
3229 unicode_t ch, priv, i; 2762 unicode_t ch, priv, i;
3230 unsigned int nargs, p; 2763 unsigned int nargs, p;
3231 int n, ndef; 2764 int n, ndef;
3232 int arg[ESC_ARGS]; 2765 int arg[ESC_ARGS] = { };
3233 2766
3234 for (nargs = ESC_ARGS; nargs > 0;) 2767 nargs = 0;
3235 arg[--nargs] = 0;
3236 2768
3237 priv = 0; 2769 priv = 0;
3238 ch = cmd_getc (); 2770 ch = cmd_getc ();
3239 if (ch >= '<' && ch <= '?') 2771 if ((ch >= '<' && ch <= '?') || ch == '!')
2772 {
3240 { /* '<' '=' '>' '?' */ 2773 /* '<' '=' '>' '?' '!' */
3241 priv = ch; 2774 priv = ch;
3242 ch = cmd_getc (); 2775 ch = cmd_getc ();
3243 } 2776 }
3244 2777
3245 /* read any numerical arguments */ 2778 /* read any numerical arguments */
… …
3284 switch (priv) 2817 switch (priv)
3285 { 2818 {
3286 case '>': 2819 case '>':
3287 if (ch == CSI_DA) /* secondary device attributes */ 2820 if (ch == CSI_DA) /* secondary device attributes */
3288 { 2821 {
3289 // 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,
3290 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2823 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3291 // 2824 //
3292 // 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
3293 // 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
3294 // that we do not support xterm mouse reporting (should be 95 when we do). 2827 // versions.
3295 // 2828 //
3296 tt_printf ("\033[>%d;94;0c", 'U'); 2829 tt_printf ("\033[>%d;95;0c", 'U');
3297 } 2830 }
3298 break; 2831 break;
2832
3299 case '?': 2833 case '?':
3300 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3301 process_terminal_mode (ch, priv, nargs, arg); 2835 process_terminal_mode (ch, priv, nargs, arg);
3302 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);
3303 } 2849 }
2850 break;
2851 }
2852
3304 return; 2853 return;
3305 } 2854 }
3306 2855
3307 switch (ch) 2856 switch (ch)
3308 { 2857 {
… …
3428 break; 2977 break;
3429 case 6: /* CPR requested */ 2978 case 6: /* CPR requested */
3430 scr_report_position (); 2979 scr_report_position ();
3431 break; 2980 break;
3432 case 7: /* unofficial extension */ 2981 case 7: /* unofficial extension */
3433 if (OPTION (Opt_insecure)) 2982 if (option (Opt_insecure))
3434 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2983 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3435 break; 2984 break;
3436 case 8: /* unofficial extension */ 2985 case 8: /* unofficial extension */
3437 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2986 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3438 break; 2987 break;
… …
3505 break; 3054 break;
3506 case CSI_75: 3055 case CSI_75:
3507 scr_cursor (RESTORE); 3056 scr_cursor (RESTORE);
3508 break; 3057 break;
3509 3058
3510#if ENABLE_FRILLS 3059#if !ENABLE_MINIMAL
3511 case CSI_74: 3060 case CSI_74:
3512 process_window_ops (arg, nargs); 3061 process_window_ops (arg, nargs);
3513 break; 3062 break;
3514#endif 3063#endif
3515 3064
… …
3522 break; 3071 break;
3523 } 3072 }
3524} 3073}
3525/*}}} */ 3074/*}}} */
3526 3075
3527#if ENABLE_FRILLS 3076#if !ENABLE_MINIMAL
3528/* ARGSUSED */ 3077/* ARGSUSED */
3529void 3078void
3530rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3079rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3531{ 3080{
3532 int x, y; 3081 int x, y;
3533 XWindowAttributes wattr; 3082 XWindowAttributes wattr;
3534 Window wdummy; 3083 Window wdummy;
3535 3084
3536 dLocal (Display *, xdisp); 3085 dLocal (Display *, dpy);
3537 3086
3538 if (nargs == 0) 3087 if (nargs == 0)
3539 return; 3088 return;
3540 3089
3541 switch (args[0]) 3090 switch (args[0])
3542 { 3091 {
3543 /* 3092 /*
3544 * commands 3093 * commands
3545 */ 3094 */
3546 case 1: /* deiconify window */ 3095 case 1: /* deiconify window */
3547 XMapWindow (xdisp, parent[0]); 3096 XMapWindow (dpy, parent[0]);
3548 break; 3097 break;
3549 case 2: /* iconify window */ 3098 case 2: /* iconify window */
3550 XIconifyWindow (xdisp, parent[0], display->screen); 3099 XIconifyWindow (dpy, parent[0], display->screen);
3551 break; 3100 break;
3552 case 3: /* set position (pixels) */ 3101 case 3: /* set position (pixels) */
3553 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3102 XMoveWindow (dpy, parent[0], args[1], args[2]);
3554 break; 3103 break;
3555 case 4: /* set size (pixels) */ 3104 case 4: /* set size (pixels) */
3556 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3105 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3557 break; 3106 break;
3558 case 5: /* raise window */ 3107 case 5: /* raise window */
3559 XRaiseWindow (xdisp, parent[0]); 3108 XRaiseWindow (dpy, parent[0]);
3560 break; 3109 break;
3561 case 6: /* lower window */ 3110 case 6: /* lower window */
3562 XLowerWindow (xdisp, parent[0]); 3111 XLowerWindow (dpy, parent[0]);
3563 break; 3112 break;
3564 case 7: /* refresh window */ 3113 case 7: /* refresh window */
3565 scr_touch (true); 3114 scr_touch (true);
3566 break; 3115 break;
3567 case 8: /* set size (chars) */ 3116 case 8: /* set size (chars) */
… …
3574 if (args[0] >= 24) /* set height (chars) */ 3123 if (args[0] >= 24) /* set height (chars) */
3575 set_widthheight ((unsigned int)width, 3124 set_widthheight ((unsigned int)width,
3576 (unsigned int) (args[1] * fheight)); 3125 (unsigned int) (args[1] * fheight));
3577 break; 3126 break;
3578 3127
3579
3580 /* 3128 /*
3581 * reports - some output format copied from XTerm 3129 * reports - some output format copied from XTerm
3582 */ 3130 */
3583 case 11: /* report window state */ 3131 case 11: /* report window state */
3584 XGetWindowAttributes (xdisp, parent[0], &wattr); 3132 XGetWindowAttributes (dpy, parent[0], &wattr);
3585 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3133 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3586 break; 3134 break;
3587 case 13: /* report window position */ 3135 case 13: /* report window position */
3588 XGetWindowAttributes (xdisp, parent[0], &wattr); 3136 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3137 XTranslateCoordinates (dpy, parent[0], wattr.root,
3590 -wattr.border_width, -wattr.border_width, 3138 -wattr.border_width, -wattr.border_width,
3591 &x, &y, &wdummy); 3139 &x, &y, &wdummy);
3592 tt_printf ("\033[3;%d;%dt", x, y); 3140 tt_printf ("\033[3;%d;%dt", x, y);
3593 break; 3141 break;
3594 case 14: /* report window size (pixels) */ 3142 case 14: /* report window size (pixels) */
3595 XGetWindowAttributes (xdisp, parent[0], &wattr); 3143 XGetWindowAttributes (dpy, parent[0], &wattr);
3596 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3144 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3597 break; 3145 break;
3598 case 18: /* report text area size (chars) */ 3146 case 18: /* report text area size (chars) */
3599 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3147 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3600 break; 3148 break;
… …
3602 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3150 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3603 break; 3151 break;
3604 case 20: /* report icon label */ 3152 case 20: /* report icon label */
3605 { 3153 {
3606 char *s; 3154 char *s;
3607 XGetIconName (xdisp, parent[0], &s); 3155 XGetIconName (dpy, parent[0], &s);
3608 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 */
3609 XFree (s); 3157 XFree (s);
3610 } 3158 }
3611 break; 3159 break;
3612 case 21: /* report window title */ 3160 case 21: /* report window title */
3613 { 3161 {
3614 char *s; 3162 char *s;
3615 XFetchName (xdisp, parent[0], &s); 3163 XFetchName (dpy, parent[0], &s);
3616 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 */
3617 XFree (s); 3165 XFree (s);
3618 } 3166 }
3619 break; 3167 break;
3620 } 3168 }
3621} 3169}
… …
3648 seen_esc = true; 3196 seen_esc = true;
3649 continue; 3197 continue;
3650 } 3198 }
3651 else if (ch == C0_BEL || ch == CHAR_ST) 3199 else if (ch == C0_BEL || ch == CHAR_ST)
3652 break; 3200 break;
3201 else if (ch == C0_SYN)
3202 ch = cmd_get8 ();
3653 else if (ch < 0x20) 3203 else if (ch < 0x20)
3654 return NULL; /* other control character - exit */ 3204 return NULL; /* other control character - exit */
3655 3205
3656 seen_esc = false; 3206 seen_esc = false;
3657 3207
3658 if (n >= STRING_MAX - 1) 3208 if (n >= STRING_MAX - 1)
3659 // stop at some sane length 3209 // stop at some sane length
3660 return NULL; 3210 return NULL;
3661 3211
3662 if (ch == C0_SYN)
3663 string[n++] = cmd_get8 ();
3664 else
3665 string[n++] = ch; 3212 string[n++] = ch;
3666 } 3213 }
3667 3214
3668 string[n++] = '\0'; 3215 string[n++] = '\0';
3669 3216
3670 ends_how = (ch == 0x5c ? C0_ESC : ch); 3217 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3721void 3268void
3722rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3269rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3723{ 3270{
3724 if (str[0] == '?' && !str[1]) 3271 if (str[0] == '?' && !str[1])
3725 { 3272 {
3726 rxvt_rgba c; 3273 rgba c;
3727 pix_colors_focused[color].get (this, c); 3274 pix_colors_focused[color].get (c);
3728 3275
3729#if XFT 3276#if XFT
3730 if (c.a != rxvt_rgba::MAX_CC) 3277 if (c.a != rgba::MAX_CC)
3731 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3278 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3732 else 3279 else
3733#endif 3280#endif
3734 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3281 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3735 } 3282 }
… …
3739 3286
3740/* 3287/*
3741 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3288 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3742 */ 3289 */
3743void 3290void
3744rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3291rxvt_term::process_xterm_seq (int op, char *str, char resp)
3745{ 3292{
3746 int color; 3293 int color;
3747 char *buf, *name; 3294 char *buf, *name;
3748 bool query = str[0] == '?' && !str[1]; 3295 bool query = str[0] == '?' && !str[1];
3749 int saveop = op; 3296 int saveop = op;
3750 3297
3751 dLocal (Display *, xdisp); 3298 dLocal (Display *, dpy);
3752 3299
3753 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
3754 switch (op) 3305 switch (op)
3755 { 3306 {
3756 case XTerm_name: 3307 case XTerm_name:
3757 set_title (str); 3308 set_title (str);
3758 /* FALLTHROUGH */ 3309 /* FALLTHROUGH */
… …
3772 unsigned long bytes_after; 3323 unsigned long bytes_after;
3773 unsigned char *value = 0; 3324 unsigned char *value = 0;
3774 const char *str = ""; 3325 const char *str = "";
3775 3326
3776 if (prop 3327 if (prop
3777 && XGetWindowProperty (xdisp, parent[0], 3328 && XGetWindowProperty (dpy, parent[0],
3778 prop, 0, 1<<16, 0, AnyPropertyType, 3329 prop, 0, 1<<16, 0, AnyPropertyType,
3779 &actual_type, &actual_format, 3330 &actual_type, &actual_format,
3780 &nitems, &bytes_after, &value) == Success 3331 &nitems, &bytes_after, &value) == Success
3781 && actual_type != None 3332 && actual_type != None
3782 && actual_format == 8) 3333 && actual_format == 8)
… …
3786 3337
3787 XFree (value); 3338 XFree (value);
3788 } 3339 }
3789 else 3340 else
3790 { 3341 {
3791 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3342 char *eq = strchr (str, '=');
3792 3343
3793 if (eq) 3344 if (eq)
3794 { 3345 {
3795 *eq = 0; 3346 *eq = 0;
3796 set_utf8_property (display->atom (str), eq + 1); 3347 set_utf8_property (display->atom (str), eq + 1);
3797 } 3348 }
3798 else 3349 else
3799 XDeleteProperty (xdisp, parent[0], 3350 XDeleteProperty (dpy, parent[0],
3800 display->atom (str)); 3351 display->atom (str));
3801 } 3352 }
3802 break; 3353 break;
3803 3354
3804 case XTerm_Color: 3355 case XTerm_Color:
… …
3817 *buf++ = '\0'; 3368 *buf++ = '\0';
3818 3369
3819 process_color_seq (op, color, name, resp); 3370 process_color_seq (op, color, name, resp);
3820 } 3371 }
3821 break; 3372 break;
3373 case Rxvt_restoreFG:
3822 case XTerm_Color00: 3374 case XTerm_Color00:
3823 process_color_seq (op, Color_fg, str, resp); 3375 process_color_seq (op, Color_fg, str, resp);
3824 break; 3376 break;
3377 case Rxvt_restoreBG:
3825 case XTerm_Color01: 3378 case XTerm_Color01:
3826 process_color_seq (op, Color_bg, str, resp); 3379 process_color_seq (op, Color_bg, str, resp);
3827 break; 3380 break;
3828#ifndef NO_CURSORCOLOR 3381#ifndef NO_CURSORCOLOR
3829 case XTerm_Color_cursor: 3382 case XTerm_Color_cursor:
… …
3850 break; 3403 break;
3851 case URxvt_Color_IT: 3404 case URxvt_Color_IT:
3852 process_color_seq (op, Color_IT, str, resp); 3405 process_color_seq (op, Color_IT, str, resp);
3853 break; 3406 break;
3854#endif 3407#endif
3855#if TRANSPARENT && TINTING 3408 case URxvt_Color_border:
3409 process_color_seq (op, Color_border, str, resp);
3410 break;
3411#if ENABLE_TRANSPARENCY
3856 case URxvt_Color_tint: 3412 case URxvt_Color_tint:
3857 process_color_seq (op, Color_tint, str, resp); 3413 process_color_seq (op, Color_tint, str, resp);
3858 check_our_parents (); 3414 {
3859 if (am_transparent) 3415 bool changed = false;
3860 want_full_refresh = want_refresh = 1;
3861 break;
3862#endif
3863 3416
3417 if (ISSET_PIXCOLOR (Color_tint))
3418 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3419 else
3420 changed = bgPixmap.unset_tint ();
3421
3422 if (changed)
3423 update_background ();
3424 }
3425
3426 break;
3427#endif
3428
3429#if BG_IMAGE_FROM_FILE
3864 case Rxvt_Pixmap: 3430 case Rxvt_Pixmap:
3865 { 3431 if (!strcmp (str, "?"))
3866 if (*str != ';')
3867 { 3432 {
3868#if XPM_BACKGROUND 3433 char str[256];
3869 scale_pixmap (""); /* reset to default scaling */ 3434
3870 set_bgPixmap (str); /* change pixmap */ 3435 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3871 scr_touch (true); 3436 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3872#endif 3437 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3438 process_xterm_seq (XTerm_title, str, CHAR_ST);
3873 } 3439 }
3874 3440 else
3441 {
3875 int changed = 0; 3442 int changed = 0;
3876 3443
3877 while ((str = strchr (str, ';')) != NULL) 3444 if (*str != ';')
3878 { 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 {
3879 str++; 3457 str++;
3880#if XPM_BACKGROUND 3458 if (bgPixmap.set_geometry (str))
3881 changed += scale_pixmap (str); 3459 changed++;
3882#endif 3460 str = strchr (str, ';');
3883 } 3461 }
3884 3462
3885 if (changed) 3463 if (changed)
3886 { 3464 update_background ();
3887#ifdef XPM_BACKGROUND
3888 resize_pixmap ();
3889 scr_touch (true);
3890#endif
3891 } 3465 }
3892 }
3893 break; 3466 break;
3894 3467#endif
3895 case Rxvt_restoreFG:
3896 set_window_color (Color_fg, str);
3897 break;
3898 case Rxvt_restoreBG:
3899 set_window_color (Color_bg, str);
3900 break;
3901 3468
3902 case XTerm_logfile: 3469 case XTerm_logfile:
3903 // TODO, when secure mode? 3470 // TODO, when secure mode?
3904 break; 3471 break;
3905 3472
… …
3923 case URxvt_italicFont: 3490 case URxvt_italicFont:
3924 case URxvt_boldItalicFont: 3491 case URxvt_boldItalicFont:
3925#endif 3492#endif
3926 if (query) 3493 if (query)
3927 tt_printf ("\33]%d;%-.250s%c", saveop, 3494 tt_printf ("\33]%d;%-.250s%c", saveop,
3928 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3495 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3929 ? fontset[op - URxvt_font]->fontdesc : "", 3496 ? fontset[op - URxvt_font]->fontdesc : "",
3930 resp); 3497 resp);
3931 else 3498 else
3932 { 3499 {
3933 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3500 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3944 op, 3511 op,
3945 rs[Rs_name], VERSION[0], VERSION[2], 3512 rs[Rs_name], VERSION[0], VERSION[2],
3946 resp); 3513 resp);
3947 break; 3514 break;
3948 3515
3949#if ENABLE_FRILLS 3516#if !ENABLE_MINIMAL
3950 case URxvt_locale: 3517 case URxvt_locale:
3951 if (query) 3518 if (query)
3952 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);
3953 else 3520 else
3954 { 3521 {
3955 set_locale (str); 3522 set_locale (str);
3956 pty->set_utf8_mode (enc_utf8); 3523 pty->set_utf8_mode (enc_utf8);
3957 init_xlocale (); 3524 init_xlocale ();
… …
3972 break; 3539 break;
3973#endif 3540#endif
3974 3541
3975#if ENABLE_PERL 3542#if ENABLE_PERL
3976 case URxvt_perl: 3543 case URxvt_perl:
3977 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));
3978 ; // no responses yet
3979 break; 3545 break;
3980#endif 3546#endif
3981 } 3547 }
3982} 3548}
3983/*----------------------------------------------------------------------*/ 3549/*----------------------------------------------------------------------*/
… …
4006 { 3572 {
4007 if (mode == 'r') 3573 if (mode == 'r')
4008 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3574 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4009 else 3575 else
4010 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3576 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4011 PrivMode (state, bit); 3577 set_privmode (bit, state);
4012 } 3578 }
4013 3579
4014 return state; 3580 return state;
4015} 3581}
4016 3582
… …
4020{ 3586{
4021 unsigned int i, j; 3587 unsigned int i, j;
4022 int state; 3588 int state;
4023 3589
4024 static const struct 3590 static const struct
4025 { 3591 {
4026 const int argval; 3592 const int argval;
4027 const unsigned long bit; 3593 const unsigned long bit;
4028 }
4029
4030 argtopriv[] = { 3594 } argtopriv[] = {
4031 { 1, PrivMode_aplCUR }, 3595 { 1, PrivMode_aplCUR }, // DECCKM
4032 { 2, PrivMode_vt52 }, 3596 { 2, PrivMode_vt52 },
4033 { 3, PrivMode_132 }, 3597 { 3, PrivMode_132 }, // DECCOLM
4034 { 4, PrivMode_smoothScroll }, 3598 { 4, PrivMode_smoothScroll }, // DECSCLM
4035 { 5, PrivMode_rVideo }, 3599 { 5, PrivMode_rVideo }, // DECSCNM
4036 { 6, PrivMode_relOrigin }, 3600 { 6, PrivMode_relOrigin }, // DECOM
4037 { 7, PrivMode_Autowrap }, 3601 { 7, PrivMode_Autowrap }, // DECAWM
4038 // 8, bi-directional support mode 3602 // 8, auto-repeat keys // DECARM
4039 { 9, PrivMode_MouseX10 }, 3603 { 9, PrivMode_MouseX10 },
4040 // 18, 19 printing-related 3604 // 18 end FF to printer after print screen
3605 // 19 Print screen prints full screen/scorll region
4041 { 25, PrivMode_VisibleCursor }, 3606 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4042#ifdef scrollBar_esc 3607#ifdef scrollBar_esc
4043 { scrollBar_esc, PrivMode_scrollBar }, 3608 { scrollBar_esc, PrivMode_scrollBar },
4044#endif 3609#endif
4045 { 35, PrivMode_ShiftKeys }, // rxvt extension 3610 { 35, PrivMode_ShiftKeys }, // rxvt extension
3611 // 38, tektronix mode // DECTEK
4046 { 40, PrivMode_132OK }, 3612 { 40, PrivMode_132OK },
4047 // 41 xterm more fixes NYI 3613 // 41 xterm more fixes NYI
4048 // 45 margin bell NYI 3614 // 45 margin bell NYI
4049 // 46 start logging 3615 // 46 start logging
4050 { 47, PrivMode_Screen }, 3616 { 47, PrivMode_Screen },
4051 { 66, PrivMode_aplKP }, 3617 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4052#ifndef NO_BACKSPACE_KEY 3618#ifndef NO_BACKSPACE_KEY
4053 { 67, PrivMode_BackSpace }, 3619 { 67, PrivMode_BackSpace }, // DECBKM
4054#endif 3620#endif
4055 { 1000, PrivMode_MouseX11 }, 3621 { 1000, PrivMode_MouseX11 },
4056 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3622 { 1002, PrivMode_MouseBtnEvent },
4057 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3623 { 1003, PrivMode_MouseAnyEvent },
4058 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4059 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3624 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4060 { 1011, PrivMode_Keypress }, // rxvt extension 3625 { 1011, PrivMode_Keypress }, // rxvt extension
4061 // 1035 enable modifiers for alt, numlock NYI 3626 // 1035 enable modifiers for alt, numlock NYI
4062 // 1036 send ESC for meta keys NYI 3627 // 1036 send ESC for meta keys NYI
4063 // 1037 send DEL for keypad delete NYI 3628 // 1037 send DEL for keypad delete NYI
4064 { 1047, PrivMode_Screen }, 3629 { 1047, PrivMode_Screen },
4065 // 1048 save and restore cursor 3630 // 1048 save and restore cursor
4066 { 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 */
4067 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3632 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3633 { 2004, PrivMode_BracketPaste },
4068 }; 3634 };
4069 3635
4070 if (nargs == 0) 3636 if (nargs == 0)
4071 return; 3637 return;
4072 3638
… …
4097 3663
4098 scr_touch (true); 3664 scr_touch (true);
4099 break; 3665 break;
4100#endif 3666#endif
4101 case 1048: /* alternative cursor save */ 3667 case 1048: /* alternative cursor save */
4102 case 1049:
4103 if (OPTION (Opt_secondaryScreen)) 3668 if (option (Opt_secondaryScreen))
4104 if (mode == 0) 3669 if (mode == 0)
4105 scr_cursor (RESTORE); 3670 scr_cursor (RESTORE);
4106 else if (mode == 1) 3671 else if (mode == 1)
4107 scr_cursor (SAVE); 3672 scr_cursor (SAVE);
4108 break; 3673 break;
… …
4116 case 2: /* VT52 mode */ 3681 case 2: /* VT52 mode */
4117 /* oddball mode. should be set regardless of set/reset 3682 /* oddball mode. should be set regardless of set/reset
4118 * parameter. Return from VT52 mode with an ESC < from 3683 * parameter. Return from VT52 mode with an ESC < from
4119 * within VT52 mode 3684 * within VT52 mode
4120 */ 3685 */
4121 PrivMode (1, PrivMode_vt52); 3686 set_privmode (PrivMode_vt52, 1);
4122 break; 3687 break;
4123 case 3: /* 80/132 */ 3688 case 3: /* 80/132 */
4124 if (priv_modes & PrivMode_132OK) 3689 if (priv_modes & PrivMode_132OK)
4125 set_widthheight (((state ? 132 : 80) * fwidth), height); 3690 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4126 break; 3691 break;
4127 case 4: /* smooth scrolling */ 3692 case 4: /* smooth scrolling */
4128 set_option (Opt_jumpScroll, !state); 3693 set_option (Opt_jumpScroll, !state);
4129 break; 3694 break;
4130 case 5: /* reverse video */ 3695 case 5: /* reverse video */
… …
4137 scr_autowrap (state); 3702 scr_autowrap (state);
4138 break; 3703 break;
4139 /* 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 */
4140 case 9: /* X10 mouse reporting */ 3705 case 9: /* X10 mouse reporting */
4141 if (state) /* orthogonal */ 3706 if (state) /* orthogonal */
4142 priv_modes &= ~PrivMode_MouseX11; 3707 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4143 break; 3708 break;
4144#ifdef scrollBar_esc 3709#ifdef scrollBar_esc
4145 case scrollBar_esc: 3710 case scrollBar_esc:
4146 if (scrollbar_mapping (state)) 3711 if (scrollBar.map (state))
4147 { 3712 {
4148 resize_all_windows (0, 0, 0); 3713 resize_all_windows (0, 0, 0);
4149 scr_touch (true); 3714 scr_touch (true);
4150 } 3715 }
4151 break; 3716 break;
… …
4160 break; 3725 break;
4161 /* case 66: - application key pad */ 3726 /* case 66: - application key pad */
4162 /* case 67: - backspace key */ 3727 /* case 67: - backspace key */
4163 case 1000: /* X11 mouse reporting */ 3728 case 1000: /* X11 mouse reporting */
4164 if (state) /* orthogonal */ 3729 if (state) /* orthogonal */
4165 priv_modes &= ~PrivMode_MouseX10; 3730 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4166 break; 3731 break;
4167#if 0
4168 case 1001: 3732 case 1002:
4169 break; /* X11 mouse highlighting */ 3733 case 1003:
4170#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;
4171 case 1010: /* scroll to bottom on TTY output inhibit */ 3745 case 1010: /* scroll to bottom on TTY output inhibit */
4172 set_option (Opt_scrollTtyOutput, !state); 3746 set_option (Opt_scrollTtyOutput, !state);
4173 break; 3747 break;
4174 case 1011: /* scroll to bottom on key press */ 3748 case 1011: /* scroll to bottom on key press */
4175 set_option (Opt_scrollTtyKeypress, state); 3749 set_option (Opt_scrollTtyKeypress, state);
4176 break; 3750 break;
4177 case 1047: /* secondary screen w/ clearing last */ 3751 case 1047: /* secondary screen w/ clearing last */
4178 if (OPTION (Opt_secondaryScreen)) 3752 if (option (Opt_secondaryScreen))
4179 if (current_screen != PRIMARY) 3753 if (!state)
4180 scr_erase_screen (2); 3754 scr_erase_screen (2);
3755
4181 scr_change_screen (state); 3756 scr_change_screen (state);
4182 break; 3757 break;
4183 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
4184 scr_change_screen (state); 3763 scr_change_screen (state);
3764
4185 if (OPTION (Opt_secondaryScreen)) 3765 if (option (Opt_secondaryScreen))
4186 if (current_screen != PRIMARY) 3766 if (state)
4187 scr_erase_screen (2); 3767 scr_erase_screen (2);
3768 else
3769 scr_cursor (RESTORE);
4188 break; 3770 break;
4189 default: 3771 default:
4190 break; 3772 break;
4191 } 3773 }
4192 } 3774 }
… …
4318 scr_color (Color_bg, Color_bg); 3900 scr_color (Color_bg, Color_bg);
4319 break; 3901 break;
4320 3902
4321 //case 50: // not variable spacing 3903 //case 50: // not variable spacing
4322 3904
4323#if ENABLE_FRILLS 3905#if !ENABLE_MINIMAL
4324 case 90: 3906 case 90:
4325 case 91: /* set bright fg color */ 3907 case 91: /* set bright fg color */
4326 case 92: 3908 case 92:
4327 case 93: 3909 case 93:
4328 case 94: 3910 case 94:
… …
4352rxvt_term::process_graphics () 3934rxvt_term::process_graphics ()
4353{ 3935{
4354 unicode_t ch, cmd = cmd_getc (); 3936 unicode_t ch, cmd = cmd_getc ();
4355 3937
4356 if (cmd == 'Q') 3938 if (cmd == 'Q')
3939 {
4357 { /* query graphics */ 3940 /* query graphics */
4358 tt_printf ("\033G0\012"); /* no graphics */ 3941 tt_printf ("\033G0\012"); /* no graphics */
4359 return; 3942 return;
4360 } 3943 }
4361 /* swallow other graphics sequences until terminating ':' */ 3944 /* swallow other graphics sequences until terminating ':' */
4362 do 3945 do
… …
4412 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3995 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4413 3996
4414 memcpy (v_buffer + v_buflen, data, len); 3997 memcpy (v_buffer + v_buflen, data, len);
4415 v_buflen += len; 3998 v_buflen += len;
4416 3999
4417 pty_ev.set (EVENT_READ | EVENT_WRITE); 4000 pty_ev.set (ev::READ | ev::WRITE);
4418} 4001}
4419 4002
4420void rxvt_term::pty_write () 4003void rxvt_term::pty_write ()
4421{ 4004{
4422 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));
… …
4427 4010
4428 if (v_buflen == 0) 4011 if (v_buflen == 0)
4429 { 4012 {
4430 free (v_buffer); 4013 free (v_buffer);
4431 v_buffer = 0; 4014 v_buffer = 0;
4432 v_buflen = 0;
4433 4015
4434 pty_ev.set (EVENT_READ); 4016 pty_ev.set (ev::READ);
4435 return; 4017 return;
4436 } 4018 }
4437 4019
4438 memmove (v_buffer, v_buffer + written, v_buflen); 4020 memmove (v_buffer, v_buffer + written, v_buflen);
4439 } 4021 }
4440 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4022 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4441 pty_ev.set (EVENT_READ); 4023 pty_ev.set (ev::READ);
4442} 4024}
4443 4025
4444/*----------------------- end-of-file (C source) -----------------------*/ 4026/*----------------------- end-of-file (C source) -----------------------*/
4445 4027

Diff Legend

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