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

Diff Legend

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