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.408 by ayin, Sat Feb 16 13:36:10 2008 UTC vs.
Revision 1.469 by sf-exg, Sat Jan 8 10:15:36 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
334# endif 340# endif
335#endif 341#endif
336 return keysym; 342 return keysym;
337} 343}
338 344
345static inline int
346map_function_key (KeySym keysym)
347{
348 int param = 0;
349
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
351 {
352 param = 11 + keysym - XK_F1;
353 if (keysym >= XK_F17)
354 param += 4;
355 else if (keysym >= XK_F15)
356 param += 3;
357 else if (keysym >= XK_F11)
358 param += 2;
359 else if (keysym >= XK_F6)
360 param += 1;
361 }
362 else
363 switch (keysym)
364 {
365 case XK_Find:
366 param = 1;
367 break;
368 case XK_Insert:
369 param = 2;
370 break;
371#ifdef DXK_Remove
372 case DXK_Remove:
373#endif
374 case XK_Execute:
375 param = 3;
376 break;
377 case XK_Select:
378 param = 4;
379 break;
380#ifndef UNSHIFTED_SCROLLKEYS
381 case XK_Prior:
382 param = 5;
383 break;
384 case XK_Next:
385 param = 6;
386 break;
387 case XK_Home:
388 param = 7;
389 break;
390 case XK_End:
391 param = 8;
392 break;
393#endif
394 case XK_Help:
395 param = 28;
396 break;
397 case XK_Menu:
398 param = 29;
399 break;
400 }
401 return param;
402}
403
339void 404void
340rxvt_term::key_press (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
341{ 406{
342 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
343 KeySym keysym; 408 KeySym keysym;
356 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
357 */ 422 */
358 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
359 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
360 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
361
362 if (numlock_state || (ev.state & ModNumLockMask))
363 {
364 numlock_state = (ev.state & ModNumLockMask);
365 PrivMode ((!numlock_state), PrivMode_aplKP);
366 }
367 426
368 kbuf[0] = 0; 427 kbuf[0] = 0;
369 428
370#ifdef USE_XIM 429#ifdef USE_XIM
371 if (Input_Context) 430 if (Input_Context)
446#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
447 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
448#else 507#else
449 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
450#endif 509#endif
510 max_it (lnsppg, 1);
511
451 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
452 { 513 {
453 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
454 return; 515 return;
455 } 516 }
520 } 581 }
521 } 582 }
522 583
523#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
524 // ISO 14755 support 585 // ISO 14755 support
525 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
526 { 587 {
527 int hv; 588 int hv;
528 589
529 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
530 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
560 scr_overlay_off (); 621 scr_overlay_off ();
561# endif 622# endif
562 iso14755buf = 0; 623 iso14755buf = 0;
563 } 624 }
564 } 625 }
626 else if (option (Opt_iso14755) &&
565 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
566 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
567 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
568 { 630 {
569 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
570# if ISO_14755 632# if ISO_14755
571 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
582 } 644 }
583#endif 645#endif
584 646
585 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
586 { 648 {
587 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
588 unsigned int newlen = 1; 650 unsigned int newlen = 1;
589 651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
590 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:
591 { 773 {
592#ifndef NO_BACKSPACE_KEY 774 int param = map_function_key (keysym);
593 case XK_BackSpace: 775 if (param > 0)
594 if (priv_modes & PrivMode_HaveBackSpace) 776 sprintf (kbuf,"\033[%d~", param);
595 {
596 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
597 ^ !!ctrl) ? '\b' : '\177';
598 kbuf[1] = '\0';
599 }
600 else 777 else
601 strcpy (kbuf, rs[Rs_backspace_key]);
602 break;
603#endif
604#ifndef NO_DELETE_KEY
605 case XK_Delete:
606 strcpy (kbuf, rs[Rs_delete_key]);
607 break;
608#endif
609 case XK_Tab:
610 if (shft)
611 strcpy (kbuf, "\033[Z");
612 else
613 {
614#ifdef CTRL_TAB_MAKES_META
615 if (ctrl)
616 meta = 1;
617#endif
618#ifdef MOD4_TAB_MAKES_META
619 if (ev.state & Mod4Mask)
620 meta = 1;
621#endif
622 newlen = 0;
623 }
624 break;
625
626 case XK_Up: /* "\033[A" */
627 case XK_Down: /* "\033[B" */
628 case XK_Right: /* "\033[C" */
629 case XK_Left: /* "\033[D" */
630 strcpy (kbuf, "\033[Z");
631 kbuf[2] = "DACB"[keysym - XK_Left];
632 /* do Shift first */
633 if (shft)
634 kbuf[2] = "dacb"[keysym - XK_Left];
635 else if (ctrl)
636 {
637 kbuf[1] = 'O';
638 kbuf[2] = "dacb"[keysym - XK_Left];
639 }
640 else if (priv_modes & PrivMode_aplCUR)
641 kbuf[1] = 'O';
642 break;
643
644#ifndef UNSHIFTED_SCROLLKEYS
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648 case XK_Next:
649 strcpy (kbuf, "\033[6~");
650 break;
651#endif
652 case XK_KP_Enter:
653 /* allow shift to override */
654 if (kp)
655 {
656 strcpy (kbuf, "\033OM");
657 break;
658 }
659
660 /* FALLTHROUGH */
661
662 case XK_Return:
663 if (priv_modes & PrivMode_LFNL)
664 {
665 kbuf[0] = '\015';
666 kbuf[1] = '\012';
667 kbuf[2] = '\0';
668 }
669 else
670 {
671 kbuf[0] = '\015';
672 kbuf[1] = '\0';
673 }
674 break;
675
676 case XK_KP_F1: /* "\033OP" */
677 case XK_KP_F2: /* "\033OQ" */
678 case XK_KP_F3: /* "\033OR" */
679 case XK_KP_F4: /* "\033OS" */
680 strcpy (kbuf, "\033OP");
681 kbuf[2] += (keysym - XK_KP_F1);
682 break;
683
684 case XK_KP_Multiply: /* "\033Oj" : "*" */
685 case XK_KP_Add: /* "\033Ok" : "+" */
686 case XK_KP_Separator: /* "\033Ol" : "," */
687 case XK_KP_Subtract: /* "\033Om" : "-" */
688 case XK_KP_Decimal: /* "\033On" : "." */
689 case XK_KP_Divide: /* "\033Oo" : "/" */
690 case XK_KP_0: /* "\033Op" : "0" */
691 case XK_KP_1: /* "\033Oq" : "1" */
692 case XK_KP_2: /* "\033Or" : "2" */
693 case XK_KP_3: /* "\033Os" : "3" */
694 case XK_KP_4: /* "\033Ot" : "4" */
695 case XK_KP_5: /* "\033Ou" : "5" */
696 case XK_KP_6: /* "\033Ov" : "6" */
697 case XK_KP_7: /* "\033Ow" : "7" */
698 case XK_KP_8: /* "\033Ox" : "8" */
699 case XK_KP_9: /* "\033Oy" : "9" */
700 /* allow shift to override */
701 if (kp)
702 {
703 strcpy (kbuf, "\033Oj");
704 kbuf[2] += (keysym - XK_KP_Multiply);
705 }
706 else
707 {
708 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
709 kbuf[1] = '\0';
710 }
711 break;
712
713 case XK_Find:
714 strcpy (kbuf, "\033[1~");
715 break;
716
717 case XK_Insert:
718 strcpy (kbuf, "\033[2~");
719 break;
720#ifdef DXK_Remove /* support for DEC remove like key */
721 case DXK_Remove:
722 /* FALLTHROUGH */
723#endif
724 case XK_Execute:
725 strcpy (kbuf, "\033[3~");
726 break;
727 case XK_Select:
728 strcpy (kbuf, "\033[4~");
729 break;
730 case XK_End:
731 strcpy (kbuf, KS_END);
732 break;
733 case XK_Home:
734 strcpy (kbuf, KS_HOME);
735 break;
736
737#define FKEY(n, fkey) \
738 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
739
740 case XK_F1: /* "\033[11~" */
741 case XK_F2: /* "\033[12~" */
742 case XK_F3: /* "\033[13~" */
743 case XK_F4: /* "\033[14~" */
744 case XK_F5: /* "\033[15~" */
745 FKEY (11, XK_F1);
746 break;
747 case XK_F6: /* "\033[17~" */
748 case XK_F7: /* "\033[18~" */
749 case XK_F8: /* "\033[19~" */
750 case XK_F9: /* "\033[20~" */
751 case XK_F10: /* "\033[21~" */
752 FKEY (17, XK_F6);
753 break;
754 case XK_F11: /* "\033[23~" */
755 case XK_F12: /* "\033[24~" */
756 case XK_F13: /* "\033[25~" */
757 case XK_F14: /* "\033[26~" */
758 FKEY (23, XK_F11);
759 break;
760 case XK_F15: /* "\033[28~" */
761 case XK_F16: /* "\033[29~" */
762 FKEY (28, XK_F15);
763 break;
764 case XK_Help: /* "\033[28~" */
765 FKEY (28, XK_Help);
766 break;
767 case XK_Menu: /* "\033[29~" */
768 FKEY (29, XK_Menu);
769 break;
770 case XK_F17: /* "\033[31~" */
771 case XK_F18: /* "\033[32~" */
772 case XK_F19: /* "\033[33~" */
773 case XK_F20: /* "\033[34~" */
774 case XK_F21: /* "\033[35~" */
775 case XK_F22: /* "\033[36~" */
776 case XK_F23: /* "\033[37~" */
777 case XK_F24: /* "\033[38~" */
778 case XK_F25: /* "\033[39~" */
779 case XK_F26: /* "\033[40~" */
780 case XK_F27: /* "\033[41~" */
781 case XK_F28: /* "\033[42~" */
782 case XK_F29: /* "\033[43~" */
783 case XK_F30: /* "\033[44~" */
784 case XK_F31: /* "\033[45~" */
785 case XK_F32: /* "\033[46~" */
786 case XK_F33: /* "\033[47~" */
787 case XK_F34: /* "\033[48~" */
788 case XK_F35: /* "\033[49~" */
789 FKEY (31, XK_F17);
790 break;
791#undef FKEY
792 default:
793 newlen = 0; 778 newlen = 0;
794 break;
795 } 779 }
780 break;
781 }
796 782
797 if (newlen) 783 if (newlen)
798 len = strlen (kbuf); 784 len = strlen (kbuf);
799 785
800 /* 786 /*
801 * Pass meta for all function keys, if 'meta' option set 787 * Pass meta for all function keys, if 'meta' option set
802 */ 788 */
803#ifdef META8_OPTION 789#ifdef META8_OPTION
903 commit_iso14755 (); 889 commit_iso14755 ();
904 890
905 return; 891 return;
906 } 892 }
907 893
908 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
909 if (i[0] == keysym) 895 if (i[0] == keysym)
910 { 896 {
911 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
912 commit_iso14755 (); 898 commit_iso14755 ();
913 899
989rxvt_term::flush () 975rxvt_term::flush ()
990{ 976{
991 flush_ev.stop (); 977 flush_ev.stop ();
992 978
993#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
994 if (bgPixmap.check_clearChanged ()) 980 if (bgPixmap.flags & bgPixmap_t::hasChanged)
995 { 981 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
996// scr_clear (true); This needs to be researched further! 983// scr_clear (true); This needs to be researched further!
997 scr_touch (false); 984 scr_touch (false);
998 } 985 }
999#endif 986#endif
1000 987
1037 } 1024 }
1038 while (row < end_row); 1025 while (row < end_row);
1039 } 1026 }
1040 1027
1041 scr_refresh (); 1028 scr_refresh ();
1042 scrollbar_show (1); 1029 scrollBar.show (1);
1043#ifdef USE_XIM 1030#ifdef USE_XIM
1044 IMSendSpot (); 1031 IMSendSpot ();
1045#endif 1032#endif
1046 } 1033 }
1047 1034
1048 display->flush (); 1035 display->flush ();
1049} 1036}
1050 1037
1051/* checks wether a refresh is requested and starts the refresh timer */ 1038/* checks whether a refresh is requested and starts the refresh timer */
1052void 1039void
1053rxvt_term::refresh_check () 1040rxvt_term::refresh_check ()
1054{ 1041{
1055 if (want_refresh && !flush_ev.is_active ()) 1042 if (want_refresh && !flush_ev.is_active ())
1056 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1043 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1149 { 1136 {
1150 // this should really be sched_yield(), but the linux guys thought 1137 // this should really be sched_yield(), but the linux guys thought
1151 // that giving a process calling sched_yield () less cpu time than 1138 // that giving a process calling sched_yield () less cpu time than
1152 // ones with high nice levels is a useful thing to do. It surely is is 1139 // ones with high nice levels is a useful thing to do. It surely is is
1153 // allowed by the sus... as is returning ENOSYS. 1140 // allowed by the sus... as is returning ENOSYS.
1141 // since the linux guys additionally thought that breaking the only
1142 // known workaround against their unusable sched_yield hack is cool,
1143 // we just nanosleep a bit and hope for the best.
1154 1144
1155 struct timespec ts = { 0, 0 }; 1145 struct timespec ts = { 0, 1000 };
1156 nanosleep (&ts, 0); 1146 nanosleep (&ts, 0);
1157 1147
1158 w.stop (); 1148 w.stop ();
1159 } 1149 }
1160 1150
1210{ 1200{
1211 make_current (); 1201 make_current ();
1212 1202
1213 if (revents & ev::READ) 1203 if (revents & ev::READ)
1214 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1215 while (pty_fill ()) 1205 for (int i = CBUFCNT; i-- && pty_fill (); )
1216 if (cmd_parse ()) 1206 cmd_parse ();
1217 break;
1218 1207
1219 if (revents & ev::WRITE) 1208 if (revents & ev::WRITE)
1220 pty_write (); 1209 pty_write ();
1221 1210
1222 refresh_check (); 1211 refresh_check ();
1263{ 1252{
1264 int button_number, key_state = 0; 1253 int button_number, key_state = 0;
1265 int x, y; 1254 int x, y;
1266 int code = 32; 1255 int code = 32;
1267 1256
1268 x = Pixel2Col (ev.x); 1257 x = Pixel2Col (ev.x) + 1;
1269 y = Pixel2Row (ev.y); 1258 y = Pixel2Row (ev.y) + 1;
1259
1270 if (ev.type == MotionNotify) 1260 if (ev.type == MotionNotify)
1271 { 1261 {
1272 if (x == mouse_row && y == mouse_col) 1262 if (x == mouse_row && y == mouse_col)
1273 return; 1263 return;
1264
1274 mouse_row = x; 1265 mouse_row = x;
1275 mouse_col = y; 1266 mouse_col = y;
1276 code += 32; 1267 code += 32;
1277 } 1268 }
1278 1269
1281 else 1272 else
1282 { 1273 {
1283 button_number = MEvent.button - Button1; 1274 button_number = MEvent.button - Button1;
1284 /* add 0x3D for wheel events, like xterm does */ 1275 /* add 0x3D for wheel events, like xterm does */
1285 if (button_number >= 3) 1276 if (button_number >= 3)
1286 button_number += (64 - 3); 1277 button_number += 64 - 3;
1287 } 1278 }
1288 1279
1289 if (priv_modes & PrivMode_MouseX10) 1280 if (priv_modes & PrivMode_MouseX10)
1290 { 1281 {
1291 /* 1282 /*
1323 fputc ('A', stderr); 1314 fputc ('A', stderr);
1324 if (key_state & 32) 1315 if (key_state & 32)
1325 fputc ('2', stderr); 1316 fputc ('2', stderr);
1326 fprintf (stderr, "]: <%d>, %d/%d\n", 1317 fprintf (stderr, "]: <%d>, %d/%d\n",
1327 button_number, 1318 button_number,
1328 x + 1, 1319 x,
1329 y + 1); 1320 y);
1330#endif 1321#endif
1331 1322
1323#if ENABLE_FRILLS
1324 if (priv_modes & PrivMode_ExtMouseRight)
1325 tt_printf ("\033[%d;%d;%dM",
1326 code + button_number + key_state,
1327 x,
1328 y);
1329 else if (priv_modes & PrivMode_ExtModeMouse)
1330 tt_printf ("\033[M%c%lc%lc",
1331 code + button_number + key_state,
1332 wint_t (32 + x),
1333 wint_t (32 + y));
1334 else
1335#endif
1332 tt_printf ("\033[M%c%c%c", 1336 tt_printf ("\033[M%c%c%c",
1333 (code + button_number + key_state), 1337 code + button_number + key_state,
1334 (32 + x + 1), 1338 32 + x,
1335 (32 + y + 1)); 1339 32 + y);
1336} 1340}
1337 1341
1338/*{{{ process an X event */ 1342/*{{{ process an X event */
1339void 1343void
1340rxvt_term::x_cb (XEvent &ev) 1344rxvt_term::x_cb (XEvent &ev)
1442 && ev.xfocus.mode != NotifyGrab) 1446 && ev.xfocus.mode != NotifyGrab)
1443 focus_out (); 1447 focus_out ();
1444 break; 1448 break;
1445 1449
1446 case ConfigureNotify: 1450 case ConfigureNotify:
1447 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1448 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1449 szHint.width, szHint.height);*/
1450 if (ev.xconfigure.window == parent[0]) 1451 if (ev.xconfigure.window == parent[0])
1451 { 1452 {
1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1453 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1453 ; 1454 ;
1455
1456#ifdef HAVE_BG_PIXMAP
1457 bool moved = false;
1458 if (bgPixmap.window_position_sensitive ())
1459 {
1460 int x, y;
1461 if (ev.xconfigure.send_event)
1462 {
1463 x = ev.xconfigure.x;
1464 y = ev.xconfigure.y;
1465 }
1466 else
1467 get_window_origin (x, y);
1468
1469 if (bgPixmap.set_position (x, y)
1470 || (bgPixmap.flags & bgPixmap_t::isInvalid))
1471 moved = true;
1472 }
1473#endif
1454 1474
1455 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1475 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1456 { 1476 {
1457 seen_resize = 1; 1477 seen_resize = 1;
1458 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1478 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1459 } 1479 }
1460 else 1480 else
1461 { 1481 {
1462#ifdef HAVE_BG_PIXMAP 1482#ifdef HAVE_BG_PIXMAP
1463 if (bgPixmap.window_position_sensitive ()) 1483 if (moved)
1464 { 1484 {
1465 if (mapped) 1485 if (mapped)
1466 update_background (); 1486 update_background ();
1467 else 1487 else
1468 bgPixmap.invalidate (); 1488 bgPixmap.invalidate ();
1481 selection_property (ev.xproperty.window, ev.xproperty.atom); 1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1482 1502
1483 break; 1503 break;
1484 1504
1485 case SelectionClear: 1505 case SelectionClear:
1486 selection_clear (); 1506 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1487 break; 1507 break;
1488 1508
1489 case SelectionNotify: 1509 case SelectionNotify:
1490 if (selection_wait == Sel_normal) 1510 if (selection_wait == Sel_normal)
1491 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1511 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1495 selection_send (ev.xselectionrequest); 1515 selection_send (ev.xselectionrequest);
1496 break; 1516 break;
1497 1517
1498 case MapNotify: 1518 case MapNotify:
1499#ifdef HAVE_BG_PIXMAP 1519#ifdef HAVE_BG_PIXMAP
1500 /* This is needed spcifically to fix the case of no window manager or a 1520 /* This is needed specifically to fix the case of no window manager or a
1501 * non-reparenting window manager. In those cases we never get first 1521 * non-reparenting window manager. In those cases we never get first
1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1522 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1503 * care of multiplicity of ConfigureNotify events arriwing while WM does 1523 * care of multiplicity of ConfigureNotify events arriving while WM does
1504 * reparenting. 1524 * reparenting.
1505 * We should not render background immidiately, as there could be several 1525 * We should not render background immediately, as there could be several
1506 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1526 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1507 * by scheduling background redraw as soon as we can, but giving a short 1527 * by scheduling background redraw as soon as we can, but giving a short
1508 * bit of time for ConfigureNotifies to arrive. 1528 * bit of time for ConfigureNotifies to arrive.
1509 * We should render background PRIOR to drawing any text, but AFTER all 1529 * We should render background PRIOR to drawing any text, but AFTER all
1510 * of ConfigureNotifys for the best results. 1530 * of ConfigureNotifys for the best results.
1558 ; 1578 ;
1559 1579
1560 if (scrollBar.state && ev.xany.window == scrollBar.win) 1580 if (scrollBar.state && ev.xany.window == scrollBar.win)
1561 { 1581 {
1562 scrollBar.state = STATE_IDLE; 1582 scrollBar.state = STATE_IDLE;
1563 scrollbar_show (0); 1583 scrollBar.show (0);
1564 } 1584 }
1565 } 1585 }
1566 break; 1586 break;
1567 1587
1568 case MotionNotify: 1588 case MotionNotify:
1667 &unused_root, &unused_child, 1687 &unused_root, &unused_child,
1668 &unused_root_x, &unused_root_y, 1688 &unused_root_x, &unused_root_y,
1669 &ev.xbutton.x, &ev.xbutton.y, 1689 &ev.xbutton.x, &ev.xbutton.y,
1670 &unused_mask); 1690 &unused_mask);
1671 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1691 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1672 scrollbar_size ()); 1692 scrollBar.size ());
1673 want_refresh = 1; 1693 want_refresh = 1;
1674 scrollbar_show (1); 1694 scrollBar.show (1);
1675 } 1695 }
1676 break; 1696 break;
1677 } 1697 }
1678 1698
1679#if defined(CURSOR_BLINK) 1699#if defined(CURSOR_BLINK)
1704#endif 1724#endif
1705 1725
1706 refresh_check (); 1726 refresh_check ();
1707} 1727}
1708 1728
1729#if ENABLE_FRILLS
1730void
1731rxvt_term::set_urgency (bool enable)
1732{
1733 if (enable == urgency_hint)
1734 return;
1735
1736 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1737 {
1738 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1739 XSetWMHints (dpy, parent[0], h);
1740 urgency_hint = enable;
1741 }
1742}
1743#endif
1744
1709void 1745void
1710rxvt_term::focus_in () 1746rxvt_term::focus_in ()
1711{ 1747{
1712 if (!focus) 1748 if (!focus)
1713 { 1749 {
1714 focus = 1; 1750 focus = 1;
1715 want_refresh = 1; 1751 want_refresh = 1;
1716
1717 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1718 1752
1719#if USE_XIM 1753#if USE_XIM
1720 if (Input_Context != NULL) 1754 if (Input_Context != NULL)
1721 { 1755 {
1722 IMSetPosition (); 1756 IMSetPosition ();
1734 scr_recolour (); 1768 scr_recolour ();
1735 } 1769 }
1736#endif 1770#endif
1737#if ENABLE_FRILLS 1771#if ENABLE_FRILLS
1738 if (option (Opt_urgentOnBell)) 1772 if (option (Opt_urgentOnBell))
1739 { 1773 set_urgency (0);
1740 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1741 {
1742 h->flags &= ~XUrgencyHint;
1743 XSetWMHints (dpy, parent[0], h);
1744 }
1745 }
1746#endif 1774#endif
1775
1776 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1747 } 1777 }
1748} 1778}
1749 1779
1750void 1780void
1751rxvt_term::focus_out () 1781rxvt_term::focus_out ()
1753 if (focus) 1783 if (focus)
1754 { 1784 {
1755 focus = 0; 1785 focus = 0;
1756 want_refresh = 1; 1786 want_refresh = 1;
1757 1787
1758 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1788#if ENABLE_FRILLS
1759 1789 if (option (Opt_urgentOnBell))
1790 set_urgency (0);
1791#endif
1760#if ENABLE_FRILLS || ISO_14755 1792#if ENABLE_FRILLS || ISO_14755
1761 if (iso14755buf) 1793 if (iso14755buf)
1762 { 1794 {
1763 iso14755buf = 0; 1795 iso14755buf = 0;
1764# if ISO_14755 1796# if ISO_14755
1781 { 1813 {
1782 pix_colors = pix_colors_unfocused; 1814 pix_colors = pix_colors_unfocused;
1783 scr_recolour (); 1815 scr_recolour ();
1784 } 1816 }
1785#endif 1817#endif
1818
1819 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1786 } 1820 }
1787} 1821}
1788 1822
1789void 1823void
1790rxvt_term::update_fade_color (unsigned int idx) 1824rxvt_term::update_fade_color (unsigned int idx)
1867 /* save the xbutton state (for ButtonRelease) */ 1901 /* save the xbutton state (for ButtonRelease) */
1868 MEvent.state = ev.state; 1902 MEvent.state = ev.state;
1869#ifdef MOUSE_REPORT_DOUBLECLICK 1903#ifdef MOUSE_REPORT_DOUBLECLICK
1870 if (ev.button == MEvent.button && clickintime) 1904 if (ev.button == MEvent.button && clickintime)
1871 { 1905 {
1872 /* same button, within alloted time */ 1906 /* same button, within allowed time */
1873 MEvent.clicks++; 1907 MEvent.clicks++;
1874 1908
1875 if (MEvent.clicks > 1) 1909 if (MEvent.clicks > 1)
1876 { 1910 {
1877 /* only report double clicks */ 1911 /* only report double clicks */
2032 } 2066 }
2033 2067
2034 if (scrollBar.style == R_SB_XTERM 2068 if (scrollBar.style == R_SB_XTERM
2035 || scrollbar_above_slider (ev.y) 2069 || scrollbar_above_slider (ev.y)
2036 || scrollbar_below_slider (ev.y)) 2070 || scrollbar_below_slider (ev.y))
2037 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2071 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2038 2072
2039 scrollBar.state = STATE_MOTION; 2073 scrollBar.state = STATE_MOTION;
2040 break; 2074 break;
2041 2075
2042 case Button1: 2076 case Button1:
2065 else 2099 else
2066 { 2100 {
2067 scr_page ((ev.button == Button1 ? DN : UP), 2101 scr_page ((ev.button == Button1 ? DN : UP),
2068 (nrow 2102 (nrow
2069 * scrollbar_position (ev.y) 2103 * scrollbar_position (ev.y)
2070 / scrollbar_size ())); 2104 / scrollBar.size ()));
2071 } 2105 }
2072 2106
2073 break; 2107 break;
2074 } 2108 }
2075 } 2109 }
2088 reportmode = !! (priv_modes & PrivMode_mouse_report); 2122 reportmode = !! (priv_modes & PrivMode_mouse_report);
2089 2123
2090 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2124 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2091 { 2125 {
2092 scrollBar.state = STATE_IDLE; 2126 scrollBar.state = STATE_IDLE;
2093 scrollbar_show (0); 2127 scrollBar.show (0);
2094 } 2128 }
2095 2129
2096#ifdef SELECTION_SCROLLING 2130#ifdef SELECTION_SCROLLING
2097 sel_scroll_ev.stop(); 2131 sel_scroll_ev.stop();
2098#endif 2132#endif
2148 selection_make (ev.time); 2182 selection_make (ev.time);
2149 break; 2183 break;
2150 2184
2151 case Button2: 2185 case Button2:
2152 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2186 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2153 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2154 break; 2188 break;
2155 2189
2156#ifdef MOUSE_WHEEL 2190#ifdef MOUSE_WHEEL
2157 case Button4: 2191 case Button4:
2158 case Button5: 2192 case Button5:
2181 } 2215 }
2182 else 2216 else
2183# endif 2217# endif
2184 { 2218 {
2185 scr_page (v, i); 2219 scr_page (v, i);
2186 scrollbar_show (1); 2220 scrollBar.show (1);
2187 } 2221 }
2188 } 2222 }
2189 break; 2223 break;
2190#endif 2224#endif
2191 } 2225 }
2192 } 2226 }
2193} 2227}
2194 2228
2195/*}}} */ 2229/*}}} */
2196 2230
2197bool 2231void
2198rxvt_term::cmd_parse () 2232rxvt_term::cmd_parse ()
2199{ 2233{
2200 bool flag = false;
2201 wchar_t ch = NOCHAR; 2234 wchar_t ch = NOCHAR;
2202 char *seq_begin; // remember start of esc-sequence here 2235 char *seq_begin; // remember start of esc-sequence here
2203 2236
2204 for (;;) 2237 for (;;)
2205 { 2238 {
2206 if (ch == NOCHAR) 2239 if (expect_false (ch == NOCHAR))
2207 { 2240 {
2208 seq_begin = cmdbuf_ptr; 2241 seq_begin = cmdbuf_ptr;
2209 ch = next_char (); 2242 ch = next_char ();
2210 2243
2211 if (ch == NOCHAR) 2244 if (ch == NOCHAR)
2212 break; 2245 break;
2213 } 2246 }
2214 2247
2215 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2248 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2216 { 2249 {
2217 if (!seen_input) 2250 if (expect_false (!seen_input))
2218 { 2251 {
2219 seen_input = 1; 2252 seen_input = 1;
2220 // many badly-written programs (e.g. jed) contain a race condition: 2253 // many badly-written programs (e.g. jed) contain a race condition:
2221 // they first read the screensize and then install a SIGWINCH handler. 2254 // they first read the screensize and then install a SIGWINCH handler.
2222 // some window managers resize the window early, and these programs 2255 // some window managers resize the window early, and these programs
2235 wchar_t *str = buf; 2268 wchar_t *str = buf;
2236 wchar_t *eol = str + min (ncol, UBUFSIZ); 2269 wchar_t *eol = str + min (ncol, UBUFSIZ);
2237 2270
2238 for (;;) 2271 for (;;)
2239 { 2272 {
2240 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2273 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2241 break; 2274 break;
2242 2275
2243 *str++ = ch; 2276 *str++ = ch;
2244 2277
2245 if (ch == C0_LF || str >= eol) 2278 if (expect_false (ch == C0_LF || str >= eol))
2246 { 2279 {
2247 if (ch == C0_LF) 2280 if (ch == C0_LF)
2248 nlines++; 2281 nlines++;
2249 2282
2250 refresh_count++; 2283 refresh_count++;
2299 * What the heck we'll cheat and only refresh less than every page-full. 2332 * What the heck we'll cheat and only refresh less than every page-full.
2300 * if skipScroll is enabled. 2333 * if skipScroll is enabled.
2301 */ 2334 */
2302 if (refreshnow) 2335 if (refreshnow)
2303 { 2336 {
2304 flag = true;
2305 scr_refresh (); 2337 scr_refresh ();
2306 want_refresh = 1; 2338 want_refresh = 1;
2307 } 2339 }
2308
2309 } 2340 }
2310 else 2341 else
2311 { 2342 {
2312 try 2343 try
2313 { 2344 {
2321 } 2352 }
2322 2353
2323 ch = NOCHAR; 2354 ch = NOCHAR;
2324 } 2355 }
2325 } 2356 }
2326
2327 return flag;
2328} 2357}
2329 2358
2330// read the next character 2359// read the next character
2331wchar_t 2360wchar_t
2332rxvt_term::next_char () NOTHROW 2361rxvt_term::next_char () NOTHROW
2333{ 2362{
2334 while (cmdbuf_ptr < cmdbuf_endp) 2363 while (cmdbuf_ptr < cmdbuf_endp)
2335 { 2364 {
2336 // assume 7-bit to be ascii ALWAYS 2365 // assume 7-bit to be ascii ALWAYS
2337 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2366 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2338 return *cmdbuf_ptr++; 2367 return *cmdbuf_ptr++;
2339 2368
2340 wchar_t wc; 2369 wchar_t wc;
2341 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2370 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2342 2371
2346 cmdbuf_ptr = cmdbuf_endp; 2375 cmdbuf_ptr = cmdbuf_endp;
2347 break; 2376 break;
2348 } 2377 }
2349 2378
2350 if (len == (size_t)-1) 2379 if (len == (size_t)-1)
2380 {
2381 mbstate.reset (); // reset now undefined conversion state
2351 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2382 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2383 }
2352 2384
2353 // assume wchar == unicode 2385 // assume wchar == unicode
2354 cmdbuf_ptr += len; 2386 cmdbuf_ptr += len;
2355 return wc & UNICODE_MASK; 2387 return wc & UNICODE_MASK;
2356 } 2388 }
2400/*----------------------------------------------------------------------*/ 2432/*----------------------------------------------------------------------*/
2401#ifdef PRINTPIPE 2433#ifdef PRINTPIPE
2402FILE * 2434FILE *
2403rxvt_term::popen_printer () 2435rxvt_term::popen_printer ()
2404{ 2436{
2405 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2437 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2406 2438
2407 if (stream == NULL) 2439 if (stream == NULL)
2408 rxvt_warn ("can't open printer pipe, not printing.\n"); 2440 rxvt_warn ("can't open printer pipe, not printing.\n");
2409 2441
2410 return stream; 2442 return stream;
2421 * simulate attached vt100 printer 2453 * simulate attached vt100 printer
2422 */ 2454 */
2423void 2455void
2424rxvt_term::process_print_pipe () 2456rxvt_term::process_print_pipe ()
2425{ 2457{
2426 int done; 2458 FILE *fd = popen_printer ();
2427 FILE *fd;
2428 2459
2429 if ((fd = popen_printer ()) == NULL) 2460 if (!fd)
2430 return; 2461 return;
2431 2462
2432 /* 2463 /*
2433 * Send all input to the printer until either ESC[4i or ESC[?4i 2464 * Send all input to the printer until either ESC[4i or ESC[?4i
2434 * is received. 2465 * is received.
2435 */ 2466 */
2436 for (done = 0; !done;) 2467 for (int done = 0; !done; )
2437 { 2468 {
2438 unsigned char buf[8]; 2469 unsigned char buf[8];
2439 unicode_t ch; 2470 unicode_t ch;
2440 unsigned int i, len; 2471 unsigned int i, len;
2441 2472
2586 break; 2617 break;
2587 case 'Z': /* identify the terminal type */ 2618 case 'Z': /* identify the terminal type */
2588 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2619 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2589 break; 2620 break;
2590 case '<': /* turn off VT52 mode */ 2621 case '<': /* turn off VT52 mode */
2591 PrivMode (0, PrivMode_vt52); 2622 set_privmode (PrivMode_vt52, 0);
2592 break; 2623 break;
2593 case 'F': /* use special graphics character set */ 2624 case 'F': /* use special graphics character set */
2594 case 'G': /* use regular character set */ 2625 case 'G': /* use regular character set */
2595 /* unimplemented */ 2626 /* unimplemented */
2596 break; 2627 break;
2650 scr_forwardindex (); 2681 scr_forwardindex ();
2651 break; 2682 break;
2652#endif 2683#endif
2653 case '=': 2684 case '=':
2654 case '>': 2685 case '>':
2655 PrivMode ((ch == '='), PrivMode_aplKP); 2686 set_privmode (PrivMode_aplKP, ch == '=');
2656 break; 2687 break;
2657 2688
2658 case C1_40: 2689 case C1_40:
2659 cmd_getc (); 2690 cmd_getc ();
2660 break; 2691 break;
2664 2695
2665 /* 8.3.87: NEXT LINE */ 2696 /* 8.3.87: NEXT LINE */
2666 case C1_NEL: /* ESC E */ 2697 case C1_NEL: /* ESC E */
2667 { 2698 {
2668 wchar_t nlcr[] = { C0_LF, C0_CR }; 2699 wchar_t nlcr[] = { C0_LF, C0_CR };
2669 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2700 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2670 } 2701 }
2671 break; 2702 break;
2672 2703
2673 /* kidnapped escape sequence: Should be 8.3.48 */ 2704 /* kidnapped escape sequence: Should be 8.3.48 */
2674 case C1_ESA: /* ESC G */ 2705 case C1_ESA: /* ESC G */
2699 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2730 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2700 case C1_SCI: /* ESC Z */ 2731 case C1_SCI: /* ESC Z */
2701 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2732 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2702 break; /* steal obsolete ESC [ c */ 2733 break; /* steal obsolete ESC [ c */
2703 2734
2704 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2735 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2705 case C1_CSI: /* ESC [ */ 2736 case C1_CSI: /* ESC [ */
2706 process_csi_seq (); 2737 process_csi_seq ();
2707 break; 2738 break;
2708 2739
2709 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2740 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2710 case C1_OSC: /* ESC ] */ 2741 case C1_OSC: /* ESC ] */
2711 process_osc_seq (); 2742 process_osc_seq ();
2712 break; 2743 break;
2713 2744
2714 /* 8.3.106: RESET TO INITIAL STATE */ 2745 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2715 case 'c': 2746 case 'c':
2716 mbstate.reset (); 2747 mbstate.reset ();
2717 scr_poweron (); 2748 scr_poweron ();
2718 scrollbar_show (1); 2749 scrollBar.show (1);
2719 break; 2750 break;
2720 2751
2721 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2752 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2722 case 'n': 2753 case 'n':
2723 scr_charset_choose (2); 2754 scr_charset_choose (2);
2743 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2774 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2744 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2775 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2745 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2776 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2746}; 2777};
2747 2778
2748#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2779#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2749 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2780 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2750 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2781 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2751#define get_byte_array_bit(array, bit) \ 2782#define get_byte_array_bit(array, bit) \
2752 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2783 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2753 2784
2754const unsigned char csi_defaults[] = 2785static const unsigned char csi_defaults[] =
2755 { 2786 {
2756 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2787 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2757 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2788 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2758 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2789 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2759 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2790 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2774 2805
2775 nargs = 0; 2806 nargs = 0;
2776 2807
2777 priv = 0; 2808 priv = 0;
2778 ch = cmd_getc (); 2809 ch = cmd_getc ();
2779 if (ch >= '<' && ch <= '?') 2810 if ((ch >= '<' && ch <= '?') || ch == '!')
2780 { 2811 {
2781 /* '<' '=' '>' '?' */ 2812 /* '<' '=' '>' '?' '!' */
2782 priv = ch; 2813 priv = ch;
2783 ch = cmd_getc (); 2814 ch = cmd_getc ();
2784 } 2815 }
2785 2816
2786 /* read any numerical arguments */ 2817 /* read any numerical arguments */
2840 2871
2841 case '?': 2872 case '?':
2842 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2873 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2843 process_terminal_mode (ch, priv, nargs, arg); 2874 process_terminal_mode (ch, priv, nargs, arg);
2844 break; 2875 break;
2876
2877 case '!':
2878 if (ch == CSI_70)
2879 {
2880 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2881 scr_soft_reset ();
2882
2883 static const int pm_h[] = { 7, 25 };
2884 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2885
2886 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2887 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2845 } 2888 }
2889 break;
2890 }
2891
2846 return; 2892 return;
2847 } 2893 }
2848 2894
2849 switch (ch) 2895 switch (ch)
2850 { 2896 {
3217 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3263 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3218 */ 3264 */
3219void 3265void
3220rxvt_term::process_dcs_seq () 3266rxvt_term::process_dcs_seq ()
3221{ 3267{
3222 char *s;
3223 unicode_t eh;
3224
3225 /* 3268 /*
3226 * Not handled yet 3269 * Not handled yet
3227 */ 3270 */
3271
3272 unicode_t eh;
3228 s = get_to_st (eh); 3273 char *s = get_to_st (eh);
3229 if (s) 3274 if (s)
3230 free (s); 3275 free (s);
3231 3276
3232 return; 3277 return;
3233} 3278}
3237 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3282 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3238 */ 3283 */
3239void 3284void
3240rxvt_term::process_osc_seq () 3285rxvt_term::process_osc_seq ()
3241{ 3286{
3242 unicode_t ch, eh;
3243 int arg; 3287 int arg;
3244 3288
3245 ch = cmd_getc (); 3289 unicode_t ch = cmd_getc ();
3246 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3290 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3247 arg = arg * 10 + (ch - '0'); 3291 arg = arg * 10 + (ch - '0');
3248 3292
3249 if (ch == ';') 3293 if (ch == ';')
3250 { 3294 {
3295 unicode_t eh;
3251 char *s = get_to_st (eh); 3296 char *s = get_to_st (eh);
3252 3297
3253 if (s) 3298 if (s)
3254 { 3299 {
3255 process_xterm_seq (arg, s, eh); 3300 process_xterm_seq (arg, s, eh);
3279 3324
3280/* 3325/*
3281 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3326 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3282 */ 3327 */
3283void 3328void
3284rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3329rxvt_term::process_xterm_seq (int op, char *str, char resp)
3285{ 3330{
3286 int color; 3331 int color;
3287 char *buf, *name; 3332 char *buf, *name;
3288 bool query = str[0] == '?' && !str[1]; 3333 bool query = str[0] == '?' && !str[1];
3289 int saveop = op; 3334 int saveop = op;
3330 3375
3331 XFree (value); 3376 XFree (value);
3332 } 3377 }
3333 else 3378 else
3334 { 3379 {
3335 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3380 char *eq = strchr (str, '=');
3336 3381
3337 if (eq) 3382 if (eq)
3338 { 3383 {
3339 *eq = 0; 3384 *eq = 0;
3340 set_utf8_property (display->atom (str), eq + 1); 3385 set_utf8_property (display->atom (str), eq + 1);
3380 process_color_seq (op, Color_pointer_fg, str, resp); 3425 process_color_seq (op, Color_pointer_fg, str, resp);
3381 break; 3426 break;
3382 case XTerm_Color_pointer_bg: 3427 case XTerm_Color_pointer_bg:
3383 process_color_seq (op, Color_pointer_bg, str, resp); 3428 process_color_seq (op, Color_pointer_bg, str, resp);
3384 break; 3429 break;
3430#ifdef OPTION_HC
3431 case XTerm_Color_HC:
3432 process_color_seq (op, Color_HC, str, resp);
3433 break;
3434 case XTerm_Color_HTC:
3435 process_color_seq (op, Color_HTC, str, resp);
3436 break;
3437#endif
3385#ifndef NO_BOLD_UNDERLINE_REVERSE 3438#ifndef NO_BOLD_UNDERLINE_REVERSE
3386 case XTerm_Color_RV:
3387 process_color_seq (op, Color_RV, str, resp);
3388 break;
3389 case Rxvt_Color_BD:
3390 case URxvt_Color_BD: 3439 case URxvt_Color_BD:
3391 process_color_seq (op, Color_BD, str, resp); 3440 process_color_seq (op, Color_BD, str, resp);
3392 break; 3441 break;
3393 case Rxvt_Color_UL:
3394 case URxvt_Color_UL: 3442 case URxvt_Color_UL:
3395 process_color_seq (op, Color_UL, str, resp); 3443 process_color_seq (op, Color_UL, str, resp);
3396 break; 3444 break;
3397 case URxvt_Color_IT: 3445 case URxvt_Color_IT:
3398 process_color_seq (op, Color_IT, str, resp); 3446 process_color_seq (op, Color_IT, str, resp);
3399 break; 3447 break;
3400#endif 3448#endif
3449 case URxvt_Color_border:
3450 process_color_seq (op, Color_border, str, resp);
3451 break;
3401#if ENABLE_TRANSPARENCY 3452#if ENABLE_TRANSPARENCY
3402 case URxvt_Color_tint: 3453 case URxvt_Color_tint:
3403 process_color_seq (op, Color_tint, str, resp); 3454 process_color_seq (op, Color_tint, str, resp);
3404 { 3455 {
3405 bool changed = false; 3456 bool changed = false;
3420 case Rxvt_Pixmap: 3471 case Rxvt_Pixmap:
3421 if (!strcmp (str, "?")) 3472 if (!strcmp (str, "?"))
3422 { 3473 {
3423 char str[256]; 3474 char str[256];
3424 3475
3425 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3476 sprintf (str, "[%dx%d+%d+%d]",
3426 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3477 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3427 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3478 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3428 process_xterm_seq (XTerm_title, str, CHAR_ST); 3479 process_xterm_seq (XTerm_title, str, CHAR_ST);
3429 } 3480 }
3430 else 3481 else
3431 { 3482 {
3432 int changed = 0; 3483 int changed = 0;
3433 3484
3434 if (*str != ';') 3485 if (*str != ';')
3435 { 3486 {
3436 /* reset to default scaling :*/
3437 bgPixmap.unset_geometry ();
3438 if (bgPixmap.set_file (str)) /* change pixmap */ 3487 if (bgPixmap.set_file (str)) /* change pixmap */
3488 {
3439 changed++; 3489 changed++;
3440 str = strchr (str, ';'); 3490 str = strchr (str, ';');
3441 if (str == NULL) 3491 if (str == NULL)
3442 bgPixmap.set_defaultGeometry (); 3492 bgPixmap.set_defaultGeometry ();
3493 else
3494 bgPixmap.set_geometry (str+1);
3495 }
3443 } 3496 }
3444 3497 else
3445 while (str)
3446 { 3498 {
3447 str++; 3499 str++;
3448 if (bgPixmap.set_geometry (str)) 3500 if (bgPixmap.set_geometry (str, true))
3449 changed++; 3501 changed++;
3450 str = strchr (str, ';');
3451 } 3502 }
3452 3503
3453 if (changed) 3504 if (changed)
3505 {
3506 if (bgPixmap.window_position_sensitive ())
3507 {
3508 int x, y;
3509 get_window_origin (x, y);
3510 bgPixmap.set_position (x, y);
3511 }
3454 update_background (); 3512 update_background ();
3513 }
3455 } 3514 }
3456 break; 3515 break;
3457#endif 3516#endif
3458 3517
3459 case XTerm_logfile: 3518 case XTerm_logfile:
3529 break; 3588 break;
3530#endif 3589#endif
3531 3590
3532#if ENABLE_PERL 3591#if ENABLE_PERL
3533 case URxvt_perl: 3592 case URxvt_perl:
3534 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3593 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3535 ; // no responses yet
3536 break; 3594 break;
3537#endif 3595#endif
3538 } 3596 }
3539} 3597}
3540/*----------------------------------------------------------------------*/ 3598/*----------------------------------------------------------------------*/
3563 { 3621 {
3564 if (mode == 'r') 3622 if (mode == 'r')
3565 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3623 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3566 else 3624 else
3567 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3625 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3568 PrivMode (state, bit); 3626
3627 set_privmode (bit, state);
3569 } 3628 }
3570 3629
3571 return state; 3630 return state;
3572} 3631}
3573 3632
3581 static const struct 3640 static const struct
3582 { 3641 {
3583 const int argval; 3642 const int argval;
3584 const unsigned long bit; 3643 const unsigned long bit;
3585 } argtopriv[] = { 3644 } argtopriv[] = {
3586 { 1, PrivMode_aplCUR }, 3645 { 1, PrivMode_aplCUR }, // DECCKM
3587 { 2, PrivMode_vt52 }, 3646 { 2, PrivMode_vt52 },
3588 { 3, PrivMode_132 }, 3647 { 3, PrivMode_132 }, // DECCOLM
3589 { 4, PrivMode_smoothScroll }, 3648 { 4, PrivMode_smoothScroll }, // DECSCLM
3590 { 5, PrivMode_rVideo }, 3649 { 5, PrivMode_rVideo }, // DECSCNM
3591 { 6, PrivMode_relOrigin }, 3650 { 6, PrivMode_relOrigin }, // DECOM
3592 { 7, PrivMode_Autowrap }, 3651 { 7, PrivMode_Autowrap }, // DECAWM
3593 // 8, bi-directional support mode 3652 // 8, auto-repeat keys // DECARM
3594 { 9, PrivMode_MouseX10 }, 3653 { 9, PrivMode_MouseX10 },
3595 // 18, 19 printing-related 3654 // 18 end FF to printer after print screen
3655 // 19 Print screen prints full screen/scroll region
3596 { 25, PrivMode_VisibleCursor }, 3656 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3597#ifdef scrollBar_esc 3657#ifdef scrollBar_esc
3598 { scrollBar_esc, PrivMode_scrollBar }, 3658 { scrollBar_esc, PrivMode_scrollBar },
3599#endif 3659#endif
3600 { 35, PrivMode_ShiftKeys }, // rxvt extension 3660 { 35, PrivMode_ShiftKeys }, // rxvt extension
3661 // 38, tektronix mode // DECTEK
3601 { 40, PrivMode_132OK }, 3662 { 40, PrivMode_132OK },
3602 // 41 xterm more fixes NYI 3663 // 41 xterm more fixes NYI
3603 // 45 margin bell NYI 3664 // 45 margin bell NYI
3604 // 46 start logging 3665 // 46 start logging
3605 { 47, PrivMode_Screen }, 3666 { 47, PrivMode_Screen },
3606 { 66, PrivMode_aplKP }, 3667 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3607#ifndef NO_BACKSPACE_KEY 3668#ifndef NO_BACKSPACE_KEY
3608 { 67, PrivMode_BackSpace }, 3669 { 67, PrivMode_BackSpace }, // DECBKM
3609#endif 3670#endif
3610 { 1000, PrivMode_MouseX11 }, 3671 { 1000, PrivMode_MouseX11 },
3611 { 1002, PrivMode_MouseBtnEvent }, 3672 { 1002, PrivMode_MouseBtnEvent },
3612 { 1003, PrivMode_MouseAnyEvent }, 3673 { 1003, PrivMode_MouseAnyEvent },
3674#if ENABLE_FRILLS
3675 { 1005, PrivMode_ExtModeMouse },
3676#endif
3613 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3677 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3614 { 1011, PrivMode_Keypress }, // rxvt extension 3678 { 1011, PrivMode_Keypress }, // rxvt extension
3679#if ENABLE_FRILLS
3680 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3681#endif
3615 // 1035 enable modifiers for alt, numlock NYI 3682 // 1035 enable modifiers for alt, numlock NYI
3616 // 1036 send ESC for meta keys NYI 3683 // 1036 send ESC for meta keys NYI
3617 // 1037 send DEL for keypad delete NYI 3684 // 1037 send DEL for keypad delete NYI
3618 { 1047, PrivMode_Screen }, 3685 { 1047, PrivMode_Screen },
3619 // 1048 save and restore cursor 3686 // 1048 save and restore cursor, implemented in code
3620 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3687 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3621 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3688 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3622 { 2004, PrivMode_BracketPaste }, 3689 { 2004, PrivMode_BracketPaste },
3623 }; 3690 };
3624 3691
3634 for (i = 0; i < nargs; i++) 3701 for (i = 0; i < nargs; i++)
3635 { 3702 {
3636 state = -1; 3703 state = -1;
3637 3704
3638 /* basic handling */ 3705 /* basic handling */
3639 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3706 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3640 if (argtopriv[j].argval == arg[i]) 3707 if (argtopriv[j].argval == arg[i])
3641 { 3708 {
3642 state = privcases (mode, argtopriv[j].bit); 3709 state = privcases (mode, argtopriv[j].bit);
3643 break; 3710 break;
3644 } 3711 }
3652 3719
3653 scr_touch (true); 3720 scr_touch (true);
3654 break; 3721 break;
3655#endif 3722#endif
3656 case 1048: /* alternative cursor save */ 3723 case 1048: /* alternative cursor save */
3657 case 1049:
3658 if (option (Opt_secondaryScreen)) 3724 if (option (Opt_secondaryScreen))
3659 if (mode == 0) 3725 if (mode == 0)
3660 scr_cursor (RESTORE); 3726 scr_cursor (RESTORE);
3661 else if (mode == 1) 3727 else if (mode == 1)
3662 scr_cursor (SAVE); 3728 scr_cursor (SAVE);
3671 case 2: /* VT52 mode */ 3737 case 2: /* VT52 mode */
3672 /* oddball mode. should be set regardless of set/reset 3738 /* oddball mode. should be set regardless of set/reset
3673 * parameter. Return from VT52 mode with an ESC < from 3739 * parameter. Return from VT52 mode with an ESC < from
3674 * within VT52 mode 3740 * within VT52 mode
3675 */ 3741 */
3676 PrivMode (1, PrivMode_vt52); 3742 set_privmode (PrivMode_vt52, 1);
3677 break; 3743 break;
3678 case 3: /* 80/132 */ 3744 case 3: /* 80/132 */
3679 if (priv_modes & PrivMode_132OK) 3745 if (priv_modes & PrivMode_132OK)
3680 {
3681 scr_poweron ();
3682 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3746 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3683 }
3684 break; 3747 break;
3685 case 4: /* smooth scrolling */ 3748 case 4: /* smooth scrolling */
3686 set_option (Opt_jumpScroll, !state); 3749 set_option (Opt_jumpScroll, !state);
3687 break; 3750 break;
3688 case 5: /* reverse video */ 3751 case 5: /* reverse video */
3699 if (state) /* orthogonal */ 3762 if (state) /* orthogonal */
3700 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3763 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3701 break; 3764 break;
3702#ifdef scrollBar_esc 3765#ifdef scrollBar_esc
3703 case scrollBar_esc: 3766 case scrollBar_esc:
3704 if (scrollbar_mapping (state)) 3767 if (scrollBar.map (state))
3705 { 3768 {
3706 resize_all_windows (0, 0, 0); 3769 resize_all_windows (0, 0, 0);
3707 scr_touch (true); 3770 scr_touch (true);
3708 } 3771 }
3709 break; 3772 break;
3726 case 1003: 3789 case 1003:
3727 if (state) 3790 if (state)
3728 { 3791 {
3729 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3792 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3730 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3793 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3794 mouse_row = mouse_col = 0;
3731 vt_emask_mouse = PointerMotionMask; 3795 vt_emask_mouse = PointerMotionMask;
3732 } 3796 }
3733 else 3797 else
3734 vt_emask_mouse = NoEventMask; 3798 vt_emask_mouse = NoEventMask;
3799
3735 vt_select_input (); 3800 vt_select_input ();
3736 break; 3801 break;
3737 case 1010: /* scroll to bottom on TTY output inhibit */ 3802 case 1010: /* scroll to bottom on TTY output inhibit */
3738 set_option (Opt_scrollTtyOutput, !state); 3803 set_option (Opt_scrollTtyOutput, !state);
3739 break; 3804 break;
3740 case 1011: /* scroll to bottom on key press */ 3805 case 1011: /* scroll to bottom on key press */
3741 set_option (Opt_scrollTtyKeypress, state); 3806 set_option (Opt_scrollTtyKeypress, state);
3742 break; 3807 break;
3743 case 1047: /* secondary screen w/ clearing last */ 3808 case 1047: /* secondary screen w/ clearing last */
3744 if (option (Opt_secondaryScreen)) 3809 if (option (Opt_secondaryScreen))
3745 if (current_screen != PRIMARY) 3810 if (!state)
3746 scr_erase_screen (2); 3811 scr_erase_screen (2);
3812
3747 scr_change_screen (state); 3813 scr_change_screen (state);
3748 break; 3814 break;
3749 case 1049: /* secondary screen w/ clearing first */ 3815 case 1049: /* secondary screen w/ clearing first */
3816 if (option (Opt_secondaryScreen))
3817 if (state)
3818 scr_cursor (SAVE);
3819
3750 scr_change_screen (state); 3820 scr_change_screen (state);
3821
3751 if (option (Opt_secondaryScreen)) 3822 if (option (Opt_secondaryScreen))
3752 if (current_screen != PRIMARY) 3823 if (state)
3753 scr_erase_screen (2); 3824 scr_erase_screen (2);
3825 else
3826 scr_cursor (RESTORE);
3754 break; 3827 break;
3755 default: 3828 default:
3756 break; 3829 break;
3757 } 3830 }
3758 } 3831 }
3952 4025
3953/* ---------------------------------------------------------------------- */ 4026/* ---------------------------------------------------------------------- */
3954/* Write data to the pty as typed by the user, pasted with the mouse, 4027/* Write data to the pty as typed by the user, pasted with the mouse,
3955 * or generated by us in response to a query ESC sequence. 4028 * or generated by us in response to a query ESC sequence.
3956 */ 4029 */
3957const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4030static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3958 4031
3959void 4032void
3960rxvt_term::tt_write (const char *data, unsigned int len) 4033rxvt_term::tt_write (const char *data, unsigned int len)
3961{ 4034{
3962 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4035 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3974 4047
3975 data += written; 4048 data += written;
3976 len -= written; 4049 len -= written;
3977 } 4050 }
3978 4051
3979 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4052 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3980 4053
3981 memcpy (v_buffer + v_buflen, data, len); 4054 memcpy (v_buffer + v_buflen, data, len);
3982 v_buflen += len; 4055 v_buflen += len;
3983 4056
3984 pty_ev.set (ev::READ | ev::WRITE); 4057 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines