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

Diff Legend

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