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

Diff Legend

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