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.211 by root, Tue Dec 20 22:27:49 2005 UTC vs.
Revision 1.407 by ayin, Fri Feb 15 10:56:29 2008 UTC

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

Diff Legend

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