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

Diff Legend

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