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.273 by ayin, Thu Jan 19 23:13:19 2006 UTC vs.
Revision 1.422 by root, Tue Oct 28 04:45:59 2008 UTC

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

Diff Legend

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