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.278 by root, Fri Jan 20 18:50:49 2006 UTC vs.
Revision 1.420 by root, Wed Oct 15 14:48: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
1133 struct timespec ts = { 0, 0 };
1134 nanosleep (&ts, 0);
1135
1114 w.stop (); 1136 w.stop ();
1115 } 1137 }
1116 1138
1117 event_handler () 1139 event_handler ()
1118 : cw_yield (this, &event_handler::yield) 1140 : yield_ev (this, &event_handler::yield_cb)
1119 { 1141 {
1120 } 1142 }
1121} event_handler; 1143} event_handler;
1122#endif 1144#endif
1123 1145
… …
1143 cmdbuf_endp += r; 1165 cmdbuf_endp += r;
1144 return true; 1166 return true;
1145 } 1167 }
1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1168 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 { 1169 {
1148#if HAVE_SCHED_YIELD 1170#if LINUX_YIELD_HACK
1149 if (display->is_local) 1171 if (display->is_local)
1150 event_handler.cw_yield.start (); 1172 event_handler.yield_ev.start ();
1151#endif 1173#endif
1152 } 1174 }
1153 else 1175 else
1154 { 1176 {
1155 pty_ev.stop (); 1177 pty_ev.stop ();
1156 1178
1157 if (!OPTION (Opt_hold)) 1179 if (!option (Opt_hold))
1158 destroy (); 1180 destroy ();
1159 } 1181 }
1160 1182
1161 return false; 1183 return false;
1162} 1184}
1163 1185
1164void 1186void
1165rxvt_term::pty_cb (io_watcher &w, short revents) 1187rxvt_term::pty_cb (ev::io &w, int revents)
1166{ 1188{
1167 make_current (); 1189 make_current ();
1168 1190
1169 if (revents & EVENT_READ) 1191 if (revents & ev::READ)
1170 // loop, but don't allow a single term to monopolize us 1192 // loop, but don't allow a single term to monopolize us
1171 while (pty_fill ()) 1193 while (pty_fill ())
1172 if (cmd_parse ()) 1194 if (cmd_parse ())
1173 break; 1195 break;
1174 1196
1175 if (revents & EVENT_WRITE) 1197 if (revents & ev::WRITE)
1176 pty_write (); 1198 pty_write ();
1199
1200 refresh_check ();
1177} 1201}
1178 1202
1179void 1203void
1180rxvt_term::pointer_unblank () 1204rxvt_term::pointer_unblank ()
1181{ 1205{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1206 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1207 recolour_cursor ();
1184 1208
1185#ifdef POINTER_BLANK 1209#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1210 hidden_pointer = 0;
1187 1211
1188 if (OPTION (Opt_pointerBlank)) 1212 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1213 pointer_ev.start (pointerBlankDelay);
1190#endif 1214#endif
1191} 1215}
1192 1216
1193#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1194void 1218void
1195rxvt_term::pointer_blank () 1219rxvt_term::pointer_blank ()
1196{ 1220{
1197 if (!OPTION (Opt_pointerBlank)) 1221 if (!option (Opt_pointerBlank))
1198 return; 1222 return;
1199 1223
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1224 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (display->display); 1225 XFlush (dpy);
1202 1226
1203 hidden_pointer = 1; 1227 hidden_pointer = 1;
1204} 1228}
1205 1229
1206void 1230void
1207rxvt_term::pointer_cb (time_watcher &w) 1231rxvt_term::pointer_cb (ev::timer &w, int revents)
1208{ 1232{
1209 make_current (); 1233 make_current ();
1210 1234
1211 pointer_blank (); 1235 pointer_blank ();
1212} 1236}
… …
1215void 1239void
1216rxvt_term::mouse_report (XButtonEvent &ev) 1240rxvt_term::mouse_report (XButtonEvent &ev)
1217{ 1241{
1218 int button_number, key_state = 0; 1242 int button_number, key_state = 0;
1219 int x, y; 1243 int x, y;
1244 int code = 32;
1220 1245
1221 x = ev.x; 1246 x = Pixel2Col (ev.x);
1222 y = ev.y; 1247 y = Pixel2Row (ev.y);
1223 pixel_position (&x, &y); 1248 if (ev.type == MotionNotify)
1249 {
1250 if (x == mouse_row && y == mouse_col)
1251 return;
1252 mouse_row = x;
1253 mouse_col = y;
1254 code += 32;
1255 }
1224 1256
1225 if (MEvent.button == AnyButton) 1257 if (MEvent.button == AnyButton)
1226 button_number = 3; 1258 button_number = 3;
1227 else 1259 else
1228 { 1260 {
… …
1274 x + 1, 1306 x + 1,
1275 y + 1); 1307 y + 1);
1276#endif 1308#endif
1277 1309
1278 tt_printf ("\033[M%c%c%c", 1310 tt_printf ("\033[M%c%c%c",
1279 (32 + button_number + key_state), 1311 (code + button_number + key_state),
1280 (32 + x + 1), 1312 (32 + x + 1),
1281 (32 + y + 1)); 1313 (32 + y + 1));
1282} 1314}
1283
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 1315
1294/*{{{ process an X event */ 1316/*{{{ process an X event */
1295void 1317void
1296rxvt_term::x_cb (XEvent &ev) 1318rxvt_term::x_cb (XEvent &ev)
1297{ 1319{
1298 make_current (); 1320 make_current ();
1299 1321
1300 dDisp; 1322 dLocal (Display *, dpy);
1301 1323
1302 if (ev.xany.window == vt 1324 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1325 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1326 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1327 return;
… …
1310 unsigned int unused_mask; 1332 unsigned int unused_mask;
1311 1333
1312 switch (ev.type) 1334 switch (ev.type)
1313 { 1335 {
1314 case KeyPress: 1336 case KeyPress:
1315#if ISO_14755 1337 key_press (ev.xkey);
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
1318 lookup_key (ev.xkey);
1319
1320 break; 1338 break;
1321 1339
1322 case KeyRelease: 1340 case KeyRelease:
1323 { 1341 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; 1342 break;
1395 }
1396 1343
1397 case ButtonPress: 1344 case ButtonPress:
1398 button_press (ev.xbutton); 1345 button_press (ev.xbutton);
1399 break; 1346 break;
1400 1347
… …
1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1362 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416 destroy (); 1363 destroy ();
1417 } 1364 }
1418#if ENABLE_EWMH 1365#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1366 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1367 XSendEvent (dpy, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1368 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1369 &ev);
1423#endif 1370#endif
1424 } 1371 }
1425 } 1372 }
… …
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1378 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out (); 1379 focus_out ();
1433 } 1380 }
1434#endif 1381#endif
1435 } 1382 }
1436 break;
1437
1438 case MappingNotify:
1439 XRefreshKeyboardMapping (&ev.xmapping);
1440 break; 1383 break;
1441 1384
1442 /* 1385 /*
1443 * XXX: this is not the _current_ arrangement 1386 * XXX: this is not the _current_ arrangement
1444 * Here's my conclusion: 1387 * Here's my conclusion:
… …
1463 break; 1406 break;
1464 } 1407 }
1465 break; 1408 break;
1466 1409
1467 case FocusIn: 1410 case FocusIn:
1411 if (ev.xfocus.detail != NotifyInferior
1412 && ev.xfocus.detail != NotifyPointer
1413 && ev.xfocus.mode != NotifyGrab)
1468 focus_in (); 1414 focus_in ();
1469 break; 1415 break;
1470 1416
1471 case FocusOut: 1417 case FocusOut:
1418 if (ev.xfocus.detail != NotifyInferior
1419 && ev.xfocus.detail != NotifyPointer
1420 && ev.xfocus.mode != NotifyGrab)
1472 focus_out (); 1421 focus_out ();
1473 break; 1422 break;
1474 1423
1475 case ConfigureNotify: 1424 case ConfigureNotify:
1425 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1426 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1427 szHint.width, szHint.height);*/
1476 if (ev.xconfigure.window == parent[0]) 1428 if (ev.xconfigure.window == parent[0])
1477 { 1429 {
1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ; 1431 ;
1480 1432
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 { 1434 {
1483 seen_resize = 1; 1435 seen_resize = 1;
1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1485 } 1437 }
1438 else
1439 {
1440#ifdef HAVE_BG_PIXMAP
1441 if (bgPixmap.window_position_sensitive ())
1442 {
1443 if (mapped)
1444 update_background ();
1445 else
1446 bgPixmap.invalidate ();
1447 }
1448#endif
1449 }
1486 1450
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1451 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 } 1452 }
1494 break; 1453 break;
1495 1454
1496 case PropertyNotify: 1455 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1456 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1513 case SelectionRequest: 1472 case SelectionRequest:
1514 selection_send (ev.xselectionrequest); 1473 selection_send (ev.xselectionrequest);
1515 break; 1474 break;
1516 1475
1517 case MapNotify: 1476 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a
1479 * non-reparenting window manager. In those cases we never get first
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does
1482 * reparenting.
1483 * We should not render background immidiately, as there could be several
1484 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1485 * by scheduling background redraw as soon as we can, but giving a short
1486 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results.
1489 */
1490 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1491 update_background_ev.start (0.025);
1492#endif
1518 mapped = 1; 1493 mapped = 1;
1519#ifdef TEXT_BLINK 1494#ifdef TEXT_BLINK
1520 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1495 text_blink_ev.start ();
1521#endif 1496#endif
1522 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1497 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1523 break; 1498 break;
1524 1499
1525 case UnmapNotify: 1500 case UnmapNotify:
… …
1527#ifdef TEXT_BLINK 1502#ifdef TEXT_BLINK
1528 text_blink_ev.stop (); 1503 text_blink_ev.stop ();
1529#endif 1504#endif
1530 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1505 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1531 break; 1506 break;
1532
1533#ifdef TRANSPARENT
1534 case ReparentNotify:
1535 rootwin_cb (ev);
1536 break;
1537#endif /* TRANSPARENT */
1538 1507
1539 case GraphicsExpose: 1508 case GraphicsExpose:
1540 case Expose: 1509 case Expose:
1541 if (ev.xany.window == vt) 1510 if (ev.xany.window == vt)
1542 { 1511 {
1543 do 1512 do
1513 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1514 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1515 ev.xexpose.width, ev.xexpose.height, False);
1516 }
1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1547 1518
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549 1520
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522 {
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1525 }
1553 1526
1554 want_refresh = 1; 1527 want_refresh = 1;
1555 } 1528 }
1556 else 1529 else
1557 { 1530 {
1558 XEvent unused_event; 1531 XEvent unused_event;
1559 1532
1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1533 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1561 ; 1534 ;
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1536 ;
1564 1537
1565 if (isScrollbarWindow (ev.xany.window)) 1538 if (scrollBar.state && ev.xany.window == scrollBar.win)
1566 { 1539 {
1567 scrollBar.setIdle (); 1540 scrollBar.state = STATE_IDLE;
1568 scrollbar_show (0); 1541 scrollBar.show (0);
1569 } 1542 }
1570
1571#ifdef TRANSPARENT
1572 if (am_transparent && ev.xany.window == parent[0])
1573 XClearWindow (disp, ev.xany.window);
1574#endif
1575 } 1543 }
1576 break; 1544 break;
1577 1545
1578 case MotionNotify: 1546 case MotionNotify:
1579#ifdef POINTER_BLANK 1547#ifdef POINTER_BLANK
1580 if (hidden_pointer) 1548 if (hidden_pointer)
1581 pointer_unblank (); 1549 pointer_unblank ();
1582#endif 1550#endif
1551 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1552 || priv_modes & PrivMode_MouseAnyEvent)
1553 mouse_report (ev.xbutton);
1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1554 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1584 break; 1555 break;
1585 1556
1586 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1587 { 1558 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1559 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1560 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop 1561 ; // nop
1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1562 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1592 { 1563 {
1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1564 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1594 ; 1565 ;
1595 1566
1596 XQueryPointer (disp, vt, 1567 XQueryPointer (dpy, vt,
1597 &unused_root, &unused_child, 1568 &unused_root, &unused_child,
1598 &unused_root_x, &unused_root_y, 1569 &unused_root_x, &unused_root_y,
1599 &ev.xbutton.x, &ev.xbutton.y, 1570 &ev.xbutton.x, &ev.xbutton.y,
1600 &ev.xbutton.state); 1571 &ev.xbutton.state);
1601#ifdef MOUSE_THRESHOLD 1572#ifdef MOUSE_THRESHOLD
… …
1621 int dist; 1592 int dist;
1622 1593
1623 /* don't clobber the current delay if we are 1594 /* don't clobber the current delay if we are
1624 * already in the middle of scrolling. 1595 * already in the middle of scrolling.
1625 */ 1596 */
1626 if (!sel_scroll_ev.active) 1597 if (!sel_scroll_ev.is_active ())
1627 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1598 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1628 1599
1629 /* save the event params so we can highlight 1600 /* save the event params so we can highlight
1630 * the selection in the pending-scroll loop 1601 * the selection in the pending-scroll loop
1631 */ 1602 */
1632 selection_save_x = ev.xbutton.x; 1603 selection_save_x = ev.xbutton.x;
… …
1654 else 1625 else
1655 { 1626 {
1656 /* we are within the text window, so we 1627 /* we are within the text window, so we
1657 * shouldn't be scrolling 1628 * shouldn't be scrolling
1658 */ 1629 */
1659 if (sel_scroll_ev.active)
1660 sel_scroll_ev.stop(); 1630 sel_scroll_ev.stop();
1661 } 1631 }
1662#endif 1632#endif
1663#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
1664 } 1634 }
1665#endif 1635#endif
1666 } 1636 }
1667 } 1637 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1638 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1669 { 1639 {
1670 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1640 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1641 MotionNotify, &ev))
1672 ; 1642 ;
1673 1643
1674 XQueryPointer (disp, scrollBar.win, 1644 XQueryPointer (dpy, scrollBar.win,
1675 &unused_root, &unused_child, 1645 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1646 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1647 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1648 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1680 scrollbar_size ()); 1650 scrollBar.size ());
1681 want_refresh = 1; 1651 want_refresh = 1;
1682 refresh_limit = 0;
1683 scrollbar_show (1); 1652 scrollBar.show (1);
1684 } 1653 }
1685 break; 1654 break;
1686 } 1655 }
1687 1656
1688skip_switch: ;
1689
1690#if defined(CURSOR_BLINK) 1657#if defined(CURSOR_BLINK)
1691 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1658 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1692 { 1659 {
1693 if (hidden_cursor) 1660 if (hidden_cursor)
1694 { 1661 {
1695 hidden_cursor = 0; 1662 hidden_cursor = 0;
1696 want_refresh = 1; 1663 want_refresh = 1;
1697 } 1664 }
1698 1665
1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1666 cursor_blink_ev.again ();
1700 } 1667 }
1701#endif 1668#endif
1702 1669
1703#if defined(POINTER_BLANK) 1670#if defined(POINTER_BLANK)
1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1671 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1705 { 1672 {
1706 if (ev.type == MotionNotify 1673 if (ev.type == MotionNotify
1707 || ev.type == ButtonPress 1674 || ev.type == ButtonPress
1708 || ev.type == ButtonRelease) 1675 || ev.type == ButtonRelease)
1709 if (hidden_pointer) 1676 if (hidden_pointer)
… …
1711 1678
1712 if (ev.type == KeyPress && hidden_pointer == 0) 1679 if (ev.type == KeyPress && hidden_pointer == 0)
1713 pointer_blank (); 1680 pointer_blank ();
1714 } 1681 }
1715#endif 1682#endif
1683
1684 refresh_check ();
1685}
1686
1687void
1688rxvt_term::set_urgency (bool enable)
1689{
1690 if (enable == urgency_hint)
1691 return;
1692
1693 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1694 {
1695 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1696 XSetWMHints (dpy, parent[0], h);
1697 urgency_hint = enable;
1698 }
1716} 1699}
1717 1700
1718void 1701void
1719rxvt_term::focus_in () 1702rxvt_term::focus_in ()
1720{ 1703{
1721 if (!focus) 1704 if (!focus)
1722 { 1705 {
1723 focus = 1; 1706 focus = 1;
1724 want_refresh = 1; 1707 want_refresh = 1;
1725 1708
1726 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1727
1728#if USE_XIM 1709#if USE_XIM
1729 if (Input_Context != NULL) 1710 if (Input_Context != NULL)
1730 { 1711 {
1731 IMSetStatusPosition (); 1712 IMSetPosition ();
1732 XSetICFocus (Input_Context); 1713 XSetICFocus (Input_Context);
1733 } 1714 }
1734#endif 1715#endif
1735#if CURSOR_BLINK 1716#if CURSOR_BLINK
1736 if (OPTION (Opt_cursorBlink)) 1717 if (option (Opt_cursorBlink))
1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1718 cursor_blink_ev.again ();
1738#endif 1719#endif
1739#if OFF_FOCUS_FADING 1720#if OFF_FOCUS_FADING
1740 if (rs[Rs_fade]) 1721 if (rs[Rs_fade])
1741 { 1722 {
1742 pix_colors = pix_colors_focused; 1723 pix_colors = pix_colors_focused;
1743 scr_recolour (); 1724 scr_recolour ();
1744 } 1725 }
1745#endif 1726#endif
1727#if ENABLE_FRILLS
1728 if (option (Opt_urgentOnBell))
1729 set_urgency (0);
1730#endif
1731
1732 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1746 } 1733 }
1747} 1734}
1748 1735
1749void 1736void
1750rxvt_term::focus_out () 1737rxvt_term::focus_out ()
… …
1752 if (focus) 1739 if (focus)
1753 { 1740 {
1754 focus = 0; 1741 focus = 0;
1755 want_refresh = 1; 1742 want_refresh = 1;
1756 1743
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1744#if ENABLE_FRILLS
1758 1745 if (option (Opt_urgentOnBell))
1746 set_urgency (0);
1747#endif
1759#if ENABLE_FRILLS || ISO_14755 1748#if ENABLE_FRILLS || ISO_14755
1760 if (iso14755buf) 1749 if (iso14755buf)
1761 { 1750 {
1762 iso14755buf = 0; 1751 iso14755buf = 0;
1763# if ENABLE_OVERLAY 1752# if ISO_14755
1764 scr_overlay_off (); 1753 scr_overlay_off ();
1765# endif 1754# endif
1766 } 1755 }
1767#endif 1756#endif
1768#if USE_XIM 1757#if USE_XIM
1769 if (Input_Context != NULL) 1758 if (Input_Context != NULL)
1770 XUnsetICFocus (Input_Context); 1759 XUnsetICFocus (Input_Context);
1771#endif 1760#endif
1772#if CURSOR_BLINK 1761#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink)) 1762 if (option (Opt_cursorBlink))
1774 cursor_blink_ev.stop (); 1763 cursor_blink_ev.stop ();
1764
1775 hidden_cursor = 0; 1765 hidden_cursor = 0;
1776#endif 1766#endif
1777#if OFF_FOCUS_FADING 1767#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade]) 1768 if (rs[Rs_fade])
1779 { 1769 {
1780 pix_colors = pix_colors_unfocused; 1770 pix_colors = pix_colors_unfocused;
1781 scr_recolour (); 1771 scr_recolour ();
1782 } 1772 }
1783#endif 1773#endif
1774
1775 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1776 }
1777}
1778
1779void
1780rxvt_term::update_fade_color (unsigned int idx)
1781{
1782#if OFF_FOCUS_FADING
1783 if (rs[Rs_fade])
1784 } 1784 {
1785 rgba c;
1786 pix_colors [Color_fade].get (c);
1787 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1788 }
1789#endif
1785} 1790}
1786 1791
1787#if TRANSPARENT 1792#if ENABLE_TRANSPARENCY || ENABLE_PERL
1788void 1793void
1789rxvt_term::rootwin_cb (XEvent &ev) 1794rxvt_term::rootwin_cb (XEvent &ev)
1790{ 1795{
1791 make_current (); 1796 make_current ();
1792 1797
1798 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1799 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1800 return;
1801
1802# if ENABLE_TRANSPARENCY
1793 switch (ev.type) 1803 switch (ev.type)
1794 { 1804 {
1795 case PropertyNotify: 1805 case PropertyNotify:
1796 /* 1806 /*
1797 * if user used some Esetroot compatible prog to set the root bg, 1807 * 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. 1808 * use the property to determine the pixmap. We use it later on.
1799 */ 1809 */
1800 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1810 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1801 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1811 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1802 return; 1812 {
1813 bgPixmap.set_root_pixmap ();
1814 update_background ();
1815 }
1803 1816
1804 /* FALLTHROUGH */
1805 case ReparentNotify:
1806 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1807 want_refresh = want_full_refresh = 1;
1808 break; 1817 break;
1809 } 1818 }
1819# endif
1820
1821 refresh_check ();
1810} 1822}
1811#endif 1823#endif
1812 1824
1813void 1825void
1814rxvt_term::button_press (XButtonEvent &ev) 1826rxvt_term::button_press (XButtonEvent &ev)
… …
1823 /* 1835 /*
1824 * VT window processing of button press 1836 * VT window processing of button press
1825 */ 1837 */
1826 if (ev.window == vt) 1838 if (ev.window == vt)
1827 { 1839 {
1840 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1841 return;
1842
1828#if ISO_14755 1843#if ISO_14755
1829 // 5.4 1844 // 5.4
1830 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1845 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1831 { 1846 {
1832 iso14755_54 (ev.x, ev.y); 1847 iso14755_54 (ev.x, ev.y);
… …
1866 mouse_report (ev); 1881 mouse_report (ev);
1867 } 1882 }
1868#else 1883#else
1869 MEvent.button = ev.button; 1884 MEvent.button = ev.button;
1870 mouse_report (ev); 1885 mouse_report (ev);
1871#endif /* MOUSE_REPORT_DOUBLECLICK */ 1886#endif /* MOUSE_REPORT_DOUBLECLICK */
1872 1887
1873 } 1888 }
1874 else 1889 else
1875 { 1890 {
1876 if (ev.button != MEvent.button) 1891 if (ev.button != MEvent.button)
1877 MEvent.clicks = 0; 1892 MEvent.clicks = 0;
1878 1893
1879 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1880 switch (ev.button) 1894 switch (ev.button)
1881 { 1895 {
1882 case Button1: 1896 case Button1:
1883 /* allow meta + click to select rectangular areas */ 1897 /* allow meta + click to select rectangular areas */
1884 /* should be done in screen.C */ 1898 /* should be done in screen.C */
1885#if ENABLE_FRILLS 1899#if ENABLE_FRILLS
1886 selection.rect = !!(ev.state & ModMetaMask); 1900 selection.rect = !!(ev.state & ModMetaMask);
1887#else 1901#else
1888 selection.rect = false; 1902 selection.rect = false;
1889#endif 1903#endif
1890 1904
1891 /* allow shift+left click to extend selection */ 1905 /* allow shift+left click to extend selection */
1892 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1906 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1893 { 1907 {
1894 if (MEvent.button == Button1 && clickintime) 1908 if (MEvent.button == Button1 && clickintime)
1895 selection_rotate (ev.x, ev.y); 1909 selection_rotate (ev.x, ev.y);
1896 else 1910 else
1897 selection_extend (ev.x, ev.y, 1); 1911 selection_extend (ev.x, ev.y, 1);
1898 } 1912 }
1899 else 1913 else
1900 { 1914 {
1901 if (MEvent.button == Button1 && clickintime) 1915 if (MEvent.button == Button1 && clickintime)
1902 MEvent.clicks++; 1916 MEvent.clicks++;
1903 else 1917 else
1904 MEvent.clicks = 1; 1918 MEvent.clicks = 1;
1905 1919
1906 selection_click (MEvent.clicks, ev.x, ev.y); 1920 selection_click (MEvent.clicks, ev.x, ev.y);
1907 } 1921 }
1908 1922
1909 MEvent.button = Button1; 1923 MEvent.button = Button1;
1910 break; 1924 break;
1911 1925
1912 case Button3: 1926 case Button3:
1913 if (MEvent.button == Button3 && clickintime) 1927 if (MEvent.button == Button3 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1915 else 1929 else
1916 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
1917 1931
1918 MEvent.button = Button3; 1932 MEvent.button = Button3;
1919 break; 1933 break;
1920 } 1934 }
1921 } 1935 }
1922 1936
1923 MEvent.time = ev.time; 1937 MEvent.time = ev.time;
1924 return; 1938 return;
1925 } 1939 }
1926 1940
1927 /* 1941 /*
1928 * Scrollbar window processing of button press 1942 * Scrollbar window processing of button press
1929 */ 1943 */
1930 if (isScrollbarWindow (ev.window)) 1944 if (scrollBar.state && ev.window == scrollBar.win)
1931 { 1945 {
1932 scrollBar.setIdle (); 1946 page_dirn direction = NO_DIR;
1947
1948 if (scrollBar.upButton (ev.y))
1949 direction = UP; /* up */
1950 else if (scrollBar.dnButton (ev.y))
1951 direction = DN; /* down */
1952
1953 scrollBar.state = STATE_IDLE;
1933 /* 1954 /*
1934 * Rxvt-style scrollbar: 1955 * Rxvt-style scrollbar:
1935 * move up if mouse is above slider 1956 * move up if mouse is above slider
1936 * move dn if mouse is below slider 1957 * move dn if mouse is below slider
1937 * 1958 *
… …
1946 /* 1967 /*
1947 * Mouse report disabled scrollbar: 1968 * Mouse report disabled scrollbar:
1948 * arrow buttons - send up/down 1969 * arrow buttons - send up/down
1949 * click on scrollbar - send pageup/down 1970 * click on scrollbar - send pageup/down
1950 */ 1971 */
1951 if ((scrollBar.style == R_SB_NEXT 1972 if (direction == UP)
1952 && scrollbarnext_upButton (ev.y))
1953 || (scrollBar.style == R_SB_RXVT
1954 && scrollbarrxvt_upButton (ev.y)))
1955 tt_printf ("\033[A"); 1973 tt_printf ("\033[A");
1956 else if ((scrollBar.style == R_SB_NEXT 1974 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"); 1975 tt_printf ("\033[B");
1961 else 1976 else
1962 switch (ev.button) 1977 switch (ev.button)
1963 { 1978 {
1964 case Button2: 1979 case Button2:
… …
1971 tt_printf ("\033[5~"); 1986 tt_printf ("\033[5~");
1972 break; 1987 break;
1973 } 1988 }
1974 } 1989 }
1975 else 1990 else
1976#endif /* NO_SCROLLBAR_REPORT */ 1991#endif /* NO_SCROLLBAR_REPORT */
1977
1978 {
1979 char upordown = 0;
1980
1981 if (scrollBar.style == R_SB_NEXT)
1982 { 1992 {
1983 if (scrollbarnext_upButton (ev.y)) 1993 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 { 1994 {
1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1995#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1996 if (!cont_scroll_ev.is_active ())
1998 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1997 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1999#endif 1998#endif
2000 if (scr_page (upordown < 0 ? UP : DN, 1)) 1999 if (scr_page (direction, 1))
2001 { 2000 {
2002 if (upordown < 0) 2001 if (direction == UP)
2003 scrollBar.setUp (); 2002 scrollBar.state = STATE_UP;
2004 else 2003 else
2005 scrollBar.setDn (); 2004 scrollBar.state = STATE_DOWN;
2006 } 2005 }
2007 } 2006 }
2008 else 2007 else
2009 switch (ev.button) 2008 switch (ev.button)
2010 { 2009 {
2011 case Button2: 2010 case Button2:
2012 switch (scrollbar_align) 2011 switch (scrollBar.align)
2013 { 2012 {
2014 case R_SB_ALIGN_TOP: 2013 case R_SB_ALIGN_TOP:
2015 csrO = 0; 2014 csrO = 0;
2016 break; 2015 break;
2017 case R_SB_ALIGN_CENTRE: 2016 case R_SB_ALIGN_CENTRE:
… …
2023 } 2022 }
2024 2023
2025 if (scrollBar.style == R_SB_XTERM 2024 if (scrollBar.style == R_SB_XTERM
2026 || scrollbar_above_slider (ev.y) 2025 || scrollbar_above_slider (ev.y)
2027 || scrollbar_below_slider (ev.y)) 2026 || scrollbar_below_slider (ev.y))
2028 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2027 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2029 2028
2030 scrollBar.setMotion (); 2029 scrollBar.state = STATE_MOTION;
2031 break; 2030 break;
2032 2031
2033 case Button1: 2032 case Button1:
2034 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2033 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2035 csrO = ev.y - scrollBar.top; 2034 csrO = ev.y - scrollBar.top;
2036 /* FALLTHROUGH */ 2035 /* FALLTHROUGH */
2037 2036
2038 case Button3: 2037 case Button3:
2039 if (scrollBar.style != R_SB_XTERM) 2038 if (scrollBar.style != R_SB_XTERM)
… …
2049 scr_page (DN, nrow - 1); 2048 scr_page (DN, nrow - 1);
2050# else 2049# else
2051 scr_page (DN, nrow / 4); 2050 scr_page (DN, nrow / 4);
2052# endif 2051# endif
2053 else 2052 else
2054 scrollBar.setMotion (); 2053 scrollBar.state = STATE_MOTION;
2055 } 2054 }
2056 else 2055 else
2057 { 2056 {
2058 scr_page ((ev.button == Button1 ? DN : UP), 2057 scr_page ((ev.button == Button1 ? DN : UP),
2059 (nrow 2058 (nrow
2060 * scrollbar_position (ev.y) 2059 * scrollbar_position (ev.y)
2061 / scrollbar_size ())); 2060 / scrollBar.size ()));
2062 } 2061 }
2063 2062
2064 break; 2063 break;
2065 } 2064 }
2066 } 2065 }
… …
2076 2075
2077 csrO = 0; /* reset csr Offset */ 2076 csrO = 0; /* reset csr Offset */
2078 if (!bypass_keystate) 2077 if (!bypass_keystate)
2079 reportmode = !! (priv_modes & PrivMode_mouse_report); 2078 reportmode = !! (priv_modes & PrivMode_mouse_report);
2080 2079
2081 if (scrollbar_isUpDn ()) 2080 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2082 { 2081 {
2083 scrollBar.setIdle (); 2082 scrollBar.state = STATE_IDLE;
2084 scrollbar_show (0); 2083 scrollBar.show (0);
2085 } 2084 }
2086 2085
2087#ifdef SELECTION_SCROLLING 2086#ifdef SELECTION_SCROLLING
2088 if (sel_scroll_ev.active)
2089 sel_scroll_ev.stop(); 2087 sel_scroll_ev.stop();
2090#endif 2088#endif
2091 2089
2092 if (ev.window == vt) 2090 if (ev.window == vt)
2093 { 2091 {
2092 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2093 return;
2094
2094#if ISO_14755 2095#if ISO_14755
2095 // 5.4 2096 // 5.4
2096 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2097 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2097 return; 2098 return;
2098#endif 2099#endif
2100
2099 if (reportmode) 2101 if (reportmode)
2100 { 2102 {
2101 /* mouse report from vt window */ 2103 /* mouse report from vt window */
2102 /* don't report release of wheel "buttons" */ 2104 /* don't report release of wheel "buttons" */
2103 if (ev.button >= 4) 2105 if (ev.button >= 4)
… …
2114 mouse_report (ev); 2116 mouse_report (ev);
2115 } 2117 }
2116#else /* MOUSE_REPORT_DOUBLECLICK */ 2118#else /* MOUSE_REPORT_DOUBLECLICK */
2117 MEvent.button = AnyButton; 2119 MEvent.button = AnyButton;
2118 mouse_report (ev); 2120 mouse_report (ev);
2119#endif /* MOUSE_REPORT_DOUBLECLICK */ 2121#endif /* MOUSE_REPORT_DOUBLECLICK */
2120 return; 2122 return;
2121 } 2123 }
2122 2124
2123 /* 2125 /*
2124 * dumb hack to compensate for the failure of click-and-drag 2126 * dumb hack to compensate for the failure of click-and-drag
… …
2127 if (priv_modes & PrivMode_mouse_report 2129 if (priv_modes & PrivMode_mouse_report
2128 && bypass_keystate 2130 && bypass_keystate
2129 && ev.button == Button1 && MEvent.clicks <= 1) 2131 && ev.button == Button1 && MEvent.clicks <= 1)
2130 selection_extend (ev.x, ev.y, 0); 2132 selection_extend (ev.x, ev.y, 0);
2131 2133
2132 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2133 return;
2134
2135 switch (ev.button) 2134 switch (ev.button)
2136 { 2135 {
2137 case Button1: 2136 case Button1:
2138 case Button3: 2137 case Button3:
2139 selection_make (ev.time); 2138 selection_make (ev.time);
2140 break; 2139 break;
2141 2140
2142 case Button2: 2141 case Button2:
2143 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2142 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); 2143 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2145 break; 2144 break;
2146 2145
2147#ifdef MOUSE_WHEEL 2146#ifdef MOUSE_WHEEL
2148 case Button4: 2147 case Button4:
2149 case Button5: 2148 case Button5:
… …
2153 2152
2154 v = ev.button == Button4 ? UP : DN; 2153 v = ev.button == Button4 ? UP : DN;
2155 2154
2156 if (ev.state & ShiftMask) 2155 if (ev.state & ShiftMask)
2157 i = 1; 2156 i = 1;
2158 else if (OPTION (Opt_mouseWheelScrollPage)) 2157 else if (option (Opt_mouseWheelScrollPage))
2159 i = nrow - 1; 2158 i = nrow - 1;
2160 else 2159 else
2161 i = 5; 2160 i = 5;
2162 2161
2163# ifdef MOUSE_SLIP_WHEELING 2162# ifdef MOUSE_SLIP_WHEELING
… …
2165 { 2164 {
2166 mouse_slip_wheel_speed += v ? -1 : 1; 2165 mouse_slip_wheel_speed += v ? -1 : 1;
2167 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2166 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2168 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2167 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2169 2168
2170 if (slip_wheel_ev.at < NOW) 2169 if (!slip_wheel_ev.is_active ())
2171 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2170 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2172
2173 slip_wheel_ev.start ();
2174 } 2171 }
2175 else 2172 else
2173# endif
2176 { 2174 {
2177# endif
2178 scr_page (v, i); 2175 scr_page (v, i);
2179 scrollbar_show (1); 2176 scrollBar.show (1);
2180# ifdef MOUSE_SLIP_WHEELING
2181 } 2177 }
2182# endif
2183 } 2178 }
2184 break; 2179 break;
2185#endif 2180#endif
2186 } 2181 }
2187 } 2182 }
2188} 2183}
2189
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#if WAIT_FOR_WM
2635 /* wait (an arbitrary period) for the WM to do its thing
2636 * needed for fvwm2.2.2 (and before?) */
2637 sleep (1);
2638#endif
2639 for (n = 0; n < (unsigned int)i; n++)
2640 {
2641 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2642 XClearWindow (disp, parent[n]);
2643 }
2644
2645 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2646 am_transparent = 1;
2647 }
2648
2649 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2650 parent[i] = None;
2651 }
2652
2653 if (scrollBar.win)
2654 {
2655 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2656 scrollBar.setIdle ();
2657 scrollbar_show (0);
2658 }
2659
2660 if (am_transparent)
2661 {
2662 want_refresh = want_full_refresh = 1;
2663 if (am_pixmap_trans)
2664 flush ();
2665 }
2666
2667 return pchanged;
2668}
2669#endif
2670 2184
2671/*}}} */ 2185/*}}} */
2672 2186
2673bool 2187bool
2674rxvt_term::cmd_parse () 2188rxvt_term::cmd_parse ()
… …
2677 wchar_t ch = NOCHAR; 2191 wchar_t ch = NOCHAR;
2678 char *seq_begin; // remember start of esc-sequence here 2192 char *seq_begin; // remember start of esc-sequence here
2679 2193
2680 for (;;) 2194 for (;;)
2681 { 2195 {
2682 if (ch == NOCHAR) 2196 if (expect_false (ch == NOCHAR))
2683 { 2197 {
2684 seq_begin = cmdbuf_ptr; 2198 seq_begin = cmdbuf_ptr;
2685 ch = next_char (); 2199 ch = next_char ();
2686 2200
2687 if (ch == NOCHAR) 2201 if (ch == NOCHAR)
2688 break; 2202 break;
2689 } 2203 }
2690 2204
2691 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2205 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2692 { 2206 {
2693 if (!seen_input) 2207 if (expect_false (!seen_input))
2694 { 2208 {
2695 seen_input = 1; 2209 seen_input = 1;
2696 // many badly-written programs (e.g. jed) contain a race condition: 2210 // many badly-written programs (e.g. jed) contain a race condition:
2697 // they first read the screensize and then install a SIGWINCH handler. 2211 // they first read the screensize and then install a SIGWINCH handler.
2698 // some window managers resize the window early, and these programs 2212 // some window managers resize the window early, and these programs
… …
2711 wchar_t *str = buf; 2225 wchar_t *str = buf;
2712 wchar_t *eol = str + min (ncol, UBUFSIZ); 2226 wchar_t *eol = str + min (ncol, UBUFSIZ);
2713 2227
2714 for (;;) 2228 for (;;)
2715 { 2229 {
2716 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2230 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2717 break; 2231 break;
2718 2232
2719 *str++ = ch; 2233 *str++ = ch;
2720 2234
2721 if (ch == C0_LF || str >= eol) 2235 if (expect_false (ch == C0_LF || str >= eol))
2722 { 2236 {
2723 if (ch == C0_LF) 2237 if (ch == C0_LF)
2724 nlines++; 2238 nlines++;
2725 2239
2726 refresh_count++; 2240 refresh_count++;
2727 2241
2728 if (!OPTION (Opt_jumpScroll) 2242 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2729 || (refresh_count >= refresh_limit * (nrow - 1)))
2730 { 2243 {
2731 refreshnow = true;
2732 refresh_count = 0; 2244 refresh_count = 0;
2245
2246 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2247 {
2248 refreshnow = true;
2733 ch = NOCHAR; 2249 ch = NOCHAR;
2734 break; 2250 break;
2251 }
2735 } 2252 }
2736 2253
2737 // scr_add_lines only works for nlines <= nrow - 1. 2254 // scr_add_lines only works for nlines <= nrow - 1.
2738 if (nlines >= nrow - 1) 2255 if (nlines >= nrow - 1)
2739 { 2256 {
… …
2767 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2284 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2768 scr_add_lines (buf, str - buf, nlines); 2285 scr_add_lines (buf, str - buf, nlines);
2769 2286
2770 /* 2287 /*
2771 * If there have been a lot of new lines, then update the screen 2288 * If there have been a lot of new lines, then update the screen
2772 * What the heck I'll cheat and only refresh less than every page-full. 2289 * What the heck we'll cheat and only refresh less than every page-full.
2773 * the number of pages between refreshes is refresh_limit, which 2290 * if skipScroll is enabled.
2774 * is incremented here because we must be doing flat-out scrolling.
2775 */ 2291 */
2776 if (refreshnow) 2292 if (refreshnow)
2777 { 2293 {
2778 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2779 refresh_limit++;
2780 else
2781 {
2782 flag = true; 2294 flag = true;
2783 scr_refresh (); 2295 scr_refresh ();
2784 want_refresh = 1; 2296 want_refresh = 1;
2785 }
2786 } 2297 }
2787 2298
2788 } 2299 }
2789 else 2300 else
2790 { 2301 {
… …
2811rxvt_term::next_char () NOTHROW 2322rxvt_term::next_char () NOTHROW
2812{ 2323{
2813 while (cmdbuf_ptr < cmdbuf_endp) 2324 while (cmdbuf_ptr < cmdbuf_endp)
2814 { 2325 {
2815 // assume 7-bit to be ascii ALWAYS 2326 // assume 7-bit to be ascii ALWAYS
2816 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2327 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2817 return *cmdbuf_ptr++; 2328 return *cmdbuf_ptr++;
2818 2329
2819 wchar_t wc; 2330 wchar_t wc;
2820 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2331 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2821 2332
… …
2825 cmdbuf_ptr = cmdbuf_endp; 2336 cmdbuf_ptr = cmdbuf_endp;
2826 break; 2337 break;
2827 } 2338 }
2828 2339
2829 if (len == (size_t)-1) 2340 if (len == (size_t)-1)
2341 {
2342 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2830 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2343 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2344 }
2831 2345
2832 // assume wchar == unicode 2346 // assume wchar == unicode
2833 cmdbuf_ptr += len; 2347 cmdbuf_ptr += len;
2834 return wc & UNICODE_MASK; 2348 return wc & UNICODE_MASK;
2835 } 2349 }
… …
2879/*----------------------------------------------------------------------*/ 2393/*----------------------------------------------------------------------*/
2880#ifdef PRINTPIPE 2394#ifdef PRINTPIPE
2881FILE * 2395FILE *
2882rxvt_term::popen_printer () 2396rxvt_term::popen_printer ()
2883{ 2397{
2884 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2398 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2885 2399
2886 if (stream == NULL) 2400 if (stream == NULL)
2887 rxvt_warn ("can't open printer pipe, not printing.\n"); 2401 rxvt_warn ("can't open printer pipe, not printing.\n");
2888 2402
2889 return stream; 2403 return stream;
… …
2900 * simulate attached vt100 printer 2414 * simulate attached vt100 printer
2901 */ 2415 */
2902void 2416void
2903rxvt_term::process_print_pipe () 2417rxvt_term::process_print_pipe ()
2904{ 2418{
2905 int done; 2419 FILE *fd = popen_printer ();
2906 FILE *fd;
2907 2420
2908 if ((fd = popen_printer ()) == NULL) 2421 if (!fd)
2909 return; 2422 return;
2910 2423
2911 /* 2424 /*
2912 * Send all input to the printer until either ESC[4i or ESC[?4i 2425 * Send all input to the printer until either ESC[4i or ESC[?4i
2913 * is received. 2426 * is received.
2914 */ 2427 */
2915 for (done = 0; !done;) 2428 for (int done = 0; !done; )
2916 { 2429 {
2917 unsigned char buf[8]; 2430 unsigned char buf[8];
2918 unicode_t ch; 2431 unicode_t ch;
2919 unsigned int i, len; 2432 unsigned int i, len;
2920 2433
… …
2939 { 2452 {
2940 if ((buf[len++] = cmd_getc ()) == 'i') 2453 if ((buf[len++] = cmd_getc ()) == 'i')
2941 break; /* done = 1 */ 2454 break; /* done = 1 */
2942 } 2455 }
2943 } 2456 }
2944 2457
2945 for (i = 0; i < len; i++) 2458 for (i = 0; i < len; i++)
2946 if (putc (buf[i], fd) == EOF) 2459 if (putc (buf[i], fd) == EOF)
2947 { 2460 {
2948 done = 1; 2461 done = 1;
2949 break; 2462 break;
… …
2951 } 2464 }
2952 } 2465 }
2953 2466
2954 pclose_printer (fd); 2467 pclose_printer (fd);
2955} 2468}
2956#endif /* PRINTPIPE */ 2469#endif /* PRINTPIPE */
2957/*}}} */ 2470/*}}} */
2958 2471
2959/* *INDENT-OFF* */ 2472/* *INDENT-OFF* */
2960enum { 2473enum {
2961 C1_40 = 0x40, 2474 C1_40 = 0x40,
… …
3011 process_dcs_seq (); 2524 process_dcs_seq ();
3012 break; 2525 break;
3013 case 0x9b: /* CSI */ 2526 case 0x9b: /* CSI */
3014 process_csi_seq (); 2527 process_csi_seq ();
3015 break; 2528 break;
3016 case 0x9d: /* CSI */ 2529 case 0x9d: /* OSC */
3017 process_osc_seq (); 2530 process_osc_seq ();
3018 break; 2531 break;
3019#endif 2532#endif
3020 } 2533 }
3021} 2534}
… …
3065 break; 2578 break;
3066 case 'Z': /* identify the terminal type */ 2579 case 'Z': /* identify the terminal type */
3067 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2580 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3068 break; 2581 break;
3069 case '<': /* turn off VT52 mode */ 2582 case '<': /* turn off VT52 mode */
3070 PrivMode (0, PrivMode_vt52); 2583 set_privmode (PrivMode_vt52, 0);
3071 break; 2584 break;
3072 case 'F': /* use special graphics character set */ 2585 case 'F': /* use special graphics character set */
3073 case 'G': /* use regular character set */ 2586 case 'G': /* use regular character set */
3074 /* unimplemented */ 2587 /* unimplemented */
3075 break; 2588 break;
… …
3111 scr_charset_set (2, (unsigned int)cmd_getc ()); 2624 scr_charset_set (2, (unsigned int)cmd_getc ());
3112 break; 2625 break;
3113 case '+': 2626 case '+':
3114 scr_charset_set (3, (unsigned int)cmd_getc ()); 2627 scr_charset_set (3, (unsigned int)cmd_getc ());
3115 break; 2628 break;
3116#if ENABLE_FRILLS 2629#if !ENABLE_MINIMAL
3117 case '6': 2630 case '6':
3118 scr_backindex (); 2631 scr_backindex ();
3119 break; 2632 break;
3120#endif 2633#endif
3121 case '7': 2634 case '7':
3122 scr_cursor (SAVE); 2635 scr_cursor (SAVE);
3123 break; 2636 break;
3124 case '8': 2637 case '8':
3125 scr_cursor (RESTORE); 2638 scr_cursor (RESTORE);
3126 break; 2639 break;
3127#if ENABLE_FRILLS 2640#if !ENABLE_MINIMAL
3128 case '9': 2641 case '9':
3129 scr_forwardindex (); 2642 scr_forwardindex ();
3130 break; 2643 break;
3131#endif 2644#endif
3132 case '=': 2645 case '=':
3133 case '>': 2646 case '>':
3134 PrivMode ((ch == '='), PrivMode_aplKP); 2647 set_privmode (PrivMode_aplKP, ch == '=');
3135 break; 2648 break;
3136 2649
3137 case C1_40: 2650 case C1_40:
3138 cmd_getc (); 2651 cmd_getc ();
3139 break; 2652 break;
… …
3192 2705
3193 /* 8.3.106: RESET TO INITIAL STATE */ 2706 /* 8.3.106: RESET TO INITIAL STATE */
3194 case 'c': 2707 case 'c':
3195 mbstate.reset (); 2708 mbstate.reset ();
3196 scr_poweron (); 2709 scr_poweron ();
3197 scrollbar_show (1); 2710 scrollBar.show (1);
3198 break; 2711 break;
3199 2712
3200 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2713 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3201 case 'n': 2714 case 'n':
3202 scr_charset_choose (2); 2715 scr_charset_choose (2);
… …
3247rxvt_term::process_csi_seq () 2760rxvt_term::process_csi_seq ()
3248{ 2761{
3249 unicode_t ch, priv, i; 2762 unicode_t ch, priv, i;
3250 unsigned int nargs, p; 2763 unsigned int nargs, p;
3251 int n, ndef; 2764 int n, ndef;
3252 int arg[ESC_ARGS]; 2765 int arg[ESC_ARGS] = { };
3253 2766
3254 for (nargs = ESC_ARGS; nargs > 0;) 2767 nargs = 0;
3255 arg[--nargs] = 0;
3256 2768
3257 priv = 0; 2769 priv = 0;
3258 ch = cmd_getc (); 2770 ch = cmd_getc ();
3259 if (ch >= '<' && ch <= '?') 2771 if (ch >= '<' && ch <= '?')
2772 {
3260 { /* '<' '=' '>' '?' */ 2773 /* '<' '=' '>' '?' */
3261 priv = ch; 2774 priv = ch;
3262 ch = cmd_getc (); 2775 ch = cmd_getc ();
3263 } 2776 }
3264 2777
3265 /* read any numerical arguments */ 2778 /* read any numerical arguments */
… …
3294 ndef = get_byte_array_bit (csi_defaults, i); 2807 ndef = get_byte_array_bit (csi_defaults, i);
3295 for (p = 0; p < nargs; p++) 2808 for (p = 0; p < nargs; p++)
3296 if (arg[p] == -1) 2809 if (arg[p] == -1)
3297 arg[p] = ndef; 2810 arg[p] = ndef;
3298 2811
3299#ifdef DEBUG_CMD
3300 fprintf (stderr, "CSI ");
3301 for (p = 0; p < nargs; p++)
3302 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3303 fprintf (stderr, "%c\n", ch);
3304#endif
3305
3306 /* 2812 /*
3307 * private mode handling 2813 * private mode handling
3308 */ 2814 */
3309 if (priv) 2815 if (priv)
3310 { 2816 {
3311 switch (priv) 2817 switch (priv)
3312 { 2818 {
3313 case '>': 2819 case '>':
3314 if (ch == CSI_DA) /* secondary device attributes */ 2820 if (ch == CSI_DA) /* secondary device attributes */
3315 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2821 {
2822 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2823 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2824 //
2825 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2826 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2827 // versions.
2828 //
2829 tt_printf ("\033[>%d;95;0c", 'U');
2830 }
3316 break; 2831 break;
2832
3317 case '?': 2833 case '?':
3318 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3319 process_terminal_mode (ch, priv, nargs, arg); 2835 process_terminal_mode (ch, priv, nargs, arg);
3320 break; 2836 break;
3321 } 2837 }
… …
3446 break; 2962 break;
3447 case 6: /* CPR requested */ 2963 case 6: /* CPR requested */
3448 scr_report_position (); 2964 scr_report_position ();
3449 break; 2965 break;
3450 case 7: /* unofficial extension */ 2966 case 7: /* unofficial extension */
3451 if (OPTION (Opt_insecure)) 2967 if (option (Opt_insecure))
3452 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2968 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3453 break; 2969 break;
3454 case 8: /* unofficial extension */ 2970 case 8: /* unofficial extension */
3455 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2971 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3456 break; 2972 break;
… …
3523 break; 3039 break;
3524 case CSI_75: 3040 case CSI_75:
3525 scr_cursor (RESTORE); 3041 scr_cursor (RESTORE);
3526 break; 3042 break;
3527 3043
3528#if ENABLE_FRILLS 3044#if !ENABLE_MINIMAL
3529 case CSI_74: 3045 case CSI_74:
3530 process_window_ops (arg, nargs); 3046 process_window_ops (arg, nargs);
3531 break; 3047 break;
3532#endif 3048#endif
3533 3049
… …
3540 break; 3056 break;
3541 } 3057 }
3542} 3058}
3543/*}}} */ 3059/*}}} */
3544 3060
3545#if ENABLE_FRILLS 3061#if !ENABLE_MINIMAL
3546/* ARGSUSED */ 3062/* ARGSUSED */
3547void 3063void
3548rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3064rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3549{ 3065{
3550 int x, y; 3066 int x, y;
3551 XWindowAttributes wattr; 3067 XWindowAttributes wattr;
3552 Window wdummy; 3068 Window wdummy;
3553 dDisp; 3069
3070 dLocal (Display *, dpy);
3554 3071
3555 if (nargs == 0) 3072 if (nargs == 0)
3556 return; 3073 return;
3557 3074
3558 switch (args[0]) 3075 switch (args[0])
3559 { 3076 {
3560 /* 3077 /*
3561 * commands 3078 * commands
3562 */ 3079 */
3563 case 1: /* deiconify window */ 3080 case 1: /* deiconify window */
3564 XMapWindow (disp, parent[0]); 3081 XMapWindow (dpy, parent[0]);
3565 break; 3082 break;
3566 case 2: /* iconify window */ 3083 case 2: /* iconify window */
3567 XIconifyWindow (disp, parent[0], display->screen); 3084 XIconifyWindow (dpy, parent[0], display->screen);
3568 break; 3085 break;
3569 case 3: /* set position (pixels) */ 3086 case 3: /* set position (pixels) */
3570 XMoveWindow (disp, parent[0], args[1], args[2]); 3087 XMoveWindow (dpy, parent[0], args[1], args[2]);
3571 break; 3088 break;
3572 case 4: /* set size (pixels) */ 3089 case 4: /* set size (pixels) */
3573 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3090 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3574 break; 3091 break;
3575 case 5: /* raise window */ 3092 case 5: /* raise window */
3576 XRaiseWindow (disp, parent[0]); 3093 XRaiseWindow (dpy, parent[0]);
3577 break; 3094 break;
3578 case 6: /* lower window */ 3095 case 6: /* lower window */
3579 XLowerWindow (disp, parent[0]); 3096 XLowerWindow (dpy, parent[0]);
3580 break; 3097 break;
3581 case 7: /* refresh window */ 3098 case 7: /* refresh window */
3582 scr_touch (true); 3099 scr_touch (true);
3583 break; 3100 break;
3584 case 8: /* set size (chars) */ 3101 case 8: /* set size (chars) */
… …
3591 if (args[0] >= 24) /* set height (chars) */ 3108 if (args[0] >= 24) /* set height (chars) */
3592 set_widthheight ((unsigned int)width, 3109 set_widthheight ((unsigned int)width,
3593 (unsigned int) (args[1] * fheight)); 3110 (unsigned int) (args[1] * fheight));
3594 break; 3111 break;
3595 3112
3596
3597 /* 3113 /*
3598 * reports - some output format copied from XTerm 3114 * reports - some output format copied from XTerm
3599 */ 3115 */
3600 case 11: /* report window state */ 3116 case 11: /* report window state */
3601 XGetWindowAttributes (disp, parent[0], &wattr); 3117 XGetWindowAttributes (dpy, parent[0], &wattr);
3602 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3118 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3603 break; 3119 break;
3604 case 13: /* report window position */ 3120 case 13: /* report window position */
3605 XGetWindowAttributes (disp, parent[0], &wattr); 3121 XGetWindowAttributes (dpy, parent[0], &wattr);
3606 XTranslateCoordinates (disp, parent[0], wattr.root, 3122 XTranslateCoordinates (dpy, parent[0], wattr.root,
3607 -wattr.border_width, -wattr.border_width, 3123 -wattr.border_width, -wattr.border_width,
3608 &x, &y, &wdummy); 3124 &x, &y, &wdummy);
3609 tt_printf ("\033[3;%d;%dt", x, y); 3125 tt_printf ("\033[3;%d;%dt", x, y);
3610 break; 3126 break;
3611 case 14: /* report window size (pixels) */ 3127 case 14: /* report window size (pixels) */
3612 XGetWindowAttributes (disp, parent[0], &wattr); 3128 XGetWindowAttributes (dpy, parent[0], &wattr);
3613 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3129 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3614 break; 3130 break;
3615 case 18: /* report text area size (chars) */ 3131 case 18: /* report text area size (chars) */
3616 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3132 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3617 break; 3133 break;
… …
3619 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3135 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3620 break; 3136 break;
3621 case 20: /* report icon label */ 3137 case 20: /* report icon label */
3622 { 3138 {
3623 char *s; 3139 char *s;
3624 XGetIconName (disp, parent[0], &s); 3140 XGetIconName (dpy, parent[0], &s);
3625 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3141 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3626 XFree (s); 3142 XFree (s);
3627 } 3143 }
3628 break; 3144 break;
3629 case 21: /* report window title */ 3145 case 21: /* report window title */
3630 { 3146 {
3631 char *s; 3147 char *s;
3632 XFetchName (disp, parent[0], &s); 3148 XFetchName (dpy, parent[0], &s);
3633 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3149 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3634 XFree (s); 3150 XFree (s);
3635 } 3151 }
3636 break; 3152 break;
3637 } 3153 }
3638} 3154}
… …
3665 seen_esc = true; 3181 seen_esc = true;
3666 continue; 3182 continue;
3667 } 3183 }
3668 else if (ch == C0_BEL || ch == CHAR_ST) 3184 else if (ch == C0_BEL || ch == CHAR_ST)
3669 break; 3185 break;
3186 else if (ch == C0_SYN)
3187 ch = cmd_get8 ();
3670 else if (ch < 0x20) 3188 else if (ch < 0x20)
3671 return NULL; /* other control character - exit */ 3189 return NULL; /* other control character - exit */
3672 3190
3673 seen_esc = false; 3191 seen_esc = false;
3674 3192
3675 if (n >= STRING_MAX - 1) 3193 if (n >= STRING_MAX - 1)
3676 // stop at some sane length 3194 // stop at some sane length
3677 return NULL; 3195 return NULL;
3678 3196
3679 if (ch == C0_SYN)
3680 string[n++] = cmd_get8 ();
3681 else
3682 string[n++] = ch; 3197 string[n++] = ch;
3683 } 3198 }
3684 3199
3685 string[n++] = '\0'; 3200 string[n++] = '\0';
3686 3201
3687 ends_how = (ch == 0x5c ? C0_ESC : ch); 3202 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3738void 3253void
3739rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3254rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3740{ 3255{
3741 if (str[0] == '?' && !str[1]) 3256 if (str[0] == '?' && !str[1])
3742 { 3257 {
3743 unsigned short r, g, b; 3258 rgba c;
3744 pix_colors_focused[color].get (display, r, g, b); 3259 pix_colors_focused[color].get (c);
3260
3261#if XFT
3262 if (c.a != rgba::MAX_CC)
3263 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3264 else
3265#endif
3745 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3266 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3746 } 3267 }
3747 else 3268 else
3748 set_window_color (color, str); 3269 set_window_color (color, str);
3749} 3270}
3750 3271
… …
3756{ 3277{
3757 int color; 3278 int color;
3758 char *buf, *name; 3279 char *buf, *name;
3759 bool query = str[0] == '?' && !str[1]; 3280 bool query = str[0] == '?' && !str[1];
3760 int saveop = op; 3281 int saveop = op;
3761 dDisp; 3282
3283 dLocal (Display *, dpy);
3762 3284
3763 assert (str != NULL); 3285 assert (str != NULL);
3286
3287 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3288 return;
3289
3764 switch (op) 3290 switch (op)
3765 { 3291 {
3766 case XTerm_name: 3292 case XTerm_name:
3767 set_title (str); 3293 set_title (str);
3768 /* FALLTHROUGH */ 3294 /* FALLTHROUGH */
… …
3782 unsigned long bytes_after; 3308 unsigned long bytes_after;
3783 unsigned char *value = 0; 3309 unsigned char *value = 0;
3784 const char *str = ""; 3310 const char *str = "";
3785 3311
3786 if (prop 3312 if (prop
3787 && XGetWindowProperty (disp, parent[0], 3313 && XGetWindowProperty (dpy, parent[0],
3788 prop, 0, 1<<16, 0, AnyPropertyType, 3314 prop, 0, 1<<16, 0, AnyPropertyType,
3789 &actual_type, &actual_format, 3315 &actual_type, &actual_format,
3790 &nitems, &bytes_after, &value) == Success 3316 &nitems, &bytes_after, &value) == Success
3791 && actual_type != None 3317 && actual_type != None
3792 && actual_format == 8) 3318 && actual_format == 8)
3793 str = (const char *)(value); 3319 str = (const char *)(value);
3794 3320
3795 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3321 tt_printf ("\033]%d;%s%c", op, str, resp);
3796 3322
3797 XFree (value); 3323 XFree (value);
3798 } 3324 }
3799 else 3325 else
3800 { 3326 {
… …
3804 { 3330 {
3805 *eq = 0; 3331 *eq = 0;
3806 set_utf8_property (display->atom (str), eq + 1); 3332 set_utf8_property (display->atom (str), eq + 1);
3807 } 3333 }
3808 else 3334 else
3809 XDeleteProperty (disp, parent[0], 3335 XDeleteProperty (dpy, parent[0],
3810 display->atom (str)); 3336 display->atom (str));
3811 } 3337 }
3812 break; 3338 break;
3813 3339
3814 case XTerm_Color: 3340 case XTerm_Color:
… …
3824 break; 3350 break;
3825 3351
3826 if ((buf = strchr (name, ';')) != NULL) 3352 if ((buf = strchr (name, ';')) != NULL)
3827 *buf++ = '\0'; 3353 *buf++ = '\0';
3828 3354
3829 if (name[0] == '?' && !name[1]) 3355 process_color_seq (op, color, name, resp);
3830 {
3831 unsigned short r, g, b;
3832 pix_colors_focused[color].get (display, r, g, b);
3833 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3834 }
3835 else
3836 set_window_color (color, name);
3837 } 3356 }
3838 break; 3357 break;
3358 case Rxvt_restoreFG:
3839 case XTerm_Color00: 3359 case XTerm_Color00:
3840 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3360 process_color_seq (op, Color_fg, str, resp);
3841 break; 3361 break;
3362 case Rxvt_restoreBG:
3842 case XTerm_Color01: 3363 case XTerm_Color01:
3843 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3364 process_color_seq (op, Color_bg, str, resp);
3844 break; 3365 break;
3845#ifndef NO_CURSORCOLOR 3366#ifndef NO_CURSORCOLOR
3846 case XTerm_Color_cursor: 3367 case XTerm_Color_cursor:
3847 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3368 process_color_seq (op, Color_cursor, str, resp);
3848 break; 3369 break;
3849#endif 3370#endif
3850 case XTerm_Color_pointer_fg: 3371 case XTerm_Color_pointer_fg:
3851 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3372 process_color_seq (op, Color_pointer_fg, str, resp);
3852 break; 3373 break;
3853 case XTerm_Color_pointer_bg: 3374 case XTerm_Color_pointer_bg:
3854 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3375 process_color_seq (op, Color_pointer_bg, str, resp);
3855 break; 3376 break;
3856#ifndef NO_BOLD_UNDERLINE_REVERSE 3377#ifndef NO_BOLD_UNDERLINE_REVERSE
3857 case XTerm_Color_RV: 3378 case XTerm_Color_RV:
3858 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3379 process_color_seq (op, Color_RV, str, resp);
3859 break; 3380 break;
3860 case Rxvt_Color_BD: 3381 case Rxvt_Color_BD:
3861 case URxvt_Color_BD: 3382 case URxvt_Color_BD:
3862 process_color_seq (op, Color_BD, str, resp); 3383 process_color_seq (op, Color_BD, str, resp);
3863 break; 3384 break;
3864 case Rxvt_Color_UL: 3385 case Rxvt_Color_UL:
3865 case URxvt_Color_UL: 3386 case URxvt_Color_UL:
3866 process_color_seq (op, Color_UL, str, resp); 3387 process_color_seq (op, Color_UL, str, resp);
3867 break; 3388 break;
3868 case URxvt_Color_IT: 3389 case URxvt_Color_IT:
3869 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3390 process_color_seq (op, Color_IT, str, resp);
3870 break; 3391 break;
3871#endif 3392#endif
3872#if TRANSPARENT && TINTING 3393#if ENABLE_TRANSPARENCY
3873 case URxvt_Color_tint: 3394 case URxvt_Color_tint:
3874 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3395 process_color_seq (op, Color_tint, str, resp);
3875 check_our_parents (); 3396 {
3876 if (am_transparent) 3397 bool changed = false;
3877 want_full_refresh = want_refresh = 1;
3878 break;
3879#endif
3880 3398
3399 if (ISSET_PIXCOLOR (Color_tint))
3400 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3401 else
3402 changed = bgPixmap.unset_tint ();
3403
3404 if (changed)
3405 update_background ();
3406 }
3407
3408 break;
3409#endif
3410
3411#if BG_IMAGE_FROM_FILE
3881 case Rxvt_Pixmap: 3412 case Rxvt_Pixmap:
3882 { 3413 if (!strcmp (str, "?"))
3883 if (*str != ';')
3884 { 3414 {
3885#if XPM_BACKGROUND 3415 char str[256];
3886 scale_pixmap (""); /* reset to default scaling */ 3416
3887 set_bgPixmap (str); /* change pixmap */ 3417 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3888 scr_touch (true); 3418 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3889#endif 3419 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3420 process_xterm_seq (XTerm_title, str, CHAR_ST);
3890 } 3421 }
3891 3422 else
3423 {
3892 int changed = 0; 3424 int changed = 0;
3893 3425
3894 while ((str = strchr (str, ';')) != NULL) 3426 if (*str != ';')
3895 { 3427 {
3428 /* reset to default scaling :*/
3429 bgPixmap.unset_geometry ();
3430 if (bgPixmap.set_file (str)) /* change pixmap */
3431 changed++;
3432 str = strchr (str, ';');
3433 if (str == NULL)
3434 bgPixmap.set_defaultGeometry ();
3435 }
3436
3437 while (str)
3438 {
3896 str++; 3439 str++;
3897#if XPM_BACKGROUND 3440 if (bgPixmap.set_geometry (str))
3898 changed += scale_pixmap (str); 3441 changed++;
3899#endif 3442 str = strchr (str, ';');
3900 } 3443 }
3901 3444
3902 if (changed) 3445 if (changed)
3903 { 3446 update_background ();
3904#ifdef XPM_BACKGROUND
3905 resize_pixmap ();
3906 scr_touch (true);
3907#endif
3908 } 3447 }
3909 }
3910 break; 3448 break;
3911 3449#endif
3912 case Rxvt_restoreFG:
3913 set_window_color (Color_fg, str);
3914 break;
3915 case Rxvt_restoreBG:
3916 set_window_color (Color_bg, str);
3917 break;
3918 3450
3919 case XTerm_logfile: 3451 case XTerm_logfile:
3920 // TODO, when secure mode? 3452 // TODO, when secure mode?
3921 break; 3453 break;
3922 3454
… …
3940 case URxvt_italicFont: 3472 case URxvt_italicFont:
3941 case URxvt_boldItalicFont: 3473 case URxvt_boldItalicFont:
3942#endif 3474#endif
3943 if (query) 3475 if (query)
3944 tt_printf ("\33]%d;%-.250s%c", saveop, 3476 tt_printf ("\33]%d;%-.250s%c", saveop,
3945 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3477 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3946 ? fontset[op - URxvt_font]->fontdesc : "", 3478 ? fontset[op - URxvt_font]->fontdesc : "",
3947 resp); 3479 resp);
3948 else 3480 else
3949 { 3481 {
3950 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3482 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3953 allocated.push_back ((void *)res); 3485 allocated.push_back ((void *)res);
3954 set_fonts (); 3486 set_fonts ();
3955 } 3487 }
3956 break; 3488 break;
3957 3489
3958#if ENABLE_FRILLS 3490 case URxvt_version:
3491 if (query)
3492 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3493 op,
3494 rs[Rs_name], VERSION[0], VERSION[2],
3495 resp);
3496 break;
3497
3498#if !ENABLE_MINIMAL
3959 case URxvt_locale: 3499 case URxvt_locale:
3960 if (query) 3500 if (query)
3961 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3501 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3962 else 3502 else
3963 { 3503 {
3964 set_locale (str); 3504 set_locale (str);
3965 pty->set_utf8_mode (enc_utf8); 3505 pty->set_utf8_mode (enc_utf8);
3966 init_xlocale (); 3506 init_xlocale ();
… …
3981 break; 3521 break;
3982#endif 3522#endif
3983 3523
3984#if ENABLE_PERL 3524#if ENABLE_PERL
3985 case URxvt_perl: 3525 case URxvt_perl:
3986 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3526 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3987 ; // no responses yet
3988 break; 3527 break;
3989#endif 3528#endif
3990 } 3529 }
3991} 3530}
3992/*----------------------------------------------------------------------*/ 3531/*----------------------------------------------------------------------*/
… …
4015 { 3554 {
4016 if (mode == 'r') 3555 if (mode == 'r')
4017 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3556 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4018 else 3557 else
4019 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3558 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4020 PrivMode (state, bit); 3559 set_privmode (bit, state);
4021 } 3560 }
4022 3561
4023 return state; 3562 return state;
4024} 3563}
4025 3564
… …
4029{ 3568{
4030 unsigned int i, j; 3569 unsigned int i, j;
4031 int state; 3570 int state;
4032 3571
4033 static const struct 3572 static const struct
4034 { 3573 {
4035 const int argval; 3574 const int argval;
4036 const unsigned long bit; 3575 const unsigned long bit;
4037 }
4038
4039 argtopriv[] = { 3576 } argtopriv[] = {
4040 { 1, PrivMode_aplCUR }, 3577 { 1, PrivMode_aplCUR },
4041 { 2, PrivMode_vt52 }, 3578 { 2, PrivMode_vt52 },
4042 { 3, PrivMode_132 }, 3579 { 3, PrivMode_132 },
4043 { 4, PrivMode_smoothScroll }, 3580 { 4, PrivMode_smoothScroll },
4044 { 5, PrivMode_rVideo }, 3581 { 5, PrivMode_rVideo },
… …
4060 { 66, PrivMode_aplKP }, 3597 { 66, PrivMode_aplKP },
4061#ifndef NO_BACKSPACE_KEY 3598#ifndef NO_BACKSPACE_KEY
4062 { 67, PrivMode_BackSpace }, 3599 { 67, PrivMode_BackSpace },
4063#endif 3600#endif
4064 { 1000, PrivMode_MouseX11 }, 3601 { 1000, PrivMode_MouseX11 },
4065 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3602 { 1002, PrivMode_MouseBtnEvent },
4066 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3603 { 1003, PrivMode_MouseAnyEvent },
4067 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4068 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3604 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4069 { 1011, PrivMode_Keypress }, // rxvt extension 3605 { 1011, PrivMode_Keypress }, // rxvt extension
4070 // 1035 enable modifiers for alt, numlock NYI 3606 // 1035 enable modifiers for alt, numlock NYI
4071 // 1036 send ESC for meta keys NYI 3607 // 1036 send ESC for meta keys NYI
4072 // 1037 send DEL for keypad delete NYI 3608 // 1037 send DEL for keypad delete NYI
4073 { 1047, PrivMode_Screen }, 3609 { 1047, PrivMode_Screen },
4074 // 1048 save and restore cursor 3610 // 1048 save and restore cursor
4075 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3611 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4076 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3612 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3613 { 2004, PrivMode_BracketPaste },
4077 }; 3614 };
4078 3615
4079 if (nargs == 0) 3616 if (nargs == 0)
4080 return; 3617 return;
4081 3618
… …
4107 scr_touch (true); 3644 scr_touch (true);
4108 break; 3645 break;
4109#endif 3646#endif
4110 case 1048: /* alternative cursor save */ 3647 case 1048: /* alternative cursor save */
4111 case 1049: 3648 case 1049:
4112 if (OPTION (Opt_secondaryScreen)) 3649 if (option (Opt_secondaryScreen))
4113 if (mode == 0) 3650 if (mode == 0)
4114 scr_cursor (RESTORE); 3651 scr_cursor (RESTORE);
4115 else if (mode == 1) 3652 else if (mode == 1)
4116 scr_cursor (SAVE); 3653 scr_cursor (SAVE);
4117 break; 3654 break;
… …
4125 case 2: /* VT52 mode */ 3662 case 2: /* VT52 mode */
4126 /* oddball mode. should be set regardless of set/reset 3663 /* oddball mode. should be set regardless of set/reset
4127 * parameter. Return from VT52 mode with an ESC < from 3664 * parameter. Return from VT52 mode with an ESC < from
4128 * within VT52 mode 3665 * within VT52 mode
4129 */ 3666 */
4130 PrivMode (1, PrivMode_vt52); 3667 set_privmode (PrivMode_vt52, 1);
4131 break; 3668 break;
4132 case 3: /* 80/132 */ 3669 case 3: /* 80/132 */
4133 if (priv_modes & PrivMode_132OK) 3670 if (priv_modes & PrivMode_132OK)
3671 {
3672 scr_poweron ();
4134 set_widthheight (((state ? 132 : 80) * fwidth), height); 3673 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3674 }
4135 break; 3675 break;
4136 case 4: /* smooth scrolling */ 3676 case 4: /* smooth scrolling */
4137 set_option (Opt_jumpScroll, !state); 3677 set_option (Opt_jumpScroll, !state);
4138 break; 3678 break;
4139 case 5: /* reverse video */ 3679 case 5: /* reverse video */
… …
4146 scr_autowrap (state); 3686 scr_autowrap (state);
4147 break; 3687 break;
4148 /* case 8: - auto repeat, can't do on a per window basis */ 3688 /* case 8: - auto repeat, can't do on a per window basis */
4149 case 9: /* X10 mouse reporting */ 3689 case 9: /* X10 mouse reporting */
4150 if (state) /* orthogonal */ 3690 if (state) /* orthogonal */
4151 priv_modes &= ~PrivMode_MouseX11; 3691 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4152 break; 3692 break;
4153#ifdef scrollBar_esc 3693#ifdef scrollBar_esc
4154 case scrollBar_esc: 3694 case scrollBar_esc:
4155 if (scrollbar_mapping (state)) 3695 if (scrollBar.map (state))
4156 { 3696 {
4157 resize_all_windows (0, 0, 0); 3697 resize_all_windows (0, 0, 0);
4158 scr_touch (true); 3698 scr_touch (true);
4159 } 3699 }
4160 break; 3700 break;
… …
4169 break; 3709 break;
4170 /* case 66: - application key pad */ 3710 /* case 66: - application key pad */
4171 /* case 67: - backspace key */ 3711 /* case 67: - backspace key */
4172 case 1000: /* X11 mouse reporting */ 3712 case 1000: /* X11 mouse reporting */
4173 if (state) /* orthogonal */ 3713 if (state) /* orthogonal */
4174 priv_modes &= ~PrivMode_MouseX10; 3714 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4175 break; 3715 break;
4176#if 0
4177 case 1001: 3716 case 1002:
4178 break; /* X11 mouse highlighting */ 3717 case 1003:
4179#endif 3718 if (state)
3719 {
3720 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3721 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3722 vt_emask_mouse = PointerMotionMask;
3723 }
3724 else
3725 vt_emask_mouse = NoEventMask;
3726 vt_select_input ();
3727 break;
4180 case 1010: /* scroll to bottom on TTY output inhibit */ 3728 case 1010: /* scroll to bottom on TTY output inhibit */
4181 set_option (Opt_scrollTtyOutput, !state); 3729 set_option (Opt_scrollTtyOutput, !state);
4182 break; 3730 break;
4183 case 1011: /* scroll to bottom on key press */ 3731 case 1011: /* scroll to bottom on key press */
4184 set_option (Opt_scrollTtyKeypress, state); 3732 set_option (Opt_scrollTtyKeypress, state);
4185 break; 3733 break;
4186 case 1047: /* secondary screen w/ clearing last */ 3734 case 1047: /* secondary screen w/ clearing last */
4187 if (OPTION (Opt_secondaryScreen)) 3735 if (option (Opt_secondaryScreen))
4188 if (current_screen != PRIMARY) 3736 if (current_screen != PRIMARY)
4189 scr_erase_screen (2); 3737 scr_erase_screen (2);
4190 scr_change_screen (state); 3738 scr_change_screen (state);
4191 break; 3739 break;
4192 case 1049: /* secondary screen w/ clearing first */ 3740 case 1049: /* secondary screen w/ clearing first */
4193 scr_change_screen (state); 3741 scr_change_screen (state);
4194 if (OPTION (Opt_secondaryScreen)) 3742 if (option (Opt_secondaryScreen))
4195 if (current_screen != PRIMARY) 3743 if (current_screen != PRIMARY)
4196 scr_erase_screen (2); 3744 scr_erase_screen (2);
4197 break; 3745 break;
4198 default: 3746 default:
4199 break; 3747 break;
… …
4327 scr_color (Color_bg, Color_bg); 3875 scr_color (Color_bg, Color_bg);
4328 break; 3876 break;
4329 3877
4330 //case 50: // not variable spacing 3878 //case 50: // not variable spacing
4331 3879
4332#if ENABLE_FRILLS 3880#if !ENABLE_MINIMAL
4333 case 90: 3881 case 90:
4334 case 91: /* set bright fg color */ 3882 case 91: /* set bright fg color */
4335 case 92: 3883 case 92:
4336 case 93: 3884 case 93:
4337 case 94: 3885 case 94:
… …
4361rxvt_term::process_graphics () 3909rxvt_term::process_graphics ()
4362{ 3910{
4363 unicode_t ch, cmd = cmd_getc (); 3911 unicode_t ch, cmd = cmd_getc ();
4364 3912
4365 if (cmd == 'Q') 3913 if (cmd == 'Q')
3914 {
4366 { /* query graphics */ 3915 /* query graphics */
4367 tt_printf ("\033G0\012"); /* no graphics */ 3916 tt_printf ("\033G0\012"); /* no graphics */
4368 return; 3917 return;
4369 } 3918 }
4370 /* swallow other graphics sequences until terminating ':' */ 3919 /* swallow other graphics sequences until terminating ':' */
4371 do 3920 do
… …
4421 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3970 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4422 3971
4423 memcpy (v_buffer + v_buflen, data, len); 3972 memcpy (v_buffer + v_buflen, data, len);
4424 v_buflen += len; 3973 v_buflen += len;
4425 3974
4426 pty_ev.set (EVENT_READ | EVENT_WRITE); 3975 pty_ev.set (ev::READ | ev::WRITE);
4427} 3976}
4428 3977
4429void rxvt_term::pty_write () 3978void rxvt_term::pty_write ()
4430{ 3979{
4431 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3980 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4436 3985
4437 if (v_buflen == 0) 3986 if (v_buflen == 0)
4438 { 3987 {
4439 free (v_buffer); 3988 free (v_buffer);
4440 v_buffer = 0; 3989 v_buffer = 0;
4441 v_buflen = 0;
4442 3990
4443 pty_ev.set (EVENT_READ); 3991 pty_ev.set (ev::READ);
4444 return; 3992 return;
4445 } 3993 }
4446 3994
4447 memmove (v_buffer, v_buffer + written, v_buflen); 3995 memmove (v_buffer, v_buffer + written, v_buflen);
4448 } 3996 }
4449 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3997 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4450 pty_ev.set (EVENT_READ); 3998 pty_ev.set (ev::READ);
4451} 3999}
4452 4000
4453/*----------------------- end-of-file (C source) -----------------------*/ 4001/*----------------------- end-of-file (C source) -----------------------*/
4454 4002

Diff Legend

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