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.202 by root, Sat Mar 12 23:35:14 2005 UTC vs.
Revision 1.212 by root, Wed Dec 21 14:19:19 2005 UTC

… …
135rxvt_term::iso14755_54 (int x, int y) 135rxvt_term::iso14755_54 (int x, int y)
136{ 136{
137 x = Pixel2Col (x); 137 x = Pixel2Col (x);
138 y = Pixel2Row (y); 138 y = Pixel2Row (y);
139 139
140 if (x < 0 || x >= TermWin.ncol 140 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= TermWin.nrow) 141 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 142 return;
143 143
144 for (;;) 144 for (;;)
145 { 145 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 146 const line_t &l = ROW(-view_start);
147
148 text_t t = l.t[x];
147 149
148 if (t != NOCHAR || !x) 150 if (t != NOCHAR || !x)
149 { 151 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 152 iso14755_51 (l.t[x], l.r[x]);
151 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
152 iso14755buf = ISO_14755_54; 153 iso14755buf = ISO_14755_54;
153 break; 154 break;
154 } 155 }
155 156
156 x--; 157 x--;
157 } 158 }
158
159} 159}
160#endif 160#endif
161 161
162#if ENABLE_OVERLAY 162#if ENABLE_OVERLAY
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2; 168 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 169 int len;
170
171 fname = rxvt_utf8towcs (f->name);
170 172
171#if ENABLE_COMBINING 173#if ENABLE_COMBINING
172 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
173 { 175 {
174 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
… …
183 alloc = 0; 185 alloc = 0;
184 chr = &ch2; 186 chr = &ch2;
185 len = 1; 187 len = 1;
186 } 188 }
187 189
188 int width = strlen (f->name); 190 int width = wcswidth (fname, wcslen (fname));
189 191
190 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
191 193
192 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193 195
… …
206#endif 208#endif
207 scr_overlay_set (11, y, ch, r); 209 scr_overlay_set (11, y, ch, r);
208 scr_overlay_set (12, y, NOCHAR, r); 210 scr_overlay_set (12, y, NOCHAR, r);
209 } 211 }
210 212
211 scr_overlay_set (0, len, f->name); 213 scr_overlay_set (0, len, fname);
214
215 free (fname);
212 216
213#if ENABLE_COMBINING 217#if ENABLE_COMBINING
214 if (alloc) 218 if (alloc)
215 delete [] alloc; 219 delete [] alloc;
216#endif 220#endif
… …
362#ifdef KEYSYM_RESOURCE 366#ifdef KEYSYM_RESOURCE
363 if (keyboard->dispatch (this, keysym, ev.state)) 367 if (keyboard->dispatch (this, keysym, ev.state))
364 return; 368 return;
365#endif 369#endif
366 370
367 if (TermWin.saveLines) 371 if (saveLines)
368 { 372 {
369#ifdef UNSHIFTED_SCROLLKEYS 373#ifdef UNSHIFTED_SCROLLKEYS
370 if (!ctrl && !meta) 374 if (!ctrl && !meta)
371#else 375#else
372 if (IS_SCROLL_MOD) 376 if (IS_SCROLL_MOD)
373#endif 377#endif
374 { 378 {
375 int lnsppg; 379 int lnsppg;
376 380
377#ifdef PAGING_CONTEXT_LINES 381#ifdef PAGING_CONTEXT_LINES
378 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 382 lnsppg = nrow - PAGING_CONTEXT_LINES;
379#else 383#else
380 lnsppg = TermWin.nrow * 4 / 5; 384 lnsppg = nrow * 4 / 5;
381#endif 385#endif
382 if (keysym == XK_Prior) 386 if (keysym == XK_Prior)
383 { 387 {
384 scr_page (UP, lnsppg); 388 scr_page (UP, lnsppg);
385 return; 389 return;
… …
841 845
842 if (len <= 0) 846 if (len <= 0)
843 return; /* not mapped */ 847 return; /* not mapped */
844 848
845 if (options & Opt_scrollTtyKeypress) 849 if (options & Opt_scrollTtyKeypress)
846 if (TermWin.view_start) 850 if (view_start)
847 { 851 {
848 TermWin.view_start = 0; 852 view_start = 0;
849 want_refresh = 1; 853 want_refresh = 1;
850 } 854 }
851 855
852 /* 856 /*
853 * these modifications only affect the static keybuffer 857 * these modifications only affect the static keybuffer
… …
1030{ 1034{
1031 if (mouse_slip_wheel_speed == 0 1035 if (mouse_slip_wheel_speed == 0
1032 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1033 : scr_page (UP, mouse_slip_wheel_speed)) 1037 : scr_page (UP, mouse_slip_wheel_speed))
1034 { 1038 {
1035 if (TermWin.view_start == TermWin.nscrolled || 1039 if (view_start == nsaved ||
1036 TermWin.view_start == 0) 1040 view_start == 0)
1037 mouse_slip_wheel_speed = 0; 1041 mouse_slip_wheel_speed = 0;
1038 1042
1039 refresh_type |= SMOOTH_REFRESH; 1043 refresh_type |= SMOOTH_REFRESH;
1040 want_refresh = 1; 1044 want_refresh = 1;
1041 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1088} 1092}
1089 1093
1090void 1094void
1091rxvt_term::pointer_unblank () 1095rxvt_term::pointer_unblank ()
1092{ 1096{
1093 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1097 XDefineCursor (display->display, vt, TermWin_cursor);
1094 recolour_cursor (); 1098 recolour_cursor ();
1095 1099
1096#ifdef POINTER_BLANK 1100#ifdef POINTER_BLANK
1097 hidden_pointer = 0; 1101 hidden_pointer = 0;
1098 1102
… …
1106rxvt_term::pointer_blank () 1110rxvt_term::pointer_blank ()
1107{ 1111{
1108 if (! (options & Opt_pointerBlank)) 1112 if (! (options & Opt_pointerBlank))
1109 return; 1113 return;
1110 1114
1111 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1115 XDefineCursor (display->display, vt, display->blank_cursor);
1112 XFlush (display->display); 1116 XFlush (display->display);
1113 1117
1114 hidden_pointer = 1; 1118 hidden_pointer = 1;
1115} 1119}
1116 1120
… …
1418 case FocusOut: 1422 case FocusOut:
1419 focus_out (); 1423 focus_out ();
1420 break; 1424 break;
1421 1425
1422 case ConfigureNotify: 1426 case ConfigureNotify:
1423 if (ev.xconfigure.window == TermWin.parent[0]) 1427 if (ev.xconfigure.window == parent[0])
1424 { 1428 {
1425 int height, width;
1426
1427 do
1428 { /* Wrap lots of configures into one */
1429 width = ev.xconfigure.width;
1430 height = ev.xconfigure.height;
1431 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1432 }
1433 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1429 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1430 ;
1434 1431
1435 if (szHint.width != width || szHint.height != height) 1432 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1436 { 1433 {
1437 seen_resize = 1; 1434 seen_resize = 1;
1438 resize_all_windows (width, height, 1); 1435 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1439 } 1436 }
1440 1437
1441#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1438#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1442 if (options & Opt_transparent) 1439 if (options & Opt_transparent)
1443 check_our_parents (); 1440 check_our_parents ();
… …
1464 case SelectionRequest: 1461 case SelectionRequest:
1465 selection_send (ev.xselectionrequest); 1462 selection_send (ev.xselectionrequest);
1466 break; 1463 break;
1467 1464
1468 case UnmapNotify: 1465 case UnmapNotify:
1469 TermWin.mapped = 0; 1466 mapped = 0;
1470#ifdef TEXT_BLINK 1467#ifdef TEXT_BLINK
1471 text_blink_ev.stop (); 1468 text_blink_ev.stop ();
1472#endif 1469#endif
1473 break; 1470 break;
1474 1471
1475 case MapNotify: 1472 case MapNotify:
1476 TermWin.mapped = 1; 1473 mapped = 1;
1477#ifdef TEXT_BLINK 1474#ifdef TEXT_BLINK
1478 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1475 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1479#endif 1476#endif
1480 break; 1477 break;
1481 1478
… …
1485 break; 1482 break;
1486#endif /* TRANSPARENT */ 1483#endif /* TRANSPARENT */
1487 1484
1488 case GraphicsExpose: 1485 case GraphicsExpose:
1489 case Expose: 1486 case Expose:
1490 if (ev.xany.window == TermWin.vt) 1487 if (ev.xany.window == vt)
1491 { 1488 {
1492 do 1489 do
1493 scr_expose (ev.xexpose.x, ev.xexpose.y, 1490 scr_expose (ev.xexpose.x, ev.xexpose.y,
1494 ev.xexpose.width, ev.xexpose.height, False); 1491 ev.xexpose.width, ev.xexpose.height, False);
1495 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1492 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1496 1493
1497 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1494 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1498 1495
1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1496 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1500 scr_expose (ev.xexpose.x, ev.xexpose.y, 1497 scr_expose (ev.xexpose.x, ev.xexpose.y,
1501 ev.xexpose.width, ev.xexpose.height, False); 1498 ev.xexpose.width, ev.xexpose.height, False);
1502 1499
1503 scr_refresh (refresh_type); 1500 scr_refresh (refresh_type);
1504 } 1501 }
… …
1520 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1517 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1521 menubar_expose (); 1518 menubar_expose ();
1522#endif 1519#endif
1523 1520
1524#ifdef TRANSPARENT 1521#ifdef TRANSPARENT
1525 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1522 if (am_transparent && ev.xany.window == parent[0])
1526 XClearWindow (disp, ev.xany.window); 1523 XClearWindow (disp, ev.xany.window);
1527#endif 1524#endif
1528 } 1525 }
1529 break; 1526 break;
1530 1527
… …
1541 } 1538 }
1542#endif 1539#endif
1543 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1540 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1544 break; 1541 break;
1545 1542
1546 if (ev.xany.window == TermWin.vt) 1543 if (ev.xany.window == vt)
1547 { 1544 {
1548 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1545 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1549 { 1546 {
1550 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1547 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1551 ; 1548 ;
1552 1549
1553 XQueryPointer (disp, TermWin.vt, 1550 XQueryPointer (disp, vt,
1554 &unused_root, &unused_child, 1551 &unused_root, &unused_child,
1555 &unused_root_x, &unused_root_y, 1552 &unused_root_x, &unused_root_y,
1556 &ev.xbutton.x, &ev.xbutton.y, 1553 &ev.xbutton.x, &ev.xbutton.y,
1557 &ev.xbutton.state); 1554 &ev.xbutton.state);
1558#ifdef MOUSE_THRESHOLD 1555#ifdef MOUSE_THRESHOLD
… …
1570#endif 1567#endif
1571 selection_extend (ev.xbutton.x, ev.xbutton.y, 1568 selection_extend (ev.xbutton.x, ev.xbutton.y,
1572 ev.xbutton.state & Button3Mask ? 2 : 0); 1569 ev.xbutton.state & Button3Mask ? 2 : 0);
1573 1570
1574#ifdef SELECTION_SCROLLING 1571#ifdef SELECTION_SCROLLING
1575 if (ev.xbutton.y < TermWin.int_bwidth 1572 if (ev.xbutton.y < int_bwidth
1576 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1573 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1577 { 1574 {
1578 int dist; 1575 int dist;
1579 1576
1580 /* don't clobber the current delay if we are 1577 /* don't clobber the current delay if we are
1581 * already in the middle of scrolling. 1578 * already in the middle of scrolling.
… …
1589 selection_save_x = ev.xbutton.x; 1586 selection_save_x = ev.xbutton.x;
1590 selection_save_y = ev.xbutton.y; 1587 selection_save_y = ev.xbutton.y;
1591 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1588 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1592 1589
1593 /* calc number of lines to scroll */ 1590 /* calc number of lines to scroll */
1594 if (ev.xbutton.y < TermWin.int_bwidth) 1591 if (ev.xbutton.y < int_bwidth)
1595 { 1592 {
1596 scroll_selection_dir = UP; 1593 scroll_selection_dir = UP;
1597 dist = TermWin.int_bwidth - ev.xbutton.y; 1594 dist = int_bwidth - ev.xbutton.y;
1598 } 1595 }
1599 else 1596 else
1600 { 1597 {
1601 scroll_selection_dir = DN; 1598 scroll_selection_dir = DN;
1602 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1599 dist = ev.xbutton.y - (int_bwidth + height);
1603 } 1600 }
1604 1601
1605 scroll_selection_lines = Pixel2Height (dist) 1602 scroll_selection_lines = Pixel2Height (dist)
1606 / SELECTION_SCROLL_LINE_SPEEDUP 1603 / SELECTION_SCROLL_LINE_SPEEDUP
1607 + 1; 1604 + 1;
1608 MIN_IT (scroll_selection_lines, 1605 min_it (scroll_selection_lines,
1609 SELECTION_SCROLL_MAX_LINES); 1606 SELECTION_SCROLL_MAX_LINES);
1610 } 1607 }
1611 else 1608 else
1612 { 1609 {
1613 /* we are within the text window, so we 1610 /* we are within the text window, so we
… …
1644} 1641}
1645 1642
1646void 1643void
1647rxvt_term::focus_in () 1644rxvt_term::focus_in ()
1648{ 1645{
1649 if (!TermWin.focus) 1646 if (!focus)
1650 { 1647 {
1651 TermWin.focus = 1; 1648 focus = 1;
1652 want_refresh = 1; 1649 want_refresh = 1;
1653#ifdef USE_XIM 1650#if USE_XIM
1654 if (Input_Context != NULL) 1651 if (Input_Context != NULL)
1655 { 1652 {
1656 IMSetStatusPosition (); 1653 IMSetStatusPosition ();
1657 XSetICFocus (Input_Context); 1654 XSetICFocus (Input_Context);
1658 } 1655 }
1659#endif 1656#endif
1660#ifdef CURSOR_BLINK 1657#if CURSOR_BLINK
1661 if (options & Opt_cursorBlink) 1658 if (options & Opt_cursorBlink)
1662 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1659 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1663#endif 1660#endif
1664#ifdef OFF_FOCUS_FADING 1661#if OFF_FOCUS_FADING
1665 if (rs[Rs_fade]) 1662 if (rs[Rs_fade])
1666 { 1663 {
1667 pix_colors = pix_colors_focused; 1664 pix_colors = pix_colors_focused;
1668 scr_recolour (); 1665 scr_recolour ();
1669 } 1666 }
… …
1672} 1669}
1673 1670
1674void 1671void
1675rxvt_term::focus_out () 1672rxvt_term::focus_out ()
1676{ 1673{
1677 if (TermWin.focus) 1674 if (focus)
1678 { 1675 {
1679 TermWin.focus = 0; 1676 focus = 0;
1680 want_refresh = 1; 1677 want_refresh = 1;
1681 1678
1682#if ENABLE_FRILLS || ISO_14755 1679#if ENABLE_FRILLS || ISO_14755
1683 iso14755buf = 0; 1680 iso14755buf = 0;
1684#endif 1681#endif
1685#if ENABLE_OVERLAY 1682#if ENABLE_OVERLAY
1686 scr_overlay_off (); 1683 scr_overlay_off ();
1687#endif 1684#endif
1688#ifdef USE_XIM 1685#if USE_XIM
1689 if (Input_Context != NULL) 1686 if (Input_Context != NULL)
1690 XUnsetICFocus (Input_Context); 1687 XUnsetICFocus (Input_Context);
1691#endif 1688#endif
1692#ifdef CURSOR_BLINK 1689#if CURSOR_BLINK
1693 if (options & Opt_cursorBlink) 1690 if (options & Opt_cursorBlink)
1694 cursor_blink_ev.stop (); 1691 cursor_blink_ev.stop ();
1695 hidden_cursor = 0; 1692 hidden_cursor = 0;
1696#endif 1693#endif
1697#ifdef OFF_FOCUS_FADING 1694#if OFF_FOCUS_FADING
1698 if (rs[Rs_fade]) 1695 if (rs[Rs_fade])
1699 { 1696 {
1700 pix_colors = pix_colors_unfocused; 1697 pix_colors = pix_colors_unfocused;
1701 scr_recolour (); 1698 scr_recolour ();
1702 } 1699 }
… …
1741 reportmode = !! (priv_modes & PrivMode_mouse_report); 1738 reportmode = !! (priv_modes & PrivMode_mouse_report);
1742 1739
1743 /* 1740 /*
1744 * VT window processing of button press 1741 * VT window processing of button press
1745 */ 1742 */
1746 if (ev.window == TermWin.vt) 1743 if (ev.window == vt)
1747 { 1744 {
1748#if ISO_14755 1745#if ISO_14755
1749 // 5.4 1746 // 5.4
1750 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1747 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1751 { 1748 {
… …
1956 case Button3: 1953 case Button3:
1957 if (scrollBar.style != R_SB_XTERM) 1954 if (scrollBar.style != R_SB_XTERM)
1958 { 1955 {
1959 if (scrollbar_above_slider (ev.y)) 1956 if (scrollbar_above_slider (ev.y))
1960# ifdef RXVT_SCROLL_FULL 1957# ifdef RXVT_SCROLL_FULL
1961 scr_page (UP, TermWin.nrow - 1); 1958 scr_page (UP, nrow - 1);
1962# else 1959# else
1963 scr_page (UP, TermWin.nrow / 4); 1960 scr_page (UP, nrow / 4);
1964# endif 1961# endif
1965 else if (scrollbar_below_slider (ev.y)) 1962 else if (scrollbar_below_slider (ev.y))
1966# ifdef RXVT_SCROLL_FULL 1963# ifdef RXVT_SCROLL_FULL
1967 scr_page (DN, TermWin.nrow - 1); 1964 scr_page (DN, nrow - 1);
1968# else 1965# else
1969 scr_page (DN, TermWin.nrow / 4); 1966 scr_page (DN, nrow / 4);
1970# endif 1967# endif
1971 else 1968 else
1972 scrollBar.setMotion (); 1969 scrollBar.setMotion ();
1973 } 1970 }
1974 else 1971 else
1975 { 1972 {
1976 scr_page ((ev.button == Button1 ? DN : UP), 1973 scr_page ((ev.button == Button1 ? DN : UP),
1977 (TermWin.nrow 1974 (nrow
1978 * scrollbar_position (ev.y) 1975 * scrollbar_position (ev.y)
1979 / scrollbar_size ())); 1976 / scrollbar_size ()));
1980 } 1977 }
1981 1978
1982 break; 1979 break;
… …
2014#ifdef SELECTION_SCROLLING 2011#ifdef SELECTION_SCROLLING
2015 if (sel_scroll_ev.active) 2012 if (sel_scroll_ev.active)
2016 sel_scroll_ev.stop(); 2013 sel_scroll_ev.stop();
2017#endif 2014#endif
2018 2015
2019 if (ev.window == TermWin.vt) 2016 if (ev.window == vt)
2020 { 2017 {
2021#if ISO_14755 2018#if ISO_14755
2022 // 5.4 2019 // 5.4
2023 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2020 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2024 return; 2021 return;
… …
2075 v = ev.button == Button4 ? UP : DN; 2072 v = ev.button == Button4 ? UP : DN;
2076 2073
2077 if (ev.state & ShiftMask) 2074 if (ev.state & ShiftMask)
2078 i = 1; 2075 i = 1;
2079 else if (options & Opt_mouseWheelScrollPage) 2076 else if (options & Opt_mouseWheelScrollPage)
2080 i = TermWin.nrow - 1; 2077 i = nrow - 1;
2081 else 2078 else
2082 i = 5; 2079 i = 5;
2083 2080
2084# ifdef MOUSE_SLIP_WHEELING 2081# ifdef MOUSE_SLIP_WHEELING
2085 if (ev.state & ControlMask) 2082 if (ev.state & ControlMask)
2086 { 2083 {
2087 mouse_slip_wheel_speed += v ? -1 : 1; 2084 mouse_slip_wheel_speed += v ? -1 : 1;
2088 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2085 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2089 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2086 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2090 2087
2091 if (slip_wheel_ev.at < NOW) 2088 if (slip_wheel_ev.at < NOW)
2092 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2089 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2093 2090
2094 slip_wheel_ev.start (); 2091 slip_wheel_ev.start ();
… …
2376 return pchanged; /* Don't try any more */ 2373 return pchanged; /* Don't try any more */
2377 2374
2378 XGetWindowAttributes (disp, display->root, &wrootattr); 2375 XGetWindowAttributes (disp, display->root, &wrootattr);
2379 rootdepth = wrootattr.depth; 2376 rootdepth = wrootattr.depth;
2380 2377
2381 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2378 XGetWindowAttributes (disp, parent[0], &wattr);
2382 2379
2383 if (rootdepth != wattr.depth) 2380 if (rootdepth != wattr.depth)
2384 { 2381 {
2385 if (am_transparent) 2382 if (am_transparent)
2386 { 2383 {
2387 pchanged = 1; 2384 pchanged = 1;
2388 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2385 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2389 am_transparent = am_pixmap_trans = 0; 2386 am_transparent = am_pixmap_trans = 0;
2390 } 2387 }
2391 2388
2392 return pchanged; /* Don't try any more */ 2389 return pchanged; /* Don't try any more */
2393 } 2390 }
… …
2434 Window cr; 2431 Window cr;
2435 XImage *image; 2432 XImage *image;
2436 GC gc; 2433 GC gc;
2437 XGCValues gcvalue; 2434 XGCValues gcvalue;
2438 2435
2439 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2436 XTranslateCoordinates (disp, parent[0], display->root,
2440 0, 0, &sx, &sy, &cr); 2437 0, 0, &sx, &sy, &cr);
2441 nw = (unsigned int)szHint.width; 2438 nw = (unsigned int)szHint.width;
2442 nh = (unsigned int)szHint.height; 2439 nh = (unsigned int)szHint.height;
2443 nx = ny = 0; 2440 nx = ny = 0;
2444 2441
… …
2454 nh += sy; 2451 nh += sy;
2455 ny = -sy; 2452 ny = -sy;
2456 sy = 0; 2453 sy = 0;
2457 } 2454 }
2458 2455
2459 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2456 min_it (nw, (unsigned int) (wrootattr.width - sx));
2460 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2457 min_it (nh, (unsigned int) (wrootattr.height - sy));
2461 2458
2462 XSync (disp, False); 2459 XSync (disp, False);
2463 allowedxerror = -1; 2460 allowedxerror = -1;
2464 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2461 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2465 2462
… …
2470 if (image == NULL) 2467 if (image == NULL)
2471 { 2468 {
2472 if (am_transparent && am_pixmap_trans) 2469 if (am_transparent && am_pixmap_trans)
2473 { 2470 {
2474 pchanged = 1; 2471 pchanged = 1;
2475 if (TermWin.pixmap != None) 2472 if (pixmap != None)
2476 { 2473 {
2477 XFreePixmap (disp, TermWin.pixmap); 2474 XFreePixmap (disp, pixmap);
2478 TermWin.pixmap = None; 2475 pixmap = None;
2479 } 2476 }
2480 } 2477 }
2481 2478
2482 am_pixmap_trans = 0; 2479 am_pixmap_trans = 0;
2483 } 2480 }
2484 else 2481 else
2485 { 2482 {
2486 if (TermWin.pixmap != None) 2483 if (pixmap != None)
2487 XFreePixmap (disp, TermWin.pixmap); 2484 XFreePixmap (disp, pixmap);
2488 2485
2489#if TINTING 2486#if TINTING
2490 if (ISSET_PIXCOLOR (Color_tint)) 2487 if (ISSET_PIXCOLOR (Color_tint))
2491 { 2488 {
2492 unsigned short rm, gm, bm; 2489 unsigned short rm, gm, bm;
… …
2496 2493
2497 ShadeXImage (display, image, shade, rm, gm, bm); 2494 ShadeXImage (display, image, shade, rm, gm, bm);
2498 } 2495 }
2499#endif 2496#endif
2500 2497
2501 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2498 pixmap = XCreatePixmap (disp, vt,
2502 szHint.width, szHint.height, image->depth); 2499 szHint.width, szHint.height, image->depth);
2503 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2500 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2504 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2501 XPutImage (disp, pixmap, gc, image, 0, 0,
2505 nx, ny, image->width, image->height); 2502 nx, ny, image->width, image->height);
2506 XFreeGC (disp, gc); 2503 XFreeGC (disp, gc);
2507 XDestroyImage (image); 2504 XDestroyImage (image);
2508 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2505 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2509 XClearWindow (disp, TermWin.parent[0]); 2506 XClearWindow (disp, parent[0]);
2510 2507
2511 if (!am_transparent || !am_pixmap_trans) 2508 if (!am_transparent || !am_pixmap_trans)
2512 pchanged = 1; 2509 pchanged = 1;
2513 2510
2514 am_transparent = am_pixmap_trans = 1; 2511 am_transparent = am_pixmap_trans = 1;
2515 } 2512 }
2516 } 2513 }
2517 2514
2518 if (am_pixmap_trans) 2515 if (am_pixmap_trans)
2519 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2516 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2520 else 2517 else
2521 { 2518 {
2522 unsigned int n; 2519 unsigned int n;
2523 /* 2520 /*
2524 * InheritPixmap transparency 2521 * InheritPixmap transparency
2525 */ 2522 */
2526 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2523 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2527 { 2524 {
2528 oldp = TermWin.parent[i]; 2525 oldp = parent[i];
2529 XQueryTree (disp, TermWin.parent[i - 1], &root, 2526 XQueryTree (disp, parent[i - 1], &root,
2530 &TermWin.parent[i], &list, &n); 2527 &parent[i], &list, &n);
2531 XFree (list); 2528 XFree (list);
2532 2529
2533 if (TermWin.parent[i] == display->root) 2530 if (parent[i] == display->root)
2534 { 2531 {
2535 if (oldp != None) 2532 if (oldp != None)
2536 pchanged = 1; 2533 pchanged = 1;
2537 2534
2538 break; 2535 break;
2539 } 2536 }
2540 2537
2541 if (oldp != TermWin.parent[i]) 2538 if (oldp != parent[i])
2542 pchanged = 1; 2539 pchanged = 1;
2543 } 2540 }
2544 2541
2545 n = 0; 2542 n = 0;
2546 2543
2547 if (pchanged) 2544 if (pchanged)
2548 { 2545 {
2549 for (; n < (unsigned int)i; n++) 2546 for (; n < (unsigned int)i; n++)
2550 { 2547 {
2551 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2548 XGetWindowAttributes (disp, parent[n], &wattr);
2552 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2549 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2553 { 2550 {
2554 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2551 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2555 break; 2552 break;
2556 } 2553 }
2557 } 2554 }
2558 } 2555 }
2559 2556
2560 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2557 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2561 { 2558 {
2562 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2559 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2563 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2560 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2564 am_transparent = 0; 2561 am_transparent = 0;
2565 /* XXX: also turn off Opt_transparent? */ 2562 /* XXX: also turn off Opt_transparent? */
2566 } 2563 }
2567 else 2564 else
2568 { 2565 {
… …
2571 * needed for fvwm2.2.2 (and before?) */ 2568 * needed for fvwm2.2.2 (and before?) */
2572 sleep (1); 2569 sleep (1);
2573#endif 2570#endif
2574 for (n = 0; n < (unsigned int)i; n++) 2571 for (n = 0; n < (unsigned int)i; n++)
2575 { 2572 {
2576 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2573 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2577 XClearWindow (disp, TermWin.parent[n]); 2574 XClearWindow (disp, parent[n]);
2578 } 2575 }
2579 2576
2580 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2577 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2581 am_transparent = 1; 2578 am_transparent = 1;
2582 } 2579 }
2583 2580
2584 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2581 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2585 TermWin.parent[i] = None; 2582 parent[i] = None;
2586 } 2583 }
2587 2584
2588 if (scrollBar.win) 2585 if (scrollBar.win)
2589 { 2586 {
2590 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2587 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2642 /* Read a text string from the input buffer */ 2639 /* Read a text string from the input buffer */
2643 unicode_t buf[UBUFSIZ]; 2640 unicode_t buf[UBUFSIZ];
2644 bool refreshnow = false; 2641 bool refreshnow = false;
2645 int nlines = 0; 2642 int nlines = 0;
2646 unicode_t *str = buf; 2643 unicode_t *str = buf;
2644 unicode_t *eol = str + min (ncol, UBUFSIZ);
2647 2645
2648 for (;;) 2646 for (;;)
2649 { 2647 {
2650 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2648 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2651 break; 2649 break;
2652 2650
2653 *str++ = ch; 2651 *str++ = ch;
2654 2652
2655 if (ch == C0_LF) 2653 if (ch == C0_LF || str >= eol)
2656 { 2654 {
2655 if (ch == C0_LF)
2657 nlines++; 2656 nlines++;
2657
2658 refresh_count++; 2658 refresh_count++;
2659 2659
2660 if (!(options & Opt_jumpScroll) 2660 if (!(options & Opt_jumpScroll)
2661 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2661 || (refresh_count >= refresh_limit * (nrow - 1)))
2662 { 2662 {
2663 refreshnow = true; 2663 refreshnow = true;
2664 ch = NOCHAR; 2664 ch = NOCHAR;
2665 break; 2665 break;
2666 } 2666 }
2667 2667
2668 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2668 // scr_add_lines only works for nlines <= nrow - 1.
2669 if (nlines >= TermWin.nrow - 1) 2669 if (nlines >= nrow - 1)
2670 { 2670 {
2671 scr_add_lines (buf, nlines, str - buf); 2671 scr_add_lines (buf, nlines, str - buf);
2672 nlines = 0; 2672 nlines = 0;
2673 str = buf; 2673 str = buf;
2674 eol = str + min (ncol, UBUFSIZ);
2674 } 2675 }
2675 }
2676 2676
2677 if (str >= buf + UBUFSIZ) 2677 if (str >= eol)
2678 { 2678 {
2679 if (eol >= buf + UBUFSIZ)
2680 {
2679 ch = NOCHAR; 2681 ch = NOCHAR;
2680 break; 2682 break;
2683 }
2684 else
2685 eol = min (eol + ncol, buf + UBUFSIZ);
2686 }
2687
2681 } 2688 }
2682 2689
2683 seq_begin = cmdbuf_ptr; 2690 seq_begin = cmdbuf_ptr;
2684 ch = next_char (); 2691 ch = next_char ();
2685 } 2692 }
… …
3344 3351
3345 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3352 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3346 arg[0] = -arg[0]; 3353 arg[0] = -arg[0];
3347 /* FALLTHROUGH */ 3354 /* FALLTHROUGH */
3348 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3355 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3349 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3356 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3350 break; 3357 break;
3351 3358
3352 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3359 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3353 tt_write ((const unsigned char *)VT100_ANS, 3360 tt_write ((const unsigned char *)VT100_ANS,
3354 (unsigned int) (sizeof (VT100_ANS) - 1)); 3361 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3479 { 3486 {
3480 /* 3487 /*
3481 * commands 3488 * commands
3482 */ 3489 */
3483 case 1: /* deiconify window */ 3490 case 1: /* deiconify window */
3484 XMapWindow (disp, TermWin.parent[0]); 3491 XMapWindow (disp, parent[0]);
3485 break; 3492 break;
3486 case 2: /* iconify window */ 3493 case 2: /* iconify window */
3487 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3494 XIconifyWindow (disp, parent[0], display->screen);
3488 break; 3495 break;
3489 case 3: /* set position (pixels) */ 3496 case 3: /* set position (pixels) */
3490 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3497 XMoveWindow (disp, parent[0], args[1], args[2]);
3491 break; 3498 break;
3492 case 4: /* set size (pixels) */ 3499 case 4: /* set size (pixels) */
3493 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3500 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3494 break; 3501 break;
3495 case 5: /* raise window */ 3502 case 5: /* raise window */
3496 XRaiseWindow (disp, TermWin.parent[0]); 3503 XRaiseWindow (disp, parent[0]);
3497 break; 3504 break;
3498 case 6: /* lower window */ 3505 case 6: /* lower window */
3499 XLowerWindow (disp, TermWin.parent[0]); 3506 XLowerWindow (disp, parent[0]);
3500 break; 3507 break;
3501 case 7: /* refresh window */ 3508 case 7: /* refresh window */
3502 scr_touch (true); 3509 scr_touch (true);
3503 break; 3510 break;
3504 case 8: /* set size (chars) */ 3511 case 8: /* set size (chars) */
3505 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3512 set_widthheight ((unsigned int) (args[2] * fwidth),
3506 (unsigned int) (args[1] * TermWin.fheight)); 3513 (unsigned int) (args[1] * fheight));
3507 break; 3514 break;
3508 3515
3509 //case 9: NYI, TODO, restore maximized window or maximize window 3516 //case 9: NYI, TODO, restore maximized window or maximize window
3510 default: 3517 default:
3511 if (args[0] >= 24) /* set height (chars) */ 3518 if (args[0] >= 24) /* set height (chars) */
3512 set_widthheight ((unsigned int)TermWin.width, 3519 set_widthheight ((unsigned int)width,
3513 (unsigned int) (args[1] * TermWin.fheight)); 3520 (unsigned int) (args[1] * fheight));
3514 break; 3521 break;
3515 3522
3516 3523
3517 /* 3524 /*
3518 * reports - some output format copied from XTerm 3525 * reports - some output format copied from XTerm
3519 */ 3526 */
3520 case 11: /* report window state */ 3527 case 11: /* report window state */
3521 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3528 XGetWindowAttributes (disp, parent[0], &wattr);
3522 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3529 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3523 break; 3530 break;
3524 case 13: /* report window position */ 3531 case 13: /* report window position */
3525 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3532 XGetWindowAttributes (disp, parent[0], &wattr);
3526 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3533 XTranslateCoordinates (disp, parent[0], wattr.root,
3527 -wattr.border_width, -wattr.border_width, 3534 -wattr.border_width, -wattr.border_width,
3528 &x, &y, &wdummy); 3535 &x, &y, &wdummy);
3529 tt_printf ("\033[3;%d;%dt", x, y); 3536 tt_printf ("\033[3;%d;%dt", x, y);
3530 break; 3537 break;
3531 case 14: /* report window size (pixels) */ 3538 case 14: /* report window size (pixels) */
3532 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3539 XGetWindowAttributes (disp, parent[0], &wattr);
3533 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3540 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3534 break; 3541 break;
3535 case 18: /* report text area size (chars) */ 3542 case 18: /* report text area size (chars) */
3536 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3543 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3537 break; 3544 break;
3538 case 19: /* report window size (chars) */ 3545 case 19: /* report window size (chars) */
3539 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3546 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3540 break; 3547 break;
3541 case 20: /* report icon label */ 3548 case 20: /* report icon label */
3542 { 3549 {
3543 char *s; 3550 char *s;
3544 XGetIconName (disp, TermWin.parent[0], &s); 3551 XGetIconName (disp, parent[0], &s);
3545 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3552 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3546 XFree (s); 3553 XFree (s);
3547 } 3554 }
3548 break; 3555 break;
3549 case 21: /* report window title */ 3556 case 21: /* report window title */
3550 { 3557 {
3551 char *s; 3558 char *s;
3552 XFetchName (disp, TermWin.parent[0], &s); 3559 XFetchName (disp, parent[0], &s);
3553 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3560 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3554 XFree (s); 3561 XFree (s);
3555 } 3562 }
3556 break; 3563 break;
3557 } 3564 }
… …
3703 unsigned long bytes_after; 3710 unsigned long bytes_after;
3704 unsigned char *value = 0; 3711 unsigned char *value = 0;
3705 const char *str = ""; 3712 const char *str = "";
3706 3713
3707 if (prop 3714 if (prop
3708 && XGetWindowProperty (disp, TermWin.parent[0], 3715 && XGetWindowProperty (disp, parent[0],
3709 prop, 0, 1<<16, 0, AnyPropertyType, 3716 prop, 0, 1<<16, 0, AnyPropertyType,
3710 &actual_type, &actual_format, 3717 &actual_type, &actual_format,
3711 &nitems, &bytes_after, &value) == Success 3718 &nitems, &bytes_after, &value) == Success
3712 && actual_type != None 3719 && actual_type != None
3713 && actual_format == 8) 3720 && actual_format == 8)
… …
3725 { 3732 {
3726 *eq = 0; 3733 *eq = 0;
3727 set_utf8_property (display->atom (str), eq + 1); 3734 set_utf8_property (display->atom (str), eq + 1);
3728 } 3735 }
3729 else 3736 else
3730 XDeleteProperty (disp, TermWin.parent[0], 3737 XDeleteProperty (disp, parent[0],
3731 display->atom (str)); 3738 display->atom (str));
3732 } 3739 }
3733 break; 3740 break;
3734 3741
3735 case XTerm_Color: 3742 case XTerm_Color:
… …
3860 case URxvt_italicFont: 3867 case URxvt_italicFont:
3861 case URxvt_boldItalicFont: 3868 case URxvt_boldItalicFont:
3862#endif 3869#endif
3863 if (query) 3870 if (query)
3864 tt_printf ("\33]%d;%-.250s%c", saveop, 3871 tt_printf ("\33]%d;%-.250s%c", saveop,
3865 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3872 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3866 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3873 ? fontset[op - URxvt_font]->fontdesc : "",
3867 resp); 3874 resp);
3868 else 3875 else
3869 { 3876 {
3870 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3877 const char *&res = rs[Rs_font + (op - URxvt_font)];
3871 3878
… …
4038 */ 4045 */
4039 PrivMode (1, PrivMode_vt52); 4046 PrivMode (1, PrivMode_vt52);
4040 break; 4047 break;
4041 case 3: /* 80/132 */ 4048 case 3: /* 80/132 */
4042 if (priv_modes & PrivMode_132OK) 4049 if (priv_modes & PrivMode_132OK)
4043 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4050 set_widthheight (((state ? 132 : 80) * fwidth), height);
4044 break; 4051 break;
4045 case 4: /* smooth scrolling */ 4052 case 4: /* smooth scrolling */
4046 if (state) 4053 if (state)
4047 options &= ~Opt_jumpScroll; 4054 options &= ~Opt_jumpScroll;
4048 else 4055 else

Diff Legend

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