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

Diff Legend

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