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

Diff Legend

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