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.488 by sf-exg, Mon May 30 18:39:03 2011 UTC vs.
Revision 1.495 by sf-exg, Sun Aug 28 18:48:41 2011 UTC

… …
987 } 987 }
988 988
989 scr_refresh (); 989 scr_refresh ();
990 scrollBar.show (1); 990 scrollBar.show (1);
991#ifdef USE_XIM 991#ifdef USE_XIM
992 IMSendSpot (); 992 im_send_spot ();
993#endif 993#endif
994 } 994 }
995 995
996 display->flush (); 996 display->flush ();
997} 997}
… …
1473 } 1473 }
1474 else 1474 else
1475 { 1475 {
1476#ifdef HAVE_BG_PIXMAP 1476#ifdef HAVE_BG_PIXMAP
1477 if (moved) 1477 if (moved)
1478 {
1479 if (mapped)
1480 update_background (); 1478 update_background ();
1481 else
1482 bg_invalidate ();
1483 }
1484#endif 1479#endif
1485 } 1480 }
1486 1481
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488 } 1483 }
… …
1671 XQueryPointer (dpy, scrollBar.win, 1666 XQueryPointer (dpy, scrollBar.win,
1672 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1673 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1674 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1675 &unused_mask); 1670 &unused_mask);
1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1677 scrollBar.size ()); 1672 scrollBar.size ());
1678 want_refresh = 1; 1673 want_refresh = 1;
1679 scrollBar.show (1); 1674 scrollBar.show (1);
1680 } 1675 }
1681 break; 1676 break;
… …
1736 want_refresh = 1; 1731 want_refresh = 1;
1737 1732
1738#if USE_XIM 1733#if USE_XIM
1739 if (Input_Context != NULL) 1734 if (Input_Context != NULL)
1740 { 1735 {
1741 IMSetPosition (); 1736 im_set_position ();
1742 XSetICFocus (Input_Context); 1737 XSetICFocus (Input_Context);
1743 } 1738 }
1744#endif 1739#endif
1745#if CURSOR_BLINK 1740#if CURSOR_BLINK
1746 if (option (Opt_cursorBlink)) 1741 if (option (Opt_cursorBlink))
… …
2049 csrO = scrollBar.bot - scrollBar.top; 2044 csrO = scrollBar.bot - scrollBar.top;
2050 break; 2045 break;
2051 } 2046 }
2052 2047
2053 if (scrollBar.style == R_SB_XTERM 2048 if (scrollBar.style == R_SB_XTERM
2054 || scrollbar_above_slider (ev.y) 2049 || scrollBar.above_slider (ev.y)
2055 || scrollbar_below_slider (ev.y)) 2050 || scrollBar.below_slider (ev.y))
2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2051 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2057 2052
2058 scrollBar.state = STATE_MOTION; 2053 scrollBar.state = STATE_MOTION;
2059 break; 2054 break;
2060 2055
2061 case Button1: 2056 case Button1:
… …
2064 /* FALLTHROUGH */ 2059 /* FALLTHROUGH */
2065 2060
2066 case Button3: 2061 case Button3:
2067 if (scrollBar.style != R_SB_XTERM) 2062 if (scrollBar.style != R_SB_XTERM)
2068 { 2063 {
2069 if (scrollbar_above_slider (ev.y)) 2064 if (scrollBar.above_slider (ev.y))
2070# ifdef RXVT_SCROLL_FULL 2065# ifdef RXVT_SCROLL_FULL
2071 scr_page (UP, nrow - 1); 2066 scr_page (UP, nrow - 1);
2072# else 2067# else
2073 scr_page (UP, nrow / 4); 2068 scr_page (UP, nrow / 4);
2074# endif 2069# endif
2075 else if (scrollbar_below_slider (ev.y)) 2070 else if (scrollBar.below_slider (ev.y))
2076# ifdef RXVT_SCROLL_FULL 2071# ifdef RXVT_SCROLL_FULL
2077 scr_page (DN, nrow - 1); 2072 scr_page (DN, nrow - 1);
2078# else 2073# else
2079 scr_page (DN, nrow / 4); 2074 scr_page (DN, nrow / 4);
2080# endif 2075# endif
… …
2083 } 2078 }
2084 else 2079 else
2085 { 2080 {
2086 scr_page ((ev.button == Button1 ? DN : UP), 2081 scr_page ((ev.button == Button1 ? DN : UP),
2087 (nrow 2082 (nrow
2088 * scrollbar_position (ev.y) 2083 * scrollBar.position (ev.y)
2089 / scrollBar.size ())); 2084 / scrollBar.size ()));
2090 } 2085 }
2091 2086
2092 break; 2087 break;
2093 } 2088 }
… …
2656#if !ENABLE_MINIMAL 2651#if !ENABLE_MINIMAL
2657 case '9': 2652 case '9':
2658 scr_forwardindex (); 2653 scr_forwardindex ();
2659 break; 2654 break;
2660#endif 2655#endif
2656 // DECPAM/DECPNM
2661 case '=': 2657 case '=':
2662 case '>': 2658 case '>':
2663 set_privmode (PrivMode_aplKP, ch == '='); 2659 set_privmode (PrivMode_aplKP, ch == '=');
2664 break; 2660 break;
2665 2661
… …
3452 min (h_align, 32767), min (v_align, 32767)); 3448 min (h_align, 32767), min (v_align, 32767));
3453 process_xterm_seq (XTerm_title, str, CHAR_ST); 3449 process_xterm_seq (XTerm_title, str, CHAR_ST);
3454 } 3450 }
3455 else 3451 else
3456 { 3452 {
3457 int changed = 0; 3453 bool changed = false;
3458 3454
3459 if (*str != ';') 3455 if (*str != ';')
3460 { 3456 {
3461 if (bg_set_file (str)) /* change pixmap */ 3457 if (bg_set_file (str)) /* change pixmap */
3462 {
3463 changed++; 3458 changed = true;
3464 str = strchr (str, ';');
3465 if (str == NULL)
3466 bg_set_default_geometry ();
3467 else
3468 bg_set_geometry (str+1);
3469 }
3470 } 3459 }
3471 else 3460 else
3472 { 3461 {
3473 str++; 3462 str++;
3474 if (bg_set_geometry (str, true)) 3463 if (bg_set_geometry (str, true))
3475 changed++; 3464 changed = true;
3476 } 3465 }
3477 3466
3478 if (changed) 3467 if (changed)
3479 { 3468 {
3480 if (bg_window_position_sensitive ()) 3469 if (bg_window_position_sensitive ())
… …
3615 { 3604 {
3616 const int argval; 3605 const int argval;
3617 const unsigned long bit; 3606 const unsigned long bit;
3618 } argtopriv[] = { 3607 } argtopriv[] = {
3619 { 1, PrivMode_aplCUR }, // DECCKM 3608 { 1, PrivMode_aplCUR }, // DECCKM
3620 { 2, PrivMode_vt52 }, 3609 { 2, PrivMode_vt52 }, // DECANM
3621 { 3, PrivMode_132 }, // DECCOLM 3610 { 3, PrivMode_132 }, // DECCOLM
3622 { 4, PrivMode_smoothScroll }, // DECSCLM 3611 { 4, PrivMode_smoothScroll }, // DECSCLM
3623 { 5, PrivMode_rVideo }, // DECSCNM 3612 { 5, PrivMode_rVideo }, // DECSCNM
3624 { 6, PrivMode_relOrigin }, // DECOM 3613 { 6, PrivMode_relOrigin }, // DECOM
3625 { 7, PrivMode_Autowrap }, // DECAWM 3614 { 7, PrivMode_Autowrap }, // DECAWM
3626 // 8, auto-repeat keys // DECARM 3615 // 8, auto-repeat keys // DECARM
3627 { 9, PrivMode_MouseX10 }, 3616 { 9, PrivMode_MouseX10 },
3628 // 18 end FF to printer after print screen 3617 // 18 end FF to printer after print screen
3629 // 19 Print screen prints full screen/scroll region 3618 // 19 Print screen prints full screen/scroll region
3630 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3619 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3631#ifdef scrollBar_esc 3620#ifdef scrollBar_esc
3632 { scrollBar_esc, PrivMode_scrollBar }, 3621 { scrollBar_esc, PrivMode_scrollBar },
3633#endif 3622#endif
3634 { 35, PrivMode_ShiftKeys }, // rxvt extension 3623 { 35, PrivMode_ShiftKeys }, // rxvt extension
3635 // 38, tektronix mode // DECTEK 3624 // 38, tektronix mode // DECTEK
3636 { 40, PrivMode_132OK }, 3625 { 40, PrivMode_132OK },
3637 // 41 xterm more fixes NYI 3626 // 41 xterm more fixes NYI
3638 // 45 margin bell NYI 3627 // 45 margin bell NYI
3639 // 46 start logging 3628 // 46 start logging
3640 { 47, PrivMode_Screen }, 3629 { 47, PrivMode_Screen },
3641 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3630 { 66, PrivMode_aplKP }, // DECNKM
3642#ifndef NO_BACKSPACE_KEY 3631#ifndef NO_BACKSPACE_KEY
3643 { 67, PrivMode_BackSpace }, // DECBKM 3632 { 67, PrivMode_BackSpace }, // DECBKM
3644#endif 3633#endif
3645 { 1000, PrivMode_MouseX11 }, 3634 { 1000, PrivMode_MouseX11 },
3646 { 1002, PrivMode_MouseBtnEvent }, 3635 { 1002, PrivMode_MouseBtnEvent },
… …
3736 if (state) /* orthogonal */ 3725 if (state) /* orthogonal */
3737 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3726 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3738 break; 3727 break;
3739#ifdef scrollBar_esc 3728#ifdef scrollBar_esc
3740 case scrollBar_esc: 3729 case scrollBar_esc:
3741 if (scrollBar.map (state)) 3730 scrollBar.map (state);
3742 {
3743 resize_all_windows (0, 0, 0); 3731 resize_all_windows (0, 0, 0);
3744 scr_touch (true); 3732 scr_touch (true);
3745 }
3746 break; 3733 break;
3747#endif 3734#endif
3748 case 25: /* visible/invisible cursor */ 3735 case 25: /* visible/invisible cursor */
3749 scr_cursor_visible (state); 3736 scr_cursor_visible (state);
3750 break; 3737 break;

Diff Legend

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