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

Diff Legend

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