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.283 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.412 by ayin, Sun Feb 17 11:13:11 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
49#include "rxvt.h" 50#include "rxvt.h"
50#include "rxvtperl.h" 51#include "rxvtperl.h"
51#include "version.h" 52#include "version.h"
52#include "command.h" 53#include "command.h"
53 54
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 56# include "keyboard.h"
61#endif 57#endif
62 58
63#include <csignal> 59#include <csignal>
60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 68
… …
96 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
97 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
98 98
99 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
101 XK_ISO_Lock, 0x21eb,
102 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
103 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
104 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
105 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
106 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
200 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
202 201
203 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
204 203
205 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
206 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
207 206
208 if (y >= 0) 207 if (y >= 0)
209 { 208 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
222 ch = *chr++; 221 ch = *chr++;
223 222
224 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
225 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
226 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
227# if !UNICODE3 226# if !UNICODE_3
228 if (ch >= 0x10000) 227 if (ch >= 0x10000)
229 ch = 0xfffd; 228 ch = 0xfffd;
230# endif 229# endif
231 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
233 } 234 }
234 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
235 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
237 243
238 free (fname); 244 free (fname);
239 245
… …
273 } 279 }
274 280
275 iso14755buf = 0; 281 iso14755buf = 0;
276} 282}
277 283
278int 284static int
279rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
280{ 286{
281 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
282 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
283 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
284 { 290 {
… …
292 298
293 return -1; 299 return -1;
294} 300}
295#endif 301#endif
296 302
297/*{{{ Convert the keypress event into a string */ 303static inline KeySym
304translate_keypad (KeySym keysym, bool kp)
305{
306#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin
322 };
323
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
325 {
326 unsigned int index = keysym - XK_KP_Home;
327 keysym = kp ? keypadtrans[index] : XK_Home + index;
328 }
329 else if (keysym == XK_KP_Insert)
330 keysym = kp ? XK_KP_0 : XK_Insert;
331# ifndef NO_DELETE_KEY
332 else if (keysym == XK_KP_Delete)
333 keysym = kp ? XK_KP_Decimal : XK_Delete;
334# endif
335#endif
336 return keysym;
337}
338
339static inline int
340map_function_key (KeySym keysym)
341{
342 int param = 0;
343
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
345 {
346 param = 11 + keysym - XK_F1;
347 if (keysym >= XK_F17)
348 param += 4;
349 else if (keysym >= XK_F15)
350 param += 3;
351 else if (keysym >= XK_F11)
352 param += 2;
353 else if (keysym >= XK_F6)
354 param += 1;
355 }
356 else
357 switch (keysym)
358 {
359 case XK_Find:
360 param = 1;
361 break;
362 case XK_Insert:
363 param = 2;
364 break;
365#ifdef DXK_Remove
366 case DXK_Remove:
367#endif
368 case XK_Execute:
369 param = 3;
370 break;
371 case XK_Select:
372 param = 4;
373 break;
374#ifndef UNSHIFTED_SCROLLKEYS
375 case XK_Prior:
376 param = 5;
377 break;
378 case XK_Next:
379 param = 6;
380 break;
381 case XK_Home:
382 param = 7;
383 break;
384 case XK_End:
385 param = 8;
386 break;
387#endif
388 case XK_Help:
389 param = 28;
390 break;
391 case XK_Menu:
392 param = 29;
393 break;
394 }
395 return param;
396}
397
298void 398void
299rxvt_term::lookup_key (XKeyEvent &ev) 399rxvt_term::key_press (XKeyEvent &ev)
300{ 400{
301 int ctrl, meta, shft, len; 401 int ctrl, meta, shft, len;
302 unsigned int newlen;
303 KeySym keysym; 402 KeySym keysym;
304 int valid_keysym; 403 int valid_keysym;
305 char kbuf[KBUFSZ]; 404 char kbuf[KBUFSZ];
405
406#if ISO_14755
407 if (iso14755buf & ISO_14755_52)
408 return;
409#endif
306 410
307 /* 411 /*
308 * 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
309 * escape sequence to toggle the Keypad. 413 * escape sequence to toggle the Keypad.
310 * 414 *
… …
315 meta = ev.state & ModMetaMask; 419 meta = ev.state & ModMetaMask;
316 420
317 if (numlock_state || (ev.state & ModNumLockMask)) 421 if (numlock_state || (ev.state & ModNumLockMask))
318 { 422 {
319 numlock_state = (ev.state & ModNumLockMask); 423 numlock_state = (ev.state & ModNumLockMask);
320 PrivMode ((!numlock_state), PrivMode_aplKP); 424 set_privmode (PrivMode_aplKP, !numlock_state);
321 } 425 }
322 426
323 kbuf[0] = 0; 427 kbuf[0] = 0;
324 428
325#ifdef USE_XIM 429#ifdef USE_XIM
… …
490# if ISO_14755 594# if ISO_14755
491 iso14755_51 (0); 595 iso14755_51 (0);
492# endif 596# endif
493 return; 597 return;
494 } 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 }
495 else if ((hv = hex_keyval (ev)) >= 0) 607 else if ((hv = hex_keyval (ev)) >= 0)
496 { 608 {
497 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 609 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
498 | hv | ISO_14755_51; 610 | hv | ISO_14755_51;
499# if ISO_14755 611# if ISO_14755
… …
501# endif 613# endif
502 return; 614 return;
503 } 615 }
504 else 616 else
505 { 617 {
506# if ENABLE_OVERLAY 618# if ISO_14755
507 scr_overlay_off (); 619 scr_overlay_off ();
508# endif 620# endif
509 iso14755buf = 0; 621 iso14755buf = 0;
510 } 622 }
511 } 623 }
512 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
513 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
514 if (!(iso14755buf & ISO_14755_STARTED)) 626 if (!(iso14755buf & ISO_14755_STARTED))
515 { 627 {
516 iso14755buf |= ISO_14755_STARTED; 628 iso14755buf |= ISO_14755_STARTED;
517# if ENABLE_OVERLAY 629# if ISO_14755
518 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
519 scr_overlay_set (0, 0, "ISO 14755 mode"); 631 scr_overlay_set (0, 0, "ISO 14755 mode");
520# endif 632# endif
521 } 633 }
522#endif 634#endif
523 635
524#ifdef PRINTPIPE 636#ifdef PRINTPIPE
525 if (keysym == XK_Print) 637 if (keysym == XK_Print)
526 { 638 {
527 scr_printscreen (ctrl | shft); 639 scr_printscreen (ctrl | shft);
528 return; 640 return;
529 } 641 }
530#endif 642#endif
531 643
532 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 644 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
533 { 645 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1;
648
649 switch (translate_keypad (keysym, kp))
534 { 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
535 newlen = 1; 681 newlen = 0;
536 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:
537 { 765 {
538#ifndef NO_BACKSPACE_KEY 766 int param = map_function_key (keysym);
539 case XK_BackSpace: 767 if (param > 0)
540 if (priv_modes & PrivMode_HaveBackSpace) 768 sprintf (kbuf,"\033[%d~", param);
541 {
542 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
543 ^ !!ctrl) ? '\b' : '\177';
544 kbuf[1] = '\0';
545 }
546 else 769 else
547 strcpy (kbuf, key_backspace);
548 break;
549#endif
550#ifndef NO_DELETE_KEY
551# ifdef XK_KP_Prior
552 case XK_KP_Delete:
553 /* allow shift to override */
554 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
555 {
556 strcpy (kbuf, "\033On");
557 break;
558 }
559 /* FALLTHROUGH */
560# endif
561 case XK_Delete:
562 strcpy (kbuf, key_delete);
563 break;
564#endif
565 case XK_Tab:
566 if (shft)
567 strcpy (kbuf, "\033[Z");
568 else
569 {
570#ifdef CTRL_TAB_MAKES_META
571 if (ctrl)
572 meta = 1;
573#endif
574#ifdef MOD4_TAB_MAKES_META
575 if (ev.state & Mod4Mask)
576 meta = 1;
577#endif
578 newlen = 0;
579 }
580 break;
581
582#ifdef XK_KP_Left
583 case XK_KP_Up: /* \033Ox or standard */
584 case XK_KP_Down: /* \033Or or standard */
585 case XK_KP_Right: /* \033Ov or standard */
586 case XK_KP_Left: /* \033Ot or standard */
587 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
588 {
589 strcpy (kbuf, "\033OZ");
590 kbuf[2] = "txvr"[keysym - XK_KP_Left];
591 break;
592 }
593 else
594 /* translate to std. cursor key */
595 keysym = XK_Left + (keysym - XK_KP_Left);
596 /* FALLTHROUGH */
597#endif
598 case XK_Up: /* "\033[A" */
599 case XK_Down: /* "\033[B" */
600 case XK_Right: /* "\033[C" */
601 case XK_Left: /* "\033[D" */
602 strcpy (kbuf, "\033[Z");
603 kbuf[2] = "DACB"[keysym - XK_Left];
604 /* do Shift first */
605 if (shft)
606 kbuf[2] = "dacb"[keysym - XK_Left];
607 else if (ctrl)
608 {
609 kbuf[1] = 'O';
610 kbuf[2] = "dacb"[keysym - XK_Left];
611 }
612 else if (priv_modes & PrivMode_aplCUR)
613 kbuf[1] = 'O';
614 break;
615
616#ifndef UNSHIFTED_SCROLLKEYS
617# ifdef XK_KP_Prior
618 case XK_KP_Prior:
619 /* allow shift to override */
620 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
621 {
622 strcpy (kbuf, "\033Oy");
623 break;
624 }
625 /* FALLTHROUGH */
626# endif
627 case XK_Prior:
628 strcpy (kbuf, "\033[5~");
629 break;
630# ifdef XK_KP_Next
631 case XK_KP_Next:
632 /* allow shift to override */
633 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
634 {
635 strcpy (kbuf, "\033Os");
636 break;
637 }
638 /* FALLTHROUGH */
639# endif
640 case XK_Next:
641 strcpy (kbuf, "\033[6~");
642 break;
643#endif
644 case XK_KP_Enter:
645 /* allow shift to override */
646 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
647 {
648 strcpy (kbuf, "\033OM");
649 break;
650 }
651
652 /* FALLTHROUGH */
653
654 case XK_Return:
655 if (priv_modes & PrivMode_LFNL)
656 {
657 kbuf[0] = '\015';
658 kbuf[1] = '\012';
659 kbuf[2] = '\0';
660 }
661 else
662 {
663 kbuf[0] = '\015';
664 kbuf[1] = '\0';
665 }
666 break;
667
668#ifdef XK_KP_Begin
669 case XK_KP_Begin:
670 strcpy (kbuf, "\033Ou");
671 break;
672
673#endif
674 case XK_KP_F1: /* "\033OP" */
675 case XK_KP_F2: /* "\033OQ" */
676 case XK_KP_F3: /* "\033OR" */
677 case XK_KP_F4: /* "\033OS" */
678 strcpy (kbuf, "\033OP");
679 kbuf[2] += (keysym - XK_KP_F1);
680 break;
681
682 case XK_KP_Multiply: /* "\033Oj" : "*" */
683 case XK_KP_Add: /* "\033Ok" : "+" */
684 case XK_KP_Separator: /* "\033Ol" : "," */
685 case XK_KP_Subtract: /* "\033Om" : "-" */
686 case XK_KP_Decimal: /* "\033On" : "." */
687 case XK_KP_Divide: /* "\033Oo" : "/" */
688 case XK_KP_0: /* "\033Op" : "0" */
689 case XK_KP_1: /* "\033Oq" : "1" */
690 case XK_KP_2: /* "\033Or" : "2" */
691 case XK_KP_3: /* "\033Os" : "3" */
692 case XK_KP_4: /* "\033Ot" : "4" */
693 case XK_KP_5: /* "\033Ou" : "5" */
694 case XK_KP_6: /* "\033Ov" : "6" */
695 case XK_KP_7: /* "\033Ow" : "7" */
696 case XK_KP_8: /* "\033Ox" : "8" */
697 case XK_KP_9: /* "\033Oy" : "9" */
698 /* allow shift to override */
699 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
700 {
701 strcpy (kbuf, "\033Oj");
702 kbuf[2] += (keysym - XK_KP_Multiply);
703 }
704 else
705 {
706 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
707 kbuf[1] = '\0';
708 }
709 break;
710
711 case XK_Find:
712 strcpy (kbuf, "\033[1~");
713 break;
714
715#ifdef XK_KP_End
716 case XK_KP_Insert:
717 /* allow shift to override */
718 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
719 {
720 strcpy (kbuf, "\033Op");
721 break;
722 }
723 /* FALLTHROUGH */
724#endif
725 case XK_Insert:
726 strcpy (kbuf, "\033[2~");
727 break;
728#ifdef DXK_Remove /* support for DEC remove like key */
729 case DXK_Remove:
730 /* FALLTHROUGH */
731#endif
732 case XK_Execute:
733 strcpy (kbuf, "\033[3~");
734 break;
735 case XK_Select:
736 strcpy (kbuf, "\033[4~");
737 break;
738#ifdef XK_KP_End
739 case XK_KP_End:
740 /* allow shift to override */
741 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
742 {
743 strcpy (kbuf, "\033Oq");
744 break;
745 }
746 /* FALLTHROUGH */
747#endif
748 case XK_End:
749 strcpy (kbuf, KS_END);
750 break;
751#ifdef XK_KP_Home
752 case XK_KP_Home:
753 /* allow shift to override */
754 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
755 {
756 strcpy (kbuf, "\033Ow");
757 break;
758 }
759 /* FALLTHROUGH */
760#endif
761 case XK_Home:
762 strcpy (kbuf, KS_HOME);
763 break;
764
765#define FKEY(n, fkey) \
766 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
767
768 case XK_F1: /* "\033[11~" */
769 case XK_F2: /* "\033[12~" */
770 case XK_F3: /* "\033[13~" */
771 case XK_F4: /* "\033[14~" */
772 case XK_F5: /* "\033[15~" */
773 FKEY (11, XK_F1);
774 break;
775 case XK_F6: /* "\033[17~" */
776 case XK_F7: /* "\033[18~" */
777 case XK_F8: /* "\033[19~" */
778 case XK_F9: /* "\033[20~" */
779 case XK_F10: /* "\033[21~" */
780 FKEY (17, XK_F6);
781 break;
782 case XK_F11: /* "\033[23~" */
783 case XK_F12: /* "\033[24~" */
784 case XK_F13: /* "\033[25~" */
785 case XK_F14: /* "\033[26~" */
786 FKEY (23, XK_F11);
787 break;
788 case XK_F15: /* "\033[28~" */
789 case XK_F16: /* "\033[29~" */
790 FKEY (28, XK_F15);
791 break;
792 case XK_Help: /* "\033[28~" */
793 FKEY (28, XK_Help);
794 break;
795 case XK_Menu: /* "\033[29~" */
796 FKEY (29, XK_Menu);
797 break;
798 case XK_F17: /* "\033[31~" */
799 case XK_F18: /* "\033[32~" */
800 case XK_F19: /* "\033[33~" */
801 case XK_F20: /* "\033[34~" */
802 case XK_F21: /* "\033[35~" */
803 case XK_F22: /* "\033[36~" */
804 case XK_F23: /* "\033[37~" */
805 case XK_F24: /* "\033[38~" */
806 case XK_F25: /* "\033[39~" */
807 case XK_F26: /* "\033[40~" */
808 case XK_F27: /* "\033[41~" */
809 case XK_F28: /* "\033[42~" */
810 case XK_F29: /* "\033[43~" */
811 case XK_F30: /* "\033[44~" */
812 case XK_F31: /* "\033[45~" */
813 case XK_F32: /* "\033[46~" */
814 case XK_F33: /* "\033[47~" */
815 case XK_F34: /* "\033[48~" */
816 case XK_F35: /* "\033[49~" */
817 FKEY (31, XK_F17);
818 break;
819#undef FKEY
820 default:
821 newlen = 0; 770 newlen = 0;
822 break;
823 } 771 }
824 772 break;
825 if (newlen)
826 len = strlen (kbuf);
827 } 773 }
774
775 if (newlen)
776 len = strlen (kbuf);
828 777
829 /* 778 /*
830 * Pass meta for all function keys, if 'meta' option set 779 * Pass meta for all function keys, if 'meta' option set
831 */ 780 */
832#ifdef META8_OPTION 781#ifdef META8_OPTION
… …
867 return; 816 return;
868 817
869 if (len <= 0) 818 if (len <= 0)
870 return; /* not mapped */ 819 return; /* not mapped */
871 820
872 if (OPTION (Opt_scrollTtyKeypress)) 821 if (option (Opt_scrollTtyKeypress))
873 if (view_start) 822 if (view_start)
874 { 823 {
875 view_start = 0; 824 view_start = 0;
876 want_refresh = 1; 825 want_refresh = 1;
877 } 826 }
… …
901 tt_write (&ch, 1); 850 tt_write (&ch, 1);
902 } 851 }
903 852
904 tt_write (kbuf, (unsigned int)len); 853 tt_write (kbuf, (unsigned int)len);
905} 854}
906/*}}} */ 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}
907 932
908#if defined (KEYSYM_RESOURCE) 933#if defined (KEYSYM_RESOURCE)
909unsigned int 934unsigned int
910rxvt_term::cmd_write (const char *str, unsigned int count) 935rxvt_term::cmd_write (const char *str, unsigned int count)
911{ 936{
… …
941void 966void
942rxvt_term::flush () 967rxvt_term::flush ()
943{ 968{
944 flush_ev.stop (); 969 flush_ev.stop ();
945 970
946#ifdef TRANSPARENT 971#ifdef HAVE_BG_PIXMAP
947 if (want_full_refresh) 972 if (bgPixmap.check_clearChanged ())
948 { 973 {
949 want_full_refresh = 0; 974// scr_clear (true); This needs to be researched further!
950 scr_clear ();
951 scr_touch (false); 975 scr_touch (false);
952 } 976 }
953#endif 977#endif
954 978
955 if (want_refresh) 979 if (want_refresh)
… …
1000 } 1024 }
1001 1025
1002 display->flush (); 1026 display->flush ();
1003} 1027}
1004 1028
1029/* checks wether a refresh is requested and starts the refresh timer */
1005void 1030void
1006rxvt_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)
1007{ 1041{
1008 make_current (); 1042 make_current ();
1009 1043
1010 display->flush ();
1011
1012 if (want_refresh && !flush_ev.active)
1013 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1014}
1015
1016void
1017rxvt_term::flush_cb (time_watcher &w)
1018{
1019 make_current ();
1020
1021 refresh_limit = 1;
1022 refresh_count = 0; 1044 refresh_count = 0;
1023 flush (); 1045 flush ();
1024} 1046}
1025 1047
1026#ifdef CURSOR_BLINK 1048#ifdef CURSOR_BLINK
1027void 1049void
1028rxvt_term::cursor_blink_cb (time_watcher &w) 1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1029{ 1051{
1030 hidden_cursor = !hidden_cursor; 1052 hidden_cursor = !hidden_cursor;
1031 want_refresh = 1; 1053 want_refresh = 1;
1032 1054 refresh_check ();
1033 w.start (w.at + CURSOR_BLINK_INTERVAL);
1034} 1055}
1035#endif 1056#endif
1036 1057
1037#ifdef TEXT_BLINK 1058#ifdef TEXT_BLINK
1038void 1059void
1039rxvt_term::text_blink_cb (time_watcher &w) 1060rxvt_term::text_blink_cb (ev::timer &w, int revents)
1040{ 1061{
1041 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1062 if (scr_refresh_rend (RS_Blink, RS_Blink))
1042 { 1063 {
1043 hidden_text = !hidden_text; 1064 hidden_text = !hidden_text;
1044 want_refresh = 1; 1065 want_refresh = 1;
1045 w.start (w.at + TEXT_BLINK_INTERVAL); 1066 refresh_check ();
1046 } 1067 }
1068 else
1069 w.stop ();
1047} 1070}
1048#endif 1071#endif
1049 1072
1050#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1051void 1074void
1052rxvt_term::cont_scroll_cb (time_watcher &w) 1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1053{ 1076{
1054 if ((scrollbar_isUp() || scrollbar_isDn()) && 1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1055 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1056 { 1079 {
1057 want_refresh = 1; 1080 want_refresh = 1;
1058 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1081 refresh_check ();
1059 } 1082 }
1083 else
1084 w.stop ();
1060} 1085}
1061#endif 1086#endif
1062 1087
1063#ifdef SELECTION_SCROLLING 1088#ifdef SELECTION_SCROLLING
1064void 1089void
1065rxvt_term::sel_scroll_cb (time_watcher &w) 1090rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1066{ 1091{
1067 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1092 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1068 { 1093 {
1069 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1094 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1070 want_refresh = 1; 1095 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1072 } 1097 }
1098 else
1099 w.stop ();
1073} 1100}
1074#endif 1101#endif
1075 1102
1076#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1077void 1104void
1078rxvt_term::slip_wheel_cb (time_watcher &w) 1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1079{ 1106{
1080 if (mouse_slip_wheel_speed == 0 1107 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1081 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1082 : scr_page (UP, mouse_slip_wheel_speed))
1083 { 1108 {
1084 if (view_start == top_row || view_start == 0)
1085 mouse_slip_wheel_speed = 0;
1086
1087 want_refresh = 1; 1109 want_refresh = 1;
1088 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)
1089 } 1114 {
1115 mouse_slip_wheel_speed = 0;
1116 w.stop ();
1117 }
1090} 1118}
1091#endif 1119#endif
1092 1120
1093#if HAVE_SCHED_YIELD 1121#if LINUX_YIELD_HACK
1094static struct event_handler 1122static struct event_handler
1095{ 1123{
1096 check_watcher cw_yield; 1124 ev::prepare yield_ev;
1097 1125
1098 void yield (check_watcher &w) 1126 void yield_cb (ev::prepare &w, int revents)
1099 { 1127 {
1100 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
1101 w.stop (); 1136 w.stop ();
1102 } 1137 }
1103 1138
1104 event_handler () 1139 event_handler ()
1105 : cw_yield (this, &event_handler::yield) 1140 : yield_ev (this, &event_handler::yield_cb)
1106 { 1141 {
1107 } 1142 }
1108} event_handler; 1143} event_handler;
1109#endif 1144#endif
1110 1145
… …
1130 cmdbuf_endp += r; 1165 cmdbuf_endp += r;
1131 return true; 1166 return true;
1132 } 1167 }
1133 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1168 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134 { 1169 {
1135#if HAVE_SCHED_YIELD 1170#if LINUX_YIELD_HACK
1136 if (display->is_local) 1171 if (display->is_local)
1137 event_handler.cw_yield.start (); 1172 event_handler.yield_ev.start ();
1138#endif 1173#endif
1139 } 1174 }
1140 else 1175 else
1141 { 1176 {
1142 pty_ev.stop (); 1177 pty_ev.stop ();
1143 1178
1144 if (!OPTION (Opt_hold)) 1179 if (!option (Opt_hold))
1145 destroy (); 1180 destroy ();
1146 } 1181 }
1147 1182
1148 return false; 1183 return false;
1149} 1184}
1150 1185
1151void 1186void
1152rxvt_term::pty_cb (io_watcher &w, short revents) 1187rxvt_term::pty_cb (ev::io &w, int revents)
1153{ 1188{
1154 make_current (); 1189 make_current ();
1155 1190
1156 if (revents & EVENT_READ) 1191 if (revents & ev::READ)
1157 // loop, but don't allow a single term to monopolize us 1192 // loop, but don't allow a single term to monopolize us
1158 while (pty_fill ()) 1193 while (pty_fill ())
1159 if (cmd_parse ()) 1194 if (cmd_parse ())
1160 break; 1195 break;
1161 1196
1162 if (revents & EVENT_WRITE) 1197 if (revents & ev::WRITE)
1163 pty_write (); 1198 pty_write ();
1199
1200 refresh_check ();
1164} 1201}
1165 1202
1166void 1203void
1167rxvt_term::pointer_unblank () 1204rxvt_term::pointer_unblank ()
1168{ 1205{
1169 XDefineCursor (display->display, vt, TermWin_cursor); 1206 XDefineCursor (dpy, vt, TermWin_cursor);
1170 recolour_cursor (); 1207 recolour_cursor ();
1171 1208
1172#ifdef POINTER_BLANK 1209#ifdef POINTER_BLANK
1173 hidden_pointer = 0; 1210 hidden_pointer = 0;
1174 1211
1175 if (OPTION (Opt_pointerBlank)) 1212 if (option (Opt_pointerBlank))
1176 pointer_ev.start (NOW + pointerBlankDelay); 1213 pointer_ev.start (pointerBlankDelay);
1177#endif 1214#endif
1178} 1215}
1179 1216
1180#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1181void 1218void
1182rxvt_term::pointer_blank () 1219rxvt_term::pointer_blank ()
1183{ 1220{
1184 if (!OPTION (Opt_pointerBlank)) 1221 if (!option (Opt_pointerBlank))
1185 return; 1222 return;
1186 1223
1187 XDefineCursor (display->display, vt, display->blank_cursor); 1224 XDefineCursor (dpy, vt, display->blank_cursor);
1188 XFlush (display->display); 1225 XFlush (dpy);
1189 1226
1190 hidden_pointer = 1; 1227 hidden_pointer = 1;
1191} 1228}
1192 1229
1193void 1230void
1194rxvt_term::pointer_cb (time_watcher &w) 1231rxvt_term::pointer_cb (ev::timer &w, int revents)
1195{ 1232{
1196 make_current (); 1233 make_current ();
1197 1234
1198 pointer_blank (); 1235 pointer_blank ();
1199} 1236}
… …
1202void 1239void
1203rxvt_term::mouse_report (XButtonEvent &ev) 1240rxvt_term::mouse_report (XButtonEvent &ev)
1204{ 1241{
1205 int button_number, key_state = 0; 1242 int button_number, key_state = 0;
1206 int x, y; 1243 int x, y;
1244 int code = 32;
1207 1245
1208 x = ev.x; 1246 x = Pixel2Col (ev.x);
1209 y = ev.y; 1247 y = Pixel2Row (ev.y);
1210 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 }
1211 1256
1212 if (MEvent.button == AnyButton) 1257 if (MEvent.button == AnyButton)
1213 button_number = 3; 1258 button_number = 3;
1214 else 1259 else
1215 { 1260 {
… …
1261 x + 1, 1306 x + 1,
1262 y + 1); 1307 y + 1);
1263#endif 1308#endif
1264 1309
1265 tt_printf ("\033[M%c%c%c", 1310 tt_printf ("\033[M%c%c%c",
1266 (32 + button_number + key_state), 1311 (code + button_number + key_state),
1267 (32 + x + 1), 1312 (32 + x + 1),
1268 (32 + y + 1)); 1313 (32 + y + 1));
1269} 1314}
1270
1271#ifdef USING_W11LIB
1272void
1273rxvt_W11_process_x_event (XEvent *ev)
1274{
1275 rxvt_t *r = rxvt_get_r ();
1276
1277 x_cb (*ev);
1278}
1279#endif
1280 1315
1281/*{{{ process an X event */ 1316/*{{{ process an X event */
1282void 1317void
1283rxvt_term::x_cb (XEvent &ev) 1318rxvt_term::x_cb (XEvent &ev)
1284{ 1319{
1285 make_current (); 1320 make_current ();
1286 1321
1287 dDisp; 1322 dLocal (Display *, dpy);
1288 1323
1289 if (ev.xany.window == vt 1324 if (ev.xany.window == vt
1290 && SHOULD_INVOKE (HOOK_X_EVENT) 1325 && SHOULD_INVOKE (HOOK_X_EVENT)
1291 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1326 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1292 return; 1327 return;
… …
1297 unsigned int unused_mask; 1332 unsigned int unused_mask;
1298 1333
1299 switch (ev.type) 1334 switch (ev.type)
1300 { 1335 {
1301 case KeyPress: 1336 case KeyPress:
1302#if ISO_14755 1337 key_press (ev.xkey);
1303 if (!(iso14755buf & ISO_14755_52))
1304#endif
1305 lookup_key (ev.xkey);
1306
1307 break; 1338 break;
1308 1339
1309 case KeyRelease: 1340 case KeyRelease:
1310 { 1341 key_release (ev.xkey);
1311#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1312 KeySym keysym;
1313
1314 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1315#endif
1316
1317#if ENABLE_FRILLS || ISO_14755
1318 // ISO 14755 support
1319 if (iso14755buf)
1320 if (iso14755buf & ISO_14755_52)
1321 {
1322# if ENABLE_OVERLAY
1323 scr_overlay_off ();
1324# endif
1325# if ISO_14755
1326 // iso14755 part 5.2 handling: release time
1327 // first: controls
1328 if ((ev.xkey.state & ControlMask)
1329 && ((keysym >= 0x40 && keysym <= 0x5f)
1330 || (keysym >= 0x61 && keysym <= 0x7f)))
1331 {
1332 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1333 commit_iso14755 ();
1334 goto skip_switch;
1335 }
1336
1337 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1338 if (i[0] == keysym)
1339 {
1340 iso14755buf = ISO_14755_51 | i[1];
1341 commit_iso14755 ();
1342 goto skip_switch;
1343 }
1344
1345 scr_bell ();
1346# endif
1347 iso14755buf = 0;
1348 break;
1349 }
1350 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1351 {
1352# if ENABLE_OVERLAY
1353 scr_overlay_off ();
1354# endif
1355 if (iso14755buf & ISO_14755_51)
1356 commit_iso14755 ();
1357#if ISO_14755
1358 else if (iso14755buf & ISO_14755_STARTED)
1359 {
1360 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1361
1362 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1363 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1364 }
1365# endif
1366 else
1367 iso14755buf = 0;
1368 }
1369#endif
1370
1371 if (ev.xany.window == vt
1372 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1373 break;
1374
1375#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1376 if (!(ev.xkey.state & ControlMask))
1377 slip_wheel_ev.stop ();
1378 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1379 mouse_slip_wheel_speed = 0;
1380#endif
1381 break; 1342 break;
1382 }
1383 1343
1384 case ButtonPress: 1344 case ButtonPress:
1385 button_press (ev.xbutton); 1345 button_press (ev.xbutton);
1386 break; 1346 break;
1387 1347
… …
1402 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1362 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1403 destroy (); 1363 destroy ();
1404 } 1364 }
1405#if ENABLE_EWMH 1365#if ENABLE_EWMH
1406 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])
1407 XSendEvent (disp, ev.xclient.window = display->root, 1367 XSendEvent (dpy, ev.xclient.window = display->root,
1408 False, SubstructureRedirectMask | SubstructureNotifyMask, 1368 False, SubstructureRedirectMask | SubstructureNotifyMask,
1409 &ev); 1369 &ev);
1410#endif 1370#endif
1411 } 1371 }
1412 } 1372 }
… …
1418 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1378 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1419 focus_out (); 1379 focus_out ();
1420 } 1380 }
1421#endif 1381#endif
1422 } 1382 }
1423 break;
1424
1425 case MappingNotify:
1426 XRefreshKeyboardMapping (&ev.xmapping);
1427 break; 1383 break;
1428 1384
1429 /* 1385 /*
1430 * XXX: this is not the _current_ arrangement 1386 * XXX: this is not the _current_ arrangement
1431 * Here's my conclusion: 1387 * Here's my conclusion:
… …
1450 break; 1406 break;
1451 } 1407 }
1452 break; 1408 break;
1453 1409
1454 case FocusIn: 1410 case FocusIn:
1411 if (ev.xfocus.detail != NotifyInferior
1412 && ev.xfocus.detail != NotifyPointer
1413 && ev.xfocus.mode != NotifyGrab)
1455 focus_in (); 1414 focus_in ();
1456 break; 1415 break;
1457 1416
1458 case FocusOut: 1417 case FocusOut:
1418 if (ev.xfocus.detail != NotifyInferior
1419 && ev.xfocus.detail != NotifyPointer
1420 && ev.xfocus.mode != NotifyGrab)
1459 focus_out (); 1421 focus_out ();
1460 break; 1422 break;
1461 1423
1462 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);*/
1463 if (ev.xconfigure.window == parent[0]) 1428 if (ev.xconfigure.window == parent[0])
1464 { 1429 {
1465 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1466 ; 1431 ;
1467 1432
1468 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1469 { 1434 {
1470 seen_resize = 1; 1435 seen_resize = 1;
1471 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1472 } 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 }
1473 1450
1474 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1475
1476#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1477 if (OPTION (Opt_transparent))
1478 check_our_parents ();
1479#endif
1480 } 1452 }
1481 break; 1453 break;
1482 1454
1483 case PropertyNotify: 1455 case PropertyNotify:
1484 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1456 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1500 case SelectionRequest: 1472 case SelectionRequest:
1501 selection_send (ev.xselectionrequest); 1473 selection_send (ev.xselectionrequest);
1502 break; 1474 break;
1503 1475
1504 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
1505 mapped = 1; 1493 mapped = 1;
1506#ifdef TEXT_BLINK 1494#ifdef TEXT_BLINK
1507 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1495 text_blink_ev.start ();
1508#endif 1496#endif
1509 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1497 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1510 break; 1498 break;
1511 1499
1512 case UnmapNotify: 1500 case UnmapNotify:
… …
1514#ifdef TEXT_BLINK 1502#ifdef TEXT_BLINK
1515 text_blink_ev.stop (); 1503 text_blink_ev.stop ();
1516#endif 1504#endif
1517 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1505 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1506 break;
1519
1520#ifdef TRANSPARENT
1521 case ReparentNotify:
1522 rootwin_cb (ev);
1523 break;
1524#endif /* TRANSPARENT */
1525 1507
1526 case GraphicsExpose: 1508 case GraphicsExpose:
1527 case Expose: 1509 case Expose:
1528 if (ev.xany.window == vt) 1510 if (ev.xany.window == vt)
1529 { 1511 {
1530 do 1512 do
1513 {
1531 scr_expose (ev.xexpose.x, ev.xexpose.y, 1514 scr_expose (ev.xexpose.x, ev.xexpose.y,
1532 ev.xexpose.width, ev.xexpose.height, False); 1515 ev.xexpose.width, ev.xexpose.height, False);
1516 }
1533 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1534 1518
1535 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1536 1520
1537 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522 {
1538 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1539 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1525 }
1540 1526
1541 want_refresh = 1; 1527 want_refresh = 1;
1542 } 1528 }
1543 else 1529 else
1544 { 1530 {
1545 XEvent unused_event; 1531 XEvent unused_event;
1546 1532
1547 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1533 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1548 ; 1534 ;
1549 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1550 ; 1536 ;
1551 1537
1552 if (isScrollbarWindow (ev.xany.window)) 1538 if (scrollBar.state && ev.xany.window == scrollBar.win)
1553 { 1539 {
1554 scrollBar.setIdle (); 1540 scrollBar.state = STATE_IDLE;
1555 scrollbar_show (0); 1541 scrollbar_show (0);
1556 } 1542 }
1557
1558#ifdef TRANSPARENT
1559 if (am_transparent && ev.xany.window == parent[0])
1560 XClearWindow (disp, ev.xany.window);
1561#endif
1562 } 1543 }
1563 break; 1544 break;
1564 1545
1565 case MotionNotify: 1546 case MotionNotify:
1566#ifdef POINTER_BLANK 1547#ifdef POINTER_BLANK
1567 if (hidden_pointer) 1548 if (hidden_pointer)
1568 pointer_unblank (); 1549 pointer_unblank ();
1569#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);
1570 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1554 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1571 break; 1555 break;
1572 1556
1573 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1574 { 1558 {
1575 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1559 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1576 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1560 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1577 ; // nop 1561 ; // nop
1578 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1562 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1579 { 1563 {
1580 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1564 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1581 ; 1565 ;
1582 1566
1583 XQueryPointer (disp, vt, 1567 XQueryPointer (dpy, vt,
1584 &unused_root, &unused_child, 1568 &unused_root, &unused_child,
1585 &unused_root_x, &unused_root_y, 1569 &unused_root_x, &unused_root_y,
1586 &ev.xbutton.x, &ev.xbutton.y, 1570 &ev.xbutton.x, &ev.xbutton.y,
1587 &ev.xbutton.state); 1571 &ev.xbutton.state);
1588#ifdef MOUSE_THRESHOLD 1572#ifdef MOUSE_THRESHOLD
… …
1608 int dist; 1592 int dist;
1609 1593
1610 /* don't clobber the current delay if we are 1594 /* don't clobber the current delay if we are
1611 * already in the middle of scrolling. 1595 * already in the middle of scrolling.
1612 */ 1596 */
1613 if (!sel_scroll_ev.active) 1597 if (!sel_scroll_ev.is_active ())
1614 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1598 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1615 1599
1616 /* save the event params so we can highlight 1600 /* save the event params so we can highlight
1617 * the selection in the pending-scroll loop 1601 * the selection in the pending-scroll loop
1618 */ 1602 */
1619 selection_save_x = ev.xbutton.x; 1603 selection_save_x = ev.xbutton.x;
… …
1641 else 1625 else
1642 { 1626 {
1643 /* we are within the text window, so we 1627 /* we are within the text window, so we
1644 * shouldn't be scrolling 1628 * shouldn't be scrolling
1645 */ 1629 */
1646 if (sel_scroll_ev.active)
1647 sel_scroll_ev.stop(); 1630 sel_scroll_ev.stop();
1648 } 1631 }
1649#endif 1632#endif
1650#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
1651 } 1634 }
1652#endif 1635#endif
1653 } 1636 }
1654 } 1637 }
1655 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1638 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1656 { 1639 {
1657 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1640 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1658 MotionNotify, &ev)) 1641 MotionNotify, &ev))
1659 ; 1642 ;
1660 1643
1661 XQueryPointer (disp, scrollBar.win, 1644 XQueryPointer (dpy, scrollBar.win,
1662 &unused_root, &unused_child, 1645 &unused_root, &unused_child,
1663 &unused_root_x, &unused_root_y, 1646 &unused_root_x, &unused_root_y,
1664 &ev.xbutton.x, &ev.xbutton.y, 1647 &ev.xbutton.x, &ev.xbutton.y,
1665 &unused_mask); 1648 &unused_mask);
1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1667 scrollbar_size ()); 1650 scrollbar_size ());
1668 want_refresh = 1; 1651 want_refresh = 1;
1669 refresh_limit = 0;
1670 scrollbar_show (1); 1652 scrollbar_show (1);
1671 } 1653 }
1672 break; 1654 break;
1673 } 1655 }
1674 1656
1675skip_switch: ;
1676
1677#if defined(CURSOR_BLINK) 1657#if defined(CURSOR_BLINK)
1678 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1658 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1679 { 1659 {
1680 if (hidden_cursor) 1660 if (hidden_cursor)
1681 { 1661 {
1682 hidden_cursor = 0; 1662 hidden_cursor = 0;
1683 want_refresh = 1; 1663 want_refresh = 1;
1684 } 1664 }
1685 1665
1686 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1666 cursor_blink_ev.again ();
1687 } 1667 }
1688#endif 1668#endif
1689 1669
1690#if defined(POINTER_BLANK) 1670#if defined(POINTER_BLANK)
1691 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1671 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1692 { 1672 {
1693 if (ev.type == MotionNotify 1673 if (ev.type == MotionNotify
1694 || ev.type == ButtonPress 1674 || ev.type == ButtonPress
1695 || ev.type == ButtonRelease) 1675 || ev.type == ButtonRelease)
1696 if (hidden_pointer) 1676 if (hidden_pointer)
… …
1698 1678
1699 if (ev.type == KeyPress && hidden_pointer == 0) 1679 if (ev.type == KeyPress && hidden_pointer == 0)
1700 pointer_blank (); 1680 pointer_blank ();
1701 } 1681 }
1702#endif 1682#endif
1683
1684 refresh_check ();
1703} 1685}
1704 1686
1705void 1687void
1706rxvt_term::focus_in () 1688rxvt_term::focus_in ()
1707{ 1689{
1708 if (!focus) 1690 if (!focus)
1709 { 1691 {
1710 focus = 1; 1692 focus = 1;
1711 want_refresh = 1; 1693 want_refresh = 1;
1712 1694
1713 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1695 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1714 1696
1715#if USE_XIM 1697#if USE_XIM
1716 if (Input_Context != NULL) 1698 if (Input_Context != NULL)
1717 { 1699 {
1718 IMSetStatusPosition (); 1700 IMSetPosition ();
1719 XSetICFocus (Input_Context); 1701 XSetICFocus (Input_Context);
1720 } 1702 }
1721#endif 1703#endif
1722#if CURSOR_BLINK 1704#if CURSOR_BLINK
1723 if (OPTION (Opt_cursorBlink)) 1705 if (option (Opt_cursorBlink))
1724 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1706 cursor_blink_ev.again ();
1725#endif 1707#endif
1726#if OFF_FOCUS_FADING 1708#if OFF_FOCUS_FADING
1727 if (rs[Rs_fade]) 1709 if (rs[Rs_fade])
1728 { 1710 {
1729 pix_colors = pix_colors_focused; 1711 pix_colors = pix_colors_focused;
1730 scr_recolour (); 1712 scr_recolour ();
1731 } 1713 }
1732#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
1733 } 1725 }
1734} 1726}
1735 1727
1736void 1728void
1737rxvt_term::focus_out () 1729rxvt_term::focus_out ()
… …
1745 1737
1746#if ENABLE_FRILLS || ISO_14755 1738#if ENABLE_FRILLS || ISO_14755
1747 if (iso14755buf) 1739 if (iso14755buf)
1748 { 1740 {
1749 iso14755buf = 0; 1741 iso14755buf = 0;
1750# if ENABLE_OVERLAY 1742# if ISO_14755
1751 scr_overlay_off (); 1743 scr_overlay_off ();
1752# endif 1744# endif
1753 } 1745 }
1754#endif 1746#endif
1755#if USE_XIM 1747#if USE_XIM
1756 if (Input_Context != NULL) 1748 if (Input_Context != NULL)
1757 XUnsetICFocus (Input_Context); 1749 XUnsetICFocus (Input_Context);
1758#endif 1750#endif
1759#if CURSOR_BLINK 1751#if CURSOR_BLINK
1760 if (OPTION (Opt_cursorBlink)) 1752 if (option (Opt_cursorBlink))
1761 cursor_blink_ev.stop (); 1753 cursor_blink_ev.stop ();
1754
1762 hidden_cursor = 0; 1755 hidden_cursor = 0;
1763#endif 1756#endif
1764#if OFF_FOCUS_FADING 1757#if OFF_FOCUS_FADING
1765 if (rs[Rs_fade]) 1758 if (rs[Rs_fade])
1766 { 1759 {
… …
1769 } 1762 }
1770#endif 1763#endif
1771 } 1764 }
1772} 1765}
1773 1766
1774#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
1775void 1781void
1776rxvt_term::rootwin_cb (XEvent &ev) 1782rxvt_term::rootwin_cb (XEvent &ev)
1777{ 1783{
1778 make_current (); 1784 make_current ();
1779 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
1780 switch (ev.type) 1791 switch (ev.type)
1781 { 1792 {
1782 case PropertyNotify: 1793 case PropertyNotify:
1783 /* 1794 /*
1784 * 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,
1785 * 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.
1786 */ 1797 */
1787 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1798 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1788 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1799 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1789 return; 1800 {
1801 bgPixmap.set_root_pixmap ();
1802 update_background ();
1803 }
1790 1804
1791 /* FALLTHROUGH */
1792 case ReparentNotify:
1793 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1794 want_refresh = want_full_refresh = 1;
1795 break; 1805 break;
1796 } 1806 }
1807# endif
1808
1809 refresh_check ();
1797} 1810}
1798#endif 1811#endif
1799 1812
1800void 1813void
1801rxvt_term::button_press (XButtonEvent &ev) 1814rxvt_term::button_press (XButtonEvent &ev)
… …
1856 mouse_report (ev); 1869 mouse_report (ev);
1857 } 1870 }
1858#else 1871#else
1859 MEvent.button = ev.button; 1872 MEvent.button = ev.button;
1860 mouse_report (ev); 1873 mouse_report (ev);
1861#endif /* MOUSE_REPORT_DOUBLECLICK */ 1874#endif /* MOUSE_REPORT_DOUBLECLICK */
1862 1875
1863 } 1876 }
1864 else 1877 else
1865 { 1878 {
1866 if (ev.button != MEvent.button) 1879 if (ev.button != MEvent.button)
… …
1914 } 1927 }
1915 1928
1916 /* 1929 /*
1917 * Scrollbar window processing of button press 1930 * Scrollbar window processing of button press
1918 */ 1931 */
1919 if (isScrollbarWindow (ev.window)) 1932 if (scrollBar.state && ev.window == scrollBar.win)
1920 { 1933 {
1921 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;
1922 /* 1942 /*
1923 * Rxvt-style scrollbar: 1943 * Rxvt-style scrollbar:
1924 * move up if mouse is above slider 1944 * move up if mouse is above slider
1925 * move dn if mouse is below slider 1945 * move dn if mouse is below slider
1926 * 1946 *
… …
1935 /* 1955 /*
1936 * Mouse report disabled scrollbar: 1956 * Mouse report disabled scrollbar:
1937 * arrow buttons - send up/down 1957 * arrow buttons - send up/down
1938 * click on scrollbar - send pageup/down 1958 * click on scrollbar - send pageup/down
1939 */ 1959 */
1940 if ((scrollBar.style == R_SB_NEXT 1960 if (direction == UP)
1941 && scrollbarnext_upButton (ev.y))
1942 || (scrollBar.style == R_SB_RXVT
1943 && scrollbarrxvt_upButton (ev.y)))
1944 tt_printf ("\033[A"); 1961 tt_printf ("\033[A");
1945 else if ((scrollBar.style == R_SB_NEXT 1962 else if (direction == DN)
1946 && scrollbarnext_dnButton (ev.y))
1947 || (scrollBar.style == R_SB_RXVT
1948 && scrollbarrxvt_dnButton (ev.y)))
1949 tt_printf ("\033[B"); 1963 tt_printf ("\033[B");
1950 else 1964 else
1951 switch (ev.button) 1965 switch (ev.button)
1952 { 1966 {
1953 case Button2: 1967 case Button2:
… …
1960 tt_printf ("\033[5~"); 1974 tt_printf ("\033[5~");
1961 break; 1975 break;
1962 } 1976 }
1963 } 1977 }
1964 else 1978 else
1965#endif /* NO_SCROLLBAR_REPORT */ 1979#endif /* NO_SCROLLBAR_REPORT */
1966
1967 {
1968 char upordown = 0;
1969
1970 if (scrollBar.style == R_SB_NEXT)
1971 { 1980 {
1972 if (scrollbarnext_upButton (ev.y)) 1981 if (direction != NO_DIR)
1973 upordown = -1; /* up */
1974 else if (scrollbarnext_dnButton (ev.y))
1975 upordown = 1; /* down */
1976 }
1977 else if (scrollBar.style == R_SB_RXVT)
1978 {
1979 if (scrollbarrxvt_upButton (ev.y))
1980 upordown = -1; /* up */
1981 else if (scrollbarrxvt_dnButton (ev.y))
1982 upordown = 1; /* down */
1983 }
1984 if (upordown)
1985 { 1982 {
1986#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1983#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1984 if (!cont_scroll_ev.is_active ())
1987 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1985 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1988#endif 1986#endif
1989 if (scr_page (upordown < 0 ? UP : DN, 1)) 1987 if (scr_page (direction, 1))
1990 { 1988 {
1991 if (upordown < 0) 1989 if (direction == UP)
1992 scrollBar.setUp (); 1990 scrollBar.state = STATE_UP;
1993 else 1991 else
1994 scrollBar.setDn (); 1992 scrollBar.state = STATE_DOWN;
1995 } 1993 }
1996 } 1994 }
1997 else 1995 else
1998 switch (ev.button) 1996 switch (ev.button)
1999 { 1997 {
2000 case Button2: 1998 case Button2:
2001 switch (scrollbar_align) 1999 switch (scrollBar.align)
2002 { 2000 {
2003 case R_SB_ALIGN_TOP: 2001 case R_SB_ALIGN_TOP:
2004 csrO = 0; 2002 csrO = 0;
2005 break; 2003 break;
2006 case R_SB_ALIGN_CENTRE: 2004 case R_SB_ALIGN_CENTRE:
… …
2014 if (scrollBar.style == R_SB_XTERM 2012 if (scrollBar.style == R_SB_XTERM
2015 || scrollbar_above_slider (ev.y) 2013 || scrollbar_above_slider (ev.y)
2016 || scrollbar_below_slider (ev.y)) 2014 || scrollbar_below_slider (ev.y))
2017 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2018 2016
2019 scrollBar.setMotion (); 2017 scrollBar.state = STATE_MOTION;
2020 break; 2018 break;
2021 2019
2022 case Button1: 2020 case Button1:
2023 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2021 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2024 csrO = ev.y - scrollBar.top; 2022 csrO = ev.y - scrollBar.top;
2025 /* FALLTHROUGH */ 2023 /* FALLTHROUGH */
2026 2024
2027 case Button3: 2025 case Button3:
2028 if (scrollBar.style != R_SB_XTERM) 2026 if (scrollBar.style != R_SB_XTERM)
… …
2038 scr_page (DN, nrow - 1); 2036 scr_page (DN, nrow - 1);
2039# else 2037# else
2040 scr_page (DN, nrow / 4); 2038 scr_page (DN, nrow / 4);
2041# endif 2039# endif
2042 else 2040 else
2043 scrollBar.setMotion (); 2041 scrollBar.state = STATE_MOTION;
2044 } 2042 }
2045 else 2043 else
2046 { 2044 {
2047 scr_page ((ev.button == Button1 ? DN : UP), 2045 scr_page ((ev.button == Button1 ? DN : UP),
2048 (nrow 2046 (nrow
… …
2065 2063
2066 csrO = 0; /* reset csr Offset */ 2064 csrO = 0; /* reset csr Offset */
2067 if (!bypass_keystate) 2065 if (!bypass_keystate)
2068 reportmode = !! (priv_modes & PrivMode_mouse_report); 2066 reportmode = !! (priv_modes & PrivMode_mouse_report);
2069 2067
2070 if (scrollbar_isUpDn ()) 2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2071 { 2069 {
2072 scrollBar.setIdle (); 2070 scrollBar.state = STATE_IDLE;
2073 scrollbar_show (0); 2071 scrollbar_show (0);
2074 } 2072 }
2075 2073
2076#ifdef SELECTION_SCROLLING 2074#ifdef SELECTION_SCROLLING
2077 if (sel_scroll_ev.active)
2078 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
2079#endif 2076#endif
2080 2077
2081 if (ev.window == vt) 2078 if (ev.window == vt)
2082 { 2079 {
2083 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2080 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2107 mouse_report (ev); 2104 mouse_report (ev);
2108 } 2105 }
2109#else /* MOUSE_REPORT_DOUBLECLICK */ 2106#else /* MOUSE_REPORT_DOUBLECLICK */
2110 MEvent.button = AnyButton; 2107 MEvent.button = AnyButton;
2111 mouse_report (ev); 2108 mouse_report (ev);
2112#endif /* MOUSE_REPORT_DOUBLECLICK */ 2109#endif /* MOUSE_REPORT_DOUBLECLICK */
2113 return; 2110 return;
2114 } 2111 }
2115 2112
2116 /* 2113 /*
2117 * dumb hack to compensate for the failure of click-and-drag 2114 * dumb hack to compensate for the failure of click-and-drag
… …
2129 selection_make (ev.time); 2126 selection_make (ev.time);
2130 break; 2127 break;
2131 2128
2132 case Button2: 2129 case Button2:
2133 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2134 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2135 break; 2132 break;
2136 2133
2137#ifdef MOUSE_WHEEL 2134#ifdef MOUSE_WHEEL
2138 case Button4: 2135 case Button4:
2139 case Button5: 2136 case Button5:
… …
2143 2140
2144 v = ev.button == Button4 ? UP : DN; 2141 v = ev.button == Button4 ? UP : DN;
2145 2142
2146 if (ev.state & ShiftMask) 2143 if (ev.state & ShiftMask)
2147 i = 1; 2144 i = 1;
2148 else if (OPTION (Opt_mouseWheelScrollPage)) 2145 else if (option (Opt_mouseWheelScrollPage))
2149 i = nrow - 1; 2146 i = nrow - 1;
2150 else 2147 else
2151 i = 5; 2148 i = 5;
2152 2149
2153# ifdef MOUSE_SLIP_WHEELING 2150# ifdef MOUSE_SLIP_WHEELING
… …
2155 { 2152 {
2156 mouse_slip_wheel_speed += v ? -1 : 1; 2153 mouse_slip_wheel_speed += v ? -1 : 1;
2157 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2154 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2158 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2155 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2159 2156
2160 if (slip_wheel_ev.at < NOW) 2157 if (!slip_wheel_ev.is_active ())
2161 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2158 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2162
2163 slip_wheel_ev.start ();
2164 } 2159 }
2165 else 2160 else
2161# endif
2166 { 2162 {
2167# endif
2168 scr_page (v, i); 2163 scr_page (v, i);
2169 scrollbar_show (1); 2164 scrollbar_show (1);
2170# ifdef MOUSE_SLIP_WHEELING
2171 } 2165 }
2172# endif
2173 } 2166 }
2174 break; 2167 break;
2175#endif 2168#endif
2176 } 2169 }
2177 } 2170 }
2178} 2171}
2179
2180#ifdef TRANSPARENT
2181#if TINTING
2182/* taken from aterm-0.4.2 */
2183
2184typedef uint32_t RUINT32T;
2185
2186void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2187{
2188 int sh_r, sh_g, sh_b;
2189 RUINT32T mask_r, mask_g, mask_b;
2190 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2191 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2192 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2193 int i;
2194
2195 Visual *visual = display->visual;
2196
2197 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2198
2199 /* for convenience */
2200 mask_r = visual->red_mask;
2201 mask_g = visual->green_mask;
2202 mask_b = visual->blue_mask;
2203
2204 /* boring lookup table pre-initialization */
2205 switch (srcImage->bits_per_pixel) {
2206 case 15:
2207 if ((mask_r != 0x7c00) ||
2208 (mask_g != 0x03e0) ||
2209 (mask_b != 0x001f))
2210 return;
2211 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2212 lookup_r = lookup;
2213 lookup_g = lookup+32;
2214 lookup_b = lookup+32+32;
2215 sh_r = 10;
2216 sh_g = 5;
2217 sh_b = 0;
2218 break;
2219 case 16:
2220 if ((mask_r != 0xf800) ||
2221 (mask_g != 0x07e0) ||
2222 (mask_b != 0x001f))
2223 return;
2224 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2225 lookup_r = lookup;
2226 lookup_g = lookup+32;
2227 lookup_b = lookup+32+64;
2228 sh_r = 11;
2229 sh_g = 5;
2230 sh_b = 0;
2231 break;
2232 case 24:
2233 if ((mask_r != 0xff0000) ||
2234 (mask_g != 0x00ff00) ||
2235 (mask_b != 0x0000ff))
2236 return;
2237 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2238 lookup_r = lookup;
2239 lookup_g = lookup+256;
2240 lookup_b = lookup+256+256;
2241 sh_r = 16;
2242 sh_g = 8;
2243 sh_b = 0;
2244 break;
2245 case 32:
2246 if ((mask_r != 0xff0000) ||
2247 (mask_g != 0x00ff00) ||
2248 (mask_b != 0x0000ff))
2249 return;
2250 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2251 lookup_r = lookup;
2252 lookup_g = lookup+256;
2253 lookup_b = lookup+256+256;
2254 sh_r = 16;
2255 sh_g = 8;
2256 sh_b = 0;
2257 break;
2258 default:
2259 return; /* we do not support this color depth */
2260 }
2261
2262 /* prepare limits for color transformation (each channel is handled separately) */
2263 if (shade < 0) {
2264 shade = -shade;
2265 if (shade < 0) shade = 0;
2266 if (shade > 100) shade = 100;
2267
2268 lower_lim_r = 65535-rm;
2269 lower_lim_g = 65535-gm;
2270 lower_lim_b = 65535-bm;
2271
2272 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2273 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2274 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2275
2276 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2277 } else {
2278 if (shade < 0) shade = 0;
2279 if (shade > 100) shade = 100;
2280
2281 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2282
2283 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2284 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2285 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2286 }
2287
2288 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2289 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2290 {
2291 unsigned int tmp;
2292
2293 tmp = lower_lim_r;
2294 lower_lim_r = lower_lim_b;
2295 lower_lim_b = tmp;
2296
2297 tmp = upper_lim_r;
2298 upper_lim_r = upper_lim_b;
2299 upper_lim_b = tmp;
2300 }
2301
2302 /* fill our lookup tables */
2303 for (i = 0; i <= mask_r>>sh_r; i++)
2304 {
2305 RUINT32T tmp;
2306 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2307 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2308 lookup_r[i] = (tmp/65535)<<sh_r;
2309 }
2310 for (i = 0; i <= mask_g>>sh_g; i++)
2311 {
2312 RUINT32T tmp;
2313 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2314 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2315 lookup_g[i] = (tmp/65535)<<sh_g;
2316 }
2317 for (i = 0; i <= mask_b>>sh_b; i++)
2318 {
2319 RUINT32T tmp;
2320 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2321 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2322 lookup_b[i] = (tmp/65535)<<sh_b;
2323 }
2324
2325 /* apply table to input image (replacing colors by newly calculated ones) */
2326 switch (srcImage->bits_per_pixel)
2327 {
2328 case 15:
2329 {
2330 unsigned short *p1, *pf, *p, *pl;
2331 p1 = (unsigned short *) srcImage->data;
2332 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2333 while (p1 < pf)
2334 {
2335 p = p1;
2336 pl = p1 + srcImage->width;
2337 for (; p < pl; p++)
2338 {
2339 *p = lookup_r[(*p & 0x7c00)>>10] |
2340 lookup_g[(*p & 0x03e0)>> 5] |
2341 lookup_b[(*p & 0x001f)];
2342 }
2343 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2344 }
2345 break;
2346 }
2347 case 16:
2348 {
2349 unsigned short *p1, *pf, *p, *pl;
2350 p1 = (unsigned short *) srcImage->data;
2351 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2352 while (p1 < pf)
2353 {
2354 p = p1;
2355 pl = p1 + srcImage->width;
2356 for (; p < pl; p++)
2357 {
2358 *p = lookup_r[(*p & 0xf800)>>11] |
2359 lookup_g[(*p & 0x07e0)>> 5] |
2360 lookup_b[(*p & 0x001f)];
2361 }
2362 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2363 }
2364 break;
2365 }
2366 case 24:
2367 {
2368 unsigned char *p1, *pf, *p, *pl;
2369 p1 = (unsigned char *) srcImage->data;
2370 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2371 while (p1 < pf)
2372 {
2373 p = p1;
2374 pl = p1 + srcImage->width * 3;
2375 for (; p < pl; p += 3)
2376 {
2377 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2378 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2379 p[2] = lookup_r[(p[2] & 0x0000ff)];
2380 }
2381 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2382 }
2383 break;
2384 }
2385 case 32:
2386 {
2387 RUINT32T *p1, *pf, *p, *pl;
2388 p1 = (RUINT32T *) srcImage->data;
2389 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2390
2391 while (p1 < pf)
2392 {
2393 p = p1;
2394 pl = p1 + srcImage->width;
2395 for (; p < pl; p++)
2396 {
2397 *p = lookup_r[(*p & 0xff0000)>>16] |
2398 lookup_g[(*p & 0x00ff00)>> 8] |
2399 lookup_b[(*p & 0x0000ff)] |
2400 (*p & ~0xffffff);
2401 }
2402 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2403 }
2404 break;
2405 }
2406 }
2407
2408 free (lookup);
2409}
2410#endif
2411
2412/*
2413 * Check our parents are still who we think they are.
2414 * Do transparency updates if required
2415 */
2416int
2417rxvt_term::check_our_parents ()
2418{
2419 int i, pchanged, aformat, have_pixmap, rootdepth;
2420 unsigned long nitems, bytes_after;
2421 Atom atype;
2422 unsigned char *prop = NULL;
2423 Window root, oldp, *list;
2424 Pixmap rootpixmap = None;
2425 XWindowAttributes wattr, wrootattr;
2426 dDisp;
2427
2428 pchanged = 0;
2429
2430 if (!OPTION (Opt_transparent))
2431 return pchanged; /* Don't try any more */
2432
2433 XGetWindowAttributes (disp, display->root, &wrootattr);
2434 rootdepth = wrootattr.depth;
2435
2436 XGetWindowAttributes (disp, parent[0], &wattr);
2437
2438 if (rootdepth != wattr.depth)
2439 {
2440 if (am_transparent)
2441 {
2442 pchanged = 1;
2443 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2444 am_transparent = am_pixmap_trans = 0;
2445 }
2446
2447 return pchanged; /* Don't try any more */
2448 }
2449
2450 /* Get all X ops out of the queue so that our information is up-to-date. */
2451 XSync (disp, False);
2452
2453 /*
2454 * Make the frame window set by the window manager have
2455 * the root background. Some window managers put multiple nested frame
2456 * windows for each client, so we have to take care about that.
2457 */
2458 i = (xa[XA_XROOTPMAP_ID]
2459 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2460 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2461 &nitems, &bytes_after, &prop) == Success);
2462
2463 if (!i || prop == NULL)
2464 i = (xa[XA_ESETROOT_PMAP_ID]
2465 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2466 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2467 &nitems, &bytes_after, &prop) == Success);
2468
2469 if (!i || prop == NULL
2470#if TINTING
2471 || !rs[Rs_color + Color_tint]
2472#endif
2473 )
2474 have_pixmap = 0;
2475 else
2476 {
2477 have_pixmap = 1;
2478 rootpixmap = *(Pixmap *)prop;
2479 XFree (prop);
2480 }
2481
2482 if (have_pixmap)
2483 {
2484 /*
2485 * Copy display->root pixmap transparency
2486 */
2487 int sx, sy, nx, ny;
2488 unsigned int nw, nh;
2489 Window cr;
2490 XImage *image;
2491 GC gc;
2492 XGCValues gcvalue;
2493
2494 XTranslateCoordinates (disp, parent[0], display->root,
2495 0, 0, &sx, &sy, &cr);
2496 nw = (unsigned int)szHint.width;
2497 nh = (unsigned int)szHint.height;
2498 nx = ny = 0;
2499
2500 if (sx < 0)
2501 {
2502 nw += sx;
2503 nx = -sx;
2504 sx = 0;
2505 }
2506
2507 if (sy < 0)
2508 {
2509 nh += sy;
2510 ny = -sy;
2511 sy = 0;
2512 }
2513
2514 min_it (nw, (unsigned int) (wrootattr.width - sx));
2515 min_it (nh, (unsigned int) (wrootattr.height - sy));
2516
2517 XSync (disp, False);
2518 allowedxerror = -1;
2519 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2520
2521 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2522 /* XXX: may need a delay here? */
2523 allowedxerror = 0;
2524
2525 if (image == NULL)
2526 {
2527 if (am_transparent && am_pixmap_trans)
2528 {
2529 pchanged = 1;
2530 if (pixmap != None)
2531 {
2532 XFreePixmap (disp, pixmap);
2533 pixmap = None;
2534 }
2535 }
2536
2537 am_pixmap_trans = 0;
2538 }
2539 else
2540 {
2541 if (pixmap != None)
2542 XFreePixmap (disp, pixmap);
2543
2544#if TINTING
2545 if (ISSET_PIXCOLOR (Color_tint))
2546 {
2547 unsigned short rm, gm, bm;
2548 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2549
2550 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2551
2552 ShadeXImage (display, image, shade, rm, gm, bm);
2553 }
2554#endif
2555
2556 pixmap = XCreatePixmap (disp, vt,
2557 szHint.width, szHint.height, image->depth);
2558 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2559 XPutImage (disp, pixmap, gc, image, 0, 0,
2560 nx, ny, image->width, image->height);
2561 XFreeGC (disp, gc);
2562 XDestroyImage (image);
2563 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2564 XClearWindow (disp, parent[0]);
2565
2566 if (!am_transparent || !am_pixmap_trans)
2567 pchanged = 1;
2568
2569 am_transparent = am_pixmap_trans = 1;
2570 }
2571 }
2572
2573 if (am_pixmap_trans)
2574 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2575 else
2576 {
2577 unsigned int n;
2578 /*
2579 * InheritPixmap transparency
2580 */
2581 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 {
2583 oldp = parent[i];
2584 XQueryTree (disp, parent[i - 1], &root,
2585 &parent[i], &list, &n);
2586 XFree (list);
2587
2588 if (parent[i] == display->root)
2589 {
2590 if (oldp != None)
2591 pchanged = 1;
2592
2593 break;
2594 }
2595
2596 if (oldp != parent[i])
2597 pchanged = 1;
2598 }
2599
2600 n = 0;
2601
2602 if (pchanged)
2603 {
2604 for (; n < (unsigned int)i; n++)
2605 {
2606 XGetWindowAttributes (disp, parent[n], &wattr);
2607 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2608 {
2609 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2610 break;
2611 }
2612 }
2613 }
2614
2615 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2616 {
2617 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2618 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2619 am_transparent = 0;
2620 /* XXX: also turn off Opt_transparent? */
2621 }
2622 else
2623 {
2624 for (n = 0; n < (unsigned int)i; n++)
2625 {
2626 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2627 XClearWindow (disp, parent[n]);
2628 }
2629
2630 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2631 am_transparent = 1;
2632 }
2633
2634 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2635 parent[i] = None;
2636 }
2637
2638 if (scrollBar.win)
2639 {
2640 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2641 scrollBar.setIdle ();
2642 scrollbar_show (0);
2643 }
2644
2645 if (am_transparent)
2646 {
2647 want_refresh = want_full_refresh = 1;
2648 if (am_pixmap_trans)
2649 flush ();
2650 }
2651
2652 return pchanged;
2653}
2654#endif
2655 2172
2656/*}}} */ 2173/*}}} */
2657 2174
2658bool 2175bool
2659rxvt_term::cmd_parse () 2176rxvt_term::cmd_parse ()
… …
2708 if (ch == C0_LF) 2225 if (ch == C0_LF)
2709 nlines++; 2226 nlines++;
2710 2227
2711 refresh_count++; 2228 refresh_count++;
2712 2229
2713 if (!OPTION (Opt_jumpScroll) 2230 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2714 || (refresh_count >= refresh_limit * (nrow - 1)))
2715 { 2231 {
2716 refreshnow = true;
2717 refresh_count = 0; 2232 refresh_count = 0;
2233
2234 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2235 {
2236 refreshnow = true;
2718 ch = NOCHAR; 2237 ch = NOCHAR;
2719 break; 2238 break;
2239 }
2720 } 2240 }
2721 2241
2722 // scr_add_lines only works for nlines <= nrow - 1. 2242 // scr_add_lines only works for nlines <= nrow - 1.
2723 if (nlines >= nrow - 1) 2243 if (nlines >= nrow - 1)
2724 { 2244 {
… …
2752 && 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))))
2753 scr_add_lines (buf, str - buf, nlines); 2273 scr_add_lines (buf, str - buf, nlines);
2754 2274
2755 /* 2275 /*
2756 * 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
2757 * 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.
2758 * the number of pages between refreshes is refresh_limit, which 2278 * if skipScroll is enabled.
2759 * is incremented here because we must be doing flat-out scrolling.
2760 */ 2279 */
2761 if (refreshnow) 2280 if (refreshnow)
2762 { 2281 {
2763 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2764 refresh_limit++;
2765 else
2766 {
2767 flag = true; 2282 flag = true;
2768 scr_refresh (); 2283 scr_refresh ();
2769 want_refresh = 1; 2284 want_refresh = 1;
2770 }
2771 } 2285 }
2772 2286
2773 } 2287 }
2774 else 2288 else
2775 { 2289 {
… …
2924 { 2438 {
2925 if ((buf[len++] = cmd_getc ()) == 'i') 2439 if ((buf[len++] = cmd_getc ()) == 'i')
2926 break; /* done = 1 */ 2440 break; /* done = 1 */
2927 } 2441 }
2928 } 2442 }
2929 2443
2930 for (i = 0; i < len; i++) 2444 for (i = 0; i < len; i++)
2931 if (putc (buf[i], fd) == EOF) 2445 if (putc (buf[i], fd) == EOF)
2932 { 2446 {
2933 done = 1; 2447 done = 1;
2934 break; 2448 break;
… …
2936 } 2450 }
2937 } 2451 }
2938 2452
2939 pclose_printer (fd); 2453 pclose_printer (fd);
2940} 2454}
2941#endif /* PRINTPIPE */ 2455#endif /* PRINTPIPE */
2942/*}}} */ 2456/*}}} */
2943 2457
2944/* *INDENT-OFF* */ 2458/* *INDENT-OFF* */
2945enum { 2459enum {
2946 C1_40 = 0x40, 2460 C1_40 = 0x40,
… …
2996 process_dcs_seq (); 2510 process_dcs_seq ();
2997 break; 2511 break;
2998 case 0x9b: /* CSI */ 2512 case 0x9b: /* CSI */
2999 process_csi_seq (); 2513 process_csi_seq ();
3000 break; 2514 break;
3001 case 0x9d: /* CSI */ 2515 case 0x9d: /* OSC */
3002 process_osc_seq (); 2516 process_osc_seq ();
3003 break; 2517 break;
3004#endif 2518#endif
3005 } 2519 }
3006} 2520}
… …
3050 break; 2564 break;
3051 case 'Z': /* identify the terminal type */ 2565 case 'Z': /* identify the terminal type */
3052 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2566 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3053 break; 2567 break;
3054 case '<': /* turn off VT52 mode */ 2568 case '<': /* turn off VT52 mode */
3055 PrivMode (0, PrivMode_vt52); 2569 set_privmode (PrivMode_vt52, 0);
3056 break; 2570 break;
3057 case 'F': /* use special graphics character set */ 2571 case 'F': /* use special graphics character set */
3058 case 'G': /* use regular character set */ 2572 case 'G': /* use regular character set */
3059 /* unimplemented */ 2573 /* unimplemented */
3060 break; 2574 break;
… …
3096 scr_charset_set (2, (unsigned int)cmd_getc ()); 2610 scr_charset_set (2, (unsigned int)cmd_getc ());
3097 break; 2611 break;
3098 case '+': 2612 case '+':
3099 scr_charset_set (3, (unsigned int)cmd_getc ()); 2613 scr_charset_set (3, (unsigned int)cmd_getc ());
3100 break; 2614 break;
3101#if ENABLE_FRILLS 2615#if !ENABLE_MINIMAL
3102 case '6': 2616 case '6':
3103 scr_backindex (); 2617 scr_backindex ();
3104 break; 2618 break;
3105#endif 2619#endif
3106 case '7': 2620 case '7':
3107 scr_cursor (SAVE); 2621 scr_cursor (SAVE);
3108 break; 2622 break;
3109 case '8': 2623 case '8':
3110 scr_cursor (RESTORE); 2624 scr_cursor (RESTORE);
3111 break; 2625 break;
3112#if ENABLE_FRILLS 2626#if !ENABLE_MINIMAL
3113 case '9': 2627 case '9':
3114 scr_forwardindex (); 2628 scr_forwardindex ();
3115 break; 2629 break;
3116#endif 2630#endif
3117 case '=': 2631 case '=':
3118 case '>': 2632 case '>':
3119 PrivMode ((ch == '='), PrivMode_aplKP); 2633 set_privmode (PrivMode_aplKP, ch == '=');
3120 break; 2634 break;
3121 2635
3122 case C1_40: 2636 case C1_40:
3123 cmd_getc (); 2637 cmd_getc ();
3124 break; 2638 break;
… …
3232rxvt_term::process_csi_seq () 2746rxvt_term::process_csi_seq ()
3233{ 2747{
3234 unicode_t ch, priv, i; 2748 unicode_t ch, priv, i;
3235 unsigned int nargs, p; 2749 unsigned int nargs, p;
3236 int n, ndef; 2750 int n, ndef;
3237 int arg[ESC_ARGS]; 2751 int arg[ESC_ARGS] = { };
3238 2752
3239 for (nargs = ESC_ARGS; nargs > 0;) 2753 nargs = 0;
3240 arg[--nargs] = 0;
3241 2754
3242 priv = 0; 2755 priv = 0;
3243 ch = cmd_getc (); 2756 ch = cmd_getc ();
3244 if (ch >= '<' && ch <= '?') 2757 if (ch >= '<' && ch <= '?')
2758 {
3245 { /* '<' '=' '>' '?' */ 2759 /* '<' '=' '>' '?' */
3246 priv = ch; 2760 priv = ch;
3247 ch = cmd_getc (); 2761 ch = cmd_getc ();
3248 } 2762 }
3249 2763
3250 /* read any numerical arguments */ 2764 /* read any numerical arguments */
… …
3289 switch (priv) 2803 switch (priv)
3290 { 2804 {
3291 case '>': 2805 case '>':
3292 if (ch == CSI_DA) /* secondary device attributes */ 2806 if (ch == CSI_DA) /* secondary device attributes */
3293 { 2807 {
3294 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2808 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3295 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions. 2809 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3296 // 2810 //
3297 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2811 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3298 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2812 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3299 // that we do not support xterm mouse reporting (should be 95 when we do). 2813 // versions.
3300 // 2814 //
3301 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); 2815 tt_printf ("\033[>%d;95;0c", 'U');
3302 } 2816 }
3303 break; 2817 break;
2818
3304 case '?': 2819 case '?':
3305 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3306 process_terminal_mode (ch, priv, nargs, arg); 2821 process_terminal_mode (ch, priv, nargs, arg);
3307 break; 2822 break;
3308 } 2823 }
… …
3433 break; 2948 break;
3434 case 6: /* CPR requested */ 2949 case 6: /* CPR requested */
3435 scr_report_position (); 2950 scr_report_position ();
3436 break; 2951 break;
3437 case 7: /* unofficial extension */ 2952 case 7: /* unofficial extension */
3438 if (OPTION (Opt_insecure)) 2953 if (option (Opt_insecure))
3439 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2954 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3440 break; 2955 break;
3441 case 8: /* unofficial extension */ 2956 case 8: /* unofficial extension */
3442 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2957 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3443 break; 2958 break;
… …
3510 break; 3025 break;
3511 case CSI_75: 3026 case CSI_75:
3512 scr_cursor (RESTORE); 3027 scr_cursor (RESTORE);
3513 break; 3028 break;
3514 3029
3515#if ENABLE_FRILLS 3030#if !ENABLE_MINIMAL
3516 case CSI_74: 3031 case CSI_74:
3517 process_window_ops (arg, nargs); 3032 process_window_ops (arg, nargs);
3518 break; 3033 break;
3519#endif 3034#endif
3520 3035
… …
3527 break; 3042 break;
3528 } 3043 }
3529} 3044}
3530/*}}} */ 3045/*}}} */
3531 3046
3532#if ENABLE_FRILLS 3047#if !ENABLE_MINIMAL
3533/* ARGSUSED */ 3048/* ARGSUSED */
3534void 3049void
3535rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3050rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3536{ 3051{
3537 int x, y; 3052 int x, y;
3538 XWindowAttributes wattr; 3053 XWindowAttributes wattr;
3539 Window wdummy; 3054 Window wdummy;
3540 dDisp; 3055
3056 dLocal (Display *, dpy);
3541 3057
3542 if (nargs == 0) 3058 if (nargs == 0)
3543 return; 3059 return;
3544 3060
3545 switch (args[0]) 3061 switch (args[0])
3546 { 3062 {
3547 /* 3063 /*
3548 * commands 3064 * commands
3549 */ 3065 */
3550 case 1: /* deiconify window */ 3066 case 1: /* deiconify window */
3551 XMapWindow (disp, parent[0]); 3067 XMapWindow (dpy, parent[0]);
3552 break; 3068 break;
3553 case 2: /* iconify window */ 3069 case 2: /* iconify window */
3554 XIconifyWindow (disp, parent[0], display->screen); 3070 XIconifyWindow (dpy, parent[0], display->screen);
3555 break; 3071 break;
3556 case 3: /* set position (pixels) */ 3072 case 3: /* set position (pixels) */
3557 XMoveWindow (disp, parent[0], args[1], args[2]); 3073 XMoveWindow (dpy, parent[0], args[1], args[2]);
3558 break; 3074 break;
3559 case 4: /* set size (pixels) */ 3075 case 4: /* set size (pixels) */
3560 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3076 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3561 break; 3077 break;
3562 case 5: /* raise window */ 3078 case 5: /* raise window */
3563 XRaiseWindow (disp, parent[0]); 3079 XRaiseWindow (dpy, parent[0]);
3564 break; 3080 break;
3565 case 6: /* lower window */ 3081 case 6: /* lower window */
3566 XLowerWindow (disp, parent[0]); 3082 XLowerWindow (dpy, parent[0]);
3567 break; 3083 break;
3568 case 7: /* refresh window */ 3084 case 7: /* refresh window */
3569 scr_touch (true); 3085 scr_touch (true);
3570 break; 3086 break;
3571 case 8: /* set size (chars) */ 3087 case 8: /* set size (chars) */
… …
3578 if (args[0] >= 24) /* set height (chars) */ 3094 if (args[0] >= 24) /* set height (chars) */
3579 set_widthheight ((unsigned int)width, 3095 set_widthheight ((unsigned int)width,
3580 (unsigned int) (args[1] * fheight)); 3096 (unsigned int) (args[1] * fheight));
3581 break; 3097 break;
3582 3098
3583
3584 /* 3099 /*
3585 * reports - some output format copied from XTerm 3100 * reports - some output format copied from XTerm
3586 */ 3101 */
3587 case 11: /* report window state */ 3102 case 11: /* report window state */
3588 XGetWindowAttributes (disp, parent[0], &wattr); 3103 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3104 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3590 break; 3105 break;
3591 case 13: /* report window position */ 3106 case 13: /* report window position */
3592 XGetWindowAttributes (disp, parent[0], &wattr); 3107 XGetWindowAttributes (dpy, parent[0], &wattr);
3593 XTranslateCoordinates (disp, parent[0], wattr.root, 3108 XTranslateCoordinates (dpy, parent[0], wattr.root,
3594 -wattr.border_width, -wattr.border_width, 3109 -wattr.border_width, -wattr.border_width,
3595 &x, &y, &wdummy); 3110 &x, &y, &wdummy);
3596 tt_printf ("\033[3;%d;%dt", x, y); 3111 tt_printf ("\033[3;%d;%dt", x, y);
3597 break; 3112 break;
3598 case 14: /* report window size (pixels) */ 3113 case 14: /* report window size (pixels) */
3599 XGetWindowAttributes (disp, parent[0], &wattr); 3114 XGetWindowAttributes (dpy, parent[0], &wattr);
3600 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3115 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3601 break; 3116 break;
3602 case 18: /* report text area size (chars) */ 3117 case 18: /* report text area size (chars) */
3603 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3118 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3604 break; 3119 break;
… …
3606 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3121 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3607 break; 3122 break;
3608 case 20: /* report icon label */ 3123 case 20: /* report icon label */
3609 { 3124 {
3610 char *s; 3125 char *s;
3611 XGetIconName (disp, parent[0], &s); 3126 XGetIconName (dpy, parent[0], &s);
3612 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3127 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3613 XFree (s); 3128 XFree (s);
3614 } 3129 }
3615 break; 3130 break;
3616 case 21: /* report window title */ 3131 case 21: /* report window title */
3617 { 3132 {
3618 char *s; 3133 char *s;
3619 XFetchName (disp, parent[0], &s); 3134 XFetchName (dpy, parent[0], &s);
3620 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3135 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3621 XFree (s); 3136 XFree (s);
3622 } 3137 }
3623 break; 3138 break;
3624 } 3139 }
3625} 3140}
… …
3652 seen_esc = true; 3167 seen_esc = true;
3653 continue; 3168 continue;
3654 } 3169 }
3655 else if (ch == C0_BEL || ch == CHAR_ST) 3170 else if (ch == C0_BEL || ch == CHAR_ST)
3656 break; 3171 break;
3172 else if (ch == C0_SYN)
3173 ch = cmd_get8 ();
3657 else if (ch < 0x20) 3174 else if (ch < 0x20)
3658 return NULL; /* other control character - exit */ 3175 return NULL; /* other control character - exit */
3659 3176
3660 seen_esc = false; 3177 seen_esc = false;
3661 3178
3662 if (n >= STRING_MAX - 1) 3179 if (n >= STRING_MAX - 1)
3663 // stop at some sane length 3180 // stop at some sane length
3664 return NULL; 3181 return NULL;
3665 3182
3666 if (ch == C0_SYN)
3667 string[n++] = cmd_get8 ();
3668 else
3669 string[n++] = ch; 3183 string[n++] = ch;
3670 } 3184 }
3671 3185
3672 string[n++] = '\0'; 3186 string[n++] = '\0';
3673 3187
3674 ends_how = (ch == 0x5c ? C0_ESC : ch); 3188 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3725void 3239void
3726rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3240rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3727{ 3241{
3728 if (str[0] == '?' && !str[1]) 3242 if (str[0] == '?' && !str[1])
3729 { 3243 {
3730 unsigned short r, g, b; 3244 rgba c;
3731 pix_colors_focused[color].get (display, r, g, b); 3245 pix_colors_focused[color].get (c);
3246
3247#if XFT
3248 if (c.a != rgba::MAX_CC)
3249 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3250 else
3251#endif
3732 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3252 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3733 } 3253 }
3734 else 3254 else
3735 set_window_color (color, str); 3255 set_window_color (color, str);
3736} 3256}
3737 3257
… …
3743{ 3263{
3744 int color; 3264 int color;
3745 char *buf, *name; 3265 char *buf, *name;
3746 bool query = str[0] == '?' && !str[1]; 3266 bool query = str[0] == '?' && !str[1];
3747 int saveop = op; 3267 int saveop = op;
3748 dDisp; 3268
3269 dLocal (Display *, dpy);
3749 3270
3750 assert (str != NULL); 3271 assert (str != NULL);
3272
3273 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3274 return;
3275
3751 switch (op) 3276 switch (op)
3752 { 3277 {
3753 case XTerm_name: 3278 case XTerm_name:
3754 set_title (str); 3279 set_title (str);
3755 /* FALLTHROUGH */ 3280 /* FALLTHROUGH */
… …
3769 unsigned long bytes_after; 3294 unsigned long bytes_after;
3770 unsigned char *value = 0; 3295 unsigned char *value = 0;
3771 const char *str = ""; 3296 const char *str = "";
3772 3297
3773 if (prop 3298 if (prop
3774 && XGetWindowProperty (disp, parent[0], 3299 && XGetWindowProperty (dpy, parent[0],
3775 prop, 0, 1<<16, 0, AnyPropertyType, 3300 prop, 0, 1<<16, 0, AnyPropertyType,
3776 &actual_type, &actual_format, 3301 &actual_type, &actual_format,
3777 &nitems, &bytes_after, &value) == Success 3302 &nitems, &bytes_after, &value) == Success
3778 && actual_type != None 3303 && actual_type != None
3779 && actual_format == 8) 3304 && actual_format == 8)
3780 str = (const char *)(value); 3305 str = (const char *)(value);
3781 3306
3782 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3307 tt_printf ("\033]%d;%s%c", op, str, resp);
3783 3308
3784 XFree (value); 3309 XFree (value);
3785 } 3310 }
3786 else 3311 else
3787 { 3312 {
… …
3791 { 3316 {
3792 *eq = 0; 3317 *eq = 0;
3793 set_utf8_property (display->atom (str), eq + 1); 3318 set_utf8_property (display->atom (str), eq + 1);
3794 } 3319 }
3795 else 3320 else
3796 XDeleteProperty (disp, parent[0], 3321 XDeleteProperty (dpy, parent[0],
3797 display->atom (str)); 3322 display->atom (str));
3798 } 3323 }
3799 break; 3324 break;
3800 3325
3801 case XTerm_Color: 3326 case XTerm_Color:
… …
3811 break; 3336 break;
3812 3337
3813 if ((buf = strchr (name, ';')) != NULL) 3338 if ((buf = strchr (name, ';')) != NULL)
3814 *buf++ = '\0'; 3339 *buf++ = '\0';
3815 3340
3816 if (name[0] == '?' && !name[1]) 3341 process_color_seq (op, color, name, resp);
3817 {
3818 unsigned short r, g, b;
3819 pix_colors_focused[color].get (display, r, g, b);
3820 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3821 }
3822 else
3823 set_window_color (color, name);
3824 } 3342 }
3825 break; 3343 break;
3344 case Rxvt_restoreFG:
3826 case XTerm_Color00: 3345 case XTerm_Color00:
3827 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3346 process_color_seq (op, Color_fg, str, resp);
3828 break; 3347 break;
3348 case Rxvt_restoreBG:
3829 case XTerm_Color01: 3349 case XTerm_Color01:
3830 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3350 process_color_seq (op, Color_bg, str, resp);
3831 break; 3351 break;
3832#ifndef NO_CURSORCOLOR 3352#ifndef NO_CURSORCOLOR
3833 case XTerm_Color_cursor: 3353 case XTerm_Color_cursor:
3834 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3354 process_color_seq (op, Color_cursor, str, resp);
3835 break; 3355 break;
3836#endif 3356#endif
3837 case XTerm_Color_pointer_fg: 3357 case XTerm_Color_pointer_fg:
3838 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3358 process_color_seq (op, Color_pointer_fg, str, resp);
3839 break; 3359 break;
3840 case XTerm_Color_pointer_bg: 3360 case XTerm_Color_pointer_bg:
3841 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3361 process_color_seq (op, Color_pointer_bg, str, resp);
3842 break; 3362 break;
3843#ifndef NO_BOLD_UNDERLINE_REVERSE 3363#ifndef NO_BOLD_UNDERLINE_REVERSE
3844 case XTerm_Color_RV: 3364 case XTerm_Color_RV:
3845 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3365 process_color_seq (op, Color_RV, str, resp);
3846 break; 3366 break;
3847 case Rxvt_Color_BD: 3367 case Rxvt_Color_BD:
3848 case URxvt_Color_BD: 3368 case URxvt_Color_BD:
3849 process_color_seq (op, Color_BD, str, resp); 3369 process_color_seq (op, Color_BD, str, resp);
3850 break; 3370 break;
3851 case Rxvt_Color_UL: 3371 case Rxvt_Color_UL:
3852 case URxvt_Color_UL: 3372 case URxvt_Color_UL:
3853 process_color_seq (op, Color_UL, str, resp); 3373 process_color_seq (op, Color_UL, str, resp);
3854 break; 3374 break;
3855 case URxvt_Color_IT: 3375 case URxvt_Color_IT:
3856 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3376 process_color_seq (op, Color_IT, str, resp);
3857 break; 3377 break;
3858#endif 3378#endif
3859#if TRANSPARENT && TINTING 3379#if ENABLE_TRANSPARENCY
3860 case URxvt_Color_tint: 3380 case URxvt_Color_tint:
3861 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3381 process_color_seq (op, Color_tint, str, resp);
3862 check_our_parents (); 3382 {
3863 if (am_transparent) 3383 bool changed = false;
3864 want_full_refresh = want_refresh = 1;
3865 break;
3866#endif
3867 3384
3385 if (ISSET_PIXCOLOR (Color_tint))
3386 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3387 else
3388 changed = bgPixmap.unset_tint ();
3389
3390 if (changed)
3391 update_background ();
3392 }
3393
3394 break;
3395#endif
3396
3397#if BG_IMAGE_FROM_FILE
3868 case Rxvt_Pixmap: 3398 case Rxvt_Pixmap:
3869 { 3399 if (!strcmp (str, "?"))
3870 if (*str != ';')
3871 { 3400 {
3872#if XPM_BACKGROUND 3401 char str[256];
3873 scale_pixmap (""); /* reset to default scaling */ 3402
3874 set_bgPixmap (str); /* change pixmap */ 3403 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3875 scr_touch (true); 3404 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3876#endif 3405 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3406 process_xterm_seq (XTerm_title, str, CHAR_ST);
3877 } 3407 }
3878 3408 else
3409 {
3879 int changed = 0; 3410 int changed = 0;
3880 3411
3881 while ((str = strchr (str, ';')) != NULL) 3412 if (*str != ';')
3882 { 3413 {
3414 /* reset to default scaling :*/
3415 bgPixmap.unset_geometry ();
3416 if (bgPixmap.set_file (str)) /* change pixmap */
3417 changed++;
3418 str = strchr (str, ';');
3419 if (str == NULL)
3420 bgPixmap.set_defaultGeometry ();
3421 }
3422
3423 while (str)
3424 {
3883 str++; 3425 str++;
3884#if XPM_BACKGROUND 3426 if (bgPixmap.set_geometry (str))
3885 changed += scale_pixmap (str); 3427 changed++;
3886#endif 3428 str = strchr (str, ';');
3887 } 3429 }
3888 3430
3889 if (changed) 3431 if (changed)
3890 { 3432 update_background ();
3891#ifdef XPM_BACKGROUND
3892 resize_pixmap ();
3893 scr_touch (true);
3894#endif
3895 } 3433 }
3896 }
3897 break; 3434 break;
3898 3435#endif
3899 case Rxvt_restoreFG:
3900 set_window_color (Color_fg, str);
3901 break;
3902 case Rxvt_restoreBG:
3903 set_window_color (Color_bg, str);
3904 break;
3905 3436
3906 case XTerm_logfile: 3437 case XTerm_logfile:
3907 // TODO, when secure mode? 3438 // TODO, when secure mode?
3908 break; 3439 break;
3909 3440
… …
3927 case URxvt_italicFont: 3458 case URxvt_italicFont:
3928 case URxvt_boldItalicFont: 3459 case URxvt_boldItalicFont:
3929#endif 3460#endif
3930 if (query) 3461 if (query)
3931 tt_printf ("\33]%d;%-.250s%c", saveop, 3462 tt_printf ("\33]%d;%-.250s%c", saveop,
3932 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3463 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3933 ? fontset[op - URxvt_font]->fontdesc : "", 3464 ? fontset[op - URxvt_font]->fontdesc : "",
3934 resp); 3465 resp);
3935 else 3466 else
3936 { 3467 {
3937 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3468 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3940 allocated.push_back ((void *)res); 3471 allocated.push_back ((void *)res);
3941 set_fonts (); 3472 set_fonts ();
3942 } 3473 }
3943 break; 3474 break;
3944 3475
3945#if ENABLE_FRILLS 3476 case URxvt_version:
3477 if (query)
3478 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3479 op,
3480 rs[Rs_name], VERSION[0], VERSION[2],
3481 resp);
3482 break;
3483
3484#if !ENABLE_MINIMAL
3946 case URxvt_locale: 3485 case URxvt_locale:
3947 if (query) 3486 if (query)
3948 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3487 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3949 else 3488 else
3950 { 3489 {
3951 set_locale (str); 3490 set_locale (str);
3952 pty->set_utf8_mode (enc_utf8); 3491 pty->set_utf8_mode (enc_utf8);
3953 init_xlocale (); 3492 init_xlocale ();
… …
3968 break; 3507 break;
3969#endif 3508#endif
3970 3509
3971#if ENABLE_PERL 3510#if ENABLE_PERL
3972 case URxvt_perl: 3511 case URxvt_perl:
3973 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3512 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3974 ; // no responses yet 3513 ; // no responses yet
3975 break; 3514 break;
3976#endif 3515#endif
3977 } 3516 }
3978} 3517}
… …
4002 { 3541 {
4003 if (mode == 'r') 3542 if (mode == 'r')
4004 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3543 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4005 else 3544 else
4006 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3545 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4007 PrivMode (state, bit); 3546 set_privmode (bit, state);
4008 } 3547 }
4009 3548
4010 return state; 3549 return state;
4011} 3550}
4012 3551
… …
4016{ 3555{
4017 unsigned int i, j; 3556 unsigned int i, j;
4018 int state; 3557 int state;
4019 3558
4020 static const struct 3559 static const struct
4021 { 3560 {
4022 const int argval; 3561 const int argval;
4023 const unsigned long bit; 3562 const unsigned long bit;
4024 }
4025
4026 argtopriv[] = { 3563 } argtopriv[] = {
4027 { 1, PrivMode_aplCUR }, 3564 { 1, PrivMode_aplCUR },
4028 { 2, PrivMode_vt52 }, 3565 { 2, PrivMode_vt52 },
4029 { 3, PrivMode_132 }, 3566 { 3, PrivMode_132 },
4030 { 4, PrivMode_smoothScroll }, 3567 { 4, PrivMode_smoothScroll },
4031 { 5, PrivMode_rVideo }, 3568 { 5, PrivMode_rVideo },
… …
4047 { 66, PrivMode_aplKP }, 3584 { 66, PrivMode_aplKP },
4048#ifndef NO_BACKSPACE_KEY 3585#ifndef NO_BACKSPACE_KEY
4049 { 67, PrivMode_BackSpace }, 3586 { 67, PrivMode_BackSpace },
4050#endif 3587#endif
4051 { 1000, PrivMode_MouseX11 }, 3588 { 1000, PrivMode_MouseX11 },
4052 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3589 { 1002, PrivMode_MouseBtnEvent },
4053 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3590 { 1003, PrivMode_MouseAnyEvent },
4054 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4055 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4056 { 1011, PrivMode_Keypress }, // rxvt extension 3592 { 1011, PrivMode_Keypress }, // rxvt extension
4057 // 1035 enable modifiers for alt, numlock NYI 3593 // 1035 enable modifiers for alt, numlock NYI
4058 // 1036 send ESC for meta keys NYI 3594 // 1036 send ESC for meta keys NYI
4059 // 1037 send DEL for keypad delete NYI 3595 // 1037 send DEL for keypad delete NYI
4060 { 1047, PrivMode_Screen }, 3596 { 1047, PrivMode_Screen },
4061 // 1048 save and restore cursor 3597 // 1048 save and restore cursor
4062 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3598 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4063 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3599 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3600 { 2004, PrivMode_BracketPaste },
4064 }; 3601 };
4065 3602
4066 if (nargs == 0) 3603 if (nargs == 0)
4067 return; 3604 return;
4068 3605
… …
4094 scr_touch (true); 3631 scr_touch (true);
4095 break; 3632 break;
4096#endif 3633#endif
4097 case 1048: /* alternative cursor save */ 3634 case 1048: /* alternative cursor save */
4098 case 1049: 3635 case 1049:
4099 if (OPTION (Opt_secondaryScreen)) 3636 if (option (Opt_secondaryScreen))
4100 if (mode == 0) 3637 if (mode == 0)
4101 scr_cursor (RESTORE); 3638 scr_cursor (RESTORE);
4102 else if (mode == 1) 3639 else if (mode == 1)
4103 scr_cursor (SAVE); 3640 scr_cursor (SAVE);
4104 break; 3641 break;
… …
4112 case 2: /* VT52 mode */ 3649 case 2: /* VT52 mode */
4113 /* oddball mode. should be set regardless of set/reset 3650 /* oddball mode. should be set regardless of set/reset
4114 * parameter. Return from VT52 mode with an ESC < from 3651 * parameter. Return from VT52 mode with an ESC < from
4115 * within VT52 mode 3652 * within VT52 mode
4116 */ 3653 */
4117 PrivMode (1, PrivMode_vt52); 3654 set_privmode (PrivMode_vt52, 1);
4118 break; 3655 break;
4119 case 3: /* 80/132 */ 3656 case 3: /* 80/132 */
4120 if (priv_modes & PrivMode_132OK) 3657 if (priv_modes & PrivMode_132OK)
3658 {
3659 scr_poweron ();
4121 set_widthheight (((state ? 132 : 80) * fwidth), height); 3660 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3661 }
4122 break; 3662 break;
4123 case 4: /* smooth scrolling */ 3663 case 4: /* smooth scrolling */
4124 set_option (Opt_jumpScroll, !state); 3664 set_option (Opt_jumpScroll, !state);
4125 break; 3665 break;
4126 case 5: /* reverse video */ 3666 case 5: /* reverse video */
… …
4133 scr_autowrap (state); 3673 scr_autowrap (state);
4134 break; 3674 break;
4135 /* case 8: - auto repeat, can't do on a per window basis */ 3675 /* case 8: - auto repeat, can't do on a per window basis */
4136 case 9: /* X10 mouse reporting */ 3676 case 9: /* X10 mouse reporting */
4137 if (state) /* orthogonal */ 3677 if (state) /* orthogonal */
4138 priv_modes &= ~PrivMode_MouseX11; 3678 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4139 break; 3679 break;
4140#ifdef scrollBar_esc 3680#ifdef scrollBar_esc
4141 case scrollBar_esc: 3681 case scrollBar_esc:
4142 if (scrollbar_mapping (state)) 3682 if (scrollbar_mapping (state))
4143 { 3683 {
… …
4156 break; 3696 break;
4157 /* case 66: - application key pad */ 3697 /* case 66: - application key pad */
4158 /* case 67: - backspace key */ 3698 /* case 67: - backspace key */
4159 case 1000: /* X11 mouse reporting */ 3699 case 1000: /* X11 mouse reporting */
4160 if (state) /* orthogonal */ 3700 if (state) /* orthogonal */
4161 priv_modes &= ~PrivMode_MouseX10; 3701 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4162 break; 3702 break;
4163#if 0
4164 case 1001: 3703 case 1002:
4165 break; /* X11 mouse highlighting */ 3704 case 1003:
4166#endif 3705 if (state)
3706 {
3707 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3708 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3709 vt_emask_mouse = PointerMotionMask;
3710 }
3711 else
3712 vt_emask_mouse = NoEventMask;
3713 vt_select_input ();
3714 break;
4167 case 1010: /* scroll to bottom on TTY output inhibit */ 3715 case 1010: /* scroll to bottom on TTY output inhibit */
4168 set_option (Opt_scrollTtyOutput, !state); 3716 set_option (Opt_scrollTtyOutput, !state);
4169 break; 3717 break;
4170 case 1011: /* scroll to bottom on key press */ 3718 case 1011: /* scroll to bottom on key press */
4171 set_option (Opt_scrollTtyKeypress, state); 3719 set_option (Opt_scrollTtyKeypress, state);
4172 break; 3720 break;
4173 case 1047: /* secondary screen w/ clearing last */ 3721 case 1047: /* secondary screen w/ clearing last */
4174 if (OPTION (Opt_secondaryScreen)) 3722 if (option (Opt_secondaryScreen))
4175 if (current_screen != PRIMARY) 3723 if (current_screen != PRIMARY)
4176 scr_erase_screen (2); 3724 scr_erase_screen (2);
4177 scr_change_screen (state); 3725 scr_change_screen (state);
4178 break; 3726 break;
4179 case 1049: /* secondary screen w/ clearing first */ 3727 case 1049: /* secondary screen w/ clearing first */
4180 scr_change_screen (state); 3728 scr_change_screen (state);
4181 if (OPTION (Opt_secondaryScreen)) 3729 if (option (Opt_secondaryScreen))
4182 if (current_screen != PRIMARY) 3730 if (current_screen != PRIMARY)
4183 scr_erase_screen (2); 3731 scr_erase_screen (2);
4184 break; 3732 break;
4185 default: 3733 default:
4186 break; 3734 break;
… …
4314 scr_color (Color_bg, Color_bg); 3862 scr_color (Color_bg, Color_bg);
4315 break; 3863 break;
4316 3864
4317 //case 50: // not variable spacing 3865 //case 50: // not variable spacing
4318 3866
4319#if ENABLE_FRILLS 3867#if !ENABLE_MINIMAL
4320 case 90: 3868 case 90:
4321 case 91: /* set bright fg color */ 3869 case 91: /* set bright fg color */
4322 case 92: 3870 case 92:
4323 case 93: 3871 case 93:
4324 case 94: 3872 case 94:
… …
4348rxvt_term::process_graphics () 3896rxvt_term::process_graphics ()
4349{ 3897{
4350 unicode_t ch, cmd = cmd_getc (); 3898 unicode_t ch, cmd = cmd_getc ();
4351 3899
4352 if (cmd == 'Q') 3900 if (cmd == 'Q')
3901 {
4353 { /* query graphics */ 3902 /* query graphics */
4354 tt_printf ("\033G0\012"); /* no graphics */ 3903 tt_printf ("\033G0\012"); /* no graphics */
4355 return; 3904 return;
4356 } 3905 }
4357 /* swallow other graphics sequences until terminating ':' */ 3906 /* swallow other graphics sequences until terminating ':' */
4358 do 3907 do
… …
4408 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3957 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4409 3958
4410 memcpy (v_buffer + v_buflen, data, len); 3959 memcpy (v_buffer + v_buflen, data, len);
4411 v_buflen += len; 3960 v_buflen += len;
4412 3961
4413 pty_ev.set (EVENT_READ | EVENT_WRITE); 3962 pty_ev.set (ev::READ | ev::WRITE);
4414} 3963}
4415 3964
4416void rxvt_term::pty_write () 3965void rxvt_term::pty_write ()
4417{ 3966{
4418 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3967 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4423 3972
4424 if (v_buflen == 0) 3973 if (v_buflen == 0)
4425 { 3974 {
4426 free (v_buffer); 3975 free (v_buffer);
4427 v_buffer = 0; 3976 v_buffer = 0;
4428 v_buflen = 0;
4429 3977
4430 pty_ev.set (EVENT_READ); 3978 pty_ev.set (ev::READ);
4431 return; 3979 return;
4432 } 3980 }
4433 3981
4434 memmove (v_buffer, v_buffer + written, v_buflen); 3982 memmove (v_buffer, v_buffer + written, v_buflen);
4435 } 3983 }
4436 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3984 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4437 pty_ev.set (EVENT_READ); 3985 pty_ev.set (ev::READ);
4438} 3986}
4439 3987
4440/*----------------------- end-of-file (C source) -----------------------*/ 3988/*----------------------- end-of-file (C source) -----------------------*/
4441 3989

Diff Legend

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