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.263 by root, Sun Jan 15 16:48:17 2006 UTC vs.
Revision 1.412 by ayin, Sun Feb 17 11:13:11 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
49#include "rxvt.h" 50#include "rxvt.h"
50#include "rxvtperl.h" 51#include "rxvtperl.h"
51#include "version.h" 52#include "version.h"
52#include "command.h" 53#include "command.h"
53 54
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 56# include "keyboard.h"
61#endif 57#endif
62 58
63#include <csignal> 59#include <csignal>
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, 0, 0); 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/*}}} */
923 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}
932
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 933#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 934unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 935rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 936{
930 unsigned int n, s; 937 unsigned int n, s;
931 938
… …
959void 966void
960rxvt_term::flush () 967rxvt_term::flush ()
961{ 968{
962 flush_ev.stop (); 969 flush_ev.stop ();
963 970
964#ifdef TRANSPARENT 971#ifdef HAVE_BG_PIXMAP
965 if (want_full_refresh) 972 if (bgPixmap.check_clearChanged ())
966 { 973 {
967 want_full_refresh = 0; 974// scr_clear (true); This needs to be researched further!
968 scr_clear ();
969 scr_touch (false); 975 scr_touch (false);
970 } 976 }
971#endif 977#endif
972 978
973 if (want_refresh) 979 if (want_refresh)
… …
1008 while (l->is_longer () && row < end_row); 1014 while (l->is_longer () && row < end_row);
1009 } 1015 }
1010 while (row < end_row); 1016 while (row < end_row);
1011 } 1017 }
1012 1018
1013 scr_refresh (refresh_type); 1019 scr_refresh ();
1014 scrollbar_show (1); 1020 scrollbar_show (1);
1015#ifdef USE_XIM 1021#ifdef USE_XIM
1016 IMSendSpot (); 1022 IMSendSpot ();
1017#endif 1023#endif
1018 } 1024 }
1019 1025
1020 display->flush (); 1026 display->flush ();
1021} 1027}
1022 1028
1029/* checks wether a refresh is requested and starts the refresh timer */
1023void 1030void
1024rxvt_term::check_cb (check_watcher &w) 1031rxvt_term::refresh_check ()
1025{ 1032{
1026 SET_R (this); 1033 if (want_refresh && !flush_ev.is_active ())
1027 SET_LOCALE (locale); 1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1028 1035
1029 display->flush (); 1036 display->flush ();
1030
1031 if (want_refresh && !flush_ev.active)
1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1033} 1037}
1034 1038
1035void 1039void
1036rxvt_term::flush_cb (time_watcher &w) 1040rxvt_term::flush_cb (ev::timer &w, int revents)
1037{ 1041{
1038 SET_R (this); 1042 make_current ();
1039 SET_LOCALE (locale);
1040 1043
1041 refresh_limit = 1;
1042 refresh_count = 0; 1044 refresh_count = 0;
1043 flush (); 1045 flush ();
1044} 1046}
1045 1047
1046#ifdef CURSOR_BLINK 1048#ifdef CURSOR_BLINK
1047void 1049void
1048rxvt_term::cursor_blink_cb (time_watcher &w) 1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1049{ 1051{
1050 hidden_cursor = !hidden_cursor; 1052 hidden_cursor = !hidden_cursor;
1051 want_refresh = 1; 1053 want_refresh = 1;
1052 1054 refresh_check ();
1053 w.start (w.at + BLINK_INTERVAL);
1054} 1055}
1055#endif 1056#endif
1056 1057
1057#ifdef TEXT_BLINK 1058#ifdef TEXT_BLINK
1058void 1059void
1059rxvt_term::text_blink_cb (time_watcher &w) 1060rxvt_term::text_blink_cb (ev::timer &w, int revents)
1060{ 1061{
1061 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1062 if (scr_refresh_rend (RS_Blink, RS_Blink))
1062 { 1063 {
1063 hidden_text = !hidden_text; 1064 hidden_text = !hidden_text;
1064 want_refresh = 1; 1065 want_refresh = 1;
1065 w.start (w.at + TEXT_BLINK_INTERVAL); 1066 refresh_check ();
1066 } 1067 }
1068 else
1069 w.stop ();
1067} 1070}
1068#endif 1071#endif
1069 1072
1070#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1071void 1074void
1072rxvt_term::cont_scroll_cb (time_watcher &w) 1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1073{ 1076{
1074 if ((scrollbar_isUp() || scrollbar_isDn()) && 1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1075 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1076 { 1079 {
1077 refresh_type |= SMOOTH_REFRESH;
1078 want_refresh = 1; 1080 want_refresh = 1;
1079 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1081 refresh_check ();
1080 } 1082 }
1083 else
1084 w.stop ();
1081} 1085}
1082#endif 1086#endif
1083 1087
1084#ifdef SELECTION_SCROLLING 1088#ifdef SELECTION_SCROLLING
1085void 1089void
1086rxvt_term::sel_scroll_cb (time_watcher &w) 1090rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1087{ 1091{
1088 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1092 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089 { 1093 {
1090 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1094 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091 refresh_type |= SMOOTH_REFRESH;
1092 want_refresh = 1; 1095 want_refresh = 1;
1093 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1094 } 1097 }
1098 else
1099 w.stop ();
1095} 1100}
1096#endif 1101#endif
1097 1102
1098#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1099void 1104void
1100rxvt_term::slip_wheel_cb (time_watcher &w) 1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1101{ 1106{
1102 if (mouse_slip_wheel_speed == 0 1107 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1103 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1104 : scr_page (UP, mouse_slip_wheel_speed))
1105 { 1108 {
1106 if (view_start == top_row || view_start == 0)
1107 mouse_slip_wheel_speed = 0;
1108
1109 refresh_type |= SMOOTH_REFRESH;
1110 want_refresh = 1; 1109 want_refresh = 1;
1111 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)
1112 } 1114 {
1115 mouse_slip_wheel_speed = 0;
1116 w.stop ();
1117 }
1113} 1118}
1114#endif 1119#endif
1115 1120
1116#if HAVE_SCHED_YIELD 1121#if LINUX_YIELD_HACK
1117static struct event_handler 1122static struct event_handler
1118{ 1123{
1119 check_watcher cw_yield; 1124 ev::prepare yield_ev;
1120 1125
1121 void yield (check_watcher &w) 1126 void yield_cb (ev::prepare &w, int revents)
1122 { 1127 {
1123 sched_yield (); 1128 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS.
1132
1133 struct timespec ts = { 0, 0 };
1134 nanosleep (&ts, 0);
1135
1124 w.stop (); 1136 w.stop ();
1125 } 1137 }
1126 1138
1127 event_handler () 1139 event_handler ()
1128 : cw_yield (this, &event_handler::yield) 1140 : yield_ev (this, &event_handler::yield_cb)
1129 { 1141 {
1130 } 1142 }
1131} event_handler; 1143} event_handler;
1132#endif 1144#endif
1133 1145
… …
1144 1156
1145 memmove (cmdbuf_base, cmdbuf_ptr, n); 1157 memmove (cmdbuf_base, cmdbuf_ptr, n);
1146 cmdbuf_ptr = cmdbuf_base; 1158 cmdbuf_ptr = cmdbuf_base;
1147 cmdbuf_endp = cmdbuf_ptr + n; 1159 cmdbuf_endp = cmdbuf_ptr + n;
1148 1160
1149 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1161 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1150 1162
1151 if (r > 0) 1163 if (r > 0)
1152 { 1164 {
1153 cmdbuf_endp += r; 1165 cmdbuf_endp += r;
1154 return true; 1166 return true;
1155 } 1167 }
1156 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1168 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1157 { 1169 {
1158#if HAVE_SCHED_YIELD 1170#if LINUX_YIELD_HACK
1159 if (display->is_local) 1171 if (display->is_local)
1160 event_handler.cw_yield.start (); 1172 event_handler.yield_ev.start ();
1161#endif 1173#endif
1162 } 1174 }
1163 else 1175 else
1164 { 1176 {
1165 pty_ev.stop (); 1177 pty_ev.stop ();
1166 1178
1167 if (!OPTION (Opt_hold)) 1179 if (!option (Opt_hold))
1168 destroy (); 1180 destroy ();
1169 } 1181 }
1170 1182
1171 return false; 1183 return false;
1172} 1184}
1173 1185
1174void 1186void
1175rxvt_term::pty_cb (io_watcher &w, short revents) 1187rxvt_term::pty_cb (ev::io &w, int revents)
1176{ 1188{
1177 SET_R (this); 1189 make_current ();
1178 SET_LOCALE (locale);
1179 1190
1180 if (revents & EVENT_READ) 1191 if (revents & ev::READ)
1181 // loop, but don't allow a single term to monopolize us 1192 // loop, but don't allow a single term to monopolize us
1182 while (pty_fill ()) 1193 while (pty_fill ())
1183 if (cmd_parse ()) 1194 if (cmd_parse ())
1184 break; 1195 break;
1185 1196
1186 if (revents & EVENT_WRITE) 1197 if (revents & ev::WRITE)
1187 pty_write (); 1198 pty_write ();
1199
1200 refresh_check ();
1188} 1201}
1189 1202
1190void 1203void
1191rxvt_term::pointer_unblank () 1204rxvt_term::pointer_unblank ()
1192{ 1205{
1193 XDefineCursor (display->display, vt, TermWin_cursor); 1206 XDefineCursor (dpy, vt, TermWin_cursor);
1194 recolour_cursor (); 1207 recolour_cursor ();
1195 1208
1196#ifdef POINTER_BLANK 1209#ifdef POINTER_BLANK
1197 hidden_pointer = 0; 1210 hidden_pointer = 0;
1198 1211
1199 if (OPTION (Opt_pointerBlank)) 1212 if (option (Opt_pointerBlank))
1200 pointer_ev.start (NOW + pointerBlankDelay); 1213 pointer_ev.start (pointerBlankDelay);
1201#endif 1214#endif
1202} 1215}
1203 1216
1204#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1205void 1218void
1206rxvt_term::pointer_blank () 1219rxvt_term::pointer_blank ()
1207{ 1220{
1208 if (!OPTION (Opt_pointerBlank)) 1221 if (!option (Opt_pointerBlank))
1209 return; 1222 return;
1210 1223
1211 XDefineCursor (display->display, vt, display->blank_cursor); 1224 XDefineCursor (dpy, vt, display->blank_cursor);
1212 XFlush (display->display); 1225 XFlush (dpy);
1213 1226
1214 hidden_pointer = 1; 1227 hidden_pointer = 1;
1215} 1228}
1216 1229
1217void 1230void
1218rxvt_term::pointer_cb (time_watcher &w) 1231rxvt_term::pointer_cb (ev::timer &w, int revents)
1219{ 1232{
1220 SET_R (this); 1233 make_current ();
1221 SET_LOCALE (locale);
1222 1234
1223 pointer_blank (); 1235 pointer_blank ();
1224} 1236}
1225#endif 1237#endif
1226 1238
1227void 1239void
1228rxvt_term::mouse_report (XButtonEvent &ev) 1240rxvt_term::mouse_report (XButtonEvent &ev)
1229{ 1241{
1230 int button_number, key_state = 0; 1242 int button_number, key_state = 0;
1231 int x, y; 1243 int x, y;
1244 int code = 32;
1232 1245
1233 x = ev.x; 1246 x = Pixel2Col (ev.x);
1234 y = ev.y; 1247 y = Pixel2Row (ev.y);
1235 pixel_position (&x, &y); 1248 if (ev.type == MotionNotify)
1249 {
1250 if (x == mouse_row && y == mouse_col)
1251 return;
1252 mouse_row = x;
1253 mouse_col = y;
1254 code += 32;
1255 }
1236 1256
1237 if (MEvent.button == AnyButton) 1257 if (MEvent.button == AnyButton)
1238 button_number = 3; 1258 button_number = 3;
1239 else 1259 else
1240 { 1260 {
… …
1286 x + 1, 1306 x + 1,
1287 y + 1); 1307 y + 1);
1288#endif 1308#endif
1289 1309
1290 tt_printf ("\033[M%c%c%c", 1310 tt_printf ("\033[M%c%c%c",
1291 (32 + button_number + key_state), 1311 (code + button_number + key_state),
1292 (32 + x + 1), 1312 (32 + x + 1),
1293 (32 + y + 1)); 1313 (32 + y + 1));
1294} 1314}
1295
1296#ifdef USING_W11LIB
1297void
1298rxvt_W11_process_x_event (XEvent *ev)
1299{
1300 rxvt_t *r = rxvt_get_r ();
1301
1302 x_cb (*ev);
1303}
1304#endif
1305 1315
1306/*{{{ process an X event */ 1316/*{{{ process an X event */
1307void 1317void
1308rxvt_term::x_cb (XEvent &ev) 1318rxvt_term::x_cb (XEvent &ev)
1309{ 1319{
1310 dDisp; 1320 make_current ();
1311 1321
1312 SET_R (this); 1322 dLocal (Display *, dpy);
1313 SET_LOCALE (locale);
1314 1323
1315 if (ev.xany.window == vt 1324 if (ev.xany.window == vt
1325 && SHOULD_INVOKE (HOOK_X_EVENT)
1316 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1326 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1317 return; 1327 return;
1318 1328
1319 // for XQueryPointer 1329 // for XQueryPointer
1320 Window unused_root, unused_child; 1330 Window unused_root, unused_child;
… …
1322 unsigned int unused_mask; 1332 unsigned int unused_mask;
1323 1333
1324 switch (ev.type) 1334 switch (ev.type)
1325 { 1335 {
1326 case KeyPress: 1336 case KeyPress:
1327#if ISO_14755 1337 key_press (ev.xkey);
1328 if (!(iso14755buf & ISO_14755_52))
1329#endif
1330 lookup_key (ev.xkey);
1331
1332 break; 1338 break;
1333 1339
1334 case KeyRelease: 1340 case KeyRelease:
1335 { 1341 key_release (ev.xkey);
1336#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1337 KeySym keysym;
1338
1339 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1340#endif
1341
1342#if ENABLE_FRILLS || ISO_14755
1343 // ISO 14755 support
1344 if (iso14755buf)
1345 if (iso14755buf & ISO_14755_52)
1346 {
1347# if ENABLE_OVERLAY
1348 scr_overlay_off ();
1349# endif
1350# if ISO_14755
1351 // iso14755 part 5.2 handling: release time
1352 // first: controls
1353 if ((ev.xkey.state & ControlMask)
1354 && ((keysym >= 0x40 && keysym <= 0x5f)
1355 || (keysym >= 0x61 && keysym <= 0x7f)))
1356 {
1357 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1358 commit_iso14755 ();
1359 goto skip_switch;
1360 }
1361
1362 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1363 if (i[0] == keysym)
1364 {
1365 iso14755buf = ISO_14755_51 | i[1];
1366 commit_iso14755 ();
1367 goto skip_switch;
1368 }
1369
1370 scr_bell ();
1371# endif
1372 iso14755buf = 0;
1373 break;
1374 }
1375 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1376 {
1377# if ENABLE_OVERLAY
1378 scr_overlay_off ();
1379# endif
1380 if (iso14755buf & ISO_14755_51)
1381 commit_iso14755 ();
1382#if ISO_14755
1383 else if (iso14755buf & ISO_14755_STARTED)
1384 {
1385 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1386
1387 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1388 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1389 }
1390# endif
1391 else
1392 iso14755buf = 0;
1393 }
1394#endif
1395
1396 if (ev.xany.window == vt
1397 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1398 break;
1399
1400#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1401 if (!(ev.xkey.state & ControlMask))
1402 slip_wheel_ev.stop ();
1403 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1404 mouse_slip_wheel_speed = 0;
1405#endif
1406 break; 1342 break;
1407 }
1408 1343
1409 case ButtonPress: 1344 case ButtonPress:
1410 button_press (ev.xbutton); 1345 button_press (ev.xbutton);
1411 break; 1346 break;
1412 1347
… …
1414 button_release (ev.xbutton); 1349 button_release (ev.xbutton);
1415 break; 1350 break;
1416 1351
1417 case ClientMessage: 1352 case ClientMessage:
1418 if (ev.xclient.format == 32 1353 if (ev.xclient.format == 32
1419 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1354 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1420 { 1355 {
1356 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1357 {
1358 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1359 {
1421 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1360 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1361 {
1362 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1422 destroy (); 1363 destroy ();
1364 }
1423#if ENABLE_EWMH 1365#if ENABLE_EWMH
1424 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1366 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1425 XSendEvent (disp, ev.xclient.window = display->root, 1367 XSendEvent (dpy, ev.xclient.window = display->root,
1426 False, SubstructureRedirectMask | SubstructureNotifyMask, 1368 False, SubstructureRedirectMask | SubstructureNotifyMask,
1427 &ev); 1369 &ev);
1370#endif
1371 }
1372 }
1373#if ENABLE_XEMBED
1374 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1375 {
1376 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1377 focus_in ();
1378 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1379 focus_out ();
1380 }
1428#endif 1381#endif
1429 } 1382 }
1430#if ENABLE_XEMBED
1431 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1432 {
1433 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1434 focus_in ();
1435 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1436 focus_out ();
1437 }
1438#endif
1439#ifdef OFFIX_DND
1440 /* OffiX Dnd (drag 'n' drop) protocol */
1441 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1442 && (ev.xclient.data.l[0] == DndFile
1443 || ev.xclient.data.l[0] == DndDir
1444 || ev.xclient.data.l[0] == DndLink))
1445 {
1446 /* Get Dnd data */
1447 Atom ActualType;
1448 int ActualFormat;
1449 unsigned char *data;
1450 unsigned long Size, RemainingBytes;
1451
1452 XGetWindowProperty (disp, display->root,
1453 xa[XA_DNDSELECTION],
1454 0L, 1000000L,
1455 False, AnyPropertyType,
1456 &ActualType, &ActualFormat,
1457 &Size, &RemainingBytes,
1458 &data);
1459 set_string_property (XA_CUT_BUFFER0, data);
1460 XFree (data);
1461 selection_paste (display->root, XA_CUT_BUFFER0, true);
1462 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1463 }
1464#endif /* OFFIX_DND */
1465 break;
1466
1467 case MappingNotify:
1468 XRefreshKeyboardMapping (&ev.xmapping);
1469 break; 1383 break;
1470 1384
1471 /* 1385 /*
1472 * XXX: this is not the _current_ arrangement 1386 * XXX: this is not the _current_ arrangement
1473 * Here's my conclusion: 1387 * Here's my conclusion:
… …
1492 break; 1406 break;
1493 } 1407 }
1494 break; 1408 break;
1495 1409
1496 case FocusIn: 1410 case FocusIn:
1411 if (ev.xfocus.detail != NotifyInferior
1412 && ev.xfocus.detail != NotifyPointer
1413 && ev.xfocus.mode != NotifyGrab)
1497 focus_in (); 1414 focus_in ();
1498 break; 1415 break;
1499 1416
1500 case FocusOut: 1417 case FocusOut:
1418 if (ev.xfocus.detail != NotifyInferior
1419 && ev.xfocus.detail != NotifyPointer
1420 && ev.xfocus.mode != NotifyGrab)
1501 focus_out (); 1421 focus_out ();
1502 break; 1422 break;
1503 1423
1504 case ConfigureNotify: 1424 case ConfigureNotify:
1425 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1426 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1427 szHint.width, szHint.height);*/
1505 if (ev.xconfigure.window == parent[0]) 1428 if (ev.xconfigure.window == parent[0])
1506 { 1429 {
1507 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1508 ; 1431 ;
1509 1432
1510 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1511 { 1434 {
1512 seen_resize = 1; 1435 seen_resize = 1;
1513 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1514 } 1437 }
1515 1438 else
1516#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1439 {
1517 if (OPTION (Opt_transparent)) 1440#ifdef HAVE_BG_PIXMAP
1518 check_our_parents (); 1441 if (bgPixmap.window_position_sensitive ())
1442 {
1443 if (mapped)
1444 update_background ();
1445 else
1446 bgPixmap.invalidate ();
1447 }
1519#endif 1448#endif
1449 }
1450
1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1520 } 1452 }
1521 break; 1453 break;
1522 1454
1523 case PropertyNotify: 1455 case PropertyNotify:
1456 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1524 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1525 && ev.xproperty.state == PropertyNewValue) 1458 && ev.xproperty.state == PropertyNewValue)
1526 selection_property (ev.xproperty.window, ev.xproperty.atom); 1459 selection_property (ev.xproperty.window, ev.xproperty.atom);
1527 1460
1528 break; 1461 break;
1529 1462
1530 case SelectionClear: 1463 case SelectionClear:
1531 selection_clear (); 1464 selection_clear ();
… …
1539 case SelectionRequest: 1472 case SelectionRequest:
1540 selection_send (ev.xselectionrequest); 1473 selection_send (ev.xselectionrequest);
1541 break; 1474 break;
1542 1475
1543 case MapNotify: 1476 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a
1479 * non-reparenting window manager. In those cases we never get first
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does
1482 * reparenting.
1483 * We should not render background immidiately, as there could be several
1484 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1485 * by scheduling background redraw as soon as we can, but giving a short
1486 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results.
1489 */
1490 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1491 update_background_ev.start (0.025);
1492#endif
1544 mapped = 1; 1493 mapped = 1;
1545#ifdef TEXT_BLINK 1494#ifdef TEXT_BLINK
1546 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1495 text_blink_ev.start ();
1547#endif 1496#endif
1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1497 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1549 break; 1498 break;
1550 1499
1551 case UnmapNotify: 1500 case UnmapNotify:
… …
1553#ifdef TEXT_BLINK 1502#ifdef TEXT_BLINK
1554 text_blink_ev.stop (); 1503 text_blink_ev.stop ();
1555#endif 1504#endif
1556 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1505 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1557 break; 1506 break;
1558
1559#ifdef TRANSPARENT
1560 case ReparentNotify:
1561 rootwin_cb (ev);
1562 break;
1563#endif /* TRANSPARENT */
1564 1507
1565 case GraphicsExpose: 1508 case GraphicsExpose:
1566 case Expose: 1509 case Expose:
1567 if (ev.xany.window == vt) 1510 if (ev.xany.window == vt)
1568 { 1511 {
1569 do 1512 do
1513 {
1570 scr_expose (ev.xexpose.x, ev.xexpose.y, 1514 scr_expose (ev.xexpose.x, ev.xexpose.y,
1571 ev.xexpose.width, ev.xexpose.height, False); 1515 ev.xexpose.width, ev.xexpose.height, False);
1516 }
1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1573 1518
1574 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1575 1520
1576 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522 {
1577 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1578 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1525 }
1579 1526
1580 want_refresh = 1; 1527 want_refresh = 1;
1581 } 1528 }
1582 else 1529 else
1583 { 1530 {
1584 XEvent unused_event; 1531 XEvent unused_event;
1585 1532
1586 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1533 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1587 ; 1534 ;
1588 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1589 ; 1536 ;
1590 1537
1591 if (isScrollbarWindow (ev.xany.window)) 1538 if (scrollBar.state && ev.xany.window == scrollBar.win)
1592 { 1539 {
1593 scrollBar.setIdle (); 1540 scrollBar.state = STATE_IDLE;
1594 scrollbar_show (0); 1541 scrollbar_show (0);
1595 } 1542 }
1596#ifdef MENUBAR
1597 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1598 menubar_expose ();
1599#endif
1600
1601#ifdef TRANSPARENT
1602 if (am_transparent && ev.xany.window == parent[0])
1603 XClearWindow (disp, ev.xany.window);
1604#endif
1605 } 1543 }
1606 break; 1544 break;
1607 1545
1608 case MotionNotify: 1546 case MotionNotify:
1609#ifdef POINTER_BLANK 1547#ifdef POINTER_BLANK
1610 if (hidden_pointer) 1548 if (hidden_pointer)
1611 pointer_unblank (); 1549 pointer_unblank ();
1612#endif 1550#endif
1613#if MENUBAR 1551 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1614 if (isMenuBarWindow (ev.xany.window)) 1552 || priv_modes & PrivMode_MouseAnyEvent)
1615 {
1616 menubar_control (ev.xbutton); 1553 mouse_report (ev.xbutton);
1617 break;
1618 }
1619#endif
1620 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1554 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1621 break; 1555 break;
1622 1556
1623 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1624 { 1558 {
1559 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1625 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1560 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1626 ; // nop 1561 ; // nop
1627 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1562 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1628 { 1563 {
1629 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1564 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1630 ; 1565 ;
1631 1566
1632 XQueryPointer (disp, vt, 1567 XQueryPointer (dpy, vt,
1633 &unused_root, &unused_child, 1568 &unused_root, &unused_child,
1634 &unused_root_x, &unused_root_y, 1569 &unused_root_x, &unused_root_y,
1635 &ev.xbutton.x, &ev.xbutton.y, 1570 &ev.xbutton.x, &ev.xbutton.y,
1636 &ev.xbutton.state); 1571 &ev.xbutton.state);
1637#ifdef MOUSE_THRESHOLD 1572#ifdef MOUSE_THRESHOLD
… …
1657 int dist; 1592 int dist;
1658 1593
1659 /* don't clobber the current delay if we are 1594 /* don't clobber the current delay if we are
1660 * already in the middle of scrolling. 1595 * already in the middle of scrolling.
1661 */ 1596 */
1662 if (!sel_scroll_ev.active) 1597 if (!sel_scroll_ev.is_active ())
1663 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1598 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1664 1599
1665 /* save the event params so we can highlight 1600 /* save the event params so we can highlight
1666 * the selection in the pending-scroll loop 1601 * the selection in the pending-scroll loop
1667 */ 1602 */
1668 selection_save_x = ev.xbutton.x; 1603 selection_save_x = ev.xbutton.x;
… …
1690 else 1625 else
1691 { 1626 {
1692 /* we are within the text window, so we 1627 /* we are within the text window, so we
1693 * shouldn't be scrolling 1628 * shouldn't be scrolling
1694 */ 1629 */
1695 if (sel_scroll_ev.active)
1696 sel_scroll_ev.stop(); 1630 sel_scroll_ev.stop();
1697 } 1631 }
1698#endif 1632#endif
1699#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
1700 } 1634 }
1701#endif 1635#endif
1702 } 1636 }
1703 } 1637 }
1704 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1638 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1705 { 1639 {
1706 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1640 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1707 MotionNotify, &ev)) 1641 MotionNotify, &ev))
1708 ; 1642 ;
1709 1643
1710 XQueryPointer (disp, scrollBar.win, 1644 XQueryPointer (dpy, scrollBar.win,
1711 &unused_root, &unused_child, 1645 &unused_root, &unused_child,
1712 &unused_root_x, &unused_root_y, 1646 &unused_root_x, &unused_root_y,
1713 &ev.xbutton.x, &ev.xbutton.y, 1647 &ev.xbutton.x, &ev.xbutton.y,
1714 &unused_mask); 1648 &unused_mask);
1715 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1716 scrollbar_size ()); 1650 scrollbar_size ());
1717 want_refresh = 1; 1651 want_refresh = 1;
1718 refresh_limit = 0;
1719 scrollbar_show (1); 1652 scrollbar_show (1);
1720 } 1653 }
1721 break; 1654 break;
1722 } 1655 }
1723 1656
1724skip_switch: ;
1725
1726#if defined(CURSOR_BLINK) 1657#if defined(CURSOR_BLINK)
1727 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1658 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1728 { 1659 {
1729 if (hidden_cursor) 1660 if (hidden_cursor)
1730 { 1661 {
1731 hidden_cursor = 0; 1662 hidden_cursor = 0;
1732 want_refresh = 1; 1663 want_refresh = 1;
1733 } 1664 }
1734 1665
1735 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1666 cursor_blink_ev.again ();
1736 } 1667 }
1737#endif 1668#endif
1738 1669
1739#if defined(POINTER_BLANK) 1670#if defined(POINTER_BLANK)
1740 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1671 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1741 { 1672 {
1742 if (ev.type == MotionNotify 1673 if (ev.type == MotionNotify
1743 || ev.type == ButtonPress 1674 || ev.type == ButtonPress
1744 || ev.type == ButtonRelease) 1675 || ev.type == ButtonRelease)
1745 if (hidden_pointer) 1676 if (hidden_pointer)
… …
1747 1678
1748 if (ev.type == KeyPress && hidden_pointer == 0) 1679 if (ev.type == KeyPress && hidden_pointer == 0)
1749 pointer_blank (); 1680 pointer_blank ();
1750 } 1681 }
1751#endif 1682#endif
1683
1684 refresh_check ();
1752} 1685}
1753 1686
1754void 1687void
1755rxvt_term::focus_in () 1688rxvt_term::focus_in ()
1756{ 1689{
1757 if (!focus) 1690 if (!focus)
1758 { 1691 {
1759 focus = 1; 1692 focus = 1;
1760 want_refresh = 1; 1693 want_refresh = 1;
1761 1694
1762 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1695 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1763 1696
1764#if USE_XIM 1697#if USE_XIM
1765 if (Input_Context != NULL) 1698 if (Input_Context != NULL)
1766 { 1699 {
1767 IMSetStatusPosition (); 1700 IMSetPosition ();
1768 XSetICFocus (Input_Context); 1701 XSetICFocus (Input_Context);
1769 } 1702 }
1770#endif 1703#endif
1771#if CURSOR_BLINK 1704#if CURSOR_BLINK
1772 if (OPTION (Opt_cursorBlink)) 1705 if (option (Opt_cursorBlink))
1773 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1706 cursor_blink_ev.again ();
1774#endif 1707#endif
1775#if OFF_FOCUS_FADING 1708#if OFF_FOCUS_FADING
1776 if (rs[Rs_fade]) 1709 if (rs[Rs_fade])
1777 { 1710 {
1778 pix_colors = pix_colors_focused; 1711 pix_colors = pix_colors_focused;
1779 scr_recolour (); 1712 scr_recolour ();
1780 } 1713 }
1781#endif 1714#endif
1715#if ENABLE_FRILLS
1716 if (option (Opt_urgentOnBell))
1717 {
1718 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1719 {
1720 h->flags &= ~XUrgencyHint;
1721 XSetWMHints (dpy, parent[0], h);
1722 }
1723 }
1724#endif
1782 } 1725 }
1783} 1726}
1784 1727
1785void 1728void
1786rxvt_term::focus_out () 1729rxvt_term::focus_out ()
… …
1794 1737
1795#if ENABLE_FRILLS || ISO_14755 1738#if ENABLE_FRILLS || ISO_14755
1796 if (iso14755buf) 1739 if (iso14755buf)
1797 { 1740 {
1798 iso14755buf = 0; 1741 iso14755buf = 0;
1799# if ENABLE_OVERLAY 1742# if ISO_14755
1800 scr_overlay_off (); 1743 scr_overlay_off ();
1801# endif 1744# endif
1802 } 1745 }
1803#endif 1746#endif
1804#if USE_XIM 1747#if USE_XIM
1805 if (Input_Context != NULL) 1748 if (Input_Context != NULL)
1806 XUnsetICFocus (Input_Context); 1749 XUnsetICFocus (Input_Context);
1807#endif 1750#endif
1808#if CURSOR_BLINK 1751#if CURSOR_BLINK
1809 if (OPTION (Opt_cursorBlink)) 1752 if (option (Opt_cursorBlink))
1810 cursor_blink_ev.stop (); 1753 cursor_blink_ev.stop ();
1754
1811 hidden_cursor = 0; 1755 hidden_cursor = 0;
1812#endif 1756#endif
1813#if OFF_FOCUS_FADING 1757#if OFF_FOCUS_FADING
1814 if (rs[Rs_fade]) 1758 if (rs[Rs_fade])
1815 { 1759 {
… …
1818 } 1762 }
1819#endif 1763#endif
1820 } 1764 }
1821} 1765}
1822 1766
1823#if TRANSPARENT 1767void
1768rxvt_term::update_fade_color (unsigned int idx)
1769{
1770#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade])
1772 {
1773 rgba c;
1774 pix_colors [Color_fade].get (c);
1775 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1776 }
1777#endif
1778}
1779
1780#if ENABLE_TRANSPARENCY || ENABLE_PERL
1824void 1781void
1825rxvt_term::rootwin_cb (XEvent &ev) 1782rxvt_term::rootwin_cb (XEvent &ev)
1826{ 1783{
1827 SET_R (this); 1784 make_current ();
1828 SET_LOCALE (locale);
1829 1785
1786 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1787 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1788 return;
1789
1790# if ENABLE_TRANSPARENCY
1830 switch (ev.type) 1791 switch (ev.type)
1831 { 1792 {
1832 case PropertyNotify: 1793 case PropertyNotify:
1833 /* 1794 /*
1834 * if user used some Esetroot compatible prog to set the root bg, 1795 * if user used some Esetroot compatible prog to set the root bg,
1835 * use the property to determine the pixmap. We use it later on. 1796 * use the property to determine the pixmap. We use it later on.
1836 */ 1797 */
1837 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1798 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1838 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1799 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1839 return; 1800 {
1801 bgPixmap.set_root_pixmap ();
1802 update_background ();
1803 }
1840 1804
1841 /* FALLTHROUGH */
1842 case ReparentNotify:
1843 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1844 want_refresh = want_full_refresh = 1;
1845 break; 1805 break;
1846 } 1806 }
1807# endif
1808
1809 refresh_check ();
1847} 1810}
1848#endif 1811#endif
1849 1812
1850void 1813void
1851rxvt_term::button_press (XButtonEvent &ev) 1814rxvt_term::button_press (XButtonEvent &ev)
… …
1860 /* 1823 /*
1861 * VT window processing of button press 1824 * VT window processing of button press
1862 */ 1825 */
1863 if (ev.window == vt) 1826 if (ev.window == vt)
1864 { 1827 {
1828 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1829 return;
1830
1865#if ISO_14755 1831#if ISO_14755
1866 // 5.4 1832 // 5.4
1867 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1833 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1868 { 1834 {
1869 iso14755_54 (ev.x, ev.y); 1835 iso14755_54 (ev.x, ev.y);
… …
1903 mouse_report (ev); 1869 mouse_report (ev);
1904 } 1870 }
1905#else 1871#else
1906 MEvent.button = ev.button; 1872 MEvent.button = ev.button;
1907 mouse_report (ev); 1873 mouse_report (ev);
1908#endif /* MOUSE_REPORT_DOUBLECLICK */ 1874#endif /* MOUSE_REPORT_DOUBLECLICK */
1909 1875
1910 } 1876 }
1911 else 1877 else
1912 { 1878 {
1913 if (ev.button != MEvent.button) 1879 if (ev.button != MEvent.button)
1914 MEvent.clicks = 0; 1880 MEvent.clicks = 0;
1915 1881
1916 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1917 switch (ev.button) 1882 switch (ev.button)
1918 { 1883 {
1919 case Button1: 1884 case Button1:
1920 /* allow meta + click to select rectangular areas */ 1885 /* allow meta + click to select rectangular areas */
1921 /* should be done in screen.C */ 1886 /* should be done in screen.C */
1922#if ENABLE_FRILLS 1887#if ENABLE_FRILLS
1923 selection.rect = !!(ev.state & ModMetaMask); 1888 selection.rect = !!(ev.state & ModMetaMask);
1924#else 1889#else
1925 selection.rect = false; 1890 selection.rect = false;
1926#endif 1891#endif
1927 1892
1928 /* allow shift+left click to extend selection */ 1893 /* allow shift+left click to extend selection */
1929 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1894 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1930 { 1895 {
1931 if (MEvent.button == Button1 && clickintime) 1896 if (MEvent.button == Button1 && clickintime)
1932 selection_rotate (ev.x, ev.y); 1897 selection_rotate (ev.x, ev.y);
1933 else 1898 else
1934 selection_extend (ev.x, ev.y, 1); 1899 selection_extend (ev.x, ev.y, 1);
1935 } 1900 }
1936 else 1901 else
1937 { 1902 {
1938 if (MEvent.button == Button1 && clickintime) 1903 if (MEvent.button == Button1 && clickintime)
1939 MEvent.clicks++; 1904 MEvent.clicks++;
1940 else 1905 else
1941 MEvent.clicks = 1; 1906 MEvent.clicks = 1;
1942 1907
1943 selection_click (MEvent.clicks, ev.x, ev.y); 1908 selection_click (MEvent.clicks, ev.x, ev.y);
1944 } 1909 }
1945 1910
1946 MEvent.button = Button1; 1911 MEvent.button = Button1;
1947 break; 1912 break;
1948 1913
1949 case Button3: 1914 case Button3:
1950 if (MEvent.button == Button3 && clickintime) 1915 if (MEvent.button == Button3 && clickintime)
1951 selection_rotate (ev.x, ev.y); 1916 selection_rotate (ev.x, ev.y);
1952 else 1917 else
1953 selection_extend (ev.x, ev.y, 1); 1918 selection_extend (ev.x, ev.y, 1);
1954 1919
1955 MEvent.button = Button3; 1920 MEvent.button = Button3;
1956 break; 1921 break;
1957 } 1922 }
1958 } 1923 }
1959 1924
1960 MEvent.time = ev.time; 1925 MEvent.time = ev.time;
1961 return; 1926 return;
1962 } 1927 }
1963 1928
1964 /* 1929 /*
1965 * Scrollbar window processing of button press 1930 * Scrollbar window processing of button press
1966 */ 1931 */
1967 if (isScrollbarWindow (ev.window)) 1932 if (scrollBar.state && ev.window == scrollBar.win)
1968 { 1933 {
1969 scrollBar.setIdle (); 1934 page_dirn direction = NO_DIR;
1935
1936 if (scrollBar.upButton (ev.y))
1937 direction = UP; /* up */
1938 else if (scrollBar.dnButton (ev.y))
1939 direction = DN; /* down */
1940
1941 scrollBar.state = STATE_IDLE;
1970 /* 1942 /*
1971 * Rxvt-style scrollbar: 1943 * Rxvt-style scrollbar:
1972 * move up if mouse is above slider 1944 * move up if mouse is above slider
1973 * move dn if mouse is below slider 1945 * move dn if mouse is below slider
1974 * 1946 *
… …
1983 /* 1955 /*
1984 * Mouse report disabled scrollbar: 1956 * Mouse report disabled scrollbar:
1985 * arrow buttons - send up/down 1957 * arrow buttons - send up/down
1986 * click on scrollbar - send pageup/down 1958 * click on scrollbar - send pageup/down
1987 */ 1959 */
1988 if ((scrollBar.style == R_SB_NEXT 1960 if (direction == UP)
1989 && scrollbarnext_upButton (ev.y))
1990 || (scrollBar.style == R_SB_RXVT
1991 && scrollbarrxvt_upButton (ev.y)))
1992 tt_printf ("\033[A"); 1961 tt_printf ("\033[A");
1993 else if ((scrollBar.style == R_SB_NEXT 1962 else if (direction == DN)
1994 && scrollbarnext_dnButton (ev.y))
1995 || (scrollBar.style == R_SB_RXVT
1996 && scrollbarrxvt_dnButton (ev.y)))
1997 tt_printf ("\033[B"); 1963 tt_printf ("\033[B");
1998 else 1964 else
1999 switch (ev.button) 1965 switch (ev.button)
2000 { 1966 {
2001 case Button2: 1967 case Button2:
… …
2008 tt_printf ("\033[5~"); 1974 tt_printf ("\033[5~");
2009 break; 1975 break;
2010 } 1976 }
2011 } 1977 }
2012 else 1978 else
2013#endif /* NO_SCROLLBAR_REPORT */ 1979#endif /* NO_SCROLLBAR_REPORT */
2014
2015 {
2016 char upordown = 0;
2017
2018 if (scrollBar.style == R_SB_NEXT)
2019 { 1980 {
2020 if (scrollbarnext_upButton (ev.y)) 1981 if (direction != NO_DIR)
2021 upordown = -1; /* up */
2022 else if (scrollbarnext_dnButton (ev.y))
2023 upordown = 1; /* down */
2024 }
2025 else if (scrollBar.style == R_SB_RXVT)
2026 {
2027 if (scrollbarrxvt_upButton (ev.y))
2028 upordown = -1; /* up */
2029 else if (scrollbarrxvt_dnButton (ev.y))
2030 upordown = 1; /* down */
2031 }
2032 if (upordown)
2033 { 1982 {
2034#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1983#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1984 if (!cont_scroll_ev.is_active ())
2035 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1985 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2036#endif 1986#endif
2037 if (scr_page (upordown < 0 ? UP : DN, 1)) 1987 if (scr_page (direction, 1))
2038 { 1988 {
2039 if (upordown < 0) 1989 if (direction == UP)
2040 scrollBar.setUp (); 1990 scrollBar.state = STATE_UP;
2041 else 1991 else
2042 scrollBar.setDn (); 1992 scrollBar.state = STATE_DOWN;
2043 } 1993 }
2044 } 1994 }
2045 else 1995 else
2046 switch (ev.button) 1996 switch (ev.button)
2047 { 1997 {
2048 case Button2: 1998 case Button2:
2049 switch (scrollbar_align) 1999 switch (scrollBar.align)
2050 { 2000 {
2051 case R_SB_ALIGN_TOP: 2001 case R_SB_ALIGN_TOP:
2052 csrO = 0; 2002 csrO = 0;
2053 break; 2003 break;
2054 case R_SB_ALIGN_CENTRE: 2004 case R_SB_ALIGN_CENTRE:
… …
2062 if (scrollBar.style == R_SB_XTERM 2012 if (scrollBar.style == R_SB_XTERM
2063 || scrollbar_above_slider (ev.y) 2013 || scrollbar_above_slider (ev.y)
2064 || scrollbar_below_slider (ev.y)) 2014 || scrollbar_below_slider (ev.y))
2065 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2066 2016
2067 scrollBar.setMotion (); 2017 scrollBar.state = STATE_MOTION;
2068 break; 2018 break;
2069 2019
2070 case Button1: 2020 case Button1:
2071 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2021 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2072 csrO = ev.y - scrollBar.top; 2022 csrO = ev.y - scrollBar.top;
2073 /* FALLTHROUGH */ 2023 /* FALLTHROUGH */
2074 2024
2075 case Button3: 2025 case Button3:
2076 if (scrollBar.style != R_SB_XTERM) 2026 if (scrollBar.style != R_SB_XTERM)
… …
2086 scr_page (DN, nrow - 1); 2036 scr_page (DN, nrow - 1);
2087# else 2037# else
2088 scr_page (DN, nrow / 4); 2038 scr_page (DN, nrow / 4);
2089# endif 2039# endif
2090 else 2040 else
2091 scrollBar.setMotion (); 2041 scrollBar.state = STATE_MOTION;
2092 } 2042 }
2093 else 2043 else
2094 { 2044 {
2095 scr_page ((ev.button == Button1 ? DN : UP), 2045 scr_page ((ev.button == Button1 ? DN : UP),
2096 (nrow 2046 (nrow
… …
2102 } 2052 }
2103 } 2053 }
2104 2054
2105 return; 2055 return;
2106 } 2056 }
2107
2108#if MENUBAR
2109 /*
2110 * Menubar window processing of button press
2111 */
2112 if (isMenuBarWindow (ev.window))
2113 menubar_control (ev);
2114#endif
2115} 2057}
2116 2058
2117void 2059void
2118rxvt_term::button_release (XButtonEvent &ev) 2060rxvt_term::button_release (XButtonEvent &ev)
2119{ 2061{
… …
2121 2063
2122 csrO = 0; /* reset csr Offset */ 2064 csrO = 0; /* reset csr Offset */
2123 if (!bypass_keystate) 2065 if (!bypass_keystate)
2124 reportmode = !! (priv_modes & PrivMode_mouse_report); 2066 reportmode = !! (priv_modes & PrivMode_mouse_report);
2125 2067
2126 if (scrollbar_isUpDn ()) 2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2127 { 2069 {
2128 scrollBar.setIdle (); 2070 scrollBar.state = STATE_IDLE;
2129 scrollbar_show (0); 2071 scrollbar_show (0);
2130#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2131 refresh_type &= ~SMOOTH_REFRESH;
2132#endif
2133 } 2072 }
2134 2073
2135#ifdef SELECTION_SCROLLING 2074#ifdef SELECTION_SCROLLING
2136 if (sel_scroll_ev.active)
2137 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
2138#endif 2076#endif
2139 2077
2140 if (ev.window == vt) 2078 if (ev.window == vt)
2141 { 2079 {
2080 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2081 return;
2082
2142#if ISO_14755 2083#if ISO_14755
2143 // 5.4 2084 // 5.4
2144 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2085 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2145 return; 2086 return;
2146#endif 2087#endif
2088
2147 if (reportmode) 2089 if (reportmode)
2148 { 2090 {
2149 /* mouse report from vt window */ 2091 /* mouse report from vt window */
2150 /* don't report release of wheel "buttons" */ 2092 /* don't report release of wheel "buttons" */
2151 if (ev.button >= 4) 2093 if (ev.button >= 4)
… …
2162 mouse_report (ev); 2104 mouse_report (ev);
2163 } 2105 }
2164#else /* MOUSE_REPORT_DOUBLECLICK */ 2106#else /* MOUSE_REPORT_DOUBLECLICK */
2165 MEvent.button = AnyButton; 2107 MEvent.button = AnyButton;
2166 mouse_report (ev); 2108 mouse_report (ev);
2167#endif /* MOUSE_REPORT_DOUBLECLICK */ 2109#endif /* MOUSE_REPORT_DOUBLECLICK */
2168 return; 2110 return;
2169 } 2111 }
2170 2112
2171 /* 2113 /*
2172 * dumb hack to compensate for the failure of click-and-drag 2114 * dumb hack to compensate for the failure of click-and-drag
… …
2175 if (priv_modes & PrivMode_mouse_report 2117 if (priv_modes & PrivMode_mouse_report
2176 && bypass_keystate 2118 && bypass_keystate
2177 && ev.button == Button1 && MEvent.clicks <= 1) 2119 && ev.button == Button1 && MEvent.clicks <= 1)
2178 selection_extend (ev.x, ev.y, 0); 2120 selection_extend (ev.x, ev.y, 0);
2179 2121
2180 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2181 return;
2182
2183 switch (ev.button) 2122 switch (ev.button)
2184 { 2123 {
2185 case Button1: 2124 case Button1:
2186 case Button3: 2125 case Button3:
2187 selection_make (ev.time); 2126 selection_make (ev.time);
2188 break; 2127 break;
2128
2189 case Button2: 2129 case Button2:
2190 selection_request (ev.time, ev.x, ev.y); 2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2191 break; 2132 break;
2133
2192#ifdef MOUSE_WHEEL 2134#ifdef MOUSE_WHEEL
2193 case Button4: 2135 case Button4:
2194 case Button5: 2136 case Button5:
2195 { 2137 {
2196 int i; 2138 int i;
… …
2198 2140
2199 v = ev.button == Button4 ? UP : DN; 2141 v = ev.button == Button4 ? UP : DN;
2200 2142
2201 if (ev.state & ShiftMask) 2143 if (ev.state & ShiftMask)
2202 i = 1; 2144 i = 1;
2203 else if (OPTION (Opt_mouseWheelScrollPage)) 2145 else if (option (Opt_mouseWheelScrollPage))
2204 i = nrow - 1; 2146 i = nrow - 1;
2205 else 2147 else
2206 i = 5; 2148 i = 5;
2207 2149
2208# ifdef MOUSE_SLIP_WHEELING 2150# ifdef MOUSE_SLIP_WHEELING
… …
2210 { 2152 {
2211 mouse_slip_wheel_speed += v ? -1 : 1; 2153 mouse_slip_wheel_speed += v ? -1 : 1;
2212 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2154 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2213 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2155 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2214 2156
2215 if (slip_wheel_ev.at < NOW) 2157 if (!slip_wheel_ev.is_active ())
2216 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2158 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2217
2218 slip_wheel_ev.start ();
2219 } 2159 }
2220 else 2160 else
2161# endif
2221 { 2162 {
2222# endif
2223 scr_page (v, i); 2163 scr_page (v, i);
2224 scrollbar_show (1); 2164 scrollbar_show (1);
2225# ifdef MOUSE_SLIP_WHEELING
2226 } 2165 }
2227# endif
2228 } 2166 }
2229 break; 2167 break;
2230#endif 2168#endif
2231 } 2169 }
2232 } 2170 }
2233#ifdef MENUBAR
2234 else if (isMenuBarWindow (ev.window))
2235 menubar_control (ev);
2236#endif
2237} 2171}
2238
2239#ifdef TRANSPARENT
2240#if TINTING
2241/* taken from aterm-0.4.2 */
2242
2243typedef uint32_t RUINT32T;
2244
2245void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2246{
2247 int sh_r, sh_g, sh_b;
2248 RUINT32T mask_r, mask_g, mask_b;
2249 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2250 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2251 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2252 int i;
2253
2254 Visual *visual = display->visual;
2255
2256 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2257
2258 /* for convenience */
2259 mask_r = visual->red_mask;
2260 mask_g = visual->green_mask;
2261 mask_b = visual->blue_mask;
2262
2263 /* boring lookup table pre-initialization */
2264 switch (srcImage->bits_per_pixel) {
2265 case 15:
2266 if ((mask_r != 0x7c00) ||
2267 (mask_g != 0x03e0) ||
2268 (mask_b != 0x001f))
2269 return;
2270 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2271 lookup_r = lookup;
2272 lookup_g = lookup+32;
2273 lookup_b = lookup+32+32;
2274 sh_r = 10;
2275 sh_g = 5;
2276 sh_b = 0;
2277 break;
2278 case 16:
2279 if ((mask_r != 0xf800) ||
2280 (mask_g != 0x07e0) ||
2281 (mask_b != 0x001f))
2282 return;
2283 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2284 lookup_r = lookup;
2285 lookup_g = lookup+32;
2286 lookup_b = lookup+32+64;
2287 sh_r = 11;
2288 sh_g = 5;
2289 sh_b = 0;
2290 break;
2291 case 24:
2292 if ((mask_r != 0xff0000) ||
2293 (mask_g != 0x00ff00) ||
2294 (mask_b != 0x0000ff))
2295 return;
2296 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2297 lookup_r = lookup;
2298 lookup_g = lookup+256;
2299 lookup_b = lookup+256+256;
2300 sh_r = 16;
2301 sh_g = 8;
2302 sh_b = 0;
2303 break;
2304 case 32:
2305 if ((mask_r != 0xff0000) ||
2306 (mask_g != 0x00ff00) ||
2307 (mask_b != 0x0000ff))
2308 return;
2309 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2310 lookup_r = lookup;
2311 lookup_g = lookup+256;
2312 lookup_b = lookup+256+256;
2313 sh_r = 16;
2314 sh_g = 8;
2315 sh_b = 0;
2316 break;
2317 default:
2318 return; /* we do not support this color depth */
2319 }
2320
2321 /* prepare limits for color transformation (each channel is handled separately) */
2322 if (shade < 0) {
2323 shade = -shade;
2324 if (shade < 0) shade = 0;
2325 if (shade > 100) shade = 100;
2326
2327 lower_lim_r = 65535-rm;
2328 lower_lim_g = 65535-gm;
2329 lower_lim_b = 65535-bm;
2330
2331 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2332 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2333 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2334
2335 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2336 } else {
2337 if (shade < 0) shade = 0;
2338 if (shade > 100) shade = 100;
2339
2340 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2341
2342 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2343 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2344 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2345 }
2346
2347 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2348 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2349 {
2350 unsigned int tmp;
2351
2352 tmp = lower_lim_r;
2353 lower_lim_r = lower_lim_b;
2354 lower_lim_b = tmp;
2355
2356 tmp = upper_lim_r;
2357 upper_lim_r = upper_lim_b;
2358 upper_lim_b = tmp;
2359 }
2360
2361 /* fill our lookup tables */
2362 for (i = 0; i <= mask_r>>sh_r; i++)
2363 {
2364 RUINT32T tmp;
2365 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2366 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2367 lookup_r[i] = (tmp/65535)<<sh_r;
2368 }
2369 for (i = 0; i <= mask_g>>sh_g; i++)
2370 {
2371 RUINT32T tmp;
2372 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2373 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2374 lookup_g[i] = (tmp/65535)<<sh_g;
2375 }
2376 for (i = 0; i <= mask_b>>sh_b; i++)
2377 {
2378 RUINT32T tmp;
2379 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2380 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2381 lookup_b[i] = (tmp/65535)<<sh_b;
2382 }
2383
2384 /* apply table to input image (replacing colors by newly calculated ones) */
2385 switch (srcImage->bits_per_pixel)
2386 {
2387 case 15:
2388 {
2389 unsigned short *p1, *pf, *p, *pl;
2390 p1 = (unsigned short *) srcImage->data;
2391 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2392 while (p1 < pf)
2393 {
2394 p = p1;
2395 pl = p1 + srcImage->width;
2396 for (; p < pl; p++)
2397 {
2398 *p = lookup_r[(*p & 0x7c00)>>10] |
2399 lookup_g[(*p & 0x03e0)>> 5] |
2400 lookup_b[(*p & 0x001f)];
2401 }
2402 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2403 }
2404 break;
2405 }
2406 case 16:
2407 {
2408 unsigned short *p1, *pf, *p, *pl;
2409 p1 = (unsigned short *) srcImage->data;
2410 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2411 while (p1 < pf)
2412 {
2413 p = p1;
2414 pl = p1 + srcImage->width;
2415 for (; p < pl; p++)
2416 {
2417 *p = lookup_r[(*p & 0xf800)>>11] |
2418 lookup_g[(*p & 0x07e0)>> 5] |
2419 lookup_b[(*p & 0x001f)];
2420 }
2421 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2422 }
2423 break;
2424 }
2425 case 24:
2426 {
2427 unsigned char *p1, *pf, *p, *pl;
2428 p1 = (unsigned char *) srcImage->data;
2429 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2430 while (p1 < pf)
2431 {
2432 p = p1;
2433 pl = p1 + srcImage->width * 3;
2434 for (; p < pl; p += 3)
2435 {
2436 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2437 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2438 p[2] = lookup_r[(p[2] & 0x0000ff)];
2439 }
2440 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2441 }
2442 break;
2443 }
2444 case 32:
2445 {
2446 RUINT32T *p1, *pf, *p, *pl;
2447 p1 = (RUINT32T *) srcImage->data;
2448 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2449
2450 while (p1 < pf)
2451 {
2452 p = p1;
2453 pl = p1 + srcImage->width;
2454 for (; p < pl; p++)
2455 {
2456 *p = lookup_r[(*p & 0xff0000)>>16] |
2457 lookup_g[(*p & 0x00ff00)>> 8] |
2458 lookup_b[(*p & 0x0000ff)] |
2459 (*p & ~0xffffff);
2460 }
2461 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2462 }
2463 break;
2464 }
2465 }
2466
2467 free (lookup);
2468}
2469#endif
2470
2471/*
2472 * Check our parents are still who we think they are.
2473 * Do transparency updates if required
2474 */
2475int
2476rxvt_term::check_our_parents ()
2477{
2478 int i, pchanged, aformat, have_pixmap, rootdepth;
2479 unsigned long nitems, bytes_after;
2480 Atom atype;
2481 unsigned char *prop = NULL;
2482 Window root, oldp, *list;
2483 Pixmap rootpixmap = None;
2484 XWindowAttributes wattr, wrootattr;
2485 dDisp;
2486
2487 pchanged = 0;
2488
2489 if (!OPTION (Opt_transparent))
2490 return pchanged; /* Don't try any more */
2491
2492 XGetWindowAttributes (disp, display->root, &wrootattr);
2493 rootdepth = wrootattr.depth;
2494
2495 XGetWindowAttributes (disp, parent[0], &wattr);
2496
2497 if (rootdepth != wattr.depth)
2498 {
2499 if (am_transparent)
2500 {
2501 pchanged = 1;
2502 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2503 am_transparent = am_pixmap_trans = 0;
2504 }
2505
2506 return pchanged; /* Don't try any more */
2507 }
2508
2509 /* Get all X ops out of the queue so that our information is up-to-date. */
2510 XSync (disp, False);
2511
2512 /*
2513 * Make the frame window set by the window manager have
2514 * the root background. Some window managers put multiple nested frame
2515 * windows for each client, so we have to take care about that.
2516 */
2517 i = (xa[XA_XROOTPMAP_ID]
2518 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2519 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2520 &nitems, &bytes_after, &prop) == Success);
2521
2522 if (!i || prop == NULL)
2523 i = (xa[XA_ESETROOT_PMAP_ID]
2524 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2525 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2526 &nitems, &bytes_after, &prop) == Success);
2527
2528 if (!i || prop == NULL
2529#if TINTING
2530 || !rs[Rs_color + Color_tint]
2531#endif
2532 )
2533 have_pixmap = 0;
2534 else
2535 {
2536 have_pixmap = 1;
2537 rootpixmap = *(Pixmap *)prop;
2538 XFree (prop);
2539 }
2540
2541 if (have_pixmap)
2542 {
2543 /*
2544 * Copy display->root pixmap transparency
2545 */
2546 int sx, sy, nx, ny;
2547 unsigned int nw, nh;
2548 Window cr;
2549 XImage *image;
2550 GC gc;
2551 XGCValues gcvalue;
2552
2553 XTranslateCoordinates (disp, parent[0], display->root,
2554 0, 0, &sx, &sy, &cr);
2555 nw = (unsigned int)szHint.width;
2556 nh = (unsigned int)szHint.height;
2557 nx = ny = 0;
2558
2559 if (sx < 0)
2560 {
2561 nw += sx;
2562 nx = -sx;
2563 sx = 0;
2564 }
2565
2566 if (sy < 0)
2567 {
2568 nh += sy;
2569 ny = -sy;
2570 sy = 0;
2571 }
2572
2573 min_it (nw, (unsigned int) (wrootattr.width - sx));
2574 min_it (nh, (unsigned int) (wrootattr.height - sy));
2575
2576 XSync (disp, False);
2577 allowedxerror = -1;
2578 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2579
2580 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2581 /* XXX: may need a delay here? */
2582 allowedxerror = 0;
2583
2584 if (image == NULL)
2585 {
2586 if (am_transparent && am_pixmap_trans)
2587 {
2588 pchanged = 1;
2589 if (pixmap != None)
2590 {
2591 XFreePixmap (disp, pixmap);
2592 pixmap = None;
2593 }
2594 }
2595
2596 am_pixmap_trans = 0;
2597 }
2598 else
2599 {
2600 if (pixmap != None)
2601 XFreePixmap (disp, pixmap);
2602
2603#if TINTING
2604 if (ISSET_PIXCOLOR (Color_tint))
2605 {
2606 unsigned short rm, gm, bm;
2607 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2608
2609 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2610
2611 ShadeXImage (display, image, shade, rm, gm, bm);
2612 }
2613#endif
2614
2615 pixmap = XCreatePixmap (disp, vt,
2616 szHint.width, szHint.height, image->depth);
2617 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2618 XPutImage (disp, pixmap, gc, image, 0, 0,
2619 nx, ny, image->width, image->height);
2620 XFreeGC (disp, gc);
2621 XDestroyImage (image);
2622 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2623 XClearWindow (disp, parent[0]);
2624
2625 if (!am_transparent || !am_pixmap_trans)
2626 pchanged = 1;
2627
2628 am_transparent = am_pixmap_trans = 1;
2629 }
2630 }
2631
2632 if (am_pixmap_trans)
2633 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2634 else
2635 {
2636 unsigned int n;
2637 /*
2638 * InheritPixmap transparency
2639 */
2640 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2641 {
2642 oldp = parent[i];
2643 XQueryTree (disp, parent[i - 1], &root,
2644 &parent[i], &list, &n);
2645 XFree (list);
2646
2647 if (parent[i] == display->root)
2648 {
2649 if (oldp != None)
2650 pchanged = 1;
2651
2652 break;
2653 }
2654
2655 if (oldp != parent[i])
2656 pchanged = 1;
2657 }
2658
2659 n = 0;
2660
2661 if (pchanged)
2662 {
2663 for (; n < (unsigned int)i; n++)
2664 {
2665 XGetWindowAttributes (disp, parent[n], &wattr);
2666 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2667 {
2668 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2669 break;
2670 }
2671 }
2672 }
2673
2674 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2675 {
2676 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2677 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2678 am_transparent = 0;
2679 /* XXX: also turn off Opt_transparent? */
2680 }
2681 else
2682 {
2683#if WAIT_FOR_WM
2684 /* wait (an arbitrary period) for the WM to do its thing
2685 * needed for fvwm2.2.2 (and before?) */
2686 sleep (1);
2687#endif
2688 for (n = 0; n < (unsigned int)i; n++)
2689 {
2690 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2691 XClearWindow (disp, parent[n]);
2692 }
2693
2694 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2695 am_transparent = 1;
2696 }
2697
2698 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2699 parent[i] = None;
2700 }
2701
2702 if (scrollBar.win)
2703 {
2704 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2705 scrollBar.setIdle ();
2706 scrollbar_show (0);
2707 }
2708
2709 if (am_transparent)
2710 {
2711 want_refresh = want_full_refresh = 1;
2712 if (am_pixmap_trans)
2713 flush ();
2714 }
2715
2716 return pchanged;
2717}
2718#endif
2719 2172
2720/*}}} */ 2173/*}}} */
2721 2174
2722bool 2175bool
2723rxvt_term::cmd_parse () 2176rxvt_term::cmd_parse ()
… …
2772 if (ch == C0_LF) 2225 if (ch == C0_LF)
2773 nlines++; 2226 nlines++;
2774 2227
2775 refresh_count++; 2228 refresh_count++;
2776 2229
2777 if (!OPTION (Opt_jumpScroll) 2230 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2778 || (refresh_count >= refresh_limit * (nrow - 1)))
2779 { 2231 {
2780 refreshnow = true;
2781 refresh_count = 0; 2232 refresh_count = 0;
2233
2234 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2235 {
2236 refreshnow = true;
2782 ch = NOCHAR; 2237 ch = NOCHAR;
2783 break; 2238 break;
2239 }
2784 } 2240 }
2785 2241
2786 // scr_add_lines only works for nlines <= nrow - 1. 2242 // scr_add_lines only works for nlines <= nrow - 1.
2787 if (nlines >= nrow - 1) 2243 if (nlines >= nrow - 1)
2788 { 2244 {
2245 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2789 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2246 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2790 scr_add_lines (buf, str - buf, nlines); 2247 scr_add_lines (buf, str - buf, nlines);
2791 2248
2792 nlines = 0; 2249 nlines = 0;
2793 str = buf; 2250 str = buf;
2794 eol = str + min (ncol, UBUFSIZ); 2251 eol = str + min (ncol, UBUFSIZ);
… …
2809 2266
2810 seq_begin = cmdbuf_ptr; 2267 seq_begin = cmdbuf_ptr;
2811 ch = next_char (); 2268 ch = next_char ();
2812 } 2269 }
2813 2270
2271 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2814 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2272 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2815 scr_add_lines (buf, str - buf, nlines); 2273 scr_add_lines (buf, str - buf, nlines);
2816 2274
2817 /* 2275 /*
2818 * If there have been a lot of new lines, then update the screen 2276 * If there have been a lot of new lines, then update the screen
2819 * What the heck I'll cheat and only refresh less than every page-full. 2277 * What the heck we'll cheat and only refresh less than every page-full.
2820 * the number of pages between refreshes is refresh_limit, which 2278 * if skipScroll is enabled.
2821 * is incremented here because we must be doing flat-out scrolling.
2822 */ 2279 */
2823 if (refreshnow) 2280 if (refreshnow)
2824 { 2281 {
2825 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2826 refresh_limit++;
2827 else
2828 {
2829 flag = true; 2282 flag = true;
2830 scr_refresh (refresh_type); 2283 scr_refresh ();
2831 want_refresh = 1; 2284 want_refresh = 1;
2832 }
2833 } 2285 }
2834 2286
2835 } 2287 }
2836 else 2288 else
2837 { 2289 {
… …
2853 return flag; 2305 return flag;
2854} 2306}
2855 2307
2856// read the next character 2308// read the next character
2857wchar_t 2309wchar_t
2858rxvt_term::next_char () 2310rxvt_term::next_char () NOTHROW
2859{ 2311{
2860 while (cmdbuf_ptr < cmdbuf_endp) 2312 while (cmdbuf_ptr < cmdbuf_endp)
2861 { 2313 {
2862 // assume 7-bit to be ascii ALWAYS 2314 // assume 7-bit to be ascii ALWAYS
2863 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2884 return NOCHAR; 2336 return NOCHAR;
2885} 2337}
2886 2338
2887// read the next octet 2339// read the next octet
2888uint32_t 2340uint32_t
2889rxvt_term::next_octet () 2341rxvt_term::next_octet () NOTHROW
2890{ 2342{
2891 return cmdbuf_ptr < cmdbuf_endp 2343 return cmdbuf_ptr < cmdbuf_endp
2892 ? (unsigned char)*cmdbuf_ptr++ 2344 ? (unsigned char)*cmdbuf_ptr++
2893 : NOCHAR; 2345 : NOCHAR;
2894} 2346}
2347
2348static class out_of_input out_of_input;
2895 2349
2896/* rxvt_cmd_getc () - Return next input character */ 2350/* rxvt_cmd_getc () - Return next input character */
2897/* 2351/*
2898 * Return the next input character after first passing any keyboard input 2352 * Return the next input character after first passing any keyboard input
2899 * to the command. 2353 * to the command.
2900 */ 2354 */
2901wchar_t 2355wchar_t
2902rxvt_term::cmd_getc () 2356rxvt_term::cmd_getc () THROW ((class out_of_input))
2903{ 2357{
2904 wchar_t c = next_char (); 2358 wchar_t c = next_char ();
2905 2359
2906 if (c == NOCHAR) 2360 if (c == NOCHAR)
2907 throw out_of_input; 2361 throw out_of_input;
2908 2362
2909 return c; 2363 return c;
2910} 2364}
2911 2365
2912uint32_t 2366uint32_t
2913rxvt_term::cmd_get8 () 2367rxvt_term::cmd_get8 () THROW ((class out_of_input))
2914{ 2368{
2915 uint32_t c = next_octet (); 2369 uint32_t c = next_octet ();
2916 2370
2917 if (c == NOCHAR) 2371 if (c == NOCHAR)
2918 throw out_of_input; 2372 throw out_of_input;
… …
2984 { 2438 {
2985 if ((buf[len++] = cmd_getc ()) == 'i') 2439 if ((buf[len++] = cmd_getc ()) == 'i')
2986 break; /* done = 1 */ 2440 break; /* done = 1 */
2987 } 2441 }
2988 } 2442 }
2989 2443
2990 for (i = 0; i < len; i++) 2444 for (i = 0; i < len; i++)
2991 if (putc (buf[i], fd) == EOF) 2445 if (putc (buf[i], fd) == EOF)
2992 { 2446 {
2993 done = 1; 2447 done = 1;
2994 break; 2448 break;
… …
2996 } 2450 }
2997 } 2451 }
2998 2452
2999 pclose_printer (fd); 2453 pclose_printer (fd);
3000} 2454}
3001#endif /* PRINTPIPE */ 2455#endif /* PRINTPIPE */
3002/*}}} */ 2456/*}}} */
3003 2457
3004/* *INDENT-OFF* */ 2458/* *INDENT-OFF* */
3005enum { 2459enum {
3006 C1_40 = 0x40, 2460 C1_40 = 0x40,
… …
3056 process_dcs_seq (); 2510 process_dcs_seq ();
3057 break; 2511 break;
3058 case 0x9b: /* CSI */ 2512 case 0x9b: /* CSI */
3059 process_csi_seq (); 2513 process_csi_seq ();
3060 break; 2514 break;
3061 case 0x9d: /* CSI */ 2515 case 0x9d: /* OSC */
3062 process_osc_seq (); 2516 process_osc_seq ();
3063 break; 2517 break;
3064#endif 2518#endif
3065 } 2519 }
3066} 2520}
… …
3110 break; 2564 break;
3111 case 'Z': /* identify the terminal type */ 2565 case 'Z': /* identify the terminal type */
3112 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2566 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3113 break; 2567 break;
3114 case '<': /* turn off VT52 mode */ 2568 case '<': /* turn off VT52 mode */
3115 PrivMode (0, PrivMode_vt52); 2569 set_privmode (PrivMode_vt52, 0);
3116 break; 2570 break;
3117 case 'F': /* use special graphics character set */ 2571 case 'F': /* use special graphics character set */
3118 case 'G': /* use regular character set */ 2572 case 'G': /* use regular character set */
3119 /* unimplemented */ 2573 /* unimplemented */
3120 break; 2574 break;
… …
3156 scr_charset_set (2, (unsigned int)cmd_getc ()); 2610 scr_charset_set (2, (unsigned int)cmd_getc ());
3157 break; 2611 break;
3158 case '+': 2612 case '+':
3159 scr_charset_set (3, (unsigned int)cmd_getc ()); 2613 scr_charset_set (3, (unsigned int)cmd_getc ());
3160 break; 2614 break;
3161#if ENABLE_FRILLS 2615#if !ENABLE_MINIMAL
3162 case '6': 2616 case '6':
3163 scr_backindex (); 2617 scr_backindex ();
3164 break; 2618 break;
3165#endif 2619#endif
3166 case '7': 2620 case '7':
3167 scr_cursor (SAVE); 2621 scr_cursor (SAVE);
3168 break; 2622 break;
3169 case '8': 2623 case '8':
3170 scr_cursor (RESTORE); 2624 scr_cursor (RESTORE);
3171 break; 2625 break;
3172#if ENABLE_FRILLS 2626#if !ENABLE_MINIMAL
3173 case '9': 2627 case '9':
3174 scr_forwardindex (); 2628 scr_forwardindex ();
3175 break; 2629 break;
3176#endif 2630#endif
3177 case '=': 2631 case '=':
3178 case '>': 2632 case '>':
3179 PrivMode ((ch == '='), PrivMode_aplKP); 2633 set_privmode (PrivMode_aplKP, ch == '=');
3180 break; 2634 break;
3181 2635
3182 case C1_40: 2636 case C1_40:
3183 cmd_getc (); 2637 cmd_getc ();
3184 break; 2638 break;
… …
3292rxvt_term::process_csi_seq () 2746rxvt_term::process_csi_seq ()
3293{ 2747{
3294 unicode_t ch, priv, i; 2748 unicode_t ch, priv, i;
3295 unsigned int nargs, p; 2749 unsigned int nargs, p;
3296 int n, ndef; 2750 int n, ndef;
3297 int arg[ESC_ARGS]; 2751 int arg[ESC_ARGS] = { };
3298 2752
3299 for (nargs = ESC_ARGS; nargs > 0;) 2753 nargs = 0;
3300 arg[--nargs] = 0;
3301 2754
3302 priv = 0; 2755 priv = 0;
3303 ch = cmd_getc (); 2756 ch = cmd_getc ();
3304 if (ch >= '<' && ch <= '?') 2757 if (ch >= '<' && ch <= '?')
2758 {
3305 { /* '<' '=' '>' '?' */ 2759 /* '<' '=' '>' '?' */
3306 priv = ch; 2760 priv = ch;
3307 ch = cmd_getc (); 2761 ch = cmd_getc ();
3308 } 2762 }
3309 2763
3310 /* read any numerical arguments */ 2764 /* read any numerical arguments */
… …
3339 ndef = get_byte_array_bit (csi_defaults, i); 2793 ndef = get_byte_array_bit (csi_defaults, i);
3340 for (p = 0; p < nargs; p++) 2794 for (p = 0; p < nargs; p++)
3341 if (arg[p] == -1) 2795 if (arg[p] == -1)
3342 arg[p] = ndef; 2796 arg[p] = ndef;
3343 2797
3344#ifdef DEBUG_CMD
3345 fprintf (stderr, "CSI ");
3346 for (p = 0; p < nargs; p++)
3347 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3348 fprintf (stderr, "%c\n", ch);
3349#endif
3350
3351 /* 2798 /*
3352 * private mode handling 2799 * private mode handling
3353 */ 2800 */
3354 if (priv) 2801 if (priv)
3355 { 2802 {
3356 switch (priv) 2803 switch (priv)
3357 { 2804 {
3358 case '>': 2805 case '>':
3359 if (ch == CSI_DA) /* secondary device attributes */ 2806 if (ch == CSI_DA) /* secondary device attributes */
3360 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2807 {
2808 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2809 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2810 //
2811 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2812 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2813 // versions.
2814 //
2815 tt_printf ("\033[>%d;95;0c", 'U');
2816 }
3361 break; 2817 break;
2818
3362 case '?': 2819 case '?':
3363 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3364 process_terminal_mode (ch, priv, nargs, arg); 2821 process_terminal_mode (ch, priv, nargs, arg);
3365 break; 2822 break;
3366 } 2823 }
… …
3491 break; 2948 break;
3492 case 6: /* CPR requested */ 2949 case 6: /* CPR requested */
3493 scr_report_position (); 2950 scr_report_position ();
3494 break; 2951 break;
3495 case 7: /* unofficial extension */ 2952 case 7: /* unofficial extension */
3496 if (OPTION (Opt_insecure)) 2953 if (option (Opt_insecure))
3497 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2954 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3498 break; 2955 break;
3499 case 8: /* unofficial extension */ 2956 case 8: /* unofficial extension */
3500 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2957 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3501 break; 2958 break;
… …
3568 break; 3025 break;
3569 case CSI_75: 3026 case CSI_75:
3570 scr_cursor (RESTORE); 3027 scr_cursor (RESTORE);
3571 break; 3028 break;
3572 3029
3573#if ENABLE_FRILLS 3030#if !ENABLE_MINIMAL
3574 case CSI_74: 3031 case CSI_74:
3575 process_window_ops (arg, nargs); 3032 process_window_ops (arg, nargs);
3576 break; 3033 break;
3577#endif 3034#endif
3578 3035
… …
3585 break; 3042 break;
3586 } 3043 }
3587} 3044}
3588/*}}} */ 3045/*}}} */
3589 3046
3590#if ENABLE_FRILLS 3047#if !ENABLE_MINIMAL
3591/* ARGSUSED */ 3048/* ARGSUSED */
3592void 3049void
3593rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3050rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3594{ 3051{
3595 int x, y; 3052 int x, y;
3596 XWindowAttributes wattr; 3053 XWindowAttributes wattr;
3597 Window wdummy; 3054 Window wdummy;
3598 dDisp; 3055
3056 dLocal (Display *, dpy);
3599 3057
3600 if (nargs == 0) 3058 if (nargs == 0)
3601 return; 3059 return;
3602 3060
3603 switch (args[0]) 3061 switch (args[0])
3604 { 3062 {
3605 /* 3063 /*
3606 * commands 3064 * commands
3607 */ 3065 */
3608 case 1: /* deiconify window */ 3066 case 1: /* deiconify window */
3609 XMapWindow (disp, parent[0]); 3067 XMapWindow (dpy, parent[0]);
3610 break; 3068 break;
3611 case 2: /* iconify window */ 3069 case 2: /* iconify window */
3612 XIconifyWindow (disp, parent[0], display->screen); 3070 XIconifyWindow (dpy, parent[0], display->screen);
3613 break; 3071 break;
3614 case 3: /* set position (pixels) */ 3072 case 3: /* set position (pixels) */
3615 XMoveWindow (disp, parent[0], args[1], args[2]); 3073 XMoveWindow (dpy, parent[0], args[1], args[2]);
3616 break; 3074 break;
3617 case 4: /* set size (pixels) */ 3075 case 4: /* set size (pixels) */
3618 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3076 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3619 break; 3077 break;
3620 case 5: /* raise window */ 3078 case 5: /* raise window */
3621 XRaiseWindow (disp, parent[0]); 3079 XRaiseWindow (dpy, parent[0]);
3622 break; 3080 break;
3623 case 6: /* lower window */ 3081 case 6: /* lower window */
3624 XLowerWindow (disp, parent[0]); 3082 XLowerWindow (dpy, parent[0]);
3625 break; 3083 break;
3626 case 7: /* refresh window */ 3084 case 7: /* refresh window */
3627 scr_touch (true); 3085 scr_touch (true);
3628 break; 3086 break;
3629 case 8: /* set size (chars) */ 3087 case 8: /* set size (chars) */
… …
3636 if (args[0] >= 24) /* set height (chars) */ 3094 if (args[0] >= 24) /* set height (chars) */
3637 set_widthheight ((unsigned int)width, 3095 set_widthheight ((unsigned int)width,
3638 (unsigned int) (args[1] * fheight)); 3096 (unsigned int) (args[1] * fheight));
3639 break; 3097 break;
3640 3098
3641
3642 /* 3099 /*
3643 * reports - some output format copied from XTerm 3100 * reports - some output format copied from XTerm
3644 */ 3101 */
3645 case 11: /* report window state */ 3102 case 11: /* report window state */
3646 XGetWindowAttributes (disp, parent[0], &wattr); 3103 XGetWindowAttributes (dpy, parent[0], &wattr);
3647 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3104 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3648 break; 3105 break;
3649 case 13: /* report window position */ 3106 case 13: /* report window position */
3650 XGetWindowAttributes (disp, parent[0], &wattr); 3107 XGetWindowAttributes (dpy, parent[0], &wattr);
3651 XTranslateCoordinates (disp, parent[0], wattr.root, 3108 XTranslateCoordinates (dpy, parent[0], wattr.root,
3652 -wattr.border_width, -wattr.border_width, 3109 -wattr.border_width, -wattr.border_width,
3653 &x, &y, &wdummy); 3110 &x, &y, &wdummy);
3654 tt_printf ("\033[3;%d;%dt", x, y); 3111 tt_printf ("\033[3;%d;%dt", x, y);
3655 break; 3112 break;
3656 case 14: /* report window size (pixels) */ 3113 case 14: /* report window size (pixels) */
3657 XGetWindowAttributes (disp, parent[0], &wattr); 3114 XGetWindowAttributes (dpy, parent[0], &wattr);
3658 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3115 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3659 break; 3116 break;
3660 case 18: /* report text area size (chars) */ 3117 case 18: /* report text area size (chars) */
3661 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3118 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3662 break; 3119 break;
… …
3664 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3121 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3665 break; 3122 break;
3666 case 20: /* report icon label */ 3123 case 20: /* report icon label */
3667 { 3124 {
3668 char *s; 3125 char *s;
3669 XGetIconName (disp, parent[0], &s); 3126 XGetIconName (dpy, parent[0], &s);
3670 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3127 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3671 XFree (s); 3128 XFree (s);
3672 } 3129 }
3673 break; 3130 break;
3674 case 21: /* report window title */ 3131 case 21: /* report window title */
3675 { 3132 {
3676 char *s; 3133 char *s;
3677 XFetchName (disp, parent[0], &s); 3134 XFetchName (dpy, parent[0], &s);
3678 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3135 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3679 XFree (s); 3136 XFree (s);
3680 } 3137 }
3681 break; 3138 break;
3682 } 3139 }
3683} 3140}
… …
3710 seen_esc = true; 3167 seen_esc = true;
3711 continue; 3168 continue;
3712 } 3169 }
3713 else if (ch == C0_BEL || ch == CHAR_ST) 3170 else if (ch == C0_BEL || ch == CHAR_ST)
3714 break; 3171 break;
3172 else if (ch == C0_SYN)
3173 ch = cmd_get8 ();
3715 else if (ch < 0x20) 3174 else if (ch < 0x20)
3716 return NULL; /* other control character - exit */ 3175 return NULL; /* other control character - exit */
3717 3176
3718 seen_esc = false; 3177 seen_esc = false;
3719 3178
3720 if (n >= STRING_MAX - 1) 3179 if (n >= STRING_MAX - 1)
3721 // stop at some sane length 3180 // stop at some sane length
3722 return NULL; 3181 return NULL;
3723 3182
3724 if (ch == C0_SYN)
3725 string[n++] = cmd_get8 ();
3726 else
3727 string[n++] = ch; 3183 string[n++] = ch;
3728 } 3184 }
3729 3185
3730 string[n++] = '\0'; 3186 string[n++] = '\0';
3731 3187
3732 ends_how = (ch == 0x5c ? C0_ESC : ch); 3188 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3783void 3239void
3784rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3240rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3785{ 3241{
3786 if (str[0] == '?' && !str[1]) 3242 if (str[0] == '?' && !str[1])
3787 { 3243 {
3788 unsigned short r, g, b; 3244 rgba c;
3789 pix_colors_focused[color].get (display, r, g, b); 3245 pix_colors_focused[color].get (c);
3246
3247#if XFT
3248 if (c.a != rgba::MAX_CC)
3249 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3250 else
3251#endif
3790 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3252 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3791 } 3253 }
3792 else 3254 else
3793 set_window_color (color, str); 3255 set_window_color (color, str);
3794} 3256}
3795 3257
… …
3797 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3259 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3798 */ 3260 */
3799void 3261void
3800rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3262rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3801{ 3263{
3802 int changed = 0;
3803 int color; 3264 int color;
3804 char *buf, *name; 3265 char *buf, *name;
3805 bool query = str[0] == '?' && !str[1]; 3266 bool query = str[0] == '?' && !str[1];
3806 int saveop = op; 3267 int saveop = op;
3807 dDisp; 3268
3269 dLocal (Display *, dpy);
3808 3270
3809 assert (str != NULL); 3271 assert (str != NULL);
3272
3273 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3274 return;
3275
3810 switch (op) 3276 switch (op)
3811 { 3277 {
3812 case XTerm_name: 3278 case XTerm_name:
3813 set_title (str); 3279 set_title (str);
3814 /* FALLTHROUGH */ 3280 /* FALLTHROUGH */
… …
3828 unsigned long bytes_after; 3294 unsigned long bytes_after;
3829 unsigned char *value = 0; 3295 unsigned char *value = 0;
3830 const char *str = ""; 3296 const char *str = "";
3831 3297
3832 if (prop 3298 if (prop
3833 && XGetWindowProperty (disp, parent[0], 3299 && XGetWindowProperty (dpy, parent[0],
3834 prop, 0, 1<<16, 0, AnyPropertyType, 3300 prop, 0, 1<<16, 0, AnyPropertyType,
3835 &actual_type, &actual_format, 3301 &actual_type, &actual_format,
3836 &nitems, &bytes_after, &value) == Success 3302 &nitems, &bytes_after, &value) == Success
3837 && actual_type != None 3303 && actual_type != None
3838 && actual_format == 8) 3304 && actual_format == 8)
3839 str = (const char *)(value); 3305 str = (const char *)(value);
3840 3306
3841 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3307 tt_printf ("\033]%d;%s%c", op, str, resp);
3842 3308
3843 XFree (value); 3309 XFree (value);
3844 } 3310 }
3845 else 3311 else
3846 { 3312 {
… …
3850 { 3316 {
3851 *eq = 0; 3317 *eq = 0;
3852 set_utf8_property (display->atom (str), eq + 1); 3318 set_utf8_property (display->atom (str), eq + 1);
3853 } 3319 }
3854 else 3320 else
3855 XDeleteProperty (disp, parent[0], 3321 XDeleteProperty (dpy, parent[0],
3856 display->atom (str)); 3322 display->atom (str));
3857 } 3323 }
3858 break; 3324 break;
3859 3325
3860 case XTerm_Color: 3326 case XTerm_Color:
… …
3870 break; 3336 break;
3871 3337
3872 if ((buf = strchr (name, ';')) != NULL) 3338 if ((buf = strchr (name, ';')) != NULL)
3873 *buf++ = '\0'; 3339 *buf++ = '\0';
3874 3340
3875 if (name[0] == '?' && !name[1]) 3341 process_color_seq (op, color, name, resp);
3876 {
3877 unsigned short r, g, b;
3878 pix_colors_focused[color].get (display, r, g, b);
3879 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3880 }
3881 else
3882 set_window_color (color, name);
3883 } 3342 }
3884 break; 3343 break;
3344 case Rxvt_restoreFG:
3885 case XTerm_Color00: 3345 case XTerm_Color00:
3886 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3346 process_color_seq (op, Color_fg, str, resp);
3887 break; 3347 break;
3348 case Rxvt_restoreBG:
3888 case XTerm_Color01: 3349 case XTerm_Color01:
3889 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3350 process_color_seq (op, Color_bg, str, resp);
3890 break; 3351 break;
3891#ifndef NO_CURSORCOLOR 3352#ifndef NO_CURSORCOLOR
3892 case XTerm_Color_cursor: 3353 case XTerm_Color_cursor:
3893 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3354 process_color_seq (op, Color_cursor, str, resp);
3894 break; 3355 break;
3895#endif 3356#endif
3896 case XTerm_Color_pointer_fg: 3357 case XTerm_Color_pointer_fg:
3897 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3358 process_color_seq (op, Color_pointer_fg, str, resp);
3898 break; 3359 break;
3899 case XTerm_Color_pointer_bg: 3360 case XTerm_Color_pointer_bg:
3900 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3361 process_color_seq (op, Color_pointer_bg, str, resp);
3901 break; 3362 break;
3902#ifndef NO_BOLD_UNDERLINE_REVERSE 3363#ifndef NO_BOLD_UNDERLINE_REVERSE
3903 case XTerm_Color_RV: 3364 case XTerm_Color_RV:
3904 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3365 process_color_seq (op, Color_RV, str, resp);
3905 break; 3366 break;
3906 case Rxvt_Color_BD: 3367 case Rxvt_Color_BD:
3907 case URxvt_Color_BD: 3368 case URxvt_Color_BD:
3908 process_color_seq (op, Color_BD, str, resp); 3369 process_color_seq (op, Color_BD, str, resp);
3909 break; 3370 break;
3910 case Rxvt_Color_UL: 3371 case Rxvt_Color_UL:
3911 case URxvt_Color_UL: 3372 case URxvt_Color_UL:
3912 process_color_seq (op, Color_UL, str, resp); 3373 process_color_seq (op, Color_UL, str, resp);
3913 break; 3374 break;
3914 case URxvt_Color_IT: 3375 case URxvt_Color_IT:
3915 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3376 process_color_seq (op, Color_IT, str, resp);
3916 break; 3377 break;
3917#endif 3378#endif
3918#if TRANSPARENT && TINTING 3379#if ENABLE_TRANSPARENCY
3919 case URxvt_Color_tint: 3380 case URxvt_Color_tint:
3920 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3381 process_color_seq (op, Color_tint, str, resp);
3921 check_our_parents (); 3382 {
3922 if (am_transparent) 3383 bool changed = false;
3923 want_full_refresh = want_refresh = 1;
3924 break;
3925#endif
3926 3384
3385 if (ISSET_PIXCOLOR (Color_tint))
3386 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3387 else
3388 changed = bgPixmap.unset_tint ();
3389
3390 if (changed)
3391 update_background ();
3392 }
3393
3394 break;
3395#endif
3396
3397#if BG_IMAGE_FROM_FILE
3927 case Rxvt_Pixmap: 3398 case Rxvt_Pixmap:
3928 if (*str != ';') 3399 if (!strcmp (str, "?"))
3929 { 3400 {
3930#if XPM_BACKGROUND 3401 char str[256];
3931 scale_pixmap (""); /* reset to default scaling */ 3402
3932 set_bgPixmap (str); /* change pixmap */ 3403 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3933 scr_touch (true); 3404 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3934#endif 3405 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3406 process_xterm_seq (XTerm_title, str, CHAR_ST);
3935 } 3407 }
3936 3408 else
3937 while ((str = strchr (str, ';')) != NULL)
3938 { 3409 {
3410 int changed = 0;
3411
3412 if (*str != ';')
3413 {
3414 /* reset to default scaling :*/
3415 bgPixmap.unset_geometry ();
3416 if (bgPixmap.set_file (str)) /* change pixmap */
3417 changed++;
3418 str = strchr (str, ';');
3419 if (str == NULL)
3420 bgPixmap.set_defaultGeometry ();
3421 }
3422
3423 while (str)
3424 {
3939 str++; 3425 str++;
3940#if XPM_BACKGROUND 3426 if (bgPixmap.set_geometry (str))
3941 changed += scale_pixmap (str); 3427 changed++;
3942#endif 3428 str = strchr (str, ';');
3429 }
3430
3431 if (changed)
3432 update_background ();
3943 } 3433 }
3944
3945 if (changed)
3946 {
3947#ifdef XPM_BACKGROUND
3948 resize_pixmap ();
3949 scr_touch (true);
3950#endif
3951 }
3952 break; 3434 break;
3953 3435#endif
3954 case Rxvt_restoreFG:
3955 set_window_color (Color_fg, str);
3956 break;
3957 case Rxvt_restoreBG:
3958 set_window_color (Color_bg, str);
3959 break;
3960 3436
3961 case XTerm_logfile: 3437 case XTerm_logfile:
3962 // TODO, when secure mode? 3438 // TODO, when secure mode?
3963 break; 3439 break;
3964 3440
3965#ifdef MENUBAR
3966 case URxvt_Menu:
3967 if (OPTION (Opt_insecure))
3968 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3969 break;
3970#endif
3971#if 0 3441#if 0
3972 case Rxvt_dumpscreen: /* no error notices */ 3442 case Rxvt_dumpscreen: /* no error notices */
3973 { 3443 {
3974 int fd; 3444 int fd;
3975 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3445 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
3988 case URxvt_italicFont: 3458 case URxvt_italicFont:
3989 case URxvt_boldItalicFont: 3459 case URxvt_boldItalicFont:
3990#endif 3460#endif
3991 if (query) 3461 if (query)
3992 tt_printf ("\33]%d;%-.250s%c", saveop, 3462 tt_printf ("\33]%d;%-.250s%c", saveop,
3993 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3463 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3994 ? fontset[op - URxvt_font]->fontdesc : "", 3464 ? fontset[op - URxvt_font]->fontdesc : "",
3995 resp); 3465 resp);
3996 else 3466 else
3997 { 3467 {
3998 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3468 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
4001 allocated.push_back ((void *)res); 3471 allocated.push_back ((void *)res);
4002 set_fonts (); 3472 set_fonts ();
4003 } 3473 }
4004 break; 3474 break;
4005 3475
4006#if ENABLE_FRILLS 3476 case URxvt_version:
3477 if (query)
3478 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3479 op,
3480 rs[Rs_name], VERSION[0], VERSION[2],
3481 resp);
3482 break;
3483
3484#if !ENABLE_MINIMAL
4007 case URxvt_locale: 3485 case URxvt_locale:
4008 if (query) 3486 if (query)
4009 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3487 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4010 else 3488 else
4011 { 3489 {
4012 set_locale (str); 3490 set_locale (str);
4013 pty.set_utf8_mode (enc_utf8); 3491 pty->set_utf8_mode (enc_utf8);
4014 init_xlocale (); 3492 init_xlocale ();
4015 } 3493 }
4016 break; 3494 break;
4017 3495
4018 case URxvt_view_up: 3496 case URxvt_view_up:
… …
4029 break; 3507 break;
4030#endif 3508#endif
4031 3509
4032#if ENABLE_PERL 3510#if ENABLE_PERL
4033 case URxvt_perl: 3511 case URxvt_perl:
4034 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3512 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4035 ; // no responses yet 3513 ; // no responses yet
4036 break; 3514 break;
4037#endif 3515#endif
4038 } 3516 }
4039} 3517}
… …
4063 { 3541 {
4064 if (mode == 'r') 3542 if (mode == 'r')
4065 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3543 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4066 else 3544 else
4067 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3545 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4068 PrivMode (state, bit); 3546 set_privmode (bit, state);
4069 } 3547 }
4070 3548
4071 return state; 3549 return state;
4072} 3550}
4073 3551
4074/* we're not using priv _yet_ */ 3552/* we're not using priv _yet_ */
4075void 3553void
4076rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3554rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4077{ 3555{
4078 unsigned int i, j; 3556 unsigned int i, j;
4079 int state; 3557 int state;
4080 3558
4081 static const struct 3559 static const struct
4082 { 3560 {
4083 const int argval; 3561 const int argval;
4084 const unsigned long bit; 3562 const unsigned long bit;
4085 }
4086
4087 argtopriv[] = { 3563 } argtopriv[] = {
4088 { 1, PrivMode_aplCUR }, 3564 { 1, PrivMode_aplCUR },
4089 { 2, PrivMode_vt52 }, 3565 { 2, PrivMode_vt52 },
4090 { 3, PrivMode_132 }, 3566 { 3, PrivMode_132 },
4091 { 4, PrivMode_smoothScroll }, 3567 { 4, PrivMode_smoothScroll },
4092 { 5, PrivMode_rVideo }, 3568 { 5, PrivMode_rVideo },
4093 { 6, PrivMode_relOrigin }, 3569 { 6, PrivMode_relOrigin },
4094 { 7, PrivMode_Autowrap }, 3570 { 7, PrivMode_Autowrap },
4095 // 8, bi-directional support mode 3571 // 8, bi-directional support mode
4096 { 9, PrivMode_MouseX10 }, 3572 { 9, PrivMode_MouseX10 },
4097#ifdef menuBar_esc
4098 { menuBar_esc, PrivMode_menuBar },
4099#endif
4100 // 18, 19 printing-related 3573 // 18, 19 printing-related
4101 { 25, PrivMode_VisibleCursor }, 3574 { 25, PrivMode_VisibleCursor },
4102#ifdef scrollBar_esc 3575#ifdef scrollBar_esc
4103 { scrollBar_esc, PrivMode_scrollBar }, 3576 { scrollBar_esc, PrivMode_scrollBar },
4104#endif 3577#endif
… …
4111 { 66, PrivMode_aplKP }, 3584 { 66, PrivMode_aplKP },
4112#ifndef NO_BACKSPACE_KEY 3585#ifndef NO_BACKSPACE_KEY
4113 { 67, PrivMode_BackSpace }, 3586 { 67, PrivMode_BackSpace },
4114#endif 3587#endif
4115 { 1000, PrivMode_MouseX11 }, 3588 { 1000, PrivMode_MouseX11 },
4116 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3589 { 1002, PrivMode_MouseBtnEvent },
4117 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3590 { 1003, PrivMode_MouseAnyEvent },
4118 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4119 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4120 { 1011, PrivMode_Keypress }, // rxvt extension 3592 { 1011, PrivMode_Keypress }, // rxvt extension
4121 // 1035 enable modifiers for alt, numlock NYI 3593 // 1035 enable modifiers for alt, numlock NYI
4122 // 1036 send ESC for meta keys NYI 3594 // 1036 send ESC for meta keys NYI
4123 // 1037 send DEL for keypad delete NYI 3595 // 1037 send DEL for keypad delete NYI
4124 { 1047, PrivMode_Screen }, 3596 { 1047, PrivMode_Screen },
4125 // 1048 save and restore cursor 3597 // 1048 save and restore cursor
4126 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3598 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4127 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3599 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3600 { 2004, PrivMode_BracketPaste },
4128 }; 3601 };
4129 3602
4130 if (nargs == 0) 3603 if (nargs == 0)
4131 return; 3604 return;
4132 3605
… …
4158 scr_touch (true); 3631 scr_touch (true);
4159 break; 3632 break;
4160#endif 3633#endif
4161 case 1048: /* alternative cursor save */ 3634 case 1048: /* alternative cursor save */
4162 case 1049: 3635 case 1049:
4163 if (OPTION (Opt_secondaryScreen)) 3636 if (option (Opt_secondaryScreen))
4164 if (mode == 0) 3637 if (mode == 0)
4165 scr_cursor (RESTORE); 3638 scr_cursor (RESTORE);
4166 else if (mode == 1) 3639 else if (mode == 1)
4167 scr_cursor (SAVE); 3640 scr_cursor (SAVE);
4168 break; 3641 break;
… …
4176 case 2: /* VT52 mode */ 3649 case 2: /* VT52 mode */
4177 /* oddball mode. should be set regardless of set/reset 3650 /* oddball mode. should be set regardless of set/reset
4178 * parameter. Return from VT52 mode with an ESC < from 3651 * parameter. Return from VT52 mode with an ESC < from
4179 * within VT52 mode 3652 * within VT52 mode
4180 */ 3653 */
4181 PrivMode (1, PrivMode_vt52); 3654 set_privmode (PrivMode_vt52, 1);
4182 break; 3655 break;
4183 case 3: /* 80/132 */ 3656 case 3: /* 80/132 */
4184 if (priv_modes & PrivMode_132OK) 3657 if (priv_modes & PrivMode_132OK)
3658 {
3659 scr_poweron ();
4185 set_widthheight (((state ? 132 : 80) * fwidth), height); 3660 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3661 }
4186 break; 3662 break;
4187 case 4: /* smooth scrolling */ 3663 case 4: /* smooth scrolling */
4188 set_option (Opt_jumpScroll, !state); 3664 set_option (Opt_jumpScroll, !state);
4189 break; 3665 break;
4190 case 5: /* reverse video */ 3666 case 5: /* reverse video */
… …
4197 scr_autowrap (state); 3673 scr_autowrap (state);
4198 break; 3674 break;
4199 /* case 8: - auto repeat, can't do on a per window basis */ 3675 /* case 8: - auto repeat, can't do on a per window basis */
4200 case 9: /* X10 mouse reporting */ 3676 case 9: /* X10 mouse reporting */
4201 if (state) /* orthogonal */ 3677 if (state) /* orthogonal */
4202 priv_modes &= ~PrivMode_MouseX11; 3678 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4203 break; 3679 break;
4204#ifdef menuBar_esc
4205 case menuBar_esc:
4206#ifdef MENUBAR
4207 map_menuBar (state);
4208#endif
4209 break;
4210#endif
4211#ifdef scrollBar_esc 3680#ifdef scrollBar_esc
4212 case scrollBar_esc: 3681 case scrollBar_esc:
4213 if (scrollbar_mapping (state)) 3682 if (scrollbar_mapping (state))
4214 { 3683 {
4215 resize_all_windows (0, 0, 0); 3684 resize_all_windows (0, 0, 0);
… …
4227 break; 3696 break;
4228 /* case 66: - application key pad */ 3697 /* case 66: - application key pad */
4229 /* case 67: - backspace key */ 3698 /* case 67: - backspace key */
4230 case 1000: /* X11 mouse reporting */ 3699 case 1000: /* X11 mouse reporting */
4231 if (state) /* orthogonal */ 3700 if (state) /* orthogonal */
4232 priv_modes &= ~PrivMode_MouseX10; 3701 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4233 break; 3702 break;
4234#if 0
4235 case 1001: 3703 case 1002:
4236 break; /* X11 mouse highlighting */ 3704 case 1003:
4237#endif 3705 if (state)
3706 {
3707 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3708 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3709 vt_emask_mouse = PointerMotionMask;
3710 }
3711 else
3712 vt_emask_mouse = NoEventMask;
3713 vt_select_input ();
3714 break;
4238 case 1010: /* scroll to bottom on TTY output inhibit */ 3715 case 1010: /* scroll to bottom on TTY output inhibit */
4239 set_option (Opt_scrollTtyOutput, !state); 3716 set_option (Opt_scrollTtyOutput, !state);
4240 break; 3717 break;
4241 case 1011: /* scroll to bottom on key press */ 3718 case 1011: /* scroll to bottom on key press */
4242 set_option (Opt_scrollTtyKeypress, state); 3719 set_option (Opt_scrollTtyKeypress, state);
4243 break; 3720 break;
4244 case 1047: /* secondary screen w/ clearing last */ 3721 case 1047: /* secondary screen w/ clearing last */
4245 if (OPTION (Opt_secondaryScreen)) 3722 if (option (Opt_secondaryScreen))
4246 if (current_screen != PRIMARY) 3723 if (current_screen != PRIMARY)
4247 scr_erase_screen (2); 3724 scr_erase_screen (2);
4248 scr_change_screen (state); 3725 scr_change_screen (state);
4249 break; 3726 break;
4250 case 1049: /* secondary screen w/ clearing first */ 3727 case 1049: /* secondary screen w/ clearing first */
4251 scr_change_screen (state); 3728 scr_change_screen (state);
4252 if (OPTION (Opt_secondaryScreen)) 3729 if (option (Opt_secondaryScreen))
4253 if (current_screen != PRIMARY) 3730 if (current_screen != PRIMARY)
4254 scr_erase_screen (2); 3731 scr_erase_screen (2);
4255 break; 3732 break;
4256 default: 3733 default:
4257 break; 3734 break;
… …
4385 scr_color (Color_bg, Color_bg); 3862 scr_color (Color_bg, Color_bg);
4386 break; 3863 break;
4387 3864
4388 //case 50: // not variable spacing 3865 //case 50: // not variable spacing
4389 3866
4390#if ENABLE_FRILLS 3867#if !ENABLE_MINIMAL
4391 case 90: 3868 case 90:
4392 case 91: /* set bright fg color */ 3869 case 91: /* set bright fg color */
4393 case 92: 3870 case 92:
4394 case 93: 3871 case 93:
4395 case 94: 3872 case 94:
… …
4419rxvt_term::process_graphics () 3896rxvt_term::process_graphics ()
4420{ 3897{
4421 unicode_t ch, cmd = cmd_getc (); 3898 unicode_t ch, cmd = cmd_getc ();
4422 3899
4423 if (cmd == 'Q') 3900 if (cmd == 'Q')
3901 {
4424 { /* query graphics */ 3902 /* query graphics */
4425 tt_printf ("\033G0\012"); /* no graphics */ 3903 tt_printf ("\033G0\012"); /* no graphics */
4426 return; 3904 return;
4427 } 3905 }
4428 /* swallow other graphics sequences until terminating ':' */ 3906 /* swallow other graphics sequences until terminating ':' */
4429 do 3907 do
… …
4460rxvt_term::tt_write (const char *data, unsigned int len) 3938rxvt_term::tt_write (const char *data, unsigned int len)
4461{ 3939{
4462 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3940 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4463 return; 3941 return;
4464 3942
4465 if (pty.pty < 0) 3943 if (pty->pty < 0)
4466 return; 3944 return;
4467 3945
4468 if (v_buflen == 0) 3946 if (v_buflen == 0)
4469 { 3947 {
4470 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3948 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4471 3949
4472 if ((unsigned int)written == len) 3950 if ((unsigned int)written == len)
4473 return; 3951 return;
4474 3952
4475 data += written; 3953 data += written;
… …
4479 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3957 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4480 3958
4481 memcpy (v_buffer + v_buflen, data, len); 3959 memcpy (v_buffer + v_buflen, data, len);
4482 v_buflen += len; 3960 v_buflen += len;
4483 3961
4484 pty_ev.set (EVENT_READ | EVENT_WRITE); 3962 pty_ev.set (ev::READ | ev::WRITE);
4485} 3963}
4486 3964
4487void rxvt_term::pty_write () 3965void rxvt_term::pty_write ()
4488{ 3966{
4489 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3967 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4490 3968
4491 if (written > 0) 3969 if (written > 0)
4492 { 3970 {
4493 v_buflen -= written; 3971 v_buflen -= written;
4494 3972
4495 if (v_buflen == 0) 3973 if (v_buflen == 0)
4496 { 3974 {
4497 free (v_buffer); 3975 free (v_buffer);
4498 v_buffer = 0; 3976 v_buffer = 0;
4499 v_buflen = 0;
4500 3977
4501 pty_ev.set (EVENT_READ); 3978 pty_ev.set (ev::READ);
4502 return; 3979 return;
4503 } 3980 }
4504 3981
4505 memmove (v_buffer, v_buffer + written, v_buflen); 3982 memmove (v_buffer, v_buffer + written, v_buflen);
4506 } 3983 }
4507 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3984 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4508 pty_ev.set (EVENT_READ); 3985 pty_ev.set (ev::READ);
4509} 3986}
4510 3987
4511/*----------------------- end-of-file (C source) -----------------------*/ 3988/*----------------------- end-of-file (C source) -----------------------*/
4512 3989

Diff Legend

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