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.221 by root, Sat Dec 31 18:27:57 2005 UTC vs.
Revision 1.406 by ayin, Thu Feb 14 23:53:05 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 44 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 45 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 46 *----------------------------------------------------------------------*/
46 47
47/*{{{ includes: */ 48/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 49#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 50#include "rxvt.h"
51#include "rxvtperl.h"
50#include "version.h" 52#include "version.h"
51#include "command.h" 53#include "command.h"
52 54
53#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 56# include "keyboard.h"
55#endif 57#endif
56 58
57#include <csignal> 59#include <csignal>
58 60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64
59/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
60 66
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 68
66#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
67 70
68#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
93 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
94 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
95 98
96 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
97 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
98 XK_ISO_Lock, 0x21eb,
99 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
100 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
101 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
102 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
103 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
141 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 144 return;
143 145
144 for (;;) 146 for (;;)
145 { 147 {
146 const line_t &l = ROW(y - view_start); 148 const line_t &l = ROW(y + view_start);
147 149
148 text_t t = l.t[x]; 150 text_t t = l.t[x];
149 151
150 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
151 { 153 {
… …
197 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
198 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
199 201
200 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
201 203
202 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
203 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
204 206
205 if (y >= 0) 207 if (y >= 0)
206 { 208 {
207 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
219 ch = *chr++; 221 ch = *chr++;
220 222
221 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
222 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
223 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
224# if !UNICODE3 226# if !UNICODE_3
225 if (ch >= 0x10000) 227 if (ch >= 0x10000)
226 ch = 0xfffd; 228 ch = 0xfffd;
227# endif 229# endif
228 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
229 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
230 } 234 }
231 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// }
232 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
233 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
234 243
235 free (fname); 244 free (fname);
236 245
… …
262 mb[0] = ch[0]; 271 mb[0] = ch[0];
263 len = 1; 272 len = 1;
264 } 273 }
265 274
266 if (len > 0) 275 if (len > 0)
267 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
268 else 277 else
269 scr_bell (); 278 scr_bell ();
270 } 279 }
271 280
272 iso14755buf = 0; 281 iso14755buf = 0;
… …
289 298
290 return -1; 299 return -1;
291} 300}
292#endif 301#endif
293 302
294/*{{{ Convert the keypress event into a string */
295void 303void
296rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
297{ 305{
298 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
299 unsigned int newlen;
300 KeySym keysym; 307 KeySym keysym;
301#ifdef DEBUG_CMD
302 static int debug_key = 1; /* accessible by a debugger only */
303#endif
304 int valid_keysym; 308 int valid_keysym;
305 unsigned char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
306 315
307 /* 316 /*
308 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
309 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
310 * 319 *
… …
328 Status status_return; 337 Status status_return;
329 338
330#if 0 339#if 0
331#ifdef X_HAVE_UTF8_STRING 340#ifdef X_HAVE_UTF8_STRING
332 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 341 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
333 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 342 len = Xutf8LookupString (Input_Context, &ev, kbuf,
334 KBUFSZ, &keysym, &status_return); 343 KBUFSZ, &keysym, &status_return);
335 else 344 else
336#endif 345#endif
337#endif 346#endif
338 { 347 {
… …
375 || status_return == XLookupBoth; 384 || status_return == XLookupBoth;
376 } 385 }
377 else 386 else
378#endif 387#endif
379 { 388 {
380 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 389 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
381 valid_keysym = keysym != NoSymbol; 390 valid_keysym = keysym != NoSymbol;
382 } 391 }
383 392
384 if (valid_keysym) 393 if (valid_keysym)
385 { 394 {
… …
437 scr_move_to (0, 1); 446 scr_move_to (0, 1);
438 return; 447 return;
439 } 448 }
440 else if (keysym == XK_End) 449 else if (keysym == XK_End)
441 { 450 {
442 scr_move_to (1, 0); 451 scr_move_to (1, 1);
443 return; 452 return;
444 } 453 }
445 } 454 }
446#endif 455#endif
447 } 456 }
… …
458 { 467 {
459 switch (keysym) 468 switch (keysym)
460 { 469 {
461 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
462 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
463 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
464 return; 473 return;
465#if TODO 474#if TODO
466 /* rxvt extras */ 475 /* rxvt extras */
467 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
468 change_font (FONT_UP); 477 change_font (FONT_UP);
… …
487 { 496 {
488 commit_iso14755 (); 497 commit_iso14755 ();
489 iso14755buf = ISO_14755_51; 498 iso14755buf = ISO_14755_51;
490# if ISO_14755 499# if ISO_14755
491 iso14755_51 (0); 500 iso14755_51 (0);
501# endif
502 return;
503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
492# endif 509# endif
493 return; 510 return;
494 } 511 }
495 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
496 { 513 {
… …
501# endif 518# endif
502 return; 519 return;
503 } 520 }
504 else 521 else
505 { 522 {
506# if ENABLE_OVERLAY 523# if ISO_14755
507 scr_overlay_off (); 524 scr_overlay_off ();
508# endif 525# endif
509 iso14755buf = 0; 526 iso14755buf = 0;
510 } 527 }
511 } 528 }
512 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
513 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
514 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
515 { 532 {
516 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
517# if ENABLE_OVERLAY 534# if ISO_14755
518 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
519 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
520# endif 537# endif
521 } 538 }
522#endif 539#endif
523 540
524#ifdef PRINTPIPE 541#ifdef PRINTPIPE
525 if (keysym == XK_Print) 542 if (keysym == XK_Print)
526 { 543 {
527 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
528 return; 545 return;
529 } 546 }
530#endif 547#endif
531 548
532 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
533 { 550 {
551 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
552 unsigned int newlen = 1;
553#ifdef XK_KP_Home
554 static const KeySym keypadtrans[] = {
555 XK_KP_7, // XK_KP_Home
556 XK_KP_4, // XK_KP_Left
557 XK_KP_8, // XK_KP_Up
558 XK_KP_6, // XK_KP_Right
559 XK_KP_2, // XK_KP_Down
560#ifndef UNSHIFTED_SCROLLKEYS
561 XK_KP_9, // XK_KP_Prior
562 XK_KP_3, // XK_KP_Next
563#else
564 XK_Prior,
565 XK_Next,
566#endif
567 XK_KP_1, // XK_KP_End
568 XK_KP_5, // XK_KP_Begin
569 };
570
571 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
534 { 572 {
535 newlen = 1; 573 unsigned int index = keysym - XK_KP_Home;
574 keysym = kp ? keypadtrans[index] : XK_Home + index;
575 }
576 else if (keysym == XK_KP_Insert)
577 keysym = kp ? XK_KP_0 : XK_Insert;
578#ifndef NO_DELETE_KEY
579 else if (keysym == XK_KP_Delete)
580 keysym = kp ? XK_KP_Decimal : XK_Delete;
581#endif
582#endif
536 switch (keysym) 583 switch (keysym)
537 { 584 {
538#ifndef NO_BACKSPACE_KEY 585#ifndef NO_BACKSPACE_KEY
539 case XK_BackSpace: 586 case XK_BackSpace:
540 if (priv_modes & PrivMode_HaveBackSpace) 587 if (priv_modes & PrivMode_HaveBackSpace)
… …
542 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 589 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
543 ^ !!ctrl) ? '\b' : '\177'; 590 ^ !!ctrl) ? '\b' : '\177';
544 kbuf[1] = '\0'; 591 kbuf[1] = '\0';
545 } 592 }
546 else 593 else
547 strcpy (kbuf, key_backspace); 594 strcpy (kbuf, rs[Rs_backspace_key]);
548 break; 595 break;
549#endif 596#endif
550#ifndef NO_DELETE_KEY 597#ifndef NO_DELETE_KEY
551# ifdef XK_KP_Prior
552 case XK_KP_Delete:
553 /* allow shift to override */
554 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
555 {
556 strcpy (kbuf, "\033On");
557 break;
558 }
559 /* FALLTHROUGH */
560# endif
561 case XK_Delete: 598 case XK_Delete:
562 strcpy (kbuf, key_delete); 599 strcpy (kbuf, rs[Rs_delete_key]);
563 break; 600 break;
564#endif 601#endif
565 case XK_Tab: 602 case XK_Tab:
566 if (shft) 603 if (shft)
567 strcpy (kbuf, "\033[Z"); 604 strcpy (kbuf, "\033[Z");
… …
577#endif 614#endif
578 newlen = 0; 615 newlen = 0;
579 } 616 }
580 break; 617 break;
581 618
582#ifdef XK_KP_Left
583 case XK_KP_Up: /* \033Ox or standard */
584 case XK_KP_Down: /* \033Or or standard */
585 case XK_KP_Right: /* \033Ov or standard */
586 case XK_KP_Left: /* \033Ot or standard */
587 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
588 {
589 strcpy (kbuf, "\033OZ");
590 kbuf[2] = "txvr"[keysym - XK_KP_Left];
591 break;
592 }
593 else
594 /* translate to std. cursor key */
595 keysym = XK_Left + (keysym - XK_KP_Left);
596 /* FALLTHROUGH */
597#endif
598 case XK_Up: /* "\033[A" */ 619 case XK_Up: /* "\033[A" */
599 case XK_Down: /* "\033[B" */ 620 case XK_Down: /* "\033[B" */
600 case XK_Right: /* "\033[C" */ 621 case XK_Right: /* "\033[C" */
601 case XK_Left: /* "\033[D" */ 622 case XK_Left: /* "\033[D" */
602 strcpy (kbuf, "\033[Z"); 623 strcpy (kbuf, "\033[Z");
… …
612 else if (priv_modes & PrivMode_aplCUR) 633 else if (priv_modes & PrivMode_aplCUR)
613 kbuf[1] = 'O'; 634 kbuf[1] = 'O';
614 break; 635 break;
615 636
616#ifndef UNSHIFTED_SCROLLKEYS 637#ifndef UNSHIFTED_SCROLLKEYS
617# ifdef XK_KP_Prior
618 case XK_KP_Prior:
619 /* allow shift to override */
620 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
621 {
622 strcpy (kbuf, "\033Oy");
623 break;
624 }
625 /* FALLTHROUGH */
626# endif
627 case XK_Prior: 638 case XK_Prior:
628 strcpy (kbuf, "\033[5~"); 639 strcpy (kbuf, "\033[5~");
629 break; 640 break;
630# ifdef XK_KP_Next
631 case XK_KP_Next:
632 /* allow shift to override */
633 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
634 {
635 strcpy (kbuf, "\033Os");
636 break;
637 }
638 /* FALLTHROUGH */
639# endif
640 case XK_Next: 641 case XK_Next:
641 strcpy (kbuf, "\033[6~"); 642 strcpy (kbuf, "\033[6~");
642 break; 643 break;
643#endif 644#endif
644 case XK_KP_Enter: 645 case XK_KP_Enter:
645 /* allow shift to override */ 646 /* allow shift to override */
646 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 647 if (kp)
647 { 648 {
648 strcpy (kbuf, "\033OM"); 649 strcpy (kbuf, "\033OM");
649 break; 650 break;
650 } 651 }
651 652
… …
663 kbuf[0] = '\015'; 664 kbuf[0] = '\015';
664 kbuf[1] = '\0'; 665 kbuf[1] = '\0';
665 } 666 }
666 break; 667 break;
667 668
668#ifdef XK_KP_Begin
669 case XK_KP_Begin:
670 strcpy (kbuf, "\033Ou");
671 break;
672
673#endif
674 case XK_KP_F1: /* "\033OP" */ 669 case XK_KP_F1: /* "\033OP" */
675 case XK_KP_F2: /* "\033OQ" */ 670 case XK_KP_F2: /* "\033OQ" */
676 case XK_KP_F3: /* "\033OR" */ 671 case XK_KP_F3: /* "\033OR" */
677 case XK_KP_F4: /* "\033OS" */ 672 case XK_KP_F4: /* "\033OS" */
678 strcpy (kbuf, "\033OP"); 673 strcpy (kbuf, "\033OP");
… …
694 case XK_KP_6: /* "\033Ov" : "6" */ 689 case XK_KP_6: /* "\033Ov" : "6" */
695 case XK_KP_7: /* "\033Ow" : "7" */ 690 case XK_KP_7: /* "\033Ow" : "7" */
696 case XK_KP_8: /* "\033Ox" : "8" */ 691 case XK_KP_8: /* "\033Ox" : "8" */
697 case XK_KP_9: /* "\033Oy" : "9" */ 692 case XK_KP_9: /* "\033Oy" : "9" */
698 /* allow shift to override */ 693 /* allow shift to override */
699 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 694 if (kp)
700 { 695 {
701 strcpy (kbuf, "\033Oj"); 696 strcpy (kbuf, "\033Oj");
702 kbuf[2] += (keysym - XK_KP_Multiply); 697 kbuf[2] += (keysym - XK_KP_Multiply);
703 } 698 }
704 else 699 else
… …
710 705
711 case XK_Find: 706 case XK_Find:
712 strcpy (kbuf, "\033[1~"); 707 strcpy (kbuf, "\033[1~");
713 break; 708 break;
714 709
715#ifdef XK_KP_End
716 case XK_KP_Insert:
717 /* allow shift to override */
718 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
719 {
720 strcpy (kbuf, "\033Op");
721 break;
722 }
723 /* FALLTHROUGH */
724#endif
725 case XK_Insert: 710 case XK_Insert:
726 strcpy (kbuf, "\033[2~"); 711 strcpy (kbuf, "\033[2~");
727 break; 712 break;
728#ifdef DXK_Remove /* support for DEC remove like key */ 713#ifdef DXK_Remove /* support for DEC remove like key */
729 case DXK_Remove: 714 case DXK_Remove:
… …
733 strcpy (kbuf, "\033[3~"); 718 strcpy (kbuf, "\033[3~");
734 break; 719 break;
735 case XK_Select: 720 case XK_Select:
736 strcpy (kbuf, "\033[4~"); 721 strcpy (kbuf, "\033[4~");
737 break; 722 break;
738#ifdef XK_KP_End
739 case XK_KP_End:
740 /* allow shift to override */
741 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
742 {
743 strcpy (kbuf, "\033Oq");
744 break;
745 }
746 /* FALLTHROUGH */
747#endif
748 case XK_End: 723 case XK_End:
749 strcpy (kbuf, KS_END); 724 strcpy (kbuf, KS_END);
750 break; 725 break;
751#ifdef XK_KP_Home
752 case XK_KP_Home:
753 /* allow shift to override */
754 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
755 {
756 strcpy (kbuf, "\033Ow");
757 break;
758 }
759 /* FALLTHROUGH */
760#endif
761 case XK_Home: 726 case XK_Home:
762 strcpy (kbuf, KS_HOME); 727 strcpy (kbuf, KS_HOME);
763 break; 728 break;
764 729
765#define FKEY(n, fkey) \ 730#define FKEY(n, fkey) \
… …
822 break; 787 break;
823 } 788 }
824 789
825 if (newlen) 790 if (newlen)
826 len = strlen (kbuf); 791 len = strlen (kbuf);
827 }
828 792
829 /* 793 /*
830 * Pass meta for all function keys, if 'meta' option set 794 * Pass meta for all function keys, if 'meta' option set
831 */ 795 */
832#ifdef META8_OPTION 796#ifdef META8_OPTION
… …
849 { 813 {
850#ifdef META8_OPTION 814#ifdef META8_OPTION
851 /* set 8-bit on */ 815 /* set 8-bit on */
852 if (meta && (meta_char == 0x80)) 816 if (meta && (meta_char == 0x80))
853 { 817 {
854 unsigned char *ch; 818 char *ch;
855 819
856 for (ch = kbuf; ch < kbuf + len; ch++) 820 for (ch = kbuf; ch < kbuf + len; ch++)
857 *ch |= 0x80; 821 *ch |= 0x80;
858 822
859 meta = 0; 823 meta = 0;
… …
861#endif 825#endif
862 /* nil */ ; 826 /* nil */ ;
863 } 827 }
864 } 828 }
865 829
830 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
831 return;
832
866 if (len <= 0) 833 if (len <= 0)
867 return; /* not mapped */ 834 return; /* not mapped */
868 835
869 if (OPTION (Opt_scrollTtyKeypress)) 836 if (option (Opt_scrollTtyKeypress))
870 if (view_start) 837 if (view_start)
871 { 838 {
872 view_start = 0; 839 view_start = 0;
873 want_refresh = 1; 840 want_refresh = 1;
874 } 841 }
… …
892#ifdef META8_OPTION 859#ifdef META8_OPTION
893 && meta_char == C0_ESC 860 && meta_char == C0_ESC
894#endif 861#endif
895 ) 862 )
896 { 863 {
897 const unsigned char ch = C0_ESC; 864 const char ch = C0_ESC;
898 tt_write (&ch, 1); 865 tt_write (&ch, 1);
899 } 866 }
900 867
901#if defined(DEBUG_CMD)
902 /* Display keyboard buffer contents */
903 unsigned char *p;
904 int i;
905
906 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
907 for (i = 0, p = kbuf; i < len; i++, p++)
908 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
909 fprintf (stderr, "'\n");
910#endif /* DEBUG_CMD */
911 tt_write (kbuf, (unsigned int)len); 868 tt_write (kbuf, (unsigned int)len);
912} 869}
913/*}}} */
914 870
871void
872rxvt_term::key_release (XKeyEvent &ev)
873{
874#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
875 KeySym keysym;
876
877 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
878#endif
879
880#if ENABLE_FRILLS || ISO_14755
881 // ISO 14755 support
882 if (iso14755buf)
883 if (iso14755buf & ISO_14755_52)
884 {
885# if ISO_14755
886 scr_overlay_off ();
887# endif
888# if ISO_14755
889 // iso14755 part 5.2 handling: release time
890 // first: controls
891 if ((ev.state & ControlMask)
892 && ((keysym >= 0x40 && keysym <= 0x5f)
893 || (keysym >= 0x61 && keysym <= 0x7f)))
894 {
895 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
896 commit_iso14755 ();
897
898 return;
899 }
900
901 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
902 if (i[0] == keysym)
903 {
904 iso14755buf = ISO_14755_51 | i[1];
905 commit_iso14755 ();
906
907 return;
908 }
909
910 scr_bell ();
911# endif
912 iso14755buf = 0;
913
914 return;
915 }
916 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
917 {
918# if ISO_14755
919 scr_overlay_off ();
920# endif
921 if (iso14755buf & ISO_14755_51)
922 commit_iso14755 ();
923#if ISO_14755
924 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
925 {
926 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
927
928 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
929 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
930 }
931# endif
932 else
933 iso14755buf = 0;
934 }
935#endif
936
937 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
938 return;
939
940#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
941 if (!(ev.state & ControlMask))
942 slip_wheel_ev.stop ();
943 else if (keysym == XK_Control_L || keysym == XK_Control_R)
944 mouse_slip_wheel_speed = 0;
945#endif
946}
947
915#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 948#if defined (KEYSYM_RESOURCE)
916/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
917/* attempt to `write' count to the input buffer */
918unsigned int 949unsigned int
919rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 950rxvt_term::cmd_write (const char *str, unsigned int count)
920{ 951{
921 unsigned int n, s; 952 unsigned int n, s;
922 953
923 n = cmdbuf_ptr - cmdbuf_base; 954 n = cmdbuf_ptr - cmdbuf_base;
924 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 955 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
950void 981void
951rxvt_term::flush () 982rxvt_term::flush ()
952{ 983{
953 flush_ev.stop (); 984 flush_ev.stop ();
954 985
955#ifdef TRANSPARENT 986#ifdef HAVE_BG_PIXMAP
956 if (want_full_refresh) 987 if (bgPixmap.check_clearChanged ())
957 { 988 {
958 want_full_refresh = 0; 989// scr_clear (true); This needs to be researched further!
959 scr_clear ();
960 scr_touch (false); 990 scr_touch (false);
961 } 991 }
962#endif 992#endif
963 993
964 if (want_refresh) 994 if (want_refresh)
965 { 995 {
996 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
997 {
998 int row = view_start;
999 int end_row = row + nrow;
1000
1001 while (row > top_row && ROW (row - 1).is_longer ())
1002 --row;
1003
1004 do
1005 {
1006 int start_row = row;
1007 line_t *l;
1008
1009 do
1010 {
1011 l = &ROW (row++);
1012
1013 if (!(l->f & LINE_FILTERED))
1014 {
1015 // line not filtered, mark it as filtered
1016 l->f |= LINE_FILTERED;
1017 while (l->is_longer ())
1018 {
1019 l = &ROW (row++);
1020 l->f |= LINE_FILTERED;
1021 }
1022
1023 // and filter it
1024 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1025
1026 break;
1027 }
1028 }
1029 while (l->is_longer () && row < end_row);
1030 }
1031 while (row < end_row);
1032 }
1033
966 scr_refresh (refresh_type); 1034 scr_refresh ();
967 scrollbar_show (1); 1035 scrollbar_show (1);
968#ifdef USE_XIM 1036#ifdef USE_XIM
969 IMSendSpot (); 1037 IMSendSpot ();
970#endif 1038#endif
971 } 1039 }
972 1040
973 display->flush (); 1041 display->flush ();
974} 1042}
975 1043
1044/* checks wether a refresh is requested and starts the refresh timer */
976void 1045void
977rxvt_term::check_cb (check_watcher &w) 1046rxvt_term::refresh_check ()
978{ 1047{
979 SET_R (this); 1048 if (want_refresh && !flush_ev.is_active ())
980 SET_LOCALE (locale); 1049 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
981 1050
982 display->flush (); 1051 display->flush ();
983
984 if (want_refresh && !flush_ev.active)
985 flush_ev.start (NOW + 0.01);
986} 1052}
987 1053
988void 1054void
989rxvt_term::flush_cb (time_watcher &w) 1055rxvt_term::flush_cb (ev::timer &w, int revents)
990{ 1056{
991 SET_R (this); 1057 make_current ();
992 SET_LOCALE (locale);
993 1058
994 refresh_limit = 1;
995 refresh_count = 0; 1059 refresh_count = 0;
996 flush (); 1060 flush ();
997} 1061}
998 1062
999#ifdef CURSOR_BLINK 1063#ifdef CURSOR_BLINK
1000void 1064void
1001rxvt_term::cursor_blink_cb (time_watcher &w) 1065rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1002{ 1066{
1003 hidden_cursor = !hidden_cursor; 1067 hidden_cursor = !hidden_cursor;
1004 want_refresh = 1; 1068 want_refresh = 1;
1005 1069 refresh_check ();
1006 w.start (w.at + BLINK_INTERVAL);
1007} 1070}
1008#endif 1071#endif
1009 1072
1010#ifdef TEXT_BLINK 1073#ifdef TEXT_BLINK
1011void 1074void
1012rxvt_term::text_blink_cb (time_watcher &w) 1075rxvt_term::text_blink_cb (ev::timer &w, int revents)
1013{ 1076{
1014 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1077 if (scr_refresh_rend (RS_Blink, RS_Blink))
1015 { 1078 {
1016 hidden_text = !hidden_text; 1079 hidden_text = !hidden_text;
1017 want_refresh = 1; 1080 want_refresh = 1;
1018 w.start (w.at + TEXT_BLINK_INTERVAL); 1081 refresh_check ();
1019 } 1082 }
1083 else
1084 w.stop ();
1020} 1085}
1021#endif 1086#endif
1022 1087
1023#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1088#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1024void 1089void
1025rxvt_term::cont_scroll_cb (time_watcher &w) 1090rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1026{ 1091{
1027 if ((scrollbar_isUp() || scrollbar_isDn()) && 1092 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1028 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1093 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1029 { 1094 {
1030 refresh_type |= SMOOTH_REFRESH;
1031 want_refresh = 1; 1095 want_refresh = 1;
1032 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1033 } 1097 }
1098 else
1099 w.stop ();
1034} 1100}
1035#endif 1101#endif
1036 1102
1037#ifdef SELECTION_SCROLLING 1103#ifdef SELECTION_SCROLLING
1038void 1104void
1039rxvt_term::sel_scroll_cb (time_watcher &w) 1105rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1040{ 1106{
1041 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1107 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1042 { 1108 {
1043 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1109 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1044 refresh_type |= SMOOTH_REFRESH;
1045 want_refresh = 1; 1110 want_refresh = 1;
1046 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1111 refresh_check ();
1047 } 1112 }
1113 else
1114 w.stop ();
1048} 1115}
1049#endif 1116#endif
1050 1117
1051#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1118#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1052void 1119void
1053rxvt_term::slip_wheel_cb (time_watcher &w) 1120rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1054{ 1121{
1055 if (mouse_slip_wheel_speed == 0 1122 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1056 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1057 : scr_page (UP, mouse_slip_wheel_speed))
1058 { 1123 {
1059 if (view_start == nsaved ||
1060 view_start == 0)
1061 mouse_slip_wheel_speed = 0;
1062
1063 refresh_type |= SMOOTH_REFRESH;
1064 want_refresh = 1; 1124 want_refresh = 1;
1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1125 refresh_check ();
1126 }
1127
1128 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1066 } 1129 {
1130 mouse_slip_wheel_speed = 0;
1131 w.stop ();
1132 }
1067} 1133}
1134#endif
1135
1136#if LINUX_YIELD_HACK
1137static struct event_handler
1138{
1139 ev::prepare yield_ev;
1140
1141 void yield_cb (ev::prepare &w, int revents)
1142 {
1143 // this should really be sched_yield(), but the linux guys thought
1144 // that giving a process calling sched_yield () less cpu time than
1145 // ones with high nice levels is a useful thing to do. It surely is is
1146 // allowed by the sus... as is returning ENOSYS.
1147
1148 struct timespec ts = { 0, 0 };
1149 nanosleep (&ts, 0);
1150
1151 w.stop ();
1152 }
1153
1154 event_handler ()
1155 : yield_ev (this, &event_handler::yield_cb)
1156 {
1157 }
1158} event_handler;
1068#endif 1159#endif
1069 1160
1070bool 1161bool
1071rxvt_term::pty_fill () 1162rxvt_term::pty_fill ()
1072{ 1163{
1073 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1164 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1074 1165
1075 if (CBUFSIZ == n) 1166 if (CBUFSIZ == n)
1076 { 1167 {
1077 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1168 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1078 n = 0; 1169 n = 0;
1079 } 1170 }
1080 1171
1081 memmove (cmdbuf_base, cmdbuf_ptr, n); 1172 memmove (cmdbuf_base, cmdbuf_ptr, n);
1082 cmdbuf_ptr = cmdbuf_base; 1173 cmdbuf_ptr = cmdbuf_base;
1083 cmdbuf_endp = cmdbuf_ptr + n; 1174 cmdbuf_endp = cmdbuf_ptr + n;
1084 1175
1085 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1176 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1086 1177
1087 if (n > 0) 1178 if (r > 0)
1088 { 1179 {
1089 cmdbuf_endp += n; 1180 cmdbuf_endp += r;
1090 return true; 1181 return true;
1091 } 1182 }
1092 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1183 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1184 {
1185#if LINUX_YIELD_HACK
1186 if (display->is_local)
1187 event_handler.yield_ev.start ();
1188#endif
1189 }
1190 else
1093 { 1191 {
1094 pty_ev.stop (); 1192 pty_ev.stop ();
1095 1193
1096 if (!OPTION (Opt_hold)) 1194 if (!option (Opt_hold))
1097 destroy (); 1195 destroy ();
1098 } 1196 }
1099 1197
1100 return false; 1198 return false;
1101} 1199}
1102 1200
1103void 1201void
1104rxvt_term::pty_cb (io_watcher &w, short revents) 1202rxvt_term::pty_cb (ev::io &w, int revents)
1105{ 1203{
1106 SET_R (this); 1204 make_current ();
1107 SET_LOCALE (locale);
1108 1205
1109 if (revents & EVENT_READ) 1206 if (revents & ev::READ)
1110 // loop, but don't allow a single term to monopolize us 1207 // loop, but don't allow a single term to monopolize us
1111 while (pty_fill ()) 1208 while (pty_fill ())
1112 if (cmd_parse ()) 1209 if (cmd_parse ())
1113 break; 1210 break;
1114 1211
1115 if (revents & EVENT_WRITE) 1212 if (revents & ev::WRITE)
1116 pty_write (); 1213 pty_write ();
1214
1215 refresh_check ();
1117} 1216}
1118 1217
1119void 1218void
1120rxvt_term::pointer_unblank () 1219rxvt_term::pointer_unblank ()
1121{ 1220{
1122 XDefineCursor (display->display, vt, TermWin_cursor); 1221 XDefineCursor (dpy, vt, TermWin_cursor);
1123 recolour_cursor (); 1222 recolour_cursor ();
1124 1223
1125#ifdef POINTER_BLANK 1224#ifdef POINTER_BLANK
1126 hidden_pointer = 0; 1225 hidden_pointer = 0;
1127 1226
1128 if (OPTION (Opt_pointerBlank)) 1227 if (option (Opt_pointerBlank))
1129 pointer_ev.start (NOW + pointerBlankDelay); 1228 pointer_ev.start (pointerBlankDelay);
1130#endif 1229#endif
1131} 1230}
1132 1231
1133#ifdef POINTER_BLANK 1232#ifdef POINTER_BLANK
1134void 1233void
1135rxvt_term::pointer_blank () 1234rxvt_term::pointer_blank ()
1136{ 1235{
1137 if (! OPTION (Opt_pointerBlank)) 1236 if (!option (Opt_pointerBlank))
1138 return; 1237 return;
1139 1238
1140 XDefineCursor (display->display, vt, display->blank_cursor); 1239 XDefineCursor (dpy, vt, display->blank_cursor);
1141 XFlush (display->display); 1240 XFlush (dpy);
1142 1241
1143 hidden_pointer = 1; 1242 hidden_pointer = 1;
1144} 1243}
1145 1244
1146void 1245void
1147rxvt_term::pointer_cb (time_watcher &w) 1246rxvt_term::pointer_cb (ev::timer &w, int revents)
1148{ 1247{
1149 SET_R (this); 1248 make_current ();
1150 SET_LOCALE (locale);
1151 1249
1152 pointer_blank (); 1250 pointer_blank ();
1153} 1251}
1154#endif 1252#endif
1155 1253
1156void 1254void
1157rxvt_term::mouse_report (XButtonEvent &ev) 1255rxvt_term::mouse_report (XButtonEvent &ev)
1158{ 1256{
1159 int button_number, key_state = 0; 1257 int button_number, key_state = 0;
1160 int x, y; 1258 int x, y;
1259 int code = 32;
1161 1260
1162 x = ev.x; 1261 x = Pixel2Col (ev.x);
1163 y = ev.y; 1262 y = Pixel2Row (ev.y);
1164 pixel_position (&x, &y); 1263 if (ev.type == MotionNotify)
1264 {
1265 if (x == mouse_row && y == mouse_col)
1266 return;
1267 mouse_row = x;
1268 mouse_col = y;
1269 code += 32;
1270 }
1165 1271
1166 if (MEvent.button == AnyButton) 1272 if (MEvent.button == AnyButton)
1167 button_number = 3; 1273 button_number = 3;
1168 else 1274 else
1169 { 1275 {
… …
1215 x + 1, 1321 x + 1,
1216 y + 1); 1322 y + 1);
1217#endif 1323#endif
1218 1324
1219 tt_printf ("\033[M%c%c%c", 1325 tt_printf ("\033[M%c%c%c",
1220 (32 + button_number + key_state), 1326 (code + button_number + key_state),
1221 (32 + x + 1), 1327 (32 + x + 1),
1222 (32 + y + 1)); 1328 (32 + y + 1));
1223} 1329}
1224
1225#ifdef USING_W11LIB
1226void
1227rxvt_W11_process_x_event (XEvent *ev)
1228{
1229 rxvt_t *r = rxvt_get_r ();
1230
1231 x_cb (*ev);
1232}
1233#endif
1234 1330
1235/*{{{ process an X event */ 1331/*{{{ process an X event */
1236void 1332void
1237rxvt_term::x_cb (XEvent &ev) 1333rxvt_term::x_cb (XEvent &ev)
1238{ 1334{
1239 dDisp; 1335 make_current ();
1240 1336
1241 SET_R (this); 1337 dLocal (Display *, dpy);
1242 SET_LOCALE (locale);
1243 1338
1244#if defined(CURSOR_BLINK) 1339 if (ev.xany.window == vt
1245 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1340 && SHOULD_INVOKE (HOOK_X_EVENT)
1246 { 1341 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1247 if (hidden_cursor) 1342 return;
1248 {
1249 hidden_cursor = 0;
1250 want_refresh = 1;
1251 }
1252 1343
1253 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1344 // for XQueryPointer
1254 }
1255#endif
1256
1257#if defined(POINTER_BLANK)
1258 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1259 {
1260 if (ev.type == MotionNotify
1261 || ev.type == ButtonPress
1262 || ev.type == ButtonRelease)
1263 if (hidden_pointer)
1264 pointer_unblank ();
1265
1266 if (ev.type == KeyPress && hidden_pointer == 0)
1267 pointer_blank ();
1268 }
1269#endif
1270
1271 Window unused_root, unused_child; 1345 Window unused_root, unused_child;
1272 int unused_root_x, unused_root_y; 1346 int unused_root_x, unused_root_y;
1273 unsigned int unused_mask; 1347 unsigned int unused_mask;
1274 1348
1275 switch (ev.type) 1349 switch (ev.type)
1276 { 1350 {
1277 case KeyPress: 1351 case KeyPress:
1278#if ISO_14755 1352 key_press (ev.xkey);
1279 if (!(iso14755buf & ISO_14755_52))
1280#endif
1281 lookup_key (ev.xkey);
1282
1283 break; 1353 break;
1284 1354
1285 case KeyRelease: 1355 case KeyRelease:
1286 { 1356 key_release (ev.xkey);
1287#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1288 KeySym ks;
1289
1290 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1291#endif
1292
1293#if ENABLE_FRILLS || ISO_14755
1294 // ISO 14755 support
1295 if (iso14755buf)
1296 if (iso14755buf & ISO_14755_52)
1297 {
1298# if ENABLE_OVERLAY
1299 scr_overlay_off ();
1300# endif
1301# if ISO_14755
1302 // iso14755 part 5.2 handling: release time
1303 // first: controls
1304 if ((ev.xkey.state & ControlMask)
1305 && ((ks >= 0x40 && ks <= 0x5f)
1306 || (ks >= 0x61 && ks <= 0x7f)))
1307 {
1308 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1309 commit_iso14755 ();
1310 return; // case-break;
1311 }
1312
1313 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1314 if (i[0] == ks)
1315 {
1316 iso14755buf = ISO_14755_51 | i[1];
1317 commit_iso14755 ();
1318 return; // case-break;
1319 }
1320
1321 scr_bell ();
1322# endif
1323 iso14755buf = 0;
1324 break;
1325 }
1326 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1327 {
1328# if ENABLE_OVERLAY
1329 scr_overlay_off ();
1330# endif
1331 if (iso14755buf & ISO_14755_51)
1332 commit_iso14755 ();
1333#if ISO_14755
1334 else if (iso14755buf & ISO_14755_STARTED)
1335 {
1336 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1337
1338 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1339 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1340 }
1341# endif
1342 else
1343 iso14755buf = 0;
1344 }
1345#endif
1346
1347#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1348 if (!(ev.xkey.state & ControlMask))
1349 slip_wheel_ev.stop ();
1350 else if (ks == XK_Control_L || ks == XK_Control_R)
1351 mouse_slip_wheel_speed = 0;
1352#endif
1353 break; 1357 break;
1354 }
1355 1358
1356 case ButtonPress: 1359 case ButtonPress:
1357 button_press (ev.xbutton); 1360 button_press (ev.xbutton);
1358 break; 1361 break;
1359 1362
… …
1361 button_release (ev.xbutton); 1364 button_release (ev.xbutton);
1362 break; 1365 break;
1363 1366
1364 case ClientMessage: 1367 case ClientMessage:
1365 if (ev.xclient.format == 32 1368 if (ev.xclient.format == 32
1366 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1369 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1367 { 1370 {
1371 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1372 {
1373 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1374 {
1368 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1375 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1376 {
1377 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1369 destroy (); 1378 destroy ();
1379 }
1370#if ENABLE_EWMH 1380#if ENABLE_EWMH
1371 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1381 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1372 XSendEvent (disp, ev.xclient.window = display->root, 1382 XSendEvent (dpy, ev.xclient.window = display->root,
1373 False, SubstructureRedirectMask | SubstructureNotifyMask, 1383 False, SubstructureRedirectMask | SubstructureNotifyMask,
1374 &ev); 1384 &ev);
1385#endif
1386 }
1387 }
1388#if ENABLE_XEMBED
1389 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1390 {
1391 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1392 focus_in ();
1393 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1394 focus_out ();
1395 }
1375#endif 1396#endif
1376 } 1397 }
1377#if ENABLE_XEMBED
1378 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1379 {
1380 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1381 focus_in ();
1382 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1383 focus_out ();
1384 }
1385#endif
1386#ifdef OFFIX_DND
1387 /* OffiX Dnd (drag 'n' drop) protocol */
1388 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1389 && (ev.xclient.data.l[0] == DndFile
1390 || ev.xclient.data.l[0] == DndDir
1391 || ev.xclient.data.l[0] == DndLink))
1392 {
1393 /* Get Dnd data */
1394 Atom ActualType;
1395 int ActualFormat;
1396 unsigned char *data;
1397 unsigned long Size, RemainingBytes;
1398
1399 XGetWindowProperty (disp, display->root,
1400 xa[XA_DNDSELECTION],
1401 0L, 1000000L,
1402 False, AnyPropertyType,
1403 &ActualType, &ActualFormat,
1404 &Size, &RemainingBytes,
1405 &data);
1406 set_string_property (XA_CUT_BUFFER0, data);
1407 XFree (data);
1408 selection_paste (display->root, XA_CUT_BUFFER0, true);
1409 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1410 }
1411#endif /* OFFIX_DND */
1412 break;
1413
1414 case MappingNotify:
1415 XRefreshKeyboardMapping (&ev.xmapping);
1416 break; 1398 break;
1417 1399
1418 /* 1400 /*
1419 * XXX: this is not the _current_ arrangement 1401 * XXX: this is not the _current_ arrangement
1420 * Here's my conclusion: 1402 * Here's my conclusion:
… …
1439 break; 1421 break;
1440 } 1422 }
1441 break; 1423 break;
1442 1424
1443 case FocusIn: 1425 case FocusIn:
1426 if (ev.xfocus.detail != NotifyInferior
1427 && ev.xfocus.detail != NotifyPointer
1428 && ev.xfocus.mode != NotifyGrab)
1444 focus_in (); 1429 focus_in ();
1445 break; 1430 break;
1446 1431
1447 case FocusOut: 1432 case FocusOut:
1433 if (ev.xfocus.detail != NotifyInferior
1434 && ev.xfocus.detail != NotifyPointer
1435 && ev.xfocus.mode != NotifyGrab)
1448 focus_out (); 1436 focus_out ();
1449 break; 1437 break;
1450 1438
1451 case ConfigureNotify: 1439 case ConfigureNotify:
1440 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1441 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1442 szHint.width, szHint.height);*/
1452 if (ev.xconfigure.window == parent[0]) 1443 if (ev.xconfigure.window == parent[0])
1453 { 1444 {
1454 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1445 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1455 ; 1446 ;
1456 1447
1457 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1448 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1458 { 1449 {
1459 seen_resize = 1; 1450 seen_resize = 1;
1460 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1451 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1461 } 1452 }
1462 1453 else
1463#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1454 {
1464 if (OPTION (Opt_transparent)) 1455#ifdef HAVE_BG_PIXMAP
1465 check_our_parents (); 1456 if (bgPixmap.window_position_sensitive ())
1457 {
1458 if (mapped)
1459 update_background ();
1460 else
1461 bgPixmap.invalidate ();
1462 }
1466#endif 1463#endif
1464 }
1465
1466 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1467 } 1467 }
1468 break; 1468 break;
1469 1469
1470 case PropertyNotify: 1470 case PropertyNotify:
1471 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1471 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1472 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1472 && ev.xproperty.state == PropertyNewValue) 1473 && ev.xproperty.state == PropertyNewValue)
1473 selection_property (ev.xproperty.window, ev.xproperty.atom); 1474 selection_property (ev.xproperty.window, ev.xproperty.atom);
1474 1475
1475 break; 1476 break;
1476 1477
1477 case SelectionClear: 1478 case SelectionClear:
1478 selection_clear (); 1479 selection_clear ();
… …
1483 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1484 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1484 break; 1485 break;
1485 1486
1486 case SelectionRequest: 1487 case SelectionRequest:
1487 selection_send (ev.xselectionrequest); 1488 selection_send (ev.xselectionrequest);
1489 break;
1490
1491 case MapNotify:
1492#ifdef HAVE_BG_PIXMAP
1493 /* This is needed spcifically to fix the case of no window manager or a
1494 * non-reparenting window manager. In those cases we never get first
1495 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1496 * care of multiplicity of ConfigureNotify events arriwing while WM does
1497 * reparenting.
1498 * We should not render background immidiately, as there could be several
1499 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1500 * by scheduling background redraw as soon as we can, but giving a short
1501 * bit of time for ConfigureNotifies to arrive.
1502 * We should render background PRIOR to drawing any text, but AFTER all
1503 * of ConfigureNotifys for the best results.
1504 */
1505 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1506 update_background_ev.start (0.025);
1507#endif
1508 mapped = 1;
1509#ifdef TEXT_BLINK
1510 text_blink_ev.start ();
1511#endif
1512 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1488 break; 1513 break;
1489 1514
1490 case UnmapNotify: 1515 case UnmapNotify:
1491 mapped = 0; 1516 mapped = 0;
1492#ifdef TEXT_BLINK 1517#ifdef TEXT_BLINK
1493 text_blink_ev.stop (); 1518 text_blink_ev.stop ();
1494#endif 1519#endif
1520 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1495 break; 1521 break;
1496
1497 case MapNotify:
1498 mapped = 1;
1499#ifdef TEXT_BLINK
1500 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1501#endif
1502 break;
1503
1504#ifdef TRANSPARENT
1505 case ReparentNotify:
1506 rootwin_cb (ev);
1507 break;
1508#endif /* TRANSPARENT */
1509 1522
1510 case GraphicsExpose: 1523 case GraphicsExpose:
1511 case Expose: 1524 case Expose:
1512 if (ev.xany.window == vt) 1525 if (ev.xany.window == vt)
1513 { 1526 {
1514 do 1527 do
1528 {
1515 scr_expose (ev.xexpose.x, ev.xexpose.y, 1529 scr_expose (ev.xexpose.x, ev.xexpose.y,
1516 ev.xexpose.width, ev.xexpose.height, False); 1530 ev.xexpose.width, ev.xexpose.height, False);
1531 }
1517 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1532 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1518 1533
1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1534 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1520 1535
1521 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1536 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1537 {
1522 scr_expose (ev.xexpose.x, ev.xexpose.y, 1538 scr_expose (ev.xexpose.x, ev.xexpose.y,
1523 ev.xexpose.width, ev.xexpose.height, False); 1539 ev.xexpose.width, ev.xexpose.height, False);
1540 }
1524 1541
1525 scr_refresh (refresh_type); 1542 want_refresh = 1;
1526 } 1543 }
1527 else 1544 else
1528 { 1545 {
1529 XEvent unused_event; 1546 XEvent unused_event;
1530 1547
1531 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1548 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1532 ; 1549 ;
1533 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1550 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1534 ; 1551 ;
1535 1552
1536 if (isScrollbarWindow (ev.xany.window)) 1553 if (scrollBar.state && ev.xany.window == scrollBar.win)
1537 { 1554 {
1538 scrollBar.setIdle (); 1555 scrollBar.state = STATE_IDLE;
1539 scrollbar_show (0); 1556 scrollbar_show (0);
1540 } 1557 }
1541#ifdef MENUBAR
1542 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1543 menubar_expose ();
1544#endif
1545
1546#ifdef TRANSPARENT
1547 if (am_transparent && ev.xany.window == parent[0])
1548 XClearWindow (disp, ev.xany.window);
1549#endif
1550 } 1558 }
1551 break; 1559 break;
1552 1560
1553 case MotionNotify: 1561 case MotionNotify:
1554#ifdef POINTER_BLANK 1562#ifdef POINTER_BLANK
1555 if (hidden_pointer) 1563 if (hidden_pointer)
1556 pointer_unblank (); 1564 pointer_unblank ();
1557#endif 1565#endif
1558#if MENUBAR 1566 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1559 if (isMenuBarWindow (ev.xany.window)) 1567 || priv_modes & PrivMode_MouseAnyEvent)
1560 {
1561 menubar_control (ev.xbutton); 1568 mouse_report (ev.xbutton);
1562 break;
1563 }
1564#endif
1565 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1569 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1566 break; 1570 break;
1567 1571
1568 if (ev.xany.window == vt) 1572 if (ev.xany.window == vt)
1569 { 1573 {
1574 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1575 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1576 ; // nop
1570 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1577 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1571 { 1578 {
1572 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1579 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1573 ; 1580 ;
1574 1581
1575 XQueryPointer (disp, vt, 1582 XQueryPointer (dpy, vt,
1576 &unused_root, &unused_child, 1583 &unused_root, &unused_child,
1577 &unused_root_x, &unused_root_y, 1584 &unused_root_x, &unused_root_y,
1578 &ev.xbutton.x, &ev.xbutton.y, 1585 &ev.xbutton.x, &ev.xbutton.y,
1579 &ev.xbutton.state); 1586 &ev.xbutton.state);
1580#ifdef MOUSE_THRESHOLD 1587#ifdef MOUSE_THRESHOLD
… …
1600 int dist; 1607 int dist;
1601 1608
1602 /* don't clobber the current delay if we are 1609 /* don't clobber the current delay if we are
1603 * already in the middle of scrolling. 1610 * already in the middle of scrolling.
1604 */ 1611 */
1605 if (!sel_scroll_ev.active) 1612 if (!sel_scroll_ev.is_active ())
1606 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1613 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1607 1614
1608 /* save the event params so we can highlight 1615 /* save the event params so we can highlight
1609 * the selection in the pending-scroll loop 1616 * the selection in the pending-scroll loop
1610 */ 1617 */
1611 selection_save_x = ev.xbutton.x; 1618 selection_save_x = ev.xbutton.x;
… …
1633 else 1640 else
1634 { 1641 {
1635 /* we are within the text window, so we 1642 /* we are within the text window, so we
1636 * shouldn't be scrolling 1643 * shouldn't be scrolling
1637 */ 1644 */
1638 if (sel_scroll_ev.active)
1639 sel_scroll_ev.stop(); 1645 sel_scroll_ev.stop();
1640 } 1646 }
1641#endif 1647#endif
1642#ifdef MOUSE_THRESHOLD 1648#ifdef MOUSE_THRESHOLD
1643 } 1649 }
1644#endif 1650#endif
1645 } 1651 }
1646 } 1652 }
1647 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1653 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1648 { 1654 {
1649 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1655 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1650 MotionNotify, &ev)) 1656 MotionNotify, &ev))
1651 ; 1657 ;
1652 1658
1653 XQueryPointer (disp, scrollBar.win, 1659 XQueryPointer (dpy, scrollBar.win,
1654 &unused_root, &unused_child, 1660 &unused_root, &unused_child,
1655 &unused_root_x, &unused_root_y, 1661 &unused_root_x, &unused_root_y,
1656 &ev.xbutton.x, &ev.xbutton.y, 1662 &ev.xbutton.x, &ev.xbutton.y,
1657 &unused_mask); 1663 &unused_mask);
1658 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1664 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1659 scrollbar_size ()); 1665 scrollbar_size ());
1660 scr_refresh (refresh_type);
1661 refresh_limit = 0; 1666 want_refresh = 1;
1662 scrollbar_show (1); 1667 scrollbar_show (1);
1663 } 1668 }
1664 break; 1669 break;
1665 } 1670 }
1671
1672#if defined(CURSOR_BLINK)
1673 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1674 {
1675 if (hidden_cursor)
1676 {
1677 hidden_cursor = 0;
1678 want_refresh = 1;
1679 }
1680
1681 cursor_blink_ev.again ();
1682 }
1683#endif
1684
1685#if defined(POINTER_BLANK)
1686 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1687 {
1688 if (ev.type == MotionNotify
1689 || ev.type == ButtonPress
1690 || ev.type == ButtonRelease)
1691 if (hidden_pointer)
1692 pointer_unblank ();
1693
1694 if (ev.type == KeyPress && hidden_pointer == 0)
1695 pointer_blank ();
1696 }
1697#endif
1698
1699 refresh_check ();
1666} 1700}
1667 1701
1668void 1702void
1669rxvt_term::focus_in () 1703rxvt_term::focus_in ()
1670{ 1704{
1671 if (!focus) 1705 if (!focus)
1672 { 1706 {
1673 focus = 1; 1707 focus = 1;
1674 want_refresh = 1; 1708 want_refresh = 1;
1709
1710 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1711
1675#if USE_XIM 1712#if USE_XIM
1676 if (Input_Context != NULL) 1713 if (Input_Context != NULL)
1677 { 1714 {
1678 IMSetStatusPosition (); 1715 IMSetPosition ();
1679 XSetICFocus (Input_Context); 1716 XSetICFocus (Input_Context);
1680 } 1717 }
1681#endif 1718#endif
1682#if CURSOR_BLINK 1719#if CURSOR_BLINK
1683 if (OPTION (Opt_cursorBlink)) 1720 if (option (Opt_cursorBlink))
1684 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1721 cursor_blink_ev.again ();
1685#endif 1722#endif
1686#if OFF_FOCUS_FADING 1723#if OFF_FOCUS_FADING
1687 if (rs[Rs_fade]) 1724 if (rs[Rs_fade])
1688 { 1725 {
1689 pix_colors = pix_colors_focused; 1726 pix_colors = pix_colors_focused;
1690 scr_recolour (); 1727 scr_recolour ();
1691 } 1728 }
1692#endif 1729#endif
1730#if ENABLE_FRILLS
1731 if (option (Opt_urgentOnBell))
1732 {
1733 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1734 {
1735 h->flags &= ~XUrgencyHint;
1736 XSetWMHints (dpy, parent[0], h);
1737 }
1738 }
1739#endif
1693 } 1740 }
1694} 1741}
1695 1742
1696void 1743void
1697rxvt_term::focus_out () 1744rxvt_term::focus_out ()
… …
1699 if (focus) 1746 if (focus)
1700 { 1747 {
1701 focus = 0; 1748 focus = 0;
1702 want_refresh = 1; 1749 want_refresh = 1;
1703 1750
1751 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1752
1704#if ENABLE_FRILLS || ISO_14755 1753#if ENABLE_FRILLS || ISO_14755
1754 if (iso14755buf)
1755 {
1705 iso14755buf = 0; 1756 iso14755buf = 0;
1706#endif 1757# if ISO_14755
1707#if ENABLE_OVERLAY
1708 scr_overlay_off (); 1758 scr_overlay_off ();
1759# endif
1760 }
1709#endif 1761#endif
1710#if USE_XIM 1762#if USE_XIM
1711 if (Input_Context != NULL) 1763 if (Input_Context != NULL)
1712 XUnsetICFocus (Input_Context); 1764 XUnsetICFocus (Input_Context);
1713#endif 1765#endif
1714#if CURSOR_BLINK 1766#if CURSOR_BLINK
1715 if (OPTION (Opt_cursorBlink)) 1767 if (option (Opt_cursorBlink))
1716 cursor_blink_ev.stop (); 1768 cursor_blink_ev.stop ();
1769
1717 hidden_cursor = 0; 1770 hidden_cursor = 0;
1718#endif 1771#endif
1719#if OFF_FOCUS_FADING 1772#if OFF_FOCUS_FADING
1720 if (rs[Rs_fade]) 1773 if (rs[Rs_fade])
1721 { 1774 {
… …
1724 } 1777 }
1725#endif 1778#endif
1726 } 1779 }
1727} 1780}
1728 1781
1729#if TRANSPARENT 1782void
1783rxvt_term::update_fade_color (unsigned int idx)
1784{
1785#if OFF_FOCUS_FADING
1786 if (rs[Rs_fade])
1787 {
1788 rgba c;
1789 pix_colors [Color_fade].get (c);
1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791 }
1792#endif
1793}
1794
1795#if ENABLE_TRANSPARENCY || ENABLE_PERL
1730void 1796void
1731rxvt_term::rootwin_cb (XEvent &ev) 1797rxvt_term::rootwin_cb (XEvent &ev)
1732{ 1798{
1733 SET_R (this); 1799 make_current ();
1734 SET_LOCALE (locale);
1735 1800
1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803 return;
1804
1805# if ENABLE_TRANSPARENCY
1736 switch (ev.type) 1806 switch (ev.type)
1737 { 1807 {
1738 case PropertyNotify: 1808 case PropertyNotify:
1739 /* 1809 /*
1740 * if user used some Esetroot compatible prog to set the root bg, 1810 * if user used some Esetroot compatible prog to set the root bg,
1741 * use the property to determine the pixmap. We use it later on. 1811 * use the property to determine the pixmap. We use it later on.
1742 */ 1812 */
1743 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1813 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1744 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1814 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1745 return; 1815 {
1816 bgPixmap.set_root_pixmap ();
1817 update_background ();
1818 }
1746 1819
1747 /* FALLTHROUGH */
1748 case ReparentNotify:
1749 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1750 want_refresh = want_full_refresh = 1;
1751 break; 1820 break;
1752 } 1821 }
1822# endif
1823
1824 refresh_check ();
1753} 1825}
1754#endif 1826#endif
1755 1827
1756void 1828void
1757rxvt_term::button_press (XButtonEvent &ev) 1829rxvt_term::button_press (XButtonEvent &ev)
1758{ 1830{
1759 int reportmode = 0, clickintime; 1831 int reportmode = 0, clickintime;
1760 1832
1761 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1833 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1834
1762 if (!bypass_keystate) 1835 if (!bypass_keystate)
1763 reportmode = !! (priv_modes & PrivMode_mouse_report); 1836 reportmode = !! (priv_modes & PrivMode_mouse_report);
1764 1837
1765 /* 1838 /*
1766 * VT window processing of button press 1839 * VT window processing of button press
1767 */ 1840 */
1768 if (ev.window == vt) 1841 if (ev.window == vt)
1769 { 1842 {
1843 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1844 return;
1845
1770#if ISO_14755 1846#if ISO_14755
1771 // 5.4 1847 // 5.4
1772 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1848 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1773 { 1849 {
1774 iso14755_54 (ev.x, ev.y); 1850 iso14755_54 (ev.x, ev.y);
… …
1786#ifdef MOUSE_REPORT_DOUBLECLICK 1862#ifdef MOUSE_REPORT_DOUBLECLICK
1787 if (ev.button == MEvent.button && clickintime) 1863 if (ev.button == MEvent.button && clickintime)
1788 { 1864 {
1789 /* same button, within alloted time */ 1865 /* same button, within alloted time */
1790 MEvent.clicks++; 1866 MEvent.clicks++;
1867
1791 if (MEvent.clicks > 1) 1868 if (MEvent.clicks > 1)
1792 { 1869 {
1793 /* only report double clicks */ 1870 /* only report double clicks */
1794 MEvent.clicks = 2; 1871 MEvent.clicks = 2;
1795 mouse_report (ev); 1872 mouse_report (ev);
… …
1807 mouse_report (ev); 1884 mouse_report (ev);
1808 } 1885 }
1809#else 1886#else
1810 MEvent.button = ev.button; 1887 MEvent.button = ev.button;
1811 mouse_report (ev); 1888 mouse_report (ev);
1812#endif /* MOUSE_REPORT_DOUBLECLICK */ 1889#endif /* MOUSE_REPORT_DOUBLECLICK */
1813 1890
1814 } 1891 }
1815 else 1892 else
1816 { 1893 {
1817 if (ev.button != MEvent.button) 1894 if (ev.button != MEvent.button)
… …
1827#else 1904#else
1828 selection.rect = false; 1905 selection.rect = false;
1829#endif 1906#endif
1830 1907
1831 /* allow shift+left click to extend selection */ 1908 /* allow shift+left click to extend selection */
1832 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1909 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1833 { 1910 {
1834 if (MEvent.button == Button1 && clickintime) 1911 if (MEvent.button == Button1 && clickintime)
1835 selection_rotate (ev.x, ev.y); 1912 selection_rotate (ev.x, ev.y);
1836 else 1913 else
1837 selection_extend (ev.x, ev.y, 1); 1914 selection_extend (ev.x, ev.y, 1);
… …
1865 } 1942 }
1866 1943
1867 /* 1944 /*
1868 * Scrollbar window processing of button press 1945 * Scrollbar window processing of button press
1869 */ 1946 */
1870 if (isScrollbarWindow (ev.window)) 1947 if (scrollBar.state && ev.window == scrollBar.win)
1871 { 1948 {
1872 scrollBar.setIdle (); 1949 page_dirn direction = NO_DIR;
1950
1951 if (scrollBar.upButton (ev.y))
1952 direction = UP; /* up */
1953 else if (scrollBar.dnButton (ev.y))
1954 direction = DN; /* down */
1955
1956 scrollBar.state = STATE_IDLE;
1873 /* 1957 /*
1874 * Rxvt-style scrollbar: 1958 * Rxvt-style scrollbar:
1875 * move up if mouse is above slider 1959 * move up if mouse is above slider
1876 * move dn if mouse is below slider 1960 * move dn if mouse is below slider
1877 * 1961 *
… …
1886 /* 1970 /*
1887 * Mouse report disabled scrollbar: 1971 * Mouse report disabled scrollbar:
1888 * arrow buttons - send up/down 1972 * arrow buttons - send up/down
1889 * click on scrollbar - send pageup/down 1973 * click on scrollbar - send pageup/down
1890 */ 1974 */
1891 if ((scrollBar.style == R_SB_NEXT 1975 if (direction == UP)
1892 && scrollbarnext_upButton (ev.y))
1893 || (scrollBar.style == R_SB_RXVT
1894 && scrollbarrxvt_upButton (ev.y)))
1895 tt_printf ("\033[A"); 1976 tt_printf ("\033[A");
1896 else if ((scrollBar.style == R_SB_NEXT 1977 else if (direction == DN)
1897 && scrollbarnext_dnButton (ev.y))
1898 || (scrollBar.style == R_SB_RXVT
1899 && scrollbarrxvt_dnButton (ev.y)))
1900 tt_printf ("\033[B"); 1978 tt_printf ("\033[B");
1901 else 1979 else
1902 switch (ev.button) 1980 switch (ev.button)
1903 { 1981 {
1904 case Button2: 1982 case Button2:
… …
1911 tt_printf ("\033[5~"); 1989 tt_printf ("\033[5~");
1912 break; 1990 break;
1913 } 1991 }
1914 } 1992 }
1915 else 1993 else
1916#endif /* NO_SCROLLBAR_REPORT */ 1994#endif /* NO_SCROLLBAR_REPORT */
1917
1918 {
1919 char upordown = 0;
1920
1921 if (scrollBar.style == R_SB_NEXT)
1922 { 1995 {
1923 if (scrollbarnext_upButton (ev.y)) 1996 if (direction != NO_DIR)
1924 upordown = -1; /* up */
1925 else if (scrollbarnext_dnButton (ev.y))
1926 upordown = 1; /* down */
1927 }
1928 else if (scrollBar.style == R_SB_RXVT)
1929 {
1930 if (scrollbarrxvt_upButton (ev.y))
1931 upordown = -1; /* up */
1932 else if (scrollbarrxvt_dnButton (ev.y))
1933 upordown = 1; /* down */
1934 }
1935 if (upordown)
1936 { 1997 {
1937#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1998#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1999 if (!cont_scroll_ev.is_active ())
1938 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2000 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1939#endif 2001#endif
1940 if (scr_page (upordown < 0 ? UP : DN, 1)) 2002 if (scr_page (direction, 1))
1941 { 2003 {
1942 if (upordown < 0) 2004 if (direction == UP)
1943 scrollBar.setUp (); 2005 scrollBar.state = STATE_UP;
1944 else 2006 else
1945 scrollBar.setDn (); 2007 scrollBar.state = STATE_DOWN;
1946 } 2008 }
1947 } 2009 }
1948 else 2010 else
1949 switch (ev.button) 2011 switch (ev.button)
1950 { 2012 {
1951 case Button2: 2013 case Button2:
1952 switch (scrollbar_align) 2014 switch (scrollBar.align)
1953 { 2015 {
1954 case R_SB_ALIGN_TOP: 2016 case R_SB_ALIGN_TOP:
1955 csrO = 0; 2017 csrO = 0;
1956 break; 2018 break;
1957 case R_SB_ALIGN_CENTRE: 2019 case R_SB_ALIGN_CENTRE:
… …
1965 if (scrollBar.style == R_SB_XTERM 2027 if (scrollBar.style == R_SB_XTERM
1966 || scrollbar_above_slider (ev.y) 2028 || scrollbar_above_slider (ev.y)
1967 || scrollbar_below_slider (ev.y)) 2029 || scrollbar_below_slider (ev.y))
1968 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1969 2031
1970 scrollBar.setMotion (); 2032 scrollBar.state = STATE_MOTION;
1971 break; 2033 break;
1972 2034
1973 case Button1: 2035 case Button1:
1974 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2036 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1975 csrO = ev.y - scrollBar.top; 2037 csrO = ev.y - scrollBar.top;
1976 /* FALLTHROUGH */ 2038 /* FALLTHROUGH */
1977 2039
1978 case Button3: 2040 case Button3:
1979 if (scrollBar.style != R_SB_XTERM) 2041 if (scrollBar.style != R_SB_XTERM)
… …
1989 scr_page (DN, nrow - 1); 2051 scr_page (DN, nrow - 1);
1990# else 2052# else
1991 scr_page (DN, nrow / 4); 2053 scr_page (DN, nrow / 4);
1992# endif 2054# endif
1993 else 2055 else
1994 scrollBar.setMotion (); 2056 scrollBar.state = STATE_MOTION;
1995 } 2057 }
1996 else 2058 else
1997 { 2059 {
1998 scr_page ((ev.button == Button1 ? DN : UP), 2060 scr_page ((ev.button == Button1 ? DN : UP),
1999 (nrow 2061 (nrow
… …
2002 } 2064 }
2003 2065
2004 break; 2066 break;
2005 } 2067 }
2006 } 2068 }
2069
2007 return; 2070 return;
2008 } 2071 }
2009#if MENUBAR
2010 /*
2011 * Menubar window processing of button press
2012 */
2013 if (isMenuBarWindow (ev.window))
2014 menubar_control (ev);
2015#endif
2016} 2072}
2017 2073
2018void 2074void
2019rxvt_term::button_release (XButtonEvent &ev) 2075rxvt_term::button_release (XButtonEvent &ev)
2020{ 2076{
… …
2022 2078
2023 csrO = 0; /* reset csr Offset */ 2079 csrO = 0; /* reset csr Offset */
2024 if (!bypass_keystate) 2080 if (!bypass_keystate)
2025 reportmode = !! (priv_modes & PrivMode_mouse_report); 2081 reportmode = !! (priv_modes & PrivMode_mouse_report);
2026 2082
2027 if (scrollbar_isUpDn ()) 2083 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2028 { 2084 {
2029 scrollBar.setIdle (); 2085 scrollBar.state = STATE_IDLE;
2030 scrollbar_show (0); 2086 scrollbar_show (0);
2031#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2032 refresh_type &= ~SMOOTH_REFRESH;
2033#endif
2034 } 2087 }
2035 2088
2036#ifdef SELECTION_SCROLLING 2089#ifdef SELECTION_SCROLLING
2037 if (sel_scroll_ev.active)
2038 sel_scroll_ev.stop(); 2090 sel_scroll_ev.stop();
2039#endif 2091#endif
2040 2092
2041 if (ev.window == vt) 2093 if (ev.window == vt)
2042 { 2094 {
2095 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2096 return;
2097
2043#if ISO_14755 2098#if ISO_14755
2044 // 5.4 2099 // 5.4
2045 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2100 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2046 return; 2101 return;
2047#endif 2102#endif
2103
2048 if (reportmode) 2104 if (reportmode)
2049 { 2105 {
2050 /* mouse report from vt window */ 2106 /* mouse report from vt window */
2051 /* don't report release of wheel "buttons" */ 2107 /* don't report release of wheel "buttons" */
2052 if (ev.button >= 4) 2108 if (ev.button >= 4)
… …
2063 mouse_report (ev); 2119 mouse_report (ev);
2064 } 2120 }
2065#else /* MOUSE_REPORT_DOUBLECLICK */ 2121#else /* MOUSE_REPORT_DOUBLECLICK */
2066 MEvent.button = AnyButton; 2122 MEvent.button = AnyButton;
2067 mouse_report (ev); 2123 mouse_report (ev);
2068#endif /* MOUSE_REPORT_DOUBLECLICK */ 2124#endif /* MOUSE_REPORT_DOUBLECLICK */
2069 return; 2125 return;
2070 } 2126 }
2071 2127
2072 /* 2128 /*
2073 * dumb hack to compensate for the failure of click-and-drag 2129 * dumb hack to compensate for the failure of click-and-drag
… …
2082 { 2138 {
2083 case Button1: 2139 case Button1:
2084 case Button3: 2140 case Button3:
2085 selection_make (ev.time); 2141 selection_make (ev.time);
2086 break; 2142 break;
2143
2087 case Button2: 2144 case Button2:
2088 selection_request (ev.time, ev.x, ev.y); 2145 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2146 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2089 break; 2147 break;
2148
2090#ifdef MOUSE_WHEEL 2149#ifdef MOUSE_WHEEL
2091 case Button4: 2150 case Button4:
2092 case Button5: 2151 case Button5:
2093 { 2152 {
2094 int i; 2153 int i;
… …
2096 2155
2097 v = ev.button == Button4 ? UP : DN; 2156 v = ev.button == Button4 ? UP : DN;
2098 2157
2099 if (ev.state & ShiftMask) 2158 if (ev.state & ShiftMask)
2100 i = 1; 2159 i = 1;
2101 else if (OPTION (Opt_mouseWheelScrollPage)) 2160 else if (option (Opt_mouseWheelScrollPage))
2102 i = nrow - 1; 2161 i = nrow - 1;
2103 else 2162 else
2104 i = 5; 2163 i = 5;
2105 2164
2106# ifdef MOUSE_SLIP_WHEELING 2165# ifdef MOUSE_SLIP_WHEELING
… …
2108 { 2167 {
2109 mouse_slip_wheel_speed += v ? -1 : 1; 2168 mouse_slip_wheel_speed += v ? -1 : 1;
2110 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2169 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2111 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2170 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2112 2171
2113 if (slip_wheel_ev.at < NOW) 2172 if (!slip_wheel_ev.is_active ())
2114 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2173 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2115
2116 slip_wheel_ev.start ();
2117 } 2174 }
2118 else 2175 else
2176# endif
2119 { 2177 {
2120# endif
2121# ifdef JUMP_MOUSE_WHEEL
2122 scr_page (v, i); 2178 scr_page (v, i);
2123 scr_refresh (SMOOTH_REFRESH);
2124 scrollbar_show (1); 2179 scrollbar_show (1);
2125# else
2126 while (i--)
2127 {
2128 scr_page (v, 1);
2129 scr_refresh (SMOOTH_REFRESH);
2130 scrollbar_show (1);
2131 }
2132# endif
2133# ifdef MOUSE_SLIP_WHEELING
2134 } 2180 }
2135#endif
2136 } 2181 }
2137 break; 2182 break;
2138#endif 2183#endif
2139 } 2184 }
2140 } 2185 }
2141#ifdef MENUBAR
2142 else if (isMenuBarWindow (ev.window))
2143 menubar_control (ev);
2144#endif
2145} 2186}
2146
2147#ifdef TRANSPARENT
2148#if TINTING
2149/* taken from aterm-0.4.2 */
2150
2151typedef uint32_t RUINT32T;
2152
2153void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2154{
2155 int sh_r, sh_g, sh_b;
2156 RUINT32T mask_r, mask_g, mask_b;
2157 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2158 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2159 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2160 int i;
2161
2162 Visual *visual = display->visual;
2163
2164 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2165
2166 /* for convenience */
2167 mask_r = visual->red_mask;
2168 mask_g = visual->green_mask;
2169 mask_b = visual->blue_mask;
2170
2171 /* boring lookup table pre-initialization */
2172 switch (srcImage->bits_per_pixel) {
2173 case 15:
2174 if ((mask_r != 0x7c00) ||
2175 (mask_g != 0x03e0) ||
2176 (mask_b != 0x001f))
2177 return;
2178 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2179 lookup_r = lookup;
2180 lookup_g = lookup+32;
2181 lookup_b = lookup+32+32;
2182 sh_r = 10;
2183 sh_g = 5;
2184 sh_b = 0;
2185 break;
2186 case 16:
2187 if ((mask_r != 0xf800) ||
2188 (mask_g != 0x07e0) ||
2189 (mask_b != 0x001f))
2190 return;
2191 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2192 lookup_r = lookup;
2193 lookup_g = lookup+32;
2194 lookup_b = lookup+32+64;
2195 sh_r = 11;
2196 sh_g = 5;
2197 sh_b = 0;
2198 break;
2199 case 24:
2200 if ((mask_r != 0xff0000) ||
2201 (mask_g != 0x00ff00) ||
2202 (mask_b != 0x0000ff))
2203 return;
2204 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2205 lookup_r = lookup;
2206 lookup_g = lookup+256;
2207 lookup_b = lookup+256+256;
2208 sh_r = 16;
2209 sh_g = 8;
2210 sh_b = 0;
2211 break;
2212 case 32:
2213 if ((mask_r != 0xff0000) ||
2214 (mask_g != 0x00ff00) ||
2215 (mask_b != 0x0000ff))
2216 return;
2217 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2218 lookup_r = lookup;
2219 lookup_g = lookup+256;
2220 lookup_b = lookup+256+256;
2221 sh_r = 16;
2222 sh_g = 8;
2223 sh_b = 0;
2224 break;
2225 default:
2226 return; /* we do not support this color depth */
2227 }
2228
2229 /* prepare limits for color transformation (each channel is handled separately) */
2230 if (shade < 0) {
2231 shade = -shade;
2232 if (shade < 0) shade = 0;
2233 if (shade > 100) shade = 100;
2234
2235 lower_lim_r = 65535-rm;
2236 lower_lim_g = 65535-gm;
2237 lower_lim_b = 65535-bm;
2238
2239 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2240 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2241 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2242
2243 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2244 } else {
2245 if (shade < 0) shade = 0;
2246 if (shade > 100) shade = 100;
2247
2248 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2249
2250 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2251 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2252 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2253 }
2254
2255 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2256 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2257 {
2258 unsigned int tmp;
2259
2260 tmp = lower_lim_r;
2261 lower_lim_r = lower_lim_b;
2262 lower_lim_b = tmp;
2263
2264 tmp = upper_lim_r;
2265 upper_lim_r = upper_lim_b;
2266 upper_lim_b = tmp;
2267 }
2268
2269 /* fill our lookup tables */
2270 for (i = 0; i <= mask_r>>sh_r; i++)
2271 {
2272 RUINT32T tmp;
2273 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2274 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2275 lookup_r[i] = (tmp/65535)<<sh_r;
2276 }
2277 for (i = 0; i <= mask_g>>sh_g; i++)
2278 {
2279 RUINT32T tmp;
2280 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2281 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2282 lookup_g[i] = (tmp/65535)<<sh_g;
2283 }
2284 for (i = 0; i <= mask_b>>sh_b; i++)
2285 {
2286 RUINT32T tmp;
2287 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2288 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2289 lookup_b[i] = (tmp/65535)<<sh_b;
2290 }
2291
2292 /* apply table to input image (replacing colors by newly calculated ones) */
2293 switch (srcImage->bits_per_pixel)
2294 {
2295 case 15:
2296 {
2297 unsigned short *p1, *pf, *p, *pl;
2298 p1 = (unsigned short *) srcImage->data;
2299 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2300 while (p1 < pf)
2301 {
2302 p = p1;
2303 pl = p1 + srcImage->width;
2304 for (; p < pl; p++)
2305 {
2306 *p = lookup_r[(*p & 0x7c00)>>10] |
2307 lookup_g[(*p & 0x03e0)>> 5] |
2308 lookup_b[(*p & 0x001f)];
2309 }
2310 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2311 }
2312 break;
2313 }
2314 case 16:
2315 {
2316 unsigned short *p1, *pf, *p, *pl;
2317 p1 = (unsigned short *) srcImage->data;
2318 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2319 while (p1 < pf)
2320 {
2321 p = p1;
2322 pl = p1 + srcImage->width;
2323 for (; p < pl; p++)
2324 {
2325 *p = lookup_r[(*p & 0xf800)>>11] |
2326 lookup_g[(*p & 0x07e0)>> 5] |
2327 lookup_b[(*p & 0x001f)];
2328 }
2329 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2330 }
2331 break;
2332 }
2333 case 24:
2334 {
2335 unsigned char *p1, *pf, *p, *pl;
2336 p1 = (unsigned char *) srcImage->data;
2337 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2338 while (p1 < pf)
2339 {
2340 p = p1;
2341 pl = p1 + srcImage->width * 3;
2342 for (; p < pl; p += 3)
2343 {
2344 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2345 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2346 p[2] = lookup_r[(p[2] & 0x0000ff)];
2347 }
2348 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2349 }
2350 break;
2351 }
2352 case 32:
2353 {
2354 RUINT32T *p1, *pf, *p, *pl;
2355 p1 = (RUINT32T *) srcImage->data;
2356 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2357
2358 while (p1 < pf)
2359 {
2360 p = p1;
2361 pl = p1 + srcImage->width;
2362 for (; p < pl; p++)
2363 {
2364 *p = lookup_r[(*p & 0xff0000)>>16] |
2365 lookup_g[(*p & 0x00ff00)>> 8] |
2366 lookup_b[(*p & 0x0000ff)] |
2367 (*p & ~0xffffff);
2368 }
2369 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2370 }
2371 break;
2372 }
2373 }
2374
2375 free (lookup);
2376}
2377#endif
2378
2379/*
2380 * Check our parents are still who we think they are.
2381 * Do transparency updates if required
2382 */
2383int
2384rxvt_term::check_our_parents ()
2385{
2386 int i, pchanged, aformat, have_pixmap, rootdepth;
2387 unsigned long nitems, bytes_after;
2388 Atom atype;
2389 unsigned char *prop = NULL;
2390 Window root, oldp, *list;
2391 Pixmap rootpixmap = None;
2392 XWindowAttributes wattr, wrootattr;
2393 dDisp;
2394
2395 pchanged = 0;
2396
2397 if (!OPTION (Opt_transparent))
2398 return pchanged; /* Don't try any more */
2399
2400 XGetWindowAttributes (disp, display->root, &wrootattr);
2401 rootdepth = wrootattr.depth;
2402
2403 XGetWindowAttributes (disp, parent[0], &wattr);
2404
2405 if (rootdepth != wattr.depth)
2406 {
2407 if (am_transparent)
2408 {
2409 pchanged = 1;
2410 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2411 am_transparent = am_pixmap_trans = 0;
2412 }
2413
2414 return pchanged; /* Don't try any more */
2415 }
2416
2417 /* Get all X ops out of the queue so that our information is up-to-date. */
2418 XSync (disp, False);
2419
2420 /*
2421 * Make the frame window set by the window manager have
2422 * the root background. Some window managers put multiple nested frame
2423 * windows for each client, so we have to take care about that.
2424 */
2425 i = (xa[XA_XROOTPMAP_ID]
2426 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2427 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2428 &nitems, &bytes_after, &prop) == Success);
2429
2430 if (!i || prop == NULL)
2431 i = (xa[XA_ESETROOT_PMAP_ID]
2432 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2434 &nitems, &bytes_after, &prop) == Success);
2435
2436 if (!i || prop == NULL
2437#if TINTING
2438 || !rs[Rs_color + Color_tint]
2439#endif
2440 )
2441 have_pixmap = 0;
2442 else
2443 {
2444 have_pixmap = 1;
2445 rootpixmap = *(Pixmap *)prop;
2446 XFree (prop);
2447 }
2448
2449 if (have_pixmap)
2450 {
2451 /*
2452 * Copy display->root pixmap transparency
2453 */
2454 int sx, sy, nx, ny;
2455 unsigned int nw, nh;
2456 Window cr;
2457 XImage *image;
2458 GC gc;
2459 XGCValues gcvalue;
2460
2461 XTranslateCoordinates (disp, parent[0], display->root,
2462 0, 0, &sx, &sy, &cr);
2463 nw = (unsigned int)szHint.width;
2464 nh = (unsigned int)szHint.height;
2465 nx = ny = 0;
2466
2467 if (sx < 0)
2468 {
2469 nw += sx;
2470 nx = -sx;
2471 sx = 0;
2472 }
2473
2474 if (sy < 0)
2475 {
2476 nh += sy;
2477 ny = -sy;
2478 sy = 0;
2479 }
2480
2481 min_it (nw, (unsigned int) (wrootattr.width - sx));
2482 min_it (nh, (unsigned int) (wrootattr.height - sy));
2483
2484 XSync (disp, False);
2485 allowedxerror = -1;
2486 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2487
2488 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2489 /* XXX: may need a delay here? */
2490 allowedxerror = 0;
2491
2492 if (image == NULL)
2493 {
2494 if (am_transparent && am_pixmap_trans)
2495 {
2496 pchanged = 1;
2497 if (pixmap != None)
2498 {
2499 XFreePixmap (disp, pixmap);
2500 pixmap = None;
2501 }
2502 }
2503
2504 am_pixmap_trans = 0;
2505 }
2506 else
2507 {
2508 if (pixmap != None)
2509 XFreePixmap (disp, pixmap);
2510
2511#if TINTING
2512 if (ISSET_PIXCOLOR (Color_tint))
2513 {
2514 unsigned short rm, gm, bm;
2515 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2516
2517 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2518
2519 ShadeXImage (display, image, shade, rm, gm, bm);
2520 }
2521#endif
2522
2523 pixmap = XCreatePixmap (disp, vt,
2524 szHint.width, szHint.height, image->depth);
2525 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2526 XPutImage (disp, pixmap, gc, image, 0, 0,
2527 nx, ny, image->width, image->height);
2528 XFreeGC (disp, gc);
2529 XDestroyImage (image);
2530 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2531 XClearWindow (disp, parent[0]);
2532
2533 if (!am_transparent || !am_pixmap_trans)
2534 pchanged = 1;
2535
2536 am_transparent = am_pixmap_trans = 1;
2537 }
2538 }
2539
2540 if (am_pixmap_trans)
2541 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2542 else
2543 {
2544 unsigned int n;
2545 /*
2546 * InheritPixmap transparency
2547 */
2548 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2549 {
2550 oldp = parent[i];
2551 XQueryTree (disp, parent[i - 1], &root,
2552 &parent[i], &list, &n);
2553 XFree (list);
2554
2555 if (parent[i] == display->root)
2556 {
2557 if (oldp != None)
2558 pchanged = 1;
2559
2560 break;
2561 }
2562
2563 if (oldp != parent[i])
2564 pchanged = 1;
2565 }
2566
2567 n = 0;
2568
2569 if (pchanged)
2570 {
2571 for (; n < (unsigned int)i; n++)
2572 {
2573 XGetWindowAttributes (disp, parent[n], &wattr);
2574 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2575 {
2576 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2577 break;
2578 }
2579 }
2580 }
2581
2582 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2583 {
2584 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2585 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2586 am_transparent = 0;
2587 /* XXX: also turn off Opt_transparent? */
2588 }
2589 else
2590 {
2591#if WAIT_FOR_WM
2592 /* wait (an arbitrary period) for the WM to do its thing
2593 * needed for fvwm2.2.2 (and before?) */
2594 sleep (1);
2595#endif
2596 for (n = 0; n < (unsigned int)i; n++)
2597 {
2598 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2599 XClearWindow (disp, parent[n]);
2600 }
2601
2602 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2603 am_transparent = 1;
2604 }
2605
2606 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2607 parent[i] = None;
2608 }
2609
2610 if (scrollBar.win)
2611 {
2612 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2613 scrollBar.setIdle ();
2614 scrollbar_show (0);
2615 }
2616
2617 if (am_transparent)
2618 {
2619 want_refresh = want_full_refresh = 1;
2620 if (am_pixmap_trans)
2621 flush ();
2622 }
2623
2624 return pchanged;
2625}
2626#endif
2627 2187
2628/*}}} */ 2188/*}}} */
2629 2189
2630bool 2190bool
2631rxvt_term::cmd_parse () 2191rxvt_term::cmd_parse ()
2632{ 2192{
2633 bool flag = false; 2193 bool flag = false;
2634 unicode_t ch = NOCHAR; 2194 wchar_t ch = NOCHAR;
2635 unsigned char *seq_begin; // remember start of esc-sequence here 2195 char *seq_begin; // remember start of esc-sequence here
2636 2196
2637 for (;;) 2197 for (;;)
2638 { 2198 {
2639 if (ch == NOCHAR) 2199 if (ch == NOCHAR)
2640 { 2200 {
2641 seq_begin = cmdbuf_ptr; 2201 seq_begin = cmdbuf_ptr;
2642 ch = next_char (); 2202 ch = next_char ();
2643 }
2644 2203
2645 if (ch == NOCHAR) // TODO: improve 2204 if (ch == NOCHAR)
2646 break; 2205 break;
2206 }
2647 2207
2648 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2208 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2649 { 2209 {
2650 if (!seen_input) 2210 if (!seen_input)
2651 { 2211 {
… …
2660 if (seen_resize && cmd_pid) 2220 if (seen_resize && cmd_pid)
2661 kill (-cmd_pid, SIGWINCH); 2221 kill (-cmd_pid, SIGWINCH);
2662 } 2222 }
2663 2223
2664 /* Read a text string from the input buffer */ 2224 /* Read a text string from the input buffer */
2665 unicode_t buf[UBUFSIZ]; 2225 wchar_t buf[UBUFSIZ];
2666 bool refreshnow = false; 2226 bool refreshnow = false;
2667 int nlines = 0; 2227 int nlines = 0;
2668 unicode_t *str = buf; 2228 wchar_t *str = buf;
2669 unicode_t *eol = str + min (ncol, UBUFSIZ); 2229 wchar_t *eol = str + min (ncol, UBUFSIZ);
2670 2230
2671 for (;;) 2231 for (;;)
2672 { 2232 {
2673 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2233 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2674 break; 2234 break;
… …
2680 if (ch == C0_LF) 2240 if (ch == C0_LF)
2681 nlines++; 2241 nlines++;
2682 2242
2683 refresh_count++; 2243 refresh_count++;
2684 2244
2685 if (!OPTION (Opt_jumpScroll) 2245 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2686 || (refresh_count >= refresh_limit * (nrow - 1)))
2687 { 2246 {
2247 refresh_count = 0;
2248
2249 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2250 {
2688 refreshnow = true; 2251 refreshnow = true;
2689 ch = NOCHAR; 2252 ch = NOCHAR;
2690 break; 2253 break;
2254 }
2691 } 2255 }
2692 2256
2693 // scr_add_lines only works for nlines <= nrow - 1. 2257 // scr_add_lines only works for nlines <= nrow - 1.
2694 if (nlines >= nrow - 1) 2258 if (nlines >= nrow - 1)
2695 { 2259 {
2260 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2261 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2696 scr_add_lines (buf, nlines, str - buf); 2262 scr_add_lines (buf, str - buf, nlines);
2263
2697 nlines = 0; 2264 nlines = 0;
2698 str = buf; 2265 str = buf;
2699 eol = str + min (ncol, UBUFSIZ); 2266 eol = str + min (ncol, UBUFSIZ);
2700 } 2267 }
2701 2268
… …
2714 2281
2715 seq_begin = cmdbuf_ptr; 2282 seq_begin = cmdbuf_ptr;
2716 ch = next_char (); 2283 ch = next_char ();
2717 } 2284 }
2718 2285
2286 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2287 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2719 scr_add_lines (buf, nlines, str - buf); 2288 scr_add_lines (buf, str - buf, nlines);
2720 2289
2721 /* 2290 /*
2722 * If there have been a lot of new lines, then update the screen 2291 * If there have been a lot of new lines, then update the screen
2723 * What the heck I'll cheat and only refresh less than every page-full. 2292 * What the heck we'll cheat and only refresh less than every page-full.
2724 * the number of pages between refreshes is refresh_limit, which 2293 * if skipScroll is enabled.
2725 * is incremented here because we must be doing flat-out scrolling.
2726 */ 2294 */
2727 if (refreshnow) 2295 if (refreshnow)
2728 { 2296 {
2729 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2730 refresh_limit++;
2731 else
2732 {
2733 flag = true; 2297 flag = true;
2734 scr_refresh (refresh_type); 2298 scr_refresh ();
2735 } 2299 want_refresh = 1;
2736 } 2300 }
2737 2301
2738 } 2302 }
2739 else 2303 else
2740 { 2304 {
… …
2754 } 2318 }
2755 2319
2756 return flag; 2320 return flag;
2757} 2321}
2758 2322
2759// read the next octet
2760unicode_t
2761rxvt_term::next_octet ()
2762{
2763 return cmdbuf_ptr < cmdbuf_endp
2764 ? *cmdbuf_ptr++
2765 : NOCHAR;
2766}
2767
2768// read the next character 2323// read the next character
2769unicode_t 2324wchar_t
2770rxvt_term::next_char () 2325rxvt_term::next_char () NOTHROW
2771{ 2326{
2772 while (cmdbuf_ptr < cmdbuf_endp) 2327 while (cmdbuf_ptr < cmdbuf_endp)
2773 { 2328 {
2774 // assume 7-bit to be ascii ALWAYS 2329 // assume 7-bit to be ascii ALWAYS
2775 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2330 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2776 return *cmdbuf_ptr++; 2331 return *cmdbuf_ptr++;
2777 2332
2778 wchar_t wc; 2333 wchar_t wc;
2779 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2334 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2780 2335
2781 if (len == (size_t)-2) 2336 if (len == (size_t)-2)
2782 { 2337 {
2783 // the mbstate stores incomplete sequences. didn't know this :/ 2338 // the mbstate stores incomplete sequences. didn't know this :/
2784 cmdbuf_ptr = cmdbuf_endp; 2339 cmdbuf_ptr = cmdbuf_endp;
2785 break; 2340 break;
2786 } 2341 }
2787 2342
2788 if (len == (size_t)-1) 2343 if (len == (size_t)-1)
2789 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2344 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2790 2345
2791 // assume wchar == unicode 2346 // assume wchar == unicode
2792 cmdbuf_ptr += len; 2347 cmdbuf_ptr += len;
2793 return wc & UNICODE_MASK; 2348 return wc & UNICODE_MASK;
2794 } 2349 }
2795 2350
2796 return NOCHAR; 2351 return NOCHAR;
2797} 2352}
2353
2354// read the next octet
2355uint32_t
2356rxvt_term::next_octet () NOTHROW
2357{
2358 return cmdbuf_ptr < cmdbuf_endp
2359 ? (unsigned char)*cmdbuf_ptr++
2360 : NOCHAR;
2361}
2362
2363static class out_of_input out_of_input;
2798 2364
2799/* rxvt_cmd_getc () - Return next input character */ 2365/* rxvt_cmd_getc () - Return next input character */
2800/* 2366/*
2801 * Return the next input character after first passing any keyboard input 2367 * Return the next input character after first passing any keyboard input
2802 * to the command. 2368 * to the command.
2803 */ 2369 */
2804unicode_t 2370wchar_t
2805rxvt_term::cmd_getc () 2371rxvt_term::cmd_getc () THROW ((class out_of_input))
2806{ 2372{
2807 unicode_t c = next_char (); 2373 wchar_t c = next_char ();
2808 2374
2809 if (c == NOCHAR) 2375 if (c == NOCHAR)
2810 throw out_of_input; 2376 throw out_of_input;
2811 2377
2812 return c; 2378 return c;
2813} 2379}
2814 2380
2815unicode_t 2381uint32_t
2816rxvt_term::cmd_get8 () 2382rxvt_term::cmd_get8 () THROW ((class out_of_input))
2817{ 2383{
2818 unicode_t c = next_octet (); 2384 uint32_t c = next_octet ();
2819 2385
2820 if (c == NOCHAR) 2386 if (c == NOCHAR)
2821 throw out_of_input; 2387 throw out_of_input;
2822 2388
2823 return c; 2389 return c;
… …
2887 { 2453 {
2888 if ((buf[len++] = cmd_getc ()) == 'i') 2454 if ((buf[len++] = cmd_getc ()) == 'i')
2889 break; /* done = 1 */ 2455 break; /* done = 1 */
2890 } 2456 }
2891 } 2457 }
2892 2458
2893 for (i = 0; i < len; i++) 2459 for (i = 0; i < len; i++)
2894 if (putc (buf[i], fd) == EOF) 2460 if (putc (buf[i], fd) == EOF)
2895 { 2461 {
2896 done = 1; 2462 done = 1;
2897 break; 2463 break;
… …
2899 } 2465 }
2900 } 2466 }
2901 2467
2902 pclose_printer (fd); 2468 pclose_printer (fd);
2903} 2469}
2904#endif /* PRINTPIPE */ 2470#endif /* PRINTPIPE */
2905/*}}} */ 2471/*}}} */
2906 2472
2907/* *INDENT-OFF* */ 2473/* *INDENT-OFF* */
2908enum { 2474enum {
2909 C1_40 = 0x40, 2475 C1_40 = 0x40,
… …
2923 case C0_ESC: 2489 case C0_ESC:
2924 process_escape_seq (); 2490 process_escape_seq ();
2925 break; 2491 break;
2926 case C0_ENQ: /* terminal Status */ 2492 case C0_ENQ: /* terminal Status */
2927 if (rs[Rs_answerbackstring]) 2493 if (rs[Rs_answerbackstring])
2928 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2494 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2929 (unsigned int)strlen (rs[Rs_answerbackstring]));
2930 else 2495 else
2931 tt_write ((unsigned char *)VT100_ANS, 2496 tt_write (VT100_ANS, strlen (VT100_ANS));
2932 (unsigned int)strlen (VT100_ANS));
2933 break; 2497 break;
2934 case C0_BEL: /* bell */ 2498 case C0_BEL: /* bell */
2935 scr_bell (); 2499 scr_bell ();
2936 break; 2500 break;
2937 case C0_BS: /* backspace */ 2501 case C0_BS: /* backspace */
… …
2961 process_dcs_seq (); 2525 process_dcs_seq ();
2962 break; 2526 break;
2963 case 0x9b: /* CSI */ 2527 case 0x9b: /* CSI */
2964 process_csi_seq (); 2528 process_csi_seq ();
2965 break; 2529 break;
2966 case 0x9d: /* CSI */ 2530 case 0x9d: /* OSC */
2967 process_osc_seq (); 2531 process_osc_seq ();
2968 break; 2532 break;
2969#endif 2533#endif
2970 } 2534 }
2971} 2535}
… …
3061 scr_charset_set (2, (unsigned int)cmd_getc ()); 2625 scr_charset_set (2, (unsigned int)cmd_getc ());
3062 break; 2626 break;
3063 case '+': 2627 case '+':
3064 scr_charset_set (3, (unsigned int)cmd_getc ()); 2628 scr_charset_set (3, (unsigned int)cmd_getc ());
3065 break; 2629 break;
3066#if ENABLE_FRILLS 2630#if !ENABLE_MINIMAL
3067 case '6': 2631 case '6':
3068 scr_backindex (); 2632 scr_backindex ();
3069 break; 2633 break;
3070#endif 2634#endif
3071 case '7': 2635 case '7':
3072 scr_cursor (SAVE); 2636 scr_cursor (SAVE);
3073 break; 2637 break;
3074 case '8': 2638 case '8':
3075 scr_cursor (RESTORE); 2639 scr_cursor (RESTORE);
3076 break; 2640 break;
3077#if ENABLE_FRILLS 2641#if !ENABLE_MINIMAL
3078 case '9': 2642 case '9':
3079 scr_forwardindex (); 2643 scr_forwardindex ();
3080 break; 2644 break;
3081#endif 2645#endif
3082 case '=': 2646 case '=':
… …
3092 break; 2656 break;
3093 2657
3094 /* 8.3.87: NEXT LINE */ 2658 /* 8.3.87: NEXT LINE */
3095 case C1_NEL: /* ESC E */ 2659 case C1_NEL: /* ESC E */
3096 { 2660 {
3097 unicode_t nlcr[] = { C0_LF, C0_CR }; 2661 wchar_t nlcr[] = { C0_LF, C0_CR };
3098 scr_add_lines (nlcr, 1, 2); 2662 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3099 } 2663 }
3100 break; 2664 break;
3101 2665
3102 /* kidnapped escape sequence: Should be 8.3.48 */ 2666 /* kidnapped escape sequence: Should be 8.3.48 */
3103 case C1_ESA: /* ESC G */ 2667 case C1_ESA: /* ESC G */
… …
3125 process_dcs_seq (); 2689 process_dcs_seq ();
3126 break; 2690 break;
3127 2691
3128 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2692 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3129 case C1_SCI: /* ESC Z */ 2693 case C1_SCI: /* ESC Z */
3130 tt_write ((const unsigned char *)ESCZ_ANSWER, 2694 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3131 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3132 break; /* steal obsolete ESC [ c */ 2695 break; /* steal obsolete ESC [ c */
3133 2696
3134 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2697 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3135 case C1_CSI: /* ESC [ */ 2698 case C1_CSI: /* ESC [ */
3136 process_csi_seq (); 2699 process_csi_seq ();
… …
3198rxvt_term::process_csi_seq () 2761rxvt_term::process_csi_seq ()
3199{ 2762{
3200 unicode_t ch, priv, i; 2763 unicode_t ch, priv, i;
3201 unsigned int nargs, p; 2764 unsigned int nargs, p;
3202 int n, ndef; 2765 int n, ndef;
3203 int arg[ESC_ARGS]; 2766 int arg[ESC_ARGS] = { };
3204 2767
3205 for (nargs = ESC_ARGS; nargs > 0;) 2768 nargs = 0;
3206 arg[--nargs] = 0;
3207 2769
3208 priv = 0; 2770 priv = 0;
3209 ch = cmd_getc (); 2771 ch = cmd_getc ();
3210 if (ch >= '<' && ch <= '?') 2772 if (ch >= '<' && ch <= '?')
2773 {
3211 { /* '<' '=' '>' '?' */ 2774 /* '<' '=' '>' '?' */
3212 priv = ch; 2775 priv = ch;
3213 ch = cmd_getc (); 2776 ch = cmd_getc ();
3214 } 2777 }
3215 2778
3216 /* read any numerical arguments */ 2779 /* read any numerical arguments */
… …
3245 ndef = get_byte_array_bit (csi_defaults, i); 2808 ndef = get_byte_array_bit (csi_defaults, i);
3246 for (p = 0; p < nargs; p++) 2809 for (p = 0; p < nargs; p++)
3247 if (arg[p] == -1) 2810 if (arg[p] == -1)
3248 arg[p] = ndef; 2811 arg[p] = ndef;
3249 2812
3250#ifdef DEBUG_CMD
3251 fprintf (stderr, "CSI ");
3252 for (p = 0; p < nargs; p++)
3253 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3254 fprintf (stderr, "%c\n", ch);
3255#endif
3256
3257 /* 2813 /*
3258 * private mode handling 2814 * private mode handling
3259 */ 2815 */
3260 if (priv) 2816 if (priv)
3261 { 2817 {
3262 switch (priv) 2818 switch (priv)
3263 { 2819 {
3264 case '>': 2820 case '>':
3265 if (ch == CSI_DA) /* secondary device attributes */ 2821 if (ch == CSI_DA) /* secondary device attributes */
3266 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2822 {
2823 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2824 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2825 //
2826 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2827 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2828 // versions.
2829 //
2830 tt_printf ("\033[>%d;95;0c", 'U');
2831 }
3267 break; 2832 break;
2833
3268 case '?': 2834 case '?':
3269 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2835 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3270 process_terminal_mode (ch, priv, nargs, arg); 2836 process_terminal_mode (ch, priv, nargs, arg);
3271 break; 2837 break;
3272 } 2838 }
… …
3380 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2946 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3381 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 2947 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3382 break; 2948 break;
3383 2949
3384 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2950 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3385 tt_write ((const unsigned char *)VT100_ANS, 2951 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3386 (unsigned int) (sizeof (VT100_ANS) - 1));
3387 break; 2952 break;
3388 2953
3389 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2954 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3390 process_sgr_mode (nargs, arg); 2955 process_sgr_mode (nargs, arg);
3391 break; 2956 break;
… …
3398 break; 2963 break;
3399 case 6: /* CPR requested */ 2964 case 6: /* CPR requested */
3400 scr_report_position (); 2965 scr_report_position ();
3401 break; 2966 break;
3402 case 7: /* unofficial extension */ 2967 case 7: /* unofficial extension */
3403 if (OPTION (Opt_insecure)) 2968 if (option (Opt_insecure))
3404 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2969 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3405 break; 2970 break;
3406 case 8: /* unofficial extension */ 2971 case 8: /* unofficial extension */
3407 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2972 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3408 break; 2973 break;
… …
3475 break; 3040 break;
3476 case CSI_75: 3041 case CSI_75:
3477 scr_cursor (RESTORE); 3042 scr_cursor (RESTORE);
3478 break; 3043 break;
3479 3044
3480#if ENABLE_FRILLS 3045#if !ENABLE_MINIMAL
3481 case CSI_74: 3046 case CSI_74:
3482 process_window_ops (arg, nargs); 3047 process_window_ops (arg, nargs);
3483 break; 3048 break;
3484#endif 3049#endif
3485 3050
… …
3492 break; 3057 break;
3493 } 3058 }
3494} 3059}
3495/*}}} */ 3060/*}}} */
3496 3061
3497#if ENABLE_FRILLS 3062#if !ENABLE_MINIMAL
3498/* ARGSUSED */ 3063/* ARGSUSED */
3499void 3064void
3500rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3065rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3501{ 3066{
3502 int x, y; 3067 int x, y;
3503 XWindowAttributes wattr; 3068 XWindowAttributes wattr;
3504 Window wdummy; 3069 Window wdummy;
3505 dDisp; 3070
3071 dLocal (Display *, dpy);
3506 3072
3507 if (nargs == 0) 3073 if (nargs == 0)
3508 return; 3074 return;
3509 3075
3510 switch (args[0]) 3076 switch (args[0])
3511 { 3077 {
3512 /* 3078 /*
3513 * commands 3079 * commands
3514 */ 3080 */
3515 case 1: /* deiconify window */ 3081 case 1: /* deiconify window */
3516 XMapWindow (disp, parent[0]); 3082 XMapWindow (dpy, parent[0]);
3517 break; 3083 break;
3518 case 2: /* iconify window */ 3084 case 2: /* iconify window */
3519 XIconifyWindow (disp, parent[0], display->screen); 3085 XIconifyWindow (dpy, parent[0], display->screen);
3520 break; 3086 break;
3521 case 3: /* set position (pixels) */ 3087 case 3: /* set position (pixels) */
3522 XMoveWindow (disp, parent[0], args[1], args[2]); 3088 XMoveWindow (dpy, parent[0], args[1], args[2]);
3523 break; 3089 break;
3524 case 4: /* set size (pixels) */ 3090 case 4: /* set size (pixels) */
3525 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3091 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3526 break; 3092 break;
3527 case 5: /* raise window */ 3093 case 5: /* raise window */
3528 XRaiseWindow (disp, parent[0]); 3094 XRaiseWindow (dpy, parent[0]);
3529 break; 3095 break;
3530 case 6: /* lower window */ 3096 case 6: /* lower window */
3531 XLowerWindow (disp, parent[0]); 3097 XLowerWindow (dpy, parent[0]);
3532 break; 3098 break;
3533 case 7: /* refresh window */ 3099 case 7: /* refresh window */
3534 scr_touch (true); 3100 scr_touch (true);
3535 break; 3101 break;
3536 case 8: /* set size (chars) */ 3102 case 8: /* set size (chars) */
… …
3543 if (args[0] >= 24) /* set height (chars) */ 3109 if (args[0] >= 24) /* set height (chars) */
3544 set_widthheight ((unsigned int)width, 3110 set_widthheight ((unsigned int)width,
3545 (unsigned int) (args[1] * fheight)); 3111 (unsigned int) (args[1] * fheight));
3546 break; 3112 break;
3547 3113
3548
3549 /* 3114 /*
3550 * reports - some output format copied from XTerm 3115 * reports - some output format copied from XTerm
3551 */ 3116 */
3552 case 11: /* report window state */ 3117 case 11: /* report window state */
3553 XGetWindowAttributes (disp, parent[0], &wattr); 3118 XGetWindowAttributes (dpy, parent[0], &wattr);
3554 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3119 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3555 break; 3120 break;
3556 case 13: /* report window position */ 3121 case 13: /* report window position */
3557 XGetWindowAttributes (disp, parent[0], &wattr); 3122 XGetWindowAttributes (dpy, parent[0], &wattr);
3558 XTranslateCoordinates (disp, parent[0], wattr.root, 3123 XTranslateCoordinates (dpy, parent[0], wattr.root,
3559 -wattr.border_width, -wattr.border_width, 3124 -wattr.border_width, -wattr.border_width,
3560 &x, &y, &wdummy); 3125 &x, &y, &wdummy);
3561 tt_printf ("\033[3;%d;%dt", x, y); 3126 tt_printf ("\033[3;%d;%dt", x, y);
3562 break; 3127 break;
3563 case 14: /* report window size (pixels) */ 3128 case 14: /* report window size (pixels) */
3564 XGetWindowAttributes (disp, parent[0], &wattr); 3129 XGetWindowAttributes (dpy, parent[0], &wattr);
3565 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3130 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3566 break; 3131 break;
3567 case 18: /* report text area size (chars) */ 3132 case 18: /* report text area size (chars) */
3568 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3133 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3569 break; 3134 break;
… …
3571 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3136 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3572 break; 3137 break;
3573 case 20: /* report icon label */ 3138 case 20: /* report icon label */
3574 { 3139 {
3575 char *s; 3140 char *s;
3576 XGetIconName (disp, parent[0], &s); 3141 XGetIconName (dpy, parent[0], &s);
3577 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3142 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3578 XFree (s); 3143 XFree (s);
3579 } 3144 }
3580 break; 3145 break;
3581 case 21: /* report window title */ 3146 case 21: /* report window title */
3582 { 3147 {
3583 char *s; 3148 char *s;
3584 XFetchName (disp, parent[0], &s); 3149 XFetchName (dpy, parent[0], &s);
3585 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3150 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3586 XFree (s); 3151 XFree (s);
3587 } 3152 }
3588 break; 3153 break;
3589 } 3154 }
3590} 3155}
… …
3593/*----------------------------------------------------------------------*/ 3158/*----------------------------------------------------------------------*/
3594/* 3159/*
3595 * get input up until STRING TERMINATOR (or BEL) 3160 * get input up until STRING TERMINATOR (or BEL)
3596 * ends_how is terminator used. returned input must be free()'d 3161 * ends_how is terminator used. returned input must be free()'d
3597 */ 3162 */
3598unsigned char * 3163char *
3599rxvt_term::get_to_st (unicode_t &ends_how) 3164rxvt_term::get_to_st (unicode_t &ends_how)
3600{ 3165{
3601 unicode_t ch; 3166 unicode_t ch;
3602 bool seen_esc = false; 3167 bool seen_esc = false;
3603 unsigned int n = 0; 3168 unsigned int n = 0;
… …
3617 seen_esc = true; 3182 seen_esc = true;
3618 continue; 3183 continue;
3619 } 3184 }
3620 else if (ch == C0_BEL || ch == CHAR_ST) 3185 else if (ch == C0_BEL || ch == CHAR_ST)
3621 break; 3186 break;
3187 else if (ch == C0_SYN)
3188 ch = cmd_get8 ();
3622 else if (ch < 0x20) 3189 else if (ch < 0x20)
3623 return NULL; /* other control character - exit */ 3190 return NULL; /* other control character - exit */
3624 3191
3625 seen_esc = false; 3192 seen_esc = false;
3626 3193
3627 if (n >= STRING_MAX - 1) 3194 if (n >= STRING_MAX - 1)
3628 // stop at some sane length 3195 // stop at some sane length
3629 return NULL; 3196 return NULL;
3630 3197
3631 if (ch == C0_SYN)
3632 string[n++] = cmd_get8 ();
3633 else
3634 string[n++] = ch; 3198 string[n++] = ch;
3635 } 3199 }
3636 3200
3637 string[n++] = '\0'; 3201 string[n++] = '\0';
3638 3202
3639 ends_how = (ch == 0x5c ? C0_ESC : ch); 3203 ends_how = (ch == 0x5c ? C0_ESC : ch);
3640 3204
3641 return (unsigned char *)rxvt_wcstombs (string); 3205 return rxvt_wcstombs (string);
3642} 3206}
3643 3207
3644/*----------------------------------------------------------------------*/ 3208/*----------------------------------------------------------------------*/
3645/* 3209/*
3646 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3210 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3647 */ 3211 */
3648void 3212void
3649rxvt_term::process_dcs_seq () 3213rxvt_term::process_dcs_seq ()
3650{ 3214{
3651 unsigned char *s; 3215 char *s;
3652 unicode_t eh; 3216 unicode_t eh;
3653 3217
3654 /* 3218 /*
3655 * Not handled yet 3219 * Not handled yet
3656 */ 3220 */
… …
3675 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3239 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3676 arg = arg * 10 + (ch - '0'); 3240 arg = arg * 10 + (ch - '0');
3677 3241
3678 if (ch == ';') 3242 if (ch == ';')
3679 { 3243 {
3680 unsigned char *s = get_to_st (eh); 3244 char *s = get_to_st (eh);
3681 3245
3682 if (s) 3246 if (s)
3683 { 3247 {
3684 process_xterm_seq (arg, (char *)s, eh); 3248 process_xterm_seq (arg, s, eh);
3685 free (s); 3249 free (s);
3686 } 3250 }
3687 } 3251 }
3688} 3252}
3689 3253
3690void 3254void
3691rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3255rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3692{ 3256{
3693 if (str[0] == '?' && !str[1]) 3257 if (str[0] == '?' && !str[1])
3694 { 3258 {
3695 unsigned short r, g, b; 3259 rgba c;
3696 pix_colors_focused[color].get (display, r, g, b); 3260 pix_colors_focused[color].get (c);
3261
3262#if XFT
3263 if (c.a != rgba::MAX_CC)
3264 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3265 else
3266#endif
3697 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3267 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3698 } 3268 }
3699 else 3269 else
3700 set_window_color (color, str); 3270 set_window_color (color, str);
3701} 3271}
3702 3272
3703/* 3273/*
3704 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3274 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3705 */ 3275 */
3706void 3276void
3707rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3277rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3708{ 3278{
3709 int changed = 0;
3710 int color; 3279 int color;
3711 char *buf, *name; 3280 char *buf, *name;
3712 bool query = str[0] == '?' && !str[1]; 3281 bool query = str[0] == '?' && !str[1];
3713 int saveop = op; 3282 int saveop = op;
3714 dDisp; 3283
3284 dLocal (Display *, dpy);
3715 3285
3716 assert (str != NULL); 3286 assert (str != NULL);
3287
3288 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3289 return;
3290
3717 switch (op) 3291 switch (op)
3718 { 3292 {
3719 case XTerm_name: 3293 case XTerm_name:
3720 set_title (str); 3294 set_title (str);
3721 /* FALLTHROUGH */ 3295 /* FALLTHROUGH */
… …
3735 unsigned long bytes_after; 3309 unsigned long bytes_after;
3736 unsigned char *value = 0; 3310 unsigned char *value = 0;
3737 const char *str = ""; 3311 const char *str = "";
3738 3312
3739 if (prop 3313 if (prop
3740 && XGetWindowProperty (disp, parent[0], 3314 && XGetWindowProperty (dpy, parent[0],
3741 prop, 0, 1<<16, 0, AnyPropertyType, 3315 prop, 0, 1<<16, 0, AnyPropertyType,
3742 &actual_type, &actual_format, 3316 &actual_type, &actual_format,
3743 &nitems, &bytes_after, &value) == Success 3317 &nitems, &bytes_after, &value) == Success
3744 && actual_type != None 3318 && actual_type != None
3745 && actual_format == 8) 3319 && actual_format == 8)
3746 str = (const char *)(value); 3320 str = (const char *)(value);
3747 3321
3748 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3322 tt_printf ("\033]%d;%s%c", op, str, resp);
3749 3323
3750 XFree (value); 3324 XFree (value);
3751 } 3325 }
3752 else 3326 else
3753 { 3327 {
… …
3757 { 3331 {
3758 *eq = 0; 3332 *eq = 0;
3759 set_utf8_property (display->atom (str), eq + 1); 3333 set_utf8_property (display->atom (str), eq + 1);
3760 } 3334 }
3761 else 3335 else
3762 XDeleteProperty (disp, parent[0], 3336 XDeleteProperty (dpy, parent[0],
3763 display->atom (str)); 3337 display->atom (str));
3764 } 3338 }
3765 break; 3339 break;
3766 3340
3767 case XTerm_Color: 3341 case XTerm_Color:
… …
3769 { 3343 {
3770 if ((name = strchr (buf, ';')) == NULL) 3344 if ((name = strchr (buf, ';')) == NULL)
3771 break; 3345 break;
3772 3346
3773 *name++ = '\0'; 3347 *name++ = '\0';
3774 color = atoi (buf); 3348 color = atoi (buf) + minCOLOR;
3775 3349
3776 if (color < 0 || color >= TOTAL_COLORS) 3350 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3777 break; 3351 break;
3778 3352
3779 if ((buf = strchr (name, ';')) != NULL) 3353 if ((buf = strchr (name, ';')) != NULL)
3780 *buf++ = '\0'; 3354 *buf++ = '\0';
3781 3355
3782 if (name[0] == '?' && !name[1]) 3356 process_color_seq (op, color, name, resp);
3783 {
3784 unsigned short r, g, b;
3785 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3786 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3787 }
3788 else
3789 set_window_color (color + minCOLOR, name);
3790 } 3357 }
3791 break; 3358 break;
3359 case Rxvt_restoreFG:
3792 case XTerm_Color00: 3360 case XTerm_Color00:
3793 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3361 process_color_seq (op, Color_fg, str, resp);
3794 break; 3362 break;
3363 case Rxvt_restoreBG:
3795 case XTerm_Color01: 3364 case XTerm_Color01:
3796 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3365 process_color_seq (op, Color_bg, str, resp);
3797 break; 3366 break;
3798#ifndef NO_CURSORCOLOR 3367#ifndef NO_CURSORCOLOR
3799 case XTerm_Color_cursor: 3368 case XTerm_Color_cursor:
3800 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3369 process_color_seq (op, Color_cursor, str, resp);
3801 break; 3370 break;
3802#endif 3371#endif
3803 case XTerm_Color_pointer_fg: 3372 case XTerm_Color_pointer_fg:
3804 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3373 process_color_seq (op, Color_pointer_fg, str, resp);
3805 break; 3374 break;
3806 case XTerm_Color_pointer_bg: 3375 case XTerm_Color_pointer_bg:
3807 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3376 process_color_seq (op, Color_pointer_bg, str, resp);
3808 break; 3377 break;
3809#ifndef NO_BOLD_UNDERLINE_REVERSE 3378#ifndef NO_BOLD_UNDERLINE_REVERSE
3810 case XTerm_Color_BD:
3811 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3812 break;
3813 case XTerm_Color_UL:
3814 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3815 break;
3816 case XTerm_Color_RV: 3379 case XTerm_Color_RV:
3817 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3380 process_color_seq (op, Color_RV, str, resp);
3381 break;
3382 case Rxvt_Color_BD:
3383 case URxvt_Color_BD:
3384 process_color_seq (op, Color_BD, str, resp);
3385 break;
3386 case Rxvt_Color_UL:
3387 case URxvt_Color_UL:
3388 process_color_seq (op, Color_UL, str, resp);
3818 break; 3389 break;
3819 case URxvt_Color_IT: 3390 case URxvt_Color_IT:
3820 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3391 process_color_seq (op, Color_IT, str, resp);
3821 break; 3392 break;
3822#endif 3393#endif
3823#if TRANSPARENT && TINTING 3394#if ENABLE_TRANSPARENCY
3824 case URxvt_Color_tint: 3395 case URxvt_Color_tint:
3825 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3396 process_color_seq (op, Color_tint, str, resp);
3826 check_our_parents (); 3397 {
3827 if (am_transparent) 3398 bool changed = false;
3828 want_full_refresh = want_refresh = 1;
3829 break;
3830#endif
3831 3399
3400 if (ISSET_PIXCOLOR (Color_tint))
3401 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3402 else
3403 changed = bgPixmap.unset_tint ();
3404
3405 if (changed)
3406 update_background ();
3407 }
3408
3409 break;
3410#endif
3411
3412#if BG_IMAGE_FROM_FILE
3832 case XTerm_Pixmap: 3413 case Rxvt_Pixmap:
3833 if (*str != ';') 3414 if (!strcmp (str, "?"))
3834 { 3415 {
3835#if XPM_BACKGROUND 3416 char str[256];
3836 scale_pixmap (""); /* reset to default scaling */ 3417
3837 set_bgPixmap (str); /* change pixmap */ 3418 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3838#endif 3419 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3839 scr_touch (true); 3420 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3421 process_xterm_seq (XTerm_title, str, CHAR_ST);
3840 } 3422 }
3841 while ((str = strchr (str, ';')) != NULL) 3423 else
3842 { 3424 {
3425 int changed = 0;
3426
3427 if (*str != ';')
3428 {
3429 /* reset to default scaling :*/
3430 bgPixmap.unset_geometry ();
3431 if (bgPixmap.set_file (str)) /* change pixmap */
3432 changed++;
3433 str = strchr (str, ';');
3434 if (str == NULL)
3435 bgPixmap.set_defaultGeometry ();
3436 }
3437
3438 while (str)
3439 {
3843 str++; 3440 str++;
3844#if XPM_BACKGROUND 3441 if (bgPixmap.set_geometry (str))
3845 changed += scale_pixmap (str); 3442 changed++;
3846#endif 3443 str = strchr (str, ';');
3444 }
3445
3446 if (changed)
3447 update_background ();
3847 } 3448 }
3848
3849 if (changed)
3850 {
3851#ifdef XPM_BACKGROUND
3852 resize_pixmap ();
3853#endif
3854 scr_touch (true);
3855 }
3856 break; 3449 break;
3857 3450#endif
3858 case XTerm_restoreFG:
3859 set_window_color (Color_fg, str);
3860 break;
3861 case XTerm_restoreBG:
3862 set_window_color (Color_bg, str);
3863 break;
3864 3451
3865 case XTerm_logfile: 3452 case XTerm_logfile:
3866 // TODO, when secure mode? 3453 // TODO, when secure mode?
3867 break; 3454 break;
3868 3455
3869#ifdef MENUBAR
3870 case URxvt_Menu:
3871 if (OPTION (Opt_insecure))
3872 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3873 break;
3874#endif
3875#if 0 3456#if 0
3876 case XTerm_dumpscreen: /* no error notices */ 3457 case Rxvt_dumpscreen: /* no error notices */
3877 { 3458 {
3878 int fd; 3459 int fd;
3879 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3460 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3880 { 3461 {
3881 scr_dump (fd); 3462 scr_dump (fd);
… …
3892 case URxvt_italicFont: 3473 case URxvt_italicFont:
3893 case URxvt_boldItalicFont: 3474 case URxvt_boldItalicFont:
3894#endif 3475#endif
3895 if (query) 3476 if (query)
3896 tt_printf ("\33]%d;%-.250s%c", saveop, 3477 tt_printf ("\33]%d;%-.250s%c", saveop,
3897 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3478 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3898 ? fontset[op - URxvt_font]->fontdesc : "", 3479 ? fontset[op - URxvt_font]->fontdesc : "",
3899 resp); 3480 resp);
3900 else 3481 else
3901 { 3482 {
3902 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3483 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3905 allocated.push_back ((void *)res); 3486 allocated.push_back ((void *)res);
3906 set_fonts (); 3487 set_fonts ();
3907 } 3488 }
3908 break; 3489 break;
3909 3490
3910#if ENABLE_FRILLS 3491 case URxvt_version:
3492 if (query)
3493 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3494 op,
3495 rs[Rs_name], VERSION[0], VERSION[2],
3496 resp);
3497 break;
3498
3499#if !ENABLE_MINIMAL
3911 case URxvt_locale: 3500 case URxvt_locale:
3912 if (query) 3501 if (query)
3913 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3502 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3914 else 3503 else
3915 { 3504 {
3916 set_locale (str); 3505 set_locale (str);
3917 pty.set_utf8_mode (enc_utf8); 3506 pty->set_utf8_mode (enc_utf8);
3918 init_xlocale (); 3507 init_xlocale ();
3919 } 3508 }
3920 break; 3509 break;
3921 3510
3922 case URxvt_view_up: 3511 case URxvt_view_up:
3923 case URxvt_view_down: 3512 case URxvt_view_down:
3513 {
3924 int lines = atoi (str); 3514 int lines = atoi (str);
3925 3515
3926 if (lines) 3516 if (lines)
3927 scr_page (op == URxvt_view_up ? UP : DN, lines); 3517 scr_page (op == URxvt_view_up ? UP : DN, lines);
3928 else 3518 else
3929 {
3930 scr_erase_savelines (); 3519 scr_erase_savelines ();
3931 } 3520 }
3932 3521
3522 break;
3523#endif
3524
3525#if ENABLE_PERL
3526 case URxvt_perl:
3527 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3528 ; // no responses yet
3933 break; 3529 break;
3934#endif 3530#endif
3935 } 3531 }
3936} 3532}
3937/*----------------------------------------------------------------------*/ 3533/*----------------------------------------------------------------------*/
… …
3968 return state; 3564 return state;
3969} 3565}
3970 3566
3971/* we're not using priv _yet_ */ 3567/* we're not using priv _yet_ */
3972void 3568void
3973rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3569rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3974{ 3570{
3975 unsigned int i, j; 3571 unsigned int i, j;
3976 int state; 3572 int state;
3977 3573
3978 static const struct 3574 static const struct
3979 { 3575 {
3980 const int argval; 3576 const int argval;
3981 const unsigned long bit; 3577 const unsigned long bit;
3982 }
3983
3984 argtopriv[] = { 3578 } argtopriv[] = {
3985 { 1, PrivMode_aplCUR }, 3579 { 1, PrivMode_aplCUR },
3986 { 2, PrivMode_vt52 }, 3580 { 2, PrivMode_vt52 },
3987 { 3, PrivMode_132 }, 3581 { 3, PrivMode_132 },
3988 { 4, PrivMode_smoothScroll }, 3582 { 4, PrivMode_smoothScroll },
3989 { 5, PrivMode_rVideo }, 3583 { 5, PrivMode_rVideo },
3990 { 6, PrivMode_relOrigin }, 3584 { 6, PrivMode_relOrigin },
3991 { 7, PrivMode_Autowrap }, 3585 { 7, PrivMode_Autowrap },
3992 // 8, bi-directional support mode 3586 // 8, bi-directional support mode
3993 { 9, PrivMode_MouseX10 }, 3587 { 9, PrivMode_MouseX10 },
3994#ifdef menuBar_esc
3995 { menuBar_esc, PrivMode_menuBar },
3996#endif
3997 // 18, 19 printing-related 3588 // 18, 19 printing-related
3998 { 25, PrivMode_VisibleCursor }, 3589 { 25, PrivMode_VisibleCursor },
3999#ifdef scrollBar_esc 3590#ifdef scrollBar_esc
4000 { scrollBar_esc, PrivMode_scrollBar }, 3591 { scrollBar_esc, PrivMode_scrollBar },
4001#endif 3592#endif
… …
4008 { 66, PrivMode_aplKP }, 3599 { 66, PrivMode_aplKP },
4009#ifndef NO_BACKSPACE_KEY 3600#ifndef NO_BACKSPACE_KEY
4010 { 67, PrivMode_BackSpace }, 3601 { 67, PrivMode_BackSpace },
4011#endif 3602#endif
4012 { 1000, PrivMode_MouseX11 }, 3603 { 1000, PrivMode_MouseX11 },
4013 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3604 { 1002, PrivMode_MouseBtnEvent },
4014 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3605 { 1003, PrivMode_MouseAnyEvent },
4015 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4016 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3606 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4017 { 1011, PrivMode_Keypress }, // rxvt extension 3607 { 1011, PrivMode_Keypress }, // rxvt extension
4018 // 1035 enable modifiers for alt, numlock NYI 3608 // 1035 enable modifiers for alt, numlock NYI
4019 // 1036 send ESC for meta keys NYI 3609 // 1036 send ESC for meta keys NYI
4020 // 1037 send DEL for keypad delete NYI 3610 // 1037 send DEL for keypad delete NYI
4021 { 1047, PrivMode_Screen }, 3611 { 1047, PrivMode_Screen },
4022 // 1048 save and restore cursor 3612 // 1048 save and restore cursor
4023 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3613 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4024 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3614 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3615 { 2004, PrivMode_BracketPaste },
4025 }; 3616 };
4026 3617
4027 if (nargs == 0) 3618 if (nargs == 0)
4028 return; 3619 return;
4029 3620
… …
4048 /* extra handling for values with state unkept */ 3639 /* extra handling for values with state unkept */
4049 switch (arg[i]) 3640 switch (arg[i])
4050 { 3641 {
4051#if ENABLE_STYLES 3642#if ENABLE_STYLES
4052 case 1021: 3643 case 1021:
4053 if (mode) 3644 set_option (Opt_intensityStyles, mode);
4054 SET_OPTION (Opt_intensityStyles); 3645
3646 scr_touch (true);
4055 else 3647 break;
4056 CLR_OPTION (Opt_intensityStyles);
4057#endif 3648#endif
4058 case 1048: /* alternative cursor save */ 3649 case 1048: /* alternative cursor save */
4059 case 1049: 3650 case 1049:
4060 if (OPTION (Opt_secondaryScreen)) 3651 if (option (Opt_secondaryScreen))
4061 if (mode == 0) 3652 if (mode == 0)
4062 scr_cursor (RESTORE); 3653 scr_cursor (RESTORE);
4063 else if (mode == 1) 3654 else if (mode == 1)
4064 scr_cursor (SAVE); 3655 scr_cursor (SAVE);
4065 break; 3656 break;
… …
4077 */ 3668 */
4078 PrivMode (1, PrivMode_vt52); 3669 PrivMode (1, PrivMode_vt52);
4079 break; 3670 break;
4080 case 3: /* 80/132 */ 3671 case 3: /* 80/132 */
4081 if (priv_modes & PrivMode_132OK) 3672 if (priv_modes & PrivMode_132OK)
3673 {
3674 scr_poweron ();
4082 set_widthheight (((state ? 132 : 80) * fwidth), height); 3675 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3676 }
4083 break; 3677 break;
4084 case 4: /* smooth scrolling */ 3678 case 4: /* smooth scrolling */
4085 if (!state) 3679 set_option (Opt_jumpScroll, !state);
4086 SET_OPTION (Opt_jumpScroll);
4087 else
4088 CLR_OPTION (Opt_jumpScroll);
4089 break; 3680 break;
4090 case 5: /* reverse video */ 3681 case 5: /* reverse video */
4091 scr_rvideo_mode (state); 3682 scr_rvideo_mode (state);
4092 break; 3683 break;
4093 case 6: /* relative/absolute origins */ 3684 case 6: /* relative/absolute origins */
… …
4097 scr_autowrap (state); 3688 scr_autowrap (state);
4098 break; 3689 break;
4099 /* case 8: - auto repeat, can't do on a per window basis */ 3690 /* case 8: - auto repeat, can't do on a per window basis */
4100 case 9: /* X10 mouse reporting */ 3691 case 9: /* X10 mouse reporting */
4101 if (state) /* orthogonal */ 3692 if (state) /* orthogonal */
4102 priv_modes &= ~PrivMode_MouseX11; 3693 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4103 break; 3694 break;
4104#ifdef menuBar_esc
4105 case menuBar_esc:
4106#ifdef MENUBAR
4107 map_menuBar (state);
4108#endif
4109 break;
4110#endif
4111#ifdef scrollBar_esc 3695#ifdef scrollBar_esc
4112 case scrollBar_esc: 3696 case scrollBar_esc:
4113 if (scrollbar_mapping (state)) 3697 if (scrollbar_mapping (state))
4114 { 3698 {
4115 resize_all_windows (0, 0, 0); 3699 resize_all_windows (0, 0, 0);
… …
4127 break; 3711 break;
4128 /* case 66: - application key pad */ 3712 /* case 66: - application key pad */
4129 /* case 67: - backspace key */ 3713 /* case 67: - backspace key */
4130 case 1000: /* X11 mouse reporting */ 3714 case 1000: /* X11 mouse reporting */
4131 if (state) /* orthogonal */ 3715 if (state) /* orthogonal */
4132 priv_modes &= ~PrivMode_MouseX10; 3716 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4133 break; 3717 break;
4134#if 0
4135 case 1001: 3718 case 1002:
4136 break; /* X11 mouse highlighting */ 3719 case 1003:
4137#endif 3720 if (state)
3721 {
3722 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3723 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3724 vt_emask_mouse = PointerMotionMask;
3725 }
3726 else
3727 vt_emask_mouse = NoEventMask;
3728 vt_select_input ();
3729 break;
4138 case 1010: /* scroll to bottom on TTY output inhibit */ 3730 case 1010: /* scroll to bottom on TTY output inhibit */
4139 if (!state) 3731 set_option (Opt_scrollTtyOutput, !state);
4140 SET_OPTION (Opt_scrollTtyOutput);
4141 else
4142 CLR_OPTION (Opt_scrollTtyOutput);
4143 break; 3732 break;
4144 case 1011: /* scroll to bottom on key press */ 3733 case 1011: /* scroll to bottom on key press */
4145 if (state) 3734 set_option (Opt_scrollTtyKeypress, state);
4146 SET_OPTION (Opt_scrollTtyKeypress);
4147 else
4148 CLR_OPTION (Opt_scrollTtyKeypress);
4149 break; 3735 break;
4150 case 1047: /* secondary screen w/ clearing last */ 3736 case 1047: /* secondary screen w/ clearing last */
4151 if (OPTION (Opt_secondaryScreen)) 3737 if (option (Opt_secondaryScreen))
4152 if (current_screen != PRIMARY) 3738 if (current_screen != PRIMARY)
4153 scr_erase_screen (2); 3739 scr_erase_screen (2);
4154 scr_change_screen (state); 3740 scr_change_screen (state);
4155 break; 3741 break;
4156 case 1049: /* secondary screen w/ clearing first */ 3742 case 1049: /* secondary screen w/ clearing first */
4157 scr_change_screen (state); 3743 scr_change_screen (state);
4158 if (OPTION (Opt_secondaryScreen)) 3744 if (option (Opt_secondaryScreen))
4159 if (current_screen != PRIMARY) 3745 if (current_screen != PRIMARY)
4160 scr_erase_screen (2); 3746 scr_erase_screen (2);
4161 break; 3747 break;
4162 default: 3748 default:
4163 break; 3749 break;
… …
4291 scr_color (Color_bg, Color_bg); 3877 scr_color (Color_bg, Color_bg);
4292 break; 3878 break;
4293 3879
4294 //case 50: // not variable spacing 3880 //case 50: // not variable spacing
4295 3881
4296#ifndef NO_BRIGHTCOLOR 3882#if !ENABLE_MINIMAL
4297 case 90: 3883 case 90:
4298 case 91: /* set bright fg color */ 3884 case 91: /* set bright fg color */
4299 case 92: 3885 case 92:
4300 case 93: 3886 case 93:
4301 case 94: 3887 case 94:
… …
4325rxvt_term::process_graphics () 3911rxvt_term::process_graphics ()
4326{ 3912{
4327 unicode_t ch, cmd = cmd_getc (); 3913 unicode_t ch, cmd = cmd_getc ();
4328 3914
4329 if (cmd == 'Q') 3915 if (cmd == 'Q')
3916 {
4330 { /* query graphics */ 3917 /* query graphics */
4331 tt_printf ("\033G0\012"); /* no graphics */ 3918 tt_printf ("\033G0\012"); /* no graphics */
4332 return; 3919 return;
4333 } 3920 }
4334 /* swallow other graphics sequences until terminating ':' */ 3921 /* swallow other graphics sequences until terminating ':' */
4335 do 3922 do
… …
4346 */ 3933 */
4347void 3934void
4348rxvt_term::tt_printf (const char *fmt,...) 3935rxvt_term::tt_printf (const char *fmt,...)
4349{ 3936{
4350 va_list arg_ptr; 3937 va_list arg_ptr;
4351 unsigned char buf[256]; 3938 char buf[256];
4352 3939
4353 va_start (arg_ptr, fmt); 3940 va_start (arg_ptr, fmt);
4354 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3941 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4355 va_end (arg_ptr); 3942 va_end (arg_ptr);
4356 tt_write (buf, strlen (buf)); 3943 tt_write (buf, strlen (buf));
… …
4361 * or generated by us in response to a query ESC sequence. 3948 * or generated by us in response to a query ESC sequence.
4362 */ 3949 */
4363const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3950const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4364 3951
4365void 3952void
4366rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3953rxvt_term::tt_write (const char *data, unsigned int len)
4367{ 3954{
3955 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3956 return;
3957
3958 if (pty->pty < 0)
3959 return;
3960
4368 if (v_buflen == 0) 3961 if (v_buflen == 0)
4369 { 3962 {
4370 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3963 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4371 3964
4372 if ((unsigned int)written == len) 3965 if ((unsigned int)written == len)
4373 return; 3966 return;
4374 3967
4375 data += written; 3968 data += written;
4376 len -= written; 3969 len -= written;
4377 } 3970 }
4378 3971
4379 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 3972 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4380 3973
4381 memcpy (v_buffer + v_buflen, data, len); 3974 memcpy (v_buffer + v_buflen, data, len);
4382 v_buflen += len; 3975 v_buflen += len;
4383 3976
4384 pty_ev.set (EVENT_READ | EVENT_WRITE); 3977 pty_ev.set (ev::READ | ev::WRITE);
4385} 3978}
4386 3979
4387void rxvt_term::pty_write () 3980void rxvt_term::pty_write ()
4388{ 3981{
4389 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3982 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4390 3983
4391 if (written > 0) 3984 if (written > 0)
4392 { 3985 {
4393 v_buflen -= written; 3986 v_buflen -= written;
4394 3987
4395 if (v_buflen == 0) 3988 if (v_buflen == 0)
4396 { 3989 {
4397 free (v_buffer); 3990 free (v_buffer);
4398 v_buffer = 0; 3991 v_buffer = 0;
4399 v_buflen = 0;
4400 3992
4401 pty_ev.set (EVENT_READ); 3993 pty_ev.set (ev::READ);
4402 return; 3994 return;
4403 } 3995 }
4404 3996
4405 memmove (v_buffer, v_buffer + written, v_buflen); 3997 memmove (v_buffer, v_buffer + written, v_buflen);
4406 } 3998 }
4407 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3999 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4408 pty_ev.set (EVENT_READ); 4000 pty_ev.set (ev::READ);
4409} 4001}
4410 4002
4411/*----------------------- end-of-file (C source) -----------------------*/ 4003/*----------------------- end-of-file (C source) -----------------------*/
4412 4004

Diff Legend

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