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.218 by root, Sat Dec 31 16:40:28 2005 UTC vs.
Revision 1.404 by root, Sat Feb 2 15:19:55 2008 UTC

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

Diff Legend

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