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.238 by root, Fri Jan 6 02:58:02 2006 UTC vs.
Revision 1.417 by root, Mon Jul 21 16:51:31 2008 UTC

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

Diff Legend

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