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.216 by root, Tue Dec 27 01:25:42 2005 UTC vs.
Revision 1.357 by sasha, Tue Sep 18 22:01:36 2007 UTC

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

Diff Legend

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