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.215 by root, Fri Dec 23 14:46:34 2005 UTC vs.
Revision 1.362 by ayin, Sat Nov 10 16:04:49 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(y - 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");
… …
558 newlen = 0; 596 newlen = 0;
559 } 597 }
560 break; 598 break;
561 599
562#ifdef XK_KP_Left 600#ifdef XK_KP_Left
601 case XK_KP_Left: /* \033Ot or standard */
563 case XK_KP_Up: /* \033Ox or standard */ 602 case XK_KP_Up: /* \033Ox or standard */
603 case XK_KP_Right: /* \033Ov or standard */
564 case XK_KP_Down: /* \033Or or standard */ 604 case XK_KP_Down: /* \033Or or standard */
565 case XK_KP_Right: /* \033Ov or standard */ 605 if (kp)
566 case XK_KP_Left: /* \033Ot or standard */
567 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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;
… …
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; 1043// scr_clear (true); This needs to be researched further!
939 scr_clear ();
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 && errno != EINTR) || n == 0) 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
1073 { 1240 {
1074 pty_ev.stop (); 1241 pty_ev.stop ();
1075 1242
1076 if (!(options & Opt_hold)) 1243 if (!option (Opt_hold))
1077 destroy (); 1244 destroy ();
1078 } 1245 }
1079 1246
1080 return false; 1247 return false;
1081} 1248}
1082 1249
1083void 1250void
1084rxvt_term::pty_cb (io_watcher &w, short revents) 1251rxvt_term::pty_cb (io_watcher &w, short revents)
1085{ 1252{
1086 SET_R (this); 1253 make_current ();
1087 SET_LOCALE (locale);
1088 1254
1089 if (revents & EVENT_READ) 1255 if (revents & EVENT_READ)
1090 // loop, but don't allow a single term to monopolize us 1256 // loop, but don't allow a single term to monopolize us
1091 while (pty_fill ()) 1257 while (pty_fill ())
1092 if (cmd_parse ()) 1258 if (cmd_parse ())
… …
1097} 1263}
1098 1264
1099void 1265void
1100rxvt_term::pointer_unblank () 1266rxvt_term::pointer_unblank ()
1101{ 1267{
1102 XDefineCursor (display->display, vt, TermWin_cursor); 1268 XDefineCursor (dpy, vt, TermWin_cursor);
1103 recolour_cursor (); 1269 recolour_cursor ();
1104 1270
1105#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1106 hidden_pointer = 0; 1272 hidden_pointer = 0;
1107 1273
1108 if (options & Opt_pointerBlank) 1274 if (option (Opt_pointerBlank))
1109 pointer_ev.start (NOW + pointerBlankDelay); 1275 pointer_ev.start (NOW + pointerBlankDelay);
1110#endif 1276#endif
1111} 1277}
1112 1278
1113#ifdef POINTER_BLANK 1279#ifdef POINTER_BLANK
1114void 1280void
1115rxvt_term::pointer_blank () 1281rxvt_term::pointer_blank ()
1116{ 1282{
1117 if (! (options & Opt_pointerBlank)) 1283 if (!option (Opt_pointerBlank))
1118 return; 1284 return;
1119 1285
1120 XDefineCursor (display->display, vt, display->blank_cursor); 1286 XDefineCursor (dpy, vt, display->blank_cursor);
1121 XFlush (display->display); 1287 XFlush (dpy);
1122 1288
1123 hidden_pointer = 1; 1289 hidden_pointer = 1;
1124} 1290}
1125 1291
1126void 1292void
1127rxvt_term::pointer_cb (time_watcher &w) 1293rxvt_term::pointer_cb (time_watcher &w)
1128{ 1294{
1129 SET_R (this); 1295 make_current ();
1130 SET_LOCALE (locale);
1131 1296
1132 pointer_blank (); 1297 pointer_blank ();
1133} 1298}
1134#endif 1299#endif
1135 1300
1136void 1301void
1137rxvt_term::mouse_report (XButtonEvent &ev) 1302rxvt_term::mouse_report (XButtonEvent &ev)
1138{ 1303{
1139 int button_number, key_state = 0; 1304 int button_number, key_state = 0;
1140 int x, y; 1305 int x, y;
1306 int code = 32;
1141 1307
1142 x = ev.x; 1308 x = Pixel2Col (ev.x);
1143 y = ev.y; 1309 y = Pixel2Row (ev.y);
1144 pixel_position (&x, &y); 1310 if (ev.type == MotionNotify) {
1311 if (x == mouse_row && y == mouse_col)
1312 return;
1313 mouse_row = x;
1314 mouse_col = y;
1315 code += 32;
1316 }
1145 1317
1146 if (MEvent.button == AnyButton) 1318 if (MEvent.button == AnyButton)
1147 button_number = 3; 1319 button_number = 3;
1148 else 1320 else
1149 { 1321 {
… …
1195 x + 1, 1367 x + 1,
1196 y + 1); 1368 y + 1);
1197#endif 1369#endif
1198 1370
1199 tt_printf ("\033[M%c%c%c", 1371 tt_printf ("\033[M%c%c%c",
1200 (32 + button_number + key_state), 1372 (code + button_number + key_state),
1201 (32 + x + 1), 1373 (32 + x + 1),
1202 (32 + y + 1)); 1374 (32 + y + 1));
1203} 1375}
1204
1205#ifdef USING_W11LIB
1206void
1207rxvt_W11_process_x_event (XEvent *ev)
1208{
1209 rxvt_t *r = rxvt_get_r ();
1210
1211 x_cb (*ev);
1212}
1213#endif
1214 1376
1215/*{{{ process an X event */ 1377/*{{{ process an X event */
1216void 1378void
1217rxvt_term::x_cb (XEvent &ev) 1379rxvt_term::x_cb (XEvent &ev)
1218{ 1380{
1219 dDisp; 1381 make_current ();
1220 1382
1221 SET_R (this); 1383 dLocal (Display *, dpy);
1222 SET_LOCALE (locale);
1223 1384
1224#if defined(CURSOR_BLINK) 1385 if (ev.xany.window == vt
1225 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1386 && SHOULD_INVOKE (HOOK_X_EVENT)
1226 { 1387 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1227 if (hidden_cursor) 1388 return;
1228 {
1229 hidden_cursor = 0;
1230 want_refresh = 1;
1231 }
1232 1389
1233 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1390 // for XQueryPointer
1234 }
1235#endif
1236
1237#if defined(POINTER_BLANK)
1238 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1239 {
1240 if (ev.type == MotionNotify
1241 || ev.type == ButtonPress
1242 || ev.type == ButtonRelease)
1243 if (hidden_pointer)
1244 pointer_unblank ();
1245
1246 if (ev.type == KeyPress && hidden_pointer == 0)
1247 pointer_blank ();
1248 }
1249#endif
1250
1251 Window unused_root, unused_child; 1391 Window unused_root, unused_child;
1252 int unused_root_x, unused_root_y; 1392 int unused_root_x, unused_root_y;
1253 unsigned int unused_mask; 1393 unsigned int unused_mask;
1254 1394
1255 switch (ev.type) 1395 switch (ev.type)
1256 { 1396 {
1257 case KeyPress: 1397 case KeyPress:
1258#if ISO_14755 1398 key_press (ev.xkey);
1259 if (!(iso14755buf & ISO_14755_52))
1260#endif
1261 lookup_key (ev.xkey);
1262
1263 break; 1399 break;
1264 1400
1265 case KeyRelease: 1401 case KeyRelease:
1266 { 1402 key_release (ev.xkey);
1267#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1268 KeySym ks;
1269
1270 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1271#endif
1272
1273#if ENABLE_FRILLS || ISO_14755
1274 // ISO 14755 support
1275 if (iso14755buf)
1276 if (iso14755buf & ISO_14755_52)
1277 {
1278# if ENABLE_OVERLAY
1279 scr_overlay_off ();
1280# endif
1281# if ISO_14755
1282 // iso14755 part 5.2 handling: release time
1283 // first: controls
1284 if ((ev.xkey.state & ControlMask)
1285 && ((ks >= 0x40 && ks <= 0x5f)
1286 || (ks >= 0x61 && ks <= 0x7f)))
1287 {
1288 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1289 commit_iso14755 ();
1290 return; // case-break;
1291 }
1292
1293 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1294 if (i[0] == ks)
1295 {
1296 iso14755buf = ISO_14755_51 | i[1];
1297 commit_iso14755 ();
1298 return; // case-break;
1299 }
1300
1301 scr_bell ();
1302# endif
1303 iso14755buf = 0;
1304 break;
1305 }
1306 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1307 {
1308# if ENABLE_OVERLAY
1309 scr_overlay_off ();
1310# endif
1311 if (iso14755buf & ISO_14755_51)
1312 commit_iso14755 ();
1313#if ISO_14755
1314 else if (iso14755buf & ISO_14755_STARTED)
1315 {
1316 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1317
1318 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1319 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1320 }
1321# endif
1322 else
1323 iso14755buf = 0;
1324 }
1325#endif
1326
1327#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1328 if (!(ev.xkey.state & ControlMask))
1329 slip_wheel_ev.stop ();
1330 else if (ks == XK_Control_L || ks == XK_Control_R)
1331 mouse_slip_wheel_speed = 0;
1332#endif
1333 break; 1403 break;
1334 }
1335 1404
1336 case ButtonPress: 1405 case ButtonPress:
1337 button_press (ev.xbutton); 1406 button_press (ev.xbutton);
1338 break; 1407 break;
1339 1408
… …
1341 button_release (ev.xbutton); 1410 button_release (ev.xbutton);
1342 break; 1411 break;
1343 1412
1344 case ClientMessage: 1413 case ClientMessage:
1345 if (ev.xclient.format == 32 1414 if (ev.xclient.format == 32
1346 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1415 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1347 { 1416 {
1417 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1418 {
1419 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1420 {
1348 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1421 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1422 {
1423 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1349 destroy (); 1424 destroy ();
1425 }
1350#if ENABLE_EWMH 1426#if ENABLE_EWMH
1351 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1427 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1352 XSendEvent (disp, ev.xclient.window = display->root, 1428 XSendEvent (dpy, ev.xclient.window = display->root,
1353 False, SubstructureRedirectMask | SubstructureNotifyMask, 1429 False, SubstructureRedirectMask | SubstructureNotifyMask,
1354 &ev); 1430 &ev);
1431#endif
1432 }
1433 }
1434#if ENABLE_XEMBED
1435 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1436 {
1437 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1438 focus_in ();
1439 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1440 focus_out ();
1441 }
1355#endif 1442#endif
1356 } 1443 }
1357#if ENABLE_XEMBED
1358 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1359 {
1360 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1361 focus_in ();
1362 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1363 focus_out ();
1364 }
1365#endif
1366#ifdef OFFIX_DND
1367 /* OffiX Dnd (drag 'n' drop) protocol */
1368 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1369 && (ev.xclient.data.l[0] == DndFile
1370 || ev.xclient.data.l[0] == DndDir
1371 || ev.xclient.data.l[0] == DndLink))
1372 {
1373 /* Get Dnd data */
1374 Atom ActualType;
1375 int ActualFormat;
1376 unsigned char *data;
1377 unsigned long Size, RemainingBytes;
1378
1379 XGetWindowProperty (disp, display->root,
1380 xa[XA_DNDSELECTION],
1381 0L, 1000000L,
1382 False, AnyPropertyType,
1383 &ActualType, &ActualFormat,
1384 &Size, &RemainingBytes,
1385 &data);
1386 set_string_property (XA_CUT_BUFFER0, data);
1387 XFree (data);
1388 selection_paste (display->root, XA_CUT_BUFFER0, true);
1389 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1390 }
1391#endif /* OFFIX_DND */
1392 break;
1393
1394 case MappingNotify:
1395 XRefreshKeyboardMapping (&ev.xmapping);
1396 break; 1444 break;
1397 1445
1398 /* 1446 /*
1399 * XXX: this is not the _current_ arrangement 1447 * XXX: this is not the _current_ arrangement
1400 * Here's my conclusion: 1448 * Here's my conclusion:
… …
1419 break; 1467 break;
1420 } 1468 }
1421 break; 1469 break;
1422 1470
1423 case FocusIn: 1471 case FocusIn:
1472 if (ev.xfocus.detail != NotifyInferior
1473 && ev.xfocus.detail != NotifyPointer
1474 && ev.xfocus.mode != NotifyGrab)
1424 focus_in (); 1475 focus_in ();
1425 break; 1476 break;
1426 1477
1427 case FocusOut: 1478 case FocusOut:
1479 if (ev.xfocus.detail != NotifyInferior
1480 && ev.xfocus.detail != NotifyPointer
1481 && ev.xfocus.mode != NotifyGrab)
1428 focus_out (); 1482 focus_out ();
1429 break; 1483 break;
1430 1484
1431 case ConfigureNotify: 1485 case ConfigureNotify:
1486 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1487 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1488 szHint.width, szHint.height); */
1432 if (ev.xconfigure.window == parent[0]) 1489 if (ev.xconfigure.window == parent[0])
1433 { 1490 {
1434 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1491 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1435 ; 1492 ;
1436 1493
1437 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1494 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1438 { 1495 {
1439 seen_resize = 1; 1496 seen_resize = 1;
1440 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1497 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1441 } 1498 }
1442 1499 else
1443#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1500 {
1444 if (options & Opt_transparent) 1501#ifdef HAVE_BG_PIXMAP
1445 check_our_parents (); 1502 if (bgPixmap.window_position_sensitive ())
1503 update_background ();
1446#endif 1504#endif
1505 }
1506 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1447 } 1507 }
1448 break; 1508 break;
1449 1509
1450 case PropertyNotify: 1510 case PropertyNotify:
1511 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1451 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1512 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1452 && ev.xproperty.state == PropertyNewValue) 1513 && ev.xproperty.state == PropertyNewValue)
1453 selection_property (ev.xproperty.window, ev.xproperty.atom); 1514 selection_property (ev.xproperty.window, ev.xproperty.atom);
1454 1515
1455 break; 1516 break;
1456 1517
1457 case SelectionClear: 1518 case SelectionClear:
1458 selection_clear (); 1519 selection_clear ();
… …
1463 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1524 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1464 break; 1525 break;
1465 1526
1466 case SelectionRequest: 1527 case SelectionRequest:
1467 selection_send (ev.xselectionrequest); 1528 selection_send (ev.xselectionrequest);
1529 break;
1530
1531 case MapNotify:
1532 mapped = 1;
1533#ifdef TEXT_BLINK
1534 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1535#endif
1536 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1468 break; 1537 break;
1469 1538
1470 case UnmapNotify: 1539 case UnmapNotify:
1471 mapped = 0; 1540 mapped = 0;
1472#ifdef TEXT_BLINK 1541#ifdef TEXT_BLINK
1473 text_blink_ev.stop (); 1542 text_blink_ev.stop ();
1474#endif 1543#endif
1544 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1475 break; 1545 break;
1476
1477 case MapNotify:
1478 mapped = 1;
1479#ifdef TEXT_BLINK
1480 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1481#endif
1482 break;
1483
1484#ifdef TRANSPARENT
1485 case ReparentNotify:
1486 rootwin_cb (ev);
1487 break;
1488#endif /* TRANSPARENT */
1489 1546
1490 case GraphicsExpose: 1547 case GraphicsExpose:
1491 case Expose: 1548 case Expose:
1492 if (ev.xany.window == vt) 1549 if (ev.xany.window == vt)
1493 { 1550 {
1494 do 1551 do
1552 {
1495 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1496 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1555 }
1497 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1556 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1498 1557
1499 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1558 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1500 1559
1501 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1560 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1561 {
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1562 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1563 ev.xexpose.width, ev.xexpose.height, False);
1504 1564 }
1505 scr_refresh (refresh_type); 1565 want_refresh = 1;
1506 } 1566 }
1507 else 1567 else
1508 { 1568 {
1509 XEvent unused_event; 1569 XEvent unused_event;
1510 1570
1511 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1512 ; 1572 ;
1513 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1514 ; 1574 ;
1515 1575
1516 if (isScrollbarWindow (ev.xany.window)) 1576 if (isScrollbarWindow (ev.xany.window))
1517 { 1577 {
1518 scrollBar.setIdle (); 1578 scrollBar.setIdle ();
1519 scrollbar_show (0); 1579 scrollbar_show (0);
1520 } 1580 }
1521#ifdef MENUBAR
1522 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1523 menubar_expose ();
1524#endif
1525
1526#ifdef TRANSPARENT
1527 if (am_transparent && ev.xany.window == parent[0])
1528 XClearWindow (disp, ev.xany.window);
1529#endif
1530 } 1581 }
1531 break; 1582 break;
1532 1583
1533 case MotionNotify: 1584 case MotionNotify:
1534#ifdef POINTER_BLANK 1585#ifdef POINTER_BLANK
1535 if (hidden_pointer) 1586 if (hidden_pointer)
1536 pointer_unblank (); 1587 pointer_unblank ();
1537#endif 1588#endif
1538#if MENUBAR 1589 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1539 if (isMenuBarWindow (ev.xany.window)) 1590 || priv_modes & PrivMode_MouseAnyEvent)
1540 {
1541 menubar_control (ev.xbutton); 1591 mouse_report (ev.xbutton);
1542 break;
1543 }
1544#endif
1545 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1546 break; 1593 break;
1547 1594
1548 if (ev.xany.window == vt) 1595 if (ev.xany.window == vt)
1549 { 1596 {
1597 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1598 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1599 ; // nop
1550 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1600 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1551 { 1601 {
1552 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1553 ; 1603 ;
1554 1604
1555 XQueryPointer (disp, vt, 1605 XQueryPointer (dpy, vt,
1556 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1557 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1558 &ev.xbutton.x, &ev.xbutton.y, 1608 &ev.xbutton.x, &ev.xbutton.y,
1559 &ev.xbutton.state); 1609 &ev.xbutton.state);
1560#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
… …
1624#endif 1674#endif
1625 } 1675 }
1626 } 1676 }
1627 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1628 { 1678 {
1629 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1679 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1630 MotionNotify, &ev)) 1680 MotionNotify, &ev))
1631 ; 1681 ;
1632 1682
1633 XQueryPointer (disp, scrollBar.win, 1683 XQueryPointer (dpy, scrollBar.win,
1634 &unused_root, &unused_child, 1684 &unused_root, &unused_child,
1635 &unused_root_x, &unused_root_y, 1685 &unused_root_x, &unused_root_y,
1636 &ev.xbutton.x, &ev.xbutton.y, 1686 &ev.xbutton.x, &ev.xbutton.y,
1637 &unused_mask); 1687 &unused_mask);
1638 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1639 scrollbar_size ()); 1689 scrollbar_size ());
1640 scr_refresh (refresh_type);
1641 refresh_limit = 0; 1690 want_refresh = 1;
1642 scrollbar_show (1); 1691 scrollbar_show (1);
1643 } 1692 }
1644 break; 1693 break;
1645 } 1694 }
1695
1696#if defined(CURSOR_BLINK)
1697 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1698 {
1699 if (hidden_cursor)
1700 {
1701 hidden_cursor = 0;
1702 want_refresh = 1;
1703 }
1704
1705 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1706 }
1707#endif
1708
1709#if defined(POINTER_BLANK)
1710 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1711 {
1712 if (ev.type == MotionNotify
1713 || ev.type == ButtonPress
1714 || ev.type == ButtonRelease)
1715 if (hidden_pointer)
1716 pointer_unblank ();
1717
1718 if (ev.type == KeyPress && hidden_pointer == 0)
1719 pointer_blank ();
1720 }
1721#endif
1646} 1722}
1647 1723
1648void 1724void
1649rxvt_term::focus_in () 1725rxvt_term::focus_in ()
1650{ 1726{
1651 if (!focus) 1727 if (!focus)
1652 { 1728 {
1653 focus = 1; 1729 focus = 1;
1654 want_refresh = 1; 1730 want_refresh = 1;
1731
1732 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1733
1655#if USE_XIM 1734#if USE_XIM
1656 if (Input_Context != NULL) 1735 if (Input_Context != NULL)
1657 { 1736 {
1658 IMSetStatusPosition (); 1737 IMSetPosition ();
1659 XSetICFocus (Input_Context); 1738 XSetICFocus (Input_Context);
1660 } 1739 }
1661#endif 1740#endif
1662#if CURSOR_BLINK 1741#if CURSOR_BLINK
1663 if (options & Opt_cursorBlink) 1742 if (option (Opt_cursorBlink))
1664 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1743 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1665#endif 1744#endif
1666#if OFF_FOCUS_FADING 1745#if OFF_FOCUS_FADING
1667 if (rs[Rs_fade]) 1746 if (rs[Rs_fade])
1668 { 1747 {
1669 pix_colors = pix_colors_focused; 1748 pix_colors = pix_colors_focused;
1670 scr_recolour (); 1749 scr_recolour ();
1671 } 1750 }
1672#endif 1751#endif
1752#if ENABLE_FRILLS
1753 if (option (Opt_urgentOnBell))
1754 {
1755 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1756 {
1757 h->flags &= ~XUrgencyHint;
1758 XSetWMHints (dpy, parent[0], h);
1759 }
1760 }
1761#endif
1673 } 1762 }
1674} 1763}
1675 1764
1676void 1765void
1677rxvt_term::focus_out () 1766rxvt_term::focus_out ()
… …
1679 if (focus) 1768 if (focus)
1680 { 1769 {
1681 focus = 0; 1770 focus = 0;
1682 want_refresh = 1; 1771 want_refresh = 1;
1683 1772
1773 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1774
1684#if ENABLE_FRILLS || ISO_14755 1775#if ENABLE_FRILLS || ISO_14755
1776 if (iso14755buf)
1777 {
1685 iso14755buf = 0; 1778 iso14755buf = 0;
1686#endif 1779# if ISO_14755
1687#if ENABLE_OVERLAY
1688 scr_overlay_off (); 1780 scr_overlay_off ();
1781# endif
1782 }
1689#endif 1783#endif
1690#if USE_XIM 1784#if USE_XIM
1691 if (Input_Context != NULL) 1785 if (Input_Context != NULL)
1692 XUnsetICFocus (Input_Context); 1786 XUnsetICFocus (Input_Context);
1693#endif 1787#endif
1694#if CURSOR_BLINK 1788#if CURSOR_BLINK
1695 if (options & Opt_cursorBlink) 1789 if (option (Opt_cursorBlink))
1696 cursor_blink_ev.stop (); 1790 cursor_blink_ev.stop ();
1697 hidden_cursor = 0; 1791 hidden_cursor = 0;
1698#endif 1792#endif
1699#if OFF_FOCUS_FADING 1793#if OFF_FOCUS_FADING
1700 if (rs[Rs_fade]) 1794 if (rs[Rs_fade])
… …
1704 } 1798 }
1705#endif 1799#endif
1706 } 1800 }
1707} 1801}
1708 1802
1709#if TRANSPARENT 1803void
1804rxvt_term::update_fade_color (unsigned int idx)
1805{
1806#if OFF_FOCUS_FADING
1807 if (rs[Rs_fade])
1808 {
1809 rgba c;
1810 pix_colors [Color_fade].get (c);
1811 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1812 }
1813#endif
1814}
1815
1816#if ENABLE_TRANSPARENCY || ENABLE_PERL
1710void 1817void
1711rxvt_term::rootwin_cb (XEvent &ev) 1818rxvt_term::rootwin_cb (XEvent &ev)
1712{ 1819{
1713 SET_R (this); 1820 make_current ();
1714 SET_LOCALE (locale);
1715 1821
1822 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1823 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1824 return;
1825
1826# if ENABLE_TRANSPARENCY
1716 switch (ev.type) 1827 switch (ev.type)
1717 { 1828 {
1718 case PropertyNotify: 1829 case PropertyNotify:
1719 /* 1830 /*
1720 * if user used some Esetroot compatible prog to set the root bg, 1831 * if user used some Esetroot compatible prog to set the root bg,
1721 * use the property to determine the pixmap. We use it later on. 1832 * use the property to determine the pixmap. We use it later on.
1722 */ 1833 */
1723 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1724 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1725 return; 1836 {
1726 1837 bgPixmap.set_root_pixmap ();
1727 /* FALLTHROUGH */ 1838 update_background ();
1728 case ReparentNotify: 1839 }
1729 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1730 want_refresh = want_full_refresh = 1;
1731 break; 1840 break;
1732 } 1841 }
1842# endif
1733} 1843}
1734#endif 1844#endif
1735 1845
1736void 1846void
1737rxvt_term::button_press (XButtonEvent &ev) 1847rxvt_term::button_press (XButtonEvent &ev)
1738{ 1848{
1739 int reportmode = 0, clickintime; 1849 int reportmode = 0, clickintime;
1740 1850
1741 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1851 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1852
1742 if (!bypass_keystate) 1853 if (!bypass_keystate)
1743 reportmode = !! (priv_modes & PrivMode_mouse_report); 1854 reportmode = !! (priv_modes & PrivMode_mouse_report);
1744 1855
1745 /* 1856 /*
1746 * VT window processing of button press 1857 * VT window processing of button press
1747 */ 1858 */
1748 if (ev.window == vt) 1859 if (ev.window == vt)
1749 { 1860 {
1861 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1862 return;
1863
1750#if ISO_14755 1864#if ISO_14755
1751 // 5.4 1865 // 5.4
1752 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1866 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1753 { 1867 {
1754 iso14755_54 (ev.x, ev.y); 1868 iso14755_54 (ev.x, ev.y);
… …
1766#ifdef MOUSE_REPORT_DOUBLECLICK 1880#ifdef MOUSE_REPORT_DOUBLECLICK
1767 if (ev.button == MEvent.button && clickintime) 1881 if (ev.button == MEvent.button && clickintime)
1768 { 1882 {
1769 /* same button, within alloted time */ 1883 /* same button, within alloted time */
1770 MEvent.clicks++; 1884 MEvent.clicks++;
1885
1771 if (MEvent.clicks > 1) 1886 if (MEvent.clicks > 1)
1772 { 1887 {
1773 /* only report double clicks */ 1888 /* only report double clicks */
1774 MEvent.clicks = 2; 1889 MEvent.clicks = 2;
1775 mouse_report (ev); 1890 mouse_report (ev);
… …
1807#else 1922#else
1808 selection.rect = false; 1923 selection.rect = false;
1809#endif 1924#endif
1810 1925
1811 /* allow shift+left click to extend selection */ 1926 /* allow shift+left click to extend selection */
1812 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1927 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1813 { 1928 {
1814 if (MEvent.button == Button1 && clickintime) 1929 if (MEvent.button == Button1 && clickintime)
1815 selection_rotate (ev.x, ev.y); 1930 selection_rotate (ev.x, ev.y);
1816 else 1931 else
1817 selection_extend (ev.x, ev.y, 1); 1932 selection_extend (ev.x, ev.y, 1);
… …
1982 } 2097 }
1983 2098
1984 break; 2099 break;
1985 } 2100 }
1986 } 2101 }
2102
1987 return; 2103 return;
1988 } 2104 }
1989#if MENUBAR
1990 /*
1991 * Menubar window processing of button press
1992 */
1993 if (isMenuBarWindow (ev.window))
1994 menubar_control (ev);
1995#endif
1996} 2105}
1997 2106
1998void 2107void
1999rxvt_term::button_release (XButtonEvent &ev) 2108rxvt_term::button_release (XButtonEvent &ev)
2000{ 2109{
… …
2006 2115
2007 if (scrollbar_isUpDn ()) 2116 if (scrollbar_isUpDn ())
2008 { 2117 {
2009 scrollBar.setIdle (); 2118 scrollBar.setIdle ();
2010 scrollbar_show (0); 2119 scrollbar_show (0);
2011#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2012 refresh_type &= ~SMOOTH_REFRESH;
2013#endif
2014 } 2120 }
2015 2121
2016#ifdef SELECTION_SCROLLING 2122#ifdef SELECTION_SCROLLING
2017 if (sel_scroll_ev.active) 2123 if (sel_scroll_ev.active)
2018 sel_scroll_ev.stop(); 2124 sel_scroll_ev.stop();
2019#endif 2125#endif
2020 2126
2021 if (ev.window == vt) 2127 if (ev.window == vt)
2022 { 2128 {
2129 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2130 return;
2131
2023#if ISO_14755 2132#if ISO_14755
2024 // 5.4 2133 // 5.4
2025 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2134 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2026 return; 2135 return;
2027#endif 2136#endif
2137
2028 if (reportmode) 2138 if (reportmode)
2029 { 2139 {
2030 /* mouse report from vt window */ 2140 /* mouse report from vt window */
2031 /* don't report release of wheel "buttons" */ 2141 /* don't report release of wheel "buttons" */
2032 if (ev.button >= 4) 2142 if (ev.button >= 4)
… …
2062 { 2172 {
2063 case Button1: 2173 case Button1:
2064 case Button3: 2174 case Button3:
2065 selection_make (ev.time); 2175 selection_make (ev.time);
2066 break; 2176 break;
2177
2067 case Button2: 2178 case Button2:
2068 selection_request (ev.time, ev.x, ev.y); 2179 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2180 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2069 break; 2181 break;
2182
2070#ifdef MOUSE_WHEEL 2183#ifdef MOUSE_WHEEL
2071 case Button4: 2184 case Button4:
2072 case Button5: 2185 case Button5:
2073 { 2186 {
2074 int i; 2187 int i;
… …
2076 2189
2077 v = ev.button == Button4 ? UP : DN; 2190 v = ev.button == Button4 ? UP : DN;
2078 2191
2079 if (ev.state & ShiftMask) 2192 if (ev.state & ShiftMask)
2080 i = 1; 2193 i = 1;
2081 else if (options & Opt_mouseWheelScrollPage) 2194 else if (option (Opt_mouseWheelScrollPage))
2082 i = nrow - 1; 2195 i = nrow - 1;
2083 else 2196 else
2084 i = 5; 2197 i = 5;
2085 2198
2086# ifdef MOUSE_SLIP_WHEELING 2199# ifdef MOUSE_SLIP_WHEELING
… …
2096 slip_wheel_ev.start (); 2209 slip_wheel_ev.start ();
2097 } 2210 }
2098 else 2211 else
2099 { 2212 {
2100# endif 2213# endif
2101# ifdef JUMP_MOUSE_WHEEL
2102 scr_page (v, i); 2214 scr_page (v, i);
2103 scr_refresh (SMOOTH_REFRESH);
2104 scrollbar_show (1); 2215 scrollbar_show (1);
2105# else
2106 while (i--)
2107 {
2108 scr_page (v, 1);
2109 scr_refresh (SMOOTH_REFRESH);
2110 scrollbar_show (1);
2111 }
2112# endif
2113# ifdef MOUSE_SLIP_WHEELING 2216# ifdef MOUSE_SLIP_WHEELING
2114 } 2217 }
2115#endif 2218# endif
2116 } 2219 }
2117 break; 2220 break;
2118#endif 2221#endif
2119 } 2222 }
2120 } 2223 }
2121#ifdef MENUBAR
2122 else if (isMenuBarWindow (ev.window))
2123 menubar_control (ev);
2124#endif
2125} 2224}
2126
2127#ifdef TRANSPARENT
2128#if TINTING
2129/* taken from aterm-0.4.2 */
2130
2131typedef uint32_t RUINT32T;
2132
2133void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2134{
2135 int sh_r, sh_g, sh_b;
2136 RUINT32T mask_r, mask_g, mask_b;
2137 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2138 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2139 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2140 int i;
2141
2142 Visual *visual = display->visual;
2143
2144 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2145
2146 /* for convenience */
2147 mask_r = visual->red_mask;
2148 mask_g = visual->green_mask;
2149 mask_b = visual->blue_mask;
2150
2151 /* boring lookup table pre-initialization */
2152 switch (srcImage->bits_per_pixel) {
2153 case 15:
2154 if ((mask_r != 0x7c00) ||
2155 (mask_g != 0x03e0) ||
2156 (mask_b != 0x001f))
2157 return;
2158 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2159 lookup_r = lookup;
2160 lookup_g = lookup+32;
2161 lookup_b = lookup+32+32;
2162 sh_r = 10;
2163 sh_g = 5;
2164 sh_b = 0;
2165 break;
2166 case 16:
2167 if ((mask_r != 0xf800) ||
2168 (mask_g != 0x07e0) ||
2169 (mask_b != 0x001f))
2170 return;
2171 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2172 lookup_r = lookup;
2173 lookup_g = lookup+32;
2174 lookup_b = lookup+32+64;
2175 sh_r = 11;
2176 sh_g = 5;
2177 sh_b = 0;
2178 break;
2179 case 24:
2180 if ((mask_r != 0xff0000) ||
2181 (mask_g != 0x00ff00) ||
2182 (mask_b != 0x0000ff))
2183 return;
2184 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2185 lookup_r = lookup;
2186 lookup_g = lookup+256;
2187 lookup_b = lookup+256+256;
2188 sh_r = 16;
2189 sh_g = 8;
2190 sh_b = 0;
2191 break;
2192 case 32:
2193 if ((mask_r != 0xff0000) ||
2194 (mask_g != 0x00ff00) ||
2195 (mask_b != 0x0000ff))
2196 return;
2197 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2198 lookup_r = lookup;
2199 lookup_g = lookup+256;
2200 lookup_b = lookup+256+256;
2201 sh_r = 16;
2202 sh_g = 8;
2203 sh_b = 0;
2204 break;
2205 default:
2206 return; /* we do not support this color depth */
2207 }
2208
2209 /* prepare limits for color transformation (each channel is handled separately) */
2210 if (shade < 0) {
2211 shade = -shade;
2212 if (shade < 0) shade = 0;
2213 if (shade > 100) shade = 100;
2214
2215 lower_lim_r = 65535-rm;
2216 lower_lim_g = 65535-gm;
2217 lower_lim_b = 65535-bm;
2218
2219 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2220 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2221 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2222
2223 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2224 } else {
2225 if (shade < 0) shade = 0;
2226 if (shade > 100) shade = 100;
2227
2228 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2229
2230 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2231 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2232 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2233 }
2234
2235 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2236 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2237 {
2238 unsigned int tmp;
2239
2240 tmp = lower_lim_r;
2241 lower_lim_r = lower_lim_b;
2242 lower_lim_b = tmp;
2243
2244 tmp = upper_lim_r;
2245 upper_lim_r = upper_lim_b;
2246 upper_lim_b = tmp;
2247 }
2248
2249 /* fill our lookup tables */
2250 for (i = 0; i <= mask_r>>sh_r; i++)
2251 {
2252 RUINT32T tmp;
2253 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2254 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2255 lookup_r[i] = (tmp/65535)<<sh_r;
2256 }
2257 for (i = 0; i <= mask_g>>sh_g; i++)
2258 {
2259 RUINT32T tmp;
2260 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2261 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2262 lookup_g[i] = (tmp/65535)<<sh_g;
2263 }
2264 for (i = 0; i <= mask_b>>sh_b; i++)
2265 {
2266 RUINT32T tmp;
2267 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2268 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2269 lookup_b[i] = (tmp/65535)<<sh_b;
2270 }
2271
2272 /* apply table to input image (replacing colors by newly calculated ones) */
2273 switch (srcImage->bits_per_pixel)
2274 {
2275 case 15:
2276 {
2277 unsigned short *p1, *pf, *p, *pl;
2278 p1 = (unsigned short *) srcImage->data;
2279 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2280 while (p1 < pf)
2281 {
2282 p = p1;
2283 pl = p1 + srcImage->width;
2284 for (; p < pl; p++)
2285 {
2286 *p = lookup_r[(*p & 0x7c00)>>10] |
2287 lookup_g[(*p & 0x03e0)>> 5] |
2288 lookup_b[(*p & 0x001f)];
2289 }
2290 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2291 }
2292 break;
2293 }
2294 case 16:
2295 {
2296 unsigned short *p1, *pf, *p, *pl;
2297 p1 = (unsigned short *) srcImage->data;
2298 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2299 while (p1 < pf)
2300 {
2301 p = p1;
2302 pl = p1 + srcImage->width;
2303 for (; p < pl; p++)
2304 {
2305 *p = lookup_r[(*p & 0xf800)>>11] |
2306 lookup_g[(*p & 0x07e0)>> 5] |
2307 lookup_b[(*p & 0x001f)];
2308 }
2309 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2310 }
2311 break;
2312 }
2313 case 24:
2314 {
2315 unsigned char *p1, *pf, *p, *pl;
2316 p1 = (unsigned char *) srcImage->data;
2317 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2318 while (p1 < pf)
2319 {
2320 p = p1;
2321 pl = p1 + srcImage->width * 3;
2322 for (; p < pl; p += 3)
2323 {
2324 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2325 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2326 p[2] = lookup_r[(p[2] & 0x0000ff)];
2327 }
2328 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2329 }
2330 break;
2331 }
2332 case 32:
2333 {
2334 RUINT32T *p1, *pf, *p, *pl;
2335 p1 = (RUINT32T *) srcImage->data;
2336 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2337
2338 while (p1 < pf)
2339 {
2340 p = p1;
2341 pl = p1 + srcImage->width;
2342 for (; p < pl; p++)
2343 {
2344 *p = lookup_r[(*p & 0xff0000)>>16] |
2345 lookup_g[(*p & 0x00ff00)>> 8] |
2346 lookup_b[(*p & 0x0000ff)] |
2347 (*p & ~0xffffff);
2348 }
2349 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2350 }
2351 break;
2352 }
2353 }
2354
2355 free (lookup);
2356}
2357#endif
2358
2359/*
2360 * Check our parents are still who we think they are.
2361 * Do transparency updates if required
2362 */
2363int
2364rxvt_term::check_our_parents ()
2365{
2366 int i, pchanged, aformat, have_pixmap, rootdepth;
2367 unsigned long nitems, bytes_after;
2368 Atom atype;
2369 unsigned char *prop = NULL;
2370 Window root, oldp, *list;
2371 Pixmap rootpixmap = None;
2372 XWindowAttributes wattr, wrootattr;
2373 dDisp;
2374
2375 pchanged = 0;
2376
2377 if (!(options & Opt_transparent))
2378 return pchanged; /* Don't try any more */
2379
2380 XGetWindowAttributes (disp, display->root, &wrootattr);
2381 rootdepth = wrootattr.depth;
2382
2383 XGetWindowAttributes (disp, parent[0], &wattr);
2384
2385 if (rootdepth != wattr.depth)
2386 {
2387 if (am_transparent)
2388 {
2389 pchanged = 1;
2390 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2391 am_transparent = am_pixmap_trans = 0;
2392 }
2393
2394 return pchanged; /* Don't try any more */
2395 }
2396
2397 /* Get all X ops out of the queue so that our information is up-to-date. */
2398 XSync (disp, False);
2399
2400 /*
2401 * Make the frame window set by the window manager have
2402 * the root background. Some window managers put multiple nested frame
2403 * windows for each client, so we have to take care about that.
2404 */
2405 i = (xa[XA_XROOTPMAP_ID]
2406 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2407 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2408 &nitems, &bytes_after, &prop) == Success);
2409
2410 if (!i || prop == NULL)
2411 i = (xa[XA_ESETROOT_PMAP_ID]
2412 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2413 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2414 &nitems, &bytes_after, &prop) == Success);
2415
2416 if (!i || prop == NULL
2417#if TINTING
2418 || !rs[Rs_color + Color_tint]
2419#endif
2420 )
2421 have_pixmap = 0;
2422 else
2423 {
2424 have_pixmap = 1;
2425 rootpixmap = *(Pixmap *)prop;
2426 XFree (prop);
2427 }
2428
2429 if (have_pixmap)
2430 {
2431 /*
2432 * Copy display->root pixmap transparency
2433 */
2434 int sx, sy, nx, ny;
2435 unsigned int nw, nh;
2436 Window cr;
2437 XImage *image;
2438 GC gc;
2439 XGCValues gcvalue;
2440
2441 XTranslateCoordinates (disp, parent[0], display->root,
2442 0, 0, &sx, &sy, &cr);
2443 nw = (unsigned int)szHint.width;
2444 nh = (unsigned int)szHint.height;
2445 nx = ny = 0;
2446
2447 if (sx < 0)
2448 {
2449 nw += sx;
2450 nx = -sx;
2451 sx = 0;
2452 }
2453
2454 if (sy < 0)
2455 {
2456 nh += sy;
2457 ny = -sy;
2458 sy = 0;
2459 }
2460
2461 min_it (nw, (unsigned int) (wrootattr.width - sx));
2462 min_it (nh, (unsigned int) (wrootattr.height - sy));
2463
2464 XSync (disp, False);
2465 allowedxerror = -1;
2466 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2467
2468 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2469 /* XXX: may need a delay here? */
2470 allowedxerror = 0;
2471
2472 if (image == NULL)
2473 {
2474 if (am_transparent && am_pixmap_trans)
2475 {
2476 pchanged = 1;
2477 if (pixmap != None)
2478 {
2479 XFreePixmap (disp, pixmap);
2480 pixmap = None;
2481 }
2482 }
2483
2484 am_pixmap_trans = 0;
2485 }
2486 else
2487 {
2488 if (pixmap != None)
2489 XFreePixmap (disp, pixmap);
2490
2491#if TINTING
2492 if (ISSET_PIXCOLOR (Color_tint))
2493 {
2494 unsigned short rm, gm, bm;
2495 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2496
2497 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2498
2499 ShadeXImage (display, image, shade, rm, gm, bm);
2500 }
2501#endif
2502
2503 pixmap = XCreatePixmap (disp, vt,
2504 szHint.width, szHint.height, image->depth);
2505 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2506 XPutImage (disp, pixmap, gc, image, 0, 0,
2507 nx, ny, image->width, image->height);
2508 XFreeGC (disp, gc);
2509 XDestroyImage (image);
2510 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2511 XClearWindow (disp, parent[0]);
2512
2513 if (!am_transparent || !am_pixmap_trans)
2514 pchanged = 1;
2515
2516 am_transparent = am_pixmap_trans = 1;
2517 }
2518 }
2519
2520 if (am_pixmap_trans)
2521 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2522 else
2523 {
2524 unsigned int n;
2525 /*
2526 * InheritPixmap transparency
2527 */
2528 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2529 {
2530 oldp = parent[i];
2531 XQueryTree (disp, parent[i - 1], &root,
2532 &parent[i], &list, &n);
2533 XFree (list);
2534
2535 if (parent[i] == display->root)
2536 {
2537 if (oldp != None)
2538 pchanged = 1;
2539
2540 break;
2541 }
2542
2543 if (oldp != parent[i])
2544 pchanged = 1;
2545 }
2546
2547 n = 0;
2548
2549 if (pchanged)
2550 {
2551 for (; n < (unsigned int)i; n++)
2552 {
2553 XGetWindowAttributes (disp, parent[n], &wattr);
2554 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2555 {
2556 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2557 break;
2558 }
2559 }
2560 }
2561
2562 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2563 {
2564 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2565 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2566 am_transparent = 0;
2567 /* XXX: also turn off Opt_transparent? */
2568 }
2569 else
2570 {
2571#if WAIT_FOR_WM
2572 /* wait (an arbitrary period) for the WM to do its thing
2573 * needed for fvwm2.2.2 (and before?) */
2574 sleep (1);
2575#endif
2576 for (n = 0; n < (unsigned int)i; n++)
2577 {
2578 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2579 XClearWindow (disp, parent[n]);
2580 }
2581
2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2583 am_transparent = 1;
2584 }
2585
2586 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2587 parent[i] = None;
2588 }
2589
2590 if (scrollBar.win)
2591 {
2592 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2593 scrollBar.setIdle ();
2594 scrollbar_show (0);
2595 }
2596
2597 if (am_transparent)
2598 {
2599 want_refresh = want_full_refresh = 1;
2600 if (am_pixmap_trans)
2601 flush ();
2602 }
2603
2604 return pchanged;
2605}
2606#endif
2607 2225
2608/*}}} */ 2226/*}}} */
2609 2227
2610bool 2228bool
2611rxvt_term::cmd_parse () 2229rxvt_term::cmd_parse ()
2612{ 2230{
2613 bool flag = false; 2231 bool flag = false;
2614 unicode_t ch = NOCHAR; 2232 wchar_t ch = NOCHAR;
2615 unsigned char *seq_begin; // remember start of esc-sequence here 2233 char *seq_begin; // remember start of esc-sequence here
2616 2234
2617 for (;;) 2235 for (;;)
2618 { 2236 {
2619 if (ch == NOCHAR) 2237 if (ch == NOCHAR)
2620 { 2238 {
2621 seq_begin = cmdbuf_ptr; 2239 seq_begin = cmdbuf_ptr;
2622 ch = next_char (); 2240 ch = next_char ();
2623 }
2624 2241
2625 if (ch == NOCHAR) // TODO: improve 2242 if (ch == NOCHAR)
2626 break; 2243 break;
2244 }
2627 2245
2628 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2246 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2629 { 2247 {
2630 if (!seen_input) 2248 if (!seen_input)
2631 { 2249 {
… …
2640 if (seen_resize && cmd_pid) 2258 if (seen_resize && cmd_pid)
2641 kill (-cmd_pid, SIGWINCH); 2259 kill (-cmd_pid, SIGWINCH);
2642 } 2260 }
2643 2261
2644 /* Read a text string from the input buffer */ 2262 /* Read a text string from the input buffer */
2645 unicode_t buf[UBUFSIZ]; 2263 wchar_t buf[UBUFSIZ];
2646 bool refreshnow = false; 2264 bool refreshnow = false;
2647 int nlines = 0; 2265 int nlines = 0;
2648 unicode_t *str = buf; 2266 wchar_t *str = buf;
2649 unicode_t *eol = str + min (ncol, UBUFSIZ); 2267 wchar_t *eol = str + min (ncol, UBUFSIZ);
2650 2268
2651 for (;;) 2269 for (;;)
2652 { 2270 {
2653 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2271 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2654 break; 2272 break;
… …
2660 if (ch == C0_LF) 2278 if (ch == C0_LF)
2661 nlines++; 2279 nlines++;
2662 2280
2663 refresh_count++; 2281 refresh_count++;
2664 2282
2665 if (!(options & Opt_jumpScroll) 2283 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2666 || (refresh_count >= refresh_limit * (nrow - 1)))
2667 { 2284 {
2285 refresh_count = 0;
2286
2287 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2288 {
2668 refreshnow = true; 2289 refreshnow = true;
2669 ch = NOCHAR; 2290 ch = NOCHAR;
2670 break; 2291 break;
2292 }
2671 } 2293 }
2672 2294
2673 // scr_add_lines only works for nlines <= nrow - 1. 2295 // scr_add_lines only works for nlines <= nrow - 1.
2674 if (nlines >= nrow - 1) 2296 if (nlines >= nrow - 1)
2675 { 2297 {
2298 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2299 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2676 scr_add_lines (buf, nlines, str - buf); 2300 scr_add_lines (buf, str - buf, nlines);
2301
2677 nlines = 0; 2302 nlines = 0;
2678 str = buf; 2303 str = buf;
2679 eol = str + min (ncol, UBUFSIZ); 2304 eol = str + min (ncol, UBUFSIZ);
2680 } 2305 }
2681 2306
… …
2694 2319
2695 seq_begin = cmdbuf_ptr; 2320 seq_begin = cmdbuf_ptr;
2696 ch = next_char (); 2321 ch = next_char ();
2697 } 2322 }
2698 2323
2324 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2325 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2699 scr_add_lines (buf, nlines, str - buf); 2326 scr_add_lines (buf, str - buf, nlines);
2700 2327
2701 /* 2328 /*
2702 * If there have been a lot of new lines, then update the screen 2329 * If there have been a lot of new lines, then update the screen
2703 * What the heck I'll cheat and only refresh less than every page-full. 2330 * What the heck we'll cheat and only refresh less than every page-full.
2704 * the number of pages between refreshes is refresh_limit, which 2331 * if skipScroll is enabled.
2705 * is incremented here because we must be doing flat-out scrolling.
2706 */ 2332 */
2707 if (refreshnow) 2333 if (refreshnow)
2708 { 2334 {
2709 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2710 refresh_limit++;
2711 else
2712 {
2713 flag = true; 2335 flag = true;
2714 scr_refresh (refresh_type); 2336 scr_refresh ();
2715 } 2337 want_refresh = 1;
2716 } 2338 }
2717 2339
2718 } 2340 }
2719 else 2341 else
2720 { 2342 {
… …
2734 } 2356 }
2735 2357
2736 return flag; 2358 return flag;
2737} 2359}
2738 2360
2739// read the next octet
2740unicode_t
2741rxvt_term::next_octet ()
2742{
2743 return cmdbuf_ptr < cmdbuf_endp
2744 ? *cmdbuf_ptr++
2745 : NOCHAR;
2746}
2747
2748// read the next character 2361// read the next character
2749unicode_t 2362wchar_t
2750rxvt_term::next_char () 2363rxvt_term::next_char () NOTHROW
2751{ 2364{
2752 while (cmdbuf_ptr < cmdbuf_endp) 2365 while (cmdbuf_ptr < cmdbuf_endp)
2753 { 2366 {
2754 // assume 7-bit to be ascii ALWAYS 2367 // assume 7-bit to be ascii ALWAYS
2755 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2368 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2756 return *cmdbuf_ptr++; 2369 return *cmdbuf_ptr++;
2757 2370
2758 wchar_t wc; 2371 wchar_t wc;
2759 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2372 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2760 2373
2761 if (len == (size_t)-2) 2374 if (len == (size_t)-2)
2762 { 2375 {
2763 // the mbstate stores incomplete sequences. didn't know this :/ 2376 // the mbstate stores incomplete sequences. didn't know this :/
2764 cmdbuf_ptr = cmdbuf_endp; 2377 cmdbuf_ptr = cmdbuf_endp;
2765 break; 2378 break;
2766 } 2379 }
2767 2380
2768 if (len == (size_t)-1) 2381 if (len == (size_t)-1)
2769 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2382 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2770 2383
2771 // assume wchar == unicode 2384 // assume wchar == unicode
2772 cmdbuf_ptr += len; 2385 cmdbuf_ptr += len;
2773 return wc & UNICODE_MASK; 2386 return wc & UNICODE_MASK;
2774 } 2387 }
2775 2388
2776 return NOCHAR; 2389 return NOCHAR;
2777} 2390}
2391
2392// read the next octet
2393uint32_t
2394rxvt_term::next_octet () NOTHROW
2395{
2396 return cmdbuf_ptr < cmdbuf_endp
2397 ? (unsigned char)*cmdbuf_ptr++
2398 : NOCHAR;
2399}
2400
2401static class out_of_input out_of_input;
2778 2402
2779/* rxvt_cmd_getc () - Return next input character */ 2403/* rxvt_cmd_getc () - Return next input character */
2780/* 2404/*
2781 * Return the next input character after first passing any keyboard input 2405 * Return the next input character after first passing any keyboard input
2782 * to the command. 2406 * to the command.
2783 */ 2407 */
2784unicode_t 2408wchar_t
2785rxvt_term::cmd_getc () 2409rxvt_term::cmd_getc () THROW ((class out_of_input))
2786{ 2410{
2787 unicode_t c = next_char (); 2411 wchar_t c = next_char ();
2788 2412
2789 if (c == NOCHAR) 2413 if (c == NOCHAR)
2790 throw out_of_input; 2414 throw out_of_input;
2791 2415
2792 return c; 2416 return c;
2793} 2417}
2794 2418
2795unicode_t 2419uint32_t
2796rxvt_term::cmd_get8 () 2420rxvt_term::cmd_get8 () THROW ((class out_of_input))
2797{ 2421{
2798 unicode_t c = next_octet (); 2422 uint32_t c = next_octet ();
2799 2423
2800 if (c == NOCHAR) 2424 if (c == NOCHAR)
2801 throw out_of_input; 2425 throw out_of_input;
2802 2426
2803 return c; 2427 return c;
… …
2867 { 2491 {
2868 if ((buf[len++] = cmd_getc ()) == 'i') 2492 if ((buf[len++] = cmd_getc ()) == 'i')
2869 break; /* done = 1 */ 2493 break; /* done = 1 */
2870 } 2494 }
2871 } 2495 }
2872 2496
2873 for (i = 0; i < len; i++) 2497 for (i = 0; i < len; i++)
2874 if (putc (buf[i], fd) == EOF) 2498 if (putc (buf[i], fd) == EOF)
2875 { 2499 {
2876 done = 1; 2500 done = 1;
2877 break; 2501 break;
… …
2903 case C0_ESC: 2527 case C0_ESC:
2904 process_escape_seq (); 2528 process_escape_seq ();
2905 break; 2529 break;
2906 case C0_ENQ: /* terminal Status */ 2530 case C0_ENQ: /* terminal Status */
2907 if (rs[Rs_answerbackstring]) 2531 if (rs[Rs_answerbackstring])
2908 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2532 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2909 (unsigned int)strlen (rs[Rs_answerbackstring]));
2910 else 2533 else
2911 tt_write ((unsigned char *)VT100_ANS, 2534 tt_write (VT100_ANS, strlen (VT100_ANS));
2912 (unsigned int)strlen (VT100_ANS));
2913 break; 2535 break;
2914 case C0_BEL: /* bell */ 2536 case C0_BEL: /* bell */
2915 scr_bell (); 2537 scr_bell ();
2916 break; 2538 break;
2917 case C0_BS: /* backspace */ 2539 case C0_BS: /* backspace */
… …
2941 process_dcs_seq (); 2563 process_dcs_seq ();
2942 break; 2564 break;
2943 case 0x9b: /* CSI */ 2565 case 0x9b: /* CSI */
2944 process_csi_seq (); 2566 process_csi_seq ();
2945 break; 2567 break;
2946 case 0x9d: /* CSI */ 2568 case 0x9d: /* OSC */
2947 process_osc_seq (); 2569 process_osc_seq ();
2948 break; 2570 break;
2949#endif 2571#endif
2950 } 2572 }
2951} 2573}
… …
3041 scr_charset_set (2, (unsigned int)cmd_getc ()); 2663 scr_charset_set (2, (unsigned int)cmd_getc ());
3042 break; 2664 break;
3043 case '+': 2665 case '+':
3044 scr_charset_set (3, (unsigned int)cmd_getc ()); 2666 scr_charset_set (3, (unsigned int)cmd_getc ());
3045 break; 2667 break;
3046#if ENABLE_FRILLS 2668#if !ENABLE_MINIMAL
3047 case '6': 2669 case '6':
3048 scr_backindex (); 2670 scr_backindex ();
3049 break; 2671 break;
3050#endif 2672#endif
3051 case '7': 2673 case '7':
3052 scr_cursor (SAVE); 2674 scr_cursor (SAVE);
3053 break; 2675 break;
3054 case '8': 2676 case '8':
3055 scr_cursor (RESTORE); 2677 scr_cursor (RESTORE);
3056 break; 2678 break;
3057#if ENABLE_FRILLS 2679#if !ENABLE_MINIMAL
3058 case '9': 2680 case '9':
3059 scr_forwardindex (); 2681 scr_forwardindex ();
3060 break; 2682 break;
3061#endif 2683#endif
3062 case '=': 2684 case '=':
… …
3072 break; 2694 break;
3073 2695
3074 /* 8.3.87: NEXT LINE */ 2696 /* 8.3.87: NEXT LINE */
3075 case C1_NEL: /* ESC E */ 2697 case C1_NEL: /* ESC E */
3076 { 2698 {
3077 unicode_t nlcr[] = { C0_LF, C0_CR }; 2699 wchar_t nlcr[] = { C0_LF, C0_CR };
3078 scr_add_lines (nlcr, 1, 2); 2700 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3079 } 2701 }
3080 break; 2702 break;
3081 2703
3082 /* kidnapped escape sequence: Should be 8.3.48 */ 2704 /* kidnapped escape sequence: Should be 8.3.48 */
3083 case C1_ESA: /* ESC G */ 2705 case C1_ESA: /* ESC G */
… …
3105 process_dcs_seq (); 2727 process_dcs_seq ();
3106 break; 2728 break;
3107 2729
3108 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2730 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3109 case C1_SCI: /* ESC Z */ 2731 case C1_SCI: /* ESC Z */
3110 tt_write ((const unsigned char *)ESCZ_ANSWER, 2732 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3111 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3112 break; /* steal obsolete ESC [ c */ 2733 break; /* steal obsolete ESC [ c */
3113 2734
3114 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2735 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3115 case C1_CSI: /* ESC [ */ 2736 case C1_CSI: /* ESC [ */
3116 process_csi_seq (); 2737 process_csi_seq ();
… …
3178rxvt_term::process_csi_seq () 2799rxvt_term::process_csi_seq ()
3179{ 2800{
3180 unicode_t ch, priv, i; 2801 unicode_t ch, priv, i;
3181 unsigned int nargs, p; 2802 unsigned int nargs, p;
3182 int n, ndef; 2803 int n, ndef;
3183 int arg[ESC_ARGS]; 2804 int arg[ESC_ARGS] = { };
3184 2805
3185 for (nargs = ESC_ARGS; nargs > 0;) 2806 nargs = 0;
3186 arg[--nargs] = 0;
3187 2807
3188 priv = 0; 2808 priv = 0;
3189 ch = cmd_getc (); 2809 ch = cmd_getc ();
3190 if (ch >= '<' && ch <= '?') 2810 if (ch >= '<' && ch <= '?')
3191 { /* '<' '=' '>' '?' */ 2811 { /* '<' '=' '>' '?' */
… …
3225 ndef = get_byte_array_bit (csi_defaults, i); 2845 ndef = get_byte_array_bit (csi_defaults, i);
3226 for (p = 0; p < nargs; p++) 2846 for (p = 0; p < nargs; p++)
3227 if (arg[p] == -1) 2847 if (arg[p] == -1)
3228 arg[p] = ndef; 2848 arg[p] = ndef;
3229 2849
3230#ifdef DEBUG_CMD
3231 fprintf (stderr, "CSI ");
3232 for (p = 0; p < nargs; p++)
3233 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3234 fprintf (stderr, "%c\n", ch);
3235#endif
3236
3237 /* 2850 /*
3238 * private mode handling 2851 * private mode handling
3239 */ 2852 */
3240 if (priv) 2853 if (priv)
3241 { 2854 {
3242 switch (priv) 2855 switch (priv)
3243 { 2856 {
3244 case '>': 2857 case '>':
3245 if (ch == CSI_DA) /* secondary device attributes */ 2858 if (ch == CSI_DA) /* secondary device attributes */
3246 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2859 {
2860 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2861 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2862 //
2863 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2864 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2865 // versions.
2866 //
2867 tt_printf ("\033[>%d;95;0c", 'U');
2868 }
3247 break; 2869 break;
3248 case '?': 2870 case '?':
3249 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2871 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3250 process_terminal_mode (ch, priv, nargs, arg); 2872 process_terminal_mode (ch, priv, nargs, arg);
3251 break; 2873 break;
… …
3360 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2982 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3361 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 2983 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3362 break; 2984 break;
3363 2985
3364 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2986 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3365 tt_write ((const unsigned char *)VT100_ANS, 2987 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3366 (unsigned int) (sizeof (VT100_ANS) - 1));
3367 break; 2988 break;
3368 2989
3369 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2990 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3370 process_sgr_mode (nargs, arg); 2991 process_sgr_mode (nargs, arg);
3371 break; 2992 break;
… …
3378 break; 2999 break;
3379 case 6: /* CPR requested */ 3000 case 6: /* CPR requested */
3380 scr_report_position (); 3001 scr_report_position ();
3381 break; 3002 break;
3382 case 7: /* unofficial extension */ 3003 case 7: /* unofficial extension */
3383 if (options & Opt_insecure) 3004 if (option (Opt_insecure))
3384 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3005 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3385 break; 3006 break;
3386 case 8: /* unofficial extension */ 3007 case 8: /* unofficial extension */
3387 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3008 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3388 break; 3009 break;
… …
3455 break; 3076 break;
3456 case CSI_75: 3077 case CSI_75:
3457 scr_cursor (RESTORE); 3078 scr_cursor (RESTORE);
3458 break; 3079 break;
3459 3080
3460#if ENABLE_FRILLS 3081#if !ENABLE_MINIMAL
3461 case CSI_74: 3082 case CSI_74:
3462 process_window_ops (arg, nargs); 3083 process_window_ops (arg, nargs);
3463 break; 3084 break;
3464#endif 3085#endif
3465 3086
… …
3472 break; 3093 break;
3473 } 3094 }
3474} 3095}
3475/*}}} */ 3096/*}}} */
3476 3097
3477#if ENABLE_FRILLS 3098#if !ENABLE_MINIMAL
3478/* ARGSUSED */ 3099/* ARGSUSED */
3479void 3100void
3480rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3101rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3481{ 3102{
3482 int x, y; 3103 int x, y;
3483 XWindowAttributes wattr; 3104 XWindowAttributes wattr;
3484 Window wdummy; 3105 Window wdummy;
3485 dDisp; 3106
3107 dLocal (Display *, dpy);
3486 3108
3487 if (nargs == 0) 3109 if (nargs == 0)
3488 return; 3110 return;
3489 3111
3490 switch (args[0]) 3112 switch (args[0])
3491 { 3113 {
3492 /* 3114 /*
3493 * commands 3115 * commands
3494 */ 3116 */
3495 case 1: /* deiconify window */ 3117 case 1: /* deiconify window */
3496 XMapWindow (disp, parent[0]); 3118 XMapWindow (dpy, parent[0]);
3497 break; 3119 break;
3498 case 2: /* iconify window */ 3120 case 2: /* iconify window */
3499 XIconifyWindow (disp, parent[0], display->screen); 3121 XIconifyWindow (dpy, parent[0], display->screen);
3500 break; 3122 break;
3501 case 3: /* set position (pixels) */ 3123 case 3: /* set position (pixels) */
3502 XMoveWindow (disp, parent[0], args[1], args[2]); 3124 XMoveWindow (dpy, parent[0], args[1], args[2]);
3503 break; 3125 break;
3504 case 4: /* set size (pixels) */ 3126 case 4: /* set size (pixels) */
3505 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3127 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3506 break; 3128 break;
3507 case 5: /* raise window */ 3129 case 5: /* raise window */
3508 XRaiseWindow (disp, parent[0]); 3130 XRaiseWindow (dpy, parent[0]);
3509 break; 3131 break;
3510 case 6: /* lower window */ 3132 case 6: /* lower window */
3511 XLowerWindow (disp, parent[0]); 3133 XLowerWindow (dpy, parent[0]);
3512 break; 3134 break;
3513 case 7: /* refresh window */ 3135 case 7: /* refresh window */
3514 scr_touch (true); 3136 scr_touch (true);
3515 break; 3137 break;
3516 case 8: /* set size (chars) */ 3138 case 8: /* set size (chars) */
… …
3523 if (args[0] >= 24) /* set height (chars) */ 3145 if (args[0] >= 24) /* set height (chars) */
3524 set_widthheight ((unsigned int)width, 3146 set_widthheight ((unsigned int)width,
3525 (unsigned int) (args[1] * fheight)); 3147 (unsigned int) (args[1] * fheight));
3526 break; 3148 break;
3527 3149
3528
3529 /* 3150 /*
3530 * reports - some output format copied from XTerm 3151 * reports - some output format copied from XTerm
3531 */ 3152 */
3532 case 11: /* report window state */ 3153 case 11: /* report window state */
3533 XGetWindowAttributes (disp, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent[0], &wattr);
3534 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3155 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3535 break; 3156 break;
3536 case 13: /* report window position */ 3157 case 13: /* report window position */
3537 XGetWindowAttributes (disp, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent[0], &wattr);
3538 XTranslateCoordinates (disp, parent[0], wattr.root, 3159 XTranslateCoordinates (dpy, parent[0], wattr.root,
3539 -wattr.border_width, -wattr.border_width, 3160 -wattr.border_width, -wattr.border_width,
3540 &x, &y, &wdummy); 3161 &x, &y, &wdummy);
3541 tt_printf ("\033[3;%d;%dt", x, y); 3162 tt_printf ("\033[3;%d;%dt", x, y);
3542 break; 3163 break;
3543 case 14: /* report window size (pixels) */ 3164 case 14: /* report window size (pixels) */
3544 XGetWindowAttributes (disp, parent[0], &wattr); 3165 XGetWindowAttributes (dpy, parent[0], &wattr);
3545 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3166 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3546 break; 3167 break;
3547 case 18: /* report text area size (chars) */ 3168 case 18: /* report text area size (chars) */
3548 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3549 break; 3170 break;
… …
3551 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3172 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3552 break; 3173 break;
3553 case 20: /* report icon label */ 3174 case 20: /* report icon label */
3554 { 3175 {
3555 char *s; 3176 char *s;
3556 XGetIconName (disp, parent[0], &s); 3177 XGetIconName (dpy, parent[0], &s);
3557 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3178 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3558 XFree (s); 3179 XFree (s);
3559 } 3180 }
3560 break; 3181 break;
3561 case 21: /* report window title */ 3182 case 21: /* report window title */
3562 { 3183 {
3563 char *s; 3184 char *s;
3564 XFetchName (disp, parent[0], &s); 3185 XFetchName (dpy, parent[0], &s);
3565 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3186 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3566 XFree (s); 3187 XFree (s);
3567 } 3188 }
3568 break; 3189 break;
3569 } 3190 }
3570} 3191}
… …
3573/*----------------------------------------------------------------------*/ 3194/*----------------------------------------------------------------------*/
3574/* 3195/*
3575 * get input up until STRING TERMINATOR (or BEL) 3196 * get input up until STRING TERMINATOR (or BEL)
3576 * ends_how is terminator used. returned input must be free()'d 3197 * ends_how is terminator used. returned input must be free()'d
3577 */ 3198 */
3578unsigned char * 3199char *
3579rxvt_term::get_to_st (unicode_t &ends_how) 3200rxvt_term::get_to_st (unicode_t &ends_how)
3580{ 3201{
3581 unicode_t ch; 3202 unicode_t ch;
3582 bool seen_esc = false; 3203 bool seen_esc = false;
3583 unsigned int n = 0; 3204 unsigned int n = 0;
… …
3597 seen_esc = true; 3218 seen_esc = true;
3598 continue; 3219 continue;
3599 } 3220 }
3600 else if (ch == C0_BEL || ch == CHAR_ST) 3221 else if (ch == C0_BEL || ch == CHAR_ST)
3601 break; 3222 break;
3223 else if (ch == C0_SYN)
3224 ch = cmd_get8 ();
3602 else if (ch < 0x20) 3225 else if (ch < 0x20)
3603 return NULL; /* other control character - exit */ 3226 return NULL; /* other control character - exit */
3604 3227
3605 seen_esc = false; 3228 seen_esc = false;
3606 3229
3607 if (n >= STRING_MAX - 1) 3230 if (n >= STRING_MAX - 1)
3608 // stop at some sane length 3231 // stop at some sane length
3609 return NULL; 3232 return NULL;
3610 3233
3611 if (ch == C0_SYN)
3612 string[n++] = cmd_get8 ();
3613 else
3614 string[n++] = ch; 3234 string[n++] = ch;
3615 } 3235 }
3616 3236
3617 string[n++] = '\0'; 3237 string[n++] = '\0';
3618 3238
3619 ends_how = (ch == 0x5c ? C0_ESC : ch); 3239 ends_how = (ch == 0x5c ? C0_ESC : ch);
3620 3240
3621 return (unsigned char *)rxvt_wcstombs (string); 3241 return rxvt_wcstombs (string);
3622} 3242}
3623 3243
3624/*----------------------------------------------------------------------*/ 3244/*----------------------------------------------------------------------*/
3625/* 3245/*
3626 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3246 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3627 */ 3247 */
3628void 3248void
3629rxvt_term::process_dcs_seq () 3249rxvt_term::process_dcs_seq ()
3630{ 3250{
3631 unsigned char *s; 3251 char *s;
3632 unicode_t eh; 3252 unicode_t eh;
3633 3253
3634 /* 3254 /*
3635 * Not handled yet 3255 * Not handled yet
3636 */ 3256 */
… …
3655 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3275 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3656 arg = arg * 10 + (ch - '0'); 3276 arg = arg * 10 + (ch - '0');
3657 3277
3658 if (ch == ';') 3278 if (ch == ';')
3659 { 3279 {
3660 unsigned char *s = get_to_st (eh); 3280 char *s = get_to_st (eh);
3661 3281
3662 if (s) 3282 if (s)
3663 { 3283 {
3664 process_xterm_seq (arg, (char *)s, eh); 3284 process_xterm_seq (arg, s, eh);
3665 free (s); 3285 free (s);
3666 } 3286 }
3667 } 3287 }
3668} 3288}
3669 3289
3670void 3290void
3671rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3291rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3672{ 3292{
3673 if (str[0] == '?' && !str[1]) 3293 if (str[0] == '?' && !str[1])
3674 { 3294 {
3675 unsigned short r, g, b; 3295 rgba c;
3676 pix_colors_focused[color].get (display, r, g, b); 3296 pix_colors_focused[color].get (c);
3297
3298#if XFT
3299 if (c.a != rgba::MAX_CC)
3300 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3301 else
3302#endif
3677 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3303 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3678 } 3304 }
3679 else 3305 else
3680 set_window_color (color, str); 3306 set_window_color (color, str);
3681} 3307}
3682 3308
3683/* 3309/*
3684 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3310 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3685 */ 3311 */
3686void 3312void
3687rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3313rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3688{ 3314{
3689 int changed = 0;
3690 int color; 3315 int color;
3691 char *buf, *name; 3316 char *buf, *name;
3692 bool query = str[0] == '?' && !str[1]; 3317 bool query = str[0] == '?' && !str[1];
3693 int saveop = op; 3318 int saveop = op;
3694 dDisp; 3319
3320 dLocal (Display *, dpy);
3695 3321
3696 assert (str != NULL); 3322 assert (str != NULL);
3323
3324 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3325 return;
3326
3697 switch (op) 3327 switch (op)
3698 { 3328 {
3699 case XTerm_name: 3329 case XTerm_name:
3700 set_title (str); 3330 set_title (str);
3701 /* FALLTHROUGH */ 3331 /* FALLTHROUGH */
… …
3715 unsigned long bytes_after; 3345 unsigned long bytes_after;
3716 unsigned char *value = 0; 3346 unsigned char *value = 0;
3717 const char *str = ""; 3347 const char *str = "";
3718 3348
3719 if (prop 3349 if (prop
3720 && XGetWindowProperty (disp, parent[0], 3350 && XGetWindowProperty (dpy, parent[0],
3721 prop, 0, 1<<16, 0, AnyPropertyType, 3351 prop, 0, 1<<16, 0, AnyPropertyType,
3722 &actual_type, &actual_format, 3352 &actual_type, &actual_format,
3723 &nitems, &bytes_after, &value) == Success 3353 &nitems, &bytes_after, &value) == Success
3724 && actual_type != None 3354 && actual_type != None
3725 && actual_format == 8) 3355 && actual_format == 8)
3726 str = (const char *)(value); 3356 str = (const char *)(value);
3727 3357
3728 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3358 tt_printf ("\033]%d;%s%c", op, str, resp);
3729 3359
3730 XFree (value); 3360 XFree (value);
3731 } 3361 }
3732 else 3362 else
3733 { 3363 {
… …
3737 { 3367 {
3738 *eq = 0; 3368 *eq = 0;
3739 set_utf8_property (display->atom (str), eq + 1); 3369 set_utf8_property (display->atom (str), eq + 1);
3740 } 3370 }
3741 else 3371 else
3742 XDeleteProperty (disp, parent[0], 3372 XDeleteProperty (dpy, parent[0],
3743 display->atom (str)); 3373 display->atom (str));
3744 } 3374 }
3745 break; 3375 break;
3746 3376
3747 case XTerm_Color: 3377 case XTerm_Color:
… …
3749 { 3379 {
3750 if ((name = strchr (buf, ';')) == NULL) 3380 if ((name = strchr (buf, ';')) == NULL)
3751 break; 3381 break;
3752 3382
3753 *name++ = '\0'; 3383 *name++ = '\0';
3754 color = atoi (buf); 3384 color = atoi (buf) + minCOLOR;
3755 3385
3756 if (color < 0 || color >= TOTAL_COLORS) 3386 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3757 break; 3387 break;
3758 3388
3759 if ((buf = strchr (name, ';')) != NULL) 3389 if ((buf = strchr (name, ';')) != NULL)
3760 *buf++ = '\0'; 3390 *buf++ = '\0';
3761 3391
3762 if (name[0] == '?' && !name[1]) 3392 process_color_seq (op, color, name, resp);
3763 {
3764 unsigned short r, g, b;
3765 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3766 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3767 }
3768 else
3769 set_window_color (color + minCOLOR, name);
3770 } 3393 }
3771 break; 3394 break;
3772 case XTerm_Color00: 3395 case XTerm_Color00:
3773 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3396 process_color_seq (op, Color_fg, str, resp);
3774 break; 3397 break;
3775 case XTerm_Color01: 3398 case XTerm_Color01:
3776 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3399 process_color_seq (op, Color_bg, str, resp);
3777 break; 3400 break;
3778#ifndef NO_CURSORCOLOR 3401#ifndef NO_CURSORCOLOR
3779 case XTerm_Color_cursor: 3402 case XTerm_Color_cursor:
3780 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3403 process_color_seq (op, Color_cursor, str, resp);
3781 break; 3404 break;
3782#endif 3405#endif
3783 case XTerm_Color_pointer_fg: 3406 case XTerm_Color_pointer_fg:
3784 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3407 process_color_seq (op, Color_pointer_fg, str, resp);
3785 break; 3408 break;
3786 case XTerm_Color_pointer_bg: 3409 case XTerm_Color_pointer_bg:
3787 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3410 process_color_seq (op, Color_pointer_bg, str, resp);
3788 break; 3411 break;
3789#ifndef NO_BOLD_UNDERLINE_REVERSE 3412#ifndef NO_BOLD_UNDERLINE_REVERSE
3790 case XTerm_Color_BD:
3791 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3792 break;
3793 case XTerm_Color_UL:
3794 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3795 break;
3796 case XTerm_Color_RV: 3413 case XTerm_Color_RV:
3797 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3414 process_color_seq (op, Color_RV, str, resp);
3415 break;
3416 case Rxvt_Color_BD:
3417 case URxvt_Color_BD:
3418 process_color_seq (op, Color_BD, str, resp);
3419 break;
3420 case Rxvt_Color_UL:
3421 case URxvt_Color_UL:
3422 process_color_seq (op, Color_UL, str, resp);
3798 break; 3423 break;
3799 case URxvt_Color_IT: 3424 case URxvt_Color_IT:
3800 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3425 process_color_seq (op, Color_IT, str, resp);
3801 break; 3426 break;
3802#endif 3427#endif
3803#if TRANSPARENT && TINTING 3428#if ENABLE_TRANSPARENCY
3804 case URxvt_Color_tint: 3429 case URxvt_Color_tint:
3805 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3430 process_color_seq (op, Color_tint, str, resp);
3806 check_our_parents (); 3431 {
3807 if (am_transparent) 3432 bool changed = false;
3808 want_full_refresh = want_refresh = 1; 3433 if (ISSET_PIXCOLOR (Color_tint))
3809 break; 3434 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3810#endif 3435 else
3436 changed = bgPixmap.unset_tint ();
3437 if (changed)
3438 update_background ();
3439 }
3811 3440
3441 break;
3442#endif
3443
3444#if BG_IMAGE_FROM_FILE
3812 case XTerm_Pixmap: 3445 case Rxvt_Pixmap:
3813 if (*str != ';') 3446 if (!strcmp (str, "?"))
3814 { 3447 {
3815#if XPM_BACKGROUND 3448 char str[256];
3816 scale_pixmap (""); /* reset to default scaling */ 3449
3817 set_bgPixmap (str); /* change pixmap */ 3450 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3818#endif 3451 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3819 scr_touch (true); 3452 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3453 process_xterm_seq (XTerm_title, str, CHAR_ST);
3820 } 3454 }
3821 while ((str = strchr (str, ';')) != NULL) 3455 else
3822 { 3456 {
3457 int changed = 0;
3458
3459 if (*str != ';')
3460 {
3461 /* reset to default scaling :*/
3462 bgPixmap.unset_geometry ();
3463 if (bgPixmap.set_file (str)) /* change pixmap */
3464 changed++;
3465 str = strchr (str, ';');
3466 if (str == NULL)
3467 bgPixmap.set_defaultGeometry ();
3468 }
3469 while (str)
3470 {
3823 str++; 3471 str++;
3824#if XPM_BACKGROUND 3472 if (bgPixmap.set_geometry (str))
3825 changed += scale_pixmap (str); 3473 changed++;
3826#endif 3474 str = strchr (str, ';');
3475 }
3476 if (changed)
3477 update_background ();
3827 } 3478 }
3828
3829 if (changed)
3830 {
3831#ifdef XPM_BACKGROUND
3832 resize_pixmap ();
3833#endif
3834 scr_touch (true);
3835 }
3836 break; 3479 break;
3480#endif
3837 3481
3838 case XTerm_restoreFG: 3482 case Rxvt_restoreFG:
3839 set_window_color (Color_fg, str); 3483 set_window_color (Color_fg, str);
3840 break; 3484 break;
3841 case XTerm_restoreBG: 3485 case Rxvt_restoreBG:
3842 set_window_color (Color_bg, str); 3486 set_window_color (Color_bg, str);
3843 break; 3487 break;
3844 3488
3845 case XTerm_logfile: 3489 case XTerm_logfile:
3846 // TODO, when secure mode? 3490 // TODO, when secure mode?
3847 break; 3491 break;
3848 3492
3849#ifdef MENUBAR
3850 case URxvt_Menu:
3851 if (options & Opt_insecure)
3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3853 break;
3854#endif
3855#if 0 3493#if 0
3856 case XTerm_dumpscreen: /* no error notices */ 3494 case Rxvt_dumpscreen: /* no error notices */
3857 { 3495 {
3858 int fd; 3496 int fd;
3859 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3497 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3860 { 3498 {
3861 scr_dump (fd); 3499 scr_dump (fd);
… …
3872 case URxvt_italicFont: 3510 case URxvt_italicFont:
3873 case URxvt_boldItalicFont: 3511 case URxvt_boldItalicFont:
3874#endif 3512#endif
3875 if (query) 3513 if (query)
3876 tt_printf ("\33]%d;%-.250s%c", saveop, 3514 tt_printf ("\33]%d;%-.250s%c", saveop,
3877 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3515 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3878 ? fontset[op - URxvt_font]->fontdesc : "", 3516 ? fontset[op - URxvt_font]->fontdesc : "",
3879 resp); 3517 resp);
3880 else 3518 else
3881 { 3519 {
3882 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3520 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3885 allocated.push_back ((void *)res); 3523 allocated.push_back ((void *)res);
3886 set_fonts (); 3524 set_fonts ();
3887 } 3525 }
3888 break; 3526 break;
3889 3527
3890#if ENABLE_FRILLS 3528 case URxvt_version:
3529 if (query)
3530 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3531 op,
3532 rs[Rs_name], VERSION[0], VERSION[2],
3533 resp);
3534 break;
3535
3536#if !ENABLE_MINIMAL
3891 case URxvt_locale: 3537 case URxvt_locale:
3892 if (query) 3538 if (query)
3893 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3539 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3894 else 3540 else
3895 { 3541 {
3896 set_locale (str); 3542 set_locale (str);
3897 pty.set_utf8_mode (enc_utf8); 3543 pty->set_utf8_mode (enc_utf8);
3898 init_xlocale (); 3544 init_xlocale ();
3899 } 3545 }
3900 break; 3546 break;
3901 3547
3902 case URxvt_view_up: 3548 case URxvt_view_up:
3903 case URxvt_view_down: 3549 case URxvt_view_down:
3550 {
3904 int lines = atoi (str); 3551 int lines = atoi (str);
3905 3552
3906 if (lines) 3553 if (lines)
3907 scr_page (op == URxvt_view_up ? UP : DN, lines); 3554 scr_page (op == URxvt_view_up ? UP : DN, lines);
3908 else 3555 else
3909 {
3910 scr_erase_savelines (); 3556 scr_erase_savelines ();
3911 } 3557 }
3912 3558
3559 break;
3560#endif
3561
3562#if ENABLE_PERL
3563 case URxvt_perl:
3564 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3565 ; // no responses yet
3913 break; 3566 break;
3914#endif 3567#endif
3915 } 3568 }
3916} 3569}
3917/*----------------------------------------------------------------------*/ 3570/*----------------------------------------------------------------------*/
… …
3948 return state; 3601 return state;
3949} 3602}
3950 3603
3951/* we're not using priv _yet_ */ 3604/* we're not using priv _yet_ */
3952void 3605void
3953rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3606rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3954{ 3607{
3955 unsigned int i, j; 3608 unsigned int i, j;
3956 int state; 3609 int state;
3957 3610
3958 static const struct 3611 static const struct
3959 { 3612 {
3960 const int argval; 3613 const int argval;
3961 const unsigned long bit; 3614 const unsigned long bit;
3962 }
3963
3964 argtopriv[] = { 3615 } argtopriv[] = {
3965 { 1, PrivMode_aplCUR }, 3616 { 1, PrivMode_aplCUR },
3966 { 2, PrivMode_vt52 }, 3617 { 2, PrivMode_vt52 },
3967 { 3, PrivMode_132 }, 3618 { 3, PrivMode_132 },
3968 { 4, PrivMode_smoothScroll }, 3619 { 4, PrivMode_smoothScroll },
3969 { 5, PrivMode_rVideo }, 3620 { 5, PrivMode_rVideo },
3970 { 6, PrivMode_relOrigin }, 3621 { 6, PrivMode_relOrigin },
3971 { 7, PrivMode_Autowrap }, 3622 { 7, PrivMode_Autowrap },
3972 // 8, bi-directional support mode 3623 // 8, bi-directional support mode
3973 { 9, PrivMode_MouseX10 }, 3624 { 9, PrivMode_MouseX10 },
3974#ifdef menuBar_esc
3975 { menuBar_esc, PrivMode_menuBar },
3976#endif
3977 // 18, 19 printing-related 3625 // 18, 19 printing-related
3978 { 25, PrivMode_VisibleCursor }, 3626 { 25, PrivMode_VisibleCursor },
3979#ifdef scrollBar_esc 3627#ifdef scrollBar_esc
3980 { scrollBar_esc, PrivMode_scrollBar }, 3628 { scrollBar_esc, PrivMode_scrollBar },
3981#endif 3629#endif
… …
3989#ifndef NO_BACKSPACE_KEY 3637#ifndef NO_BACKSPACE_KEY
3990 { 67, PrivMode_BackSpace }, 3638 { 67, PrivMode_BackSpace },
3991#endif 3639#endif
3992 { 1000, PrivMode_MouseX11 }, 3640 { 1000, PrivMode_MouseX11 },
3993 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3641 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3994 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3642 { 1002, PrivMode_MouseBtnEvent },
3995 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3643 { 1003, PrivMode_MouseAnyEvent },
3996 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3644 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3997 { 1011, PrivMode_Keypress }, // rxvt extension 3645 { 1011, PrivMode_Keypress }, // rxvt extension
3998 // 1035 enable modifiers for alt, numlock NYI 3646 // 1035 enable modifiers for alt, numlock NYI
3999 // 1036 send ESC for meta keys NYI 3647 // 1036 send ESC for meta keys NYI
4000 // 1037 send DEL for keypad delete NYI 3648 // 1037 send DEL for keypad delete NYI
… …
4026 } 3674 }
4027 3675
4028 /* extra handling for values with state unkept */ 3676 /* extra handling for values with state unkept */
4029 switch (arg[i]) 3677 switch (arg[i])
4030 { 3678 {
3679#if ENABLE_STYLES
3680 case 1021:
3681 set_option (Opt_intensityStyles, mode);
3682
3683 scr_touch (true);
3684 break;
3685#endif
4031 case 1048: /* alternative cursor save */ 3686 case 1048: /* alternative cursor save */
4032 case 1049: 3687 case 1049:
4033 if (options & Opt_secondaryScreen) 3688 if (option (Opt_secondaryScreen))
4034 if (mode == 0) 3689 if (mode == 0)
4035 scr_cursor (RESTORE); 3690 scr_cursor (RESTORE);
4036 else if (mode == 1) 3691 else if (mode == 1)
4037 scr_cursor (SAVE); 3692 scr_cursor (SAVE);
4038 break; 3693 break;
… …
4053 case 3: /* 80/132 */ 3708 case 3: /* 80/132 */
4054 if (priv_modes & PrivMode_132OK) 3709 if (priv_modes & PrivMode_132OK)
4055 set_widthheight (((state ? 132 : 80) * fwidth), height); 3710 set_widthheight (((state ? 132 : 80) * fwidth), height);
4056 break; 3711 break;
4057 case 4: /* smooth scrolling */ 3712 case 4: /* smooth scrolling */
4058 if (state)
4059 options &= ~Opt_jumpScroll;
4060 else
4061 options |= Opt_jumpScroll; 3713 set_option (Opt_jumpScroll, !state);
4062 break; 3714 break;
4063 case 5: /* reverse video */ 3715 case 5: /* reverse video */
4064 scr_rvideo_mode (state); 3716 scr_rvideo_mode (state);
4065 break; 3717 break;
4066 case 6: /* relative/absolute origins */ 3718 case 6: /* relative/absolute origins */
… …
4070 scr_autowrap (state); 3722 scr_autowrap (state);
4071 break; 3723 break;
4072 /* case 8: - auto repeat, can't do on a per window basis */ 3724 /* case 8: - auto repeat, can't do on a per window basis */
4073 case 9: /* X10 mouse reporting */ 3725 case 9: /* X10 mouse reporting */
4074 if (state) /* orthogonal */ 3726 if (state) /* orthogonal */
4075 priv_modes &= ~PrivMode_MouseX11; 3727 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4076 break; 3728 break;
4077#ifdef menuBar_esc
4078 case menuBar_esc:
4079#ifdef MENUBAR
4080 map_menuBar (state);
4081#endif
4082 break;
4083#endif
4084#ifdef scrollBar_esc 3729#ifdef scrollBar_esc
4085 case scrollBar_esc: 3730 case scrollBar_esc:
4086 if (scrollbar_mapping (state)) 3731 if (scrollbar_mapping (state))
4087 { 3732 {
4088 resize_all_windows (0, 0, 0); 3733 resize_all_windows (0, 0, 0);
… …
4100 break; 3745 break;
4101 /* case 66: - application key pad */ 3746 /* case 66: - application key pad */
4102 /* case 67: - backspace key */ 3747 /* case 67: - backspace key */
4103 case 1000: /* X11 mouse reporting */ 3748 case 1000: /* X11 mouse reporting */
4104 if (state) /* orthogonal */ 3749 if (state) /* orthogonal */
4105 priv_modes &= ~PrivMode_MouseX10; 3750 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4106 break; 3751 break;
4107#if 0 3752#if 0
4108 case 1001: 3753 case 1001:
4109 break; /* X11 mouse highlighting */ 3754 break; /* X11 mouse highlighting */
4110#endif 3755#endif
3756 case 1002:
3757 case 1003:
3758 if (state) {
3759 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3760 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3761 vt_emask_mouse = PointerMotionMask;
3762 } else
3763 vt_emask_mouse = NoEventMask;
3764 vt_select_input ();
3765 break;
4111 case 1010: /* scroll to bottom on TTY output inhibit */ 3766 case 1010: /* scroll to bottom on TTY output inhibit */
4112 if (state)
4113 options &= ~Opt_scrollTtyOutput;
4114 else
4115 options |= Opt_scrollTtyOutput; 3767 set_option (Opt_scrollTtyOutput, !state);
4116 break; 3768 break;
4117 case 1011: /* scroll to bottom on key press */ 3769 case 1011: /* scroll to bottom on key press */
4118 if (state)
4119 options |= Opt_scrollTtyKeypress; 3770 set_option (Opt_scrollTtyKeypress, state);
4120 else
4121 options &= ~Opt_scrollTtyKeypress;
4122 break; 3771 break;
4123 case 1047: /* secondary screen w/ clearing last */ 3772 case 1047: /* secondary screen w/ clearing last */
4124 if (options & Opt_secondaryScreen) 3773 if (option (Opt_secondaryScreen))
4125 if (current_screen != PRIMARY) 3774 if (current_screen != PRIMARY)
4126 scr_erase_screen (2); 3775 scr_erase_screen (2);
4127 scr_change_screen (state); 3776 scr_change_screen (state);
4128 break; 3777 break;
4129 case 1049: /* secondary screen w/ clearing first */ 3778 case 1049: /* secondary screen w/ clearing first */
4130 scr_change_screen (state); 3779 scr_change_screen (state);
4131 if (options & Opt_secondaryScreen) 3780 if (option (Opt_secondaryScreen))
4132 if (current_screen != PRIMARY) 3781 if (current_screen != PRIMARY)
4133 scr_erase_screen (2); 3782 scr_erase_screen (2);
4134 break; 3783 break;
4135 default: 3784 default:
4136 break; 3785 break;
… …
4264 scr_color (Color_bg, Color_bg); 3913 scr_color (Color_bg, Color_bg);
4265 break; 3914 break;
4266 3915
4267 //case 50: // not variable spacing 3916 //case 50: // not variable spacing
4268 3917
4269#ifndef NO_BRIGHTCOLOR 3918#if !ENABLE_MINIMAL
4270 case 90: 3919 case 90:
4271 case 91: /* set bright fg color */ 3920 case 91: /* set bright fg color */
4272 case 92: 3921 case 92:
4273 case 93: 3922 case 93:
4274 case 94: 3923 case 94:
… …
4286 case 106: 3935 case 106:
4287 case 107: 3936 case 107:
4288 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3937 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4289 break; 3938 break;
4290#endif 3939#endif
4291
4292 } 3940 }
4293 } 3941 }
4294} 3942}
4295/*}}} */ 3943/*}}} */
4296 3944
… …
4320 */ 3968 */
4321void 3969void
4322rxvt_term::tt_printf (const char *fmt,...) 3970rxvt_term::tt_printf (const char *fmt,...)
4323{ 3971{
4324 va_list arg_ptr; 3972 va_list arg_ptr;
4325 unsigned char buf[256]; 3973 char buf[256];
4326 3974
4327 va_start (arg_ptr, fmt); 3975 va_start (arg_ptr, fmt);
4328 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3976 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4329 va_end (arg_ptr); 3977 va_end (arg_ptr);
4330 tt_write (buf, strlen (buf)); 3978 tt_write (buf, strlen (buf));
… …
4335 * or generated by us in response to a query ESC sequence. 3983 * or generated by us in response to a query ESC sequence.
4336 */ 3984 */
4337const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3985const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4338 3986
4339void 3987void
4340rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3988rxvt_term::tt_write (const char *data, unsigned int len)
4341{ 3989{
3990 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3991 return;
3992
3993 if (pty->pty < 0)
3994 return;
3995
4342 if (v_buflen == 0) 3996 if (v_buflen == 0)
4343 { 3997 {
4344 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3998 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4345 3999
4346 if ((unsigned int)written == len) 4000 if ((unsigned int)written == len)
4347 return; 4001 return;
4348 4002
4349 data += written; 4003 data += written;
4350 len -= written; 4004 len -= written;
4351 } 4005 }
4352 4006
4353 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4007 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4354 4008
4355 memcpy (v_buffer + v_buflen, data, len); 4009 memcpy (v_buffer + v_buflen, data, len);
4356 v_buflen += len; 4010 v_buflen += len;
4357 4011
4358 pty_ev.set (EVENT_READ | EVENT_WRITE); 4012 pty_ev.set (EVENT_READ | EVENT_WRITE);
4359} 4013}
4360 4014
4361void rxvt_term::pty_write () 4015void rxvt_term::pty_write ()
4362{ 4016{
4363 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4017 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4364 4018
4365 if (written > 0) 4019 if (written > 0)
4366 { 4020 {
4367 v_buflen -= written; 4021 v_buflen -= written;
4368 4022
4369 if (v_buflen == 0) 4023 if (v_buflen == 0)
4370 { 4024 {
4371 free (v_buffer); 4025 free (v_buffer);
4372 v_buffer = 0; 4026 v_buffer = 0;
4373 v_buflen = 0;
4374 4027
4375 pty_ev.set (EVENT_READ); 4028 pty_ev.set (EVENT_READ);
4376 return; 4029 return;
4377 } 4030 }
4378 4031

Diff Legend

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