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.219 by root, Sat Dec 31 17:16:17 2005 UTC vs.
Revision 1.407 by ayin, Fri Feb 15 10:56:29 2008 UTC

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

Diff Legend

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