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

Diff Legend

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