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.480 by sf-exg, Mon Mar 7 11:48:55 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
282} 288}
283 289
284static int 290static int
285hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
286{ 292{
287 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
290 { 296 {
291 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
292 298
416 */ 422 */
417 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
420 426
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; 427 kbuf[0] = 0;
428 428
429#ifdef USE_XIM 429#ifdef USE_XIM
430 if (Input_Context) 430 if (Input_Context)
431 { 431 {
505#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
506 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
507#else 507#else
508 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
509#endif 509#endif
510 max_it (lnsppg, 1);
511
510 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
511 { 513 {
512 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
513 return; 515 return;
514 } 516 }
579 } 581 }
580 } 582 }
581 583
582#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 585 // ISO 14755 support
584 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 587 {
586 int hv; 588 int hv;
587 589
588 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
619 scr_overlay_off (); 621 scr_overlay_off ();
620# endif 622# endif
621 iso14755buf = 0; 623 iso14755buf = 0;
622 } 624 }
623 } 625 }
626 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
627 { 630 {
628 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 632# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
641 } 644 }
642#endif 645#endif
643 646
644 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645 { 648 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1; 650 unsigned int newlen = 1;
648 651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
649 switch (translate_keypad (keysym, kp)) 655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
658 {
659#ifndef NO_BACKSPACE_KEY
660 case XK_BackSpace:
661 if (priv_modes & PrivMode_HaveBackSpace)
662 {
663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
664 ^ !!ctrl) ? '\b' : '\177';
665 kbuf[1] = '\0';
666 }
667 else
668 strcpy (kbuf, rs[Rs_backspace_key]);
669 break;
670#endif
671#ifndef NO_DELETE_KEY
672 case XK_Delete:
673 strcpy (kbuf, rs[Rs_delete_key]);
674 break;
675#endif
676 case XK_Tab:
677 if (shft)
678 strcpy (kbuf, "\033[Z");
679 else
680 {
681#ifdef CTRL_TAB_MAKES_META
682 if (ctrl)
683 meta = 1;
684#endif
685#ifdef MOD4_TAB_MAKES_META
686 if (ev.state & Mod4Mask)
687 meta = 1;
688#endif
689 newlen = 0;
690 }
691 break;
692
693 case XK_Up: /* "\033[A" */
694 case XK_Down: /* "\033[B" */
695 case XK_Right: /* "\033[C" */
696 case XK_Left: /* "\033[D" */
697 strcpy (kbuf, "\033[Z");
698 kbuf[2] = "DACB"[keysym - XK_Left];
699 /* do Shift first */
700 if (shft)
701 kbuf[2] = "dacb"[keysym - XK_Left];
702 else if (ctrl)
703 {
704 kbuf[1] = 'O';
705 kbuf[2] = "dacb"[keysym - XK_Left];
706 }
707 else if (priv_modes & PrivMode_aplCUR)
708 kbuf[1] = 'O';
709 break;
710
711 case XK_KP_Enter:
712 /* allow shift to override */
713 if (kp)
714 {
715 strcpy (kbuf, "\033OM");
716 break;
717 }
718
719 /* FALLTHROUGH */
720
721 case XK_Return:
722 if (priv_modes & PrivMode_LFNL)
723 {
724 kbuf[0] = '\015';
725 kbuf[1] = '\012';
726 kbuf[2] = '\0';
727 }
728 else
729 {
730 kbuf[0] = '\015';
731 kbuf[1] = '\0';
732 }
733 break;
734
735 case XK_KP_F1: /* "\033OP" */
736 case XK_KP_F2: /* "\033OQ" */
737 case XK_KP_F3: /* "\033OR" */
738 case XK_KP_F4: /* "\033OS" */
739 strcpy (kbuf, "\033OP");
740 kbuf[2] += (keysym - XK_KP_F1);
741 break;
742
743 case XK_KP_Multiply: /* "\033Oj" : "*" */
744 case XK_KP_Add: /* "\033Ok" : "+" */
745 case XK_KP_Separator: /* "\033Ol" : "," */
746 case XK_KP_Subtract: /* "\033Om" : "-" */
747 case XK_KP_Decimal: /* "\033On" : "." */
748 case XK_KP_Divide: /* "\033Oo" : "/" */
749 case XK_KP_0: /* "\033Op" : "0" */
750 case XK_KP_1: /* "\033Oq" : "1" */
751 case XK_KP_2: /* "\033Or" : "2" */
752 case XK_KP_3: /* "\033Os" : "3" */
753 case XK_KP_4: /* "\033Ot" : "4" */
754 case XK_KP_5: /* "\033Ou" : "5" */
755 case XK_KP_6: /* "\033Ov" : "6" */
756 case XK_KP_7: /* "\033Ow" : "7" */
757 case XK_KP_8: /* "\033Ox" : "8" */
758 case XK_KP_9: /* "\033Oy" : "9" */
759 /* allow shift to override */
760 if (kp)
761 {
762 strcpy (kbuf, "\033Oj");
763 kbuf[2] += (keysym - XK_KP_Multiply);
764 }
765 else
766 {
767 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
768 kbuf[1] = '\0';
769 }
770 break;
771
772 default:
650 { 773 {
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); 774 int param = map_function_key (keysym);
767 if (param > 0) 775 if (param > 0)
768 sprintf (kbuf,"\033[%d~", param); 776 sprintf (kbuf,"\033[%d~", param);
769 else 777 else
770 newlen = 0; 778 newlen = 0;
771 }
772 break;
773 } 779 }
780 break;
781 }
774 782
775 if (newlen) 783 if (newlen)
776 len = strlen (kbuf); 784 len = strlen (kbuf);
777 785
778 /* 786 /*
779 * Pass meta for all function keys, if 'meta' option set 787 * Pass meta for all function keys, if 'meta' option set
780 */ 788 */
781#ifdef META8_OPTION 789#ifdef META8_OPTION
881 commit_iso14755 (); 889 commit_iso14755 ();
882 890
883 return; 891 return;
884 } 892 }
885 893
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
887 if (i[0] == keysym) 895 if (i[0] == keysym)
888 { 896 {
889 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 (); 898 commit_iso14755 ();
891 899
967rxvt_term::flush () 975rxvt_term::flush ()
968{ 976{
969 flush_ev.stop (); 977 flush_ev.stop ();
970 978
971#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
972 if (bgPixmap.check_clearChanged ()) 980 if (bg_flags & BG_NEEDS_REFRESH)
973 { 981 {
974// scr_clear (true); This needs to be researched further! 982 bg_flags &= ~BG_NEEDS_REFRESH;
975 scr_touch (false); 983 scr_touch (false);
976 } 984 }
977#endif 985#endif
978 986
979 if (want_refresh) 987 if (want_refresh)
1015 } 1023 }
1016 while (row < end_row); 1024 while (row < end_row);
1017 } 1025 }
1018 1026
1019 scr_refresh (); 1027 scr_refresh ();
1020 scrollbar_show (1); 1028 scrollBar.show (1);
1021#ifdef USE_XIM 1029#ifdef USE_XIM
1022 IMSendSpot (); 1030 IMSendSpot ();
1023#endif 1031#endif
1024 } 1032 }
1025 1033
1026 display->flush (); 1034 display->flush ();
1027} 1035}
1028 1036
1029/* checks wether a refresh is requested and starts the refresh timer */ 1037/* checks whether a refresh is requested and starts the refresh timer */
1030void 1038void
1031rxvt_term::refresh_check () 1039rxvt_term::refresh_check ()
1032{ 1040{
1033 if (want_refresh && !flush_ev.is_active ()) 1041 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1042 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1127 { 1135 {
1128 // this should really be sched_yield(), but the linux guys thought 1136 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1137 // 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 1138 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1139 // allowed by the sus... as is returning ENOSYS.
1140 // since the linux guys additionally thought that breaking the only
1141 // known workaround against their unusable sched_yield hack is cool,
1142 // we just nanosleep a bit and hope for the best.
1132 1143
1133 struct timespec ts = { 0, 0 }; 1144 struct timespec ts = { 0, 1000 };
1134 nanosleep (&ts, 0); 1145 nanosleep (&ts, 0);
1135 1146
1136 w.stop (); 1147 w.stop ();
1137 } 1148 }
1138 1149
1147rxvt_term::pty_fill () 1158rxvt_term::pty_fill ()
1148{ 1159{
1149 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1150 1161
1151 if (CBUFSIZ == n) 1162 if (CBUFSIZ == n)
1152 { 1163 n = 0; // normally this indicates a "too long" command sequence - just drop the data we have
1153 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1154 n = 0;
1155 }
1156 1164
1157 memmove (cmdbuf_base, cmdbuf_ptr, n); 1165 memmove (cmdbuf_base, cmdbuf_ptr, n);
1158 cmdbuf_ptr = cmdbuf_base; 1166 cmdbuf_ptr = cmdbuf_base;
1159 cmdbuf_endp = cmdbuf_ptr + n; 1167 cmdbuf_endp = cmdbuf_ptr + n;
1160 1168
1188{ 1196{
1189 make_current (); 1197 make_current ();
1190 1198
1191 if (revents & ev::READ) 1199 if (revents & ev::READ)
1192 // loop, but don't allow a single term to monopolize us 1200 // loop, but don't allow a single term to monopolize us
1193 while (pty_fill ()) 1201 for (int i = CBUFCNT; i-- && pty_fill (); )
1194 if (cmd_parse ()) 1202 cmd_parse ();
1195 break;
1196 1203
1197 if (revents & ev::WRITE) 1204 if (revents & ev::WRITE)
1198 pty_write (); 1205 pty_write ();
1199 1206
1200 refresh_check (); 1207 refresh_check ();
1241{ 1248{
1242 int button_number, key_state = 0; 1249 int button_number, key_state = 0;
1243 int x, y; 1250 int x, y;
1244 int code = 32; 1251 int code = 32;
1245 1252
1246 x = Pixel2Col (ev.x); 1253 x = Pixel2Col (ev.x) + 1;
1247 y = Pixel2Row (ev.y); 1254 y = Pixel2Row (ev.y) + 1;
1255
1248 if (ev.type == MotionNotify) 1256 if (ev.type == MotionNotify)
1249 { 1257 {
1250 if (x == mouse_row && y == mouse_col) 1258 if (x == mouse_row && y == mouse_col)
1251 return; 1259 return;
1260
1252 mouse_row = x; 1261 mouse_row = x;
1253 mouse_col = y; 1262 mouse_col = y;
1254 code += 32; 1263 code += 32;
1255 } 1264 }
1256 1265
1259 else 1268 else
1260 { 1269 {
1261 button_number = MEvent.button - Button1; 1270 button_number = MEvent.button - Button1;
1262 /* add 0x3D for wheel events, like xterm does */ 1271 /* add 0x3D for wheel events, like xterm does */
1263 if (button_number >= 3) 1272 if (button_number >= 3)
1264 button_number += (64 - 3); 1273 button_number += 64 - 3;
1265 } 1274 }
1266 1275
1267 if (priv_modes & PrivMode_MouseX10) 1276 if (priv_modes & PrivMode_MouseX10)
1268 { 1277 {
1269 /* 1278 /*
1301 fputc ('A', stderr); 1310 fputc ('A', stderr);
1302 if (key_state & 32) 1311 if (key_state & 32)
1303 fputc ('2', stderr); 1312 fputc ('2', stderr);
1304 fprintf (stderr, "]: <%d>, %d/%d\n", 1313 fprintf (stderr, "]: <%d>, %d/%d\n",
1305 button_number, 1314 button_number,
1306 x + 1, 1315 x,
1307 y + 1); 1316 y);
1308#endif 1317#endif
1309 1318
1319#if ENABLE_FRILLS
1320 if (priv_modes & PrivMode_ExtMouseRight)
1321 tt_printf ("\033[%d;%d;%dM",
1322 code + button_number + key_state,
1323 x,
1324 y);
1325 else if (priv_modes & PrivMode_ExtModeMouse)
1326 tt_printf ("\033[M%c%lc%lc",
1327 code + button_number + key_state,
1328 wint_t (32 + x),
1329 wint_t (32 + y));
1330 else
1331#endif
1310 tt_printf ("\033[M%c%c%c", 1332 tt_printf ("\033[M%c%c%c",
1311 (code + button_number + key_state), 1333 code + button_number + key_state,
1312 (32 + x + 1), 1334 32 + x,
1313 (32 + y + 1)); 1335 32 + y);
1314} 1336}
1315 1337
1316/*{{{ process an X event */ 1338/*{{{ process an X event */
1317void 1339void
1318rxvt_term::x_cb (XEvent &ev) 1340rxvt_term::x_cb (XEvent &ev)
1420 && ev.xfocus.mode != NotifyGrab) 1442 && ev.xfocus.mode != NotifyGrab)
1421 focus_out (); 1443 focus_out ();
1422 break; 1444 break;
1423 1445
1424 case ConfigureNotify: 1446 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]) 1447 if (ev.xconfigure.window == parent[0])
1429 { 1448 {
1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1449 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ; 1450 ;
1451
1452#ifdef HAVE_BG_PIXMAP
1453 bool moved = false;
1454 if (bg_window_position_sensitive ())
1455 {
1456 int x, y;
1457 if (ev.xconfigure.send_event)
1458 {
1459 x = ev.xconfigure.x;
1460 y = ev.xconfigure.y;
1461 }
1462 else
1463 get_window_origin (x, y);
1464
1465 if (bg_set_position (x, y)
1466 || !(bg_flags & BG_IS_VALID))
1467 moved = true;
1468 }
1469#endif
1432 1470
1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1472 {
1435 seen_resize = 1; 1473 seen_resize = 1;
1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1474 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1475 }
1438 else 1476 else
1439 { 1477 {
1440#ifdef HAVE_BG_PIXMAP 1478#ifdef HAVE_BG_PIXMAP
1441 if (bgPixmap.window_position_sensitive ()) 1479 if (moved)
1442 { 1480 {
1443 if (mapped) 1481 if (mapped)
1444 update_background (); 1482 update_background ();
1445 else 1483 else
1446 bgPixmap.invalidate (); 1484 bg_invalidate ();
1447 } 1485 }
1448#endif 1486#endif
1449 } 1487 }
1450 1488
1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1489 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1452 } 1490 }
1453 break; 1491 break;
1454 1492
1455 case PropertyNotify: 1493 case PropertyNotify:
1456 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1494 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; 1495 break;
1462 1496
1463 case SelectionClear: 1497 case SelectionClear:
1464 selection_clear (); 1498 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; 1499 break;
1471 1500
1472 case SelectionRequest: 1501 case SelectionRequest:
1473 selection_send (ev.xselectionrequest); 1502 selection_send (ev.xselectionrequest);
1474 break; 1503 break;
1475 1504
1476 case MapNotify: 1505 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP 1506#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a 1507 /* 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 1508 * non-reparenting window manager. In those cases we never get first
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1509 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does 1510 * care of multiplicity of ConfigureNotify events arriving while WM does
1482 * reparenting. 1511 * reparenting.
1483 * We should not render background immidiately, as there could be several 1512 * 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 1513 * 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 1514 * by scheduling background redraw as soon as we can, but giving a short
1486 * bit of time for ConfigureNotifies to arrive. 1515 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all 1516 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results. 1517 * of ConfigureNotifys for the best results.
1489 */ 1518 */
1490 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1519 if (!(bg_flags & BG_IS_VALID))
1491 update_background_ev.start (0.025); 1520 update_background_ev.start (0.025);
1492#endif 1521#endif
1493 mapped = 1; 1522 mapped = 1;
1494#ifdef TEXT_BLINK 1523#ifdef TEXT_BLINK
1495 text_blink_ev.start (); 1524 text_blink_ev.start ();
1510 if (ev.xany.window == vt) 1539 if (ev.xany.window == vt)
1511 { 1540 {
1512 do 1541 do
1513 { 1542 {
1514 scr_expose (ev.xexpose.x, ev.xexpose.y, 1543 scr_expose (ev.xexpose.x, ev.xexpose.y,
1515 ev.xexpose.width, ev.xexpose.height, False); 1544 ev.xexpose.width, ev.xexpose.height, false);
1516 } 1545 }
1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1546 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1518 1547
1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1520 1549
1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1550 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522 { 1551 {
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, false);
1525 } 1554 }
1526 1555
1527 want_refresh = 1; 1556 want_refresh = 1;
1528 } 1557 }
1529 else 1558 else
1536 ; 1565 ;
1537 1566
1538 if (scrollBar.state && ev.xany.window == scrollBar.win) 1567 if (scrollBar.state && ev.xany.window == scrollBar.win)
1539 { 1568 {
1540 scrollBar.state = STATE_IDLE; 1569 scrollBar.state = STATE_IDLE;
1541 scrollbar_show (0); 1570 scrollBar.show (0);
1542 } 1571 }
1543 } 1572 }
1544 break; 1573 break;
1545 1574
1546 case MotionNotify: 1575 case MotionNotify:
1645 &unused_root, &unused_child, 1674 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1675 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1676 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1677 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1650 scrollbar_size ()); 1679 scrollBar.size ());
1651 want_refresh = 1; 1680 want_refresh = 1;
1652 scrollbar_show (1); 1681 scrollBar.show (1);
1653 } 1682 }
1654 break; 1683 break;
1655 } 1684 }
1656 1685
1657#if defined(CURSOR_BLINK) 1686#if defined(CURSOR_BLINK)
1682#endif 1711#endif
1683 1712
1684 refresh_check (); 1713 refresh_check ();
1685} 1714}
1686 1715
1716#if ENABLE_FRILLS
1717void
1718rxvt_term::set_urgency (bool enable)
1719{
1720 if (enable == urgency_hint)
1721 return;
1722
1723 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1724 {
1725 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1726 XSetWMHints (dpy, parent[0], h);
1727 urgency_hint = enable;
1728 }
1729}
1730#endif
1731
1687void 1732void
1688rxvt_term::focus_in () 1733rxvt_term::focus_in ()
1689{ 1734{
1690 if (!focus) 1735 if (!focus)
1691 { 1736 {
1692 focus = 1; 1737 focus = 1;
1693 want_refresh = 1; 1738 want_refresh = 1;
1694
1695 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696 1739
1697#if USE_XIM 1740#if USE_XIM
1698 if (Input_Context != NULL) 1741 if (Input_Context != NULL)
1699 { 1742 {
1700 IMSetPosition (); 1743 IMSetPosition ();
1712 scr_recolour (); 1755 scr_recolour ();
1713 } 1756 }
1714#endif 1757#endif
1715#if ENABLE_FRILLS 1758#if ENABLE_FRILLS
1716 if (option (Opt_urgentOnBell)) 1759 if (option (Opt_urgentOnBell))
1717 { 1760 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 1761#endif
1762
1763 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1725 } 1764 }
1726} 1765}
1727 1766
1728void 1767void
1729rxvt_term::focus_out () 1768rxvt_term::focus_out ()
1731 if (focus) 1770 if (focus)
1732 { 1771 {
1733 focus = 0; 1772 focus = 0;
1734 want_refresh = 1; 1773 want_refresh = 1;
1735 1774
1736 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1775#if ENABLE_FRILLS
1737 1776 if (option (Opt_urgentOnBell))
1777 set_urgency (0);
1778#endif
1738#if ENABLE_FRILLS || ISO_14755 1779#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf) 1780 if (iso14755buf)
1740 { 1781 {
1741 iso14755buf = 0; 1782 iso14755buf = 0;
1742# if ISO_14755 1783# if ISO_14755
1759 { 1800 {
1760 pix_colors = pix_colors_unfocused; 1801 pix_colors = pix_colors_unfocused;
1761 scr_recolour (); 1802 scr_recolour ();
1762 } 1803 }
1763#endif 1804#endif
1805
1806 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764 } 1807 }
1765} 1808}
1766 1809
1767void 1810void
1768rxvt_term::update_fade_color (unsigned int idx) 1811rxvt_term::update_fade_color (unsigned int idx)
1796 * use the property to determine the pixmap. We use it later on. 1839 * use the property to determine the pixmap. We use it later on.
1797 */ 1840 */
1798 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1841 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1799 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1842 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1800 { 1843 {
1801 bgPixmap.set_root_pixmap (); 1844 bg_set_root_pixmap ();
1802 update_background (); 1845 update_background ();
1803 } 1846 }
1804 1847
1805 break; 1848 break;
1806 } 1849 }
1845 /* save the xbutton state (for ButtonRelease) */ 1888 /* save the xbutton state (for ButtonRelease) */
1846 MEvent.state = ev.state; 1889 MEvent.state = ev.state;
1847#ifdef MOUSE_REPORT_DOUBLECLICK 1890#ifdef MOUSE_REPORT_DOUBLECLICK
1848 if (ev.button == MEvent.button && clickintime) 1891 if (ev.button == MEvent.button && clickintime)
1849 { 1892 {
1850 /* same button, within alloted time */ 1893 /* same button, within allowed time */
1851 MEvent.clicks++; 1894 MEvent.clicks++;
1852 1895
1853 if (MEvent.clicks > 1) 1896 if (MEvent.clicks > 1)
1854 { 1897 {
1855 /* only report double clicks */ 1898 /* only report double clicks */
2010 } 2053 }
2011 2054
2012 if (scrollBar.style == R_SB_XTERM 2055 if (scrollBar.style == R_SB_XTERM
2013 || scrollbar_above_slider (ev.y) 2056 || scrollbar_above_slider (ev.y)
2014 || scrollbar_below_slider (ev.y)) 2057 || scrollbar_below_slider (ev.y))
2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2058 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2016 2059
2017 scrollBar.state = STATE_MOTION; 2060 scrollBar.state = STATE_MOTION;
2018 break; 2061 break;
2019 2062
2020 case Button1: 2063 case Button1:
2043 else 2086 else
2044 { 2087 {
2045 scr_page ((ev.button == Button1 ? DN : UP), 2088 scr_page ((ev.button == Button1 ? DN : UP),
2046 (nrow 2089 (nrow
2047 * scrollbar_position (ev.y) 2090 * scrollbar_position (ev.y)
2048 / scrollbar_size ())); 2091 / scrollBar.size ()));
2049 } 2092 }
2050 2093
2051 break; 2094 break;
2052 } 2095 }
2053 } 2096 }
2066 reportmode = !! (priv_modes & PrivMode_mouse_report); 2109 reportmode = !! (priv_modes & PrivMode_mouse_report);
2067 2110
2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2111 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2069 { 2112 {
2070 scrollBar.state = STATE_IDLE; 2113 scrollBar.state = STATE_IDLE;
2071 scrollbar_show (0); 2114 scrollBar.show (0);
2072 } 2115 }
2073 2116
2074#ifdef SELECTION_SCROLLING 2117#ifdef SELECTION_SCROLLING
2075 sel_scroll_ev.stop(); 2118 sel_scroll_ev.stop();
2076#endif 2119#endif
2126 selection_make (ev.time); 2169 selection_make (ev.time);
2127 break; 2170 break;
2128 2171
2129 case Button2: 2172 case Button2:
2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2173 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); 2174 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132 break; 2175 break;
2133 2176
2134#ifdef MOUSE_WHEEL 2177#ifdef MOUSE_WHEEL
2135 case Button4: 2178 case Button4:
2136 case Button5: 2179 case Button5:
2159 } 2202 }
2160 else 2203 else
2161# endif 2204# endif
2162 { 2205 {
2163 scr_page (v, i); 2206 scr_page (v, i);
2164 scrollbar_show (1); 2207 scrollBar.show (1);
2165 } 2208 }
2166 } 2209 }
2167 break; 2210 break;
2168#endif 2211#endif
2169 } 2212 }
2170 } 2213 }
2171} 2214}
2172 2215
2173/*}}} */ 2216/*}}} */
2174 2217
2175bool 2218void
2176rxvt_term::cmd_parse () 2219rxvt_term::cmd_parse ()
2177{ 2220{
2178 bool flag = false;
2179 wchar_t ch = NOCHAR; 2221 wchar_t ch = NOCHAR;
2180 char *seq_begin; // remember start of esc-sequence here 2222 char *seq_begin; // remember start of esc-sequence here
2181 2223
2182 for (;;) 2224 for (;;)
2183 { 2225 {
2184 if (ch == NOCHAR) 2226 if (expect_false (ch == NOCHAR))
2185 { 2227 {
2186 seq_begin = cmdbuf_ptr; 2228 seq_begin = cmdbuf_ptr;
2187 ch = next_char (); 2229 ch = next_char ();
2188 2230
2189 if (ch == NOCHAR) 2231 if (ch == NOCHAR)
2190 break; 2232 break;
2191 } 2233 }
2192 2234
2193 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2235 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2194 { 2236 {
2195 if (!seen_input) 2237 if (expect_false (!seen_input))
2196 { 2238 {
2197 seen_input = 1; 2239 seen_input = 1;
2198 // many badly-written programs (e.g. jed) contain a race condition: 2240 // many badly-written programs (e.g. jed) contain a race condition:
2199 // they first read the screensize and then install a SIGWINCH handler. 2241 // they first read the screensize and then install a SIGWINCH handler.
2200 // some window managers resize the window early, and these programs 2242 // some window managers resize the window early, and these programs
2213 wchar_t *str = buf; 2255 wchar_t *str = buf;
2214 wchar_t *eol = str + min (ncol, UBUFSIZ); 2256 wchar_t *eol = str + min (ncol, UBUFSIZ);
2215 2257
2216 for (;;) 2258 for (;;)
2217 { 2259 {
2218 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2260 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2219 break; 2261 break;
2220 2262
2221 *str++ = ch; 2263 *str++ = ch;
2222 2264
2223 if (ch == C0_LF || str >= eol) 2265 if (expect_false (ch == C0_LF || str >= eol))
2224 { 2266 {
2225 if (ch == C0_LF) 2267 if (ch == C0_LF)
2226 nlines++; 2268 nlines++;
2227 2269
2228 refresh_count++; 2270 refresh_count++;
2277 * What the heck we'll cheat and only refresh less than every page-full. 2319 * What the heck we'll cheat and only refresh less than every page-full.
2278 * if skipScroll is enabled. 2320 * if skipScroll is enabled.
2279 */ 2321 */
2280 if (refreshnow) 2322 if (refreshnow)
2281 { 2323 {
2282 flag = true;
2283 scr_refresh (); 2324 scr_refresh ();
2284 want_refresh = 1; 2325 want_refresh = 1;
2285 } 2326 }
2286
2287 } 2327 }
2288 else 2328 else
2289 { 2329 {
2290 try 2330 try
2291 { 2331 {
2299 } 2339 }
2300 2340
2301 ch = NOCHAR; 2341 ch = NOCHAR;
2302 } 2342 }
2303 } 2343 }
2304
2305 return flag;
2306} 2344}
2307 2345
2308// read the next character 2346// read the next character
2309wchar_t 2347wchar_t
2310rxvt_term::next_char () NOTHROW 2348rxvt_term::next_char () NOTHROW
2311{ 2349{
2312 while (cmdbuf_ptr < cmdbuf_endp) 2350 while (cmdbuf_ptr < cmdbuf_endp)
2313 { 2351 {
2314 // assume 7-bit to be ascii ALWAYS 2352 // assume 7-bit to be ascii ALWAYS
2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2353 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2316 return *cmdbuf_ptr++; 2354 return *cmdbuf_ptr++;
2317 2355
2318 wchar_t wc; 2356 wchar_t wc;
2319 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2357 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2320 2358
2324 cmdbuf_ptr = cmdbuf_endp; 2362 cmdbuf_ptr = cmdbuf_endp;
2325 break; 2363 break;
2326 } 2364 }
2327 2365
2328 if (len == (size_t)-1) 2366 if (len == (size_t)-1)
2367 {
2368 mbstate.reset (); // reset now undefined conversion state
2329 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2369 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2370 }
2330 2371
2331 // assume wchar == unicode 2372 // assume wchar == unicode
2332 cmdbuf_ptr += len; 2373 cmdbuf_ptr += len;
2333 return wc & UNICODE_MASK; 2374 return wc & UNICODE_MASK;
2334 } 2375 }
2378/*----------------------------------------------------------------------*/ 2419/*----------------------------------------------------------------------*/
2379#ifdef PRINTPIPE 2420#ifdef PRINTPIPE
2380FILE * 2421FILE *
2381rxvt_term::popen_printer () 2422rxvt_term::popen_printer ()
2382{ 2423{
2383 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2424 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2384 2425
2385 if (stream == NULL) 2426 if (stream == NULL)
2386 rxvt_warn ("can't open printer pipe, not printing.\n"); 2427 rxvt_warn ("can't open printer pipe, not printing.\n");
2387 2428
2388 return stream; 2429 return stream;
2399 * simulate attached vt100 printer 2440 * simulate attached vt100 printer
2400 */ 2441 */
2401void 2442void
2402rxvt_term::process_print_pipe () 2443rxvt_term::process_print_pipe ()
2403{ 2444{
2404 int done; 2445 FILE *fd = popen_printer ();
2405 FILE *fd;
2406 2446
2407 if ((fd = popen_printer ()) == NULL) 2447 if (!fd)
2408 return; 2448 return;
2409 2449
2410 /* 2450 /*
2411 * Send all input to the printer until either ESC[4i or ESC[?4i 2451 * Send all input to the printer until either ESC[4i or ESC[?4i
2412 * is received. 2452 * is received.
2413 */ 2453 */
2414 for (done = 0; !done;) 2454 for (int done = 0; !done; )
2415 { 2455 {
2416 unsigned char buf[8]; 2456 unsigned char buf[8];
2417 unicode_t ch; 2457 unicode_t ch;
2418 unsigned int i, len; 2458 unsigned int i, len;
2419 2459
2564 break; 2604 break;
2565 case 'Z': /* identify the terminal type */ 2605 case 'Z': /* identify the terminal type */
2566 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2606 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2567 break; 2607 break;
2568 case '<': /* turn off VT52 mode */ 2608 case '<': /* turn off VT52 mode */
2569 PrivMode (0, PrivMode_vt52); 2609 set_privmode (PrivMode_vt52, 0);
2570 break; 2610 break;
2571 case 'F': /* use special graphics character set */ 2611 case 'F': /* use special graphics character set */
2572 case 'G': /* use regular character set */ 2612 case 'G': /* use regular character set */
2573 /* unimplemented */ 2613 /* unimplemented */
2574 break; 2614 break;
2628 scr_forwardindex (); 2668 scr_forwardindex ();
2629 break; 2669 break;
2630#endif 2670#endif
2631 case '=': 2671 case '=':
2632 case '>': 2672 case '>':
2633 PrivMode ((ch == '='), PrivMode_aplKP); 2673 set_privmode (PrivMode_aplKP, ch == '=');
2634 break; 2674 break;
2635 2675
2636 case C1_40: 2676 case C1_40:
2637 cmd_getc (); 2677 cmd_getc ();
2638 break; 2678 break;
2642 2682
2643 /* 8.3.87: NEXT LINE */ 2683 /* 8.3.87: NEXT LINE */
2644 case C1_NEL: /* ESC E */ 2684 case C1_NEL: /* ESC E */
2645 { 2685 {
2646 wchar_t nlcr[] = { C0_LF, C0_CR }; 2686 wchar_t nlcr[] = { C0_LF, C0_CR };
2647 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2687 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2648 } 2688 }
2649 break; 2689 break;
2650 2690
2651 /* kidnapped escape sequence: Should be 8.3.48 */ 2691 /* kidnapped escape sequence: Should be 8.3.48 */
2652 case C1_ESA: /* ESC G */ 2692 case C1_ESA: /* ESC G */
2653 process_graphics (); 2693 // used by original rxvt for rob nations own graphics mode
2694 if (cmd_getc () == 'Q')
2695 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2654 break; 2696 break;
2655 2697
2656 /* 8.3.63: CHARACTER TABULATION SET */ 2698 /* 8.3.63: CHARACTER TABULATION SET */
2657 case C1_HTS: /* ESC H */ 2699 case C1_HTS: /* ESC H */
2658 scr_set_tab (1); 2700 scr_set_tab (1);
2677 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2719 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2678 case C1_SCI: /* ESC Z */ 2720 case C1_SCI: /* ESC Z */
2679 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2721 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2680 break; /* steal obsolete ESC [ c */ 2722 break; /* steal obsolete ESC [ c */
2681 2723
2682 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2724 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2683 case C1_CSI: /* ESC [ */ 2725 case C1_CSI: /* ESC [ */
2684 process_csi_seq (); 2726 process_csi_seq ();
2685 break; 2727 break;
2686 2728
2687 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2729 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2688 case C1_OSC: /* ESC ] */ 2730 case C1_OSC: /* ESC ] */
2689 process_osc_seq (); 2731 process_osc_seq ();
2690 break; 2732 break;
2691 2733
2692 /* 8.3.106: RESET TO INITIAL STATE */ 2734 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2693 case 'c': 2735 case 'c':
2694 mbstate.reset (); 2736 mbstate.reset ();
2695 scr_poweron (); 2737 scr_poweron ();
2696 scrollbar_show (1); 2738 scrollBar.show (1);
2697 break; 2739 break;
2698 2740
2699 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2741 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2700 case 'n': 2742 case 'n':
2701 scr_charset_choose (2); 2743 scr_charset_choose (2);
2721 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2763 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 , 2764 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 2765 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2724}; 2766};
2725 2767
2726#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2768#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2727 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2769 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2728 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2770 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2729#define get_byte_array_bit(array, bit) \ 2771#define get_byte_array_bit(array, bit) \
2730 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2772 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2731 2773
2732const unsigned char csi_defaults[] = 2774static const unsigned char csi_defaults[] =
2733 { 2775 {
2734 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2776 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, */ 2777 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, */ 2778 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, [, \, ], ^, _, */ 2779 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2752 2794
2753 nargs = 0; 2795 nargs = 0;
2754 2796
2755 priv = 0; 2797 priv = 0;
2756 ch = cmd_getc (); 2798 ch = cmd_getc ();
2757 if (ch >= '<' && ch <= '?') 2799 if ((ch >= '<' && ch <= '?') || ch == '!')
2758 { 2800 {
2759 /* '<' '=' '>' '?' */ 2801 /* '<' '=' '>' '?' '!' */
2760 priv = ch; 2802 priv = ch;
2761 ch = cmd_getc (); 2803 ch = cmd_getc ();
2762 } 2804 }
2763 2805
2764 /* read any numerical arguments */ 2806 /* read any numerical arguments */
2818 2860
2819 case '?': 2861 case '?':
2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2862 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2821 process_terminal_mode (ch, priv, nargs, arg); 2863 process_terminal_mode (ch, priv, nargs, arg);
2822 break; 2864 break;
2865
2866 case '!':
2867 if (ch == CSI_70)
2868 {
2869 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2870 scr_soft_reset ();
2871
2872 static const int pm_h[] = { 7, 25 };
2873 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2874
2875 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2876 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2823 } 2877 }
2878 break;
2879 }
2880
2824 return; 2881 return;
2825 } 2882 }
2826 2883
2827 switch (ch) 2884 switch (ch)
2828 { 2885 {
3195 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3252 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3196 */ 3253 */
3197void 3254void
3198rxvt_term::process_dcs_seq () 3255rxvt_term::process_dcs_seq ()
3199{ 3256{
3200 char *s;
3201 unicode_t eh;
3202
3203 /* 3257 /*
3204 * Not handled yet 3258 * Not handled yet
3205 */ 3259 */
3260
3261 unicode_t eh;
3206 s = get_to_st (eh); 3262 char *s = get_to_st (eh);
3207 if (s) 3263 if (s)
3208 free (s); 3264 free (s);
3209 3265
3210 return; 3266 return;
3211} 3267}
3215 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3271 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3216 */ 3272 */
3217void 3273void
3218rxvt_term::process_osc_seq () 3274rxvt_term::process_osc_seq ()
3219{ 3275{
3220 unicode_t ch, eh;
3221 int arg; 3276 int arg;
3222 3277
3223 ch = cmd_getc (); 3278 unicode_t ch = cmd_getc ();
3224 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3279 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3225 arg = arg * 10 + (ch - '0'); 3280 arg = arg * 10 + (ch - '0');
3226 3281
3227 if (ch == ';') 3282 if (ch == ';')
3228 { 3283 {
3284 unicode_t eh;
3229 char *s = get_to_st (eh); 3285 char *s = get_to_st (eh);
3230 3286
3231 if (s) 3287 if (s)
3232 { 3288 {
3233 process_xterm_seq (arg, s, eh); 3289 process_xterm_seq (arg, s, eh);
3257 3313
3258/* 3314/*
3259 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3315 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3260 */ 3316 */
3261void 3317void
3262rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3318rxvt_term::process_xterm_seq (int op, char *str, char resp)
3263{ 3319{
3264 int color; 3320 int color;
3265 char *buf, *name; 3321 char *buf, *name;
3266 bool query = str[0] == '?' && !str[1]; 3322 bool query = str[0] == '?' && !str[1];
3267 int saveop = op; 3323 int saveop = op;
3308 3364
3309 XFree (value); 3365 XFree (value);
3310 } 3366 }
3311 else 3367 else
3312 { 3368 {
3313 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3369 char *eq = strchr (str, '=');
3314 3370
3315 if (eq) 3371 if (eq)
3316 { 3372 {
3317 *eq = 0; 3373 *eq = 0;
3318 set_utf8_property (display->atom (str), eq + 1); 3374 set_utf8_property (display->atom (str), eq + 1);
3358 process_color_seq (op, Color_pointer_fg, str, resp); 3414 process_color_seq (op, Color_pointer_fg, str, resp);
3359 break; 3415 break;
3360 case XTerm_Color_pointer_bg: 3416 case XTerm_Color_pointer_bg:
3361 process_color_seq (op, Color_pointer_bg, str, resp); 3417 process_color_seq (op, Color_pointer_bg, str, resp);
3362 break; 3418 break;
3419#ifdef OPTION_HC
3420 case XTerm_Color_HC:
3421 process_color_seq (op, Color_HC, str, resp);
3422 break;
3423 case XTerm_Color_HTC:
3424 process_color_seq (op, Color_HTC, str, resp);
3425 break;
3426#endif
3363#ifndef NO_BOLD_UNDERLINE_REVERSE 3427#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: 3428 case URxvt_Color_BD:
3369 process_color_seq (op, Color_BD, str, resp); 3429 process_color_seq (op, Color_BD, str, resp);
3370 break; 3430 break;
3371 case Rxvt_Color_UL:
3372 case URxvt_Color_UL: 3431 case URxvt_Color_UL:
3373 process_color_seq (op, Color_UL, str, resp); 3432 process_color_seq (op, Color_UL, str, resp);
3374 break; 3433 break;
3375 case URxvt_Color_IT: 3434 case URxvt_Color_IT:
3376 process_color_seq (op, Color_IT, str, resp); 3435 process_color_seq (op, Color_IT, str, resp);
3377 break; 3436 break;
3378#endif 3437#endif
3438 case URxvt_Color_border:
3439 process_color_seq (op, Color_border, str, resp);
3440 break;
3379#if ENABLE_TRANSPARENCY 3441#if ENABLE_TRANSPARENCY
3380 case URxvt_Color_tint: 3442 case URxvt_Color_tint:
3381 process_color_seq (op, Color_tint, str, resp); 3443 process_color_seq (op, Color_tint, str, resp);
3382 { 3444 {
3383 bool changed = false; 3445 bool changed = false;
3384 3446
3385 if (ISSET_PIXCOLOR (Color_tint)) 3447 if (ISSET_PIXCOLOR (Color_tint))
3386 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3448 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3387 else
3388 changed = bgPixmap.unset_tint ();
3389 3449
3390 if (changed) 3450 if (changed)
3391 update_background (); 3451 update_background ();
3392 } 3452 }
3393 3453
3398 case Rxvt_Pixmap: 3458 case Rxvt_Pixmap:
3399 if (!strcmp (str, "?")) 3459 if (!strcmp (str, "?"))
3400 { 3460 {
3401 char str[256]; 3461 char str[256];
3402 3462
3403 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3463 sprintf (str, "[%dx%d+%d+%d]",
3404 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3464 min (h_scale, 32767), min (v_scale, 32767),
3405 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3465 min (h_align, 32767), min (v_align, 32767));
3406 process_xterm_seq (XTerm_title, str, CHAR_ST); 3466 process_xterm_seq (XTerm_title, str, CHAR_ST);
3407 } 3467 }
3408 else 3468 else
3409 { 3469 {
3410 int changed = 0; 3470 int changed = 0;
3411 3471
3412 if (*str != ';') 3472 if (*str != ';')
3413 { 3473 {
3414 /* reset to default scaling :*/
3415 bgPixmap.unset_geometry ();
3416 if (bgPixmap.set_file (str)) /* change pixmap */ 3474 if (bg_set_file (str)) /* change pixmap */
3475 {
3417 changed++; 3476 changed++;
3418 str = strchr (str, ';'); 3477 str = strchr (str, ';');
3419 if (str == NULL) 3478 if (str == NULL)
3420 bgPixmap.set_defaultGeometry (); 3479 bg_set_default_geometry ();
3480 else
3481 bg_set_geometry (str+1);
3482 }
3421 } 3483 }
3422 3484 else
3423 while (str)
3424 { 3485 {
3425 str++; 3486 str++;
3426 if (bgPixmap.set_geometry (str)) 3487 if (bg_set_geometry (str, true))
3427 changed++; 3488 changed++;
3428 str = strchr (str, ';');
3429 } 3489 }
3430 3490
3431 if (changed) 3491 if (changed)
3492 {
3493 if (bg_window_position_sensitive ())
3494 {
3495 int x, y;
3496 get_window_origin (x, y);
3497 bg_set_position (x, y);
3498 }
3432 update_background (); 3499 update_background ();
3500 }
3433 } 3501 }
3434 break; 3502 break;
3435#endif 3503#endif
3436 3504
3437 case XTerm_logfile: 3505 case XTerm_logfile:
3507 break; 3575 break;
3508#endif 3576#endif
3509 3577
3510#if ENABLE_PERL 3578#if ENABLE_PERL
3511 case URxvt_perl: 3579 case URxvt_perl:
3512 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3580 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3513 ; // no responses yet
3514 break; 3581 break;
3515#endif 3582#endif
3516 } 3583 }
3517} 3584}
3518/*----------------------------------------------------------------------*/ 3585/*----------------------------------------------------------------------*/
3541 { 3608 {
3542 if (mode == 'r') 3609 if (mode == 'r')
3543 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3610 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3544 else 3611 else
3545 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3612 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3546 PrivMode (state, bit); 3613
3614 set_privmode (bit, state);
3547 } 3615 }
3548 3616
3549 return state; 3617 return state;
3550} 3618}
3551 3619
3559 static const struct 3627 static const struct
3560 { 3628 {
3561 const int argval; 3629 const int argval;
3562 const unsigned long bit; 3630 const unsigned long bit;
3563 } argtopriv[] = { 3631 } argtopriv[] = {
3564 { 1, PrivMode_aplCUR }, 3632 { 1, PrivMode_aplCUR }, // DECCKM
3565 { 2, PrivMode_vt52 }, 3633 { 2, PrivMode_vt52 },
3566 { 3, PrivMode_132 }, 3634 { 3, PrivMode_132 }, // DECCOLM
3567 { 4, PrivMode_smoothScroll }, 3635 { 4, PrivMode_smoothScroll }, // DECSCLM
3568 { 5, PrivMode_rVideo }, 3636 { 5, PrivMode_rVideo }, // DECSCNM
3569 { 6, PrivMode_relOrigin }, 3637 { 6, PrivMode_relOrigin }, // DECOM
3570 { 7, PrivMode_Autowrap }, 3638 { 7, PrivMode_Autowrap }, // DECAWM
3571 // 8, bi-directional support mode 3639 // 8, auto-repeat keys // DECARM
3572 { 9, PrivMode_MouseX10 }, 3640 { 9, PrivMode_MouseX10 },
3573 // 18, 19 printing-related 3641 // 18 end FF to printer after print screen
3642 // 19 Print screen prints full screen/scroll region
3574 { 25, PrivMode_VisibleCursor }, 3643 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3575#ifdef scrollBar_esc 3644#ifdef scrollBar_esc
3576 { scrollBar_esc, PrivMode_scrollBar }, 3645 { scrollBar_esc, PrivMode_scrollBar },
3577#endif 3646#endif
3578 { 35, PrivMode_ShiftKeys }, // rxvt extension 3647 { 35, PrivMode_ShiftKeys }, // rxvt extension
3648 // 38, tektronix mode // DECTEK
3579 { 40, PrivMode_132OK }, 3649 { 40, PrivMode_132OK },
3580 // 41 xterm more fixes NYI 3650 // 41 xterm more fixes NYI
3581 // 45 margin bell NYI 3651 // 45 margin bell NYI
3582 // 46 start logging 3652 // 46 start logging
3583 { 47, PrivMode_Screen }, 3653 { 47, PrivMode_Screen },
3584 { 66, PrivMode_aplKP }, 3654 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3585#ifndef NO_BACKSPACE_KEY 3655#ifndef NO_BACKSPACE_KEY
3586 { 67, PrivMode_BackSpace }, 3656 { 67, PrivMode_BackSpace }, // DECBKM
3587#endif 3657#endif
3588 { 1000, PrivMode_MouseX11 }, 3658 { 1000, PrivMode_MouseX11 },
3589 { 1002, PrivMode_MouseBtnEvent }, 3659 { 1002, PrivMode_MouseBtnEvent },
3590 { 1003, PrivMode_MouseAnyEvent }, 3660 { 1003, PrivMode_MouseAnyEvent },
3661#if ENABLE_FRILLS
3662 { 1005, PrivMode_ExtModeMouse },
3663#endif
3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3664 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3592 { 1011, PrivMode_Keypress }, // rxvt extension 3665 { 1011, PrivMode_Keypress }, // rxvt extension
3666#if ENABLE_FRILLS
3667 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3668#endif
3593 // 1035 enable modifiers for alt, numlock NYI 3669 // 1035 enable modifiers for alt, numlock NYI
3594 // 1036 send ESC for meta keys NYI 3670 // 1036 send ESC for meta keys NYI
3595 // 1037 send DEL for keypad delete NYI 3671 // 1037 send DEL for keypad delete NYI
3596 { 1047, PrivMode_Screen }, 3672 { 1047, PrivMode_Screen },
3597 // 1048 save and restore cursor 3673 // 1048 save and restore cursor, implemented in code
3598 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3674 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3599 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3675 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3600 { 2004, PrivMode_BracketPaste }, 3676 { 2004, PrivMode_BracketPaste },
3601 }; 3677 };
3602 3678
3612 for (i = 0; i < nargs; i++) 3688 for (i = 0; i < nargs; i++)
3613 { 3689 {
3614 state = -1; 3690 state = -1;
3615 3691
3616 /* basic handling */ 3692 /* basic handling */
3617 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3693 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3618 if (argtopriv[j].argval == arg[i]) 3694 if (argtopriv[j].argval == arg[i])
3619 { 3695 {
3620 state = privcases (mode, argtopriv[j].bit); 3696 state = privcases (mode, argtopriv[j].bit);
3621 break; 3697 break;
3622 } 3698 }
3630 3706
3631 scr_touch (true); 3707 scr_touch (true);
3632 break; 3708 break;
3633#endif 3709#endif
3634 case 1048: /* alternative cursor save */ 3710 case 1048: /* alternative cursor save */
3635 case 1049:
3636 if (option (Opt_secondaryScreen)) 3711 if (option (Opt_secondaryScreen))
3637 if (mode == 0) 3712 if (mode == 0)
3638 scr_cursor (RESTORE); 3713 scr_cursor (RESTORE);
3639 else if (mode == 1) 3714 else if (mode == 1)
3640 scr_cursor (SAVE); 3715 scr_cursor (SAVE);
3649 case 2: /* VT52 mode */ 3724 case 2: /* VT52 mode */
3650 /* oddball mode. should be set regardless of set/reset 3725 /* oddball mode. should be set regardless of set/reset
3651 * parameter. Return from VT52 mode with an ESC < from 3726 * parameter. Return from VT52 mode with an ESC < from
3652 * within VT52 mode 3727 * within VT52 mode
3653 */ 3728 */
3654 PrivMode (1, PrivMode_vt52); 3729 set_privmode (PrivMode_vt52, 1);
3655 break; 3730 break;
3656 case 3: /* 80/132 */ 3731 case 3: /* 80/132 */
3657 if (priv_modes & PrivMode_132OK) 3732 if (priv_modes & PrivMode_132OK)
3658 {
3659 scr_poweron ();
3660 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3733 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3661 }
3662 break; 3734 break;
3663 case 4: /* smooth scrolling */ 3735 case 4: /* smooth scrolling */
3664 set_option (Opt_jumpScroll, !state); 3736 set_option (Opt_jumpScroll, !state);
3665 break; 3737 break;
3666 case 5: /* reverse video */ 3738 case 5: /* reverse video */
3677 if (state) /* orthogonal */ 3749 if (state) /* orthogonal */
3678 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3750 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3679 break; 3751 break;
3680#ifdef scrollBar_esc 3752#ifdef scrollBar_esc
3681 case scrollBar_esc: 3753 case scrollBar_esc:
3682 if (scrollbar_mapping (state)) 3754 if (scrollBar.map (state))
3683 { 3755 {
3684 resize_all_windows (0, 0, 0); 3756 resize_all_windows (0, 0, 0);
3685 scr_touch (true); 3757 scr_touch (true);
3686 } 3758 }
3687 break; 3759 break;
3704 case 1003: 3776 case 1003:
3705 if (state) 3777 if (state)
3706 { 3778 {
3707 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3779 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3708 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3780 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3781 mouse_row = mouse_col = 0;
3709 vt_emask_mouse = PointerMotionMask; 3782 vt_emask_mouse = PointerMotionMask;
3710 } 3783 }
3711 else 3784 else
3712 vt_emask_mouse = NoEventMask; 3785 vt_emask_mouse = NoEventMask;
3786
3713 vt_select_input (); 3787 vt_select_input ();
3714 break; 3788 break;
3715 case 1010: /* scroll to bottom on TTY output inhibit */ 3789 case 1010: /* scroll to bottom on TTY output inhibit */
3716 set_option (Opt_scrollTtyOutput, !state); 3790 set_option (Opt_scrollTtyOutput, !state);
3717 break; 3791 break;
3718 case 1011: /* scroll to bottom on key press */ 3792 case 1011: /* scroll to bottom on key press */
3719 set_option (Opt_scrollTtyKeypress, state); 3793 set_option (Opt_scrollTtyKeypress, state);
3720 break; 3794 break;
3721 case 1047: /* secondary screen w/ clearing last */ 3795 case 1047: /* secondary screen w/ clearing last */
3722 if (option (Opt_secondaryScreen)) 3796 if (option (Opt_secondaryScreen))
3723 if (current_screen != PRIMARY) 3797 if (!state)
3724 scr_erase_screen (2); 3798 scr_erase_screen (2);
3799
3725 scr_change_screen (state); 3800 scr_change_screen (state);
3726 break; 3801 break;
3727 case 1049: /* secondary screen w/ clearing first */ 3802 case 1049: /* secondary screen w/ clearing first */
3803 if (option (Opt_secondaryScreen))
3804 if (state)
3805 scr_cursor (SAVE);
3806
3728 scr_change_screen (state); 3807 scr_change_screen (state);
3808
3729 if (option (Opt_secondaryScreen)) 3809 if (option (Opt_secondaryScreen))
3730 if (current_screen != PRIMARY) 3810 if (state)
3731 scr_erase_screen (2); 3811 scr_erase_screen (2);
3812 else
3813 scr_cursor (RESTORE);
3732 break; 3814 break;
3733 default: 3815 default:
3734 break; 3816 break;
3735 } 3817 }
3736 } 3818 }
3889 } 3971 }
3890 } 3972 }
3891} 3973}
3892/*}}} */ 3974/*}}} */
3893 3975
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/* ------------------------------------------------------------------------- */ 3976/* ------------------------------------------------------------------------- */
3914 3977
3915/* 3978/*
3916 * Send printf () formatted output to the command. 3979 * Send printf () formatted output to the command.
3917 * Only use for small amounts of data. 3980 * Only use for small amounts of data.
3930 3993
3931/* ---------------------------------------------------------------------- */ 3994/* ---------------------------------------------------------------------- */
3932/* Write data to the pty as typed by the user, pasted with the mouse, 3995/* 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. 3996 * or generated by us in response to a query ESC sequence.
3934 */ 3997 */
3935const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3998static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3936 3999
3937void 4000void
3938rxvt_term::tt_write (const char *data, unsigned int len) 4001rxvt_term::tt_write (const char *data, unsigned int len)
3939{ 4002{
3940 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4003 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3945 4008
3946 if (v_buflen == 0) 4009 if (v_buflen == 0)
3947 { 4010 {
3948 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4011 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3949 4012
4013 max_it (written, 0);
4014
3950 if ((unsigned int)written == len) 4015 if (written == len)
3951 return; 4016 return;
3952 4017
3953 data += written; 4018 data += written;
3954 len -= written; 4019 len -= written;
3955 } 4020 }
3956 4021
3957 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4022 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3958 4023
3959 memcpy (v_buffer + v_buflen, data, len); 4024 memcpy (v_buffer + v_buflen, data, len);
3960 v_buflen += len; 4025 v_buflen += len;
3961 4026
3962 pty_ev.set (ev::READ | ev::WRITE); 4027 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines