ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.409 by ayin, Sat Feb 16 15:39:20 2008 UTC vs.
Revision 1.471 by sf-exg, Thu Jan 20 16:41:23 2011 UTC

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
376 param = 5; 382 param = 5;
377 break; 383 break;
378 case XK_Next: 384 case XK_Next:
379 param = 6; 385 param = 6;
380 break; 386 break;
387 case XK_Home:
388 param = 7;
389 break;
390 case XK_End:
391 param = 8;
392 break;
381#endif 393#endif
382 case XK_Help: 394 case XK_Help:
383 param = 28; 395 param = 28;
384 break; 396 break;
385 case XK_Menu: 397 case XK_Menu:
409 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
410 */ 422 */
411 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
412 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
413 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
414
415 if (numlock_state || (ev.state & ModNumLockMask))
416 {
417 numlock_state = (ev.state & ModNumLockMask);
418 PrivMode ((!numlock_state), PrivMode_aplKP);
419 }
420 426
421 kbuf[0] = 0; 427 kbuf[0] = 0;
422 428
423#ifdef USE_XIM 429#ifdef USE_XIM
424 if (Input_Context) 430 if (Input_Context)
499#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
500 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
501#else 507#else
502 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
503#endif 509#endif
510 max_it (lnsppg, 1);
511
504 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
505 { 513 {
506 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
507 return; 515 return;
508 } 516 }
573 } 581 }
574 } 582 }
575 583
576#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
577 // ISO 14755 support 585 // ISO 14755 support
578 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
579 { 587 {
580 int hv; 588 int hv;
581 589
582 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
583 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
613 scr_overlay_off (); 621 scr_overlay_off ();
614# endif 622# endif
615 iso14755buf = 0; 623 iso14755buf = 0;
616 } 624 }
617 } 625 }
626 else if (option (Opt_iso14755) &&
618 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
619 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
620 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
621 { 630 {
622 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
623# if ISO_14755 632# if ISO_14755
624 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
635 } 644 }
636#endif 645#endif
637 646
638 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
639 { 648 {
640 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
641 unsigned int newlen = 1; 650 unsigned int newlen = 1;
642 651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
643 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:
644 { 773 {
645#ifndef NO_BACKSPACE_KEY
646 case XK_BackSpace:
647 if (priv_modes & PrivMode_HaveBackSpace)
648 {
649 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
650 ^ !!ctrl) ? '\b' : '\177';
651 kbuf[1] = '\0';
652 }
653 else
654 strcpy (kbuf, rs[Rs_backspace_key]);
655 break;
656#endif
657#ifndef NO_DELETE_KEY
658 case XK_Delete:
659 strcpy (kbuf, rs[Rs_delete_key]);
660 break;
661#endif
662 case XK_Tab:
663 if (shft)
664 strcpy (kbuf, "\033[Z");
665 else
666 {
667#ifdef CTRL_TAB_MAKES_META
668 if (ctrl)
669 meta = 1;
670#endif
671#ifdef MOD4_TAB_MAKES_META
672 if (ev.state & Mod4Mask)
673 meta = 1;
674#endif
675 newlen = 0;
676 }
677 break;
678
679 case XK_Up: /* "\033[A" */
680 case XK_Down: /* "\033[B" */
681 case XK_Right: /* "\033[C" */
682 case XK_Left: /* "\033[D" */
683 strcpy (kbuf, "\033[Z");
684 kbuf[2] = "DACB"[keysym - XK_Left];
685 /* do Shift first */
686 if (shft)
687 kbuf[2] = "dacb"[keysym - XK_Left];
688 else if (ctrl)
689 {
690 kbuf[1] = 'O';
691 kbuf[2] = "dacb"[keysym - XK_Left];
692 }
693 else if (priv_modes & PrivMode_aplCUR)
694 kbuf[1] = 'O';
695 break;
696
697 case XK_KP_Enter:
698 /* allow shift to override */
699 if (kp)
700 {
701 strcpy (kbuf, "\033OM");
702 break;
703 }
704
705 /* FALLTHROUGH */
706
707 case XK_Return:
708 if (priv_modes & PrivMode_LFNL)
709 {
710 kbuf[0] = '\015';
711 kbuf[1] = '\012';
712 kbuf[2] = '\0';
713 }
714 else
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\0';
718 }
719 break;
720
721 case XK_KP_F1: /* "\033OP" */
722 case XK_KP_F2: /* "\033OQ" */
723 case XK_KP_F3: /* "\033OR" */
724 case XK_KP_F4: /* "\033OS" */
725 strcpy (kbuf, "\033OP");
726 kbuf[2] += (keysym - XK_KP_F1);
727 break;
728
729 case XK_KP_Multiply: /* "\033Oj" : "*" */
730 case XK_KP_Add: /* "\033Ok" : "+" */
731 case XK_KP_Separator: /* "\033Ol" : "," */
732 case XK_KP_Subtract: /* "\033Om" : "-" */
733 case XK_KP_Decimal: /* "\033On" : "." */
734 case XK_KP_Divide: /* "\033Oo" : "/" */
735 case XK_KP_0: /* "\033Op" : "0" */
736 case XK_KP_1: /* "\033Oq" : "1" */
737 case XK_KP_2: /* "\033Or" : "2" */
738 case XK_KP_3: /* "\033Os" : "3" */
739 case XK_KP_4: /* "\033Ot" : "4" */
740 case XK_KP_5: /* "\033Ou" : "5" */
741 case XK_KP_6: /* "\033Ov" : "6" */
742 case XK_KP_7: /* "\033Ow" : "7" */
743 case XK_KP_8: /* "\033Ox" : "8" */
744 case XK_KP_9: /* "\033Oy" : "9" */
745 /* allow shift to override */
746 if (kp)
747 {
748 strcpy (kbuf, "\033Oj");
749 kbuf[2] += (keysym - XK_KP_Multiply);
750 }
751 else
752 {
753 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
754 kbuf[1] = '\0';
755 }
756 break;
757
758 case XK_End:
759 strcpy (kbuf, KS_END);
760 break;
761 case XK_Home:
762 strcpy (kbuf, KS_HOME);
763 break;
764
765 default:
766 {
767 int param = map_function_key (keysym); 774 int param = map_function_key (keysym);
768 if (param > 0) 775 if (param > 0)
769 sprintf (kbuf,"\033[%d~", param); 776 sprintf (kbuf,"\033[%d~", param);
770 else 777 else
771 newlen = 0; 778 newlen = 0;
772 }
773 break;
774 } 779 }
780 break;
781 }
775 782
776 if (newlen) 783 if (newlen)
777 len = strlen (kbuf); 784 len = strlen (kbuf);
778 785
779 /* 786 /*
780 * Pass meta for all function keys, if 'meta' option set 787 * Pass meta for all function keys, if 'meta' option set
781 */ 788 */
782#ifdef META8_OPTION 789#ifdef META8_OPTION
882 commit_iso14755 (); 889 commit_iso14755 ();
883 890
884 return; 891 return;
885 } 892 }
886 893
887 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
888 if (i[0] == keysym) 895 if (i[0] == keysym)
889 { 896 {
890 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
891 commit_iso14755 (); 898 commit_iso14755 ();
892 899
968rxvt_term::flush () 975rxvt_term::flush ()
969{ 976{
970 flush_ev.stop (); 977 flush_ev.stop ();
971 978
972#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
973 if (bgPixmap.check_clearChanged ()) 980 if (bgPixmap.flags & bgPixmap_t::hasChanged)
974 { 981 {
975// scr_clear (true); This needs to be researched further! 982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
976 scr_touch (false); 983 scr_touch (false);
977 } 984 }
978#endif 985#endif
979 986
980 if (want_refresh) 987 if (want_refresh)
1016 } 1023 }
1017 while (row < end_row); 1024 while (row < end_row);
1018 } 1025 }
1019 1026
1020 scr_refresh (); 1027 scr_refresh ();
1021 scrollbar_show (1); 1028 scrollBar.show (1);
1022#ifdef USE_XIM 1029#ifdef USE_XIM
1023 IMSendSpot (); 1030 IMSendSpot ();
1024#endif 1031#endif
1025 } 1032 }
1026 1033
1027 display->flush (); 1034 display->flush ();
1028} 1035}
1029 1036
1030/* checks wether a refresh is requested and starts the refresh timer */ 1037/* checks whether a refresh is requested and starts the refresh timer */
1031void 1038void
1032rxvt_term::refresh_check () 1039rxvt_term::refresh_check ()
1033{ 1040{
1034 if (want_refresh && !flush_ev.is_active ()) 1041 if (want_refresh && !flush_ev.is_active ())
1035 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1042 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1128 { 1135 {
1129 // this should really be sched_yield(), but the linux guys thought 1136 // this should really be sched_yield(), but the linux guys thought
1130 // that giving a process calling sched_yield () less cpu time than 1137 // that giving a process calling sched_yield () less cpu time than
1131 // ones with high nice levels is a useful thing to do. It surely is is 1138 // ones with high nice levels is a useful thing to do. It surely is is
1132 // 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.
1133 1143
1134 struct timespec ts = { 0, 0 }; 1144 struct timespec ts = { 0, 1000 };
1135 nanosleep (&ts, 0); 1145 nanosleep (&ts, 0);
1136 1146
1137 w.stop (); 1147 w.stop ();
1138 } 1148 }
1139 1149
1189{ 1199{
1190 make_current (); 1200 make_current ();
1191 1201
1192 if (revents & ev::READ) 1202 if (revents & ev::READ)
1193 // loop, but don't allow a single term to monopolize us 1203 // loop, but don't allow a single term to monopolize us
1194 while (pty_fill ()) 1204 for (int i = CBUFCNT; i-- && pty_fill (); )
1195 if (cmd_parse ()) 1205 cmd_parse ();
1196 break;
1197 1206
1198 if (revents & ev::WRITE) 1207 if (revents & ev::WRITE)
1199 pty_write (); 1208 pty_write ();
1200 1209
1201 refresh_check (); 1210 refresh_check ();
1242{ 1251{
1243 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1244 int x, y; 1253 int x, y;
1245 int code = 32; 1254 int code = 32;
1246 1255
1247 x = Pixel2Col (ev.x); 1256 x = Pixel2Col (ev.x) + 1;
1248 y = Pixel2Row (ev.y); 1257 y = Pixel2Row (ev.y) + 1;
1258
1249 if (ev.type == MotionNotify) 1259 if (ev.type == MotionNotify)
1250 { 1260 {
1251 if (x == mouse_row && y == mouse_col) 1261 if (x == mouse_row && y == mouse_col)
1252 return; 1262 return;
1263
1253 mouse_row = x; 1264 mouse_row = x;
1254 mouse_col = y; 1265 mouse_col = y;
1255 code += 32; 1266 code += 32;
1256 } 1267 }
1257 1268
1260 else 1271 else
1261 { 1272 {
1262 button_number = MEvent.button - Button1; 1273 button_number = MEvent.button - Button1;
1263 /* add 0x3D for wheel events, like xterm does */ 1274 /* add 0x3D for wheel events, like xterm does */
1264 if (button_number >= 3) 1275 if (button_number >= 3)
1265 button_number += (64 - 3); 1276 button_number += 64 - 3;
1266 } 1277 }
1267 1278
1268 if (priv_modes & PrivMode_MouseX10) 1279 if (priv_modes & PrivMode_MouseX10)
1269 { 1280 {
1270 /* 1281 /*
1302 fputc ('A', stderr); 1313 fputc ('A', stderr);
1303 if (key_state & 32) 1314 if (key_state & 32)
1304 fputc ('2', stderr); 1315 fputc ('2', stderr);
1305 fprintf (stderr, "]: <%d>, %d/%d\n", 1316 fprintf (stderr, "]: <%d>, %d/%d\n",
1306 button_number, 1317 button_number,
1307 x + 1, 1318 x,
1308 y + 1); 1319 y);
1309#endif 1320#endif
1310 1321
1322#if ENABLE_FRILLS
1323 if (priv_modes & PrivMode_ExtMouseRight)
1324 tt_printf ("\033[%d;%d;%dM",
1325 code + button_number + key_state,
1326 x,
1327 y);
1328 else if (priv_modes & PrivMode_ExtModeMouse)
1329 tt_printf ("\033[M%c%lc%lc",
1330 code + button_number + key_state,
1331 wint_t (32 + x),
1332 wint_t (32 + y));
1333 else
1334#endif
1311 tt_printf ("\033[M%c%c%c", 1335 tt_printf ("\033[M%c%c%c",
1312 (code + button_number + key_state), 1336 code + button_number + key_state,
1313 (32 + x + 1), 1337 32 + x,
1314 (32 + y + 1)); 1338 32 + y);
1315} 1339}
1316 1340
1317/*{{{ process an X event */ 1341/*{{{ process an X event */
1318void 1342void
1319rxvt_term::x_cb (XEvent &ev) 1343rxvt_term::x_cb (XEvent &ev)
1421 && ev.xfocus.mode != NotifyGrab) 1445 && ev.xfocus.mode != NotifyGrab)
1422 focus_out (); 1446 focus_out ();
1423 break; 1447 break;
1424 1448
1425 case ConfigureNotify: 1449 case ConfigureNotify:
1426 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1427 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1428 szHint.width, szHint.height);*/
1429 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent[0])
1430 { 1451 {
1431 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1432 ; 1453 ;
1454
1455#ifdef HAVE_BG_PIXMAP
1456 bool moved = false;
1457 if (bgPixmap.window_position_sensitive ())
1458 {
1459 int x, y;
1460 if (ev.xconfigure.send_event)
1461 {
1462 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y;
1464 }
1465 else
1466 get_window_origin (x, y);
1467
1468 if (bgPixmap.set_position (x, y)
1469 || (bgPixmap.flags & bgPixmap_t::isInvalid))
1470 moved = true;
1471 }
1472#endif
1433 1473
1434 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1435 { 1475 {
1436 seen_resize = 1; 1476 seen_resize = 1;
1437 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1438 } 1478 }
1439 else 1479 else
1440 { 1480 {
1441#ifdef HAVE_BG_PIXMAP 1481#ifdef HAVE_BG_PIXMAP
1442 if (bgPixmap.window_position_sensitive ()) 1482 if (moved)
1443 { 1483 {
1444 if (mapped) 1484 if (mapped)
1445 update_background (); 1485 update_background ();
1446 else 1486 else
1447 bgPixmap.invalidate (); 1487 bgPixmap.invalidate ();
1460 selection_property (ev.xproperty.window, ev.xproperty.atom); 1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1461 1501
1462 break; 1502 break;
1463 1503
1464 case SelectionClear: 1504 case SelectionClear:
1465 selection_clear (); 1505 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1466 break; 1506 break;
1467 1507
1468 case SelectionNotify: 1508 case SelectionNotify:
1469 if (selection_wait == Sel_normal) 1509 if (selection_wait == Sel_normal)
1470 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1510 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1474 selection_send (ev.xselectionrequest); 1514 selection_send (ev.xselectionrequest);
1475 break; 1515 break;
1476 1516
1477 case MapNotify: 1517 case MapNotify:
1478#ifdef HAVE_BG_PIXMAP 1518#ifdef HAVE_BG_PIXMAP
1479 /* This is needed spcifically to fix the case of no window manager or a 1519 /* This is needed specifically to fix the case of no window manager or a
1480 * non-reparenting window manager. In those cases we never get first 1520 * non-reparenting window manager. In those cases we never get first
1481 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1521 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1482 * care of multiplicity of ConfigureNotify events arriwing while WM does 1522 * care of multiplicity of ConfigureNotify events arriving while WM does
1483 * reparenting. 1523 * reparenting.
1484 * We should not render background immidiately, as there could be several 1524 * We should not render background immediately, as there could be several
1485 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1525 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1486 * by scheduling background redraw as soon as we can, but giving a short 1526 * by scheduling background redraw as soon as we can, but giving a short
1487 * bit of time for ConfigureNotifies to arrive. 1527 * bit of time for ConfigureNotifies to arrive.
1488 * We should render background PRIOR to drawing any text, but AFTER all 1528 * We should render background PRIOR to drawing any text, but AFTER all
1489 * of ConfigureNotifys for the best results. 1529 * of ConfigureNotifys for the best results.
1537 ; 1577 ;
1538 1578
1539 if (scrollBar.state && ev.xany.window == scrollBar.win) 1579 if (scrollBar.state && ev.xany.window == scrollBar.win)
1540 { 1580 {
1541 scrollBar.state = STATE_IDLE; 1581 scrollBar.state = STATE_IDLE;
1542 scrollbar_show (0); 1582 scrollBar.show (0);
1543 } 1583 }
1544 } 1584 }
1545 break; 1585 break;
1546 1586
1547 case MotionNotify: 1587 case MotionNotify:
1646 &unused_root, &unused_child, 1686 &unused_root, &unused_child,
1647 &unused_root_x, &unused_root_y, 1687 &unused_root_x, &unused_root_y,
1648 &ev.xbutton.x, &ev.xbutton.y, 1688 &ev.xbutton.x, &ev.xbutton.y,
1649 &unused_mask); 1689 &unused_mask);
1650 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1690 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1651 scrollbar_size ()); 1691 scrollBar.size ());
1652 want_refresh = 1; 1692 want_refresh = 1;
1653 scrollbar_show (1); 1693 scrollBar.show (1);
1654 } 1694 }
1655 break; 1695 break;
1656 } 1696 }
1657 1697
1658#if defined(CURSOR_BLINK) 1698#if defined(CURSOR_BLINK)
1683#endif 1723#endif
1684 1724
1685 refresh_check (); 1725 refresh_check ();
1686} 1726}
1687 1727
1728#if ENABLE_FRILLS
1729void
1730rxvt_term::set_urgency (bool enable)
1731{
1732 if (enable == urgency_hint)
1733 return;
1734
1735 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1736 {
1737 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1738 XSetWMHints (dpy, parent[0], h);
1739 urgency_hint = enable;
1740 }
1741}
1742#endif
1743
1688void 1744void
1689rxvt_term::focus_in () 1745rxvt_term::focus_in ()
1690{ 1746{
1691 if (!focus) 1747 if (!focus)
1692 { 1748 {
1693 focus = 1; 1749 focus = 1;
1694 want_refresh = 1; 1750 want_refresh = 1;
1695
1696 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1697 1751
1698#if USE_XIM 1752#if USE_XIM
1699 if (Input_Context != NULL) 1753 if (Input_Context != NULL)
1700 { 1754 {
1701 IMSetPosition (); 1755 IMSetPosition ();
1713 scr_recolour (); 1767 scr_recolour ();
1714 } 1768 }
1715#endif 1769#endif
1716#if ENABLE_FRILLS 1770#if ENABLE_FRILLS
1717 if (option (Opt_urgentOnBell)) 1771 if (option (Opt_urgentOnBell))
1718 { 1772 set_urgency (0);
1719 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1720 {
1721 h->flags &= ~XUrgencyHint;
1722 XSetWMHints (dpy, parent[0], h);
1723 }
1724 }
1725#endif 1773#endif
1774
1775 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1726 } 1776 }
1727} 1777}
1728 1778
1729void 1779void
1730rxvt_term::focus_out () 1780rxvt_term::focus_out ()
1732 if (focus) 1782 if (focus)
1733 { 1783 {
1734 focus = 0; 1784 focus = 0;
1735 want_refresh = 1; 1785 want_refresh = 1;
1736 1786
1737 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1787#if ENABLE_FRILLS
1738 1788 if (option (Opt_urgentOnBell))
1789 set_urgency (0);
1790#endif
1739#if ENABLE_FRILLS || ISO_14755 1791#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf) 1792 if (iso14755buf)
1741 { 1793 {
1742 iso14755buf = 0; 1794 iso14755buf = 0;
1743# if ISO_14755 1795# if ISO_14755
1760 { 1812 {
1761 pix_colors = pix_colors_unfocused; 1813 pix_colors = pix_colors_unfocused;
1762 scr_recolour (); 1814 scr_recolour ();
1763 } 1815 }
1764#endif 1816#endif
1817
1818 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1765 } 1819 }
1766} 1820}
1767 1821
1768void 1822void
1769rxvt_term::update_fade_color (unsigned int idx) 1823rxvt_term::update_fade_color (unsigned int idx)
1846 /* save the xbutton state (for ButtonRelease) */ 1900 /* save the xbutton state (for ButtonRelease) */
1847 MEvent.state = ev.state; 1901 MEvent.state = ev.state;
1848#ifdef MOUSE_REPORT_DOUBLECLICK 1902#ifdef MOUSE_REPORT_DOUBLECLICK
1849 if (ev.button == MEvent.button && clickintime) 1903 if (ev.button == MEvent.button && clickintime)
1850 { 1904 {
1851 /* same button, within alloted time */ 1905 /* same button, within allowed time */
1852 MEvent.clicks++; 1906 MEvent.clicks++;
1853 1907
1854 if (MEvent.clicks > 1) 1908 if (MEvent.clicks > 1)
1855 { 1909 {
1856 /* only report double clicks */ 1910 /* only report double clicks */
2011 } 2065 }
2012 2066
2013 if (scrollBar.style == R_SB_XTERM 2067 if (scrollBar.style == R_SB_XTERM
2014 || scrollbar_above_slider (ev.y) 2068 || scrollbar_above_slider (ev.y)
2015 || scrollbar_below_slider (ev.y)) 2069 || scrollbar_below_slider (ev.y))
2016 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2070 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2017 2071
2018 scrollBar.state = STATE_MOTION; 2072 scrollBar.state = STATE_MOTION;
2019 break; 2073 break;
2020 2074
2021 case Button1: 2075 case Button1:
2044 else 2098 else
2045 { 2099 {
2046 scr_page ((ev.button == Button1 ? DN : UP), 2100 scr_page ((ev.button == Button1 ? DN : UP),
2047 (nrow 2101 (nrow
2048 * scrollbar_position (ev.y) 2102 * scrollbar_position (ev.y)
2049 / scrollbar_size ())); 2103 / scrollBar.size ()));
2050 } 2104 }
2051 2105
2052 break; 2106 break;
2053 } 2107 }
2054 } 2108 }
2067 reportmode = !! (priv_modes & PrivMode_mouse_report); 2121 reportmode = !! (priv_modes & PrivMode_mouse_report);
2068 2122
2069 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2123 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2070 { 2124 {
2071 scrollBar.state = STATE_IDLE; 2125 scrollBar.state = STATE_IDLE;
2072 scrollbar_show (0); 2126 scrollBar.show (0);
2073 } 2127 }
2074 2128
2075#ifdef SELECTION_SCROLLING 2129#ifdef SELECTION_SCROLLING
2076 sel_scroll_ev.stop(); 2130 sel_scroll_ev.stop();
2077#endif 2131#endif
2127 selection_make (ev.time); 2181 selection_make (ev.time);
2128 break; 2182 break;
2129 2183
2130 case Button2: 2184 case Button2:
2131 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2185 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2132 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2186 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2133 break; 2187 break;
2134 2188
2135#ifdef MOUSE_WHEEL 2189#ifdef MOUSE_WHEEL
2136 case Button4: 2190 case Button4:
2137 case Button5: 2191 case Button5:
2160 } 2214 }
2161 else 2215 else
2162# endif 2216# endif
2163 { 2217 {
2164 scr_page (v, i); 2218 scr_page (v, i);
2165 scrollbar_show (1); 2219 scrollBar.show (1);
2166 } 2220 }
2167 } 2221 }
2168 break; 2222 break;
2169#endif 2223#endif
2170 } 2224 }
2171 } 2225 }
2172} 2226}
2173 2227
2174/*}}} */ 2228/*}}} */
2175 2229
2176bool 2230void
2177rxvt_term::cmd_parse () 2231rxvt_term::cmd_parse ()
2178{ 2232{
2179 bool flag = false;
2180 wchar_t ch = NOCHAR; 2233 wchar_t ch = NOCHAR;
2181 char *seq_begin; // remember start of esc-sequence here 2234 char *seq_begin; // remember start of esc-sequence here
2182 2235
2183 for (;;) 2236 for (;;)
2184 { 2237 {
2185 if (ch == NOCHAR) 2238 if (expect_false (ch == NOCHAR))
2186 { 2239 {
2187 seq_begin = cmdbuf_ptr; 2240 seq_begin = cmdbuf_ptr;
2188 ch = next_char (); 2241 ch = next_char ();
2189 2242
2190 if (ch == NOCHAR) 2243 if (ch == NOCHAR)
2191 break; 2244 break;
2192 } 2245 }
2193 2246
2194 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2247 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2195 { 2248 {
2196 if (!seen_input) 2249 if (expect_false (!seen_input))
2197 { 2250 {
2198 seen_input = 1; 2251 seen_input = 1;
2199 // many badly-written programs (e.g. jed) contain a race condition: 2252 // many badly-written programs (e.g. jed) contain a race condition:
2200 // they first read the screensize and then install a SIGWINCH handler. 2253 // they first read the screensize and then install a SIGWINCH handler.
2201 // some window managers resize the window early, and these programs 2254 // some window managers resize the window early, and these programs
2214 wchar_t *str = buf; 2267 wchar_t *str = buf;
2215 wchar_t *eol = str + min (ncol, UBUFSIZ); 2268 wchar_t *eol = str + min (ncol, UBUFSIZ);
2216 2269
2217 for (;;) 2270 for (;;)
2218 { 2271 {
2219 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2272 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2220 break; 2273 break;
2221 2274
2222 *str++ = ch; 2275 *str++ = ch;
2223 2276
2224 if (ch == C0_LF || str >= eol) 2277 if (expect_false (ch == C0_LF || str >= eol))
2225 { 2278 {
2226 if (ch == C0_LF) 2279 if (ch == C0_LF)
2227 nlines++; 2280 nlines++;
2228 2281
2229 refresh_count++; 2282 refresh_count++;
2278 * What the heck we'll cheat and only refresh less than every page-full. 2331 * What the heck we'll cheat and only refresh less than every page-full.
2279 * if skipScroll is enabled. 2332 * if skipScroll is enabled.
2280 */ 2333 */
2281 if (refreshnow) 2334 if (refreshnow)
2282 { 2335 {
2283 flag = true;
2284 scr_refresh (); 2336 scr_refresh ();
2285 want_refresh = 1; 2337 want_refresh = 1;
2286 } 2338 }
2287
2288 } 2339 }
2289 else 2340 else
2290 { 2341 {
2291 try 2342 try
2292 { 2343 {
2300 } 2351 }
2301 2352
2302 ch = NOCHAR; 2353 ch = NOCHAR;
2303 } 2354 }
2304 } 2355 }
2305
2306 return flag;
2307} 2356}
2308 2357
2309// read the next character 2358// read the next character
2310wchar_t 2359wchar_t
2311rxvt_term::next_char () NOTHROW 2360rxvt_term::next_char () NOTHROW
2312{ 2361{
2313 while (cmdbuf_ptr < cmdbuf_endp) 2362 while (cmdbuf_ptr < cmdbuf_endp)
2314 { 2363 {
2315 // assume 7-bit to be ascii ALWAYS 2364 // assume 7-bit to be ascii ALWAYS
2316 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2365 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2317 return *cmdbuf_ptr++; 2366 return *cmdbuf_ptr++;
2318 2367
2319 wchar_t wc; 2368 wchar_t wc;
2320 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2369 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2321 2370
2325 cmdbuf_ptr = cmdbuf_endp; 2374 cmdbuf_ptr = cmdbuf_endp;
2326 break; 2375 break;
2327 } 2376 }
2328 2377
2329 if (len == (size_t)-1) 2378 if (len == (size_t)-1)
2379 {
2380 mbstate.reset (); // reset now undefined conversion state
2330 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2381 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2382 }
2331 2383
2332 // assume wchar == unicode 2384 // assume wchar == unicode
2333 cmdbuf_ptr += len; 2385 cmdbuf_ptr += len;
2334 return wc & UNICODE_MASK; 2386 return wc & UNICODE_MASK;
2335 } 2387 }
2379/*----------------------------------------------------------------------*/ 2431/*----------------------------------------------------------------------*/
2380#ifdef PRINTPIPE 2432#ifdef PRINTPIPE
2381FILE * 2433FILE *
2382rxvt_term::popen_printer () 2434rxvt_term::popen_printer ()
2383{ 2435{
2384 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2436 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2385 2437
2386 if (stream == NULL) 2438 if (stream == NULL)
2387 rxvt_warn ("can't open printer pipe, not printing.\n"); 2439 rxvt_warn ("can't open printer pipe, not printing.\n");
2388 2440
2389 return stream; 2441 return stream;
2400 * simulate attached vt100 printer 2452 * simulate attached vt100 printer
2401 */ 2453 */
2402void 2454void
2403rxvt_term::process_print_pipe () 2455rxvt_term::process_print_pipe ()
2404{ 2456{
2405 int done; 2457 FILE *fd = popen_printer ();
2406 FILE *fd;
2407 2458
2408 if ((fd = popen_printer ()) == NULL) 2459 if (!fd)
2409 return; 2460 return;
2410 2461
2411 /* 2462 /*
2412 * Send all input to the printer until either ESC[4i or ESC[?4i 2463 * Send all input to the printer until either ESC[4i or ESC[?4i
2413 * is received. 2464 * is received.
2414 */ 2465 */
2415 for (done = 0; !done;) 2466 for (int done = 0; !done; )
2416 { 2467 {
2417 unsigned char buf[8]; 2468 unsigned char buf[8];
2418 unicode_t ch; 2469 unicode_t ch;
2419 unsigned int i, len; 2470 unsigned int i, len;
2420 2471
2565 break; 2616 break;
2566 case 'Z': /* identify the terminal type */ 2617 case 'Z': /* identify the terminal type */
2567 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2618 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2568 break; 2619 break;
2569 case '<': /* turn off VT52 mode */ 2620 case '<': /* turn off VT52 mode */
2570 PrivMode (0, PrivMode_vt52); 2621 set_privmode (PrivMode_vt52, 0);
2571 break; 2622 break;
2572 case 'F': /* use special graphics character set */ 2623 case 'F': /* use special graphics character set */
2573 case 'G': /* use regular character set */ 2624 case 'G': /* use regular character set */
2574 /* unimplemented */ 2625 /* unimplemented */
2575 break; 2626 break;
2629 scr_forwardindex (); 2680 scr_forwardindex ();
2630 break; 2681 break;
2631#endif 2682#endif
2632 case '=': 2683 case '=':
2633 case '>': 2684 case '>':
2634 PrivMode ((ch == '='), PrivMode_aplKP); 2685 set_privmode (PrivMode_aplKP, ch == '=');
2635 break; 2686 break;
2636 2687
2637 case C1_40: 2688 case C1_40:
2638 cmd_getc (); 2689 cmd_getc ();
2639 break; 2690 break;
2643 2694
2644 /* 8.3.87: NEXT LINE */ 2695 /* 8.3.87: NEXT LINE */
2645 case C1_NEL: /* ESC E */ 2696 case C1_NEL: /* ESC E */
2646 { 2697 {
2647 wchar_t nlcr[] = { C0_LF, C0_CR }; 2698 wchar_t nlcr[] = { C0_LF, C0_CR };
2648 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2699 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2649 } 2700 }
2650 break; 2701 break;
2651 2702
2652 /* kidnapped escape sequence: Should be 8.3.48 */ 2703 /* kidnapped escape sequence: Should be 8.3.48 */
2653 case C1_ESA: /* ESC G */ 2704 case C1_ESA: /* ESC G */
2678 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2729 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2679 case C1_SCI: /* ESC Z */ 2730 case C1_SCI: /* ESC Z */
2680 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2731 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2681 break; /* steal obsolete ESC [ c */ 2732 break; /* steal obsolete ESC [ c */
2682 2733
2683 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2734 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2684 case C1_CSI: /* ESC [ */ 2735 case C1_CSI: /* ESC [ */
2685 process_csi_seq (); 2736 process_csi_seq ();
2686 break; 2737 break;
2687 2738
2688 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2739 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2689 case C1_OSC: /* ESC ] */ 2740 case C1_OSC: /* ESC ] */
2690 process_osc_seq (); 2741 process_osc_seq ();
2691 break; 2742 break;
2692 2743
2693 /* 8.3.106: RESET TO INITIAL STATE */ 2744 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2694 case 'c': 2745 case 'c':
2695 mbstate.reset (); 2746 mbstate.reset ();
2696 scr_poweron (); 2747 scr_poweron ();
2697 scrollbar_show (1); 2748 scrollBar.show (1);
2698 break; 2749 break;
2699 2750
2700 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2751 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2701 case 'n': 2752 case 'n':
2702 scr_charset_choose (2); 2753 scr_charset_choose (2);
2722 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2773 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2723 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2774 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2724 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2775 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2725}; 2776};
2726 2777
2727#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2778#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2728 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2779 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2729 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2780 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2730#define get_byte_array_bit(array, bit) \ 2781#define get_byte_array_bit(array, bit) \
2731 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2782 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2732 2783
2733const unsigned char csi_defaults[] = 2784static const unsigned char csi_defaults[] =
2734 { 2785 {
2735 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2786 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2736 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2787 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2737 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2788 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2738 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2789 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2753 2804
2754 nargs = 0; 2805 nargs = 0;
2755 2806
2756 priv = 0; 2807 priv = 0;
2757 ch = cmd_getc (); 2808 ch = cmd_getc ();
2758 if (ch >= '<' && ch <= '?') 2809 if ((ch >= '<' && ch <= '?') || ch == '!')
2759 { 2810 {
2760 /* '<' '=' '>' '?' */ 2811 /* '<' '=' '>' '?' '!' */
2761 priv = ch; 2812 priv = ch;
2762 ch = cmd_getc (); 2813 ch = cmd_getc ();
2763 } 2814 }
2764 2815
2765 /* read any numerical arguments */ 2816 /* read any numerical arguments */
2819 2870
2820 case '?': 2871 case '?':
2821 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2872 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2822 process_terminal_mode (ch, priv, nargs, arg); 2873 process_terminal_mode (ch, priv, nargs, arg);
2823 break; 2874 break;
2875
2876 case '!':
2877 if (ch == CSI_70)
2878 {
2879 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2880 scr_soft_reset ();
2881
2882 static const int pm_h[] = { 7, 25 };
2883 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2884
2885 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2886 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2824 } 2887 }
2888 break;
2889 }
2890
2825 return; 2891 return;
2826 } 2892 }
2827 2893
2828 switch (ch) 2894 switch (ch)
2829 { 2895 {
3196 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3262 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3197 */ 3263 */
3198void 3264void
3199rxvt_term::process_dcs_seq () 3265rxvt_term::process_dcs_seq ()
3200{ 3266{
3201 char *s;
3202 unicode_t eh;
3203
3204 /* 3267 /*
3205 * Not handled yet 3268 * Not handled yet
3206 */ 3269 */
3270
3271 unicode_t eh;
3207 s = get_to_st (eh); 3272 char *s = get_to_st (eh);
3208 if (s) 3273 if (s)
3209 free (s); 3274 free (s);
3210 3275
3211 return; 3276 return;
3212} 3277}
3216 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3281 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3217 */ 3282 */
3218void 3283void
3219rxvt_term::process_osc_seq () 3284rxvt_term::process_osc_seq ()
3220{ 3285{
3221 unicode_t ch, eh;
3222 int arg; 3286 int arg;
3223 3287
3224 ch = cmd_getc (); 3288 unicode_t ch = cmd_getc ();
3225 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3289 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3226 arg = arg * 10 + (ch - '0'); 3290 arg = arg * 10 + (ch - '0');
3227 3291
3228 if (ch == ';') 3292 if (ch == ';')
3229 { 3293 {
3294 unicode_t eh;
3230 char *s = get_to_st (eh); 3295 char *s = get_to_st (eh);
3231 3296
3232 if (s) 3297 if (s)
3233 { 3298 {
3234 process_xterm_seq (arg, s, eh); 3299 process_xterm_seq (arg, s, eh);
3258 3323
3259/* 3324/*
3260 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3325 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3261 */ 3326 */
3262void 3327void
3263rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3328rxvt_term::process_xterm_seq (int op, char *str, char resp)
3264{ 3329{
3265 int color; 3330 int color;
3266 char *buf, *name; 3331 char *buf, *name;
3267 bool query = str[0] == '?' && !str[1]; 3332 bool query = str[0] == '?' && !str[1];
3268 int saveop = op; 3333 int saveop = op;
3309 3374
3310 XFree (value); 3375 XFree (value);
3311 } 3376 }
3312 else 3377 else
3313 { 3378 {
3314 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3379 char *eq = strchr (str, '=');
3315 3380
3316 if (eq) 3381 if (eq)
3317 { 3382 {
3318 *eq = 0; 3383 *eq = 0;
3319 set_utf8_property (display->atom (str), eq + 1); 3384 set_utf8_property (display->atom (str), eq + 1);
3359 process_color_seq (op, Color_pointer_fg, str, resp); 3424 process_color_seq (op, Color_pointer_fg, str, resp);
3360 break; 3425 break;
3361 case XTerm_Color_pointer_bg: 3426 case XTerm_Color_pointer_bg:
3362 process_color_seq (op, Color_pointer_bg, str, resp); 3427 process_color_seq (op, Color_pointer_bg, str, resp);
3363 break; 3428 break;
3429#ifdef OPTION_HC
3430 case XTerm_Color_HC:
3431 process_color_seq (op, Color_HC, str, resp);
3432 break;
3433 case XTerm_Color_HTC:
3434 process_color_seq (op, Color_HTC, str, resp);
3435 break;
3436#endif
3364#ifndef NO_BOLD_UNDERLINE_REVERSE 3437#ifndef NO_BOLD_UNDERLINE_REVERSE
3365 case XTerm_Color_RV:
3366 process_color_seq (op, Color_RV, str, resp);
3367 break;
3368 case Rxvt_Color_BD:
3369 case URxvt_Color_BD: 3438 case URxvt_Color_BD:
3370 process_color_seq (op, Color_BD, str, resp); 3439 process_color_seq (op, Color_BD, str, resp);
3371 break; 3440 break;
3372 case Rxvt_Color_UL:
3373 case URxvt_Color_UL: 3441 case URxvt_Color_UL:
3374 process_color_seq (op, Color_UL, str, resp); 3442 process_color_seq (op, Color_UL, str, resp);
3375 break; 3443 break;
3376 case URxvt_Color_IT: 3444 case URxvt_Color_IT:
3377 process_color_seq (op, Color_IT, str, resp); 3445 process_color_seq (op, Color_IT, str, resp);
3378 break; 3446 break;
3379#endif 3447#endif
3448 case URxvt_Color_border:
3449 process_color_seq (op, Color_border, str, resp);
3450 break;
3380#if ENABLE_TRANSPARENCY 3451#if ENABLE_TRANSPARENCY
3381 case URxvt_Color_tint: 3452 case URxvt_Color_tint:
3382 process_color_seq (op, Color_tint, str, resp); 3453 process_color_seq (op, Color_tint, str, resp);
3383 { 3454 {
3384 bool changed = false; 3455 bool changed = false;
3385 3456
3386 if (ISSET_PIXCOLOR (Color_tint)) 3457 if (ISSET_PIXCOLOR (Color_tint))
3387 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3458 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3388 else
3389 changed = bgPixmap.unset_tint ();
3390 3459
3391 if (changed) 3460 if (changed)
3392 update_background (); 3461 update_background ();
3393 } 3462 }
3394 3463
3399 case Rxvt_Pixmap: 3468 case Rxvt_Pixmap:
3400 if (!strcmp (str, "?")) 3469 if (!strcmp (str, "?"))
3401 { 3470 {
3402 char str[256]; 3471 char str[256];
3403 3472
3404 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3473 sprintf (str, "[%dx%d+%d+%d]",
3405 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3474 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3406 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3475 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3407 process_xterm_seq (XTerm_title, str, CHAR_ST); 3476 process_xterm_seq (XTerm_title, str, CHAR_ST);
3408 } 3477 }
3409 else 3478 else
3410 { 3479 {
3411 int changed = 0; 3480 int changed = 0;
3412 3481
3413 if (*str != ';') 3482 if (*str != ';')
3414 { 3483 {
3415 /* reset to default scaling :*/
3416 bgPixmap.unset_geometry ();
3417 if (bgPixmap.set_file (str)) /* change pixmap */ 3484 if (bgPixmap.set_file (str)) /* change pixmap */
3485 {
3418 changed++; 3486 changed++;
3419 str = strchr (str, ';'); 3487 str = strchr (str, ';');
3420 if (str == NULL) 3488 if (str == NULL)
3421 bgPixmap.set_defaultGeometry (); 3489 bgPixmap.set_defaultGeometry ();
3490 else
3491 bgPixmap.set_geometry (str+1);
3492 }
3422 } 3493 }
3423 3494 else
3424 while (str)
3425 { 3495 {
3426 str++; 3496 str++;
3427 if (bgPixmap.set_geometry (str)) 3497 if (bgPixmap.set_geometry (str, true))
3428 changed++; 3498 changed++;
3429 str = strchr (str, ';');
3430 } 3499 }
3431 3500
3432 if (changed) 3501 if (changed)
3502 {
3503 if (bgPixmap.window_position_sensitive ())
3504 {
3505 int x, y;
3506 get_window_origin (x, y);
3507 bgPixmap.set_position (x, y);
3508 }
3433 update_background (); 3509 update_background ();
3510 }
3434 } 3511 }
3435 break; 3512 break;
3436#endif 3513#endif
3437 3514
3438 case XTerm_logfile: 3515 case XTerm_logfile:
3508 break; 3585 break;
3509#endif 3586#endif
3510 3587
3511#if ENABLE_PERL 3588#if ENABLE_PERL
3512 case URxvt_perl: 3589 case URxvt_perl:
3513 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3590 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3514 ; // no responses yet
3515 break; 3591 break;
3516#endif 3592#endif
3517 } 3593 }
3518} 3594}
3519/*----------------------------------------------------------------------*/ 3595/*----------------------------------------------------------------------*/
3542 { 3618 {
3543 if (mode == 'r') 3619 if (mode == 'r')
3544 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3620 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3545 else 3621 else
3546 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3622 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3547 PrivMode (state, bit); 3623
3624 set_privmode (bit, state);
3548 } 3625 }
3549 3626
3550 return state; 3627 return state;
3551} 3628}
3552 3629
3560 static const struct 3637 static const struct
3561 { 3638 {
3562 const int argval; 3639 const int argval;
3563 const unsigned long bit; 3640 const unsigned long bit;
3564 } argtopriv[] = { 3641 } argtopriv[] = {
3565 { 1, PrivMode_aplCUR }, 3642 { 1, PrivMode_aplCUR }, // DECCKM
3566 { 2, PrivMode_vt52 }, 3643 { 2, PrivMode_vt52 },
3567 { 3, PrivMode_132 }, 3644 { 3, PrivMode_132 }, // DECCOLM
3568 { 4, PrivMode_smoothScroll }, 3645 { 4, PrivMode_smoothScroll }, // DECSCLM
3569 { 5, PrivMode_rVideo }, 3646 { 5, PrivMode_rVideo }, // DECSCNM
3570 { 6, PrivMode_relOrigin }, 3647 { 6, PrivMode_relOrigin }, // DECOM
3571 { 7, PrivMode_Autowrap }, 3648 { 7, PrivMode_Autowrap }, // DECAWM
3572 // 8, bi-directional support mode 3649 // 8, auto-repeat keys // DECARM
3573 { 9, PrivMode_MouseX10 }, 3650 { 9, PrivMode_MouseX10 },
3574 // 18, 19 printing-related 3651 // 18 end FF to printer after print screen
3652 // 19 Print screen prints full screen/scroll region
3575 { 25, PrivMode_VisibleCursor }, 3653 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3576#ifdef scrollBar_esc 3654#ifdef scrollBar_esc
3577 { scrollBar_esc, PrivMode_scrollBar }, 3655 { scrollBar_esc, PrivMode_scrollBar },
3578#endif 3656#endif
3579 { 35, PrivMode_ShiftKeys }, // rxvt extension 3657 { 35, PrivMode_ShiftKeys }, // rxvt extension
3658 // 38, tektronix mode // DECTEK
3580 { 40, PrivMode_132OK }, 3659 { 40, PrivMode_132OK },
3581 // 41 xterm more fixes NYI 3660 // 41 xterm more fixes NYI
3582 // 45 margin bell NYI 3661 // 45 margin bell NYI
3583 // 46 start logging 3662 // 46 start logging
3584 { 47, PrivMode_Screen }, 3663 { 47, PrivMode_Screen },
3585 { 66, PrivMode_aplKP }, 3664 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3586#ifndef NO_BACKSPACE_KEY 3665#ifndef NO_BACKSPACE_KEY
3587 { 67, PrivMode_BackSpace }, 3666 { 67, PrivMode_BackSpace }, // DECBKM
3588#endif 3667#endif
3589 { 1000, PrivMode_MouseX11 }, 3668 { 1000, PrivMode_MouseX11 },
3590 { 1002, PrivMode_MouseBtnEvent }, 3669 { 1002, PrivMode_MouseBtnEvent },
3591 { 1003, PrivMode_MouseAnyEvent }, 3670 { 1003, PrivMode_MouseAnyEvent },
3671#if ENABLE_FRILLS
3672 { 1005, PrivMode_ExtModeMouse },
3673#endif
3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3674 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3593 { 1011, PrivMode_Keypress }, // rxvt extension 3675 { 1011, PrivMode_Keypress }, // rxvt extension
3676#if ENABLE_FRILLS
3677 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3678#endif
3594 // 1035 enable modifiers for alt, numlock NYI 3679 // 1035 enable modifiers for alt, numlock NYI
3595 // 1036 send ESC for meta keys NYI 3680 // 1036 send ESC for meta keys NYI
3596 // 1037 send DEL for keypad delete NYI 3681 // 1037 send DEL for keypad delete NYI
3597 { 1047, PrivMode_Screen }, 3682 { 1047, PrivMode_Screen },
3598 // 1048 save and restore cursor 3683 // 1048 save and restore cursor, implemented in code
3599 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3684 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3600 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3685 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3601 { 2004, PrivMode_BracketPaste }, 3686 { 2004, PrivMode_BracketPaste },
3602 }; 3687 };
3603 3688
3613 for (i = 0; i < nargs; i++) 3698 for (i = 0; i < nargs; i++)
3614 { 3699 {
3615 state = -1; 3700 state = -1;
3616 3701
3617 /* basic handling */ 3702 /* basic handling */
3618 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3703 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3619 if (argtopriv[j].argval == arg[i]) 3704 if (argtopriv[j].argval == arg[i])
3620 { 3705 {
3621 state = privcases (mode, argtopriv[j].bit); 3706 state = privcases (mode, argtopriv[j].bit);
3622 break; 3707 break;
3623 } 3708 }
3631 3716
3632 scr_touch (true); 3717 scr_touch (true);
3633 break; 3718 break;
3634#endif 3719#endif
3635 case 1048: /* alternative cursor save */ 3720 case 1048: /* alternative cursor save */
3636 case 1049:
3637 if (option (Opt_secondaryScreen)) 3721 if (option (Opt_secondaryScreen))
3638 if (mode == 0) 3722 if (mode == 0)
3639 scr_cursor (RESTORE); 3723 scr_cursor (RESTORE);
3640 else if (mode == 1) 3724 else if (mode == 1)
3641 scr_cursor (SAVE); 3725 scr_cursor (SAVE);
3650 case 2: /* VT52 mode */ 3734 case 2: /* VT52 mode */
3651 /* oddball mode. should be set regardless of set/reset 3735 /* oddball mode. should be set regardless of set/reset
3652 * parameter. Return from VT52 mode with an ESC < from 3736 * parameter. Return from VT52 mode with an ESC < from
3653 * within VT52 mode 3737 * within VT52 mode
3654 */ 3738 */
3655 PrivMode (1, PrivMode_vt52); 3739 set_privmode (PrivMode_vt52, 1);
3656 break; 3740 break;
3657 case 3: /* 80/132 */ 3741 case 3: /* 80/132 */
3658 if (priv_modes & PrivMode_132OK) 3742 if (priv_modes & PrivMode_132OK)
3659 {
3660 scr_poweron ();
3661 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3743 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3662 }
3663 break; 3744 break;
3664 case 4: /* smooth scrolling */ 3745 case 4: /* smooth scrolling */
3665 set_option (Opt_jumpScroll, !state); 3746 set_option (Opt_jumpScroll, !state);
3666 break; 3747 break;
3667 case 5: /* reverse video */ 3748 case 5: /* reverse video */
3678 if (state) /* orthogonal */ 3759 if (state) /* orthogonal */
3679 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3760 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3680 break; 3761 break;
3681#ifdef scrollBar_esc 3762#ifdef scrollBar_esc
3682 case scrollBar_esc: 3763 case scrollBar_esc:
3683 if (scrollbar_mapping (state)) 3764 if (scrollBar.map (state))
3684 { 3765 {
3685 resize_all_windows (0, 0, 0); 3766 resize_all_windows (0, 0, 0);
3686 scr_touch (true); 3767 scr_touch (true);
3687 } 3768 }
3688 break; 3769 break;
3705 case 1003: 3786 case 1003:
3706 if (state) 3787 if (state)
3707 { 3788 {
3708 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3789 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3709 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3790 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3791 mouse_row = mouse_col = 0;
3710 vt_emask_mouse = PointerMotionMask; 3792 vt_emask_mouse = PointerMotionMask;
3711 } 3793 }
3712 else 3794 else
3713 vt_emask_mouse = NoEventMask; 3795 vt_emask_mouse = NoEventMask;
3796
3714 vt_select_input (); 3797 vt_select_input ();
3715 break; 3798 break;
3716 case 1010: /* scroll to bottom on TTY output inhibit */ 3799 case 1010: /* scroll to bottom on TTY output inhibit */
3717 set_option (Opt_scrollTtyOutput, !state); 3800 set_option (Opt_scrollTtyOutput, !state);
3718 break; 3801 break;
3719 case 1011: /* scroll to bottom on key press */ 3802 case 1011: /* scroll to bottom on key press */
3720 set_option (Opt_scrollTtyKeypress, state); 3803 set_option (Opt_scrollTtyKeypress, state);
3721 break; 3804 break;
3722 case 1047: /* secondary screen w/ clearing last */ 3805 case 1047: /* secondary screen w/ clearing last */
3723 if (option (Opt_secondaryScreen)) 3806 if (option (Opt_secondaryScreen))
3724 if (current_screen != PRIMARY) 3807 if (!state)
3725 scr_erase_screen (2); 3808 scr_erase_screen (2);
3809
3726 scr_change_screen (state); 3810 scr_change_screen (state);
3727 break; 3811 break;
3728 case 1049: /* secondary screen w/ clearing first */ 3812 case 1049: /* secondary screen w/ clearing first */
3813 if (option (Opt_secondaryScreen))
3814 if (state)
3815 scr_cursor (SAVE);
3816
3729 scr_change_screen (state); 3817 scr_change_screen (state);
3818
3730 if (option (Opt_secondaryScreen)) 3819 if (option (Opt_secondaryScreen))
3731 if (current_screen != PRIMARY) 3820 if (state)
3732 scr_erase_screen (2); 3821 scr_erase_screen (2);
3822 else
3823 scr_cursor (RESTORE);
3733 break; 3824 break;
3734 default: 3825 default:
3735 break; 3826 break;
3736 } 3827 }
3737 } 3828 }
3931 4022
3932/* ---------------------------------------------------------------------- */ 4023/* ---------------------------------------------------------------------- */
3933/* Write data to the pty as typed by the user, pasted with the mouse, 4024/* Write data to the pty as typed by the user, pasted with the mouse,
3934 * or generated by us in response to a query ESC sequence. 4025 * or generated by us in response to a query ESC sequence.
3935 */ 4026 */
3936const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4027static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3937 4028
3938void 4029void
3939rxvt_term::tt_write (const char *data, unsigned int len) 4030rxvt_term::tt_write (const char *data, unsigned int len)
3940{ 4031{
3941 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4032 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3953 4044
3954 data += written; 4045 data += written;
3955 len -= written; 4046 len -= written;
3956 } 4047 }
3957 4048
3958 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4049 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3959 4050
3960 memcpy (v_buffer + v_buflen, data, len); 4051 memcpy (v_buffer + v_buflen, data, len);
3961 v_buflen += len; 4052 v_buflen += len;
3962 4053
3963 pty_ev.set (ev::READ | ev::WRITE); 4054 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines