ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.283 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.438 by root, Thu Feb 4 21:55:12 2010 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
… …
401#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
402 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
403#else 507#else
404 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
405#endif 509#endif
510 max_it (lnsppg, 1);
511
406 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
407 { 513 {
408 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
409 return; 515 return;
410 } 516 }
… …
475 } 581 }
476 } 582 }
477 583
478#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
479 // ISO 14755 support 585 // ISO 14755 support
480 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
481 { 587 {
482 int hv; 588 int hv;
483 589
484 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
485 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
… …
487 { 593 {
488 commit_iso14755 (); 594 commit_iso14755 ();
489 iso14755buf = ISO_14755_51; 595 iso14755buf = ISO_14755_51;
490# if ISO_14755 596# if ISO_14755
491 iso14755_51 (0); 597 iso14755_51 (0);
598# endif
599 return;
600 }
601 else if (keysym == XK_BackSpace)
602 {
603 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
604# if ISO_14755
605 iso14755_51 (iso14755buf & ISO_14755_MASK);
492# endif 606# endif
493 return; 607 return;
494 } 608 }
495 else if ((hv = hex_keyval (ev)) >= 0) 609 else if ((hv = hex_keyval (ev)) >= 0)
496 { 610 {
… …
501# endif 615# endif
502 return; 616 return;
503 } 617 }
504 else 618 else
505 { 619 {
506# if ENABLE_OVERLAY 620# if ISO_14755
507 scr_overlay_off (); 621 scr_overlay_off ();
508# endif 622# endif
509 iso14755buf = 0; 623 iso14755buf = 0;
510 } 624 }
511 } 625 }
626 else if (option (Opt_iso14755) &&
512 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
513 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
514 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
515 { 630 {
516 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
517# if ENABLE_OVERLAY 632# if ISO_14755
518 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
519 scr_overlay_set (0, 0, "ISO 14755 mode"); 634 scr_overlay_set (0, 0, "ISO 14755 mode");
520# endif 635# endif
521 } 636 }
522#endif 637#endif
523 638
524#ifdef PRINTPIPE 639#ifdef PRINTPIPE
525 if (keysym == XK_Print) 640 if (keysym == XK_Print)
526 { 641 {
527 scr_printscreen (ctrl | shft); 642 scr_printscreen (ctrl | shft);
528 return; 643 return;
529 } 644 }
530#endif 645#endif
531 646
532 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
533 { 648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1;
651
652 switch (translate_keypad (keysym, kp))
534 { 653 {
654#ifndef NO_BACKSPACE_KEY
655 case XK_BackSpace:
656 if (priv_modes & PrivMode_HaveBackSpace)
657 {
658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
659 ^ !!ctrl) ? '\b' : '\177';
660 kbuf[1] = '\0';
661 }
662 else
663 strcpy (kbuf, rs[Rs_backspace_key]);
664 break;
665#endif
666#ifndef NO_DELETE_KEY
667 case XK_Delete:
668 strcpy (kbuf, rs[Rs_delete_key]);
669 break;
670#endif
671 case XK_Tab:
672 if (shft)
673 strcpy (kbuf, "\033[Z");
674 else
675 {
676#ifdef CTRL_TAB_MAKES_META
677 if (ctrl)
678 meta = 1;
679#endif
680#ifdef MOD4_TAB_MAKES_META
681 if (ev.state & Mod4Mask)
682 meta = 1;
683#endif
535 newlen = 1; 684 newlen = 0;
536 switch (keysym) 685 }
686 break;
687
688 case XK_Up: /* "\033[A" */
689 case XK_Down: /* "\033[B" */
690 case XK_Right: /* "\033[C" */
691 case XK_Left: /* "\033[D" */
692 strcpy (kbuf, "\033[Z");
693 kbuf[2] = "DACB"[keysym - XK_Left];
694 /* do Shift first */
695 if (shft)
696 kbuf[2] = "dacb"[keysym - XK_Left];
697 else if (ctrl)
698 {
699 kbuf[1] = 'O';
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 }
702 else if (priv_modes & PrivMode_aplCUR)
703 kbuf[1] = 'O';
704 break;
705
706 case XK_KP_Enter:
707 /* allow shift to override */
708 if (kp)
709 {
710 strcpy (kbuf, "\033OM");
711 break;
712 }
713
714 /* FALLTHROUGH */
715
716 case XK_Return:
717 if (priv_modes & PrivMode_LFNL)
718 {
719 kbuf[0] = '\015';
720 kbuf[1] = '\012';
721 kbuf[2] = '\0';
722 }
723 else
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\0';
727 }
728 break;
729
730 case XK_KP_F1: /* "\033OP" */
731 case XK_KP_F2: /* "\033OQ" */
732 case XK_KP_F3: /* "\033OR" */
733 case XK_KP_F4: /* "\033OS" */
734 strcpy (kbuf, "\033OP");
735 kbuf[2] += (keysym - XK_KP_F1);
736 break;
737
738 case XK_KP_Multiply: /* "\033Oj" : "*" */
739 case XK_KP_Add: /* "\033Ok" : "+" */
740 case XK_KP_Separator: /* "\033Ol" : "," */
741 case XK_KP_Subtract: /* "\033Om" : "-" */
742 case XK_KP_Decimal: /* "\033On" : "." */
743 case XK_KP_Divide: /* "\033Oo" : "/" */
744 case XK_KP_0: /* "\033Op" : "0" */
745 case XK_KP_1: /* "\033Oq" : "1" */
746 case XK_KP_2: /* "\033Or" : "2" */
747 case XK_KP_3: /* "\033Os" : "3" */
748 case XK_KP_4: /* "\033Ot" : "4" */
749 case XK_KP_5: /* "\033Ou" : "5" */
750 case XK_KP_6: /* "\033Ov" : "6" */
751 case XK_KP_7: /* "\033Ow" : "7" */
752 case XK_KP_8: /* "\033Ox" : "8" */
753 case XK_KP_9: /* "\033Oy" : "9" */
754 /* allow shift to override */
755 if (kp)
756 {
757 strcpy (kbuf, "\033Oj");
758 kbuf[2] += (keysym - XK_KP_Multiply);
759 }
760 else
761 {
762 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
763 kbuf[1] = '\0';
764 }
765 break;
766
767 default:
537 { 768 {
538#ifndef NO_BACKSPACE_KEY 769 int param = map_function_key (keysym);
539 case XK_BackSpace: 770 if (param > 0)
540 if (priv_modes & PrivMode_HaveBackSpace) 771 sprintf (kbuf,"\033[%d~", param);
541 {
542 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
543 ^ !!ctrl) ? '\b' : '\177';
544 kbuf[1] = '\0';
545 }
546 else 772 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; 773 newlen = 0;
822 break;
823 } 774 }
824 775 break;
825 if (newlen)
826 len = strlen (kbuf);
827 } 776 }
777
778 if (newlen)
779 len = strlen (kbuf);
828 780
829 /* 781 /*
830 * Pass meta for all function keys, if 'meta' option set 782 * Pass meta for all function keys, if 'meta' option set
831 */ 783 */
832#ifdef META8_OPTION 784#ifdef META8_OPTION
… …
867 return; 819 return;
868 820
869 if (len <= 0) 821 if (len <= 0)
870 return; /* not mapped */ 822 return; /* not mapped */
871 823
872 if (OPTION (Opt_scrollTtyKeypress)) 824 if (option (Opt_scrollTtyKeypress))
873 if (view_start) 825 if (view_start)
874 { 826 {
875 view_start = 0; 827 view_start = 0;
876 want_refresh = 1; 828 want_refresh = 1;
877 } 829 }
… …
901 tt_write (&ch, 1); 853 tt_write (&ch, 1);
902 } 854 }
903 855
904 tt_write (kbuf, (unsigned int)len); 856 tt_write (kbuf, (unsigned int)len);
905} 857}
906/*}}} */ 858
859void
860rxvt_term::key_release (XKeyEvent &ev)
861{
862#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
863 KeySym keysym;
864
865 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
866#endif
867
868#if ENABLE_FRILLS || ISO_14755
869 // ISO 14755 support
870 if (iso14755buf)
871 if (iso14755buf & ISO_14755_52)
872 {
873# if ISO_14755
874 scr_overlay_off ();
875# endif
876# if ISO_14755
877 // iso14755 part 5.2 handling: release time
878 // first: controls
879 if ((ev.state & ControlMask)
880 && ((keysym >= 0x40 && keysym <= 0x5f)
881 || (keysym >= 0x61 && keysym <= 0x7f)))
882 {
883 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
884 commit_iso14755 ();
885
886 return;
887 }
888
889 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
890 if (i[0] == keysym)
891 {
892 iso14755buf = ISO_14755_51 | i[1];
893 commit_iso14755 ();
894
895 return;
896 }
897
898 scr_bell ();
899# endif
900 iso14755buf = 0;
901
902 return;
903 }
904 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
905 {
906# if ISO_14755
907 scr_overlay_off ();
908# endif
909 if (iso14755buf & ISO_14755_51)
910 commit_iso14755 ();
911#if ISO_14755
912 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
913 {
914 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
915
916 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
917 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
918 }
919# endif
920 else
921 iso14755buf = 0;
922 }
923#endif
924
925 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
926 return;
927
928#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
929 if (!(ev.state & ControlMask))
930 slip_wheel_ev.stop ();
931 else if (keysym == XK_Control_L || keysym == XK_Control_R)
932 mouse_slip_wheel_speed = 0;
933#endif
934}
907 935
908#if defined (KEYSYM_RESOURCE) 936#if defined (KEYSYM_RESOURCE)
909unsigned int 937unsigned int
910rxvt_term::cmd_write (const char *str, unsigned int count) 938rxvt_term::cmd_write (const char *str, unsigned int count)
911{ 939{
… …
941void 969void
942rxvt_term::flush () 970rxvt_term::flush ()
943{ 971{
944 flush_ev.stop (); 972 flush_ev.stop ();
945 973
946#ifdef TRANSPARENT 974#ifdef HAVE_BG_PIXMAP
947 if (want_full_refresh) 975 if (bgPixmap.check_clearChanged ())
948 { 976 {
949 want_full_refresh = 0; 977// scr_clear (true); This needs to be researched further!
950 scr_clear ();
951 scr_touch (false); 978 scr_touch (false);
952 } 979 }
953#endif 980#endif
954 981
955 if (want_refresh) 982 if (want_refresh)
… …
991 } 1018 }
992 while (row < end_row); 1019 while (row < end_row);
993 } 1020 }
994 1021
995 scr_refresh (); 1022 scr_refresh ();
996 scrollbar_show (1); 1023 scrollBar.show (1);
997#ifdef USE_XIM 1024#ifdef USE_XIM
998 IMSendSpot (); 1025 IMSendSpot ();
999#endif 1026#endif
1000 } 1027 }
1001 1028
1002 display->flush (); 1029 display->flush ();
1003} 1030}
1004 1031
1032/* checks wether a refresh is requested and starts the refresh timer */
1005void 1033void
1006rxvt_term::check_cb (check_watcher &w) 1034rxvt_term::refresh_check ()
1035{
1036 if (want_refresh && !flush_ev.is_active ())
1037 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1038
1039 display->flush ();
1040}
1041
1042void
1043rxvt_term::flush_cb (ev::timer &w, int revents)
1007{ 1044{
1008 make_current (); 1045 make_current ();
1009 1046
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; 1047 refresh_count = 0;
1023 flush (); 1048 flush ();
1024} 1049}
1025 1050
1026#ifdef CURSOR_BLINK 1051#ifdef CURSOR_BLINK
1027void 1052void
1028rxvt_term::cursor_blink_cb (time_watcher &w) 1053rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1029{ 1054{
1030 hidden_cursor = !hidden_cursor; 1055 hidden_cursor = !hidden_cursor;
1031 want_refresh = 1; 1056 want_refresh = 1;
1032 1057 refresh_check ();
1033 w.start (w.at + CURSOR_BLINK_INTERVAL);
1034} 1058}
1035#endif 1059#endif
1036 1060
1037#ifdef TEXT_BLINK 1061#ifdef TEXT_BLINK
1038void 1062void
1039rxvt_term::text_blink_cb (time_watcher &w) 1063rxvt_term::text_blink_cb (ev::timer &w, int revents)
1040{ 1064{
1041 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1065 if (scr_refresh_rend (RS_Blink, RS_Blink))
1042 { 1066 {
1043 hidden_text = !hidden_text; 1067 hidden_text = !hidden_text;
1044 want_refresh = 1; 1068 want_refresh = 1;
1045 w.start (w.at + TEXT_BLINK_INTERVAL); 1069 refresh_check ();
1046 } 1070 }
1071 else
1072 w.stop ();
1047} 1073}
1048#endif 1074#endif
1049 1075
1050#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1076#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1051void 1077void
1052rxvt_term::cont_scroll_cb (time_watcher &w) 1078rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1053{ 1079{
1054 if ((scrollbar_isUp() || scrollbar_isDn()) && 1080 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1055 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1081 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1056 { 1082 {
1057 want_refresh = 1; 1083 want_refresh = 1;
1058 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1084 refresh_check ();
1059 } 1085 }
1086 else
1087 w.stop ();
1060} 1088}
1061#endif 1089#endif
1062 1090
1063#ifdef SELECTION_SCROLLING 1091#ifdef SELECTION_SCROLLING
1064void 1092void
1065rxvt_term::sel_scroll_cb (time_watcher &w) 1093rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1066{ 1094{
1067 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1095 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1068 { 1096 {
1069 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1097 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1070 want_refresh = 1; 1098 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1099 refresh_check ();
1072 } 1100 }
1101 else
1102 w.stop ();
1073} 1103}
1074#endif 1104#endif
1075 1105
1076#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1106#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1077void 1107void
1078rxvt_term::slip_wheel_cb (time_watcher &w) 1108rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1079{ 1109{
1080 if (mouse_slip_wheel_speed == 0 1110 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 { 1111 {
1084 if (view_start == top_row || view_start == 0)
1085 mouse_slip_wheel_speed = 0;
1086
1087 want_refresh = 1; 1112 want_refresh = 1;
1088 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 refresh_check ();
1114 }
1115
1116 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1089 } 1117 {
1118 mouse_slip_wheel_speed = 0;
1119 w.stop ();
1120 }
1090} 1121}
1091#endif 1122#endif
1092 1123
1093#if HAVE_SCHED_YIELD 1124#if LINUX_YIELD_HACK
1094static struct event_handler 1125static struct event_handler
1095{ 1126{
1096 check_watcher cw_yield; 1127 ev::prepare yield_ev;
1097 1128
1098 void yield (check_watcher &w) 1129 void yield_cb (ev::prepare &w, int revents)
1099 { 1130 {
1100 sched_yield (); 1131 // this should really be sched_yield(), but the linux guys thought
1132 // that giving a process calling sched_yield () less cpu time than
1133 // ones with high nice levels is a useful thing to do. It surely is is
1134 // allowed by the sus... as is returning ENOSYS.
1135 // since the linux guys additionally thought that breaking the only
1136 // known workaroudn against their unusable sched_yield hack is cool,
1137 // we just nanosleep a bit and hope for the best.
1138
1139 struct timespec ts = { 0, 1000 };
1140 nanosleep (&ts, 0);
1141
1101 w.stop (); 1142 w.stop ();
1102 } 1143 }
1103 1144
1104 event_handler () 1145 event_handler ()
1105 : cw_yield (this, &event_handler::yield) 1146 : yield_ev (this, &event_handler::yield_cb)
1106 { 1147 {
1107 } 1148 }
1108} event_handler; 1149} event_handler;
1109#endif 1150#endif
1110 1151
… …
1130 cmdbuf_endp += r; 1171 cmdbuf_endp += r;
1131 return true; 1172 return true;
1132 } 1173 }
1133 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1174 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134 { 1175 {
1135#if HAVE_SCHED_YIELD 1176#if LINUX_YIELD_HACK
1136 if (display->is_local) 1177 if (display->is_local)
1137 event_handler.cw_yield.start (); 1178 event_handler.yield_ev.start ();
1138#endif 1179#endif
1139 } 1180 }
1140 else 1181 else
1141 { 1182 {
1142 pty_ev.stop (); 1183 pty_ev.stop ();
1143 1184
1144 if (!OPTION (Opt_hold)) 1185 if (!option (Opt_hold))
1145 destroy (); 1186 destroy ();
1146 } 1187 }
1147 1188
1148 return false; 1189 return false;
1149} 1190}
1150 1191
1151void 1192void
1152rxvt_term::pty_cb (io_watcher &w, short revents) 1193rxvt_term::pty_cb (ev::io &w, int revents)
1153{ 1194{
1154 make_current (); 1195 make_current ();
1155 1196
1156 if (revents & EVENT_READ) 1197 if (revents & ev::READ)
1157 // loop, but don't allow a single term to monopolize us 1198 // loop, but don't allow a single term to monopolize us
1158 while (pty_fill ()) 1199 for (int i = CBUFCNT; i-- && pty_fill (); )
1159 if (cmd_parse ()) 1200 cmd_parse ();
1160 break;
1161 1201
1162 if (revents & EVENT_WRITE) 1202 if (revents & ev::WRITE)
1163 pty_write (); 1203 pty_write ();
1204
1205 refresh_check ();
1164} 1206}
1165 1207
1166void 1208void
1167rxvt_term::pointer_unblank () 1209rxvt_term::pointer_unblank ()
1168{ 1210{
1169 XDefineCursor (display->display, vt, TermWin_cursor); 1211 XDefineCursor (dpy, vt, TermWin_cursor);
1170 recolour_cursor (); 1212 recolour_cursor ();
1171 1213
1172#ifdef POINTER_BLANK 1214#ifdef POINTER_BLANK
1173 hidden_pointer = 0; 1215 hidden_pointer = 0;
1174 1216
1175 if (OPTION (Opt_pointerBlank)) 1217 if (option (Opt_pointerBlank))
1176 pointer_ev.start (NOW + pointerBlankDelay); 1218 pointer_ev.start (pointerBlankDelay);
1177#endif 1219#endif
1178} 1220}
1179 1221
1180#ifdef POINTER_BLANK 1222#ifdef POINTER_BLANK
1181void 1223void
1182rxvt_term::pointer_blank () 1224rxvt_term::pointer_blank ()
1183{ 1225{
1184 if (!OPTION (Opt_pointerBlank)) 1226 if (!option (Opt_pointerBlank))
1185 return; 1227 return;
1186 1228
1187 XDefineCursor (display->display, vt, display->blank_cursor); 1229 XDefineCursor (dpy, vt, display->blank_cursor);
1188 XFlush (display->display); 1230 XFlush (dpy);
1189 1231
1190 hidden_pointer = 1; 1232 hidden_pointer = 1;
1191} 1233}
1192 1234
1193void 1235void
1194rxvt_term::pointer_cb (time_watcher &w) 1236rxvt_term::pointer_cb (ev::timer &w, int revents)
1195{ 1237{
1196 make_current (); 1238 make_current ();
1197 1239
1198 pointer_blank (); 1240 pointer_blank ();
1199} 1241}
… …
1202void 1244void
1203rxvt_term::mouse_report (XButtonEvent &ev) 1245rxvt_term::mouse_report (XButtonEvent &ev)
1204{ 1246{
1205 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
1206 int x, y; 1248 int x, y;
1249 int code = 32;
1207 1250
1208 x = ev.x; 1251 x = Pixel2Col (ev.x);
1209 y = ev.y; 1252 y = Pixel2Row (ev.y);
1210 pixel_position (&x, &y); 1253 if (ev.type == MotionNotify)
1254 {
1255 if (x == mouse_row && y == mouse_col)
1256 return;
1257 mouse_row = x;
1258 mouse_col = y;
1259 code += 32;
1260 }
1211 1261
1212 if (MEvent.button == AnyButton) 1262 if (MEvent.button == AnyButton)
1213 button_number = 3; 1263 button_number = 3;
1214 else 1264 else
1215 { 1265 {
… …
1261 x + 1, 1311 x + 1,
1262 y + 1); 1312 y + 1);
1263#endif 1313#endif
1264 1314
1265 tt_printf ("\033[M%c%c%c", 1315 tt_printf ("\033[M%c%c%c",
1266 (32 + button_number + key_state), 1316 (code + button_number + key_state),
1267 (32 + x + 1), 1317 (32 + x + 1),
1268 (32 + y + 1)); 1318 (32 + y + 1));
1269} 1319}
1270 1320
1271#ifdef USING_W11LIB
1272void
1273rxvt_W11_process_x_event (XEvent *ev)
1274{
1275 rxvt_t *r = rxvt_get_r ();
1276
1277 x_cb (*ev);
1278}
1279#endif
1280
1281/*{{{ process an X event */ 1321/*{{{ process an X event */
1282void 1322void
1283rxvt_term::x_cb (XEvent &ev) 1323rxvt_term::x_cb (XEvent &ev)
1284{ 1324{
1285 make_current (); 1325 make_current ();
1286 1326
1287 dDisp; 1327 dLocal (Display *, dpy);
1288 1328
1289 if (ev.xany.window == vt 1329 if (ev.xany.window == vt
1290 && SHOULD_INVOKE (HOOK_X_EVENT) 1330 && SHOULD_INVOKE (HOOK_X_EVENT)
1291 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1331 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1292 return; 1332 return;
… …
1297 unsigned int unused_mask; 1337 unsigned int unused_mask;
1298 1338
1299 switch (ev.type) 1339 switch (ev.type)
1300 { 1340 {
1301 case KeyPress: 1341 case KeyPress:
1302#if ISO_14755 1342 key_press (ev.xkey);
1303 if (!(iso14755buf & ISO_14755_52))
1304#endif
1305 lookup_key (ev.xkey);
1306
1307 break; 1343 break;
1308 1344
1309 case KeyRelease: 1345 case KeyRelease:
1310 { 1346 key_release (ev.xkey);
1311#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1312 KeySym keysym;
1313
1314 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1315#endif
1316
1317#if ENABLE_FRILLS || ISO_14755
1318 // ISO 14755 support
1319 if (iso14755buf)
1320 if (iso14755buf & ISO_14755_52)
1321 {
1322# if ENABLE_OVERLAY
1323 scr_overlay_off ();
1324# endif
1325# if ISO_14755
1326 // iso14755 part 5.2 handling: release time
1327 // first: controls
1328 if ((ev.xkey.state & ControlMask)
1329 && ((keysym >= 0x40 && keysym <= 0x5f)
1330 || (keysym >= 0x61 && keysym <= 0x7f)))
1331 {
1332 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1333 commit_iso14755 ();
1334 goto skip_switch;
1335 }
1336
1337 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1338 if (i[0] == keysym)
1339 {
1340 iso14755buf = ISO_14755_51 | i[1];
1341 commit_iso14755 ();
1342 goto skip_switch;
1343 }
1344
1345 scr_bell ();
1346# endif
1347 iso14755buf = 0;
1348 break;
1349 }
1350 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1351 {
1352# if ENABLE_OVERLAY
1353 scr_overlay_off ();
1354# endif
1355 if (iso14755buf & ISO_14755_51)
1356 commit_iso14755 ();
1357#if ISO_14755
1358 else if (iso14755buf & ISO_14755_STARTED)
1359 {
1360 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1361
1362 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1363 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1364 }
1365# endif
1366 else
1367 iso14755buf = 0;
1368 }
1369#endif
1370
1371 if (ev.xany.window == vt
1372 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1373 break;
1374
1375#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1376 if (!(ev.xkey.state & ControlMask))
1377 slip_wheel_ev.stop ();
1378 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1379 mouse_slip_wheel_speed = 0;
1380#endif
1381 break; 1347 break;
1382 }
1383 1348
1384 case ButtonPress: 1349 case ButtonPress:
1385 button_press (ev.xbutton); 1350 button_press (ev.xbutton);
1386 break; 1351 break;
1387 1352
… …
1402 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1367 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1403 destroy (); 1368 destroy ();
1404 } 1369 }
1405#if ENABLE_EWMH 1370#if ENABLE_EWMH
1406 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1371 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1407 XSendEvent (disp, ev.xclient.window = display->root, 1372 XSendEvent (dpy, ev.xclient.window = display->root,
1408 False, SubstructureRedirectMask | SubstructureNotifyMask, 1373 False, SubstructureRedirectMask | SubstructureNotifyMask,
1409 &ev); 1374 &ev);
1410#endif 1375#endif
1411 } 1376 }
1412 } 1377 }
… …
1418 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1383 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1419 focus_out (); 1384 focus_out ();
1420 } 1385 }
1421#endif 1386#endif
1422 } 1387 }
1423 break;
1424
1425 case MappingNotify:
1426 XRefreshKeyboardMapping (&ev.xmapping);
1427 break; 1388 break;
1428 1389
1429 /* 1390 /*
1430 * XXX: this is not the _current_ arrangement 1391 * XXX: this is not the _current_ arrangement
1431 * Here's my conclusion: 1392 * Here's my conclusion:
… …
1450 break; 1411 break;
1451 } 1412 }
1452 break; 1413 break;
1453 1414
1454 case FocusIn: 1415 case FocusIn:
1416 if (ev.xfocus.detail != NotifyInferior
1417 && ev.xfocus.detail != NotifyPointer
1418 && ev.xfocus.mode != NotifyGrab)
1455 focus_in (); 1419 focus_in ();
1456 break; 1420 break;
1457 1421
1458 case FocusOut: 1422 case FocusOut:
1423 if (ev.xfocus.detail != NotifyInferior
1424 && ev.xfocus.detail != NotifyPointer
1425 && ev.xfocus.mode != NotifyGrab)
1459 focus_out (); 1426 focus_out ();
1460 break; 1427 break;
1461 1428
1462 case ConfigureNotify: 1429 case ConfigureNotify:
1430 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1431 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1432 szHint.width, szHint.height);*/
1463 if (ev.xconfigure.window == parent[0]) 1433 if (ev.xconfigure.window == parent[0])
1464 { 1434 {
1465 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1435 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1466 ; 1436 ;
1467 1437
1468 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1438 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1469 { 1439 {
1470 seen_resize = 1; 1440 seen_resize = 1;
1471 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1441 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1472 } 1442 }
1443 else
1444 {
1445#ifdef HAVE_BG_PIXMAP
1446 if (bgPixmap.window_position_sensitive ())
1447 {
1448 if (mapped)
1449 update_background ();
1450 else
1451 bgPixmap.invalidate ();
1452 }
1453#endif
1454 }
1473 1455
1474 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1456 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1475
1476#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1477 if (OPTION (Opt_transparent))
1478 check_our_parents ();
1479#endif
1480 } 1457 }
1481 break; 1458 break;
1482 1459
1483 case PropertyNotify: 1460 case PropertyNotify:
1484 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1461 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1487 selection_property (ev.xproperty.window, ev.xproperty.atom); 1464 selection_property (ev.xproperty.window, ev.xproperty.atom);
1488 1465
1489 break; 1466 break;
1490 1467
1491 case SelectionClear: 1468 case SelectionClear:
1492 selection_clear (); 1469 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1493 break; 1470 break;
1494 1471
1495 case SelectionNotify: 1472 case SelectionNotify:
1496 if (selection_wait == Sel_normal) 1473 if (selection_wait == Sel_normal)
1497 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1474 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1500 case SelectionRequest: 1477 case SelectionRequest:
1501 selection_send (ev.xselectionrequest); 1478 selection_send (ev.xselectionrequest);
1502 break; 1479 break;
1503 1480
1504 case MapNotify: 1481 case MapNotify:
1482#ifdef HAVE_BG_PIXMAP
1483 /* This is needed spcifically to fix the case of no window manager or a
1484 * non-reparenting window manager. In those cases we never get first
1485 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1486 * care of multiplicity of ConfigureNotify events arriwing while WM does
1487 * reparenting.
1488 * We should not render background immidiately, as there could be several
1489 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1490 * by scheduling background redraw as soon as we can, but giving a short
1491 * bit of time for ConfigureNotifies to arrive.
1492 * We should render background PRIOR to drawing any text, but AFTER all
1493 * of ConfigureNotifys for the best results.
1494 */
1495 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1496 update_background_ev.start (0.025);
1497#endif
1505 mapped = 1; 1498 mapped = 1;
1506#ifdef TEXT_BLINK 1499#ifdef TEXT_BLINK
1507 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1500 text_blink_ev.start ();
1508#endif 1501#endif
1509 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1502 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1510 break; 1503 break;
1511 1504
1512 case UnmapNotify: 1505 case UnmapNotify:
… …
1514#ifdef TEXT_BLINK 1507#ifdef TEXT_BLINK
1515 text_blink_ev.stop (); 1508 text_blink_ev.stop ();
1516#endif 1509#endif
1517 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1510 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1511 break;
1519
1520#ifdef TRANSPARENT
1521 case ReparentNotify:
1522 rootwin_cb (ev);
1523 break;
1524#endif /* TRANSPARENT */
1525 1512
1526 case GraphicsExpose: 1513 case GraphicsExpose:
1527 case Expose: 1514 case Expose:
1528 if (ev.xany.window == vt) 1515 if (ev.xany.window == vt)
1529 { 1516 {
1530 do 1517 do
1518 {
1531 scr_expose (ev.xexpose.x, ev.xexpose.y, 1519 scr_expose (ev.xexpose.x, ev.xexpose.y,
1532 ev.xexpose.width, ev.xexpose.height, False); 1520 ev.xexpose.width, ev.xexpose.height, False);
1521 }
1533 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1522 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1534 1523
1535 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1524 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1536 1525
1537 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1526 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1527 {
1538 scr_expose (ev.xexpose.x, ev.xexpose.y, 1528 scr_expose (ev.xexpose.x, ev.xexpose.y,
1539 ev.xexpose.width, ev.xexpose.height, False); 1529 ev.xexpose.width, ev.xexpose.height, False);
1530 }
1540 1531
1541 want_refresh = 1; 1532 want_refresh = 1;
1542 } 1533 }
1543 else 1534 else
1544 { 1535 {
1545 XEvent unused_event; 1536 XEvent unused_event;
1546 1537
1547 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1538 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1548 ; 1539 ;
1549 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1540 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1550 ; 1541 ;
1551 1542
1552 if (isScrollbarWindow (ev.xany.window)) 1543 if (scrollBar.state && ev.xany.window == scrollBar.win)
1553 { 1544 {
1554 scrollBar.setIdle (); 1545 scrollBar.state = STATE_IDLE;
1555 scrollbar_show (0); 1546 scrollBar.show (0);
1556 } 1547 }
1557
1558#ifdef TRANSPARENT
1559 if (am_transparent && ev.xany.window == parent[0])
1560 XClearWindow (disp, ev.xany.window);
1561#endif
1562 } 1548 }
1563 break; 1549 break;
1564 1550
1565 case MotionNotify: 1551 case MotionNotify:
1566#ifdef POINTER_BLANK 1552#ifdef POINTER_BLANK
1567 if (hidden_pointer) 1553 if (hidden_pointer)
1568 pointer_unblank (); 1554 pointer_unblank ();
1569#endif 1555#endif
1556 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1557 || priv_modes & PrivMode_MouseAnyEvent)
1558 mouse_report (ev.xbutton);
1570 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1559 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1571 break; 1560 break;
1572 1561
1573 if (ev.xany.window == vt) 1562 if (ev.xany.window == vt)
1574 { 1563 {
1575 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1564 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1576 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1565 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1577 ; // nop 1566 ; // nop
1578 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1567 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1579 { 1568 {
1580 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1569 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1581 ; 1570 ;
1582 1571
1583 XQueryPointer (disp, vt, 1572 XQueryPointer (dpy, vt,
1584 &unused_root, &unused_child, 1573 &unused_root, &unused_child,
1585 &unused_root_x, &unused_root_y, 1574 &unused_root_x, &unused_root_y,
1586 &ev.xbutton.x, &ev.xbutton.y, 1575 &ev.xbutton.x, &ev.xbutton.y,
1587 &ev.xbutton.state); 1576 &ev.xbutton.state);
1588#ifdef MOUSE_THRESHOLD 1577#ifdef MOUSE_THRESHOLD
… …
1608 int dist; 1597 int dist;
1609 1598
1610 /* don't clobber the current delay if we are 1599 /* don't clobber the current delay if we are
1611 * already in the middle of scrolling. 1600 * already in the middle of scrolling.
1612 */ 1601 */
1613 if (!sel_scroll_ev.active) 1602 if (!sel_scroll_ev.is_active ())
1614 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1603 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1615 1604
1616 /* save the event params so we can highlight 1605 /* save the event params so we can highlight
1617 * the selection in the pending-scroll loop 1606 * the selection in the pending-scroll loop
1618 */ 1607 */
1619 selection_save_x = ev.xbutton.x; 1608 selection_save_x = ev.xbutton.x;
… …
1641 else 1630 else
1642 { 1631 {
1643 /* we are within the text window, so we 1632 /* we are within the text window, so we
1644 * shouldn't be scrolling 1633 * shouldn't be scrolling
1645 */ 1634 */
1646 if (sel_scroll_ev.active)
1647 sel_scroll_ev.stop(); 1635 sel_scroll_ev.stop();
1648 } 1636 }
1649#endif 1637#endif
1650#ifdef MOUSE_THRESHOLD 1638#ifdef MOUSE_THRESHOLD
1651 } 1639 }
1652#endif 1640#endif
1653 } 1641 }
1654 } 1642 }
1655 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1643 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1656 { 1644 {
1657 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1645 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1658 MotionNotify, &ev)) 1646 MotionNotify, &ev))
1659 ; 1647 ;
1660 1648
1661 XQueryPointer (disp, scrollBar.win, 1649 XQueryPointer (dpy, scrollBar.win,
1662 &unused_root, &unused_child, 1650 &unused_root, &unused_child,
1663 &unused_root_x, &unused_root_y, 1651 &unused_root_x, &unused_root_y,
1664 &ev.xbutton.x, &ev.xbutton.y, 1652 &ev.xbutton.x, &ev.xbutton.y,
1665 &unused_mask); 1653 &unused_mask);
1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1654 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1667 scrollbar_size ()); 1655 scrollBar.size ());
1668 want_refresh = 1; 1656 want_refresh = 1;
1669 refresh_limit = 0;
1670 scrollbar_show (1); 1657 scrollBar.show (1);
1671 } 1658 }
1672 break; 1659 break;
1673 } 1660 }
1674 1661
1675skip_switch: ;
1676
1677#if defined(CURSOR_BLINK) 1662#if defined(CURSOR_BLINK)
1678 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1663 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1679 { 1664 {
1680 if (hidden_cursor) 1665 if (hidden_cursor)
1681 { 1666 {
1682 hidden_cursor = 0; 1667 hidden_cursor = 0;
1683 want_refresh = 1; 1668 want_refresh = 1;
1684 } 1669 }
1685 1670
1686 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1671 cursor_blink_ev.again ();
1687 } 1672 }
1688#endif 1673#endif
1689 1674
1690#if defined(POINTER_BLANK) 1675#if defined(POINTER_BLANK)
1691 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1676 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1692 { 1677 {
1693 if (ev.type == MotionNotify 1678 if (ev.type == MotionNotify
1694 || ev.type == ButtonPress 1679 || ev.type == ButtonPress
1695 || ev.type == ButtonRelease) 1680 || ev.type == ButtonRelease)
1696 if (hidden_pointer) 1681 if (hidden_pointer)
… …
1698 1683
1699 if (ev.type == KeyPress && hidden_pointer == 0) 1684 if (ev.type == KeyPress && hidden_pointer == 0)
1700 pointer_blank (); 1685 pointer_blank ();
1701 } 1686 }
1702#endif 1687#endif
1688
1689 refresh_check ();
1703} 1690}
1691
1692#if ENABLE_FRILLS
1693void
1694rxvt_term::set_urgency (bool enable)
1695{
1696 if (enable == urgency_hint)
1697 return;
1698
1699 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1700 {
1701 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1702 XSetWMHints (dpy, parent[0], h);
1703 urgency_hint = enable;
1704 }
1705}
1706#endif
1704 1707
1705void 1708void
1706rxvt_term::focus_in () 1709rxvt_term::focus_in ()
1707{ 1710{
1708 if (!focus) 1711 if (!focus)
1709 { 1712 {
1710 focus = 1; 1713 focus = 1;
1711 want_refresh = 1; 1714 want_refresh = 1;
1712 1715
1713 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1714
1715#if USE_XIM 1716#if USE_XIM
1716 if (Input_Context != NULL) 1717 if (Input_Context != NULL)
1717 { 1718 {
1718 IMSetStatusPosition (); 1719 IMSetPosition ();
1719 XSetICFocus (Input_Context); 1720 XSetICFocus (Input_Context);
1720 } 1721 }
1721#endif 1722#endif
1722#if CURSOR_BLINK 1723#if CURSOR_BLINK
1723 if (OPTION (Opt_cursorBlink)) 1724 if (option (Opt_cursorBlink))
1724 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1725 cursor_blink_ev.again ();
1725#endif 1726#endif
1726#if OFF_FOCUS_FADING 1727#if OFF_FOCUS_FADING
1727 if (rs[Rs_fade]) 1728 if (rs[Rs_fade])
1728 { 1729 {
1729 pix_colors = pix_colors_focused; 1730 pix_colors = pix_colors_focused;
1730 scr_recolour (); 1731 scr_recolour ();
1731 } 1732 }
1732#endif 1733#endif
1734#if ENABLE_FRILLS
1735 if (option (Opt_urgentOnBell))
1736 set_urgency (0);
1737#endif
1738
1739 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1733 } 1740 }
1734} 1741}
1735 1742
1736void 1743void
1737rxvt_term::focus_out () 1744rxvt_term::focus_out ()
… …
1739 if (focus) 1746 if (focus)
1740 { 1747 {
1741 focus = 0; 1748 focus = 0;
1742 want_refresh = 1; 1749 want_refresh = 1;
1743 1750
1744 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1751#if ENABLE_FRILLS
1745 1752 if (option (Opt_urgentOnBell))
1753 set_urgency (0);
1754#endif
1746#if ENABLE_FRILLS || ISO_14755 1755#if ENABLE_FRILLS || ISO_14755
1747 if (iso14755buf) 1756 if (iso14755buf)
1748 { 1757 {
1749 iso14755buf = 0; 1758 iso14755buf = 0;
1750# if ENABLE_OVERLAY 1759# if ISO_14755
1751 scr_overlay_off (); 1760 scr_overlay_off ();
1752# endif 1761# endif
1753 } 1762 }
1754#endif 1763#endif
1755#if USE_XIM 1764#if USE_XIM
1756 if (Input_Context != NULL) 1765 if (Input_Context != NULL)
1757 XUnsetICFocus (Input_Context); 1766 XUnsetICFocus (Input_Context);
1758#endif 1767#endif
1759#if CURSOR_BLINK 1768#if CURSOR_BLINK
1760 if (OPTION (Opt_cursorBlink)) 1769 if (option (Opt_cursorBlink))
1761 cursor_blink_ev.stop (); 1770 cursor_blink_ev.stop ();
1771
1762 hidden_cursor = 0; 1772 hidden_cursor = 0;
1763#endif 1773#endif
1764#if OFF_FOCUS_FADING 1774#if OFF_FOCUS_FADING
1765 if (rs[Rs_fade]) 1775 if (rs[Rs_fade])
1766 { 1776 {
1767 pix_colors = pix_colors_unfocused; 1777 pix_colors = pix_colors_unfocused;
1768 scr_recolour (); 1778 scr_recolour ();
1769 } 1779 }
1770#endif 1780#endif
1781
1782 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1783 }
1784}
1785
1786void
1787rxvt_term::update_fade_color (unsigned int idx)
1788{
1789#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade])
1771 } 1791 {
1792 rgba c;
1793 pix_colors [Color_fade].get (c);
1794 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1795 }
1796#endif
1772} 1797}
1773 1798
1774#if TRANSPARENT 1799#if ENABLE_TRANSPARENCY || ENABLE_PERL
1775void 1800void
1776rxvt_term::rootwin_cb (XEvent &ev) 1801rxvt_term::rootwin_cb (XEvent &ev)
1777{ 1802{
1778 make_current (); 1803 make_current ();
1779 1804
1805 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1806 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1807 return;
1808
1809# if ENABLE_TRANSPARENCY
1780 switch (ev.type) 1810 switch (ev.type)
1781 { 1811 {
1782 case PropertyNotify: 1812 case PropertyNotify:
1783 /* 1813 /*
1784 * if user used some Esetroot compatible prog to set the root bg, 1814 * if user used some Esetroot compatible prog to set the root bg,
1785 * use the property to determine the pixmap. We use it later on. 1815 * use the property to determine the pixmap. We use it later on.
1786 */ 1816 */
1787 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1817 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1788 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1818 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1789 return; 1819 {
1820 bgPixmap.set_root_pixmap ();
1821 update_background ();
1822 }
1790 1823
1791 /* FALLTHROUGH */
1792 case ReparentNotify:
1793 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1794 want_refresh = want_full_refresh = 1;
1795 break; 1824 break;
1796 } 1825 }
1826# endif
1827
1828 refresh_check ();
1797} 1829}
1798#endif 1830#endif
1799 1831
1800void 1832void
1801rxvt_term::button_press (XButtonEvent &ev) 1833rxvt_term::button_press (XButtonEvent &ev)
… …
1856 mouse_report (ev); 1888 mouse_report (ev);
1857 } 1889 }
1858#else 1890#else
1859 MEvent.button = ev.button; 1891 MEvent.button = ev.button;
1860 mouse_report (ev); 1892 mouse_report (ev);
1861#endif /* MOUSE_REPORT_DOUBLECLICK */ 1893#endif /* MOUSE_REPORT_DOUBLECLICK */
1862 1894
1863 } 1895 }
1864 else 1896 else
1865 { 1897 {
1866 if (ev.button != MEvent.button) 1898 if (ev.button != MEvent.button)
… …
1914 } 1946 }
1915 1947
1916 /* 1948 /*
1917 * Scrollbar window processing of button press 1949 * Scrollbar window processing of button press
1918 */ 1950 */
1919 if (isScrollbarWindow (ev.window)) 1951 if (scrollBar.state && ev.window == scrollBar.win)
1920 { 1952 {
1921 scrollBar.setIdle (); 1953 page_dirn direction = NO_DIR;
1954
1955 if (scrollBar.upButton (ev.y))
1956 direction = UP; /* up */
1957 else if (scrollBar.dnButton (ev.y))
1958 direction = DN; /* down */
1959
1960 scrollBar.state = STATE_IDLE;
1922 /* 1961 /*
1923 * Rxvt-style scrollbar: 1962 * Rxvt-style scrollbar:
1924 * move up if mouse is above slider 1963 * move up if mouse is above slider
1925 * move dn if mouse is below slider 1964 * move dn if mouse is below slider
1926 * 1965 *
… …
1935 /* 1974 /*
1936 * Mouse report disabled scrollbar: 1975 * Mouse report disabled scrollbar:
1937 * arrow buttons - send up/down 1976 * arrow buttons - send up/down
1938 * click on scrollbar - send pageup/down 1977 * click on scrollbar - send pageup/down
1939 */ 1978 */
1940 if ((scrollBar.style == R_SB_NEXT 1979 if (direction == UP)
1941 && scrollbarnext_upButton (ev.y))
1942 || (scrollBar.style == R_SB_RXVT
1943 && scrollbarrxvt_upButton (ev.y)))
1944 tt_printf ("\033[A"); 1980 tt_printf ("\033[A");
1945 else if ((scrollBar.style == R_SB_NEXT 1981 else if (direction == DN)
1946 && scrollbarnext_dnButton (ev.y))
1947 || (scrollBar.style == R_SB_RXVT
1948 && scrollbarrxvt_dnButton (ev.y)))
1949 tt_printf ("\033[B"); 1982 tt_printf ("\033[B");
1950 else 1983 else
1951 switch (ev.button) 1984 switch (ev.button)
1952 { 1985 {
1953 case Button2: 1986 case Button2:
… …
1960 tt_printf ("\033[5~"); 1993 tt_printf ("\033[5~");
1961 break; 1994 break;
1962 } 1995 }
1963 } 1996 }
1964 else 1997 else
1965#endif /* NO_SCROLLBAR_REPORT */ 1998#endif /* NO_SCROLLBAR_REPORT */
1966
1967 {
1968 char upordown = 0;
1969
1970 if (scrollBar.style == R_SB_NEXT)
1971 { 1999 {
1972 if (scrollbarnext_upButton (ev.y)) 2000 if (direction != NO_DIR)
1973 upordown = -1; /* up */
1974 else if (scrollbarnext_dnButton (ev.y))
1975 upordown = 1; /* down */
1976 }
1977 else if (scrollBar.style == R_SB_RXVT)
1978 {
1979 if (scrollbarrxvt_upButton (ev.y))
1980 upordown = -1; /* up */
1981 else if (scrollbarrxvt_dnButton (ev.y))
1982 upordown = 1; /* down */
1983 }
1984 if (upordown)
1985 { 2001 {
1986#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2002#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2003 if (!cont_scroll_ev.is_active ())
1987 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2004 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1988#endif 2005#endif
1989 if (scr_page (upordown < 0 ? UP : DN, 1)) 2006 if (scr_page (direction, 1))
1990 { 2007 {
1991 if (upordown < 0) 2008 if (direction == UP)
1992 scrollBar.setUp (); 2009 scrollBar.state = STATE_UP;
1993 else 2010 else
1994 scrollBar.setDn (); 2011 scrollBar.state = STATE_DOWN;
1995 } 2012 }
1996 } 2013 }
1997 else 2014 else
1998 switch (ev.button) 2015 switch (ev.button)
1999 { 2016 {
2000 case Button2: 2017 case Button2:
2001 switch (scrollbar_align) 2018 switch (scrollBar.align)
2002 { 2019 {
2003 case R_SB_ALIGN_TOP: 2020 case R_SB_ALIGN_TOP:
2004 csrO = 0; 2021 csrO = 0;
2005 break; 2022 break;
2006 case R_SB_ALIGN_CENTRE: 2023 case R_SB_ALIGN_CENTRE:
… …
2012 } 2029 }
2013 2030
2014 if (scrollBar.style == R_SB_XTERM 2031 if (scrollBar.style == R_SB_XTERM
2015 || scrollbar_above_slider (ev.y) 2032 || scrollbar_above_slider (ev.y)
2016 || scrollbar_below_slider (ev.y)) 2033 || scrollbar_below_slider (ev.y))
2017 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2034 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2018 2035
2019 scrollBar.setMotion (); 2036 scrollBar.state = STATE_MOTION;
2020 break; 2037 break;
2021 2038
2022 case Button1: 2039 case Button1:
2023 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2040 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2024 csrO = ev.y - scrollBar.top; 2041 csrO = ev.y - scrollBar.top;
2025 /* FALLTHROUGH */ 2042 /* FALLTHROUGH */
2026 2043
2027 case Button3: 2044 case Button3:
2028 if (scrollBar.style != R_SB_XTERM) 2045 if (scrollBar.style != R_SB_XTERM)
… …
2038 scr_page (DN, nrow - 1); 2055 scr_page (DN, nrow - 1);
2039# else 2056# else
2040 scr_page (DN, nrow / 4); 2057 scr_page (DN, nrow / 4);
2041# endif 2058# endif
2042 else 2059 else
2043 scrollBar.setMotion (); 2060 scrollBar.state = STATE_MOTION;
2044 } 2061 }
2045 else 2062 else
2046 { 2063 {
2047 scr_page ((ev.button == Button1 ? DN : UP), 2064 scr_page ((ev.button == Button1 ? DN : UP),
2048 (nrow 2065 (nrow
2049 * scrollbar_position (ev.y) 2066 * scrollbar_position (ev.y)
2050 / scrollbar_size ())); 2067 / scrollBar.size ()));
2051 } 2068 }
2052 2069
2053 break; 2070 break;
2054 } 2071 }
2055 } 2072 }
… …
2065 2082
2066 csrO = 0; /* reset csr Offset */ 2083 csrO = 0; /* reset csr Offset */
2067 if (!bypass_keystate) 2084 if (!bypass_keystate)
2068 reportmode = !! (priv_modes & PrivMode_mouse_report); 2085 reportmode = !! (priv_modes & PrivMode_mouse_report);
2069 2086
2070 if (scrollbar_isUpDn ()) 2087 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2071 { 2088 {
2072 scrollBar.setIdle (); 2089 scrollBar.state = STATE_IDLE;
2073 scrollbar_show (0); 2090 scrollBar.show (0);
2074 } 2091 }
2075 2092
2076#ifdef SELECTION_SCROLLING 2093#ifdef SELECTION_SCROLLING
2077 if (sel_scroll_ev.active)
2078 sel_scroll_ev.stop(); 2094 sel_scroll_ev.stop();
2079#endif 2095#endif
2080 2096
2081 if (ev.window == vt) 2097 if (ev.window == vt)
2082 { 2098 {
2083 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2099 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2107 mouse_report (ev); 2123 mouse_report (ev);
2108 } 2124 }
2109#else /* MOUSE_REPORT_DOUBLECLICK */ 2125#else /* MOUSE_REPORT_DOUBLECLICK */
2110 MEvent.button = AnyButton; 2126 MEvent.button = AnyButton;
2111 mouse_report (ev); 2127 mouse_report (ev);
2112#endif /* MOUSE_REPORT_DOUBLECLICK */ 2128#endif /* MOUSE_REPORT_DOUBLECLICK */
2113 return; 2129 return;
2114 } 2130 }
2115 2131
2116 /* 2132 /*
2117 * dumb hack to compensate for the failure of click-and-drag 2133 * dumb hack to compensate for the failure of click-and-drag
… …
2129 selection_make (ev.time); 2145 selection_make (ev.time);
2130 break; 2146 break;
2131 2147
2132 case Button2: 2148 case Button2:
2133 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2149 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2134 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2150 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2135 break; 2151 break;
2136 2152
2137#ifdef MOUSE_WHEEL 2153#ifdef MOUSE_WHEEL
2138 case Button4: 2154 case Button4:
2139 case Button5: 2155 case Button5:
… …
2143 2159
2144 v = ev.button == Button4 ? UP : DN; 2160 v = ev.button == Button4 ? UP : DN;
2145 2161
2146 if (ev.state & ShiftMask) 2162 if (ev.state & ShiftMask)
2147 i = 1; 2163 i = 1;
2148 else if (OPTION (Opt_mouseWheelScrollPage)) 2164 else if (option (Opt_mouseWheelScrollPage))
2149 i = nrow - 1; 2165 i = nrow - 1;
2150 else 2166 else
2151 i = 5; 2167 i = 5;
2152 2168
2153# ifdef MOUSE_SLIP_WHEELING 2169# ifdef MOUSE_SLIP_WHEELING
… …
2155 { 2171 {
2156 mouse_slip_wheel_speed += v ? -1 : 1; 2172 mouse_slip_wheel_speed += v ? -1 : 1;
2157 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2173 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2158 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2174 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2159 2175
2160 if (slip_wheel_ev.at < NOW) 2176 if (!slip_wheel_ev.is_active ())
2161 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2177 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2162
2163 slip_wheel_ev.start ();
2164 } 2178 }
2165 else 2179 else
2180# endif
2166 { 2181 {
2167# endif
2168 scr_page (v, i); 2182 scr_page (v, i);
2169 scrollbar_show (1); 2183 scrollBar.show (1);
2170# ifdef MOUSE_SLIP_WHEELING
2171 } 2184 }
2172# endif
2173 } 2185 }
2174 break; 2186 break;
2175#endif 2187#endif
2176 } 2188 }
2177 } 2189 }
2178} 2190}
2179 2191
2180#ifdef TRANSPARENT
2181#if TINTING
2182/* taken from aterm-0.4.2 */
2183
2184typedef uint32_t RUINT32T;
2185
2186void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2187{
2188 int sh_r, sh_g, sh_b;
2189 RUINT32T mask_r, mask_g, mask_b;
2190 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2191 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2192 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2193 int i;
2194
2195 Visual *visual = display->visual;
2196
2197 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2198
2199 /* for convenience */
2200 mask_r = visual->red_mask;
2201 mask_g = visual->green_mask;
2202 mask_b = visual->blue_mask;
2203
2204 /* boring lookup table pre-initialization */
2205 switch (srcImage->bits_per_pixel) {
2206 case 15:
2207 if ((mask_r != 0x7c00) ||
2208 (mask_g != 0x03e0) ||
2209 (mask_b != 0x001f))
2210 return;
2211 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2212 lookup_r = lookup;
2213 lookup_g = lookup+32;
2214 lookup_b = lookup+32+32;
2215 sh_r = 10;
2216 sh_g = 5;
2217 sh_b = 0;
2218 break;
2219 case 16:
2220 if ((mask_r != 0xf800) ||
2221 (mask_g != 0x07e0) ||
2222 (mask_b != 0x001f))
2223 return;
2224 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2225 lookup_r = lookup;
2226 lookup_g = lookup+32;
2227 lookup_b = lookup+32+64;
2228 sh_r = 11;
2229 sh_g = 5;
2230 sh_b = 0;
2231 break;
2232 case 24:
2233 if ((mask_r != 0xff0000) ||
2234 (mask_g != 0x00ff00) ||
2235 (mask_b != 0x0000ff))
2236 return;
2237 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2238 lookup_r = lookup;
2239 lookup_g = lookup+256;
2240 lookup_b = lookup+256+256;
2241 sh_r = 16;
2242 sh_g = 8;
2243 sh_b = 0;
2244 break;
2245 case 32:
2246 if ((mask_r != 0xff0000) ||
2247 (mask_g != 0x00ff00) ||
2248 (mask_b != 0x0000ff))
2249 return;
2250 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2251 lookup_r = lookup;
2252 lookup_g = lookup+256;
2253 lookup_b = lookup+256+256;
2254 sh_r = 16;
2255 sh_g = 8;
2256 sh_b = 0;
2257 break;
2258 default:
2259 return; /* we do not support this color depth */
2260 }
2261
2262 /* prepare limits for color transformation (each channel is handled separately) */
2263 if (shade < 0) {
2264 shade = -shade;
2265 if (shade < 0) shade = 0;
2266 if (shade > 100) shade = 100;
2267
2268 lower_lim_r = 65535-rm;
2269 lower_lim_g = 65535-gm;
2270 lower_lim_b = 65535-bm;
2271
2272 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2273 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2274 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2275
2276 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2277 } else {
2278 if (shade < 0) shade = 0;
2279 if (shade > 100) shade = 100;
2280
2281 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2282
2283 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2284 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2285 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2286 }
2287
2288 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2289 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2290 {
2291 unsigned int tmp;
2292
2293 tmp = lower_lim_r;
2294 lower_lim_r = lower_lim_b;
2295 lower_lim_b = tmp;
2296
2297 tmp = upper_lim_r;
2298 upper_lim_r = upper_lim_b;
2299 upper_lim_b = tmp;
2300 }
2301
2302 /* fill our lookup tables */
2303 for (i = 0; i <= mask_r>>sh_r; i++)
2304 {
2305 RUINT32T tmp;
2306 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2307 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2308 lookup_r[i] = (tmp/65535)<<sh_r;
2309 }
2310 for (i = 0; i <= mask_g>>sh_g; i++)
2311 {
2312 RUINT32T tmp;
2313 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2314 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2315 lookup_g[i] = (tmp/65535)<<sh_g;
2316 }
2317 for (i = 0; i <= mask_b>>sh_b; i++)
2318 {
2319 RUINT32T tmp;
2320 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2321 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2322 lookup_b[i] = (tmp/65535)<<sh_b;
2323 }
2324
2325 /* apply table to input image (replacing colors by newly calculated ones) */
2326 switch (srcImage->bits_per_pixel)
2327 {
2328 case 15:
2329 {
2330 unsigned short *p1, *pf, *p, *pl;
2331 p1 = (unsigned short *) srcImage->data;
2332 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2333 while (p1 < pf)
2334 {
2335 p = p1;
2336 pl = p1 + srcImage->width;
2337 for (; p < pl; p++)
2338 {
2339 *p = lookup_r[(*p & 0x7c00)>>10] |
2340 lookup_g[(*p & 0x03e0)>> 5] |
2341 lookup_b[(*p & 0x001f)];
2342 }
2343 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2344 }
2345 break;
2346 }
2347 case 16:
2348 {
2349 unsigned short *p1, *pf, *p, *pl;
2350 p1 = (unsigned short *) srcImage->data;
2351 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2352 while (p1 < pf)
2353 {
2354 p = p1;
2355 pl = p1 + srcImage->width;
2356 for (; p < pl; p++)
2357 {
2358 *p = lookup_r[(*p & 0xf800)>>11] |
2359 lookup_g[(*p & 0x07e0)>> 5] |
2360 lookup_b[(*p & 0x001f)];
2361 }
2362 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2363 }
2364 break;
2365 }
2366 case 24:
2367 {
2368 unsigned char *p1, *pf, *p, *pl;
2369 p1 = (unsigned char *) srcImage->data;
2370 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2371 while (p1 < pf)
2372 {
2373 p = p1;
2374 pl = p1 + srcImage->width * 3;
2375 for (; p < pl; p += 3)
2376 {
2377 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2378 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2379 p[2] = lookup_r[(p[2] & 0x0000ff)];
2380 }
2381 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2382 }
2383 break;
2384 }
2385 case 32:
2386 {
2387 RUINT32T *p1, *pf, *p, *pl;
2388 p1 = (RUINT32T *) srcImage->data;
2389 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2390
2391 while (p1 < pf)
2392 {
2393 p = p1;
2394 pl = p1 + srcImage->width;
2395 for (; p < pl; p++)
2396 {
2397 *p = lookup_r[(*p & 0xff0000)>>16] |
2398 lookup_g[(*p & 0x00ff00)>> 8] |
2399 lookup_b[(*p & 0x0000ff)] |
2400 (*p & ~0xffffff);
2401 }
2402 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2403 }
2404 break;
2405 }
2406 }
2407
2408 free (lookup);
2409}
2410#endif
2411
2412/*
2413 * Check our parents are still who we think they are.
2414 * Do transparency updates if required
2415 */
2416int
2417rxvt_term::check_our_parents ()
2418{
2419 int i, pchanged, aformat, have_pixmap, rootdepth;
2420 unsigned long nitems, bytes_after;
2421 Atom atype;
2422 unsigned char *prop = NULL;
2423 Window root, oldp, *list;
2424 Pixmap rootpixmap = None;
2425 XWindowAttributes wattr, wrootattr;
2426 dDisp;
2427
2428 pchanged = 0;
2429
2430 if (!OPTION (Opt_transparent))
2431 return pchanged; /* Don't try any more */
2432
2433 XGetWindowAttributes (disp, display->root, &wrootattr);
2434 rootdepth = wrootattr.depth;
2435
2436 XGetWindowAttributes (disp, parent[0], &wattr);
2437
2438 if (rootdepth != wattr.depth)
2439 {
2440 if (am_transparent)
2441 {
2442 pchanged = 1;
2443 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2444 am_transparent = am_pixmap_trans = 0;
2445 }
2446
2447 return pchanged; /* Don't try any more */
2448 }
2449
2450 /* Get all X ops out of the queue so that our information is up-to-date. */
2451 XSync (disp, False);
2452
2453 /*
2454 * Make the frame window set by the window manager have
2455 * the root background. Some window managers put multiple nested frame
2456 * windows for each client, so we have to take care about that.
2457 */
2458 i = (xa[XA_XROOTPMAP_ID]
2459 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2460 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2461 &nitems, &bytes_after, &prop) == Success);
2462
2463 if (!i || prop == NULL)
2464 i = (xa[XA_ESETROOT_PMAP_ID]
2465 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2466 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2467 &nitems, &bytes_after, &prop) == Success);
2468
2469 if (!i || prop == NULL
2470#if TINTING
2471 || !rs[Rs_color + Color_tint]
2472#endif
2473 )
2474 have_pixmap = 0;
2475 else
2476 {
2477 have_pixmap = 1;
2478 rootpixmap = *(Pixmap *)prop;
2479 XFree (prop);
2480 }
2481
2482 if (have_pixmap)
2483 {
2484 /*
2485 * Copy display->root pixmap transparency
2486 */
2487 int sx, sy, nx, ny;
2488 unsigned int nw, nh;
2489 Window cr;
2490 XImage *image;
2491 GC gc;
2492 XGCValues gcvalue;
2493
2494 XTranslateCoordinates (disp, parent[0], display->root,
2495 0, 0, &sx, &sy, &cr);
2496 nw = (unsigned int)szHint.width;
2497 nh = (unsigned int)szHint.height;
2498 nx = ny = 0;
2499
2500 if (sx < 0)
2501 {
2502 nw += sx;
2503 nx = -sx;
2504 sx = 0;
2505 }
2506
2507 if (sy < 0)
2508 {
2509 nh += sy;
2510 ny = -sy;
2511 sy = 0;
2512 }
2513
2514 min_it (nw, (unsigned int) (wrootattr.width - sx));
2515 min_it (nh, (unsigned int) (wrootattr.height - sy));
2516
2517 XSync (disp, False);
2518 allowedxerror = -1;
2519 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2520
2521 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2522 /* XXX: may need a delay here? */
2523 allowedxerror = 0;
2524
2525 if (image == NULL)
2526 {
2527 if (am_transparent && am_pixmap_trans)
2528 {
2529 pchanged = 1;
2530 if (pixmap != None)
2531 {
2532 XFreePixmap (disp, pixmap);
2533 pixmap = None;
2534 }
2535 }
2536
2537 am_pixmap_trans = 0;
2538 }
2539 else
2540 {
2541 if (pixmap != None)
2542 XFreePixmap (disp, pixmap);
2543
2544#if TINTING
2545 if (ISSET_PIXCOLOR (Color_tint))
2546 {
2547 unsigned short rm, gm, bm;
2548 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2549
2550 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2551
2552 ShadeXImage (display, image, shade, rm, gm, bm);
2553 }
2554#endif
2555
2556 pixmap = XCreatePixmap (disp, vt,
2557 szHint.width, szHint.height, image->depth);
2558 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2559 XPutImage (disp, pixmap, gc, image, 0, 0,
2560 nx, ny, image->width, image->height);
2561 XFreeGC (disp, gc);
2562 XDestroyImage (image);
2563 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2564 XClearWindow (disp, parent[0]);
2565
2566 if (!am_transparent || !am_pixmap_trans)
2567 pchanged = 1;
2568
2569 am_transparent = am_pixmap_trans = 1;
2570 }
2571 }
2572
2573 if (am_pixmap_trans)
2574 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2575 else
2576 {
2577 unsigned int n;
2578 /*
2579 * InheritPixmap transparency
2580 */
2581 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 {
2583 oldp = parent[i];
2584 XQueryTree (disp, parent[i - 1], &root,
2585 &parent[i], &list, &n);
2586 XFree (list);
2587
2588 if (parent[i] == display->root)
2589 {
2590 if (oldp != None)
2591 pchanged = 1;
2592
2593 break;
2594 }
2595
2596 if (oldp != parent[i])
2597 pchanged = 1;
2598 }
2599
2600 n = 0;
2601
2602 if (pchanged)
2603 {
2604 for (; n < (unsigned int)i; n++)
2605 {
2606 XGetWindowAttributes (disp, parent[n], &wattr);
2607 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2608 {
2609 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2610 break;
2611 }
2612 }
2613 }
2614
2615 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2616 {
2617 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2618 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2619 am_transparent = 0;
2620 /* XXX: also turn off Opt_transparent? */
2621 }
2622 else
2623 {
2624 for (n = 0; n < (unsigned int)i; n++)
2625 {
2626 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2627 XClearWindow (disp, parent[n]);
2628 }
2629
2630 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2631 am_transparent = 1;
2632 }
2633
2634 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2635 parent[i] = None;
2636 }
2637
2638 if (scrollBar.win)
2639 {
2640 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2641 scrollBar.setIdle ();
2642 scrollbar_show (0);
2643 }
2644
2645 if (am_transparent)
2646 {
2647 want_refresh = want_full_refresh = 1;
2648 if (am_pixmap_trans)
2649 flush ();
2650 }
2651
2652 return pchanged;
2653}
2654#endif
2655
2656/*}}} */ 2192/*}}} */
2657 2193
2658bool 2194void
2659rxvt_term::cmd_parse () 2195rxvt_term::cmd_parse ()
2660{ 2196{
2661 bool flag = false;
2662 wchar_t ch = NOCHAR; 2197 wchar_t ch = NOCHAR;
2663 char *seq_begin; // remember start of esc-sequence here 2198 char *seq_begin; // remember start of esc-sequence here
2664 2199
2665 for (;;) 2200 for (;;)
2666 { 2201 {
2667 if (ch == NOCHAR) 2202 if (expect_false (ch == NOCHAR))
2668 { 2203 {
2669 seq_begin = cmdbuf_ptr; 2204 seq_begin = cmdbuf_ptr;
2670 ch = next_char (); 2205 ch = next_char ();
2671 2206
2672 if (ch == NOCHAR) 2207 if (ch == NOCHAR)
2673 break; 2208 break;
2674 } 2209 }
2675 2210
2676 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2211 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2677 { 2212 {
2678 if (!seen_input) 2213 if (expect_false (!seen_input))
2679 { 2214 {
2680 seen_input = 1; 2215 seen_input = 1;
2681 // many badly-written programs (e.g. jed) contain a race condition: 2216 // many badly-written programs (e.g. jed) contain a race condition:
2682 // they first read the screensize and then install a SIGWINCH handler. 2217 // they first read the screensize and then install a SIGWINCH handler.
2683 // some window managers resize the window early, and these programs 2218 // some window managers resize the window early, and these programs
… …
2696 wchar_t *str = buf; 2231 wchar_t *str = buf;
2697 wchar_t *eol = str + min (ncol, UBUFSIZ); 2232 wchar_t *eol = str + min (ncol, UBUFSIZ);
2698 2233
2699 for (;;) 2234 for (;;)
2700 { 2235 {
2701 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2236 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2702 break; 2237 break;
2703 2238
2704 *str++ = ch; 2239 *str++ = ch;
2705 2240
2706 if (ch == C0_LF || str >= eol) 2241 if (expect_false (ch == C0_LF || str >= eol))
2707 { 2242 {
2708 if (ch == C0_LF) 2243 if (ch == C0_LF)
2709 nlines++; 2244 nlines++;
2710 2245
2711 refresh_count++; 2246 refresh_count++;
2712 2247
2713 if (!OPTION (Opt_jumpScroll) 2248 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2714 || (refresh_count >= refresh_limit * (nrow - 1)))
2715 { 2249 {
2716 refreshnow = true;
2717 refresh_count = 0; 2250 refresh_count = 0;
2251
2252 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2253 {
2254 refreshnow = true;
2718 ch = NOCHAR; 2255 ch = NOCHAR;
2719 break; 2256 break;
2257 }
2720 } 2258 }
2721 2259
2722 // scr_add_lines only works for nlines <= nrow - 1. 2260 // scr_add_lines only works for nlines <= nrow - 1.
2723 if (nlines >= nrow - 1) 2261 if (nlines >= nrow - 1)
2724 { 2262 {
… …
2752 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2290 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2753 scr_add_lines (buf, str - buf, nlines); 2291 scr_add_lines (buf, str - buf, nlines);
2754 2292
2755 /* 2293 /*
2756 * If there have been a lot of new lines, then update the screen 2294 * If there have been a lot of new lines, then update the screen
2757 * What the heck I'll cheat and only refresh less than every page-full. 2295 * What the heck we'll cheat and only refresh less than every page-full.
2758 * the number of pages between refreshes is refresh_limit, which 2296 * if skipScroll is enabled.
2759 * is incremented here because we must be doing flat-out scrolling.
2760 */ 2297 */
2761 if (refreshnow) 2298 if (refreshnow)
2762 { 2299 {
2763 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2764 refresh_limit++;
2765 else
2766 {
2767 flag = true;
2768 scr_refresh (); 2300 scr_refresh ();
2769 want_refresh = 1; 2301 want_refresh = 1;
2770 }
2771 } 2302 }
2772
2773 } 2303 }
2774 else 2304 else
2775 { 2305 {
2776 try 2306 try
2777 { 2307 {
… …
2785 } 2315 }
2786 2316
2787 ch = NOCHAR; 2317 ch = NOCHAR;
2788 } 2318 }
2789 } 2319 }
2790
2791 return flag;
2792} 2320}
2793 2321
2794// read the next character 2322// read the next character
2795wchar_t 2323wchar_t
2796rxvt_term::next_char () NOTHROW 2324rxvt_term::next_char () NOTHROW
2797{ 2325{
2798 while (cmdbuf_ptr < cmdbuf_endp) 2326 while (cmdbuf_ptr < cmdbuf_endp)
2799 { 2327 {
2800 // assume 7-bit to be ascii ALWAYS 2328 // assume 7-bit to be ascii ALWAYS
2801 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2329 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2802 return *cmdbuf_ptr++; 2330 return *cmdbuf_ptr++;
2803 2331
2804 wchar_t wc; 2332 wchar_t wc;
2805 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2333 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2806 2334
… …
2810 cmdbuf_ptr = cmdbuf_endp; 2338 cmdbuf_ptr = cmdbuf_endp;
2811 break; 2339 break;
2812 } 2340 }
2813 2341
2814 if (len == (size_t)-1) 2342 if (len == (size_t)-1)
2343 {
2344 mbstate.reset (); // reset now undefined conversion state
2815 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2345 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2346 }
2816 2347
2817 // assume wchar == unicode 2348 // assume wchar == unicode
2818 cmdbuf_ptr += len; 2349 cmdbuf_ptr += len;
2819 return wc & UNICODE_MASK; 2350 return wc & UNICODE_MASK;
2820 } 2351 }
… …
2864/*----------------------------------------------------------------------*/ 2395/*----------------------------------------------------------------------*/
2865#ifdef PRINTPIPE 2396#ifdef PRINTPIPE
2866FILE * 2397FILE *
2867rxvt_term::popen_printer () 2398rxvt_term::popen_printer ()
2868{ 2399{
2869 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2400 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2870 2401
2871 if (stream == NULL) 2402 if (stream == NULL)
2872 rxvt_warn ("can't open printer pipe, not printing.\n"); 2403 rxvt_warn ("can't open printer pipe, not printing.\n");
2873 2404
2874 return stream; 2405 return stream;
… …
2885 * simulate attached vt100 printer 2416 * simulate attached vt100 printer
2886 */ 2417 */
2887void 2418void
2888rxvt_term::process_print_pipe () 2419rxvt_term::process_print_pipe ()
2889{ 2420{
2890 int done; 2421 FILE *fd = popen_printer ();
2891 FILE *fd;
2892 2422
2893 if ((fd = popen_printer ()) == NULL) 2423 if (!fd)
2894 return; 2424 return;
2895 2425
2896 /* 2426 /*
2897 * Send all input to the printer until either ESC[4i or ESC[?4i 2427 * Send all input to the printer until either ESC[4i or ESC[?4i
2898 * is received. 2428 * is received.
2899 */ 2429 */
2900 for (done = 0; !done;) 2430 for (int done = 0; !done; )
2901 { 2431 {
2902 unsigned char buf[8]; 2432 unsigned char buf[8];
2903 unicode_t ch; 2433 unicode_t ch;
2904 unsigned int i, len; 2434 unsigned int i, len;
2905 2435
… …
2924 { 2454 {
2925 if ((buf[len++] = cmd_getc ()) == 'i') 2455 if ((buf[len++] = cmd_getc ()) == 'i')
2926 break; /* done = 1 */ 2456 break; /* done = 1 */
2927 } 2457 }
2928 } 2458 }
2929 2459
2930 for (i = 0; i < len; i++) 2460 for (i = 0; i < len; i++)
2931 if (putc (buf[i], fd) == EOF) 2461 if (putc (buf[i], fd) == EOF)
2932 { 2462 {
2933 done = 1; 2463 done = 1;
2934 break; 2464 break;
… …
2936 } 2466 }
2937 } 2467 }
2938 2468
2939 pclose_printer (fd); 2469 pclose_printer (fd);
2940} 2470}
2941#endif /* PRINTPIPE */ 2471#endif /* PRINTPIPE */
2942/*}}} */ 2472/*}}} */
2943 2473
2944/* *INDENT-OFF* */ 2474/* *INDENT-OFF* */
2945enum { 2475enum {
2946 C1_40 = 0x40, 2476 C1_40 = 0x40,
… …
2996 process_dcs_seq (); 2526 process_dcs_seq ();
2997 break; 2527 break;
2998 case 0x9b: /* CSI */ 2528 case 0x9b: /* CSI */
2999 process_csi_seq (); 2529 process_csi_seq ();
3000 break; 2530 break;
3001 case 0x9d: /* CSI */ 2531 case 0x9d: /* OSC */
3002 process_osc_seq (); 2532 process_osc_seq ();
3003 break; 2533 break;
3004#endif 2534#endif
3005 } 2535 }
3006} 2536}
… …
3050 break; 2580 break;
3051 case 'Z': /* identify the terminal type */ 2581 case 'Z': /* identify the terminal type */
3052 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2582 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3053 break; 2583 break;
3054 case '<': /* turn off VT52 mode */ 2584 case '<': /* turn off VT52 mode */
3055 PrivMode (0, PrivMode_vt52); 2585 set_privmode (PrivMode_vt52, 0);
3056 break; 2586 break;
3057 case 'F': /* use special graphics character set */ 2587 case 'F': /* use special graphics character set */
3058 case 'G': /* use regular character set */ 2588 case 'G': /* use regular character set */
3059 /* unimplemented */ 2589 /* unimplemented */
3060 break; 2590 break;
… …
3096 scr_charset_set (2, (unsigned int)cmd_getc ()); 2626 scr_charset_set (2, (unsigned int)cmd_getc ());
3097 break; 2627 break;
3098 case '+': 2628 case '+':
3099 scr_charset_set (3, (unsigned int)cmd_getc ()); 2629 scr_charset_set (3, (unsigned int)cmd_getc ());
3100 break; 2630 break;
3101#if ENABLE_FRILLS 2631#if !ENABLE_MINIMAL
3102 case '6': 2632 case '6':
3103 scr_backindex (); 2633 scr_backindex ();
3104 break; 2634 break;
3105#endif 2635#endif
3106 case '7': 2636 case '7':
3107 scr_cursor (SAVE); 2637 scr_cursor (SAVE);
3108 break; 2638 break;
3109 case '8': 2639 case '8':
3110 scr_cursor (RESTORE); 2640 scr_cursor (RESTORE);
3111 break; 2641 break;
3112#if ENABLE_FRILLS 2642#if !ENABLE_MINIMAL
3113 case '9': 2643 case '9':
3114 scr_forwardindex (); 2644 scr_forwardindex ();
3115 break; 2645 break;
3116#endif 2646#endif
3117 case '=': 2647 case '=':
3118 case '>': 2648 case '>':
3119 PrivMode ((ch == '='), PrivMode_aplKP); 2649 set_privmode (PrivMode_aplKP, ch == '=');
3120 break; 2650 break;
3121 2651
3122 case C1_40: 2652 case C1_40:
3123 cmd_getc (); 2653 cmd_getc ();
3124 break; 2654 break;
… …
3163 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2693 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3164 case C1_SCI: /* ESC Z */ 2694 case C1_SCI: /* ESC Z */
3165 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2695 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3166 break; /* steal obsolete ESC [ c */ 2696 break; /* steal obsolete ESC [ c */
3167 2697
3168 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2698 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3169 case C1_CSI: /* ESC [ */ 2699 case C1_CSI: /* ESC [ */
3170 process_csi_seq (); 2700 process_csi_seq ();
3171 break; 2701 break;
3172 2702
3173 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2703 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3174 case C1_OSC: /* ESC ] */ 2704 case C1_OSC: /* ESC ] */
3175 process_osc_seq (); 2705 process_osc_seq ();
3176 break; 2706 break;
3177 2707
3178 /* 8.3.106: RESET TO INITIAL STATE */ 2708 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3179 case 'c': 2709 case 'c':
3180 mbstate.reset (); 2710 mbstate.reset ();
3181 scr_poweron (); 2711 scr_poweron ();
3182 scrollbar_show (1); 2712 scrollBar.show (1);
3183 break; 2713 break;
3184 2714
3185 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2715 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3186 case 'n': 2716 case 'n':
3187 scr_charset_choose (2); 2717 scr_charset_choose (2);
… …
3232rxvt_term::process_csi_seq () 2762rxvt_term::process_csi_seq ()
3233{ 2763{
3234 unicode_t ch, priv, i; 2764 unicode_t ch, priv, i;
3235 unsigned int nargs, p; 2765 unsigned int nargs, p;
3236 int n, ndef; 2766 int n, ndef;
3237 int arg[ESC_ARGS]; 2767 int arg[ESC_ARGS] = { };
3238 2768
3239 for (nargs = ESC_ARGS; nargs > 0;) 2769 nargs = 0;
3240 arg[--nargs] = 0;
3241 2770
3242 priv = 0; 2771 priv = 0;
3243 ch = cmd_getc (); 2772 ch = cmd_getc ();
3244 if (ch >= '<' && ch <= '?') 2773 if ((ch >= '<' && ch <= '?') || ch == '!')
2774 {
3245 { /* '<' '=' '>' '?' */ 2775 /* '<' '=' '>' '?' '!' */
3246 priv = ch; 2776 priv = ch;
3247 ch = cmd_getc (); 2777 ch = cmd_getc ();
3248 } 2778 }
3249 2779
3250 /* read any numerical arguments */ 2780 /* read any numerical arguments */
… …
3289 switch (priv) 2819 switch (priv)
3290 { 2820 {
3291 case '>': 2821 case '>':
3292 if (ch == CSI_DA) /* secondary device attributes */ 2822 if (ch == CSI_DA) /* secondary device attributes */
3293 { 2823 {
3294 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2824 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3295 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions. 2825 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3296 // 2826 //
3297 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2827 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3298 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2828 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3299 // that we do not support xterm mouse reporting (should be 95 when we do). 2829 // versions.
3300 // 2830 //
3301 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); 2831 tt_printf ("\033[>%d;95;0c", 'U');
3302 } 2832 }
3303 break; 2833 break;
2834
3304 case '?': 2835 case '?':
3305 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2836 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3306 process_terminal_mode (ch, priv, nargs, arg); 2837 process_terminal_mode (ch, priv, nargs, arg);
3307 break; 2838 break;
2839
2840 case '!':
2841 if (ch == CSI_70)
2842 {
2843 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2844 scr_soft_reset ();
2845
2846 static const int pm_h[] = { 7, 25 };
2847 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2848
2849 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2850 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
3308 } 2851 }
2852 break;
2853 }
2854
3309 return; 2855 return;
3310 } 2856 }
3311 2857
3312 switch (ch) 2858 switch (ch)
3313 { 2859 {
… …
3433 break; 2979 break;
3434 case 6: /* CPR requested */ 2980 case 6: /* CPR requested */
3435 scr_report_position (); 2981 scr_report_position ();
3436 break; 2982 break;
3437 case 7: /* unofficial extension */ 2983 case 7: /* unofficial extension */
3438 if (OPTION (Opt_insecure)) 2984 if (option (Opt_insecure))
3439 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2985 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3440 break; 2986 break;
3441 case 8: /* unofficial extension */ 2987 case 8: /* unofficial extension */
3442 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2988 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3443 break; 2989 break;
… …
3510 break; 3056 break;
3511 case CSI_75: 3057 case CSI_75:
3512 scr_cursor (RESTORE); 3058 scr_cursor (RESTORE);
3513 break; 3059 break;
3514 3060
3515#if ENABLE_FRILLS 3061#if !ENABLE_MINIMAL
3516 case CSI_74: 3062 case CSI_74:
3517 process_window_ops (arg, nargs); 3063 process_window_ops (arg, nargs);
3518 break; 3064 break;
3519#endif 3065#endif
3520 3066
… …
3527 break; 3073 break;
3528 } 3074 }
3529} 3075}
3530/*}}} */ 3076/*}}} */
3531 3077
3532#if ENABLE_FRILLS 3078#if !ENABLE_MINIMAL
3533/* ARGSUSED */ 3079/* ARGSUSED */
3534void 3080void
3535rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3081rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3536{ 3082{
3537 int x, y; 3083 int x, y;
3538 XWindowAttributes wattr; 3084 XWindowAttributes wattr;
3539 Window wdummy; 3085 Window wdummy;
3540 dDisp; 3086
3087 dLocal (Display *, dpy);
3541 3088
3542 if (nargs == 0) 3089 if (nargs == 0)
3543 return; 3090 return;
3544 3091
3545 switch (args[0]) 3092 switch (args[0])
3546 { 3093 {
3547 /* 3094 /*
3548 * commands 3095 * commands
3549 */ 3096 */
3550 case 1: /* deiconify window */ 3097 case 1: /* deiconify window */
3551 XMapWindow (disp, parent[0]); 3098 XMapWindow (dpy, parent[0]);
3552 break; 3099 break;
3553 case 2: /* iconify window */ 3100 case 2: /* iconify window */
3554 XIconifyWindow (disp, parent[0], display->screen); 3101 XIconifyWindow (dpy, parent[0], display->screen);
3555 break; 3102 break;
3556 case 3: /* set position (pixels) */ 3103 case 3: /* set position (pixels) */
3557 XMoveWindow (disp, parent[0], args[1], args[2]); 3104 XMoveWindow (dpy, parent[0], args[1], args[2]);
3558 break; 3105 break;
3559 case 4: /* set size (pixels) */ 3106 case 4: /* set size (pixels) */
3560 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3107 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3561 break; 3108 break;
3562 case 5: /* raise window */ 3109 case 5: /* raise window */
3563 XRaiseWindow (disp, parent[0]); 3110 XRaiseWindow (dpy, parent[0]);
3564 break; 3111 break;
3565 case 6: /* lower window */ 3112 case 6: /* lower window */
3566 XLowerWindow (disp, parent[0]); 3113 XLowerWindow (dpy, parent[0]);
3567 break; 3114 break;
3568 case 7: /* refresh window */ 3115 case 7: /* refresh window */
3569 scr_touch (true); 3116 scr_touch (true);
3570 break; 3117 break;
3571 case 8: /* set size (chars) */ 3118 case 8: /* set size (chars) */
… …
3578 if (args[0] >= 24) /* set height (chars) */ 3125 if (args[0] >= 24) /* set height (chars) */
3579 set_widthheight ((unsigned int)width, 3126 set_widthheight ((unsigned int)width,
3580 (unsigned int) (args[1] * fheight)); 3127 (unsigned int) (args[1] * fheight));
3581 break; 3128 break;
3582 3129
3583
3584 /* 3130 /*
3585 * reports - some output format copied from XTerm 3131 * reports - some output format copied from XTerm
3586 */ 3132 */
3587 case 11: /* report window state */ 3133 case 11: /* report window state */
3588 XGetWindowAttributes (disp, parent[0], &wattr); 3134 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3135 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3590 break; 3136 break;
3591 case 13: /* report window position */ 3137 case 13: /* report window position */
3592 XGetWindowAttributes (disp, parent[0], &wattr); 3138 XGetWindowAttributes (dpy, parent[0], &wattr);
3593 XTranslateCoordinates (disp, parent[0], wattr.root, 3139 XTranslateCoordinates (dpy, parent[0], wattr.root,
3594 -wattr.border_width, -wattr.border_width, 3140 -wattr.border_width, -wattr.border_width,
3595 &x, &y, &wdummy); 3141 &x, &y, &wdummy);
3596 tt_printf ("\033[3;%d;%dt", x, y); 3142 tt_printf ("\033[3;%d;%dt", x, y);
3597 break; 3143 break;
3598 case 14: /* report window size (pixels) */ 3144 case 14: /* report window size (pixels) */
3599 XGetWindowAttributes (disp, parent[0], &wattr); 3145 XGetWindowAttributes (dpy, parent[0], &wattr);
3600 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3146 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3601 break; 3147 break;
3602 case 18: /* report text area size (chars) */ 3148 case 18: /* report text area size (chars) */
3603 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3149 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3604 break; 3150 break;
… …
3606 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3152 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3607 break; 3153 break;
3608 case 20: /* report icon label */ 3154 case 20: /* report icon label */
3609 { 3155 {
3610 char *s; 3156 char *s;
3611 XGetIconName (disp, parent[0], &s); 3157 XGetIconName (dpy, parent[0], &s);
3612 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3158 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3613 XFree (s); 3159 XFree (s);
3614 } 3160 }
3615 break; 3161 break;
3616 case 21: /* report window title */ 3162 case 21: /* report window title */
3617 { 3163 {
3618 char *s; 3164 char *s;
3619 XFetchName (disp, parent[0], &s); 3165 XFetchName (dpy, parent[0], &s);
3620 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3166 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3621 XFree (s); 3167 XFree (s);
3622 } 3168 }
3623 break; 3169 break;
3624 } 3170 }
3625} 3171}
… …
3652 seen_esc = true; 3198 seen_esc = true;
3653 continue; 3199 continue;
3654 } 3200 }
3655 else if (ch == C0_BEL || ch == CHAR_ST) 3201 else if (ch == C0_BEL || ch == CHAR_ST)
3656 break; 3202 break;
3203 else if (ch == C0_SYN)
3204 ch = cmd_get8 ();
3657 else if (ch < 0x20) 3205 else if (ch < 0x20)
3658 return NULL; /* other control character - exit */ 3206 return NULL; /* other control character - exit */
3659 3207
3660 seen_esc = false; 3208 seen_esc = false;
3661 3209
3662 if (n >= STRING_MAX - 1) 3210 if (n >= STRING_MAX - 1)
3663 // stop at some sane length 3211 // stop at some sane length
3664 return NULL; 3212 return NULL;
3665 3213
3666 if (ch == C0_SYN)
3667 string[n++] = cmd_get8 ();
3668 else
3669 string[n++] = ch; 3214 string[n++] = ch;
3670 } 3215 }
3671 3216
3672 string[n++] = '\0'; 3217 string[n++] = '\0';
3673 3218
3674 ends_how = (ch == 0x5c ? C0_ESC : ch); 3219 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3725void 3270void
3726rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3271rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3727{ 3272{
3728 if (str[0] == '?' && !str[1]) 3273 if (str[0] == '?' && !str[1])
3729 { 3274 {
3730 unsigned short r, g, b; 3275 rgba c;
3731 pix_colors_focused[color].get (display, r, g, b); 3276 pix_colors_focused[color].get (c);
3277
3278#if XFT
3279 if (c.a != rgba::MAX_CC)
3280 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3281 else
3282#endif
3732 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3283 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3733 } 3284 }
3734 else 3285 else
3735 set_window_color (color, str); 3286 set_window_color (color, str);
3736} 3287}
3737 3288
3738/* 3289/*
3739 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3290 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3740 */ 3291 */
3741void 3292void
3742rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3293rxvt_term::process_xterm_seq (int op, char *str, char resp)
3743{ 3294{
3744 int color; 3295 int color;
3745 char *buf, *name; 3296 char *buf, *name;
3746 bool query = str[0] == '?' && !str[1]; 3297 bool query = str[0] == '?' && !str[1];
3747 int saveop = op; 3298 int saveop = op;
3748 dDisp; 3299
3300 dLocal (Display *, dpy);
3749 3301
3750 assert (str != NULL); 3302 assert (str != NULL);
3303
3304 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3305 return;
3306
3751 switch (op) 3307 switch (op)
3752 { 3308 {
3753 case XTerm_name: 3309 case XTerm_name:
3754 set_title (str); 3310 set_title (str);
3755 /* FALLTHROUGH */ 3311 /* FALLTHROUGH */
… …
3769 unsigned long bytes_after; 3325 unsigned long bytes_after;
3770 unsigned char *value = 0; 3326 unsigned char *value = 0;
3771 const char *str = ""; 3327 const char *str = "";
3772 3328
3773 if (prop 3329 if (prop
3774 && XGetWindowProperty (disp, parent[0], 3330 && XGetWindowProperty (dpy, parent[0],
3775 prop, 0, 1<<16, 0, AnyPropertyType, 3331 prop, 0, 1<<16, 0, AnyPropertyType,
3776 &actual_type, &actual_format, 3332 &actual_type, &actual_format,
3777 &nitems, &bytes_after, &value) == Success 3333 &nitems, &bytes_after, &value) == Success
3778 && actual_type != None 3334 && actual_type != None
3779 && actual_format == 8) 3335 && actual_format == 8)
3780 str = (const char *)(value); 3336 str = (const char *)(value);
3781 3337
3782 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3338 tt_printf ("\033]%d;%s%c", op, str, resp);
3783 3339
3784 XFree (value); 3340 XFree (value);
3785 } 3341 }
3786 else 3342 else
3787 { 3343 {
3788 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3344 char *eq = strchr (str, '=');
3789 3345
3790 if (eq) 3346 if (eq)
3791 { 3347 {
3792 *eq = 0; 3348 *eq = 0;
3793 set_utf8_property (display->atom (str), eq + 1); 3349 set_utf8_property (display->atom (str), eq + 1);
3794 } 3350 }
3795 else 3351 else
3796 XDeleteProperty (disp, parent[0], 3352 XDeleteProperty (dpy, parent[0],
3797 display->atom (str)); 3353 display->atom (str));
3798 } 3354 }
3799 break; 3355 break;
3800 3356
3801 case XTerm_Color: 3357 case XTerm_Color:
… …
3811 break; 3367 break;
3812 3368
3813 if ((buf = strchr (name, ';')) != NULL) 3369 if ((buf = strchr (name, ';')) != NULL)
3814 *buf++ = '\0'; 3370 *buf++ = '\0';
3815 3371
3816 if (name[0] == '?' && !name[1]) 3372 process_color_seq (op, color, name, resp);
3817 {
3818 unsigned short r, g, b;
3819 pix_colors_focused[color].get (display, r, g, b);
3820 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3821 }
3822 else
3823 set_window_color (color, name);
3824 } 3373 }
3825 break; 3374 break;
3375 case Rxvt_restoreFG:
3826 case XTerm_Color00: 3376 case XTerm_Color00:
3827 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3377 process_color_seq (op, Color_fg, str, resp);
3828 break; 3378 break;
3379 case Rxvt_restoreBG:
3829 case XTerm_Color01: 3380 case XTerm_Color01:
3830 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3381 process_color_seq (op, Color_bg, str, resp);
3831 break; 3382 break;
3832#ifndef NO_CURSORCOLOR 3383#ifndef NO_CURSORCOLOR
3833 case XTerm_Color_cursor: 3384 case XTerm_Color_cursor:
3834 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3385 process_color_seq (op, Color_cursor, str, resp);
3835 break; 3386 break;
3836#endif 3387#endif
3837 case XTerm_Color_pointer_fg: 3388 case XTerm_Color_pointer_fg:
3838 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3389 process_color_seq (op, Color_pointer_fg, str, resp);
3839 break; 3390 break;
3840 case XTerm_Color_pointer_bg: 3391 case XTerm_Color_pointer_bg:
3841 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3392 process_color_seq (op, Color_pointer_bg, str, resp);
3842 break; 3393 break;
3843#ifndef NO_BOLD_UNDERLINE_REVERSE 3394#ifndef NO_BOLD_UNDERLINE_REVERSE
3844 case XTerm_Color_RV: 3395 case XTerm_Color_RV:
3845 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3396 process_color_seq (op, Color_RV, str, resp);
3846 break; 3397 break;
3847 case Rxvt_Color_BD: 3398 case Rxvt_Color_BD:
3848 case URxvt_Color_BD: 3399 case URxvt_Color_BD:
3849 process_color_seq (op, Color_BD, str, resp); 3400 process_color_seq (op, Color_BD, str, resp);
3850 break; 3401 break;
3851 case Rxvt_Color_UL: 3402 case Rxvt_Color_UL:
3852 case URxvt_Color_UL: 3403 case URxvt_Color_UL:
3853 process_color_seq (op, Color_UL, str, resp); 3404 process_color_seq (op, Color_UL, str, resp);
3854 break; 3405 break;
3855 case URxvt_Color_IT: 3406 case URxvt_Color_IT:
3856 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3407 process_color_seq (op, Color_IT, str, resp);
3857 break; 3408 break;
3858#endif 3409#endif
3859#if TRANSPARENT && TINTING 3410 case URxvt_Color_border:
3411 process_color_seq (op, Color_border, str, resp);
3412 break;
3413#if ENABLE_TRANSPARENCY
3860 case URxvt_Color_tint: 3414 case URxvt_Color_tint:
3861 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3415 process_color_seq (op, Color_tint, str, resp);
3862 check_our_parents (); 3416 {
3863 if (am_transparent) 3417 bool changed = false;
3864 want_full_refresh = want_refresh = 1;
3865 break;
3866#endif
3867 3418
3419 if (ISSET_PIXCOLOR (Color_tint))
3420 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3421 else
3422 changed = bgPixmap.unset_tint ();
3423
3424 if (changed)
3425 update_background ();
3426 }
3427
3428 break;
3429#endif
3430
3431#if BG_IMAGE_FROM_FILE
3868 case Rxvt_Pixmap: 3432 case Rxvt_Pixmap:
3869 { 3433 if (!strcmp (str, "?"))
3870 if (*str != ';')
3871 { 3434 {
3872#if XPM_BACKGROUND 3435 char str[256];
3873 scale_pixmap (""); /* reset to default scaling */ 3436
3874 set_bgPixmap (str); /* change pixmap */ 3437 sprintf (str, "[%dx%d+%d+%d]",
3875 scr_touch (true); 3438 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3876#endif 3439 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3440 process_xterm_seq (XTerm_title, str, CHAR_ST);
3877 } 3441 }
3878 3442 else
3443 {
3879 int changed = 0; 3444 int changed = 0;
3880 3445
3881 while ((str = strchr (str, ';')) != NULL) 3446 if (*str != ';')
3882 { 3447 {
3448 /* reset to default scaling :*/
3449 bgPixmap.unset_geometry ();
3450 if (bgPixmap.set_file (str)) /* change pixmap */
3451 changed++;
3452 str = strchr (str, ';');
3453 if (str == NULL)
3454 bgPixmap.set_defaultGeometry ();
3455 }
3456
3457 while (str)
3458 {
3883 str++; 3459 str++;
3884#if XPM_BACKGROUND 3460 if (bgPixmap.set_geometry (str))
3885 changed += scale_pixmap (str); 3461 changed++;
3886#endif 3462 str = strchr (str, ';');
3887 } 3463 }
3888 3464
3889 if (changed) 3465 if (changed)
3890 { 3466 update_background ();
3891#ifdef XPM_BACKGROUND
3892 resize_pixmap ();
3893 scr_touch (true);
3894#endif
3895 } 3467 }
3896 }
3897 break; 3468 break;
3898 3469#endif
3899 case Rxvt_restoreFG:
3900 set_window_color (Color_fg, str);
3901 break;
3902 case Rxvt_restoreBG:
3903 set_window_color (Color_bg, str);
3904 break;
3905 3470
3906 case XTerm_logfile: 3471 case XTerm_logfile:
3907 // TODO, when secure mode? 3472 // TODO, when secure mode?
3908 break; 3473 break;
3909 3474
… …
3927 case URxvt_italicFont: 3492 case URxvt_italicFont:
3928 case URxvt_boldItalicFont: 3493 case URxvt_boldItalicFont:
3929#endif 3494#endif
3930 if (query) 3495 if (query)
3931 tt_printf ("\33]%d;%-.250s%c", saveop, 3496 tt_printf ("\33]%d;%-.250s%c", saveop,
3932 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3497 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3933 ? fontset[op - URxvt_font]->fontdesc : "", 3498 ? fontset[op - URxvt_font]->fontdesc : "",
3934 resp); 3499 resp);
3935 else 3500 else
3936 { 3501 {
3937 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3502 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3940 allocated.push_back ((void *)res); 3505 allocated.push_back ((void *)res);
3941 set_fonts (); 3506 set_fonts ();
3942 } 3507 }
3943 break; 3508 break;
3944 3509
3945#if ENABLE_FRILLS 3510 case URxvt_version:
3511 if (query)
3512 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3513 op,
3514 rs[Rs_name], VERSION[0], VERSION[2],
3515 resp);
3516 break;
3517
3518#if !ENABLE_MINIMAL
3946 case URxvt_locale: 3519 case URxvt_locale:
3947 if (query) 3520 if (query)
3948 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3521 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3949 else 3522 else
3950 { 3523 {
3951 set_locale (str); 3524 set_locale (str);
3952 pty->set_utf8_mode (enc_utf8); 3525 pty->set_utf8_mode (enc_utf8);
3953 init_xlocale (); 3526 init_xlocale ();
… …
3968 break; 3541 break;
3969#endif 3542#endif
3970 3543
3971#if ENABLE_PERL 3544#if ENABLE_PERL
3972 case URxvt_perl: 3545 case URxvt_perl:
3973 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3546 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3974 ; // no responses yet
3975 break; 3547 break;
3976#endif 3548#endif
3977 } 3549 }
3978} 3550}
3979/*----------------------------------------------------------------------*/ 3551/*----------------------------------------------------------------------*/
… …
4002 { 3574 {
4003 if (mode == 'r') 3575 if (mode == 'r')
4004 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4005 else 3577 else
4006 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3578 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4007 PrivMode (state, bit); 3579 set_privmode (bit, state);
4008 } 3580 }
4009 3581
4010 return state; 3582 return state;
4011} 3583}
4012 3584
… …
4016{ 3588{
4017 unsigned int i, j; 3589 unsigned int i, j;
4018 int state; 3590 int state;
4019 3591
4020 static const struct 3592 static const struct
4021 { 3593 {
4022 const int argval; 3594 const int argval;
4023 const unsigned long bit; 3595 const unsigned long bit;
4024 }
4025
4026 argtopriv[] = { 3596 } argtopriv[] = {
4027 { 1, PrivMode_aplCUR }, 3597 { 1, PrivMode_aplCUR }, // DECCKM
4028 { 2, PrivMode_vt52 }, 3598 { 2, PrivMode_vt52 },
4029 { 3, PrivMode_132 }, 3599 { 3, PrivMode_132 }, // DECCOLM
4030 { 4, PrivMode_smoothScroll }, 3600 { 4, PrivMode_smoothScroll }, // DECSCLM
4031 { 5, PrivMode_rVideo }, 3601 { 5, PrivMode_rVideo }, // DECSCNM
4032 { 6, PrivMode_relOrigin }, 3602 { 6, PrivMode_relOrigin }, // DECOM
4033 { 7, PrivMode_Autowrap }, 3603 { 7, PrivMode_Autowrap }, // DECAWM
4034 // 8, bi-directional support mode 3604 // 8, auto-repeat keys // DECARM
4035 { 9, PrivMode_MouseX10 }, 3605 { 9, PrivMode_MouseX10 },
4036 // 18, 19 printing-related 3606 // 18 end FF to printer after print screen
3607 // 19 Print screen prints full screen/scorll region
4037 { 25, PrivMode_VisibleCursor }, 3608 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4038#ifdef scrollBar_esc 3609#ifdef scrollBar_esc
4039 { scrollBar_esc, PrivMode_scrollBar }, 3610 { scrollBar_esc, PrivMode_scrollBar },
4040#endif 3611#endif
4041 { 35, PrivMode_ShiftKeys }, // rxvt extension 3612 { 35, PrivMode_ShiftKeys }, // rxvt extension
3613 // 38, tektronix mode // DECTEK
4042 { 40, PrivMode_132OK }, 3614 { 40, PrivMode_132OK },
4043 // 41 xterm more fixes NYI 3615 // 41 xterm more fixes NYI
4044 // 45 margin bell NYI 3616 // 45 margin bell NYI
4045 // 46 start logging 3617 // 46 start logging
4046 { 47, PrivMode_Screen }, 3618 { 47, PrivMode_Screen },
4047 { 66, PrivMode_aplKP }, 3619 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4048#ifndef NO_BACKSPACE_KEY 3620#ifndef NO_BACKSPACE_KEY
4049 { 67, PrivMode_BackSpace }, 3621 { 67, PrivMode_BackSpace }, // DECBKM
4050#endif 3622#endif
4051 { 1000, PrivMode_MouseX11 }, 3623 { 1000, PrivMode_MouseX11 },
4052 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3624 { 1002, PrivMode_MouseBtnEvent },
4053 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3625 { 1003, PrivMode_MouseAnyEvent },
4054 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4055 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3626 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4056 { 1011, PrivMode_Keypress }, // rxvt extension 3627 { 1011, PrivMode_Keypress }, // rxvt extension
4057 // 1035 enable modifiers for alt, numlock NYI 3628 // 1035 enable modifiers for alt, numlock NYI
4058 // 1036 send ESC for meta keys NYI 3629 // 1036 send ESC for meta keys NYI
4059 // 1037 send DEL for keypad delete NYI 3630 // 1037 send DEL for keypad delete NYI
4060 { 1047, PrivMode_Screen }, 3631 { 1047, PrivMode_Screen },
4061 // 1048 save and restore cursor 3632 // 1048 save and restore cursor
4062 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3633 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4063 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3634 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3635 { 2004, PrivMode_BracketPaste },
4064 }; 3636 };
4065 3637
4066 if (nargs == 0) 3638 if (nargs == 0)
4067 return; 3639 return;
4068 3640
… …
4093 3665
4094 scr_touch (true); 3666 scr_touch (true);
4095 break; 3667 break;
4096#endif 3668#endif
4097 case 1048: /* alternative cursor save */ 3669 case 1048: /* alternative cursor save */
4098 case 1049:
4099 if (OPTION (Opt_secondaryScreen)) 3670 if (option (Opt_secondaryScreen))
4100 if (mode == 0) 3671 if (mode == 0)
4101 scr_cursor (RESTORE); 3672 scr_cursor (RESTORE);
4102 else if (mode == 1) 3673 else if (mode == 1)
4103 scr_cursor (SAVE); 3674 scr_cursor (SAVE);
4104 break; 3675 break;
… …
4112 case 2: /* VT52 mode */ 3683 case 2: /* VT52 mode */
4113 /* oddball mode. should be set regardless of set/reset 3684 /* oddball mode. should be set regardless of set/reset
4114 * parameter. Return from VT52 mode with an ESC < from 3685 * parameter. Return from VT52 mode with an ESC < from
4115 * within VT52 mode 3686 * within VT52 mode
4116 */ 3687 */
4117 PrivMode (1, PrivMode_vt52); 3688 set_privmode (PrivMode_vt52, 1);
4118 break; 3689 break;
4119 case 3: /* 80/132 */ 3690 case 3: /* 80/132 */
4120 if (priv_modes & PrivMode_132OK) 3691 if (priv_modes & PrivMode_132OK)
4121 set_widthheight (((state ? 132 : 80) * fwidth), height); 3692 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4122 break; 3693 break;
4123 case 4: /* smooth scrolling */ 3694 case 4: /* smooth scrolling */
4124 set_option (Opt_jumpScroll, !state); 3695 set_option (Opt_jumpScroll, !state);
4125 break; 3696 break;
4126 case 5: /* reverse video */ 3697 case 5: /* reverse video */
… …
4133 scr_autowrap (state); 3704 scr_autowrap (state);
4134 break; 3705 break;
4135 /* case 8: - auto repeat, can't do on a per window basis */ 3706 /* case 8: - auto repeat, can't do on a per window basis */
4136 case 9: /* X10 mouse reporting */ 3707 case 9: /* X10 mouse reporting */
4137 if (state) /* orthogonal */ 3708 if (state) /* orthogonal */
4138 priv_modes &= ~PrivMode_MouseX11; 3709 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4139 break; 3710 break;
4140#ifdef scrollBar_esc 3711#ifdef scrollBar_esc
4141 case scrollBar_esc: 3712 case scrollBar_esc:
4142 if (scrollbar_mapping (state)) 3713 if (scrollBar.map (state))
4143 { 3714 {
4144 resize_all_windows (0, 0, 0); 3715 resize_all_windows (0, 0, 0);
4145 scr_touch (true); 3716 scr_touch (true);
4146 } 3717 }
4147 break; 3718 break;
… …
4156 break; 3727 break;
4157 /* case 66: - application key pad */ 3728 /* case 66: - application key pad */
4158 /* case 67: - backspace key */ 3729 /* case 67: - backspace key */
4159 case 1000: /* X11 mouse reporting */ 3730 case 1000: /* X11 mouse reporting */
4160 if (state) /* orthogonal */ 3731 if (state) /* orthogonal */
4161 priv_modes &= ~PrivMode_MouseX10; 3732 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4162 break; 3733 break;
4163#if 0
4164 case 1001: 3734 case 1002:
4165 break; /* X11 mouse highlighting */ 3735 case 1003:
4166#endif 3736 if (state)
3737 {
3738 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3739 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3740 vt_emask_mouse = PointerMotionMask;
3741 }
3742 else
3743 vt_emask_mouse = NoEventMask;
3744
3745 vt_select_input ();
3746 break;
4167 case 1010: /* scroll to bottom on TTY output inhibit */ 3747 case 1010: /* scroll to bottom on TTY output inhibit */
4168 set_option (Opt_scrollTtyOutput, !state); 3748 set_option (Opt_scrollTtyOutput, !state);
4169 break; 3749 break;
4170 case 1011: /* scroll to bottom on key press */ 3750 case 1011: /* scroll to bottom on key press */
4171 set_option (Opt_scrollTtyKeypress, state); 3751 set_option (Opt_scrollTtyKeypress, state);
4172 break; 3752 break;
4173 case 1047: /* secondary screen w/ clearing last */ 3753 case 1047: /* secondary screen w/ clearing last */
4174 if (OPTION (Opt_secondaryScreen)) 3754 if (option (Opt_secondaryScreen))
4175 if (current_screen != PRIMARY) 3755 if (!state)
4176 scr_erase_screen (2); 3756 scr_erase_screen (2);
3757
4177 scr_change_screen (state); 3758 scr_change_screen (state);
4178 break; 3759 break;
4179 case 1049: /* secondary screen w/ clearing first */ 3760 case 1049: /* secondary screen w/ clearing first */
3761 if (option (Opt_secondaryScreen))
3762 if (state)
3763 scr_cursor (SAVE);
3764
4180 scr_change_screen (state); 3765 scr_change_screen (state);
3766
4181 if (OPTION (Opt_secondaryScreen)) 3767 if (option (Opt_secondaryScreen))
4182 if (current_screen != PRIMARY) 3768 if (state)
4183 scr_erase_screen (2); 3769 scr_erase_screen (2);
3770 else
3771 scr_cursor (RESTORE);
4184 break; 3772 break;
4185 default: 3773 default:
4186 break; 3774 break;
4187 } 3775 }
4188 } 3776 }
… …
4314 scr_color (Color_bg, Color_bg); 3902 scr_color (Color_bg, Color_bg);
4315 break; 3903 break;
4316 3904
4317 //case 50: // not variable spacing 3905 //case 50: // not variable spacing
4318 3906
4319#if ENABLE_FRILLS 3907#if !ENABLE_MINIMAL
4320 case 90: 3908 case 90:
4321 case 91: /* set bright fg color */ 3909 case 91: /* set bright fg color */
4322 case 92: 3910 case 92:
4323 case 93: 3911 case 93:
4324 case 94: 3912 case 94:
… …
4348rxvt_term::process_graphics () 3936rxvt_term::process_graphics ()
4349{ 3937{
4350 unicode_t ch, cmd = cmd_getc (); 3938 unicode_t ch, cmd = cmd_getc ();
4351 3939
4352 if (cmd == 'Q') 3940 if (cmd == 'Q')
3941 {
4353 { /* query graphics */ 3942 /* query graphics */
4354 tt_printf ("\033G0\012"); /* no graphics */ 3943 tt_printf ("\033G0\012"); /* no graphics */
4355 return; 3944 return;
4356 } 3945 }
4357 /* swallow other graphics sequences until terminating ':' */ 3946 /* swallow other graphics sequences until terminating ':' */
4358 do 3947 do
… …
4408 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3997 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4409 3998
4410 memcpy (v_buffer + v_buflen, data, len); 3999 memcpy (v_buffer + v_buflen, data, len);
4411 v_buflen += len; 4000 v_buflen += len;
4412 4001
4413 pty_ev.set (EVENT_READ | EVENT_WRITE); 4002 pty_ev.set (ev::READ | ev::WRITE);
4414} 4003}
4415 4004
4416void rxvt_term::pty_write () 4005void rxvt_term::pty_write ()
4417{ 4006{
4418 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4007 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4423 4012
4424 if (v_buflen == 0) 4013 if (v_buflen == 0)
4425 { 4014 {
4426 free (v_buffer); 4015 free (v_buffer);
4427 v_buffer = 0; 4016 v_buffer = 0;
4428 v_buflen = 0;
4429 4017
4430 pty_ev.set (EVENT_READ); 4018 pty_ev.set (ev::READ);
4431 return; 4019 return;
4432 } 4020 }
4433 4021
4434 memmove (v_buffer, v_buffer + written, v_buflen); 4022 memmove (v_buffer, v_buffer + written, v_buflen);
4435 } 4023 }
4436 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4024 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4437 pty_ev.set (EVENT_READ); 4025 pty_ev.set (ev::READ);
4438} 4026}
4439 4027
4440/*----------------------- end-of-file (C source) -----------------------*/ 4028/*----------------------- end-of-file (C source) -----------------------*/
4441 4029

Diff Legend

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