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.279 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.424 by root, Tue Nov 4 23:46:22 2008 UTC

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

Diff Legend

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