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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.410 by ayin, Sat Feb 16 15:48:36 2008 UTC vs.
Revision 1.450 by sf-exg, Sun Apr 18 11:11:28 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
416 */ 422 */
417 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
420 426
421 if (numlock_state || (ev.state & ModNumLockMask))
422 {
423 numlock_state = (ev.state & ModNumLockMask);
424 PrivMode ((!numlock_state), PrivMode_aplKP);
425 }
426
427 kbuf[0] = 0; 427 kbuf[0] = 0;
428 428
429#ifdef USE_XIM 429#ifdef USE_XIM
430 if (Input_Context) 430 if (Input_Context)
431 { 431 {
505#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
506 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
507#else 507#else
508 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
509#endif 509#endif
510 max_it (lnsppg, 1);
511
510 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
511 { 513 {
512 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
513 return; 515 return;
514 } 516 }
579 } 581 }
580 } 582 }
581 583
582#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 585 // ISO 14755 support
584 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 587 {
586 int hv; 588 int hv;
587 589
588 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
619 scr_overlay_off (); 621 scr_overlay_off ();
620# endif 622# endif
621 iso14755buf = 0; 623 iso14755buf = 0;
622 } 624 }
623 } 625 }
626 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
627 { 630 {
628 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 632# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
641 } 644 }
642#endif 645#endif
643 646
644 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645 { 648 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1; 650 unsigned int newlen = 1;
648 651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
649 switch (translate_keypad (keysym, kp)) 655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
658 {
659#ifndef NO_BACKSPACE_KEY
660 case XK_BackSpace:
661 if (priv_modes & PrivMode_HaveBackSpace)
662 {
663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
664 ^ !!ctrl) ? '\b' : '\177';
665 kbuf[1] = '\0';
666 }
667 else
668 strcpy (kbuf, rs[Rs_backspace_key]);
669 break;
670#endif
671#ifndef NO_DELETE_KEY
672 case XK_Delete:
673 strcpy (kbuf, rs[Rs_delete_key]);
674 break;
675#endif
676 case XK_Tab:
677 if (shft)
678 strcpy (kbuf, "\033[Z");
679 else
680 {
681#ifdef CTRL_TAB_MAKES_META
682 if (ctrl)
683 meta = 1;
684#endif
685#ifdef MOD4_TAB_MAKES_META
686 if (ev.state & Mod4Mask)
687 meta = 1;
688#endif
689 newlen = 0;
690 }
691 break;
692
693 case XK_Up: /* "\033[A" */
694 case XK_Down: /* "\033[B" */
695 case XK_Right: /* "\033[C" */
696 case XK_Left: /* "\033[D" */
697 strcpy (kbuf, "\033[Z");
698 kbuf[2] = "DACB"[keysym - XK_Left];
699 /* do Shift first */
700 if (shft)
701 kbuf[2] = "dacb"[keysym - XK_Left];
702 else if (ctrl)
703 {
704 kbuf[1] = 'O';
705 kbuf[2] = "dacb"[keysym - XK_Left];
706 }
707 else if (priv_modes & PrivMode_aplCUR)
708 kbuf[1] = 'O';
709 break;
710
711 case XK_KP_Enter:
712 /* allow shift to override */
713 if (kp)
714 {
715 strcpy (kbuf, "\033OM");
716 break;
717 }
718
719 /* FALLTHROUGH */
720
721 case XK_Return:
722 if (priv_modes & PrivMode_LFNL)
723 {
724 kbuf[0] = '\015';
725 kbuf[1] = '\012';
726 kbuf[2] = '\0';
727 }
728 else
729 {
730 kbuf[0] = '\015';
731 kbuf[1] = '\0';
732 }
733 break;
734
735 case XK_KP_F1: /* "\033OP" */
736 case XK_KP_F2: /* "\033OQ" */
737 case XK_KP_F3: /* "\033OR" */
738 case XK_KP_F4: /* "\033OS" */
739 strcpy (kbuf, "\033OP");
740 kbuf[2] += (keysym - XK_KP_F1);
741 break;
742
743 case XK_KP_Multiply: /* "\033Oj" : "*" */
744 case XK_KP_Add: /* "\033Ok" : "+" */
745 case XK_KP_Separator: /* "\033Ol" : "," */
746 case XK_KP_Subtract: /* "\033Om" : "-" */
747 case XK_KP_Decimal: /* "\033On" : "." */
748 case XK_KP_Divide: /* "\033Oo" : "/" */
749 case XK_KP_0: /* "\033Op" : "0" */
750 case XK_KP_1: /* "\033Oq" : "1" */
751 case XK_KP_2: /* "\033Or" : "2" */
752 case XK_KP_3: /* "\033Os" : "3" */
753 case XK_KP_4: /* "\033Ot" : "4" */
754 case XK_KP_5: /* "\033Ou" : "5" */
755 case XK_KP_6: /* "\033Ov" : "6" */
756 case XK_KP_7: /* "\033Ow" : "7" */
757 case XK_KP_8: /* "\033Ox" : "8" */
758 case XK_KP_9: /* "\033Oy" : "9" */
759 /* allow shift to override */
760 if (kp)
761 {
762 strcpy (kbuf, "\033Oj");
763 kbuf[2] += (keysym - XK_KP_Multiply);
764 }
765 else
766 {
767 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
768 kbuf[1] = '\0';
769 }
770 break;
771
772 default:
650 { 773 {
651#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace)
654 {
655 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
656 ^ !!ctrl) ? '\b' : '\177';
657 kbuf[1] = '\0';
658 }
659 else
660 strcpy (kbuf, rs[Rs_backspace_key]);
661 break;
662#endif
663#ifndef NO_DELETE_KEY
664 case XK_Delete:
665 strcpy (kbuf, rs[Rs_delete_key]);
666 break;
667#endif
668 case XK_Tab:
669 if (shft)
670 strcpy (kbuf, "\033[Z");
671 else
672 {
673#ifdef CTRL_TAB_MAKES_META
674 if (ctrl)
675 meta = 1;
676#endif
677#ifdef MOD4_TAB_MAKES_META
678 if (ev.state & Mod4Mask)
679 meta = 1;
680#endif
681 newlen = 0;
682 }
683 break;
684
685 case XK_Up: /* "\033[A" */
686 case XK_Down: /* "\033[B" */
687 case XK_Right: /* "\033[C" */
688 case XK_Left: /* "\033[D" */
689 strcpy (kbuf, "\033[Z");
690 kbuf[2] = "DACB"[keysym - XK_Left];
691 /* do Shift first */
692 if (shft)
693 kbuf[2] = "dacb"[keysym - XK_Left];
694 else if (ctrl)
695 {
696 kbuf[1] = 'O';
697 kbuf[2] = "dacb"[keysym - XK_Left];
698 }
699 else if (priv_modes & PrivMode_aplCUR)
700 kbuf[1] = 'O';
701 break;
702
703 case XK_KP_Enter:
704 /* allow shift to override */
705 if (kp)
706 {
707 strcpy (kbuf, "\033OM");
708 break;
709 }
710
711 /* FALLTHROUGH */
712
713 case XK_Return:
714 if (priv_modes & PrivMode_LFNL)
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\012';
718 kbuf[2] = '\0';
719 }
720 else
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\0';
724 }
725 break;
726
727 case XK_KP_F1: /* "\033OP" */
728 case XK_KP_F2: /* "\033OQ" */
729 case XK_KP_F3: /* "\033OR" */
730 case XK_KP_F4: /* "\033OS" */
731 strcpy (kbuf, "\033OP");
732 kbuf[2] += (keysym - XK_KP_F1);
733 break;
734
735 case XK_KP_Multiply: /* "\033Oj" : "*" */
736 case XK_KP_Add: /* "\033Ok" : "+" */
737 case XK_KP_Separator: /* "\033Ol" : "," */
738 case XK_KP_Subtract: /* "\033Om" : "-" */
739 case XK_KP_Decimal: /* "\033On" : "." */
740 case XK_KP_Divide: /* "\033Oo" : "/" */
741 case XK_KP_0: /* "\033Op" : "0" */
742 case XK_KP_1: /* "\033Oq" : "1" */
743 case XK_KP_2: /* "\033Or" : "2" */
744 case XK_KP_3: /* "\033Os" : "3" */
745 case XK_KP_4: /* "\033Ot" : "4" */
746 case XK_KP_5: /* "\033Ou" : "5" */
747 case XK_KP_6: /* "\033Ov" : "6" */
748 case XK_KP_7: /* "\033Ow" : "7" */
749 case XK_KP_8: /* "\033Ox" : "8" */
750 case XK_KP_9: /* "\033Oy" : "9" */
751 /* allow shift to override */
752 if (kp)
753 {
754 strcpy (kbuf, "\033Oj");
755 kbuf[2] += (keysym - XK_KP_Multiply);
756 }
757 else
758 {
759 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
760 kbuf[1] = '\0';
761 }
762 break;
763
764 default:
765 {
766 int param = map_function_key (keysym); 774 int param = map_function_key (keysym);
767 if (param > 0) 775 if (param > 0)
768 sprintf (kbuf,"\033[%d~", param); 776 sprintf (kbuf,"\033[%d~", param);
769 else 777 else
770 newlen = 0; 778 newlen = 0;
771 }
772 break;
773 } 779 }
780 break;
781 }
774 782
775 if (newlen) 783 if (newlen)
776 len = strlen (kbuf); 784 len = strlen (kbuf);
777 785
778 /* 786 /*
779 * Pass meta for all function keys, if 'meta' option set 787 * Pass meta for all function keys, if 'meta' option set
780 */ 788 */
781#ifdef META8_OPTION 789#ifdef META8_OPTION
1015 } 1023 }
1016 while (row < end_row); 1024 while (row < end_row);
1017 } 1025 }
1018 1026
1019 scr_refresh (); 1027 scr_refresh ();
1020 scrollbar_show (1); 1028 scrollBar.show (1);
1021#ifdef USE_XIM 1029#ifdef USE_XIM
1022 IMSendSpot (); 1030 IMSendSpot ();
1023#endif 1031#endif
1024 } 1032 }
1025 1033
1026 display->flush (); 1034 display->flush ();
1027} 1035}
1028 1036
1029/* checks wether a refresh is requested and starts the refresh timer */ 1037/* checks whether a refresh is requested and starts the refresh timer */
1030void 1038void
1031rxvt_term::refresh_check () 1039rxvt_term::refresh_check ()
1032{ 1040{
1033 if (want_refresh && !flush_ev.is_active ()) 1041 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1042 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1127 { 1135 {
1128 // this should really be sched_yield(), but the linux guys thought 1136 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1137 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is 1138 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1139 // allowed by the sus... as is returning ENOSYS.
1140 // since the linux guys additionally thought that breaking the only
1141 // known workaround against their unusable sched_yield hack is cool,
1142 // we just nanosleep a bit and hope for the best.
1132 1143
1133 struct timespec ts = { 0, 0 }; 1144 struct timespec ts = { 0, 1000 };
1134 nanosleep (&ts, 0); 1145 nanosleep (&ts, 0);
1135 1146
1136 w.stop (); 1147 w.stop ();
1137 } 1148 }
1138 1149
1188{ 1199{
1189 make_current (); 1200 make_current ();
1190 1201
1191 if (revents & ev::READ) 1202 if (revents & ev::READ)
1192 // loop, but don't allow a single term to monopolize us 1203 // loop, but don't allow a single term to monopolize us
1193 while (pty_fill ()) 1204 for (int i = CBUFCNT; i-- && pty_fill (); )
1194 if (cmd_parse ()) 1205 cmd_parse ();
1195 break;
1196 1206
1197 if (revents & ev::WRITE) 1207 if (revents & ev::WRITE)
1198 pty_write (); 1208 pty_write ();
1199 1209
1200 refresh_check (); 1210 refresh_check ();
1459 selection_property (ev.xproperty.window, ev.xproperty.atom); 1469 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460 1470
1461 break; 1471 break;
1462 1472
1463 case SelectionClear: 1473 case SelectionClear:
1464 selection_clear (); 1474 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465 break; 1475 break;
1466 1476
1467 case SelectionNotify: 1477 case SelectionNotify:
1468 if (selection_wait == Sel_normal) 1478 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1479 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1536 ; 1546 ;
1537 1547
1538 if (scrollBar.state && ev.xany.window == scrollBar.win) 1548 if (scrollBar.state && ev.xany.window == scrollBar.win)
1539 { 1549 {
1540 scrollBar.state = STATE_IDLE; 1550 scrollBar.state = STATE_IDLE;
1541 scrollbar_show (0); 1551 scrollBar.show (0);
1542 } 1552 }
1543 } 1553 }
1544 break; 1554 break;
1545 1555
1546 case MotionNotify: 1556 case MotionNotify:
1645 &unused_root, &unused_child, 1655 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1656 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1657 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1658 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1659 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1650 scrollbar_size ()); 1660 scrollBar.size ());
1651 want_refresh = 1; 1661 want_refresh = 1;
1652 scrollbar_show (1); 1662 scrollBar.show (1);
1653 } 1663 }
1654 break; 1664 break;
1655 } 1665 }
1656 1666
1657#if defined(CURSOR_BLINK) 1667#if defined(CURSOR_BLINK)
1682#endif 1692#endif
1683 1693
1684 refresh_check (); 1694 refresh_check ();
1685} 1695}
1686 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
1687void 1713void
1688rxvt_term::focus_in () 1714rxvt_term::focus_in ()
1689{ 1715{
1690 if (!focus) 1716 if (!focus)
1691 { 1717 {
1692 focus = 1; 1718 focus = 1;
1693 want_refresh = 1; 1719 want_refresh = 1;
1694
1695 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696 1720
1697#if USE_XIM 1721#if USE_XIM
1698 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1699 { 1723 {
1700 IMSetPosition (); 1724 IMSetPosition ();
1712 scr_recolour (); 1736 scr_recolour ();
1713 } 1737 }
1714#endif 1738#endif
1715#if ENABLE_FRILLS 1739#if ENABLE_FRILLS
1716 if (option (Opt_urgentOnBell)) 1740 if (option (Opt_urgentOnBell))
1717 { 1741 set_urgency (0);
1718 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1719 {
1720 h->flags &= ~XUrgencyHint;
1721 XSetWMHints (dpy, parent[0], h);
1722 }
1723 }
1724#endif 1742#endif
1743
1744 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1725 } 1745 }
1726} 1746}
1727 1747
1728void 1748void
1729rxvt_term::focus_out () 1749rxvt_term::focus_out ()
1731 if (focus) 1751 if (focus)
1732 { 1752 {
1733 focus = 0; 1753 focus = 0;
1734 want_refresh = 1; 1754 want_refresh = 1;
1735 1755
1736 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1756#if ENABLE_FRILLS
1737 1757 if (option (Opt_urgentOnBell))
1758 set_urgency (0);
1759#endif
1738#if ENABLE_FRILLS || ISO_14755 1760#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf) 1761 if (iso14755buf)
1740 { 1762 {
1741 iso14755buf = 0; 1763 iso14755buf = 0;
1742# if ISO_14755 1764# if ISO_14755
1759 { 1781 {
1760 pix_colors = pix_colors_unfocused; 1782 pix_colors = pix_colors_unfocused;
1761 scr_recolour (); 1783 scr_recolour ();
1762 } 1784 }
1763#endif 1785#endif
1786
1787 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764 } 1788 }
1765} 1789}
1766 1790
1767void 1791void
1768rxvt_term::update_fade_color (unsigned int idx) 1792rxvt_term::update_fade_color (unsigned int idx)
2010 } 2034 }
2011 2035
2012 if (scrollBar.style == R_SB_XTERM 2036 if (scrollBar.style == R_SB_XTERM
2013 || scrollbar_above_slider (ev.y) 2037 || scrollbar_above_slider (ev.y)
2014 || scrollbar_below_slider (ev.y)) 2038 || scrollbar_below_slider (ev.y))
2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2039 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2016 2040
2017 scrollBar.state = STATE_MOTION; 2041 scrollBar.state = STATE_MOTION;
2018 break; 2042 break;
2019 2043
2020 case Button1: 2044 case Button1:
2043 else 2067 else
2044 { 2068 {
2045 scr_page ((ev.button == Button1 ? DN : UP), 2069 scr_page ((ev.button == Button1 ? DN : UP),
2046 (nrow 2070 (nrow
2047 * scrollbar_position (ev.y) 2071 * scrollbar_position (ev.y)
2048 / scrollbar_size ())); 2072 / scrollBar.size ()));
2049 } 2073 }
2050 2074
2051 break; 2075 break;
2052 } 2076 }
2053 } 2077 }
2066 reportmode = !! (priv_modes & PrivMode_mouse_report); 2090 reportmode = !! (priv_modes & PrivMode_mouse_report);
2067 2091
2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2092 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2069 { 2093 {
2070 scrollBar.state = STATE_IDLE; 2094 scrollBar.state = STATE_IDLE;
2071 scrollbar_show (0); 2095 scrollBar.show (0);
2072 } 2096 }
2073 2097
2074#ifdef SELECTION_SCROLLING 2098#ifdef SELECTION_SCROLLING
2075 sel_scroll_ev.stop(); 2099 sel_scroll_ev.stop();
2076#endif 2100#endif
2126 selection_make (ev.time); 2150 selection_make (ev.time);
2127 break; 2151 break;
2128 2152
2129 case Button2: 2153 case Button2:
2130 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?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2155 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132 break; 2156 break;
2133 2157
2134#ifdef MOUSE_WHEEL 2158#ifdef MOUSE_WHEEL
2135 case Button4: 2159 case Button4:
2136 case Button5: 2160 case Button5:
2159 } 2183 }
2160 else 2184 else
2161# endif 2185# endif
2162 { 2186 {
2163 scr_page (v, i); 2187 scr_page (v, i);
2164 scrollbar_show (1); 2188 scrollBar.show (1);
2165 } 2189 }
2166 } 2190 }
2167 break; 2191 break;
2168#endif 2192#endif
2169 } 2193 }
2170 } 2194 }
2171} 2195}
2172 2196
2173/*}}} */ 2197/*}}} */
2174 2198
2175bool 2199void
2176rxvt_term::cmd_parse () 2200rxvt_term::cmd_parse ()
2177{ 2201{
2178 bool flag = false;
2179 wchar_t ch = NOCHAR; 2202 wchar_t ch = NOCHAR;
2180 char *seq_begin; // remember start of esc-sequence here 2203 char *seq_begin; // remember start of esc-sequence here
2181 2204
2182 for (;;) 2205 for (;;)
2183 { 2206 {
2184 if (ch == NOCHAR) 2207 if (expect_false (ch == NOCHAR))
2185 { 2208 {
2186 seq_begin = cmdbuf_ptr; 2209 seq_begin = cmdbuf_ptr;
2187 ch = next_char (); 2210 ch = next_char ();
2188 2211
2189 if (ch == NOCHAR) 2212 if (ch == NOCHAR)
2190 break; 2213 break;
2191 } 2214 }
2192 2215
2193 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))
2194 { 2217 {
2195 if (!seen_input) 2218 if (expect_false (!seen_input))
2196 { 2219 {
2197 seen_input = 1; 2220 seen_input = 1;
2198 // many badly-written programs (e.g. jed) contain a race condition: 2221 // many badly-written programs (e.g. jed) contain a race condition:
2199 // they first read the screensize and then install a SIGWINCH handler. 2222 // they first read the screensize and then install a SIGWINCH handler.
2200 // some window managers resize the window early, and these programs 2223 // some window managers resize the window early, and these programs
2213 wchar_t *str = buf; 2236 wchar_t *str = buf;
2214 wchar_t *eol = str + min (ncol, UBUFSIZ); 2237 wchar_t *eol = str + min (ncol, UBUFSIZ);
2215 2238
2216 for (;;) 2239 for (;;)
2217 { 2240 {
2218 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)))
2219 break; 2242 break;
2220 2243
2221 *str++ = ch; 2244 *str++ = ch;
2222 2245
2223 if (ch == C0_LF || str >= eol) 2246 if (expect_false (ch == C0_LF || str >= eol))
2224 { 2247 {
2225 if (ch == C0_LF) 2248 if (ch == C0_LF)
2226 nlines++; 2249 nlines++;
2227 2250
2228 refresh_count++; 2251 refresh_count++;
2277 * 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.
2278 * if skipScroll is enabled. 2301 * if skipScroll is enabled.
2279 */ 2302 */
2280 if (refreshnow) 2303 if (refreshnow)
2281 { 2304 {
2282 flag = true;
2283 scr_refresh (); 2305 scr_refresh ();
2284 want_refresh = 1; 2306 want_refresh = 1;
2285 } 2307 }
2286
2287 } 2308 }
2288 else 2309 else
2289 { 2310 {
2290 try 2311 try
2291 { 2312 {
2299 } 2320 }
2300 2321
2301 ch = NOCHAR; 2322 ch = NOCHAR;
2302 } 2323 }
2303 } 2324 }
2304
2305 return flag;
2306} 2325}
2307 2326
2308// read the next character 2327// read the next character
2309wchar_t 2328wchar_t
2310rxvt_term::next_char () NOTHROW 2329rxvt_term::next_char () NOTHROW
2311{ 2330{
2312 while (cmdbuf_ptr < cmdbuf_endp) 2331 while (cmdbuf_ptr < cmdbuf_endp)
2313 { 2332 {
2314 // assume 7-bit to be ascii ALWAYS 2333 // assume 7-bit to be ascii ALWAYS
2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2334 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2316 return *cmdbuf_ptr++; 2335 return *cmdbuf_ptr++;
2317 2336
2318 wchar_t wc; 2337 wchar_t wc;
2319 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);
2320 2339
2324 cmdbuf_ptr = cmdbuf_endp; 2343 cmdbuf_ptr = cmdbuf_endp;
2325 break; 2344 break;
2326 } 2345 }
2327 2346
2328 if (len == (size_t)-1) 2347 if (len == (size_t)-1)
2348 {
2349 mbstate.reset (); // reset now undefined conversion state
2329 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 }
2330 2352
2331 // assume wchar == unicode 2353 // assume wchar == unicode
2332 cmdbuf_ptr += len; 2354 cmdbuf_ptr += len;
2333 return wc & UNICODE_MASK; 2355 return wc & UNICODE_MASK;
2334 } 2356 }
2378/*----------------------------------------------------------------------*/ 2400/*----------------------------------------------------------------------*/
2379#ifdef PRINTPIPE 2401#ifdef PRINTPIPE
2380FILE * 2402FILE *
2381rxvt_term::popen_printer () 2403rxvt_term::popen_printer ()
2382{ 2404{
2383 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2405 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2384 2406
2385 if (stream == NULL) 2407 if (stream == NULL)
2386 rxvt_warn ("can't open printer pipe, not printing.\n"); 2408 rxvt_warn ("can't open printer pipe, not printing.\n");
2387 2409
2388 return stream; 2410 return stream;
2399 * simulate attached vt100 printer 2421 * simulate attached vt100 printer
2400 */ 2422 */
2401void 2423void
2402rxvt_term::process_print_pipe () 2424rxvt_term::process_print_pipe ()
2403{ 2425{
2404 int done; 2426 FILE *fd = popen_printer ();
2405 FILE *fd;
2406 2427
2407 if ((fd = popen_printer ()) == NULL) 2428 if (!fd)
2408 return; 2429 return;
2409 2430
2410 /* 2431 /*
2411 * 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
2412 * is received. 2433 * is received.
2413 */ 2434 */
2414 for (done = 0; !done;) 2435 for (int done = 0; !done; )
2415 { 2436 {
2416 unsigned char buf[8]; 2437 unsigned char buf[8];
2417 unicode_t ch; 2438 unicode_t ch;
2418 unsigned int i, len; 2439 unsigned int i, len;
2419 2440
2564 break; 2585 break;
2565 case 'Z': /* identify the terminal type */ 2586 case 'Z': /* identify the terminal type */
2566 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2587 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2567 break; 2588 break;
2568 case '<': /* turn off VT52 mode */ 2589 case '<': /* turn off VT52 mode */
2569 PrivMode (0, PrivMode_vt52); 2590 set_privmode (PrivMode_vt52, 0);
2570 break; 2591 break;
2571 case 'F': /* use special graphics character set */ 2592 case 'F': /* use special graphics character set */
2572 case 'G': /* use regular character set */ 2593 case 'G': /* use regular character set */
2573 /* unimplemented */ 2594 /* unimplemented */
2574 break; 2595 break;
2628 scr_forwardindex (); 2649 scr_forwardindex ();
2629 break; 2650 break;
2630#endif 2651#endif
2631 case '=': 2652 case '=':
2632 case '>': 2653 case '>':
2633 PrivMode ((ch == '='), PrivMode_aplKP); 2654 set_privmode (PrivMode_aplKP, ch == '=');
2634 break; 2655 break;
2635 2656
2636 case C1_40: 2657 case C1_40:
2637 cmd_getc (); 2658 cmd_getc ();
2638 break; 2659 break;
2677 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2698 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2678 case C1_SCI: /* ESC Z */ 2699 case C1_SCI: /* ESC Z */
2679 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2700 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2680 break; /* steal obsolete ESC [ c */ 2701 break; /* steal obsolete ESC [ c */
2681 2702
2682 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2703 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2683 case C1_CSI: /* ESC [ */ 2704 case C1_CSI: /* ESC [ */
2684 process_csi_seq (); 2705 process_csi_seq ();
2685 break; 2706 break;
2686 2707
2687 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2708 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2688 case C1_OSC: /* ESC ] */ 2709 case C1_OSC: /* ESC ] */
2689 process_osc_seq (); 2710 process_osc_seq ();
2690 break; 2711 break;
2691 2712
2692 /* 8.3.106: RESET TO INITIAL STATE */ 2713 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2693 case 'c': 2714 case 'c':
2694 mbstate.reset (); 2715 mbstate.reset ();
2695 scr_poweron (); 2716 scr_poweron ();
2696 scrollbar_show (1); 2717 scrollBar.show (1);
2697 break; 2718 break;
2698 2719
2699 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2720 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2700 case 'n': 2721 case 'n':
2701 scr_charset_choose (2); 2722 scr_charset_choose (2);
2752 2773
2753 nargs = 0; 2774 nargs = 0;
2754 2775
2755 priv = 0; 2776 priv = 0;
2756 ch = cmd_getc (); 2777 ch = cmd_getc ();
2757 if (ch >= '<' && ch <= '?') 2778 if ((ch >= '<' && ch <= '?') || ch == '!')
2758 { 2779 {
2759 /* '<' '=' '>' '?' */ 2780 /* '<' '=' '>' '?' '!' */
2760 priv = ch; 2781 priv = ch;
2761 ch = cmd_getc (); 2782 ch = cmd_getc ();
2762 } 2783 }
2763 2784
2764 /* read any numerical arguments */ 2785 /* read any numerical arguments */
2818 2839
2819 case '?': 2840 case '?':
2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2841 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2821 process_terminal_mode (ch, priv, nargs, arg); 2842 process_terminal_mode (ch, priv, nargs, arg);
2822 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);
2823 } 2856 }
2857 break;
2858 }
2859
2824 return; 2860 return;
2825 } 2861 }
2826 2862
2827 switch (ch) 2863 switch (ch)
2828 { 2864 {
3257 3293
3258/* 3294/*
3259 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3295 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3260 */ 3296 */
3261void 3297void
3262rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3298rxvt_term::process_xterm_seq (int op, char *str, char resp)
3263{ 3299{
3264 int color; 3300 int color;
3265 char *buf, *name; 3301 char *buf, *name;
3266 bool query = str[0] == '?' && !str[1]; 3302 bool query = str[0] == '?' && !str[1];
3267 int saveop = op; 3303 int saveop = op;
3308 3344
3309 XFree (value); 3345 XFree (value);
3310 } 3346 }
3311 else 3347 else
3312 { 3348 {
3313 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3349 char *eq = strchr (str, '=');
3314 3350
3315 if (eq) 3351 if (eq)
3316 { 3352 {
3317 *eq = 0; 3353 *eq = 0;
3318 set_utf8_property (display->atom (str), eq + 1); 3354 set_utf8_property (display->atom (str), eq + 1);
3358 process_color_seq (op, Color_pointer_fg, str, resp); 3394 process_color_seq (op, Color_pointer_fg, str, resp);
3359 break; 3395 break;
3360 case XTerm_Color_pointer_bg: 3396 case XTerm_Color_pointer_bg:
3361 process_color_seq (op, Color_pointer_bg, str, resp); 3397 process_color_seq (op, Color_pointer_bg, str, resp);
3362 break; 3398 break;
3399#ifdef OPTION_HC
3400 case XTerm_Color_HC:
3401 process_color_seq (op, Color_HC, str, resp);
3402 break;
3403 case XTerm_Color_HTC:
3404 process_color_seq (op, Color_HTC, str, resp);
3405 break;
3406#endif
3363#ifndef NO_BOLD_UNDERLINE_REVERSE 3407#ifndef NO_BOLD_UNDERLINE_REVERSE
3364 case XTerm_Color_RV:
3365 process_color_seq (op, Color_RV, str, resp);
3366 break;
3367 case Rxvt_Color_BD:
3368 case URxvt_Color_BD: 3408 case URxvt_Color_BD:
3369 process_color_seq (op, Color_BD, str, resp); 3409 process_color_seq (op, Color_BD, str, resp);
3370 break; 3410 break;
3371 case Rxvt_Color_UL:
3372 case URxvt_Color_UL: 3411 case URxvt_Color_UL:
3373 process_color_seq (op, Color_UL, str, resp); 3412 process_color_seq (op, Color_UL, str, resp);
3374 break; 3413 break;
3375 case URxvt_Color_IT: 3414 case URxvt_Color_IT:
3376 process_color_seq (op, Color_IT, str, resp); 3415 process_color_seq (op, Color_IT, str, resp);
3377 break; 3416 break;
3378#endif 3417#endif
3418 case URxvt_Color_border:
3419 process_color_seq (op, Color_border, str, resp);
3420 break;
3379#if ENABLE_TRANSPARENCY 3421#if ENABLE_TRANSPARENCY
3380 case URxvt_Color_tint: 3422 case URxvt_Color_tint:
3381 process_color_seq (op, Color_tint, str, resp); 3423 process_color_seq (op, Color_tint, str, resp);
3382 { 3424 {
3383 bool changed = false; 3425 bool changed = false;
3398 case Rxvt_Pixmap: 3440 case Rxvt_Pixmap:
3399 if (!strcmp (str, "?")) 3441 if (!strcmp (str, "?"))
3400 { 3442 {
3401 char str[256]; 3443 char str[256];
3402 3444
3403 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3445 sprintf (str, "[%dx%d+%d+%d]",
3404 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3446 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3405 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3447 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3406 process_xterm_seq (XTerm_title, str, CHAR_ST); 3448 process_xterm_seq (XTerm_title, str, CHAR_ST);
3407 } 3449 }
3408 else 3450 else
3507 break; 3549 break;
3508#endif 3550#endif
3509 3551
3510#if ENABLE_PERL 3552#if ENABLE_PERL
3511 case URxvt_perl: 3553 case URxvt_perl:
3512 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3554 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3513 ; // no responses yet
3514 break; 3555 break;
3515#endif 3556#endif
3516 } 3557 }
3517} 3558}
3518/*----------------------------------------------------------------------*/ 3559/*----------------------------------------------------------------------*/
3541 { 3582 {
3542 if (mode == 'r') 3583 if (mode == 'r')
3543 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3584 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3544 else 3585 else
3545 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3586 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3546 PrivMode (state, bit); 3587 set_privmode (bit, state);
3547 } 3588 }
3548 3589
3549 return state; 3590 return state;
3550} 3591}
3551 3592
3559 static const struct 3600 static const struct
3560 { 3601 {
3561 const int argval; 3602 const int argval;
3562 const unsigned long bit; 3603 const unsigned long bit;
3563 } argtopriv[] = { 3604 } argtopriv[] = {
3564 { 1, PrivMode_aplCUR }, 3605 { 1, PrivMode_aplCUR }, // DECCKM
3565 { 2, PrivMode_vt52 }, 3606 { 2, PrivMode_vt52 },
3566 { 3, PrivMode_132 }, 3607 { 3, PrivMode_132 }, // DECCOLM
3567 { 4, PrivMode_smoothScroll }, 3608 { 4, PrivMode_smoothScroll }, // DECSCLM
3568 { 5, PrivMode_rVideo }, 3609 { 5, PrivMode_rVideo }, // DECSCNM
3569 { 6, PrivMode_relOrigin }, 3610 { 6, PrivMode_relOrigin }, // DECOM
3570 { 7, PrivMode_Autowrap }, 3611 { 7, PrivMode_Autowrap }, // DECAWM
3571 // 8, bi-directional support mode 3612 // 8, auto-repeat keys // DECARM
3572 { 9, PrivMode_MouseX10 }, 3613 { 9, PrivMode_MouseX10 },
3573 // 18, 19 printing-related 3614 // 18 end FF to printer after print screen
3615 // 19 Print screen prints full screen/scorll region
3574 { 25, PrivMode_VisibleCursor }, 3616 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3575#ifdef scrollBar_esc 3617#ifdef scrollBar_esc
3576 { scrollBar_esc, PrivMode_scrollBar }, 3618 { scrollBar_esc, PrivMode_scrollBar },
3577#endif 3619#endif
3578 { 35, PrivMode_ShiftKeys }, // rxvt extension 3620 { 35, PrivMode_ShiftKeys }, // rxvt extension
3621 // 38, tektronix mode // DECTEK
3579 { 40, PrivMode_132OK }, 3622 { 40, PrivMode_132OK },
3580 // 41 xterm more fixes NYI 3623 // 41 xterm more fixes NYI
3581 // 45 margin bell NYI 3624 // 45 margin bell NYI
3582 // 46 start logging 3625 // 46 start logging
3583 { 47, PrivMode_Screen }, 3626 { 47, PrivMode_Screen },
3584 { 66, PrivMode_aplKP }, 3627 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3585#ifndef NO_BACKSPACE_KEY 3628#ifndef NO_BACKSPACE_KEY
3586 { 67, PrivMode_BackSpace }, 3629 { 67, PrivMode_BackSpace }, // DECBKM
3587#endif 3630#endif
3588 { 1000, PrivMode_MouseX11 }, 3631 { 1000, PrivMode_MouseX11 },
3589 { 1002, PrivMode_MouseBtnEvent }, 3632 { 1002, PrivMode_MouseBtnEvent },
3590 { 1003, PrivMode_MouseAnyEvent }, 3633 { 1003, PrivMode_MouseAnyEvent },
3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3634 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3630 3673
3631 scr_touch (true); 3674 scr_touch (true);
3632 break; 3675 break;
3633#endif 3676#endif
3634 case 1048: /* alternative cursor save */ 3677 case 1048: /* alternative cursor save */
3635 case 1049:
3636 if (option (Opt_secondaryScreen)) 3678 if (option (Opt_secondaryScreen))
3637 if (mode == 0) 3679 if (mode == 0)
3638 scr_cursor (RESTORE); 3680 scr_cursor (RESTORE);
3639 else if (mode == 1) 3681 else if (mode == 1)
3640 scr_cursor (SAVE); 3682 scr_cursor (SAVE);
3649 case 2: /* VT52 mode */ 3691 case 2: /* VT52 mode */
3650 /* oddball mode. should be set regardless of set/reset 3692 /* oddball mode. should be set regardless of set/reset
3651 * parameter. Return from VT52 mode with an ESC < from 3693 * parameter. Return from VT52 mode with an ESC < from
3652 * within VT52 mode 3694 * within VT52 mode
3653 */ 3695 */
3654 PrivMode (1, PrivMode_vt52); 3696 set_privmode (PrivMode_vt52, 1);
3655 break; 3697 break;
3656 case 3: /* 80/132 */ 3698 case 3: /* 80/132 */
3657 if (priv_modes & PrivMode_132OK) 3699 if (priv_modes & PrivMode_132OK)
3658 {
3659 scr_poweron ();
3660 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3700 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3661 }
3662 break; 3701 break;
3663 case 4: /* smooth scrolling */ 3702 case 4: /* smooth scrolling */
3664 set_option (Opt_jumpScroll, !state); 3703 set_option (Opt_jumpScroll, !state);
3665 break; 3704 break;
3666 case 5: /* reverse video */ 3705 case 5: /* reverse video */
3677 if (state) /* orthogonal */ 3716 if (state) /* orthogonal */
3678 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3717 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3679 break; 3718 break;
3680#ifdef scrollBar_esc 3719#ifdef scrollBar_esc
3681 case scrollBar_esc: 3720 case scrollBar_esc:
3682 if (scrollbar_mapping (state)) 3721 if (scrollBar.map (state))
3683 { 3722 {
3684 resize_all_windows (0, 0, 0); 3723 resize_all_windows (0, 0, 0);
3685 scr_touch (true); 3724 scr_touch (true);
3686 } 3725 }
3687 break; 3726 break;
3708 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3747 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3709 vt_emask_mouse = PointerMotionMask; 3748 vt_emask_mouse = PointerMotionMask;
3710 } 3749 }
3711 else 3750 else
3712 vt_emask_mouse = NoEventMask; 3751 vt_emask_mouse = NoEventMask;
3752
3713 vt_select_input (); 3753 vt_select_input ();
3714 break; 3754 break;
3715 case 1010: /* scroll to bottom on TTY output inhibit */ 3755 case 1010: /* scroll to bottom on TTY output inhibit */
3716 set_option (Opt_scrollTtyOutput, !state); 3756 set_option (Opt_scrollTtyOutput, !state);
3717 break; 3757 break;
3718 case 1011: /* scroll to bottom on key press */ 3758 case 1011: /* scroll to bottom on key press */
3719 set_option (Opt_scrollTtyKeypress, state); 3759 set_option (Opt_scrollTtyKeypress, state);
3720 break; 3760 break;
3721 case 1047: /* secondary screen w/ clearing last */ 3761 case 1047: /* secondary screen w/ clearing last */
3722 if (option (Opt_secondaryScreen)) 3762 if (option (Opt_secondaryScreen))
3723 if (current_screen != PRIMARY) 3763 if (!state)
3724 scr_erase_screen (2); 3764 scr_erase_screen (2);
3765
3725 scr_change_screen (state); 3766 scr_change_screen (state);
3726 break; 3767 break;
3727 case 1049: /* secondary screen w/ clearing first */ 3768 case 1049: /* secondary screen w/ clearing first */
3769 if (option (Opt_secondaryScreen))
3770 if (state)
3771 scr_cursor (SAVE);
3772
3728 scr_change_screen (state); 3773 scr_change_screen (state);
3774
3729 if (option (Opt_secondaryScreen)) 3775 if (option (Opt_secondaryScreen))
3730 if (current_screen != PRIMARY) 3776 if (state)
3731 scr_erase_screen (2); 3777 scr_erase_screen (2);
3778 else
3779 scr_cursor (RESTORE);
3732 break; 3780 break;
3733 default: 3781 default:
3734 break; 3782 break;
3735 } 3783 }
3736 } 3784 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines