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

Diff Legend

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