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.409 by ayin, Sat Feb 16 15:39:20 2008 UTC vs.
Revision 1.497 by sf-exg, Thu Sep 1 08:11:26 2011 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
… …
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
… …
376 param = 5; 379 param = 5;
377 break; 380 break;
378 case XK_Next: 381 case XK_Next:
379 param = 6; 382 param = 6;
380 break; 383 break;
384 case XK_Home:
385 param = 7;
386 break;
387 case XK_End:
388 param = 8;
389 break;
381#endif 390#endif
382 case XK_Help: 391 case XK_Help:
383 param = 28; 392 param = 28;
384 break; 393 break;
385 case XK_Menu: 394 case XK_Menu:
… …
409 * Always permit `shift' to override the current setting 418 * Always permit `shift' to override the current setting
410 */ 419 */
411 shft = ev.state & ShiftMask; 420 shft = ev.state & ShiftMask;
412 ctrl = ev.state & ControlMask; 421 ctrl = ev.state & ControlMask;
413 meta = ev.state & ModMetaMask; 422 meta = ev.state & ModMetaMask;
414
415 if (numlock_state || (ev.state & ModNumLockMask))
416 {
417 numlock_state = (ev.state & ModNumLockMask);
418 PrivMode ((!numlock_state), PrivMode_aplKP);
419 }
420 423
421 kbuf[0] = 0; 424 kbuf[0] = 0;
422 425
423#ifdef USE_XIM 426#ifdef USE_XIM
424 if (Input_Context) 427 if (Input_Context)
… …
499#ifdef PAGING_CONTEXT_LINES 502#ifdef PAGING_CONTEXT_LINES
500 lnsppg = nrow - PAGING_CONTEXT_LINES; 503 lnsppg = nrow - PAGING_CONTEXT_LINES;
501#else 504#else
502 lnsppg = nrow * 4 / 5; 505 lnsppg = nrow * 4 / 5;
503#endif 506#endif
507 max_it (lnsppg, 1);
508
504 if (keysym == XK_Prior) 509 if (keysym == XK_Prior)
505 { 510 {
506 scr_page (UP, lnsppg); 511 scr_page (UP, lnsppg);
507 return; 512 return;
508 } 513 }
… …
561 selection_request (ev.time); 566 selection_request (ev.time);
562 return; 567 return;
563#if TODO 568#if TODO
564 /* rxvt extras */ 569 /* rxvt extras */
565 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
566 change_font (FONT_UP);
567 return; 571 return;
568 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
569 change_font (FONT_DN);
570 return; 573 return;
571#endif 574#endif
572 } 575 }
573 } 576 }
574 } 577 }
575 578
576#if ENABLE_FRILLS || ISO_14755 579#if ENABLE_FRILLS || ISO_14755
577 // ISO 14755 support 580 // ISO 14755 support
578 if (shft && ctrl) 581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
579 { 582 {
580 int hv; 583 int hv;
581 584
582 if (iso14755buf & ISO_14755_51 585 if (iso14755buf & ISO_14755_51
583 && (keysym == XK_space || keysym == XK_KP_Space 586 && (keysym == XK_space || keysym == XK_KP_Space
… …
613 scr_overlay_off (); 616 scr_overlay_off ();
614# endif 617# endif
615 iso14755buf = 0; 618 iso14755buf = 0;
616 } 619 }
617 } 620 }
621 else if (option (Opt_iso14755) &&
618 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 622 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
619 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 623 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
620 if (!(iso14755buf & ISO_14755_STARTED)) 624 if (!(iso14755buf & ISO_14755_STARTED))
621 { 625 {
622 iso14755buf |= ISO_14755_STARTED; 626 iso14755buf |= ISO_14755_STARTED;
623# if ISO_14755 627# if ISO_14755
624 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 628 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
635 } 639 }
636#endif 640#endif
637 641
638 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
639 { 643 {
640 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
641 unsigned int newlen = 1; 645 unsigned int newlen = 1;
642 646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
643 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:
644 { 768 {
645#ifndef NO_BACKSPACE_KEY
646 case XK_BackSpace:
647 if (priv_modes & PrivMode_HaveBackSpace)
648 {
649 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
650 ^ !!ctrl) ? '\b' : '\177';
651 kbuf[1] = '\0';
652 }
653 else
654 strcpy (kbuf, rs[Rs_backspace_key]);
655 break;
656#endif
657#ifndef NO_DELETE_KEY
658 case XK_Delete:
659 strcpy (kbuf, rs[Rs_delete_key]);
660 break;
661#endif
662 case XK_Tab:
663 if (shft)
664 strcpy (kbuf, "\033[Z");
665 else
666 {
667#ifdef CTRL_TAB_MAKES_META
668 if (ctrl)
669 meta = 1;
670#endif
671#ifdef MOD4_TAB_MAKES_META
672 if (ev.state & Mod4Mask)
673 meta = 1;
674#endif
675 newlen = 0;
676 }
677 break;
678
679 case XK_Up: /* "\033[A" */
680 case XK_Down: /* "\033[B" */
681 case XK_Right: /* "\033[C" */
682 case XK_Left: /* "\033[D" */
683 strcpy (kbuf, "\033[Z");
684 kbuf[2] = "DACB"[keysym - XK_Left];
685 /* do Shift first */
686 if (shft)
687 kbuf[2] = "dacb"[keysym - XK_Left];
688 else if (ctrl)
689 {
690 kbuf[1] = 'O';
691 kbuf[2] = "dacb"[keysym - XK_Left];
692 }
693 else if (priv_modes & PrivMode_aplCUR)
694 kbuf[1] = 'O';
695 break;
696
697 case XK_KP_Enter:
698 /* allow shift to override */
699 if (kp)
700 {
701 strcpy (kbuf, "\033OM");
702 break;
703 }
704
705 /* FALLTHROUGH */
706
707 case XK_Return:
708 if (priv_modes & PrivMode_LFNL)
709 {
710 kbuf[0] = '\015';
711 kbuf[1] = '\012';
712 kbuf[2] = '\0';
713 }
714 else
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\0';
718 }
719 break;
720
721 case XK_KP_F1: /* "\033OP" */
722 case XK_KP_F2: /* "\033OQ" */
723 case XK_KP_F3: /* "\033OR" */
724 case XK_KP_F4: /* "\033OS" */
725 strcpy (kbuf, "\033OP");
726 kbuf[2] += (keysym - XK_KP_F1);
727 break;
728
729 case XK_KP_Multiply: /* "\033Oj" : "*" */
730 case XK_KP_Add: /* "\033Ok" : "+" */
731 case XK_KP_Separator: /* "\033Ol" : "," */
732 case XK_KP_Subtract: /* "\033Om" : "-" */
733 case XK_KP_Decimal: /* "\033On" : "." */
734 case XK_KP_Divide: /* "\033Oo" : "/" */
735 case XK_KP_0: /* "\033Op" : "0" */
736 case XK_KP_1: /* "\033Oq" : "1" */
737 case XK_KP_2: /* "\033Or" : "2" */
738 case XK_KP_3: /* "\033Os" : "3" */
739 case XK_KP_4: /* "\033Ot" : "4" */
740 case XK_KP_5: /* "\033Ou" : "5" */
741 case XK_KP_6: /* "\033Ov" : "6" */
742 case XK_KP_7: /* "\033Ow" : "7" */
743 case XK_KP_8: /* "\033Ox" : "8" */
744 case XK_KP_9: /* "\033Oy" : "9" */
745 /* allow shift to override */
746 if (kp)
747 {
748 strcpy (kbuf, "\033Oj");
749 kbuf[2] += (keysym - XK_KP_Multiply);
750 }
751 else
752 {
753 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
754 kbuf[1] = '\0';
755 }
756 break;
757
758 case XK_End:
759 strcpy (kbuf, KS_END);
760 break;
761 case XK_Home:
762 strcpy (kbuf, KS_HOME);
763 break;
764
765 default:
766 {
767 int param = map_function_key (keysym); 769 int param = map_function_key (keysym);
768 if (param > 0) 770 if (param > 0)
769 sprintf (kbuf,"\033[%d~", param); 771 sprintf (kbuf,"\033[%d~", param);
770 else 772 else
771 newlen = 0; 773 newlen = 0;
772 }
773 break;
774 } 774 }
775 break;
776 }
775 777
776 if (newlen) 778 if (newlen)
777 len = strlen (kbuf); 779 len = strlen (kbuf);
778 780
779 /* 781 /*
780 * Pass meta for all function keys, if 'meta' option set 782 * Pass meta for all function keys, if 'meta' option set
781 */ 783 */
782#ifdef META8_OPTION 784#ifdef META8_OPTION
… …
882 commit_iso14755 (); 884 commit_iso14755 ();
883 885
884 return; 886 return;
885 } 887 }
886 888
887 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 889 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
888 if (i[0] == keysym) 890 if (i[0] == keysym)
889 { 891 {
890 iso14755buf = ISO_14755_51 | i[1]; 892 iso14755buf = ISO_14755_51 | i[1];
891 commit_iso14755 (); 893 commit_iso14755 ();
892 894
… …
929 else if (keysym == XK_Control_L || keysym == XK_Control_R) 931 else if (keysym == XK_Control_L || keysym == XK_Control_R)
930 mouse_slip_wheel_speed = 0; 932 mouse_slip_wheel_speed = 0;
931#endif 933#endif
932} 934}
933 935
934#if defined (KEYSYM_RESOURCE)
935unsigned int
936rxvt_term::cmd_write (const char *str, unsigned int count)
937{
938 unsigned int n, s;
939
940 n = cmdbuf_ptr - cmdbuf_base;
941 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
942
943 if (n > 0 && s < count)
944 {
945 memmove (cmdbuf_base, cmdbuf_ptr,
946 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
947 cmdbuf_ptr = cmdbuf_base;
948 cmdbuf_endp -= n;
949 s += n;
950 }
951
952 if (count > s)
953 {
954 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
955 count = s;
956 }
957
958 for (; count--;)
959 *cmdbuf_endp++ = *str++;
960
961 cmd_parse ();
962
963 return 0;
964}
965#endif
966
967void 936void
968rxvt_term::flush () 937rxvt_term::flush ()
969{ 938{
970 flush_ev.stop (); 939 flush_ev.stop ();
971 940
972#ifdef HAVE_BG_PIXMAP 941#ifdef HAVE_BG_PIXMAP
973 if (bgPixmap.check_clearChanged ()) 942 if (bg_flags & BG_NEEDS_REFRESH)
974 { 943 {
975// scr_clear (true); This needs to be researched further! 944 bg_flags &= ~BG_NEEDS_REFRESH;
976 scr_touch (false); 945 scr_touch (false);
977 } 946 }
978#endif 947#endif
979 948
980 if (want_refresh) 949 if (want_refresh)
… …
1016 } 985 }
1017 while (row < end_row); 986 while (row < end_row);
1018 } 987 }
1019 988
1020 scr_refresh (); 989 scr_refresh ();
1021 scrollbar_show (1); 990 scrollBar.show (1);
1022#ifdef USE_XIM 991#ifdef USE_XIM
1023 IMSendSpot (); 992 im_send_spot ();
1024#endif 993#endif
1025 } 994 }
1026 995
1027 display->flush (); 996 display->flush ();
1028} 997}
1029 998
1030/* checks wether a refresh is requested and starts the refresh timer */ 999/* checks whether a refresh is requested and starts the refresh timer */
1031void 1000void
1032rxvt_term::refresh_check () 1001rxvt_term::refresh_check ()
1033{ 1002{
1034 if (want_refresh && !flush_ev.is_active ()) 1003 if (want_refresh && !flush_ev.is_active ())
1035 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1004 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1073 1042
1074#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1075void 1044void
1076rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1077{ 1046{
1078 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1047 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1079 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1048 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1080 { 1049 {
1081 want_refresh = 1; 1050 want_refresh = 1;
1082 refresh_check (); 1051 refresh_check ();
1083 } 1052 }
1084 else 1053 else
… …
1128 { 1097 {
1129 // this should really be sched_yield(), but the linux guys thought 1098 // this should really be sched_yield(), but the linux guys thought
1130 // that giving a process calling sched_yield () less cpu time than 1099 // that giving a process calling sched_yield () less cpu time than
1131 // ones with high nice levels is a useful thing to do. It surely is is 1100 // ones with high nice levels is a useful thing to do. It surely is is
1132 // allowed by the sus... as is returning ENOSYS. 1101 // allowed by the sus... as is returning ENOSYS.
1102 // since the linux guys additionally thought that breaking the only
1103 // known workaround against their unusable sched_yield hack is cool,
1104 // we just nanosleep a bit and hope for the best.
1133 1105
1134 struct timespec ts = { 0, 0 }; 1106 struct timespec ts = { 0, 1000 };
1135 nanosleep (&ts, 0); 1107 nanosleep (&ts, 0);
1136 1108
1137 w.stop (); 1109 w.stop ();
1138 } 1110 }
1139 1111
… …
1142 { 1114 {
1143 } 1115 }
1144} event_handler; 1116} event_handler;
1145#endif 1117#endif
1146 1118
1119/* make sure all the cmd data is at beginning of cmdbuf */
1120void
1121rxvt_term::cmdbuf_reify ()
1122{
1123 if (cmdbuf_ptr == cmdbuf_base)
1124 return;
1125
1126 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1127
1128 memmove (cmdbuf_base, cmdbuf_ptr, used);
1129 cmdbuf_ptr = cmdbuf_base;
1130 cmdbuf_endp = cmdbuf_ptr + used;
1131
1132}
1133
1134#if defined (KEYSYM_RESOURCE)
1135void
1136rxvt_term::cmdbuf_append (const char *str, size_t count)
1137{
1138 cmdbuf_reify ();
1139
1140 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1141
1142 if (count > avail)
1143 return;
1144
1145 memcpy (cmdbuf_endp, str, count);
1146 cmdbuf_endp += count;
1147
1148 cmd_parse ();
1149}
1150#endif
1151
1147bool 1152bool
1148rxvt_term::pty_fill () 1153rxvt_term::pty_fill ()
1149{ 1154{
1150 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1155 cmdbuf_reify ();
1151 1156
1152 if (CBUFSIZ == n) 1157 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1153 { 1158
1154 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1159 if (!avail)
1155 n = 0;
1156 } 1160 {
1157 1161 // normally this indicates a "too long" command sequence - just drop the data we have
1158 memmove (cmdbuf_base, cmdbuf_ptr, n);
1159 cmdbuf_ptr = cmdbuf_base; 1162 cmdbuf_ptr = cmdbuf_base;
1160 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
1161 1166
1162 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1163 1168
1164 if (r > 0) 1169 if (r > 0)
1165 { 1170 {
1166 cmdbuf_endp += r; 1171 cmdbuf_endp += r;
1167 return true; 1172 return true;
… …
1189{ 1194{
1190 make_current (); 1195 make_current ();
1191 1196
1192 if (revents & ev::READ) 1197 if (revents & ev::READ)
1193 // loop, but don't allow a single term to monopolize us 1198 // loop, but don't allow a single term to monopolize us
1194 while (pty_fill ()) 1199 for (int i = CBUFCNT; i-- && pty_fill (); )
1195 if (cmd_parse ()) 1200 cmd_parse ();
1196 break;
1197 1201
1198 if (revents & ev::WRITE) 1202 if (revents & ev::WRITE)
1199 pty_write (); 1203 pty_write ();
1200 1204
1201 refresh_check (); 1205 refresh_check ();
… …
1242{ 1246{
1243 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
1244 int x, y; 1248 int x, y;
1245 int code = 32; 1249 int code = 32;
1246 1250
1247 x = Pixel2Col (ev.x); 1251 x = Pixel2Col (ev.x) + 1;
1248 y = Pixel2Row (ev.y); 1252 y = Pixel2Row (ev.y) + 1;
1253
1249 if (ev.type == MotionNotify) 1254 if (ev.type == MotionNotify)
1250 { 1255 {
1251 if (x == mouse_row && y == mouse_col) 1256 if (x == mouse_row && y == mouse_col)
1252 return; 1257 return;
1258
1253 mouse_row = x; 1259 mouse_row = x;
1254 mouse_col = y; 1260 mouse_col = y;
1255 code += 32; 1261 code += 32;
1256 } 1262 }
1257 1263
… …
1260 else 1266 else
1261 { 1267 {
1262 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
1263 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
1264 if (button_number >= 3) 1270 if (button_number >= 3)
1265 button_number += (64 - 3); 1271 button_number += 64 - 3;
1266 } 1272 }
1267 1273
1268 if (priv_modes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
1269 { 1275 {
1270 /* 1276 /*
… …
1302 fputc ('A', stderr); 1308 fputc ('A', stderr);
1303 if (key_state & 32) 1309 if (key_state & 32)
1304 fputc ('2', stderr); 1310 fputc ('2', stderr);
1305 fprintf (stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
1306 button_number, 1312 button_number,
1307 x + 1, 1313 x,
1308 y + 1); 1314 y);
1309#endif 1315#endif
1310 1316
1317#if ENABLE_FRILLS
1318 if (priv_modes & PrivMode_ExtMouseRight)
1319 tt_printf ("\033[%d;%d;%dM",
1320 code + button_number + key_state,
1321 x,
1322 y);
1323 else if (priv_modes & PrivMode_ExtModeMouse)
1324 tt_printf ("\033[M%c%lc%lc",
1325 code + button_number + key_state,
1326 wint_t (32 + x),
1327 wint_t (32 + y));
1328 else
1329#endif
1311 tt_printf ("\033[M%c%c%c", 1330 tt_printf ("\033[M%c%c%c",
1312 (code + button_number + key_state), 1331 code + button_number + key_state,
1313 (32 + x + 1), 1332 32 + x,
1314 (32 + y + 1)); 1333 32 + y);
1315} 1334}
1316 1335
1317/*{{{ process an X event */ 1336/*{{{ process an X event */
1318void 1337void
1319rxvt_term::x_cb (XEvent &ev) 1338rxvt_term::x_cb (XEvent &ev)
… …
1421 && ev.xfocus.mode != NotifyGrab) 1440 && ev.xfocus.mode != NotifyGrab)
1422 focus_out (); 1441 focus_out ();
1423 break; 1442 break;
1424 1443
1425 case ConfigureNotify: 1444 case ConfigureNotify:
1426 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1427 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1428 szHint.width, szHint.height);*/
1429 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent)
1430 { 1446 {
1431 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1432 ; 1448 ;
1449
1450#ifdef HAVE_BG_PIXMAP
1451 bool moved = false;
1452 if (bg_window_position_sensitive ())
1453 {
1454 int x, y;
1455 if (ev.xconfigure.send_event)
1456 {
1457 x = ev.xconfigure.x;
1458 y = ev.xconfigure.y;
1459 }
1460 else
1461 get_window_origin (x, y);
1462
1463 if (bg_set_position (x, y)
1464 || !(bg_flags & BG_IS_VALID))
1465 moved = true;
1466 }
1467#endif
1433 1468
1434 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1435 { 1470 {
1436 seen_resize = 1; 1471 seen_resize = 1;
1437 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1438 } 1473 }
1439 else 1474 else
1440 { 1475 {
1441#ifdef HAVE_BG_PIXMAP 1476#ifdef HAVE_BG_PIXMAP
1442 if (bgPixmap.window_position_sensitive ())
1443 {
1444 if (mapped) 1477 if (moved)
1445 update_background (); 1478 update_background ();
1446 else
1447 bgPixmap.invalidate ();
1448 }
1449#endif 1479#endif
1450 } 1480 }
1451 1481
1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1453 } 1483 }
1454 break; 1484 break;
1455 1485
1456 case PropertyNotify: 1486 case PropertyNotify:
1457 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1487 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1458 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1459 && ev.xproperty.state == PropertyNewValue)
1460 selection_property (ev.xproperty.window, ev.xproperty.atom);
1461
1462 break; 1488 break;
1463 1489
1464 case SelectionClear: 1490 case SelectionClear:
1465 selection_clear (); 1491 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1466 break;
1467
1468 case SelectionNotify:
1469 if (selection_wait == Sel_normal)
1470 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1471 break; 1492 break;
1472 1493
1473 case SelectionRequest: 1494 case SelectionRequest:
1474 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1475 break; 1496 break;
1476 1497
1477 case MapNotify: 1498 case MapNotify:
1478#ifdef HAVE_BG_PIXMAP 1499#ifdef HAVE_BG_PIXMAP
1479 /* This is needed spcifically to fix the case of no window manager or a 1500 /* This is needed specifically to fix the case of no window manager or a
1480 * non-reparenting window manager. In those cases we never get first 1501 * non-reparenting window manager. In those cases we never get first
1481 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1482 * care of multiplicity of ConfigureNotify events arriwing while WM does 1503 * care of multiplicity of ConfigureNotify events arriving while WM does
1483 * reparenting. 1504 * reparenting.
1484 * We should not render background immidiately, as there could be several 1505 * We should not render background immediately, as there could be several
1485 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1506 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1486 * by scheduling background redraw as soon as we can, but giving a short 1507 * by scheduling background redraw as soon as we can, but giving a short
1487 * bit of time for ConfigureNotifies to arrive. 1508 * bit of time for ConfigureNotifies to arrive.
1488 * We should render background PRIOR to drawing any text, but AFTER all 1509 * We should render background PRIOR to drawing any text, but AFTER all
1489 * of ConfigureNotifys for the best results. 1510 * of ConfigureNotifys for the best results.
1490 */ 1511 */
1491 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1512 if (!(bg_flags & BG_IS_VALID))
1492 update_background_ev.start (0.025); 1513 update_background_ev.start (0.025);
1493#endif 1514#endif
1494 mapped = 1; 1515 mapped = 1;
1495#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1496 text_blink_ev.start (); 1517 text_blink_ev.start ();
… …
1511 if (ev.xany.window == vt) 1532 if (ev.xany.window == vt)
1512 { 1533 {
1513 do 1534 do
1514 { 1535 {
1515 scr_expose (ev.xexpose.x, ev.xexpose.y, 1536 scr_expose (ev.xexpose.x, ev.xexpose.y,
1516 ev.xexpose.width, ev.xexpose.height, False); 1537 ev.xexpose.width, ev.xexpose.height, false);
1517 } 1538 }
1518 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1519 1540
1520 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1521 1542
1522 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1523 { 1544 {
1524 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1525 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, false);
1526 } 1547 }
1527 1548
1528 want_refresh = 1; 1549 want_refresh = 1;
1529 } 1550 }
1530 else 1551 else
… …
1536 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1537 ; 1558 ;
1538 1559
1539 if (scrollBar.state && ev.xany.window == scrollBar.win) 1560 if (scrollBar.state && ev.xany.window == scrollBar.win)
1540 { 1561 {
1541 scrollBar.state = STATE_IDLE; 1562 scrollBar.state = SB_STATE_IDLE;
1542 scrollbar_show (0); 1563 scrollBar.show (0);
1543 } 1564 }
1544 } 1565 }
1545 break; 1566 break;
1546 1567
1547 case MotionNotify: 1568 case MotionNotify:
… …
1634#ifdef MOUSE_THRESHOLD 1655#ifdef MOUSE_THRESHOLD
1635 } 1656 }
1636#endif 1657#endif
1637 } 1658 }
1638 } 1659 }
1639 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1660 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1640 { 1661 {
1641 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1642 MotionNotify, &ev)) 1663 MotionNotify, &ev))
1643 ; 1664 ;
1644 1665
1645 XQueryPointer (dpy, scrollBar.win, 1666 XQueryPointer (dpy, scrollBar.win,
1646 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1647 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1648 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1649 &unused_mask); 1670 &unused_mask);
1650 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1651 scrollbar_size ()); 1672 scrollBar.size ());
1652 want_refresh = 1; 1673 want_refresh = 1;
1653 scrollbar_show (1); 1674 scrollBar.show (1);
1654 } 1675 }
1655 break; 1676 break;
1656 } 1677 }
1657 1678
1658#if defined(CURSOR_BLINK) 1679#if defined(CURSOR_BLINK)
… …
1683#endif 1704#endif
1684 1705
1685 refresh_check (); 1706 refresh_check ();
1686} 1707}
1687 1708
1709#if ENABLE_FRILLS
1710void
1711rxvt_term::set_urgency (bool enable)
1712{
1713 if (enable == urgency_hint)
1714 return;
1715
1716 if (XWMHints *h = XGetWMHints (dpy, parent))
1717 {
1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1719 XSetWMHints (dpy, parent, h);
1720 urgency_hint = enable;
1721 }
1722}
1723#endif
1724
1688void 1725void
1689rxvt_term::focus_in () 1726rxvt_term::focus_in ()
1690{ 1727{
1691 if (!focus) 1728 if (!focus)
1692 { 1729 {
1693 focus = 1; 1730 focus = 1;
1694 want_refresh = 1; 1731 want_refresh = 1;
1695 1732
1696 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1697
1698#if USE_XIM 1733#if USE_XIM
1699 if (Input_Context != NULL) 1734 if (Input_Context != NULL)
1700 { 1735 {
1701 IMSetPosition (); 1736 im_set_position ();
1702 XSetICFocus (Input_Context); 1737 XSetICFocus (Input_Context);
1703 } 1738 }
1704#endif 1739#endif
1705#if CURSOR_BLINK 1740#if CURSOR_BLINK
1706 if (option (Opt_cursorBlink)) 1741 if (option (Opt_cursorBlink))
… …
1713 scr_recolour (); 1748 scr_recolour ();
1714 } 1749 }
1715#endif 1750#endif
1716#if ENABLE_FRILLS 1751#if ENABLE_FRILLS
1717 if (option (Opt_urgentOnBell)) 1752 if (option (Opt_urgentOnBell))
1718 { 1753 set_urgency (0);
1719 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1720 {
1721 h->flags &= ~XUrgencyHint;
1722 XSetWMHints (dpy, parent[0], h);
1723 }
1724 }
1725#endif 1754#endif
1755
1756 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1726 } 1757 }
1727} 1758}
1728 1759
1729void 1760void
1730rxvt_term::focus_out () 1761rxvt_term::focus_out ()
… …
1732 if (focus) 1763 if (focus)
1733 { 1764 {
1734 focus = 0; 1765 focus = 0;
1735 want_refresh = 1; 1766 want_refresh = 1;
1736 1767
1737 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1768#if ENABLE_FRILLS
1738 1769 if (option (Opt_urgentOnBell))
1770 set_urgency (0);
1771#endif
1739#if ENABLE_FRILLS || ISO_14755 1772#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf) 1773 if (iso14755buf)
1741 { 1774 {
1742 iso14755buf = 0; 1775 iso14755buf = 0;
1743# if ISO_14755 1776# if ISO_14755
… …
1760 { 1793 {
1761 pix_colors = pix_colors_unfocused; 1794 pix_colors = pix_colors_unfocused;
1762 scr_recolour (); 1795 scr_recolour ();
1763 } 1796 }
1764#endif 1797#endif
1798
1799 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1765 } 1800 }
1766} 1801}
1767 1802
1768void 1803void
1769rxvt_term::update_fade_color (unsigned int idx) 1804rxvt_term::update_fade_color (unsigned int idx)
… …
1797 * use the property to determine the pixmap. We use it later on. 1832 * use the property to determine the pixmap. We use it later on.
1798 */ 1833 */
1799 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1800 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1801 { 1836 {
1802 bgPixmap.set_root_pixmap (); 1837 bg_set_root_pixmap ();
1803 update_background (); 1838 update_background ();
1804 } 1839 }
1805 1840
1806 break; 1841 break;
1807 } 1842 }
… …
1846 /* save the xbutton state (for ButtonRelease) */ 1881 /* save the xbutton state (for ButtonRelease) */
1847 MEvent.state = ev.state; 1882 MEvent.state = ev.state;
1848#ifdef MOUSE_REPORT_DOUBLECLICK 1883#ifdef MOUSE_REPORT_DOUBLECLICK
1849 if (ev.button == MEvent.button && clickintime) 1884 if (ev.button == MEvent.button && clickintime)
1850 { 1885 {
1851 /* same button, within alloted time */ 1886 /* same button, within allowed time */
1852 MEvent.clicks++; 1887 MEvent.clicks++;
1853 1888
1854 if (MEvent.clicks > 1) 1889 if (MEvent.clicks > 1)
1855 { 1890 {
1856 /* only report double clicks */ 1891 /* only report double clicks */
… …
1937 if (scrollBar.upButton (ev.y)) 1972 if (scrollBar.upButton (ev.y))
1938 direction = UP; /* up */ 1973 direction = UP; /* up */
1939 else if (scrollBar.dnButton (ev.y)) 1974 else if (scrollBar.dnButton (ev.y))
1940 direction = DN; /* down */ 1975 direction = DN; /* down */
1941 1976
1942 scrollBar.state = STATE_IDLE; 1977 scrollBar.state = SB_STATE_IDLE;
1943 /* 1978 /*
1944 * Rxvt-style scrollbar: 1979 * Rxvt-style scrollbar:
1945 * move up if mouse is above slider 1980 * move up if mouse is above slider
1946 * move dn if mouse is below slider 1981 * move dn if mouse is below slider
1947 * 1982 *
… …
1986 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2021 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1987#endif 2022#endif
1988 if (scr_page (direction, 1)) 2023 if (scr_page (direction, 1))
1989 { 2024 {
1990 if (direction == UP) 2025 if (direction == UP)
1991 scrollBar.state = STATE_UP; 2026 scrollBar.state = SB_STATE_UP;
1992 else 2027 else
1993 scrollBar.state = STATE_DOWN; 2028 scrollBar.state = SB_STATE_DOWN;
1994 } 2029 }
1995 } 2030 }
1996 else 2031 else
1997 switch (ev.button) 2032 switch (ev.button)
1998 { 2033 {
1999 case Button2: 2034 case Button2:
2000 switch (scrollBar.align) 2035 switch (scrollBar.align)
2001 { 2036 {
2002 case R_SB_ALIGN_TOP: 2037 case SB_ALIGN_TOP:
2003 csrO = 0; 2038 csrO = 0;
2004 break; 2039 break;
2005 case R_SB_ALIGN_CENTRE: 2040 case SB_ALIGN_CENTRE:
2006 csrO = (scrollBar.bot - scrollBar.top) / 2; 2041 csrO = (scrollBar.bot - scrollBar.top) / 2;
2007 break; 2042 break;
2008 case R_SB_ALIGN_BOTTOM: 2043 case SB_ALIGN_BOTTOM:
2009 csrO = scrollBar.bot - scrollBar.top; 2044 csrO = scrollBar.bot - scrollBar.top;
2010 break; 2045 break;
2011 } 2046 }
2012 2047
2013 if (scrollBar.style == R_SB_XTERM 2048 if (scrollBar.style == SB_STYLE_XTERM
2014 || scrollbar_above_slider (ev.y) 2049 || scrollBar.above_slider (ev.y)
2015 || scrollbar_below_slider (ev.y)) 2050 || scrollBar.below_slider (ev.y))
2016 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2051 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2017 2052
2018 scrollBar.state = STATE_MOTION; 2053 scrollBar.state = SB_STATE_MOTION;
2019 break; 2054 break;
2020 2055
2021 case Button1: 2056 case Button1:
2022 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2057 if (scrollBar.align == SB_ALIGN_CENTRE)
2023 csrO = ev.y - scrollBar.top; 2058 csrO = ev.y - scrollBar.top;
2024 /* FALLTHROUGH */ 2059 /* FALLTHROUGH */
2025 2060
2026 case Button3: 2061 case Button3:
2027 if (scrollBar.style != R_SB_XTERM) 2062 if (scrollBar.style != SB_STYLE_XTERM)
2028 { 2063 {
2029 if (scrollbar_above_slider (ev.y)) 2064 if (scrollBar.above_slider (ev.y))
2030# ifdef RXVT_SCROLL_FULL 2065# ifdef RXVT_SCROLL_FULL
2031 scr_page (UP, nrow - 1); 2066 scr_page (UP, nrow - 1);
2032# else 2067# else
2033 scr_page (UP, nrow / 4); 2068 scr_page (UP, nrow / 4);
2034# endif 2069# endif
2035 else if (scrollbar_below_slider (ev.y)) 2070 else if (scrollBar.below_slider (ev.y))
2036# ifdef RXVT_SCROLL_FULL 2071# ifdef RXVT_SCROLL_FULL
2037 scr_page (DN, nrow - 1); 2072 scr_page (DN, nrow - 1);
2038# else 2073# else
2039 scr_page (DN, nrow / 4); 2074 scr_page (DN, nrow / 4);
2040# endif 2075# endif
2041 else 2076 else
2042 scrollBar.state = STATE_MOTION; 2077 scrollBar.state = SB_STATE_MOTION;
2043 } 2078 }
2044 else 2079 else
2045 { 2080 {
2046 scr_page ((ev.button == Button1 ? DN : UP), 2081 scr_page ((ev.button == Button1 ? DN : UP),
2047 (nrow 2082 (nrow
2048 * scrollbar_position (ev.y) 2083 * scrollBar.position (ev.y)
2049 / scrollbar_size ())); 2084 / scrollBar.size ()));
2050 } 2085 }
2051 2086
2052 break; 2087 break;
2053 } 2088 }
2054 } 2089 }
… …
2064 2099
2065 csrO = 0; /* reset csr Offset */ 2100 csrO = 0; /* reset csr Offset */
2066 if (!bypass_keystate) 2101 if (!bypass_keystate)
2067 reportmode = !! (priv_modes & PrivMode_mouse_report); 2102 reportmode = !! (priv_modes & PrivMode_mouse_report);
2068 2103
2069 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2104 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2070 { 2105 {
2071 scrollBar.state = STATE_IDLE; 2106 scrollBar.state = SB_STATE_IDLE;
2072 scrollbar_show (0); 2107 scrollBar.show (0);
2073 } 2108 }
2074 2109
2075#ifdef SELECTION_SCROLLING 2110#ifdef SELECTION_SCROLLING
2076 sel_scroll_ev.stop(); 2111 sel_scroll_ev.stop();
2077#endif 2112#endif
… …
2127 selection_make (ev.time); 2162 selection_make (ev.time);
2128 break; 2163 break;
2129 2164
2130 case Button2: 2165 case Button2:
2131 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2166 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2132 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2167 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2133 break; 2168 break;
2134 2169
2135#ifdef MOUSE_WHEEL 2170#ifdef MOUSE_WHEEL
2136 case Button4: 2171 case Button4:
2137 case Button5: 2172 case Button5:
… …
2160 } 2195 }
2161 else 2196 else
2162# endif 2197# endif
2163 { 2198 {
2164 scr_page (v, i); 2199 scr_page (v, i);
2165 scrollbar_show (1); 2200 scrollBar.show (1);
2166 } 2201 }
2167 } 2202 }
2168 break; 2203 break;
2169#endif 2204#endif
2170 } 2205 }
2171 } 2206 }
2172} 2207}
2173 2208
2174/*}}} */ 2209/*}}} */
2175 2210
2176bool 2211void
2177rxvt_term::cmd_parse () 2212rxvt_term::cmd_parse ()
2178{ 2213{
2179 bool flag = false;
2180 wchar_t ch = NOCHAR; 2214 wchar_t ch = NOCHAR;
2181 char *seq_begin; // remember start of esc-sequence here 2215 char *seq_begin; // remember start of esc-sequence here
2182 2216
2183 for (;;) 2217 for (;;)
2184 { 2218 {
2185 if (ch == NOCHAR) 2219 if (ecb_unlikely (ch == NOCHAR))
2186 { 2220 {
2187 seq_begin = cmdbuf_ptr; 2221 seq_begin = cmdbuf_ptr;
2188 ch = next_char (); 2222 ch = next_char ();
2189 2223
2190 if (ch == NOCHAR) 2224 if (ch == NOCHAR)
2191 break; 2225 break;
2192 } 2226 }
2193 2227
2194 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2228 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2195 { 2229 {
2196 if (!seen_input) 2230 if (ecb_unlikely (!seen_input))
2197 { 2231 {
2198 seen_input = 1; 2232 seen_input = 1;
2199 // many badly-written programs (e.g. jed) contain a race condition: 2233 // many badly-written programs (e.g. jed) contain a race condition:
2200 // they first read the screensize and then install a SIGWINCH handler. 2234 // they first read the screensize and then install a SIGWINCH handler.
2201 // some window managers resize the window early, and these programs 2235 // some window managers resize the window early, and these programs
… …
2214 wchar_t *str = buf; 2248 wchar_t *str = buf;
2215 wchar_t *eol = str + min (ncol, UBUFSIZ); 2249 wchar_t *eol = str + min (ncol, UBUFSIZ);
2216 2250
2217 for (;;) 2251 for (;;)
2218 { 2252 {
2219 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2253 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2220 break; 2254 break;
2221 2255
2222 *str++ = ch; 2256 *str++ = ch;
2223 2257
2224 if (ch == C0_LF || str >= eol) 2258 if (ecb_unlikely (ch == C0_LF || str >= eol))
2225 { 2259 {
2226 if (ch == C0_LF) 2260 if (ch == C0_LF)
2227 nlines++; 2261 nlines++;
2228 2262
2229 refresh_count++; 2263 refresh_count++;
… …
2278 * What the heck we'll cheat and only refresh less than every page-full. 2312 * What the heck we'll cheat and only refresh less than every page-full.
2279 * if skipScroll is enabled. 2313 * if skipScroll is enabled.
2280 */ 2314 */
2281 if (refreshnow) 2315 if (refreshnow)
2282 { 2316 {
2283 flag = true;
2284 scr_refresh (); 2317 scr_refresh ();
2285 want_refresh = 1; 2318 want_refresh = 1;
2286 } 2319 }
2287
2288 } 2320 }
2289 else 2321 else
2290 { 2322 {
2291 try 2323 try
2292 { 2324 {
… …
2300 } 2332 }
2301 2333
2302 ch = NOCHAR; 2334 ch = NOCHAR;
2303 } 2335 }
2304 } 2336 }
2305
2306 return flag;
2307} 2337}
2308 2338
2309// read the next character 2339// read the next character
2310wchar_t 2340wchar_t
2311rxvt_term::next_char () NOTHROW 2341rxvt_term::next_char () NOTHROW
2312{ 2342{
2313 while (cmdbuf_ptr < cmdbuf_endp) 2343 while (cmdbuf_ptr < cmdbuf_endp)
2314 { 2344 {
2315 // assume 7-bit to be ascii ALWAYS 2345 // assume 7-bit to be ascii ALWAYS
2316 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2346 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2317 return *cmdbuf_ptr++; 2347 return *cmdbuf_ptr++;
2318 2348
2319 wchar_t wc; 2349 wchar_t wc;
2320 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2350 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2321 2351
… …
2325 cmdbuf_ptr = cmdbuf_endp; 2355 cmdbuf_ptr = cmdbuf_endp;
2326 break; 2356 break;
2327 } 2357 }
2328 2358
2329 if (len == (size_t)-1) 2359 if (len == (size_t)-1)
2360 {
2361 mbstate.reset (); // reset now undefined conversion state
2330 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2362 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2363 }
2331 2364
2332 // assume wchar == unicode 2365 // assume wchar == unicode
2333 cmdbuf_ptr += len; 2366 cmdbuf_ptr += len;
2334 return wc & UNICODE_MASK; 2367 return wc & UNICODE_MASK;
2335 } 2368 }
… …
2346 : NOCHAR; 2379 : NOCHAR;
2347} 2380}
2348 2381
2349static class out_of_input out_of_input; 2382static class out_of_input out_of_input;
2350 2383
2351/* rxvt_cmd_getc () - Return next input character */
2352/*
2353 * Return the next input character after first passing any keyboard input
2354 * to the command.
2355 */
2356wchar_t 2384wchar_t
2357rxvt_term::cmd_getc () THROW ((class out_of_input)) 2385rxvt_term::cmd_getc () THROW ((class out_of_input))
2358{ 2386{
2359 wchar_t c = next_char (); 2387 wchar_t c = next_char ();
2360 2388
… …
2379/*----------------------------------------------------------------------*/ 2407/*----------------------------------------------------------------------*/
2380#ifdef PRINTPIPE 2408#ifdef PRINTPIPE
2381FILE * 2409FILE *
2382rxvt_term::popen_printer () 2410rxvt_term::popen_printer ()
2383{ 2411{
2384 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2412 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2385 2413
2386 if (stream == NULL) 2414 if (stream == NULL)
2387 rxvt_warn ("can't open printer pipe, not printing.\n"); 2415 rxvt_warn ("can't open printer pipe, not printing.\n");
2388 2416
2389 return stream; 2417 return stream;
… …
2400 * simulate attached vt100 printer 2428 * simulate attached vt100 printer
2401 */ 2429 */
2402void 2430void
2403rxvt_term::process_print_pipe () 2431rxvt_term::process_print_pipe ()
2404{ 2432{
2405 int done; 2433 FILE *fd = popen_printer ();
2406 FILE *fd;
2407 2434
2408 if ((fd = popen_printer ()) == NULL) 2435 if (!fd)
2409 return; 2436 return;
2410 2437
2411 /* 2438 /*
2412 * Send all input to the printer until either ESC[4i or ESC[?4i 2439 * Send all input to the printer until either ESC[4i or ESC[?4i
2413 * is received. 2440 * is received.
2414 */ 2441 */
2415 for (done = 0; !done;) 2442 for (int done = 0; !done; )
2416 { 2443 {
2417 unsigned char buf[8]; 2444 unsigned char buf[8];
2418 unicode_t ch; 2445 unicode_t ch;
2419 unsigned int i, len; 2446 unsigned int i, len;
2420 2447
… …
2454 pclose_printer (fd); 2481 pclose_printer (fd);
2455} 2482}
2456#endif /* PRINTPIPE */ 2483#endif /* PRINTPIPE */
2457/*}}} */ 2484/*}}} */
2458 2485
2459/* *INDENT-OFF* */
2460enum { 2486enum {
2461 C1_40 = 0x40, 2487 C1_40 = 0x40,
2462 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2488 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2463 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2489 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2464 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2490 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2465 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2491 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2466}; 2492};
2467/* *INDENT-ON* */
2468 2493
2469/*{{{ process non-printing single characters */ 2494/*{{{ process non-printing single characters */
2470void 2495void
2471rxvt_term::process_nonprinting (unicode_t ch) 2496rxvt_term::process_nonprinting (unicode_t ch)
2472{ 2497{
… …
2565 break; 2590 break;
2566 case 'Z': /* identify the terminal type */ 2591 case 'Z': /* identify the terminal type */
2567 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2592 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2568 break; 2593 break;
2569 case '<': /* turn off VT52 mode */ 2594 case '<': /* turn off VT52 mode */
2570 PrivMode (0, PrivMode_vt52); 2595 priv_modes &= ~PrivMode_vt52;
2571 break; 2596 break;
2572 case 'F': /* use special graphics character set */ 2597 case 'F': /* use special graphics character set */
2573 case 'G': /* use regular character set */ 2598 case 'G': /* use regular character set */
2574 /* unimplemented */ 2599 /* unimplemented */
2575 break; 2600 break;
… …
2594 return; 2619 return;
2595 } 2620 }
2596 2621
2597 switch (ch) 2622 switch (ch)
2598 { 2623 {
2599 /* case 1: do_tek_mode (); break; */
2600 case '#': 2624 case '#':
2601 if (cmd_getc () == '8') 2625 if (cmd_getc () == '8')
2602 scr_E (); 2626 scr_E ();
2603 break; 2627 break;
2604 case '(': 2628 case '(':
… …
2627#if !ENABLE_MINIMAL 2651#if !ENABLE_MINIMAL
2628 case '9': 2652 case '9':
2629 scr_forwardindex (); 2653 scr_forwardindex ();
2630 break; 2654 break;
2631#endif 2655#endif
2656 // DECPAM/DECPNM
2632 case '=': 2657 case '=':
2658 priv_modes |= PrivMode_aplKP;
2659 break;
2633 case '>': 2660 case '>':
2634 PrivMode ((ch == '='), PrivMode_aplKP); 2661 priv_modes &= ~PrivMode_aplKP;
2635 break; 2662 break;
2636 2663
2637 case C1_40: 2664 case C1_40:
2638 cmd_getc (); 2665 cmd_getc ();
2639 break; 2666 break;
… …
2643 2670
2644 /* 8.3.87: NEXT LINE */ 2671 /* 8.3.87: NEXT LINE */
2645 case C1_NEL: /* ESC E */ 2672 case C1_NEL: /* ESC E */
2646 { 2673 {
2647 wchar_t nlcr[] = { C0_LF, C0_CR }; 2674 wchar_t nlcr[] = { C0_LF, C0_CR };
2648 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2675 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2649 } 2676 }
2650 break; 2677 break;
2651 2678
2652 /* kidnapped escape sequence: Should be 8.3.48 */ 2679 /* kidnapped escape sequence: Should be 8.3.48 */
2653 case C1_ESA: /* ESC G */ 2680 case C1_ESA: /* ESC G */
2654 process_graphics (); 2681 // used by original rxvt for rob nations own graphics mode
2682 if (cmd_getc () == 'Q')
2683 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2655 break; 2684 break;
2656 2685
2657 /* 8.3.63: CHARACTER TABULATION SET */ 2686 /* 8.3.63: CHARACTER TABULATION SET */
2658 case C1_HTS: /* ESC H */ 2687 case C1_HTS: /* ESC H */
2659 scr_set_tab (1); 2688 scr_set_tab (1);
… …
2663 case C1_RI: /* ESC M */ 2692 case C1_RI: /* ESC M */
2664 scr_index (DN); 2693 scr_index (DN);
2665 break; 2694 break;
2666 2695
2667 /* 8.3.142: SINGLE-SHIFT TWO */ 2696 /* 8.3.142: SINGLE-SHIFT TWO */
2668 /*case C1_SS2: scr_single_shift (2); break; */ 2697 /* case C1_SS2: break; */
2669 2698
2670 /* 8.3.143: SINGLE-SHIFT THREE */ 2699 /* 8.3.143: SINGLE-SHIFT THREE */
2671 /*case C1_SS3: scr_single_shift (3); break; */ 2700 /* case C1_SS3: break; */
2672 2701
2673 /* 8.3.27: DEVICE CONTROL STRING */ 2702 /* 8.3.27: DEVICE CONTROL STRING */
2674 case C1_DCS: /* ESC P */ 2703 case C1_DCS: /* ESC P */
2675 process_dcs_seq (); 2704 process_dcs_seq ();
2676 break; 2705 break;
… …
2678 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2707 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2679 case C1_SCI: /* ESC Z */ 2708 case C1_SCI: /* ESC Z */
2680 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2709 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2681 break; /* steal obsolete ESC [ c */ 2710 break; /* steal obsolete ESC [ c */
2682 2711
2683 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2712 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2684 case C1_CSI: /* ESC [ */ 2713 case C1_CSI: /* ESC [ */
2685 process_csi_seq (); 2714 process_csi_seq ();
2686 break; 2715 break;
2687 2716
2688 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2717 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2689 case C1_OSC: /* ESC ] */ 2718 case C1_OSC: /* ESC ] */
2690 process_osc_seq (); 2719 process_osc_seq ();
2691 break; 2720 break;
2692 2721
2693 /* 8.3.106: RESET TO INITIAL STATE */ 2722 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2694 case 'c': 2723 case 'c':
2695 mbstate.reset (); 2724 mbstate.reset ();
2696 scr_poweron (); 2725 scr_poweron ();
2697 scrollbar_show (1); 2726 scrollBar.show (1);
2698 break; 2727 break;
2699 2728
2700 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2729 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2701 case 'n': 2730 case 'n':
2702 scr_charset_choose (2); 2731 scr_charset_choose (2);
… …
2709 } 2738 }
2710} 2739}
2711/*}}} */ 2740/*}}} */
2712 2741
2713/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2742/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2714/* *INDENT-OFF* */
2715enum { 2743enum {
2716 CSI_ICH = 0x40, 2744 CSI_ICH = 0x40,
2717 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2745 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2718 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2746 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2719 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2747 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2722 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2750 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2723 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2751 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2724 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2752 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2725}; 2753};
2726 2754
2727#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2755#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2728 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2756 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2729 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2757 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2730#define get_byte_array_bit(array, bit) \ 2758#define get_byte_array_bit(array, bit) \
2731 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2759 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2732 2760
2733const unsigned char csi_defaults[] = 2761static const unsigned char csi_defaults[] =
2734 { 2762 {
2735 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2763 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2736 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2764 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2737 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2765 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2738 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2766 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2739 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2767 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2740 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2768 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2741 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2769 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2742 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2770 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2743 }; 2771 };
2744/* *INDENT-ON* */
2745 2772
2746void 2773void
2747rxvt_term::process_csi_seq () 2774rxvt_term::process_csi_seq ()
2748{ 2775{
2749 unicode_t ch, priv, i; 2776 unicode_t ch, priv, i;
… …
2753 2780
2754 nargs = 0; 2781 nargs = 0;
2755 2782
2756 priv = 0; 2783 priv = 0;
2757 ch = cmd_getc (); 2784 ch = cmd_getc ();
2758 if (ch >= '<' && ch <= '?') 2785 if ((ch >= '<' && ch <= '?') || ch == '!')
2759 { 2786 {
2760 /* '<' '=' '>' '?' */ 2787 /* '<' '=' '>' '?' '!' */
2761 priv = ch; 2788 priv = ch;
2762 ch = cmd_getc (); 2789 ch = cmd_getc ();
2763 } 2790 }
2764 2791
2765 /* read any numerical arguments */ 2792 /* read any numerical arguments */
… …
2819 2846
2820 case '?': 2847 case '?':
2821 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2848 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2822 process_terminal_mode (ch, priv, nargs, arg); 2849 process_terminal_mode (ch, priv, nargs, arg);
2823 break; 2850 break;
2851
2852 case '!':
2853 if (ch == CSI_70)
2854 {
2855 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2856 scr_soft_reset ();
2857
2858 static const int pm_h[] = { 7, 25 };
2859 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2860
2861 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2862 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2824 } 2863 }
2864 break;
2865 }
2866
2825 return; 2867 return;
2826 } 2868 }
2827 2869
2828 switch (ch) 2870 switch (ch)
2829 { 2871 {
… …
3044 } 3086 }
3045} 3087}
3046/*}}} */ 3088/*}}} */
3047 3089
3048#if !ENABLE_MINIMAL 3090#if !ENABLE_MINIMAL
3049/* ARGSUSED */
3050void 3091void
3051rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3092rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3052{ 3093{
3053 int x, y; 3094 int x, y;
3054 XWindowAttributes wattr; 3095 XWindowAttributes wattr;
… …
3063 { 3104 {
3064 /* 3105 /*
3065 * commands 3106 * commands
3066 */ 3107 */
3067 case 1: /* deiconify window */ 3108 case 1: /* deiconify window */
3068 XMapWindow (dpy, parent[0]); 3109 XMapWindow (dpy, parent);
3069 break; 3110 break;
3070 case 2: /* iconify window */ 3111 case 2: /* iconify window */
3071 XIconifyWindow (dpy, parent[0], display->screen); 3112 XIconifyWindow (dpy, parent, display->screen);
3072 break; 3113 break;
3073 case 3: /* set position (pixels) */ 3114 case 3: /* set position (pixels) */
3074 XMoveWindow (dpy, parent[0], args[1], args[2]); 3115 XMoveWindow (dpy, parent, args[1], args[2]);
3075 break; 3116 break;
3076 case 4: /* set size (pixels) */ 3117 case 4: /* set size (pixels) */
3077 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3118 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3078 break; 3119 break;
3079 case 5: /* raise window */ 3120 case 5: /* raise window */
3080 XRaiseWindow (dpy, parent[0]); 3121 XRaiseWindow (dpy, parent);
3081 break; 3122 break;
3082 case 6: /* lower window */ 3123 case 6: /* lower window */
3083 XLowerWindow (dpy, parent[0]); 3124 XLowerWindow (dpy, parent);
3084 break; 3125 break;
3085 case 7: /* refresh window */ 3126 case 7: /* refresh window */
3086 scr_touch (true); 3127 scr_touch (true);
3087 break; 3128 break;
3088 case 8: /* set size (chars) */ 3129 case 8: /* set size (chars) */
… …
3099 3140
3100 /* 3141 /*
3101 * reports - some output format copied from XTerm 3142 * reports - some output format copied from XTerm
3102 */ 3143 */
3103 case 11: /* report window state */ 3144 case 11: /* report window state */
3104 XGetWindowAttributes (dpy, parent[0], &wattr); 3145 XGetWindowAttributes (dpy, parent, &wattr);
3105 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3146 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3106 break; 3147 break;
3107 case 13: /* report window position */ 3148 case 13: /* report window position */
3108 XGetWindowAttributes (dpy, parent[0], &wattr); 3149 XGetWindowAttributes (dpy, parent, &wattr);
3109 XTranslateCoordinates (dpy, parent[0], wattr.root, 3150 XTranslateCoordinates (dpy, parent, wattr.root,
3110 -wattr.border_width, -wattr.border_width, 3151 -wattr.border_width, -wattr.border_width,
3111 &x, &y, &wdummy); 3152 &x, &y, &wdummy);
3112 tt_printf ("\033[3;%d;%dt", x, y); 3153 tt_printf ("\033[3;%d;%dt", x, y);
3113 break; 3154 break;
3114 case 14: /* report window size (pixels) */ 3155 case 14: /* report window size (pixels) */
3115 XGetWindowAttributes (dpy, parent[0], &wattr); 3156 XGetWindowAttributes (dpy, parent, &wattr);
3116 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3157 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3117 break; 3158 break;
3118 case 18: /* report text area size (chars) */ 3159 case 18: /* report text area size (chars) */
3119 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3160 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3120 break; 3161 break;
… …
3122 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3163 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3123 break; 3164 break;
3124 case 20: /* report icon label */ 3165 case 20: /* report icon label */
3125 { 3166 {
3126 char *s; 3167 char *s;
3127 XGetIconName (dpy, parent[0], &s); 3168 XGetIconName (dpy, parent, &s);
3128 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3169 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3129 XFree (s); 3170 XFree (s);
3130 } 3171 }
3131 break; 3172 break;
3132 case 21: /* report window title */ 3173 case 21: /* report window title */
3133 { 3174 {
3134 char *s; 3175 char *s;
3135 XFetchName (dpy, parent[0], &s); 3176 XFetchName (dpy, parent, &s);
3136 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3177 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3137 XFree (s); 3178 XFree (s);
3138 } 3179 }
3139 break; 3180 break;
3140 } 3181 }
… …
3196 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3237 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3197 */ 3238 */
3198void 3239void
3199rxvt_term::process_dcs_seq () 3240rxvt_term::process_dcs_seq ()
3200{ 3241{
3201 char *s;
3202 unicode_t eh;
3203
3204 /* 3242 /*
3205 * Not handled yet 3243 * Not handled yet
3206 */ 3244 */
3245
3246 unicode_t eh;
3207 s = get_to_st (eh); 3247 char *s = get_to_st (eh);
3208 if (s) 3248 if (s)
3209 free (s); 3249 free (s);
3210 3250
3211 return; 3251 return;
3212} 3252}
… …
3216 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3256 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3217 */ 3257 */
3218void 3258void
3219rxvt_term::process_osc_seq () 3259rxvt_term::process_osc_seq ()
3220{ 3260{
3221 unicode_t ch, eh;
3222 int arg; 3261 int arg;
3223 3262
3224 ch = cmd_getc (); 3263 unicode_t ch = cmd_getc ();
3225 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3264 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3226 arg = arg * 10 + (ch - '0'); 3265 arg = arg * 10 + (ch - '0');
3227 3266
3228 if (ch == ';') 3267 if (ch == ';')
3229 { 3268 {
3269 unicode_t eh;
3230 char *s = get_to_st (eh); 3270 char *s = get_to_st (eh);
3231 3271
3232 if (s) 3272 if (s)
3233 { 3273 {
3234 process_xterm_seq (arg, s, eh); 3274 process_xterm_seq (arg, s, eh);
… …
3258 3298
3259/* 3299/*
3260 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3300 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3261 */ 3301 */
3262void 3302void
3263rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3303rxvt_term::process_xterm_seq (int op, char *str, char resp)
3264{ 3304{
3265 int color; 3305 int color;
3266 char *buf, *name; 3306 char *buf, *name;
3267 bool query = str[0] == '?' && !str[1]; 3307 bool query = str[0] == '?' && !str[1];
3268 int saveop = op; 3308 int saveop = op;
… …
3295 unsigned long bytes_after; 3335 unsigned long bytes_after;
3296 unsigned char *value = 0; 3336 unsigned char *value = 0;
3297 const char *str = ""; 3337 const char *str = "";
3298 3338
3299 if (prop 3339 if (prop
3300 && XGetWindowProperty (dpy, parent[0], 3340 && XGetWindowProperty (dpy, parent,
3301 prop, 0, 1<<16, 0, AnyPropertyType, 3341 prop, 0, 1<<16, 0, AnyPropertyType,
3302 &actual_type, &actual_format, 3342 &actual_type, &actual_format,
3303 &nitems, &bytes_after, &value) == Success 3343 &nitems, &bytes_after, &value) == Success
3304 && actual_type != None 3344 && actual_type != None
3305 && actual_format == 8) 3345 && actual_format == 8)
… …
3309 3349
3310 XFree (value); 3350 XFree (value);
3311 } 3351 }
3312 else 3352 else
3313 { 3353 {
3314 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3354 char *eq = strchr (str, '=');
3315 3355
3316 if (eq) 3356 if (eq)
3317 { 3357 {
3318 *eq = 0; 3358 *eq = 0;
3319 set_utf8_property (display->atom (str), eq + 1); 3359 set_utf8_property (display->atom (str), eq + 1);
3320 } 3360 }
3321 else 3361 else
3322 XDeleteProperty (dpy, parent[0], 3362 XDeleteProperty (dpy, parent,
3323 display->atom (str)); 3363 display->atom (str));
3324 } 3364 }
3325 break; 3365 break;
3326 3366
3327 case XTerm_Color: 3367 case XTerm_Color:
… …
3359 process_color_seq (op, Color_pointer_fg, str, resp); 3399 process_color_seq (op, Color_pointer_fg, str, resp);
3360 break; 3400 break;
3361 case XTerm_Color_pointer_bg: 3401 case XTerm_Color_pointer_bg:
3362 process_color_seq (op, Color_pointer_bg, str, resp); 3402 process_color_seq (op, Color_pointer_bg, str, resp);
3363 break; 3403 break;
3404#ifdef OPTION_HC
3405 case XTerm_Color_HC:
3406 process_color_seq (op, Color_HC, str, resp);
3407 break;
3408 case XTerm_Color_HTC:
3409 process_color_seq (op, Color_HTC, str, resp);
3410 break;
3411#endif
3364#ifndef NO_BOLD_UNDERLINE_REVERSE 3412#ifndef NO_BOLD_UNDERLINE_REVERSE
3365 case XTerm_Color_RV:
3366 process_color_seq (op, Color_RV, str, resp);
3367 break;
3368 case Rxvt_Color_BD:
3369 case URxvt_Color_BD: 3413 case URxvt_Color_BD:
3370 process_color_seq (op, Color_BD, str, resp); 3414 process_color_seq (op, Color_BD, str, resp);
3371 break; 3415 break;
3372 case Rxvt_Color_UL:
3373 case URxvt_Color_UL: 3416 case URxvt_Color_UL:
3374 process_color_seq (op, Color_UL, str, resp); 3417 process_color_seq (op, Color_UL, str, resp);
3375 break; 3418 break;
3376 case URxvt_Color_IT: 3419 case URxvt_Color_IT:
3377 process_color_seq (op, Color_IT, str, resp); 3420 process_color_seq (op, Color_IT, str, resp);
3378 break; 3421 break;
3379#endif 3422#endif
3423 case URxvt_Color_border:
3424 process_color_seq (op, Color_border, str, resp);
3425 break;
3380#if ENABLE_TRANSPARENCY 3426#if ENABLE_TRANSPARENCY
3381 case URxvt_Color_tint: 3427 case URxvt_Color_tint:
3382 process_color_seq (op, Color_tint, str, resp); 3428 process_color_seq (op, Color_tint, str, resp);
3383 { 3429 {
3384 bool changed = false; 3430 bool changed = false;
3385 3431
3386 if (ISSET_PIXCOLOR (Color_tint)) 3432 if (ISSET_PIXCOLOR (Color_tint))
3387 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3433 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3388 else
3389 changed = bgPixmap.unset_tint ();
3390 3434
3391 if (changed) 3435 if (changed)
3392 update_background (); 3436 update_background ();
3393 } 3437 }
3394 3438
… …
3399 case Rxvt_Pixmap: 3443 case Rxvt_Pixmap:
3400 if (!strcmp (str, "?")) 3444 if (!strcmp (str, "?"))
3401 { 3445 {
3402 char str[256]; 3446 char str[256];
3403 3447
3404 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3448 sprintf (str, "[%dx%d+%d+%d]",
3405 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3449 min (h_scale, 32767), min (v_scale, 32767),
3406 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3450 min (h_align, 32767), min (v_align, 32767));
3407 process_xterm_seq (XTerm_title, str, CHAR_ST); 3451 process_xterm_seq (XTerm_title, str, CHAR_ST);
3408 } 3452 }
3409 else 3453 else
3410 { 3454 {
3411 int changed = 0; 3455 bool changed = false;
3412 3456
3413 if (*str != ';') 3457 if (*str != ';')
3414 { 3458 {
3415 /* reset to default scaling :*/
3416 bgPixmap.unset_geometry ();
3417 if (bgPixmap.set_file (str)) /* change pixmap */ 3459 if (bg_set_file (str)) /* change pixmap */
3418 changed++; 3460 changed = true;
3419 str = strchr (str, ';');
3420 if (str == NULL)
3421 bgPixmap.set_defaultGeometry ();
3422 } 3461 }
3423 3462 else
3424 while (str)
3425 { 3463 {
3426 str++; 3464 str++;
3427 if (bgPixmap.set_geometry (str)) 3465 if (bg_set_geometry (str, true))
3428 changed++; 3466 changed = true;
3429 str = strchr (str, ';');
3430 } 3467 }
3431 3468
3432 if (changed) 3469 if (changed)
3470 {
3471 if (bg_window_position_sensitive ())
3472 {
3473 int x, y;
3474 get_window_origin (x, y);
3475 bg_set_position (x, y);
3476 }
3433 update_background (); 3477 update_background ();
3478 }
3434 } 3479 }
3435 break; 3480 break;
3436#endif 3481#endif
3437 3482
3438 case XTerm_logfile: 3483 case XTerm_logfile:
… …
3508 break; 3553 break;
3509#endif 3554#endif
3510 3555
3511#if ENABLE_PERL 3556#if ENABLE_PERL
3512 case URxvt_perl: 3557 case URxvt_perl:
3513 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3558 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3514 ; // no responses yet
3515 break; 3559 break;
3516#endif 3560#endif
3517 } 3561 }
3518} 3562}
3519/*----------------------------------------------------------------------*/ 3563/*----------------------------------------------------------------------*/
… …
3542 { 3586 {
3543 if (mode == 'r') 3587 if (mode == 'r')
3544 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3588 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3545 else 3589 else
3546 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3590 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3547 PrivMode (state, bit); 3591
3592 if (state)
3593 priv_modes |= bit;
3594 else
3595 priv_modes &= ~bit;
3548 } 3596 }
3549 3597
3550 return state; 3598 return state;
3551} 3599}
3552 3600
3553/* we're not using priv _yet_ */ 3601/* we're not using priv _yet_ */
3554void 3602void
3555rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3603rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3556{ 3604{
3557 unsigned int i, j; 3605 unsigned int i, j;
3558 int state; 3606 int state;
3559 3607
3560 static const struct 3608 static const struct
3561 { 3609 {
3562 const int argval; 3610 const int argval;
3563 const unsigned long bit; 3611 const unsigned long bit;
3564 } argtopriv[] = { 3612 } argtopriv[] = {
3565 { 1, PrivMode_aplCUR }, 3613 { 1, PrivMode_aplCUR }, // DECCKM
3566 { 2, PrivMode_vt52 }, 3614 { 2, PrivMode_vt52 }, // DECANM
3567 { 3, PrivMode_132 }, 3615 { 3, PrivMode_132 }, // DECCOLM
3568 { 4, PrivMode_smoothScroll }, 3616 { 4, PrivMode_smoothScroll }, // DECSCLM
3569 { 5, PrivMode_rVideo }, 3617 { 5, PrivMode_rVideo }, // DECSCNM
3570 { 6, PrivMode_relOrigin }, 3618 { 6, PrivMode_relOrigin }, // DECOM
3571 { 7, PrivMode_Autowrap }, 3619 { 7, PrivMode_Autowrap }, // DECAWM
3572 // 8, bi-directional support mode 3620 // 8, auto-repeat keys // DECARM
3573 { 9, PrivMode_MouseX10 }, 3621 { 9, PrivMode_MouseX10 },
3574 // 18, 19 printing-related 3622 // 18 end FF to printer after print screen
3623 // 19 Print screen prints full screen/scroll region
3575 { 25, PrivMode_VisibleCursor }, 3624 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3576#ifdef scrollBar_esc 3625#ifdef scrollBar_esc
3577 { scrollBar_esc, PrivMode_scrollBar }, 3626 { scrollBar_esc, PrivMode_scrollBar },
3578#endif 3627#endif
3579 { 35, PrivMode_ShiftKeys }, // rxvt extension 3628 { 35, PrivMode_ShiftKeys }, // rxvt extension
3629 // 38, tektronix mode // DECTEK
3580 { 40, PrivMode_132OK }, 3630 { 40, PrivMode_132OK },
3581 // 41 xterm more fixes NYI 3631 // 41 xterm more fixes NYI
3582 // 45 margin bell NYI 3632 // 45 margin bell NYI
3583 // 46 start logging 3633 // 46 start logging
3584 { 47, PrivMode_Screen }, 3634 { 47, PrivMode_Screen },
3585 { 66, PrivMode_aplKP }, 3635 { 66, PrivMode_aplKP }, // DECNKM
3586#ifndef NO_BACKSPACE_KEY 3636#ifndef NO_BACKSPACE_KEY
3587 { 67, PrivMode_BackSpace }, 3637 { 67, PrivMode_BackSpace }, // DECBKM
3588#endif 3638#endif
3589 { 1000, PrivMode_MouseX11 }, 3639 { 1000, PrivMode_MouseX11 },
3590 { 1002, PrivMode_MouseBtnEvent }, 3640 { 1002, PrivMode_MouseBtnEvent },
3591 { 1003, PrivMode_MouseAnyEvent }, 3641 { 1003, PrivMode_MouseAnyEvent },
3642#if ENABLE_FRILLS
3643 { 1005, PrivMode_ExtModeMouse },
3644#endif
3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3645 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3593 { 1011, PrivMode_Keypress }, // rxvt extension 3646 { 1011, PrivMode_Keypress }, // rxvt extension
3647#if ENABLE_FRILLS
3648 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3649#endif
3594 // 1035 enable modifiers for alt, numlock NYI 3650 // 1035 enable modifiers for alt, numlock NYI
3595 // 1036 send ESC for meta keys NYI 3651 // 1036 send ESC for meta keys NYI
3596 // 1037 send DEL for keypad delete NYI 3652 // 1037 send DEL for keypad delete NYI
3597 { 1047, PrivMode_Screen }, 3653 { 1047, PrivMode_Screen },
3598 // 1048 save and restore cursor 3654 // 1048 save and restore cursor, implemented in code
3599 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3655 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3600 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3656 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3601 { 2004, PrivMode_BracketPaste }, 3657 { 2004, PrivMode_BracketPaste },
3602 }; 3658 };
3603 3659
… …
3613 for (i = 0; i < nargs; i++) 3669 for (i = 0; i < nargs; i++)
3614 { 3670 {
3615 state = -1; 3671 state = -1;
3616 3672
3617 /* basic handling */ 3673 /* basic handling */
3618 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3674 for (j = 0; j < ecb_array_length (argtopriv); j++)
3619 if (argtopriv[j].argval == arg[i]) 3675 if (argtopriv[j].argval == arg[i])
3620 { 3676 {
3621 state = privcases (mode, argtopriv[j].bit); 3677 state = privcases (mode, argtopriv[j].bit);
3622 break; 3678 break;
3623 } 3679 }
… …
3631 3687
3632 scr_touch (true); 3688 scr_touch (true);
3633 break; 3689 break;
3634#endif 3690#endif
3635 case 1048: /* alternative cursor save */ 3691 case 1048: /* alternative cursor save */
3636 case 1049:
3637 if (option (Opt_secondaryScreen)) 3692 if (option (Opt_secondaryScreen))
3638 if (mode == 0) 3693 if (mode == 0)
3639 scr_cursor (RESTORE); 3694 scr_cursor (RESTORE);
3640 else if (mode == 1) 3695 else if (mode == 1)
3641 scr_cursor (SAVE); 3696 scr_cursor (SAVE);
… …
3650 case 2: /* VT52 mode */ 3705 case 2: /* VT52 mode */
3651 /* oddball mode. should be set regardless of set/reset 3706 /* oddball mode. should be set regardless of set/reset
3652 * parameter. Return from VT52 mode with an ESC < from 3707 * parameter. Return from VT52 mode with an ESC < from
3653 * within VT52 mode 3708 * within VT52 mode
3654 */ 3709 */
3655 PrivMode (1, PrivMode_vt52); 3710 priv_modes |= PrivMode_vt52;
3656 break; 3711 break;
3657 case 3: /* 80/132 */ 3712 case 3: /* 80/132 */
3658 if (priv_modes & PrivMode_132OK) 3713 if (priv_modes & PrivMode_132OK)
3659 {
3660 scr_poweron ();
3661 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3714 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3662 }
3663 break; 3715 break;
3664 case 4: /* smooth scrolling */ 3716 case 4: /* smooth scrolling */
3665 set_option (Opt_jumpScroll, !state); 3717 set_option (Opt_jumpScroll, !state);
3666 break; 3718 break;
3667 case 5: /* reverse video */ 3719 case 5: /* reverse video */
… …
3678 if (state) /* orthogonal */ 3730 if (state) /* orthogonal */
3679 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3731 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3680 break; 3732 break;
3681#ifdef scrollBar_esc 3733#ifdef scrollBar_esc
3682 case scrollBar_esc: 3734 case scrollBar_esc:
3683 if (scrollbar_mapping (state)) 3735 scrollBar.map (state);
3684 {
3685 resize_all_windows (0, 0, 0); 3736 resize_all_windows (0, 0, 0);
3686 scr_touch (true); 3737 scr_touch (true);
3687 }
3688 break; 3738 break;
3689#endif 3739#endif
3690 case 25: /* visible/invisible cursor */ 3740 case 25: /* visible/invisible cursor */
3691 scr_cursor_visible (state); 3741 scr_cursor_visible (state);
3692 break; 3742 break;
… …
3705 case 1003: 3755 case 1003:
3706 if (state) 3756 if (state)
3707 { 3757 {
3708 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3758 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3709 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3759 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3760 mouse_row = mouse_col = 0;
3710 vt_emask_mouse = PointerMotionMask; 3761 vt_emask_mouse = PointerMotionMask;
3711 } 3762 }
3712 else 3763 else
3713 vt_emask_mouse = NoEventMask; 3764 vt_emask_mouse = NoEventMask;
3765
3714 vt_select_input (); 3766 vt_select_input ();
3715 break; 3767 break;
3716 case 1010: /* scroll to bottom on TTY output inhibit */ 3768 case 1010: /* scroll to bottom on TTY output inhibit */
3717 set_option (Opt_scrollTtyOutput, !state); 3769 set_option (Opt_scrollTtyOutput, !state);
3718 break; 3770 break;
3719 case 1011: /* scroll to bottom on key press */ 3771 case 1011: /* scroll to bottom on key press */
3720 set_option (Opt_scrollTtyKeypress, state); 3772 set_option (Opt_scrollTtyKeypress, state);
3721 break; 3773 break;
3722 case 1047: /* secondary screen w/ clearing last */ 3774 case 1047: /* secondary screen w/ clearing last */
3723 if (option (Opt_secondaryScreen)) 3775 if (option (Opt_secondaryScreen))
3724 if (current_screen != PRIMARY) 3776 if (!state)
3725 scr_erase_screen (2); 3777 scr_erase_screen (2);
3778
3726 scr_change_screen (state); 3779 scr_change_screen (state);
3727 break; 3780 break;
3728 case 1049: /* secondary screen w/ clearing first */ 3781 case 1049: /* secondary screen w/ clearing first */
3782 if (option (Opt_secondaryScreen))
3783 if (state)
3784 scr_cursor (SAVE);
3785
3729 scr_change_screen (state); 3786 scr_change_screen (state);
3787
3730 if (option (Opt_secondaryScreen)) 3788 if (option (Opt_secondaryScreen))
3731 if (current_screen != PRIMARY) 3789 if (state)
3732 scr_erase_screen (2); 3790 scr_erase_screen (2);
3791 else
3792 scr_cursor (RESTORE);
3733 break; 3793 break;
3734 default: 3794 default:
3735 break; 3795 break;
3736 } 3796 }
3737 } 3797 }
… …
3890 } 3950 }
3891 } 3951 }
3892} 3952}
3893/*}}} */ 3953/*}}} */
3894 3954
3895/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3896void
3897rxvt_term::process_graphics ()
3898{
3899 unicode_t ch, cmd = cmd_getc ();
3900
3901 if (cmd == 'Q')
3902 {
3903 /* query graphics */
3904 tt_printf ("\033G0\012"); /* no graphics */
3905 return;
3906 }
3907 /* swallow other graphics sequences until terminating ':' */
3908 do
3909 ch = cmd_getc ();
3910 while (ch != ':');
3911}
3912/*}}} */
3913
3914/* ------------------------------------------------------------------------- */ 3955/* ------------------------------------------------------------------------- */
3915 3956
3916/* 3957/*
3917 * Send printf () formatted output to the command. 3958 * Send printf () formatted output to the command.
3918 * Only use for small amounts of data. 3959 * Only use for small amounts of data.
… …
3931 3972
3932/* ---------------------------------------------------------------------- */ 3973/* ---------------------------------------------------------------------- */
3933/* Write data to the pty as typed by the user, pasted with the mouse, 3974/* Write data to the pty as typed by the user, pasted with the mouse,
3934 * or generated by us in response to a query ESC sequence. 3975 * or generated by us in response to a query ESC sequence.
3935 */ 3976 */
3936const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3977static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3937 3978
3938void 3979void
3939rxvt_term::tt_write (const char *data, unsigned int len) 3980rxvt_term::tt_write (const char *data, unsigned int len)
3940{ 3981{
3941 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3982 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3946 3987
3947 if (v_buflen == 0) 3988 if (v_buflen == 0)
3948 { 3989 {
3949 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3990 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3950 3991
3992 max_it (written, 0);
3993
3951 if ((unsigned int)written == len) 3994 if (written == len)
3952 return; 3995 return;
3953 3996
3954 data += written; 3997 data += written;
3955 len -= written; 3998 len -= written;
3956 } 3999 }
3957 4000
3958 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4001 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3959 4002
3960 memcpy (v_buffer + v_buflen, data, len); 4003 memcpy (v_buffer + v_buflen, data, len);
3961 v_buflen += len; 4004 v_buflen += len;
3962 4005
3963 pty_ev.set (ev::READ | ev::WRITE); 4006 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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