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.489 by sf-exg, Sat Jul 9 13:40:13 2011 UTC vs.
Revision 1.497 by sf-exg, Thu Sep 1 08:11:26 2011 UTC

… …
1042 1042
1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1044void 1044void
1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1046{ 1046{
1047 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1047 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1048 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1048 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1049 { 1049 {
1050 want_refresh = 1; 1050 want_refresh = 1;
1051 refresh_check (); 1051 refresh_check ();
1052 } 1052 }
1053 else 1053 else
… …
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 }
… …
1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1558 ;
1564 1559
1565 if (scrollBar.state && ev.xany.window == scrollBar.win) 1560 if (scrollBar.state && ev.xany.window == scrollBar.win)
1566 { 1561 {
1567 scrollBar.state = STATE_IDLE; 1562 scrollBar.state = SB_STATE_IDLE;
1568 scrollBar.show (0); 1563 scrollBar.show (0);
1569 } 1564 }
1570 } 1565 }
1571 break; 1566 break;
1572 1567
… …
1660#ifdef MOUSE_THRESHOLD 1655#ifdef MOUSE_THRESHOLD
1661 } 1656 }
1662#endif 1657#endif
1663 } 1658 }
1664 } 1659 }
1665 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1660 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1666 { 1661 {
1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1668 MotionNotify, &ev)) 1663 MotionNotify, &ev))
1669 ; 1664 ;
1670 1665
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;
… …
1977 if (scrollBar.upButton (ev.y)) 1972 if (scrollBar.upButton (ev.y))
1978 direction = UP; /* up */ 1973 direction = UP; /* up */
1979 else if (scrollBar.dnButton (ev.y)) 1974 else if (scrollBar.dnButton (ev.y))
1980 direction = DN; /* down */ 1975 direction = DN; /* down */
1981 1976
1982 scrollBar.state = STATE_IDLE; 1977 scrollBar.state = SB_STATE_IDLE;
1983 /* 1978 /*
1984 * Rxvt-style scrollbar: 1979 * Rxvt-style scrollbar:
1985 * move up if mouse is above slider 1980 * move up if mouse is above slider
1986 * move dn if mouse is below slider 1981 * move dn if mouse is below slider
1987 * 1982 *
… …
2026 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2021 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2027#endif 2022#endif
2028 if (scr_page (direction, 1)) 2023 if (scr_page (direction, 1))
2029 { 2024 {
2030 if (direction == UP) 2025 if (direction == UP)
2031 scrollBar.state = STATE_UP; 2026 scrollBar.state = SB_STATE_UP;
2032 else 2027 else
2033 scrollBar.state = STATE_DOWN; 2028 scrollBar.state = SB_STATE_DOWN;
2034 } 2029 }
2035 } 2030 }
2036 else 2031 else
2037 switch (ev.button) 2032 switch (ev.button)
2038 { 2033 {
2039 case Button2: 2034 case Button2:
2040 switch (scrollBar.align) 2035 switch (scrollBar.align)
2041 { 2036 {
2042 case R_SB_ALIGN_TOP: 2037 case SB_ALIGN_TOP:
2043 csrO = 0; 2038 csrO = 0;
2044 break; 2039 break;
2045 case R_SB_ALIGN_CENTRE: 2040 case SB_ALIGN_CENTRE:
2046 csrO = (scrollBar.bot - scrollBar.top) / 2; 2041 csrO = (scrollBar.bot - scrollBar.top) / 2;
2047 break; 2042 break;
2048 case R_SB_ALIGN_BOTTOM: 2043 case SB_ALIGN_BOTTOM:
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 == SB_STYLE_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 = SB_STATE_MOTION;
2059 break; 2054 break;
2060 2055
2061 case Button1: 2056 case Button1:
2062 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2057 if (scrollBar.align == SB_ALIGN_CENTRE)
2063 csrO = ev.y - scrollBar.top; 2058 csrO = ev.y - scrollBar.top;
2064 /* FALLTHROUGH */ 2059 /* FALLTHROUGH */
2065 2060
2066 case Button3: 2061 case Button3:
2067 if (scrollBar.style != R_SB_XTERM) 2062 if (scrollBar.style != SB_STYLE_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
2081 else 2076 else
2082 scrollBar.state = STATE_MOTION; 2077 scrollBar.state = SB_STATE_MOTION;
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 }
… …
2104 2099
2105 csrO = 0; /* reset csr Offset */ 2100 csrO = 0; /* reset csr Offset */
2106 if (!bypass_keystate) 2101 if (!bypass_keystate)
2107 reportmode = !! (priv_modes & PrivMode_mouse_report); 2102 reportmode = !! (priv_modes & PrivMode_mouse_report);
2108 2103
2109 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2104 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2110 { 2105 {
2111 scrollBar.state = STATE_IDLE; 2106 scrollBar.state = SB_STATE_IDLE;
2112 scrollBar.show (0); 2107 scrollBar.show (0);
2113 } 2108 }
2114 2109
2115#ifdef SELECTION_SCROLLING 2110#ifdef SELECTION_SCROLLING
2116 sel_scroll_ev.stop(); 2111 sel_scroll_ev.stop();
… …
2595 break; 2590 break;
2596 case 'Z': /* identify the terminal type */ 2591 case 'Z': /* identify the terminal type */
2597 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2592 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2598 break; 2593 break;
2599 case '<': /* turn off VT52 mode */ 2594 case '<': /* turn off VT52 mode */
2600 set_privmode (PrivMode_vt52, 0); 2595 priv_modes &= ~PrivMode_vt52;
2601 break; 2596 break;
2602 case 'F': /* use special graphics character set */ 2597 case 'F': /* use special graphics character set */
2603 case 'G': /* use regular character set */ 2598 case 'G': /* use regular character set */
2604 /* unimplemented */ 2599 /* unimplemented */
2605 break; 2600 break;
… …
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 '=':
2658 priv_modes |= PrivMode_aplKP;
2659 break;
2662 case '>': 2660 case '>':
2663 set_privmode (PrivMode_aplKP, ch == '='); 2661 priv_modes &= ~PrivMode_aplKP;
2664 break; 2662 break;
2665 2663
2666 case C1_40: 2664 case C1_40:
2667 cmd_getc (); 2665 cmd_getc ();
2668 break; 2666 break;
… …
3452 min (h_align, 32767), min (v_align, 32767)); 3450 min (h_align, 32767), min (v_align, 32767));
3453 process_xterm_seq (XTerm_title, str, CHAR_ST); 3451 process_xterm_seq (XTerm_title, str, CHAR_ST);
3454 } 3452 }
3455 else 3453 else
3456 { 3454 {
3457 int changed = 0; 3455 bool changed = false;
3458 3456
3459 if (*str != ';') 3457 if (*str != ';')
3460 { 3458 {
3461 if (bg_set_file (str)) /* change pixmap */ 3459 if (bg_set_file (str)) /* change pixmap */
3462 {
3463 changed++; 3460 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 } 3461 }
3471 else 3462 else
3472 { 3463 {
3473 str++; 3464 str++;
3474 if (bg_set_geometry (str, true)) 3465 if (bg_set_geometry (str, true))
3475 changed++; 3466 changed = true;
3476 } 3467 }
3477 3468
3478 if (changed) 3469 if (changed)
3479 { 3470 {
3480 if (bg_window_position_sensitive ()) 3471 if (bg_window_position_sensitive ())
… …
3596 if (mode == 'r') 3587 if (mode == 'r')
3597 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3588 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3598 else 3589 else
3599 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3590 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3600 3591
3601 set_privmode (bit, state); 3592 if (state)
3593 priv_modes |= bit;
3594 else
3595 priv_modes &= ~bit;
3602 } 3596 }
3603 3597
3604 return state; 3598 return state;
3605} 3599}
3606 3600
… …
3615 { 3609 {
3616 const int argval; 3610 const int argval;
3617 const unsigned long bit; 3611 const unsigned long bit;
3618 } argtopriv[] = { 3612 } argtopriv[] = {
3619 { 1, PrivMode_aplCUR }, // DECCKM 3613 { 1, PrivMode_aplCUR }, // DECCKM
3620 { 2, PrivMode_vt52 }, 3614 { 2, PrivMode_vt52 }, // DECANM
3621 { 3, PrivMode_132 }, // DECCOLM 3615 { 3, PrivMode_132 }, // DECCOLM
3622 { 4, PrivMode_smoothScroll }, // DECSCLM 3616 { 4, PrivMode_smoothScroll }, // DECSCLM
3623 { 5, PrivMode_rVideo }, // DECSCNM 3617 { 5, PrivMode_rVideo }, // DECSCNM
3624 { 6, PrivMode_relOrigin }, // DECOM 3618 { 6, PrivMode_relOrigin }, // DECOM
3625 { 7, PrivMode_Autowrap }, // DECAWM 3619 { 7, PrivMode_Autowrap }, // DECAWM
3626 // 8, auto-repeat keys // DECARM 3620 // 8, auto-repeat keys // DECARM
3627 { 9, PrivMode_MouseX10 }, 3621 { 9, PrivMode_MouseX10 },
3628 // 18 end FF to printer after print screen 3622 // 18 end FF to printer after print screen
3629 // 19 Print screen prints full screen/scroll region 3623 // 19 Print screen prints full screen/scroll region
3630 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3624 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3631#ifdef scrollBar_esc 3625#ifdef scrollBar_esc
3632 { scrollBar_esc, PrivMode_scrollBar }, 3626 { scrollBar_esc, PrivMode_scrollBar },
3633#endif 3627#endif
3634 { 35, PrivMode_ShiftKeys }, // rxvt extension 3628 { 35, PrivMode_ShiftKeys }, // rxvt extension
3635 // 38, tektronix mode // DECTEK 3629 // 38, tektronix mode // DECTEK
3636 { 40, PrivMode_132OK }, 3630 { 40, PrivMode_132OK },
3637 // 41 xterm more fixes NYI 3631 // 41 xterm more fixes NYI
3638 // 45 margin bell NYI 3632 // 45 margin bell NYI
3639 // 46 start logging 3633 // 46 start logging
3640 { 47, PrivMode_Screen }, 3634 { 47, PrivMode_Screen },
3641 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3635 { 66, PrivMode_aplKP }, // DECNKM
3642#ifndef NO_BACKSPACE_KEY 3636#ifndef NO_BACKSPACE_KEY
3643 { 67, PrivMode_BackSpace }, // DECBKM 3637 { 67, PrivMode_BackSpace }, // DECBKM
3644#endif 3638#endif
3645 { 1000, PrivMode_MouseX11 }, 3639 { 1000, PrivMode_MouseX11 },
3646 { 1002, PrivMode_MouseBtnEvent }, 3640 { 1002, PrivMode_MouseBtnEvent },
… …
3711 case 2: /* VT52 mode */ 3705 case 2: /* VT52 mode */
3712 /* oddball mode. should be set regardless of set/reset 3706 /* oddball mode. should be set regardless of set/reset
3713 * parameter. Return from VT52 mode with an ESC < from 3707 * parameter. Return from VT52 mode with an ESC < from
3714 * within VT52 mode 3708 * within VT52 mode
3715 */ 3709 */
3716 set_privmode (PrivMode_vt52, 1); 3710 priv_modes |= PrivMode_vt52;
3717 break; 3711 break;
3718 case 3: /* 80/132 */ 3712 case 3: /* 80/132 */
3719 if (priv_modes & PrivMode_132OK) 3713 if (priv_modes & PrivMode_132OK)
3720 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3714 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3721 break; 3715 break;
… …
3736 if (state) /* orthogonal */ 3730 if (state) /* orthogonal */
3737 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3731 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3738 break; 3732 break;
3739#ifdef scrollBar_esc 3733#ifdef scrollBar_esc
3740 case scrollBar_esc: 3734 case scrollBar_esc:
3741 if (scrollBar.map (state)) 3735 scrollBar.map (state);
3742 {
3743 resize_all_windows (0, 0, 0); 3736 resize_all_windows (0, 0, 0);
3744 scr_touch (true); 3737 scr_touch (true);
3745 }
3746 break; 3738 break;
3747#endif 3739#endif
3748 case 25: /* visible/invisible cursor */ 3740 case 25: /* visible/invisible cursor */
3749 scr_cursor_visible (state); 3741 scr_cursor_visible (state);
3750 break; 3742 break;

Diff Legend

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