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.490 by sf-exg, Sat Jul 9 18:23:48 2011 UTC vs.
Revision 1.495 by sf-exg, Sun Aug 28 18:48:41 2011 UTC

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;
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 }
3453 min (h_align, 32767), min (v_align, 32767)); 3448 min (h_align, 32767), min (v_align, 32767));
3454 process_xterm_seq (XTerm_title, str, CHAR_ST); 3449 process_xterm_seq (XTerm_title, str, CHAR_ST);
3455 } 3450 }
3456 else 3451 else
3457 { 3452 {
3458 int changed = 0; 3453 bool changed = false;
3459 3454
3460 if (*str != ';') 3455 if (*str != ';')
3461 { 3456 {
3462 if (bg_set_file (str)) /* change pixmap */ 3457 if (bg_set_file (str)) /* change pixmap */
3463 {
3464 changed++; 3458 changed = true;
3465 str = strchr (str, ';');
3466 if (str == NULL)
3467 bg_set_default_geometry ();
3468 else
3469 bg_set_geometry (str+1);
3470 }
3471 } 3459 }
3472 else 3460 else
3473 { 3461 {
3474 str++; 3462 str++;
3475 if (bg_set_geometry (str, true)) 3463 if (bg_set_geometry (str, true))
3476 changed++; 3464 changed = true;
3477 } 3465 }
3478 3466
3479 if (changed) 3467 if (changed)
3480 { 3468 {
3481 if (bg_window_position_sensitive ()) 3469 if (bg_window_position_sensitive ())
3737 if (state) /* orthogonal */ 3725 if (state) /* orthogonal */
3738 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3726 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3739 break; 3727 break;
3740#ifdef scrollBar_esc 3728#ifdef scrollBar_esc
3741 case scrollBar_esc: 3729 case scrollBar_esc:
3742 if (scrollBar.map (state)) 3730 scrollBar.map (state);
3743 {
3744 resize_all_windows (0, 0, 0); 3731 resize_all_windows (0, 0, 0);
3745 scr_touch (true); 3732 scr_touch (true);
3746 }
3747 break; 3733 break;
3748#endif 3734#endif
3749 case 25: /* visible/invisible cursor */ 3735 case 25: /* visible/invisible cursor */
3750 scr_cursor_visible (state); 3736 scr_cursor_visible (state);
3751 break; 3737 break;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines