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.448 by sf-exg, Sat Apr 17 23:00:45 2010 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
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 ();
1460 selection_property (ev.xproperty.window, ev.xproperty.atom); 1469 selection_property (ev.xproperty.window, ev.xproperty.atom);
1461 1470
1462 break; 1471 break;
1463 1472
1464 case SelectionClear: 1473 case SelectionClear:
1465 selection_clear (); 1474 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1466 break; 1475 break;
1467 1476
1468 case SelectionNotify: 1477 case SelectionNotify:
1469 if (selection_wait == Sel_normal) 1478 if (selection_wait == Sel_normal)
1470 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1479 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1537 ; 1546 ;
1538 1547
1539 if (scrollBar.state && ev.xany.window == scrollBar.win) 1548 if (scrollBar.state && ev.xany.window == scrollBar.win)
1540 { 1549 {
1541 scrollBar.state = STATE_IDLE; 1550 scrollBar.state = STATE_IDLE;
1542 scrollbar_show (0); 1551 scrollBar.show (0);
1543 } 1552 }
1544 } 1553 }
1545 break; 1554 break;
1546 1555
1547 case MotionNotify: 1556 case MotionNotify:
1646 &unused_root, &unused_child, 1655 &unused_root, &unused_child,
1647 &unused_root_x, &unused_root_y, 1656 &unused_root_x, &unused_root_y,
1648 &ev.xbutton.x, &ev.xbutton.y, 1657 &ev.xbutton.x, &ev.xbutton.y,
1649 &unused_mask); 1658 &unused_mask);
1650 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1659 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1651 scrollbar_size ()); 1660 scrollBar.size ());
1652 want_refresh = 1; 1661 want_refresh = 1;
1653 scrollbar_show (1); 1662 scrollBar.show (1);
1654 } 1663 }
1655 break; 1664 break;
1656 } 1665 }
1657 1666
1658#if defined(CURSOR_BLINK) 1667#if defined(CURSOR_BLINK)
1683#endif 1692#endif
1684 1693
1685 refresh_check (); 1694 refresh_check ();
1686} 1695}
1687 1696
1697#if ENABLE_FRILLS
1698void
1699rxvt_term::set_urgency (bool enable)
1700{
1701 if (enable == urgency_hint)
1702 return;
1703
1704 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1705 {
1706 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1707 XSetWMHints (dpy, parent[0], h);
1708 urgency_hint = enable;
1709 }
1710}
1711#endif
1712
1688void 1713void
1689rxvt_term::focus_in () 1714rxvt_term::focus_in ()
1690{ 1715{
1691 if (!focus) 1716 if (!focus)
1692 { 1717 {
1693 focus = 1; 1718 focus = 1;
1694 want_refresh = 1; 1719 want_refresh = 1;
1695
1696 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1697 1720
1698#if USE_XIM 1721#if USE_XIM
1699 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1700 { 1723 {
1701 IMSetPosition (); 1724 IMSetPosition ();
1713 scr_recolour (); 1736 scr_recolour ();
1714 } 1737 }
1715#endif 1738#endif
1716#if ENABLE_FRILLS 1739#if ENABLE_FRILLS
1717 if (option (Opt_urgentOnBell)) 1740 if (option (Opt_urgentOnBell))
1718 { 1741 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 1742#endif
1743
1744 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1726 } 1745 }
1727} 1746}
1728 1747
1729void 1748void
1730rxvt_term::focus_out () 1749rxvt_term::focus_out ()
1732 if (focus) 1751 if (focus)
1733 { 1752 {
1734 focus = 0; 1753 focus = 0;
1735 want_refresh = 1; 1754 want_refresh = 1;
1736 1755
1737 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1756#if ENABLE_FRILLS
1738 1757 if (option (Opt_urgentOnBell))
1758 set_urgency (0);
1759#endif
1739#if ENABLE_FRILLS || ISO_14755 1760#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf) 1761 if (iso14755buf)
1741 { 1762 {
1742 iso14755buf = 0; 1763 iso14755buf = 0;
1743# if ISO_14755 1764# if ISO_14755
1760 { 1781 {
1761 pix_colors = pix_colors_unfocused; 1782 pix_colors = pix_colors_unfocused;
1762 scr_recolour (); 1783 scr_recolour ();
1763 } 1784 }
1764#endif 1785#endif
1786
1787 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1765 } 1788 }
1766} 1789}
1767 1790
1768void 1791void
1769rxvt_term::update_fade_color (unsigned int idx) 1792rxvt_term::update_fade_color (unsigned int idx)
2011 } 2034 }
2012 2035
2013 if (scrollBar.style == R_SB_XTERM 2036 if (scrollBar.style == R_SB_XTERM
2014 || scrollbar_above_slider (ev.y) 2037 || scrollbar_above_slider (ev.y)
2015 || scrollbar_below_slider (ev.y)) 2038 || scrollbar_below_slider (ev.y))
2016 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2039 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2017 2040
2018 scrollBar.state = STATE_MOTION; 2041 scrollBar.state = STATE_MOTION;
2019 break; 2042 break;
2020 2043
2021 case Button1: 2044 case Button1:
2044 else 2067 else
2045 { 2068 {
2046 scr_page ((ev.button == Button1 ? DN : UP), 2069 scr_page ((ev.button == Button1 ? DN : UP),
2047 (nrow 2070 (nrow
2048 * scrollbar_position (ev.y) 2071 * scrollbar_position (ev.y)
2049 / scrollbar_size ())); 2072 / scrollBar.size ()));
2050 } 2073 }
2051 2074
2052 break; 2075 break;
2053 } 2076 }
2054 } 2077 }
2067 reportmode = !! (priv_modes & PrivMode_mouse_report); 2090 reportmode = !! (priv_modes & PrivMode_mouse_report);
2068 2091
2069 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2092 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2070 { 2093 {
2071 scrollBar.state = STATE_IDLE; 2094 scrollBar.state = STATE_IDLE;
2072 scrollbar_show (0); 2095 scrollBar.show (0);
2073 } 2096 }
2074 2097
2075#ifdef SELECTION_SCROLLING 2098#ifdef SELECTION_SCROLLING
2076 sel_scroll_ev.stop(); 2099 sel_scroll_ev.stop();
2077#endif 2100#endif
2127 selection_make (ev.time); 2150 selection_make (ev.time);
2128 break; 2151 break;
2129 2152
2130 case Button2: 2153 case Button2:
2131 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2154 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); 2155 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2133 break; 2156 break;
2134 2157
2135#ifdef MOUSE_WHEEL 2158#ifdef MOUSE_WHEEL
2136 case Button4: 2159 case Button4:
2137 case Button5: 2160 case Button5:
2160 } 2183 }
2161 else 2184 else
2162# endif 2185# endif
2163 { 2186 {
2164 scr_page (v, i); 2187 scr_page (v, i);
2165 scrollbar_show (1); 2188 scrollBar.show (1);
2166 } 2189 }
2167 } 2190 }
2168 break; 2191 break;
2169#endif 2192#endif
2170 } 2193 }
2171 } 2194 }
2172} 2195}
2173 2196
2174/*}}} */ 2197/*}}} */
2175 2198
2176bool 2199void
2177rxvt_term::cmd_parse () 2200rxvt_term::cmd_parse ()
2178{ 2201{
2179 bool flag = false;
2180 wchar_t ch = NOCHAR; 2202 wchar_t ch = NOCHAR;
2181 char *seq_begin; // remember start of esc-sequence here 2203 char *seq_begin; // remember start of esc-sequence here
2182 2204
2183 for (;;) 2205 for (;;)
2184 { 2206 {
2185 if (ch == NOCHAR) 2207 if (expect_false (ch == NOCHAR))
2186 { 2208 {
2187 seq_begin = cmdbuf_ptr; 2209 seq_begin = cmdbuf_ptr;
2188 ch = next_char (); 2210 ch = next_char ();
2189 2211
2190 if (ch == NOCHAR) 2212 if (ch == NOCHAR)
2191 break; 2213 break;
2192 } 2214 }
2193 2215
2194 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2216 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2195 { 2217 {
2196 if (!seen_input) 2218 if (expect_false (!seen_input))
2197 { 2219 {
2198 seen_input = 1; 2220 seen_input = 1;
2199 // many badly-written programs (e.g. jed) contain a race condition: 2221 // many badly-written programs (e.g. jed) contain a race condition:
2200 // they first read the screensize and then install a SIGWINCH handler. 2222 // they first read the screensize and then install a SIGWINCH handler.
2201 // some window managers resize the window early, and these programs 2223 // some window managers resize the window early, and these programs
2214 wchar_t *str = buf; 2236 wchar_t *str = buf;
2215 wchar_t *eol = str + min (ncol, UBUFSIZ); 2237 wchar_t *eol = str + min (ncol, UBUFSIZ);
2216 2238
2217 for (;;) 2239 for (;;)
2218 { 2240 {
2219 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2241 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2220 break; 2242 break;
2221 2243
2222 *str++ = ch; 2244 *str++ = ch;
2223 2245
2224 if (ch == C0_LF || str >= eol) 2246 if (expect_false (ch == C0_LF || str >= eol))
2225 { 2247 {
2226 if (ch == C0_LF) 2248 if (ch == C0_LF)
2227 nlines++; 2249 nlines++;
2228 2250
2229 refresh_count++; 2251 refresh_count++;
2278 * What the heck we'll cheat and only refresh less than every page-full. 2300 * What the heck we'll cheat and only refresh less than every page-full.
2279 * if skipScroll is enabled. 2301 * if skipScroll is enabled.
2280 */ 2302 */
2281 if (refreshnow) 2303 if (refreshnow)
2282 { 2304 {
2283 flag = true;
2284 scr_refresh (); 2305 scr_refresh ();
2285 want_refresh = 1; 2306 want_refresh = 1;
2286 } 2307 }
2287
2288 } 2308 }
2289 else 2309 else
2290 { 2310 {
2291 try 2311 try
2292 { 2312 {
2300 } 2320 }
2301 2321
2302 ch = NOCHAR; 2322 ch = NOCHAR;
2303 } 2323 }
2304 } 2324 }
2305
2306 return flag;
2307} 2325}
2308 2326
2309// read the next character 2327// read the next character
2310wchar_t 2328wchar_t
2311rxvt_term::next_char () NOTHROW 2329rxvt_term::next_char () NOTHROW
2312{ 2330{
2313 while (cmdbuf_ptr < cmdbuf_endp) 2331 while (cmdbuf_ptr < cmdbuf_endp)
2314 { 2332 {
2315 // assume 7-bit to be ascii ALWAYS 2333 // assume 7-bit to be ascii ALWAYS
2316 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2334 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2317 return *cmdbuf_ptr++; 2335 return *cmdbuf_ptr++;
2318 2336
2319 wchar_t wc; 2337 wchar_t wc;
2320 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2338 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2321 2339
2325 cmdbuf_ptr = cmdbuf_endp; 2343 cmdbuf_ptr = cmdbuf_endp;
2326 break; 2344 break;
2327 } 2345 }
2328 2346
2329 if (len == (size_t)-1) 2347 if (len == (size_t)-1)
2348 {
2349 mbstate.reset (); // reset now undefined conversion state
2330 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2350 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2351 }
2331 2352
2332 // assume wchar == unicode 2353 // assume wchar == unicode
2333 cmdbuf_ptr += len; 2354 cmdbuf_ptr += len;
2334 return wc & UNICODE_MASK; 2355 return wc & UNICODE_MASK;
2335 } 2356 }
2379/*----------------------------------------------------------------------*/ 2400/*----------------------------------------------------------------------*/
2380#ifdef PRINTPIPE 2401#ifdef PRINTPIPE
2381FILE * 2402FILE *
2382rxvt_term::popen_printer () 2403rxvt_term::popen_printer ()
2383{ 2404{
2384 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2405 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2385 2406
2386 if (stream == NULL) 2407 if (stream == NULL)
2387 rxvt_warn ("can't open printer pipe, not printing.\n"); 2408 rxvt_warn ("can't open printer pipe, not printing.\n");
2388 2409
2389 return stream; 2410 return stream;
2400 * simulate attached vt100 printer 2421 * simulate attached vt100 printer
2401 */ 2422 */
2402void 2423void
2403rxvt_term::process_print_pipe () 2424rxvt_term::process_print_pipe ()
2404{ 2425{
2405 int done; 2426 FILE *fd = popen_printer ();
2406 FILE *fd;
2407 2427
2408 if ((fd = popen_printer ()) == NULL) 2428 if (!fd)
2409 return; 2429 return;
2410 2430
2411 /* 2431 /*
2412 * Send all input to the printer until either ESC[4i or ESC[?4i 2432 * Send all input to the printer until either ESC[4i or ESC[?4i
2413 * is received. 2433 * is received.
2414 */ 2434 */
2415 for (done = 0; !done;) 2435 for (int done = 0; !done; )
2416 { 2436 {
2417 unsigned char buf[8]; 2437 unsigned char buf[8];
2418 unicode_t ch; 2438 unicode_t ch;
2419 unsigned int i, len; 2439 unsigned int i, len;
2420 2440
2565 break; 2585 break;
2566 case 'Z': /* identify the terminal type */ 2586 case 'Z': /* identify the terminal type */
2567 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2587 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2568 break; 2588 break;
2569 case '<': /* turn off VT52 mode */ 2589 case '<': /* turn off VT52 mode */
2570 PrivMode (0, PrivMode_vt52); 2590 set_privmode (PrivMode_vt52, 0);
2571 break; 2591 break;
2572 case 'F': /* use special graphics character set */ 2592 case 'F': /* use special graphics character set */
2573 case 'G': /* use regular character set */ 2593 case 'G': /* use regular character set */
2574 /* unimplemented */ 2594 /* unimplemented */
2575 break; 2595 break;
2629 scr_forwardindex (); 2649 scr_forwardindex ();
2630 break; 2650 break;
2631#endif 2651#endif
2632 case '=': 2652 case '=':
2633 case '>': 2653 case '>':
2634 PrivMode ((ch == '='), PrivMode_aplKP); 2654 set_privmode (PrivMode_aplKP, ch == '=');
2635 break; 2655 break;
2636 2656
2637 case C1_40: 2657 case C1_40:
2638 cmd_getc (); 2658 cmd_getc ();
2639 break; 2659 break;
2678 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2698 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2679 case C1_SCI: /* ESC Z */ 2699 case C1_SCI: /* ESC Z */
2680 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2700 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2681 break; /* steal obsolete ESC [ c */ 2701 break; /* steal obsolete ESC [ c */
2682 2702
2683 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2703 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2684 case C1_CSI: /* ESC [ */ 2704 case C1_CSI: /* ESC [ */
2685 process_csi_seq (); 2705 process_csi_seq ();
2686 break; 2706 break;
2687 2707
2688 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2708 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2689 case C1_OSC: /* ESC ] */ 2709 case C1_OSC: /* ESC ] */
2690 process_osc_seq (); 2710 process_osc_seq ();
2691 break; 2711 break;
2692 2712
2693 /* 8.3.106: RESET TO INITIAL STATE */ 2713 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2694 case 'c': 2714 case 'c':
2695 mbstate.reset (); 2715 mbstate.reset ();
2696 scr_poweron (); 2716 scr_poweron ();
2697 scrollbar_show (1); 2717 scrollBar.show (1);
2698 break; 2718 break;
2699 2719
2700 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2720 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2701 case 'n': 2721 case 'n':
2702 scr_charset_choose (2); 2722 scr_charset_choose (2);
2753 2773
2754 nargs = 0; 2774 nargs = 0;
2755 2775
2756 priv = 0; 2776 priv = 0;
2757 ch = cmd_getc (); 2777 ch = cmd_getc ();
2758 if (ch >= '<' && ch <= '?') 2778 if ((ch >= '<' && ch <= '?') || ch == '!')
2759 { 2779 {
2760 /* '<' '=' '>' '?' */ 2780 /* '<' '=' '>' '?' '!' */
2761 priv = ch; 2781 priv = ch;
2762 ch = cmd_getc (); 2782 ch = cmd_getc ();
2763 } 2783 }
2764 2784
2765 /* read any numerical arguments */ 2785 /* read any numerical arguments */
2819 2839
2820 case '?': 2840 case '?':
2821 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2841 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2822 process_terminal_mode (ch, priv, nargs, arg); 2842 process_terminal_mode (ch, priv, nargs, arg);
2823 break; 2843 break;
2844
2845 case '!':
2846 if (ch == CSI_70)
2847 {
2848 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2849 scr_soft_reset ();
2850
2851 static const int pm_h[] = { 7, 25 };
2852 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2853
2854 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2855 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2824 } 2856 }
2857 break;
2858 }
2859
2825 return; 2860 return;
2826 } 2861 }
2827 2862
2828 switch (ch) 2863 switch (ch)
2829 { 2864 {
3258 3293
3259/* 3294/*
3260 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3295 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3261 */ 3296 */
3262void 3297void
3263rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3298rxvt_term::process_xterm_seq (int op, char *str, char resp)
3264{ 3299{
3265 int color; 3300 int color;
3266 char *buf, *name; 3301 char *buf, *name;
3267 bool query = str[0] == '?' && !str[1]; 3302 bool query = str[0] == '?' && !str[1];
3268 int saveop = op; 3303 int saveop = op;
3309 3344
3310 XFree (value); 3345 XFree (value);
3311 } 3346 }
3312 else 3347 else
3313 { 3348 {
3314 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3349 char *eq = strchr (str, '=');
3315 3350
3316 if (eq) 3351 if (eq)
3317 { 3352 {
3318 *eq = 0; 3353 *eq = 0;
3319 set_utf8_property (display->atom (str), eq + 1); 3354 set_utf8_property (display->atom (str), eq + 1);
3359 process_color_seq (op, Color_pointer_fg, str, resp); 3394 process_color_seq (op, Color_pointer_fg, str, resp);
3360 break; 3395 break;
3361 case XTerm_Color_pointer_bg: 3396 case XTerm_Color_pointer_bg:
3362 process_color_seq (op, Color_pointer_bg, str, resp); 3397 process_color_seq (op, Color_pointer_bg, str, resp);
3363 break; 3398 break;
3399#ifdef OPTION_HC
3400 case XTerm_Color_HC:
3401 process_color_seq (op, Color_HC, str, resp);
3402 break;
3403#endif
3364#ifndef NO_BOLD_UNDERLINE_REVERSE 3404#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: 3405 case Rxvt_Color_BD:
3369 case URxvt_Color_BD: 3406 case URxvt_Color_BD:
3370 process_color_seq (op, Color_BD, str, resp); 3407 process_color_seq (op, Color_BD, str, resp);
3371 break; 3408 break;
3372 case Rxvt_Color_UL: 3409 case Rxvt_Color_UL:
3375 break; 3412 break;
3376 case URxvt_Color_IT: 3413 case URxvt_Color_IT:
3377 process_color_seq (op, Color_IT, str, resp); 3414 process_color_seq (op, Color_IT, str, resp);
3378 break; 3415 break;
3379#endif 3416#endif
3417 case URxvt_Color_border:
3418 process_color_seq (op, Color_border, str, resp);
3419 break;
3380#if ENABLE_TRANSPARENCY 3420#if ENABLE_TRANSPARENCY
3381 case URxvt_Color_tint: 3421 case URxvt_Color_tint:
3382 process_color_seq (op, Color_tint, str, resp); 3422 process_color_seq (op, Color_tint, str, resp);
3383 { 3423 {
3384 bool changed = false; 3424 bool changed = false;
3399 case Rxvt_Pixmap: 3439 case Rxvt_Pixmap:
3400 if (!strcmp (str, "?")) 3440 if (!strcmp (str, "?"))
3401 { 3441 {
3402 char str[256]; 3442 char str[256];
3403 3443
3404 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3444 sprintf (str, "[%dx%d+%d+%d]",
3405 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3445 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3406 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3446 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3407 process_xterm_seq (XTerm_title, str, CHAR_ST); 3447 process_xterm_seq (XTerm_title, str, CHAR_ST);
3408 } 3448 }
3409 else 3449 else
3508 break; 3548 break;
3509#endif 3549#endif
3510 3550
3511#if ENABLE_PERL 3551#if ENABLE_PERL
3512 case URxvt_perl: 3552 case URxvt_perl:
3513 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3553 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3514 ; // no responses yet
3515 break; 3554 break;
3516#endif 3555#endif
3517 } 3556 }
3518} 3557}
3519/*----------------------------------------------------------------------*/ 3558/*----------------------------------------------------------------------*/
3542 { 3581 {
3543 if (mode == 'r') 3582 if (mode == 'r')
3544 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3583 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3545 else 3584 else
3546 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3585 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3547 PrivMode (state, bit); 3586 set_privmode (bit, state);
3548 } 3587 }
3549 3588
3550 return state; 3589 return state;
3551} 3590}
3552 3591
3560 static const struct 3599 static const struct
3561 { 3600 {
3562 const int argval; 3601 const int argval;
3563 const unsigned long bit; 3602 const unsigned long bit;
3564 } argtopriv[] = { 3603 } argtopriv[] = {
3565 { 1, PrivMode_aplCUR }, 3604 { 1, PrivMode_aplCUR }, // DECCKM
3566 { 2, PrivMode_vt52 }, 3605 { 2, PrivMode_vt52 },
3567 { 3, PrivMode_132 }, 3606 { 3, PrivMode_132 }, // DECCOLM
3568 { 4, PrivMode_smoothScroll }, 3607 { 4, PrivMode_smoothScroll }, // DECSCLM
3569 { 5, PrivMode_rVideo }, 3608 { 5, PrivMode_rVideo }, // DECSCNM
3570 { 6, PrivMode_relOrigin }, 3609 { 6, PrivMode_relOrigin }, // DECOM
3571 { 7, PrivMode_Autowrap }, 3610 { 7, PrivMode_Autowrap }, // DECAWM
3572 // 8, bi-directional support mode 3611 // 8, auto-repeat keys // DECARM
3573 { 9, PrivMode_MouseX10 }, 3612 { 9, PrivMode_MouseX10 },
3574 // 18, 19 printing-related 3613 // 18 end FF to printer after print screen
3614 // 19 Print screen prints full screen/scorll region
3575 { 25, PrivMode_VisibleCursor }, 3615 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3576#ifdef scrollBar_esc 3616#ifdef scrollBar_esc
3577 { scrollBar_esc, PrivMode_scrollBar }, 3617 { scrollBar_esc, PrivMode_scrollBar },
3578#endif 3618#endif
3579 { 35, PrivMode_ShiftKeys }, // rxvt extension 3619 { 35, PrivMode_ShiftKeys }, // rxvt extension
3620 // 38, tektronix mode // DECTEK
3580 { 40, PrivMode_132OK }, 3621 { 40, PrivMode_132OK },
3581 // 41 xterm more fixes NYI 3622 // 41 xterm more fixes NYI
3582 // 45 margin bell NYI 3623 // 45 margin bell NYI
3583 // 46 start logging 3624 // 46 start logging
3584 { 47, PrivMode_Screen }, 3625 { 47, PrivMode_Screen },
3585 { 66, PrivMode_aplKP }, 3626 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3586#ifndef NO_BACKSPACE_KEY 3627#ifndef NO_BACKSPACE_KEY
3587 { 67, PrivMode_BackSpace }, 3628 { 67, PrivMode_BackSpace }, // DECBKM
3588#endif 3629#endif
3589 { 1000, PrivMode_MouseX11 }, 3630 { 1000, PrivMode_MouseX11 },
3590 { 1002, PrivMode_MouseBtnEvent }, 3631 { 1002, PrivMode_MouseBtnEvent },
3591 { 1003, PrivMode_MouseAnyEvent }, 3632 { 1003, PrivMode_MouseAnyEvent },
3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3633 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3631 3672
3632 scr_touch (true); 3673 scr_touch (true);
3633 break; 3674 break;
3634#endif 3675#endif
3635 case 1048: /* alternative cursor save */ 3676 case 1048: /* alternative cursor save */
3636 case 1049:
3637 if (option (Opt_secondaryScreen)) 3677 if (option (Opt_secondaryScreen))
3638 if (mode == 0) 3678 if (mode == 0)
3639 scr_cursor (RESTORE); 3679 scr_cursor (RESTORE);
3640 else if (mode == 1) 3680 else if (mode == 1)
3641 scr_cursor (SAVE); 3681 scr_cursor (SAVE);
3650 case 2: /* VT52 mode */ 3690 case 2: /* VT52 mode */
3651 /* oddball mode. should be set regardless of set/reset 3691 /* oddball mode. should be set regardless of set/reset
3652 * parameter. Return from VT52 mode with an ESC < from 3692 * parameter. Return from VT52 mode with an ESC < from
3653 * within VT52 mode 3693 * within VT52 mode
3654 */ 3694 */
3655 PrivMode (1, PrivMode_vt52); 3695 set_privmode (PrivMode_vt52, 1);
3656 break; 3696 break;
3657 case 3: /* 80/132 */ 3697 case 3: /* 80/132 */
3658 if (priv_modes & PrivMode_132OK) 3698 if (priv_modes & PrivMode_132OK)
3659 {
3660 scr_poweron ();
3661 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3699 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3662 }
3663 break; 3700 break;
3664 case 4: /* smooth scrolling */ 3701 case 4: /* smooth scrolling */
3665 set_option (Opt_jumpScroll, !state); 3702 set_option (Opt_jumpScroll, !state);
3666 break; 3703 break;
3667 case 5: /* reverse video */ 3704 case 5: /* reverse video */
3678 if (state) /* orthogonal */ 3715 if (state) /* orthogonal */
3679 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3716 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3680 break; 3717 break;
3681#ifdef scrollBar_esc 3718#ifdef scrollBar_esc
3682 case scrollBar_esc: 3719 case scrollBar_esc:
3683 if (scrollbar_mapping (state)) 3720 if (scrollBar.map (state))
3684 { 3721 {
3685 resize_all_windows (0, 0, 0); 3722 resize_all_windows (0, 0, 0);
3686 scr_touch (true); 3723 scr_touch (true);
3687 } 3724 }
3688 break; 3725 break;
3709 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3746 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3710 vt_emask_mouse = PointerMotionMask; 3747 vt_emask_mouse = PointerMotionMask;
3711 } 3748 }
3712 else 3749 else
3713 vt_emask_mouse = NoEventMask; 3750 vt_emask_mouse = NoEventMask;
3751
3714 vt_select_input (); 3752 vt_select_input ();
3715 break; 3753 break;
3716 case 1010: /* scroll to bottom on TTY output inhibit */ 3754 case 1010: /* scroll to bottom on TTY output inhibit */
3717 set_option (Opt_scrollTtyOutput, !state); 3755 set_option (Opt_scrollTtyOutput, !state);
3718 break; 3756 break;
3719 case 1011: /* scroll to bottom on key press */ 3757 case 1011: /* scroll to bottom on key press */
3720 set_option (Opt_scrollTtyKeypress, state); 3758 set_option (Opt_scrollTtyKeypress, state);
3721 break; 3759 break;
3722 case 1047: /* secondary screen w/ clearing last */ 3760 case 1047: /* secondary screen w/ clearing last */
3723 if (option (Opt_secondaryScreen)) 3761 if (option (Opt_secondaryScreen))
3724 if (current_screen != PRIMARY) 3762 if (!state)
3725 scr_erase_screen (2); 3763 scr_erase_screen (2);
3764
3726 scr_change_screen (state); 3765 scr_change_screen (state);
3727 break; 3766 break;
3728 case 1049: /* secondary screen w/ clearing first */ 3767 case 1049: /* secondary screen w/ clearing first */
3768 if (option (Opt_secondaryScreen))
3769 if (state)
3770 scr_cursor (SAVE);
3771
3729 scr_change_screen (state); 3772 scr_change_screen (state);
3773
3730 if (option (Opt_secondaryScreen)) 3774 if (option (Opt_secondaryScreen))
3731 if (current_screen != PRIMARY) 3775 if (state)
3732 scr_erase_screen (2); 3776 scr_erase_screen (2);
3777 else
3778 scr_cursor (RESTORE);
3733 break; 3779 break;
3734 default: 3780 default:
3735 break; 3781 break;
3736 } 3782 }
3737 } 3783 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines