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.425 by root, Wed Nov 5 12:28:15 2008 UTC vs.
Revision 1.434 by sf-exg, Wed Jan 6 10:29:14 2010 UTC

… …
579 } 579 }
580 } 580 }
581 581
582#if ENABLE_FRILLS || ISO_14755 582#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 583 // ISO 14755 support
584 if (shft && ctrl) 584 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 585 {
586 int hv; 586 int hv;
587 587
588 if (iso14755buf & ISO_14755_51 588 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 589 && (keysym == XK_space || keysym == XK_KP_Space
… …
1684#endif 1684#endif
1685 1685
1686 refresh_check (); 1686 refresh_check ();
1687} 1687}
1688 1688
1689#if ENABLE_FRILLS
1689void 1690void
1690rxvt_term::set_urgency (bool enable) 1691rxvt_term::set_urgency (bool enable)
1691{ 1692{
1692 if (enable == urgency_hint) 1693 if (enable == urgency_hint)
1693 return; 1694 return;
… …
1697 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1698 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1698 XSetWMHints (dpy, parent[0], h); 1699 XSetWMHints (dpy, parent[0], h);
1699 urgency_hint = enable; 1700 urgency_hint = enable;
1700 } 1701 }
1701} 1702}
1703#endif
1702 1704
1703void 1705void
1704rxvt_term::focus_in () 1706rxvt_term::focus_in ()
1705{ 1707{
1706 if (!focus) 1708 if (!focus)
… …
2334 break; 2336 break;
2335 } 2337 }
2336 2338
2337 if (len == (size_t)-1) 2339 if (len == (size_t)-1)
2338 { 2340 {
2339 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2341 mbstate.reset (); // reset now undefined conversion state
2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2342 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2341 } 2343 }
2342 2344
2343 // assume wchar == unicode 2345 // assume wchar == unicode
2344 cmdbuf_ptr += len; 2346 cmdbuf_ptr += len;
… …
3283 3285
3284/* 3286/*
3285 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3287 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3286 */ 3288 */
3287void 3289void
3288rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3290rxvt_term::process_xterm_seq (int op, char *str, char resp)
3289{ 3291{
3290 int color; 3292 int color;
3291 char *buf, *name; 3293 char *buf, *name;
3292 bool query = str[0] == '?' && !str[1]; 3294 bool query = str[0] == '?' && !str[1];
3293 int saveop = op; 3295 int saveop = op;
… …
3334 3336
3335 XFree (value); 3337 XFree (value);
3336 } 3338 }
3337 else 3339 else
3338 { 3340 {
3339 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3341 char *eq = strchr (str, '=');
3340 3342
3341 if (eq) 3343 if (eq)
3342 { 3344 {
3343 *eq = 0; 3345 *eq = 0;
3344 set_utf8_property (display->atom (str), eq + 1); 3346 set_utf8_property (display->atom (str), eq + 1);
… …
3400 break; 3402 break;
3401 case URxvt_Color_IT: 3403 case URxvt_Color_IT:
3402 process_color_seq (op, Color_IT, str, resp); 3404 process_color_seq (op, Color_IT, str, resp);
3403 break; 3405 break;
3404#endif 3406#endif
3407 case URxvt_Color_border:
3408 process_color_seq (op, Color_border, str, resp);
3409 break;
3405#if ENABLE_TRANSPARENCY 3410#if ENABLE_TRANSPARENCY
3406 case URxvt_Color_tint: 3411 case URxvt_Color_tint:
3407 process_color_seq (op, Color_tint, str, resp); 3412 process_color_seq (op, Color_tint, str, resp);
3408 { 3413 {
3409 bool changed = false; 3414 bool changed = false;
… …
3593 { 5, PrivMode_rVideo }, // DECSCNM 3598 { 5, PrivMode_rVideo }, // DECSCNM
3594 { 6, PrivMode_relOrigin }, // DECOM 3599 { 6, PrivMode_relOrigin }, // DECOM
3595 { 7, PrivMode_Autowrap }, // DECAWM 3600 { 7, PrivMode_Autowrap }, // DECAWM
3596 // 8, auto-repeat keys // DECARM 3601 // 8, auto-repeat keys // DECARM
3597 { 9, PrivMode_MouseX10 }, 3602 { 9, PrivMode_MouseX10 },
3598 // 18, 19 printing-related 3603 // 18 end FF to printer after print screen
3604 // 19 Print screen prints full screen/scorll region
3599 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3605 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3600#ifdef scrollBar_esc 3606#ifdef scrollBar_esc
3601 { scrollBar_esc, PrivMode_scrollBar }, 3607 { scrollBar_esc, PrivMode_scrollBar },
3602#endif 3608#endif
3603 { 35, PrivMode_ShiftKeys }, // rxvt extension 3609 { 35, PrivMode_ShiftKeys }, // rxvt extension
… …
3656 3662
3657 scr_touch (true); 3663 scr_touch (true);
3658 break; 3664 break;
3659#endif 3665#endif
3660 case 1048: /* alternative cursor save */ 3666 case 1048: /* alternative cursor save */
3661 case 1049:
3662 if (option (Opt_secondaryScreen)) 3667 if (option (Opt_secondaryScreen))
3663 if (mode == 0) 3668 if (mode == 0)
3664 scr_cursor (RESTORE); 3669 scr_cursor (RESTORE);
3665 else if (mode == 1) 3670 else if (mode == 1)
3666 scr_cursor (SAVE); 3671 scr_cursor (SAVE);
… …
3742 case 1011: /* scroll to bottom on key press */ 3747 case 1011: /* scroll to bottom on key press */
3743 set_option (Opt_scrollTtyKeypress, state); 3748 set_option (Opt_scrollTtyKeypress, state);
3744 break; 3749 break;
3745 case 1047: /* secondary screen w/ clearing last */ 3750 case 1047: /* secondary screen w/ clearing last */
3746 if (option (Opt_secondaryScreen)) 3751 if (option (Opt_secondaryScreen))
3747 if (current_screen != PRIMARY) 3752 if (!state)
3748 scr_erase_screen (2); 3753 scr_erase_screen (2);
3749 3754
3750 scr_change_screen (state); 3755 scr_change_screen (state);
3751 break; 3756 break;
3752 case 1049: /* secondary screen w/ clearing first */ 3757 case 1049: /* secondary screen w/ clearing first */
3758 if (option (Opt_secondaryScreen))
3759 if (state)
3760 scr_cursor (SAVE);
3761
3753 scr_change_screen (state); 3762 scr_change_screen (state);
3763
3754 if (option (Opt_secondaryScreen)) 3764 if (option (Opt_secondaryScreen))
3755 if (current_screen != PRIMARY) 3765 if (state)
3756 scr_erase_screen (2); 3766 scr_erase_screen (2);
3767 else
3768 scr_cursor (RESTORE);
3757 break; 3769 break;
3758 default: 3770 default:
3759 break; 3771 break;
3760 } 3772 }
3761 } 3773 }

Diff Legend

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