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.259 by root, Fri Jan 13 04:59:04 2006 UTC vs.
Revision 1.416 by root, Tue Jul 15 16:41:22 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
1133 struct timespec ts = { 0, 0 };
1134 nanosleep (&ts, 0);
1135
1125 w.stop (); 1136 w.stop ();
1126 } 1137 }
1127 1138
1128 event_handler () 1139 event_handler ()
1129 : cw_yield (this, &event_handler::yield) 1140 : yield_ev (this, &event_handler::yield_cb)
1130 { 1141 {
1131 } 1142 }
1132} event_handler; 1143} event_handler;
1133#endif 1144#endif
1134 1145
… …
1145 1156
1146 memmove (cmdbuf_base, cmdbuf_ptr, n); 1157 memmove (cmdbuf_base, cmdbuf_ptr, n);
1147 cmdbuf_ptr = cmdbuf_base; 1158 cmdbuf_ptr = cmdbuf_base;
1148 cmdbuf_endp = cmdbuf_ptr + n; 1159 cmdbuf_endp = cmdbuf_ptr + n;
1149 1160
1150 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1161 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1151 1162
1152 if (r > 0) 1163 if (r > 0)
1153 { 1164 {
1154 cmdbuf_endp += r; 1165 cmdbuf_endp += r;
1155 return true; 1166 return true;
1156 } 1167 }
1157 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1168 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1158 { 1169 {
1159#if HAVE_SCHED_YIELD 1170#if LINUX_YIELD_HACK
1160 if (display->is_local) 1171 if (display->is_local)
1161 event_handler.cw_yield.start (); 1172 event_handler.yield_ev.start ();
1162#endif 1173#endif
1163 } 1174 }
1164 else 1175 else
1165 { 1176 {
1166 pty_ev.stop (); 1177 pty_ev.stop ();
1167 1178
1168 if (!OPTION (Opt_hold)) 1179 if (!option (Opt_hold))
1169 destroy (); 1180 destroy ();
1170 } 1181 }
1171 1182
1172 return false; 1183 return false;
1173} 1184}
1174 1185
1175void 1186void
1176rxvt_term::pty_cb (io_watcher &w, short revents) 1187rxvt_term::pty_cb (ev::io &w, int revents)
1177{ 1188{
1178 SET_R (this); 1189 make_current ();
1179 SET_LOCALE (locale);
1180 1190
1181 if (revents & EVENT_READ) 1191 if (revents & ev::READ)
1182 // loop, but don't allow a single term to monopolize us 1192 // loop, but don't allow a single term to monopolize us
1183 while (pty_fill ()) 1193 while (pty_fill ())
1184 if (cmd_parse ()) 1194 if (cmd_parse ())
1185 break; 1195 break;
1186 1196
1187 if (revents & EVENT_WRITE) 1197 if (revents & ev::WRITE)
1188 pty_write (); 1198 pty_write ();
1199
1200 refresh_check ();
1189} 1201}
1190 1202
1191void 1203void
1192rxvt_term::pointer_unblank () 1204rxvt_term::pointer_unblank ()
1193{ 1205{
1194 XDefineCursor (display->display, vt, TermWin_cursor); 1206 XDefineCursor (dpy, vt, TermWin_cursor);
1195 recolour_cursor (); 1207 recolour_cursor ();
1196 1208
1197#ifdef POINTER_BLANK 1209#ifdef POINTER_BLANK
1198 hidden_pointer = 0; 1210 hidden_pointer = 0;
1199 1211
1200 if (OPTION (Opt_pointerBlank)) 1212 if (option (Opt_pointerBlank))
1201 pointer_ev.start (NOW + pointerBlankDelay); 1213 pointer_ev.start (pointerBlankDelay);
1202#endif 1214#endif
1203} 1215}
1204 1216
1205#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1206void 1218void
1207rxvt_term::pointer_blank () 1219rxvt_term::pointer_blank ()
1208{ 1220{
1209 if (!OPTION (Opt_pointerBlank)) 1221 if (!option (Opt_pointerBlank))
1210 return; 1222 return;
1211 1223
1212 XDefineCursor (display->display, vt, display->blank_cursor); 1224 XDefineCursor (dpy, vt, display->blank_cursor);
1213 XFlush (display->display); 1225 XFlush (dpy);
1214 1226
1215 hidden_pointer = 1; 1227 hidden_pointer = 1;
1216} 1228}
1217 1229
1218void 1230void
1219rxvt_term::pointer_cb (time_watcher &w) 1231rxvt_term::pointer_cb (ev::timer &w, int revents)
1220{ 1232{
1221 SET_R (this); 1233 make_current ();
1222 SET_LOCALE (locale);
1223 1234
1224 pointer_blank (); 1235 pointer_blank ();
1225} 1236}
1226#endif 1237#endif
1227 1238
1228void 1239void
1229rxvt_term::mouse_report (XButtonEvent &ev) 1240rxvt_term::mouse_report (XButtonEvent &ev)
1230{ 1241{
1231 int button_number, key_state = 0; 1242 int button_number, key_state = 0;
1232 int x, y; 1243 int x, y;
1244 int code = 32;
1233 1245
1234 x = ev.x; 1246 x = Pixel2Col (ev.x);
1235 y = ev.y; 1247 y = Pixel2Row (ev.y);
1236 pixel_position (&x, &y); 1248 if (ev.type == MotionNotify)
1249 {
1250 if (x == mouse_row && y == mouse_col)
1251 return;
1252 mouse_row = x;
1253 mouse_col = y;
1254 code += 32;
1255 }
1237 1256
1238 if (MEvent.button == AnyButton) 1257 if (MEvent.button == AnyButton)
1239 button_number = 3; 1258 button_number = 3;
1240 else 1259 else
1241 { 1260 {
… …
1287 x + 1, 1306 x + 1,
1288 y + 1); 1307 y + 1);
1289#endif 1308#endif
1290 1309
1291 tt_printf ("\033[M%c%c%c", 1310 tt_printf ("\033[M%c%c%c",
1292 (32 + button_number + key_state), 1311 (code + button_number + key_state),
1293 (32 + x + 1), 1312 (32 + x + 1),
1294 (32 + y + 1)); 1313 (32 + y + 1));
1295} 1314}
1296
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 1315
1307/*{{{ process an X event */ 1316/*{{{ process an X event */
1308void 1317void
1309rxvt_term::x_cb (XEvent &ev) 1318rxvt_term::x_cb (XEvent &ev)
1310{ 1319{
1311 dDisp; 1320 make_current ();
1312 1321
1313 SET_R (this); 1322 dLocal (Display *, dpy);
1314 SET_LOCALE (locale);
1315 1323
1316 if (ev.xany.window == vt 1324 if (ev.xany.window == vt
1325 && SHOULD_INVOKE (HOOK_X_EVENT)
1317 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1326 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1318 return; 1327 return;
1319 1328
1329 // for XQueryPointer
1320 Window unused_root, unused_child; 1330 Window unused_root, unused_child;
1321 int unused_root_x, unused_root_y; 1331 int unused_root_x, unused_root_y;
1322 unsigned int unused_mask; 1332 unsigned int unused_mask;
1323 1333
1324 switch (ev.type) 1334 switch (ev.type)
1325 { 1335 {
1326 case KeyPress: 1336 case KeyPress:
1327#if ISO_14755 1337 key_press (ev.xkey);
1328 if (!(iso14755buf & ISO_14755_52))
1329#endif
1330 lookup_key (ev.xkey);
1331
1332 break; 1338 break;
1333 1339
1334 case KeyRelease: 1340 case KeyRelease:
1335 { 1341 key_release (ev.xkey);
1336#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1337 KeySym keysym;
1338
1339 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1340#endif
1341
1342#if ENABLE_FRILLS || ISO_14755
1343 // ISO 14755 support
1344 if (iso14755buf)
1345 if (iso14755buf & ISO_14755_52)
1346 {
1347# if ENABLE_OVERLAY
1348 scr_overlay_off ();
1349# endif
1350# if ISO_14755
1351 // iso14755 part 5.2 handling: release time
1352 // first: controls
1353 if ((ev.xkey.state & ControlMask)
1354 && ((keysym >= 0x40 && keysym <= 0x5f)
1355 || (keysym >= 0x61 && keysym <= 0x7f)))
1356 {
1357 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1358 commit_iso14755 ();
1359 goto skip_switch;
1360 }
1361
1362 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1363 if (i[0] == keysym)
1364 {
1365 iso14755buf = ISO_14755_51 | i[1];
1366 commit_iso14755 ();
1367 goto skip_switch;
1368 }
1369
1370 scr_bell ();
1371# endif
1372 iso14755buf = 0;
1373 break;
1374 }
1375 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1376 {
1377# if ENABLE_OVERLAY
1378 scr_overlay_off ();
1379# endif
1380 if (iso14755buf & ISO_14755_51)
1381 commit_iso14755 ();
1382#if ISO_14755
1383 else if (iso14755buf & ISO_14755_STARTED)
1384 {
1385 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1386
1387 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1388 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1389 }
1390# endif
1391 else
1392 iso14755buf = 0;
1393 }
1394#endif
1395
1396 if (ev.xany.window == vt
1397 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1398 break;
1399
1400#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1401 if (!(ev.xkey.state & ControlMask))
1402 slip_wheel_ev.stop ();
1403 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1404 mouse_slip_wheel_speed = 0;
1405#endif
1406 break; 1342 break;
1407 }
1408 1343
1409 case ButtonPress: 1344 case ButtonPress:
1410 button_press (ev.xbutton); 1345 button_press (ev.xbutton);
1411 break; 1346 break;
1412 1347
… …
1414 button_release (ev.xbutton); 1349 button_release (ev.xbutton);
1415 break; 1350 break;
1416 1351
1417 case ClientMessage: 1352 case ClientMessage:
1418 if (ev.xclient.format == 32 1353 if (ev.xclient.format == 32
1419 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1354 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1420 { 1355 {
1356 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1357 {
1358 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1359 {
1421 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1360 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1361 {
1362 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1422 destroy (); 1363 destroy ();
1364 }
1423#if ENABLE_EWMH 1365#if ENABLE_EWMH
1424 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1366 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1425 XSendEvent (disp, ev.xclient.window = display->root, 1367 XSendEvent (dpy, ev.xclient.window = display->root,
1426 False, SubstructureRedirectMask | SubstructureNotifyMask, 1368 False, SubstructureRedirectMask | SubstructureNotifyMask,
1427 &ev); 1369 &ev);
1370#endif
1371 }
1372 }
1373#if ENABLE_XEMBED
1374 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1375 {
1376 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1377 focus_in ();
1378 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1379 focus_out ();
1380 }
1428#endif 1381#endif
1429 } 1382 }
1430#if ENABLE_XEMBED
1431 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1432 {
1433 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1434 focus_in ();
1435 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1436 focus_out ();
1437 }
1438#endif
1439#ifdef OFFIX_DND
1440 /* OffiX Dnd (drag 'n' drop) protocol */
1441 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1442 && (ev.xclient.data.l[0] == DndFile
1443 || ev.xclient.data.l[0] == DndDir
1444 || ev.xclient.data.l[0] == DndLink))
1445 {
1446 /* Get Dnd data */
1447 Atom ActualType;
1448 int ActualFormat;
1449 unsigned char *data;
1450 unsigned long Size, RemainingBytes;
1451
1452 XGetWindowProperty (disp, display->root,
1453 xa[XA_DNDSELECTION],
1454 0L, 1000000L,
1455 False, AnyPropertyType,
1456 &ActualType, &ActualFormat,
1457 &Size, &RemainingBytes,
1458 &data);
1459 set_string_property (XA_CUT_BUFFER0, data);
1460 XFree (data);
1461 selection_paste (display->root, XA_CUT_BUFFER0, true);
1462 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1463 }
1464#endif /* OFFIX_DND */
1465 break;
1466
1467 case MappingNotify:
1468 XRefreshKeyboardMapping (&ev.xmapping);
1469 break; 1383 break;
1470 1384
1471 /* 1385 /*
1472 * XXX: this is not the _current_ arrangement 1386 * XXX: this is not the _current_ arrangement
1473 * Here's my conclusion: 1387 * Here's my conclusion:
… …
1492 break; 1406 break;
1493 } 1407 }
1494 break; 1408 break;
1495 1409
1496 case FocusIn: 1410 case FocusIn:
1411 if (ev.xfocus.detail != NotifyInferior
1412 && ev.xfocus.detail != NotifyPointer
1413 && ev.xfocus.mode != NotifyGrab)
1497 focus_in (); 1414 focus_in ();
1498 break; 1415 break;
1499 1416
1500 case FocusOut: 1417 case FocusOut:
1418 if (ev.xfocus.detail != NotifyInferior
1419 && ev.xfocus.detail != NotifyPointer
1420 && ev.xfocus.mode != NotifyGrab)
1501 focus_out (); 1421 focus_out ();
1502 break; 1422 break;
1503 1423
1504 case ConfigureNotify: 1424 case ConfigureNotify:
1425 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1426 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1427 szHint.width, szHint.height);*/
1505 if (ev.xconfigure.window == parent[0]) 1428 if (ev.xconfigure.window == parent[0])
1506 { 1429 {
1507 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1508 ; 1431 ;
1509 1432
1510 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1511 { 1434 {
1512 seen_resize = 1; 1435 seen_resize = 1;
1513 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1514 } 1437 }
1515 1438 else
1516#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1439 {
1517 if (OPTION (Opt_transparent)) 1440#ifdef HAVE_BG_PIXMAP
1518 check_our_parents (); 1441 if (bgPixmap.window_position_sensitive ())
1442 {
1443 if (mapped)
1444 update_background ();
1445 else
1446 bgPixmap.invalidate ();
1447 }
1519#endif 1448#endif
1449 }
1450
1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1520 } 1452 }
1521 break; 1453 break;
1522 1454
1523 case PropertyNotify: 1455 case PropertyNotify:
1456 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1524 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1525 && ev.xproperty.state == PropertyNewValue) 1458 && ev.xproperty.state == PropertyNewValue)
1526 selection_property (ev.xproperty.window, ev.xproperty.atom); 1459 selection_property (ev.xproperty.window, ev.xproperty.atom);
1527 1460
1528 break; 1461 break;
1529 1462
1530 case SelectionClear: 1463 case SelectionClear:
1531 selection_clear (); 1464 selection_clear ();
… …
1539 case SelectionRequest: 1472 case SelectionRequest:
1540 selection_send (ev.xselectionrequest); 1473 selection_send (ev.xselectionrequest);
1541 break; 1474 break;
1542 1475
1543 case MapNotify: 1476 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a
1479 * non-reparenting window manager. In those cases we never get first
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does
1482 * reparenting.
1483 * We should not render background immidiately, as there could be several
1484 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1485 * by scheduling background redraw as soon as we can, but giving a short
1486 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results.
1489 */
1490 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1491 update_background_ev.start (0.025);
1492#endif
1544 mapped = 1; 1493 mapped = 1;
1545#ifdef TEXT_BLINK 1494#ifdef TEXT_BLINK
1546 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1495 text_blink_ev.start ();
1547#endif 1496#endif
1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1497 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1549 break; 1498 break;
1550 1499
1551 case UnmapNotify: 1500 case UnmapNotify:
… …
1553#ifdef TEXT_BLINK 1502#ifdef TEXT_BLINK
1554 text_blink_ev.stop (); 1503 text_blink_ev.stop ();
1555#endif 1504#endif
1556 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1505 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1557 break; 1506 break;
1558
1559#ifdef TRANSPARENT
1560 case ReparentNotify:
1561 rootwin_cb (ev);
1562 break;
1563#endif /* TRANSPARENT */
1564 1507
1565 case GraphicsExpose: 1508 case GraphicsExpose:
1566 case Expose: 1509 case Expose:
1567 if (ev.xany.window == vt) 1510 if (ev.xany.window == vt)
1568 { 1511 {
1569 do 1512 do
1513 {
1570 scr_expose (ev.xexpose.x, ev.xexpose.y, 1514 scr_expose (ev.xexpose.x, ev.xexpose.y,
1571 ev.xexpose.width, ev.xexpose.height, False); 1515 ev.xexpose.width, ev.xexpose.height, False);
1516 }
1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1573 1518
1574 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1575 1520
1576 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522 {
1577 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1578 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1525 }
1579 1526
1580 want_refresh = 1; 1527 want_refresh = 1;
1581 } 1528 }
1582 else 1529 else
1583 { 1530 {
1584 XEvent unused_event; 1531 XEvent unused_event;
1585 1532
1586 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1533 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1587 ; 1534 ;
1588 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1589 ; 1536 ;
1590 1537
1591 if (isScrollbarWindow (ev.xany.window)) 1538 if (scrollBar.state && ev.xany.window == scrollBar.win)
1592 { 1539 {
1593 scrollBar.setIdle (); 1540 scrollBar.state = STATE_IDLE;
1594 scrollbar_show (0); 1541 scrollBar.show (0);
1595 } 1542 }
1596#ifdef MENUBAR
1597 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1598 menubar_expose ();
1599#endif
1600
1601#ifdef TRANSPARENT
1602 if (am_transparent && ev.xany.window == parent[0])
1603 XClearWindow (disp, ev.xany.window);
1604#endif
1605 } 1543 }
1606 break; 1544 break;
1607 1545
1608 case MotionNotify: 1546 case MotionNotify:
1609 printf ("motion notify\n");//D
1610#ifdef POINTER_BLANK 1547#ifdef POINTER_BLANK
1611 if (hidden_pointer) 1548 if (hidden_pointer)
1612 pointer_unblank (); 1549 pointer_unblank ();
1613#endif 1550#endif
1614#if MENUBAR 1551 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1615 if (isMenuBarWindow (ev.xany.window)) 1552 || priv_modes & PrivMode_MouseAnyEvent)
1616 {
1617 menubar_control (ev.xbutton); 1553 mouse_report (ev.xbutton);
1618 break;
1619 }
1620#endif
1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1554 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1622 break; 1555 break;
1623 1556
1624 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1625 { 1558 {
1559 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1626 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1560 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1627 ; // nop 1561 ; // nop
1628 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1562 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1629 { 1563 {
1630 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1564 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1631 ; 1565 ;
1632 1566
1633 XQueryPointer (disp, vt, 1567 XQueryPointer (dpy, vt,
1634 &unused_root, &unused_child, 1568 &unused_root, &unused_child,
1635 &unused_root_x, &unused_root_y, 1569 &unused_root_x, &unused_root_y,
1636 &ev.xbutton.x, &ev.xbutton.y, 1570 &ev.xbutton.x, &ev.xbutton.y,
1637 &ev.xbutton.state); 1571 &ev.xbutton.state);
1638#ifdef MOUSE_THRESHOLD 1572#ifdef MOUSE_THRESHOLD
… …
1658 int dist; 1592 int dist;
1659 1593
1660 /* don't clobber the current delay if we are 1594 /* don't clobber the current delay if we are
1661 * already in the middle of scrolling. 1595 * already in the middle of scrolling.
1662 */ 1596 */
1663 if (!sel_scroll_ev.active) 1597 if (!sel_scroll_ev.is_active ())
1664 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1598 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1665 1599
1666 /* save the event params so we can highlight 1600 /* save the event params so we can highlight
1667 * the selection in the pending-scroll loop 1601 * the selection in the pending-scroll loop
1668 */ 1602 */
1669 selection_save_x = ev.xbutton.x; 1603 selection_save_x = ev.xbutton.x;
… …
1691 else 1625 else
1692 { 1626 {
1693 /* we are within the text window, so we 1627 /* we are within the text window, so we
1694 * shouldn't be scrolling 1628 * shouldn't be scrolling
1695 */ 1629 */
1696 if (sel_scroll_ev.active)
1697 sel_scroll_ev.stop(); 1630 sel_scroll_ev.stop();
1698 } 1631 }
1699#endif 1632#endif
1700#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
1701 } 1634 }
1702#endif 1635#endif
1703 } 1636 }
1704 } 1637 }
1705 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1638 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1706 { 1639 {
1707 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1640 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1708 MotionNotify, &ev)) 1641 MotionNotify, &ev))
1709 ; 1642 ;
1710 1643
1711 XQueryPointer (disp, scrollBar.win, 1644 XQueryPointer (dpy, scrollBar.win,
1712 &unused_root, &unused_child, 1645 &unused_root, &unused_child,
1713 &unused_root_x, &unused_root_y, 1646 &unused_root_x, &unused_root_y,
1714 &ev.xbutton.x, &ev.xbutton.y, 1647 &ev.xbutton.x, &ev.xbutton.y,
1715 &unused_mask); 1648 &unused_mask);
1716 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1717 scrollbar_size ()); 1650 scrollBar.size ());
1718 want_refresh = 1; 1651 want_refresh = 1;
1719 refresh_limit = 0;
1720 scrollbar_show (1); 1652 scrollBar.show (1);
1721 } 1653 }
1722 break; 1654 break;
1723 } 1655 }
1724 1656
1725skip_switch: ;
1726
1727#if defined(CURSOR_BLINK) 1657#if defined(CURSOR_BLINK)
1728 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1658 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1729 { 1659 {
1730 if (hidden_cursor) 1660 if (hidden_cursor)
1731 { 1661 {
1732 hidden_cursor = 0; 1662 hidden_cursor = 0;
1733 want_refresh = 1; 1663 want_refresh = 1;
1734 } 1664 }
1735 1665
1736 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1666 cursor_blink_ev.again ();
1737 } 1667 }
1738#endif 1668#endif
1739 1669
1740#if defined(POINTER_BLANK) 1670#if defined(POINTER_BLANK)
1741 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1671 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1742 { 1672 {
1743 if (ev.type == MotionNotify 1673 if (ev.type == MotionNotify
1744 || ev.type == ButtonPress 1674 || ev.type == ButtonPress
1745 || ev.type == ButtonRelease) 1675 || ev.type == ButtonRelease)
1746 if (hidden_pointer) 1676 if (hidden_pointer)
… …
1748 1678
1749 if (ev.type == KeyPress && hidden_pointer == 0) 1679 if (ev.type == KeyPress && hidden_pointer == 0)
1750 pointer_blank (); 1680 pointer_blank ();
1751 } 1681 }
1752#endif 1682#endif
1683
1684 refresh_check ();
1753} 1685}
1754 1686
1755void 1687void
1756rxvt_term::focus_in () 1688rxvt_term::focus_in ()
1757{ 1689{
1758 if (!focus) 1690 if (!focus)
1759 { 1691 {
1760 focus = 1; 1692 focus = 1;
1761 want_refresh = 1; 1693 want_refresh = 1;
1762 1694
1763 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1695 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1764 1696
1765#if USE_XIM 1697#if USE_XIM
1766 if (Input_Context != NULL) 1698 if (Input_Context != NULL)
1767 { 1699 {
1768 IMSetStatusPosition (); 1700 IMSetPosition ();
1769 XSetICFocus (Input_Context); 1701 XSetICFocus (Input_Context);
1770 } 1702 }
1771#endif 1703#endif
1772#if CURSOR_BLINK 1704#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink)) 1705 if (option (Opt_cursorBlink))
1774 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1706 cursor_blink_ev.again ();
1775#endif 1707#endif
1776#if OFF_FOCUS_FADING 1708#if OFF_FOCUS_FADING
1777 if (rs[Rs_fade]) 1709 if (rs[Rs_fade])
1778 { 1710 {
1779 pix_colors = pix_colors_focused; 1711 pix_colors = pix_colors_focused;
1780 scr_recolour (); 1712 scr_recolour ();
1781 } 1713 }
1782#endif 1714#endif
1715#if ENABLE_FRILLS
1716 if (option (Opt_urgentOnBell))
1717 {
1718 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1719 {
1720 h->flags &= ~XUrgencyHint;
1721 XSetWMHints (dpy, parent[0], h);
1722 }
1723 }
1724#endif
1783 } 1725 }
1784} 1726}
1785 1727
1786void 1728void
1787rxvt_term::focus_out () 1729rxvt_term::focus_out ()
… …
1795 1737
1796#if ENABLE_FRILLS || ISO_14755 1738#if ENABLE_FRILLS || ISO_14755
1797 if (iso14755buf) 1739 if (iso14755buf)
1798 { 1740 {
1799 iso14755buf = 0; 1741 iso14755buf = 0;
1800# if ENABLE_OVERLAY 1742# if ISO_14755
1801 scr_overlay_off (); 1743 scr_overlay_off ();
1802# endif 1744# endif
1803 } 1745 }
1804#endif 1746#endif
1805#if USE_XIM 1747#if USE_XIM
1806 if (Input_Context != NULL) 1748 if (Input_Context != NULL)
1807 XUnsetICFocus (Input_Context); 1749 XUnsetICFocus (Input_Context);
1808#endif 1750#endif
1809#if CURSOR_BLINK 1751#if CURSOR_BLINK
1810 if (OPTION (Opt_cursorBlink)) 1752 if (option (Opt_cursorBlink))
1811 cursor_blink_ev.stop (); 1753 cursor_blink_ev.stop ();
1754
1812 hidden_cursor = 0; 1755 hidden_cursor = 0;
1813#endif 1756#endif
1814#if OFF_FOCUS_FADING 1757#if OFF_FOCUS_FADING
1815 if (rs[Rs_fade]) 1758 if (rs[Rs_fade])
1816 { 1759 {
… …
1819 } 1762 }
1820#endif 1763#endif
1821 } 1764 }
1822} 1765}
1823 1766
1824#if TRANSPARENT 1767void
1768rxvt_term::update_fade_color (unsigned int idx)
1769{
1770#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade])
1772 {
1773 rgba c;
1774 pix_colors [Color_fade].get (c);
1775 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1776 }
1777#endif
1778}
1779
1780#if ENABLE_TRANSPARENCY || ENABLE_PERL
1825void 1781void
1826rxvt_term::rootwin_cb (XEvent &ev) 1782rxvt_term::rootwin_cb (XEvent &ev)
1827{ 1783{
1828 SET_R (this); 1784 make_current ();
1829 SET_LOCALE (locale);
1830 1785
1786 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1787 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1788 return;
1789
1790# if ENABLE_TRANSPARENCY
1831 switch (ev.type) 1791 switch (ev.type)
1832 { 1792 {
1833 case PropertyNotify: 1793 case PropertyNotify:
1834 /* 1794 /*
1835 * if user used some Esetroot compatible prog to set the root bg, 1795 * if user used some Esetroot compatible prog to set the root bg,
1836 * use the property to determine the pixmap. We use it later on. 1796 * use the property to determine the pixmap. We use it later on.
1837 */ 1797 */
1838 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1798 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1799 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1840 return; 1800 {
1801 bgPixmap.set_root_pixmap ();
1802 update_background ();
1803 }
1841 1804
1842 /* FALLTHROUGH */
1843 case ReparentNotify:
1844 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1845 want_refresh = want_full_refresh = 1;
1846 break; 1805 break;
1847 } 1806 }
1807# endif
1808
1809 refresh_check ();
1848} 1810}
1849#endif 1811#endif
1850 1812
1851void 1813void
1852rxvt_term::button_press (XButtonEvent &ev) 1814rxvt_term::button_press (XButtonEvent &ev)
… …
1861 /* 1823 /*
1862 * VT window processing of button press 1824 * VT window processing of button press
1863 */ 1825 */
1864 if (ev.window == vt) 1826 if (ev.window == vt)
1865 { 1827 {
1828 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1829 return;
1830
1866#if ISO_14755 1831#if ISO_14755
1867 // 5.4 1832 // 5.4
1868 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1833 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1869 { 1834 {
1870 iso14755_54 (ev.x, ev.y); 1835 iso14755_54 (ev.x, ev.y);
… …
1904 mouse_report (ev); 1869 mouse_report (ev);
1905 } 1870 }
1906#else 1871#else
1907 MEvent.button = ev.button; 1872 MEvent.button = ev.button;
1908 mouse_report (ev); 1873 mouse_report (ev);
1909#endif /* MOUSE_REPORT_DOUBLECLICK */ 1874#endif /* MOUSE_REPORT_DOUBLECLICK */
1910 1875
1911 } 1876 }
1912 else 1877 else
1913 { 1878 {
1914 if (ev.button != MEvent.button) 1879 if (ev.button != MEvent.button)
1915 MEvent.clicks = 0; 1880 MEvent.clicks = 0;
1916 1881
1917 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1918 switch (ev.button) 1882 switch (ev.button)
1919 { 1883 {
1920 case Button1: 1884 case Button1:
1921 /* allow meta + click to select rectangular areas */ 1885 /* allow meta + click to select rectangular areas */
1922 /* should be done in screen.C */ 1886 /* should be done in screen.C */
1923#if ENABLE_FRILLS 1887#if ENABLE_FRILLS
1924 selection.rect = !!(ev.state & ModMetaMask); 1888 selection.rect = !!(ev.state & ModMetaMask);
1925#else 1889#else
1926 selection.rect = false; 1890 selection.rect = false;
1927#endif 1891#endif
1928 1892
1929 /* allow shift+left click to extend selection */ 1893 /* allow shift+left click to extend selection */
1930 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1894 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1931 { 1895 {
1932 if (MEvent.button == Button1 && clickintime) 1896 if (MEvent.button == Button1 && clickintime)
1933 selection_rotate (ev.x, ev.y); 1897 selection_rotate (ev.x, ev.y);
1934 else 1898 else
1935 selection_extend (ev.x, ev.y, 1); 1899 selection_extend (ev.x, ev.y, 1);
1936 } 1900 }
1937 else 1901 else
1938 { 1902 {
1939 if (MEvent.button == Button1 && clickintime) 1903 if (MEvent.button == Button1 && clickintime)
1940 MEvent.clicks++; 1904 MEvent.clicks++;
1941 else 1905 else
1942 MEvent.clicks = 1; 1906 MEvent.clicks = 1;
1943 1907
1944 selection_click (MEvent.clicks, ev.x, ev.y); 1908 selection_click (MEvent.clicks, ev.x, ev.y);
1945 } 1909 }
1946 1910
1947 MEvent.button = Button1; 1911 MEvent.button = Button1;
1948 break; 1912 break;
1949 1913
1950 case Button3: 1914 case Button3:
1951 if (MEvent.button == Button3 && clickintime) 1915 if (MEvent.button == Button3 && clickintime)
1952 selection_rotate (ev.x, ev.y); 1916 selection_rotate (ev.x, ev.y);
1953 else 1917 else
1954 selection_extend (ev.x, ev.y, 1); 1918 selection_extend (ev.x, ev.y, 1);
1955 1919
1956 MEvent.button = Button3; 1920 MEvent.button = Button3;
1957 break; 1921 break;
1958 } 1922 }
1959 } 1923 }
1960 1924
1961 MEvent.time = ev.time; 1925 MEvent.time = ev.time;
1962 return; 1926 return;
1963 } 1927 }
1964 1928
1965 /* 1929 /*
1966 * Scrollbar window processing of button press 1930 * Scrollbar window processing of button press
1967 */ 1931 */
1968 if (isScrollbarWindow (ev.window)) 1932 if (scrollBar.state && ev.window == scrollBar.win)
1969 { 1933 {
1970 scrollBar.setIdle (); 1934 page_dirn direction = NO_DIR;
1935
1936 if (scrollBar.upButton (ev.y))
1937 direction = UP; /* up */
1938 else if (scrollBar.dnButton (ev.y))
1939 direction = DN; /* down */
1940
1941 scrollBar.state = STATE_IDLE;
1971 /* 1942 /*
1972 * Rxvt-style scrollbar: 1943 * Rxvt-style scrollbar:
1973 * move up if mouse is above slider 1944 * move up if mouse is above slider
1974 * move dn if mouse is below slider 1945 * move dn if mouse is below slider
1975 * 1946 *
… …
1984 /* 1955 /*
1985 * Mouse report disabled scrollbar: 1956 * Mouse report disabled scrollbar:
1986 * arrow buttons - send up/down 1957 * arrow buttons - send up/down
1987 * click on scrollbar - send pageup/down 1958 * click on scrollbar - send pageup/down
1988 */ 1959 */
1989 if ((scrollBar.style == R_SB_NEXT 1960 if (direction == UP)
1990 && scrollbarnext_upButton (ev.y))
1991 || (scrollBar.style == R_SB_RXVT
1992 && scrollbarrxvt_upButton (ev.y)))
1993 tt_printf ("\033[A"); 1961 tt_printf ("\033[A");
1994 else if ((scrollBar.style == R_SB_NEXT 1962 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"); 1963 tt_printf ("\033[B");
1999 else 1964 else
2000 switch (ev.button) 1965 switch (ev.button)
2001 { 1966 {
2002 case Button2: 1967 case Button2:
… …
2009 tt_printf ("\033[5~"); 1974 tt_printf ("\033[5~");
2010 break; 1975 break;
2011 } 1976 }
2012 } 1977 }
2013 else 1978 else
2014#endif /* NO_SCROLLBAR_REPORT */ 1979#endif /* NO_SCROLLBAR_REPORT */
2015
2016 {
2017 char upordown = 0;
2018
2019 if (scrollBar.style == R_SB_NEXT)
2020 { 1980 {
2021 if (scrollbarnext_upButton (ev.y)) 1981 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 { 1982 {
2035#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1983#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1984 if (!cont_scroll_ev.is_active ())
2036 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1985 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2037#endif 1986#endif
2038 if (scr_page (upordown < 0 ? UP : DN, 1)) 1987 if (scr_page (direction, 1))
2039 { 1988 {
2040 if (upordown < 0) 1989 if (direction == UP)
2041 scrollBar.setUp (); 1990 scrollBar.state = STATE_UP;
2042 else 1991 else
2043 scrollBar.setDn (); 1992 scrollBar.state = STATE_DOWN;
2044 } 1993 }
2045 } 1994 }
2046 else 1995 else
2047 switch (ev.button) 1996 switch (ev.button)
2048 { 1997 {
2049 case Button2: 1998 case Button2:
2050 switch (scrollbar_align) 1999 switch (scrollBar.align)
2051 { 2000 {
2052 case R_SB_ALIGN_TOP: 2001 case R_SB_ALIGN_TOP:
2053 csrO = 0; 2002 csrO = 0;
2054 break; 2003 break;
2055 case R_SB_ALIGN_CENTRE: 2004 case R_SB_ALIGN_CENTRE:
… …
2061 } 2010 }
2062 2011
2063 if (scrollBar.style == R_SB_XTERM 2012 if (scrollBar.style == R_SB_XTERM
2064 || scrollbar_above_slider (ev.y) 2013 || scrollbar_above_slider (ev.y)
2065 || scrollbar_below_slider (ev.y)) 2014 || scrollbar_below_slider (ev.y))
2066 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2067 2016
2068 scrollBar.setMotion (); 2017 scrollBar.state = STATE_MOTION;
2069 break; 2018 break;
2070 2019
2071 case Button1: 2020 case Button1:
2072 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2021 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2073 csrO = ev.y - scrollBar.top; 2022 csrO = ev.y - scrollBar.top;
2074 /* FALLTHROUGH */ 2023 /* FALLTHROUGH */
2075 2024
2076 case Button3: 2025 case Button3:
2077 if (scrollBar.style != R_SB_XTERM) 2026 if (scrollBar.style != R_SB_XTERM)
… …
2087 scr_page (DN, nrow - 1); 2036 scr_page (DN, nrow - 1);
2088# else 2037# else
2089 scr_page (DN, nrow / 4); 2038 scr_page (DN, nrow / 4);
2090# endif 2039# endif
2091 else 2040 else
2092 scrollBar.setMotion (); 2041 scrollBar.state = STATE_MOTION;
2093 } 2042 }
2094 else 2043 else
2095 { 2044 {
2096 scr_page ((ev.button == Button1 ? DN : UP), 2045 scr_page ((ev.button == Button1 ? DN : UP),
2097 (nrow 2046 (nrow
2098 * scrollbar_position (ev.y) 2047 * scrollbar_position (ev.y)
2099 / scrollbar_size ())); 2048 / scrollBar.size ()));
2100 } 2049 }
2101 2050
2102 break; 2051 break;
2103 } 2052 }
2104 } 2053 }
2105 2054
2106 return; 2055 return;
2107 } 2056 }
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} 2057}
2117 2058
2118void 2059void
2119rxvt_term::button_release (XButtonEvent &ev) 2060rxvt_term::button_release (XButtonEvent &ev)
2120{ 2061{
… …
2122 2063
2123 csrO = 0; /* reset csr Offset */ 2064 csrO = 0; /* reset csr Offset */
2124 if (!bypass_keystate) 2065 if (!bypass_keystate)
2125 reportmode = !! (priv_modes & PrivMode_mouse_report); 2066 reportmode = !! (priv_modes & PrivMode_mouse_report);
2126 2067
2127 if (scrollbar_isUpDn ()) 2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2128 { 2069 {
2129 scrollBar.setIdle (); 2070 scrollBar.state = STATE_IDLE;
2130 scrollbar_show (0); 2071 scrollBar.show (0);
2131#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2132 refresh_type &= ~SMOOTH_REFRESH;
2133#endif
2134 } 2072 }
2135 2073
2136#ifdef SELECTION_SCROLLING 2074#ifdef SELECTION_SCROLLING
2137 if (sel_scroll_ev.active)
2138 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
2139#endif 2076#endif
2140 2077
2141 if (ev.window == vt) 2078 if (ev.window == vt)
2142 { 2079 {
2080 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2081 return;
2082
2143#if ISO_14755 2083#if ISO_14755
2144 // 5.4 2084 // 5.4
2145 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2085 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2146 return; 2086 return;
2147#endif 2087#endif
2088
2148 if (reportmode) 2089 if (reportmode)
2149 { 2090 {
2150 /* mouse report from vt window */ 2091 /* mouse report from vt window */
2151 /* don't report release of wheel "buttons" */ 2092 /* don't report release of wheel "buttons" */
2152 if (ev.button >= 4) 2093 if (ev.button >= 4)
… …
2163 mouse_report (ev); 2104 mouse_report (ev);
2164 } 2105 }
2165#else /* MOUSE_REPORT_DOUBLECLICK */ 2106#else /* MOUSE_REPORT_DOUBLECLICK */
2166 MEvent.button = AnyButton; 2107 MEvent.button = AnyButton;
2167 mouse_report (ev); 2108 mouse_report (ev);
2168#endif /* MOUSE_REPORT_DOUBLECLICK */ 2109#endif /* MOUSE_REPORT_DOUBLECLICK */
2169 return; 2110 return;
2170 } 2111 }
2171 2112
2172 /* 2113 /*
2173 * dumb hack to compensate for the failure of click-and-drag 2114 * dumb hack to compensate for the failure of click-and-drag
… …
2176 if (priv_modes & PrivMode_mouse_report 2117 if (priv_modes & PrivMode_mouse_report
2177 && bypass_keystate 2118 && bypass_keystate
2178 && ev.button == Button1 && MEvent.clicks <= 1) 2119 && ev.button == Button1 && MEvent.clicks <= 1)
2179 selection_extend (ev.x, ev.y, 0); 2120 selection_extend (ev.x, ev.y, 0);
2180 2121
2181 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2182 return;
2183
2184 switch (ev.button) 2122 switch (ev.button)
2185 { 2123 {
2186 case Button1: 2124 case Button1:
2187 case Button3: 2125 case Button3:
2188 selection_make (ev.time); 2126 selection_make (ev.time);
2189 break; 2127 break;
2128
2190 case Button2: 2129 case Button2:
2191 selection_request (ev.time, ev.x, ev.y); 2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2192 break; 2132 break;
2133
2193#ifdef MOUSE_WHEEL 2134#ifdef MOUSE_WHEEL
2194 case Button4: 2135 case Button4:
2195 case Button5: 2136 case Button5:
2196 { 2137 {
2197 int i; 2138 int i;
… …
2199 2140
2200 v = ev.button == Button4 ? UP : DN; 2141 v = ev.button == Button4 ? UP : DN;
2201 2142
2202 if (ev.state & ShiftMask) 2143 if (ev.state & ShiftMask)
2203 i = 1; 2144 i = 1;
2204 else if (OPTION (Opt_mouseWheelScrollPage)) 2145 else if (option (Opt_mouseWheelScrollPage))
2205 i = nrow - 1; 2146 i = nrow - 1;
2206 else 2147 else
2207 i = 5; 2148 i = 5;
2208 2149
2209# ifdef MOUSE_SLIP_WHEELING 2150# ifdef MOUSE_SLIP_WHEELING
… …
2211 { 2152 {
2212 mouse_slip_wheel_speed += v ? -1 : 1; 2153 mouse_slip_wheel_speed += v ? -1 : 1;
2213 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2154 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2214 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2155 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2215 2156
2216 if (slip_wheel_ev.at < NOW) 2157 if (!slip_wheel_ev.is_active ())
2217 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2158 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2218
2219 slip_wheel_ev.start ();
2220 } 2159 }
2221 else 2160 else
2161# endif
2222 { 2162 {
2223# endif
2224 scr_page (v, i); 2163 scr_page (v, i);
2225 scrollbar_show (1); 2164 scrollBar.show (1);
2226# ifdef MOUSE_SLIP_WHEELING
2227 } 2165 }
2228# endif
2229 } 2166 }
2230 break; 2167 break;
2231#endif 2168#endif
2232 } 2169 }
2233 } 2170 }
2234#ifdef MENUBAR
2235 else if (isMenuBarWindow (ev.window))
2236 menubar_control (ev);
2237#endif
2238} 2171}
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 2172
2721/*}}} */ 2173/*}}} */
2722 2174
2723bool 2175bool
2724rxvt_term::cmd_parse () 2176rxvt_term::cmd_parse ()
… …
2773 if (ch == C0_LF) 2225 if (ch == C0_LF)
2774 nlines++; 2226 nlines++;
2775 2227
2776 refresh_count++; 2228 refresh_count++;
2777 2229
2778 if (!OPTION (Opt_jumpScroll) 2230 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2779 || (refresh_count >= refresh_limit * (nrow - 1)))
2780 { 2231 {
2781 refreshnow = true;
2782 refresh_count = 0; 2232 refresh_count = 0;
2233
2234 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2235 {
2236 refreshnow = true;
2783 ch = NOCHAR; 2237 ch = NOCHAR;
2784 break; 2238 break;
2239 }
2785 } 2240 }
2786 2241
2787 // scr_add_lines only works for nlines <= nrow - 1. 2242 // scr_add_lines only works for nlines <= nrow - 1.
2788 if (nlines >= nrow - 1) 2243 if (nlines >= nrow - 1)
2789 { 2244 {
2245 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2790 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2246 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2791 scr_add_lines (buf, str - buf, nlines); 2247 scr_add_lines (buf, str - buf, nlines);
2792 2248
2793 nlines = 0; 2249 nlines = 0;
2794 str = buf; 2250 str = buf;
2795 eol = str + min (ncol, UBUFSIZ); 2251 eol = str + min (ncol, UBUFSIZ);
… …
2810 2266
2811 seq_begin = cmdbuf_ptr; 2267 seq_begin = cmdbuf_ptr;
2812 ch = next_char (); 2268 ch = next_char ();
2813 } 2269 }
2814 2270
2271 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2815 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2272 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2816 scr_add_lines (buf, str - buf, nlines); 2273 scr_add_lines (buf, str - buf, nlines);
2817 2274
2818 /* 2275 /*
2819 * If there have been a lot of new lines, then update the screen 2276 * If there have been a lot of new lines, then update the screen
2820 * What the heck I'll cheat and only refresh less than every page-full. 2277 * What the heck we'll cheat and only refresh less than every page-full.
2821 * the number of pages between refreshes is refresh_limit, which 2278 * if skipScroll is enabled.
2822 * is incremented here because we must be doing flat-out scrolling.
2823 */ 2279 */
2824 if (refreshnow) 2280 if (refreshnow)
2825 { 2281 {
2826 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2827 refresh_limit++;
2828 else
2829 {
2830 flag = true; 2282 flag = true;
2831 scr_refresh (refresh_type); 2283 scr_refresh ();
2832 want_refresh = 1; 2284 want_refresh = 1;
2833 }
2834 } 2285 }
2835 2286
2836 } 2287 }
2837 else 2288 else
2838 { 2289 {
… …
2854 return flag; 2305 return flag;
2855} 2306}
2856 2307
2857// read the next character 2308// read the next character
2858wchar_t 2309wchar_t
2859rxvt_term::next_char () 2310rxvt_term::next_char () NOTHROW
2860{ 2311{
2861 while (cmdbuf_ptr < cmdbuf_endp) 2312 while (cmdbuf_ptr < cmdbuf_endp)
2862 { 2313 {
2863 // assume 7-bit to be ascii ALWAYS 2314 // assume 7-bit to be ascii ALWAYS
2864 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2873 cmdbuf_ptr = cmdbuf_endp; 2324 cmdbuf_ptr = cmdbuf_endp;
2874 break; 2325 break;
2875 } 2326 }
2876 2327
2877 if (len == (size_t)-1) 2328 if (len == (size_t)-1)
2329 {
2330 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 2331 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2332 }
2879 2333
2880 // assume wchar == unicode 2334 // assume wchar == unicode
2881 cmdbuf_ptr += len; 2335 cmdbuf_ptr += len;
2882 return wc & UNICODE_MASK; 2336 return wc & UNICODE_MASK;
2883 } 2337 }
… …
2885 return NOCHAR; 2339 return NOCHAR;
2886} 2340}
2887 2341
2888// read the next octet 2342// read the next octet
2889uint32_t 2343uint32_t
2890rxvt_term::next_octet () 2344rxvt_term::next_octet () NOTHROW
2891{ 2345{
2892 return cmdbuf_ptr < cmdbuf_endp 2346 return cmdbuf_ptr < cmdbuf_endp
2893 ? (unsigned char)*cmdbuf_ptr++ 2347 ? (unsigned char)*cmdbuf_ptr++
2894 : NOCHAR; 2348 : NOCHAR;
2895} 2349}
2350
2351static class out_of_input out_of_input;
2896 2352
2897/* rxvt_cmd_getc () - Return next input character */ 2353/* rxvt_cmd_getc () - Return next input character */
2898/* 2354/*
2899 * Return the next input character after first passing any keyboard input 2355 * Return the next input character after first passing any keyboard input
2900 * to the command. 2356 * to the command.
2901 */ 2357 */
2902wchar_t 2358wchar_t
2903rxvt_term::cmd_getc () 2359rxvt_term::cmd_getc () THROW ((class out_of_input))
2904{ 2360{
2905 wchar_t c = next_char (); 2361 wchar_t c = next_char ();
2906 2362
2907 if (c == NOCHAR) 2363 if (c == NOCHAR)
2908 throw out_of_input; 2364 throw out_of_input;
2909 2365
2910 return c; 2366 return c;
2911} 2367}
2912 2368
2913uint32_t 2369uint32_t
2914rxvt_term::cmd_get8 () 2370rxvt_term::cmd_get8 () THROW ((class out_of_input))
2915{ 2371{
2916 uint32_t c = next_octet (); 2372 uint32_t c = next_octet ();
2917 2373
2918 if (c == NOCHAR) 2374 if (c == NOCHAR)
2919 throw out_of_input; 2375 throw out_of_input;
… …
2925/*----------------------------------------------------------------------*/ 2381/*----------------------------------------------------------------------*/
2926#ifdef PRINTPIPE 2382#ifdef PRINTPIPE
2927FILE * 2383FILE *
2928rxvt_term::popen_printer () 2384rxvt_term::popen_printer ()
2929{ 2385{
2930 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2386 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2931 2387
2932 if (stream == NULL) 2388 if (stream == NULL)
2933 rxvt_warn ("can't open printer pipe, not printing.\n"); 2389 rxvt_warn ("can't open printer pipe, not printing.\n");
2934 2390
2935 return stream; 2391 return stream;
… …
2946 * simulate attached vt100 printer 2402 * simulate attached vt100 printer
2947 */ 2403 */
2948void 2404void
2949rxvt_term::process_print_pipe () 2405rxvt_term::process_print_pipe ()
2950{ 2406{
2951 int done; 2407 FILE *fd = popen_printer ();
2952 FILE *fd;
2953 2408
2954 if ((fd = popen_printer ()) == NULL) 2409 if (!fd)
2955 return; 2410 return;
2956 2411
2957 /* 2412 /*
2958 * Send all input to the printer until either ESC[4i or ESC[?4i 2413 * Send all input to the printer until either ESC[4i or ESC[?4i
2959 * is received. 2414 * is received.
2960 */ 2415 */
2961 for (done = 0; !done;) 2416 for (int done = 0; !done; )
2962 { 2417 {
2963 unsigned char buf[8]; 2418 unsigned char buf[8];
2964 unicode_t ch; 2419 unicode_t ch;
2965 unsigned int i, len; 2420 unsigned int i, len;
2966 2421
… …
2985 { 2440 {
2986 if ((buf[len++] = cmd_getc ()) == 'i') 2441 if ((buf[len++] = cmd_getc ()) == 'i')
2987 break; /* done = 1 */ 2442 break; /* done = 1 */
2988 } 2443 }
2989 } 2444 }
2990 2445
2991 for (i = 0; i < len; i++) 2446 for (i = 0; i < len; i++)
2992 if (putc (buf[i], fd) == EOF) 2447 if (putc (buf[i], fd) == EOF)
2993 { 2448 {
2994 done = 1; 2449 done = 1;
2995 break; 2450 break;
… …
2997 } 2452 }
2998 } 2453 }
2999 2454
3000 pclose_printer (fd); 2455 pclose_printer (fd);
3001} 2456}
3002#endif /* PRINTPIPE */ 2457#endif /* PRINTPIPE */
3003/*}}} */ 2458/*}}} */
3004 2459
3005/* *INDENT-OFF* */ 2460/* *INDENT-OFF* */
3006enum { 2461enum {
3007 C1_40 = 0x40, 2462 C1_40 = 0x40,
… …
3057 process_dcs_seq (); 2512 process_dcs_seq ();
3058 break; 2513 break;
3059 case 0x9b: /* CSI */ 2514 case 0x9b: /* CSI */
3060 process_csi_seq (); 2515 process_csi_seq ();
3061 break; 2516 break;
3062 case 0x9d: /* CSI */ 2517 case 0x9d: /* OSC */
3063 process_osc_seq (); 2518 process_osc_seq ();
3064 break; 2519 break;
3065#endif 2520#endif
3066 } 2521 }
3067} 2522}
… …
3111 break; 2566 break;
3112 case 'Z': /* identify the terminal type */ 2567 case 'Z': /* identify the terminal type */
3113 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2568 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3114 break; 2569 break;
3115 case '<': /* turn off VT52 mode */ 2570 case '<': /* turn off VT52 mode */
3116 PrivMode (0, PrivMode_vt52); 2571 set_privmode (PrivMode_vt52, 0);
3117 break; 2572 break;
3118 case 'F': /* use special graphics character set */ 2573 case 'F': /* use special graphics character set */
3119 case 'G': /* use regular character set */ 2574 case 'G': /* use regular character set */
3120 /* unimplemented */ 2575 /* unimplemented */
3121 break; 2576 break;
… …
3157 scr_charset_set (2, (unsigned int)cmd_getc ()); 2612 scr_charset_set (2, (unsigned int)cmd_getc ());
3158 break; 2613 break;
3159 case '+': 2614 case '+':
3160 scr_charset_set (3, (unsigned int)cmd_getc ()); 2615 scr_charset_set (3, (unsigned int)cmd_getc ());
3161 break; 2616 break;
3162#if ENABLE_FRILLS 2617#if !ENABLE_MINIMAL
3163 case '6': 2618 case '6':
3164 scr_backindex (); 2619 scr_backindex ();
3165 break; 2620 break;
3166#endif 2621#endif
3167 case '7': 2622 case '7':
3168 scr_cursor (SAVE); 2623 scr_cursor (SAVE);
3169 break; 2624 break;
3170 case '8': 2625 case '8':
3171 scr_cursor (RESTORE); 2626 scr_cursor (RESTORE);
3172 break; 2627 break;
3173#if ENABLE_FRILLS 2628#if !ENABLE_MINIMAL
3174 case '9': 2629 case '9':
3175 scr_forwardindex (); 2630 scr_forwardindex ();
3176 break; 2631 break;
3177#endif 2632#endif
3178 case '=': 2633 case '=':
3179 case '>': 2634 case '>':
3180 PrivMode ((ch == '='), PrivMode_aplKP); 2635 set_privmode (PrivMode_aplKP, ch == '=');
3181 break; 2636 break;
3182 2637
3183 case C1_40: 2638 case C1_40:
3184 cmd_getc (); 2639 cmd_getc ();
3185 break; 2640 break;
… …
3238 2693
3239 /* 8.3.106: RESET TO INITIAL STATE */ 2694 /* 8.3.106: RESET TO INITIAL STATE */
3240 case 'c': 2695 case 'c':
3241 mbstate.reset (); 2696 mbstate.reset ();
3242 scr_poweron (); 2697 scr_poweron ();
3243 scrollbar_show (1); 2698 scrollBar.show (1);
3244 break; 2699 break;
3245 2700
3246 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2701 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3247 case 'n': 2702 case 'n':
3248 scr_charset_choose (2); 2703 scr_charset_choose (2);
… …
3293rxvt_term::process_csi_seq () 2748rxvt_term::process_csi_seq ()
3294{ 2749{
3295 unicode_t ch, priv, i; 2750 unicode_t ch, priv, i;
3296 unsigned int nargs, p; 2751 unsigned int nargs, p;
3297 int n, ndef; 2752 int n, ndef;
3298 int arg[ESC_ARGS]; 2753 int arg[ESC_ARGS] = { };
3299 2754
3300 for (nargs = ESC_ARGS; nargs > 0;) 2755 nargs = 0;
3301 arg[--nargs] = 0;
3302 2756
3303 priv = 0; 2757 priv = 0;
3304 ch = cmd_getc (); 2758 ch = cmd_getc ();
3305 if (ch >= '<' && ch <= '?') 2759 if (ch >= '<' && ch <= '?')
2760 {
3306 { /* '<' '=' '>' '?' */ 2761 /* '<' '=' '>' '?' */
3307 priv = ch; 2762 priv = ch;
3308 ch = cmd_getc (); 2763 ch = cmd_getc ();
3309 } 2764 }
3310 2765
3311 /* read any numerical arguments */ 2766 /* read any numerical arguments */
… …
3340 ndef = get_byte_array_bit (csi_defaults, i); 2795 ndef = get_byte_array_bit (csi_defaults, i);
3341 for (p = 0; p < nargs; p++) 2796 for (p = 0; p < nargs; p++)
3342 if (arg[p] == -1) 2797 if (arg[p] == -1)
3343 arg[p] = ndef; 2798 arg[p] = ndef;
3344 2799
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 /* 2800 /*
3353 * private mode handling 2801 * private mode handling
3354 */ 2802 */
3355 if (priv) 2803 if (priv)
3356 { 2804 {
3357 switch (priv) 2805 switch (priv)
3358 { 2806 {
3359 case '>': 2807 case '>':
3360 if (ch == CSI_DA) /* secondary device attributes */ 2808 if (ch == CSI_DA) /* secondary device attributes */
3361 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2809 {
2810 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2811 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2812 //
2813 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2814 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2815 // versions.
2816 //
2817 tt_printf ("\033[>%d;95;0c", 'U');
2818 }
3362 break; 2819 break;
2820
3363 case '?': 2821 case '?':
3364 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2822 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3365 process_terminal_mode (ch, priv, nargs, arg); 2823 process_terminal_mode (ch, priv, nargs, arg);
3366 break; 2824 break;
3367 } 2825 }
… …
3492 break; 2950 break;
3493 case 6: /* CPR requested */ 2951 case 6: /* CPR requested */
3494 scr_report_position (); 2952 scr_report_position ();
3495 break; 2953 break;
3496 case 7: /* unofficial extension */ 2954 case 7: /* unofficial extension */
3497 if (OPTION (Opt_insecure)) 2955 if (option (Opt_insecure))
3498 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2956 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3499 break; 2957 break;
3500 case 8: /* unofficial extension */ 2958 case 8: /* unofficial extension */
3501 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2959 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3502 break; 2960 break;
… …
3569 break; 3027 break;
3570 case CSI_75: 3028 case CSI_75:
3571 scr_cursor (RESTORE); 3029 scr_cursor (RESTORE);
3572 break; 3030 break;
3573 3031
3574#if ENABLE_FRILLS 3032#if !ENABLE_MINIMAL
3575 case CSI_74: 3033 case CSI_74:
3576 process_window_ops (arg, nargs); 3034 process_window_ops (arg, nargs);
3577 break; 3035 break;
3578#endif 3036#endif
3579 3037
… …
3586 break; 3044 break;
3587 } 3045 }
3588} 3046}
3589/*}}} */ 3047/*}}} */
3590 3048
3591#if ENABLE_FRILLS 3049#if !ENABLE_MINIMAL
3592/* ARGSUSED */ 3050/* ARGSUSED */
3593void 3051void
3594rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3052rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3595{ 3053{
3596 int x, y; 3054 int x, y;
3597 XWindowAttributes wattr; 3055 XWindowAttributes wattr;
3598 Window wdummy; 3056 Window wdummy;
3599 dDisp; 3057
3058 dLocal (Display *, dpy);
3600 3059
3601 if (nargs == 0) 3060 if (nargs == 0)
3602 return; 3061 return;
3603 3062
3604 switch (args[0]) 3063 switch (args[0])
3605 { 3064 {
3606 /* 3065 /*
3607 * commands 3066 * commands
3608 */ 3067 */
3609 case 1: /* deiconify window */ 3068 case 1: /* deiconify window */
3610 XMapWindow (disp, parent[0]); 3069 XMapWindow (dpy, parent[0]);
3611 break; 3070 break;
3612 case 2: /* iconify window */ 3071 case 2: /* iconify window */
3613 XIconifyWindow (disp, parent[0], display->screen); 3072 XIconifyWindow (dpy, parent[0], display->screen);
3614 break; 3073 break;
3615 case 3: /* set position (pixels) */ 3074 case 3: /* set position (pixels) */
3616 XMoveWindow (disp, parent[0], args[1], args[2]); 3075 XMoveWindow (dpy, parent[0], args[1], args[2]);
3617 break; 3076 break;
3618 case 4: /* set size (pixels) */ 3077 case 4: /* set size (pixels) */
3619 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3078 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3620 break; 3079 break;
3621 case 5: /* raise window */ 3080 case 5: /* raise window */
3622 XRaiseWindow (disp, parent[0]); 3081 XRaiseWindow (dpy, parent[0]);
3623 break; 3082 break;
3624 case 6: /* lower window */ 3083 case 6: /* lower window */
3625 XLowerWindow (disp, parent[0]); 3084 XLowerWindow (dpy, parent[0]);
3626 break; 3085 break;
3627 case 7: /* refresh window */ 3086 case 7: /* refresh window */
3628 scr_touch (true); 3087 scr_touch (true);
3629 break; 3088 break;
3630 case 8: /* set size (chars) */ 3089 case 8: /* set size (chars) */
… …
3637 if (args[0] >= 24) /* set height (chars) */ 3096 if (args[0] >= 24) /* set height (chars) */
3638 set_widthheight ((unsigned int)width, 3097 set_widthheight ((unsigned int)width,
3639 (unsigned int) (args[1] * fheight)); 3098 (unsigned int) (args[1] * fheight));
3640 break; 3099 break;
3641 3100
3642
3643 /* 3101 /*
3644 * reports - some output format copied from XTerm 3102 * reports - some output format copied from XTerm
3645 */ 3103 */
3646 case 11: /* report window state */ 3104 case 11: /* report window state */
3647 XGetWindowAttributes (disp, parent[0], &wattr); 3105 XGetWindowAttributes (dpy, parent[0], &wattr);
3648 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3106 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3649 break; 3107 break;
3650 case 13: /* report window position */ 3108 case 13: /* report window position */
3651 XGetWindowAttributes (disp, parent[0], &wattr); 3109 XGetWindowAttributes (dpy, parent[0], &wattr);
3652 XTranslateCoordinates (disp, parent[0], wattr.root, 3110 XTranslateCoordinates (dpy, parent[0], wattr.root,
3653 -wattr.border_width, -wattr.border_width, 3111 -wattr.border_width, -wattr.border_width,
3654 &x, &y, &wdummy); 3112 &x, &y, &wdummy);
3655 tt_printf ("\033[3;%d;%dt", x, y); 3113 tt_printf ("\033[3;%d;%dt", x, y);
3656 break; 3114 break;
3657 case 14: /* report window size (pixels) */ 3115 case 14: /* report window size (pixels) */
3658 XGetWindowAttributes (disp, parent[0], &wattr); 3116 XGetWindowAttributes (dpy, parent[0], &wattr);
3659 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3117 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3660 break; 3118 break;
3661 case 18: /* report text area size (chars) */ 3119 case 18: /* report text area size (chars) */
3662 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3120 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3663 break; 3121 break;
… …
3665 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3123 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3666 break; 3124 break;
3667 case 20: /* report icon label */ 3125 case 20: /* report icon label */
3668 { 3126 {
3669 char *s; 3127 char *s;
3670 XGetIconName (disp, parent[0], &s); 3128 XGetIconName (dpy, parent[0], &s);
3671 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3129 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3672 XFree (s); 3130 XFree (s);
3673 } 3131 }
3674 break; 3132 break;
3675 case 21: /* report window title */ 3133 case 21: /* report window title */
3676 { 3134 {
3677 char *s; 3135 char *s;
3678 XFetchName (disp, parent[0], &s); 3136 XFetchName (dpy, parent[0], &s);
3679 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3137 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3680 XFree (s); 3138 XFree (s);
3681 } 3139 }
3682 break; 3140 break;
3683 } 3141 }
3684} 3142}
… …
3711 seen_esc = true; 3169 seen_esc = true;
3712 continue; 3170 continue;
3713 } 3171 }
3714 else if (ch == C0_BEL || ch == CHAR_ST) 3172 else if (ch == C0_BEL || ch == CHAR_ST)
3715 break; 3173 break;
3174 else if (ch == C0_SYN)
3175 ch = cmd_get8 ();
3716 else if (ch < 0x20) 3176 else if (ch < 0x20)
3717 return NULL; /* other control character - exit */ 3177 return NULL; /* other control character - exit */
3718 3178
3719 seen_esc = false; 3179 seen_esc = false;
3720 3180
3721 if (n >= STRING_MAX - 1) 3181 if (n >= STRING_MAX - 1)
3722 // stop at some sane length 3182 // stop at some sane length
3723 return NULL; 3183 return NULL;
3724 3184
3725 if (ch == C0_SYN)
3726 string[n++] = cmd_get8 ();
3727 else
3728 string[n++] = ch; 3185 string[n++] = ch;
3729 } 3186 }
3730 3187
3731 string[n++] = '\0'; 3188 string[n++] = '\0';
3732 3189
3733 ends_how = (ch == 0x5c ? C0_ESC : ch); 3190 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3784void 3241void
3785rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3242rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3786{ 3243{
3787 if (str[0] == '?' && !str[1]) 3244 if (str[0] == '?' && !str[1])
3788 { 3245 {
3789 unsigned short r, g, b; 3246 rgba c;
3790 pix_colors_focused[color].get (display, r, g, b); 3247 pix_colors_focused[color].get (c);
3248
3249#if XFT
3250 if (c.a != rgba::MAX_CC)
3251 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3252 else
3253#endif
3791 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3254 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3792 } 3255 }
3793 else 3256 else
3794 set_window_color (color, str); 3257 set_window_color (color, str);
3795} 3258}
3796 3259
… …
3798 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3261 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3799 */ 3262 */
3800void 3263void
3801rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3264rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3802{ 3265{
3803 int changed = 0;
3804 int color; 3266 int color;
3805 char *buf, *name; 3267 char *buf, *name;
3806 bool query = str[0] == '?' && !str[1]; 3268 bool query = str[0] == '?' && !str[1];
3807 int saveop = op; 3269 int saveop = op;
3808 dDisp; 3270
3271 dLocal (Display *, dpy);
3809 3272
3810 assert (str != NULL); 3273 assert (str != NULL);
3274
3275 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3276 return;
3277
3811 switch (op) 3278 switch (op)
3812 { 3279 {
3813 case XTerm_name: 3280 case XTerm_name:
3814 set_title (str); 3281 set_title (str);
3815 /* FALLTHROUGH */ 3282 /* FALLTHROUGH */
… …
3829 unsigned long bytes_after; 3296 unsigned long bytes_after;
3830 unsigned char *value = 0; 3297 unsigned char *value = 0;
3831 const char *str = ""; 3298 const char *str = "";
3832 3299
3833 if (prop 3300 if (prop
3834 && XGetWindowProperty (disp, parent[0], 3301 && XGetWindowProperty (dpy, parent[0],
3835 prop, 0, 1<<16, 0, AnyPropertyType, 3302 prop, 0, 1<<16, 0, AnyPropertyType,
3836 &actual_type, &actual_format, 3303 &actual_type, &actual_format,
3837 &nitems, &bytes_after, &value) == Success 3304 &nitems, &bytes_after, &value) == Success
3838 && actual_type != None 3305 && actual_type != None
3839 && actual_format == 8) 3306 && actual_format == 8)
3840 str = (const char *)(value); 3307 str = (const char *)(value);
3841 3308
3842 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3309 tt_printf ("\033]%d;%s%c", op, str, resp);
3843 3310
3844 XFree (value); 3311 XFree (value);
3845 } 3312 }
3846 else 3313 else
3847 { 3314 {
… …
3851 { 3318 {
3852 *eq = 0; 3319 *eq = 0;
3853 set_utf8_property (display->atom (str), eq + 1); 3320 set_utf8_property (display->atom (str), eq + 1);
3854 } 3321 }
3855 else 3322 else
3856 XDeleteProperty (disp, parent[0], 3323 XDeleteProperty (dpy, parent[0],
3857 display->atom (str)); 3324 display->atom (str));
3858 } 3325 }
3859 break; 3326 break;
3860 3327
3861 case XTerm_Color: 3328 case XTerm_Color:
… …
3871 break; 3338 break;
3872 3339
3873 if ((buf = strchr (name, ';')) != NULL) 3340 if ((buf = strchr (name, ';')) != NULL)
3874 *buf++ = '\0'; 3341 *buf++ = '\0';
3875 3342
3876 if (name[0] == '?' && !name[1]) 3343 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 } 3344 }
3885 break; 3345 break;
3346 case Rxvt_restoreFG:
3886 case XTerm_Color00: 3347 case XTerm_Color00:
3887 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3348 process_color_seq (op, Color_fg, str, resp);
3888 break; 3349 break;
3350 case Rxvt_restoreBG:
3889 case XTerm_Color01: 3351 case XTerm_Color01:
3890 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3352 process_color_seq (op, Color_bg, str, resp);
3891 break; 3353 break;
3892#ifndef NO_CURSORCOLOR 3354#ifndef NO_CURSORCOLOR
3893 case XTerm_Color_cursor: 3355 case XTerm_Color_cursor:
3894 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3356 process_color_seq (op, Color_cursor, str, resp);
3895 break; 3357 break;
3896#endif 3358#endif
3897 case XTerm_Color_pointer_fg: 3359 case XTerm_Color_pointer_fg:
3898 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3360 process_color_seq (op, Color_pointer_fg, str, resp);
3899 break; 3361 break;
3900 case XTerm_Color_pointer_bg: 3362 case XTerm_Color_pointer_bg:
3901 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3363 process_color_seq (op, Color_pointer_bg, str, resp);
3902 break; 3364 break;
3903#ifndef NO_BOLD_UNDERLINE_REVERSE 3365#ifndef NO_BOLD_UNDERLINE_REVERSE
3904 case XTerm_Color_RV: 3366 case XTerm_Color_RV:
3905 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3367 process_color_seq (op, Color_RV, str, resp);
3906 break; 3368 break;
3907 case Rxvt_Color_BD: 3369 case Rxvt_Color_BD:
3908 case URxvt_Color_BD: 3370 case URxvt_Color_BD:
3909 process_color_seq (op, Color_BD, str, resp); 3371 process_color_seq (op, Color_BD, str, resp);
3910 break; 3372 break;
3911 case Rxvt_Color_UL: 3373 case Rxvt_Color_UL:
3912 case URxvt_Color_UL: 3374 case URxvt_Color_UL:
3913 process_color_seq (op, Color_UL, str, resp); 3375 process_color_seq (op, Color_UL, str, resp);
3914 break; 3376 break;
3915 case URxvt_Color_IT: 3377 case URxvt_Color_IT:
3916 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3378 process_color_seq (op, Color_IT, str, resp);
3917 break; 3379 break;
3918#endif 3380#endif
3919#if TRANSPARENT && TINTING 3381#if ENABLE_TRANSPARENCY
3920 case URxvt_Color_tint: 3382 case URxvt_Color_tint:
3921 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3383 process_color_seq (op, Color_tint, str, resp);
3922 check_our_parents (); 3384 {
3923 if (am_transparent) 3385 bool changed = false;
3924 want_full_refresh = want_refresh = 1;
3925 break;
3926#endif
3927 3386
3387 if (ISSET_PIXCOLOR (Color_tint))
3388 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3389 else
3390 changed = bgPixmap.unset_tint ();
3391
3392 if (changed)
3393 update_background ();
3394 }
3395
3396 break;
3397#endif
3398
3399#if BG_IMAGE_FROM_FILE
3928 case Rxvt_Pixmap: 3400 case Rxvt_Pixmap:
3929 if (*str != ';') 3401 if (!strcmp (str, "?"))
3930 { 3402 {
3931#if XPM_BACKGROUND 3403 char str[256];
3932 scale_pixmap (""); /* reset to default scaling */ 3404
3933 set_bgPixmap (str); /* change pixmap */ 3405 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3934 scr_touch (true); 3406 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3935#endif 3407 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3408 process_xterm_seq (XTerm_title, str, CHAR_ST);
3936 } 3409 }
3937 3410 else
3938 while ((str = strchr (str, ';')) != NULL)
3939 { 3411 {
3412 int changed = 0;
3413
3414 if (*str != ';')
3415 {
3416 /* reset to default scaling :*/
3417 bgPixmap.unset_geometry ();
3418 if (bgPixmap.set_file (str)) /* change pixmap */
3419 changed++;
3420 str = strchr (str, ';');
3421 if (str == NULL)
3422 bgPixmap.set_defaultGeometry ();
3423 }
3424
3425 while (str)
3426 {
3940 str++; 3427 str++;
3941#if XPM_BACKGROUND 3428 if (bgPixmap.set_geometry (str))
3942 changed += scale_pixmap (str); 3429 changed++;
3943#endif 3430 str = strchr (str, ';');
3431 }
3432
3433 if (changed)
3434 update_background ();
3944 } 3435 }
3945
3946 if (changed)
3947 {
3948#ifdef XPM_BACKGROUND
3949 resize_pixmap ();
3950 scr_touch (true);
3951#endif
3952 }
3953 break; 3436 break;
3954 3437#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 3438
3962 case XTerm_logfile: 3439 case XTerm_logfile:
3963 // TODO, when secure mode? 3440 // TODO, when secure mode?
3964 break; 3441 break;
3965 3442
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 3443#if 0
3973 case Rxvt_dumpscreen: /* no error notices */ 3444 case Rxvt_dumpscreen: /* no error notices */
3974 { 3445 {
3975 int fd; 3446 int fd;
3976 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3447 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
3989 case URxvt_italicFont: 3460 case URxvt_italicFont:
3990 case URxvt_boldItalicFont: 3461 case URxvt_boldItalicFont:
3991#endif 3462#endif
3992 if (query) 3463 if (query)
3993 tt_printf ("\33]%d;%-.250s%c", saveop, 3464 tt_printf ("\33]%d;%-.250s%c", saveop,
3994 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3465 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3995 ? fontset[op - URxvt_font]->fontdesc : "", 3466 ? fontset[op - URxvt_font]->fontdesc : "",
3996 resp); 3467 resp);
3997 else 3468 else
3998 { 3469 {
3999 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3470 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
4002 allocated.push_back ((void *)res); 3473 allocated.push_back ((void *)res);
4003 set_fonts (); 3474 set_fonts ();
4004 } 3475 }
4005 break; 3476 break;
4006 3477
4007#if ENABLE_FRILLS 3478 case URxvt_version:
3479 if (query)
3480 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3481 op,
3482 rs[Rs_name], VERSION[0], VERSION[2],
3483 resp);
3484 break;
3485
3486#if !ENABLE_MINIMAL
4008 case URxvt_locale: 3487 case URxvt_locale:
4009 if (query) 3488 if (query)
4010 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3489 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4011 else 3490 else
4012 { 3491 {
4013 set_locale (str); 3492 set_locale (str);
4014 pty.set_utf8_mode (enc_utf8); 3493 pty->set_utf8_mode (enc_utf8);
4015 init_xlocale (); 3494 init_xlocale ();
4016 } 3495 }
4017 break; 3496 break;
4018 3497
4019 case URxvt_view_up: 3498 case URxvt_view_up:
… …
4030 break; 3509 break;
4031#endif 3510#endif
4032 3511
4033#if ENABLE_PERL 3512#if ENABLE_PERL
4034 case URxvt_perl: 3513 case URxvt_perl:
4035 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3514 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4036 ; // no responses yet 3515 ; // no responses yet
4037 break; 3516 break;
4038#endif 3517#endif
4039 } 3518 }
4040} 3519}
… …
4064 { 3543 {
4065 if (mode == 'r') 3544 if (mode == 'r')
4066 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3545 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4067 else 3546 else
4068 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3547 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4069 PrivMode (state, bit); 3548 set_privmode (bit, state);
4070 } 3549 }
4071 3550
4072 return state; 3551 return state;
4073} 3552}
4074 3553
4075/* we're not using priv _yet_ */ 3554/* we're not using priv _yet_ */
4076void 3555void
4077rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3556rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4078{ 3557{
4079 unsigned int i, j; 3558 unsigned int i, j;
4080 int state; 3559 int state;
4081 3560
4082 static const struct 3561 static const struct
4083 { 3562 {
4084 const int argval; 3563 const int argval;
4085 const unsigned long bit; 3564 const unsigned long bit;
4086 }
4087
4088 argtopriv[] = { 3565 } argtopriv[] = {
4089 { 1, PrivMode_aplCUR }, 3566 { 1, PrivMode_aplCUR },
4090 { 2, PrivMode_vt52 }, 3567 { 2, PrivMode_vt52 },
4091 { 3, PrivMode_132 }, 3568 { 3, PrivMode_132 },
4092 { 4, PrivMode_smoothScroll }, 3569 { 4, PrivMode_smoothScroll },
4093 { 5, PrivMode_rVideo }, 3570 { 5, PrivMode_rVideo },
4094 { 6, PrivMode_relOrigin }, 3571 { 6, PrivMode_relOrigin },
4095 { 7, PrivMode_Autowrap }, 3572 { 7, PrivMode_Autowrap },
4096 // 8, bi-directional support mode 3573 // 8, bi-directional support mode
4097 { 9, PrivMode_MouseX10 }, 3574 { 9, PrivMode_MouseX10 },
4098#ifdef menuBar_esc
4099 { menuBar_esc, PrivMode_menuBar },
4100#endif
4101 // 18, 19 printing-related 3575 // 18, 19 printing-related
4102 { 25, PrivMode_VisibleCursor }, 3576 { 25, PrivMode_VisibleCursor },
4103#ifdef scrollBar_esc 3577#ifdef scrollBar_esc
4104 { scrollBar_esc, PrivMode_scrollBar }, 3578 { scrollBar_esc, PrivMode_scrollBar },
4105#endif 3579#endif
… …
4112 { 66, PrivMode_aplKP }, 3586 { 66, PrivMode_aplKP },
4113#ifndef NO_BACKSPACE_KEY 3587#ifndef NO_BACKSPACE_KEY
4114 { 67, PrivMode_BackSpace }, 3588 { 67, PrivMode_BackSpace },
4115#endif 3589#endif
4116 { 1000, PrivMode_MouseX11 }, 3590 { 1000, PrivMode_MouseX11 },
4117 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3591 { 1002, PrivMode_MouseBtnEvent },
4118 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3592 { 1003, PrivMode_MouseAnyEvent },
4119 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4120 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3593 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4121 { 1011, PrivMode_Keypress }, // rxvt extension 3594 { 1011, PrivMode_Keypress }, // rxvt extension
4122 // 1035 enable modifiers for alt, numlock NYI 3595 // 1035 enable modifiers for alt, numlock NYI
4123 // 1036 send ESC for meta keys NYI 3596 // 1036 send ESC for meta keys NYI
4124 // 1037 send DEL for keypad delete NYI 3597 // 1037 send DEL for keypad delete NYI
4125 { 1047, PrivMode_Screen }, 3598 { 1047, PrivMode_Screen },
4126 // 1048 save and restore cursor 3599 // 1048 save and restore cursor
4127 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3600 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4128 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3601 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3602 { 2004, PrivMode_BracketPaste },
4129 }; 3603 };
4130 3604
4131 if (nargs == 0) 3605 if (nargs == 0)
4132 return; 3606 return;
4133 3607
… …
4159 scr_touch (true); 3633 scr_touch (true);
4160 break; 3634 break;
4161#endif 3635#endif
4162 case 1048: /* alternative cursor save */ 3636 case 1048: /* alternative cursor save */
4163 case 1049: 3637 case 1049:
4164 if (OPTION (Opt_secondaryScreen)) 3638 if (option (Opt_secondaryScreen))
4165 if (mode == 0) 3639 if (mode == 0)
4166 scr_cursor (RESTORE); 3640 scr_cursor (RESTORE);
4167 else if (mode == 1) 3641 else if (mode == 1)
4168 scr_cursor (SAVE); 3642 scr_cursor (SAVE);
4169 break; 3643 break;
… …
4177 case 2: /* VT52 mode */ 3651 case 2: /* VT52 mode */
4178 /* oddball mode. should be set regardless of set/reset 3652 /* oddball mode. should be set regardless of set/reset
4179 * parameter. Return from VT52 mode with an ESC < from 3653 * parameter. Return from VT52 mode with an ESC < from
4180 * within VT52 mode 3654 * within VT52 mode
4181 */ 3655 */
4182 PrivMode (1, PrivMode_vt52); 3656 set_privmode (PrivMode_vt52, 1);
4183 break; 3657 break;
4184 case 3: /* 80/132 */ 3658 case 3: /* 80/132 */
4185 if (priv_modes & PrivMode_132OK) 3659 if (priv_modes & PrivMode_132OK)
3660 {
3661 scr_poweron ();
4186 set_widthheight (((state ? 132 : 80) * fwidth), height); 3662 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3663 }
4187 break; 3664 break;
4188 case 4: /* smooth scrolling */ 3665 case 4: /* smooth scrolling */
4189 set_option (Opt_jumpScroll, !state); 3666 set_option (Opt_jumpScroll, !state);
4190 break; 3667 break;
4191 case 5: /* reverse video */ 3668 case 5: /* reverse video */
… …
4198 scr_autowrap (state); 3675 scr_autowrap (state);
4199 break; 3676 break;
4200 /* case 8: - auto repeat, can't do on a per window basis */ 3677 /* case 8: - auto repeat, can't do on a per window basis */
4201 case 9: /* X10 mouse reporting */ 3678 case 9: /* X10 mouse reporting */
4202 if (state) /* orthogonal */ 3679 if (state) /* orthogonal */
4203 priv_modes &= ~PrivMode_MouseX11; 3680 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4204 break; 3681 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 3682#ifdef scrollBar_esc
4213 case scrollBar_esc: 3683 case scrollBar_esc:
4214 if (scrollbar_mapping (state)) 3684 if (scrollBar.map (state))
4215 { 3685 {
4216 resize_all_windows (0, 0, 0); 3686 resize_all_windows (0, 0, 0);
4217 scr_touch (true); 3687 scr_touch (true);
4218 } 3688 }
4219 break; 3689 break;
… …
4228 break; 3698 break;
4229 /* case 66: - application key pad */ 3699 /* case 66: - application key pad */
4230 /* case 67: - backspace key */ 3700 /* case 67: - backspace key */
4231 case 1000: /* X11 mouse reporting */ 3701 case 1000: /* X11 mouse reporting */
4232 if (state) /* orthogonal */ 3702 if (state) /* orthogonal */
4233 priv_modes &= ~PrivMode_MouseX10; 3703 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4234 break; 3704 break;
4235#if 0
4236 case 1001: 3705 case 1002:
4237 break; /* X11 mouse highlighting */ 3706 case 1003:
4238#endif 3707 if (state)
3708 {
3709 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3710 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3711 vt_emask_mouse = PointerMotionMask;
3712 }
3713 else
3714 vt_emask_mouse = NoEventMask;
3715 vt_select_input ();
3716 break;
4239 case 1010: /* scroll to bottom on TTY output inhibit */ 3717 case 1010: /* scroll to bottom on TTY output inhibit */
4240 set_option (Opt_scrollTtyOutput, !state); 3718 set_option (Opt_scrollTtyOutput, !state);
4241 break; 3719 break;
4242 case 1011: /* scroll to bottom on key press */ 3720 case 1011: /* scroll to bottom on key press */
4243 set_option (Opt_scrollTtyKeypress, state); 3721 set_option (Opt_scrollTtyKeypress, state);
4244 break; 3722 break;
4245 case 1047: /* secondary screen w/ clearing last */ 3723 case 1047: /* secondary screen w/ clearing last */
4246 if (OPTION (Opt_secondaryScreen)) 3724 if (option (Opt_secondaryScreen))
4247 if (current_screen != PRIMARY) 3725 if (current_screen != PRIMARY)
4248 scr_erase_screen (2); 3726 scr_erase_screen (2);
4249 scr_change_screen (state); 3727 scr_change_screen (state);
4250 break; 3728 break;
4251 case 1049: /* secondary screen w/ clearing first */ 3729 case 1049: /* secondary screen w/ clearing first */
4252 scr_change_screen (state); 3730 scr_change_screen (state);
4253 if (OPTION (Opt_secondaryScreen)) 3731 if (option (Opt_secondaryScreen))
4254 if (current_screen != PRIMARY) 3732 if (current_screen != PRIMARY)
4255 scr_erase_screen (2); 3733 scr_erase_screen (2);
4256 break; 3734 break;
4257 default: 3735 default:
4258 break; 3736 break;
… …
4386 scr_color (Color_bg, Color_bg); 3864 scr_color (Color_bg, Color_bg);
4387 break; 3865 break;
4388 3866
4389 //case 50: // not variable spacing 3867 //case 50: // not variable spacing
4390 3868
4391#if ENABLE_FRILLS 3869#if !ENABLE_MINIMAL
4392 case 90: 3870 case 90:
4393 case 91: /* set bright fg color */ 3871 case 91: /* set bright fg color */
4394 case 92: 3872 case 92:
4395 case 93: 3873 case 93:
4396 case 94: 3874 case 94:
… …
4420rxvt_term::process_graphics () 3898rxvt_term::process_graphics ()
4421{ 3899{
4422 unicode_t ch, cmd = cmd_getc (); 3900 unicode_t ch, cmd = cmd_getc ();
4423 3901
4424 if (cmd == 'Q') 3902 if (cmd == 'Q')
3903 {
4425 { /* query graphics */ 3904 /* query graphics */
4426 tt_printf ("\033G0\012"); /* no graphics */ 3905 tt_printf ("\033G0\012"); /* no graphics */
4427 return; 3906 return;
4428 } 3907 }
4429 /* swallow other graphics sequences until terminating ':' */ 3908 /* swallow other graphics sequences until terminating ':' */
4430 do 3909 do
… …
4461rxvt_term::tt_write (const char *data, unsigned int len) 3940rxvt_term::tt_write (const char *data, unsigned int len)
4462{ 3941{
4463 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3942 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4464 return; 3943 return;
4465 3944
4466 if (pty.pty < 0) 3945 if (pty->pty < 0)
4467 return; 3946 return;
4468 3947
4469 if (v_buflen == 0) 3948 if (v_buflen == 0)
4470 { 3949 {
4471 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3950 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4472 3951
4473 if ((unsigned int)written == len) 3952 if ((unsigned int)written == len)
4474 return; 3953 return;
4475 3954
4476 data += written; 3955 data += written;
… …
4480 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3959 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4481 3960
4482 memcpy (v_buffer + v_buflen, data, len); 3961 memcpy (v_buffer + v_buflen, data, len);
4483 v_buflen += len; 3962 v_buflen += len;
4484 3963
4485 pty_ev.set (EVENT_READ | EVENT_WRITE); 3964 pty_ev.set (ev::READ | ev::WRITE);
4486} 3965}
4487 3966
4488void rxvt_term::pty_write () 3967void rxvt_term::pty_write ()
4489{ 3968{
4490 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3969 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4491 3970
4492 if (written > 0) 3971 if (written > 0)
4493 { 3972 {
4494 v_buflen -= written; 3973 v_buflen -= written;
4495 3974
4496 if (v_buflen == 0) 3975 if (v_buflen == 0)
4497 { 3976 {
4498 free (v_buffer); 3977 free (v_buffer);
4499 v_buffer = 0; 3978 v_buffer = 0;
4500 v_buflen = 0;
4501 3979
4502 pty_ev.set (EVENT_READ); 3980 pty_ev.set (ev::READ);
4503 return; 3981 return;
4504 } 3982 }
4505 3983
4506 memmove (v_buffer, v_buffer + written, v_buflen); 3984 memmove (v_buffer, v_buffer + written, v_buflen);
4507 } 3985 }
4508 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3986 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4509 pty_ev.set (EVENT_READ); 3987 pty_ev.set (ev::READ);
4510} 3988}
4511 3989
4512/*----------------------- end-of-file (C source) -----------------------*/ 3990/*----------------------- end-of-file (C source) -----------------------*/
4513 3991

Diff Legend

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