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

Diff Legend

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