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.212 by root, Wed Dec 21 14:19:19 2005 UTC vs.
Revision 1.357 by sasha, Tue Sep 18 22:01:36 2007 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-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * 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 33 * 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 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 55# include "keyboard.h"
55#endif 56#endif
56 57
57#include <csignal> 58#include <csignal>
58 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
59/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
60 65
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#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 67
66#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
67 69
68#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
93 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
94 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
95 97
96 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
97 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
98 XK_ISO_Lock, 0x21eb,
99 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
100 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
101 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
102 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
103 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
141 || !IN_RANGE_EXC (y, 0, nrow)) 142 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 143 return;
143 144
144 for (;;) 145 for (;;)
145 { 146 {
146 const line_t &l = ROW(-view_start); 147 const line_t &l = ROW(y + view_start);
147 148
148 text_t t = l.t[x]; 149 text_t t = l.t[x];
149 150
150 if (t != NOCHAR || !x) 151 if (t != NOCHAR || !x)
151 { 152 {
152 iso14755_51 (l.t[x], l.r[x]); 153 iso14755_51 (l.t[x], l.r[x], x, y);
153 iso14755buf = ISO_14755_54; 154 iso14755buf = ISO_14755_54;
154 break; 155 break;
155 } 156 }
156 157
157 x--; 158 x--;
158 } 159 }
159} 160}
160#endif
161 161
162#if ENABLE_OVERLAY
163void 162void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 164{
166 rxvt_fontset *fs = FONTSET (r); 165 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 166 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 168 int len;
170 169
171 fname = rxvt_utf8towcs (f->name); 170 fname = rxvt_utf8towcs (f->name);
172 171
173#if ENABLE_COMBINING 172# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 173 if (IS_COMPOSE (ch))
175 { 174 {
176 len = rxvt_composite.expand (ch, 0); 175 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 176 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 177 rxvt_composite.expand (ch, chr);
179 } 178 }
180 else 179 else
181#endif 180# endif
182 { 181 {
183 ch2 = ch; 182 ch2 = ch;
184 183
185 alloc = 0; 184 alloc = 0;
186 chr = &ch2; 185 chr = &ch2;
187 len = 1; 186 len = 1;
188 } 187 }
189 188
189 char attr[80]; // plenty
190
191 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
192 (int)r,
193 fgcolor_of (r), bgcolor_of (r),
194 r & RS_Bold ? " bold" : "",
195 r & RS_Italic ? " italic" : "",
196 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : "");
200
190 int width = wcswidth (fname, wcslen (fname)); 201 int width = wcswidth (fname, wcslen (fname));
191 202
192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 203 max_it (width, 8+5); // for char + hey
204 max_it (width, strlen (attr));
205
206 if (y >= 0)
207 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0;
210 }
211
212 scr_overlay_new (x, y, width, len + 2);
193 213
194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
195 215
196 for (int y = 0; y < len; y++) 216 for (int y = 0; y < len; y++)
197 { 217 {
… …
200 ch = *chr++; 220 ch = *chr++;
201 221
202 sprintf (buf, "%8x", ch); 222 sprintf (buf, "%8x", ch);
203 scr_overlay_set (0, y, buf); 223 scr_overlay_set (0, y, buf);
204 scr_overlay_set (9, y, '='); 224 scr_overlay_set (9, y, '=');
205#if !UNICODE3 225# if !UNICODE3
206 if (ch >= 0x10000) 226 if (ch >= 0x10000)
207 ch = 0xfffd; 227 ch = 0xfffd;
208#endif 228# endif
209 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
210 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
211 } 233 }
212 234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
240 scr_overlay_set (0, len , attr);
213 scr_overlay_set (0, len, fname); 241 scr_overlay_set (0, len + 1, fname);
214 242
215 free (fname); 243 free (fname);
216 244
217#if ENABLE_COMBINING 245# if ENABLE_COMBINING
218 if (alloc) 246 if (alloc)
219 delete [] alloc; 247 delete [] alloc;
220#endif 248# endif
221} 249}
222#endif 250#endif
223 251
224void 252void
225rxvt_term::commit_iso14755 () 253rxvt_term::commit_iso14755 ()
… …
242 mb[0] = ch[0]; 270 mb[0] = ch[0];
243 len = 1; 271 len = 1;
244 } 272 }
245 273
246 if (len > 0) 274 if (len > 0)
247 tt_write ((unsigned char *)mb, len); 275 tt_write (mb, len);
248 else 276 else
249 scr_bell (); 277 scr_bell ();
250 } 278 }
251 279
252 iso14755buf = 0; 280 iso14755buf = 0;
… …
269 297
270 return -1; 298 return -1;
271} 299}
272#endif 300#endif
273 301
274/*{{{ Convert the keypress event into a string */
275void 302void
276rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
277{ 304{
278 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
279 unsigned int newlen; 306 unsigned int newlen;
280 KeySym keysym; 307 KeySym keysym;
281#ifdef DEBUG_CMD
282 static int debug_key = 1; /* accessible by a debugger only */
283#endif
284 int valid_keysym; 308 int valid_keysym;
285 unsigned char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
286 315
287 /* 316 /*
288 * 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
289 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
290 * 319 *
… …
308 Status status_return; 337 Status status_return;
309 338
310#if 0 339#if 0
311#ifdef X_HAVE_UTF8_STRING 340#ifdef X_HAVE_UTF8_STRING
312 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
313 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 342 len = Xutf8LookupString (Input_Context, &ev, kbuf,
314 KBUFSZ, &keysym, &status_return); 343 KBUFSZ, &keysym, &status_return);
315 else 344 else
316#endif 345#endif
317#endif 346#endif
318 { 347 {
… …
355 || status_return == XLookupBoth; 384 || status_return == XLookupBoth;
356 } 385 }
357 else 386 else
358#endif 387#endif
359 { 388 {
360 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 389 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
361 valid_keysym = keysym != NoSymbol; 390 valid_keysym = keysym != NoSymbol;
362 } 391 }
363 392
364 if (valid_keysym) 393 if (valid_keysym)
365 { 394 {
… …
417 scr_move_to (0, 1); 446 scr_move_to (0, 1);
418 return; 447 return;
419 } 448 }
420 else if (keysym == XK_End) 449 else if (keysym == XK_End)
421 { 450 {
422 scr_move_to (1, 0); 451 scr_move_to (1, 1);
423 return; 452 return;
424 } 453 }
425 } 454 }
426#endif 455#endif
427 } 456 }
… …
438 { 467 {
439 switch (keysym) 468 switch (keysym)
440 { 469 {
441 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
442 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
443 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
444 return; 473 return;
445#if TODO 474#if TODO
446 /* rxvt extras */ 475 /* rxvt extras */
447 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
448 change_font (FONT_UP); 477 change_font (FONT_UP);
… …
467 { 496 {
468 commit_iso14755 (); 497 commit_iso14755 ();
469 iso14755buf = ISO_14755_51; 498 iso14755buf = ISO_14755_51;
470# if ISO_14755 499# if ISO_14755
471 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);
472# endif 509# endif
473 return; 510 return;
474 } 511 }
475 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
476 { 513 {
… …
481# endif 518# endif
482 return; 519 return;
483 } 520 }
484 else 521 else
485 { 522 {
486# if ENABLE_OVERLAY 523# if ISO_14755
487 scr_overlay_off (); 524 scr_overlay_off ();
488# endif 525# endif
489 iso14755buf = 0; 526 iso14755buf = 0;
490 } 527 }
491 } 528 }
492 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
493 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
494 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
495 { 532 {
496 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
497# if ENABLE_OVERLAY 534# if ISO_14755
498 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
499 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
500# endif 537# endif
501 } 538 }
502#endif 539#endif
503 540
504#ifdef PRINTPIPE 541#ifdef PRINTPIPE
505 if (keysym == XK_Print) 542 if (keysym == XK_Print)
506 { 543 {
507 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
508 return; 545 return;
… …
510#endif 547#endif
511 548
512 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
513 { 550 {
514 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
515 newlen = 1; 553 newlen = 1;
516 switch (keysym) 554 switch (keysym)
517 { 555 {
518#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
519 case XK_BackSpace: 557 case XK_BackSpace:
… …
522 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
523 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
524 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
525 } 563 }
526 else 564 else
527 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
528 break; 566 break;
529#endif 567#endif
530#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
531# ifdef XK_KP_Prior 569# ifdef XK_KP_Delete
532 case XK_KP_Delete: 570 case XK_KP_Delete:
533 /* allow shift to override */ 571 /* allow shift to override */
534 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 572 if (kp)
535 { 573 {
536 strcpy (kbuf, "\033On"); 574 strcpy (kbuf, "\033On");
537 break; 575 break;
538 } 576 }
539 /* FALLTHROUGH */ 577 /* FALLTHROUGH */
540# endif 578# endif
541 case XK_Delete: 579 case XK_Delete:
542 strcpy (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
543 break; 581 break;
544#endif 582#endif
545 case XK_Tab: 583 case XK_Tab:
546 if (shft) 584 if (shft)
547 strcpy (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
… …
562#ifdef XK_KP_Left 600#ifdef XK_KP_Left
563 case XK_KP_Up: /* \033Ox or standard */ 601 case XK_KP_Up: /* \033Ox or standard */
564 case XK_KP_Down: /* \033Or or standard */ 602 case XK_KP_Down: /* \033Or or standard */
565 case XK_KP_Right: /* \033Ov or standard */ 603 case XK_KP_Right: /* \033Ov or standard */
566 case XK_KP_Left: /* \033Ot or standard */ 604 case XK_KP_Left: /* \033Ot or standard */
567 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 605 if (kp)
568 { 606 {
569 strcpy (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
570 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
571 break; 609 break;
572 } 610 }
… …
595 633
596#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
597# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
598 case XK_KP_Prior: 636 case XK_KP_Prior:
599 /* allow shift to override */ 637 /* allow shift to override */
600 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
601 { 639 {
602 strcpy (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
603 break; 641 break;
604 } 642 }
605 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
… …
608 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
609 break; 647 break;
610# ifdef XK_KP_Next 648# ifdef XK_KP_Next
611 case XK_KP_Next: 649 case XK_KP_Next:
612 /* allow shift to override */ 650 /* allow shift to override */
613 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
614 { 652 {
615 strcpy (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
616 break; 654 break;
617 } 655 }
618 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
… …
621 strcpy (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
622 break; 660 break;
623#endif 661#endif
624 case XK_KP_Enter: 662 case XK_KP_Enter:
625 /* allow shift to override */ 663 /* allow shift to override */
626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
627 { 665 {
628 strcpy (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
629 break; 667 break;
630 } 668 }
631 669
… …
674 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
675 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
676 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
677 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
678 /* allow shift to override */ 716 /* allow shift to override */
679 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
680 { 718 {
681 strcpy (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
682 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
683 } 721 }
684 else 722 else
… …
690 728
691 case XK_Find: 729 case XK_Find:
692 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
693 break; 731 break;
694 732
695#ifdef XK_KP_End 733#ifdef XK_KP_Insert
696 case XK_KP_Insert: 734 case XK_KP_Insert:
697 /* allow shift to override */ 735 /* allow shift to override */
698 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if (kp)
699 { 737 {
700 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
701 break; 739 break;
702 } 740 }
703 /* FALLTHROUGH */ 741 /* FALLTHROUGH */
… …
716 strcpy (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
717 break; 755 break;
718#ifdef XK_KP_End 756#ifdef XK_KP_End
719 case XK_KP_End: 757 case XK_KP_End:
720 /* allow shift to override */ 758 /* allow shift to override */
721 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
722 { 760 {
723 strcpy (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
724 break; 762 break;
725 } 763 }
726 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
… …
729 strcpy (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
730 break; 768 break;
731#ifdef XK_KP_Home 769#ifdef XK_KP_Home
732 case XK_KP_Home: 770 case XK_KP_Home:
733 /* allow shift to override */ 771 /* allow shift to override */
734 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
735 { 773 {
736 strcpy (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
737 break; 775 break;
738 } 776 }
739 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
… …
829 { 867 {
830#ifdef META8_OPTION 868#ifdef META8_OPTION
831 /* set 8-bit on */ 869 /* set 8-bit on */
832 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
833 { 871 {
834 unsigned char *ch; 872 char *ch;
835 873
836 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
837 *ch |= 0x80; 875 *ch |= 0x80;
838 876
839 meta = 0; 877 meta = 0;
… …
841#endif 879#endif
842 /* nil */ ; 880 /* nil */ ;
843 } 881 }
844 } 882 }
845 883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886
846 if (len <= 0) 887 if (len <= 0)
847 return; /* not mapped */ 888 return; /* not mapped */
848 889
849 if (options & Opt_scrollTtyKeypress) 890 if (option (Opt_scrollTtyKeypress))
850 if (view_start) 891 if (view_start)
851 { 892 {
852 view_start = 0; 893 view_start = 0;
853 want_refresh = 1; 894 want_refresh = 1;
854 } 895 }
… …
872#ifdef META8_OPTION 913#ifdef META8_OPTION
873 && meta_char == C0_ESC 914 && meta_char == C0_ESC
874#endif 915#endif
875 ) 916 )
876 { 917 {
877 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
878 tt_write (&ch, 1); 919 tt_write (&ch, 1);
879 } 920 }
880 921
881#if defined(DEBUG_CMD)
882 /* Display keyboard buffer contents */
883 unsigned char *p;
884 int i;
885
886 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
887 for (i = 0, p = kbuf; i < len; i++, p++)
888 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
889 fprintf (stderr, "'\n");
890#endif /* DEBUG_CMD */
891 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
892} 923}
893/*}}} */
894 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ISO_14755
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ISO_14755
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
897/* attempt to `write' count to the input buffer */
898unsigned int 1003unsigned int
899rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
900{ 1005{
901 unsigned int n, s; 1006 unsigned int n, s;
902 1007
903 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
904 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
929 1034
930void 1035void
931rxvt_term::flush () 1036rxvt_term::flush ()
932{ 1037{
933 flush_ev.stop (); 1038 flush_ev.stop ();
934 1039
935#ifdef TRANSPARENT 1040#ifdef HAVE_BG_PIXMAP
936 if (want_full_refresh) 1041 if (bgPixmap.check_clearChanged ())
937 { 1042 {
938 want_full_refresh = 0;
939 scr_clear (); 1043 scr_clear (true);
940 scr_touch (false); 1044 scr_touch (false);
941 } 1045 }
942#endif 1046#endif
943 1047
944 if (want_refresh) 1048 if (want_refresh)
945 { 1049 {
1050 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1051 {
1052 int row = view_start;
1053 int end_row = row + nrow;
1054
1055 while (row > top_row && ROW (row - 1).is_longer ())
1056 --row;
1057
1058 do
1059 {
1060 int start_row = row;
1061 line_t *l;
1062
1063 do
1064 {
1065 l = &ROW (row++);
1066
1067 if (!(l->f & LINE_FILTERED))
1068 {
1069 // line not filtered, mark it as filtered
1070 l->f |= LINE_FILTERED;
1071 while (l->is_longer ())
1072 {
1073 l = &ROW (row++);
1074 l->f |= LINE_FILTERED;
1075 }
1076
1077 // and filter it
1078 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1079
1080 break;
1081 }
1082 }
1083 while (l->is_longer () && row < end_row);
1084 }
1085 while (row < end_row);
1086 }
1087
946 scr_refresh (refresh_type); 1088 scr_refresh ();
947 scrollbar_show (1); 1089 scrollbar_show (1);
948#ifdef USE_XIM 1090#ifdef USE_XIM
949 IMSendSpot (); 1091 IMSendSpot ();
950#endif 1092#endif
951 } 1093 }
… …
954} 1096}
955 1097
956void 1098void
957rxvt_term::check_cb (check_watcher &w) 1099rxvt_term::check_cb (check_watcher &w)
958{ 1100{
959 SET_R (this); 1101 make_current ();
960 SET_LOCALE (locale);
961 1102
962 display->flush (); 1103 display->flush ();
963 1104
964 if (want_refresh && !flush_ev.active) 1105 if (want_refresh && !flush_ev.active)
965 flush_ev.start (NOW + 0.01); 1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
966} 1107}
967 1108
968void 1109void
969rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (time_watcher &w)
970{ 1111{
971 SET_R (this); 1112 make_current ();
972 SET_LOCALE (locale);
973 1113
974 refresh_limit = 1;
975 refresh_count = 0; 1114 refresh_count = 0;
976 flush (); 1115 flush ();
977} 1116}
978 1117
979#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
… …
981rxvt_term::cursor_blink_cb (time_watcher &w) 1120rxvt_term::cursor_blink_cb (time_watcher &w)
982{ 1121{
983 hidden_cursor = !hidden_cursor; 1122 hidden_cursor = !hidden_cursor;
984 want_refresh = 1; 1123 want_refresh = 1;
985 1124
986 w.start (w.at + BLINK_INTERVAL); 1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
987} 1126}
988#endif 1127#endif
989 1128
990#ifdef TEXT_BLINK 1129#ifdef TEXT_BLINK
991void 1130void
… …
1005rxvt_term::cont_scroll_cb (time_watcher &w) 1144rxvt_term::cont_scroll_cb (time_watcher &w)
1006{ 1145{
1007 if ((scrollbar_isUp() || scrollbar_isDn()) && 1146 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1008 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1147 scr_page (scrollbar_isUp() ? UP : DN, 1))
1009 { 1148 {
1010 refresh_type |= SMOOTH_REFRESH;
1011 want_refresh = 1; 1149 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1013 } 1151 }
1014} 1152}
1015#endif 1153#endif
… …
1019rxvt_term::sel_scroll_cb (time_watcher &w) 1157rxvt_term::sel_scroll_cb (time_watcher &w)
1020{ 1158{
1021 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1159 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1022 { 1160 {
1023 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1161 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1024 refresh_type |= SMOOTH_REFRESH;
1025 want_refresh = 1; 1162 want_refresh = 1;
1026 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1027 } 1164 }
1028} 1165}
1029#endif 1166#endif
… …
1034{ 1171{
1035 if (mouse_slip_wheel_speed == 0 1172 if (mouse_slip_wheel_speed == 0
1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1037 : scr_page (UP, mouse_slip_wheel_speed)) 1174 : scr_page (UP, mouse_slip_wheel_speed))
1038 { 1175 {
1039 if (view_start == nsaved || 1176 if (view_start == top_row || view_start == 0)
1040 view_start == 0)
1041 mouse_slip_wheel_speed = 0; 1177 mouse_slip_wheel_speed = 0;
1042 1178
1043 refresh_type |= SMOOTH_REFRESH;
1044 want_refresh = 1; 1179 want_refresh = 1;
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1046 } 1181 }
1047} 1182}
1048#endif 1183#endif
1049 1184
1185#if LINUX_YIELD_HACK
1186static struct event_handler
1187{
1188 check_watcher yield_ev;
1189
1190 void yield_cb (check_watcher &w)
1191 {
1192 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than
1194 // ones with high nice levels is a useful thing to do. It surely is is
1195 // allowed by the sus... as is returning ENOSYS.
1196
1197 struct timespec ts = { 0, 0 };
1198 nanosleep (&ts, 0);
1199
1200 w.stop ();
1201 }
1202
1203 event_handler ()
1204 : yield_ev (this, &event_handler::yield_cb)
1205 {
1206 }
1207} event_handler;
1208#endif
1209
1050bool 1210bool
1051rxvt_term::pty_fill () 1211rxvt_term::pty_fill ()
1052{ 1212{
1053 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1213 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1054 1214
1055 if (CBUFSIZ == n) 1215 if (CBUFSIZ == n)
1056 { 1216 {
1057 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1217 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1058 n = 0; 1218 n = 0;
1059 } 1219 }
1060 1220
1061 memmove (cmdbuf_base, cmdbuf_ptr, n); 1221 memmove (cmdbuf_base, cmdbuf_ptr, n);
1062 cmdbuf_ptr = cmdbuf_base; 1222 cmdbuf_ptr = cmdbuf_base;
1063 cmdbuf_endp = cmdbuf_ptr + n; 1223 cmdbuf_endp = cmdbuf_ptr + n;
1064 1224
1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1225 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1066 1226
1067 if (n > 0) 1227 if (r > 0)
1068 { 1228 {
1069 cmdbuf_endp += n; 1229 cmdbuf_endp += r;
1070 return true; 1230 return true;
1071 } 1231 }
1072 else if (n < 0 && errno != EAGAIN) 1232 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1233 {
1234#if LINUX_YIELD_HACK
1235 if (display->is_local)
1236 event_handler.yield_ev.start ();
1237#endif
1238 }
1239 else
1240 {
1241 pty_ev.stop ();
1242
1243 if (!option (Opt_hold))
1073 destroy (); 1244 destroy ();
1074 1245 }
1246
1075 return false; 1247 return false;
1076} 1248}
1077 1249
1078void 1250void
1079rxvt_term::pty_cb (io_watcher &w, short revents) 1251rxvt_term::pty_cb (io_watcher &w, short revents)
1080{ 1252{
1081 SET_R (this); 1253 make_current ();
1082 SET_LOCALE (locale);
1083 1254
1084 if (revents & EVENT_READ) 1255 if (revents & EVENT_READ)
1085 // loop, but don't allow a single term to monopolize us 1256 // loop, but don't allow a single term to monopolize us
1086 while (pty_fill ()) 1257 while (pty_fill ())
1087 if (cmd_parse ()) 1258 if (cmd_parse ())
… …
1092} 1263}
1093 1264
1094void 1265void
1095rxvt_term::pointer_unblank () 1266rxvt_term::pointer_unblank ()
1096{ 1267{
1097 XDefineCursor (display->display, vt, TermWin_cursor); 1268 XDefineCursor (dpy, vt, TermWin_cursor);
1098 recolour_cursor (); 1269 recolour_cursor ();
1099 1270
1100#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1272 hidden_pointer = 0;
1102 1273
1103 if (options & Opt_pointerBlank) 1274 if (option (Opt_pointerBlank))
1104 pointer_ev.start (NOW + pointerBlankDelay); 1275 pointer_ev.start (NOW + pointerBlankDelay);
1105#endif 1276#endif
1106} 1277}
1107 1278
1108#ifdef POINTER_BLANK 1279#ifdef POINTER_BLANK
1109void 1280void
1110rxvt_term::pointer_blank () 1281rxvt_term::pointer_blank ()
1111{ 1282{
1112 if (! (options & Opt_pointerBlank)) 1283 if (!option (Opt_pointerBlank))
1113 return; 1284 return;
1114 1285
1115 XDefineCursor (display->display, vt, display->blank_cursor); 1286 XDefineCursor (dpy, vt, display->blank_cursor);
1116 XFlush (display->display); 1287 XFlush (dpy);
1117 1288
1118 hidden_pointer = 1; 1289 hidden_pointer = 1;
1119} 1290}
1120 1291
1121void 1292void
1122rxvt_term::pointer_cb (time_watcher &w) 1293rxvt_term::pointer_cb (time_watcher &w)
1123{ 1294{
1124 SET_R (this); 1295 make_current ();
1125 SET_LOCALE (locale);
1126 1296
1127 pointer_blank (); 1297 pointer_blank ();
1128} 1298}
1129#endif 1299#endif
1130 1300
… …
1195 (32 + button_number + key_state), 1365 (32 + button_number + key_state),
1196 (32 + x + 1), 1366 (32 + x + 1),
1197 (32 + y + 1)); 1367 (32 + y + 1));
1198} 1368}
1199 1369
1200#ifdef USING_W11LIB
1201void
1202rxvt_W11_process_x_event (XEvent *ev)
1203{
1204 rxvt_t *r = rxvt_get_r ();
1205
1206 x_cb (*ev);
1207}
1208#endif
1209
1210/*{{{ process an X event */ 1370/*{{{ process an X event */
1211void 1371void
1212rxvt_term::x_cb (XEvent &ev) 1372rxvt_term::x_cb (XEvent &ev)
1213{ 1373{
1214 dDisp; 1374 make_current ();
1215 1375
1216 SET_R (this); 1376 dLocal (Display *, dpy);
1217 SET_LOCALE (locale);
1218 1377
1219#if defined(CURSOR_BLINK) 1378 if (ev.xany.window == vt
1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1379 && SHOULD_INVOKE (HOOK_X_EVENT)
1221 { 1380 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1222 if (hidden_cursor) 1381 return;
1223 {
1224 hidden_cursor = 0;
1225 want_refresh = 1;
1226 }
1227 1382
1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1383 // for XQueryPointer
1229 }
1230#endif
1231
1232#if defined(POINTER_BLANK)
1233 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1234 {
1235 if (ev.type == MotionNotify
1236 || ev.type == ButtonPress
1237 || ev.type == ButtonRelease)
1238 if (hidden_pointer)
1239 pointer_unblank ();
1240
1241 if (ev.type == KeyPress && hidden_pointer == 0)
1242 pointer_blank ();
1243 }
1244#endif
1245
1246 Window unused_root, unused_child; 1384 Window unused_root, unused_child;
1247 int unused_root_x, unused_root_y; 1385 int unused_root_x, unused_root_y;
1248 unsigned int unused_mask; 1386 unsigned int unused_mask;
1249 1387
1250 switch (ev.type) 1388 switch (ev.type)
1251 { 1389 {
1252 case KeyPress: 1390 case KeyPress:
1253#if ISO_14755 1391 key_press (ev.xkey);
1254 if (!(iso14755buf & ISO_14755_52))
1255#endif
1256 lookup_key (ev.xkey);
1257
1258 break; 1392 break;
1259 1393
1260 case KeyRelease: 1394 case KeyRelease:
1261 { 1395 key_release (ev.xkey);
1262#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1263 KeySym ks;
1264
1265 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1266#endif
1267
1268#if ENABLE_FRILLS || ISO_14755
1269 // ISO 14755 support
1270 if (iso14755buf)
1271 if (iso14755buf & ISO_14755_52)
1272 {
1273# if ENABLE_OVERLAY
1274 scr_overlay_off ();
1275# endif
1276# if ISO_14755
1277 // iso14755 part 5.2 handling: release time
1278 // first: controls
1279 if ((ev.xkey.state & ControlMask)
1280 && ((ks >= 0x40 && ks <= 0x5f)
1281 || (ks >= 0x61 && ks <= 0x7f)))
1282 {
1283 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1284 commit_iso14755 ();
1285 return; // case-break;
1286 }
1287
1288 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1289 if (i[0] == ks)
1290 {
1291 iso14755buf = ISO_14755_51 | i[1];
1292 commit_iso14755 ();
1293 return; // case-break;
1294 }
1295
1296 scr_bell ();
1297# endif
1298 iso14755buf = 0;
1299 break;
1300 }
1301 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1302 {
1303# if ENABLE_OVERLAY
1304 scr_overlay_off ();
1305# endif
1306 if (iso14755buf & ISO_14755_51)
1307 commit_iso14755 ();
1308#if ISO_14755
1309 else if (iso14755buf & ISO_14755_STARTED)
1310 {
1311 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1312
1313 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1314 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1315 }
1316# endif
1317 else
1318 iso14755buf = 0;
1319 }
1320#endif
1321
1322#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1323 if (!(ev.xkey.state & ControlMask))
1324 slip_wheel_ev.stop ();
1325 else if (ks == XK_Control_L || ks == XK_Control_R)
1326 mouse_slip_wheel_speed = 0;
1327#endif
1328 break; 1396 break;
1329 }
1330 1397
1331 case ButtonPress: 1398 case ButtonPress:
1332 button_press (ev.xbutton); 1399 button_press (ev.xbutton);
1333 break; 1400 break;
1334 1401
… …
1336 button_release (ev.xbutton); 1403 button_release (ev.xbutton);
1337 break; 1404 break;
1338 1405
1339 case ClientMessage: 1406 case ClientMessage:
1340 if (ev.xclient.format == 32 1407 if (ev.xclient.format == 32
1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1408 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1342 { 1409 {
1410 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1411 {
1412 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1413 {
1343 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1414 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1415 {
1416 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1344 destroy (); 1417 destroy ();
1418 }
1345#if ENABLE_EWMH 1419#if ENABLE_EWMH
1346 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1347 XSendEvent (disp, ev.xclient.window = display->root, 1421 XSendEvent (dpy, ev.xclient.window = display->root,
1348 False, SubstructureRedirectMask | SubstructureNotifyMask, 1422 False, SubstructureRedirectMask | SubstructureNotifyMask,
1349 &ev); 1423 &ev);
1424#endif
1425 }
1426 }
1427#if ENABLE_XEMBED
1428 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1429 {
1430 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1431 focus_in ();
1432 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1433 focus_out ();
1434 }
1350#endif 1435#endif
1351 } 1436 }
1352#if ENABLE_XEMBED
1353 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1354 {
1355 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1356 focus_in ();
1357 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1358 focus_out ();
1359 }
1360#endif
1361#ifdef OFFIX_DND
1362 /* OffiX Dnd (drag 'n' drop) protocol */
1363 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1364 && (ev.xclient.data.l[0] == DndFile
1365 || ev.xclient.data.l[0] == DndDir
1366 || ev.xclient.data.l[0] == DndLink))
1367 {
1368 /* Get Dnd data */
1369 Atom ActualType;
1370 int ActualFormat;
1371 unsigned char *data;
1372 unsigned long Size, RemainingBytes;
1373
1374 XGetWindowProperty (disp, display->root,
1375 xa[XA_DNDSELECTION],
1376 0L, 1000000L,
1377 False, AnyPropertyType,
1378 &ActualType, &ActualFormat,
1379 &Size, &RemainingBytes,
1380 &data);
1381 set_string_property (XA_CUT_BUFFER0, data);
1382 XFree (data);
1383 selection_paste (display->root, XA_CUT_BUFFER0, true);
1384 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1385 }
1386#endif /* OFFIX_DND */
1387 break;
1388
1389 case MappingNotify:
1390 XRefreshKeyboardMapping (&ev.xmapping);
1391 break; 1437 break;
1392 1438
1393 /* 1439 /*
1394 * XXX: this is not the _current_ arrangement 1440 * XXX: this is not the _current_ arrangement
1395 * Here's my conclusion: 1441 * Here's my conclusion:
… …
1414 break; 1460 break;
1415 } 1461 }
1416 break; 1462 break;
1417 1463
1418 case FocusIn: 1464 case FocusIn:
1465 if (ev.xfocus.detail != NotifyInferior
1466 && ev.xfocus.detail != NotifyPointer
1467 && ev.xfocus.mode != NotifyGrab)
1419 focus_in (); 1468 focus_in ();
1420 break; 1469 break;
1421 1470
1422 case FocusOut: 1471 case FocusOut:
1472 if (ev.xfocus.detail != NotifyInferior
1473 && ev.xfocus.detail != NotifyPointer
1474 && ev.xfocus.mode != NotifyGrab)
1423 focus_out (); 1475 focus_out ();
1424 break; 1476 break;
1425 1477
1426 case ConfigureNotify: 1478 case ConfigureNotify:
1479 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1480 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1481 szHint.width, szHint.height); */
1427 if (ev.xconfigure.window == parent[0]) 1482 if (ev.xconfigure.window == parent[0])
1428 { 1483 {
1429 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1430 ; 1485 ;
1431 1486
1432 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1433 { 1488 {
1434 seen_resize = 1; 1489 seen_resize = 1;
1435 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1436 } 1491 }
1437 1492 else
1438#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1493 {
1439 if (options & Opt_transparent) 1494#ifdef HAVE_BG_PIXMAP
1440 check_our_parents (); 1495 if (bgPixmap.window_position_sensitive ())
1496 update_background ();
1441#endif 1497#endif
1498 }
1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1442 } 1500 }
1443 break; 1501 break;
1444 1502
1445 case PropertyNotify: 1503 case PropertyNotify:
1504 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1446 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1505 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1447 && ev.xproperty.state == PropertyNewValue) 1506 && ev.xproperty.state == PropertyNewValue)
1448 selection_property (ev.xproperty.window, ev.xproperty.atom); 1507 selection_property (ev.xproperty.window, ev.xproperty.atom);
1449 1508
1450 break; 1509 break;
1451 1510
1452 case SelectionClear: 1511 case SelectionClear:
1453 selection_clear (); 1512 selection_clear ();
… …
1458 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1517 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1459 break; 1518 break;
1460 1519
1461 case SelectionRequest: 1520 case SelectionRequest:
1462 selection_send (ev.xselectionrequest); 1521 selection_send (ev.xselectionrequest);
1522 break;
1523
1524 case MapNotify:
1525 mapped = 1;
1526#ifdef TEXT_BLINK
1527 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1528#endif
1529 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1463 break; 1530 break;
1464 1531
1465 case UnmapNotify: 1532 case UnmapNotify:
1466 mapped = 0; 1533 mapped = 0;
1467#ifdef TEXT_BLINK 1534#ifdef TEXT_BLINK
1468 text_blink_ev.stop (); 1535 text_blink_ev.stop ();
1469#endif 1536#endif
1537 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1470 break; 1538 break;
1471
1472 case MapNotify:
1473 mapped = 1;
1474#ifdef TEXT_BLINK
1475 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1476#endif
1477 break;
1478
1479#ifdef TRANSPARENT
1480 case ReparentNotify:
1481 rootwin_cb (ev);
1482 break;
1483#endif /* TRANSPARENT */
1484 1539
1485 case GraphicsExpose: 1540 case GraphicsExpose:
1486 case Expose: 1541 case Expose:
1487 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1488 { 1543 {
1489 do 1544 do
1545 {
1490 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1491 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1548 }
1492 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1493 1550
1494 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1495 1552
1496 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1554 {
1497 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1498 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, False);
1499 1557 }
1500 scr_refresh (refresh_type); 1558 want_refresh = 1;
1501 } 1559 }
1502 else 1560 else
1503 { 1561 {
1504 XEvent unused_event; 1562 XEvent unused_event;
1505 1563
1506 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1564 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1507 ; 1565 ;
1508 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1566 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1509 ; 1567 ;
1510 1568
1511 if (isScrollbarWindow (ev.xany.window)) 1569 if (isScrollbarWindow (ev.xany.window))
1512 { 1570 {
1513 scrollBar.setIdle (); 1571 scrollBar.setIdle ();
1514 scrollbar_show (0); 1572 scrollbar_show (0);
1515 } 1573 }
1516#ifdef MENUBAR
1517 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1518 menubar_expose ();
1519#endif
1520
1521#ifdef TRANSPARENT
1522 if (am_transparent && ev.xany.window == parent[0])
1523 XClearWindow (disp, ev.xany.window);
1524#endif
1525 } 1574 }
1526 break; 1575 break;
1527 1576
1528 case MotionNotify: 1577 case MotionNotify:
1529#ifdef POINTER_BLANK 1578#ifdef POINTER_BLANK
1530 if (hidden_pointer) 1579 if (hidden_pointer)
1531 pointer_unblank (); 1580 pointer_unblank ();
1532#endif 1581#endif
1533#if MENUBAR
1534 if (isMenuBarWindow (ev.xany.window))
1535 {
1536 menubar_control (ev.xbutton);
1537 break;
1538 }
1539#endif
1540 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1582 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1541 break; 1583 break;
1542 1584
1543 if (ev.xany.window == vt) 1585 if (ev.xany.window == vt)
1544 { 1586 {
1587 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1588 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1589 ; // nop
1545 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1590 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1546 { 1591 {
1547 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1592 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1548 ; 1593 ;
1549 1594
1550 XQueryPointer (disp, vt, 1595 XQueryPointer (dpy, vt,
1551 &unused_root, &unused_child, 1596 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1597 &unused_root_x, &unused_root_y,
1553 &ev.xbutton.x, &ev.xbutton.y, 1598 &ev.xbutton.x, &ev.xbutton.y,
1554 &ev.xbutton.state); 1599 &ev.xbutton.state);
1555#ifdef MOUSE_THRESHOLD 1600#ifdef MOUSE_THRESHOLD
… …
1619#endif 1664#endif
1620 } 1665 }
1621 } 1666 }
1622 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1667 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1623 { 1668 {
1624 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1669 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1625 MotionNotify, &ev)) 1670 MotionNotify, &ev))
1626 ; 1671 ;
1627 1672
1628 XQueryPointer (disp, scrollBar.win, 1673 XQueryPointer (dpy, scrollBar.win,
1629 &unused_root, &unused_child, 1674 &unused_root, &unused_child,
1630 &unused_root_x, &unused_root_y, 1675 &unused_root_x, &unused_root_y,
1631 &ev.xbutton.x, &ev.xbutton.y, 1676 &ev.xbutton.x, &ev.xbutton.y,
1632 &unused_mask); 1677 &unused_mask);
1633 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1634 scrollbar_size ()); 1679 scrollbar_size ());
1635 scr_refresh (refresh_type);
1636 refresh_limit = 0; 1680 want_refresh = 1;
1637 scrollbar_show (1); 1681 scrollbar_show (1);
1638 } 1682 }
1639 break; 1683 break;
1640 } 1684 }
1685
1686#if defined(CURSOR_BLINK)
1687 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1688 {
1689 if (hidden_cursor)
1690 {
1691 hidden_cursor = 0;
1692 want_refresh = 1;
1693 }
1694
1695 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1696 }
1697#endif
1698
1699#if defined(POINTER_BLANK)
1700 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1701 {
1702 if (ev.type == MotionNotify
1703 || ev.type == ButtonPress
1704 || ev.type == ButtonRelease)
1705 if (hidden_pointer)
1706 pointer_unblank ();
1707
1708 if (ev.type == KeyPress && hidden_pointer == 0)
1709 pointer_blank ();
1710 }
1711#endif
1641} 1712}
1642 1713
1643void 1714void
1644rxvt_term::focus_in () 1715rxvt_term::focus_in ()
1645{ 1716{
1646 if (!focus) 1717 if (!focus)
1647 { 1718 {
1648 focus = 1; 1719 focus = 1;
1649 want_refresh = 1; 1720 want_refresh = 1;
1721
1722 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1723
1650#if USE_XIM 1724#if USE_XIM
1651 if (Input_Context != NULL) 1725 if (Input_Context != NULL)
1652 { 1726 {
1653 IMSetStatusPosition (); 1727 IMSetPosition ();
1654 XSetICFocus (Input_Context); 1728 XSetICFocus (Input_Context);
1655 } 1729 }
1656#endif 1730#endif
1657#if CURSOR_BLINK 1731#if CURSOR_BLINK
1658 if (options & Opt_cursorBlink) 1732 if (option (Opt_cursorBlink))
1659 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1733 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1660#endif 1734#endif
1661#if OFF_FOCUS_FADING 1735#if OFF_FOCUS_FADING
1662 if (rs[Rs_fade]) 1736 if (rs[Rs_fade])
1663 { 1737 {
1664 pix_colors = pix_colors_focused; 1738 pix_colors = pix_colors_focused;
1665 scr_recolour (); 1739 scr_recolour ();
1666 } 1740 }
1667#endif 1741#endif
1742#if ENABLE_FRILLS
1743 if (option (Opt_urgentOnBell))
1744 {
1745 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1746 {
1747 h->flags &= ~XUrgencyHint;
1748 XSetWMHints (dpy, parent[0], h);
1749 }
1750 }
1751#endif
1668 } 1752 }
1669} 1753}
1670 1754
1671void 1755void
1672rxvt_term::focus_out () 1756rxvt_term::focus_out ()
… …
1674 if (focus) 1758 if (focus)
1675 { 1759 {
1676 focus = 0; 1760 focus = 0;
1677 want_refresh = 1; 1761 want_refresh = 1;
1678 1762
1763 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764
1679#if ENABLE_FRILLS || ISO_14755 1765#if ENABLE_FRILLS || ISO_14755
1766 if (iso14755buf)
1767 {
1680 iso14755buf = 0; 1768 iso14755buf = 0;
1681#endif 1769# if ISO_14755
1682#if ENABLE_OVERLAY
1683 scr_overlay_off (); 1770 scr_overlay_off ();
1771# endif
1772 }
1684#endif 1773#endif
1685#if USE_XIM 1774#if USE_XIM
1686 if (Input_Context != NULL) 1775 if (Input_Context != NULL)
1687 XUnsetICFocus (Input_Context); 1776 XUnsetICFocus (Input_Context);
1688#endif 1777#endif
1689#if CURSOR_BLINK 1778#if CURSOR_BLINK
1690 if (options & Opt_cursorBlink) 1779 if (option (Opt_cursorBlink))
1691 cursor_blink_ev.stop (); 1780 cursor_blink_ev.stop ();
1692 hidden_cursor = 0; 1781 hidden_cursor = 0;
1693#endif 1782#endif
1694#if OFF_FOCUS_FADING 1783#if OFF_FOCUS_FADING
1695 if (rs[Rs_fade]) 1784 if (rs[Rs_fade])
… …
1699 } 1788 }
1700#endif 1789#endif
1701 } 1790 }
1702} 1791}
1703 1792
1704#if TRANSPARENT 1793void
1794rxvt_term::update_fade_color (unsigned int idx)
1795{
1796#if OFF_FOCUS_FADING
1797 if (rs[Rs_fade])
1798 {
1799 rgba c;
1800 pix_colors [Color_fade].get (c);
1801 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1802 }
1803#endif
1804}
1805
1806#if ENABLE_TRANSPARENCY || ENABLE_PERL
1705void 1807void
1706rxvt_term::rootwin_cb (XEvent &ev) 1808rxvt_term::rootwin_cb (XEvent &ev)
1707{ 1809{
1708 SET_R (this); 1810 make_current ();
1709 SET_LOCALE (locale);
1710 1811
1812 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1813 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1814 return;
1815
1816# if ENABLE_TRANSPARENCY
1711 switch (ev.type) 1817 switch (ev.type)
1712 { 1818 {
1713 case PropertyNotify: 1819 case PropertyNotify:
1714 /* 1820 /*
1715 * if user used some Esetroot compatible prog to set the root bg, 1821 * if user used some Esetroot compatible prog to set the root bg,
1716 * use the property to determine the pixmap. We use it later on. 1822 * use the property to determine the pixmap. We use it later on.
1717 */ 1823 */
1718 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1824 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1719 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1825 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1720 return; 1826 {
1721 1827 bgPixmap.set_root_pixmap ();
1722 /* FALLTHROUGH */ 1828 update_background ();
1723 case ReparentNotify: 1829 }
1724 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1725 want_refresh = want_full_refresh = 1;
1726 break; 1830 break;
1727 } 1831 }
1832# endif
1728} 1833}
1729#endif 1834#endif
1730 1835
1731void 1836void
1732rxvt_term::button_press (XButtonEvent &ev) 1837rxvt_term::button_press (XButtonEvent &ev)
1733{ 1838{
1734 int reportmode = 0, clickintime; 1839 int reportmode = 0, clickintime;
1735 1840
1736 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1841 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1842
1737 if (!bypass_keystate) 1843 if (!bypass_keystate)
1738 reportmode = !! (priv_modes & PrivMode_mouse_report); 1844 reportmode = !! (priv_modes & PrivMode_mouse_report);
1739 1845
1740 /* 1846 /*
1741 * VT window processing of button press 1847 * VT window processing of button press
1742 */ 1848 */
1743 if (ev.window == vt) 1849 if (ev.window == vt)
1744 { 1850 {
1851 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1852 return;
1853
1745#if ISO_14755 1854#if ISO_14755
1746 // 5.4 1855 // 5.4
1747 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1856 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1748 { 1857 {
1749 iso14755_54 (ev.x, ev.y); 1858 iso14755_54 (ev.x, ev.y);
… …
1761#ifdef MOUSE_REPORT_DOUBLECLICK 1870#ifdef MOUSE_REPORT_DOUBLECLICK
1762 if (ev.button == MEvent.button && clickintime) 1871 if (ev.button == MEvent.button && clickintime)
1763 { 1872 {
1764 /* same button, within alloted time */ 1873 /* same button, within alloted time */
1765 MEvent.clicks++; 1874 MEvent.clicks++;
1875
1766 if (MEvent.clicks > 1) 1876 if (MEvent.clicks > 1)
1767 { 1877 {
1768 /* only report double clicks */ 1878 /* only report double clicks */
1769 MEvent.clicks = 2; 1879 MEvent.clicks = 2;
1770 mouse_report (ev); 1880 mouse_report (ev);
… …
1802#else 1912#else
1803 selection.rect = false; 1913 selection.rect = false;
1804#endif 1914#endif
1805 1915
1806 /* allow shift+left click to extend selection */ 1916 /* allow shift+left click to extend selection */
1807 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1917 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1808 { 1918 {
1809 if (MEvent.button == Button1 && clickintime) 1919 if (MEvent.button == Button1 && clickintime)
1810 selection_rotate (ev.x, ev.y); 1920 selection_rotate (ev.x, ev.y);
1811 else 1921 else
1812 selection_extend (ev.x, ev.y, 1); 1922 selection_extend (ev.x, ev.y, 1);
… …
1977 } 2087 }
1978 2088
1979 break; 2089 break;
1980 } 2090 }
1981 } 2091 }
2092
1982 return; 2093 return;
1983 } 2094 }
1984#if MENUBAR
1985 /*
1986 * Menubar window processing of button press
1987 */
1988 if (isMenuBarWindow (ev.window))
1989 menubar_control (ev);
1990#endif
1991} 2095}
1992 2096
1993void 2097void
1994rxvt_term::button_release (XButtonEvent &ev) 2098rxvt_term::button_release (XButtonEvent &ev)
1995{ 2099{
… …
2001 2105
2002 if (scrollbar_isUpDn ()) 2106 if (scrollbar_isUpDn ())
2003 { 2107 {
2004 scrollBar.setIdle (); 2108 scrollBar.setIdle ();
2005 scrollbar_show (0); 2109 scrollbar_show (0);
2006#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2007 refresh_type &= ~SMOOTH_REFRESH;
2008#endif
2009 } 2110 }
2010 2111
2011#ifdef SELECTION_SCROLLING 2112#ifdef SELECTION_SCROLLING
2012 if (sel_scroll_ev.active) 2113 if (sel_scroll_ev.active)
2013 sel_scroll_ev.stop(); 2114 sel_scroll_ev.stop();
2014#endif 2115#endif
2015 2116
2016 if (ev.window == vt) 2117 if (ev.window == vt)
2017 { 2118 {
2119 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2120 return;
2121
2018#if ISO_14755 2122#if ISO_14755
2019 // 5.4 2123 // 5.4
2020 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2124 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2021 return; 2125 return;
2022#endif 2126#endif
2127
2023 if (reportmode) 2128 if (reportmode)
2024 { 2129 {
2025 /* mouse report from vt window */ 2130 /* mouse report from vt window */
2026 /* don't report release of wheel "buttons" */ 2131 /* don't report release of wheel "buttons" */
2027 if (ev.button >= 4) 2132 if (ev.button >= 4)
… …
2057 { 2162 {
2058 case Button1: 2163 case Button1:
2059 case Button3: 2164 case Button3:
2060 selection_make (ev.time); 2165 selection_make (ev.time);
2061 break; 2166 break;
2167
2062 case Button2: 2168 case Button2:
2063 selection_request (ev.time, ev.x, ev.y); 2169 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2170 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2064 break; 2171 break;
2172
2065#ifdef MOUSE_WHEEL 2173#ifdef MOUSE_WHEEL
2066 case Button4: 2174 case Button4:
2067 case Button5: 2175 case Button5:
2068 { 2176 {
2069 int i; 2177 int i;
… …
2071 2179
2072 v = ev.button == Button4 ? UP : DN; 2180 v = ev.button == Button4 ? UP : DN;
2073 2181
2074 if (ev.state & ShiftMask) 2182 if (ev.state & ShiftMask)
2075 i = 1; 2183 i = 1;
2076 else if (options & Opt_mouseWheelScrollPage) 2184 else if (option (Opt_mouseWheelScrollPage))
2077 i = nrow - 1; 2185 i = nrow - 1;
2078 else 2186 else
2079 i = 5; 2187 i = 5;
2080 2188
2081# ifdef MOUSE_SLIP_WHEELING 2189# ifdef MOUSE_SLIP_WHEELING
… …
2091 slip_wheel_ev.start (); 2199 slip_wheel_ev.start ();
2092 } 2200 }
2093 else 2201 else
2094 { 2202 {
2095# endif 2203# endif
2096# ifdef JUMP_MOUSE_WHEEL
2097 scr_page (v, i); 2204 scr_page (v, i);
2098 scr_refresh (SMOOTH_REFRESH);
2099 scrollbar_show (1); 2205 scrollbar_show (1);
2100# else
2101 while (i--)
2102 {
2103 scr_page (v, 1);
2104 scr_refresh (SMOOTH_REFRESH);
2105 scrollbar_show (1);
2106 }
2107# endif
2108# ifdef MOUSE_SLIP_WHEELING 2206# ifdef MOUSE_SLIP_WHEELING
2109 } 2207 }
2110#endif 2208# endif
2111 } 2209 }
2112 break; 2210 break;
2113#endif 2211#endif
2114 } 2212 }
2115 } 2213 }
2116#ifdef MENUBAR
2117 else if (isMenuBarWindow (ev.window))
2118 menubar_control (ev);
2119#endif
2120} 2214}
2121
2122#ifdef TRANSPARENT
2123#if TINTING
2124/* taken from aterm-0.4.2 */
2125
2126typedef uint32_t RUINT32T;
2127
2128void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2129{
2130 int sh_r, sh_g, sh_b;
2131 RUINT32T mask_r, mask_g, mask_b;
2132 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2133 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2134 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2135 int i;
2136
2137 Visual *visual = display->visual;
2138
2139 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2140
2141 /* for convenience */
2142 mask_r = visual->red_mask;
2143 mask_g = visual->green_mask;
2144 mask_b = visual->blue_mask;
2145
2146 /* boring lookup table pre-initialization */
2147 switch (srcImage->bits_per_pixel) {
2148 case 15:
2149 if ((mask_r != 0x7c00) ||
2150 (mask_g != 0x03e0) ||
2151 (mask_b != 0x001f))
2152 return;
2153 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2154 lookup_r = lookup;
2155 lookup_g = lookup+32;
2156 lookup_b = lookup+32+32;
2157 sh_r = 10;
2158 sh_g = 5;
2159 sh_b = 0;
2160 break;
2161 case 16:
2162 if ((mask_r != 0xf800) ||
2163 (mask_g != 0x07e0) ||
2164 (mask_b != 0x001f))
2165 return;
2166 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2167 lookup_r = lookup;
2168 lookup_g = lookup+32;
2169 lookup_b = lookup+32+64;
2170 sh_r = 11;
2171 sh_g = 5;
2172 sh_b = 0;
2173 break;
2174 case 24:
2175 if ((mask_r != 0xff0000) ||
2176 (mask_g != 0x00ff00) ||
2177 (mask_b != 0x0000ff))
2178 return;
2179 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2180 lookup_r = lookup;
2181 lookup_g = lookup+256;
2182 lookup_b = lookup+256+256;
2183 sh_r = 16;
2184 sh_g = 8;
2185 sh_b = 0;
2186 break;
2187 case 32:
2188 if ((mask_r != 0xff0000) ||
2189 (mask_g != 0x00ff00) ||
2190 (mask_b != 0x0000ff))
2191 return;
2192 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2193 lookup_r = lookup;
2194 lookup_g = lookup+256;
2195 lookup_b = lookup+256+256;
2196 sh_r = 16;
2197 sh_g = 8;
2198 sh_b = 0;
2199 break;
2200 default:
2201 return; /* we do not support this color depth */
2202 }
2203
2204 /* prepare limits for color transformation (each channel is handled separately) */
2205 if (shade < 0) {
2206 shade = -shade;
2207 if (shade < 0) shade = 0;
2208 if (shade > 100) shade = 100;
2209
2210 lower_lim_r = 65535-rm;
2211 lower_lim_g = 65535-gm;
2212 lower_lim_b = 65535-bm;
2213
2214 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2215 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2216 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2217
2218 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2219 } else {
2220 if (shade < 0) shade = 0;
2221 if (shade > 100) shade = 100;
2222
2223 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2224
2225 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2226 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2227 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2228 }
2229
2230 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2231 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2232 {
2233 unsigned int tmp;
2234
2235 tmp = lower_lim_r;
2236 lower_lim_r = lower_lim_b;
2237 lower_lim_b = tmp;
2238
2239 tmp = upper_lim_r;
2240 upper_lim_r = upper_lim_b;
2241 upper_lim_b = tmp;
2242 }
2243
2244 /* fill our lookup tables */
2245 for (i = 0; i <= mask_r>>sh_r; i++)
2246 {
2247 RUINT32T tmp;
2248 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2249 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2250 lookup_r[i] = (tmp/65535)<<sh_r;
2251 }
2252 for (i = 0; i <= mask_g>>sh_g; i++)
2253 {
2254 RUINT32T tmp;
2255 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2256 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2257 lookup_g[i] = (tmp/65535)<<sh_g;
2258 }
2259 for (i = 0; i <= mask_b>>sh_b; i++)
2260 {
2261 RUINT32T tmp;
2262 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2263 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2264 lookup_b[i] = (tmp/65535)<<sh_b;
2265 }
2266
2267 /* apply table to input image (replacing colors by newly calculated ones) */
2268 switch (srcImage->bits_per_pixel)
2269 {
2270 case 15:
2271 {
2272 unsigned short *p1, *pf, *p, *pl;
2273 p1 = (unsigned short *) srcImage->data;
2274 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2275 while (p1 < pf)
2276 {
2277 p = p1;
2278 pl = p1 + srcImage->width;
2279 for (; p < pl; p++)
2280 {
2281 *p = lookup_r[(*p & 0x7c00)>>10] |
2282 lookup_g[(*p & 0x03e0)>> 5] |
2283 lookup_b[(*p & 0x001f)];
2284 }
2285 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2286 }
2287 break;
2288 }
2289 case 16:
2290 {
2291 unsigned short *p1, *pf, *p, *pl;
2292 p1 = (unsigned short *) srcImage->data;
2293 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2294 while (p1 < pf)
2295 {
2296 p = p1;
2297 pl = p1 + srcImage->width;
2298 for (; p < pl; p++)
2299 {
2300 *p = lookup_r[(*p & 0xf800)>>11] |
2301 lookup_g[(*p & 0x07e0)>> 5] |
2302 lookup_b[(*p & 0x001f)];
2303 }
2304 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2305 }
2306 break;
2307 }
2308 case 24:
2309 {
2310 unsigned char *p1, *pf, *p, *pl;
2311 p1 = (unsigned char *) srcImage->data;
2312 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2313 while (p1 < pf)
2314 {
2315 p = p1;
2316 pl = p1 + srcImage->width * 3;
2317 for (; p < pl; p += 3)
2318 {
2319 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2320 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2321 p[2] = lookup_r[(p[2] & 0x0000ff)];
2322 }
2323 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2324 }
2325 break;
2326 }
2327 case 32:
2328 {
2329 RUINT32T *p1, *pf, *p, *pl;
2330 p1 = (RUINT32T *) srcImage->data;
2331 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2332
2333 while (p1 < pf)
2334 {
2335 p = p1;
2336 pl = p1 + srcImage->width;
2337 for (; p < pl; p++)
2338 {
2339 *p = lookup_r[(*p & 0xff0000)>>16] |
2340 lookup_g[(*p & 0x00ff00)>> 8] |
2341 lookup_b[(*p & 0x0000ff)] |
2342 (*p & ~0xffffff);
2343 }
2344 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2345 }
2346 break;
2347 }
2348 }
2349
2350 free (lookup);
2351}
2352#endif
2353
2354/*
2355 * Check our parents are still who we think they are.
2356 * Do transparency updates if required
2357 */
2358int
2359rxvt_term::check_our_parents ()
2360{
2361 int i, pchanged, aformat, have_pixmap, rootdepth;
2362 unsigned long nitems, bytes_after;
2363 Atom atype;
2364 unsigned char *prop = NULL;
2365 Window root, oldp, *list;
2366 Pixmap rootpixmap = None;
2367 XWindowAttributes wattr, wrootattr;
2368 dDisp;
2369
2370 pchanged = 0;
2371
2372 if (!(options & Opt_transparent))
2373 return pchanged; /* Don't try any more */
2374
2375 XGetWindowAttributes (disp, display->root, &wrootattr);
2376 rootdepth = wrootattr.depth;
2377
2378 XGetWindowAttributes (disp, parent[0], &wattr);
2379
2380 if (rootdepth != wattr.depth)
2381 {
2382 if (am_transparent)
2383 {
2384 pchanged = 1;
2385 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2386 am_transparent = am_pixmap_trans = 0;
2387 }
2388
2389 return pchanged; /* Don't try any more */
2390 }
2391
2392 /* Get all X ops out of the queue so that our information is up-to-date. */
2393 XSync (disp, False);
2394
2395 /*
2396 * Make the frame window set by the window manager have
2397 * the root background. Some window managers put multiple nested frame
2398 * windows for each client, so we have to take care about that.
2399 */
2400 i = (xa[XA_XROOTPMAP_ID]
2401 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2402 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2403 &nitems, &bytes_after, &prop) == Success);
2404
2405 if (!i || prop == NULL)
2406 i = (xa[XA_ESETROOT_PMAP_ID]
2407 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2408 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2409 &nitems, &bytes_after, &prop) == Success);
2410
2411 if (!i || prop == NULL
2412#if TINTING
2413 || !rs[Rs_color + Color_tint]
2414#endif
2415 )
2416 have_pixmap = 0;
2417 else
2418 {
2419 have_pixmap = 1;
2420 rootpixmap = *(Pixmap *)prop;
2421 XFree (prop);
2422 }
2423
2424 if (have_pixmap)
2425 {
2426 /*
2427 * Copy display->root pixmap transparency
2428 */
2429 int sx, sy, nx, ny;
2430 unsigned int nw, nh;
2431 Window cr;
2432 XImage *image;
2433 GC gc;
2434 XGCValues gcvalue;
2435
2436 XTranslateCoordinates (disp, parent[0], display->root,
2437 0, 0, &sx, &sy, &cr);
2438 nw = (unsigned int)szHint.width;
2439 nh = (unsigned int)szHint.height;
2440 nx = ny = 0;
2441
2442 if (sx < 0)
2443 {
2444 nw += sx;
2445 nx = -sx;
2446 sx = 0;
2447 }
2448
2449 if (sy < 0)
2450 {
2451 nh += sy;
2452 ny = -sy;
2453 sy = 0;
2454 }
2455
2456 min_it (nw, (unsigned int) (wrootattr.width - sx));
2457 min_it (nh, (unsigned int) (wrootattr.height - sy));
2458
2459 XSync (disp, False);
2460 allowedxerror = -1;
2461 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2462
2463 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2464 /* XXX: may need a delay here? */
2465 allowedxerror = 0;
2466
2467 if (image == NULL)
2468 {
2469 if (am_transparent && am_pixmap_trans)
2470 {
2471 pchanged = 1;
2472 if (pixmap != None)
2473 {
2474 XFreePixmap (disp, pixmap);
2475 pixmap = None;
2476 }
2477 }
2478
2479 am_pixmap_trans = 0;
2480 }
2481 else
2482 {
2483 if (pixmap != None)
2484 XFreePixmap (disp, pixmap);
2485
2486#if TINTING
2487 if (ISSET_PIXCOLOR (Color_tint))
2488 {
2489 unsigned short rm, gm, bm;
2490 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2491
2492 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2493
2494 ShadeXImage (display, image, shade, rm, gm, bm);
2495 }
2496#endif
2497
2498 pixmap = XCreatePixmap (disp, vt,
2499 szHint.width, szHint.height, image->depth);
2500 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2501 XPutImage (disp, pixmap, gc, image, 0, 0,
2502 nx, ny, image->width, image->height);
2503 XFreeGC (disp, gc);
2504 XDestroyImage (image);
2505 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2506 XClearWindow (disp, parent[0]);
2507
2508 if (!am_transparent || !am_pixmap_trans)
2509 pchanged = 1;
2510
2511 am_transparent = am_pixmap_trans = 1;
2512 }
2513 }
2514
2515 if (am_pixmap_trans)
2516 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2517 else
2518 {
2519 unsigned int n;
2520 /*
2521 * InheritPixmap transparency
2522 */
2523 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2524 {
2525 oldp = parent[i];
2526 XQueryTree (disp, parent[i - 1], &root,
2527 &parent[i], &list, &n);
2528 XFree (list);
2529
2530 if (parent[i] == display->root)
2531 {
2532 if (oldp != None)
2533 pchanged = 1;
2534
2535 break;
2536 }
2537
2538 if (oldp != parent[i])
2539 pchanged = 1;
2540 }
2541
2542 n = 0;
2543
2544 if (pchanged)
2545 {
2546 for (; n < (unsigned int)i; n++)
2547 {
2548 XGetWindowAttributes (disp, parent[n], &wattr);
2549 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2550 {
2551 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2552 break;
2553 }
2554 }
2555 }
2556
2557 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2558 {
2559 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2560 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2561 am_transparent = 0;
2562 /* XXX: also turn off Opt_transparent? */
2563 }
2564 else
2565 {
2566#if WAIT_FOR_WM
2567 /* wait (an arbitrary period) for the WM to do its thing
2568 * needed for fvwm2.2.2 (and before?) */
2569 sleep (1);
2570#endif
2571 for (n = 0; n < (unsigned int)i; n++)
2572 {
2573 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2574 XClearWindow (disp, parent[n]);
2575 }
2576
2577 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2578 am_transparent = 1;
2579 }
2580
2581 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 parent[i] = None;
2583 }
2584
2585 if (scrollBar.win)
2586 {
2587 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2588 scrollBar.setIdle ();
2589 scrollbar_show (0);
2590 }
2591
2592 if (am_transparent)
2593 {
2594 want_refresh = want_full_refresh = 1;
2595 if (am_pixmap_trans)
2596 flush ();
2597 }
2598
2599 return pchanged;
2600}
2601#endif
2602 2215
2603/*}}} */ 2216/*}}} */
2604 2217
2605bool 2218bool
2606rxvt_term::cmd_parse () 2219rxvt_term::cmd_parse ()
2607{ 2220{
2608 bool flag = false; 2221 bool flag = false;
2609 unicode_t ch = NOCHAR; 2222 wchar_t ch = NOCHAR;
2610 unsigned char *seq_begin; // remember start of esc-sequence here 2223 char *seq_begin; // remember start of esc-sequence here
2611 2224
2612 for (;;) 2225 for (;;)
2613 { 2226 {
2614 if (ch == NOCHAR) 2227 if (ch == NOCHAR)
2615 { 2228 {
2616 seq_begin = cmdbuf_ptr; 2229 seq_begin = cmdbuf_ptr;
2617 ch = next_char (); 2230 ch = next_char ();
2618 }
2619 2231
2620 if (ch == NOCHAR) // TODO: improve 2232 if (ch == NOCHAR)
2621 break; 2233 break;
2234 }
2622 2235
2623 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2236 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2624 { 2237 {
2625 if (!seen_input) 2238 if (!seen_input)
2626 { 2239 {
… …
2635 if (seen_resize && cmd_pid) 2248 if (seen_resize && cmd_pid)
2636 kill (-cmd_pid, SIGWINCH); 2249 kill (-cmd_pid, SIGWINCH);
2637 } 2250 }
2638 2251
2639 /* Read a text string from the input buffer */ 2252 /* Read a text string from the input buffer */
2640 unicode_t buf[UBUFSIZ]; 2253 wchar_t buf[UBUFSIZ];
2641 bool refreshnow = false; 2254 bool refreshnow = false;
2642 int nlines = 0; 2255 int nlines = 0;
2643 unicode_t *str = buf; 2256 wchar_t *str = buf;
2644 unicode_t *eol = str + min (ncol, UBUFSIZ); 2257 wchar_t *eol = str + min (ncol, UBUFSIZ);
2645 2258
2646 for (;;) 2259 for (;;)
2647 { 2260 {
2648 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2261 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2649 break; 2262 break;
… …
2655 if (ch == C0_LF) 2268 if (ch == C0_LF)
2656 nlines++; 2269 nlines++;
2657 2270
2658 refresh_count++; 2271 refresh_count++;
2659 2272
2660 if (!(options & Opt_jumpScroll) 2273 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2661 || (refresh_count >= refresh_limit * (nrow - 1)))
2662 { 2274 {
2275 refresh_count = 0;
2276
2277 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2278 {
2663 refreshnow = true; 2279 refreshnow = true;
2664 ch = NOCHAR; 2280 ch = NOCHAR;
2665 break; 2281 break;
2282 }
2666 } 2283 }
2667 2284
2668 // scr_add_lines only works for nlines <= nrow - 1. 2285 // scr_add_lines only works for nlines <= nrow - 1.
2669 if (nlines >= nrow - 1) 2286 if (nlines >= nrow - 1)
2670 { 2287 {
2288 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2289 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2671 scr_add_lines (buf, nlines, str - buf); 2290 scr_add_lines (buf, str - buf, nlines);
2291
2672 nlines = 0; 2292 nlines = 0;
2673 str = buf; 2293 str = buf;
2674 eol = str + min (ncol, UBUFSIZ); 2294 eol = str + min (ncol, UBUFSIZ);
2675 } 2295 }
2676 2296
… …
2689 2309
2690 seq_begin = cmdbuf_ptr; 2310 seq_begin = cmdbuf_ptr;
2691 ch = next_char (); 2311 ch = next_char ();
2692 } 2312 }
2693 2313
2314 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2315 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2694 scr_add_lines (buf, nlines, str - buf); 2316 scr_add_lines (buf, str - buf, nlines);
2695 2317
2696 /* 2318 /*
2697 * If there have been a lot of new lines, then update the screen 2319 * If there have been a lot of new lines, then update the screen
2698 * What the heck I'll cheat and only refresh less than every page-full. 2320 * What the heck we'll cheat and only refresh less than every page-full.
2699 * the number of pages between refreshes is refresh_limit, which 2321 * if skipScroll is enabled.
2700 * is incremented here because we must be doing flat-out scrolling.
2701 */ 2322 */
2702 if (refreshnow) 2323 if (refreshnow)
2703 { 2324 {
2704 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2705 refresh_limit++;
2706 else
2707 {
2708 flag = true; 2325 flag = true;
2709 scr_refresh (refresh_type); 2326 scr_refresh ();
2710 } 2327 want_refresh = 1;
2711 } 2328 }
2712 2329
2713 } 2330 }
2714 else 2331 else
2715 { 2332 {
… …
2729 } 2346 }
2730 2347
2731 return flag; 2348 return flag;
2732} 2349}
2733 2350
2734// read the next octet
2735unicode_t
2736rxvt_term::next_octet ()
2737{
2738 return cmdbuf_ptr < cmdbuf_endp
2739 ? *cmdbuf_ptr++
2740 : NOCHAR;
2741}
2742
2743// read the next character 2351// read the next character
2744unicode_t 2352wchar_t
2745rxvt_term::next_char () 2353rxvt_term::next_char () NOTHROW
2746{ 2354{
2747 while (cmdbuf_ptr < cmdbuf_endp) 2355 while (cmdbuf_ptr < cmdbuf_endp)
2748 { 2356 {
2749 // assume 7-bit to be ascii ALWAYS 2357 // assume 7-bit to be ascii ALWAYS
2750 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2358 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2751 return *cmdbuf_ptr++; 2359 return *cmdbuf_ptr++;
2752 2360
2753 wchar_t wc; 2361 wchar_t wc;
2754 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2362 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2755 2363
2756 if (len == (size_t)-2) 2364 if (len == (size_t)-2)
2757 { 2365 {
2758 // the mbstate stores incomplete sequences. didn't know this :/ 2366 // the mbstate stores incomplete sequences. didn't know this :/
2759 cmdbuf_ptr = cmdbuf_endp; 2367 cmdbuf_ptr = cmdbuf_endp;
2760 break; 2368 break;
2761 } 2369 }
2762 2370
2763 if (len == (size_t)-1) 2371 if (len == (size_t)-1)
2764 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2372 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2765 2373
2766 // assume wchar == unicode 2374 // assume wchar == unicode
2767 cmdbuf_ptr += len; 2375 cmdbuf_ptr += len;
2768 return wc & UNICODE_MASK; 2376 return wc & UNICODE_MASK;
2769 } 2377 }
2770 2378
2771 return NOCHAR; 2379 return NOCHAR;
2772} 2380}
2381
2382// read the next octet
2383uint32_t
2384rxvt_term::next_octet () NOTHROW
2385{
2386 return cmdbuf_ptr < cmdbuf_endp
2387 ? (unsigned char)*cmdbuf_ptr++
2388 : NOCHAR;
2389}
2390
2391static class out_of_input out_of_input;
2773 2392
2774/* rxvt_cmd_getc () - Return next input character */ 2393/* rxvt_cmd_getc () - Return next input character */
2775/* 2394/*
2776 * Return the next input character after first passing any keyboard input 2395 * Return the next input character after first passing any keyboard input
2777 * to the command. 2396 * to the command.
2778 */ 2397 */
2779unicode_t 2398wchar_t
2780rxvt_term::cmd_getc () 2399rxvt_term::cmd_getc () THROW ((class out_of_input))
2781{ 2400{
2782 unicode_t c = next_char (); 2401 wchar_t c = next_char ();
2783 2402
2784 if (c == NOCHAR) 2403 if (c == NOCHAR)
2785 throw out_of_input; 2404 throw out_of_input;
2786 2405
2787 return c; 2406 return c;
2788} 2407}
2789 2408
2790unicode_t 2409uint32_t
2791rxvt_term::cmd_get8 () 2410rxvt_term::cmd_get8 () THROW ((class out_of_input))
2792{ 2411{
2793 unicode_t c = next_octet (); 2412 uint32_t c = next_octet ();
2794 2413
2795 if (c == NOCHAR) 2414 if (c == NOCHAR)
2796 throw out_of_input; 2415 throw out_of_input;
2797 2416
2798 return c; 2417 return c;
… …
2862 { 2481 {
2863 if ((buf[len++] = cmd_getc ()) == 'i') 2482 if ((buf[len++] = cmd_getc ()) == 'i')
2864 break; /* done = 1 */ 2483 break; /* done = 1 */
2865 } 2484 }
2866 } 2485 }
2867 2486
2868 for (i = 0; i < len; i++) 2487 for (i = 0; i < len; i++)
2869 if (putc (buf[i], fd) == EOF) 2488 if (putc (buf[i], fd) == EOF)
2870 { 2489 {
2871 done = 1; 2490 done = 1;
2872 break; 2491 break;
… …
2898 case C0_ESC: 2517 case C0_ESC:
2899 process_escape_seq (); 2518 process_escape_seq ();
2900 break; 2519 break;
2901 case C0_ENQ: /* terminal Status */ 2520 case C0_ENQ: /* terminal Status */
2902 if (rs[Rs_answerbackstring]) 2521 if (rs[Rs_answerbackstring])
2903 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2522 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2904 (unsigned int)strlen (rs[Rs_answerbackstring]));
2905 else 2523 else
2906 tt_write ((unsigned char *)VT100_ANS, 2524 tt_write (VT100_ANS, strlen (VT100_ANS));
2907 (unsigned int)strlen (VT100_ANS));
2908 break; 2525 break;
2909 case C0_BEL: /* bell */ 2526 case C0_BEL: /* bell */
2910 scr_bell (); 2527 scr_bell ();
2911 break; 2528 break;
2912 case C0_BS: /* backspace */ 2529 case C0_BS: /* backspace */
… …
2936 process_dcs_seq (); 2553 process_dcs_seq ();
2937 break; 2554 break;
2938 case 0x9b: /* CSI */ 2555 case 0x9b: /* CSI */
2939 process_csi_seq (); 2556 process_csi_seq ();
2940 break; 2557 break;
2941 case 0x9d: /* CSI */ 2558 case 0x9d: /* OSC */
2942 process_osc_seq (); 2559 process_osc_seq ();
2943 break; 2560 break;
2944#endif 2561#endif
2945 } 2562 }
2946} 2563}
… …
3036 scr_charset_set (2, (unsigned int)cmd_getc ()); 2653 scr_charset_set (2, (unsigned int)cmd_getc ());
3037 break; 2654 break;
3038 case '+': 2655 case '+':
3039 scr_charset_set (3, (unsigned int)cmd_getc ()); 2656 scr_charset_set (3, (unsigned int)cmd_getc ());
3040 break; 2657 break;
3041#if ENABLE_FRILLS 2658#if !ENABLE_MINIMAL
3042 case '6': 2659 case '6':
3043 scr_backindex (); 2660 scr_backindex ();
3044 break; 2661 break;
3045#endif 2662#endif
3046 case '7': 2663 case '7':
3047 scr_cursor (SAVE); 2664 scr_cursor (SAVE);
3048 break; 2665 break;
3049 case '8': 2666 case '8':
3050 scr_cursor (RESTORE); 2667 scr_cursor (RESTORE);
3051 break; 2668 break;
3052#if ENABLE_FRILLS 2669#if !ENABLE_MINIMAL
3053 case '9': 2670 case '9':
3054 scr_forwardindex (); 2671 scr_forwardindex ();
3055 break; 2672 break;
3056#endif 2673#endif
3057 case '=': 2674 case '=':
… …
3067 break; 2684 break;
3068 2685
3069 /* 8.3.87: NEXT LINE */ 2686 /* 8.3.87: NEXT LINE */
3070 case C1_NEL: /* ESC E */ 2687 case C1_NEL: /* ESC E */
3071 { 2688 {
3072 unicode_t nlcr[] = { C0_LF, C0_CR }; 2689 wchar_t nlcr[] = { C0_LF, C0_CR };
3073 scr_add_lines (nlcr, 1, 2); 2690 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3074 } 2691 }
3075 break; 2692 break;
3076 2693
3077 /* kidnapped escape sequence: Should be 8.3.48 */ 2694 /* kidnapped escape sequence: Should be 8.3.48 */
3078 case C1_ESA: /* ESC G */ 2695 case C1_ESA: /* ESC G */
… …
3100 process_dcs_seq (); 2717 process_dcs_seq ();
3101 break; 2718 break;
3102 2719
3103 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2720 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3104 case C1_SCI: /* ESC Z */ 2721 case C1_SCI: /* ESC Z */
3105 tt_write ((const unsigned char *)ESCZ_ANSWER, 2722 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3106 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3107 break; /* steal obsolete ESC [ c */ 2723 break; /* steal obsolete ESC [ c */
3108 2724
3109 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2725 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3110 case C1_CSI: /* ESC [ */ 2726 case C1_CSI: /* ESC [ */
3111 process_csi_seq (); 2727 process_csi_seq ();
… …
3173rxvt_term::process_csi_seq () 2789rxvt_term::process_csi_seq ()
3174{ 2790{
3175 unicode_t ch, priv, i; 2791 unicode_t ch, priv, i;
3176 unsigned int nargs, p; 2792 unsigned int nargs, p;
3177 int n, ndef; 2793 int n, ndef;
3178 int arg[ESC_ARGS]; 2794 int arg[ESC_ARGS] = { };
3179 2795
3180 for (nargs = ESC_ARGS; nargs > 0;) 2796 nargs = 0;
3181 arg[--nargs] = 0;
3182 2797
3183 priv = 0; 2798 priv = 0;
3184 ch = cmd_getc (); 2799 ch = cmd_getc ();
3185 if (ch >= '<' && ch <= '?') 2800 if (ch >= '<' && ch <= '?')
3186 { /* '<' '=' '>' '?' */ 2801 { /* '<' '=' '>' '?' */
… …
3220 ndef = get_byte_array_bit (csi_defaults, i); 2835 ndef = get_byte_array_bit (csi_defaults, i);
3221 for (p = 0; p < nargs; p++) 2836 for (p = 0; p < nargs; p++)
3222 if (arg[p] == -1) 2837 if (arg[p] == -1)
3223 arg[p] = ndef; 2838 arg[p] = ndef;
3224 2839
3225#ifdef DEBUG_CMD
3226 fprintf (stderr, "CSI ");
3227 for (p = 0; p < nargs; p++)
3228 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3229 fprintf (stderr, "%c\n", ch);
3230#endif
3231
3232 /* 2840 /*
3233 * private mode handling 2841 * private mode handling
3234 */ 2842 */
3235 if (priv) 2843 if (priv)
3236 { 2844 {
3237 switch (priv) 2845 switch (priv)
3238 { 2846 {
3239 case '>': 2847 case '>':
3240 if (ch == CSI_DA) /* secondary device attributes */ 2848 if (ch == CSI_DA) /* secondary device attributes */
3241 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2849 {
2850 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2851 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2852 //
2853 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2854 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2855 // that we do not support xterm mouse reporting (should be 95 when we do).
2856 //
2857 tt_printf ("\033[>%d;94;0c", 'U');
2858 }
3242 break; 2859 break;
3243 case '?': 2860 case '?':
3244 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2861 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3245 process_terminal_mode (ch, priv, nargs, arg); 2862 process_terminal_mode (ch, priv, nargs, arg);
3246 break; 2863 break;
… …
3355 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2972 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3356 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 2973 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3357 break; 2974 break;
3358 2975
3359 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2976 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3360 tt_write ((const unsigned char *)VT100_ANS, 2977 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3361 (unsigned int) (sizeof (VT100_ANS) - 1));
3362 break; 2978 break;
3363 2979
3364 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2980 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3365 process_sgr_mode (nargs, arg); 2981 process_sgr_mode (nargs, arg);
3366 break; 2982 break;
… …
3373 break; 2989 break;
3374 case 6: /* CPR requested */ 2990 case 6: /* CPR requested */
3375 scr_report_position (); 2991 scr_report_position ();
3376 break; 2992 break;
3377 case 7: /* unofficial extension */ 2993 case 7: /* unofficial extension */
3378 if (options & Opt_insecure) 2994 if (option (Opt_insecure))
3379 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2995 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3380 break; 2996 break;
3381 case 8: /* unofficial extension */ 2997 case 8: /* unofficial extension */
3382 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2998 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3383 break; 2999 break;
… …
3450 break; 3066 break;
3451 case CSI_75: 3067 case CSI_75:
3452 scr_cursor (RESTORE); 3068 scr_cursor (RESTORE);
3453 break; 3069 break;
3454 3070
3455#if ENABLE_FRILLS 3071#if !ENABLE_MINIMAL
3456 case CSI_74: 3072 case CSI_74:
3457 process_window_ops (arg, nargs); 3073 process_window_ops (arg, nargs);
3458 break; 3074 break;
3459#endif 3075#endif
3460 3076
… …
3467 break; 3083 break;
3468 } 3084 }
3469} 3085}
3470/*}}} */ 3086/*}}} */
3471 3087
3472#if ENABLE_FRILLS 3088#if !ENABLE_MINIMAL
3473/* ARGSUSED */ 3089/* ARGSUSED */
3474void 3090void
3475rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3091rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3476{ 3092{
3477 int x, y; 3093 int x, y;
3478 XWindowAttributes wattr; 3094 XWindowAttributes wattr;
3479 Window wdummy; 3095 Window wdummy;
3480 dDisp; 3096
3097 dLocal (Display *, dpy);
3481 3098
3482 if (nargs == 0) 3099 if (nargs == 0)
3483 return; 3100 return;
3484 3101
3485 switch (args[0]) 3102 switch (args[0])
3486 { 3103 {
3487 /* 3104 /*
3488 * commands 3105 * commands
3489 */ 3106 */
3490 case 1: /* deiconify window */ 3107 case 1: /* deiconify window */
3491 XMapWindow (disp, parent[0]); 3108 XMapWindow (dpy, parent[0]);
3492 break; 3109 break;
3493 case 2: /* iconify window */ 3110 case 2: /* iconify window */
3494 XIconifyWindow (disp, parent[0], display->screen); 3111 XIconifyWindow (dpy, parent[0], display->screen);
3495 break; 3112 break;
3496 case 3: /* set position (pixels) */ 3113 case 3: /* set position (pixels) */
3497 XMoveWindow (disp, parent[0], args[1], args[2]); 3114 XMoveWindow (dpy, parent[0], args[1], args[2]);
3498 break; 3115 break;
3499 case 4: /* set size (pixels) */ 3116 case 4: /* set size (pixels) */
3500 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3117 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3501 break; 3118 break;
3502 case 5: /* raise window */ 3119 case 5: /* raise window */
3503 XRaiseWindow (disp, parent[0]); 3120 XRaiseWindow (dpy, parent[0]);
3504 break; 3121 break;
3505 case 6: /* lower window */ 3122 case 6: /* lower window */
3506 XLowerWindow (disp, parent[0]); 3123 XLowerWindow (dpy, parent[0]);
3507 break; 3124 break;
3508 case 7: /* refresh window */ 3125 case 7: /* refresh window */
3509 scr_touch (true); 3126 scr_touch (true);
3510 break; 3127 break;
3511 case 8: /* set size (chars) */ 3128 case 8: /* set size (chars) */
… …
3518 if (args[0] >= 24) /* set height (chars) */ 3135 if (args[0] >= 24) /* set height (chars) */
3519 set_widthheight ((unsigned int)width, 3136 set_widthheight ((unsigned int)width,
3520 (unsigned int) (args[1] * fheight)); 3137 (unsigned int) (args[1] * fheight));
3521 break; 3138 break;
3522 3139
3523
3524 /* 3140 /*
3525 * reports - some output format copied from XTerm 3141 * reports - some output format copied from XTerm
3526 */ 3142 */
3527 case 11: /* report window state */ 3143 case 11: /* report window state */
3528 XGetWindowAttributes (disp, parent[0], &wattr); 3144 XGetWindowAttributes (dpy, parent[0], &wattr);
3529 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3145 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3530 break; 3146 break;
3531 case 13: /* report window position */ 3147 case 13: /* report window position */
3532 XGetWindowAttributes (disp, parent[0], &wattr); 3148 XGetWindowAttributes (dpy, parent[0], &wattr);
3533 XTranslateCoordinates (disp, parent[0], wattr.root, 3149 XTranslateCoordinates (dpy, parent[0], wattr.root,
3534 -wattr.border_width, -wattr.border_width, 3150 -wattr.border_width, -wattr.border_width,
3535 &x, &y, &wdummy); 3151 &x, &y, &wdummy);
3536 tt_printf ("\033[3;%d;%dt", x, y); 3152 tt_printf ("\033[3;%d;%dt", x, y);
3537 break; 3153 break;
3538 case 14: /* report window size (pixels) */ 3154 case 14: /* report window size (pixels) */
3539 XGetWindowAttributes (disp, parent[0], &wattr); 3155 XGetWindowAttributes (dpy, parent[0], &wattr);
3540 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3156 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3541 break; 3157 break;
3542 case 18: /* report text area size (chars) */ 3158 case 18: /* report text area size (chars) */
3543 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3159 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3544 break; 3160 break;
… …
3546 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3162 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3547 break; 3163 break;
3548 case 20: /* report icon label */ 3164 case 20: /* report icon label */
3549 { 3165 {
3550 char *s; 3166 char *s;
3551 XGetIconName (disp, parent[0], &s); 3167 XGetIconName (dpy, parent[0], &s);
3552 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3168 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3553 XFree (s); 3169 XFree (s);
3554 } 3170 }
3555 break; 3171 break;
3556 case 21: /* report window title */ 3172 case 21: /* report window title */
3557 { 3173 {
3558 char *s; 3174 char *s;
3559 XFetchName (disp, parent[0], &s); 3175 XFetchName (dpy, parent[0], &s);
3560 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3176 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3561 XFree (s); 3177 XFree (s);
3562 } 3178 }
3563 break; 3179 break;
3564 } 3180 }
3565} 3181}
… …
3568/*----------------------------------------------------------------------*/ 3184/*----------------------------------------------------------------------*/
3569/* 3185/*
3570 * get input up until STRING TERMINATOR (or BEL) 3186 * get input up until STRING TERMINATOR (or BEL)
3571 * ends_how is terminator used. returned input must be free()'d 3187 * ends_how is terminator used. returned input must be free()'d
3572 */ 3188 */
3573unsigned char * 3189char *
3574rxvt_term::get_to_st (unicode_t &ends_how) 3190rxvt_term::get_to_st (unicode_t &ends_how)
3575{ 3191{
3576 unicode_t ch; 3192 unicode_t ch;
3577 bool seen_esc = false; 3193 bool seen_esc = false;
3578 unsigned int n = 0; 3194 unsigned int n = 0;
… …
3592 seen_esc = true; 3208 seen_esc = true;
3593 continue; 3209 continue;
3594 } 3210 }
3595 else if (ch == C0_BEL || ch == CHAR_ST) 3211 else if (ch == C0_BEL || ch == CHAR_ST)
3596 break; 3212 break;
3213 else if (ch == C0_SYN)
3214 ch = cmd_get8 ();
3597 else if (ch < 0x20) 3215 else if (ch < 0x20)
3598 return NULL; /* other control character - exit */ 3216 return NULL; /* other control character - exit */
3599 3217
3600 seen_esc = false; 3218 seen_esc = false;
3601 3219
3602 if (n >= STRING_MAX - 1) 3220 if (n >= STRING_MAX - 1)
3603 // stop at some sane length 3221 // stop at some sane length
3604 return NULL; 3222 return NULL;
3605 3223
3606 if (ch == C0_SYN)
3607 string[n++] = cmd_get8 ();
3608 else
3609 string[n++] = ch; 3224 string[n++] = ch;
3610 } 3225 }
3611 3226
3612 string[n++] = '\0'; 3227 string[n++] = '\0';
3613 3228
3614 ends_how = (ch == 0x5c ? C0_ESC : ch); 3229 ends_how = (ch == 0x5c ? C0_ESC : ch);
3615 3230
3616 return (unsigned char *)rxvt_wcstombs (string); 3231 return rxvt_wcstombs (string);
3617} 3232}
3618 3233
3619/*----------------------------------------------------------------------*/ 3234/*----------------------------------------------------------------------*/
3620/* 3235/*
3621 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3236 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3622 */ 3237 */
3623void 3238void
3624rxvt_term::process_dcs_seq () 3239rxvt_term::process_dcs_seq ()
3625{ 3240{
3626 unsigned char *s; 3241 char *s;
3627 unicode_t eh; 3242 unicode_t eh;
3628 3243
3629 /* 3244 /*
3630 * Not handled yet 3245 * Not handled yet
3631 */ 3246 */
… …
3650 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3265 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3651 arg = arg * 10 + (ch - '0'); 3266 arg = arg * 10 + (ch - '0');
3652 3267
3653 if (ch == ';') 3268 if (ch == ';')
3654 { 3269 {
3655 unsigned char *s = get_to_st (eh); 3270 char *s = get_to_st (eh);
3656 3271
3657 if (s) 3272 if (s)
3658 { 3273 {
3659 process_xterm_seq (arg, (char *)s, eh); 3274 process_xterm_seq (arg, s, eh);
3660 free (s); 3275 free (s);
3661 } 3276 }
3662 } 3277 }
3663} 3278}
3664 3279
3665void 3280void
3666rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3281rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3667{ 3282{
3668 if (str[0] == '?' && !str[1]) 3283 if (str[0] == '?' && !str[1])
3669 { 3284 {
3670 unsigned short r, g, b; 3285 rgba c;
3671 pix_colors_focused[color].get (display, r, g, b); 3286 pix_colors_focused[color].get (c);
3287
3288#if XFT
3289 if (c.a != rgba::MAX_CC)
3290 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3291 else
3292#endif
3672 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3293 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3673 } 3294 }
3674 else 3295 else
3675 set_window_color (color, str); 3296 set_window_color (color, str);
3676} 3297}
3677 3298
3678/* 3299/*
3679 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3300 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3680 */ 3301 */
3681void 3302void
3682rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3303rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3683{ 3304{
3684 int changed = 0;
3685 int color; 3305 int color;
3686 char *buf, *name; 3306 char *buf, *name;
3687 bool query = str[0] == '?' && !str[1]; 3307 bool query = str[0] == '?' && !str[1];
3688 int saveop = op; 3308 int saveop = op;
3689 dDisp; 3309
3310 dLocal (Display *, dpy);
3690 3311
3691 assert (str != NULL); 3312 assert (str != NULL);
3313
3314 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3315 return;
3316
3692 switch (op) 3317 switch (op)
3693 { 3318 {
3694 case XTerm_name: 3319 case XTerm_name:
3695 set_title (str); 3320 set_title (str);
3696 /* FALLTHROUGH */ 3321 /* FALLTHROUGH */
… …
3710 unsigned long bytes_after; 3335 unsigned long bytes_after;
3711 unsigned char *value = 0; 3336 unsigned char *value = 0;
3712 const char *str = ""; 3337 const char *str = "";
3713 3338
3714 if (prop 3339 if (prop
3715 && XGetWindowProperty (disp, parent[0], 3340 && XGetWindowProperty (dpy, parent[0],
3716 prop, 0, 1<<16, 0, AnyPropertyType, 3341 prop, 0, 1<<16, 0, AnyPropertyType,
3717 &actual_type, &actual_format, 3342 &actual_type, &actual_format,
3718 &nitems, &bytes_after, &value) == Success 3343 &nitems, &bytes_after, &value) == Success
3719 && actual_type != None 3344 && actual_type != None
3720 && actual_format == 8) 3345 && actual_format == 8)
3721 str = (const char *)(value); 3346 str = (const char *)(value);
3722 3347
3723 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3348 tt_printf ("\033]%d;%s%c", op, str, resp);
3724 3349
3725 XFree (value); 3350 XFree (value);
3726 } 3351 }
3727 else 3352 else
3728 { 3353 {
… …
3732 { 3357 {
3733 *eq = 0; 3358 *eq = 0;
3734 set_utf8_property (display->atom (str), eq + 1); 3359 set_utf8_property (display->atom (str), eq + 1);
3735 } 3360 }
3736 else 3361 else
3737 XDeleteProperty (disp, parent[0], 3362 XDeleteProperty (dpy, parent[0],
3738 display->atom (str)); 3363 display->atom (str));
3739 } 3364 }
3740 break; 3365 break;
3741 3366
3742 case XTerm_Color: 3367 case XTerm_Color:
… …
3744 { 3369 {
3745 if ((name = strchr (buf, ';')) == NULL) 3370 if ((name = strchr (buf, ';')) == NULL)
3746 break; 3371 break;
3747 3372
3748 *name++ = '\0'; 3373 *name++ = '\0';
3749 color = atoi (buf); 3374 color = atoi (buf) + minCOLOR;
3750 3375
3751 if (color < 0 || color >= TOTAL_COLORS) 3376 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3752 break; 3377 break;
3753 3378
3754 if ((buf = strchr (name, ';')) != NULL) 3379 if ((buf = strchr (name, ';')) != NULL)
3755 *buf++ = '\0'; 3380 *buf++ = '\0';
3756 3381
3757 if (name[0] == '?' && !name[1]) 3382 process_color_seq (op, color, name, resp);
3758 {
3759 unsigned short r, g, b;
3760 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3761 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3762 }
3763 else
3764 set_window_color (color + minCOLOR, name);
3765 } 3383 }
3766 break; 3384 break;
3767 case XTerm_Color00: 3385 case XTerm_Color00:
3768 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3386 process_color_seq (op, Color_fg, str, resp);
3769 break; 3387 break;
3770 case XTerm_Color01: 3388 case XTerm_Color01:
3771 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3389 process_color_seq (op, Color_bg, str, resp);
3772 break; 3390 break;
3773#ifndef NO_CURSORCOLOR 3391#ifndef NO_CURSORCOLOR
3774 case XTerm_Color_cursor: 3392 case XTerm_Color_cursor:
3775 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3393 process_color_seq (op, Color_cursor, str, resp);
3776 break; 3394 break;
3777#endif 3395#endif
3778 case XTerm_Color_pointer_fg: 3396 case XTerm_Color_pointer_fg:
3779 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3397 process_color_seq (op, Color_pointer_fg, str, resp);
3780 break; 3398 break;
3781 case XTerm_Color_pointer_bg: 3399 case XTerm_Color_pointer_bg:
3782 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3400 process_color_seq (op, Color_pointer_bg, str, resp);
3783 break; 3401 break;
3784#ifndef NO_BOLD_UNDERLINE_REVERSE 3402#ifndef NO_BOLD_UNDERLINE_REVERSE
3785 case XTerm_Color_BD:
3786 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3787 break;
3788 case XTerm_Color_UL:
3789 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3790 break;
3791 case XTerm_Color_RV: 3403 case XTerm_Color_RV:
3792 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3404 process_color_seq (op, Color_RV, str, resp);
3405 break;
3406 case Rxvt_Color_BD:
3407 case URxvt_Color_BD:
3408 process_color_seq (op, Color_BD, str, resp);
3409 break;
3410 case Rxvt_Color_UL:
3411 case URxvt_Color_UL:
3412 process_color_seq (op, Color_UL, str, resp);
3793 break; 3413 break;
3794 case URxvt_Color_IT: 3414 case URxvt_Color_IT:
3795 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3415 process_color_seq (op, Color_IT, str, resp);
3796 break; 3416 break;
3797#endif 3417#endif
3798#if TRANSPARENT && TINTING 3418#if ENABLE_TRANSPARENCY
3799 case URxvt_Color_tint: 3419 case URxvt_Color_tint:
3800 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3420 process_color_seq (op, Color_tint, str, resp);
3801 check_our_parents (); 3421 {
3802 if (am_transparent) 3422 bool changed = false;
3803 want_full_refresh = want_refresh = 1; 3423 if (ISSET_PIXCOLOR (Color_tint))
3804 break; 3424 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3805#endif 3425 else
3426 changed = bgPixmap.unset_tint ();
3427 if (changed)
3428 update_background ();
3429 }
3806 3430
3431 break;
3432#endif
3433
3434#if BG_IMAGE_FROM_FILE
3807 case XTerm_Pixmap: 3435 case Rxvt_Pixmap:
3808 if (*str != ';') 3436 if (!strcmp (str, "?"))
3809 { 3437 {
3810#if XPM_BACKGROUND 3438 char str[256];
3811 scale_pixmap (""); /* reset to default scaling */ 3439
3812 set_bgPixmap (str); /* change pixmap */ 3440 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3813#endif 3441 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3814 scr_touch (true); 3442 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3443 process_xterm_seq (XTerm_title, str, CHAR_ST);
3815 } 3444 }
3816 while ((str = strchr (str, ';')) != NULL) 3445 else
3817 { 3446 {
3447 int changed = 0;
3448
3449 if (*str != ';')
3450 {
3451 /* reset to default scaling :*/
3452 bgPixmap.unset_geometry ();
3453 if (bgPixmap.set_file (str)) /* change pixmap */
3454 changed++;
3455 str = strchr (str, ';');
3456 if (str == NULL)
3457 bgPixmap.set_defaultGeometry ();
3458 }
3459 while (str)
3460 {
3818 str++; 3461 str++;
3819#if XPM_BACKGROUND 3462 if (bgPixmap.set_geometry (str))
3820 changed += scale_pixmap (str); 3463 changed++;
3821#endif 3464 str = strchr (str, ';');
3465 }
3466 if (changed)
3467 update_background ();
3822 } 3468 }
3823
3824 if (changed)
3825 {
3826#ifdef XPM_BACKGROUND
3827 resize_pixmap ();
3828#endif
3829 scr_touch (true);
3830 }
3831 break; 3469 break;
3470#endif
3832 3471
3833 case XTerm_restoreFG: 3472 case Rxvt_restoreFG:
3834 set_window_color (Color_fg, str); 3473 set_window_color (Color_fg, str);
3835 break; 3474 break;
3836 case XTerm_restoreBG: 3475 case Rxvt_restoreBG:
3837 set_window_color (Color_bg, str); 3476 set_window_color (Color_bg, str);
3838 break; 3477 break;
3839 3478
3840 case XTerm_logfile: 3479 case XTerm_logfile:
3841 // TODO, when secure mode? 3480 // TODO, when secure mode?
3842 break; 3481 break;
3843 3482
3844#ifdef MENUBAR
3845 case URxvt_Menu:
3846 if (options & Opt_insecure)
3847 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3848 break;
3849#endif
3850#if 0 3483#if 0
3851 case XTerm_dumpscreen: /* no error notices */ 3484 case Rxvt_dumpscreen: /* no error notices */
3852 { 3485 {
3853 int fd; 3486 int fd;
3854 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3487 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3855 { 3488 {
3856 scr_dump (fd); 3489 scr_dump (fd);
… …
3867 case URxvt_italicFont: 3500 case URxvt_italicFont:
3868 case URxvt_boldItalicFont: 3501 case URxvt_boldItalicFont:
3869#endif 3502#endif
3870 if (query) 3503 if (query)
3871 tt_printf ("\33]%d;%-.250s%c", saveop, 3504 tt_printf ("\33]%d;%-.250s%c", saveop,
3872 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3505 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3873 ? fontset[op - URxvt_font]->fontdesc : "", 3506 ? fontset[op - URxvt_font]->fontdesc : "",
3874 resp); 3507 resp);
3875 else 3508 else
3876 { 3509 {
3877 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3510 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3880 allocated.push_back ((void *)res); 3513 allocated.push_back ((void *)res);
3881 set_fonts (); 3514 set_fonts ();
3882 } 3515 }
3883 break; 3516 break;
3884 3517
3885#if ENABLE_FRILLS 3518 case URxvt_version:
3519 if (query)
3520 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3521 op,
3522 rs[Rs_name], VERSION[0], VERSION[2],
3523 resp);
3524 break;
3525
3526#if !ENABLE_MINIMAL
3886 case URxvt_locale: 3527 case URxvt_locale:
3887 if (query) 3528 if (query)
3888 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3529 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3889 else 3530 else
3890 { 3531 {
3891 set_locale (str); 3532 set_locale (str);
3892 pty.set_utf8_mode (enc_utf8); 3533 pty->set_utf8_mode (enc_utf8);
3893 init_xlocale (); 3534 init_xlocale ();
3894 } 3535 }
3895 break; 3536 break;
3896 3537
3897 case URxvt_view_up: 3538 case URxvt_view_up:
3898 case URxvt_view_down: 3539 case URxvt_view_down:
3540 {
3899 int lines = atoi (str); 3541 int lines = atoi (str);
3900 3542
3901 if (lines) 3543 if (lines)
3902 scr_page (op == URxvt_view_up ? UP : DN, lines); 3544 scr_page (op == URxvt_view_up ? UP : DN, lines);
3903 else 3545 else
3904 {
3905 scr_erase_savelines (); 3546 scr_erase_savelines ();
3906 } 3547 }
3907 3548
3549 break;
3550#endif
3551
3552#if ENABLE_PERL
3553 case URxvt_perl:
3554 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3555 ; // no responses yet
3908 break; 3556 break;
3909#endif 3557#endif
3910 } 3558 }
3911} 3559}
3912/*----------------------------------------------------------------------*/ 3560/*----------------------------------------------------------------------*/
… …
3943 return state; 3591 return state;
3944} 3592}
3945 3593
3946/* we're not using priv _yet_ */ 3594/* we're not using priv _yet_ */
3947void 3595void
3948rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3596rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3949{ 3597{
3950 unsigned int i, j; 3598 unsigned int i, j;
3951 int state; 3599 int state;
3952 3600
3953 static const struct 3601 static const struct
3954 { 3602 {
3955 const int argval; 3603 const int argval;
3956 const unsigned long bit; 3604 const unsigned long bit;
3957 }
3958
3959 argtopriv[] = { 3605 } argtopriv[] = {
3960 { 1, PrivMode_aplCUR }, 3606 { 1, PrivMode_aplCUR },
3961 { 2, PrivMode_vt52 }, 3607 { 2, PrivMode_vt52 },
3962 { 3, PrivMode_132 }, 3608 { 3, PrivMode_132 },
3963 { 4, PrivMode_smoothScroll }, 3609 { 4, PrivMode_smoothScroll },
3964 { 5, PrivMode_rVideo }, 3610 { 5, PrivMode_rVideo },
3965 { 6, PrivMode_relOrigin }, 3611 { 6, PrivMode_relOrigin },
3966 { 7, PrivMode_Autowrap }, 3612 { 7, PrivMode_Autowrap },
3967 // 8, bi-directional support mode 3613 // 8, bi-directional support mode
3968 { 9, PrivMode_MouseX10 }, 3614 { 9, PrivMode_MouseX10 },
3969#ifdef menuBar_esc
3970 { menuBar_esc, PrivMode_menuBar },
3971#endif
3972 // 18, 19 printing-related 3615 // 18, 19 printing-related
3973 { 25, PrivMode_VisibleCursor }, 3616 { 25, PrivMode_VisibleCursor },
3974#ifdef scrollBar_esc 3617#ifdef scrollBar_esc
3975 { scrollBar_esc, PrivMode_scrollBar }, 3618 { scrollBar_esc, PrivMode_scrollBar },
3976#endif 3619#endif
… …
4021 } 3664 }
4022 3665
4023 /* extra handling for values with state unkept */ 3666 /* extra handling for values with state unkept */
4024 switch (arg[i]) 3667 switch (arg[i])
4025 { 3668 {
3669#if ENABLE_STYLES
3670 case 1021:
3671 set_option (Opt_intensityStyles, mode);
3672
3673 scr_touch (true);
3674 break;
3675#endif
4026 case 1048: /* alternative cursor save */ 3676 case 1048: /* alternative cursor save */
4027 case 1049: 3677 case 1049:
4028 if (options & Opt_secondaryScreen) 3678 if (option (Opt_secondaryScreen))
4029 if (mode == 0) 3679 if (mode == 0)
4030 scr_cursor (RESTORE); 3680 scr_cursor (RESTORE);
4031 else if (mode == 1) 3681 else if (mode == 1)
4032 scr_cursor (SAVE); 3682 scr_cursor (SAVE);
4033 break; 3683 break;
… …
4048 case 3: /* 80/132 */ 3698 case 3: /* 80/132 */
4049 if (priv_modes & PrivMode_132OK) 3699 if (priv_modes & PrivMode_132OK)
4050 set_widthheight (((state ? 132 : 80) * fwidth), height); 3700 set_widthheight (((state ? 132 : 80) * fwidth), height);
4051 break; 3701 break;
4052 case 4: /* smooth scrolling */ 3702 case 4: /* smooth scrolling */
4053 if (state)
4054 options &= ~Opt_jumpScroll;
4055 else
4056 options |= Opt_jumpScroll; 3703 set_option (Opt_jumpScroll, !state);
4057 break; 3704 break;
4058 case 5: /* reverse video */ 3705 case 5: /* reverse video */
4059 scr_rvideo_mode (state); 3706 scr_rvideo_mode (state);
4060 break; 3707 break;
4061 case 6: /* relative/absolute origins */ 3708 case 6: /* relative/absolute origins */
… …
4067 /* case 8: - auto repeat, can't do on a per window basis */ 3714 /* case 8: - auto repeat, can't do on a per window basis */
4068 case 9: /* X10 mouse reporting */ 3715 case 9: /* X10 mouse reporting */
4069 if (state) /* orthogonal */ 3716 if (state) /* orthogonal */
4070 priv_modes &= ~PrivMode_MouseX11; 3717 priv_modes &= ~PrivMode_MouseX11;
4071 break; 3718 break;
4072#ifdef menuBar_esc
4073 case menuBar_esc:
4074#ifdef MENUBAR
4075 map_menuBar (state);
4076#endif
4077 break;
4078#endif
4079#ifdef scrollBar_esc 3719#ifdef scrollBar_esc
4080 case scrollBar_esc: 3720 case scrollBar_esc:
4081 if (scrollbar_mapping (state)) 3721 if (scrollbar_mapping (state))
4082 { 3722 {
4083 resize_all_windows (0, 0, 0); 3723 resize_all_windows (0, 0, 0);
… …
4102#if 0 3742#if 0
4103 case 1001: 3743 case 1001:
4104 break; /* X11 mouse highlighting */ 3744 break; /* X11 mouse highlighting */
4105#endif 3745#endif
4106 case 1010: /* scroll to bottom on TTY output inhibit */ 3746 case 1010: /* scroll to bottom on TTY output inhibit */
4107 if (state)
4108 options &= ~Opt_scrollTtyOutput;
4109 else
4110 options |= Opt_scrollTtyOutput; 3747 set_option (Opt_scrollTtyOutput, !state);
4111 break; 3748 break;
4112 case 1011: /* scroll to bottom on key press */ 3749 case 1011: /* scroll to bottom on key press */
4113 if (state)
4114 options |= Opt_scrollTtyKeypress; 3750 set_option (Opt_scrollTtyKeypress, state);
4115 else
4116 options &= ~Opt_scrollTtyKeypress;
4117 break; 3751 break;
4118 case 1047: /* secondary screen w/ clearing last */ 3752 case 1047: /* secondary screen w/ clearing last */
4119 if (options & Opt_secondaryScreen) 3753 if (option (Opt_secondaryScreen))
4120 if (current_screen != PRIMARY) 3754 if (current_screen != PRIMARY)
4121 scr_erase_screen (2); 3755 scr_erase_screen (2);
4122 scr_change_screen (state); 3756 scr_change_screen (state);
4123 break; 3757 break;
4124 case 1049: /* secondary screen w/ clearing first */ 3758 case 1049: /* secondary screen w/ clearing first */
4125 scr_change_screen (state); 3759 scr_change_screen (state);
4126 if (options & Opt_secondaryScreen) 3760 if (option (Opt_secondaryScreen))
4127 if (current_screen != PRIMARY) 3761 if (current_screen != PRIMARY)
4128 scr_erase_screen (2); 3762 scr_erase_screen (2);
4129 break; 3763 break;
4130 default: 3764 default:
4131 break; 3765 break;
… …
4259 scr_color (Color_bg, Color_bg); 3893 scr_color (Color_bg, Color_bg);
4260 break; 3894 break;
4261 3895
4262 //case 50: // not variable spacing 3896 //case 50: // not variable spacing
4263 3897
4264#ifndef NO_BRIGHTCOLOR 3898#if !ENABLE_MINIMAL
4265 case 90: 3899 case 90:
4266 case 91: /* set bright fg color */ 3900 case 91: /* set bright fg color */
4267 case 92: 3901 case 92:
4268 case 93: 3902 case 93:
4269 case 94: 3903 case 94:
… …
4281 case 106: 3915 case 106:
4282 case 107: 3916 case 107:
4283 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3917 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4284 break; 3918 break;
4285#endif 3919#endif
4286
4287 } 3920 }
4288 } 3921 }
4289} 3922}
4290/*}}} */ 3923/*}}} */
4291 3924
… …
4315 */ 3948 */
4316void 3949void
4317rxvt_term::tt_printf (const char *fmt,...) 3950rxvt_term::tt_printf (const char *fmt,...)
4318{ 3951{
4319 va_list arg_ptr; 3952 va_list arg_ptr;
4320 unsigned char buf[256]; 3953 char buf[256];
4321 3954
4322 va_start (arg_ptr, fmt); 3955 va_start (arg_ptr, fmt);
4323 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3956 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4324 va_end (arg_ptr); 3957 va_end (arg_ptr);
4325 tt_write (buf, strlen (buf)); 3958 tt_write (buf, strlen (buf));
… …
4330 * or generated by us in response to a query ESC sequence. 3963 * or generated by us in response to a query ESC sequence.
4331 */ 3964 */
4332const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3965const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4333 3966
4334void 3967void
4335rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3968rxvt_term::tt_write (const char *data, unsigned int len)
4336{ 3969{
3970 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3971 return;
3972
3973 if (pty->pty < 0)
3974 return;
3975
4337 if (v_buflen == 0) 3976 if (v_buflen == 0)
4338 { 3977 {
4339 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3978 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4340 3979
4341 if ((unsigned int)written == len) 3980 if ((unsigned int)written == len)
4342 return; 3981 return;
4343 3982
4344 data += written; 3983 data += written;
4345 len -= written; 3984 len -= written;
4346 } 3985 }
4347 3986
4348 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 3987 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4349 3988
4350 memcpy (v_buffer + v_buflen, data, len); 3989 memcpy (v_buffer + v_buflen, data, len);
4351 v_buflen += len; 3990 v_buflen += len;
4352 3991
4353 pty_ev.set (EVENT_READ | EVENT_WRITE); 3992 pty_ev.set (EVENT_READ | EVENT_WRITE);
4354} 3993}
4355 3994
4356void rxvt_term::pty_write () 3995void rxvt_term::pty_write ()
4357{ 3996{
4358 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3997 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4359 3998
4360 if (written > 0) 3999 if (written > 0)
4361 { 4000 {
4362 v_buflen -= written; 4001 v_buflen -= written;
4363 4002
4364 if (v_buflen == 0) 4003 if (v_buflen == 0)
4365 { 4004 {
4366 free (v_buffer); 4005 free (v_buffer);
4367 v_buffer = 0; 4006 v_buffer = 0;
4368 v_buflen = 0;
4369 4007
4370 pty_ev.set (EVENT_READ); 4008 pty_ev.set (EVENT_READ);
4371 return; 4009 return;
4372 } 4010 }
4373 4011
4374 memmove (v_buffer, v_buffer + written, v_buflen); 4012 memmove (v_buffer, v_buffer + written, v_buflen);
4375 } 4013 }
4376 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4014 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4377 // original code just ignores this... 4015 pty_ev.set (EVENT_READ);
4378 destroy ();
4379} 4016}
4380 4017
4381/*----------------------- end-of-file (C source) -----------------------*/ 4018/*----------------------- end-of-file (C source) -----------------------*/
4382 4019

Diff Legend

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