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.288 by root, Sat Jan 28 20:33:31 2006 UTC vs.
Revision 1.422 by root, Tue Oct 28 04:45:59 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)
… …
991 } 1015 }
992 while (row < end_row); 1016 while (row < end_row);
993 } 1017 }
994 1018
995 scr_refresh (); 1019 scr_refresh ();
996 scrollbar_show (1); 1020 scrollBar.show (1);
997#ifdef USE_XIM 1021#ifdef USE_XIM
998 IMSendSpot (); 1022 IMSendSpot ();
999#endif 1023#endif
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 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best.
1135
1136 struct timespec ts = { 0, 1000 };
1137 nanosleep (&ts, 0);
1138
1101 w.stop (); 1139 w.stop ();
1102 } 1140 }
1103 1141
1104 event_handler () 1142 event_handler ()
1105 : cw_yield (this, &event_handler::yield) 1143 : yield_ev (this, &event_handler::yield_cb)
1106 { 1144 {
1107 } 1145 }
1108} event_handler; 1146} event_handler;
1109#endif 1147#endif
1110 1148
… …
1130 cmdbuf_endp += r; 1168 cmdbuf_endp += r;
1131 return true; 1169 return true;
1132 } 1170 }
1133 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1171 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134 { 1172 {
1135#if HAVE_SCHED_YIELD 1173#if LINUX_YIELD_HACK
1136 if (display->is_local) 1174 if (display->is_local)
1137 event_handler.cw_yield.start (); 1175 event_handler.yield_ev.start ();
1138#endif 1176#endif
1139 } 1177 }
1140 else 1178 else
1141 { 1179 {
1142 pty_ev.stop (); 1180 pty_ev.stop ();
1143 1181
1144 if (!OPTION (Opt_hold)) 1182 if (!option (Opt_hold))
1145 destroy (); 1183 destroy ();
1146 } 1184 }
1147 1185
1148 return false; 1186 return false;
1149} 1187}
1150 1188
1151void 1189void
1152rxvt_term::pty_cb (io_watcher &w, short revents) 1190rxvt_term::pty_cb (ev::io &w, int revents)
1153{ 1191{
1154 make_current (); 1192 make_current ();
1155 1193
1156 if (revents & EVENT_READ) 1194 if (revents & ev::READ)
1157 // loop, but don't allow a single term to monopolize us 1195 // loop, but don't allow a single term to monopolize us
1158 while (pty_fill ()) 1196 for (int i = CBUFCNT; i-- && pty_fill (); )
1159 if (cmd_parse ()) 1197 cmd_parse ();
1160 break;
1161 1198
1162 if (revents & EVENT_WRITE) 1199 if (revents & ev::WRITE)
1163 pty_write (); 1200 pty_write ();
1201
1202 refresh_check ();
1164} 1203}
1165 1204
1166void 1205void
1167rxvt_term::pointer_unblank () 1206rxvt_term::pointer_unblank ()
1168{ 1207{
1169 XDefineCursor (xdisp, vt, TermWin_cursor); 1208 XDefineCursor (dpy, vt, TermWin_cursor);
1170 recolour_cursor (); 1209 recolour_cursor ();
1171 1210
1172#ifdef POINTER_BLANK 1211#ifdef POINTER_BLANK
1173 hidden_pointer = 0; 1212 hidden_pointer = 0;
1174 1213
1175 if (OPTION (Opt_pointerBlank)) 1214 if (option (Opt_pointerBlank))
1176 pointer_ev.start (NOW + pointerBlankDelay); 1215 pointer_ev.start (pointerBlankDelay);
1177#endif 1216#endif
1178} 1217}
1179 1218
1180#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1181void 1220void
1182rxvt_term::pointer_blank () 1221rxvt_term::pointer_blank ()
1183{ 1222{
1184 if (!OPTION (Opt_pointerBlank)) 1223 if (!option (Opt_pointerBlank))
1185 return; 1224 return;
1186 1225
1187 XDefineCursor (xdisp, vt, display->blank_cursor); 1226 XDefineCursor (dpy, vt, display->blank_cursor);
1188 XFlush (xdisp); 1227 XFlush (dpy);
1189 1228
1190 hidden_pointer = 1; 1229 hidden_pointer = 1;
1191} 1230}
1192 1231
1193void 1232void
1194rxvt_term::pointer_cb (time_watcher &w) 1233rxvt_term::pointer_cb (ev::timer &w, int revents)
1195{ 1234{
1196 make_current (); 1235 make_current ();
1197 1236
1198 pointer_blank (); 1237 pointer_blank ();
1199} 1238}
… …
1202void 1241void
1203rxvt_term::mouse_report (XButtonEvent &ev) 1242rxvt_term::mouse_report (XButtonEvent &ev)
1204{ 1243{
1205 int button_number, key_state = 0; 1244 int button_number, key_state = 0;
1206 int x, y; 1245 int x, y;
1246 int code = 32;
1207 1247
1208 x = ev.x; 1248 x = Pixel2Col (ev.x);
1209 y = ev.y; 1249 y = Pixel2Row (ev.y);
1210 pixel_position (&x, &y); 1250 if (ev.type == MotionNotify)
1251 {
1252 if (x == mouse_row && y == mouse_col)
1253 return;
1254 mouse_row = x;
1255 mouse_col = y;
1256 code += 32;
1257 }
1211 1258
1212 if (MEvent.button == AnyButton) 1259 if (MEvent.button == AnyButton)
1213 button_number = 3; 1260 button_number = 3;
1214 else 1261 else
1215 { 1262 {
… …
1261 x + 1, 1308 x + 1,
1262 y + 1); 1309 y + 1);
1263#endif 1310#endif
1264 1311
1265 tt_printf ("\033[M%c%c%c", 1312 tt_printf ("\033[M%c%c%c",
1266 (32 + button_number + key_state), 1313 (code + button_number + key_state),
1267 (32 + x + 1), 1314 (32 + x + 1),
1268 (32 + y + 1)); 1315 (32 + y + 1));
1269} 1316}
1270 1317
1271/*{{{ process an X event */ 1318/*{{{ process an X event */
1272void 1319void
1273rxvt_term::x_cb (XEvent &ev) 1320rxvt_term::x_cb (XEvent &ev)
1274{ 1321{
1275 make_current (); 1322 make_current ();
1276 1323
1277 dLocal (Display *, xdisp); 1324 dLocal (Display *, dpy);
1278 1325
1279 if (ev.xany.window == vt 1326 if (ev.xany.window == vt
1280 && SHOULD_INVOKE (HOOK_X_EVENT) 1327 && SHOULD_INVOKE (HOOK_X_EVENT)
1281 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1328 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1282 return; 1329 return;
… …
1287 unsigned int unused_mask; 1334 unsigned int unused_mask;
1288 1335
1289 switch (ev.type) 1336 switch (ev.type)
1290 { 1337 {
1291 case KeyPress: 1338 case KeyPress:
1292#if ISO_14755 1339 key_press (ev.xkey);
1293 if (!(iso14755buf & ISO_14755_52))
1294#endif
1295 lookup_key (ev.xkey);
1296
1297 break; 1340 break;
1298 1341
1299 case KeyRelease: 1342 case KeyRelease:
1300 { 1343 key_release (ev.xkey);
1301#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1302 KeySym keysym;
1303
1304 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1305#endif
1306
1307#if ENABLE_FRILLS || ISO_14755
1308 // ISO 14755 support
1309 if (iso14755buf)
1310 if (iso14755buf & ISO_14755_52)
1311 {
1312# if ENABLE_OVERLAY
1313 scr_overlay_off ();
1314# endif
1315# if ISO_14755
1316 // iso14755 part 5.2 handling: release time
1317 // first: controls
1318 if ((ev.xkey.state & ControlMask)
1319 && ((keysym >= 0x40 && keysym <= 0x5f)
1320 || (keysym >= 0x61 && keysym <= 0x7f)))
1321 {
1322 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1323 commit_iso14755 ();
1324 goto skip_switch;
1325 }
1326
1327 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1328 if (i[0] == keysym)
1329 {
1330 iso14755buf = ISO_14755_51 | i[1];
1331 commit_iso14755 ();
1332 goto skip_switch;
1333 }
1334
1335 scr_bell ();
1336# endif
1337 iso14755buf = 0;
1338 break;
1339 }
1340 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1341 {
1342# if ENABLE_OVERLAY
1343 scr_overlay_off ();
1344# endif
1345 if (iso14755buf & ISO_14755_51)
1346 commit_iso14755 ();
1347#if ISO_14755
1348 else if (iso14755buf & ISO_14755_STARTED)
1349 {
1350 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1351
1352 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1353 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1354 }
1355# endif
1356 else
1357 iso14755buf = 0;
1358 }
1359#endif
1360
1361 if (ev.xany.window == vt
1362 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1363 break;
1364
1365#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1366 if (!(ev.xkey.state & ControlMask))
1367 slip_wheel_ev.stop ();
1368 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1369 mouse_slip_wheel_speed = 0;
1370#endif
1371 break; 1344 break;
1372 }
1373 1345
1374 case ButtonPress: 1346 case ButtonPress:
1375 button_press (ev.xbutton); 1347 button_press (ev.xbutton);
1376 break; 1348 break;
1377 1349
… …
1392 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1364 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1393 destroy (); 1365 destroy ();
1394 } 1366 }
1395#if ENABLE_EWMH 1367#if ENABLE_EWMH
1396 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1368 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1397 XSendEvent (xdisp, ev.xclient.window = display->root, 1369 XSendEvent (dpy, ev.xclient.window = display->root,
1398 False, SubstructureRedirectMask | SubstructureNotifyMask, 1370 False, SubstructureRedirectMask | SubstructureNotifyMask,
1399 &ev); 1371 &ev);
1400#endif 1372#endif
1401 } 1373 }
1402 } 1374 }
… …
1408 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1380 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1409 focus_out (); 1381 focus_out ();
1410 } 1382 }
1411#endif 1383#endif
1412 } 1384 }
1413 break;
1414
1415 case MappingNotify:
1416 XRefreshKeyboardMapping (&ev.xmapping);
1417 break; 1385 break;
1418 1386
1419 /* 1387 /*
1420 * XXX: this is not the _current_ arrangement 1388 * XXX: this is not the _current_ arrangement
1421 * Here's my conclusion: 1389 * Here's my conclusion:
… …
1440 break; 1408 break;
1441 } 1409 }
1442 break; 1410 break;
1443 1411
1444 case FocusIn: 1412 case FocusIn:
1413 if (ev.xfocus.detail != NotifyInferior
1414 && ev.xfocus.detail != NotifyPointer
1415 && ev.xfocus.mode != NotifyGrab)
1445 focus_in (); 1416 focus_in ();
1446 break; 1417 break;
1447 1418
1448 case FocusOut: 1419 case FocusOut:
1420 if (ev.xfocus.detail != NotifyInferior
1421 && ev.xfocus.detail != NotifyPointer
1422 && ev.xfocus.mode != NotifyGrab)
1449 focus_out (); 1423 focus_out ();
1450 break; 1424 break;
1451 1425
1452 case ConfigureNotify: 1426 case ConfigureNotify:
1427 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1428 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1429 szHint.width, szHint.height);*/
1453 if (ev.xconfigure.window == parent[0]) 1430 if (ev.xconfigure.window == parent[0])
1454 { 1431 {
1455 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1432 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1456 ; 1433 ;
1457 1434
1458 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1435 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1459 { 1436 {
1460 seen_resize = 1; 1437 seen_resize = 1;
1461 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1438 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1462 } 1439 }
1440 else
1441 {
1442#ifdef HAVE_BG_PIXMAP
1443 if (bgPixmap.window_position_sensitive ())
1444 {
1445 if (mapped)
1446 update_background ();
1447 else
1448 bgPixmap.invalidate ();
1449 }
1450#endif
1451 }
1463 1452
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1465
1466#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1467 if (OPTION (Opt_transparent))
1468 check_our_parents ();
1469#endif
1470 } 1454 }
1471 break; 1455 break;
1472 1456
1473 case PropertyNotify: 1457 case PropertyNotify:
1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1490 case SelectionRequest: 1474 case SelectionRequest:
1491 selection_send (ev.xselectionrequest); 1475 selection_send (ev.xselectionrequest);
1492 break; 1476 break;
1493 1477
1494 case MapNotify: 1478 case MapNotify:
1479#ifdef HAVE_BG_PIXMAP
1480 /* This is needed spcifically to fix the case of no window manager or a
1481 * non-reparenting window manager. In those cases we never get first
1482 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1483 * care of multiplicity of ConfigureNotify events arriwing while WM does
1484 * reparenting.
1485 * We should not render background immidiately, as there could be several
1486 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1487 * by scheduling background redraw as soon as we can, but giving a short
1488 * bit of time for ConfigureNotifies to arrive.
1489 * We should render background PRIOR to drawing any text, but AFTER all
1490 * of ConfigureNotifys for the best results.
1491 */
1492 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1493 update_background_ev.start (0.025);
1494#endif
1495 mapped = 1; 1495 mapped = 1;
1496#ifdef TEXT_BLINK 1496#ifdef TEXT_BLINK
1497 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1497 text_blink_ev.start ();
1498#endif 1498#endif
1499 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1499 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1500 break; 1500 break;
1501 1501
1502 case UnmapNotify: 1502 case UnmapNotify:
… …
1504#ifdef TEXT_BLINK 1504#ifdef TEXT_BLINK
1505 text_blink_ev.stop (); 1505 text_blink_ev.stop ();
1506#endif 1506#endif
1507 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1507 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1508 break; 1508 break;
1509
1510#ifdef TRANSPARENT
1511 case ReparentNotify:
1512 rootwin_cb (ev);
1513 break;
1514#endif /* TRANSPARENT */
1515 1509
1516 case GraphicsExpose: 1510 case GraphicsExpose:
1517 case Expose: 1511 case Expose:
1518 if (ev.xany.window == vt) 1512 if (ev.xany.window == vt)
1519 { 1513 {
1520 do 1514 do
1515 {
1521 scr_expose (ev.xexpose.x, ev.xexpose.y, 1516 scr_expose (ev.xexpose.x, ev.xexpose.y,
1522 ev.xexpose.width, ev.xexpose.height, False); 1517 ev.xexpose.width, ev.xexpose.height, False);
1518 }
1523 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1519 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1524 1520
1525 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1526 1522
1527 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1523 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1524 {
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1525 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1526 ev.xexpose.width, ev.xexpose.height, False);
1527 }
1530 1528
1531 want_refresh = 1; 1529 want_refresh = 1;
1532 } 1530 }
1533 else 1531 else
1534 { 1532 {
1535 XEvent unused_event; 1533 XEvent unused_event;
1536 1534
1537 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1538 ; 1536 ;
1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1537 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1540 ; 1538 ;
1541 1539
1542 if (isScrollbarWindow (ev.xany.window)) 1540 if (scrollBar.state && ev.xany.window == scrollBar.win)
1543 { 1541 {
1544 scrollBar.setIdle (); 1542 scrollBar.state = STATE_IDLE;
1545 scrollbar_show (0); 1543 scrollBar.show (0);
1546 } 1544 }
1547
1548#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == parent[0])
1550 XClearWindow (xdisp, ev.xany.window);
1551#endif
1552 } 1545 }
1553 break; 1546 break;
1554 1547
1555 case MotionNotify: 1548 case MotionNotify:
1556#ifdef POINTER_BLANK 1549#ifdef POINTER_BLANK
1557 if (hidden_pointer) 1550 if (hidden_pointer)
1558 pointer_unblank (); 1551 pointer_unblank ();
1559#endif 1552#endif
1553 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1554 || priv_modes & PrivMode_MouseAnyEvent)
1555 mouse_report (ev.xbutton);
1560 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1556 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1561 break; 1557 break;
1562 1558
1563 if (ev.xany.window == vt) 1559 if (ev.xany.window == vt)
1564 { 1560 {
1565 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1561 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1566 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1562 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1567 ; // nop 1563 ; // nop
1568 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1564 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1569 { 1565 {
1570 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1566 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1571 ; 1567 ;
1572 1568
1573 XQueryPointer (xdisp, vt, 1569 XQueryPointer (dpy, vt,
1574 &unused_root, &unused_child, 1570 &unused_root, &unused_child,
1575 &unused_root_x, &unused_root_y, 1571 &unused_root_x, &unused_root_y,
1576 &ev.xbutton.x, &ev.xbutton.y, 1572 &ev.xbutton.x, &ev.xbutton.y,
1577 &ev.xbutton.state); 1573 &ev.xbutton.state);
1578#ifdef MOUSE_THRESHOLD 1574#ifdef MOUSE_THRESHOLD
… …
1598 int dist; 1594 int dist;
1599 1595
1600 /* don't clobber the current delay if we are 1596 /* don't clobber the current delay if we are
1601 * already in the middle of scrolling. 1597 * already in the middle of scrolling.
1602 */ 1598 */
1603 if (!sel_scroll_ev.active) 1599 if (!sel_scroll_ev.is_active ())
1604 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1600 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1605 1601
1606 /* save the event params so we can highlight 1602 /* save the event params so we can highlight
1607 * the selection in the pending-scroll loop 1603 * the selection in the pending-scroll loop
1608 */ 1604 */
1609 selection_save_x = ev.xbutton.x; 1605 selection_save_x = ev.xbutton.x;
… …
1631 else 1627 else
1632 { 1628 {
1633 /* we are within the text window, so we 1629 /* we are within the text window, so we
1634 * shouldn't be scrolling 1630 * shouldn't be scrolling
1635 */ 1631 */
1636 if (sel_scroll_ev.active)
1637 sel_scroll_ev.stop(); 1632 sel_scroll_ev.stop();
1638 } 1633 }
1639#endif 1634#endif
1640#ifdef MOUSE_THRESHOLD 1635#ifdef MOUSE_THRESHOLD
1641 } 1636 }
1642#endif 1637#endif
1643 } 1638 }
1644 } 1639 }
1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1640 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1646 { 1641 {
1647 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1642 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1648 MotionNotify, &ev)) 1643 MotionNotify, &ev))
1649 ; 1644 ;
1650 1645
1651 XQueryPointer (xdisp, scrollBar.win, 1646 XQueryPointer (dpy, scrollBar.win,
1652 &unused_root, &unused_child, 1647 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1648 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1649 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1650 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1651 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1657 scrollbar_size ()); 1652 scrollBar.size ());
1658 want_refresh = 1; 1653 want_refresh = 1;
1659 refresh_limit = 0;
1660 scrollbar_show (1); 1654 scrollBar.show (1);
1661 } 1655 }
1662 break; 1656 break;
1663 } 1657 }
1664 1658
1665skip_switch: ;
1666
1667#if defined(CURSOR_BLINK) 1659#if defined(CURSOR_BLINK)
1668 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1660 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1669 { 1661 {
1670 if (hidden_cursor) 1662 if (hidden_cursor)
1671 { 1663 {
1672 hidden_cursor = 0; 1664 hidden_cursor = 0;
1673 want_refresh = 1; 1665 want_refresh = 1;
1674 } 1666 }
1675 1667
1676 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1668 cursor_blink_ev.again ();
1677 } 1669 }
1678#endif 1670#endif
1679 1671
1680#if defined(POINTER_BLANK) 1672#if defined(POINTER_BLANK)
1681 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1673 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1682 { 1674 {
1683 if (ev.type == MotionNotify 1675 if (ev.type == MotionNotify
1684 || ev.type == ButtonPress 1676 || ev.type == ButtonPress
1685 || ev.type == ButtonRelease) 1677 || ev.type == ButtonRelease)
1686 if (hidden_pointer) 1678 if (hidden_pointer)
… …
1688 1680
1689 if (ev.type == KeyPress && hidden_pointer == 0) 1681 if (ev.type == KeyPress && hidden_pointer == 0)
1690 pointer_blank (); 1682 pointer_blank ();
1691 } 1683 }
1692#endif 1684#endif
1685
1686 refresh_check ();
1687}
1688
1689void
1690rxvt_term::set_urgency (bool enable)
1691{
1692 if (enable == urgency_hint)
1693 return;
1694
1695 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1696 {
1697 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1698 XSetWMHints (dpy, parent[0], h);
1699 urgency_hint = enable;
1700 }
1693} 1701}
1694 1702
1695void 1703void
1696rxvt_term::focus_in () 1704rxvt_term::focus_in ()
1697{ 1705{
1698 if (!focus) 1706 if (!focus)
1699 { 1707 {
1700 focus = 1; 1708 focus = 1;
1701 want_refresh = 1; 1709 want_refresh = 1;
1702 1710
1703 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1704
1705#if USE_XIM 1711#if USE_XIM
1706 if (Input_Context != NULL) 1712 if (Input_Context != NULL)
1707 { 1713 {
1708 IMSetStatusPosition (); 1714 IMSetPosition ();
1709 XSetICFocus (Input_Context); 1715 XSetICFocus (Input_Context);
1710 } 1716 }
1711#endif 1717#endif
1712#if CURSOR_BLINK 1718#if CURSOR_BLINK
1713 if (OPTION (Opt_cursorBlink)) 1719 if (option (Opt_cursorBlink))
1714 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1720 cursor_blink_ev.again ();
1715#endif 1721#endif
1716#if OFF_FOCUS_FADING 1722#if OFF_FOCUS_FADING
1717 if (rs[Rs_fade]) 1723 if (rs[Rs_fade])
1718 { 1724 {
1719 pix_colors = pix_colors_focused; 1725 pix_colors = pix_colors_focused;
1720 scr_recolour (); 1726 scr_recolour ();
1721 } 1727 }
1722#endif 1728#endif
1729#if ENABLE_FRILLS
1730 if (option (Opt_urgentOnBell))
1731 set_urgency (0);
1732#endif
1733
1734 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1723 } 1735 }
1724} 1736}
1725 1737
1726void 1738void
1727rxvt_term::focus_out () 1739rxvt_term::focus_out ()
… …
1729 if (focus) 1741 if (focus)
1730 { 1742 {
1731 focus = 0; 1743 focus = 0;
1732 want_refresh = 1; 1744 want_refresh = 1;
1733 1745
1734 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1746#if ENABLE_FRILLS
1735 1747 if (option (Opt_urgentOnBell))
1748 set_urgency (0);
1749#endif
1736#if ENABLE_FRILLS || ISO_14755 1750#if ENABLE_FRILLS || ISO_14755
1737 if (iso14755buf) 1751 if (iso14755buf)
1738 { 1752 {
1739 iso14755buf = 0; 1753 iso14755buf = 0;
1740# if ENABLE_OVERLAY 1754# if ISO_14755
1741 scr_overlay_off (); 1755 scr_overlay_off ();
1742# endif 1756# endif
1743 } 1757 }
1744#endif 1758#endif
1745#if USE_XIM 1759#if USE_XIM
1746 if (Input_Context != NULL) 1760 if (Input_Context != NULL)
1747 XUnsetICFocus (Input_Context); 1761 XUnsetICFocus (Input_Context);
1748#endif 1762#endif
1749#if CURSOR_BLINK 1763#if CURSOR_BLINK
1750 if (OPTION (Opt_cursorBlink)) 1764 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.stop (); 1765 cursor_blink_ev.stop ();
1766
1752 hidden_cursor = 0; 1767 hidden_cursor = 0;
1753#endif 1768#endif
1754#if OFF_FOCUS_FADING 1769#if OFF_FOCUS_FADING
1755 if (rs[Rs_fade]) 1770 if (rs[Rs_fade])
1756 { 1771 {
1757 pix_colors = pix_colors_unfocused; 1772 pix_colors = pix_colors_unfocused;
1758 scr_recolour (); 1773 scr_recolour ();
1759 } 1774 }
1760#endif 1775#endif
1776
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1778 }
1779}
1780
1781void
1782rxvt_term::update_fade_color (unsigned int idx)
1783{
1784#if OFF_FOCUS_FADING
1785 if (rs[Rs_fade])
1761 } 1786 {
1787 rgba c;
1788 pix_colors [Color_fade].get (c);
1789 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1790 }
1791#endif
1762} 1792}
1763 1793
1764#if TRANSPARENT 1794#if ENABLE_TRANSPARENCY || ENABLE_PERL
1765void 1795void
1766rxvt_term::rootwin_cb (XEvent &ev) 1796rxvt_term::rootwin_cb (XEvent &ev)
1767{ 1797{
1768 make_current (); 1798 make_current ();
1769 1799
1800 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1801 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1802 return;
1803
1804# if ENABLE_TRANSPARENCY
1770 switch (ev.type) 1805 switch (ev.type)
1771 { 1806 {
1772 case PropertyNotify: 1807 case PropertyNotify:
1773 /* 1808 /*
1774 * if user used some Esetroot compatible prog to set the root bg, 1809 * if user used some Esetroot compatible prog to set the root bg,
1775 * use the property to determine the pixmap. We use it later on. 1810 * use the property to determine the pixmap. We use it later on.
1776 */ 1811 */
1777 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1812 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1778 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1813 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1779 return; 1814 {
1815 bgPixmap.set_root_pixmap ();
1816 update_background ();
1817 }
1780 1818
1781 /* FALLTHROUGH */
1782 case ReparentNotify:
1783 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1784 want_refresh = want_full_refresh = 1;
1785 break; 1819 break;
1786 } 1820 }
1821# endif
1822
1823 refresh_check ();
1787} 1824}
1788#endif 1825#endif
1789 1826
1790void 1827void
1791rxvt_term::button_press (XButtonEvent &ev) 1828rxvt_term::button_press (XButtonEvent &ev)
… …
1846 mouse_report (ev); 1883 mouse_report (ev);
1847 } 1884 }
1848#else 1885#else
1849 MEvent.button = ev.button; 1886 MEvent.button = ev.button;
1850 mouse_report (ev); 1887 mouse_report (ev);
1851#endif /* MOUSE_REPORT_DOUBLECLICK */ 1888#endif /* MOUSE_REPORT_DOUBLECLICK */
1852 1889
1853 } 1890 }
1854 else 1891 else
1855 { 1892 {
1856 if (ev.button != MEvent.button) 1893 if (ev.button != MEvent.button)
… …
1904 } 1941 }
1905 1942
1906 /* 1943 /*
1907 * Scrollbar window processing of button press 1944 * Scrollbar window processing of button press
1908 */ 1945 */
1909 if (isScrollbarWindow (ev.window)) 1946 if (scrollBar.state && ev.window == scrollBar.win)
1910 { 1947 {
1911 scrollBar.setIdle (); 1948 page_dirn direction = NO_DIR;
1949
1950 if (scrollBar.upButton (ev.y))
1951 direction = UP; /* up */
1952 else if (scrollBar.dnButton (ev.y))
1953 direction = DN; /* down */
1954
1955 scrollBar.state = STATE_IDLE;
1912 /* 1956 /*
1913 * Rxvt-style scrollbar: 1957 * Rxvt-style scrollbar:
1914 * move up if mouse is above slider 1958 * move up if mouse is above slider
1915 * move dn if mouse is below slider 1959 * move dn if mouse is below slider
1916 * 1960 *
… …
1925 /* 1969 /*
1926 * Mouse report disabled scrollbar: 1970 * Mouse report disabled scrollbar:
1927 * arrow buttons - send up/down 1971 * arrow buttons - send up/down
1928 * click on scrollbar - send pageup/down 1972 * click on scrollbar - send pageup/down
1929 */ 1973 */
1930 if ((scrollBar.style == R_SB_NEXT 1974 if (direction == UP)
1931 && scrollbarnext_upButton (ev.y))
1932 || (scrollBar.style == R_SB_RXVT
1933 && scrollbarrxvt_upButton (ev.y)))
1934 tt_printf ("\033[A"); 1975 tt_printf ("\033[A");
1935 else if ((scrollBar.style == R_SB_NEXT 1976 else if (direction == DN)
1936 && scrollbarnext_dnButton (ev.y))
1937 || (scrollBar.style == R_SB_RXVT
1938 && scrollbarrxvt_dnButton (ev.y)))
1939 tt_printf ("\033[B"); 1977 tt_printf ("\033[B");
1940 else 1978 else
1941 switch (ev.button) 1979 switch (ev.button)
1942 { 1980 {
1943 case Button2: 1981 case Button2:
… …
1950 tt_printf ("\033[5~"); 1988 tt_printf ("\033[5~");
1951 break; 1989 break;
1952 } 1990 }
1953 } 1991 }
1954 else 1992 else
1955#endif /* NO_SCROLLBAR_REPORT */ 1993#endif /* NO_SCROLLBAR_REPORT */
1956
1957 {
1958 char upordown = 0;
1959
1960 if (scrollBar.style == R_SB_NEXT)
1961 { 1994 {
1962 if (scrollbarnext_upButton (ev.y)) 1995 if (direction != NO_DIR)
1963 upordown = -1; /* up */
1964 else if (scrollbarnext_dnButton (ev.y))
1965 upordown = 1; /* down */
1966 }
1967 else if (scrollBar.style == R_SB_RXVT)
1968 {
1969 if (scrollbarrxvt_upButton (ev.y))
1970 upordown = -1; /* up */
1971 else if (scrollbarrxvt_dnButton (ev.y))
1972 upordown = 1; /* down */
1973 }
1974 if (upordown)
1975 { 1996 {
1976#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1998 if (!cont_scroll_ev.is_active ())
1977 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1999 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1978#endif 2000#endif
1979 if (scr_page (upordown < 0 ? UP : DN, 1)) 2001 if (scr_page (direction, 1))
1980 { 2002 {
1981 if (upordown < 0) 2003 if (direction == UP)
1982 scrollBar.setUp (); 2004 scrollBar.state = STATE_UP;
1983 else 2005 else
1984 scrollBar.setDn (); 2006 scrollBar.state = STATE_DOWN;
1985 } 2007 }
1986 } 2008 }
1987 else 2009 else
1988 switch (ev.button) 2010 switch (ev.button)
1989 { 2011 {
1990 case Button2: 2012 case Button2:
1991 switch (scrollbar_align) 2013 switch (scrollBar.align)
1992 { 2014 {
1993 case R_SB_ALIGN_TOP: 2015 case R_SB_ALIGN_TOP:
1994 csrO = 0; 2016 csrO = 0;
1995 break; 2017 break;
1996 case R_SB_ALIGN_CENTRE: 2018 case R_SB_ALIGN_CENTRE:
… …
2002 } 2024 }
2003 2025
2004 if (scrollBar.style == R_SB_XTERM 2026 if (scrollBar.style == R_SB_XTERM
2005 || scrollbar_above_slider (ev.y) 2027 || scrollbar_above_slider (ev.y)
2006 || scrollbar_below_slider (ev.y)) 2028 || scrollbar_below_slider (ev.y))
2007 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2029 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2008 2030
2009 scrollBar.setMotion (); 2031 scrollBar.state = STATE_MOTION;
2010 break; 2032 break;
2011 2033
2012 case Button1: 2034 case Button1:
2013 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2035 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2014 csrO = ev.y - scrollBar.top; 2036 csrO = ev.y - scrollBar.top;
2015 /* FALLTHROUGH */ 2037 /* FALLTHROUGH */
2016 2038
2017 case Button3: 2039 case Button3:
2018 if (scrollBar.style != R_SB_XTERM) 2040 if (scrollBar.style != R_SB_XTERM)
… …
2028 scr_page (DN, nrow - 1); 2050 scr_page (DN, nrow - 1);
2029# else 2051# else
2030 scr_page (DN, nrow / 4); 2052 scr_page (DN, nrow / 4);
2031# endif 2053# endif
2032 else 2054 else
2033 scrollBar.setMotion (); 2055 scrollBar.state = STATE_MOTION;
2034 } 2056 }
2035 else 2057 else
2036 { 2058 {
2037 scr_page ((ev.button == Button1 ? DN : UP), 2059 scr_page ((ev.button == Button1 ? DN : UP),
2038 (nrow 2060 (nrow
2039 * scrollbar_position (ev.y) 2061 * scrollbar_position (ev.y)
2040 / scrollbar_size ())); 2062 / scrollBar.size ()));
2041 } 2063 }
2042 2064
2043 break; 2065 break;
2044 } 2066 }
2045 } 2067 }
… …
2055 2077
2056 csrO = 0; /* reset csr Offset */ 2078 csrO = 0; /* reset csr Offset */
2057 if (!bypass_keystate) 2079 if (!bypass_keystate)
2058 reportmode = !! (priv_modes & PrivMode_mouse_report); 2080 reportmode = !! (priv_modes & PrivMode_mouse_report);
2059 2081
2060 if (scrollbar_isUpDn ()) 2082 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2061 { 2083 {
2062 scrollBar.setIdle (); 2084 scrollBar.state = STATE_IDLE;
2063 scrollbar_show (0); 2085 scrollBar.show (0);
2064 } 2086 }
2065 2087
2066#ifdef SELECTION_SCROLLING 2088#ifdef SELECTION_SCROLLING
2067 if (sel_scroll_ev.active)
2068 sel_scroll_ev.stop(); 2089 sel_scroll_ev.stop();
2069#endif 2090#endif
2070 2091
2071 if (ev.window == vt) 2092 if (ev.window == vt)
2072 { 2093 {
2073 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2094 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2097 mouse_report (ev); 2118 mouse_report (ev);
2098 } 2119 }
2099#else /* MOUSE_REPORT_DOUBLECLICK */ 2120#else /* MOUSE_REPORT_DOUBLECLICK */
2100 MEvent.button = AnyButton; 2121 MEvent.button = AnyButton;
2101 mouse_report (ev); 2122 mouse_report (ev);
2102#endif /* MOUSE_REPORT_DOUBLECLICK */ 2123#endif /* MOUSE_REPORT_DOUBLECLICK */
2103 return; 2124 return;
2104 } 2125 }
2105 2126
2106 /* 2127 /*
2107 * dumb hack to compensate for the failure of click-and-drag 2128 * dumb hack to compensate for the failure of click-and-drag
… …
2119 selection_make (ev.time); 2140 selection_make (ev.time);
2120 break; 2141 break;
2121 2142
2122 case Button2: 2143 case Button2:
2123 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2144 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2124 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2145 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2125 break; 2146 break;
2126 2147
2127#ifdef MOUSE_WHEEL 2148#ifdef MOUSE_WHEEL
2128 case Button4: 2149 case Button4:
2129 case Button5: 2150 case Button5:
… …
2133 2154
2134 v = ev.button == Button4 ? UP : DN; 2155 v = ev.button == Button4 ? UP : DN;
2135 2156
2136 if (ev.state & ShiftMask) 2157 if (ev.state & ShiftMask)
2137 i = 1; 2158 i = 1;
2138 else if (OPTION (Opt_mouseWheelScrollPage)) 2159 else if (option (Opt_mouseWheelScrollPage))
2139 i = nrow - 1; 2160 i = nrow - 1;
2140 else 2161 else
2141 i = 5; 2162 i = 5;
2142 2163
2143# ifdef MOUSE_SLIP_WHEELING 2164# ifdef MOUSE_SLIP_WHEELING
… …
2145 { 2166 {
2146 mouse_slip_wheel_speed += v ? -1 : 1; 2167 mouse_slip_wheel_speed += v ? -1 : 1;
2147 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2168 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2148 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2169 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2149 2170
2150 if (slip_wheel_ev.at < NOW) 2171 if (!slip_wheel_ev.is_active ())
2151 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2172 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2152
2153 slip_wheel_ev.start ();
2154 } 2173 }
2155 else 2174 else
2175# endif
2156 { 2176 {
2157# endif
2158 scr_page (v, i); 2177 scr_page (v, i);
2159 scrollbar_show (1); 2178 scrollBar.show (1);
2160# ifdef MOUSE_SLIP_WHEELING
2161 } 2179 }
2162# endif
2163 } 2180 }
2164 break; 2181 break;
2165#endif 2182#endif
2166 } 2183 }
2167 } 2184 }
2168} 2185}
2169 2186
2170#ifdef TRANSPARENT
2171#if TINTING
2172/* taken from aterm-0.4.2 */
2173
2174typedef uint32_t RUINT32T;
2175
2176void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2177{
2178 int sh_r, sh_g, sh_b;
2179 RUINT32T mask_r, mask_g, mask_b;
2180 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2181 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2182 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2183 int i;
2184
2185 Visual *visual = term->visual;
2186
2187 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2188
2189 /* for convenience */
2190 mask_r = visual->red_mask;
2191 mask_g = visual->green_mask;
2192 mask_b = visual->blue_mask;
2193
2194 /* boring lookup table pre-initialization */
2195 switch (srcImage->bits_per_pixel) {
2196 case 15:
2197 if ((mask_r != 0x7c00) ||
2198 (mask_g != 0x03e0) ||
2199 (mask_b != 0x001f))
2200 return;
2201 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2202 lookup_r = lookup;
2203 lookup_g = lookup+32;
2204 lookup_b = lookup+32+32;
2205 sh_r = 10;
2206 sh_g = 5;
2207 sh_b = 0;
2208 break;
2209 case 16:
2210 if ((mask_r != 0xf800) ||
2211 (mask_g != 0x07e0) ||
2212 (mask_b != 0x001f))
2213 return;
2214 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2215 lookup_r = lookup;
2216 lookup_g = lookup+32;
2217 lookup_b = lookup+32+64;
2218 sh_r = 11;
2219 sh_g = 5;
2220 sh_b = 0;
2221 break;
2222 case 24:
2223 if ((mask_r != 0xff0000) ||
2224 (mask_g != 0x00ff00) ||
2225 (mask_b != 0x0000ff))
2226 return;
2227 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2228 lookup_r = lookup;
2229 lookup_g = lookup+256;
2230 lookup_b = lookup+256+256;
2231 sh_r = 16;
2232 sh_g = 8;
2233 sh_b = 0;
2234 break;
2235 case 32:
2236 if ((mask_r != 0xff0000) ||
2237 (mask_g != 0x00ff00) ||
2238 (mask_b != 0x0000ff))
2239 return;
2240 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2241 lookup_r = lookup;
2242 lookup_g = lookup+256;
2243 lookup_b = lookup+256+256;
2244 sh_r = 16;
2245 sh_g = 8;
2246 sh_b = 0;
2247 break;
2248 default:
2249 return; /* we do not support this color depth */
2250 }
2251
2252 /* prepare limits for color transformation (each channel is handled separately) */
2253 if (shade < 0) {
2254 shade = -shade;
2255 if (shade < 0) shade = 0;
2256 if (shade > 100) shade = 100;
2257
2258 lower_lim_r = 65535-rm;
2259 lower_lim_g = 65535-gm;
2260 lower_lim_b = 65535-bm;
2261
2262 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2263 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2264 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2265
2266 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2267 } else {
2268 if (shade < 0) shade = 0;
2269 if (shade > 100) shade = 100;
2270
2271 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2272
2273 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2274 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2275 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2276 }
2277
2278 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2279 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2280 {
2281 unsigned int tmp;
2282
2283 tmp = lower_lim_r;
2284 lower_lim_r = lower_lim_b;
2285 lower_lim_b = tmp;
2286
2287 tmp = upper_lim_r;
2288 upper_lim_r = upper_lim_b;
2289 upper_lim_b = tmp;
2290 }
2291
2292 /* fill our lookup tables */
2293 for (i = 0; i <= mask_r>>sh_r; i++)
2294 {
2295 RUINT32T tmp;
2296 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2297 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2298 lookup_r[i] = (tmp/65535)<<sh_r;
2299 }
2300 for (i = 0; i <= mask_g>>sh_g; i++)
2301 {
2302 RUINT32T tmp;
2303 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2304 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2305 lookup_g[i] = (tmp/65535)<<sh_g;
2306 }
2307 for (i = 0; i <= mask_b>>sh_b; i++)
2308 {
2309 RUINT32T tmp;
2310 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2311 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2312 lookup_b[i] = (tmp/65535)<<sh_b;
2313 }
2314
2315 /* apply table to input image (replacing colors by newly calculated ones) */
2316 switch (srcImage->bits_per_pixel)
2317 {
2318 case 15:
2319 {
2320 unsigned short *p1, *pf, *p, *pl;
2321 p1 = (unsigned short *) srcImage->data;
2322 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2323 while (p1 < pf)
2324 {
2325 p = p1;
2326 pl = p1 + srcImage->width;
2327 for (; p < pl; p++)
2328 {
2329 *p = lookup_r[(*p & 0x7c00)>>10] |
2330 lookup_g[(*p & 0x03e0)>> 5] |
2331 lookup_b[(*p & 0x001f)];
2332 }
2333 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2334 }
2335 break;
2336 }
2337 case 16:
2338 {
2339 unsigned short *p1, *pf, *p, *pl;
2340 p1 = (unsigned short *) srcImage->data;
2341 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2342 while (p1 < pf)
2343 {
2344 p = p1;
2345 pl = p1 + srcImage->width;
2346 for (; p < pl; p++)
2347 {
2348 *p = lookup_r[(*p & 0xf800)>>11] |
2349 lookup_g[(*p & 0x07e0)>> 5] |
2350 lookup_b[(*p & 0x001f)];
2351 }
2352 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2353 }
2354 break;
2355 }
2356 case 24:
2357 {
2358 unsigned char *p1, *pf, *p, *pl;
2359 p1 = (unsigned char *) srcImage->data;
2360 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2361 while (p1 < pf)
2362 {
2363 p = p1;
2364 pl = p1 + srcImage->width * 3;
2365 for (; p < pl; p += 3)
2366 {
2367 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2368 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2369 p[2] = lookup_r[(p[2] & 0x0000ff)];
2370 }
2371 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2372 }
2373 break;
2374 }
2375 case 32:
2376 {
2377 RUINT32T *p1, *pf, *p, *pl;
2378 p1 = (RUINT32T *) srcImage->data;
2379 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2380
2381 while (p1 < pf)
2382 {
2383 p = p1;
2384 pl = p1 + srcImage->width;
2385 for (; p < pl; p++)
2386 {
2387 *p = lookup_r[(*p & 0xff0000)>>16] |
2388 lookup_g[(*p & 0x00ff00)>> 8] |
2389 lookup_b[(*p & 0x0000ff)] |
2390 (*p & ~0xffffff);
2391 }
2392 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2393 }
2394 break;
2395 }
2396 }
2397
2398 free (lookup);
2399}
2400#endif
2401
2402/*
2403 * Check our parents are still who we think they are.
2404 * Do transparency updates if required
2405 */
2406int
2407rxvt_term::check_our_parents ()
2408{
2409 int i, pchanged, aformat, have_pixmap, rootdepth;
2410 unsigned long nitems, bytes_after;
2411 Atom atype;
2412 unsigned char *prop = NULL;
2413 Window root, oldp, *list;
2414 Pixmap rootpixmap = None;
2415 XWindowAttributes wattr, wrootattr;
2416
2417 pchanged = 0;
2418
2419 if (!OPTION (Opt_transparent))
2420 return pchanged; /* Don't try any more */
2421
2422 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2423 rootdepth = wrootattr.depth;
2424
2425 XGetWindowAttributes (xdisp, parent[0], &wattr);
2426
2427 if (rootdepth != wattr.depth)
2428 {
2429 if (am_transparent)
2430 {
2431 pchanged = 1;
2432 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2433 am_transparent = am_pixmap_trans = 0;
2434 }
2435
2436 return pchanged; /* Don't try any more */
2437 }
2438
2439 /* Get all X ops out of the queue so that our information is up-to-date. */
2440 XSync (xdisp, False);
2441
2442 /*
2443 * Make the frame window set by the window manager have
2444 * the root background. Some window managers put multiple nested frame
2445 * windows for each client, so we have to take care about that.
2446 */
2447 i = (xa[XA_XROOTPMAP_ID]
2448 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2449 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2450 &nitems, &bytes_after, &prop) == Success);
2451
2452 if (!i || prop == NULL)
2453 i = (xa[XA_ESETROOT_PMAP_ID]
2454 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2455 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2456 &nitems, &bytes_after, &prop) == Success);
2457
2458 if (!i || prop == NULL
2459#if TINTING
2460 || !rs[Rs_color + Color_tint]
2461#endif
2462 )
2463 have_pixmap = 0;
2464 else
2465 {
2466 have_pixmap = 1;
2467 rootpixmap = *(Pixmap *)prop;
2468 XFree (prop);
2469 }
2470
2471 if (have_pixmap)
2472 {
2473 /*
2474 * Copy display->root pixmap transparency
2475 */
2476 int sx, sy, nx, ny;
2477 unsigned int nw, nh;
2478 Window cr;
2479 XImage *image;
2480 GC gc;
2481 XGCValues gcvalue;
2482
2483 XTranslateCoordinates (xdisp, parent[0], display->root,
2484 0, 0, &sx, &sy, &cr);
2485 nw = (unsigned int)szHint.width;
2486 nh = (unsigned int)szHint.height;
2487 nx = ny = 0;
2488
2489 if (sx < 0)
2490 {
2491 nw += sx;
2492 nx = -sx;
2493 sx = 0;
2494 }
2495
2496 if (sy < 0)
2497 {
2498 nh += sy;
2499 ny = -sy;
2500 sy = 0;
2501 }
2502
2503 min_it (nw, (unsigned int) (wrootattr.width - sx));
2504 min_it (nh, (unsigned int) (wrootattr.height - sy));
2505
2506 XSync (xdisp, False);
2507 allowedxerror = -1;
2508 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2509
2510 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2511 /* XXX: may need a delay here? */
2512 allowedxerror = 0;
2513
2514 if (image == NULL)
2515 {
2516 if (am_transparent && am_pixmap_trans)
2517 {
2518 pchanged = 1;
2519 if (pixmap != None)
2520 {
2521 XFreePixmap (xdisp, pixmap);
2522 pixmap = None;
2523 }
2524 }
2525
2526 am_pixmap_trans = 0;
2527 }
2528 else
2529 {
2530 if (pixmap != None)
2531 XFreePixmap (xdisp, pixmap);
2532
2533#if TINTING
2534 if (ISSET_PIXCOLOR (Color_tint))
2535 {
2536 unsigned short rm, gm, bm;
2537 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2538
2539 pix_colors_focused[Color_tint].get (this, rm, gm, bm);
2540
2541 ShadeXImage (this, image, shade, rm, gm, bm);
2542 }
2543#endif
2544
2545 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2546 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2547 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2548 nx, ny, image->width, image->height);
2549 XFreeGC (xdisp, gc);
2550 XDestroyImage (image);
2551 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2552 XClearWindow (xdisp, parent[0]);
2553
2554 if (!am_transparent || !am_pixmap_trans)
2555 pchanged = 1;
2556
2557 am_transparent = am_pixmap_trans = 1;
2558 }
2559 }
2560
2561 if (am_pixmap_trans)
2562 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2563 else
2564 {
2565 unsigned int n;
2566 /*
2567 * InheritPixmap transparency
2568 */
2569 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2570 {
2571 oldp = parent[i];
2572 XQueryTree (xdisp, parent[i - 1], &root,
2573 &parent[i], &list, &n);
2574 XFree (list);
2575
2576 if (parent[i] == display->root)
2577 {
2578 if (oldp != None)
2579 pchanged = 1;
2580
2581 break;
2582 }
2583
2584 if (oldp != parent[i])
2585 pchanged = 1;
2586 }
2587
2588 n = 0;
2589
2590 if (pchanged)
2591 {
2592 for (; n < (unsigned int)i; n++)
2593 {
2594 XGetWindowAttributes (xdisp, parent[n], &wattr);
2595 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2596 {
2597 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2598 break;
2599 }
2600 }
2601 }
2602
2603 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2604 {
2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2607 am_transparent = 0;
2608 /* XXX: also turn off Opt_transparent? */
2609 }
2610 else
2611 {
2612 for (n = 0; n < (unsigned int)i; n++)
2613 {
2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2615 XClearWindow (xdisp, parent[n]);
2616 }
2617
2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2619 am_transparent = 1;
2620 }
2621
2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2623 parent[i] = None;
2624 }
2625
2626 if (scrollBar.win)
2627 {
2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2629 scrollBar.setIdle ();
2630 scrollbar_show (0);
2631 }
2632
2633 if (am_transparent)
2634 {
2635 want_refresh = want_full_refresh = 1;
2636 if (am_pixmap_trans)
2637 flush ();
2638 }
2639
2640 return pchanged;
2641}
2642#endif
2643
2644/*}}} */ 2187/*}}} */
2645 2188
2646bool 2189void
2647rxvt_term::cmd_parse () 2190rxvt_term::cmd_parse ()
2648{ 2191{
2649 bool flag = false;
2650 wchar_t ch = NOCHAR; 2192 wchar_t ch = NOCHAR;
2651 char *seq_begin; // remember start of esc-sequence here 2193 char *seq_begin; // remember start of esc-sequence here
2652 2194
2653 for (;;) 2195 for (;;)
2654 { 2196 {
2655 if (ch == NOCHAR) 2197 if (expect_false (ch == NOCHAR))
2656 { 2198 {
2657 seq_begin = cmdbuf_ptr; 2199 seq_begin = cmdbuf_ptr;
2658 ch = next_char (); 2200 ch = next_char ();
2659 2201
2660 if (ch == NOCHAR) 2202 if (ch == NOCHAR)
2661 break; 2203 break;
2662 } 2204 }
2663 2205
2664 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2206 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2665 { 2207 {
2666 if (!seen_input) 2208 if (expect_false (!seen_input))
2667 { 2209 {
2668 seen_input = 1; 2210 seen_input = 1;
2669 // many badly-written programs (e.g. jed) contain a race condition: 2211 // many badly-written programs (e.g. jed) contain a race condition:
2670 // they first read the screensize and then install a SIGWINCH handler. 2212 // they first read the screensize and then install a SIGWINCH handler.
2671 // some window managers resize the window early, and these programs 2213 // some window managers resize the window early, and these programs
… …
2684 wchar_t *str = buf; 2226 wchar_t *str = buf;
2685 wchar_t *eol = str + min (ncol, UBUFSIZ); 2227 wchar_t *eol = str + min (ncol, UBUFSIZ);
2686 2228
2687 for (;;) 2229 for (;;)
2688 { 2230 {
2689 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2231 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2690 break; 2232 break;
2691 2233
2692 *str++ = ch; 2234 *str++ = ch;
2693 2235
2694 if (ch == C0_LF || str >= eol) 2236 if (expect_false (ch == C0_LF || str >= eol))
2695 { 2237 {
2696 if (ch == C0_LF) 2238 if (ch == C0_LF)
2697 nlines++; 2239 nlines++;
2698 2240
2699 refresh_count++; 2241 refresh_count++;
2700 2242
2701 if (!OPTION (Opt_jumpScroll) 2243 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2702 || (refresh_count >= refresh_limit * (nrow - 1)))
2703 { 2244 {
2704 refreshnow = true;
2705 refresh_count = 0; 2245 refresh_count = 0;
2246
2247 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2248 {
2249 refreshnow = true;
2706 ch = NOCHAR; 2250 ch = NOCHAR;
2707 break; 2251 break;
2252 }
2708 } 2253 }
2709 2254
2710 // scr_add_lines only works for nlines <= nrow - 1. 2255 // scr_add_lines only works for nlines <= nrow - 1.
2711 if (nlines >= nrow - 1) 2256 if (nlines >= nrow - 1)
2712 { 2257 {
… …
2740 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2285 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2741 scr_add_lines (buf, str - buf, nlines); 2286 scr_add_lines (buf, str - buf, nlines);
2742 2287
2743 /* 2288 /*
2744 * If there have been a lot of new lines, then update the screen 2289 * If there have been a lot of new lines, then update the screen
2745 * What the heck I'll cheat and only refresh less than every page-full. 2290 * What the heck we'll cheat and only refresh less than every page-full.
2746 * the number of pages between refreshes is refresh_limit, which 2291 * if skipScroll is enabled.
2747 * is incremented here because we must be doing flat-out scrolling.
2748 */ 2292 */
2749 if (refreshnow) 2293 if (refreshnow)
2750 { 2294 {
2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2752 refresh_limit++;
2753 else
2754 {
2755 flag = true;
2756 scr_refresh (); 2295 scr_refresh ();
2757 want_refresh = 1; 2296 want_refresh = 1;
2758 }
2759 } 2297 }
2760
2761 } 2298 }
2762 else 2299 else
2763 { 2300 {
2764 try 2301 try
2765 { 2302 {
… …
2773 } 2310 }
2774 2311
2775 ch = NOCHAR; 2312 ch = NOCHAR;
2776 } 2313 }
2777 } 2314 }
2778
2779 return flag;
2780} 2315}
2781 2316
2782// read the next character 2317// read the next character
2783wchar_t 2318wchar_t
2784rxvt_term::next_char () NOTHROW 2319rxvt_term::next_char () NOTHROW
2785{ 2320{
2786 while (cmdbuf_ptr < cmdbuf_endp) 2321 while (cmdbuf_ptr < cmdbuf_endp)
2787 { 2322 {
2788 // assume 7-bit to be ascii ALWAYS 2323 // assume 7-bit to be ascii ALWAYS
2789 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2324 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2790 return *cmdbuf_ptr++; 2325 return *cmdbuf_ptr++;
2791 2326
2792 wchar_t wc; 2327 wchar_t wc;
2793 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2328 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2794 2329
… …
2798 cmdbuf_ptr = cmdbuf_endp; 2333 cmdbuf_ptr = cmdbuf_endp;
2799 break; 2334 break;
2800 } 2335 }
2801 2336
2802 if (len == (size_t)-1) 2337 if (len == (size_t)-1)
2338 {
2339 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2803 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2341 }
2804 2342
2805 // assume wchar == unicode 2343 // assume wchar == unicode
2806 cmdbuf_ptr += len; 2344 cmdbuf_ptr += len;
2807 return wc & UNICODE_MASK; 2345 return wc & UNICODE_MASK;
2808 } 2346 }
… …
2852/*----------------------------------------------------------------------*/ 2390/*----------------------------------------------------------------------*/
2853#ifdef PRINTPIPE 2391#ifdef PRINTPIPE
2854FILE * 2392FILE *
2855rxvt_term::popen_printer () 2393rxvt_term::popen_printer ()
2856{ 2394{
2857 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2395 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2858 2396
2859 if (stream == NULL) 2397 if (stream == NULL)
2860 rxvt_warn ("can't open printer pipe, not printing.\n"); 2398 rxvt_warn ("can't open printer pipe, not printing.\n");
2861 2399
2862 return stream; 2400 return stream;
… …
2873 * simulate attached vt100 printer 2411 * simulate attached vt100 printer
2874 */ 2412 */
2875void 2413void
2876rxvt_term::process_print_pipe () 2414rxvt_term::process_print_pipe ()
2877{ 2415{
2878 int done; 2416 FILE *fd = popen_printer ();
2879 FILE *fd;
2880 2417
2881 if ((fd = popen_printer ()) == NULL) 2418 if (!fd)
2882 return; 2419 return;
2883 2420
2884 /* 2421 /*
2885 * Send all input to the printer until either ESC[4i or ESC[?4i 2422 * Send all input to the printer until either ESC[4i or ESC[?4i
2886 * is received. 2423 * is received.
2887 */ 2424 */
2888 for (done = 0; !done;) 2425 for (int done = 0; !done; )
2889 { 2426 {
2890 unsigned char buf[8]; 2427 unsigned char buf[8];
2891 unicode_t ch; 2428 unicode_t ch;
2892 unsigned int i, len; 2429 unsigned int i, len;
2893 2430
… …
2912 { 2449 {
2913 if ((buf[len++] = cmd_getc ()) == 'i') 2450 if ((buf[len++] = cmd_getc ()) == 'i')
2914 break; /* done = 1 */ 2451 break; /* done = 1 */
2915 } 2452 }
2916 } 2453 }
2917 2454
2918 for (i = 0; i < len; i++) 2455 for (i = 0; i < len; i++)
2919 if (putc (buf[i], fd) == EOF) 2456 if (putc (buf[i], fd) == EOF)
2920 { 2457 {
2921 done = 1; 2458 done = 1;
2922 break; 2459 break;
… …
2924 } 2461 }
2925 } 2462 }
2926 2463
2927 pclose_printer (fd); 2464 pclose_printer (fd);
2928} 2465}
2929#endif /* PRINTPIPE */ 2466#endif /* PRINTPIPE */
2930/*}}} */ 2467/*}}} */
2931 2468
2932/* *INDENT-OFF* */ 2469/* *INDENT-OFF* */
2933enum { 2470enum {
2934 C1_40 = 0x40, 2471 C1_40 = 0x40,
… …
2984 process_dcs_seq (); 2521 process_dcs_seq ();
2985 break; 2522 break;
2986 case 0x9b: /* CSI */ 2523 case 0x9b: /* CSI */
2987 process_csi_seq (); 2524 process_csi_seq ();
2988 break; 2525 break;
2989 case 0x9d: /* CSI */ 2526 case 0x9d: /* OSC */
2990 process_osc_seq (); 2527 process_osc_seq ();
2991 break; 2528 break;
2992#endif 2529#endif
2993 } 2530 }
2994} 2531}
… …
3038 break; 2575 break;
3039 case 'Z': /* identify the terminal type */ 2576 case 'Z': /* identify the terminal type */
3040 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2577 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3041 break; 2578 break;
3042 case '<': /* turn off VT52 mode */ 2579 case '<': /* turn off VT52 mode */
3043 PrivMode (0, PrivMode_vt52); 2580 set_privmode (PrivMode_vt52, 0);
3044 break; 2581 break;
3045 case 'F': /* use special graphics character set */ 2582 case 'F': /* use special graphics character set */
3046 case 'G': /* use regular character set */ 2583 case 'G': /* use regular character set */
3047 /* unimplemented */ 2584 /* unimplemented */
3048 break; 2585 break;
… …
3084 scr_charset_set (2, (unsigned int)cmd_getc ()); 2621 scr_charset_set (2, (unsigned int)cmd_getc ());
3085 break; 2622 break;
3086 case '+': 2623 case '+':
3087 scr_charset_set (3, (unsigned int)cmd_getc ()); 2624 scr_charset_set (3, (unsigned int)cmd_getc ());
3088 break; 2625 break;
3089#if ENABLE_FRILLS 2626#if !ENABLE_MINIMAL
3090 case '6': 2627 case '6':
3091 scr_backindex (); 2628 scr_backindex ();
3092 break; 2629 break;
3093#endif 2630#endif
3094 case '7': 2631 case '7':
3095 scr_cursor (SAVE); 2632 scr_cursor (SAVE);
3096 break; 2633 break;
3097 case '8': 2634 case '8':
3098 scr_cursor (RESTORE); 2635 scr_cursor (RESTORE);
3099 break; 2636 break;
3100#if ENABLE_FRILLS 2637#if !ENABLE_MINIMAL
3101 case '9': 2638 case '9':
3102 scr_forwardindex (); 2639 scr_forwardindex ();
3103 break; 2640 break;
3104#endif 2641#endif
3105 case '=': 2642 case '=':
3106 case '>': 2643 case '>':
3107 PrivMode ((ch == '='), PrivMode_aplKP); 2644 set_privmode (PrivMode_aplKP, ch == '=');
3108 break; 2645 break;
3109 2646
3110 case C1_40: 2647 case C1_40:
3111 cmd_getc (); 2648 cmd_getc ();
3112 break; 2649 break;
… …
3165 2702
3166 /* 8.3.106: RESET TO INITIAL STATE */ 2703 /* 8.3.106: RESET TO INITIAL STATE */
3167 case 'c': 2704 case 'c':
3168 mbstate.reset (); 2705 mbstate.reset ();
3169 scr_poweron (); 2706 scr_poweron ();
3170 scrollbar_show (1); 2707 scrollBar.show (1);
3171 break; 2708 break;
3172 2709
3173 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2710 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3174 case 'n': 2711 case 'n':
3175 scr_charset_choose (2); 2712 scr_charset_choose (2);
… …
3220rxvt_term::process_csi_seq () 2757rxvt_term::process_csi_seq ()
3221{ 2758{
3222 unicode_t ch, priv, i; 2759 unicode_t ch, priv, i;
3223 unsigned int nargs, p; 2760 unsigned int nargs, p;
3224 int n, ndef; 2761 int n, ndef;
3225 int arg[ESC_ARGS]; 2762 int arg[ESC_ARGS] = { };
3226 2763
3227 for (nargs = ESC_ARGS; nargs > 0;) 2764 nargs = 0;
3228 arg[--nargs] = 0;
3229 2765
3230 priv = 0; 2766 priv = 0;
3231 ch = cmd_getc (); 2767 ch = cmd_getc ();
3232 if (ch >= '<' && ch <= '?') 2768 if (ch >= '<' && ch <= '?')
2769 {
3233 { /* '<' '=' '>' '?' */ 2770 /* '<' '=' '>' '?' */
3234 priv = ch; 2771 priv = ch;
3235 ch = cmd_getc (); 2772 ch = cmd_getc ();
3236 } 2773 }
3237 2774
3238 /* read any numerical arguments */ 2775 /* read any numerical arguments */
… …
3277 switch (priv) 2814 switch (priv)
3278 { 2815 {
3279 case '>': 2816 case '>':
3280 if (ch == CSI_DA) /* secondary device attributes */ 2817 if (ch == CSI_DA) /* secondary device attributes */
3281 { 2818 {
3282 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2819 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3283 // 'U' for rxvt-unicode <= 7.2. 2820 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3284 // 2821 //
3285 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2822 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3286 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2823 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3287 // that we do not support xterm mouse reporting (should be 95 when we do). 2824 // versions.
3288 // 2825 //
3289 tt_printf ("\033[>0;94;0c"); 2826 tt_printf ("\033[>%d;95;0c", 'U');
3290 } 2827 }
3291 break; 2828 break;
2829
3292 case '?': 2830 case '?':
3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2831 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3294 process_terminal_mode (ch, priv, nargs, arg); 2832 process_terminal_mode (ch, priv, nargs, arg);
3295 break; 2833 break;
3296 } 2834 }
… …
3421 break; 2959 break;
3422 case 6: /* CPR requested */ 2960 case 6: /* CPR requested */
3423 scr_report_position (); 2961 scr_report_position ();
3424 break; 2962 break;
3425 case 7: /* unofficial extension */ 2963 case 7: /* unofficial extension */
3426 if (OPTION (Opt_insecure)) 2964 if (option (Opt_insecure))
3427 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2965 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3428 break; 2966 break;
3429 case 8: /* unofficial extension */ 2967 case 8: /* unofficial extension */
3430 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2968 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3431 break; 2969 break;
… …
3498 break; 3036 break;
3499 case CSI_75: 3037 case CSI_75:
3500 scr_cursor (RESTORE); 3038 scr_cursor (RESTORE);
3501 break; 3039 break;
3502 3040
3503#if ENABLE_FRILLS 3041#if !ENABLE_MINIMAL
3504 case CSI_74: 3042 case CSI_74:
3505 process_window_ops (arg, nargs); 3043 process_window_ops (arg, nargs);
3506 break; 3044 break;
3507#endif 3045#endif
3508 3046
… …
3515 break; 3053 break;
3516 } 3054 }
3517} 3055}
3518/*}}} */ 3056/*}}} */
3519 3057
3520#if ENABLE_FRILLS 3058#if !ENABLE_MINIMAL
3521/* ARGSUSED */ 3059/* ARGSUSED */
3522void 3060void
3523rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3061rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3524{ 3062{
3525 int x, y; 3063 int x, y;
3526 XWindowAttributes wattr; 3064 XWindowAttributes wattr;
3527 Window wdummy; 3065 Window wdummy;
3528 3066
3529 dLocal (Display *, xdisp); 3067 dLocal (Display *, dpy);
3530 3068
3531 if (nargs == 0) 3069 if (nargs == 0)
3532 return; 3070 return;
3533 3071
3534 switch (args[0]) 3072 switch (args[0])
3535 { 3073 {
3536 /* 3074 /*
3537 * commands 3075 * commands
3538 */ 3076 */
3539 case 1: /* deiconify window */ 3077 case 1: /* deiconify window */
3540 XMapWindow (xdisp, parent[0]); 3078 XMapWindow (dpy, parent[0]);
3541 break; 3079 break;
3542 case 2: /* iconify window */ 3080 case 2: /* iconify window */
3543 XIconifyWindow (xdisp, parent[0], display->screen); 3081 XIconifyWindow (dpy, parent[0], display->screen);
3544 break; 3082 break;
3545 case 3: /* set position (pixels) */ 3083 case 3: /* set position (pixels) */
3546 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3084 XMoveWindow (dpy, parent[0], args[1], args[2]);
3547 break; 3085 break;
3548 case 4: /* set size (pixels) */ 3086 case 4: /* set size (pixels) */
3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3087 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3550 break; 3088 break;
3551 case 5: /* raise window */ 3089 case 5: /* raise window */
3552 XRaiseWindow (xdisp, parent[0]); 3090 XRaiseWindow (dpy, parent[0]);
3553 break; 3091 break;
3554 case 6: /* lower window */ 3092 case 6: /* lower window */
3555 XLowerWindow (xdisp, parent[0]); 3093 XLowerWindow (dpy, parent[0]);
3556 break; 3094 break;
3557 case 7: /* refresh window */ 3095 case 7: /* refresh window */
3558 scr_touch (true); 3096 scr_touch (true);
3559 break; 3097 break;
3560 case 8: /* set size (chars) */ 3098 case 8: /* set size (chars) */
… …
3567 if (args[0] >= 24) /* set height (chars) */ 3105 if (args[0] >= 24) /* set height (chars) */
3568 set_widthheight ((unsigned int)width, 3106 set_widthheight ((unsigned int)width,
3569 (unsigned int) (args[1] * fheight)); 3107 (unsigned int) (args[1] * fheight));
3570 break; 3108 break;
3571 3109
3572
3573 /* 3110 /*
3574 * reports - some output format copied from XTerm 3111 * reports - some output format copied from XTerm
3575 */ 3112 */
3576 case 11: /* report window state */ 3113 case 11: /* report window state */
3577 XGetWindowAttributes (xdisp, parent[0], &wattr); 3114 XGetWindowAttributes (dpy, parent[0], &wattr);
3578 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3115 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3579 break; 3116 break;
3580 case 13: /* report window position */ 3117 case 13: /* report window position */
3581 XGetWindowAttributes (xdisp, parent[0], &wattr); 3118 XGetWindowAttributes (dpy, parent[0], &wattr);
3582 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3119 XTranslateCoordinates (dpy, parent[0], wattr.root,
3583 -wattr.border_width, -wattr.border_width, 3120 -wattr.border_width, -wattr.border_width,
3584 &x, &y, &wdummy); 3121 &x, &y, &wdummy);
3585 tt_printf ("\033[3;%d;%dt", x, y); 3122 tt_printf ("\033[3;%d;%dt", x, y);
3586 break; 3123 break;
3587 case 14: /* report window size (pixels) */ 3124 case 14: /* report window size (pixels) */
3588 XGetWindowAttributes (xdisp, parent[0], &wattr); 3125 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3126 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3590 break; 3127 break;
3591 case 18: /* report text area size (chars) */ 3128 case 18: /* report text area size (chars) */
3592 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3129 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3593 break; 3130 break;
… …
3595 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3132 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3596 break; 3133 break;
3597 case 20: /* report icon label */ 3134 case 20: /* report icon label */
3598 { 3135 {
3599 char *s; 3136 char *s;
3600 XGetIconName (xdisp, parent[0], &s); 3137 XGetIconName (dpy, parent[0], &s);
3601 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3138 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3602 XFree (s); 3139 XFree (s);
3603 } 3140 }
3604 break; 3141 break;
3605 case 21: /* report window title */ 3142 case 21: /* report window title */
3606 { 3143 {
3607 char *s; 3144 char *s;
3608 XFetchName (xdisp, parent[0], &s); 3145 XFetchName (dpy, parent[0], &s);
3609 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3146 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3610 XFree (s); 3147 XFree (s);
3611 } 3148 }
3612 break; 3149 break;
3613 } 3150 }
3614} 3151}
… …
3641 seen_esc = true; 3178 seen_esc = true;
3642 continue; 3179 continue;
3643 } 3180 }
3644 else if (ch == C0_BEL || ch == CHAR_ST) 3181 else if (ch == C0_BEL || ch == CHAR_ST)
3645 break; 3182 break;
3183 else if (ch == C0_SYN)
3184 ch = cmd_get8 ();
3646 else if (ch < 0x20) 3185 else if (ch < 0x20)
3647 return NULL; /* other control character - exit */ 3186 return NULL; /* other control character - exit */
3648 3187
3649 seen_esc = false; 3188 seen_esc = false;
3650 3189
3651 if (n >= STRING_MAX - 1) 3190 if (n >= STRING_MAX - 1)
3652 // stop at some sane length 3191 // stop at some sane length
3653 return NULL; 3192 return NULL;
3654 3193
3655 if (ch == C0_SYN)
3656 string[n++] = cmd_get8 ();
3657 else
3658 string[n++] = ch; 3194 string[n++] = ch;
3659 } 3195 }
3660 3196
3661 string[n++] = '\0'; 3197 string[n++] = '\0';
3662 3198
3663 ends_how = (ch == 0x5c ? C0_ESC : ch); 3199 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3714void 3250void
3715rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3251rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3716{ 3252{
3717 if (str[0] == '?' && !str[1]) 3253 if (str[0] == '?' && !str[1])
3718 { 3254 {
3719 unsigned short r, g, b; 3255 rgba c;
3720 pix_colors_focused[color].get (this, r, g, b); 3256 pix_colors_focused[color].get (c);
3257
3258#if XFT
3259 if (c.a != rgba::MAX_CC)
3260 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3261 else
3262#endif
3721 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3263 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3722 } 3264 }
3723 else 3265 else
3724 set_window_color (color, str); 3266 set_window_color (color, str);
3725} 3267}
3726 3268
… …
3733 int color; 3275 int color;
3734 char *buf, *name; 3276 char *buf, *name;
3735 bool query = str[0] == '?' && !str[1]; 3277 bool query = str[0] == '?' && !str[1];
3736 int saveop = op; 3278 int saveop = op;
3737 3279
3738 dLocal (Display *, xdisp); 3280 dLocal (Display *, dpy);
3739 3281
3740 assert (str != NULL); 3282 assert (str != NULL);
3283
3284 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3285 return;
3286
3741 switch (op) 3287 switch (op)
3742 { 3288 {
3743 case XTerm_name: 3289 case XTerm_name:
3744 set_title (str); 3290 set_title (str);
3745 /* FALLTHROUGH */ 3291 /* FALLTHROUGH */
… …
3759 unsigned long bytes_after; 3305 unsigned long bytes_after;
3760 unsigned char *value = 0; 3306 unsigned char *value = 0;
3761 const char *str = ""; 3307 const char *str = "";
3762 3308
3763 if (prop 3309 if (prop
3764 && XGetWindowProperty (xdisp, parent[0], 3310 && XGetWindowProperty (dpy, parent[0],
3765 prop, 0, 1<<16, 0, AnyPropertyType, 3311 prop, 0, 1<<16, 0, AnyPropertyType,
3766 &actual_type, &actual_format, 3312 &actual_type, &actual_format,
3767 &nitems, &bytes_after, &value) == Success 3313 &nitems, &bytes_after, &value) == Success
3768 && actual_type != None 3314 && actual_type != None
3769 && actual_format == 8) 3315 && actual_format == 8)
3770 str = (const char *)(value); 3316 str = (const char *)(value);
3771 3317
3772 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3318 tt_printf ("\033]%d;%s%c", op, str, resp);
3773 3319
3774 XFree (value); 3320 XFree (value);
3775 } 3321 }
3776 else 3322 else
3777 { 3323 {
… …
3781 { 3327 {
3782 *eq = 0; 3328 *eq = 0;
3783 set_utf8_property (display->atom (str), eq + 1); 3329 set_utf8_property (display->atom (str), eq + 1);
3784 } 3330 }
3785 else 3331 else
3786 XDeleteProperty (xdisp, parent[0], 3332 XDeleteProperty (dpy, parent[0],
3787 display->atom (str)); 3333 display->atom (str));
3788 } 3334 }
3789 break; 3335 break;
3790 3336
3791 case XTerm_Color: 3337 case XTerm_Color:
… …
3801 break; 3347 break;
3802 3348
3803 if ((buf = strchr (name, ';')) != NULL) 3349 if ((buf = strchr (name, ';')) != NULL)
3804 *buf++ = '\0'; 3350 *buf++ = '\0';
3805 3351
3806 if (name[0] == '?' && !name[1]) 3352 process_color_seq (op, color, name, resp);
3807 {
3808 unsigned short r, g, b;
3809 pix_colors_focused[color].get (this, r, g, b);
3810 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3811 }
3812 else
3813 set_window_color (color, name);
3814 } 3353 }
3815 break; 3354 break;
3355 case Rxvt_restoreFG:
3816 case XTerm_Color00: 3356 case XTerm_Color00:
3817 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3357 process_color_seq (op, Color_fg, str, resp);
3818 break; 3358 break;
3359 case Rxvt_restoreBG:
3819 case XTerm_Color01: 3360 case XTerm_Color01:
3820 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3361 process_color_seq (op, Color_bg, str, resp);
3821 break; 3362 break;
3822#ifndef NO_CURSORCOLOR 3363#ifndef NO_CURSORCOLOR
3823 case XTerm_Color_cursor: 3364 case XTerm_Color_cursor:
3824 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3365 process_color_seq (op, Color_cursor, str, resp);
3825 break; 3366 break;
3826#endif 3367#endif
3827 case XTerm_Color_pointer_fg: 3368 case XTerm_Color_pointer_fg:
3828 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3369 process_color_seq (op, Color_pointer_fg, str, resp);
3829 break; 3370 break;
3830 case XTerm_Color_pointer_bg: 3371 case XTerm_Color_pointer_bg:
3831 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3372 process_color_seq (op, Color_pointer_bg, str, resp);
3832 break; 3373 break;
3833#ifndef NO_BOLD_UNDERLINE_REVERSE 3374#ifndef NO_BOLD_UNDERLINE_REVERSE
3834 case XTerm_Color_RV: 3375 case XTerm_Color_RV:
3835 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3376 process_color_seq (op, Color_RV, str, resp);
3836 break; 3377 break;
3837 case Rxvt_Color_BD: 3378 case Rxvt_Color_BD:
3838 case URxvt_Color_BD: 3379 case URxvt_Color_BD:
3839 process_color_seq (op, Color_BD, str, resp); 3380 process_color_seq (op, Color_BD, str, resp);
3840 break; 3381 break;
3841 case Rxvt_Color_UL: 3382 case Rxvt_Color_UL:
3842 case URxvt_Color_UL: 3383 case URxvt_Color_UL:
3843 process_color_seq (op, Color_UL, str, resp); 3384 process_color_seq (op, Color_UL, str, resp);
3844 break; 3385 break;
3845 case URxvt_Color_IT: 3386 case URxvt_Color_IT:
3846 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3387 process_color_seq (op, Color_IT, str, resp);
3847 break; 3388 break;
3848#endif 3389#endif
3849#if TRANSPARENT && TINTING 3390#if ENABLE_TRANSPARENCY
3850 case URxvt_Color_tint: 3391 case URxvt_Color_tint:
3851 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3392 process_color_seq (op, Color_tint, str, resp);
3852 check_our_parents (); 3393 {
3853 if (am_transparent) 3394 bool changed = false;
3854 want_full_refresh = want_refresh = 1;
3855 break;
3856#endif
3857 3395
3396 if (ISSET_PIXCOLOR (Color_tint))
3397 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3398 else
3399 changed = bgPixmap.unset_tint ();
3400
3401 if (changed)
3402 update_background ();
3403 }
3404
3405 break;
3406#endif
3407
3408#if BG_IMAGE_FROM_FILE
3858 case Rxvt_Pixmap: 3409 case Rxvt_Pixmap:
3859 { 3410 if (!strcmp (str, "?"))
3860 if (*str != ';')
3861 { 3411 {
3862#if XPM_BACKGROUND 3412 char str[256];
3863 scale_pixmap (""); /* reset to default scaling */ 3413
3864 set_bgPixmap (str); /* change pixmap */ 3414 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3865 scr_touch (true); 3415 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3866#endif 3416 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3417 process_xterm_seq (XTerm_title, str, CHAR_ST);
3867 } 3418 }
3868 3419 else
3420 {
3869 int changed = 0; 3421 int changed = 0;
3870 3422
3871 while ((str = strchr (str, ';')) != NULL) 3423 if (*str != ';')
3872 { 3424 {
3425 /* reset to default scaling :*/
3426 bgPixmap.unset_geometry ();
3427 if (bgPixmap.set_file (str)) /* change pixmap */
3428 changed++;
3429 str = strchr (str, ';');
3430 if (str == NULL)
3431 bgPixmap.set_defaultGeometry ();
3432 }
3433
3434 while (str)
3435 {
3873 str++; 3436 str++;
3874#if XPM_BACKGROUND 3437 if (bgPixmap.set_geometry (str))
3875 changed += scale_pixmap (str); 3438 changed++;
3876#endif 3439 str = strchr (str, ';');
3877 } 3440 }
3878 3441
3879 if (changed) 3442 if (changed)
3880 { 3443 update_background ();
3881#ifdef XPM_BACKGROUND
3882 resize_pixmap ();
3883 scr_touch (true);
3884#endif
3885 } 3444 }
3886 }
3887 break; 3445 break;
3888 3446#endif
3889 case Rxvt_restoreFG:
3890 set_window_color (Color_fg, str);
3891 break;
3892 case Rxvt_restoreBG:
3893 set_window_color (Color_bg, str);
3894 break;
3895 3447
3896 case XTerm_logfile: 3448 case XTerm_logfile:
3897 // TODO, when secure mode? 3449 // TODO, when secure mode?
3898 break; 3450 break;
3899 3451
… …
3917 case URxvt_italicFont: 3469 case URxvt_italicFont:
3918 case URxvt_boldItalicFont: 3470 case URxvt_boldItalicFont:
3919#endif 3471#endif
3920 if (query) 3472 if (query)
3921 tt_printf ("\33]%d;%-.250s%c", saveop, 3473 tt_printf ("\33]%d;%-.250s%c", saveop,
3922 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3474 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3923 ? fontset[op - URxvt_font]->fontdesc : "", 3475 ? fontset[op - URxvt_font]->fontdesc : "",
3924 resp); 3476 resp);
3925 else 3477 else
3926 { 3478 {
3927 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3479 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3933 break; 3485 break;
3934 3486
3935 case URxvt_version: 3487 case URxvt_version:
3936 if (query) 3488 if (query)
3937 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3489 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3938 URxvt_version, 3490 op,
3939 rs[Rs_name],
3940 VERSION[0], VERSION[2], 3491 rs[Rs_name], VERSION[0], VERSION[2],
3941 resp); 3492 resp);
3942 break; 3493 break;
3943 3494
3944#if ENABLE_FRILLS 3495#if !ENABLE_MINIMAL
3945 case URxvt_locale: 3496 case URxvt_locale:
3946 if (query) 3497 if (query)
3947 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3498 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3948 else 3499 else
3949 { 3500 {
3950 set_locale (str); 3501 set_locale (str);
3951 pty->set_utf8_mode (enc_utf8); 3502 pty->set_utf8_mode (enc_utf8);
3952 init_xlocale (); 3503 init_xlocale ();
… …
3967 break; 3518 break;
3968#endif 3519#endif
3969 3520
3970#if ENABLE_PERL 3521#if ENABLE_PERL
3971 case URxvt_perl: 3522 case URxvt_perl:
3972 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3523 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3973 ; // no responses yet
3974 break; 3524 break;
3975#endif 3525#endif
3976 } 3526 }
3977} 3527}
3978/*----------------------------------------------------------------------*/ 3528/*----------------------------------------------------------------------*/
… …
4001 { 3551 {
4002 if (mode == 'r') 3552 if (mode == 'r')
4003 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3553 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4004 else 3554 else
4005 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3555 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4006 PrivMode (state, bit); 3556 set_privmode (bit, state);
4007 } 3557 }
4008 3558
4009 return state; 3559 return state;
4010} 3560}
4011 3561
… …
4015{ 3565{
4016 unsigned int i, j; 3566 unsigned int i, j;
4017 int state; 3567 int state;
4018 3568
4019 static const struct 3569 static const struct
4020 { 3570 {
4021 const int argval; 3571 const int argval;
4022 const unsigned long bit; 3572 const unsigned long bit;
4023 }
4024
4025 argtopriv[] = { 3573 } argtopriv[] = {
4026 { 1, PrivMode_aplCUR }, 3574 { 1, PrivMode_aplCUR },
4027 { 2, PrivMode_vt52 }, 3575 { 2, PrivMode_vt52 },
4028 { 3, PrivMode_132 }, 3576 { 3, PrivMode_132 },
4029 { 4, PrivMode_smoothScroll }, 3577 { 4, PrivMode_smoothScroll },
4030 { 5, PrivMode_rVideo }, 3578 { 5, PrivMode_rVideo },
… …
4046 { 66, PrivMode_aplKP }, 3594 { 66, PrivMode_aplKP },
4047#ifndef NO_BACKSPACE_KEY 3595#ifndef NO_BACKSPACE_KEY
4048 { 67, PrivMode_BackSpace }, 3596 { 67, PrivMode_BackSpace },
4049#endif 3597#endif
4050 { 1000, PrivMode_MouseX11 }, 3598 { 1000, PrivMode_MouseX11 },
4051 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3599 { 1002, PrivMode_MouseBtnEvent },
4052 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3600 { 1003, PrivMode_MouseAnyEvent },
4053 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4054 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3601 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4055 { 1011, PrivMode_Keypress }, // rxvt extension 3602 { 1011, PrivMode_Keypress }, // rxvt extension
4056 // 1035 enable modifiers for alt, numlock NYI 3603 // 1035 enable modifiers for alt, numlock NYI
4057 // 1036 send ESC for meta keys NYI 3604 // 1036 send ESC for meta keys NYI
4058 // 1037 send DEL for keypad delete NYI 3605 // 1037 send DEL for keypad delete NYI
4059 { 1047, PrivMode_Screen }, 3606 { 1047, PrivMode_Screen },
4060 // 1048 save and restore cursor 3607 // 1048 save and restore cursor
4061 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3608 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4062 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3609 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3610 { 2004, PrivMode_BracketPaste },
4063 }; 3611 };
4064 3612
4065 if (nargs == 0) 3613 if (nargs == 0)
4066 return; 3614 return;
4067 3615
… …
4093 scr_touch (true); 3641 scr_touch (true);
4094 break; 3642 break;
4095#endif 3643#endif
4096 case 1048: /* alternative cursor save */ 3644 case 1048: /* alternative cursor save */
4097 case 1049: 3645 case 1049:
4098 if (OPTION (Opt_secondaryScreen)) 3646 if (option (Opt_secondaryScreen))
4099 if (mode == 0) 3647 if (mode == 0)
4100 scr_cursor (RESTORE); 3648 scr_cursor (RESTORE);
4101 else if (mode == 1) 3649 else if (mode == 1)
4102 scr_cursor (SAVE); 3650 scr_cursor (SAVE);
4103 break; 3651 break;
… …
4111 case 2: /* VT52 mode */ 3659 case 2: /* VT52 mode */
4112 /* oddball mode. should be set regardless of set/reset 3660 /* oddball mode. should be set regardless of set/reset
4113 * parameter. Return from VT52 mode with an ESC < from 3661 * parameter. Return from VT52 mode with an ESC < from
4114 * within VT52 mode 3662 * within VT52 mode
4115 */ 3663 */
4116 PrivMode (1, PrivMode_vt52); 3664 set_privmode (PrivMode_vt52, 1);
4117 break; 3665 break;
4118 case 3: /* 80/132 */ 3666 case 3: /* 80/132 */
4119 if (priv_modes & PrivMode_132OK) 3667 if (priv_modes & PrivMode_132OK)
3668 {
3669 scr_poweron ();
4120 set_widthheight (((state ? 132 : 80) * fwidth), height); 3670 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3671 }
4121 break; 3672 break;
4122 case 4: /* smooth scrolling */ 3673 case 4: /* smooth scrolling */
4123 set_option (Opt_jumpScroll, !state); 3674 set_option (Opt_jumpScroll, !state);
4124 break; 3675 break;
4125 case 5: /* reverse video */ 3676 case 5: /* reverse video */
… …
4132 scr_autowrap (state); 3683 scr_autowrap (state);
4133 break; 3684 break;
4134 /* case 8: - auto repeat, can't do on a per window basis */ 3685 /* case 8: - auto repeat, can't do on a per window basis */
4135 case 9: /* X10 mouse reporting */ 3686 case 9: /* X10 mouse reporting */
4136 if (state) /* orthogonal */ 3687 if (state) /* orthogonal */
4137 priv_modes &= ~PrivMode_MouseX11; 3688 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4138 break; 3689 break;
4139#ifdef scrollBar_esc 3690#ifdef scrollBar_esc
4140 case scrollBar_esc: 3691 case scrollBar_esc:
4141 if (scrollbar_mapping (state)) 3692 if (scrollBar.map (state))
4142 { 3693 {
4143 resize_all_windows (0, 0, 0); 3694 resize_all_windows (0, 0, 0);
4144 scr_touch (true); 3695 scr_touch (true);
4145 } 3696 }
4146 break; 3697 break;
… …
4155 break; 3706 break;
4156 /* case 66: - application key pad */ 3707 /* case 66: - application key pad */
4157 /* case 67: - backspace key */ 3708 /* case 67: - backspace key */
4158 case 1000: /* X11 mouse reporting */ 3709 case 1000: /* X11 mouse reporting */
4159 if (state) /* orthogonal */ 3710 if (state) /* orthogonal */
4160 priv_modes &= ~PrivMode_MouseX10; 3711 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4161 break; 3712 break;
4162#if 0
4163 case 1001: 3713 case 1002:
4164 break; /* X11 mouse highlighting */ 3714 case 1003:
4165#endif 3715 if (state)
3716 {
3717 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3718 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3719 vt_emask_mouse = PointerMotionMask;
3720 }
3721 else
3722 vt_emask_mouse = NoEventMask;
3723 vt_select_input ();
3724 break;
4166 case 1010: /* scroll to bottom on TTY output inhibit */ 3725 case 1010: /* scroll to bottom on TTY output inhibit */
4167 set_option (Opt_scrollTtyOutput, !state); 3726 set_option (Opt_scrollTtyOutput, !state);
4168 break; 3727 break;
4169 case 1011: /* scroll to bottom on key press */ 3728 case 1011: /* scroll to bottom on key press */
4170 set_option (Opt_scrollTtyKeypress, state); 3729 set_option (Opt_scrollTtyKeypress, state);
4171 break; 3730 break;
4172 case 1047: /* secondary screen w/ clearing last */ 3731 case 1047: /* secondary screen w/ clearing last */
4173 if (OPTION (Opt_secondaryScreen)) 3732 if (option (Opt_secondaryScreen))
4174 if (current_screen != PRIMARY) 3733 if (current_screen != PRIMARY)
4175 scr_erase_screen (2); 3734 scr_erase_screen (2);
4176 scr_change_screen (state); 3735 scr_change_screen (state);
4177 break; 3736 break;
4178 case 1049: /* secondary screen w/ clearing first */ 3737 case 1049: /* secondary screen w/ clearing first */
4179 scr_change_screen (state); 3738 scr_change_screen (state);
4180 if (OPTION (Opt_secondaryScreen)) 3739 if (option (Opt_secondaryScreen))
4181 if (current_screen != PRIMARY) 3740 if (current_screen != PRIMARY)
4182 scr_erase_screen (2); 3741 scr_erase_screen (2);
4183 break; 3742 break;
4184 default: 3743 default:
4185 break; 3744 break;
… …
4313 scr_color (Color_bg, Color_bg); 3872 scr_color (Color_bg, Color_bg);
4314 break; 3873 break;
4315 3874
4316 //case 50: // not variable spacing 3875 //case 50: // not variable spacing
4317 3876
4318#if ENABLE_FRILLS 3877#if !ENABLE_MINIMAL
4319 case 90: 3878 case 90:
4320 case 91: /* set bright fg color */ 3879 case 91: /* set bright fg color */
4321 case 92: 3880 case 92:
4322 case 93: 3881 case 93:
4323 case 94: 3882 case 94:
… …
4347rxvt_term::process_graphics () 3906rxvt_term::process_graphics ()
4348{ 3907{
4349 unicode_t ch, cmd = cmd_getc (); 3908 unicode_t ch, cmd = cmd_getc ();
4350 3909
4351 if (cmd == 'Q') 3910 if (cmd == 'Q')
3911 {
4352 { /* query graphics */ 3912 /* query graphics */
4353 tt_printf ("\033G0\012"); /* no graphics */ 3913 tt_printf ("\033G0\012"); /* no graphics */
4354 return; 3914 return;
4355 } 3915 }
4356 /* swallow other graphics sequences until terminating ':' */ 3916 /* swallow other graphics sequences until terminating ':' */
4357 do 3917 do
… …
4407 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3967 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4408 3968
4409 memcpy (v_buffer + v_buflen, data, len); 3969 memcpy (v_buffer + v_buflen, data, len);
4410 v_buflen += len; 3970 v_buflen += len;
4411 3971
4412 pty_ev.set (EVENT_READ | EVENT_WRITE); 3972 pty_ev.set (ev::READ | ev::WRITE);
4413} 3973}
4414 3974
4415void rxvt_term::pty_write () 3975void rxvt_term::pty_write ()
4416{ 3976{
4417 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3977 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4422 3982
4423 if (v_buflen == 0) 3983 if (v_buflen == 0)
4424 { 3984 {
4425 free (v_buffer); 3985 free (v_buffer);
4426 v_buffer = 0; 3986 v_buffer = 0;
4427 v_buflen = 0;
4428 3987
4429 pty_ev.set (EVENT_READ); 3988 pty_ev.set (ev::READ);
4430 return; 3989 return;
4431 } 3990 }
4432 3991
4433 memmove (v_buffer, v_buffer + written, v_buflen); 3992 memmove (v_buffer, v_buffer + written, v_buflen);
4434 } 3993 }
4435 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3994 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4436 pty_ev.set (EVENT_READ); 3995 pty_ev.set (ev::READ);
4437} 3996}
4438 3997
4439/*----------------------- end-of-file (C source) -----------------------*/ 3998/*----------------------- end-of-file (C source) -----------------------*/
4440 3999

Diff Legend

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