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

Diff Legend

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