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.273 by ayin, Thu Jan 19 23:13:19 2006 UTC vs.
Revision 1.438 by root, Thu Feb 4 21:55:12 2010 UTC

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

Diff Legend

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