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.426 by root, Wed Nov 5 13:49:36 2008 UTC vs.
Revision 1.437 by sf-exg, Fri Jan 29 17:27:36 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
… …
619 scr_overlay_off (); 619 scr_overlay_off ();
620# endif 620# endif
621 iso14755buf = 0; 621 iso14755buf = 0;
622 } 622 }
623 } 623 }
624 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 625 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 626 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 627 if (!(iso14755buf & ISO_14755_STARTED))
627 { 628 {
628 iso14755buf |= ISO_14755_STARTED; 629 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 630# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 631 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
1461 selection_property (ev.xproperty.window, ev.xproperty.atom); 1462 selection_property (ev.xproperty.window, ev.xproperty.atom);
1462 1463
1463 break; 1464 break;
1464 1465
1465 case SelectionClear: 1466 case SelectionClear:
1466 selection_clear (); 1467 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467 break; 1468 break;
1468 1469
1469 case SelectionNotify: 1470 case SelectionNotify:
1470 if (selection_wait == Sel_normal) 1471 if (selection_wait == Sel_normal)
1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1472 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1684#endif 1685#endif
1685 1686
1686 refresh_check (); 1687 refresh_check ();
1687} 1688}
1688 1689
1690#if ENABLE_FRILLS
1689void 1691void
1690rxvt_term::set_urgency (bool enable) 1692rxvt_term::set_urgency (bool enable)
1691{ 1693{
1692 if (enable == urgency_hint) 1694 if (enable == urgency_hint)
1693 return; 1695 return;
… …
1697 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1699 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1698 XSetWMHints (dpy, parent[0], h); 1700 XSetWMHints (dpy, parent[0], h);
1699 urgency_hint = enable; 1701 urgency_hint = enable;
1700 } 1702 }
1701} 1703}
1704#endif
1702 1705
1703void 1706void
1704rxvt_term::focus_in () 1707rxvt_term::focus_in ()
1705{ 1708{
1706 if (!focus) 1709 if (!focus)
… …
2334 break; 2337 break;
2335 } 2338 }
2336 2339
2337 if (len == (size_t)-1) 2340 if (len == (size_t)-1)
2338 { 2341 {
2339 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2342 mbstate.reset (); // reset now undefined conversion state
2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2343 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2341 } 2344 }
2342 2345
2343 // assume wchar == unicode 2346 // assume wchar == unicode
2344 cmdbuf_ptr += len; 2347 cmdbuf_ptr += len;
… …
3283 3286
3284/* 3287/*
3285 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3288 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3286 */ 3289 */
3287void 3290void
3288rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3291rxvt_term::process_xterm_seq (int op, char *str, char resp)
3289{ 3292{
3290 int color; 3293 int color;
3291 char *buf, *name; 3294 char *buf, *name;
3292 bool query = str[0] == '?' && !str[1]; 3295 bool query = str[0] == '?' && !str[1];
3293 int saveop = op; 3296 int saveop = op;
… …
3334 3337
3335 XFree (value); 3338 XFree (value);
3336 } 3339 }
3337 else 3340 else
3338 { 3341 {
3339 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3342 char *eq = strchr (str, '=');
3340 3343
3341 if (eq) 3344 if (eq)
3342 { 3345 {
3343 *eq = 0; 3346 *eq = 0;
3344 set_utf8_property (display->atom (str), eq + 1); 3347 set_utf8_property (display->atom (str), eq + 1);
… …
3400 break; 3403 break;
3401 case URxvt_Color_IT: 3404 case URxvt_Color_IT:
3402 process_color_seq (op, Color_IT, str, resp); 3405 process_color_seq (op, Color_IT, str, resp);
3403 break; 3406 break;
3404#endif 3407#endif
3408 case URxvt_Color_border:
3409 process_color_seq (op, Color_border, str, resp);
3410 break;
3405#if ENABLE_TRANSPARENCY 3411#if ENABLE_TRANSPARENCY
3406 case URxvt_Color_tint: 3412 case URxvt_Color_tint:
3407 process_color_seq (op, Color_tint, str, resp); 3413 process_color_seq (op, Color_tint, str, resp);
3408 { 3414 {
3409 bool changed = false; 3415 bool changed = false;
… …
3424 case Rxvt_Pixmap: 3430 case Rxvt_Pixmap:
3425 if (!strcmp (str, "?")) 3431 if (!strcmp (str, "?"))
3426 { 3432 {
3427 char str[256]; 3433 char str[256];
3428 3434
3429 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3435 sprintf (str, "[%dx%d+%d+%d]",
3430 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3436 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3431 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3437 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3432 process_xterm_seq (XTerm_title, str, CHAR_ST); 3438 process_xterm_seq (XTerm_title, str, CHAR_ST);
3433 } 3439 }
3434 else 3440 else
… …
3657 3663
3658 scr_touch (true); 3664 scr_touch (true);
3659 break; 3665 break;
3660#endif 3666#endif
3661 case 1048: /* alternative cursor save */ 3667 case 1048: /* alternative cursor save */
3662 case 1049:
3663 if (option (Opt_secondaryScreen)) 3668 if (option (Opt_secondaryScreen))
3664 if (mode == 0) 3669 if (mode == 0)
3665 scr_cursor (RESTORE); 3670 scr_cursor (RESTORE);
3666 else if (mode == 1) 3671 else if (mode == 1)
3667 scr_cursor (SAVE); 3672 scr_cursor (SAVE);
… …
3743 case 1011: /* scroll to bottom on key press */ 3748 case 1011: /* scroll to bottom on key press */
3744 set_option (Opt_scrollTtyKeypress, state); 3749 set_option (Opt_scrollTtyKeypress, state);
3745 break; 3750 break;
3746 case 1047: /* secondary screen w/ clearing last */ 3751 case 1047: /* secondary screen w/ clearing last */
3747 if (option (Opt_secondaryScreen)) 3752 if (option (Opt_secondaryScreen))
3748 if (current_screen != PRIMARY) 3753 if (!state)
3749 scr_erase_screen (2); 3754 scr_erase_screen (2);
3750 3755
3751 scr_change_screen (state); 3756 scr_change_screen (state);
3752 break; 3757 break;
3753 case 1049: /* secondary screen w/ clearing first */ 3758 case 1049: /* secondary screen w/ clearing first */
3759 if (option (Opt_secondaryScreen))
3760 if (state)
3761 scr_cursor (SAVE);
3762
3754 scr_change_screen (state); 3763 scr_change_screen (state);
3764
3755 if (option (Opt_secondaryScreen)) 3765 if (option (Opt_secondaryScreen))
3756 if (current_screen != PRIMARY) 3766 if (state)
3757 scr_erase_screen (2); 3767 scr_erase_screen (2);
3768 else
3769 scr_cursor (RESTORE);
3758 break; 3770 break;
3759 default: 3771 default:
3760 break; 3772 break;
3761 } 3773 }
3762 } 3774 }

Diff Legend

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