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.272 by root, Thu Jan 19 16:22:12 2006 UTC vs.
Revision 1.416 by root, Tue Jul 15 16:41: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>
64 60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 68
72#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
73 70
74#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
99 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
100 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
101 98
102 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
103 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
104 XK_ISO_Lock, 0x21eb,
105 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
106 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
107 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
108 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
109 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
203 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
205 201
206 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
207 203
208 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
210 206
211 if (y >= 0) 207 if (y >= 0)
212 { 208 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
225 ch = *chr++; 221 ch = *chr++;
226 222
227 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
229 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
230# if !UNICODE3 226# if !UNICODE_3
231 if (ch >= 0x10000) 227 if (ch >= 0x10000)
232 ch = 0xfffd; 228 ch = 0xfffd;
233# endif 229# endif
234 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
236 } 234 }
237 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// }
238 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
240 243
241 free (fname); 244 free (fname);
242 245
… …
276 } 279 }
277 280
278 iso14755buf = 0; 281 iso14755buf = 0;
279} 282}
280 283
281int 284static int
282rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
283{ 286{
284 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
285 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
286 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
287 { 290 {
… …
295 298
296 return -1; 299 return -1;
297} 300}
298#endif 301#endif
299 302
300/*{{{ 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
301void 398void
302rxvt_term::lookup_key (XKeyEvent &ev) 399rxvt_term::key_press (XKeyEvent &ev)
303{ 400{
304 int ctrl, meta, shft, len; 401 int ctrl, meta, shft, len;
305 unsigned int newlen;
306 KeySym keysym; 402 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 403 int valid_keysym;
311 char kbuf[KBUFSZ]; 404 char kbuf[KBUFSZ];
405
406#if ISO_14755
407 if (iso14755buf & ISO_14755_52)
408 return;
409#endif
312 410
313 /* 411 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 412 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 413 * escape sequence to toggle the Keypad.
316 * 414 *
… …
321 meta = ev.state & ModMetaMask; 419 meta = ev.state & ModMetaMask;
322 420
323 if (numlock_state || (ev.state & ModNumLockMask)) 421 if (numlock_state || (ev.state & ModNumLockMask))
324 { 422 {
325 numlock_state = (ev.state & ModNumLockMask); 423 numlock_state = (ev.state & ModNumLockMask);
326 PrivMode ((!numlock_state), PrivMode_aplKP); 424 set_privmode (PrivMode_aplKP, !numlock_state);
327 } 425 }
328 426
329 kbuf[0] = 0; 427 kbuf[0] = 0;
330 428
331#ifdef USE_XIM 429#ifdef USE_XIM
… …
496# if ISO_14755 594# if ISO_14755
497 iso14755_51 (0); 595 iso14755_51 (0);
498# endif 596# endif
499 return; 597 return;
500 } 598 }
599 else if (keysym == XK_BackSpace)
600 {
601 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
602# if ISO_14755
603 iso14755_51 (iso14755buf & ISO_14755_MASK);
604# endif
605 return;
606 }
501 else if ((hv = hex_keyval (ev)) >= 0) 607 else if ((hv = hex_keyval (ev)) >= 0)
502 { 608 {
503 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 609 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
504 | hv | ISO_14755_51; 610 | hv | ISO_14755_51;
505# if ISO_14755 611# if ISO_14755
… …
507# endif 613# endif
508 return; 614 return;
509 } 615 }
510 else 616 else
511 { 617 {
512# if ENABLE_OVERLAY 618# if ISO_14755
513 scr_overlay_off (); 619 scr_overlay_off ();
514# endif 620# endif
515 iso14755buf = 0; 621 iso14755buf = 0;
516 } 622 }
517 } 623 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 626 if (!(iso14755buf & ISO_14755_STARTED))
521 { 627 {
522 iso14755buf |= ISO_14755_STARTED; 628 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 629# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 631 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 632# endif
527 } 633 }
528#endif 634#endif
529 635
530#ifdef PRINTPIPE 636#ifdef PRINTPIPE
531 if (keysym == XK_Print) 637 if (keysym == XK_Print)
532 { 638 {
533 scr_printscreen (ctrl | shft); 639 scr_printscreen (ctrl | shft);
534 return; 640 return;
535 } 641 }
536#endif 642#endif
537 643
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 644 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 { 645 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1;
648
649 switch (translate_keypad (keysym, kp))
540 { 650 {
651#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace)
654 {
655 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
656 ^ !!ctrl) ? '\b' : '\177';
657 kbuf[1] = '\0';
658 }
659 else
660 strcpy (kbuf, rs[Rs_backspace_key]);
661 break;
662#endif
663#ifndef NO_DELETE_KEY
664 case XK_Delete:
665 strcpy (kbuf, rs[Rs_delete_key]);
666 break;
667#endif
668 case XK_Tab:
669 if (shft)
670 strcpy (kbuf, "\033[Z");
671 else
672 {
673#ifdef CTRL_TAB_MAKES_META
674 if (ctrl)
675 meta = 1;
676#endif
677#ifdef MOD4_TAB_MAKES_META
678 if (ev.state & Mod4Mask)
679 meta = 1;
680#endif
541 newlen = 1; 681 newlen = 0;
542 switch (keysym) 682 }
683 break;
684
685 case XK_Up: /* "\033[A" */
686 case XK_Down: /* "\033[B" */
687 case XK_Right: /* "\033[C" */
688 case XK_Left: /* "\033[D" */
689 strcpy (kbuf, "\033[Z");
690 kbuf[2] = "DACB"[keysym - XK_Left];
691 /* do Shift first */
692 if (shft)
693 kbuf[2] = "dacb"[keysym - XK_Left];
694 else if (ctrl)
695 {
696 kbuf[1] = 'O';
697 kbuf[2] = "dacb"[keysym - XK_Left];
698 }
699 else if (priv_modes & PrivMode_aplCUR)
700 kbuf[1] = 'O';
701 break;
702
703 case XK_KP_Enter:
704 /* allow shift to override */
705 if (kp)
706 {
707 strcpy (kbuf, "\033OM");
708 break;
709 }
710
711 /* FALLTHROUGH */
712
713 case XK_Return:
714 if (priv_modes & PrivMode_LFNL)
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\012';
718 kbuf[2] = '\0';
719 }
720 else
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\0';
724 }
725 break;
726
727 case XK_KP_F1: /* "\033OP" */
728 case XK_KP_F2: /* "\033OQ" */
729 case XK_KP_F3: /* "\033OR" */
730 case XK_KP_F4: /* "\033OS" */
731 strcpy (kbuf, "\033OP");
732 kbuf[2] += (keysym - XK_KP_F1);
733 break;
734
735 case XK_KP_Multiply: /* "\033Oj" : "*" */
736 case XK_KP_Add: /* "\033Ok" : "+" */
737 case XK_KP_Separator: /* "\033Ol" : "," */
738 case XK_KP_Subtract: /* "\033Om" : "-" */
739 case XK_KP_Decimal: /* "\033On" : "." */
740 case XK_KP_Divide: /* "\033Oo" : "/" */
741 case XK_KP_0: /* "\033Op" : "0" */
742 case XK_KP_1: /* "\033Oq" : "1" */
743 case XK_KP_2: /* "\033Or" : "2" */
744 case XK_KP_3: /* "\033Os" : "3" */
745 case XK_KP_4: /* "\033Ot" : "4" */
746 case XK_KP_5: /* "\033Ou" : "5" */
747 case XK_KP_6: /* "\033Ov" : "6" */
748 case XK_KP_7: /* "\033Ow" : "7" */
749 case XK_KP_8: /* "\033Ox" : "8" */
750 case XK_KP_9: /* "\033Oy" : "9" */
751 /* allow shift to override */
752 if (kp)
753 {
754 strcpy (kbuf, "\033Oj");
755 kbuf[2] += (keysym - XK_KP_Multiply);
756 }
757 else
758 {
759 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
760 kbuf[1] = '\0';
761 }
762 break;
763
764 default:
543 { 765 {
544#ifndef NO_BACKSPACE_KEY 766 int param = map_function_key (keysym);
545 case XK_BackSpace: 767 if (param > 0)
546 if (priv_modes & PrivMode_HaveBackSpace) 768 sprintf (kbuf,"\033[%d~", param);
547 {
548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
549 ^ !!ctrl) ? '\b' : '\177';
550 kbuf[1] = '\0';
551 }
552 else 769 else
553 strcpy (kbuf, key_backspace);
554 break;
555#endif
556#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 {
562 strcpy (kbuf, "\033On");
563 break;
564 }
565 /* FALLTHROUGH */
566# endif
567 case XK_Delete:
568 strcpy (kbuf, key_delete);
569 break;
570#endif
571 case XK_Tab:
572 if (shft)
573 strcpy (kbuf, "\033[Z");
574 else
575 {
576#ifdef CTRL_TAB_MAKES_META
577 if (ctrl)
578 meta = 1;
579#endif
580#ifdef MOD4_TAB_MAKES_META
581 if (ev.state & Mod4Mask)
582 meta = 1;
583#endif
584 newlen = 0;
585 }
586 break;
587
588#ifdef XK_KP_Left
589 case XK_KP_Up: /* \033Ox or standard */
590 case XK_KP_Down: /* \033Or or standard */
591 case XK_KP_Right: /* \033Ov or standard */
592 case XK_KP_Left: /* \033Ot or standard */
593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
594 {
595 strcpy (kbuf, "\033OZ");
596 kbuf[2] = "txvr"[keysym - XK_KP_Left];
597 break;
598 }
599 else
600 /* translate to std. cursor key */
601 keysym = XK_Left + (keysym - XK_KP_Left);
602 /* FALLTHROUGH */
603#endif
604 case XK_Up: /* "\033[A" */
605 case XK_Down: /* "\033[B" */
606 case XK_Right: /* "\033[C" */
607 case XK_Left: /* "\033[D" */
608 strcpy (kbuf, "\033[Z");
609 kbuf[2] = "DACB"[keysym - XK_Left];
610 /* do Shift first */
611 if (shft)
612 kbuf[2] = "dacb"[keysym - XK_Left];
613 else if (ctrl)
614 {
615 kbuf[1] = 'O';
616 kbuf[2] = "dacb"[keysym - XK_Left];
617 }
618 else if (priv_modes & PrivMode_aplCUR)
619 kbuf[1] = 'O';
620 break;
621
622#ifndef UNSHIFTED_SCROLLKEYS
623# ifdef XK_KP_Prior
624 case XK_KP_Prior:
625 /* allow shift to override */
626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
627 {
628 strcpy (kbuf, "\033Oy");
629 break;
630 }
631 /* FALLTHROUGH */
632# endif
633 case XK_Prior:
634 strcpy (kbuf, "\033[5~");
635 break;
636# ifdef XK_KP_Next
637 case XK_KP_Next:
638 /* allow shift to override */
639 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
640 {
641 strcpy (kbuf, "\033Os");
642 break;
643 }
644 /* FALLTHROUGH */
645# endif
646 case XK_Next:
647 strcpy (kbuf, "\033[6~");
648 break;
649#endif
650 case XK_KP_Enter:
651 /* allow shift to override */
652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
653 {
654 strcpy (kbuf, "\033OM");
655 break;
656 }
657
658 /* FALLTHROUGH */
659
660 case XK_Return:
661 if (priv_modes & PrivMode_LFNL)
662 {
663 kbuf[0] = '\015';
664 kbuf[1] = '\012';
665 kbuf[2] = '\0';
666 }
667 else
668 {
669 kbuf[0] = '\015';
670 kbuf[1] = '\0';
671 }
672 break;
673
674#ifdef XK_KP_Begin
675 case XK_KP_Begin:
676 strcpy (kbuf, "\033Ou");
677 break;
678
679#endif
680 case XK_KP_F1: /* "\033OP" */
681 case XK_KP_F2: /* "\033OQ" */
682 case XK_KP_F3: /* "\033OR" */
683 case XK_KP_F4: /* "\033OS" */
684 strcpy (kbuf, "\033OP");
685 kbuf[2] += (keysym - XK_KP_F1);
686 break;
687
688 case XK_KP_Multiply: /* "\033Oj" : "*" */
689 case XK_KP_Add: /* "\033Ok" : "+" */
690 case XK_KP_Separator: /* "\033Ol" : "," */
691 case XK_KP_Subtract: /* "\033Om" : "-" */
692 case XK_KP_Decimal: /* "\033On" : "." */
693 case XK_KP_Divide: /* "\033Oo" : "/" */
694 case XK_KP_0: /* "\033Op" : "0" */
695 case XK_KP_1: /* "\033Oq" : "1" */
696 case XK_KP_2: /* "\033Or" : "2" */
697 case XK_KP_3: /* "\033Os" : "3" */
698 case XK_KP_4: /* "\033Ot" : "4" */
699 case XK_KP_5: /* "\033Ou" : "5" */
700 case XK_KP_6: /* "\033Ov" : "6" */
701 case XK_KP_7: /* "\033Ow" : "7" */
702 case XK_KP_8: /* "\033Ox" : "8" */
703 case XK_KP_9: /* "\033Oy" : "9" */
704 /* allow shift to override */
705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
706 {
707 strcpy (kbuf, "\033Oj");
708 kbuf[2] += (keysym - XK_KP_Multiply);
709 }
710 else
711 {
712 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
713 kbuf[1] = '\0';
714 }
715 break;
716
717 case XK_Find:
718 strcpy (kbuf, "\033[1~");
719 break;
720
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
731 case XK_Insert:
732 strcpy (kbuf, "\033[2~");
733 break;
734#ifdef DXK_Remove /* support for DEC remove like key */
735 case DXK_Remove:
736 /* FALLTHROUGH */
737#endif
738 case XK_Execute:
739 strcpy (kbuf, "\033[3~");
740 break;
741 case XK_Select:
742 strcpy (kbuf, "\033[4~");
743 break;
744#ifdef XK_KP_End
745 case XK_KP_End:
746 /* allow shift to override */
747 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
748 {
749 strcpy (kbuf, "\033Oq");
750 break;
751 }
752 /* FALLTHROUGH */
753#endif
754 case XK_End:
755 strcpy (kbuf, KS_END);
756 break;
757#ifdef XK_KP_Home
758 case XK_KP_Home:
759 /* allow shift to override */
760 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
761 {
762 strcpy (kbuf, "\033Ow");
763 break;
764 }
765 /* FALLTHROUGH */
766#endif
767 case XK_Home:
768 strcpy (kbuf, KS_HOME);
769 break;
770
771#define FKEY(n, fkey) \
772 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
773
774 case XK_F1: /* "\033[11~" */
775 case XK_F2: /* "\033[12~" */
776 case XK_F3: /* "\033[13~" */
777 case XK_F4: /* "\033[14~" */
778 case XK_F5: /* "\033[15~" */
779 FKEY (11, XK_F1);
780 break;
781 case XK_F6: /* "\033[17~" */
782 case XK_F7: /* "\033[18~" */
783 case XK_F8: /* "\033[19~" */
784 case XK_F9: /* "\033[20~" */
785 case XK_F10: /* "\033[21~" */
786 FKEY (17, XK_F6);
787 break;
788 case XK_F11: /* "\033[23~" */
789 case XK_F12: /* "\033[24~" */
790 case XK_F13: /* "\033[25~" */
791 case XK_F14: /* "\033[26~" */
792 FKEY (23, XK_F11);
793 break;
794 case XK_F15: /* "\033[28~" */
795 case XK_F16: /* "\033[29~" */
796 FKEY (28, XK_F15);
797 break;
798 case XK_Help: /* "\033[28~" */
799 FKEY (28, XK_Help);
800 break;
801 case XK_Menu: /* "\033[29~" */
802 FKEY (29, XK_Menu);
803 break;
804 case XK_F17: /* "\033[31~" */
805 case XK_F18: /* "\033[32~" */
806 case XK_F19: /* "\033[33~" */
807 case XK_F20: /* "\033[34~" */
808 case XK_F21: /* "\033[35~" */
809 case XK_F22: /* "\033[36~" */
810 case XK_F23: /* "\033[37~" */
811 case XK_F24: /* "\033[38~" */
812 case XK_F25: /* "\033[39~" */
813 case XK_F26: /* "\033[40~" */
814 case XK_F27: /* "\033[41~" */
815 case XK_F28: /* "\033[42~" */
816 case XK_F29: /* "\033[43~" */
817 case XK_F30: /* "\033[44~" */
818 case XK_F31: /* "\033[45~" */
819 case XK_F32: /* "\033[46~" */
820 case XK_F33: /* "\033[47~" */
821 case XK_F34: /* "\033[48~" */
822 case XK_F35: /* "\033[49~" */
823 FKEY (31, XK_F17);
824 break;
825#undef FKEY
826 default:
827 newlen = 0; 770 newlen = 0;
828 break;
829 } 771 }
830 772 break;
831 if (newlen)
832 len = strlen (kbuf);
833 } 773 }
774
775 if (newlen)
776 len = strlen (kbuf);
834 777
835 /* 778 /*
836 * Pass meta for all function keys, if 'meta' option set 779 * Pass meta for all function keys, if 'meta' option set
837 */ 780 */
838#ifdef META8_OPTION 781#ifdef META8_OPTION
… …
873 return; 816 return;
874 817
875 if (len <= 0) 818 if (len <= 0)
876 return; /* not mapped */ 819 return; /* not mapped */
877 820
878 if (OPTION (Opt_scrollTtyKeypress)) 821 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 822 if (view_start)
880 { 823 {
881 view_start = 0; 824 view_start = 0;
882 want_refresh = 1; 825 want_refresh = 1;
883 } 826 }
… …
905 { 848 {
906 const char ch = C0_ESC; 849 const char ch = C0_ESC;
907 tt_write (&ch, 1); 850 tt_write (&ch, 1);
908 } 851 }
909 852
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 853 tt_write (kbuf, (unsigned int)len);
921} 854}
922/*}}} */ 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}
923 932
924#if defined (KEYSYM_RESOURCE) 933#if defined (KEYSYM_RESOURCE)
925unsigned int 934unsigned int
926rxvt_term::cmd_write (const char *str, unsigned int count) 935rxvt_term::cmd_write (const char *str, unsigned int count)
927{ 936{
… …
957void 966void
958rxvt_term::flush () 967rxvt_term::flush ()
959{ 968{
960 flush_ev.stop (); 969 flush_ev.stop ();
961 970
962#ifdef TRANSPARENT 971#ifdef HAVE_BG_PIXMAP
963 if (want_full_refresh) 972 if (bgPixmap.check_clearChanged ())
964 { 973 {
965 want_full_refresh = 0; 974// scr_clear (true); This needs to be researched further!
966 scr_clear ();
967 scr_touch (false); 975 scr_touch (false);
968 } 976 }
969#endif 977#endif
970 978
971 if (want_refresh) 979 if (want_refresh)
… …
1007 } 1015 }
1008 while (row < end_row); 1016 while (row < end_row);
1009 } 1017 }
1010 1018
1011 scr_refresh (); 1019 scr_refresh ();
1012 scrollbar_show (1); 1020 scrollBar.show (1);
1013#ifdef USE_XIM 1021#ifdef USE_XIM
1014 IMSendSpot (); 1022 IMSendSpot ();
1015#endif 1023#endif
1016 } 1024 }
1017 1025
1018 display->flush (); 1026 display->flush ();
1019} 1027}
1020 1028
1029/* checks wether a refresh is requested and starts the refresh timer */
1021void 1030void
1022rxvt_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)
1023{ 1041{
1024 make_current (); 1042 make_current ();
1025 1043
1026 display->flush ();
1027
1028 if (want_refresh && !flush_ev.active)
1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1030}
1031
1032void
1033rxvt_term::flush_cb (time_watcher &w)
1034{
1035 make_current ();
1036
1037 refresh_limit = 1;
1038 refresh_count = 0; 1044 refresh_count = 0;
1039 flush (); 1045 flush ();
1040} 1046}
1041 1047
1042#ifdef CURSOR_BLINK 1048#ifdef CURSOR_BLINK
1043void 1049void
1044rxvt_term::cursor_blink_cb (time_watcher &w) 1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1045{ 1051{
1046 hidden_cursor = !hidden_cursor; 1052 hidden_cursor = !hidden_cursor;
1047 want_refresh = 1; 1053 want_refresh = 1;
1048 1054 refresh_check ();
1049 w.start (w.at + BLINK_INTERVAL);
1050} 1055}
1051#endif 1056#endif
1052 1057
1053#ifdef TEXT_BLINK 1058#ifdef TEXT_BLINK
1054void 1059void
1055rxvt_term::text_blink_cb (time_watcher &w) 1060rxvt_term::text_blink_cb (ev::timer &w, int revents)
1056{ 1061{
1057 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1062 if (scr_refresh_rend (RS_Blink, RS_Blink))
1058 { 1063 {
1059 hidden_text = !hidden_text; 1064 hidden_text = !hidden_text;
1060 want_refresh = 1; 1065 want_refresh = 1;
1061 w.start (w.at + TEXT_BLINK_INTERVAL); 1066 refresh_check ();
1062 } 1067 }
1068 else
1069 w.stop ();
1063} 1070}
1064#endif 1071#endif
1065 1072
1066#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1067void 1074void
1068rxvt_term::cont_scroll_cb (time_watcher &w) 1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1069{ 1076{
1070 if ((scrollbar_isUp() || scrollbar_isDn()) && 1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1071 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1072 { 1079 {
1073 want_refresh = 1; 1080 want_refresh = 1;
1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1081 refresh_check ();
1075 } 1082 }
1083 else
1084 w.stop ();
1076} 1085}
1077#endif 1086#endif
1078 1087
1079#ifdef SELECTION_SCROLLING 1088#ifdef SELECTION_SCROLLING
1080void 1089void
1081rxvt_term::sel_scroll_cb (time_watcher &w) 1090rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1082{ 1091{
1083 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1092 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1084 { 1093 {
1085 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1094 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1086 want_refresh = 1; 1095 want_refresh = 1;
1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1088 } 1097 }
1098 else
1099 w.stop ();
1089} 1100}
1090#endif 1101#endif
1091 1102
1092#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1093void 1104void
1094rxvt_term::slip_wheel_cb (time_watcher &w) 1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1095{ 1106{
1096 if (mouse_slip_wheel_speed == 0 1107 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1097 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1098 : scr_page (UP, mouse_slip_wheel_speed))
1099 { 1108 {
1100 if (view_start == top_row || view_start == 0)
1101 mouse_slip_wheel_speed = 0;
1102
1103 want_refresh = 1; 1109 want_refresh = 1;
1104 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)
1105 } 1114 {
1115 mouse_slip_wheel_speed = 0;
1116 w.stop ();
1117 }
1106} 1118}
1107#endif 1119#endif
1108 1120
1109#if HAVE_SCHED_YIELD 1121#if LINUX_YIELD_HACK
1110static struct event_handler 1122static struct event_handler
1111{ 1123{
1112 check_watcher cw_yield; 1124 ev::prepare yield_ev;
1113 1125
1114 void yield (check_watcher &w) 1126 void yield_cb (ev::prepare &w, int revents)
1115 { 1127 {
1116 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
1117 w.stop (); 1136 w.stop ();
1118 } 1137 }
1119 1138
1120 event_handler () 1139 event_handler ()
1121 : cw_yield (this, &event_handler::yield) 1140 : yield_ev (this, &event_handler::yield_cb)
1122 { 1141 {
1123 } 1142 }
1124} event_handler; 1143} event_handler;
1125#endif 1144#endif
1126 1145
… …
1146 cmdbuf_endp += r; 1165 cmdbuf_endp += r;
1147 return true; 1166 return true;
1148 } 1167 }
1149 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1168 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1150 { 1169 {
1151#if HAVE_SCHED_YIELD 1170#if LINUX_YIELD_HACK
1152 if (display->is_local) 1171 if (display->is_local)
1153 event_handler.cw_yield.start (); 1172 event_handler.yield_ev.start ();
1154#endif 1173#endif
1155 } 1174 }
1156 else 1175 else
1157 { 1176 {
1158 pty_ev.stop (); 1177 pty_ev.stop ();
1159 1178
1160 if (!OPTION (Opt_hold)) 1179 if (!option (Opt_hold))
1161 destroy (); 1180 destroy ();
1162 } 1181 }
1163 1182
1164 return false; 1183 return false;
1165} 1184}
1166 1185
1167void 1186void
1168rxvt_term::pty_cb (io_watcher &w, short revents) 1187rxvt_term::pty_cb (ev::io &w, int revents)
1169{ 1188{
1170 make_current (); 1189 make_current ();
1171 1190
1172 if (revents & EVENT_READ) 1191 if (revents & ev::READ)
1173 // loop, but don't allow a single term to monopolize us 1192 // loop, but don't allow a single term to monopolize us
1174 while (pty_fill ()) 1193 while (pty_fill ())
1175 if (cmd_parse ()) 1194 if (cmd_parse ())
1176 break; 1195 break;
1177 1196
1178 if (revents & EVENT_WRITE) 1197 if (revents & ev::WRITE)
1179 pty_write (); 1198 pty_write ();
1199
1200 refresh_check ();
1180} 1201}
1181 1202
1182void 1203void
1183rxvt_term::pointer_unblank () 1204rxvt_term::pointer_unblank ()
1184{ 1205{
1185 XDefineCursor (display->display, vt, TermWin_cursor); 1206 XDefineCursor (dpy, vt, TermWin_cursor);
1186 recolour_cursor (); 1207 recolour_cursor ();
1187 1208
1188#ifdef POINTER_BLANK 1209#ifdef POINTER_BLANK
1189 hidden_pointer = 0; 1210 hidden_pointer = 0;
1190 1211
1191 if (OPTION (Opt_pointerBlank)) 1212 if (option (Opt_pointerBlank))
1192 pointer_ev.start (NOW + pointerBlankDelay); 1213 pointer_ev.start (pointerBlankDelay);
1193#endif 1214#endif
1194} 1215}
1195 1216
1196#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1197void 1218void
1198rxvt_term::pointer_blank () 1219rxvt_term::pointer_blank ()
1199{ 1220{
1200 if (!OPTION (Opt_pointerBlank)) 1221 if (!option (Opt_pointerBlank))
1201 return; 1222 return;
1202 1223
1203 XDefineCursor (display->display, vt, display->blank_cursor); 1224 XDefineCursor (dpy, vt, display->blank_cursor);
1204 XFlush (display->display); 1225 XFlush (dpy);
1205 1226
1206 hidden_pointer = 1; 1227 hidden_pointer = 1;
1207} 1228}
1208 1229
1209void 1230void
1210rxvt_term::pointer_cb (time_watcher &w) 1231rxvt_term::pointer_cb (ev::timer &w, int revents)
1211{ 1232{
1212 make_current (); 1233 make_current ();
1213 1234
1214 pointer_blank (); 1235 pointer_blank ();
1215} 1236}
… …
1218void 1239void
1219rxvt_term::mouse_report (XButtonEvent &ev) 1240rxvt_term::mouse_report (XButtonEvent &ev)
1220{ 1241{
1221 int button_number, key_state = 0; 1242 int button_number, key_state = 0;
1222 int x, y; 1243 int x, y;
1244 int code = 32;
1223 1245
1224 x = ev.x; 1246 x = Pixel2Col (ev.x);
1225 y = ev.y; 1247 y = Pixel2Row (ev.y);
1226 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 }
1227 1256
1228 if (MEvent.button == AnyButton) 1257 if (MEvent.button == AnyButton)
1229 button_number = 3; 1258 button_number = 3;
1230 else 1259 else
1231 { 1260 {
… …
1277 x + 1, 1306 x + 1,
1278 y + 1); 1307 y + 1);
1279#endif 1308#endif
1280 1309
1281 tt_printf ("\033[M%c%c%c", 1310 tt_printf ("\033[M%c%c%c",
1282 (32 + button_number + key_state), 1311 (code + button_number + key_state),
1283 (32 + x + 1), 1312 (32 + x + 1),
1284 (32 + y + 1)); 1313 (32 + y + 1));
1285} 1314}
1286
1287#ifdef USING_W11LIB
1288void
1289rxvt_W11_process_x_event (XEvent *ev)
1290{
1291 rxvt_t *r = rxvt_get_r ();
1292
1293 x_cb (*ev);
1294}
1295#endif
1296 1315
1297/*{{{ process an X event */ 1316/*{{{ process an X event */
1298void 1317void
1299rxvt_term::x_cb (XEvent &ev) 1318rxvt_term::x_cb (XEvent &ev)
1300{ 1319{
1301 make_current (); 1320 make_current ();
1302 1321
1303 dDisp; 1322 dLocal (Display *, dpy);
1304 1323
1305 if (ev.xany.window == vt 1324 if (ev.xany.window == vt
1306 && SHOULD_INVOKE (HOOK_X_EVENT) 1325 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1326 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return; 1327 return;
… …
1313 unsigned int unused_mask; 1332 unsigned int unused_mask;
1314 1333
1315 switch (ev.type) 1334 switch (ev.type)
1316 { 1335 {
1317 case KeyPress: 1336 case KeyPress:
1318#if ISO_14755 1337 key_press (ev.xkey);
1319 if (!(iso14755buf & ISO_14755_52))
1320#endif
1321 lookup_key (ev.xkey);
1322
1323 break; 1338 break;
1324 1339
1325 case KeyRelease: 1340 case KeyRelease:
1326 { 1341 key_release (ev.xkey);
1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1328 KeySym keysym;
1329
1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1331#endif
1332
1333#if ENABLE_FRILLS || ISO_14755
1334 // ISO 14755 support
1335 if (iso14755buf)
1336 if (iso14755buf & ISO_14755_52)
1337 {
1338# if ENABLE_OVERLAY
1339 scr_overlay_off ();
1340# endif
1341# if ISO_14755
1342 // iso14755 part 5.2 handling: release time
1343 // first: controls
1344 if ((ev.xkey.state & ControlMask)
1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1347 {
1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1349 commit_iso14755 ();
1350 goto skip_switch;
1351 }
1352
1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1354 if (i[0] == keysym)
1355 {
1356 iso14755buf = ISO_14755_51 | i[1];
1357 commit_iso14755 ();
1358 goto skip_switch;
1359 }
1360
1361 scr_bell ();
1362# endif
1363 iso14755buf = 0;
1364 break;
1365 }
1366 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1367 {
1368# if ENABLE_OVERLAY
1369 scr_overlay_off ();
1370# endif
1371 if (iso14755buf & ISO_14755_51)
1372 commit_iso14755 ();
1373#if ISO_14755
1374 else if (iso14755buf & ISO_14755_STARTED)
1375 {
1376 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1377
1378 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1379 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1380 }
1381# endif
1382 else
1383 iso14755buf = 0;
1384 }
1385#endif
1386
1387 if (ev.xany.window == vt
1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1389 break;
1390
1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1392 if (!(ev.xkey.state & ControlMask))
1393 slip_wheel_ev.stop ();
1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1395 mouse_slip_wheel_speed = 0;
1396#endif
1397 break; 1342 break;
1398 }
1399 1343
1400 case ButtonPress: 1344 case ButtonPress:
1401 button_press (ev.xbutton); 1345 button_press (ev.xbutton);
1402 break; 1346 break;
1403 1347
… …
1405 button_release (ev.xbutton); 1349 button_release (ev.xbutton);
1406 break; 1350 break;
1407 1351
1408 case ClientMessage: 1352 case ClientMessage:
1409 if (ev.xclient.format == 32 1353 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1354 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411 { 1355 {
1356 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1357 {
1358 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1359 {
1412 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1360 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1361 {
1362 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413 destroy (); 1363 destroy ();
1364 }
1414#if ENABLE_EWMH 1365#if ENABLE_EWMH
1415 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])
1416 XSendEvent (disp, ev.xclient.window = display->root, 1367 XSendEvent (dpy, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask, 1368 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &ev); 1369 &ev);
1370#endif
1371 }
1372 }
1373#if ENABLE_XEMBED
1374 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1375 {
1376 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1377 focus_in ();
1378 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1379 focus_out ();
1380 }
1419#endif 1381#endif
1420 } 1382 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1429#endif
1430#ifdef OFFIX_DND
1431 /* OffiX Dnd (drag 'n' drop) protocol */
1432 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1433 && (ev.xclient.data.l[0] == DndFile
1434 || ev.xclient.data.l[0] == DndDir
1435 || ev.xclient.data.l[0] == DndLink))
1436 {
1437 /* Get Dnd data */
1438 Atom ActualType;
1439 int ActualFormat;
1440 unsigned char *data;
1441 unsigned long Size, RemainingBytes;
1442
1443 XGetWindowProperty (disp, display->root,
1444 xa[XA_DNDSELECTION],
1445 0L, 1000000L,
1446 False, AnyPropertyType,
1447 &ActualType, &ActualFormat,
1448 &Size, &RemainingBytes,
1449 &data);
1450 set_string_property (XA_CUT_BUFFER0, data);
1451 XFree (data);
1452 selection_paste (display->root, XA_CUT_BUFFER0, true);
1453 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1454 }
1455#endif /* OFFIX_DND */
1456 break;
1457
1458 case MappingNotify:
1459 XRefreshKeyboardMapping (&ev.xmapping);
1460 break; 1383 break;
1461 1384
1462 /* 1385 /*
1463 * XXX: this is not the _current_ arrangement 1386 * XXX: this is not the _current_ arrangement
1464 * Here's my conclusion: 1387 * Here's my conclusion:
… …
1483 break; 1406 break;
1484 } 1407 }
1485 break; 1408 break;
1486 1409
1487 case FocusIn: 1410 case FocusIn:
1411 if (ev.xfocus.detail != NotifyInferior
1412 && ev.xfocus.detail != NotifyPointer
1413 && ev.xfocus.mode != NotifyGrab)
1488 focus_in (); 1414 focus_in ();
1489 break; 1415 break;
1490 1416
1491 case FocusOut: 1417 case FocusOut:
1418 if (ev.xfocus.detail != NotifyInferior
1419 && ev.xfocus.detail != NotifyPointer
1420 && ev.xfocus.mode != NotifyGrab)
1492 focus_out (); 1421 focus_out ();
1493 break; 1422 break;
1494 1423
1495 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);*/
1496 if (ev.xconfigure.window == parent[0]) 1428 if (ev.xconfigure.window == parent[0])
1497 { 1429 {
1498 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1499 ; 1431 ;
1500 1432
1501 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1502 { 1434 {
1503 seen_resize = 1; 1435 seen_resize = 1;
1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1505 } 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 }
1506 1450
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1508
1509#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1510 if (OPTION (Opt_transparent))
1511 check_our_parents ();
1512#endif
1513 } 1452 }
1514 break; 1453 break;
1515 1454
1516 case PropertyNotify: 1455 case PropertyNotify:
1456 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1517 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1518 && ev.xproperty.state == PropertyNewValue) 1458 && ev.xproperty.state == PropertyNewValue)
1519 selection_property (ev.xproperty.window, ev.xproperty.atom); 1459 selection_property (ev.xproperty.window, ev.xproperty.atom);
1520 1460
1521 break; 1461 break;
1522 1462
1523 case SelectionClear: 1463 case SelectionClear:
1524 selection_clear (); 1464 selection_clear ();
… …
1532 case SelectionRequest: 1472 case SelectionRequest:
1533 selection_send (ev.xselectionrequest); 1473 selection_send (ev.xselectionrequest);
1534 break; 1474 break;
1535 1475
1536 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
1537 mapped = 1; 1493 mapped = 1;
1538#ifdef TEXT_BLINK 1494#ifdef TEXT_BLINK
1539 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1495 text_blink_ev.start ();
1540#endif 1496#endif
1541 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1497 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1542 break; 1498 break;
1543 1499
1544 case UnmapNotify: 1500 case UnmapNotify:
… …
1546#ifdef TEXT_BLINK 1502#ifdef TEXT_BLINK
1547 text_blink_ev.stop (); 1503 text_blink_ev.stop ();
1548#endif 1504#endif
1549 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1505 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1550 break; 1506 break;
1551
1552#ifdef TRANSPARENT
1553 case ReparentNotify:
1554 rootwin_cb (ev);
1555 break;
1556#endif /* TRANSPARENT */
1557 1507
1558 case GraphicsExpose: 1508 case GraphicsExpose:
1559 case Expose: 1509 case Expose:
1560 if (ev.xany.window == vt) 1510 if (ev.xany.window == vt)
1561 { 1511 {
1562 do 1512 do
1513 {
1563 scr_expose (ev.xexpose.x, ev.xexpose.y, 1514 scr_expose (ev.xexpose.x, ev.xexpose.y,
1564 ev.xexpose.width, ev.xexpose.height, False); 1515 ev.xexpose.width, ev.xexpose.height, False);
1516 }
1565 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1566 1518
1567 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1568 1520
1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522 {
1570 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1571 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1525 }
1572 1526
1573 want_refresh = 1; 1527 want_refresh = 1;
1574 } 1528 }
1575 else 1529 else
1576 { 1530 {
1577 XEvent unused_event; 1531 XEvent unused_event;
1578 1532
1579 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1533 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1580 ; 1534 ;
1581 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1582 ; 1536 ;
1583 1537
1584 if (isScrollbarWindow (ev.xany.window)) 1538 if (scrollBar.state && ev.xany.window == scrollBar.win)
1585 { 1539 {
1586 scrollBar.setIdle (); 1540 scrollBar.state = STATE_IDLE;
1587 scrollbar_show (0); 1541 scrollBar.show (0);
1588 } 1542 }
1589
1590#ifdef TRANSPARENT
1591 if (am_transparent && ev.xany.window == parent[0])
1592 XClearWindow (disp, ev.xany.window);
1593#endif
1594 } 1543 }
1595 break; 1544 break;
1596 1545
1597 case MotionNotify: 1546 case MotionNotify:
1598#ifdef POINTER_BLANK 1547#ifdef POINTER_BLANK
1599 if (hidden_pointer) 1548 if (hidden_pointer)
1600 pointer_unblank (); 1549 pointer_unblank ();
1601#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);
1602 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1554 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1603 break; 1555 break;
1604 1556
1605 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1606 { 1558 {
1607 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1559 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1560 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609 ; // nop 1561 ; // nop
1610 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1562 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1611 { 1563 {
1612 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1564 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1613 ; 1565 ;
1614 1566
1615 XQueryPointer (disp, vt, 1567 XQueryPointer (dpy, vt,
1616 &unused_root, &unused_child, 1568 &unused_root, &unused_child,
1617 &unused_root_x, &unused_root_y, 1569 &unused_root_x, &unused_root_y,
1618 &ev.xbutton.x, &ev.xbutton.y, 1570 &ev.xbutton.x, &ev.xbutton.y,
1619 &ev.xbutton.state); 1571 &ev.xbutton.state);
1620#ifdef MOUSE_THRESHOLD 1572#ifdef MOUSE_THRESHOLD
… …
1640 int dist; 1592 int dist;
1641 1593
1642 /* don't clobber the current delay if we are 1594 /* don't clobber the current delay if we are
1643 * already in the middle of scrolling. 1595 * already in the middle of scrolling.
1644 */ 1596 */
1645 if (!sel_scroll_ev.active) 1597 if (!sel_scroll_ev.is_active ())
1646 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1598 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1647 1599
1648 /* save the event params so we can highlight 1600 /* save the event params so we can highlight
1649 * the selection in the pending-scroll loop 1601 * the selection in the pending-scroll loop
1650 */ 1602 */
1651 selection_save_x = ev.xbutton.x; 1603 selection_save_x = ev.xbutton.x;
… …
1673 else 1625 else
1674 { 1626 {
1675 /* we are within the text window, so we 1627 /* we are within the text window, so we
1676 * shouldn't be scrolling 1628 * shouldn't be scrolling
1677 */ 1629 */
1678 if (sel_scroll_ev.active)
1679 sel_scroll_ev.stop(); 1630 sel_scroll_ev.stop();
1680 } 1631 }
1681#endif 1632#endif
1682#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
1683 } 1634 }
1684#endif 1635#endif
1685 } 1636 }
1686 } 1637 }
1687 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1638 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1688 { 1639 {
1689 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1640 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1690 MotionNotify, &ev)) 1641 MotionNotify, &ev))
1691 ; 1642 ;
1692 1643
1693 XQueryPointer (disp, scrollBar.win, 1644 XQueryPointer (dpy, scrollBar.win,
1694 &unused_root, &unused_child, 1645 &unused_root, &unused_child,
1695 &unused_root_x, &unused_root_y, 1646 &unused_root_x, &unused_root_y,
1696 &ev.xbutton.x, &ev.xbutton.y, 1647 &ev.xbutton.x, &ev.xbutton.y,
1697 &unused_mask); 1648 &unused_mask);
1698 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1699 scrollbar_size ()); 1650 scrollBar.size ());
1700 want_refresh = 1; 1651 want_refresh = 1;
1701 refresh_limit = 0;
1702 scrollbar_show (1); 1652 scrollBar.show (1);
1703 } 1653 }
1704 break; 1654 break;
1705 } 1655 }
1706 1656
1707skip_switch: ;
1708
1709#if defined(CURSOR_BLINK) 1657#if defined(CURSOR_BLINK)
1710 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1658 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1711 { 1659 {
1712 if (hidden_cursor) 1660 if (hidden_cursor)
1713 { 1661 {
1714 hidden_cursor = 0; 1662 hidden_cursor = 0;
1715 want_refresh = 1; 1663 want_refresh = 1;
1716 } 1664 }
1717 1665
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1666 cursor_blink_ev.again ();
1719 } 1667 }
1720#endif 1668#endif
1721 1669
1722#if defined(POINTER_BLANK) 1670#if defined(POINTER_BLANK)
1723 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1671 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1724 { 1672 {
1725 if (ev.type == MotionNotify 1673 if (ev.type == MotionNotify
1726 || ev.type == ButtonPress 1674 || ev.type == ButtonPress
1727 || ev.type == ButtonRelease) 1675 || ev.type == ButtonRelease)
1728 if (hidden_pointer) 1676 if (hidden_pointer)
… …
1730 1678
1731 if (ev.type == KeyPress && hidden_pointer == 0) 1679 if (ev.type == KeyPress && hidden_pointer == 0)
1732 pointer_blank (); 1680 pointer_blank ();
1733 } 1681 }
1734#endif 1682#endif
1683
1684 refresh_check ();
1735} 1685}
1736 1686
1737void 1687void
1738rxvt_term::focus_in () 1688rxvt_term::focus_in ()
1739{ 1689{
1740 if (!focus) 1690 if (!focus)
1741 { 1691 {
1742 focus = 1; 1692 focus = 1;
1743 want_refresh = 1; 1693 want_refresh = 1;
1744 1694
1745 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1695 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1746 1696
1747#if USE_XIM 1697#if USE_XIM
1748 if (Input_Context != NULL) 1698 if (Input_Context != NULL)
1749 { 1699 {
1750 IMSetStatusPosition (); 1700 IMSetPosition ();
1751 XSetICFocus (Input_Context); 1701 XSetICFocus (Input_Context);
1752 } 1702 }
1753#endif 1703#endif
1754#if CURSOR_BLINK 1704#if CURSOR_BLINK
1755 if (OPTION (Opt_cursorBlink)) 1705 if (option (Opt_cursorBlink))
1756 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1706 cursor_blink_ev.again ();
1757#endif 1707#endif
1758#if OFF_FOCUS_FADING 1708#if OFF_FOCUS_FADING
1759 if (rs[Rs_fade]) 1709 if (rs[Rs_fade])
1760 { 1710 {
1761 pix_colors = pix_colors_focused; 1711 pix_colors = pix_colors_focused;
1762 scr_recolour (); 1712 scr_recolour ();
1763 } 1713 }
1764#endif 1714#endif
1715#if ENABLE_FRILLS
1716 if (option (Opt_urgentOnBell))
1717 {
1718 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1719 {
1720 h->flags &= ~XUrgencyHint;
1721 XSetWMHints (dpy, parent[0], h);
1722 }
1723 }
1724#endif
1765 } 1725 }
1766} 1726}
1767 1727
1768void 1728void
1769rxvt_term::focus_out () 1729rxvt_term::focus_out ()
… …
1777 1737
1778#if ENABLE_FRILLS || ISO_14755 1738#if ENABLE_FRILLS || ISO_14755
1779 if (iso14755buf) 1739 if (iso14755buf)
1780 { 1740 {
1781 iso14755buf = 0; 1741 iso14755buf = 0;
1782# if ENABLE_OVERLAY 1742# if ISO_14755
1783 scr_overlay_off (); 1743 scr_overlay_off ();
1784# endif 1744# endif
1785 } 1745 }
1786#endif 1746#endif
1787#if USE_XIM 1747#if USE_XIM
1788 if (Input_Context != NULL) 1748 if (Input_Context != NULL)
1789 XUnsetICFocus (Input_Context); 1749 XUnsetICFocus (Input_Context);
1790#endif 1750#endif
1791#if CURSOR_BLINK 1751#if CURSOR_BLINK
1792 if (OPTION (Opt_cursorBlink)) 1752 if (option (Opt_cursorBlink))
1793 cursor_blink_ev.stop (); 1753 cursor_blink_ev.stop ();
1754
1794 hidden_cursor = 0; 1755 hidden_cursor = 0;
1795#endif 1756#endif
1796#if OFF_FOCUS_FADING 1757#if OFF_FOCUS_FADING
1797 if (rs[Rs_fade]) 1758 if (rs[Rs_fade])
1798 { 1759 {
… …
1801 } 1762 }
1802#endif 1763#endif
1803 } 1764 }
1804} 1765}
1805 1766
1806#if TRANSPARENT 1767void
1768rxvt_term::update_fade_color (unsigned int idx)
1769{
1770#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade])
1772 {
1773 rgba c;
1774 pix_colors [Color_fade].get (c);
1775 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1776 }
1777#endif
1778}
1779
1780#if ENABLE_TRANSPARENCY || ENABLE_PERL
1807void 1781void
1808rxvt_term::rootwin_cb (XEvent &ev) 1782rxvt_term::rootwin_cb (XEvent &ev)
1809{ 1783{
1810 make_current (); 1784 make_current ();
1811 1785
1786 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1787 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1788 return;
1789
1790# if ENABLE_TRANSPARENCY
1812 switch (ev.type) 1791 switch (ev.type)
1813 { 1792 {
1814 case PropertyNotify: 1793 case PropertyNotify:
1815 /* 1794 /*
1816 * if user used some Esetroot compatible prog to set the root bg, 1795 * if user used some Esetroot compatible prog to set the root bg,
1817 * use the property to determine the pixmap. We use it later on. 1796 * use the property to determine the pixmap. We use it later on.
1818 */ 1797 */
1819 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1798 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1820 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1799 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1821 return; 1800 {
1801 bgPixmap.set_root_pixmap ();
1802 update_background ();
1803 }
1822 1804
1823 /* FALLTHROUGH */
1824 case ReparentNotify:
1825 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1826 want_refresh = want_full_refresh = 1;
1827 break; 1805 break;
1828 } 1806 }
1807# endif
1808
1809 refresh_check ();
1829} 1810}
1830#endif 1811#endif
1831 1812
1832void 1813void
1833rxvt_term::button_press (XButtonEvent &ev) 1814rxvt_term::button_press (XButtonEvent &ev)
… …
1842 /* 1823 /*
1843 * VT window processing of button press 1824 * VT window processing of button press
1844 */ 1825 */
1845 if (ev.window == vt) 1826 if (ev.window == vt)
1846 { 1827 {
1828 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1829 return;
1830
1847#if ISO_14755 1831#if ISO_14755
1848 // 5.4 1832 // 5.4
1849 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1833 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1850 { 1834 {
1851 iso14755_54 (ev.x, ev.y); 1835 iso14755_54 (ev.x, ev.y);
… …
1885 mouse_report (ev); 1869 mouse_report (ev);
1886 } 1870 }
1887#else 1871#else
1888 MEvent.button = ev.button; 1872 MEvent.button = ev.button;
1889 mouse_report (ev); 1873 mouse_report (ev);
1890#endif /* MOUSE_REPORT_DOUBLECLICK */ 1874#endif /* MOUSE_REPORT_DOUBLECLICK */
1891 1875
1892 } 1876 }
1893 else 1877 else
1894 { 1878 {
1895 if (ev.button != MEvent.button) 1879 if (ev.button != MEvent.button)
1896 MEvent.clicks = 0; 1880 MEvent.clicks = 0;
1897 1881
1898 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1899 switch (ev.button) 1882 switch (ev.button)
1900 { 1883 {
1901 case Button1: 1884 case Button1:
1902 /* allow meta + click to select rectangular areas */ 1885 /* allow meta + click to select rectangular areas */
1903 /* should be done in screen.C */ 1886 /* should be done in screen.C */
1904#if ENABLE_FRILLS 1887#if ENABLE_FRILLS
1905 selection.rect = !!(ev.state & ModMetaMask); 1888 selection.rect = !!(ev.state & ModMetaMask);
1906#else 1889#else
1907 selection.rect = false; 1890 selection.rect = false;
1908#endif 1891#endif
1909 1892
1910 /* allow shift+left click to extend selection */ 1893 /* allow shift+left click to extend selection */
1911 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1894 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1912 { 1895 {
1913 if (MEvent.button == Button1 && clickintime) 1896 if (MEvent.button == Button1 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1897 selection_rotate (ev.x, ev.y);
1915 else 1898 else
1916 selection_extend (ev.x, ev.y, 1); 1899 selection_extend (ev.x, ev.y, 1);
1917 } 1900 }
1918 else 1901 else
1919 { 1902 {
1920 if (MEvent.button == Button1 && clickintime) 1903 if (MEvent.button == Button1 && clickintime)
1921 MEvent.clicks++; 1904 MEvent.clicks++;
1922 else 1905 else
1923 MEvent.clicks = 1; 1906 MEvent.clicks = 1;
1924 1907
1925 selection_click (MEvent.clicks, ev.x, ev.y); 1908 selection_click (MEvent.clicks, ev.x, ev.y);
1926 } 1909 }
1927 1910
1928 MEvent.button = Button1; 1911 MEvent.button = Button1;
1929 break; 1912 break;
1930 1913
1931 case Button3: 1914 case Button3:
1932 if (MEvent.button == Button3 && clickintime) 1915 if (MEvent.button == Button3 && clickintime)
1933 selection_rotate (ev.x, ev.y); 1916 selection_rotate (ev.x, ev.y);
1934 else 1917 else
1935 selection_extend (ev.x, ev.y, 1); 1918 selection_extend (ev.x, ev.y, 1);
1936 1919
1937 MEvent.button = Button3; 1920 MEvent.button = Button3;
1938 break; 1921 break;
1939 } 1922 }
1940 } 1923 }
1941 1924
1942 MEvent.time = ev.time; 1925 MEvent.time = ev.time;
1943 return; 1926 return;
1944 } 1927 }
1945 1928
1946 /* 1929 /*
1947 * Scrollbar window processing of button press 1930 * Scrollbar window processing of button press
1948 */ 1931 */
1949 if (isScrollbarWindow (ev.window)) 1932 if (scrollBar.state && ev.window == scrollBar.win)
1950 { 1933 {
1951 scrollBar.setIdle (); 1934 page_dirn direction = NO_DIR;
1935
1936 if (scrollBar.upButton (ev.y))
1937 direction = UP; /* up */
1938 else if (scrollBar.dnButton (ev.y))
1939 direction = DN; /* down */
1940
1941 scrollBar.state = STATE_IDLE;
1952 /* 1942 /*
1953 * Rxvt-style scrollbar: 1943 * Rxvt-style scrollbar:
1954 * move up if mouse is above slider 1944 * move up if mouse is above slider
1955 * move dn if mouse is below slider 1945 * move dn if mouse is below slider
1956 * 1946 *
… …
1965 /* 1955 /*
1966 * Mouse report disabled scrollbar: 1956 * Mouse report disabled scrollbar:
1967 * arrow buttons - send up/down 1957 * arrow buttons - send up/down
1968 * click on scrollbar - send pageup/down 1958 * click on scrollbar - send pageup/down
1969 */ 1959 */
1970 if ((scrollBar.style == R_SB_NEXT 1960 if (direction == UP)
1971 && scrollbarnext_upButton (ev.y))
1972 || (scrollBar.style == R_SB_RXVT
1973 && scrollbarrxvt_upButton (ev.y)))
1974 tt_printf ("\033[A"); 1961 tt_printf ("\033[A");
1975 else if ((scrollBar.style == R_SB_NEXT 1962 else if (direction == DN)
1976 && scrollbarnext_dnButton (ev.y))
1977 || (scrollBar.style == R_SB_RXVT
1978 && scrollbarrxvt_dnButton (ev.y)))
1979 tt_printf ("\033[B"); 1963 tt_printf ("\033[B");
1980 else 1964 else
1981 switch (ev.button) 1965 switch (ev.button)
1982 { 1966 {
1983 case Button2: 1967 case Button2:
… …
1990 tt_printf ("\033[5~"); 1974 tt_printf ("\033[5~");
1991 break; 1975 break;
1992 } 1976 }
1993 } 1977 }
1994 else 1978 else
1995#endif /* NO_SCROLLBAR_REPORT */ 1979#endif /* NO_SCROLLBAR_REPORT */
1996
1997 {
1998 char upordown = 0;
1999
2000 if (scrollBar.style == R_SB_NEXT)
2001 { 1980 {
2002 if (scrollbarnext_upButton (ev.y)) 1981 if (direction != NO_DIR)
2003 upordown = -1; /* up */
2004 else if (scrollbarnext_dnButton (ev.y))
2005 upordown = 1; /* down */
2006 }
2007 else if (scrollBar.style == R_SB_RXVT)
2008 {
2009 if (scrollbarrxvt_upButton (ev.y))
2010 upordown = -1; /* up */
2011 else if (scrollbarrxvt_dnButton (ev.y))
2012 upordown = 1; /* down */
2013 }
2014 if (upordown)
2015 { 1982 {
2016#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1983#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1984 if (!cont_scroll_ev.is_active ())
2017 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1985 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2018#endif 1986#endif
2019 if (scr_page (upordown < 0 ? UP : DN, 1)) 1987 if (scr_page (direction, 1))
2020 { 1988 {
2021 if (upordown < 0) 1989 if (direction == UP)
2022 scrollBar.setUp (); 1990 scrollBar.state = STATE_UP;
2023 else 1991 else
2024 scrollBar.setDn (); 1992 scrollBar.state = STATE_DOWN;
2025 } 1993 }
2026 } 1994 }
2027 else 1995 else
2028 switch (ev.button) 1996 switch (ev.button)
2029 { 1997 {
2030 case Button2: 1998 case Button2:
2031 switch (scrollbar_align) 1999 switch (scrollBar.align)
2032 { 2000 {
2033 case R_SB_ALIGN_TOP: 2001 case R_SB_ALIGN_TOP:
2034 csrO = 0; 2002 csrO = 0;
2035 break; 2003 break;
2036 case R_SB_ALIGN_CENTRE: 2004 case R_SB_ALIGN_CENTRE:
… …
2042 } 2010 }
2043 2011
2044 if (scrollBar.style == R_SB_XTERM 2012 if (scrollBar.style == R_SB_XTERM
2045 || scrollbar_above_slider (ev.y) 2013 || scrollbar_above_slider (ev.y)
2046 || scrollbar_below_slider (ev.y)) 2014 || scrollbar_below_slider (ev.y))
2047 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2048 2016
2049 scrollBar.setMotion (); 2017 scrollBar.state = STATE_MOTION;
2050 break; 2018 break;
2051 2019
2052 case Button1: 2020 case Button1:
2053 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2021 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2054 csrO = ev.y - scrollBar.top; 2022 csrO = ev.y - scrollBar.top;
2055 /* FALLTHROUGH */ 2023 /* FALLTHROUGH */
2056 2024
2057 case Button3: 2025 case Button3:
2058 if (scrollBar.style != R_SB_XTERM) 2026 if (scrollBar.style != R_SB_XTERM)
… …
2068 scr_page (DN, nrow - 1); 2036 scr_page (DN, nrow - 1);
2069# else 2037# else
2070 scr_page (DN, nrow / 4); 2038 scr_page (DN, nrow / 4);
2071# endif 2039# endif
2072 else 2040 else
2073 scrollBar.setMotion (); 2041 scrollBar.state = STATE_MOTION;
2074 } 2042 }
2075 else 2043 else
2076 { 2044 {
2077 scr_page ((ev.button == Button1 ? DN : UP), 2045 scr_page ((ev.button == Button1 ? DN : UP),
2078 (nrow 2046 (nrow
2079 * scrollbar_position (ev.y) 2047 * scrollbar_position (ev.y)
2080 / scrollbar_size ())); 2048 / scrollBar.size ()));
2081 } 2049 }
2082 2050
2083 break; 2051 break;
2084 } 2052 }
2085 } 2053 }
… …
2095 2063
2096 csrO = 0; /* reset csr Offset */ 2064 csrO = 0; /* reset csr Offset */
2097 if (!bypass_keystate) 2065 if (!bypass_keystate)
2098 reportmode = !! (priv_modes & PrivMode_mouse_report); 2066 reportmode = !! (priv_modes & PrivMode_mouse_report);
2099 2067
2100 if (scrollbar_isUpDn ()) 2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2101 { 2069 {
2102 scrollBar.setIdle (); 2070 scrollBar.state = STATE_IDLE;
2103 scrollbar_show (0); 2071 scrollBar.show (0);
2104 } 2072 }
2105 2073
2106#ifdef SELECTION_SCROLLING 2074#ifdef SELECTION_SCROLLING
2107 if (sel_scroll_ev.active)
2108 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
2109#endif 2076#endif
2110 2077
2111 if (ev.window == vt) 2078 if (ev.window == vt)
2112 { 2079 {
2080 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2081 return;
2082
2113#if ISO_14755 2083#if ISO_14755
2114 // 5.4 2084 // 5.4
2115 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2085 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2116 return; 2086 return;
2117#endif 2087#endif
2088
2118 if (reportmode) 2089 if (reportmode)
2119 { 2090 {
2120 /* mouse report from vt window */ 2091 /* mouse report from vt window */
2121 /* don't report release of wheel "buttons" */ 2092 /* don't report release of wheel "buttons" */
2122 if (ev.button >= 4) 2093 if (ev.button >= 4)
… …
2133 mouse_report (ev); 2104 mouse_report (ev);
2134 } 2105 }
2135#else /* MOUSE_REPORT_DOUBLECLICK */ 2106#else /* MOUSE_REPORT_DOUBLECLICK */
2136 MEvent.button = AnyButton; 2107 MEvent.button = AnyButton;
2137 mouse_report (ev); 2108 mouse_report (ev);
2138#endif /* MOUSE_REPORT_DOUBLECLICK */ 2109#endif /* MOUSE_REPORT_DOUBLECLICK */
2139 return; 2110 return;
2140 } 2111 }
2141 2112
2142 /* 2113 /*
2143 * dumb hack to compensate for the failure of click-and-drag 2114 * dumb hack to compensate for the failure of click-and-drag
… …
2146 if (priv_modes & PrivMode_mouse_report 2117 if (priv_modes & PrivMode_mouse_report
2147 && bypass_keystate 2118 && bypass_keystate
2148 && ev.button == Button1 && MEvent.clicks <= 1) 2119 && ev.button == Button1 && MEvent.clicks <= 1)
2149 selection_extend (ev.x, ev.y, 0); 2120 selection_extend (ev.x, ev.y, 0);
2150 2121
2151 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152 return;
2153
2154 switch (ev.button) 2122 switch (ev.button)
2155 { 2123 {
2156 case Button1: 2124 case Button1:
2157 case Button3: 2125 case Button3:
2158 selection_make (ev.time); 2126 selection_make (ev.time);
2159 break; 2127 break;
2160 2128
2161 case Button2: 2129 case Button2:
2162 if (IN_RANGE_EXC (ev.x, 0, width) 2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2163 && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2164 selection_request (ev.time);
2165
2166 break; 2132 break;
2167 2133
2168#ifdef MOUSE_WHEEL 2134#ifdef MOUSE_WHEEL
2169 case Button4: 2135 case Button4:
2170 case Button5: 2136 case Button5:
… …
2174 2140
2175 v = ev.button == Button4 ? UP : DN; 2141 v = ev.button == Button4 ? UP : DN;
2176 2142
2177 if (ev.state & ShiftMask) 2143 if (ev.state & ShiftMask)
2178 i = 1; 2144 i = 1;
2179 else if (OPTION (Opt_mouseWheelScrollPage)) 2145 else if (option (Opt_mouseWheelScrollPage))
2180 i = nrow - 1; 2146 i = nrow - 1;
2181 else 2147 else
2182 i = 5; 2148 i = 5;
2183 2149
2184# ifdef MOUSE_SLIP_WHEELING 2150# ifdef MOUSE_SLIP_WHEELING
… …
2186 { 2152 {
2187 mouse_slip_wheel_speed += v ? -1 : 1; 2153 mouse_slip_wheel_speed += v ? -1 : 1;
2188 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2154 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2189 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2155 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2190 2156
2191 if (slip_wheel_ev.at < NOW) 2157 if (!slip_wheel_ev.is_active ())
2192 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2158 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2193
2194 slip_wheel_ev.start ();
2195 } 2159 }
2196 else 2160 else
2161# endif
2197 { 2162 {
2198# endif
2199 scr_page (v, i); 2163 scr_page (v, i);
2200 scrollbar_show (1); 2164 scrollBar.show (1);
2201# ifdef MOUSE_SLIP_WHEELING
2202 } 2165 }
2203# endif
2204 } 2166 }
2205 break; 2167 break;
2206#endif 2168#endif
2207 } 2169 }
2208 } 2170 }
2209} 2171}
2210
2211#ifdef TRANSPARENT
2212#if TINTING
2213/* taken from aterm-0.4.2 */
2214
2215typedef uint32_t RUINT32T;
2216
2217void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2218{
2219 int sh_r, sh_g, sh_b;
2220 RUINT32T mask_r, mask_g, mask_b;
2221 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2222 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2223 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2224 int i;
2225
2226 Visual *visual = display->visual;
2227
2228 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2229
2230 /* for convenience */
2231 mask_r = visual->red_mask;
2232 mask_g = visual->green_mask;
2233 mask_b = visual->blue_mask;
2234
2235 /* boring lookup table pre-initialization */
2236 switch (srcImage->bits_per_pixel) {
2237 case 15:
2238 if ((mask_r != 0x7c00) ||
2239 (mask_g != 0x03e0) ||
2240 (mask_b != 0x001f))
2241 return;
2242 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2243 lookup_r = lookup;
2244 lookup_g = lookup+32;
2245 lookup_b = lookup+32+32;
2246 sh_r = 10;
2247 sh_g = 5;
2248 sh_b = 0;
2249 break;
2250 case 16:
2251 if ((mask_r != 0xf800) ||
2252 (mask_g != 0x07e0) ||
2253 (mask_b != 0x001f))
2254 return;
2255 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2256 lookup_r = lookup;
2257 lookup_g = lookup+32;
2258 lookup_b = lookup+32+64;
2259 sh_r = 11;
2260 sh_g = 5;
2261 sh_b = 0;
2262 break;
2263 case 24:
2264 if ((mask_r != 0xff0000) ||
2265 (mask_g != 0x00ff00) ||
2266 (mask_b != 0x0000ff))
2267 return;
2268 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2269 lookup_r = lookup;
2270 lookup_g = lookup+256;
2271 lookup_b = lookup+256+256;
2272 sh_r = 16;
2273 sh_g = 8;
2274 sh_b = 0;
2275 break;
2276 case 32:
2277 if ((mask_r != 0xff0000) ||
2278 (mask_g != 0x00ff00) ||
2279 (mask_b != 0x0000ff))
2280 return;
2281 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2282 lookup_r = lookup;
2283 lookup_g = lookup+256;
2284 lookup_b = lookup+256+256;
2285 sh_r = 16;
2286 sh_g = 8;
2287 sh_b = 0;
2288 break;
2289 default:
2290 return; /* we do not support this color depth */
2291 }
2292
2293 /* prepare limits for color transformation (each channel is handled separately) */
2294 if (shade < 0) {
2295 shade = -shade;
2296 if (shade < 0) shade = 0;
2297 if (shade > 100) shade = 100;
2298
2299 lower_lim_r = 65535-rm;
2300 lower_lim_g = 65535-gm;
2301 lower_lim_b = 65535-bm;
2302
2303 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2304 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2305 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2306
2307 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2308 } else {
2309 if (shade < 0) shade = 0;
2310 if (shade > 100) shade = 100;
2311
2312 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2313
2314 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2315 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2316 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2317 }
2318
2319 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2320 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2321 {
2322 unsigned int tmp;
2323
2324 tmp = lower_lim_r;
2325 lower_lim_r = lower_lim_b;
2326 lower_lim_b = tmp;
2327
2328 tmp = upper_lim_r;
2329 upper_lim_r = upper_lim_b;
2330 upper_lim_b = tmp;
2331 }
2332
2333 /* fill our lookup tables */
2334 for (i = 0; i <= mask_r>>sh_r; i++)
2335 {
2336 RUINT32T tmp;
2337 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2338 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2339 lookup_r[i] = (tmp/65535)<<sh_r;
2340 }
2341 for (i = 0; i <= mask_g>>sh_g; i++)
2342 {
2343 RUINT32T tmp;
2344 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2345 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2346 lookup_g[i] = (tmp/65535)<<sh_g;
2347 }
2348 for (i = 0; i <= mask_b>>sh_b; i++)
2349 {
2350 RUINT32T tmp;
2351 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2352 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2353 lookup_b[i] = (tmp/65535)<<sh_b;
2354 }
2355
2356 /* apply table to input image (replacing colors by newly calculated ones) */
2357 switch (srcImage->bits_per_pixel)
2358 {
2359 case 15:
2360 {
2361 unsigned short *p1, *pf, *p, *pl;
2362 p1 = (unsigned short *) srcImage->data;
2363 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2364 while (p1 < pf)
2365 {
2366 p = p1;
2367 pl = p1 + srcImage->width;
2368 for (; p < pl; p++)
2369 {
2370 *p = lookup_r[(*p & 0x7c00)>>10] |
2371 lookup_g[(*p & 0x03e0)>> 5] |
2372 lookup_b[(*p & 0x001f)];
2373 }
2374 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2375 }
2376 break;
2377 }
2378 case 16:
2379 {
2380 unsigned short *p1, *pf, *p, *pl;
2381 p1 = (unsigned short *) srcImage->data;
2382 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2383 while (p1 < pf)
2384 {
2385 p = p1;
2386 pl = p1 + srcImage->width;
2387 for (; p < pl; p++)
2388 {
2389 *p = lookup_r[(*p & 0xf800)>>11] |
2390 lookup_g[(*p & 0x07e0)>> 5] |
2391 lookup_b[(*p & 0x001f)];
2392 }
2393 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2394 }
2395 break;
2396 }
2397 case 24:
2398 {
2399 unsigned char *p1, *pf, *p, *pl;
2400 p1 = (unsigned char *) srcImage->data;
2401 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2402 while (p1 < pf)
2403 {
2404 p = p1;
2405 pl = p1 + srcImage->width * 3;
2406 for (; p < pl; p += 3)
2407 {
2408 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2409 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2410 p[2] = lookup_r[(p[2] & 0x0000ff)];
2411 }
2412 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2413 }
2414 break;
2415 }
2416 case 32:
2417 {
2418 RUINT32T *p1, *pf, *p, *pl;
2419 p1 = (RUINT32T *) srcImage->data;
2420 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2421
2422 while (p1 < pf)
2423 {
2424 p = p1;
2425 pl = p1 + srcImage->width;
2426 for (; p < pl; p++)
2427 {
2428 *p = lookup_r[(*p & 0xff0000)>>16] |
2429 lookup_g[(*p & 0x00ff00)>> 8] |
2430 lookup_b[(*p & 0x0000ff)] |
2431 (*p & ~0xffffff);
2432 }
2433 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2434 }
2435 break;
2436 }
2437 }
2438
2439 free (lookup);
2440}
2441#endif
2442
2443/*
2444 * Check our parents are still who we think they are.
2445 * Do transparency updates if required
2446 */
2447int
2448rxvt_term::check_our_parents ()
2449{
2450 int i, pchanged, aformat, have_pixmap, rootdepth;
2451 unsigned long nitems, bytes_after;
2452 Atom atype;
2453 unsigned char *prop = NULL;
2454 Window root, oldp, *list;
2455 Pixmap rootpixmap = None;
2456 XWindowAttributes wattr, wrootattr;
2457 dDisp;
2458
2459 pchanged = 0;
2460
2461 if (!OPTION (Opt_transparent))
2462 return pchanged; /* Don't try any more */
2463
2464 XGetWindowAttributes (disp, display->root, &wrootattr);
2465 rootdepth = wrootattr.depth;
2466
2467 XGetWindowAttributes (disp, parent[0], &wattr);
2468
2469 if (rootdepth != wattr.depth)
2470 {
2471 if (am_transparent)
2472 {
2473 pchanged = 1;
2474 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2475 am_transparent = am_pixmap_trans = 0;
2476 }
2477
2478 return pchanged; /* Don't try any more */
2479 }
2480
2481 /* Get all X ops out of the queue so that our information is up-to-date. */
2482 XSync (disp, False);
2483
2484 /*
2485 * Make the frame window set by the window manager have
2486 * the root background. Some window managers put multiple nested frame
2487 * windows for each client, so we have to take care about that.
2488 */
2489 i = (xa[XA_XROOTPMAP_ID]
2490 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2491 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2492 &nitems, &bytes_after, &prop) == Success);
2493
2494 if (!i || prop == NULL)
2495 i = (xa[XA_ESETROOT_PMAP_ID]
2496 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2497 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2498 &nitems, &bytes_after, &prop) == Success);
2499
2500 if (!i || prop == NULL
2501#if TINTING
2502 || !rs[Rs_color + Color_tint]
2503#endif
2504 )
2505 have_pixmap = 0;
2506 else
2507 {
2508 have_pixmap = 1;
2509 rootpixmap = *(Pixmap *)prop;
2510 XFree (prop);
2511 }
2512
2513 if (have_pixmap)
2514 {
2515 /*
2516 * Copy display->root pixmap transparency
2517 */
2518 int sx, sy, nx, ny;
2519 unsigned int nw, nh;
2520 Window cr;
2521 XImage *image;
2522 GC gc;
2523 XGCValues gcvalue;
2524
2525 XTranslateCoordinates (disp, parent[0], display->root,
2526 0, 0, &sx, &sy, &cr);
2527 nw = (unsigned int)szHint.width;
2528 nh = (unsigned int)szHint.height;
2529 nx = ny = 0;
2530
2531 if (sx < 0)
2532 {
2533 nw += sx;
2534 nx = -sx;
2535 sx = 0;
2536 }
2537
2538 if (sy < 0)
2539 {
2540 nh += sy;
2541 ny = -sy;
2542 sy = 0;
2543 }
2544
2545 min_it (nw, (unsigned int) (wrootattr.width - sx));
2546 min_it (nh, (unsigned int) (wrootattr.height - sy));
2547
2548 XSync (disp, False);
2549 allowedxerror = -1;
2550 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2551
2552 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2553 /* XXX: may need a delay here? */
2554 allowedxerror = 0;
2555
2556 if (image == NULL)
2557 {
2558 if (am_transparent && am_pixmap_trans)
2559 {
2560 pchanged = 1;
2561 if (pixmap != None)
2562 {
2563 XFreePixmap (disp, pixmap);
2564 pixmap = None;
2565 }
2566 }
2567
2568 am_pixmap_trans = 0;
2569 }
2570 else
2571 {
2572 if (pixmap != None)
2573 XFreePixmap (disp, pixmap);
2574
2575#if TINTING
2576 if (ISSET_PIXCOLOR (Color_tint))
2577 {
2578 unsigned short rm, gm, bm;
2579 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2580
2581 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2582
2583 ShadeXImage (display, image, shade, rm, gm, bm);
2584 }
2585#endif
2586
2587 pixmap = XCreatePixmap (disp, vt,
2588 szHint.width, szHint.height, image->depth);
2589 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2590 XPutImage (disp, pixmap, gc, image, 0, 0,
2591 nx, ny, image->width, image->height);
2592 XFreeGC (disp, gc);
2593 XDestroyImage (image);
2594 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2595 XClearWindow (disp, parent[0]);
2596
2597 if (!am_transparent || !am_pixmap_trans)
2598 pchanged = 1;
2599
2600 am_transparent = am_pixmap_trans = 1;
2601 }
2602 }
2603
2604 if (am_pixmap_trans)
2605 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2606 else
2607 {
2608 unsigned int n;
2609 /*
2610 * InheritPixmap transparency
2611 */
2612 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2613 {
2614 oldp = parent[i];
2615 XQueryTree (disp, parent[i - 1], &root,
2616 &parent[i], &list, &n);
2617 XFree (list);
2618
2619 if (parent[i] == display->root)
2620 {
2621 if (oldp != None)
2622 pchanged = 1;
2623
2624 break;
2625 }
2626
2627 if (oldp != parent[i])
2628 pchanged = 1;
2629 }
2630
2631 n = 0;
2632
2633 if (pchanged)
2634 {
2635 for (; n < (unsigned int)i; n++)
2636 {
2637 XGetWindowAttributes (disp, parent[n], &wattr);
2638 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2639 {
2640 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2641 break;
2642 }
2643 }
2644 }
2645
2646 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2647 {
2648 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2649 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2650 am_transparent = 0;
2651 /* XXX: also turn off Opt_transparent? */
2652 }
2653 else
2654 {
2655#if WAIT_FOR_WM
2656 /* wait (an arbitrary period) for the WM to do its thing
2657 * needed for fvwm2.2.2 (and before?) */
2658 sleep (1);
2659#endif
2660 for (n = 0; n < (unsigned int)i; n++)
2661 {
2662 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2663 XClearWindow (disp, parent[n]);
2664 }
2665
2666 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2667 am_transparent = 1;
2668 }
2669
2670 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2671 parent[i] = None;
2672 }
2673
2674 if (scrollBar.win)
2675 {
2676 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2677 scrollBar.setIdle ();
2678 scrollbar_show (0);
2679 }
2680
2681 if (am_transparent)
2682 {
2683 want_refresh = want_full_refresh = 1;
2684 if (am_pixmap_trans)
2685 flush ();
2686 }
2687
2688 return pchanged;
2689}
2690#endif
2691 2172
2692/*}}} */ 2173/*}}} */
2693 2174
2694bool 2175bool
2695rxvt_term::cmd_parse () 2176rxvt_term::cmd_parse ()
… …
2744 if (ch == C0_LF) 2225 if (ch == C0_LF)
2745 nlines++; 2226 nlines++;
2746 2227
2747 refresh_count++; 2228 refresh_count++;
2748 2229
2749 if (!OPTION (Opt_jumpScroll) 2230 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2750 || (refresh_count >= refresh_limit * (nrow - 1)))
2751 { 2231 {
2752 refreshnow = true;
2753 refresh_count = 0; 2232 refresh_count = 0;
2233
2234 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2235 {
2236 refreshnow = true;
2754 ch = NOCHAR; 2237 ch = NOCHAR;
2755 break; 2238 break;
2239 }
2756 } 2240 }
2757 2241
2758 // scr_add_lines only works for nlines <= nrow - 1. 2242 // scr_add_lines only works for nlines <= nrow - 1.
2759 if (nlines >= nrow - 1) 2243 if (nlines >= nrow - 1)
2760 { 2244 {
… …
2788 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2272 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2789 scr_add_lines (buf, str - buf, nlines); 2273 scr_add_lines (buf, str - buf, nlines);
2790 2274
2791 /* 2275 /*
2792 * If there have been a lot of new lines, then update the screen 2276 * If there have been a lot of new lines, then update the screen
2793 * What the heck I'll cheat and only refresh less than every page-full. 2277 * What the heck we'll cheat and only refresh less than every page-full.
2794 * the number of pages between refreshes is refresh_limit, which 2278 * if skipScroll is enabled.
2795 * is incremented here because we must be doing flat-out scrolling.
2796 */ 2279 */
2797 if (refreshnow) 2280 if (refreshnow)
2798 { 2281 {
2799 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2800 refresh_limit++;
2801 else
2802 {
2803 flag = true; 2282 flag = true;
2804 scr_refresh (); 2283 scr_refresh ();
2805 want_refresh = 1; 2284 want_refresh = 1;
2806 }
2807 } 2285 }
2808 2286
2809 } 2287 }
2810 else 2288 else
2811 { 2289 {
… …
2827 return flag; 2305 return flag;
2828} 2306}
2829 2307
2830// read the next character 2308// read the next character
2831wchar_t 2309wchar_t
2832rxvt_term::next_char () 2310rxvt_term::next_char () NOTHROW
2833{ 2311{
2834 while (cmdbuf_ptr < cmdbuf_endp) 2312 while (cmdbuf_ptr < cmdbuf_endp)
2835 { 2313 {
2836 // assume 7-bit to be ascii ALWAYS 2314 // assume 7-bit to be ascii ALWAYS
2837 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2846 cmdbuf_ptr = cmdbuf_endp; 2324 cmdbuf_ptr = cmdbuf_endp;
2847 break; 2325 break;
2848 } 2326 }
2849 2327
2850 if (len == (size_t)-1) 2328 if (len == (size_t)-1)
2329 {
2330 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2851 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2331 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2332 }
2852 2333
2853 // assume wchar == unicode 2334 // assume wchar == unicode
2854 cmdbuf_ptr += len; 2335 cmdbuf_ptr += len;
2855 return wc & UNICODE_MASK; 2336 return wc & UNICODE_MASK;
2856 } 2337 }
… …
2858 return NOCHAR; 2339 return NOCHAR;
2859} 2340}
2860 2341
2861// read the next octet 2342// read the next octet
2862uint32_t 2343uint32_t
2863rxvt_term::next_octet () 2344rxvt_term::next_octet () NOTHROW
2864{ 2345{
2865 return cmdbuf_ptr < cmdbuf_endp 2346 return cmdbuf_ptr < cmdbuf_endp
2866 ? (unsigned char)*cmdbuf_ptr++ 2347 ? (unsigned char)*cmdbuf_ptr++
2867 : NOCHAR; 2348 : NOCHAR;
2868} 2349}
2350
2351static class out_of_input out_of_input;
2869 2352
2870/* rxvt_cmd_getc () - Return next input character */ 2353/* rxvt_cmd_getc () - Return next input character */
2871/* 2354/*
2872 * Return the next input character after first passing any keyboard input 2355 * Return the next input character after first passing any keyboard input
2873 * to the command. 2356 * to the command.
2874 */ 2357 */
2875wchar_t 2358wchar_t
2876rxvt_term::cmd_getc () 2359rxvt_term::cmd_getc () THROW ((class out_of_input))
2877{ 2360{
2878 wchar_t c = next_char (); 2361 wchar_t c = next_char ();
2879 2362
2880 if (c == NOCHAR) 2363 if (c == NOCHAR)
2881 throw out_of_input; 2364 throw out_of_input;
2882 2365
2883 return c; 2366 return c;
2884} 2367}
2885 2368
2886uint32_t 2369uint32_t
2887rxvt_term::cmd_get8 () 2370rxvt_term::cmd_get8 () THROW ((class out_of_input))
2888{ 2371{
2889 uint32_t c = next_octet (); 2372 uint32_t c = next_octet ();
2890 2373
2891 if (c == NOCHAR) 2374 if (c == NOCHAR)
2892 throw out_of_input; 2375 throw out_of_input;
… …
2898/*----------------------------------------------------------------------*/ 2381/*----------------------------------------------------------------------*/
2899#ifdef PRINTPIPE 2382#ifdef PRINTPIPE
2900FILE * 2383FILE *
2901rxvt_term::popen_printer () 2384rxvt_term::popen_printer ()
2902{ 2385{
2903 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2386 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2904 2387
2905 if (stream == NULL) 2388 if (stream == NULL)
2906 rxvt_warn ("can't open printer pipe, not printing.\n"); 2389 rxvt_warn ("can't open printer pipe, not printing.\n");
2907 2390
2908 return stream; 2391 return stream;
… …
2919 * simulate attached vt100 printer 2402 * simulate attached vt100 printer
2920 */ 2403 */
2921void 2404void
2922rxvt_term::process_print_pipe () 2405rxvt_term::process_print_pipe ()
2923{ 2406{
2924 int done; 2407 FILE *fd = popen_printer ();
2925 FILE *fd;
2926 2408
2927 if ((fd = popen_printer ()) == NULL) 2409 if (!fd)
2928 return; 2410 return;
2929 2411
2930 /* 2412 /*
2931 * Send all input to the printer until either ESC[4i or ESC[?4i 2413 * Send all input to the printer until either ESC[4i or ESC[?4i
2932 * is received. 2414 * is received.
2933 */ 2415 */
2934 for (done = 0; !done;) 2416 for (int done = 0; !done; )
2935 { 2417 {
2936 unsigned char buf[8]; 2418 unsigned char buf[8];
2937 unicode_t ch; 2419 unicode_t ch;
2938 unsigned int i, len; 2420 unsigned int i, len;
2939 2421
… …
2958 { 2440 {
2959 if ((buf[len++] = cmd_getc ()) == 'i') 2441 if ((buf[len++] = cmd_getc ()) == 'i')
2960 break; /* done = 1 */ 2442 break; /* done = 1 */
2961 } 2443 }
2962 } 2444 }
2963 2445
2964 for (i = 0; i < len; i++) 2446 for (i = 0; i < len; i++)
2965 if (putc (buf[i], fd) == EOF) 2447 if (putc (buf[i], fd) == EOF)
2966 { 2448 {
2967 done = 1; 2449 done = 1;
2968 break; 2450 break;
… …
2970 } 2452 }
2971 } 2453 }
2972 2454
2973 pclose_printer (fd); 2455 pclose_printer (fd);
2974} 2456}
2975#endif /* PRINTPIPE */ 2457#endif /* PRINTPIPE */
2976/*}}} */ 2458/*}}} */
2977 2459
2978/* *INDENT-OFF* */ 2460/* *INDENT-OFF* */
2979enum { 2461enum {
2980 C1_40 = 0x40, 2462 C1_40 = 0x40,
… …
3030 process_dcs_seq (); 2512 process_dcs_seq ();
3031 break; 2513 break;
3032 case 0x9b: /* CSI */ 2514 case 0x9b: /* CSI */
3033 process_csi_seq (); 2515 process_csi_seq ();
3034 break; 2516 break;
3035 case 0x9d: /* CSI */ 2517 case 0x9d: /* OSC */
3036 process_osc_seq (); 2518 process_osc_seq ();
3037 break; 2519 break;
3038#endif 2520#endif
3039 } 2521 }
3040} 2522}
… …
3084 break; 2566 break;
3085 case 'Z': /* identify the terminal type */ 2567 case 'Z': /* identify the terminal type */
3086 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2568 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3087 break; 2569 break;
3088 case '<': /* turn off VT52 mode */ 2570 case '<': /* turn off VT52 mode */
3089 PrivMode (0, PrivMode_vt52); 2571 set_privmode (PrivMode_vt52, 0);
3090 break; 2572 break;
3091 case 'F': /* use special graphics character set */ 2573 case 'F': /* use special graphics character set */
3092 case 'G': /* use regular character set */ 2574 case 'G': /* use regular character set */
3093 /* unimplemented */ 2575 /* unimplemented */
3094 break; 2576 break;
… …
3130 scr_charset_set (2, (unsigned int)cmd_getc ()); 2612 scr_charset_set (2, (unsigned int)cmd_getc ());
3131 break; 2613 break;
3132 case '+': 2614 case '+':
3133 scr_charset_set (3, (unsigned int)cmd_getc ()); 2615 scr_charset_set (3, (unsigned int)cmd_getc ());
3134 break; 2616 break;
3135#if ENABLE_FRILLS 2617#if !ENABLE_MINIMAL
3136 case '6': 2618 case '6':
3137 scr_backindex (); 2619 scr_backindex ();
3138 break; 2620 break;
3139#endif 2621#endif
3140 case '7': 2622 case '7':
3141 scr_cursor (SAVE); 2623 scr_cursor (SAVE);
3142 break; 2624 break;
3143 case '8': 2625 case '8':
3144 scr_cursor (RESTORE); 2626 scr_cursor (RESTORE);
3145 break; 2627 break;
3146#if ENABLE_FRILLS 2628#if !ENABLE_MINIMAL
3147 case '9': 2629 case '9':
3148 scr_forwardindex (); 2630 scr_forwardindex ();
3149 break; 2631 break;
3150#endif 2632#endif
3151 case '=': 2633 case '=':
3152 case '>': 2634 case '>':
3153 PrivMode ((ch == '='), PrivMode_aplKP); 2635 set_privmode (PrivMode_aplKP, ch == '=');
3154 break; 2636 break;
3155 2637
3156 case C1_40: 2638 case C1_40:
3157 cmd_getc (); 2639 cmd_getc ();
3158 break; 2640 break;
… …
3211 2693
3212 /* 8.3.106: RESET TO INITIAL STATE */ 2694 /* 8.3.106: RESET TO INITIAL STATE */
3213 case 'c': 2695 case 'c':
3214 mbstate.reset (); 2696 mbstate.reset ();
3215 scr_poweron (); 2697 scr_poweron ();
3216 scrollbar_show (1); 2698 scrollBar.show (1);
3217 break; 2699 break;
3218 2700
3219 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2701 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3220 case 'n': 2702 case 'n':
3221 scr_charset_choose (2); 2703 scr_charset_choose (2);
… …
3266rxvt_term::process_csi_seq () 2748rxvt_term::process_csi_seq ()
3267{ 2749{
3268 unicode_t ch, priv, i; 2750 unicode_t ch, priv, i;
3269 unsigned int nargs, p; 2751 unsigned int nargs, p;
3270 int n, ndef; 2752 int n, ndef;
3271 int arg[ESC_ARGS]; 2753 int arg[ESC_ARGS] = { };
3272 2754
3273 for (nargs = ESC_ARGS; nargs > 0;) 2755 nargs = 0;
3274 arg[--nargs] = 0;
3275 2756
3276 priv = 0; 2757 priv = 0;
3277 ch = cmd_getc (); 2758 ch = cmd_getc ();
3278 if (ch >= '<' && ch <= '?') 2759 if (ch >= '<' && ch <= '?')
2760 {
3279 { /* '<' '=' '>' '?' */ 2761 /* '<' '=' '>' '?' */
3280 priv = ch; 2762 priv = ch;
3281 ch = cmd_getc (); 2763 ch = cmd_getc ();
3282 } 2764 }
3283 2765
3284 /* read any numerical arguments */ 2766 /* read any numerical arguments */
… …
3313 ndef = get_byte_array_bit (csi_defaults, i); 2795 ndef = get_byte_array_bit (csi_defaults, i);
3314 for (p = 0; p < nargs; p++) 2796 for (p = 0; p < nargs; p++)
3315 if (arg[p] == -1) 2797 if (arg[p] == -1)
3316 arg[p] = ndef; 2798 arg[p] = ndef;
3317 2799
3318#ifdef DEBUG_CMD
3319 fprintf (stderr, "CSI ");
3320 for (p = 0; p < nargs; p++)
3321 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3322 fprintf (stderr, "%c\n", ch);
3323#endif
3324
3325 /* 2800 /*
3326 * private mode handling 2801 * private mode handling
3327 */ 2802 */
3328 if (priv) 2803 if (priv)
3329 { 2804 {
3330 switch (priv) 2805 switch (priv)
3331 { 2806 {
3332 case '>': 2807 case '>':
3333 if (ch == CSI_DA) /* secondary device attributes */ 2808 if (ch == CSI_DA) /* secondary device attributes */
3334 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2809 {
2810 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2811 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2812 //
2813 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2814 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2815 // versions.
2816 //
2817 tt_printf ("\033[>%d;95;0c", 'U');
2818 }
3335 break; 2819 break;
2820
3336 case '?': 2821 case '?':
3337 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2822 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3338 process_terminal_mode (ch, priv, nargs, arg); 2823 process_terminal_mode (ch, priv, nargs, arg);
3339 break; 2824 break;
3340 } 2825 }
… …
3465 break; 2950 break;
3466 case 6: /* CPR requested */ 2951 case 6: /* CPR requested */
3467 scr_report_position (); 2952 scr_report_position ();
3468 break; 2953 break;
3469 case 7: /* unofficial extension */ 2954 case 7: /* unofficial extension */
3470 if (OPTION (Opt_insecure)) 2955 if (option (Opt_insecure))
3471 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2956 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3472 break; 2957 break;
3473 case 8: /* unofficial extension */ 2958 case 8: /* unofficial extension */
3474 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2959 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3475 break; 2960 break;
… …
3542 break; 3027 break;
3543 case CSI_75: 3028 case CSI_75:
3544 scr_cursor (RESTORE); 3029 scr_cursor (RESTORE);
3545 break; 3030 break;
3546 3031
3547#if ENABLE_FRILLS 3032#if !ENABLE_MINIMAL
3548 case CSI_74: 3033 case CSI_74:
3549 process_window_ops (arg, nargs); 3034 process_window_ops (arg, nargs);
3550 break; 3035 break;
3551#endif 3036#endif
3552 3037
… …
3559 break; 3044 break;
3560 } 3045 }
3561} 3046}
3562/*}}} */ 3047/*}}} */
3563 3048
3564#if ENABLE_FRILLS 3049#if !ENABLE_MINIMAL
3565/* ARGSUSED */ 3050/* ARGSUSED */
3566void 3051void
3567rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3052rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3568{ 3053{
3569 int x, y; 3054 int x, y;
3570 XWindowAttributes wattr; 3055 XWindowAttributes wattr;
3571 Window wdummy; 3056 Window wdummy;
3572 dDisp; 3057
3058 dLocal (Display *, dpy);
3573 3059
3574 if (nargs == 0) 3060 if (nargs == 0)
3575 return; 3061 return;
3576 3062
3577 switch (args[0]) 3063 switch (args[0])
3578 { 3064 {
3579 /* 3065 /*
3580 * commands 3066 * commands
3581 */ 3067 */
3582 case 1: /* deiconify window */ 3068 case 1: /* deiconify window */
3583 XMapWindow (disp, parent[0]); 3069 XMapWindow (dpy, parent[0]);
3584 break; 3070 break;
3585 case 2: /* iconify window */ 3071 case 2: /* iconify window */
3586 XIconifyWindow (disp, parent[0], display->screen); 3072 XIconifyWindow (dpy, parent[0], display->screen);
3587 break; 3073 break;
3588 case 3: /* set position (pixels) */ 3074 case 3: /* set position (pixels) */
3589 XMoveWindow (disp, parent[0], args[1], args[2]); 3075 XMoveWindow (dpy, parent[0], args[1], args[2]);
3590 break; 3076 break;
3591 case 4: /* set size (pixels) */ 3077 case 4: /* set size (pixels) */
3592 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3078 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3593 break; 3079 break;
3594 case 5: /* raise window */ 3080 case 5: /* raise window */
3595 XRaiseWindow (disp, parent[0]); 3081 XRaiseWindow (dpy, parent[0]);
3596 break; 3082 break;
3597 case 6: /* lower window */ 3083 case 6: /* lower window */
3598 XLowerWindow (disp, parent[0]); 3084 XLowerWindow (dpy, parent[0]);
3599 break; 3085 break;
3600 case 7: /* refresh window */ 3086 case 7: /* refresh window */
3601 scr_touch (true); 3087 scr_touch (true);
3602 break; 3088 break;
3603 case 8: /* set size (chars) */ 3089 case 8: /* set size (chars) */
… …
3610 if (args[0] >= 24) /* set height (chars) */ 3096 if (args[0] >= 24) /* set height (chars) */
3611 set_widthheight ((unsigned int)width, 3097 set_widthheight ((unsigned int)width,
3612 (unsigned int) (args[1] * fheight)); 3098 (unsigned int) (args[1] * fheight));
3613 break; 3099 break;
3614 3100
3615
3616 /* 3101 /*
3617 * reports - some output format copied from XTerm 3102 * reports - some output format copied from XTerm
3618 */ 3103 */
3619 case 11: /* report window state */ 3104 case 11: /* report window state */
3620 XGetWindowAttributes (disp, parent[0], &wattr); 3105 XGetWindowAttributes (dpy, parent[0], &wattr);
3621 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3106 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3622 break; 3107 break;
3623 case 13: /* report window position */ 3108 case 13: /* report window position */
3624 XGetWindowAttributes (disp, parent[0], &wattr); 3109 XGetWindowAttributes (dpy, parent[0], &wattr);
3625 XTranslateCoordinates (disp, parent[0], wattr.root, 3110 XTranslateCoordinates (dpy, parent[0], wattr.root,
3626 -wattr.border_width, -wattr.border_width, 3111 -wattr.border_width, -wattr.border_width,
3627 &x, &y, &wdummy); 3112 &x, &y, &wdummy);
3628 tt_printf ("\033[3;%d;%dt", x, y); 3113 tt_printf ("\033[3;%d;%dt", x, y);
3629 break; 3114 break;
3630 case 14: /* report window size (pixels) */ 3115 case 14: /* report window size (pixels) */
3631 XGetWindowAttributes (disp, parent[0], &wattr); 3116 XGetWindowAttributes (dpy, parent[0], &wattr);
3632 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3117 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3633 break; 3118 break;
3634 case 18: /* report text area size (chars) */ 3119 case 18: /* report text area size (chars) */
3635 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3120 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3636 break; 3121 break;
… …
3638 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3123 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3639 break; 3124 break;
3640 case 20: /* report icon label */ 3125 case 20: /* report icon label */
3641 { 3126 {
3642 char *s; 3127 char *s;
3643 XGetIconName (disp, parent[0], &s); 3128 XGetIconName (dpy, parent[0], &s);
3644 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3129 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3645 XFree (s); 3130 XFree (s);
3646 } 3131 }
3647 break; 3132 break;
3648 case 21: /* report window title */ 3133 case 21: /* report window title */
3649 { 3134 {
3650 char *s; 3135 char *s;
3651 XFetchName (disp, parent[0], &s); 3136 XFetchName (dpy, parent[0], &s);
3652 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3137 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3653 XFree (s); 3138 XFree (s);
3654 } 3139 }
3655 break; 3140 break;
3656 } 3141 }
3657} 3142}
… …
3684 seen_esc = true; 3169 seen_esc = true;
3685 continue; 3170 continue;
3686 } 3171 }
3687 else if (ch == C0_BEL || ch == CHAR_ST) 3172 else if (ch == C0_BEL || ch == CHAR_ST)
3688 break; 3173 break;
3174 else if (ch == C0_SYN)
3175 ch = cmd_get8 ();
3689 else if (ch < 0x20) 3176 else if (ch < 0x20)
3690 return NULL; /* other control character - exit */ 3177 return NULL; /* other control character - exit */
3691 3178
3692 seen_esc = false; 3179 seen_esc = false;
3693 3180
3694 if (n >= STRING_MAX - 1) 3181 if (n >= STRING_MAX - 1)
3695 // stop at some sane length 3182 // stop at some sane length
3696 return NULL; 3183 return NULL;
3697 3184
3698 if (ch == C0_SYN)
3699 string[n++] = cmd_get8 ();
3700 else
3701 string[n++] = ch; 3185 string[n++] = ch;
3702 } 3186 }
3703 3187
3704 string[n++] = '\0'; 3188 string[n++] = '\0';
3705 3189
3706 ends_how = (ch == 0x5c ? C0_ESC : ch); 3190 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3757void 3241void
3758rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3242rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3759{ 3243{
3760 if (str[0] == '?' && !str[1]) 3244 if (str[0] == '?' && !str[1])
3761 { 3245 {
3762 unsigned short r, g, b; 3246 rgba c;
3763 pix_colors_focused[color].get (display, r, g, b); 3247 pix_colors_focused[color].get (c);
3248
3249#if XFT
3250 if (c.a != rgba::MAX_CC)
3251 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3252 else
3253#endif
3764 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3254 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3765 } 3255 }
3766 else 3256 else
3767 set_window_color (color, str); 3257 set_window_color (color, str);
3768} 3258}
3769 3259
… …
3775{ 3265{
3776 int color; 3266 int color;
3777 char *buf, *name; 3267 char *buf, *name;
3778 bool query = str[0] == '?' && !str[1]; 3268 bool query = str[0] == '?' && !str[1];
3779 int saveop = op; 3269 int saveop = op;
3780 dDisp; 3270
3271 dLocal (Display *, dpy);
3781 3272
3782 assert (str != NULL); 3273 assert (str != NULL);
3274
3275 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3276 return;
3277
3783 switch (op) 3278 switch (op)
3784 { 3279 {
3785 case XTerm_name: 3280 case XTerm_name:
3786 set_title (str); 3281 set_title (str);
3787 /* FALLTHROUGH */ 3282 /* FALLTHROUGH */
… …
3801 unsigned long bytes_after; 3296 unsigned long bytes_after;
3802 unsigned char *value = 0; 3297 unsigned char *value = 0;
3803 const char *str = ""; 3298 const char *str = "";
3804 3299
3805 if (prop 3300 if (prop
3806 && XGetWindowProperty (disp, parent[0], 3301 && XGetWindowProperty (dpy, parent[0],
3807 prop, 0, 1<<16, 0, AnyPropertyType, 3302 prop, 0, 1<<16, 0, AnyPropertyType,
3808 &actual_type, &actual_format, 3303 &actual_type, &actual_format,
3809 &nitems, &bytes_after, &value) == Success 3304 &nitems, &bytes_after, &value) == Success
3810 && actual_type != None 3305 && actual_type != None
3811 && actual_format == 8) 3306 && actual_format == 8)
3812 str = (const char *)(value); 3307 str = (const char *)(value);
3813 3308
3814 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3309 tt_printf ("\033]%d;%s%c", op, str, resp);
3815 3310
3816 XFree (value); 3311 XFree (value);
3817 } 3312 }
3818 else 3313 else
3819 { 3314 {
… …
3823 { 3318 {
3824 *eq = 0; 3319 *eq = 0;
3825 set_utf8_property (display->atom (str), eq + 1); 3320 set_utf8_property (display->atom (str), eq + 1);
3826 } 3321 }
3827 else 3322 else
3828 XDeleteProperty (disp, parent[0], 3323 XDeleteProperty (dpy, parent[0],
3829 display->atom (str)); 3324 display->atom (str));
3830 } 3325 }
3831 break; 3326 break;
3832 3327
3833 case XTerm_Color: 3328 case XTerm_Color:
… …
3843 break; 3338 break;
3844 3339
3845 if ((buf = strchr (name, ';')) != NULL) 3340 if ((buf = strchr (name, ';')) != NULL)
3846 *buf++ = '\0'; 3341 *buf++ = '\0';
3847 3342
3848 if (name[0] == '?' && !name[1]) 3343 process_color_seq (op, color, name, resp);
3849 {
3850 unsigned short r, g, b;
3851 pix_colors_focused[color].get (display, r, g, b);
3852 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3853 }
3854 else
3855 set_window_color (color, name);
3856 } 3344 }
3857 break; 3345 break;
3346 case Rxvt_restoreFG:
3858 case XTerm_Color00: 3347 case XTerm_Color00:
3859 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3348 process_color_seq (op, Color_fg, str, resp);
3860 break; 3349 break;
3350 case Rxvt_restoreBG:
3861 case XTerm_Color01: 3351 case XTerm_Color01:
3862 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3352 process_color_seq (op, Color_bg, str, resp);
3863 break; 3353 break;
3864#ifndef NO_CURSORCOLOR 3354#ifndef NO_CURSORCOLOR
3865 case XTerm_Color_cursor: 3355 case XTerm_Color_cursor:
3866 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3356 process_color_seq (op, Color_cursor, str, resp);
3867 break; 3357 break;
3868#endif 3358#endif
3869 case XTerm_Color_pointer_fg: 3359 case XTerm_Color_pointer_fg:
3870 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3360 process_color_seq (op, Color_pointer_fg, str, resp);
3871 break; 3361 break;
3872 case XTerm_Color_pointer_bg: 3362 case XTerm_Color_pointer_bg:
3873 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3363 process_color_seq (op, Color_pointer_bg, str, resp);
3874 break; 3364 break;
3875#ifndef NO_BOLD_UNDERLINE_REVERSE 3365#ifndef NO_BOLD_UNDERLINE_REVERSE
3876 case XTerm_Color_RV: 3366 case XTerm_Color_RV:
3877 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3367 process_color_seq (op, Color_RV, str, resp);
3878 break; 3368 break;
3879 case Rxvt_Color_BD: 3369 case Rxvt_Color_BD:
3880 case URxvt_Color_BD: 3370 case URxvt_Color_BD:
3881 process_color_seq (op, Color_BD, str, resp); 3371 process_color_seq (op, Color_BD, str, resp);
3882 break; 3372 break;
3883 case Rxvt_Color_UL: 3373 case Rxvt_Color_UL:
3884 case URxvt_Color_UL: 3374 case URxvt_Color_UL:
3885 process_color_seq (op, Color_UL, str, resp); 3375 process_color_seq (op, Color_UL, str, resp);
3886 break; 3376 break;
3887 case URxvt_Color_IT: 3377 case URxvt_Color_IT:
3888 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3378 process_color_seq (op, Color_IT, str, resp);
3889 break; 3379 break;
3890#endif 3380#endif
3891#if TRANSPARENT && TINTING 3381#if ENABLE_TRANSPARENCY
3892 case URxvt_Color_tint: 3382 case URxvt_Color_tint:
3893 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3383 process_color_seq (op, Color_tint, str, resp);
3894 check_our_parents (); 3384 {
3895 if (am_transparent) 3385 bool changed = false;
3896 want_full_refresh = want_refresh = 1;
3897 break;
3898#endif
3899 3386
3387 if (ISSET_PIXCOLOR (Color_tint))
3388 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3389 else
3390 changed = bgPixmap.unset_tint ();
3391
3392 if (changed)
3393 update_background ();
3394 }
3395
3396 break;
3397#endif
3398
3399#if BG_IMAGE_FROM_FILE
3900 case Rxvt_Pixmap: 3400 case Rxvt_Pixmap:
3901 { 3401 if (!strcmp (str, "?"))
3902 if (*str != ';')
3903 { 3402 {
3904#if XPM_BACKGROUND 3403 char str[256];
3905 scale_pixmap (""); /* reset to default scaling */ 3404
3906 set_bgPixmap (str); /* change pixmap */ 3405 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3907 scr_touch (true); 3406 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3908#endif 3407 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3408 process_xterm_seq (XTerm_title, str, CHAR_ST);
3909 } 3409 }
3910 3410 else
3411 {
3911 int changed = 0; 3412 int changed = 0;
3912 3413
3913 while ((str = strchr (str, ';')) != NULL) 3414 if (*str != ';')
3914 { 3415 {
3416 /* reset to default scaling :*/
3417 bgPixmap.unset_geometry ();
3418 if (bgPixmap.set_file (str)) /* change pixmap */
3419 changed++;
3420 str = strchr (str, ';');
3421 if (str == NULL)
3422 bgPixmap.set_defaultGeometry ();
3423 }
3424
3425 while (str)
3426 {
3915 str++; 3427 str++;
3916#if XPM_BACKGROUND 3428 if (bgPixmap.set_geometry (str))
3917 changed += scale_pixmap (str); 3429 changed++;
3918#endif 3430 str = strchr (str, ';');
3919 } 3431 }
3920 3432
3921 if (changed) 3433 if (changed)
3922 { 3434 update_background ();
3923#ifdef XPM_BACKGROUND
3924 resize_pixmap ();
3925 scr_touch (true);
3926#endif
3927 } 3435 }
3928 }
3929 break; 3436 break;
3930 3437#endif
3931 case Rxvt_restoreFG:
3932 set_window_color (Color_fg, str);
3933 break;
3934 case Rxvt_restoreBG:
3935 set_window_color (Color_bg, str);
3936 break;
3937 3438
3938 case XTerm_logfile: 3439 case XTerm_logfile:
3939 // TODO, when secure mode? 3440 // TODO, when secure mode?
3940 break; 3441 break;
3941 3442
… …
3959 case URxvt_italicFont: 3460 case URxvt_italicFont:
3960 case URxvt_boldItalicFont: 3461 case URxvt_boldItalicFont:
3961#endif 3462#endif
3962 if (query) 3463 if (query)
3963 tt_printf ("\33]%d;%-.250s%c", saveop, 3464 tt_printf ("\33]%d;%-.250s%c", saveop,
3964 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3465 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3965 ? fontset[op - URxvt_font]->fontdesc : "", 3466 ? fontset[op - URxvt_font]->fontdesc : "",
3966 resp); 3467 resp);
3967 else 3468 else
3968 { 3469 {
3969 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3470 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3972 allocated.push_back ((void *)res); 3473 allocated.push_back ((void *)res);
3973 set_fonts (); 3474 set_fonts ();
3974 } 3475 }
3975 break; 3476 break;
3976 3477
3977#if ENABLE_FRILLS 3478 case URxvt_version:
3479 if (query)
3480 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3481 op,
3482 rs[Rs_name], VERSION[0], VERSION[2],
3483 resp);
3484 break;
3485
3486#if !ENABLE_MINIMAL
3978 case URxvt_locale: 3487 case URxvt_locale:
3979 if (query) 3488 if (query)
3980 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3489 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3981 else 3490 else
3982 { 3491 {
3983 set_locale (str); 3492 set_locale (str);
3984 pty->set_utf8_mode (enc_utf8); 3493 pty->set_utf8_mode (enc_utf8);
3985 init_xlocale (); 3494 init_xlocale ();
… …
4000 break; 3509 break;
4001#endif 3510#endif
4002 3511
4003#if ENABLE_PERL 3512#if ENABLE_PERL
4004 case URxvt_perl: 3513 case URxvt_perl:
4005 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3514 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4006 ; // no responses yet 3515 ; // no responses yet
4007 break; 3516 break;
4008#endif 3517#endif
4009 } 3518 }
4010} 3519}
… …
4034 { 3543 {
4035 if (mode == 'r') 3544 if (mode == 'r')
4036 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3545 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4037 else 3546 else
4038 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3547 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4039 PrivMode (state, bit); 3548 set_privmode (bit, state);
4040 } 3549 }
4041 3550
4042 return state; 3551 return state;
4043} 3552}
4044 3553
4045/* we're not using priv _yet_ */ 3554/* we're not using priv _yet_ */
4046void 3555void
4047rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3556rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4048{ 3557{
4049 unsigned int i, j; 3558 unsigned int i, j;
4050 int state; 3559 int state;
4051 3560
4052 static const struct 3561 static const struct
4053 { 3562 {
4054 const int argval; 3563 const int argval;
4055 const unsigned long bit; 3564 const unsigned long bit;
4056 }
4057
4058 argtopriv[] = { 3565 } argtopriv[] = {
4059 { 1, PrivMode_aplCUR }, 3566 { 1, PrivMode_aplCUR },
4060 { 2, PrivMode_vt52 }, 3567 { 2, PrivMode_vt52 },
4061 { 3, PrivMode_132 }, 3568 { 3, PrivMode_132 },
4062 { 4, PrivMode_smoothScroll }, 3569 { 4, PrivMode_smoothScroll },
4063 { 5, PrivMode_rVideo }, 3570 { 5, PrivMode_rVideo },
… …
4079 { 66, PrivMode_aplKP }, 3586 { 66, PrivMode_aplKP },
4080#ifndef NO_BACKSPACE_KEY 3587#ifndef NO_BACKSPACE_KEY
4081 { 67, PrivMode_BackSpace }, 3588 { 67, PrivMode_BackSpace },
4082#endif 3589#endif
4083 { 1000, PrivMode_MouseX11 }, 3590 { 1000, PrivMode_MouseX11 },
4084 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3591 { 1002, PrivMode_MouseBtnEvent },
4085 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3592 { 1003, PrivMode_MouseAnyEvent },
4086 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4087 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3593 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4088 { 1011, PrivMode_Keypress }, // rxvt extension 3594 { 1011, PrivMode_Keypress }, // rxvt extension
4089 // 1035 enable modifiers for alt, numlock NYI 3595 // 1035 enable modifiers for alt, numlock NYI
4090 // 1036 send ESC for meta keys NYI 3596 // 1036 send ESC for meta keys NYI
4091 // 1037 send DEL for keypad delete NYI 3597 // 1037 send DEL for keypad delete NYI
4092 { 1047, PrivMode_Screen }, 3598 { 1047, PrivMode_Screen },
4093 // 1048 save and restore cursor 3599 // 1048 save and restore cursor
4094 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3600 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4095 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3601 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3602 { 2004, PrivMode_BracketPaste },
4096 }; 3603 };
4097 3604
4098 if (nargs == 0) 3605 if (nargs == 0)
4099 return; 3606 return;
4100 3607
… …
4126 scr_touch (true); 3633 scr_touch (true);
4127 break; 3634 break;
4128#endif 3635#endif
4129 case 1048: /* alternative cursor save */ 3636 case 1048: /* alternative cursor save */
4130 case 1049: 3637 case 1049:
4131 if (OPTION (Opt_secondaryScreen)) 3638 if (option (Opt_secondaryScreen))
4132 if (mode == 0) 3639 if (mode == 0)
4133 scr_cursor (RESTORE); 3640 scr_cursor (RESTORE);
4134 else if (mode == 1) 3641 else if (mode == 1)
4135 scr_cursor (SAVE); 3642 scr_cursor (SAVE);
4136 break; 3643 break;
… …
4144 case 2: /* VT52 mode */ 3651 case 2: /* VT52 mode */
4145 /* oddball mode. should be set regardless of set/reset 3652 /* oddball mode. should be set regardless of set/reset
4146 * parameter. Return from VT52 mode with an ESC < from 3653 * parameter. Return from VT52 mode with an ESC < from
4147 * within VT52 mode 3654 * within VT52 mode
4148 */ 3655 */
4149 PrivMode (1, PrivMode_vt52); 3656 set_privmode (PrivMode_vt52, 1);
4150 break; 3657 break;
4151 case 3: /* 80/132 */ 3658 case 3: /* 80/132 */
4152 if (priv_modes & PrivMode_132OK) 3659 if (priv_modes & PrivMode_132OK)
3660 {
3661 scr_poweron ();
4153 set_widthheight (((state ? 132 : 80) * fwidth), height); 3662 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3663 }
4154 break; 3664 break;
4155 case 4: /* smooth scrolling */ 3665 case 4: /* smooth scrolling */
4156 set_option (Opt_jumpScroll, !state); 3666 set_option (Opt_jumpScroll, !state);
4157 break; 3667 break;
4158 case 5: /* reverse video */ 3668 case 5: /* reverse video */
… …
4165 scr_autowrap (state); 3675 scr_autowrap (state);
4166 break; 3676 break;
4167 /* case 8: - auto repeat, can't do on a per window basis */ 3677 /* case 8: - auto repeat, can't do on a per window basis */
4168 case 9: /* X10 mouse reporting */ 3678 case 9: /* X10 mouse reporting */
4169 if (state) /* orthogonal */ 3679 if (state) /* orthogonal */
4170 priv_modes &= ~PrivMode_MouseX11; 3680 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4171 break; 3681 break;
4172#ifdef scrollBar_esc 3682#ifdef scrollBar_esc
4173 case scrollBar_esc: 3683 case scrollBar_esc:
4174 if (scrollbar_mapping (state)) 3684 if (scrollBar.map (state))
4175 { 3685 {
4176 resize_all_windows (0, 0, 0); 3686 resize_all_windows (0, 0, 0);
4177 scr_touch (true); 3687 scr_touch (true);
4178 } 3688 }
4179 break; 3689 break;
… …
4188 break; 3698 break;
4189 /* case 66: - application key pad */ 3699 /* case 66: - application key pad */
4190 /* case 67: - backspace key */ 3700 /* case 67: - backspace key */
4191 case 1000: /* X11 mouse reporting */ 3701 case 1000: /* X11 mouse reporting */
4192 if (state) /* orthogonal */ 3702 if (state) /* orthogonal */
4193 priv_modes &= ~PrivMode_MouseX10; 3703 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4194 break; 3704 break;
4195#if 0
4196 case 1001: 3705 case 1002:
4197 break; /* X11 mouse highlighting */ 3706 case 1003:
4198#endif 3707 if (state)
3708 {
3709 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3710 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3711 vt_emask_mouse = PointerMotionMask;
3712 }
3713 else
3714 vt_emask_mouse = NoEventMask;
3715 vt_select_input ();
3716 break;
4199 case 1010: /* scroll to bottom on TTY output inhibit */ 3717 case 1010: /* scroll to bottom on TTY output inhibit */
4200 set_option (Opt_scrollTtyOutput, !state); 3718 set_option (Opt_scrollTtyOutput, !state);
4201 break; 3719 break;
4202 case 1011: /* scroll to bottom on key press */ 3720 case 1011: /* scroll to bottom on key press */
4203 set_option (Opt_scrollTtyKeypress, state); 3721 set_option (Opt_scrollTtyKeypress, state);
4204 break; 3722 break;
4205 case 1047: /* secondary screen w/ clearing last */ 3723 case 1047: /* secondary screen w/ clearing last */
4206 if (OPTION (Opt_secondaryScreen)) 3724 if (option (Opt_secondaryScreen))
4207 if (current_screen != PRIMARY) 3725 if (current_screen != PRIMARY)
4208 scr_erase_screen (2); 3726 scr_erase_screen (2);
4209 scr_change_screen (state); 3727 scr_change_screen (state);
4210 break; 3728 break;
4211 case 1049: /* secondary screen w/ clearing first */ 3729 case 1049: /* secondary screen w/ clearing first */
4212 scr_change_screen (state); 3730 scr_change_screen (state);
4213 if (OPTION (Opt_secondaryScreen)) 3731 if (option (Opt_secondaryScreen))
4214 if (current_screen != PRIMARY) 3732 if (current_screen != PRIMARY)
4215 scr_erase_screen (2); 3733 scr_erase_screen (2);
4216 break; 3734 break;
4217 default: 3735 default:
4218 break; 3736 break;
… …
4346 scr_color (Color_bg, Color_bg); 3864 scr_color (Color_bg, Color_bg);
4347 break; 3865 break;
4348 3866
4349 //case 50: // not variable spacing 3867 //case 50: // not variable spacing
4350 3868
4351#if ENABLE_FRILLS 3869#if !ENABLE_MINIMAL
4352 case 90: 3870 case 90:
4353 case 91: /* set bright fg color */ 3871 case 91: /* set bright fg color */
4354 case 92: 3872 case 92:
4355 case 93: 3873 case 93:
4356 case 94: 3874 case 94:
… …
4380rxvt_term::process_graphics () 3898rxvt_term::process_graphics ()
4381{ 3899{
4382 unicode_t ch, cmd = cmd_getc (); 3900 unicode_t ch, cmd = cmd_getc ();
4383 3901
4384 if (cmd == 'Q') 3902 if (cmd == 'Q')
3903 {
4385 { /* query graphics */ 3904 /* query graphics */
4386 tt_printf ("\033G0\012"); /* no graphics */ 3905 tt_printf ("\033G0\012"); /* no graphics */
4387 return; 3906 return;
4388 } 3907 }
4389 /* swallow other graphics sequences until terminating ':' */ 3908 /* swallow other graphics sequences until terminating ':' */
4390 do 3909 do
… …
4440 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3959 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4441 3960
4442 memcpy (v_buffer + v_buflen, data, len); 3961 memcpy (v_buffer + v_buflen, data, len);
4443 v_buflen += len; 3962 v_buflen += len;
4444 3963
4445 pty_ev.set (EVENT_READ | EVENT_WRITE); 3964 pty_ev.set (ev::READ | ev::WRITE);
4446} 3965}
4447 3966
4448void rxvt_term::pty_write () 3967void rxvt_term::pty_write ()
4449{ 3968{
4450 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3969 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4455 3974
4456 if (v_buflen == 0) 3975 if (v_buflen == 0)
4457 { 3976 {
4458 free (v_buffer); 3977 free (v_buffer);
4459 v_buffer = 0; 3978 v_buffer = 0;
4460 v_buflen = 0;
4461 3979
4462 pty_ev.set (EVENT_READ); 3980 pty_ev.set (ev::READ);
4463 return; 3981 return;
4464 } 3982 }
4465 3983
4466 memmove (v_buffer, v_buffer + written, v_buflen); 3984 memmove (v_buffer, v_buffer + written, v_buflen);
4467 } 3985 }
4468 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3986 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4469 pty_ev.set (EVENT_READ); 3987 pty_ev.set (ev::READ);
4470} 3988}
4471 3989
4472/*----------------------- end-of-file (C source) -----------------------*/ 3990/*----------------------- end-of-file (C source) -----------------------*/
4473 3991

Diff Legend

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