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.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
… …
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
778 /* 781 /*
779 * Pass meta for all function keys, if 'meta' option set 782 * Pass meta for all function keys, if 'meta' option set
780 */ 783 */
781#ifdef META8_OPTION 784#ifdef META8_OPTION
… …
881 commit_iso14755 (); 884 commit_iso14755 ();
882 885
883 return; 886 return;
884 } 887 }
885 888
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 889 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
887 if (i[0] == keysym) 890 if (i[0] == keysym)
888 { 891 {
889 iso14755buf = ISO_14755_51 | i[1]; 892 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 (); 893 commit_iso14755 ();
891 894
… …
928 else if (keysym == XK_Control_L || keysym == XK_Control_R) 931 else if (keysym == XK_Control_L || keysym == XK_Control_R)
929 mouse_slip_wheel_speed = 0; 932 mouse_slip_wheel_speed = 0;
930#endif 933#endif
931} 934}
932 935
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 936void
967rxvt_term::flush () 937rxvt_term::flush ()
968{ 938{
969 flush_ev.stop (); 939 flush_ev.stop ();
970 940
971#ifdef HAVE_BG_PIXMAP 941#ifdef HAVE_BG_PIXMAP
972 if (bgPixmap.check_clearChanged ()) 942 if (bg_flags & BG_NEEDS_REFRESH)
973 { 943 {
974// scr_clear (true); This needs to be researched further! 944 bg_flags &= ~BG_NEEDS_REFRESH;
975 scr_touch (false); 945 scr_touch (false);
976 } 946 }
977#endif 947#endif
978 948
979 if (want_refresh) 949 if (want_refresh)
… …
1015 } 985 }
1016 while (row < end_row); 986 while (row < end_row);
1017 } 987 }
1018 988
1019 scr_refresh (); 989 scr_refresh ();
1020 scrollbar_show (1); 990 scrollBar.show (1);
1021#ifdef USE_XIM 991#ifdef USE_XIM
1022 IMSendSpot (); 992 im_send_spot ();
1023#endif 993#endif
1024 } 994 }
1025 995
1026 display->flush (); 996 display->flush ();
1027} 997}
1028 998
1029/* checks wether a refresh is requested and starts the refresh timer */ 999/* checks whether a refresh is requested and starts the refresh timer */
1030void 1000void
1031rxvt_term::refresh_check () 1001rxvt_term::refresh_check ()
1032{ 1002{
1033 if (want_refresh && !flush_ev.is_active ()) 1003 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1004 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1072 1042
1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1074void 1044void
1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1076{ 1046{
1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1047 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1048 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1079 { 1049 {
1080 want_refresh = 1; 1050 want_refresh = 1;
1081 refresh_check (); 1051 refresh_check ();
1082 } 1052 }
1083 else 1053 else
… …
1127 { 1097 {
1128 // this should really be sched_yield(), but the linux guys thought 1098 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1099 // 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 1100 // ones with high nice levels is a useful thing to do. It surely is is
1131 // 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.
1132 1105
1133 struct timespec ts = { 0, 0 }; 1106 struct timespec ts = { 0, 1000 };
1134 nanosleep (&ts, 0); 1107 nanosleep (&ts, 0);
1135 1108
1136 w.stop (); 1109 w.stop ();
1137 } 1110 }
1138 1111
… …
1141 { 1114 {
1142 } 1115 }
1143} event_handler; 1116} event_handler;
1144#endif 1117#endif
1145 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
1146bool 1152bool
1147rxvt_term::pty_fill () 1153rxvt_term::pty_fill ()
1148{ 1154{
1149 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1155 cmdbuf_reify ();
1150 1156
1151 if (CBUFSIZ == n) 1157 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1152 { 1158
1153 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1159 if (!avail)
1154 n = 0;
1155 } 1160 {
1156 1161 // 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; 1162 cmdbuf_ptr = cmdbuf_base;
1159 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
1160 1166
1161 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1162 1168
1163 if (r > 0) 1169 if (r > 0)
1164 { 1170 {
1165 cmdbuf_endp += r; 1171 cmdbuf_endp += r;
1166 return true; 1172 return true;
… …
1188{ 1194{
1189 make_current (); 1195 make_current ();
1190 1196
1191 if (revents & ev::READ) 1197 if (revents & ev::READ)
1192 // loop, but don't allow a single term to monopolize us 1198 // loop, but don't allow a single term to monopolize us
1193 while (pty_fill ()) 1199 for (int i = CBUFCNT; i-- && pty_fill (); )
1194 if (cmd_parse ()) 1200 cmd_parse ();
1195 break;
1196 1201
1197 if (revents & ev::WRITE) 1202 if (revents & ev::WRITE)
1198 pty_write (); 1203 pty_write ();
1199 1204
1200 refresh_check (); 1205 refresh_check ();
… …
1241{ 1246{
1242 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
1243 int x, y; 1248 int x, y;
1244 int code = 32; 1249 int code = 32;
1245 1250
1246 x = Pixel2Col (ev.x); 1251 x = Pixel2Col (ev.x) + 1;
1247 y = Pixel2Row (ev.y); 1252 y = Pixel2Row (ev.y) + 1;
1253
1248 if (ev.type == MotionNotify) 1254 if (ev.type == MotionNotify)
1249 { 1255 {
1250 if (x == mouse_row && y == mouse_col) 1256 if (x == mouse_row && y == mouse_col)
1251 return; 1257 return;
1258
1252 mouse_row = x; 1259 mouse_row = x;
1253 mouse_col = y; 1260 mouse_col = y;
1254 code += 32; 1261 code += 32;
1255 } 1262 }
1256 1263
… …
1259 else 1266 else
1260 { 1267 {
1261 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
1262 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
1263 if (button_number >= 3) 1270 if (button_number >= 3)
1264 button_number += (64 - 3); 1271 button_number += 64 - 3;
1265 } 1272 }
1266 1273
1267 if (priv_modes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
1268 { 1275 {
1269 /* 1276 /*
… …
1301 fputc ('A', stderr); 1308 fputc ('A', stderr);
1302 if (key_state & 32) 1309 if (key_state & 32)
1303 fputc ('2', stderr); 1310 fputc ('2', stderr);
1304 fprintf (stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
1305 button_number, 1312 button_number,
1306 x + 1, 1313 x,
1307 y + 1); 1314 y);
1308#endif 1315#endif
1309 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
1310 tt_printf ("\033[M%c%c%c", 1330 tt_printf ("\033[M%c%c%c",
1311 (code + button_number + key_state), 1331 code + button_number + key_state,
1312 (32 + x + 1), 1332 32 + x,
1313 (32 + y + 1)); 1333 32 + y);
1314} 1334}
1315 1335
1316/*{{{ process an X event */ 1336/*{{{ process an X event */
1317void 1337void
1318rxvt_term::x_cb (XEvent &ev) 1338rxvt_term::x_cb (XEvent &ev)
… …
1420 && ev.xfocus.mode != NotifyGrab) 1440 && ev.xfocus.mode != NotifyGrab)
1421 focus_out (); 1441 focus_out ();
1422 break; 1442 break;
1423 1443
1424 case ConfigureNotify: 1444 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]) 1445 if (ev.xconfigure.window == parent)
1429 { 1446 {
1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ; 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
1432 1468
1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1470 {
1435 seen_resize = 1; 1471 seen_resize = 1;
1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1473 }
1438 else 1474 else
1439 { 1475 {
1440#ifdef HAVE_BG_PIXMAP 1476#ifdef HAVE_BG_PIXMAP
1441 if (bgPixmap.window_position_sensitive ())
1442 {
1443 if (mapped) 1477 if (moved)
1444 update_background (); 1478 update_background ();
1445 else
1446 bgPixmap.invalidate ();
1447 }
1448#endif 1479#endif
1449 } 1480 }
1450 1481
1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1452 } 1483 }
1453 break; 1484 break;
1454 1485
1455 case PropertyNotify: 1486 case PropertyNotify:
1456 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1487 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; 1488 break;
1462 1489
1463 case SelectionClear: 1490 case SelectionClear:
1464 selection_clear (); 1491 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; 1492 break;
1471 1493
1472 case SelectionRequest: 1494 case SelectionRequest:
1473 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1474 break; 1496 break;
1475 1497
1476 case MapNotify: 1498 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP 1499#ifdef HAVE_BG_PIXMAP
1478 /* 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
1479 * non-reparenting window manager. In those cases we never get first 1501 * non-reparenting window manager. In those cases we never get first
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does 1503 * care of multiplicity of ConfigureNotify events arriving while WM does
1482 * reparenting. 1504 * reparenting.
1483 * We should not render background immidiately, as there could be several 1505 * 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 1506 * 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 1507 * by scheduling background redraw as soon as we can, but giving a short
1486 * bit of time for ConfigureNotifies to arrive. 1508 * bit of time for ConfigureNotifies to arrive.
1487 * 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
1488 * of ConfigureNotifys for the best results. 1510 * of ConfigureNotifys for the best results.
1489 */ 1511 */
1490 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1512 if (!(bg_flags & BG_IS_VALID))
1491 update_background_ev.start (0.025); 1513 update_background_ev.start (0.025);
1492#endif 1514#endif
1493 mapped = 1; 1515 mapped = 1;
1494#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1495 text_blink_ev.start (); 1517 text_blink_ev.start ();
… …
1510 if (ev.xany.window == vt) 1532 if (ev.xany.window == vt)
1511 { 1533 {
1512 do 1534 do
1513 { 1535 {
1514 scr_expose (ev.xexpose.x, ev.xexpose.y, 1536 scr_expose (ev.xexpose.x, ev.xexpose.y,
1515 ev.xexpose.width, ev.xexpose.height, False); 1537 ev.xexpose.width, ev.xexpose.height, false);
1516 } 1538 }
1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1518 1540
1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1520 1542
1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522 { 1544 {
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, false);
1525 } 1547 }
1526 1548
1527 want_refresh = 1; 1549 want_refresh = 1;
1528 } 1550 }
1529 else 1551 else
… …
1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1536 ; 1558 ;
1537 1559
1538 if (scrollBar.state && ev.xany.window == scrollBar.win) 1560 if (scrollBar.state && ev.xany.window == scrollBar.win)
1539 { 1561 {
1540 scrollBar.state = STATE_IDLE; 1562 scrollBar.state = SB_STATE_IDLE;
1541 scrollbar_show (0); 1563 scrollBar.show (0);
1542 } 1564 }
1543 } 1565 }
1544 break; 1566 break;
1545 1567
1546 case MotionNotify: 1568 case MotionNotify:
… …
1633#ifdef MOUSE_THRESHOLD 1655#ifdef MOUSE_THRESHOLD
1634 } 1656 }
1635#endif 1657#endif
1636 } 1658 }
1637 } 1659 }
1638 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1660 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1639 { 1661 {
1640 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1641 MotionNotify, &ev)) 1663 MotionNotify, &ev))
1642 ; 1664 ;
1643 1665
1644 XQueryPointer (dpy, scrollBar.win, 1666 XQueryPointer (dpy, scrollBar.win,
1645 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1670 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1650 scrollbar_size ()); 1672 scrollBar.size ());
1651 want_refresh = 1; 1673 want_refresh = 1;
1652 scrollbar_show (1); 1674 scrollBar.show (1);
1653 } 1675 }
1654 break; 1676 break;
1655 } 1677 }
1656 1678
1657#if defined(CURSOR_BLINK) 1679#if defined(CURSOR_BLINK)
… …
1682#endif 1704#endif
1683 1705
1684 refresh_check (); 1706 refresh_check ();
1685} 1707}
1686 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
1687void 1725void
1688rxvt_term::focus_in () 1726rxvt_term::focus_in ()
1689{ 1727{
1690 if (!focus) 1728 if (!focus)
1691 { 1729 {
1692 focus = 1; 1730 focus = 1;
1693 want_refresh = 1; 1731 want_refresh = 1;
1694 1732
1695 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696
1697#if USE_XIM 1733#if USE_XIM
1698 if (Input_Context != NULL) 1734 if (Input_Context != NULL)
1699 { 1735 {
1700 IMSetPosition (); 1736 im_set_position ();
1701 XSetICFocus (Input_Context); 1737 XSetICFocus (Input_Context);
1702 } 1738 }
1703#endif 1739#endif
1704#if CURSOR_BLINK 1740#if CURSOR_BLINK
1705 if (option (Opt_cursorBlink)) 1741 if (option (Opt_cursorBlink))
… …
1712 scr_recolour (); 1748 scr_recolour ();
1713 } 1749 }
1714#endif 1750#endif
1715#if ENABLE_FRILLS 1751#if ENABLE_FRILLS
1716 if (option (Opt_urgentOnBell)) 1752 if (option (Opt_urgentOnBell))
1717 { 1753 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 1754#endif
1755
1756 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1725 } 1757 }
1726} 1758}
1727 1759
1728void 1760void
1729rxvt_term::focus_out () 1761rxvt_term::focus_out ()
… …
1731 if (focus) 1763 if (focus)
1732 { 1764 {
1733 focus = 0; 1765 focus = 0;
1734 want_refresh = 1; 1766 want_refresh = 1;
1735 1767
1736 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1768#if ENABLE_FRILLS
1737 1769 if (option (Opt_urgentOnBell))
1770 set_urgency (0);
1771#endif
1738#if ENABLE_FRILLS || ISO_14755 1772#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf) 1773 if (iso14755buf)
1740 { 1774 {
1741 iso14755buf = 0; 1775 iso14755buf = 0;
1742# if ISO_14755 1776# if ISO_14755
… …
1759 { 1793 {
1760 pix_colors = pix_colors_unfocused; 1794 pix_colors = pix_colors_unfocused;
1761 scr_recolour (); 1795 scr_recolour ();
1762 } 1796 }
1763#endif 1797#endif
1798
1799 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764 } 1800 }
1765} 1801}
1766 1802
1767void 1803void
1768rxvt_term::update_fade_color (unsigned int idx) 1804rxvt_term::update_fade_color (unsigned int idx)
… …
1796 * 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.
1797 */ 1833 */
1798 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1799 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1800 { 1836 {
1801 bgPixmap.set_root_pixmap (); 1837 bg_set_root_pixmap ();
1802 update_background (); 1838 update_background ();
1803 } 1839 }
1804 1840
1805 break; 1841 break;
1806 } 1842 }
… …
1845 /* save the xbutton state (for ButtonRelease) */ 1881 /* save the xbutton state (for ButtonRelease) */
1846 MEvent.state = ev.state; 1882 MEvent.state = ev.state;
1847#ifdef MOUSE_REPORT_DOUBLECLICK 1883#ifdef MOUSE_REPORT_DOUBLECLICK
1848 if (ev.button == MEvent.button && clickintime) 1884 if (ev.button == MEvent.button && clickintime)
1849 { 1885 {
1850 /* same button, within alloted time */ 1886 /* same button, within allowed time */
1851 MEvent.clicks++; 1887 MEvent.clicks++;
1852 1888
1853 if (MEvent.clicks > 1) 1889 if (MEvent.clicks > 1)
1854 { 1890 {
1855 /* only report double clicks */ 1891 /* only report double clicks */
… …
1936 if (scrollBar.upButton (ev.y)) 1972 if (scrollBar.upButton (ev.y))
1937 direction = UP; /* up */ 1973 direction = UP; /* up */
1938 else if (scrollBar.dnButton (ev.y)) 1974 else if (scrollBar.dnButton (ev.y))
1939 direction = DN; /* down */ 1975 direction = DN; /* down */
1940 1976
1941 scrollBar.state = STATE_IDLE; 1977 scrollBar.state = SB_STATE_IDLE;
1942 /* 1978 /*
1943 * Rxvt-style scrollbar: 1979 * Rxvt-style scrollbar:
1944 * move up if mouse is above slider 1980 * move up if mouse is above slider
1945 * move dn if mouse is below slider 1981 * move dn if mouse is below slider
1946 * 1982 *
… …
1985 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2021 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1986#endif 2022#endif
1987 if (scr_page (direction, 1)) 2023 if (scr_page (direction, 1))
1988 { 2024 {
1989 if (direction == UP) 2025 if (direction == UP)
1990 scrollBar.state = STATE_UP; 2026 scrollBar.state = SB_STATE_UP;
1991 else 2027 else
1992 scrollBar.state = STATE_DOWN; 2028 scrollBar.state = SB_STATE_DOWN;
1993 } 2029 }
1994 } 2030 }
1995 else 2031 else
1996 switch (ev.button) 2032 switch (ev.button)
1997 { 2033 {
1998 case Button2: 2034 case Button2:
1999 switch (scrollBar.align) 2035 switch (scrollBar.align)
2000 { 2036 {
2001 case R_SB_ALIGN_TOP: 2037 case SB_ALIGN_TOP:
2002 csrO = 0; 2038 csrO = 0;
2003 break; 2039 break;
2004 case R_SB_ALIGN_CENTRE: 2040 case SB_ALIGN_CENTRE:
2005 csrO = (scrollBar.bot - scrollBar.top) / 2; 2041 csrO = (scrollBar.bot - scrollBar.top) / 2;
2006 break; 2042 break;
2007 case R_SB_ALIGN_BOTTOM: 2043 case SB_ALIGN_BOTTOM:
2008 csrO = scrollBar.bot - scrollBar.top; 2044 csrO = scrollBar.bot - scrollBar.top;
2009 break; 2045 break;
2010 } 2046 }
2011 2047
2012 if (scrollBar.style == R_SB_XTERM 2048 if (scrollBar.style == SB_STYLE_XTERM
2013 || scrollbar_above_slider (ev.y) 2049 || scrollBar.above_slider (ev.y)
2014 || scrollbar_below_slider (ev.y)) 2050 || scrollBar.below_slider (ev.y))
2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2051 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2016 2052
2017 scrollBar.state = STATE_MOTION; 2053 scrollBar.state = SB_STATE_MOTION;
2018 break; 2054 break;
2019 2055
2020 case Button1: 2056 case Button1:
2021 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2057 if (scrollBar.align == SB_ALIGN_CENTRE)
2022 csrO = ev.y - scrollBar.top; 2058 csrO = ev.y - scrollBar.top;
2023 /* FALLTHROUGH */ 2059 /* FALLTHROUGH */
2024 2060
2025 case Button3: 2061 case Button3:
2026 if (scrollBar.style != R_SB_XTERM) 2062 if (scrollBar.style != SB_STYLE_XTERM)
2027 { 2063 {
2028 if (scrollbar_above_slider (ev.y)) 2064 if (scrollBar.above_slider (ev.y))
2029# ifdef RXVT_SCROLL_FULL 2065# ifdef RXVT_SCROLL_FULL
2030 scr_page (UP, nrow - 1); 2066 scr_page (UP, nrow - 1);
2031# else 2067# else
2032 scr_page (UP, nrow / 4); 2068 scr_page (UP, nrow / 4);
2033# endif 2069# endif
2034 else if (scrollbar_below_slider (ev.y)) 2070 else if (scrollBar.below_slider (ev.y))
2035# ifdef RXVT_SCROLL_FULL 2071# ifdef RXVT_SCROLL_FULL
2036 scr_page (DN, nrow - 1); 2072 scr_page (DN, nrow - 1);
2037# else 2073# else
2038 scr_page (DN, nrow / 4); 2074 scr_page (DN, nrow / 4);
2039# endif 2075# endif
2040 else 2076 else
2041 scrollBar.state = STATE_MOTION; 2077 scrollBar.state = SB_STATE_MOTION;
2042 } 2078 }
2043 else 2079 else
2044 { 2080 {
2045 scr_page ((ev.button == Button1 ? DN : UP), 2081 scr_page ((ev.button == Button1 ? DN : UP),
2046 (nrow 2082 (nrow
2047 * scrollbar_position (ev.y) 2083 * scrollBar.position (ev.y)
2048 / scrollbar_size ())); 2084 / scrollBar.size ()));
2049 } 2085 }
2050 2086
2051 break; 2087 break;
2052 } 2088 }
2053 } 2089 }
… …
2063 2099
2064 csrO = 0; /* reset csr Offset */ 2100 csrO = 0; /* reset csr Offset */
2065 if (!bypass_keystate) 2101 if (!bypass_keystate)
2066 reportmode = !! (priv_modes & PrivMode_mouse_report); 2102 reportmode = !! (priv_modes & PrivMode_mouse_report);
2067 2103
2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2104 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2069 { 2105 {
2070 scrollBar.state = STATE_IDLE; 2106 scrollBar.state = SB_STATE_IDLE;
2071 scrollbar_show (0); 2107 scrollBar.show (0);
2072 } 2108 }
2073 2109
2074#ifdef SELECTION_SCROLLING 2110#ifdef SELECTION_SCROLLING
2075 sel_scroll_ev.stop(); 2111 sel_scroll_ev.stop();
2076#endif 2112#endif
… …
2126 selection_make (ev.time); 2162 selection_make (ev.time);
2127 break; 2163 break;
2128 2164
2129 case Button2: 2165 case Button2:
2130 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?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2167 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132 break; 2168 break;
2133 2169
2134#ifdef MOUSE_WHEEL 2170#ifdef MOUSE_WHEEL
2135 case Button4: 2171 case Button4:
2136 case Button5: 2172 case Button5:
… …
2159 } 2195 }
2160 else 2196 else
2161# endif 2197# endif
2162 { 2198 {
2163 scr_page (v, i); 2199 scr_page (v, i);
2164 scrollbar_show (1); 2200 scrollBar.show (1);
2165 } 2201 }
2166 } 2202 }
2167 break; 2203 break;
2168#endif 2204#endif
2169 } 2205 }
2170 } 2206 }
2171} 2207}
2172 2208
2173/*}}} */ 2209/*}}} */
2174 2210
2175bool 2211void
2176rxvt_term::cmd_parse () 2212rxvt_term::cmd_parse ()
2177{ 2213{
2178 bool flag = false;
2179 wchar_t ch = NOCHAR; 2214 wchar_t ch = NOCHAR;
2180 char *seq_begin; // remember start of esc-sequence here 2215 char *seq_begin; // remember start of esc-sequence here
2181 2216
2182 for (;;) 2217 for (;;)
2183 { 2218 {
2184 if (ch == NOCHAR) 2219 if (ecb_unlikely (ch == NOCHAR))
2185 { 2220 {
2186 seq_begin = cmdbuf_ptr; 2221 seq_begin = cmdbuf_ptr;
2187 ch = next_char (); 2222 ch = next_char ();
2188 2223
2189 if (ch == NOCHAR) 2224 if (ch == NOCHAR)
2190 break; 2225 break;
2191 } 2226 }
2192 2227
2193 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))
2194 { 2229 {
2195 if (!seen_input) 2230 if (ecb_unlikely (!seen_input))
2196 { 2231 {
2197 seen_input = 1; 2232 seen_input = 1;
2198 // many badly-written programs (e.g. jed) contain a race condition: 2233 // many badly-written programs (e.g. jed) contain a race condition:
2199 // they first read the screensize and then install a SIGWINCH handler. 2234 // they first read the screensize and then install a SIGWINCH handler.
2200 // some window managers resize the window early, and these programs 2235 // some window managers resize the window early, and these programs
… …
2213 wchar_t *str = buf; 2248 wchar_t *str = buf;
2214 wchar_t *eol = str + min (ncol, UBUFSIZ); 2249 wchar_t *eol = str + min (ncol, UBUFSIZ);
2215 2250
2216 for (;;) 2251 for (;;)
2217 { 2252 {
2218 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)))
2219 break; 2254 break;
2220 2255
2221 *str++ = ch; 2256 *str++ = ch;
2222 2257
2223 if (ch == C0_LF || str >= eol) 2258 if (ecb_unlikely (ch == C0_LF || str >= eol))
2224 { 2259 {
2225 if (ch == C0_LF) 2260 if (ch == C0_LF)
2226 nlines++; 2261 nlines++;
2227 2262
2228 refresh_count++; 2263 refresh_count++;
… …
2277 * 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.
2278 * if skipScroll is enabled. 2313 * if skipScroll is enabled.
2279 */ 2314 */
2280 if (refreshnow) 2315 if (refreshnow)
2281 { 2316 {
2282 flag = true;
2283 scr_refresh (); 2317 scr_refresh ();
2284 want_refresh = 1; 2318 want_refresh = 1;
2285 } 2319 }
2286
2287 } 2320 }
2288 else 2321 else
2289 { 2322 {
2290 try 2323 try
2291 { 2324 {
… …
2299 } 2332 }
2300 2333
2301 ch = NOCHAR; 2334 ch = NOCHAR;
2302 } 2335 }
2303 } 2336 }
2304
2305 return flag;
2306} 2337}
2307 2338
2308// read the next character 2339// read the next character
2309wchar_t 2340wchar_t
2310rxvt_term::next_char () NOTHROW 2341rxvt_term::next_char () NOTHROW
2311{ 2342{
2312 while (cmdbuf_ptr < cmdbuf_endp) 2343 while (cmdbuf_ptr < cmdbuf_endp)
2313 { 2344 {
2314 // assume 7-bit to be ascii ALWAYS 2345 // assume 7-bit to be ascii ALWAYS
2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2346 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2316 return *cmdbuf_ptr++; 2347 return *cmdbuf_ptr++;
2317 2348
2318 wchar_t wc; 2349 wchar_t wc;
2319 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);
2320 2351
… …
2324 cmdbuf_ptr = cmdbuf_endp; 2355 cmdbuf_ptr = cmdbuf_endp;
2325 break; 2356 break;
2326 } 2357 }
2327 2358
2328 if (len == (size_t)-1) 2359 if (len == (size_t)-1)
2360 {
2361 mbstate.reset (); // reset now undefined conversion state
2329 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 }
2330 2364
2331 // assume wchar == unicode 2365 // assume wchar == unicode
2332 cmdbuf_ptr += len; 2366 cmdbuf_ptr += len;
2333 return wc & UNICODE_MASK; 2367 return wc & UNICODE_MASK;
2334 } 2368 }
… …
2345 : NOCHAR; 2379 : NOCHAR;
2346} 2380}
2347 2381
2348static class out_of_input out_of_input; 2382static class out_of_input out_of_input;
2349 2383
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 2384wchar_t
2356rxvt_term::cmd_getc () THROW ((class out_of_input)) 2385rxvt_term::cmd_getc () THROW ((class out_of_input))
2357{ 2386{
2358 wchar_t c = next_char (); 2387 wchar_t c = next_char ();
2359 2388
… …
2378/*----------------------------------------------------------------------*/ 2407/*----------------------------------------------------------------------*/
2379#ifdef PRINTPIPE 2408#ifdef PRINTPIPE
2380FILE * 2409FILE *
2381rxvt_term::popen_printer () 2410rxvt_term::popen_printer ()
2382{ 2411{
2383 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2412 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2384 2413
2385 if (stream == NULL) 2414 if (stream == NULL)
2386 rxvt_warn ("can't open printer pipe, not printing.\n"); 2415 rxvt_warn ("can't open printer pipe, not printing.\n");
2387 2416
2388 return stream; 2417 return stream;
… …
2399 * simulate attached vt100 printer 2428 * simulate attached vt100 printer
2400 */ 2429 */
2401void 2430void
2402rxvt_term::process_print_pipe () 2431rxvt_term::process_print_pipe ()
2403{ 2432{
2404 int done; 2433 FILE *fd = popen_printer ();
2405 FILE *fd;
2406 2434
2407 if ((fd = popen_printer ()) == NULL) 2435 if (!fd)
2408 return; 2436 return;
2409 2437
2410 /* 2438 /*
2411 * 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
2412 * is received. 2440 * is received.
2413 */ 2441 */
2414 for (done = 0; !done;) 2442 for (int done = 0; !done; )
2415 { 2443 {
2416 unsigned char buf[8]; 2444 unsigned char buf[8];
2417 unicode_t ch; 2445 unicode_t ch;
2418 unsigned int i, len; 2446 unsigned int i, len;
2419 2447
… …
2453 pclose_printer (fd); 2481 pclose_printer (fd);
2454} 2482}
2455#endif /* PRINTPIPE */ 2483#endif /* PRINTPIPE */
2456/*}}} */ 2484/*}}} */
2457 2485
2458/* *INDENT-OFF* */
2459enum { 2486enum {
2460 C1_40 = 0x40, 2487 C1_40 = 0x40,
2461 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,
2462 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,
2463 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,
2464 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,
2465}; 2492};
2466/* *INDENT-ON* */
2467 2493
2468/*{{{ process non-printing single characters */ 2494/*{{{ process non-printing single characters */
2469void 2495void
2470rxvt_term::process_nonprinting (unicode_t ch) 2496rxvt_term::process_nonprinting (unicode_t ch)
2471{ 2497{
… …
2564 break; 2590 break;
2565 case 'Z': /* identify the terminal type */ 2591 case 'Z': /* identify the terminal type */
2566 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2592 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2567 break; 2593 break;
2568 case '<': /* turn off VT52 mode */ 2594 case '<': /* turn off VT52 mode */
2569 PrivMode (0, PrivMode_vt52); 2595 priv_modes &= ~PrivMode_vt52;
2570 break; 2596 break;
2571 case 'F': /* use special graphics character set */ 2597 case 'F': /* use special graphics character set */
2572 case 'G': /* use regular character set */ 2598 case 'G': /* use regular character set */
2573 /* unimplemented */ 2599 /* unimplemented */
2574 break; 2600 break;
… …
2593 return; 2619 return;
2594 } 2620 }
2595 2621
2596 switch (ch) 2622 switch (ch)
2597 { 2623 {
2598 /* case 1: do_tek_mode (); break; */
2599 case '#': 2624 case '#':
2600 if (cmd_getc () == '8') 2625 if (cmd_getc () == '8')
2601 scr_E (); 2626 scr_E ();
2602 break; 2627 break;
2603 case '(': 2628 case '(':
… …
2626#if !ENABLE_MINIMAL 2651#if !ENABLE_MINIMAL
2627 case '9': 2652 case '9':
2628 scr_forwardindex (); 2653 scr_forwardindex ();
2629 break; 2654 break;
2630#endif 2655#endif
2656 // DECPAM/DECPNM
2631 case '=': 2657 case '=':
2658 priv_modes |= PrivMode_aplKP;
2659 break;
2632 case '>': 2660 case '>':
2633 PrivMode ((ch == '='), PrivMode_aplKP); 2661 priv_modes &= ~PrivMode_aplKP;
2634 break; 2662 break;
2635 2663
2636 case C1_40: 2664 case C1_40:
2637 cmd_getc (); 2665 cmd_getc ();
2638 break; 2666 break;
… …
2642 2670
2643 /* 8.3.87: NEXT LINE */ 2671 /* 8.3.87: NEXT LINE */
2644 case C1_NEL: /* ESC E */ 2672 case C1_NEL: /* ESC E */
2645 { 2673 {
2646 wchar_t nlcr[] = { C0_LF, C0_CR }; 2674 wchar_t nlcr[] = { C0_LF, C0_CR };
2647 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2675 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2648 } 2676 }
2649 break; 2677 break;
2650 2678
2651 /* kidnapped escape sequence: Should be 8.3.48 */ 2679 /* kidnapped escape sequence: Should be 8.3.48 */
2652 case C1_ESA: /* ESC G */ 2680 case C1_ESA: /* ESC G */
2653 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 */
2654 break; 2684 break;
2655 2685
2656 /* 8.3.63: CHARACTER TABULATION SET */ 2686 /* 8.3.63: CHARACTER TABULATION SET */
2657 case C1_HTS: /* ESC H */ 2687 case C1_HTS: /* ESC H */
2658 scr_set_tab (1); 2688 scr_set_tab (1);
… …
2662 case C1_RI: /* ESC M */ 2692 case C1_RI: /* ESC M */
2663 scr_index (DN); 2693 scr_index (DN);
2664 break; 2694 break;
2665 2695
2666 /* 8.3.142: SINGLE-SHIFT TWO */ 2696 /* 8.3.142: SINGLE-SHIFT TWO */
2667 /*case C1_SS2: scr_single_shift (2); break; */ 2697 /* case C1_SS2: break; */
2668 2698
2669 /* 8.3.143: SINGLE-SHIFT THREE */ 2699 /* 8.3.143: SINGLE-SHIFT THREE */
2670 /*case C1_SS3: scr_single_shift (3); break; */ 2700 /* case C1_SS3: break; */
2671 2701
2672 /* 8.3.27: DEVICE CONTROL STRING */ 2702 /* 8.3.27: DEVICE CONTROL STRING */
2673 case C1_DCS: /* ESC P */ 2703 case C1_DCS: /* ESC P */
2674 process_dcs_seq (); 2704 process_dcs_seq ();
2675 break; 2705 break;
… …
2677 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2707 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2678 case C1_SCI: /* ESC Z */ 2708 case C1_SCI: /* ESC Z */
2679 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2709 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2680 break; /* steal obsolete ESC [ c */ 2710 break; /* steal obsolete ESC [ c */
2681 2711
2682 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2712 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2683 case C1_CSI: /* ESC [ */ 2713 case C1_CSI: /* ESC [ */
2684 process_csi_seq (); 2714 process_csi_seq ();
2685 break; 2715 break;
2686 2716
2687 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2717 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2688 case C1_OSC: /* ESC ] */ 2718 case C1_OSC: /* ESC ] */
2689 process_osc_seq (); 2719 process_osc_seq ();
2690 break; 2720 break;
2691 2721
2692 /* 8.3.106: RESET TO INITIAL STATE */ 2722 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2693 case 'c': 2723 case 'c':
2694 mbstate.reset (); 2724 mbstate.reset ();
2695 scr_poweron (); 2725 scr_poweron ();
2696 scrollbar_show (1); 2726 scrollBar.show (1);
2697 break; 2727 break;
2698 2728
2699 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2729 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2700 case 'n': 2730 case 'n':
2701 scr_charset_choose (2); 2731 scr_charset_choose (2);
… …
2708 } 2738 }
2709} 2739}
2710/*}}} */ 2740/*}}} */
2711 2741
2712/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2742/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2713/* *INDENT-OFF* */
2714enum { 2743enum {
2715 CSI_ICH = 0x40, 2744 CSI_ICH = 0x40,
2716 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,
2717 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 ,
2718 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,
… …
2721 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,
2722 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 ,
2723 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
2724}; 2753};
2725 2754
2726#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2755#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2727 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2756 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2728 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2757 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2729#define get_byte_array_bit(array, bit) \ 2758#define get_byte_array_bit(array, bit) \
2730 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2759 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2731 2760
2732const unsigned char csi_defaults[] = 2761static const unsigned char csi_defaults[] =
2733 { 2762 {
2734 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, */
2735 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, */
2736 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, */
2737 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, [, \, ], ^, _, */
2738 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, */
2739 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, */
2740 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, */
2741 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, {, |, }, ~, */
2742 }; 2771 };
2743/* *INDENT-ON* */
2744 2772
2745void 2773void
2746rxvt_term::process_csi_seq () 2774rxvt_term::process_csi_seq ()
2747{ 2775{
2748 unicode_t ch, priv, i; 2776 unicode_t ch, priv, i;
… …
2752 2780
2753 nargs = 0; 2781 nargs = 0;
2754 2782
2755 priv = 0; 2783 priv = 0;
2756 ch = cmd_getc (); 2784 ch = cmd_getc ();
2757 if (ch >= '<' && ch <= '?') 2785 if ((ch >= '<' && ch <= '?') || ch == '!')
2758 { 2786 {
2759 /* '<' '=' '>' '?' */ 2787 /* '<' '=' '>' '?' '!' */
2760 priv = ch; 2788 priv = ch;
2761 ch = cmd_getc (); 2789 ch = cmd_getc ();
2762 } 2790 }
2763 2791
2764 /* read any numerical arguments */ 2792 /* read any numerical arguments */
… …
2818 2846
2819 case '?': 2847 case '?':
2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2848 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2821 process_terminal_mode (ch, priv, nargs, arg); 2849 process_terminal_mode (ch, priv, nargs, arg);
2822 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);
2823 } 2863 }
2864 break;
2865 }
2866
2824 return; 2867 return;
2825 } 2868 }
2826 2869
2827 switch (ch) 2870 switch (ch)
2828 { 2871 {
… …
3043 } 3086 }
3044} 3087}
3045/*}}} */ 3088/*}}} */
3046 3089
3047#if !ENABLE_MINIMAL 3090#if !ENABLE_MINIMAL
3048/* ARGSUSED */
3049void 3091void
3050rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3092rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3051{ 3093{
3052 int x, y; 3094 int x, y;
3053 XWindowAttributes wattr; 3095 XWindowAttributes wattr;
… …
3062 { 3104 {
3063 /* 3105 /*
3064 * commands 3106 * commands
3065 */ 3107 */
3066 case 1: /* deiconify window */ 3108 case 1: /* deiconify window */
3067 XMapWindow (dpy, parent[0]); 3109 XMapWindow (dpy, parent);
3068 break; 3110 break;
3069 case 2: /* iconify window */ 3111 case 2: /* iconify window */
3070 XIconifyWindow (dpy, parent[0], display->screen); 3112 XIconifyWindow (dpy, parent, display->screen);
3071 break; 3113 break;
3072 case 3: /* set position (pixels) */ 3114 case 3: /* set position (pixels) */
3073 XMoveWindow (dpy, parent[0], args[1], args[2]); 3115 XMoveWindow (dpy, parent, args[1], args[2]);
3074 break; 3116 break;
3075 case 4: /* set size (pixels) */ 3117 case 4: /* set size (pixels) */
3076 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3118 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3077 break; 3119 break;
3078 case 5: /* raise window */ 3120 case 5: /* raise window */
3079 XRaiseWindow (dpy, parent[0]); 3121 XRaiseWindow (dpy, parent);
3080 break; 3122 break;
3081 case 6: /* lower window */ 3123 case 6: /* lower window */
3082 XLowerWindow (dpy, parent[0]); 3124 XLowerWindow (dpy, parent);
3083 break; 3125 break;
3084 case 7: /* refresh window */ 3126 case 7: /* refresh window */
3085 scr_touch (true); 3127 scr_touch (true);
3086 break; 3128 break;
3087 case 8: /* set size (chars) */ 3129 case 8: /* set size (chars) */
… …
3098 3140
3099 /* 3141 /*
3100 * reports - some output format copied from XTerm 3142 * reports - some output format copied from XTerm
3101 */ 3143 */
3102 case 11: /* report window state */ 3144 case 11: /* report window state */
3103 XGetWindowAttributes (dpy, parent[0], &wattr); 3145 XGetWindowAttributes (dpy, parent, &wattr);
3104 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3146 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3105 break; 3147 break;
3106 case 13: /* report window position */ 3148 case 13: /* report window position */
3107 XGetWindowAttributes (dpy, parent[0], &wattr); 3149 XGetWindowAttributes (dpy, parent, &wattr);
3108 XTranslateCoordinates (dpy, parent[0], wattr.root, 3150 XTranslateCoordinates (dpy, parent, wattr.root,
3109 -wattr.border_width, -wattr.border_width, 3151 -wattr.border_width, -wattr.border_width,
3110 &x, &y, &wdummy); 3152 &x, &y, &wdummy);
3111 tt_printf ("\033[3;%d;%dt", x, y); 3153 tt_printf ("\033[3;%d;%dt", x, y);
3112 break; 3154 break;
3113 case 14: /* report window size (pixels) */ 3155 case 14: /* report window size (pixels) */
3114 XGetWindowAttributes (dpy, parent[0], &wattr); 3156 XGetWindowAttributes (dpy, parent, &wattr);
3115 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3157 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3116 break; 3158 break;
3117 case 18: /* report text area size (chars) */ 3159 case 18: /* report text area size (chars) */
3118 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3160 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3119 break; 3161 break;
… …
3121 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3163 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3122 break; 3164 break;
3123 case 20: /* report icon label */ 3165 case 20: /* report icon label */
3124 { 3166 {
3125 char *s; 3167 char *s;
3126 XGetIconName (dpy, parent[0], &s); 3168 XGetIconName (dpy, parent, &s);
3127 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 */
3128 XFree (s); 3170 XFree (s);
3129 } 3171 }
3130 break; 3172 break;
3131 case 21: /* report window title */ 3173 case 21: /* report window title */
3132 { 3174 {
3133 char *s; 3175 char *s;
3134 XFetchName (dpy, parent[0], &s); 3176 XFetchName (dpy, parent, &s);
3135 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 */
3136 XFree (s); 3178 XFree (s);
3137 } 3179 }
3138 break; 3180 break;
3139 } 3181 }
… …
3195 * 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)'
3196 */ 3238 */
3197void 3239void
3198rxvt_term::process_dcs_seq () 3240rxvt_term::process_dcs_seq ()
3199{ 3241{
3200 char *s;
3201 unicode_t eh;
3202
3203 /* 3242 /*
3204 * Not handled yet 3243 * Not handled yet
3205 */ 3244 */
3245
3246 unicode_t eh;
3206 s = get_to_st (eh); 3247 char *s = get_to_st (eh);
3207 if (s) 3248 if (s)
3208 free (s); 3249 free (s);
3209 3250
3210 return; 3251 return;
3211} 3252}
… …
3215 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3256 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3216 */ 3257 */
3217void 3258void
3218rxvt_term::process_osc_seq () 3259rxvt_term::process_osc_seq ()
3219{ 3260{
3220 unicode_t ch, eh;
3221 int arg; 3261 int arg;
3222 3262
3223 ch = cmd_getc (); 3263 unicode_t ch = cmd_getc ();
3224 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3264 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3225 arg = arg * 10 + (ch - '0'); 3265 arg = arg * 10 + (ch - '0');
3226 3266
3227 if (ch == ';') 3267 if (ch == ';')
3228 { 3268 {
3269 unicode_t eh;
3229 char *s = get_to_st (eh); 3270 char *s = get_to_st (eh);
3230 3271
3231 if (s) 3272 if (s)
3232 { 3273 {
3233 process_xterm_seq (arg, s, eh); 3274 process_xterm_seq (arg, s, eh);
… …
3257 3298
3258/* 3299/*
3259 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3300 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3260 */ 3301 */
3261void 3302void
3262rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3303rxvt_term::process_xterm_seq (int op, char *str, char resp)
3263{ 3304{
3264 int color; 3305 int color;
3265 char *buf, *name; 3306 char *buf, *name;
3266 bool query = str[0] == '?' && !str[1]; 3307 bool query = str[0] == '?' && !str[1];
3267 int saveop = op; 3308 int saveop = op;
… …
3294 unsigned long bytes_after; 3335 unsigned long bytes_after;
3295 unsigned char *value = 0; 3336 unsigned char *value = 0;
3296 const char *str = ""; 3337 const char *str = "";
3297 3338
3298 if (prop 3339 if (prop
3299 && XGetWindowProperty (dpy, parent[0], 3340 && XGetWindowProperty (dpy, parent,
3300 prop, 0, 1<<16, 0, AnyPropertyType, 3341 prop, 0, 1<<16, 0, AnyPropertyType,
3301 &actual_type, &actual_format, 3342 &actual_type, &actual_format,
3302 &nitems, &bytes_after, &value) == Success 3343 &nitems, &bytes_after, &value) == Success
3303 && actual_type != None 3344 && actual_type != None
3304 && actual_format == 8) 3345 && actual_format == 8)
… …
3308 3349
3309 XFree (value); 3350 XFree (value);
3310 } 3351 }
3311 else 3352 else
3312 { 3353 {
3313 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3354 char *eq = strchr (str, '=');
3314 3355
3315 if (eq) 3356 if (eq)
3316 { 3357 {
3317 *eq = 0; 3358 *eq = 0;
3318 set_utf8_property (display->atom (str), eq + 1); 3359 set_utf8_property (display->atom (str), eq + 1);
3319 } 3360 }
3320 else 3361 else
3321 XDeleteProperty (dpy, parent[0], 3362 XDeleteProperty (dpy, parent,
3322 display->atom (str)); 3363 display->atom (str));
3323 } 3364 }
3324 break; 3365 break;
3325 3366
3326 case XTerm_Color: 3367 case XTerm_Color:
… …
3358 process_color_seq (op, Color_pointer_fg, str, resp); 3399 process_color_seq (op, Color_pointer_fg, str, resp);
3359 break; 3400 break;
3360 case XTerm_Color_pointer_bg: 3401 case XTerm_Color_pointer_bg:
3361 process_color_seq (op, Color_pointer_bg, str, resp); 3402 process_color_seq (op, Color_pointer_bg, str, resp);
3362 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
3363#ifndef NO_BOLD_UNDERLINE_REVERSE 3412#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: 3413 case URxvt_Color_BD:
3369 process_color_seq (op, Color_BD, str, resp); 3414 process_color_seq (op, Color_BD, str, resp);
3370 break; 3415 break;
3371 case Rxvt_Color_UL:
3372 case URxvt_Color_UL: 3416 case URxvt_Color_UL:
3373 process_color_seq (op, Color_UL, str, resp); 3417 process_color_seq (op, Color_UL, str, resp);
3374 break; 3418 break;
3375 case URxvt_Color_IT: 3419 case URxvt_Color_IT:
3376 process_color_seq (op, Color_IT, str, resp); 3420 process_color_seq (op, Color_IT, str, resp);
3377 break; 3421 break;
3378#endif 3422#endif
3423 case URxvt_Color_border:
3424 process_color_seq (op, Color_border, str, resp);
3425 break;
3379#if ENABLE_TRANSPARENCY 3426#if ENABLE_TRANSPARENCY
3380 case URxvt_Color_tint: 3427 case URxvt_Color_tint:
3381 process_color_seq (op, Color_tint, str, resp); 3428 process_color_seq (op, Color_tint, str, resp);
3382 { 3429 {
3383 bool changed = false; 3430 bool changed = false;
3384 3431
3385 if (ISSET_PIXCOLOR (Color_tint)) 3432 if (ISSET_PIXCOLOR (Color_tint))
3386 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3433 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3387 else
3388 changed = bgPixmap.unset_tint ();
3389 3434
3390 if (changed) 3435 if (changed)
3391 update_background (); 3436 update_background ();
3392 } 3437 }
3393 3438
… …
3398 case Rxvt_Pixmap: 3443 case Rxvt_Pixmap:
3399 if (!strcmp (str, "?")) 3444 if (!strcmp (str, "?"))
3400 { 3445 {
3401 char str[256]; 3446 char str[256];
3402 3447
3403 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3448 sprintf (str, "[%dx%d+%d+%d]",
3404 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3449 min (h_scale, 32767), min (v_scale, 32767),
3405 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3450 min (h_align, 32767), min (v_align, 32767));
3406 process_xterm_seq (XTerm_title, str, CHAR_ST); 3451 process_xterm_seq (XTerm_title, str, CHAR_ST);
3407 } 3452 }
3408 else 3453 else
3409 { 3454 {
3410 int changed = 0; 3455 bool changed = false;
3411 3456
3412 if (*str != ';') 3457 if (*str != ';')
3413 { 3458 {
3414 /* reset to default scaling :*/
3415 bgPixmap.unset_geometry ();
3416 if (bgPixmap.set_file (str)) /* change pixmap */ 3459 if (bg_set_file (str)) /* change pixmap */
3417 changed++; 3460 changed = true;
3418 str = strchr (str, ';');
3419 if (str == NULL)
3420 bgPixmap.set_defaultGeometry ();
3421 } 3461 }
3422 3462 else
3423 while (str)
3424 { 3463 {
3425 str++; 3464 str++;
3426 if (bgPixmap.set_geometry (str)) 3465 if (bg_set_geometry (str, true))
3427 changed++; 3466 changed = true;
3428 str = strchr (str, ';');
3429 } 3467 }
3430 3468
3431 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 }
3432 update_background (); 3477 update_background ();
3478 }
3433 } 3479 }
3434 break; 3480 break;
3435#endif 3481#endif
3436 3482
3437 case XTerm_logfile: 3483 case XTerm_logfile:
… …
3507 break; 3553 break;
3508#endif 3554#endif
3509 3555
3510#if ENABLE_PERL 3556#if ENABLE_PERL
3511 case URxvt_perl: 3557 case URxvt_perl:
3512 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));
3513 ; // no responses yet
3514 break; 3559 break;
3515#endif 3560#endif
3516 } 3561 }
3517} 3562}
3518/*----------------------------------------------------------------------*/ 3563/*----------------------------------------------------------------------*/
… …
3541 { 3586 {
3542 if (mode == 'r') 3587 if (mode == 'r')
3543 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3588 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3544 else 3589 else
3545 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3590 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3546 PrivMode (state, bit); 3591
3592 if (state)
3593 priv_modes |= bit;
3594 else
3595 priv_modes &= ~bit;
3547 } 3596 }
3548 3597
3549 return state; 3598 return state;
3550} 3599}
3551 3600
3552/* we're not using priv _yet_ */ 3601/* we're not using priv _yet_ */
3553void 3602void
3554rxvt_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)
3555{ 3604{
3556 unsigned int i, j; 3605 unsigned int i, j;
3557 int state; 3606 int state;
3558 3607
3559 static const struct 3608 static const struct
3560 { 3609 {
3561 const int argval; 3610 const int argval;
3562 const unsigned long bit; 3611 const unsigned long bit;
3563 } argtopriv[] = { 3612 } argtopriv[] = {
3564 { 1, PrivMode_aplCUR }, 3613 { 1, PrivMode_aplCUR }, // DECCKM
3565 { 2, PrivMode_vt52 }, 3614 { 2, PrivMode_vt52 }, // DECANM
3566 { 3, PrivMode_132 }, 3615 { 3, PrivMode_132 }, // DECCOLM
3567 { 4, PrivMode_smoothScroll }, 3616 { 4, PrivMode_smoothScroll }, // DECSCLM
3568 { 5, PrivMode_rVideo }, 3617 { 5, PrivMode_rVideo }, // DECSCNM
3569 { 6, PrivMode_relOrigin }, 3618 { 6, PrivMode_relOrigin }, // DECOM
3570 { 7, PrivMode_Autowrap }, 3619 { 7, PrivMode_Autowrap }, // DECAWM
3571 // 8, bi-directional support mode 3620 // 8, auto-repeat keys // DECARM
3572 { 9, PrivMode_MouseX10 }, 3621 { 9, PrivMode_MouseX10 },
3573 // 18, 19 printing-related 3622 // 18 end FF to printer after print screen
3623 // 19 Print screen prints full screen/scroll region
3574 { 25, PrivMode_VisibleCursor }, 3624 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3575#ifdef scrollBar_esc 3625#ifdef scrollBar_esc
3576 { scrollBar_esc, PrivMode_scrollBar }, 3626 { scrollBar_esc, PrivMode_scrollBar },
3577#endif 3627#endif
3578 { 35, PrivMode_ShiftKeys }, // rxvt extension 3628 { 35, PrivMode_ShiftKeys }, // rxvt extension
3629 // 38, tektronix mode // DECTEK
3579 { 40, PrivMode_132OK }, 3630 { 40, PrivMode_132OK },
3580 // 41 xterm more fixes NYI 3631 // 41 xterm more fixes NYI
3581 // 45 margin bell NYI 3632 // 45 margin bell NYI
3582 // 46 start logging 3633 // 46 start logging
3583 { 47, PrivMode_Screen }, 3634 { 47, PrivMode_Screen },
3584 { 66, PrivMode_aplKP }, 3635 { 66, PrivMode_aplKP }, // DECNKM
3585#ifndef NO_BACKSPACE_KEY 3636#ifndef NO_BACKSPACE_KEY
3586 { 67, PrivMode_BackSpace }, 3637 { 67, PrivMode_BackSpace }, // DECBKM
3587#endif 3638#endif
3588 { 1000, PrivMode_MouseX11 }, 3639 { 1000, PrivMode_MouseX11 },
3589 { 1002, PrivMode_MouseBtnEvent }, 3640 { 1002, PrivMode_MouseBtnEvent },
3590 { 1003, PrivMode_MouseAnyEvent }, 3641 { 1003, PrivMode_MouseAnyEvent },
3642#if ENABLE_FRILLS
3643 { 1005, PrivMode_ExtModeMouse },
3644#endif
3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3645 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3592 { 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
3593 // 1035 enable modifiers for alt, numlock NYI 3650 // 1035 enable modifiers for alt, numlock NYI
3594 // 1036 send ESC for meta keys NYI 3651 // 1036 send ESC for meta keys NYI
3595 // 1037 send DEL for keypad delete NYI 3652 // 1037 send DEL for keypad delete NYI
3596 { 1047, PrivMode_Screen }, 3653 { 1047, PrivMode_Screen },
3597 // 1048 save and restore cursor 3654 // 1048 save and restore cursor, implemented in code
3598 { 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 */
3599 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3656 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3600 { 2004, PrivMode_BracketPaste }, 3657 { 2004, PrivMode_BracketPaste },
3601 }; 3658 };
3602 3659
… …
3612 for (i = 0; i < nargs; i++) 3669 for (i = 0; i < nargs; i++)
3613 { 3670 {
3614 state = -1; 3671 state = -1;
3615 3672
3616 /* basic handling */ 3673 /* basic handling */
3617 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3674 for (j = 0; j < ecb_array_length (argtopriv); j++)
3618 if (argtopriv[j].argval == arg[i]) 3675 if (argtopriv[j].argval == arg[i])
3619 { 3676 {
3620 state = privcases (mode, argtopriv[j].bit); 3677 state = privcases (mode, argtopriv[j].bit);
3621 break; 3678 break;
3622 } 3679 }
… …
3630 3687
3631 scr_touch (true); 3688 scr_touch (true);
3632 break; 3689 break;
3633#endif 3690#endif
3634 case 1048: /* alternative cursor save */ 3691 case 1048: /* alternative cursor save */
3635 case 1049:
3636 if (option (Opt_secondaryScreen)) 3692 if (option (Opt_secondaryScreen))
3637 if (mode == 0) 3693 if (mode == 0)
3638 scr_cursor (RESTORE); 3694 scr_cursor (RESTORE);
3639 else if (mode == 1) 3695 else if (mode == 1)
3640 scr_cursor (SAVE); 3696 scr_cursor (SAVE);
… …
3649 case 2: /* VT52 mode */ 3705 case 2: /* VT52 mode */
3650 /* oddball mode. should be set regardless of set/reset 3706 /* oddball mode. should be set regardless of set/reset
3651 * parameter. Return from VT52 mode with an ESC < from 3707 * parameter. Return from VT52 mode with an ESC < from
3652 * within VT52 mode 3708 * within VT52 mode
3653 */ 3709 */
3654 PrivMode (1, PrivMode_vt52); 3710 priv_modes |= PrivMode_vt52;
3655 break; 3711 break;
3656 case 3: /* 80/132 */ 3712 case 3: /* 80/132 */
3657 if (priv_modes & PrivMode_132OK) 3713 if (priv_modes & PrivMode_132OK)
3658 {
3659 scr_poweron ();
3660 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3714 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3661 }
3662 break; 3715 break;
3663 case 4: /* smooth scrolling */ 3716 case 4: /* smooth scrolling */
3664 set_option (Opt_jumpScroll, !state); 3717 set_option (Opt_jumpScroll, !state);
3665 break; 3718 break;
3666 case 5: /* reverse video */ 3719 case 5: /* reverse video */
… …
3677 if (state) /* orthogonal */ 3730 if (state) /* orthogonal */
3678 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3731 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3679 break; 3732 break;
3680#ifdef scrollBar_esc 3733#ifdef scrollBar_esc
3681 case scrollBar_esc: 3734 case scrollBar_esc:
3682 if (scrollbar_mapping (state)) 3735 scrollBar.map (state);
3683 {
3684 resize_all_windows (0, 0, 0); 3736 resize_all_windows (0, 0, 0);
3685 scr_touch (true); 3737 scr_touch (true);
3686 }
3687 break; 3738 break;
3688#endif 3739#endif
3689 case 25: /* visible/invisible cursor */ 3740 case 25: /* visible/invisible cursor */
3690 scr_cursor_visible (state); 3741 scr_cursor_visible (state);
3691 break; 3742 break;
… …
3704 case 1003: 3755 case 1003:
3705 if (state) 3756 if (state)
3706 { 3757 {
3707 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3758 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3708 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;
3709 vt_emask_mouse = PointerMotionMask; 3761 vt_emask_mouse = PointerMotionMask;
3710 } 3762 }
3711 else 3763 else
3712 vt_emask_mouse = NoEventMask; 3764 vt_emask_mouse = NoEventMask;
3765
3713 vt_select_input (); 3766 vt_select_input ();
3714 break; 3767 break;
3715 case 1010: /* scroll to bottom on TTY output inhibit */ 3768 case 1010: /* scroll to bottom on TTY output inhibit */
3716 set_option (Opt_scrollTtyOutput, !state); 3769 set_option (Opt_scrollTtyOutput, !state);
3717 break; 3770 break;
3718 case 1011: /* scroll to bottom on key press */ 3771 case 1011: /* scroll to bottom on key press */
3719 set_option (Opt_scrollTtyKeypress, state); 3772 set_option (Opt_scrollTtyKeypress, state);
3720 break; 3773 break;
3721 case 1047: /* secondary screen w/ clearing last */ 3774 case 1047: /* secondary screen w/ clearing last */
3722 if (option (Opt_secondaryScreen)) 3775 if (option (Opt_secondaryScreen))
3723 if (current_screen != PRIMARY) 3776 if (!state)
3724 scr_erase_screen (2); 3777 scr_erase_screen (2);
3778
3725 scr_change_screen (state); 3779 scr_change_screen (state);
3726 break; 3780 break;
3727 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
3728 scr_change_screen (state); 3786 scr_change_screen (state);
3787
3729 if (option (Opt_secondaryScreen)) 3788 if (option (Opt_secondaryScreen))
3730 if (current_screen != PRIMARY) 3789 if (state)
3731 scr_erase_screen (2); 3790 scr_erase_screen (2);
3791 else
3792 scr_cursor (RESTORE);
3732 break; 3793 break;
3733 default: 3794 default:
3734 break; 3795 break;
3735 } 3796 }
3736 } 3797 }
… …
3889 } 3950 }
3890 } 3951 }
3891} 3952}
3892/*}}} */ 3953/*}}} */
3893 3954
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/* ------------------------------------------------------------------------- */ 3955/* ------------------------------------------------------------------------- */
3914 3956
3915/* 3957/*
3916 * Send printf () formatted output to the command. 3958 * Send printf () formatted output to the command.
3917 * Only use for small amounts of data. 3959 * Only use for small amounts of data.
… …
3930 3972
3931/* ---------------------------------------------------------------------- */ 3973/* ---------------------------------------------------------------------- */
3932/* 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,
3933 * or generated by us in response to a query ESC sequence. 3975 * or generated by us in response to a query ESC sequence.
3934 */ 3976 */
3935const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3977static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3936 3978
3937void 3979void
3938rxvt_term::tt_write (const char *data, unsigned int len) 3980rxvt_term::tt_write (const char *data, unsigned int len)
3939{ 3981{
3940 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)))
… …
3945 3987
3946 if (v_buflen == 0) 3988 if (v_buflen == 0)
3947 { 3989 {
3948 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));
3949 3991
3992 max_it (written, 0);
3993
3950 if ((unsigned int)written == len) 3994 if (written == len)
3951 return; 3995 return;
3952 3996
3953 data += written; 3997 data += written;
3954 len -= written; 3998 len -= written;
3955 } 3999 }
3956 4000
3957 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4001 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3958 4002
3959 memcpy (v_buffer + v_buflen, data, len); 4003 memcpy (v_buffer + v_buflen, data, len);
3960 v_buflen += len; 4004 v_buflen += len;
3961 4005
3962 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