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.210 by root, Tue Dec 20 20:58:31 2005 UTC vs.
Revision 1.362 by ayin, Sat Nov 10 16:04:49 2007 UTC

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

Diff Legend

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