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

Diff Legend

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