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.492 by sf-exg, Sun Aug 21 20:13:58 2011 UTC vs.
Revision 1.496 by sf-exg, Wed Aug 31 22:39:49 2011 UTC

… …
1666 XQueryPointer (dpy, scrollBar.win, 1666 XQueryPointer (dpy, scrollBar.win,
1667 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1668 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1669 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1670 &unused_mask); 1670 &unused_mask);
1671 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1672 scrollBar.size ()); 1672 scrollBar.size ());
1673 want_refresh = 1; 1673 want_refresh = 1;
1674 scrollBar.show (1); 1674 scrollBar.show (1);
1675 } 1675 }
1676 break; 1676 break;
… …
2044 csrO = scrollBar.bot - scrollBar.top; 2044 csrO = scrollBar.bot - scrollBar.top;
2045 break; 2045 break;
2046 } 2046 }
2047 2047
2048 if (scrollBar.style == R_SB_XTERM 2048 if (scrollBar.style == R_SB_XTERM
2049 || scrollbar_above_slider (ev.y) 2049 || scrollBar.above_slider (ev.y)
2050 || scrollbar_below_slider (ev.y)) 2050 || scrollBar.below_slider (ev.y))
2051 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2051 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2052 2052
2053 scrollBar.state = STATE_MOTION; 2053 scrollBar.state = STATE_MOTION;
2054 break; 2054 break;
2055 2055
2056 case Button1: 2056 case Button1:
… …
2059 /* FALLTHROUGH */ 2059 /* FALLTHROUGH */
2060 2060
2061 case Button3: 2061 case Button3:
2062 if (scrollBar.style != R_SB_XTERM) 2062 if (scrollBar.style != R_SB_XTERM)
2063 { 2063 {
2064 if (scrollbar_above_slider (ev.y)) 2064 if (scrollBar.above_slider (ev.y))
2065# ifdef RXVT_SCROLL_FULL 2065# ifdef RXVT_SCROLL_FULL
2066 scr_page (UP, nrow - 1); 2066 scr_page (UP, nrow - 1);
2067# else 2067# else
2068 scr_page (UP, nrow / 4); 2068 scr_page (UP, nrow / 4);
2069# endif 2069# endif
2070 else if (scrollbar_below_slider (ev.y)) 2070 else if (scrollBar.below_slider (ev.y))
2071# ifdef RXVT_SCROLL_FULL 2071# ifdef RXVT_SCROLL_FULL
2072 scr_page (DN, nrow - 1); 2072 scr_page (DN, nrow - 1);
2073# else 2073# else
2074 scr_page (DN, nrow / 4); 2074 scr_page (DN, nrow / 4);
2075# endif 2075# endif
… …
2078 } 2078 }
2079 else 2079 else
2080 { 2080 {
2081 scr_page ((ev.button == Button1 ? DN : UP), 2081 scr_page ((ev.button == Button1 ? DN : UP),
2082 (nrow 2082 (nrow
2083 * scrollbar_position (ev.y) 2083 * scrollBar.position (ev.y)
2084 / scrollBar.size ())); 2084 / scrollBar.size ()));
2085 } 2085 }
2086 2086
2087 break; 2087 break;
2088 } 2088 }
… …
2590 break; 2590 break;
2591 case 'Z': /* identify the terminal type */ 2591 case 'Z': /* identify the terminal type */
2592 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2592 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2593 break; 2593 break;
2594 case '<': /* turn off VT52 mode */ 2594 case '<': /* turn off VT52 mode */
2595 set_privmode (PrivMode_vt52, 0); 2595 priv_modes &= ~PrivMode_vt52;
2596 break; 2596 break;
2597 case 'F': /* use special graphics character set */ 2597 case 'F': /* use special graphics character set */
2598 case 'G': /* use regular character set */ 2598 case 'G': /* use regular character set */
2599 /* unimplemented */ 2599 /* unimplemented */
2600 break; 2600 break;
… …
2653 scr_forwardindex (); 2653 scr_forwardindex ();
2654 break; 2654 break;
2655#endif 2655#endif
2656 // DECPAM/DECPNM 2656 // DECPAM/DECPNM
2657 case '=': 2657 case '=':
2658 priv_modes |= PrivMode_aplKP;
2659 break;
2658 case '>': 2660 case '>':
2659 set_privmode (PrivMode_aplKP, ch == '='); 2661 priv_modes &= ~PrivMode_aplKP;
2660 break; 2662 break;
2661 2663
2662 case C1_40: 2664 case C1_40:
2663 cmd_getc (); 2665 cmd_getc ();
2664 break; 2666 break;
… …
3448 min (h_align, 32767), min (v_align, 32767)); 3450 min (h_align, 32767), min (v_align, 32767));
3449 process_xterm_seq (XTerm_title, str, CHAR_ST); 3451 process_xterm_seq (XTerm_title, str, CHAR_ST);
3450 } 3452 }
3451 else 3453 else
3452 { 3454 {
3453 int changed = 0; 3455 bool changed = false;
3454 3456
3455 if (*str != ';') 3457 if (*str != ';')
3456 { 3458 {
3457 if (bg_set_file (str)) /* change pixmap */ 3459 if (bg_set_file (str)) /* change pixmap */
3458 {
3459 changed++; 3460 changed = true;
3460 }
3461 } 3461 }
3462 else 3462 else
3463 { 3463 {
3464 str++; 3464 str++;
3465 if (bg_set_geometry (str, true)) 3465 if (bg_set_geometry (str, true))
3466 changed++; 3466 changed = true;
3467 } 3467 }
3468 3468
3469 if (changed) 3469 if (changed)
3470 { 3470 {
3471 if (bg_window_position_sensitive ()) 3471 if (bg_window_position_sensitive ())
… …
3587 if (mode == 'r') 3587 if (mode == 'r')
3588 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3588 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3589 else 3589 else
3590 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3590 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3591 3591
3592 set_privmode (bit, state); 3592 if (state)
3593 priv_modes |= bit;
3594 else
3595 priv_modes &= ~bit;
3593 } 3596 }
3594 3597
3595 return state; 3598 return state;
3596} 3599}
3597 3600
… …
3702 case 2: /* VT52 mode */ 3705 case 2: /* VT52 mode */
3703 /* oddball mode. should be set regardless of set/reset 3706 /* oddball mode. should be set regardless of set/reset
3704 * parameter. Return from VT52 mode with an ESC < from 3707 * parameter. Return from VT52 mode with an ESC < from
3705 * within VT52 mode 3708 * within VT52 mode
3706 */ 3709 */
3707 set_privmode (PrivMode_vt52, 1); 3710 priv_modes |= PrivMode_vt52;
3708 break; 3711 break;
3709 case 3: /* 80/132 */ 3712 case 3: /* 80/132 */
3710 if (priv_modes & PrivMode_132OK) 3713 if (priv_modes & PrivMode_132OK)
3711 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3714 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3712 break; 3715 break;
… …
3727 if (state) /* orthogonal */ 3730 if (state) /* orthogonal */
3728 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3731 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3729 break; 3732 break;
3730#ifdef scrollBar_esc 3733#ifdef scrollBar_esc
3731 case scrollBar_esc: 3734 case scrollBar_esc:
3732 if (scrollBar.map (state)) 3735 scrollBar.map (state);
3733 {
3734 resize_all_windows (0, 0, 0); 3736 resize_all_windows (0, 0, 0);
3735 scr_touch (true); 3737 scr_touch (true);
3736 }
3737 break; 3738 break;
3738#endif 3739#endif
3739 case 25: /* visible/invisible cursor */ 3740 case 25: /* visible/invisible cursor */
3740 scr_cursor_visible (state); 3741 scr_cursor_visible (state);
3741 break; 3742 break;

Diff Legend

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