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.410 by ayin, Sat Feb 16 15:48:36 2008 UTC vs.
Revision 1.508 by sf-exg, Fri Apr 13 09:23:58 2012 UTC

… …
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-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * 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
34 * 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
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
162 162
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hex 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
… …
251#endif 257#endif
252 258
253void 259void
254rxvt_term::commit_iso14755 () 260rxvt_term::commit_iso14755 ()
255{ 261{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 262 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 263
261 if (iso14755buf & ISO_14755_51) 264 if (iso14755buf & ISO_14755_51)
262 { 265 {
263 char mb[16]; 266 char mb[MB_LEN_MAX];
264 int len; 267 int len;
265 268
266 // allow verbatim 0-bytes and control-bytes to be entered 269 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 270 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 271 len = wctomb (mb, ch);
269 else 272 else
270 { 273 {
271 mb[0] = ch[0]; 274 mb[0] = ch;
272 len = 1; 275 len = 1;
273 } 276 }
274 277
275 if (len > 0) 278 if (len > 0)
276 tt_write (mb, len); 279 tt_write (mb, len);
… …
282} 285}
283 286
284static int 287static int
285hex_keyval (XKeyEvent &ev) 288hex_keyval (XKeyEvent &ev)
286{ 289{
287 // check wether this event corresponds to a hex digit 290 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 291 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 292 for (int index = 0; index < 8; index++)
290 { 293 {
291 KeySym k = XLookupKeysym (&ev, index); 294 KeySym k = XLookupKeysym (&ev, index);
292 295
… …
416 */ 419 */
417 shft = ev.state & ShiftMask; 420 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 421 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 422 meta = ev.state & ModMetaMask;
420 423
421 if (numlock_state || (ev.state & ModNumLockMask))
422 {
423 numlock_state = (ev.state & ModNumLockMask);
424 PrivMode ((!numlock_state), PrivMode_aplKP);
425 }
426
427 kbuf[0] = 0; 424 kbuf[0] = 0;
428 425
429#ifdef USE_XIM 426#ifdef USE_XIM
430 if (Input_Context) 427 if (Input_Context)
431 { 428 {
… …
505#ifdef PAGING_CONTEXT_LINES 502#ifdef PAGING_CONTEXT_LINES
506 lnsppg = nrow - PAGING_CONTEXT_LINES; 503 lnsppg = nrow - PAGING_CONTEXT_LINES;
507#else 504#else
508 lnsppg = nrow * 4 / 5; 505 lnsppg = nrow * 4 / 5;
509#endif 506#endif
507 max_it (lnsppg, 1);
508
510 if (keysym == XK_Prior) 509 if (keysym == XK_Prior)
511 { 510 {
512 scr_page (UP, lnsppg); 511 scr_page (UP, lnsppg);
513 return; 512 return;
514 } 513 }
… …
567 selection_request (ev.time); 566 selection_request (ev.time);
568 return; 567 return;
569#if TODO 568#if TODO
570 /* rxvt extras */ 569 /* rxvt extras */
571 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
572 change_font (FONT_UP);
573 return; 571 return;
574 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
575 change_font (FONT_DN);
576 return; 573 return;
577#endif 574#endif
578 } 575 }
579 } 576 }
580 } 577 }
581 578
582#if ENABLE_FRILLS || ISO_14755 579#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 580 // ISO 14755 support
584 if (shft && ctrl) 581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 582 {
586 int hv; 583 int hv;
587 584
588 if (iso14755buf & ISO_14755_51 585 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 586 && (keysym == XK_space || keysym == XK_KP_Space
… …
619 scr_overlay_off (); 616 scr_overlay_off ();
620# endif 617# endif
621 iso14755buf = 0; 618 iso14755buf = 0;
622 } 619 }
623 } 620 }
621 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 622 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 623 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 624 if (!(iso14755buf & ISO_14755_STARTED))
627 { 625 {
628 iso14755buf |= ISO_14755_STARTED; 626 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 627# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 628 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
641 } 639 }
642#endif 640#endif
643 641
644 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645 { 643 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1; 645 unsigned int newlen = 1;
648 646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
649 switch (translate_keypad (keysym, kp)) 650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
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
684 newlen = 0;
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:
650 { 768 {
651#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace)
654 {
655 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
656 ^ !!ctrl) ? '\b' : '\177';
657 kbuf[1] = '\0';
658 }
659 else
660 strcpy (kbuf, rs[Rs_backspace_key]);
661 break;
662#endif
663#ifndef NO_DELETE_KEY
664 case XK_Delete:
665 strcpy (kbuf, rs[Rs_delete_key]);
666 break;
667#endif
668 case XK_Tab:
669 if (shft)
670 strcpy (kbuf, "\033[Z");
671 else
672 {
673#ifdef CTRL_TAB_MAKES_META
674 if (ctrl)
675 meta = 1;
676#endif
677#ifdef MOD4_TAB_MAKES_META
678 if (ev.state & Mod4Mask)
679 meta = 1;
680#endif
681 newlen = 0;
682 }
683 break;
684
685 case XK_Up: /* "\033[A" */
686 case XK_Down: /* "\033[B" */
687 case XK_Right: /* "\033[C" */
688 case XK_Left: /* "\033[D" */
689 strcpy (kbuf, "\033[Z");
690 kbuf[2] = "DACB"[keysym - XK_Left];
691 /* do Shift first */
692 if (shft)
693 kbuf[2] = "dacb"[keysym - XK_Left];
694 else if (ctrl)
695 {
696 kbuf[1] = 'O';
697 kbuf[2] = "dacb"[keysym - XK_Left];
698 }
699 else if (priv_modes & PrivMode_aplCUR)
700 kbuf[1] = 'O';
701 break;
702
703 case XK_KP_Enter:
704 /* allow shift to override */
705 if (kp)
706 {
707 strcpy (kbuf, "\033OM");
708 break;
709 }
710
711 /* FALLTHROUGH */
712
713 case XK_Return:
714 if (priv_modes & PrivMode_LFNL)
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\012';
718 kbuf[2] = '\0';
719 }
720 else
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\0';
724 }
725 break;
726
727 case XK_KP_F1: /* "\033OP" */
728 case XK_KP_F2: /* "\033OQ" */
729 case XK_KP_F3: /* "\033OR" */
730 case XK_KP_F4: /* "\033OS" */
731 strcpy (kbuf, "\033OP");
732 kbuf[2] += (keysym - XK_KP_F1);
733 break;
734
735 case XK_KP_Multiply: /* "\033Oj" : "*" */
736 case XK_KP_Add: /* "\033Ok" : "+" */
737 case XK_KP_Separator: /* "\033Ol" : "," */
738 case XK_KP_Subtract: /* "\033Om" : "-" */
739 case XK_KP_Decimal: /* "\033On" : "." */
740 case XK_KP_Divide: /* "\033Oo" : "/" */
741 case XK_KP_0: /* "\033Op" : "0" */
742 case XK_KP_1: /* "\033Oq" : "1" */
743 case XK_KP_2: /* "\033Or" : "2" */
744 case XK_KP_3: /* "\033Os" : "3" */
745 case XK_KP_4: /* "\033Ot" : "4" */
746 case XK_KP_5: /* "\033Ou" : "5" */
747 case XK_KP_6: /* "\033Ov" : "6" */
748 case XK_KP_7: /* "\033Ow" : "7" */
749 case XK_KP_8: /* "\033Ox" : "8" */
750 case XK_KP_9: /* "\033Oy" : "9" */
751 /* allow shift to override */
752 if (kp)
753 {
754 strcpy (kbuf, "\033Oj");
755 kbuf[2] += (keysym - XK_KP_Multiply);
756 }
757 else
758 {
759 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
760 kbuf[1] = '\0';
761 }
762 break;
763
764 default:
765 {
766 int param = map_function_key (keysym); 769 int param = map_function_key (keysym);
767 if (param > 0) 770 if (param > 0)
768 sprintf (kbuf,"\033[%d~", param); 771 sprintf (kbuf,"\033[%d~", param);
769 else 772 else
770 newlen = 0; 773 newlen = 0;
771 }
772 break;
773 } 774 }
775 break;
776 }
774 777
775 if (newlen) 778 if (newlen)
776 len = strlen (kbuf); 779 len = strlen (kbuf);
777 780
781 if (len > 0)
782 {
778 /* 783 /*
784 * pass Shift/Control indicators for function keys ending with `~'
785 *
786 * eg,
787 * Prior = "ESC[5~"
788 * Shift+Prior = "ESC[5$"
789 * Ctrl+Prior = "ESC[5^"
790 * Ctrl+Shift+Prior = "ESC[5@"
791 */
792 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
793 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
794
795 /*
779 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
780 */ 797 */
781#ifdef META8_OPTION 798#ifdef META8_OPTION
782 if (meta && (meta_char == 0x80) && len > 0) 799 if (meta && (meta_char == 0x80))
783 kbuf[len - 1] |= 0x80; 800 kbuf[len - 1] |= 0x80;
784#endif 801#endif
802 }
785 803
786 } 804 }
787 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
788 { 806 {
789 len = 1; 807 len = 1;
… …
822 if (view_start) 840 if (view_start)
823 { 841 {
824 view_start = 0; 842 view_start = 0;
825 want_refresh = 1; 843 want_refresh = 1;
826 } 844 }
827
828 /*
829 * these modifications only affect the static keybuffer
830 * pass Shift/Control indicators for function keys ending with `~'
831 *
832 * eg,
833 * Prior = "ESC[5~"
834 * Shift+Prior = "ESC[5$"
835 * Ctrl+Prior = "ESC[5^"
836 * Ctrl+Shift+Prior = "ESC[5@"
837 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
838 */
839 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
840 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
841 845
842 /* escape prefix */ 846 /* escape prefix */
843 if (meta 847 if (meta
844#ifdef META8_OPTION 848#ifdef META8_OPTION
845 && meta_char == C0_ESC 849 && meta_char == C0_ESC
… …
881 commit_iso14755 (); 885 commit_iso14755 ();
882 886
883 return; 887 return;
884 } 888 }
885 889
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 890 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
887 if (i[0] == keysym) 891 if (i[0] == keysym)
888 { 892 {
889 iso14755buf = ISO_14755_51 | i[1]; 893 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 (); 894 commit_iso14755 ();
891 895
… …
928 else if (keysym == XK_Control_L || keysym == XK_Control_R) 932 else if (keysym == XK_Control_L || keysym == XK_Control_R)
929 mouse_slip_wheel_speed = 0; 933 mouse_slip_wheel_speed = 0;
930#endif 934#endif
931} 935}
932 936
933#if defined (KEYSYM_RESOURCE)
934unsigned int
935rxvt_term::cmd_write (const char *str, unsigned int count)
936{
937 unsigned int n, s;
938
939 n = cmdbuf_ptr - cmdbuf_base;
940 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
941
942 if (n > 0 && s < count)
943 {
944 memmove (cmdbuf_base, cmdbuf_ptr,
945 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
946 cmdbuf_ptr = cmdbuf_base;
947 cmdbuf_endp -= n;
948 s += n;
949 }
950
951 if (count > s)
952 {
953 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
954 count = s;
955 }
956
957 for (; count--;)
958 *cmdbuf_endp++ = *str++;
959
960 cmd_parse ();
961
962 return 0;
963}
964#endif
965
966void 937void
967rxvt_term::flush () 938rxvt_term::flush ()
968{ 939{
969 flush_ev.stop (); 940 flush_ev.stop ();
970 941
971#ifdef HAVE_BG_PIXMAP 942#ifdef HAVE_BG_PIXMAP
972 if (bgPixmap.check_clearChanged ()) 943 if (bg_flags & BG_NEEDS_REFRESH)
973 { 944 {
974// scr_clear (true); This needs to be researched further! 945 bg_flags &= ~BG_NEEDS_REFRESH;
975 scr_touch (false); 946 scr_touch (false);
976 } 947 }
977#endif 948#endif
978 949
979 if (want_refresh) 950 if (want_refresh)
… …
1015 } 986 }
1016 while (row < end_row); 987 while (row < end_row);
1017 } 988 }
1018 989
1019 scr_refresh (); 990 scr_refresh ();
1020 scrollbar_show (1); 991 scrollBar.show (1);
1021#ifdef USE_XIM 992#ifdef USE_XIM
1022 IMSendSpot (); 993 im_send_spot ();
1023#endif 994#endif
1024 } 995 }
1025 996
1026 display->flush (); 997 display->flush ();
1027} 998}
1028 999
1029/* checks wether a refresh is requested and starts the refresh timer */ 1000/* checks whether a refresh is requested and starts the refresh timer */
1030void 1001void
1031rxvt_term::refresh_check () 1002rxvt_term::refresh_check ()
1032{ 1003{
1033 if (want_refresh && !flush_ev.is_active ()) 1004 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1005 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1044 refresh_count = 0; 1015 refresh_count = 0;
1045 flush (); 1016 flush ();
1046} 1017}
1047 1018
1048#ifdef CURSOR_BLINK 1019#ifdef CURSOR_BLINK
1020void
1021rxvt_term::cursor_blink_reset ()
1022{
1023 if (hidden_cursor)
1024 {
1025 hidden_cursor = 0;
1026 want_refresh = 1;
1027 }
1028
1029 if (option (Opt_cursorBlink))
1030 cursor_blink_ev.again ();
1031 else
1032 cursor_blink_ev.stop ();
1033}
1034
1049void 1035void
1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1051{ 1037{
1052 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1053 want_refresh = 1; 1039 want_refresh = 1;
… …
1072 1058
1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1074void 1060void
1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1076{ 1062{
1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1079 { 1065 {
1080 want_refresh = 1; 1066 want_refresh = 1;
1081 refresh_check (); 1067 refresh_check ();
1082 } 1068 }
1083 else 1069 else
… …
1127 { 1113 {
1128 // this should really be sched_yield(), but the linux guys thought 1114 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1115 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is 1116 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1117 // allowed by the sus... as is returning ENOSYS.
1118 // since the linux guys additionally thought that breaking the only
1119 // known workaround against their unusable sched_yield hack is cool,
1120 // we just nanosleep a bit and hope for the best.
1132 1121
1133 struct timespec ts = { 0, 0 }; 1122 struct timespec ts = { 0, 1000 };
1134 nanosleep (&ts, 0); 1123 nanosleep (&ts, 0);
1135 1124
1136 w.stop (); 1125 w.stop ();
1137 } 1126 }
1138 1127
… …
1141 { 1130 {
1142 } 1131 }
1143} event_handler; 1132} event_handler;
1144#endif 1133#endif
1145 1134
1135/* make sure all the cmd data is at beginning of cmdbuf */
1136void
1137rxvt_term::cmdbuf_reify ()
1138{
1139 if (cmdbuf_ptr == cmdbuf_base)
1140 return;
1141
1142 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1143
1144 memmove (cmdbuf_base, cmdbuf_ptr, used);
1145 cmdbuf_ptr = cmdbuf_base;
1146 cmdbuf_endp = cmdbuf_ptr + used;
1147
1148}
1149
1150#if defined (KEYSYM_RESOURCE)
1151void
1152rxvt_term::cmdbuf_append (const char *str, size_t count)
1153{
1154 cmdbuf_reify ();
1155
1156 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1157
1158 if (count > avail)
1159 return;
1160
1161 memcpy (cmdbuf_endp, str, count);
1162 cmdbuf_endp += count;
1163
1164 cmd_parse ();
1165}
1166#endif
1167
1146bool 1168bool
1147rxvt_term::pty_fill () 1169rxvt_term::pty_fill ()
1148{ 1170{
1149 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1171 cmdbuf_reify ();
1150 1172
1151 if (CBUFSIZ == n) 1173 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1152 { 1174
1153 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1175 if (!avail)
1154 n = 0;
1155 } 1176 {
1156 1177 // normally this indicates a "too long" command sequence - just drop the data we have
1157 memmove (cmdbuf_base, cmdbuf_ptr, n);
1158 cmdbuf_ptr = cmdbuf_base; 1178 cmdbuf_ptr = cmdbuf_base;
1159 cmdbuf_endp = cmdbuf_ptr + n; 1179 cmdbuf_endp = cmdbuf_ptr;
1180 avail = CBUFSIZ;
1181 }
1160 1182
1161 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1183 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1162 1184
1163 if (r > 0) 1185 if (r > 0)
1164 { 1186 {
1165 cmdbuf_endp += r; 1187 cmdbuf_endp += r;
1166 return true; 1188 return true;
… …
1188{ 1210{
1189 make_current (); 1211 make_current ();
1190 1212
1191 if (revents & ev::READ) 1213 if (revents & ev::READ)
1192 // loop, but don't allow a single term to monopolize us 1214 // loop, but don't allow a single term to monopolize us
1193 while (pty_fill ()) 1215 for (int i = CBUFCNT; i-- && pty_fill (); )
1194 if (cmd_parse ()) 1216 cmd_parse ();
1195 break;
1196 1217
1197 if (revents & ev::WRITE) 1218 if (revents & ev::WRITE)
1198 pty_write (); 1219 pty_write ();
1199 1220
1200 refresh_check (); 1221 refresh_check ();
… …
1241{ 1262{
1242 int button_number, key_state = 0; 1263 int button_number, key_state = 0;
1243 int x, y; 1264 int x, y;
1244 int code = 32; 1265 int code = 32;
1245 1266
1246 x = Pixel2Col (ev.x); 1267 x = Pixel2Col (ev.x) + 1;
1247 y = Pixel2Row (ev.y); 1268 y = Pixel2Row (ev.y) + 1;
1269
1248 if (ev.type == MotionNotify) 1270 if (ev.type == MotionNotify)
1249 { 1271 {
1250 if (x == mouse_row && y == mouse_col) 1272 if (x == mouse_row && y == mouse_col)
1251 return; 1273 return;
1274
1252 mouse_row = x; 1275 mouse_row = x;
1253 mouse_col = y; 1276 mouse_col = y;
1254 code += 32; 1277 code += 32;
1255 } 1278 }
1256 1279
… …
1259 else 1282 else
1260 { 1283 {
1261 button_number = MEvent.button - Button1; 1284 button_number = MEvent.button - Button1;
1262 /* add 0x3D for wheel events, like xterm does */ 1285 /* add 0x3D for wheel events, like xterm does */
1263 if (button_number >= 3) 1286 if (button_number >= 3)
1264 button_number += (64 - 3); 1287 button_number += 64 - 3;
1265 } 1288 }
1266 1289
1267 if (priv_modes & PrivMode_MouseX10) 1290 if (priv_modes & PrivMode_MouseX10)
1268 { 1291 {
1269 /* 1292 /*
… …
1301 fputc ('A', stderr); 1324 fputc ('A', stderr);
1302 if (key_state & 32) 1325 if (key_state & 32)
1303 fputc ('2', stderr); 1326 fputc ('2', stderr);
1304 fprintf (stderr, "]: <%d>, %d/%d\n", 1327 fprintf (stderr, "]: <%d>, %d/%d\n",
1305 button_number, 1328 button_number,
1306 x + 1, 1329 x,
1307 y + 1); 1330 y);
1308#endif 1331#endif
1309 1332
1333#if ENABLE_FRILLS
1334 if (priv_modes & PrivMode_ExtMouseRight)
1335 tt_printf ("\033[%d;%d;%dM",
1336 code + button_number + key_state,
1337 x,
1338 y);
1339 else if (priv_modes & PrivMode_ExtModeMouse)
1340 tt_printf ("\033[M%c%lc%lc",
1341 code + button_number + key_state,
1342 wint_t (32 + x),
1343 wint_t (32 + y));
1344 else
1345#endif
1310 tt_printf ("\033[M%c%c%c", 1346 tt_printf ("\033[M%c%c%c",
1311 (code + button_number + key_state), 1347 code + button_number + key_state,
1312 (32 + x + 1), 1348 32 + x,
1313 (32 + y + 1)); 1349 32 + y);
1314} 1350}
1315 1351
1316/*{{{ process an X event */ 1352/*{{{ process an X event */
1317void 1353void
1318rxvt_term::x_cb (XEvent &ev) 1354rxvt_term::x_cb (XEvent &ev)
… …
1420 && ev.xfocus.mode != NotifyGrab) 1456 && ev.xfocus.mode != NotifyGrab)
1421 focus_out (); 1457 focus_out ();
1422 break; 1458 break;
1423 1459
1424 case ConfigureNotify: 1460 case ConfigureNotify:
1425 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1426 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1427 szHint.width, szHint.height);*/
1428 if (ev.xconfigure.window == parent[0]) 1461 if (ev.xconfigure.window == parent)
1429 { 1462 {
1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ; 1464 ;
1465
1466#ifdef HAVE_BG_PIXMAP
1467 bool moved = false;
1468 if (bg_window_position_sensitive ())
1469 {
1470 int x, y;
1471 if (ev.xconfigure.send_event)
1472 {
1473 x = ev.xconfigure.x;
1474 y = ev.xconfigure.y;
1475 }
1476 else
1477 get_window_origin (x, y);
1478
1479 if (bg_set_position (x, y)
1480 || !(bg_flags & BG_IS_VALID))
1481 moved = true;
1482 }
1483#endif
1432 1484
1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1486 {
1435 seen_resize = 1; 1487 seen_resize = 1;
1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1489 }
1438 else 1490 else
1439 { 1491 {
1440#ifdef HAVE_BG_PIXMAP 1492#ifdef HAVE_BG_PIXMAP
1441 if (bgPixmap.window_position_sensitive ())
1442 {
1443 if (mapped) 1493 if (moved)
1444 update_background (); 1494 update_background ();
1445 else
1446 bgPixmap.invalidate ();
1447 }
1448#endif 1495#endif
1449 } 1496 }
1450 1497
1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1452 } 1499 }
1453 break; 1500 break;
1454 1501
1455 case PropertyNotify: 1502 case PropertyNotify:
1456 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1503 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1458 && ev.xproperty.state == PropertyNewValue)
1459 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460
1461 break; 1504 break;
1462 1505
1463 case SelectionClear: 1506 case SelectionClear:
1464 selection_clear (); 1507 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465 break;
1466
1467 case SelectionNotify:
1468 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1470 break; 1508 break;
1471 1509
1472 case SelectionRequest: 1510 case SelectionRequest:
1473 selection_send (ev.xselectionrequest); 1511 selection_send (ev.xselectionrequest);
1474 break; 1512 break;
1475 1513
1476 case MapNotify: 1514 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP 1515#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a 1516 /* This is needed specifically to fix the case of no window manager or a
1479 * non-reparenting window manager. In those cases we never get first 1517 * non-reparenting window manager. In those cases we never get first
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1518 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does 1519 * care of multiplicity of ConfigureNotify events arriving while WM does
1482 * reparenting. 1520 * reparenting.
1483 * We should not render background immidiately, as there could be several 1521 * We should not render background immediately, as there could be several
1484 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1522 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1485 * by scheduling background redraw as soon as we can, but giving a short 1523 * by scheduling background redraw as soon as we can, but giving a short
1486 * bit of time for ConfigureNotifies to arrive. 1524 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all 1525 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results. 1526 * of ConfigureNotifys for the best results.
1489 */ 1527 */
1490 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1528 if (!(bg_flags & BG_IS_VALID))
1491 update_background_ev.start (0.025); 1529 update_background_ev.start (0.025);
1492#endif 1530#endif
1493 mapped = 1; 1531 mapped = 1;
1494#ifdef TEXT_BLINK 1532#ifdef TEXT_BLINK
1495 text_blink_ev.start (); 1533 text_blink_ev.start ();
… …
1510 if (ev.xany.window == vt) 1548 if (ev.xany.window == vt)
1511 { 1549 {
1512 do 1550 do
1513 { 1551 {
1514 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1515 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, false);
1516 } 1554 }
1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1518 1556
1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1520 1558
1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522 { 1560 {
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1561 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1562 ev.xexpose.width, ev.xexpose.height, false);
1525 } 1563 }
1526 1564
1527 want_refresh = 1; 1565 want_refresh = 1;
1528 } 1566 }
1529 else 1567 else
… …
1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1536 ; 1574 ;
1537 1575
1538 if (scrollBar.state && ev.xany.window == scrollBar.win) 1576 if (scrollBar.state && ev.xany.window == scrollBar.win)
1539 { 1577 {
1540 scrollBar.state = STATE_IDLE; 1578 scrollBar.state = SB_STATE_IDLE;
1541 scrollbar_show (0); 1579 scrollBar.show (0);
1542 } 1580 }
1543 } 1581 }
1544 break; 1582 break;
1545 1583
1546 case MotionNotify: 1584 case MotionNotify:
… …
1611 dist = int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1612 } 1650 }
1613 else 1651 else
1614 { 1652 {
1615 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1616 dist = ev.xbutton.y - (int_bwidth + height); 1654 dist = ev.xbutton.y - (int_bwidth + vt_height);
1617 } 1655 }
1618 1656
1619 scroll_selection_lines = Pixel2Height (dist) 1657 scroll_selection_lines = Pixel2Height (dist)
1620 / SELECTION_SCROLL_LINE_SPEEDUP 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1621 + 1; 1659 + 1;
… …
1633#ifdef MOUSE_THRESHOLD 1671#ifdef MOUSE_THRESHOLD
1634 } 1672 }
1635#endif 1673#endif
1636 } 1674 }
1637 } 1675 }
1638 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1676 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1639 { 1677 {
1640 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1678 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1641 MotionNotify, &ev)) 1679 MotionNotify, &ev))
1642 ; 1680 ;
1643 1681
1644 XQueryPointer (dpy, scrollBar.win, 1682 XQueryPointer (dpy, scrollBar.win,
1645 &unused_root, &unused_child, 1683 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1684 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1685 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1686 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1687 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1650 scrollbar_size ()); 1688 scrollBar.size ());
1651 want_refresh = 1; 1689 want_refresh = 1;
1652 scrollbar_show (1); 1690 scrollBar.show (1);
1653 } 1691 }
1654 break; 1692 break;
1655 } 1693 }
1656 1694
1657#if defined(CURSOR_BLINK) 1695#if defined(CURSOR_BLINK)
1658 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1696 if (ev.type == KeyPress)
1659 {
1660 if (hidden_cursor)
1661 {
1662 hidden_cursor = 0;
1663 want_refresh = 1;
1664 }
1665
1666 cursor_blink_ev.again (); 1697 cursor_blink_reset ();
1667 }
1668#endif 1698#endif
1669 1699
1670#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1671 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1672 { 1702 {
… …
1682#endif 1712#endif
1683 1713
1684 refresh_check (); 1714 refresh_check ();
1685} 1715}
1686 1716
1717#if ENABLE_FRILLS
1718void
1719rxvt_term::set_urgency (bool enable)
1720{
1721 if (enable == urgency_hint)
1722 return;
1723
1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1725 {
1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1727 XSetWMHints (dpy, parent, h);
1728 urgency_hint = enable;
1729 XFree (h);
1730 }
1731}
1732#endif
1733
1687void 1734void
1688rxvt_term::focus_in () 1735rxvt_term::focus_in ()
1689{ 1736{
1690 if (!focus) 1737 if (!focus)
1691 { 1738 {
1692 focus = 1; 1739 focus = 1;
1693 want_refresh = 1; 1740 want_refresh = 1;
1694 1741
1695 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696
1697#if USE_XIM 1742#if USE_XIM
1698 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1699 { 1744 {
1700 IMSetPosition (); 1745 im_set_position ();
1701 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1702 } 1747 }
1703#endif 1748#endif
1704#if CURSOR_BLINK 1749#if CURSOR_BLINK
1705 if (option (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
… …
1712 scr_recolour (); 1757 scr_recolour ();
1713 } 1758 }
1714#endif 1759#endif
1715#if ENABLE_FRILLS 1760#if ENABLE_FRILLS
1716 if (option (Opt_urgentOnBell)) 1761 if (option (Opt_urgentOnBell))
1717 { 1762 set_urgency (0);
1718 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1719 {
1720 h->flags &= ~XUrgencyHint;
1721 XSetWMHints (dpy, parent[0], h);
1722 }
1723 }
1724#endif 1763#endif
1764
1765 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1725 } 1766 }
1726} 1767}
1727 1768
1728void 1769void
1729rxvt_term::focus_out () 1770rxvt_term::focus_out ()
… …
1731 if (focus) 1772 if (focus)
1732 { 1773 {
1733 focus = 0; 1774 focus = 0;
1734 want_refresh = 1; 1775 want_refresh = 1;
1735 1776
1736 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1777#if ENABLE_FRILLS
1737 1778 if (option (Opt_urgentOnBell))
1779 set_urgency (0);
1780#endif
1738#if ENABLE_FRILLS || ISO_14755 1781#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf) 1782 if (iso14755buf)
1740 { 1783 {
1741 iso14755buf = 0; 1784 iso14755buf = 0;
1742# if ISO_14755 1785# if ISO_14755
… …
1759 { 1802 {
1760 pix_colors = pix_colors_unfocused; 1803 pix_colors = pix_colors_unfocused;
1761 scr_recolour (); 1804 scr_recolour ();
1762 } 1805 }
1763#endif 1806#endif
1807
1808 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764 } 1809 }
1765} 1810}
1766 1811
1767void 1812void
1768rxvt_term::update_fade_color (unsigned int idx) 1813rxvt_term::update_fade_color (unsigned int idx)
… …
1796 * use the property to determine the pixmap. We use it later on. 1841 * use the property to determine the pixmap. We use it later on.
1797 */ 1842 */
1798 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1843 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1799 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1844 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1800 { 1845 {
1801 bgPixmap.set_root_pixmap (); 1846 bg_set_root_pixmap ();
1802 update_background (); 1847 update_background ();
1803 } 1848 }
1804 1849
1805 break; 1850 break;
1806 } 1851 }
… …
1845 /* save the xbutton state (for ButtonRelease) */ 1890 /* save the xbutton state (for ButtonRelease) */
1846 MEvent.state = ev.state; 1891 MEvent.state = ev.state;
1847#ifdef MOUSE_REPORT_DOUBLECLICK 1892#ifdef MOUSE_REPORT_DOUBLECLICK
1848 if (ev.button == MEvent.button && clickintime) 1893 if (ev.button == MEvent.button && clickintime)
1849 { 1894 {
1850 /* same button, within alloted time */ 1895 /* same button, within allowed time */
1851 MEvent.clicks++; 1896 MEvent.clicks++;
1852 1897
1853 if (MEvent.clicks > 1) 1898 if (MEvent.clicks > 1)
1854 { 1899 {
1855 /* only report double clicks */ 1900 /* only report double clicks */
… …
1936 if (scrollBar.upButton (ev.y)) 1981 if (scrollBar.upButton (ev.y))
1937 direction = UP; /* up */ 1982 direction = UP; /* up */
1938 else if (scrollBar.dnButton (ev.y)) 1983 else if (scrollBar.dnButton (ev.y))
1939 direction = DN; /* down */ 1984 direction = DN; /* down */
1940 1985
1941 scrollBar.state = STATE_IDLE; 1986 scrollBar.state = SB_STATE_IDLE;
1942 /* 1987 /*
1943 * Rxvt-style scrollbar: 1988 * Rxvt-style scrollbar:
1944 * move up if mouse is above slider 1989 * move up if mouse is above slider
1945 * move dn if mouse is below slider 1990 * move dn if mouse is below slider
1946 * 1991 *
… …
1985 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2030 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1986#endif 2031#endif
1987 if (scr_page (direction, 1)) 2032 if (scr_page (direction, 1))
1988 { 2033 {
1989 if (direction == UP) 2034 if (direction == UP)
1990 scrollBar.state = STATE_UP; 2035 scrollBar.state = SB_STATE_UP;
1991 else 2036 else
1992 scrollBar.state = STATE_DOWN; 2037 scrollBar.state = SB_STATE_DOWN;
1993 } 2038 }
1994 } 2039 }
1995 else 2040 else
1996 switch (ev.button) 2041 switch (ev.button)
1997 { 2042 {
1998 case Button2: 2043 case Button2:
1999 switch (scrollBar.align) 2044 switch (scrollBar.align)
2000 { 2045 {
2001 case R_SB_ALIGN_TOP: 2046 case SB_ALIGN_TOP:
2002 csrO = 0; 2047 csrO = 0;
2003 break; 2048 break;
2004 case R_SB_ALIGN_CENTRE: 2049 case SB_ALIGN_CENTRE:
2005 csrO = (scrollBar.bot - scrollBar.top) / 2; 2050 csrO = (scrollBar.bot - scrollBar.top) / 2;
2006 break; 2051 break;
2007 case R_SB_ALIGN_BOTTOM: 2052 case SB_ALIGN_BOTTOM:
2008 csrO = scrollBar.bot - scrollBar.top; 2053 csrO = scrollBar.bot - scrollBar.top;
2009 break; 2054 break;
2010 } 2055 }
2011 2056
2012 if (scrollBar.style == R_SB_XTERM 2057 if (scrollBar.style == SB_STYLE_XTERM
2013 || scrollbar_above_slider (ev.y) 2058 || scrollBar.above_slider (ev.y)
2014 || scrollbar_below_slider (ev.y)) 2059 || scrollBar.below_slider (ev.y))
2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2060 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2016 2061
2017 scrollBar.state = STATE_MOTION; 2062 scrollBar.state = SB_STATE_MOTION;
2018 break; 2063 break;
2019 2064
2020 case Button1: 2065 case Button1:
2021 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2066 if (scrollBar.align == SB_ALIGN_CENTRE)
2022 csrO = ev.y - scrollBar.top; 2067 csrO = ev.y - scrollBar.top;
2023 /* FALLTHROUGH */ 2068 /* FALLTHROUGH */
2024 2069
2025 case Button3: 2070 case Button3:
2026 if (scrollBar.style != R_SB_XTERM) 2071 if (scrollBar.style != SB_STYLE_XTERM)
2027 { 2072 {
2028 if (scrollbar_above_slider (ev.y)) 2073 if (scrollBar.above_slider (ev.y))
2029# ifdef RXVT_SCROLL_FULL 2074# ifdef RXVT_SCROLL_FULL
2030 scr_page (UP, nrow - 1); 2075 scr_page (UP, nrow - 1);
2031# else 2076# else
2032 scr_page (UP, nrow / 4); 2077 scr_page (UP, nrow / 4);
2033# endif 2078# endif
2034 else if (scrollbar_below_slider (ev.y)) 2079 else if (scrollBar.below_slider (ev.y))
2035# ifdef RXVT_SCROLL_FULL 2080# ifdef RXVT_SCROLL_FULL
2036 scr_page (DN, nrow - 1); 2081 scr_page (DN, nrow - 1);
2037# else 2082# else
2038 scr_page (DN, nrow / 4); 2083 scr_page (DN, nrow / 4);
2039# endif 2084# endif
2040 else 2085 else
2041 scrollBar.state = STATE_MOTION; 2086 scrollBar.state = SB_STATE_MOTION;
2042 } 2087 }
2043 else 2088 else
2044 { 2089 {
2045 scr_page ((ev.button == Button1 ? DN : UP), 2090 scr_page ((ev.button == Button1 ? DN : UP),
2046 (nrow 2091 (nrow
2047 * scrollbar_position (ev.y) 2092 * scrollBar.position (ev.y)
2048 / scrollbar_size ())); 2093 / scrollBar.size ()));
2049 } 2094 }
2050 2095
2051 break; 2096 break;
2052 } 2097 }
2053 } 2098 }
… …
2063 2108
2064 csrO = 0; /* reset csr Offset */ 2109 csrO = 0; /* reset csr Offset */
2065 if (!bypass_keystate) 2110 if (!bypass_keystate)
2066 reportmode = !! (priv_modes & PrivMode_mouse_report); 2111 reportmode = !! (priv_modes & PrivMode_mouse_report);
2067 2112
2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2113 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2069 { 2114 {
2070 scrollBar.state = STATE_IDLE; 2115 scrollBar.state = SB_STATE_IDLE;
2071 scrollbar_show (0); 2116 scrollBar.show (0);
2072 } 2117 }
2073 2118
2074#ifdef SELECTION_SCROLLING 2119#ifdef SELECTION_SCROLLING
2075 sel_scroll_ev.stop(); 2120 sel_scroll_ev.stop();
2076#endif 2121#endif
… …
2125 case Button3: 2170 case Button3:
2126 selection_make (ev.time); 2171 selection_make (ev.time);
2127 break; 2172 break;
2128 2173
2129 case Button2: 2174 case Button2:
2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2175 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132 break; 2177 break;
2133 2178
2134#ifdef MOUSE_WHEEL 2179#ifdef MOUSE_WHEEL
2135 case Button4: 2180 case Button4:
2136 case Button5: 2181 case Button5:
… …
2159 } 2204 }
2160 else 2205 else
2161# endif 2206# endif
2162 { 2207 {
2163 scr_page (v, i); 2208 scr_page (v, i);
2164 scrollbar_show (1); 2209 scrollBar.show (1);
2165 } 2210 }
2166 } 2211 }
2167 break; 2212 break;
2168#endif 2213#endif
2169 } 2214 }
2170 } 2215 }
2171} 2216}
2172 2217
2173/*}}} */ 2218/*}}} */
2174 2219
2175bool 2220void
2176rxvt_term::cmd_parse () 2221rxvt_term::cmd_parse ()
2177{ 2222{
2178 bool flag = false;
2179 wchar_t ch = NOCHAR; 2223 wchar_t ch = NOCHAR;
2180 char *seq_begin; // remember start of esc-sequence here 2224 char *seq_begin; // remember start of esc-sequence here
2181 2225
2182 for (;;) 2226 for (;;)
2183 { 2227 {
2184 if (ch == NOCHAR) 2228 if (ecb_unlikely (ch == NOCHAR))
2185 { 2229 {
2186 seq_begin = cmdbuf_ptr; 2230 seq_begin = cmdbuf_ptr;
2187 ch = next_char (); 2231 ch = next_char ();
2188 2232
2189 if (ch == NOCHAR) 2233 if (ch == NOCHAR)
2190 break; 2234 break;
2191 } 2235 }
2192 2236
2193 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2237 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2194 { 2238 {
2195 if (!seen_input) 2239 if (ecb_unlikely (!seen_input))
2196 { 2240 {
2197 seen_input = 1; 2241 seen_input = 1;
2198 // many badly-written programs (e.g. jed) contain a race condition: 2242 // many badly-written programs (e.g. jed) contain a race condition:
2199 // they first read the screensize and then install a SIGWINCH handler. 2243 // they first read the screensize and then install a SIGWINCH handler.
2200 // some window managers resize the window early, and these programs 2244 // some window managers resize the window early, and these programs
… …
2213 wchar_t *str = buf; 2257 wchar_t *str = buf;
2214 wchar_t *eol = str + min (ncol, UBUFSIZ); 2258 wchar_t *eol = str + min (ncol, UBUFSIZ);
2215 2259
2216 for (;;) 2260 for (;;)
2217 { 2261 {
2218 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2262 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2219 break; 2263 break;
2220 2264
2221 *str++ = ch; 2265 *str++ = ch;
2222 2266
2223 if (ch == C0_LF || str >= eol) 2267 if (ecb_unlikely (ch == C0_LF || str >= eol))
2224 { 2268 {
2225 if (ch == C0_LF) 2269 if (ch == C0_LF)
2226 nlines++; 2270 nlines++;
2227 2271
2228 refresh_count++; 2272 refresh_count++;
… …
2277 * What the heck we'll cheat and only refresh less than every page-full. 2321 * What the heck we'll cheat and only refresh less than every page-full.
2278 * if skipScroll is enabled. 2322 * if skipScroll is enabled.
2279 */ 2323 */
2280 if (refreshnow) 2324 if (refreshnow)
2281 { 2325 {
2282 flag = true;
2283 scr_refresh (); 2326 scr_refresh ();
2284 want_refresh = 1; 2327 want_refresh = 1;
2285 } 2328 }
2286
2287 } 2329 }
2288 else 2330 else
2289 { 2331 {
2290 try 2332 try
2291 { 2333 {
… …
2299 } 2341 }
2300 2342
2301 ch = NOCHAR; 2343 ch = NOCHAR;
2302 } 2344 }
2303 } 2345 }
2304
2305 return flag;
2306} 2346}
2307 2347
2308// read the next character 2348// read the next character
2309wchar_t 2349wchar_t
2310rxvt_term::next_char () NOTHROW 2350rxvt_term::next_char () NOTHROW
2311{ 2351{
2312 while (cmdbuf_ptr < cmdbuf_endp) 2352 while (cmdbuf_ptr < cmdbuf_endp)
2313 { 2353 {
2314 // assume 7-bit to be ascii ALWAYS 2354 // assume 7-bit to be ascii ALWAYS
2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2355 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2316 return *cmdbuf_ptr++; 2356 return *cmdbuf_ptr++;
2317 2357
2318 wchar_t wc; 2358 wchar_t wc;
2319 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2359 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2320 2360
… …
2324 cmdbuf_ptr = cmdbuf_endp; 2364 cmdbuf_ptr = cmdbuf_endp;
2325 break; 2365 break;
2326 } 2366 }
2327 2367
2328 if (len == (size_t)-1) 2368 if (len == (size_t)-1)
2369 {
2370 mbstate.reset (); // reset now undefined conversion state
2329 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2371 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2372 }
2330 2373
2331 // assume wchar == unicode 2374 // assume wchar == unicode
2332 cmdbuf_ptr += len; 2375 cmdbuf_ptr += len;
2333 return wc & UNICODE_MASK; 2376 return wc & UNICODE_MASK;
2334 } 2377 }
… …
2345 : NOCHAR; 2388 : NOCHAR;
2346} 2389}
2347 2390
2348static class out_of_input out_of_input; 2391static class out_of_input out_of_input;
2349 2392
2350/* rxvt_cmd_getc () - Return next input character */
2351/*
2352 * Return the next input character after first passing any keyboard input
2353 * to the command.
2354 */
2355wchar_t 2393wchar_t
2356rxvt_term::cmd_getc () THROW ((class out_of_input)) 2394rxvt_term::cmd_getc () THROW ((class out_of_input))
2357{ 2395{
2358 wchar_t c = next_char (); 2396 wchar_t c = next_char ();
2359 2397
… …
2378/*----------------------------------------------------------------------*/ 2416/*----------------------------------------------------------------------*/
2379#ifdef PRINTPIPE 2417#ifdef PRINTPIPE
2380FILE * 2418FILE *
2381rxvt_term::popen_printer () 2419rxvt_term::popen_printer ()
2382{ 2420{
2383 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2421 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2384 2422
2385 if (stream == NULL) 2423 if (stream == NULL)
2386 rxvt_warn ("can't open printer pipe, not printing.\n"); 2424 rxvt_warn ("can't open printer pipe, not printing.\n");
2387 2425
2388 return stream; 2426 return stream;
… …
2399 * simulate attached vt100 printer 2437 * simulate attached vt100 printer
2400 */ 2438 */
2401void 2439void
2402rxvt_term::process_print_pipe () 2440rxvt_term::process_print_pipe ()
2403{ 2441{
2404 int done; 2442 FILE *fd = popen_printer ();
2405 FILE *fd;
2406 2443
2407 if ((fd = popen_printer ()) == NULL) 2444 if (!fd)
2408 return; 2445 return;
2409 2446
2410 /* 2447 /*
2411 * Send all input to the printer until either ESC[4i or ESC[?4i 2448 * Send all input to the printer until either ESC[4i or ESC[?4i
2412 * is received. 2449 * is received.
2413 */ 2450 */
2414 for (done = 0; !done;) 2451 for (int done = 0; !done; )
2415 { 2452 {
2416 unsigned char buf[8]; 2453 unsigned char buf[8];
2417 unicode_t ch; 2454 unicode_t ch;
2418 unsigned int i, len; 2455 unsigned int i, len;
2419 2456
… …
2453 pclose_printer (fd); 2490 pclose_printer (fd);
2454} 2491}
2455#endif /* PRINTPIPE */ 2492#endif /* PRINTPIPE */
2456/*}}} */ 2493/*}}} */
2457 2494
2458/* *INDENT-OFF* */
2459enum { 2495enum {
2460 C1_40 = 0x40, 2496 C1_40 = 0x40,
2461 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2497 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2462 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2498 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2463 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2499 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2464 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2500 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2465}; 2501};
2466/* *INDENT-ON* */
2467 2502
2468/*{{{ process non-printing single characters */ 2503/*{{{ process non-printing single characters */
2469void 2504void
2470rxvt_term::process_nonprinting (unicode_t ch) 2505rxvt_term::process_nonprinting (unicode_t ch)
2471{ 2506{
… …
2564 break; 2599 break;
2565 case 'Z': /* identify the terminal type */ 2600 case 'Z': /* identify the terminal type */
2566 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2567 break; 2602 break;
2568 case '<': /* turn off VT52 mode */ 2603 case '<': /* turn off VT52 mode */
2569 PrivMode (0, PrivMode_vt52); 2604 priv_modes &= ~PrivMode_vt52;
2570 break; 2605 break;
2571 case 'F': /* use special graphics character set */ 2606 case 'F': /* use special graphics character set */
2572 case 'G': /* use regular character set */ 2607 case 'G': /* use regular character set */
2573 /* unimplemented */ 2608 /* unimplemented */
2574 break; 2609 break;
… …
2593 return; 2628 return;
2594 } 2629 }
2595 2630
2596 switch (ch) 2631 switch (ch)
2597 { 2632 {
2598 /* case 1: do_tek_mode (); break; */
2599 case '#': 2633 case '#':
2600 if (cmd_getc () == '8') 2634 if (cmd_getc () == '8')
2601 scr_E (); 2635 scr_E ();
2602 break; 2636 break;
2603 case '(': 2637 case '(':
… …
2626#if !ENABLE_MINIMAL 2660#if !ENABLE_MINIMAL
2627 case '9': 2661 case '9':
2628 scr_forwardindex (); 2662 scr_forwardindex ();
2629 break; 2663 break;
2630#endif 2664#endif
2665 // DECPAM/DECPNM
2631 case '=': 2666 case '=':
2667 priv_modes |= PrivMode_aplKP;
2668 break;
2632 case '>': 2669 case '>':
2633 PrivMode ((ch == '='), PrivMode_aplKP); 2670 priv_modes &= ~PrivMode_aplKP;
2634 break; 2671 break;
2635 2672
2636 case C1_40: 2673 case C1_40:
2637 cmd_getc (); 2674 cmd_getc ();
2638 break; 2675 break;
… …
2642 2679
2643 /* 8.3.87: NEXT LINE */ 2680 /* 8.3.87: NEXT LINE */
2644 case C1_NEL: /* ESC E */ 2681 case C1_NEL: /* ESC E */
2645 { 2682 {
2646 wchar_t nlcr[] = { C0_LF, C0_CR }; 2683 wchar_t nlcr[] = { C0_LF, C0_CR };
2647 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2684 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2648 } 2685 }
2649 break; 2686 break;
2650 2687
2651 /* kidnapped escape sequence: Should be 8.3.48 */ 2688 /* kidnapped escape sequence: Should be 8.3.48 */
2652 case C1_ESA: /* ESC G */ 2689 case C1_ESA: /* ESC G */
2653 process_graphics (); 2690 // used by original rxvt for rob nations own graphics mode
2691 if (cmd_getc () == 'Q')
2692 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2654 break; 2693 break;
2655 2694
2656 /* 8.3.63: CHARACTER TABULATION SET */ 2695 /* 8.3.63: CHARACTER TABULATION SET */
2657 case C1_HTS: /* ESC H */ 2696 case C1_HTS: /* ESC H */
2658 scr_set_tab (1); 2697 scr_set_tab (1);
… …
2662 case C1_RI: /* ESC M */ 2701 case C1_RI: /* ESC M */
2663 scr_index (DN); 2702 scr_index (DN);
2664 break; 2703 break;
2665 2704
2666 /* 8.3.142: SINGLE-SHIFT TWO */ 2705 /* 8.3.142: SINGLE-SHIFT TWO */
2667 /*case C1_SS2: scr_single_shift (2); break; */ 2706 /* case C1_SS2: break; */
2668 2707
2669 /* 8.3.143: SINGLE-SHIFT THREE */ 2708 /* 8.3.143: SINGLE-SHIFT THREE */
2670 /*case C1_SS3: scr_single_shift (3); break; */ 2709 /* case C1_SS3: break; */
2671 2710
2672 /* 8.3.27: DEVICE CONTROL STRING */ 2711 /* 8.3.27: DEVICE CONTROL STRING */
2673 case C1_DCS: /* ESC P */ 2712 case C1_DCS: /* ESC P */
2674 process_dcs_seq (); 2713 process_dcs_seq ();
2675 break; 2714 break;
… …
2677 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2716 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2678 case C1_SCI: /* ESC Z */ 2717 case C1_SCI: /* ESC Z */
2679 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2718 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2680 break; /* steal obsolete ESC [ c */ 2719 break; /* steal obsolete ESC [ c */
2681 2720
2682 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2721 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2683 case C1_CSI: /* ESC [ */ 2722 case C1_CSI: /* ESC [ */
2684 process_csi_seq (); 2723 process_csi_seq ();
2685 break; 2724 break;
2686 2725
2687 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2726 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2688 case C1_OSC: /* ESC ] */ 2727 case C1_OSC: /* ESC ] */
2689 process_osc_seq (); 2728 process_osc_seq ();
2690 break; 2729 break;
2691 2730
2692 /* 8.3.106: RESET TO INITIAL STATE */ 2731 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2693 case 'c': 2732 case 'c':
2694 mbstate.reset (); 2733 mbstate.reset ();
2695 scr_poweron (); 2734 scr_poweron ();
2696 scrollbar_show (1); 2735 scrollBar.show (1);
2697 break; 2736 break;
2698 2737
2699 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2738 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2700 case 'n': 2739 case 'n':
2701 scr_charset_choose (2); 2740 scr_charset_choose (2);
… …
2708 } 2747 }
2709} 2748}
2710/*}}} */ 2749/*}}} */
2711 2750
2712/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2751/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2713/* *INDENT-OFF* */
2714enum { 2752enum {
2715 CSI_ICH = 0x40, 2753 CSI_ICH = 0x40,
2716 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2754 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2717 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2755 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2718 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2756 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2721 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2759 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2722 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2760 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2723 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2761 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2724}; 2762};
2725 2763
2726#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2764#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2727 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2765 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2728 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2766 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2729#define get_byte_array_bit(array, bit) \ 2767#define get_byte_array_bit(array, bit) \
2730 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2768 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2731 2769
2732const unsigned char csi_defaults[] = 2770static const unsigned char csi_defaults[] =
2733 { 2771 {
2734 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2772 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2735 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2773 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2736 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2774 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2737 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2775 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2738 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2776 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2739 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2777 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2740 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2778 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2741 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2779 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2742 }; 2780 };
2743/* *INDENT-ON* */
2744 2781
2745void 2782void
2746rxvt_term::process_csi_seq () 2783rxvt_term::process_csi_seq ()
2747{ 2784{
2748 unicode_t ch, priv, i; 2785 unicode_t ch, priv, i;
… …
2752 2789
2753 nargs = 0; 2790 nargs = 0;
2754 2791
2755 priv = 0; 2792 priv = 0;
2756 ch = cmd_getc (); 2793 ch = cmd_getc ();
2757 if (ch >= '<' && ch <= '?') 2794 if ((ch >= '<' && ch <= '?') || ch == '!')
2758 { 2795 {
2759 /* '<' '=' '>' '?' */ 2796 /* '<' '=' '>' '?' '!' */
2760 priv = ch; 2797 priv = ch;
2761 ch = cmd_getc (); 2798 ch = cmd_getc ();
2762 } 2799 }
2763 2800
2764 /* read any numerical arguments */ 2801 /* read any numerical arguments */
… …
2818 2855
2819 case '?': 2856 case '?':
2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2857 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2821 process_terminal_mode (ch, priv, nargs, arg); 2858 process_terminal_mode (ch, priv, nargs, arg);
2822 break; 2859 break;
2860
2861 case '!':
2862 if (ch == CSI_70)
2863 {
2864 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2865 scr_soft_reset ();
2866
2867 static const int pm_h[] = { 7, 25 };
2868 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2869
2870 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2871 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2823 } 2872 }
2873 break;
2874 }
2875
2824 return; 2876 return;
2825 } 2877 }
2826 2878
2827 switch (ch) 2879 switch (ch)
2828 { 2880 {
… …
2842 } 2894 }
2843 break; 2895 break;
2844#endif 2896#endif
2845 2897
2846 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2898 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2847 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2899 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2848 arg[0] = -arg[0]; 2900 arg[0] = -arg[0];
2849 /* FALLTHROUGH */ 2901 /* FALLTHROUGH */
2850 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2902 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2851 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2903 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2852 scr_gotorc (arg[0], 0, RELATIVE); 2904 scr_gotorc (arg[0], 0, RELATIVE);
2853 break; 2905 break;
2854 2906
2855 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2907 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2856 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2908 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3043 } 3095 }
3044} 3096}
3045/*}}} */ 3097/*}}} */
3046 3098
3047#if !ENABLE_MINIMAL 3099#if !ENABLE_MINIMAL
3048/* ARGSUSED */
3049void 3100void
3050rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3101rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3051{ 3102{
3052 int x, y; 3103 int x, y;
3053 XWindowAttributes wattr; 3104 XWindowAttributes wattr;
… …
3062 { 3113 {
3063 /* 3114 /*
3064 * commands 3115 * commands
3065 */ 3116 */
3066 case 1: /* deiconify window */ 3117 case 1: /* deiconify window */
3067 XMapWindow (dpy, parent[0]); 3118 XMapWindow (dpy, parent);
3068 break; 3119 break;
3069 case 2: /* iconify window */ 3120 case 2: /* iconify window */
3070 XIconifyWindow (dpy, parent[0], display->screen); 3121 XIconifyWindow (dpy, parent, display->screen);
3071 break; 3122 break;
3072 case 3: /* set position (pixels) */ 3123 case 3: /* set position (pixels) */
3073 XMoveWindow (dpy, parent[0], args[1], args[2]); 3124 XMoveWindow (dpy, parent, args[1], args[2]);
3074 break; 3125 break;
3075 case 4: /* set size (pixels) */ 3126 case 4: /* set size (pixels) */
3076 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3127 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3077 break; 3128 break;
3078 case 5: /* raise window */ 3129 case 5: /* raise window */
3079 XRaiseWindow (dpy, parent[0]); 3130 XRaiseWindow (dpy, parent);
3080 break; 3131 break;
3081 case 6: /* lower window */ 3132 case 6: /* lower window */
3082 XLowerWindow (dpy, parent[0]); 3133 XLowerWindow (dpy, parent);
3083 break; 3134 break;
3084 case 7: /* refresh window */ 3135 case 7: /* refresh window */
3085 scr_touch (true); 3136 scr_touch (true);
3086 break; 3137 break;
3087 case 8: /* set size (chars) */ 3138 case 8: /* set size (chars) */
… …
3090 break; 3141 break;
3091 3142
3092 //case 9: NYI, TODO, restore maximized window or maximize window 3143 //case 9: NYI, TODO, restore maximized window or maximize window
3093 default: 3144 default:
3094 if (args[0] >= 24) /* set height (chars) */ 3145 if (args[0] >= 24) /* set height (chars) */
3095 set_widthheight ((unsigned int)width, 3146 set_widthheight ((unsigned int)vt_width,
3096 (unsigned int) (args[1] * fheight)); 3147 (unsigned int) (args[1] * fheight));
3097 break; 3148 break;
3098 3149
3099 /* 3150 /*
3100 * reports - some output format copied from XTerm 3151 * reports - some output format copied from XTerm
3101 */ 3152 */
3102 case 11: /* report window state */ 3153 case 11: /* report window state */
3103 XGetWindowAttributes (dpy, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent, &wattr);
3104 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3155 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3105 break; 3156 break;
3106 case 13: /* report window position */ 3157 case 13: /* report window position */
3107 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3108 XTranslateCoordinates (dpy, parent[0], wattr.root, 3159 XTranslateCoordinates (dpy, parent, wattr.root,
3109 -wattr.border_width, -wattr.border_width, 3160 -wattr.border_width, -wattr.border_width,
3110 &x, &y, &wdummy); 3161 &x, &y, &wdummy);
3111 tt_printf ("\033[3;%d;%dt", x, y); 3162 tt_printf ("\033[3;%d;%dt", x, y);
3112 break; 3163 break;
3113 case 14: /* report window size (pixels) */ 3164 case 14: /* report window size (pixels) */
3114 XGetWindowAttributes (dpy, parent[0], &wattr); 3165 XGetWindowAttributes (dpy, parent, &wattr);
3115 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3166 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3116 break; 3167 break;
3117 case 18: /* report text area size (chars) */ 3168 case 18: /* report text area size (chars) */
3118 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3119 break; 3170 break;
… …
3121 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3172 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3122 break; 3173 break;
3123 case 20: /* report icon label */ 3174 case 20: /* report icon label */
3124 { 3175 {
3125 char *s; 3176 char *s;
3126 XGetIconName (dpy, parent[0], &s); 3177 XGetIconName (dpy, parent, &s);
3127 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3178 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3128 XFree (s); 3179 XFree (s);
3129 } 3180 }
3130 break; 3181 break;
3131 case 21: /* report window title */ 3182 case 21: /* report window title */
3132 { 3183 {
3133 char *s; 3184 char *s;
3134 XFetchName (dpy, parent[0], &s); 3185 XFetchName (dpy, parent, &s);
3135 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3186 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3136 XFree (s); 3187 XFree (s);
3137 } 3188 }
3138 break; 3189 break;
3139 } 3190 }
… …
3195 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3246 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3196 */ 3247 */
3197void 3248void
3198rxvt_term::process_dcs_seq () 3249rxvt_term::process_dcs_seq ()
3199{ 3250{
3200 char *s;
3201 unicode_t eh;
3202
3203 /* 3251 /*
3204 * Not handled yet 3252 * Not handled yet
3205 */ 3253 */
3254
3255 unicode_t eh;
3206 s = get_to_st (eh); 3256 char *s = get_to_st (eh);
3207 if (s) 3257 if (s)
3208 free (s); 3258 free (s);
3209 3259
3210 return; 3260 return;
3211} 3261}
… …
3215 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3265 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3216 */ 3266 */
3217void 3267void
3218rxvt_term::process_osc_seq () 3268rxvt_term::process_osc_seq ()
3219{ 3269{
3220 unicode_t ch, eh;
3221 int arg; 3270 int arg;
3222 3271
3223 ch = cmd_getc (); 3272 unicode_t ch = cmd_getc ();
3224 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3273 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3225 arg = arg * 10 + (ch - '0'); 3274 arg = arg * 10 + (ch - '0');
3226 3275
3227 if (ch == ';') 3276 if (ch == ';')
3228 { 3277 {
3278 unicode_t eh;
3229 char *s = get_to_st (eh); 3279 char *s = get_to_st (eh);
3230 3280
3231 if (s) 3281 if (s)
3232 { 3282 {
3233 process_xterm_seq (arg, s, eh); 3283 process_xterm_seq (arg, s, eh);
… …
3257 3307
3258/* 3308/*
3259 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3309 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3260 */ 3310 */
3261void 3311void
3262rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3312rxvt_term::process_xterm_seq (int op, char *str, char resp)
3263{ 3313{
3264 int color; 3314 int color;
3265 char *buf, *name; 3315 char *buf, *name;
3266 bool query = str[0] == '?' && !str[1]; 3316 bool query = str[0] == '?' && !str[1];
3267 int saveop = op; 3317 int saveop = op;
… …
3294 unsigned long bytes_after; 3344 unsigned long bytes_after;
3295 unsigned char *value = 0; 3345 unsigned char *value = 0;
3296 const char *str = ""; 3346 const char *str = "";
3297 3347
3298 if (prop 3348 if (prop
3299 && XGetWindowProperty (dpy, parent[0], 3349 && XGetWindowProperty (dpy, parent,
3300 prop, 0, 1<<16, 0, AnyPropertyType, 3350 prop, 0, 1<<16, 0, AnyPropertyType,
3301 &actual_type, &actual_format, 3351 &actual_type, &actual_format,
3302 &nitems, &bytes_after, &value) == Success 3352 &nitems, &bytes_after, &value) == Success
3303 && actual_type != None 3353 && actual_type != None
3304 && actual_format == 8) 3354 && actual_format == 8)
… …
3308 3358
3309 XFree (value); 3359 XFree (value);
3310 } 3360 }
3311 else 3361 else
3312 { 3362 {
3313 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3363 char *eq = strchr (str, '=');
3314 3364
3315 if (eq) 3365 if (eq)
3316 { 3366 {
3317 *eq = 0; 3367 *eq = 0;
3318 set_utf8_property (display->atom (str), eq + 1); 3368 set_utf8_property (display->atom (str), eq + 1);
3319 } 3369 }
3320 else 3370 else
3321 XDeleteProperty (dpy, parent[0], 3371 XDeleteProperty (dpy, parent,
3322 display->atom (str)); 3372 display->atom (str));
3323 } 3373 }
3324 break; 3374 break;
3325 3375
3326 case XTerm_Color: 3376 case XTerm_Color:
… …
3358 process_color_seq (op, Color_pointer_fg, str, resp); 3408 process_color_seq (op, Color_pointer_fg, str, resp);
3359 break; 3409 break;
3360 case XTerm_Color_pointer_bg: 3410 case XTerm_Color_pointer_bg:
3361 process_color_seq (op, Color_pointer_bg, str, resp); 3411 process_color_seq (op, Color_pointer_bg, str, resp);
3362 break; 3412 break;
3413#ifdef OPTION_HC
3414 case XTerm_Color_HC:
3415 process_color_seq (op, Color_HC, str, resp);
3416 break;
3417 case XTerm_Color_HTC:
3418 process_color_seq (op, Color_HTC, str, resp);
3419 break;
3420#endif
3363#ifndef NO_BOLD_UNDERLINE_REVERSE 3421#ifndef NO_BOLD_UNDERLINE_REVERSE
3364 case XTerm_Color_RV:
3365 process_color_seq (op, Color_RV, str, resp);
3366 break;
3367 case Rxvt_Color_BD:
3368 case URxvt_Color_BD: 3422 case URxvt_Color_BD:
3369 process_color_seq (op, Color_BD, str, resp); 3423 process_color_seq (op, Color_BD, str, resp);
3370 break; 3424 break;
3371 case Rxvt_Color_UL:
3372 case URxvt_Color_UL: 3425 case URxvt_Color_UL:
3373 process_color_seq (op, Color_UL, str, resp); 3426 process_color_seq (op, Color_UL, str, resp);
3374 break; 3427 break;
3375 case URxvt_Color_IT: 3428 case URxvt_Color_IT:
3376 process_color_seq (op, Color_IT, str, resp); 3429 process_color_seq (op, Color_IT, str, resp);
3377 break; 3430 break;
3378#endif 3431#endif
3432 case URxvt_Color_border:
3433 process_color_seq (op, Color_border, str, resp);
3434 break;
3379#if ENABLE_TRANSPARENCY 3435#if ENABLE_TRANSPARENCY
3380 case URxvt_Color_tint: 3436 case URxvt_Color_tint:
3381 process_color_seq (op, Color_tint, str, resp); 3437 process_color_seq (op, Color_tint, str, resp);
3382 { 3438 {
3383 bool changed = false; 3439 bool changed = false;
3384 3440
3385 if (ISSET_PIXCOLOR (Color_tint)) 3441 if (ISSET_PIXCOLOR (Color_tint))
3386 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3442 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3387 else
3388 changed = bgPixmap.unset_tint ();
3389 3443
3390 if (changed) 3444 if (changed)
3391 update_background (); 3445 update_background ();
3392 } 3446 }
3393 3447
… …
3398 case Rxvt_Pixmap: 3452 case Rxvt_Pixmap:
3399 if (!strcmp (str, "?")) 3453 if (!strcmp (str, "?"))
3400 { 3454 {
3401 char str[256]; 3455 char str[256];
3402 3456
3403 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3457 sprintf (str, "[%dx%d+%d+%d]",
3404 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3458 min (h_scale, 32767), min (v_scale, 32767),
3405 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3459 min (h_align, 32767), min (v_align, 32767));
3406 process_xterm_seq (XTerm_title, str, CHAR_ST); 3460 process_xterm_seq (XTerm_title, str, CHAR_ST);
3407 } 3461 }
3408 else 3462 else
3409 { 3463 {
3410 int changed = 0; 3464 bool changed = false;
3411 3465
3412 if (*str != ';') 3466 if (*str != ';')
3413 { 3467 {
3414 /* reset to default scaling :*/
3415 bgPixmap.unset_geometry ();
3416 if (bgPixmap.set_file (str)) /* change pixmap */ 3468 if (bg_set_file (str)) /* change pixmap */
3417 changed++; 3469 changed = true;
3418 str = strchr (str, ';');
3419 if (str == NULL)
3420 bgPixmap.set_defaultGeometry ();
3421 } 3470 }
3422 3471 else
3423 while (str)
3424 { 3472 {
3425 str++; 3473 str++;
3426 if (bgPixmap.set_geometry (str)) 3474 if (bg_set_geometry (str, true))
3427 changed++; 3475 changed = true;
3428 str = strchr (str, ';');
3429 } 3476 }
3430 3477
3431 if (changed) 3478 if (changed)
3479 {
3480 if (bg_window_position_sensitive ())
3481 {
3482 int x, y;
3483 get_window_origin (x, y);
3484 bg_set_position (x, y);
3485 }
3432 update_background (); 3486 update_background ();
3487 }
3433 } 3488 }
3434 break; 3489 break;
3435#endif 3490#endif
3436 3491
3437 case XTerm_logfile: 3492 case XTerm_logfile:
… …
3507 break; 3562 break;
3508#endif 3563#endif
3509 3564
3510#if ENABLE_PERL 3565#if ENABLE_PERL
3511 case URxvt_perl: 3566 case URxvt_perl:
3512 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3567 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3513 ; // no responses yet
3514 break; 3568 break;
3515#endif 3569#endif
3516 } 3570 }
3517} 3571}
3518/*----------------------------------------------------------------------*/ 3572/*----------------------------------------------------------------------*/
… …
3532{ 3586{
3533 int state; 3587 int state;
3534 3588
3535 if (mode == 's') 3589 if (mode == 's')
3536 { 3590 {
3537 SavedModes |= (priv_modes & bit); 3591 if (priv_modes & bit)
3592 SavedModes |= bit;
3593 else
3594 SavedModes &= ~bit;
3538 return -1; 3595 return -1;
3539 } 3596 }
3540 else 3597 else
3541 { 3598 {
3542 if (mode == 'r') 3599 if (mode == 'r')
3543 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3600 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3544 else 3601 else
3545 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3602 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3546 PrivMode (state, bit); 3603
3604 if (state)
3605 priv_modes |= bit;
3606 else
3607 priv_modes &= ~bit;
3547 } 3608 }
3548 3609
3549 return state; 3610 return state;
3550} 3611}
3551 3612
3552/* we're not using priv _yet_ */ 3613/* we're not using priv _yet_ */
3553void 3614void
3554rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3615rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3555{ 3616{
3556 unsigned int i, j; 3617 unsigned int i, j;
3557 int state; 3618 int state;
3558 3619
3559 static const struct 3620 static const struct
3560 { 3621 {
3561 const int argval; 3622 const int argval;
3562 const unsigned long bit; 3623 const unsigned long bit;
3563 } argtopriv[] = { 3624 } argtopriv[] = {
3564 { 1, PrivMode_aplCUR }, 3625 { 1, PrivMode_aplCUR }, // DECCKM
3565 { 2, PrivMode_vt52 }, 3626 { 2, PrivMode_vt52 }, // DECANM
3566 { 3, PrivMode_132 }, 3627 { 3, PrivMode_132 }, // DECCOLM
3567 { 4, PrivMode_smoothScroll }, 3628 { 4, PrivMode_smoothScroll }, // DECSCLM
3568 { 5, PrivMode_rVideo }, 3629 { 5, PrivMode_rVideo }, // DECSCNM
3569 { 6, PrivMode_relOrigin }, 3630 { 6, PrivMode_relOrigin }, // DECOM
3570 { 7, PrivMode_Autowrap }, 3631 { 7, PrivMode_Autowrap }, // DECAWM
3571 // 8, bi-directional support mode 3632 // 8, auto-repeat keys // DECARM
3572 { 9, PrivMode_MouseX10 }, 3633 { 9, PrivMode_MouseX10 },
3573 // 18, 19 printing-related 3634 // 18 end FF to printer after print screen
3635 // 19 Print screen prints full screen/scroll region
3574 { 25, PrivMode_VisibleCursor }, 3636 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3575#ifdef scrollBar_esc 3637#ifdef scrollBar_esc
3576 { scrollBar_esc, PrivMode_scrollBar }, 3638 { scrollBar_esc, PrivMode_scrollBar },
3577#endif 3639#endif
3578 { 35, PrivMode_ShiftKeys }, // rxvt extension 3640 { 35, PrivMode_ShiftKeys }, // rxvt extension
3641 // 38, tektronix mode // DECTEK
3579 { 40, PrivMode_132OK }, 3642 { 40, PrivMode_132OK },
3580 // 41 xterm more fixes NYI 3643 // 41 xterm more fixes NYI
3581 // 45 margin bell NYI 3644 // 45 margin bell NYI
3582 // 46 start logging 3645 // 46 start logging
3583 { 47, PrivMode_Screen }, 3646 { 47, PrivMode_Screen },
3584 { 66, PrivMode_aplKP }, 3647 { 66, PrivMode_aplKP }, // DECNKM
3585#ifndef NO_BACKSPACE_KEY 3648#ifndef NO_BACKSPACE_KEY
3586 { 67, PrivMode_BackSpace }, 3649 { 67, PrivMode_BackSpace }, // DECBKM
3587#endif 3650#endif
3588 { 1000, PrivMode_MouseX11 }, 3651 { 1000, PrivMode_MouseX11 },
3589 { 1002, PrivMode_MouseBtnEvent }, 3652 { 1002, PrivMode_MouseBtnEvent },
3590 { 1003, PrivMode_MouseAnyEvent }, 3653 { 1003, PrivMode_MouseAnyEvent },
3654#if ENABLE_FRILLS
3655 { 1005, PrivMode_ExtModeMouse },
3656#endif
3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3657 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3592 { 1011, PrivMode_Keypress }, // rxvt extension 3658 { 1011, PrivMode_Keypress }, // rxvt extension
3659#if ENABLE_FRILLS
3660 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3661#endif
3593 // 1035 enable modifiers for alt, numlock NYI 3662 // 1035 enable modifiers for alt, numlock NYI
3594 // 1036 send ESC for meta keys NYI 3663 // 1036 send ESC for meta keys NYI
3595 // 1037 send DEL for keypad delete NYI 3664 // 1037 send DEL for keypad delete NYI
3596 { 1047, PrivMode_Screen }, 3665 { 1047, PrivMode_Screen },
3597 // 1048 save and restore cursor 3666 // 1048 save and restore cursor, implemented in code
3598 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3667 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3599 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3668 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3600 { 2004, PrivMode_BracketPaste }, 3669 { 2004, PrivMode_BracketPaste },
3601 }; 3670 };
3602 3671
… …
3612 for (i = 0; i < nargs; i++) 3681 for (i = 0; i < nargs; i++)
3613 { 3682 {
3614 state = -1; 3683 state = -1;
3615 3684
3616 /* basic handling */ 3685 /* basic handling */
3617 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3686 for (j = 0; j < ecb_array_length (argtopriv); j++)
3618 if (argtopriv[j].argval == arg[i]) 3687 if (argtopriv[j].argval == arg[i])
3619 { 3688 {
3620 state = privcases (mode, argtopriv[j].bit); 3689 state = privcases (mode, argtopriv[j].bit);
3621 break; 3690 break;
3622 } 3691 }
… …
3630 3699
3631 scr_touch (true); 3700 scr_touch (true);
3632 break; 3701 break;
3633#endif 3702#endif
3634 case 1048: /* alternative cursor save */ 3703 case 1048: /* alternative cursor save */
3635 case 1049:
3636 if (option (Opt_secondaryScreen)) 3704 if (option (Opt_secondaryScreen))
3637 if (mode == 0) 3705 if (mode == 0)
3638 scr_cursor (RESTORE); 3706 scr_cursor (RESTORE);
3639 else if (mode == 1) 3707 else if (mode == 1)
3640 scr_cursor (SAVE); 3708 scr_cursor (SAVE);
… …
3649 case 2: /* VT52 mode */ 3717 case 2: /* VT52 mode */
3650 /* oddball mode. should be set regardless of set/reset 3718 /* oddball mode. should be set regardless of set/reset
3651 * parameter. Return from VT52 mode with an ESC < from 3719 * parameter. Return from VT52 mode with an ESC < from
3652 * within VT52 mode 3720 * within VT52 mode
3653 */ 3721 */
3654 PrivMode (1, PrivMode_vt52); 3722 priv_modes |= PrivMode_vt52;
3655 break; 3723 break;
3656 case 3: /* 80/132 */ 3724 case 3: /* 80/132 */
3657 if (priv_modes & PrivMode_132OK) 3725 if (priv_modes & PrivMode_132OK)
3658 {
3659 scr_poweron ();
3660 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3726 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3661 }
3662 break; 3727 break;
3663 case 4: /* smooth scrolling */ 3728 case 4: /* smooth scrolling */
3664 set_option (Opt_jumpScroll, !state); 3729 set_option (Opt_jumpScroll, !state);
3665 break; 3730 break;
3666 case 5: /* reverse video */ 3731 case 5: /* reverse video */
… …
3677 if (state) /* orthogonal */ 3742 if (state) /* orthogonal */
3678 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3743 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3679 break; 3744 break;
3680#ifdef scrollBar_esc 3745#ifdef scrollBar_esc
3681 case scrollBar_esc: 3746 case scrollBar_esc:
3682 if (scrollbar_mapping (state)) 3747 scrollBar.map (state);
3683 {
3684 resize_all_windows (0, 0, 0); 3748 resize_all_windows (0, 0, 0);
3685 scr_touch (true); 3749 scr_touch (true);
3686 }
3687 break; 3750 break;
3688#endif 3751#endif
3689 case 25: /* visible/invisible cursor */ 3752 case 25: /* visible/invisible cursor */
3690 scr_cursor_visible (state); 3753 scr_cursor_visible (state);
3691 break; 3754 break;
… …
3704 case 1003: 3767 case 1003:
3705 if (state) 3768 if (state)
3706 { 3769 {
3707 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3770 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3708 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3771 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3772 mouse_row = mouse_col = 0;
3709 vt_emask_mouse = PointerMotionMask; 3773 vt_emask_mouse = PointerMotionMask;
3710 } 3774 }
3711 else 3775 else
3712 vt_emask_mouse = NoEventMask; 3776 vt_emask_mouse = NoEventMask;
3777
3713 vt_select_input (); 3778 vt_select_input ();
3714 break; 3779 break;
3715 case 1010: /* scroll to bottom on TTY output inhibit */ 3780 case 1010: /* scroll to bottom on TTY output inhibit */
3716 set_option (Opt_scrollTtyOutput, !state); 3781 set_option (Opt_scrollTtyOutput, !state);
3717 break; 3782 break;
3718 case 1011: /* scroll to bottom on key press */ 3783 case 1011: /* scroll to bottom on key press */
3719 set_option (Opt_scrollTtyKeypress, state); 3784 set_option (Opt_scrollTtyKeypress, state);
3720 break; 3785 break;
3721 case 1047: /* secondary screen w/ clearing last */ 3786 case 1047: /* secondary screen w/ clearing last */
3722 if (option (Opt_secondaryScreen)) 3787 if (option (Opt_secondaryScreen))
3723 if (current_screen != PRIMARY) 3788 if (!state)
3724 scr_erase_screen (2); 3789 scr_erase_screen (2);
3790
3725 scr_change_screen (state); 3791 scr_change_screen (state);
3726 break; 3792 break;
3727 case 1049: /* secondary screen w/ clearing first */ 3793 case 1049: /* secondary screen w/ clearing first */
3794 if (option (Opt_secondaryScreen))
3795 if (state)
3796 scr_cursor (SAVE);
3797
3728 scr_change_screen (state); 3798 scr_change_screen (state);
3799
3729 if (option (Opt_secondaryScreen)) 3800 if (option (Opt_secondaryScreen))
3730 if (current_screen != PRIMARY) 3801 if (state)
3731 scr_erase_screen (2); 3802 scr_erase_screen (2);
3803 else
3804 scr_cursor (RESTORE);
3732 break; 3805 break;
3733 default: 3806 default:
3734 break; 3807 break;
3735 } 3808 }
3736 } 3809 }
… …
3889 } 3962 }
3890 } 3963 }
3891} 3964}
3892/*}}} */ 3965/*}}} */
3893 3966
3894/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3895void
3896rxvt_term::process_graphics ()
3897{
3898 unicode_t ch, cmd = cmd_getc ();
3899
3900 if (cmd == 'Q')
3901 {
3902 /* query graphics */
3903 tt_printf ("\033G0\012"); /* no graphics */
3904 return;
3905 }
3906 /* swallow other graphics sequences until terminating ':' */
3907 do
3908 ch = cmd_getc ();
3909 while (ch != ':');
3910}
3911/*}}} */
3912
3913/* ------------------------------------------------------------------------- */ 3967/* ------------------------------------------------------------------------- */
3914 3968
3915/* 3969/*
3916 * Send printf () formatted output to the command. 3970 * Send printf () formatted output to the command.
3917 * Only use for small amounts of data. 3971 * Only use for small amounts of data.
… …
3930 3984
3931/* ---------------------------------------------------------------------- */ 3985/* ---------------------------------------------------------------------- */
3932/* Write data to the pty as typed by the user, pasted with the mouse, 3986/* Write data to the pty as typed by the user, pasted with the mouse,
3933 * or generated by us in response to a query ESC sequence. 3987 * or generated by us in response to a query ESC sequence.
3934 */ 3988 */
3935const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3989static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3936 3990
3937void 3991void
3938rxvt_term::tt_write (const char *data, unsigned int len) 3992rxvt_term::tt_write (const char *data, unsigned int len)
3939{ 3993{
3940 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3994 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3945 3999
3946 if (v_buflen == 0) 4000 if (v_buflen == 0)
3947 { 4001 {
3948 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4002 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3949 4003
4004 max_it (written, 0);
4005
3950 if ((unsigned int)written == len) 4006 if (written == len)
3951 return; 4007 return;
3952 4008
3953 data += written; 4009 data += written;
3954 len -= written; 4010 len -= written;
3955 } 4011 }
3956 4012
3957 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4013 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3958 4014
3959 memcpy (v_buffer + v_buflen, data, len); 4015 memcpy (v_buffer + v_buflen, data, len);
3960 v_buflen += len; 4016 v_buflen += len;
3961 4017
3962 pty_ev.set (ev::READ | ev::WRITE); 4018 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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