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

Diff Legend

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