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.420 by root, Wed Oct 15 14:48:22 2008 UTC vs.
Revision 1.438 by root, Thu Feb 4 21:55:12 2010 UTC

… …
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);
… …
1127 { 1130 {
1128 // this should really be sched_yield(), but the linux guys thought 1131 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1132 // 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 1133 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1134 // allowed by the sus... as is returning ENOSYS.
1135 // since the linux guys additionally thought that breaking the only
1136 // known workaroudn against their unusable sched_yield hack is cool,
1137 // we just nanosleep a bit and hope for the best.
1132 1138
1133 struct timespec ts = { 0, 0 }; 1139 struct timespec ts = { 0, 1000 };
1134 nanosleep (&ts, 0); 1140 nanosleep (&ts, 0);
1135 1141
1136 w.stop (); 1142 w.stop ();
1137 } 1143 }
1138 1144
… …
1188{ 1194{
1189 make_current (); 1195 make_current ();
1190 1196
1191 if (revents & ev::READ) 1197 if (revents & ev::READ)
1192 // loop, but don't allow a single term to monopolize us 1198 // loop, but don't allow a single term to monopolize us
1193 while (pty_fill ()) 1199 for (int i = CBUFCNT; i-- && pty_fill (); )
1194 if (cmd_parse ()) 1200 cmd_parse ();
1195 break;
1196 1201
1197 if (revents & ev::WRITE) 1202 if (revents & ev::WRITE)
1198 pty_write (); 1203 pty_write ();
1199 1204
1200 refresh_check (); 1205 refresh_check ();
… …
1459 selection_property (ev.xproperty.window, ev.xproperty.atom); 1464 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460 1465
1461 break; 1466 break;
1462 1467
1463 case SelectionClear: 1468 case SelectionClear:
1464 selection_clear (); 1469 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465 break; 1470 break;
1466 1471
1467 case SelectionNotify: 1472 case SelectionNotify:
1468 if (selection_wait == Sel_normal) 1473 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1474 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1682#endif 1687#endif
1683 1688
1684 refresh_check (); 1689 refresh_check ();
1685} 1690}
1686 1691
1692#if ENABLE_FRILLS
1687void 1693void
1688rxvt_term::set_urgency (bool enable) 1694rxvt_term::set_urgency (bool enable)
1689{ 1695{
1690 if (enable == urgency_hint) 1696 if (enable == urgency_hint)
1691 return; 1697 return;
… …
1695 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1701 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1696 XSetWMHints (dpy, parent[0], h); 1702 XSetWMHints (dpy, parent[0], h);
1697 urgency_hint = enable; 1703 urgency_hint = enable;
1698 } 1704 }
1699} 1705}
1706#endif
1700 1707
1701void 1708void
1702rxvt_term::focus_in () 1709rxvt_term::focus_in ()
1703{ 1710{
1704 if (!focus) 1711 if (!focus)
… …
2182 } 2189 }
2183} 2190}
2184 2191
2185/*}}} */ 2192/*}}} */
2186 2193
2187bool 2194void
2188rxvt_term::cmd_parse () 2195rxvt_term::cmd_parse ()
2189{ 2196{
2190 bool flag = false;
2191 wchar_t ch = NOCHAR; 2197 wchar_t ch = NOCHAR;
2192 char *seq_begin; // remember start of esc-sequence here 2198 char *seq_begin; // remember start of esc-sequence here
2193 2199
2194 for (;;) 2200 for (;;)
2195 { 2201 {
… …
2289 * What the heck we'll cheat and only refresh less than every page-full. 2295 * What the heck we'll cheat and only refresh less than every page-full.
2290 * if skipScroll is enabled. 2296 * if skipScroll is enabled.
2291 */ 2297 */
2292 if (refreshnow) 2298 if (refreshnow)
2293 { 2299 {
2294 flag = true;
2295 scr_refresh (); 2300 scr_refresh ();
2296 want_refresh = 1; 2301 want_refresh = 1;
2297 } 2302 }
2298
2299 } 2303 }
2300 else 2304 else
2301 { 2305 {
2302 try 2306 try
2303 { 2307 {
… …
2311 } 2315 }
2312 2316
2313 ch = NOCHAR; 2317 ch = NOCHAR;
2314 } 2318 }
2315 } 2319 }
2316
2317 return flag;
2318} 2320}
2319 2321
2320// read the next character 2322// read the next character
2321wchar_t 2323wchar_t
2322rxvt_term::next_char () NOTHROW 2324rxvt_term::next_char () NOTHROW
… …
2337 break; 2339 break;
2338 } 2340 }
2339 2341
2340 if (len == (size_t)-1) 2342 if (len == (size_t)-1)
2341 { 2343 {
2342 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2344 mbstate.reset (); // reset now undefined conversion state
2343 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2345 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2344 } 2346 }
2345 2347
2346 // assume wchar == unicode 2348 // assume wchar == unicode
2347 cmdbuf_ptr += len; 2349 cmdbuf_ptr += len;
… …
2691 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2693 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2692 case C1_SCI: /* ESC Z */ 2694 case C1_SCI: /* ESC Z */
2693 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2695 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2694 break; /* steal obsolete ESC [ c */ 2696 break; /* steal obsolete ESC [ c */
2695 2697
2696 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2698 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2697 case C1_CSI: /* ESC [ */ 2699 case C1_CSI: /* ESC [ */
2698 process_csi_seq (); 2700 process_csi_seq ();
2699 break; 2701 break;
2700 2702
2701 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2703 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2702 case C1_OSC: /* ESC ] */ 2704 case C1_OSC: /* ESC ] */
2703 process_osc_seq (); 2705 process_osc_seq ();
2704 break; 2706 break;
2705 2707
2706 /* 8.3.106: RESET TO INITIAL STATE */ 2708 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2707 case 'c': 2709 case 'c':
2708 mbstate.reset (); 2710 mbstate.reset ();
2709 scr_poweron (); 2711 scr_poweron ();
2710 scrollBar.show (1); 2712 scrollBar.show (1);
2711 break; 2713 break;
… …
2766 2768
2767 nargs = 0; 2769 nargs = 0;
2768 2770
2769 priv = 0; 2771 priv = 0;
2770 ch = cmd_getc (); 2772 ch = cmd_getc ();
2771 if (ch >= '<' && ch <= '?') 2773 if ((ch >= '<' && ch <= '?') || ch == '!')
2772 { 2774 {
2773 /* '<' '=' '>' '?' */ 2775 /* '<' '=' '>' '?' '!' */
2774 priv = ch; 2776 priv = ch;
2775 ch = cmd_getc (); 2777 ch = cmd_getc ();
2776 } 2778 }
2777 2779
2778 /* read any numerical arguments */ 2780 /* read any numerical arguments */
… …
2832 2834
2833 case '?': 2835 case '?':
2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2836 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2835 process_terminal_mode (ch, priv, nargs, arg); 2837 process_terminal_mode (ch, priv, nargs, arg);
2836 break; 2838 break;
2839
2840 case '!':
2841 if (ch == CSI_70)
2842 {
2843 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2844 scr_soft_reset ();
2845
2846 static const int pm_h[] = { 7, 25 };
2847 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2848
2849 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2850 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2837 } 2851 }
2852 break;
2853 }
2854
2838 return; 2855 return;
2839 } 2856 }
2840 2857
2841 switch (ch) 2858 switch (ch)
2842 { 2859 {
… …
3271 3288
3272/* 3289/*
3273 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3290 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3274 */ 3291 */
3275void 3292void
3276rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3293rxvt_term::process_xterm_seq (int op, char *str, char resp)
3277{ 3294{
3278 int color; 3295 int color;
3279 char *buf, *name; 3296 char *buf, *name;
3280 bool query = str[0] == '?' && !str[1]; 3297 bool query = str[0] == '?' && !str[1];
3281 int saveop = op; 3298 int saveop = op;
… …
3322 3339
3323 XFree (value); 3340 XFree (value);
3324 } 3341 }
3325 else 3342 else
3326 { 3343 {
3327 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3344 char *eq = strchr (str, '=');
3328 3345
3329 if (eq) 3346 if (eq)
3330 { 3347 {
3331 *eq = 0; 3348 *eq = 0;
3332 set_utf8_property (display->atom (str), eq + 1); 3349 set_utf8_property (display->atom (str), eq + 1);
… …
3388 break; 3405 break;
3389 case URxvt_Color_IT: 3406 case URxvt_Color_IT:
3390 process_color_seq (op, Color_IT, str, resp); 3407 process_color_seq (op, Color_IT, str, resp);
3391 break; 3408 break;
3392#endif 3409#endif
3410 case URxvt_Color_border:
3411 process_color_seq (op, Color_border, str, resp);
3412 break;
3393#if ENABLE_TRANSPARENCY 3413#if ENABLE_TRANSPARENCY
3394 case URxvt_Color_tint: 3414 case URxvt_Color_tint:
3395 process_color_seq (op, Color_tint, str, resp); 3415 process_color_seq (op, Color_tint, str, resp);
3396 { 3416 {
3397 bool changed = false; 3417 bool changed = false;
… …
3412 case Rxvt_Pixmap: 3432 case Rxvt_Pixmap:
3413 if (!strcmp (str, "?")) 3433 if (!strcmp (str, "?"))
3414 { 3434 {
3415 char str[256]; 3435 char str[256];
3416 3436
3417 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3437 sprintf (str, "[%dx%d+%d+%d]",
3418 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3438 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3419 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3439 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3420 process_xterm_seq (XTerm_title, str, CHAR_ST); 3440 process_xterm_seq (XTerm_title, str, CHAR_ST);
3421 } 3441 }
3422 else 3442 else
… …
3572 static const struct 3592 static const struct
3573 { 3593 {
3574 const int argval; 3594 const int argval;
3575 const unsigned long bit; 3595 const unsigned long bit;
3576 } argtopriv[] = { 3596 } argtopriv[] = {
3577 { 1, PrivMode_aplCUR }, 3597 { 1, PrivMode_aplCUR }, // DECCKM
3578 { 2, PrivMode_vt52 }, 3598 { 2, PrivMode_vt52 },
3579 { 3, PrivMode_132 }, 3599 { 3, PrivMode_132 }, // DECCOLM
3580 { 4, PrivMode_smoothScroll }, 3600 { 4, PrivMode_smoothScroll }, // DECSCLM
3581 { 5, PrivMode_rVideo }, 3601 { 5, PrivMode_rVideo }, // DECSCNM
3582 { 6, PrivMode_relOrigin }, 3602 { 6, PrivMode_relOrigin }, // DECOM
3583 { 7, PrivMode_Autowrap }, 3603 { 7, PrivMode_Autowrap }, // DECAWM
3584 // 8, bi-directional support mode 3604 // 8, auto-repeat keys // DECARM
3585 { 9, PrivMode_MouseX10 }, 3605 { 9, PrivMode_MouseX10 },
3586 // 18, 19 printing-related 3606 // 18 end FF to printer after print screen
3607 // 19 Print screen prints full screen/scorll region
3587 { 25, PrivMode_VisibleCursor }, 3608 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3588#ifdef scrollBar_esc 3609#ifdef scrollBar_esc
3589 { scrollBar_esc, PrivMode_scrollBar }, 3610 { scrollBar_esc, PrivMode_scrollBar },
3590#endif 3611#endif
3591 { 35, PrivMode_ShiftKeys }, // rxvt extension 3612 { 35, PrivMode_ShiftKeys }, // rxvt extension
3613 // 38, tektronix mode // DECTEK
3592 { 40, PrivMode_132OK }, 3614 { 40, PrivMode_132OK },
3593 // 41 xterm more fixes NYI 3615 // 41 xterm more fixes NYI
3594 // 45 margin bell NYI 3616 // 45 margin bell NYI
3595 // 46 start logging 3617 // 46 start logging
3596 { 47, PrivMode_Screen }, 3618 { 47, PrivMode_Screen },
3597 { 66, PrivMode_aplKP }, 3619 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3598#ifndef NO_BACKSPACE_KEY 3620#ifndef NO_BACKSPACE_KEY
3599 { 67, PrivMode_BackSpace }, 3621 { 67, PrivMode_BackSpace }, // DECBKM
3600#endif 3622#endif
3601 { 1000, PrivMode_MouseX11 }, 3623 { 1000, PrivMode_MouseX11 },
3602 { 1002, PrivMode_MouseBtnEvent }, 3624 { 1002, PrivMode_MouseBtnEvent },
3603 { 1003, PrivMode_MouseAnyEvent }, 3625 { 1003, PrivMode_MouseAnyEvent },
3604 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3626 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
… …
3643 3665
3644 scr_touch (true); 3666 scr_touch (true);
3645 break; 3667 break;
3646#endif 3668#endif
3647 case 1048: /* alternative cursor save */ 3669 case 1048: /* alternative cursor save */
3648 case 1049:
3649 if (option (Opt_secondaryScreen)) 3670 if (option (Opt_secondaryScreen))
3650 if (mode == 0) 3671 if (mode == 0)
3651 scr_cursor (RESTORE); 3672 scr_cursor (RESTORE);
3652 else if (mode == 1) 3673 else if (mode == 1)
3653 scr_cursor (SAVE); 3674 scr_cursor (SAVE);
… …
3666 */ 3687 */
3667 set_privmode (PrivMode_vt52, 1); 3688 set_privmode (PrivMode_vt52, 1);
3668 break; 3689 break;
3669 case 3: /* 80/132 */ 3690 case 3: /* 80/132 */
3670 if (priv_modes & PrivMode_132OK) 3691 if (priv_modes & PrivMode_132OK)
3671 {
3672 scr_poweron ();
3673 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3692 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3674 }
3675 break; 3693 break;
3676 case 4: /* smooth scrolling */ 3694 case 4: /* smooth scrolling */
3677 set_option (Opt_jumpScroll, !state); 3695 set_option (Opt_jumpScroll, !state);
3678 break; 3696 break;
3679 case 5: /* reverse video */ 3697 case 5: /* reverse video */
… …
3721 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3739 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3722 vt_emask_mouse = PointerMotionMask; 3740 vt_emask_mouse = PointerMotionMask;
3723 } 3741 }
3724 else 3742 else
3725 vt_emask_mouse = NoEventMask; 3743 vt_emask_mouse = NoEventMask;
3744
3726 vt_select_input (); 3745 vt_select_input ();
3727 break; 3746 break;
3728 case 1010: /* scroll to bottom on TTY output inhibit */ 3747 case 1010: /* scroll to bottom on TTY output inhibit */
3729 set_option (Opt_scrollTtyOutput, !state); 3748 set_option (Opt_scrollTtyOutput, !state);
3730 break; 3749 break;
3731 case 1011: /* scroll to bottom on key press */ 3750 case 1011: /* scroll to bottom on key press */
3732 set_option (Opt_scrollTtyKeypress, state); 3751 set_option (Opt_scrollTtyKeypress, state);
3733 break; 3752 break;
3734 case 1047: /* secondary screen w/ clearing last */ 3753 case 1047: /* secondary screen w/ clearing last */
3735 if (option (Opt_secondaryScreen)) 3754 if (option (Opt_secondaryScreen))
3736 if (current_screen != PRIMARY) 3755 if (!state)
3737 scr_erase_screen (2); 3756 scr_erase_screen (2);
3757
3738 scr_change_screen (state); 3758 scr_change_screen (state);
3739 break; 3759 break;
3740 case 1049: /* secondary screen w/ clearing first */ 3760 case 1049: /* secondary screen w/ clearing first */
3761 if (option (Opt_secondaryScreen))
3762 if (state)
3763 scr_cursor (SAVE);
3764
3741 scr_change_screen (state); 3765 scr_change_screen (state);
3766
3742 if (option (Opt_secondaryScreen)) 3767 if (option (Opt_secondaryScreen))
3743 if (current_screen != PRIMARY) 3768 if (state)
3744 scr_erase_screen (2); 3769 scr_erase_screen (2);
3770 else
3771 scr_cursor (RESTORE);
3745 break; 3772 break;
3746 default: 3773 default:
3747 break; 3774 break;
3748 } 3775 }
3749 } 3776 }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines