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.261 by root, Fri Jan 13 15:42:50 2006 UTC vs.
Revision 1.425 by root, Wed Nov 5 12:28:15 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
49#include "rxvt.h" 50#include "rxvt.h"
50#include "rxvtperl.h" 51#include "rxvtperl.h"
51#include "version.h" 52#include "version.h"
52#include "command.h" 53#include "command.h"
53 54
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 56# include "keyboard.h"
61#endif 57#endif
62 58
63#include <csignal> 59#include <csignal>
64 60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 68
72#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
73 70
74#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
99 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
100 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
101 98
102 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
103 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
104 XK_ISO_Lock, 0x21eb,
105 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
106 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
107 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
108 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
109 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 144 return;
149 145
150 for (;;) 146 for (;;)
151 { 147 {
152 const line_t &l = ROW(y - view_start); 148 const line_t &l = ROW(y + view_start);
153 149
154 text_t t = l.t[x]; 150 text_t t = l.t[x];
155 151
156 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
157 { 153 {
… …
203 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
205 201
206 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
207 203
208 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
210 206
211 if (y >= 0) 207 if (y >= 0)
212 { 208 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
225 ch = *chr++; 221 ch = *chr++;
226 222
227 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
229 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
230# if !UNICODE3 226# if !UNICODE_3
231 if (ch >= 0x10000) 227 if (ch >= 0x10000)
232 ch = 0xfffd; 228 ch = 0xfffd;
233# endif 229# endif
234 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
236 } 234 }
237 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
238 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
240 243
241 free (fname); 244 free (fname);
242 245
… …
276 } 279 }
277 280
278 iso14755buf = 0; 281 iso14755buf = 0;
279} 282}
280 283
281int 284static int
282rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
283{ 286{
284 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
285 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
286 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
287 { 290 {
… …
295 298
296 return -1; 299 return -1;
297} 300}
298#endif 301#endif
299 302
300/*{{{ Convert the keypress event into a string */ 303static inline KeySym
304translate_keypad (KeySym keysym, bool kp)
305{
306#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin
322 };
323
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
325 {
326 unsigned int index = keysym - XK_KP_Home;
327 keysym = kp ? keypadtrans[index] : XK_Home + index;
328 }
329 else if (keysym == XK_KP_Insert)
330 keysym = kp ? XK_KP_0 : XK_Insert;
331# ifndef NO_DELETE_KEY
332 else if (keysym == XK_KP_Delete)
333 keysym = kp ? XK_KP_Decimal : XK_Delete;
334# endif
335#endif
336 return keysym;
337}
338
339static inline int
340map_function_key (KeySym keysym)
341{
342 int param = 0;
343
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
345 {
346 param = 11 + keysym - XK_F1;
347 if (keysym >= XK_F17)
348 param += 4;
349 else if (keysym >= XK_F15)
350 param += 3;
351 else if (keysym >= XK_F11)
352 param += 2;
353 else if (keysym >= XK_F6)
354 param += 1;
355 }
356 else
357 switch (keysym)
358 {
359 case XK_Find:
360 param = 1;
361 break;
362 case XK_Insert:
363 param = 2;
364 break;
365#ifdef DXK_Remove
366 case DXK_Remove:
367#endif
368 case XK_Execute:
369 param = 3;
370 break;
371 case XK_Select:
372 param = 4;
373 break;
374#ifndef UNSHIFTED_SCROLLKEYS
375 case XK_Prior:
376 param = 5;
377 break;
378 case XK_Next:
379 param = 6;
380 break;
381 case XK_Home:
382 param = 7;
383 break;
384 case XK_End:
385 param = 8;
386 break;
387#endif
388 case XK_Help:
389 param = 28;
390 break;
391 case XK_Menu:
392 param = 29;
393 break;
394 }
395 return param;
396}
397
301void 398void
302rxvt_term::lookup_key (XKeyEvent &ev) 399rxvt_term::key_press (XKeyEvent &ev)
303{ 400{
304 int ctrl, meta, shft, len; 401 int ctrl, meta, shft, len;
305 unsigned int newlen;
306 KeySym keysym; 402 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 403 int valid_keysym;
311 char kbuf[KBUFSZ]; 404 char kbuf[KBUFSZ];
405
406#if ISO_14755
407 if (iso14755buf & ISO_14755_52)
408 return;
409#endif
312 410
313 /* 411 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 412 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 413 * escape sequence to toggle the Keypad.
316 * 414 *
… …
321 meta = ev.state & ModMetaMask; 419 meta = ev.state & ModMetaMask;
322 420
323 if (numlock_state || (ev.state & ModNumLockMask)) 421 if (numlock_state || (ev.state & ModNumLockMask))
324 { 422 {
325 numlock_state = (ev.state & ModNumLockMask); 423 numlock_state = (ev.state & ModNumLockMask);
326 PrivMode ((!numlock_state), PrivMode_aplKP); 424 set_privmode (PrivMode_aplKP, !numlock_state);
327 } 425 }
328 426
329 kbuf[0] = 0; 427 kbuf[0] = 0;
330 428
331#ifdef USE_XIM 429#ifdef USE_XIM
… …
443 scr_move_to (0, 1); 541 scr_move_to (0, 1);
444 return; 542 return;
445 } 543 }
446 else if (keysym == XK_End) 544 else if (keysym == XK_End)
447 { 545 {
448 scr_move_to (1, 0); 546 scr_move_to (1, 1);
449 return; 547 return;
450 } 548 }
451 } 549 }
452#endif 550#endif
453 } 551 }
… …
464 { 562 {
465 switch (keysym) 563 switch (keysym)
466 { 564 {
467 /* normal XTerm key bindings */ 565 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 566 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 567 selection_request (ev.time);
470 return; 568 return;
471#if TODO 569#if TODO
472 /* rxvt extras */ 570 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 571 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 572 change_font (FONT_UP);
… …
493 { 591 {
494 commit_iso14755 (); 592 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 593 iso14755buf = ISO_14755_51;
496# if ISO_14755 594# if ISO_14755
497 iso14755_51 (0); 595 iso14755_51 (0);
596# endif
597 return;
598 }
599 else if (keysym == XK_BackSpace)
600 {
601 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
602# if ISO_14755
603 iso14755_51 (iso14755buf & ISO_14755_MASK);
498# endif 604# endif
499 return; 605 return;
500 } 606 }
501 else if ((hv = hex_keyval (ev)) >= 0) 607 else if ((hv = hex_keyval (ev)) >= 0)
502 { 608 {
… …
507# endif 613# endif
508 return; 614 return;
509 } 615 }
510 else 616 else
511 { 617 {
512# if ENABLE_OVERLAY 618# if ISO_14755
513 scr_overlay_off (); 619 scr_overlay_off ();
514# endif 620# endif
515 iso14755buf = 0; 621 iso14755buf = 0;
516 } 622 }
517 } 623 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 626 if (!(iso14755buf & ISO_14755_STARTED))
521 { 627 {
522 iso14755buf |= ISO_14755_STARTED; 628 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 629# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 631 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 632# endif
527 } 633 }
528#endif 634#endif
529 635
530#ifdef PRINTPIPE 636#ifdef PRINTPIPE
531 if (keysym == XK_Print) 637 if (keysym == XK_Print)
532 { 638 {
533 scr_printscreen (ctrl | shft); 639 scr_printscreen (ctrl | shft);
534 return; 640 return;
535 } 641 }
536#endif 642#endif
537 643
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 644 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 { 645 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1;
648
649 switch (translate_keypad (keysym, kp))
540 { 650 {
651#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace)
654 {
655 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
656 ^ !!ctrl) ? '\b' : '\177';
657 kbuf[1] = '\0';
658 }
659 else
660 strcpy (kbuf, rs[Rs_backspace_key]);
661 break;
662#endif
663#ifndef NO_DELETE_KEY
664 case XK_Delete:
665 strcpy (kbuf, rs[Rs_delete_key]);
666 break;
667#endif
668 case XK_Tab:
669 if (shft)
670 strcpy (kbuf, "\033[Z");
671 else
672 {
673#ifdef CTRL_TAB_MAKES_META
674 if (ctrl)
675 meta = 1;
676#endif
677#ifdef MOD4_TAB_MAKES_META
678 if (ev.state & Mod4Mask)
679 meta = 1;
680#endif
541 newlen = 1; 681 newlen = 0;
542 switch (keysym) 682 }
683 break;
684
685 case XK_Up: /* "\033[A" */
686 case XK_Down: /* "\033[B" */
687 case XK_Right: /* "\033[C" */
688 case XK_Left: /* "\033[D" */
689 strcpy (kbuf, "\033[Z");
690 kbuf[2] = "DACB"[keysym - XK_Left];
691 /* do Shift first */
692 if (shft)
693 kbuf[2] = "dacb"[keysym - XK_Left];
694 else if (ctrl)
695 {
696 kbuf[1] = 'O';
697 kbuf[2] = "dacb"[keysym - XK_Left];
698 }
699 else if (priv_modes & PrivMode_aplCUR)
700 kbuf[1] = 'O';
701 break;
702
703 case XK_KP_Enter:
704 /* allow shift to override */
705 if (kp)
706 {
707 strcpy (kbuf, "\033OM");
708 break;
709 }
710
711 /* FALLTHROUGH */
712
713 case XK_Return:
714 if (priv_modes & PrivMode_LFNL)
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\012';
718 kbuf[2] = '\0';
719 }
720 else
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\0';
724 }
725 break;
726
727 case XK_KP_F1: /* "\033OP" */
728 case XK_KP_F2: /* "\033OQ" */
729 case XK_KP_F3: /* "\033OR" */
730 case XK_KP_F4: /* "\033OS" */
731 strcpy (kbuf, "\033OP");
732 kbuf[2] += (keysym - XK_KP_F1);
733 break;
734
735 case XK_KP_Multiply: /* "\033Oj" : "*" */
736 case XK_KP_Add: /* "\033Ok" : "+" */
737 case XK_KP_Separator: /* "\033Ol" : "," */
738 case XK_KP_Subtract: /* "\033Om" : "-" */
739 case XK_KP_Decimal: /* "\033On" : "." */
740 case XK_KP_Divide: /* "\033Oo" : "/" */
741 case XK_KP_0: /* "\033Op" : "0" */
742 case XK_KP_1: /* "\033Oq" : "1" */
743 case XK_KP_2: /* "\033Or" : "2" */
744 case XK_KP_3: /* "\033Os" : "3" */
745 case XK_KP_4: /* "\033Ot" : "4" */
746 case XK_KP_5: /* "\033Ou" : "5" */
747 case XK_KP_6: /* "\033Ov" : "6" */
748 case XK_KP_7: /* "\033Ow" : "7" */
749 case XK_KP_8: /* "\033Ox" : "8" */
750 case XK_KP_9: /* "\033Oy" : "9" */
751 /* allow shift to override */
752 if (kp)
753 {
754 strcpy (kbuf, "\033Oj");
755 kbuf[2] += (keysym - XK_KP_Multiply);
756 }
757 else
758 {
759 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
760 kbuf[1] = '\0';
761 }
762 break;
763
764 default:
543 { 765 {
544#ifndef NO_BACKSPACE_KEY 766 int param = map_function_key (keysym);
545 case XK_BackSpace: 767 if (param > 0)
546 if (priv_modes & PrivMode_HaveBackSpace) 768 sprintf (kbuf,"\033[%d~", param);
547 {
548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
549 ^ !!ctrl) ? '\b' : '\177';
550 kbuf[1] = '\0';
551 }
552 else 769 else
553 strcpy (kbuf, key_backspace);
554 break;
555#endif
556#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 {
562 strcpy (kbuf, "\033On");
563 break;
564 }
565 /* FALLTHROUGH */
566# endif
567 case XK_Delete:
568 strcpy (kbuf, key_delete);
569 break;
570#endif
571 case XK_Tab:
572 if (shft)
573 strcpy (kbuf, "\033[Z");
574 else
575 {
576#ifdef CTRL_TAB_MAKES_META
577 if (ctrl)
578 meta = 1;
579#endif
580#ifdef MOD4_TAB_MAKES_META
581 if (ev.state & Mod4Mask)
582 meta = 1;
583#endif
584 newlen = 0;
585 }
586 break;
587
588#ifdef XK_KP_Left
589 case XK_KP_Up: /* \033Ox or standard */
590 case XK_KP_Down: /* \033Or or standard */
591 case XK_KP_Right: /* \033Ov or standard */
592 case XK_KP_Left: /* \033Ot or standard */
593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
594 {
595 strcpy (kbuf, "\033OZ");
596 kbuf[2] = "txvr"[keysym - XK_KP_Left];
597 break;
598 }
599 else
600 /* translate to std. cursor key */
601 keysym = XK_Left + (keysym - XK_KP_Left);
602 /* FALLTHROUGH */
603#endif
604 case XK_Up: /* "\033[A" */
605 case XK_Down: /* "\033[B" */
606 case XK_Right: /* "\033[C" */
607 case XK_Left: /* "\033[D" */
608 strcpy (kbuf, "\033[Z");
609 kbuf[2] = "DACB"[keysym - XK_Left];
610 /* do Shift first */
611 if (shft)
612 kbuf[2] = "dacb"[keysym - XK_Left];
613 else if (ctrl)
614 {
615 kbuf[1] = 'O';
616 kbuf[2] = "dacb"[keysym - XK_Left];
617 }
618 else if (priv_modes & PrivMode_aplCUR)
619 kbuf[1] = 'O';
620 break;
621
622#ifndef UNSHIFTED_SCROLLKEYS
623# ifdef XK_KP_Prior
624 case XK_KP_Prior:
625 /* allow shift to override */
626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
627 {
628 strcpy (kbuf, "\033Oy");
629 break;
630 }
631 /* FALLTHROUGH */
632# endif
633 case XK_Prior:
634 strcpy (kbuf, "\033[5~");
635 break;
636# ifdef XK_KP_Next
637 case XK_KP_Next:
638 /* allow shift to override */
639 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
640 {
641 strcpy (kbuf, "\033Os");
642 break;
643 }
644 /* FALLTHROUGH */
645# endif
646 case XK_Next:
647 strcpy (kbuf, "\033[6~");
648 break;
649#endif
650 case XK_KP_Enter:
651 /* allow shift to override */
652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
653 {
654 strcpy (kbuf, "\033OM");
655 break;
656 }
657
658 /* FALLTHROUGH */
659
660 case XK_Return:
661 if (priv_modes & PrivMode_LFNL)
662 {
663 kbuf[0] = '\015';
664 kbuf[1] = '\012';
665 kbuf[2] = '\0';
666 }
667 else
668 {
669 kbuf[0] = '\015';
670 kbuf[1] = '\0';
671 }
672 break;
673
674#ifdef XK_KP_Begin
675 case XK_KP_Begin:
676 strcpy (kbuf, "\033Ou");
677 break;
678
679#endif
680 case XK_KP_F1: /* "\033OP" */
681 case XK_KP_F2: /* "\033OQ" */
682 case XK_KP_F3: /* "\033OR" */
683 case XK_KP_F4: /* "\033OS" */
684 strcpy (kbuf, "\033OP");
685 kbuf[2] += (keysym - XK_KP_F1);
686 break;
687
688 case XK_KP_Multiply: /* "\033Oj" : "*" */
689 case XK_KP_Add: /* "\033Ok" : "+" */
690 case XK_KP_Separator: /* "\033Ol" : "," */
691 case XK_KP_Subtract: /* "\033Om" : "-" */
692 case XK_KP_Decimal: /* "\033On" : "." */
693 case XK_KP_Divide: /* "\033Oo" : "/" */
694 case XK_KP_0: /* "\033Op" : "0" */
695 case XK_KP_1: /* "\033Oq" : "1" */
696 case XK_KP_2: /* "\033Or" : "2" */
697 case XK_KP_3: /* "\033Os" : "3" */
698 case XK_KP_4: /* "\033Ot" : "4" */
699 case XK_KP_5: /* "\033Ou" : "5" */
700 case XK_KP_6: /* "\033Ov" : "6" */
701 case XK_KP_7: /* "\033Ow" : "7" */
702 case XK_KP_8: /* "\033Ox" : "8" */
703 case XK_KP_9: /* "\033Oy" : "9" */
704 /* allow shift to override */
705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
706 {
707 strcpy (kbuf, "\033Oj");
708 kbuf[2] += (keysym - XK_KP_Multiply);
709 }
710 else
711 {
712 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
713 kbuf[1] = '\0';
714 }
715 break;
716
717 case XK_Find:
718 strcpy (kbuf, "\033[1~");
719 break;
720
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
731 case XK_Insert:
732 strcpy (kbuf, "\033[2~");
733 break;
734#ifdef DXK_Remove /* support for DEC remove like key */
735 case DXK_Remove:
736 /* FALLTHROUGH */
737#endif
738 case XK_Execute:
739 strcpy (kbuf, "\033[3~");
740 break;
741 case XK_Select:
742 strcpy (kbuf, "\033[4~");
743 break;
744#ifdef XK_KP_End
745 case XK_KP_End:
746 /* allow shift to override */
747 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
748 {
749 strcpy (kbuf, "\033Oq");
750 break;
751 }
752 /* FALLTHROUGH */
753#endif
754 case XK_End:
755 strcpy (kbuf, KS_END);
756 break;
757#ifdef XK_KP_Home
758 case XK_KP_Home:
759 /* allow shift to override */
760 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
761 {
762 strcpy (kbuf, "\033Ow");
763 break;
764 }
765 /* FALLTHROUGH */
766#endif
767 case XK_Home:
768 strcpy (kbuf, KS_HOME);
769 break;
770
771#define FKEY(n, fkey) \
772 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
773
774 case XK_F1: /* "\033[11~" */
775 case XK_F2: /* "\033[12~" */
776 case XK_F3: /* "\033[13~" */
777 case XK_F4: /* "\033[14~" */
778 case XK_F5: /* "\033[15~" */
779 FKEY (11, XK_F1);
780 break;
781 case XK_F6: /* "\033[17~" */
782 case XK_F7: /* "\033[18~" */
783 case XK_F8: /* "\033[19~" */
784 case XK_F9: /* "\033[20~" */
785 case XK_F10: /* "\033[21~" */
786 FKEY (17, XK_F6);
787 break;
788 case XK_F11: /* "\033[23~" */
789 case XK_F12: /* "\033[24~" */
790 case XK_F13: /* "\033[25~" */
791 case XK_F14: /* "\033[26~" */
792 FKEY (23, XK_F11);
793 break;
794 case XK_F15: /* "\033[28~" */
795 case XK_F16: /* "\033[29~" */
796 FKEY (28, XK_F15);
797 break;
798 case XK_Help: /* "\033[28~" */
799 FKEY (28, XK_Help);
800 break;
801 case XK_Menu: /* "\033[29~" */
802 FKEY (29, XK_Menu);
803 break;
804 case XK_F17: /* "\033[31~" */
805 case XK_F18: /* "\033[32~" */
806 case XK_F19: /* "\033[33~" */
807 case XK_F20: /* "\033[34~" */
808 case XK_F21: /* "\033[35~" */
809 case XK_F22: /* "\033[36~" */
810 case XK_F23: /* "\033[37~" */
811 case XK_F24: /* "\033[38~" */
812 case XK_F25: /* "\033[39~" */
813 case XK_F26: /* "\033[40~" */
814 case XK_F27: /* "\033[41~" */
815 case XK_F28: /* "\033[42~" */
816 case XK_F29: /* "\033[43~" */
817 case XK_F30: /* "\033[44~" */
818 case XK_F31: /* "\033[45~" */
819 case XK_F32: /* "\033[46~" */
820 case XK_F33: /* "\033[47~" */
821 case XK_F34: /* "\033[48~" */
822 case XK_F35: /* "\033[49~" */
823 FKEY (31, XK_F17);
824 break;
825#undef FKEY
826 default:
827 newlen = 0; 770 newlen = 0;
828 break;
829 } 771 }
830 772 break;
831 if (newlen)
832 len = strlen (kbuf);
833 } 773 }
774
775 if (newlen)
776 len = strlen (kbuf);
834 777
835 /* 778 /*
836 * Pass meta for all function keys, if 'meta' option set 779 * Pass meta for all function keys, if 'meta' option set
837 */ 780 */
838#ifdef META8_OPTION 781#ifdef META8_OPTION
… …
873 return; 816 return;
874 817
875 if (len <= 0) 818 if (len <= 0)
876 return; /* not mapped */ 819 return; /* not mapped */
877 820
878 if (OPTION (Opt_scrollTtyKeypress)) 821 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 822 if (view_start)
880 { 823 {
881 view_start = 0; 824 view_start = 0;
882 want_refresh = 1; 825 want_refresh = 1;
883 } 826 }
… …
905 { 848 {
906 const char ch = C0_ESC; 849 const char ch = C0_ESC;
907 tt_write (&ch, 1); 850 tt_write (&ch, 1);
908 } 851 }
909 852
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 853 tt_write (kbuf, (unsigned int)len);
921} 854}
922/*}}} */
923 855
856void
857rxvt_term::key_release (XKeyEvent &ev)
858{
859#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
860 KeySym keysym;
861
862 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
863#endif
864
865#if ENABLE_FRILLS || ISO_14755
866 // ISO 14755 support
867 if (iso14755buf)
868 if (iso14755buf & ISO_14755_52)
869 {
870# if ISO_14755
871 scr_overlay_off ();
872# endif
873# if ISO_14755
874 // iso14755 part 5.2 handling: release time
875 // first: controls
876 if ((ev.state & ControlMask)
877 && ((keysym >= 0x40 && keysym <= 0x5f)
878 || (keysym >= 0x61 && keysym <= 0x7f)))
879 {
880 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
881 commit_iso14755 ();
882
883 return;
884 }
885
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
887 if (i[0] == keysym)
888 {
889 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 ();
891
892 return;
893 }
894
895 scr_bell ();
896# endif
897 iso14755buf = 0;
898
899 return;
900 }
901 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
902 {
903# if ISO_14755
904 scr_overlay_off ();
905# endif
906 if (iso14755buf & ISO_14755_51)
907 commit_iso14755 ();
908#if ISO_14755
909 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
910 {
911 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
912
913 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
914 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
915 }
916# endif
917 else
918 iso14755buf = 0;
919 }
920#endif
921
922 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
923 return;
924
925#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
926 if (!(ev.state & ControlMask))
927 slip_wheel_ev.stop ();
928 else if (keysym == XK_Control_L || keysym == XK_Control_R)
929 mouse_slip_wheel_speed = 0;
930#endif
931}
932
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 933#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 934unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 935rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 936{
930 unsigned int n, s; 937 unsigned int n, s;
931 938
… …
959void 966void
960rxvt_term::flush () 967rxvt_term::flush ()
961{ 968{
962 flush_ev.stop (); 969 flush_ev.stop ();
963 970
964#ifdef TRANSPARENT 971#ifdef HAVE_BG_PIXMAP
965 if (want_full_refresh) 972 if (bgPixmap.check_clearChanged ())
966 { 973 {
967 want_full_refresh = 0; 974// scr_clear (true); This needs to be researched further!
968 scr_clear ();
969 scr_touch (false); 975 scr_touch (false);
970 } 976 }
971#endif 977#endif
972 978
973 if (want_refresh) 979 if (want_refresh)
974 { 980 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 981 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 982 {
977 int row = -view_start; 983 int row = view_start;
978 int end_row = row + nrow; 984 int end_row = row + nrow;
979 985
980 while (row > -nsaved && ROW (row - 1).is_longer ()) 986 while (row > top_row && ROW (row - 1).is_longer ())
981 --row; 987 --row;
982 988
983 do 989 do
984 { 990 {
985 int start_row = row; 991 int start_row = row;
… …
1008 while (l->is_longer () && row < end_row); 1014 while (l->is_longer () && row < end_row);
1009 } 1015 }
1010 while (row < end_row); 1016 while (row < end_row);
1011 } 1017 }
1012 1018
1013 scr_refresh (refresh_type); 1019 scr_refresh ();
1014 scrollbar_show (1); 1020 scrollBar.show (1);
1015#ifdef USE_XIM 1021#ifdef USE_XIM
1016 IMSendSpot (); 1022 IMSendSpot ();
1017#endif 1023#endif
1018 } 1024 }
1019 1025
1020 display->flush (); 1026 display->flush ();
1021} 1027}
1022 1028
1029/* checks wether a refresh is requested and starts the refresh timer */
1023void 1030void
1024rxvt_term::check_cb (check_watcher &w) 1031rxvt_term::refresh_check ()
1025{ 1032{
1026 SET_R (this); 1033 if (want_refresh && !flush_ev.is_active ())
1027 SET_LOCALE (locale); 1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1028 1035
1029 display->flush (); 1036 display->flush ();
1030
1031 if (want_refresh && !flush_ev.active)
1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1033} 1037}
1034 1038
1035void 1039void
1036rxvt_term::flush_cb (time_watcher &w) 1040rxvt_term::flush_cb (ev::timer &w, int revents)
1037{ 1041{
1038 SET_R (this); 1042 make_current ();
1039 SET_LOCALE (locale);
1040 1043
1041 refresh_limit = 1;
1042 refresh_count = 0; 1044 refresh_count = 0;
1043 flush (); 1045 flush ();
1044} 1046}
1045 1047
1046#ifdef CURSOR_BLINK 1048#ifdef CURSOR_BLINK
1047void 1049void
1048rxvt_term::cursor_blink_cb (time_watcher &w) 1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1049{ 1051{
1050 hidden_cursor = !hidden_cursor; 1052 hidden_cursor = !hidden_cursor;
1051 want_refresh = 1; 1053 want_refresh = 1;
1052 1054 refresh_check ();
1053 w.start (w.at + BLINK_INTERVAL);
1054} 1055}
1055#endif 1056#endif
1056 1057
1057#ifdef TEXT_BLINK 1058#ifdef TEXT_BLINK
1058void 1059void
1059rxvt_term::text_blink_cb (time_watcher &w) 1060rxvt_term::text_blink_cb (ev::timer &w, int revents)
1060{ 1061{
1061 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1062 if (scr_refresh_rend (RS_Blink, RS_Blink))
1062 { 1063 {
1063 hidden_text = !hidden_text; 1064 hidden_text = !hidden_text;
1064 want_refresh = 1; 1065 want_refresh = 1;
1065 w.start (w.at + TEXT_BLINK_INTERVAL); 1066 refresh_check ();
1066 } 1067 }
1068 else
1069 w.stop ();
1067} 1070}
1068#endif 1071#endif
1069 1072
1070#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1071void 1074void
1072rxvt_term::cont_scroll_cb (time_watcher &w) 1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1073{ 1076{
1074 if ((scrollbar_isUp() || scrollbar_isDn()) && 1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1075 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1076 { 1079 {
1077 refresh_type |= SMOOTH_REFRESH;
1078 want_refresh = 1; 1080 want_refresh = 1;
1079 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1081 refresh_check ();
1080 } 1082 }
1083 else
1084 w.stop ();
1081} 1085}
1082#endif 1086#endif
1083 1087
1084#ifdef SELECTION_SCROLLING 1088#ifdef SELECTION_SCROLLING
1085void 1089void
1086rxvt_term::sel_scroll_cb (time_watcher &w) 1090rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1087{ 1091{
1088 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1092 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089 { 1093 {
1090 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1094 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091 refresh_type |= SMOOTH_REFRESH;
1092 want_refresh = 1; 1095 want_refresh = 1;
1093 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1094 } 1097 }
1098 else
1099 w.stop ();
1095} 1100}
1096#endif 1101#endif
1097 1102
1098#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1099void 1104void
1100rxvt_term::slip_wheel_cb (time_watcher &w) 1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1101{ 1106{
1102 if (mouse_slip_wheel_speed == 0 1107 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1103 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1104 : scr_page (UP, mouse_slip_wheel_speed))
1105 { 1108 {
1106 if (view_start == nsaved ||
1107 view_start == 0)
1108 mouse_slip_wheel_speed = 0;
1109
1110 refresh_type |= SMOOTH_REFRESH;
1111 want_refresh = 1; 1109 want_refresh = 1;
1112 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)
1113 } 1114 {
1115 mouse_slip_wheel_speed = 0;
1116 w.stop ();
1117 }
1114} 1118}
1115#endif 1119#endif
1116 1120
1117#if HAVE_SCHED_YIELD 1121#if LINUX_YIELD_HACK
1118static struct event_handler 1122static struct event_handler
1119{ 1123{
1120 check_watcher cw_yield; 1124 ev::prepare yield_ev;
1121 1125
1122 void yield (check_watcher &w) 1126 void yield_cb (ev::prepare &w, int revents)
1123 { 1127 {
1124 sched_yield (); 1128 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS.
1132 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best.
1135
1136 struct timespec ts = { 0, 1000 };
1137 nanosleep (&ts, 0);
1138
1125 w.stop (); 1139 w.stop ();
1126 } 1140 }
1127 1141
1128 event_handler () 1142 event_handler ()
1129 : cw_yield (this, &event_handler::yield) 1143 : yield_ev (this, &event_handler::yield_cb)
1130 { 1144 {
1131 } 1145 }
1132} event_handler; 1146} event_handler;
1133#endif 1147#endif
1134 1148
… …
1145 1159
1146 memmove (cmdbuf_base, cmdbuf_ptr, n); 1160 memmove (cmdbuf_base, cmdbuf_ptr, n);
1147 cmdbuf_ptr = cmdbuf_base; 1161 cmdbuf_ptr = cmdbuf_base;
1148 cmdbuf_endp = cmdbuf_ptr + n; 1162 cmdbuf_endp = cmdbuf_ptr + n;
1149 1163
1150 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1164 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1151 1165
1152 if (r > 0) 1166 if (r > 0)
1153 { 1167 {
1154 cmdbuf_endp += r; 1168 cmdbuf_endp += r;
1155 return true; 1169 return true;
1156 } 1170 }
1157 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1171 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1158 { 1172 {
1159#if HAVE_SCHED_YIELD 1173#if LINUX_YIELD_HACK
1160 if (display->is_local) 1174 if (display->is_local)
1161 event_handler.cw_yield.start (); 1175 event_handler.yield_ev.start ();
1162#endif 1176#endif
1163 } 1177 }
1164 else 1178 else
1165 { 1179 {
1166 pty_ev.stop (); 1180 pty_ev.stop ();
1167 1181
1168 if (!OPTION (Opt_hold)) 1182 if (!option (Opt_hold))
1169 destroy (); 1183 destroy ();
1170 } 1184 }
1171 1185
1172 return false; 1186 return false;
1173} 1187}
1174 1188
1175void 1189void
1176rxvt_term::pty_cb (io_watcher &w, short revents) 1190rxvt_term::pty_cb (ev::io &w, int revents)
1177{ 1191{
1178 SET_R (this); 1192 make_current ();
1179 SET_LOCALE (locale);
1180 1193
1181 if (revents & EVENT_READ) 1194 if (revents & ev::READ)
1182 // loop, but don't allow a single term to monopolize us 1195 // loop, but don't allow a single term to monopolize us
1183 while (pty_fill ()) 1196 for (int i = CBUFCNT; i-- && pty_fill (); )
1184 if (cmd_parse ()) 1197 cmd_parse ();
1185 break;
1186 1198
1187 if (revents & EVENT_WRITE) 1199 if (revents & ev::WRITE)
1188 pty_write (); 1200 pty_write ();
1201
1202 refresh_check ();
1189} 1203}
1190 1204
1191void 1205void
1192rxvt_term::pointer_unblank () 1206rxvt_term::pointer_unblank ()
1193{ 1207{
1194 XDefineCursor (display->display, vt, TermWin_cursor); 1208 XDefineCursor (dpy, vt, TermWin_cursor);
1195 recolour_cursor (); 1209 recolour_cursor ();
1196 1210
1197#ifdef POINTER_BLANK 1211#ifdef POINTER_BLANK
1198 hidden_pointer = 0; 1212 hidden_pointer = 0;
1199 1213
1200 if (OPTION (Opt_pointerBlank)) 1214 if (option (Opt_pointerBlank))
1201 pointer_ev.start (NOW + pointerBlankDelay); 1215 pointer_ev.start (pointerBlankDelay);
1202#endif 1216#endif
1203} 1217}
1204 1218
1205#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1206void 1220void
1207rxvt_term::pointer_blank () 1221rxvt_term::pointer_blank ()
1208{ 1222{
1209 if (!OPTION (Opt_pointerBlank)) 1223 if (!option (Opt_pointerBlank))
1210 return; 1224 return;
1211 1225
1212 XDefineCursor (display->display, vt, display->blank_cursor); 1226 XDefineCursor (dpy, vt, display->blank_cursor);
1213 XFlush (display->display); 1227 XFlush (dpy);
1214 1228
1215 hidden_pointer = 1; 1229 hidden_pointer = 1;
1216} 1230}
1217 1231
1218void 1232void
1219rxvt_term::pointer_cb (time_watcher &w) 1233rxvt_term::pointer_cb (ev::timer &w, int revents)
1220{ 1234{
1221 SET_R (this); 1235 make_current ();
1222 SET_LOCALE (locale);
1223 1236
1224 pointer_blank (); 1237 pointer_blank ();
1225} 1238}
1226#endif 1239#endif
1227 1240
1228void 1241void
1229rxvt_term::mouse_report (XButtonEvent &ev) 1242rxvt_term::mouse_report (XButtonEvent &ev)
1230{ 1243{
1231 int button_number, key_state = 0; 1244 int button_number, key_state = 0;
1232 int x, y; 1245 int x, y;
1246 int code = 32;
1233 1247
1234 x = ev.x; 1248 x = Pixel2Col (ev.x);
1235 y = ev.y; 1249 y = Pixel2Row (ev.y);
1236 pixel_position (&x, &y); 1250 if (ev.type == MotionNotify)
1251 {
1252 if (x == mouse_row && y == mouse_col)
1253 return;
1254 mouse_row = x;
1255 mouse_col = y;
1256 code += 32;
1257 }
1237 1258
1238 if (MEvent.button == AnyButton) 1259 if (MEvent.button == AnyButton)
1239 button_number = 3; 1260 button_number = 3;
1240 else 1261 else
1241 { 1262 {
… …
1287 x + 1, 1308 x + 1,
1288 y + 1); 1309 y + 1);
1289#endif 1310#endif
1290 1311
1291 tt_printf ("\033[M%c%c%c", 1312 tt_printf ("\033[M%c%c%c",
1292 (32 + button_number + key_state), 1313 (code + button_number + key_state),
1293 (32 + x + 1), 1314 (32 + x + 1),
1294 (32 + y + 1)); 1315 (32 + y + 1));
1295} 1316}
1296 1317
1297#ifdef USING_W11LIB
1298void
1299rxvt_W11_process_x_event (XEvent *ev)
1300{
1301 rxvt_t *r = rxvt_get_r ();
1302
1303 x_cb (*ev);
1304}
1305#endif
1306
1307/*{{{ process an X event */ 1318/*{{{ process an X event */
1308void 1319void
1309rxvt_term::x_cb (XEvent &ev) 1320rxvt_term::x_cb (XEvent &ev)
1310{ 1321{
1311 dDisp; 1322 make_current ();
1312 1323
1313 SET_R (this); 1324 dLocal (Display *, dpy);
1314 SET_LOCALE (locale);
1315 1325
1316 if (ev.xany.window == vt 1326 if (ev.xany.window == vt
1327 && SHOULD_INVOKE (HOOK_X_EVENT)
1317 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1328 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1318 return; 1329 return;
1319 1330
1320 // for XQueryPointer 1331 // for XQueryPointer
1321 Window unused_root, unused_child; 1332 Window unused_root, unused_child;
… …
1323 unsigned int unused_mask; 1334 unsigned int unused_mask;
1324 1335
1325 switch (ev.type) 1336 switch (ev.type)
1326 { 1337 {
1327 case KeyPress: 1338 case KeyPress:
1328#if ISO_14755 1339 key_press (ev.xkey);
1329 if (!(iso14755buf & ISO_14755_52))
1330#endif
1331 lookup_key (ev.xkey);
1332
1333 break; 1340 break;
1334 1341
1335 case KeyRelease: 1342 case KeyRelease:
1336 { 1343 key_release (ev.xkey);
1337#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1338 KeySym keysym;
1339
1340 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1341#endif
1342
1343#if ENABLE_FRILLS || ISO_14755
1344 // ISO 14755 support
1345 if (iso14755buf)
1346 if (iso14755buf & ISO_14755_52)
1347 {
1348# if ENABLE_OVERLAY
1349 scr_overlay_off ();
1350# endif
1351# if ISO_14755
1352 // iso14755 part 5.2 handling: release time
1353 // first: controls
1354 if ((ev.xkey.state & ControlMask)
1355 && ((keysym >= 0x40 && keysym <= 0x5f)
1356 || (keysym >= 0x61 && keysym <= 0x7f)))
1357 {
1358 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1359 commit_iso14755 ();
1360 goto skip_switch;
1361 }
1362
1363 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1364 if (i[0] == keysym)
1365 {
1366 iso14755buf = ISO_14755_51 | i[1];
1367 commit_iso14755 ();
1368 goto skip_switch;
1369 }
1370
1371 scr_bell ();
1372# endif
1373 iso14755buf = 0;
1374 break;
1375 }
1376 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1377 {
1378# if ENABLE_OVERLAY
1379 scr_overlay_off ();
1380# endif
1381 if (iso14755buf & ISO_14755_51)
1382 commit_iso14755 ();
1383#if ISO_14755
1384 else if (iso14755buf & ISO_14755_STARTED)
1385 {
1386 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1387
1388 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1389 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1390 }
1391# endif
1392 else
1393 iso14755buf = 0;
1394 }
1395#endif
1396
1397 if (ev.xany.window == vt
1398 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1399 break;
1400
1401#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1402 if (!(ev.xkey.state & ControlMask))
1403 slip_wheel_ev.stop ();
1404 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1405 mouse_slip_wheel_speed = 0;
1406#endif
1407 break; 1344 break;
1408 }
1409 1345
1410 case ButtonPress: 1346 case ButtonPress:
1411 button_press (ev.xbutton); 1347 button_press (ev.xbutton);
1412 break; 1348 break;
1413 1349
… …
1415 button_release (ev.xbutton); 1351 button_release (ev.xbutton);
1416 break; 1352 break;
1417 1353
1418 case ClientMessage: 1354 case ClientMessage:
1419 if (ev.xclient.format == 32 1355 if (ev.xclient.format == 32
1420 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1356 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1421 { 1357 {
1358 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1359 {
1360 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1361 {
1422 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1362 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1363 {
1364 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1423 destroy (); 1365 destroy ();
1366 }
1424#if ENABLE_EWMH 1367#if ENABLE_EWMH
1425 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1368 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1426 XSendEvent (disp, ev.xclient.window = display->root, 1369 XSendEvent (dpy, ev.xclient.window = display->root,
1427 False, SubstructureRedirectMask | SubstructureNotifyMask, 1370 False, SubstructureRedirectMask | SubstructureNotifyMask,
1428 &ev); 1371 &ev);
1372#endif
1373 }
1374 }
1375#if ENABLE_XEMBED
1376 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1377 {
1378 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1379 focus_in ();
1380 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1381 focus_out ();
1382 }
1429#endif 1383#endif
1430 } 1384 }
1431#if ENABLE_XEMBED
1432 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1433 {
1434 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1435 focus_in ();
1436 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1437 focus_out ();
1438 }
1439#endif
1440#ifdef OFFIX_DND
1441 /* OffiX Dnd (drag 'n' drop) protocol */
1442 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1443 && (ev.xclient.data.l[0] == DndFile
1444 || ev.xclient.data.l[0] == DndDir
1445 || ev.xclient.data.l[0] == DndLink))
1446 {
1447 /* Get Dnd data */
1448 Atom ActualType;
1449 int ActualFormat;
1450 unsigned char *data;
1451 unsigned long Size, RemainingBytes;
1452
1453 XGetWindowProperty (disp, display->root,
1454 xa[XA_DNDSELECTION],
1455 0L, 1000000L,
1456 False, AnyPropertyType,
1457 &ActualType, &ActualFormat,
1458 &Size, &RemainingBytes,
1459 &data);
1460 set_string_property (XA_CUT_BUFFER0, data);
1461 XFree (data);
1462 selection_paste (display->root, XA_CUT_BUFFER0, true);
1463 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1464 }
1465#endif /* OFFIX_DND */
1466 break;
1467
1468 case MappingNotify:
1469 XRefreshKeyboardMapping (&ev.xmapping);
1470 break; 1385 break;
1471 1386
1472 /* 1387 /*
1473 * XXX: this is not the _current_ arrangement 1388 * XXX: this is not the _current_ arrangement
1474 * Here's my conclusion: 1389 * Here's my conclusion:
… …
1493 break; 1408 break;
1494 } 1409 }
1495 break; 1410 break;
1496 1411
1497 case FocusIn: 1412 case FocusIn:
1413 if (ev.xfocus.detail != NotifyInferior
1414 && ev.xfocus.detail != NotifyPointer
1415 && ev.xfocus.mode != NotifyGrab)
1498 focus_in (); 1416 focus_in ();
1499 break; 1417 break;
1500 1418
1501 case FocusOut: 1419 case FocusOut:
1420 if (ev.xfocus.detail != NotifyInferior
1421 && ev.xfocus.detail != NotifyPointer
1422 && ev.xfocus.mode != NotifyGrab)
1502 focus_out (); 1423 focus_out ();
1503 break; 1424 break;
1504 1425
1505 case ConfigureNotify: 1426 case ConfigureNotify:
1427 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1428 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1429 szHint.width, szHint.height);*/
1506 if (ev.xconfigure.window == parent[0]) 1430 if (ev.xconfigure.window == parent[0])
1507 { 1431 {
1508 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1432 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1509 ; 1433 ;
1510 1434
1511 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1435 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1512 { 1436 {
1513 seen_resize = 1; 1437 seen_resize = 1;
1514 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1438 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1515 } 1439 }
1516 1440 else
1517#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1441 {
1518 if (OPTION (Opt_transparent)) 1442#ifdef HAVE_BG_PIXMAP
1519 check_our_parents (); 1443 if (bgPixmap.window_position_sensitive ())
1444 {
1445 if (mapped)
1446 update_background ();
1447 else
1448 bgPixmap.invalidate ();
1449 }
1520#endif 1450#endif
1451 }
1452
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1521 } 1454 }
1522 break; 1455 break;
1523 1456
1524 case PropertyNotify: 1457 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1525 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1526 && ev.xproperty.state == PropertyNewValue) 1460 && ev.xproperty.state == PropertyNewValue)
1527 selection_property (ev.xproperty.window, ev.xproperty.atom); 1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1528 1462
1529 break; 1463 break;
1530 1464
1531 case SelectionClear: 1465 case SelectionClear:
1532 selection_clear (); 1466 selection_clear ();
… …
1540 case SelectionRequest: 1474 case SelectionRequest:
1541 selection_send (ev.xselectionrequest); 1475 selection_send (ev.xselectionrequest);
1542 break; 1476 break;
1543 1477
1544 case MapNotify: 1478 case MapNotify:
1479#ifdef HAVE_BG_PIXMAP
1480 /* This is needed spcifically to fix the case of no window manager or a
1481 * non-reparenting window manager. In those cases we never get first
1482 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1483 * care of multiplicity of ConfigureNotify events arriwing while WM does
1484 * reparenting.
1485 * We should not render background immidiately, as there could be several
1486 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1487 * by scheduling background redraw as soon as we can, but giving a short
1488 * bit of time for ConfigureNotifies to arrive.
1489 * We should render background PRIOR to drawing any text, but AFTER all
1490 * of ConfigureNotifys for the best results.
1491 */
1492 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1493 update_background_ev.start (0.025);
1494#endif
1545 mapped = 1; 1495 mapped = 1;
1546#ifdef TEXT_BLINK 1496#ifdef TEXT_BLINK
1547 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1497 text_blink_ev.start ();
1548#endif 1498#endif
1549 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1499 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1550 break; 1500 break;
1551 1501
1552 case UnmapNotify: 1502 case UnmapNotify:
… …
1554#ifdef TEXT_BLINK 1504#ifdef TEXT_BLINK
1555 text_blink_ev.stop (); 1505 text_blink_ev.stop ();
1556#endif 1506#endif
1557 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1507 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1558 break; 1508 break;
1559
1560#ifdef TRANSPARENT
1561 case ReparentNotify:
1562 rootwin_cb (ev);
1563 break;
1564#endif /* TRANSPARENT */
1565 1509
1566 case GraphicsExpose: 1510 case GraphicsExpose:
1567 case Expose: 1511 case Expose:
1568 if (ev.xany.window == vt) 1512 if (ev.xany.window == vt)
1569 { 1513 {
1570 do 1514 do
1515 {
1571 scr_expose (ev.xexpose.x, ev.xexpose.y, 1516 scr_expose (ev.xexpose.x, ev.xexpose.y,
1572 ev.xexpose.width, ev.xexpose.height, False); 1517 ev.xexpose.width, ev.xexpose.height, False);
1518 }
1573 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1519 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1574 1520
1575 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1576 1522
1577 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1523 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1524 {
1578 scr_expose (ev.xexpose.x, ev.xexpose.y, 1525 scr_expose (ev.xexpose.x, ev.xexpose.y,
1579 ev.xexpose.width, ev.xexpose.height, False); 1526 ev.xexpose.width, ev.xexpose.height, False);
1527 }
1580 1528
1581 want_refresh = 1; 1529 want_refresh = 1;
1582 } 1530 }
1583 else 1531 else
1584 { 1532 {
1585 XEvent unused_event; 1533 XEvent unused_event;
1586 1534
1587 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1588 ; 1536 ;
1589 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1537 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1590 ; 1538 ;
1591 1539
1592 if (isScrollbarWindow (ev.xany.window)) 1540 if (scrollBar.state && ev.xany.window == scrollBar.win)
1593 { 1541 {
1594 scrollBar.setIdle (); 1542 scrollBar.state = STATE_IDLE;
1595 scrollbar_show (0); 1543 scrollBar.show (0);
1596 } 1544 }
1597#ifdef MENUBAR
1598 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1599 menubar_expose ();
1600#endif
1601
1602#ifdef TRANSPARENT
1603 if (am_transparent && ev.xany.window == parent[0])
1604 XClearWindow (disp, ev.xany.window);
1605#endif
1606 } 1545 }
1607 break; 1546 break;
1608 1547
1609 case MotionNotify: 1548 case MotionNotify:
1610#ifdef POINTER_BLANK 1549#ifdef POINTER_BLANK
1611 if (hidden_pointer) 1550 if (hidden_pointer)
1612 pointer_unblank (); 1551 pointer_unblank ();
1613#endif 1552#endif
1614#if MENUBAR 1553 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1615 if (isMenuBarWindow (ev.xany.window)) 1554 || priv_modes & PrivMode_MouseAnyEvent)
1616 {
1617 menubar_control (ev.xbutton); 1555 mouse_report (ev.xbutton);
1618 break;
1619 }
1620#endif
1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1556 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1622 break; 1557 break;
1623 1558
1624 if (ev.xany.window == vt) 1559 if (ev.xany.window == vt)
1625 { 1560 {
1561 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1626 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1562 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1627 ; // nop 1563 ; // nop
1628 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1564 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1629 { 1565 {
1630 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1566 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1631 ; 1567 ;
1632 1568
1633 XQueryPointer (disp, vt, 1569 XQueryPointer (dpy, vt,
1634 &unused_root, &unused_child, 1570 &unused_root, &unused_child,
1635 &unused_root_x, &unused_root_y, 1571 &unused_root_x, &unused_root_y,
1636 &ev.xbutton.x, &ev.xbutton.y, 1572 &ev.xbutton.x, &ev.xbutton.y,
1637 &ev.xbutton.state); 1573 &ev.xbutton.state);
1638#ifdef MOUSE_THRESHOLD 1574#ifdef MOUSE_THRESHOLD
… …
1658 int dist; 1594 int dist;
1659 1595
1660 /* don't clobber the current delay if we are 1596 /* don't clobber the current delay if we are
1661 * already in the middle of scrolling. 1597 * already in the middle of scrolling.
1662 */ 1598 */
1663 if (!sel_scroll_ev.active) 1599 if (!sel_scroll_ev.is_active ())
1664 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1600 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1665 1601
1666 /* save the event params so we can highlight 1602 /* save the event params so we can highlight
1667 * the selection in the pending-scroll loop 1603 * the selection in the pending-scroll loop
1668 */ 1604 */
1669 selection_save_x = ev.xbutton.x; 1605 selection_save_x = ev.xbutton.x;
… …
1691 else 1627 else
1692 { 1628 {
1693 /* we are within the text window, so we 1629 /* we are within the text window, so we
1694 * shouldn't be scrolling 1630 * shouldn't be scrolling
1695 */ 1631 */
1696 if (sel_scroll_ev.active)
1697 sel_scroll_ev.stop(); 1632 sel_scroll_ev.stop();
1698 } 1633 }
1699#endif 1634#endif
1700#ifdef MOUSE_THRESHOLD 1635#ifdef MOUSE_THRESHOLD
1701 } 1636 }
1702#endif 1637#endif
1703 } 1638 }
1704 } 1639 }
1705 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1640 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1706 { 1641 {
1707 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1642 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1708 MotionNotify, &ev)) 1643 MotionNotify, &ev))
1709 ; 1644 ;
1710 1645
1711 XQueryPointer (disp, scrollBar.win, 1646 XQueryPointer (dpy, scrollBar.win,
1712 &unused_root, &unused_child, 1647 &unused_root, &unused_child,
1713 &unused_root_x, &unused_root_y, 1648 &unused_root_x, &unused_root_y,
1714 &ev.xbutton.x, &ev.xbutton.y, 1649 &ev.xbutton.x, &ev.xbutton.y,
1715 &unused_mask); 1650 &unused_mask);
1716 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1651 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1717 scrollbar_size ()); 1652 scrollBar.size ());
1718 want_refresh = 1; 1653 want_refresh = 1;
1719 refresh_limit = 0;
1720 scrollbar_show (1); 1654 scrollBar.show (1);
1721 } 1655 }
1722 break; 1656 break;
1723 } 1657 }
1724 1658
1725skip_switch: ;
1726
1727#if defined(CURSOR_BLINK) 1659#if defined(CURSOR_BLINK)
1728 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1660 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1729 { 1661 {
1730 if (hidden_cursor) 1662 if (hidden_cursor)
1731 { 1663 {
1732 hidden_cursor = 0; 1664 hidden_cursor = 0;
1733 want_refresh = 1; 1665 want_refresh = 1;
1734 } 1666 }
1735 1667
1736 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1668 cursor_blink_ev.again ();
1737 } 1669 }
1738#endif 1670#endif
1739 1671
1740#if defined(POINTER_BLANK) 1672#if defined(POINTER_BLANK)
1741 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1673 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1742 { 1674 {
1743 if (ev.type == MotionNotify 1675 if (ev.type == MotionNotify
1744 || ev.type == ButtonPress 1676 || ev.type == ButtonPress
1745 || ev.type == ButtonRelease) 1677 || ev.type == ButtonRelease)
1746 if (hidden_pointer) 1678 if (hidden_pointer)
… …
1748 1680
1749 if (ev.type == KeyPress && hidden_pointer == 0) 1681 if (ev.type == KeyPress && hidden_pointer == 0)
1750 pointer_blank (); 1682 pointer_blank ();
1751 } 1683 }
1752#endif 1684#endif
1685
1686 refresh_check ();
1687}
1688
1689void
1690rxvt_term::set_urgency (bool enable)
1691{
1692 if (enable == urgency_hint)
1693 return;
1694
1695 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1696 {
1697 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1698 XSetWMHints (dpy, parent[0], h);
1699 urgency_hint = enable;
1700 }
1753} 1701}
1754 1702
1755void 1703void
1756rxvt_term::focus_in () 1704rxvt_term::focus_in ()
1757{ 1705{
1758 if (!focus) 1706 if (!focus)
1759 { 1707 {
1760 focus = 1; 1708 focus = 1;
1761 want_refresh = 1; 1709 want_refresh = 1;
1762 1710
1763 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764
1765#if USE_XIM 1711#if USE_XIM
1766 if (Input_Context != NULL) 1712 if (Input_Context != NULL)
1767 { 1713 {
1768 IMSetStatusPosition (); 1714 IMSetPosition ();
1769 XSetICFocus (Input_Context); 1715 XSetICFocus (Input_Context);
1770 } 1716 }
1771#endif 1717#endif
1772#if CURSOR_BLINK 1718#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink)) 1719 if (option (Opt_cursorBlink))
1774 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1720 cursor_blink_ev.again ();
1775#endif 1721#endif
1776#if OFF_FOCUS_FADING 1722#if OFF_FOCUS_FADING
1777 if (rs[Rs_fade]) 1723 if (rs[Rs_fade])
1778 { 1724 {
1779 pix_colors = pix_colors_focused; 1725 pix_colors = pix_colors_focused;
1780 scr_recolour (); 1726 scr_recolour ();
1781 } 1727 }
1782#endif 1728#endif
1729#if ENABLE_FRILLS
1730 if (option (Opt_urgentOnBell))
1731 set_urgency (0);
1732#endif
1733
1734 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1783 } 1735 }
1784} 1736}
1785 1737
1786void 1738void
1787rxvt_term::focus_out () 1739rxvt_term::focus_out ()
… …
1789 if (focus) 1741 if (focus)
1790 { 1742 {
1791 focus = 0; 1743 focus = 0;
1792 want_refresh = 1; 1744 want_refresh = 1;
1793 1745
1794 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1746#if ENABLE_FRILLS
1795 1747 if (option (Opt_urgentOnBell))
1748 set_urgency (0);
1749#endif
1796#if ENABLE_FRILLS || ISO_14755 1750#if ENABLE_FRILLS || ISO_14755
1797 if (iso14755buf) 1751 if (iso14755buf)
1798 { 1752 {
1799 iso14755buf = 0; 1753 iso14755buf = 0;
1800# if ENABLE_OVERLAY 1754# if ISO_14755
1801 scr_overlay_off (); 1755 scr_overlay_off ();
1802# endif 1756# endif
1803 } 1757 }
1804#endif 1758#endif
1805#if USE_XIM 1759#if USE_XIM
1806 if (Input_Context != NULL) 1760 if (Input_Context != NULL)
1807 XUnsetICFocus (Input_Context); 1761 XUnsetICFocus (Input_Context);
1808#endif 1762#endif
1809#if CURSOR_BLINK 1763#if CURSOR_BLINK
1810 if (OPTION (Opt_cursorBlink)) 1764 if (option (Opt_cursorBlink))
1811 cursor_blink_ev.stop (); 1765 cursor_blink_ev.stop ();
1766
1812 hidden_cursor = 0; 1767 hidden_cursor = 0;
1813#endif 1768#endif
1814#if OFF_FOCUS_FADING 1769#if OFF_FOCUS_FADING
1815 if (rs[Rs_fade]) 1770 if (rs[Rs_fade])
1816 { 1771 {
1817 pix_colors = pix_colors_unfocused; 1772 pix_colors = pix_colors_unfocused;
1818 scr_recolour (); 1773 scr_recolour ();
1819 } 1774 }
1820#endif 1775#endif
1776
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1778 }
1779}
1780
1781void
1782rxvt_term::update_fade_color (unsigned int idx)
1783{
1784#if OFF_FOCUS_FADING
1785 if (rs[Rs_fade])
1821 } 1786 {
1787 rgba c;
1788 pix_colors [Color_fade].get (c);
1789 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1790 }
1791#endif
1822} 1792}
1823 1793
1824#if TRANSPARENT 1794#if ENABLE_TRANSPARENCY || ENABLE_PERL
1825void 1795void
1826rxvt_term::rootwin_cb (XEvent &ev) 1796rxvt_term::rootwin_cb (XEvent &ev)
1827{ 1797{
1828 SET_R (this); 1798 make_current ();
1829 SET_LOCALE (locale);
1830 1799
1800 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1801 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1802 return;
1803
1804# if ENABLE_TRANSPARENCY
1831 switch (ev.type) 1805 switch (ev.type)
1832 { 1806 {
1833 case PropertyNotify: 1807 case PropertyNotify:
1834 /* 1808 /*
1835 * if user used some Esetroot compatible prog to set the root bg, 1809 * if user used some Esetroot compatible prog to set the root bg,
1836 * use the property to determine the pixmap. We use it later on. 1810 * use the property to determine the pixmap. We use it later on.
1837 */ 1811 */
1838 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1812 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1813 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1840 return; 1814 {
1815 bgPixmap.set_root_pixmap ();
1816 update_background ();
1817 }
1841 1818
1842 /* FALLTHROUGH */
1843 case ReparentNotify:
1844 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1845 want_refresh = want_full_refresh = 1;
1846 break; 1819 break;
1847 } 1820 }
1821# endif
1822
1823 refresh_check ();
1848} 1824}
1849#endif 1825#endif
1850 1826
1851void 1827void
1852rxvt_term::button_press (XButtonEvent &ev) 1828rxvt_term::button_press (XButtonEvent &ev)
… …
1861 /* 1837 /*
1862 * VT window processing of button press 1838 * VT window processing of button press
1863 */ 1839 */
1864 if (ev.window == vt) 1840 if (ev.window == vt)
1865 { 1841 {
1842 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1843 return;
1844
1866#if ISO_14755 1845#if ISO_14755
1867 // 5.4 1846 // 5.4
1868 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1847 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1869 { 1848 {
1870 iso14755_54 (ev.x, ev.y); 1849 iso14755_54 (ev.x, ev.y);
… …
1904 mouse_report (ev); 1883 mouse_report (ev);
1905 } 1884 }
1906#else 1885#else
1907 MEvent.button = ev.button; 1886 MEvent.button = ev.button;
1908 mouse_report (ev); 1887 mouse_report (ev);
1909#endif /* MOUSE_REPORT_DOUBLECLICK */ 1888#endif /* MOUSE_REPORT_DOUBLECLICK */
1910 1889
1911 } 1890 }
1912 else 1891 else
1913 { 1892 {
1914 if (ev.button != MEvent.button) 1893 if (ev.button != MEvent.button)
1915 MEvent.clicks = 0; 1894 MEvent.clicks = 0;
1916 1895
1917 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1918 switch (ev.button) 1896 switch (ev.button)
1919 { 1897 {
1920 case Button1: 1898 case Button1:
1921 /* allow meta + click to select rectangular areas */ 1899 /* allow meta + click to select rectangular areas */
1922 /* should be done in screen.C */ 1900 /* should be done in screen.C */
1923#if ENABLE_FRILLS 1901#if ENABLE_FRILLS
1924 selection.rect = !!(ev.state & ModMetaMask); 1902 selection.rect = !!(ev.state & ModMetaMask);
1925#else 1903#else
1926 selection.rect = false; 1904 selection.rect = false;
1927#endif 1905#endif
1928 1906
1929 /* allow shift+left click to extend selection */ 1907 /* allow shift+left click to extend selection */
1930 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1931 { 1909 {
1932 if (MEvent.button == Button1 && clickintime) 1910 if (MEvent.button == Button1 && clickintime)
1933 selection_rotate (ev.x, ev.y); 1911 selection_rotate (ev.x, ev.y);
1934 else 1912 else
1935 selection_extend (ev.x, ev.y, 1); 1913 selection_extend (ev.x, ev.y, 1);
1936 } 1914 }
1937 else 1915 else
1938 { 1916 {
1939 if (MEvent.button == Button1 && clickintime) 1917 if (MEvent.button == Button1 && clickintime)
1940 MEvent.clicks++; 1918 MEvent.clicks++;
1941 else 1919 else
1942 MEvent.clicks = 1; 1920 MEvent.clicks = 1;
1943 1921
1944 selection_click (MEvent.clicks, ev.x, ev.y); 1922 selection_click (MEvent.clicks, ev.x, ev.y);
1945 } 1923 }
1946 1924
1947 MEvent.button = Button1; 1925 MEvent.button = Button1;
1948 break; 1926 break;
1949 1927
1950 case Button3: 1928 case Button3:
1951 if (MEvent.button == Button3 && clickintime) 1929 if (MEvent.button == Button3 && clickintime)
1952 selection_rotate (ev.x, ev.y); 1930 selection_rotate (ev.x, ev.y);
1953 else 1931 else
1954 selection_extend (ev.x, ev.y, 1); 1932 selection_extend (ev.x, ev.y, 1);
1955 1933
1956 MEvent.button = Button3; 1934 MEvent.button = Button3;
1957 break; 1935 break;
1958 } 1936 }
1959 } 1937 }
1960 1938
1961 MEvent.time = ev.time; 1939 MEvent.time = ev.time;
1962 return; 1940 return;
1963 } 1941 }
1964 1942
1965 /* 1943 /*
1966 * Scrollbar window processing of button press 1944 * Scrollbar window processing of button press
1967 */ 1945 */
1968 if (isScrollbarWindow (ev.window)) 1946 if (scrollBar.state && ev.window == scrollBar.win)
1969 { 1947 {
1970 scrollBar.setIdle (); 1948 page_dirn direction = NO_DIR;
1949
1950 if (scrollBar.upButton (ev.y))
1951 direction = UP; /* up */
1952 else if (scrollBar.dnButton (ev.y))
1953 direction = DN; /* down */
1954
1955 scrollBar.state = STATE_IDLE;
1971 /* 1956 /*
1972 * Rxvt-style scrollbar: 1957 * Rxvt-style scrollbar:
1973 * move up if mouse is above slider 1958 * move up if mouse is above slider
1974 * move dn if mouse is below slider 1959 * move dn if mouse is below slider
1975 * 1960 *
… …
1984 /* 1969 /*
1985 * Mouse report disabled scrollbar: 1970 * Mouse report disabled scrollbar:
1986 * arrow buttons - send up/down 1971 * arrow buttons - send up/down
1987 * click on scrollbar - send pageup/down 1972 * click on scrollbar - send pageup/down
1988 */ 1973 */
1989 if ((scrollBar.style == R_SB_NEXT 1974 if (direction == UP)
1990 && scrollbarnext_upButton (ev.y))
1991 || (scrollBar.style == R_SB_RXVT
1992 && scrollbarrxvt_upButton (ev.y)))
1993 tt_printf ("\033[A"); 1975 tt_printf ("\033[A");
1994 else if ((scrollBar.style == R_SB_NEXT 1976 else if (direction == DN)
1995 && scrollbarnext_dnButton (ev.y))
1996 || (scrollBar.style == R_SB_RXVT
1997 && scrollbarrxvt_dnButton (ev.y)))
1998 tt_printf ("\033[B"); 1977 tt_printf ("\033[B");
1999 else 1978 else
2000 switch (ev.button) 1979 switch (ev.button)
2001 { 1980 {
2002 case Button2: 1981 case Button2:
… …
2009 tt_printf ("\033[5~"); 1988 tt_printf ("\033[5~");
2010 break; 1989 break;
2011 } 1990 }
2012 } 1991 }
2013 else 1992 else
2014#endif /* NO_SCROLLBAR_REPORT */ 1993#endif /* NO_SCROLLBAR_REPORT */
2015
2016 {
2017 char upordown = 0;
2018
2019 if (scrollBar.style == R_SB_NEXT)
2020 { 1994 {
2021 if (scrollbarnext_upButton (ev.y)) 1995 if (direction != NO_DIR)
2022 upordown = -1; /* up */
2023 else if (scrollbarnext_dnButton (ev.y))
2024 upordown = 1; /* down */
2025 }
2026 else if (scrollBar.style == R_SB_RXVT)
2027 {
2028 if (scrollbarrxvt_upButton (ev.y))
2029 upordown = -1; /* up */
2030 else if (scrollbarrxvt_dnButton (ev.y))
2031 upordown = 1; /* down */
2032 }
2033 if (upordown)
2034 { 1996 {
2035#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1998 if (!cont_scroll_ev.is_active ())
2036 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1999 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2037#endif 2000#endif
2038 if (scr_page (upordown < 0 ? UP : DN, 1)) 2001 if (scr_page (direction, 1))
2039 { 2002 {
2040 if (upordown < 0) 2003 if (direction == UP)
2041 scrollBar.setUp (); 2004 scrollBar.state = STATE_UP;
2042 else 2005 else
2043 scrollBar.setDn (); 2006 scrollBar.state = STATE_DOWN;
2044 } 2007 }
2045 } 2008 }
2046 else 2009 else
2047 switch (ev.button) 2010 switch (ev.button)
2048 { 2011 {
2049 case Button2: 2012 case Button2:
2050 switch (scrollbar_align) 2013 switch (scrollBar.align)
2051 { 2014 {
2052 case R_SB_ALIGN_TOP: 2015 case R_SB_ALIGN_TOP:
2053 csrO = 0; 2016 csrO = 0;
2054 break; 2017 break;
2055 case R_SB_ALIGN_CENTRE: 2018 case R_SB_ALIGN_CENTRE:
… …
2061 } 2024 }
2062 2025
2063 if (scrollBar.style == R_SB_XTERM 2026 if (scrollBar.style == R_SB_XTERM
2064 || scrollbar_above_slider (ev.y) 2027 || scrollbar_above_slider (ev.y)
2065 || scrollbar_below_slider (ev.y)) 2028 || scrollbar_below_slider (ev.y))
2066 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2029 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2067 2030
2068 scrollBar.setMotion (); 2031 scrollBar.state = STATE_MOTION;
2069 break; 2032 break;
2070 2033
2071 case Button1: 2034 case Button1:
2072 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2035 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2073 csrO = ev.y - scrollBar.top; 2036 csrO = ev.y - scrollBar.top;
2074 /* FALLTHROUGH */ 2037 /* FALLTHROUGH */
2075 2038
2076 case Button3: 2039 case Button3:
2077 if (scrollBar.style != R_SB_XTERM) 2040 if (scrollBar.style != R_SB_XTERM)
… …
2087 scr_page (DN, nrow - 1); 2050 scr_page (DN, nrow - 1);
2088# else 2051# else
2089 scr_page (DN, nrow / 4); 2052 scr_page (DN, nrow / 4);
2090# endif 2053# endif
2091 else 2054 else
2092 scrollBar.setMotion (); 2055 scrollBar.state = STATE_MOTION;
2093 } 2056 }
2094 else 2057 else
2095 { 2058 {
2096 scr_page ((ev.button == Button1 ? DN : UP), 2059 scr_page ((ev.button == Button1 ? DN : UP),
2097 (nrow 2060 (nrow
2098 * scrollbar_position (ev.y) 2061 * scrollbar_position (ev.y)
2099 / scrollbar_size ())); 2062 / scrollBar.size ()));
2100 } 2063 }
2101 2064
2102 break; 2065 break;
2103 } 2066 }
2104 } 2067 }
2105 2068
2106 return; 2069 return;
2107 } 2070 }
2108
2109#if MENUBAR
2110 /*
2111 * Menubar window processing of button press
2112 */
2113 if (isMenuBarWindow (ev.window))
2114 menubar_control (ev);
2115#endif
2116} 2071}
2117 2072
2118void 2073void
2119rxvt_term::button_release (XButtonEvent &ev) 2074rxvt_term::button_release (XButtonEvent &ev)
2120{ 2075{
… …
2122 2077
2123 csrO = 0; /* reset csr Offset */ 2078 csrO = 0; /* reset csr Offset */
2124 if (!bypass_keystate) 2079 if (!bypass_keystate)
2125 reportmode = !! (priv_modes & PrivMode_mouse_report); 2080 reportmode = !! (priv_modes & PrivMode_mouse_report);
2126 2081
2127 if (scrollbar_isUpDn ()) 2082 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2128 { 2083 {
2129 scrollBar.setIdle (); 2084 scrollBar.state = STATE_IDLE;
2130 scrollbar_show (0); 2085 scrollBar.show (0);
2131#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2132 refresh_type &= ~SMOOTH_REFRESH;
2133#endif
2134 } 2086 }
2135 2087
2136#ifdef SELECTION_SCROLLING 2088#ifdef SELECTION_SCROLLING
2137 if (sel_scroll_ev.active)
2138 sel_scroll_ev.stop(); 2089 sel_scroll_ev.stop();
2139#endif 2090#endif
2140 2091
2141 if (ev.window == vt) 2092 if (ev.window == vt)
2142 { 2093 {
2094 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2095 return;
2096
2143#if ISO_14755 2097#if ISO_14755
2144 // 5.4 2098 // 5.4
2145 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2099 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2146 return; 2100 return;
2147#endif 2101#endif
2102
2148 if (reportmode) 2103 if (reportmode)
2149 { 2104 {
2150 /* mouse report from vt window */ 2105 /* mouse report from vt window */
2151 /* don't report release of wheel "buttons" */ 2106 /* don't report release of wheel "buttons" */
2152 if (ev.button >= 4) 2107 if (ev.button >= 4)
… …
2163 mouse_report (ev); 2118 mouse_report (ev);
2164 } 2119 }
2165#else /* MOUSE_REPORT_DOUBLECLICK */ 2120#else /* MOUSE_REPORT_DOUBLECLICK */
2166 MEvent.button = AnyButton; 2121 MEvent.button = AnyButton;
2167 mouse_report (ev); 2122 mouse_report (ev);
2168#endif /* MOUSE_REPORT_DOUBLECLICK */ 2123#endif /* MOUSE_REPORT_DOUBLECLICK */
2169 return; 2124 return;
2170 } 2125 }
2171 2126
2172 /* 2127 /*
2173 * dumb hack to compensate for the failure of click-and-drag 2128 * dumb hack to compensate for the failure of click-and-drag
… …
2176 if (priv_modes & PrivMode_mouse_report 2131 if (priv_modes & PrivMode_mouse_report
2177 && bypass_keystate 2132 && bypass_keystate
2178 && ev.button == Button1 && MEvent.clicks <= 1) 2133 && ev.button == Button1 && MEvent.clicks <= 1)
2179 selection_extend (ev.x, ev.y, 0); 2134 selection_extend (ev.x, ev.y, 0);
2180 2135
2181 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2182 return;
2183
2184 switch (ev.button) 2136 switch (ev.button)
2185 { 2137 {
2186 case Button1: 2138 case Button1:
2187 case Button3: 2139 case Button3:
2188 selection_make (ev.time); 2140 selection_make (ev.time);
2189 break; 2141 break;
2142
2190 case Button2: 2143 case Button2:
2191 selection_request (ev.time, ev.x, ev.y); 2144 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2145 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2192 break; 2146 break;
2147
2193#ifdef MOUSE_WHEEL 2148#ifdef MOUSE_WHEEL
2194 case Button4: 2149 case Button4:
2195 case Button5: 2150 case Button5:
2196 { 2151 {
2197 int i; 2152 int i;
… …
2199 2154
2200 v = ev.button == Button4 ? UP : DN; 2155 v = ev.button == Button4 ? UP : DN;
2201 2156
2202 if (ev.state & ShiftMask) 2157 if (ev.state & ShiftMask)
2203 i = 1; 2158 i = 1;
2204 else if (OPTION (Opt_mouseWheelScrollPage)) 2159 else if (option (Opt_mouseWheelScrollPage))
2205 i = nrow - 1; 2160 i = nrow - 1;
2206 else 2161 else
2207 i = 5; 2162 i = 5;
2208 2163
2209# ifdef MOUSE_SLIP_WHEELING 2164# ifdef MOUSE_SLIP_WHEELING
… …
2211 { 2166 {
2212 mouse_slip_wheel_speed += v ? -1 : 1; 2167 mouse_slip_wheel_speed += v ? -1 : 1;
2213 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2168 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2214 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2169 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2215 2170
2216 if (slip_wheel_ev.at < NOW) 2171 if (!slip_wheel_ev.is_active ())
2217 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2172 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2218
2219 slip_wheel_ev.start ();
2220 } 2173 }
2221 else 2174 else
2175# endif
2222 { 2176 {
2223# endif
2224 scr_page (v, i); 2177 scr_page (v, i);
2225 scrollbar_show (1); 2178 scrollBar.show (1);
2226# ifdef MOUSE_SLIP_WHEELING
2227 } 2179 }
2228# endif
2229 } 2180 }
2230 break; 2181 break;
2231#endif 2182#endif
2232 } 2183 }
2233 } 2184 }
2234#ifdef MENUBAR
2235 else if (isMenuBarWindow (ev.window))
2236 menubar_control (ev);
2237#endif
2238} 2185}
2239
2240#ifdef TRANSPARENT
2241#if TINTING
2242/* taken from aterm-0.4.2 */
2243
2244typedef uint32_t RUINT32T;
2245
2246void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2247{
2248 int sh_r, sh_g, sh_b;
2249 RUINT32T mask_r, mask_g, mask_b;
2250 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2251 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2252 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2253 int i;
2254
2255 Visual *visual = display->visual;
2256
2257 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2258
2259 /* for convenience */
2260 mask_r = visual->red_mask;
2261 mask_g = visual->green_mask;
2262 mask_b = visual->blue_mask;
2263
2264 /* boring lookup table pre-initialization */
2265 switch (srcImage->bits_per_pixel) {
2266 case 15:
2267 if ((mask_r != 0x7c00) ||
2268 (mask_g != 0x03e0) ||
2269 (mask_b != 0x001f))
2270 return;
2271 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2272 lookup_r = lookup;
2273 lookup_g = lookup+32;
2274 lookup_b = lookup+32+32;
2275 sh_r = 10;
2276 sh_g = 5;
2277 sh_b = 0;
2278 break;
2279 case 16:
2280 if ((mask_r != 0xf800) ||
2281 (mask_g != 0x07e0) ||
2282 (mask_b != 0x001f))
2283 return;
2284 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2285 lookup_r = lookup;
2286 lookup_g = lookup+32;
2287 lookup_b = lookup+32+64;
2288 sh_r = 11;
2289 sh_g = 5;
2290 sh_b = 0;
2291 break;
2292 case 24:
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 case 32:
2306 if ((mask_r != 0xff0000) ||
2307 (mask_g != 0x00ff00) ||
2308 (mask_b != 0x0000ff))
2309 return;
2310 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2311 lookup_r = lookup;
2312 lookup_g = lookup+256;
2313 lookup_b = lookup+256+256;
2314 sh_r = 16;
2315 sh_g = 8;
2316 sh_b = 0;
2317 break;
2318 default:
2319 return; /* we do not support this color depth */
2320 }
2321
2322 /* prepare limits for color transformation (each channel is handled separately) */
2323 if (shade < 0) {
2324 shade = -shade;
2325 if (shade < 0) shade = 0;
2326 if (shade > 100) shade = 100;
2327
2328 lower_lim_r = 65535-rm;
2329 lower_lim_g = 65535-gm;
2330 lower_lim_b = 65535-bm;
2331
2332 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2333 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2334 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2335
2336 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2337 } else {
2338 if (shade < 0) shade = 0;
2339 if (shade > 100) shade = 100;
2340
2341 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2342
2343 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2344 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2345 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2346 }
2347
2348 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2349 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2350 {
2351 unsigned int tmp;
2352
2353 tmp = lower_lim_r;
2354 lower_lim_r = lower_lim_b;
2355 lower_lim_b = tmp;
2356
2357 tmp = upper_lim_r;
2358 upper_lim_r = upper_lim_b;
2359 upper_lim_b = tmp;
2360 }
2361
2362 /* fill our lookup tables */
2363 for (i = 0; i <= mask_r>>sh_r; i++)
2364 {
2365 RUINT32T tmp;
2366 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2367 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2368 lookup_r[i] = (tmp/65535)<<sh_r;
2369 }
2370 for (i = 0; i <= mask_g>>sh_g; i++)
2371 {
2372 RUINT32T tmp;
2373 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2374 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2375 lookup_g[i] = (tmp/65535)<<sh_g;
2376 }
2377 for (i = 0; i <= mask_b>>sh_b; i++)
2378 {
2379 RUINT32T tmp;
2380 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2381 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2382 lookup_b[i] = (tmp/65535)<<sh_b;
2383 }
2384
2385 /* apply table to input image (replacing colors by newly calculated ones) */
2386 switch (srcImage->bits_per_pixel)
2387 {
2388 case 15:
2389 {
2390 unsigned short *p1, *pf, *p, *pl;
2391 p1 = (unsigned short *) srcImage->data;
2392 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2393 while (p1 < pf)
2394 {
2395 p = p1;
2396 pl = p1 + srcImage->width;
2397 for (; p < pl; p++)
2398 {
2399 *p = lookup_r[(*p & 0x7c00)>>10] |
2400 lookup_g[(*p & 0x03e0)>> 5] |
2401 lookup_b[(*p & 0x001f)];
2402 }
2403 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2404 }
2405 break;
2406 }
2407 case 16:
2408 {
2409 unsigned short *p1, *pf, *p, *pl;
2410 p1 = (unsigned short *) srcImage->data;
2411 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2412 while (p1 < pf)
2413 {
2414 p = p1;
2415 pl = p1 + srcImage->width;
2416 for (; p < pl; p++)
2417 {
2418 *p = lookup_r[(*p & 0xf800)>>11] |
2419 lookup_g[(*p & 0x07e0)>> 5] |
2420 lookup_b[(*p & 0x001f)];
2421 }
2422 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2423 }
2424 break;
2425 }
2426 case 24:
2427 {
2428 unsigned char *p1, *pf, *p, *pl;
2429 p1 = (unsigned char *) srcImage->data;
2430 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2431 while (p1 < pf)
2432 {
2433 p = p1;
2434 pl = p1 + srcImage->width * 3;
2435 for (; p < pl; p += 3)
2436 {
2437 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2438 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2439 p[2] = lookup_r[(p[2] & 0x0000ff)];
2440 }
2441 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2442 }
2443 break;
2444 }
2445 case 32:
2446 {
2447 RUINT32T *p1, *pf, *p, *pl;
2448 p1 = (RUINT32T *) srcImage->data;
2449 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2450
2451 while (p1 < pf)
2452 {
2453 p = p1;
2454 pl = p1 + srcImage->width;
2455 for (; p < pl; p++)
2456 {
2457 *p = lookup_r[(*p & 0xff0000)>>16] |
2458 lookup_g[(*p & 0x00ff00)>> 8] |
2459 lookup_b[(*p & 0x0000ff)] |
2460 (*p & ~0xffffff);
2461 }
2462 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2463 }
2464 break;
2465 }
2466 }
2467
2468 free (lookup);
2469}
2470#endif
2471
2472/*
2473 * Check our parents are still who we think they are.
2474 * Do transparency updates if required
2475 */
2476int
2477rxvt_term::check_our_parents ()
2478{
2479 int i, pchanged, aformat, have_pixmap, rootdepth;
2480 unsigned long nitems, bytes_after;
2481 Atom atype;
2482 unsigned char *prop = NULL;
2483 Window root, oldp, *list;
2484 Pixmap rootpixmap = None;
2485 XWindowAttributes wattr, wrootattr;
2486 dDisp;
2487
2488 pchanged = 0;
2489
2490 if (!OPTION (Opt_transparent))
2491 return pchanged; /* Don't try any more */
2492
2493 XGetWindowAttributes (disp, display->root, &wrootattr);
2494 rootdepth = wrootattr.depth;
2495
2496 XGetWindowAttributes (disp, parent[0], &wattr);
2497
2498 if (rootdepth != wattr.depth)
2499 {
2500 if (am_transparent)
2501 {
2502 pchanged = 1;
2503 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2504 am_transparent = am_pixmap_trans = 0;
2505 }
2506
2507 return pchanged; /* Don't try any more */
2508 }
2509
2510 /* Get all X ops out of the queue so that our information is up-to-date. */
2511 XSync (disp, False);
2512
2513 /*
2514 * Make the frame window set by the window manager have
2515 * the root background. Some window managers put multiple nested frame
2516 * windows for each client, so we have to take care about that.
2517 */
2518 i = (xa[XA_XROOTPMAP_ID]
2519 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2520 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2521 &nitems, &bytes_after, &prop) == Success);
2522
2523 if (!i || prop == NULL)
2524 i = (xa[XA_ESETROOT_PMAP_ID]
2525 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2526 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2527 &nitems, &bytes_after, &prop) == Success);
2528
2529 if (!i || prop == NULL
2530#if TINTING
2531 || !rs[Rs_color + Color_tint]
2532#endif
2533 )
2534 have_pixmap = 0;
2535 else
2536 {
2537 have_pixmap = 1;
2538 rootpixmap = *(Pixmap *)prop;
2539 XFree (prop);
2540 }
2541
2542 if (have_pixmap)
2543 {
2544 /*
2545 * Copy display->root pixmap transparency
2546 */
2547 int sx, sy, nx, ny;
2548 unsigned int nw, nh;
2549 Window cr;
2550 XImage *image;
2551 GC gc;
2552 XGCValues gcvalue;
2553
2554 XTranslateCoordinates (disp, parent[0], display->root,
2555 0, 0, &sx, &sy, &cr);
2556 nw = (unsigned int)szHint.width;
2557 nh = (unsigned int)szHint.height;
2558 nx = ny = 0;
2559
2560 if (sx < 0)
2561 {
2562 nw += sx;
2563 nx = -sx;
2564 sx = 0;
2565 }
2566
2567 if (sy < 0)
2568 {
2569 nh += sy;
2570 ny = -sy;
2571 sy = 0;
2572 }
2573
2574 min_it (nw, (unsigned int) (wrootattr.width - sx));
2575 min_it (nh, (unsigned int) (wrootattr.height - sy));
2576
2577 XSync (disp, False);
2578 allowedxerror = -1;
2579 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2580
2581 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2582 /* XXX: may need a delay here? */
2583 allowedxerror = 0;
2584
2585 if (image == NULL)
2586 {
2587 if (am_transparent && am_pixmap_trans)
2588 {
2589 pchanged = 1;
2590 if (pixmap != None)
2591 {
2592 XFreePixmap (disp, pixmap);
2593 pixmap = None;
2594 }
2595 }
2596
2597 am_pixmap_trans = 0;
2598 }
2599 else
2600 {
2601 if (pixmap != None)
2602 XFreePixmap (disp, pixmap);
2603
2604#if TINTING
2605 if (ISSET_PIXCOLOR (Color_tint))
2606 {
2607 unsigned short rm, gm, bm;
2608 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2609
2610 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2611
2612 ShadeXImage (display, image, shade, rm, gm, bm);
2613 }
2614#endif
2615
2616 pixmap = XCreatePixmap (disp, vt,
2617 szHint.width, szHint.height, image->depth);
2618 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2619 XPutImage (disp, pixmap, gc, image, 0, 0,
2620 nx, ny, image->width, image->height);
2621 XFreeGC (disp, gc);
2622 XDestroyImage (image);
2623 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2624 XClearWindow (disp, parent[0]);
2625
2626 if (!am_transparent || !am_pixmap_trans)
2627 pchanged = 1;
2628
2629 am_transparent = am_pixmap_trans = 1;
2630 }
2631 }
2632
2633 if (am_pixmap_trans)
2634 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2635 else
2636 {
2637 unsigned int n;
2638 /*
2639 * InheritPixmap transparency
2640 */
2641 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2642 {
2643 oldp = parent[i];
2644 XQueryTree (disp, parent[i - 1], &root,
2645 &parent[i], &list, &n);
2646 XFree (list);
2647
2648 if (parent[i] == display->root)
2649 {
2650 if (oldp != None)
2651 pchanged = 1;
2652
2653 break;
2654 }
2655
2656 if (oldp != parent[i])
2657 pchanged = 1;
2658 }
2659
2660 n = 0;
2661
2662 if (pchanged)
2663 {
2664 for (; n < (unsigned int)i; n++)
2665 {
2666 XGetWindowAttributes (disp, parent[n], &wattr);
2667 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2668 {
2669 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2670 break;
2671 }
2672 }
2673 }
2674
2675 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2676 {
2677 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2678 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2679 am_transparent = 0;
2680 /* XXX: also turn off Opt_transparent? */
2681 }
2682 else
2683 {
2684#if WAIT_FOR_WM
2685 /* wait (an arbitrary period) for the WM to do its thing
2686 * needed for fvwm2.2.2 (and before?) */
2687 sleep (1);
2688#endif
2689 for (n = 0; n < (unsigned int)i; n++)
2690 {
2691 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2692 XClearWindow (disp, parent[n]);
2693 }
2694
2695 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2696 am_transparent = 1;
2697 }
2698
2699 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2700 parent[i] = None;
2701 }
2702
2703 if (scrollBar.win)
2704 {
2705 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2706 scrollBar.setIdle ();
2707 scrollbar_show (0);
2708 }
2709
2710 if (am_transparent)
2711 {
2712 want_refresh = want_full_refresh = 1;
2713 if (am_pixmap_trans)
2714 flush ();
2715 }
2716
2717 return pchanged;
2718}
2719#endif
2720 2186
2721/*}}} */ 2187/*}}} */
2722 2188
2723bool 2189void
2724rxvt_term::cmd_parse () 2190rxvt_term::cmd_parse ()
2725{ 2191{
2726 bool flag = false;
2727 wchar_t ch = NOCHAR; 2192 wchar_t ch = NOCHAR;
2728 char *seq_begin; // remember start of esc-sequence here 2193 char *seq_begin; // remember start of esc-sequence here
2729 2194
2730 for (;;) 2195 for (;;)
2731 { 2196 {
2732 if (ch == NOCHAR) 2197 if (expect_false (ch == NOCHAR))
2733 { 2198 {
2734 seq_begin = cmdbuf_ptr; 2199 seq_begin = cmdbuf_ptr;
2735 ch = next_char (); 2200 ch = next_char ();
2736 2201
2737 if (ch == NOCHAR) 2202 if (ch == NOCHAR)
2738 break; 2203 break;
2739 } 2204 }
2740 2205
2741 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2206 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2742 { 2207 {
2743 if (!seen_input) 2208 if (expect_false (!seen_input))
2744 { 2209 {
2745 seen_input = 1; 2210 seen_input = 1;
2746 // many badly-written programs (e.g. jed) contain a race condition: 2211 // many badly-written programs (e.g. jed) contain a race condition:
2747 // they first read the screensize and then install a SIGWINCH handler. 2212 // they first read the screensize and then install a SIGWINCH handler.
2748 // some window managers resize the window early, and these programs 2213 // some window managers resize the window early, and these programs
… …
2761 wchar_t *str = buf; 2226 wchar_t *str = buf;
2762 wchar_t *eol = str + min (ncol, UBUFSIZ); 2227 wchar_t *eol = str + min (ncol, UBUFSIZ);
2763 2228
2764 for (;;) 2229 for (;;)
2765 { 2230 {
2766 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2231 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2767 break; 2232 break;
2768 2233
2769 *str++ = ch; 2234 *str++ = ch;
2770 2235
2771 if (ch == C0_LF || str >= eol) 2236 if (expect_false (ch == C0_LF || str >= eol))
2772 { 2237 {
2773 if (ch == C0_LF) 2238 if (ch == C0_LF)
2774 nlines++; 2239 nlines++;
2775 2240
2776 refresh_count++; 2241 refresh_count++;
2777 2242
2778 if (!OPTION (Opt_jumpScroll) 2243 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2779 || (refresh_count >= refresh_limit * (nrow - 1)))
2780 { 2244 {
2781 refreshnow = true;
2782 refresh_count = 0; 2245 refresh_count = 0;
2246
2247 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2248 {
2249 refreshnow = true;
2783 ch = NOCHAR; 2250 ch = NOCHAR;
2784 break; 2251 break;
2252 }
2785 } 2253 }
2786 2254
2787 // scr_add_lines only works for nlines <= nrow - 1. 2255 // scr_add_lines only works for nlines <= nrow - 1.
2788 if (nlines >= nrow - 1) 2256 if (nlines >= nrow - 1)
2789 { 2257 {
2258 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2790 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2259 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2791 scr_add_lines (buf, str - buf, nlines); 2260 scr_add_lines (buf, str - buf, nlines);
2792 2261
2793 nlines = 0; 2262 nlines = 0;
2794 str = buf; 2263 str = buf;
2795 eol = str + min (ncol, UBUFSIZ); 2264 eol = str + min (ncol, UBUFSIZ);
… …
2810 2279
2811 seq_begin = cmdbuf_ptr; 2280 seq_begin = cmdbuf_ptr;
2812 ch = next_char (); 2281 ch = next_char ();
2813 } 2282 }
2814 2283
2284 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2815 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2285 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2816 scr_add_lines (buf, str - buf, nlines); 2286 scr_add_lines (buf, str - buf, nlines);
2817 2287
2818 /* 2288 /*
2819 * If there have been a lot of new lines, then update the screen 2289 * If there have been a lot of new lines, then update the screen
2820 * What the heck I'll cheat and only refresh less than every page-full. 2290 * What the heck we'll cheat and only refresh less than every page-full.
2821 * the number of pages between refreshes is refresh_limit, which 2291 * if skipScroll is enabled.
2822 * is incremented here because we must be doing flat-out scrolling.
2823 */ 2292 */
2824 if (refreshnow) 2293 if (refreshnow)
2825 { 2294 {
2826 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2827 refresh_limit++;
2828 else
2829 {
2830 flag = true;
2831 scr_refresh (refresh_type); 2295 scr_refresh ();
2832 want_refresh = 1; 2296 want_refresh = 1;
2833 }
2834 } 2297 }
2835
2836 } 2298 }
2837 else 2299 else
2838 { 2300 {
2839 try 2301 try
2840 { 2302 {
… …
2848 } 2310 }
2849 2311
2850 ch = NOCHAR; 2312 ch = NOCHAR;
2851 } 2313 }
2852 } 2314 }
2853
2854 return flag;
2855} 2315}
2856 2316
2857// read the next character 2317// read the next character
2858wchar_t 2318wchar_t
2859rxvt_term::next_char () 2319rxvt_term::next_char () NOTHROW
2860{ 2320{
2861 while (cmdbuf_ptr < cmdbuf_endp) 2321 while (cmdbuf_ptr < cmdbuf_endp)
2862 { 2322 {
2863 // assume 7-bit to be ascii ALWAYS 2323 // assume 7-bit to be ascii ALWAYS
2864 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2324 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2865 return *cmdbuf_ptr++; 2325 return *cmdbuf_ptr++;
2866 2326
2867 wchar_t wc; 2327 wchar_t wc;
2868 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2328 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2869 2329
… …
2873 cmdbuf_ptr = cmdbuf_endp; 2333 cmdbuf_ptr = cmdbuf_endp;
2874 break; 2334 break;
2875 } 2335 }
2876 2336
2877 if (len == (size_t)-1) 2337 if (len == (size_t)-1)
2338 {
2339 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2878 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2341 }
2879 2342
2880 // assume wchar == unicode 2343 // assume wchar == unicode
2881 cmdbuf_ptr += len; 2344 cmdbuf_ptr += len;
2882 return wc & UNICODE_MASK; 2345 return wc & UNICODE_MASK;
2883 } 2346 }
… …
2885 return NOCHAR; 2348 return NOCHAR;
2886} 2349}
2887 2350
2888// read the next octet 2351// read the next octet
2889uint32_t 2352uint32_t
2890rxvt_term::next_octet () 2353rxvt_term::next_octet () NOTHROW
2891{ 2354{
2892 return cmdbuf_ptr < cmdbuf_endp 2355 return cmdbuf_ptr < cmdbuf_endp
2893 ? (unsigned char)*cmdbuf_ptr++ 2356 ? (unsigned char)*cmdbuf_ptr++
2894 : NOCHAR; 2357 : NOCHAR;
2895} 2358}
2359
2360static class out_of_input out_of_input;
2896 2361
2897/* rxvt_cmd_getc () - Return next input character */ 2362/* rxvt_cmd_getc () - Return next input character */
2898/* 2363/*
2899 * Return the next input character after first passing any keyboard input 2364 * Return the next input character after first passing any keyboard input
2900 * to the command. 2365 * to the command.
2901 */ 2366 */
2902wchar_t 2367wchar_t
2903rxvt_term::cmd_getc () 2368rxvt_term::cmd_getc () THROW ((class out_of_input))
2904{ 2369{
2905 wchar_t c = next_char (); 2370 wchar_t c = next_char ();
2906 2371
2907 if (c == NOCHAR) 2372 if (c == NOCHAR)
2908 throw out_of_input; 2373 throw out_of_input;
2909 2374
2910 return c; 2375 return c;
2911} 2376}
2912 2377
2913uint32_t 2378uint32_t
2914rxvt_term::cmd_get8 () 2379rxvt_term::cmd_get8 () THROW ((class out_of_input))
2915{ 2380{
2916 uint32_t c = next_octet (); 2381 uint32_t c = next_octet ();
2917 2382
2918 if (c == NOCHAR) 2383 if (c == NOCHAR)
2919 throw out_of_input; 2384 throw out_of_input;
… …
2925/*----------------------------------------------------------------------*/ 2390/*----------------------------------------------------------------------*/
2926#ifdef PRINTPIPE 2391#ifdef PRINTPIPE
2927FILE * 2392FILE *
2928rxvt_term::popen_printer () 2393rxvt_term::popen_printer ()
2929{ 2394{
2930 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2395 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2931 2396
2932 if (stream == NULL) 2397 if (stream == NULL)
2933 rxvt_warn ("can't open printer pipe, not printing.\n"); 2398 rxvt_warn ("can't open printer pipe, not printing.\n");
2934 2399
2935 return stream; 2400 return stream;
… …
2946 * simulate attached vt100 printer 2411 * simulate attached vt100 printer
2947 */ 2412 */
2948void 2413void
2949rxvt_term::process_print_pipe () 2414rxvt_term::process_print_pipe ()
2950{ 2415{
2951 int done; 2416 FILE *fd = popen_printer ();
2952 FILE *fd;
2953 2417
2954 if ((fd = popen_printer ()) == NULL) 2418 if (!fd)
2955 return; 2419 return;
2956 2420
2957 /* 2421 /*
2958 * Send all input to the printer until either ESC[4i or ESC[?4i 2422 * Send all input to the printer until either ESC[4i or ESC[?4i
2959 * is received. 2423 * is received.
2960 */ 2424 */
2961 for (done = 0; !done;) 2425 for (int done = 0; !done; )
2962 { 2426 {
2963 unsigned char buf[8]; 2427 unsigned char buf[8];
2964 unicode_t ch; 2428 unicode_t ch;
2965 unsigned int i, len; 2429 unsigned int i, len;
2966 2430
… …
2985 { 2449 {
2986 if ((buf[len++] = cmd_getc ()) == 'i') 2450 if ((buf[len++] = cmd_getc ()) == 'i')
2987 break; /* done = 1 */ 2451 break; /* done = 1 */
2988 } 2452 }
2989 } 2453 }
2990 2454
2991 for (i = 0; i < len; i++) 2455 for (i = 0; i < len; i++)
2992 if (putc (buf[i], fd) == EOF) 2456 if (putc (buf[i], fd) == EOF)
2993 { 2457 {
2994 done = 1; 2458 done = 1;
2995 break; 2459 break;
… …
2997 } 2461 }
2998 } 2462 }
2999 2463
3000 pclose_printer (fd); 2464 pclose_printer (fd);
3001} 2465}
3002#endif /* PRINTPIPE */ 2466#endif /* PRINTPIPE */
3003/*}}} */ 2467/*}}} */
3004 2468
3005/* *INDENT-OFF* */ 2469/* *INDENT-OFF* */
3006enum { 2470enum {
3007 C1_40 = 0x40, 2471 C1_40 = 0x40,
… …
3057 process_dcs_seq (); 2521 process_dcs_seq ();
3058 break; 2522 break;
3059 case 0x9b: /* CSI */ 2523 case 0x9b: /* CSI */
3060 process_csi_seq (); 2524 process_csi_seq ();
3061 break; 2525 break;
3062 case 0x9d: /* CSI */ 2526 case 0x9d: /* OSC */
3063 process_osc_seq (); 2527 process_osc_seq ();
3064 break; 2528 break;
3065#endif 2529#endif
3066 } 2530 }
3067} 2531}
… …
3111 break; 2575 break;
3112 case 'Z': /* identify the terminal type */ 2576 case 'Z': /* identify the terminal type */
3113 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2577 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3114 break; 2578 break;
3115 case '<': /* turn off VT52 mode */ 2579 case '<': /* turn off VT52 mode */
3116 PrivMode (0, PrivMode_vt52); 2580 set_privmode (PrivMode_vt52, 0);
3117 break; 2581 break;
3118 case 'F': /* use special graphics character set */ 2582 case 'F': /* use special graphics character set */
3119 case 'G': /* use regular character set */ 2583 case 'G': /* use regular character set */
3120 /* unimplemented */ 2584 /* unimplemented */
3121 break; 2585 break;
… …
3157 scr_charset_set (2, (unsigned int)cmd_getc ()); 2621 scr_charset_set (2, (unsigned int)cmd_getc ());
3158 break; 2622 break;
3159 case '+': 2623 case '+':
3160 scr_charset_set (3, (unsigned int)cmd_getc ()); 2624 scr_charset_set (3, (unsigned int)cmd_getc ());
3161 break; 2625 break;
3162#if ENABLE_FRILLS 2626#if !ENABLE_MINIMAL
3163 case '6': 2627 case '6':
3164 scr_backindex (); 2628 scr_backindex ();
3165 break; 2629 break;
3166#endif 2630#endif
3167 case '7': 2631 case '7':
3168 scr_cursor (SAVE); 2632 scr_cursor (SAVE);
3169 break; 2633 break;
3170 case '8': 2634 case '8':
3171 scr_cursor (RESTORE); 2635 scr_cursor (RESTORE);
3172 break; 2636 break;
3173#if ENABLE_FRILLS 2637#if !ENABLE_MINIMAL
3174 case '9': 2638 case '9':
3175 scr_forwardindex (); 2639 scr_forwardindex ();
3176 break; 2640 break;
3177#endif 2641#endif
3178 case '=': 2642 case '=':
3179 case '>': 2643 case '>':
3180 PrivMode ((ch == '='), PrivMode_aplKP); 2644 set_privmode (PrivMode_aplKP, ch == '=');
3181 break; 2645 break;
3182 2646
3183 case C1_40: 2647 case C1_40:
3184 cmd_getc (); 2648 cmd_getc ();
3185 break; 2649 break;
… …
3224 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2688 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3225 case C1_SCI: /* ESC Z */ 2689 case C1_SCI: /* ESC Z */
3226 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2690 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3227 break; /* steal obsolete ESC [ c */ 2691 break; /* steal obsolete ESC [ c */
3228 2692
3229 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2693 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3230 case C1_CSI: /* ESC [ */ 2694 case C1_CSI: /* ESC [ */
3231 process_csi_seq (); 2695 process_csi_seq ();
3232 break; 2696 break;
3233 2697
3234 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2698 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3235 case C1_OSC: /* ESC ] */ 2699 case C1_OSC: /* ESC ] */
3236 process_osc_seq (); 2700 process_osc_seq ();
3237 break; 2701 break;
3238 2702
3239 /* 8.3.106: RESET TO INITIAL STATE */ 2703 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3240 case 'c': 2704 case 'c':
3241 mbstate.reset (); 2705 mbstate.reset ();
3242 scr_poweron (); 2706 scr_poweron ();
3243 scrollbar_show (1); 2707 scrollBar.show (1);
3244 break; 2708 break;
3245 2709
3246 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2710 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3247 case 'n': 2711 case 'n':
3248 scr_charset_choose (2); 2712 scr_charset_choose (2);
… …
3293rxvt_term::process_csi_seq () 2757rxvt_term::process_csi_seq ()
3294{ 2758{
3295 unicode_t ch, priv, i; 2759 unicode_t ch, priv, i;
3296 unsigned int nargs, p; 2760 unsigned int nargs, p;
3297 int n, ndef; 2761 int n, ndef;
3298 int arg[ESC_ARGS]; 2762 int arg[ESC_ARGS] = { };
3299 2763
3300 for (nargs = ESC_ARGS; nargs > 0;) 2764 nargs = 0;
3301 arg[--nargs] = 0;
3302 2765
3303 priv = 0; 2766 priv = 0;
3304 ch = cmd_getc (); 2767 ch = cmd_getc ();
3305 if (ch >= '<' && ch <= '?') 2768 if ((ch >= '<' && ch <= '?') || ch == '!')
2769 {
3306 { /* '<' '=' '>' '?' */ 2770 /* '<' '=' '>' '?' '!' */
3307 priv = ch; 2771 priv = ch;
3308 ch = cmd_getc (); 2772 ch = cmd_getc ();
3309 } 2773 }
3310 2774
3311 /* read any numerical arguments */ 2775 /* read any numerical arguments */
… …
3340 ndef = get_byte_array_bit (csi_defaults, i); 2804 ndef = get_byte_array_bit (csi_defaults, i);
3341 for (p = 0; p < nargs; p++) 2805 for (p = 0; p < nargs; p++)
3342 if (arg[p] == -1) 2806 if (arg[p] == -1)
3343 arg[p] = ndef; 2807 arg[p] = ndef;
3344 2808
3345#ifdef DEBUG_CMD
3346 fprintf (stderr, "CSI ");
3347 for (p = 0; p < nargs; p++)
3348 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3349 fprintf (stderr, "%c\n", ch);
3350#endif
3351
3352 /* 2809 /*
3353 * private mode handling 2810 * private mode handling
3354 */ 2811 */
3355 if (priv) 2812 if (priv)
3356 { 2813 {
3357 switch (priv) 2814 switch (priv)
3358 { 2815 {
3359 case '>': 2816 case '>':
3360 if (ch == CSI_DA) /* secondary device attributes */ 2817 if (ch == CSI_DA) /* secondary device attributes */
3361 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2818 {
2819 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2820 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2821 //
2822 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2823 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2824 // versions.
2825 //
2826 tt_printf ("\033[>%d;95;0c", 'U');
2827 }
3362 break; 2828 break;
2829
3363 case '?': 2830 case '?':
3364 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2831 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3365 process_terminal_mode (ch, priv, nargs, arg); 2832 process_terminal_mode (ch, priv, nargs, arg);
3366 break; 2833 break;
2834
2835 case '!':
2836 if (ch == CSI_70)
2837 {
2838 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2839 scr_soft_reset ();
2840
2841 static const int pm_h[] = { 7, 25 };
2842 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2843
2844 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2845 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
3367 } 2846 }
2847 break;
2848 }
2849
3368 return; 2850 return;
3369 } 2851 }
3370 2852
3371 switch (ch) 2853 switch (ch)
3372 { 2854 {
… …
3492 break; 2974 break;
3493 case 6: /* CPR requested */ 2975 case 6: /* CPR requested */
3494 scr_report_position (); 2976 scr_report_position ();
3495 break; 2977 break;
3496 case 7: /* unofficial extension */ 2978 case 7: /* unofficial extension */
3497 if (OPTION (Opt_insecure)) 2979 if (option (Opt_insecure))
3498 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2980 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3499 break; 2981 break;
3500 case 8: /* unofficial extension */ 2982 case 8: /* unofficial extension */
3501 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2983 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3502 break; 2984 break;
… …
3569 break; 3051 break;
3570 case CSI_75: 3052 case CSI_75:
3571 scr_cursor (RESTORE); 3053 scr_cursor (RESTORE);
3572 break; 3054 break;
3573 3055
3574#if ENABLE_FRILLS 3056#if !ENABLE_MINIMAL
3575 case CSI_74: 3057 case CSI_74:
3576 process_window_ops (arg, nargs); 3058 process_window_ops (arg, nargs);
3577 break; 3059 break;
3578#endif 3060#endif
3579 3061
… …
3586 break; 3068 break;
3587 } 3069 }
3588} 3070}
3589/*}}} */ 3071/*}}} */
3590 3072
3591#if ENABLE_FRILLS 3073#if !ENABLE_MINIMAL
3592/* ARGSUSED */ 3074/* ARGSUSED */
3593void 3075void
3594rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3076rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3595{ 3077{
3596 int x, y; 3078 int x, y;
3597 XWindowAttributes wattr; 3079 XWindowAttributes wattr;
3598 Window wdummy; 3080 Window wdummy;
3599 dDisp; 3081
3082 dLocal (Display *, dpy);
3600 3083
3601 if (nargs == 0) 3084 if (nargs == 0)
3602 return; 3085 return;
3603 3086
3604 switch (args[0]) 3087 switch (args[0])
3605 { 3088 {
3606 /* 3089 /*
3607 * commands 3090 * commands
3608 */ 3091 */
3609 case 1: /* deiconify window */ 3092 case 1: /* deiconify window */
3610 XMapWindow (disp, parent[0]); 3093 XMapWindow (dpy, parent[0]);
3611 break; 3094 break;
3612 case 2: /* iconify window */ 3095 case 2: /* iconify window */
3613 XIconifyWindow (disp, parent[0], display->screen); 3096 XIconifyWindow (dpy, parent[0], display->screen);
3614 break; 3097 break;
3615 case 3: /* set position (pixels) */ 3098 case 3: /* set position (pixels) */
3616 XMoveWindow (disp, parent[0], args[1], args[2]); 3099 XMoveWindow (dpy, parent[0], args[1], args[2]);
3617 break; 3100 break;
3618 case 4: /* set size (pixels) */ 3101 case 4: /* set size (pixels) */
3619 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3102 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3620 break; 3103 break;
3621 case 5: /* raise window */ 3104 case 5: /* raise window */
3622 XRaiseWindow (disp, parent[0]); 3105 XRaiseWindow (dpy, parent[0]);
3623 break; 3106 break;
3624 case 6: /* lower window */ 3107 case 6: /* lower window */
3625 XLowerWindow (disp, parent[0]); 3108 XLowerWindow (dpy, parent[0]);
3626 break; 3109 break;
3627 case 7: /* refresh window */ 3110 case 7: /* refresh window */
3628 scr_touch (true); 3111 scr_touch (true);
3629 break; 3112 break;
3630 case 8: /* set size (chars) */ 3113 case 8: /* set size (chars) */
… …
3637 if (args[0] >= 24) /* set height (chars) */ 3120 if (args[0] >= 24) /* set height (chars) */
3638 set_widthheight ((unsigned int)width, 3121 set_widthheight ((unsigned int)width,
3639 (unsigned int) (args[1] * fheight)); 3122 (unsigned int) (args[1] * fheight));
3640 break; 3123 break;
3641 3124
3642
3643 /* 3125 /*
3644 * reports - some output format copied from XTerm 3126 * reports - some output format copied from XTerm
3645 */ 3127 */
3646 case 11: /* report window state */ 3128 case 11: /* report window state */
3647 XGetWindowAttributes (disp, parent[0], &wattr); 3129 XGetWindowAttributes (dpy, parent[0], &wattr);
3648 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3130 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3649 break; 3131 break;
3650 case 13: /* report window position */ 3132 case 13: /* report window position */
3651 XGetWindowAttributes (disp, parent[0], &wattr); 3133 XGetWindowAttributes (dpy, parent[0], &wattr);
3652 XTranslateCoordinates (disp, parent[0], wattr.root, 3134 XTranslateCoordinates (dpy, parent[0], wattr.root,
3653 -wattr.border_width, -wattr.border_width, 3135 -wattr.border_width, -wattr.border_width,
3654 &x, &y, &wdummy); 3136 &x, &y, &wdummy);
3655 tt_printf ("\033[3;%d;%dt", x, y); 3137 tt_printf ("\033[3;%d;%dt", x, y);
3656 break; 3138 break;
3657 case 14: /* report window size (pixels) */ 3139 case 14: /* report window size (pixels) */
3658 XGetWindowAttributes (disp, parent[0], &wattr); 3140 XGetWindowAttributes (dpy, parent[0], &wattr);
3659 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3141 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3660 break; 3142 break;
3661 case 18: /* report text area size (chars) */ 3143 case 18: /* report text area size (chars) */
3662 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3144 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3663 break; 3145 break;
… …
3665 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3147 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3666 break; 3148 break;
3667 case 20: /* report icon label */ 3149 case 20: /* report icon label */
3668 { 3150 {
3669 char *s; 3151 char *s;
3670 XGetIconName (disp, parent[0], &s); 3152 XGetIconName (dpy, parent[0], &s);
3671 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3153 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3672 XFree (s); 3154 XFree (s);
3673 } 3155 }
3674 break; 3156 break;
3675 case 21: /* report window title */ 3157 case 21: /* report window title */
3676 { 3158 {
3677 char *s; 3159 char *s;
3678 XFetchName (disp, parent[0], &s); 3160 XFetchName (dpy, parent[0], &s);
3679 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3161 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3680 XFree (s); 3162 XFree (s);
3681 } 3163 }
3682 break; 3164 break;
3683 } 3165 }
3684} 3166}
… …
3711 seen_esc = true; 3193 seen_esc = true;
3712 continue; 3194 continue;
3713 } 3195 }
3714 else if (ch == C0_BEL || ch == CHAR_ST) 3196 else if (ch == C0_BEL || ch == CHAR_ST)
3715 break; 3197 break;
3198 else if (ch == C0_SYN)
3199 ch = cmd_get8 ();
3716 else if (ch < 0x20) 3200 else if (ch < 0x20)
3717 return NULL; /* other control character - exit */ 3201 return NULL; /* other control character - exit */
3718 3202
3719 seen_esc = false; 3203 seen_esc = false;
3720 3204
3721 if (n >= STRING_MAX - 1) 3205 if (n >= STRING_MAX - 1)
3722 // stop at some sane length 3206 // stop at some sane length
3723 return NULL; 3207 return NULL;
3724 3208
3725 if (ch == C0_SYN)
3726 string[n++] = cmd_get8 ();
3727 else
3728 string[n++] = ch; 3209 string[n++] = ch;
3729 } 3210 }
3730 3211
3731 string[n++] = '\0'; 3212 string[n++] = '\0';
3732 3213
3733 ends_how = (ch == 0x5c ? C0_ESC : ch); 3214 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3784void 3265void
3785rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3266rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3786{ 3267{
3787 if (str[0] == '?' && !str[1]) 3268 if (str[0] == '?' && !str[1])
3788 { 3269 {
3789 unsigned short r, g, b; 3270 rgba c;
3790 pix_colors_focused[color].get (display, r, g, b); 3271 pix_colors_focused[color].get (c);
3272
3273#if XFT
3274 if (c.a != rgba::MAX_CC)
3275 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3276 else
3277#endif
3791 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3278 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3792 } 3279 }
3793 else 3280 else
3794 set_window_color (color, str); 3281 set_window_color (color, str);
3795} 3282}
3796 3283
… …
3798 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3285 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3799 */ 3286 */
3800void 3287void
3801rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3288rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3802{ 3289{
3803 int changed = 0;
3804 int color; 3290 int color;
3805 char *buf, *name; 3291 char *buf, *name;
3806 bool query = str[0] == '?' && !str[1]; 3292 bool query = str[0] == '?' && !str[1];
3807 int saveop = op; 3293 int saveop = op;
3808 dDisp; 3294
3295 dLocal (Display *, dpy);
3809 3296
3810 assert (str != NULL); 3297 assert (str != NULL);
3298
3299 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3300 return;
3301
3811 switch (op) 3302 switch (op)
3812 { 3303 {
3813 case XTerm_name: 3304 case XTerm_name:
3814 set_title (str); 3305 set_title (str);
3815 /* FALLTHROUGH */ 3306 /* FALLTHROUGH */
… …
3829 unsigned long bytes_after; 3320 unsigned long bytes_after;
3830 unsigned char *value = 0; 3321 unsigned char *value = 0;
3831 const char *str = ""; 3322 const char *str = "";
3832 3323
3833 if (prop 3324 if (prop
3834 && XGetWindowProperty (disp, parent[0], 3325 && XGetWindowProperty (dpy, parent[0],
3835 prop, 0, 1<<16, 0, AnyPropertyType, 3326 prop, 0, 1<<16, 0, AnyPropertyType,
3836 &actual_type, &actual_format, 3327 &actual_type, &actual_format,
3837 &nitems, &bytes_after, &value) == Success 3328 &nitems, &bytes_after, &value) == Success
3838 && actual_type != None 3329 && actual_type != None
3839 && actual_format == 8) 3330 && actual_format == 8)
3840 str = (const char *)(value); 3331 str = (const char *)(value);
3841 3332
3842 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3333 tt_printf ("\033]%d;%s%c", op, str, resp);
3843 3334
3844 XFree (value); 3335 XFree (value);
3845 } 3336 }
3846 else 3337 else
3847 { 3338 {
… …
3851 { 3342 {
3852 *eq = 0; 3343 *eq = 0;
3853 set_utf8_property (display->atom (str), eq + 1); 3344 set_utf8_property (display->atom (str), eq + 1);
3854 } 3345 }
3855 else 3346 else
3856 XDeleteProperty (disp, parent[0], 3347 XDeleteProperty (dpy, parent[0],
3857 display->atom (str)); 3348 display->atom (str));
3858 } 3349 }
3859 break; 3350 break;
3860 3351
3861 case XTerm_Color: 3352 case XTerm_Color:
… …
3871 break; 3362 break;
3872 3363
3873 if ((buf = strchr (name, ';')) != NULL) 3364 if ((buf = strchr (name, ';')) != NULL)
3874 *buf++ = '\0'; 3365 *buf++ = '\0';
3875 3366
3876 if (name[0] == '?' && !name[1]) 3367 process_color_seq (op, color, name, resp);
3877 {
3878 unsigned short r, g, b;
3879 pix_colors_focused[color].get (display, r, g, b);
3880 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3881 }
3882 else
3883 set_window_color (color, name);
3884 } 3368 }
3885 break; 3369 break;
3370 case Rxvt_restoreFG:
3886 case XTerm_Color00: 3371 case XTerm_Color00:
3887 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3372 process_color_seq (op, Color_fg, str, resp);
3888 break; 3373 break;
3374 case Rxvt_restoreBG:
3889 case XTerm_Color01: 3375 case XTerm_Color01:
3890 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3376 process_color_seq (op, Color_bg, str, resp);
3891 break; 3377 break;
3892#ifndef NO_CURSORCOLOR 3378#ifndef NO_CURSORCOLOR
3893 case XTerm_Color_cursor: 3379 case XTerm_Color_cursor:
3894 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3380 process_color_seq (op, Color_cursor, str, resp);
3895 break; 3381 break;
3896#endif 3382#endif
3897 case XTerm_Color_pointer_fg: 3383 case XTerm_Color_pointer_fg:
3898 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3384 process_color_seq (op, Color_pointer_fg, str, resp);
3899 break; 3385 break;
3900 case XTerm_Color_pointer_bg: 3386 case XTerm_Color_pointer_bg:
3901 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3387 process_color_seq (op, Color_pointer_bg, str, resp);
3902 break; 3388 break;
3903#ifndef NO_BOLD_UNDERLINE_REVERSE 3389#ifndef NO_BOLD_UNDERLINE_REVERSE
3904 case XTerm_Color_RV: 3390 case XTerm_Color_RV:
3905 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3391 process_color_seq (op, Color_RV, str, resp);
3906 break; 3392 break;
3907 case Rxvt_Color_BD: 3393 case Rxvt_Color_BD:
3908 case URxvt_Color_BD: 3394 case URxvt_Color_BD:
3909 process_color_seq (op, Color_BD, str, resp); 3395 process_color_seq (op, Color_BD, str, resp);
3910 break; 3396 break;
3911 case Rxvt_Color_UL: 3397 case Rxvt_Color_UL:
3912 case URxvt_Color_UL: 3398 case URxvt_Color_UL:
3913 process_color_seq (op, Color_UL, str, resp); 3399 process_color_seq (op, Color_UL, str, resp);
3914 break; 3400 break;
3915 case URxvt_Color_IT: 3401 case URxvt_Color_IT:
3916 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3402 process_color_seq (op, Color_IT, str, resp);
3917 break; 3403 break;
3918#endif 3404#endif
3919#if TRANSPARENT && TINTING 3405#if ENABLE_TRANSPARENCY
3920 case URxvt_Color_tint: 3406 case URxvt_Color_tint:
3921 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3407 process_color_seq (op, Color_tint, str, resp);
3922 check_our_parents (); 3408 {
3923 if (am_transparent) 3409 bool changed = false;
3924 want_full_refresh = want_refresh = 1;
3925 break;
3926#endif
3927 3410
3411 if (ISSET_PIXCOLOR (Color_tint))
3412 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3413 else
3414 changed = bgPixmap.unset_tint ();
3415
3416 if (changed)
3417 update_background ();
3418 }
3419
3420 break;
3421#endif
3422
3423#if BG_IMAGE_FROM_FILE
3928 case Rxvt_Pixmap: 3424 case Rxvt_Pixmap:
3929 if (*str != ';') 3425 if (!strcmp (str, "?"))
3930 { 3426 {
3931#if XPM_BACKGROUND 3427 char str[256];
3932 scale_pixmap (""); /* reset to default scaling */ 3428
3933 set_bgPixmap (str); /* change pixmap */ 3429 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3934 scr_touch (true); 3430 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3935#endif 3431 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3432 process_xterm_seq (XTerm_title, str, CHAR_ST);
3936 } 3433 }
3937 3434 else
3938 while ((str = strchr (str, ';')) != NULL)
3939 { 3435 {
3436 int changed = 0;
3437
3438 if (*str != ';')
3439 {
3440 /* reset to default scaling :*/
3441 bgPixmap.unset_geometry ();
3442 if (bgPixmap.set_file (str)) /* change pixmap */
3443 changed++;
3444 str = strchr (str, ';');
3445 if (str == NULL)
3446 bgPixmap.set_defaultGeometry ();
3447 }
3448
3449 while (str)
3450 {
3940 str++; 3451 str++;
3941#if XPM_BACKGROUND 3452 if (bgPixmap.set_geometry (str))
3942 changed += scale_pixmap (str); 3453 changed++;
3943#endif 3454 str = strchr (str, ';');
3455 }
3456
3457 if (changed)
3458 update_background ();
3944 } 3459 }
3945
3946 if (changed)
3947 {
3948#ifdef XPM_BACKGROUND
3949 resize_pixmap ();
3950 scr_touch (true);
3951#endif
3952 }
3953 break; 3460 break;
3954 3461#endif
3955 case Rxvt_restoreFG:
3956 set_window_color (Color_fg, str);
3957 break;
3958 case Rxvt_restoreBG:
3959 set_window_color (Color_bg, str);
3960 break;
3961 3462
3962 case XTerm_logfile: 3463 case XTerm_logfile:
3963 // TODO, when secure mode? 3464 // TODO, when secure mode?
3964 break; 3465 break;
3965 3466
3966#ifdef MENUBAR
3967 case URxvt_Menu:
3968 if (OPTION (Opt_insecure))
3969 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3970 break;
3971#endif
3972#if 0 3467#if 0
3973 case Rxvt_dumpscreen: /* no error notices */ 3468 case Rxvt_dumpscreen: /* no error notices */
3974 { 3469 {
3975 int fd; 3470 int fd;
3976 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3471 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
3989 case URxvt_italicFont: 3484 case URxvt_italicFont:
3990 case URxvt_boldItalicFont: 3485 case URxvt_boldItalicFont:
3991#endif 3486#endif
3992 if (query) 3487 if (query)
3993 tt_printf ("\33]%d;%-.250s%c", saveop, 3488 tt_printf ("\33]%d;%-.250s%c", saveop,
3994 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3489 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3995 ? fontset[op - URxvt_font]->fontdesc : "", 3490 ? fontset[op - URxvt_font]->fontdesc : "",
3996 resp); 3491 resp);
3997 else 3492 else
3998 { 3493 {
3999 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3494 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
4002 allocated.push_back ((void *)res); 3497 allocated.push_back ((void *)res);
4003 set_fonts (); 3498 set_fonts ();
4004 } 3499 }
4005 break; 3500 break;
4006 3501
4007#if ENABLE_FRILLS 3502 case URxvt_version:
3503 if (query)
3504 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3505 op,
3506 rs[Rs_name], VERSION[0], VERSION[2],
3507 resp);
3508 break;
3509
3510#if !ENABLE_MINIMAL
4008 case URxvt_locale: 3511 case URxvt_locale:
4009 if (query) 3512 if (query)
4010 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3513 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4011 else 3514 else
4012 { 3515 {
4013 set_locale (str); 3516 set_locale (str);
4014 pty.set_utf8_mode (enc_utf8); 3517 pty->set_utf8_mode (enc_utf8);
4015 init_xlocale (); 3518 init_xlocale ();
4016 } 3519 }
4017 break; 3520 break;
4018 3521
4019 case URxvt_view_up: 3522 case URxvt_view_up:
… …
4030 break; 3533 break;
4031#endif 3534#endif
4032 3535
4033#if ENABLE_PERL 3536#if ENABLE_PERL
4034 case URxvt_perl: 3537 case URxvt_perl:
4035 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3538 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
4036 ; // no responses yet
4037 break; 3539 break;
4038#endif 3540#endif
4039 } 3541 }
4040} 3542}
4041/*----------------------------------------------------------------------*/ 3543/*----------------------------------------------------------------------*/
… …
4064 { 3566 {
4065 if (mode == 'r') 3567 if (mode == 'r')
4066 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3568 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4067 else 3569 else
4068 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3570 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4069 PrivMode (state, bit); 3571 set_privmode (bit, state);
4070 } 3572 }
4071 3573
4072 return state; 3574 return state;
4073} 3575}
4074 3576
4075/* we're not using priv _yet_ */ 3577/* we're not using priv _yet_ */
4076void 3578void
4077rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3579rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4078{ 3580{
4079 unsigned int i, j; 3581 unsigned int i, j;
4080 int state; 3582 int state;
4081 3583
4082 static const struct 3584 static const struct
4083 { 3585 {
4084 const int argval; 3586 const int argval;
4085 const unsigned long bit; 3587 const unsigned long bit;
4086 }
4087
4088 argtopriv[] = { 3588 } argtopriv[] = {
4089 { 1, PrivMode_aplCUR }, 3589 { 1, PrivMode_aplCUR }, // DECCKM
4090 { 2, PrivMode_vt52 }, 3590 { 2, PrivMode_vt52 },
4091 { 3, PrivMode_132 }, 3591 { 3, PrivMode_132 }, // DECCOLM
4092 { 4, PrivMode_smoothScroll }, 3592 { 4, PrivMode_smoothScroll }, // DECSCLM
4093 { 5, PrivMode_rVideo }, 3593 { 5, PrivMode_rVideo }, // DECSCNM
4094 { 6, PrivMode_relOrigin }, 3594 { 6, PrivMode_relOrigin }, // DECOM
4095 { 7, PrivMode_Autowrap }, 3595 { 7, PrivMode_Autowrap }, // DECAWM
4096 // 8, bi-directional support mode 3596 // 8, auto-repeat keys // DECARM
4097 { 9, PrivMode_MouseX10 }, 3597 { 9, PrivMode_MouseX10 },
4098#ifdef menuBar_esc
4099 { menuBar_esc, PrivMode_menuBar },
4100#endif
4101 // 18, 19 printing-related 3598 // 18, 19 printing-related
4102 { 25, PrivMode_VisibleCursor }, 3599 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
4103#ifdef scrollBar_esc 3600#ifdef scrollBar_esc
4104 { scrollBar_esc, PrivMode_scrollBar }, 3601 { scrollBar_esc, PrivMode_scrollBar },
4105#endif 3602#endif
4106 { 35, PrivMode_ShiftKeys }, // rxvt extension 3603 { 35, PrivMode_ShiftKeys }, // rxvt extension
3604 // 38, tektronix mode // DECTEK
4107 { 40, PrivMode_132OK }, 3605 { 40, PrivMode_132OK },
4108 // 41 xterm more fixes NYI 3606 // 41 xterm more fixes NYI
4109 // 45 margin bell NYI 3607 // 45 margin bell NYI
4110 // 46 start logging 3608 // 46 start logging
4111 { 47, PrivMode_Screen }, 3609 { 47, PrivMode_Screen },
4112 { 66, PrivMode_aplKP }, 3610 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4113#ifndef NO_BACKSPACE_KEY 3611#ifndef NO_BACKSPACE_KEY
4114 { 67, PrivMode_BackSpace }, 3612 { 67, PrivMode_BackSpace }, // DECBKM
4115#endif 3613#endif
4116 { 1000, PrivMode_MouseX11 }, 3614 { 1000, PrivMode_MouseX11 },
4117 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3615 { 1002, PrivMode_MouseBtnEvent },
4118 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3616 { 1003, PrivMode_MouseAnyEvent },
4119 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4120 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3617 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4121 { 1011, PrivMode_Keypress }, // rxvt extension 3618 { 1011, PrivMode_Keypress }, // rxvt extension
4122 // 1035 enable modifiers for alt, numlock NYI 3619 // 1035 enable modifiers for alt, numlock NYI
4123 // 1036 send ESC for meta keys NYI 3620 // 1036 send ESC for meta keys NYI
4124 // 1037 send DEL for keypad delete NYI 3621 // 1037 send DEL for keypad delete NYI
4125 { 1047, PrivMode_Screen }, 3622 { 1047, PrivMode_Screen },
4126 // 1048 save and restore cursor 3623 // 1048 save and restore cursor
4127 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3624 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4128 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3625 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3626 { 2004, PrivMode_BracketPaste },
4129 }; 3627 };
4130 3628
4131 if (nargs == 0) 3629 if (nargs == 0)
4132 return; 3630 return;
4133 3631
… …
4159 scr_touch (true); 3657 scr_touch (true);
4160 break; 3658 break;
4161#endif 3659#endif
4162 case 1048: /* alternative cursor save */ 3660 case 1048: /* alternative cursor save */
4163 case 1049: 3661 case 1049:
4164 if (OPTION (Opt_secondaryScreen)) 3662 if (option (Opt_secondaryScreen))
4165 if (mode == 0) 3663 if (mode == 0)
4166 scr_cursor (RESTORE); 3664 scr_cursor (RESTORE);
4167 else if (mode == 1) 3665 else if (mode == 1)
4168 scr_cursor (SAVE); 3666 scr_cursor (SAVE);
4169 break; 3667 break;
… …
4177 case 2: /* VT52 mode */ 3675 case 2: /* VT52 mode */
4178 /* oddball mode. should be set regardless of set/reset 3676 /* oddball mode. should be set regardless of set/reset
4179 * parameter. Return from VT52 mode with an ESC < from 3677 * parameter. Return from VT52 mode with an ESC < from
4180 * within VT52 mode 3678 * within VT52 mode
4181 */ 3679 */
4182 PrivMode (1, PrivMode_vt52); 3680 set_privmode (PrivMode_vt52, 1);
4183 break; 3681 break;
4184 case 3: /* 80/132 */ 3682 case 3: /* 80/132 */
4185 if (priv_modes & PrivMode_132OK) 3683 if (priv_modes & PrivMode_132OK)
4186 set_widthheight (((state ? 132 : 80) * fwidth), height); 3684 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4187 break; 3685 break;
4188 case 4: /* smooth scrolling */ 3686 case 4: /* smooth scrolling */
4189 set_option (Opt_jumpScroll, !state); 3687 set_option (Opt_jumpScroll, !state);
4190 break; 3688 break;
4191 case 5: /* reverse video */ 3689 case 5: /* reverse video */
… …
4198 scr_autowrap (state); 3696 scr_autowrap (state);
4199 break; 3697 break;
4200 /* case 8: - auto repeat, can't do on a per window basis */ 3698 /* case 8: - auto repeat, can't do on a per window basis */
4201 case 9: /* X10 mouse reporting */ 3699 case 9: /* X10 mouse reporting */
4202 if (state) /* orthogonal */ 3700 if (state) /* orthogonal */
4203 priv_modes &= ~PrivMode_MouseX11; 3701 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4204 break; 3702 break;
4205#ifdef menuBar_esc
4206 case menuBar_esc:
4207#ifdef MENUBAR
4208 map_menuBar (state);
4209#endif
4210 break;
4211#endif
4212#ifdef scrollBar_esc 3703#ifdef scrollBar_esc
4213 case scrollBar_esc: 3704 case scrollBar_esc:
4214 if (scrollbar_mapping (state)) 3705 if (scrollBar.map (state))
4215 { 3706 {
4216 resize_all_windows (0, 0, 0); 3707 resize_all_windows (0, 0, 0);
4217 scr_touch (true); 3708 scr_touch (true);
4218 } 3709 }
4219 break; 3710 break;
… …
4228 break; 3719 break;
4229 /* case 66: - application key pad */ 3720 /* case 66: - application key pad */
4230 /* case 67: - backspace key */ 3721 /* case 67: - backspace key */
4231 case 1000: /* X11 mouse reporting */ 3722 case 1000: /* X11 mouse reporting */
4232 if (state) /* orthogonal */ 3723 if (state) /* orthogonal */
4233 priv_modes &= ~PrivMode_MouseX10; 3724 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4234 break; 3725 break;
4235#if 0
4236 case 1001: 3726 case 1002:
4237 break; /* X11 mouse highlighting */ 3727 case 1003:
4238#endif 3728 if (state)
3729 {
3730 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3731 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3732 vt_emask_mouse = PointerMotionMask;
3733 }
3734 else
3735 vt_emask_mouse = NoEventMask;
3736
3737 vt_select_input ();
3738 break;
4239 case 1010: /* scroll to bottom on TTY output inhibit */ 3739 case 1010: /* scroll to bottom on TTY output inhibit */
4240 set_option (Opt_scrollTtyOutput, !state); 3740 set_option (Opt_scrollTtyOutput, !state);
4241 break; 3741 break;
4242 case 1011: /* scroll to bottom on key press */ 3742 case 1011: /* scroll to bottom on key press */
4243 set_option (Opt_scrollTtyKeypress, state); 3743 set_option (Opt_scrollTtyKeypress, state);
4244 break; 3744 break;
4245 case 1047: /* secondary screen w/ clearing last */ 3745 case 1047: /* secondary screen w/ clearing last */
4246 if (OPTION (Opt_secondaryScreen)) 3746 if (option (Opt_secondaryScreen))
4247 if (current_screen != PRIMARY) 3747 if (current_screen != PRIMARY)
4248 scr_erase_screen (2); 3748 scr_erase_screen (2);
3749
4249 scr_change_screen (state); 3750 scr_change_screen (state);
4250 break; 3751 break;
4251 case 1049: /* secondary screen w/ clearing first */ 3752 case 1049: /* secondary screen w/ clearing first */
4252 scr_change_screen (state); 3753 scr_change_screen (state);
4253 if (OPTION (Opt_secondaryScreen)) 3754 if (option (Opt_secondaryScreen))
4254 if (current_screen != PRIMARY) 3755 if (current_screen != PRIMARY)
4255 scr_erase_screen (2); 3756 scr_erase_screen (2);
4256 break; 3757 break;
4257 default: 3758 default:
4258 break; 3759 break;
… …
4386 scr_color (Color_bg, Color_bg); 3887 scr_color (Color_bg, Color_bg);
4387 break; 3888 break;
4388 3889
4389 //case 50: // not variable spacing 3890 //case 50: // not variable spacing
4390 3891
4391#if ENABLE_FRILLS 3892#if !ENABLE_MINIMAL
4392 case 90: 3893 case 90:
4393 case 91: /* set bright fg color */ 3894 case 91: /* set bright fg color */
4394 case 92: 3895 case 92:
4395 case 93: 3896 case 93:
4396 case 94: 3897 case 94:
… …
4420rxvt_term::process_graphics () 3921rxvt_term::process_graphics ()
4421{ 3922{
4422 unicode_t ch, cmd = cmd_getc (); 3923 unicode_t ch, cmd = cmd_getc ();
4423 3924
4424 if (cmd == 'Q') 3925 if (cmd == 'Q')
3926 {
4425 { /* query graphics */ 3927 /* query graphics */
4426 tt_printf ("\033G0\012"); /* no graphics */ 3928 tt_printf ("\033G0\012"); /* no graphics */
4427 return; 3929 return;
4428 } 3930 }
4429 /* swallow other graphics sequences until terminating ':' */ 3931 /* swallow other graphics sequences until terminating ':' */
4430 do 3932 do
… …
4461rxvt_term::tt_write (const char *data, unsigned int len) 3963rxvt_term::tt_write (const char *data, unsigned int len)
4462{ 3964{
4463 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3965 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4464 return; 3966 return;
4465 3967
4466 if (pty.pty < 0) 3968 if (pty->pty < 0)
4467 return; 3969 return;
4468 3970
4469 if (v_buflen == 0) 3971 if (v_buflen == 0)
4470 { 3972 {
4471 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3973 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4472 3974
4473 if ((unsigned int)written == len) 3975 if ((unsigned int)written == len)
4474 return; 3976 return;
4475 3977
4476 data += written; 3978 data += written;
… …
4480 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3982 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4481 3983
4482 memcpy (v_buffer + v_buflen, data, len); 3984 memcpy (v_buffer + v_buflen, data, len);
4483 v_buflen += len; 3985 v_buflen += len;
4484 3986
4485 pty_ev.set (EVENT_READ | EVENT_WRITE); 3987 pty_ev.set (ev::READ | ev::WRITE);
4486} 3988}
4487 3989
4488void rxvt_term::pty_write () 3990void rxvt_term::pty_write ()
4489{ 3991{
4490 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3992 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4491 3993
4492 if (written > 0) 3994 if (written > 0)
4493 { 3995 {
4494 v_buflen -= written; 3996 v_buflen -= written;
4495 3997
4496 if (v_buflen == 0) 3998 if (v_buflen == 0)
4497 { 3999 {
4498 free (v_buffer); 4000 free (v_buffer);
4499 v_buffer = 0; 4001 v_buffer = 0;
4500 v_buflen = 0;
4501 4002
4502 pty_ev.set (EVENT_READ); 4003 pty_ev.set (ev::READ);
4503 return; 4004 return;
4504 } 4005 }
4505 4006
4506 memmove (v_buffer, v_buffer + written, v_buflen); 4007 memmove (v_buffer, v_buffer + written, v_buflen);
4507 } 4008 }
4508 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4009 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4509 pty_ev.set (EVENT_READ); 4010 pty_ev.set (ev::READ);
4510} 4011}
4511 4012
4512/*----------------------- end-of-file (C source) -----------------------*/ 4013/*----------------------- end-of-file (C source) -----------------------*/
4513 4014

Diff Legend

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