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.229 by root, Tue Jan 3 17:34:44 2006 UTC vs.
Revision 1.416 by root, Tue Jul 15 16:41:22 2008 UTC

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

Diff Legend

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