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.215 by root, Fri Dec 23 14:46:34 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(y - 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);
… …
1063 if (n > 0) 1067 if (n > 0)
1064 { 1068 {
1065 cmdbuf_endp += n; 1069 cmdbuf_endp += n;
1066 return true; 1070 return true;
1067 } 1071 }
1068 else if (n < 0 && errno != EAGAIN) 1072 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
1073 {
1074 pty_ev.stop ();
1075
1076 if (!(options & Opt_hold))
1069 destroy (); 1077 destroy ();
1078 }
1070 1079
1071 return false; 1080 return false;
1072} 1081}
1073 1082
1074void 1083void
… …
1088} 1097}
1089 1098
1090void 1099void
1091rxvt_term::pointer_unblank () 1100rxvt_term::pointer_unblank ()
1092{ 1101{
1093 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1102 XDefineCursor (display->display, vt, TermWin_cursor);
1094 recolour_cursor (); 1103 recolour_cursor ();
1095 1104
1096#ifdef POINTER_BLANK 1105#ifdef POINTER_BLANK
1097 hidden_pointer = 0; 1106 hidden_pointer = 0;
1098 1107
… …
1106rxvt_term::pointer_blank () 1115rxvt_term::pointer_blank ()
1107{ 1116{
1108 if (! (options & Opt_pointerBlank)) 1117 if (! (options & Opt_pointerBlank))
1109 return; 1118 return;
1110 1119
1111 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1120 XDefineCursor (display->display, vt, display->blank_cursor);
1112 XFlush (display->display); 1121 XFlush (display->display);
1113 1122
1114 hidden_pointer = 1; 1123 hidden_pointer = 1;
1115} 1124}
1116 1125
… …
1418 case FocusOut: 1427 case FocusOut:
1419 focus_out (); 1428 focus_out ();
1420 break; 1429 break;
1421 1430
1422 case ConfigureNotify: 1431 case ConfigureNotify:
1423 if (ev.xconfigure.window == TermWin.parent[0]) 1432 if (ev.xconfigure.window == parent[0])
1424 { 1433 {
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)); 1434 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1435 ;
1434 1436
1435 if (szHint.width != width || szHint.height != height) 1437 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1436 { 1438 {
1437 seen_resize = 1; 1439 seen_resize = 1;
1438 resize_all_windows (width, height, 1); 1440 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1439 } 1441 }
1440 1442
1441#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1443#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1442 if (options & Opt_transparent) 1444 if (options & Opt_transparent)
1443 check_our_parents (); 1445 check_our_parents ();
… …
1464 case SelectionRequest: 1466 case SelectionRequest:
1465 selection_send (ev.xselectionrequest); 1467 selection_send (ev.xselectionrequest);
1466 break; 1468 break;
1467 1469
1468 case UnmapNotify: 1470 case UnmapNotify:
1469 TermWin.mapped = 0; 1471 mapped = 0;
1470#ifdef TEXT_BLINK 1472#ifdef TEXT_BLINK
1471 text_blink_ev.stop (); 1473 text_blink_ev.stop ();
1472#endif 1474#endif
1473 break; 1475 break;
1474 1476
1475 case MapNotify: 1477 case MapNotify:
1476 TermWin.mapped = 1; 1478 mapped = 1;
1477#ifdef TEXT_BLINK 1479#ifdef TEXT_BLINK
1478 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1480 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1479#endif 1481#endif
1480 break; 1482 break;
1481 1483
… …
1485 break; 1487 break;
1486#endif /* TRANSPARENT */ 1488#endif /* TRANSPARENT */
1487 1489
1488 case GraphicsExpose: 1490 case GraphicsExpose:
1489 case Expose: 1491 case Expose:
1490 if (ev.xany.window == TermWin.vt) 1492 if (ev.xany.window == vt)
1491 { 1493 {
1492 do 1494 do
1493 scr_expose (ev.xexpose.x, ev.xexpose.y, 1495 scr_expose (ev.xexpose.x, ev.xexpose.y,
1494 ev.xexpose.width, ev.xexpose.height, False); 1496 ev.xexpose.width, ev.xexpose.height, False);
1495 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1497 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1496 1498
1497 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1499 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1498 1500
1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1501 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1500 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1501 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1502 1504
1503 scr_refresh (refresh_type); 1505 scr_refresh (refresh_type);
1504 } 1506 }
… …
1520 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1522 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1521 menubar_expose (); 1523 menubar_expose ();
1522#endif 1524#endif
1523 1525
1524#ifdef TRANSPARENT 1526#ifdef TRANSPARENT
1525 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1527 if (am_transparent && ev.xany.window == parent[0])
1526 XClearWindow (disp, ev.xany.window); 1528 XClearWindow (disp, ev.xany.window);
1527#endif 1529#endif
1528 } 1530 }
1529 break; 1531 break;
1530 1532
… …
1541 } 1543 }
1542#endif 1544#endif
1543 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1545 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1544 break; 1546 break;
1545 1547
1546 if (ev.xany.window == TermWin.vt) 1548 if (ev.xany.window == vt)
1547 { 1549 {
1548 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1550 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1549 { 1551 {
1550 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1552 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1551 ; 1553 ;
1552 1554
1553 XQueryPointer (disp, TermWin.vt, 1555 XQueryPointer (disp, vt,
1554 &unused_root, &unused_child, 1556 &unused_root, &unused_child,
1555 &unused_root_x, &unused_root_y, 1557 &unused_root_x, &unused_root_y,
1556 &ev.xbutton.x, &ev.xbutton.y, 1558 &ev.xbutton.x, &ev.xbutton.y,
1557 &ev.xbutton.state); 1559 &ev.xbutton.state);
1558#ifdef MOUSE_THRESHOLD 1560#ifdef MOUSE_THRESHOLD
… …
1570#endif 1572#endif
1571 selection_extend (ev.xbutton.x, ev.xbutton.y, 1573 selection_extend (ev.xbutton.x, ev.xbutton.y,
1572 ev.xbutton.state & Button3Mask ? 2 : 0); 1574 ev.xbutton.state & Button3Mask ? 2 : 0);
1573 1575
1574#ifdef SELECTION_SCROLLING 1576#ifdef SELECTION_SCROLLING
1575 if (ev.xbutton.y < TermWin.int_bwidth 1577 if (ev.xbutton.y < int_bwidth
1576 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1578 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1577 { 1579 {
1578 int dist; 1580 int dist;
1579 1581
1580 /* don't clobber the current delay if we are 1582 /* don't clobber the current delay if we are
1581 * already in the middle of scrolling. 1583 * already in the middle of scrolling.
… …
1589 selection_save_x = ev.xbutton.x; 1591 selection_save_x = ev.xbutton.x;
1590 selection_save_y = ev.xbutton.y; 1592 selection_save_y = ev.xbutton.y;
1591 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1593 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1592 1594
1593 /* calc number of lines to scroll */ 1595 /* calc number of lines to scroll */
1594 if (ev.xbutton.y < TermWin.int_bwidth) 1596 if (ev.xbutton.y < int_bwidth)
1595 { 1597 {
1596 scroll_selection_dir = UP; 1598 scroll_selection_dir = UP;
1597 dist = TermWin.int_bwidth - ev.xbutton.y; 1599 dist = int_bwidth - ev.xbutton.y;
1598 } 1600 }
1599 else 1601 else
1600 { 1602 {
1601 scroll_selection_dir = DN; 1603 scroll_selection_dir = DN;
1602 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1604 dist = ev.xbutton.y - (int_bwidth + height);
1603 } 1605 }
1604 1606
1605 scroll_selection_lines = Pixel2Height (dist) 1607 scroll_selection_lines = Pixel2Height (dist)
1606 / SELECTION_SCROLL_LINE_SPEEDUP 1608 / SELECTION_SCROLL_LINE_SPEEDUP
1607 + 1; 1609 + 1;
1608 MIN_IT (scroll_selection_lines, 1610 min_it (scroll_selection_lines,
1609 SELECTION_SCROLL_MAX_LINES); 1611 SELECTION_SCROLL_MAX_LINES);
1610 } 1612 }
1611 else 1613 else
1612 { 1614 {
1613 /* we are within the text window, so we 1615 /* we are within the text window, so we
… …
1644} 1646}
1645 1647
1646void 1648void
1647rxvt_term::focus_in () 1649rxvt_term::focus_in ()
1648{ 1650{
1649 if (!TermWin.focus) 1651 if (!focus)
1650 { 1652 {
1651 TermWin.focus = 1; 1653 focus = 1;
1652 want_refresh = 1; 1654 want_refresh = 1;
1653#ifdef USE_XIM 1655#if USE_XIM
1654 if (Input_Context != NULL) 1656 if (Input_Context != NULL)
1655 { 1657 {
1656 IMSetStatusPosition (); 1658 IMSetStatusPosition ();
1657 XSetICFocus (Input_Context); 1659 XSetICFocus (Input_Context);
1658 } 1660 }
1659#endif 1661#endif
1660#ifdef CURSOR_BLINK 1662#if CURSOR_BLINK
1661 if (options & Opt_cursorBlink) 1663 if (options & Opt_cursorBlink)
1662 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1664 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1663#endif 1665#endif
1664#ifdef OFF_FOCUS_FADING 1666#if OFF_FOCUS_FADING
1665 if (rs[Rs_fade]) 1667 if (rs[Rs_fade])
1666 { 1668 {
1667 pix_colors = pix_colors_focused; 1669 pix_colors = pix_colors_focused;
1668 scr_recolour (); 1670 scr_recolour ();
1669 } 1671 }
… …
1672} 1674}
1673 1675
1674void 1676void
1675rxvt_term::focus_out () 1677rxvt_term::focus_out ()
1676{ 1678{
1677 if (TermWin.focus) 1679 if (focus)
1678 { 1680 {
1679 TermWin.focus = 0; 1681 focus = 0;
1680 want_refresh = 1; 1682 want_refresh = 1;
1681 1683
1682#if ENABLE_FRILLS || ISO_14755 1684#if ENABLE_FRILLS || ISO_14755
1683 iso14755buf = 0; 1685 iso14755buf = 0;
1684#endif 1686#endif
1685#if ENABLE_OVERLAY 1687#if ENABLE_OVERLAY
1686 scr_overlay_off (); 1688 scr_overlay_off ();
1687#endif 1689#endif
1688#ifdef USE_XIM 1690#if USE_XIM
1689 if (Input_Context != NULL) 1691 if (Input_Context != NULL)
1690 XUnsetICFocus (Input_Context); 1692 XUnsetICFocus (Input_Context);
1691#endif 1693#endif
1692#ifdef CURSOR_BLINK 1694#if CURSOR_BLINK
1693 if (options & Opt_cursorBlink) 1695 if (options & Opt_cursorBlink)
1694 cursor_blink_ev.stop (); 1696 cursor_blink_ev.stop ();
1695 hidden_cursor = 0; 1697 hidden_cursor = 0;
1696#endif 1698#endif
1697#ifdef OFF_FOCUS_FADING 1699#if OFF_FOCUS_FADING
1698 if (rs[Rs_fade]) 1700 if (rs[Rs_fade])
1699 { 1701 {
1700 pix_colors = pix_colors_unfocused; 1702 pix_colors = pix_colors_unfocused;
1701 scr_recolour (); 1703 scr_recolour ();
1702 } 1704 }
… …
1741 reportmode = !! (priv_modes & PrivMode_mouse_report); 1743 reportmode = !! (priv_modes & PrivMode_mouse_report);
1742 1744
1743 /* 1745 /*
1744 * VT window processing of button press 1746 * VT window processing of button press
1745 */ 1747 */
1746 if (ev.window == TermWin.vt) 1748 if (ev.window == vt)
1747 { 1749 {
1748#if ISO_14755 1750#if ISO_14755
1749 // 5.4 1751 // 5.4
1750 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1752 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1751 { 1753 {
… …
1956 case Button3: 1958 case Button3:
1957 if (scrollBar.style != R_SB_XTERM) 1959 if (scrollBar.style != R_SB_XTERM)
1958 { 1960 {
1959 if (scrollbar_above_slider (ev.y)) 1961 if (scrollbar_above_slider (ev.y))
1960# ifdef RXVT_SCROLL_FULL 1962# ifdef RXVT_SCROLL_FULL
1961 scr_page (UP, TermWin.nrow - 1); 1963 scr_page (UP, nrow - 1);
1962# else 1964# else
1963 scr_page (UP, TermWin.nrow / 4); 1965 scr_page (UP, nrow / 4);
1964# endif 1966# endif
1965 else if (scrollbar_below_slider (ev.y)) 1967 else if (scrollbar_below_slider (ev.y))
1966# ifdef RXVT_SCROLL_FULL 1968# ifdef RXVT_SCROLL_FULL
1967 scr_page (DN, TermWin.nrow - 1); 1969 scr_page (DN, nrow - 1);
1968# else 1970# else
1969 scr_page (DN, TermWin.nrow / 4); 1971 scr_page (DN, nrow / 4);
1970# endif 1972# endif
1971 else 1973 else
1972 scrollBar.setMotion (); 1974 scrollBar.setMotion ();
1973 } 1975 }
1974 else 1976 else
1975 { 1977 {
1976 scr_page ((ev.button == Button1 ? DN : UP), 1978 scr_page ((ev.button == Button1 ? DN : UP),
1977 (TermWin.nrow 1979 (nrow
1978 * scrollbar_position (ev.y) 1980 * scrollbar_position (ev.y)
1979 / scrollbar_size ())); 1981 / scrollbar_size ()));
1980 } 1982 }
1981 1983
1982 break; 1984 break;
… …
2014#ifdef SELECTION_SCROLLING 2016#ifdef SELECTION_SCROLLING
2015 if (sel_scroll_ev.active) 2017 if (sel_scroll_ev.active)
2016 sel_scroll_ev.stop(); 2018 sel_scroll_ev.stop();
2017#endif 2019#endif
2018 2020
2019 if (ev.window == TermWin.vt) 2021 if (ev.window == vt)
2020 { 2022 {
2021#if ISO_14755 2023#if ISO_14755
2022 // 5.4 2024 // 5.4
2023 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2025 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2024 return; 2026 return;
… …
2075 v = ev.button == Button4 ? UP : DN; 2077 v = ev.button == Button4 ? UP : DN;
2076 2078
2077 if (ev.state & ShiftMask) 2079 if (ev.state & ShiftMask)
2078 i = 1; 2080 i = 1;
2079 else if (options & Opt_mouseWheelScrollPage) 2081 else if (options & Opt_mouseWheelScrollPage)
2080 i = TermWin.nrow - 1; 2082 i = nrow - 1;
2081 else 2083 else
2082 i = 5; 2084 i = 5;
2083 2085
2084# ifdef MOUSE_SLIP_WHEELING 2086# ifdef MOUSE_SLIP_WHEELING
2085 if (ev.state & ControlMask) 2087 if (ev.state & ControlMask)
2086 { 2088 {
2087 mouse_slip_wheel_speed += v ? -1 : 1; 2089 mouse_slip_wheel_speed += v ? -1 : 1;
2088 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2090 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; 2091 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2090 2092
2091 if (slip_wheel_ev.at < NOW) 2093 if (slip_wheel_ev.at < NOW)
2092 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2094 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2093 2095
2094 slip_wheel_ev.start (); 2096 slip_wheel_ev.start ();
… …
2376 return pchanged; /* Don't try any more */ 2378 return pchanged; /* Don't try any more */
2377 2379
2378 XGetWindowAttributes (disp, display->root, &wrootattr); 2380 XGetWindowAttributes (disp, display->root, &wrootattr);
2379 rootdepth = wrootattr.depth; 2381 rootdepth = wrootattr.depth;
2380 2382
2381 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2383 XGetWindowAttributes (disp, parent[0], &wattr);
2382 2384
2383 if (rootdepth != wattr.depth) 2385 if (rootdepth != wattr.depth)
2384 { 2386 {
2385 if (am_transparent) 2387 if (am_transparent)
2386 { 2388 {
2387 pchanged = 1; 2389 pchanged = 1;
2388 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2390 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2389 am_transparent = am_pixmap_trans = 0; 2391 am_transparent = am_pixmap_trans = 0;
2390 } 2392 }
2391 2393
2392 return pchanged; /* Don't try any more */ 2394 return pchanged; /* Don't try any more */
2393 } 2395 }
… …
2434 Window cr; 2436 Window cr;
2435 XImage *image; 2437 XImage *image;
2436 GC gc; 2438 GC gc;
2437 XGCValues gcvalue; 2439 XGCValues gcvalue;
2438 2440
2439 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2441 XTranslateCoordinates (disp, parent[0], display->root,
2440 0, 0, &sx, &sy, &cr); 2442 0, 0, &sx, &sy, &cr);
2441 nw = (unsigned int)szHint.width; 2443 nw = (unsigned int)szHint.width;
2442 nh = (unsigned int)szHint.height; 2444 nh = (unsigned int)szHint.height;
2443 nx = ny = 0; 2445 nx = ny = 0;
2444 2446
… …
2454 nh += sy; 2456 nh += sy;
2455 ny = -sy; 2457 ny = -sy;
2456 sy = 0; 2458 sy = 0;
2457 } 2459 }
2458 2460
2459 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2461 min_it (nw, (unsigned int) (wrootattr.width - sx));
2460 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2462 min_it (nh, (unsigned int) (wrootattr.height - sy));
2461 2463
2462 XSync (disp, False); 2464 XSync (disp, False);
2463 allowedxerror = -1; 2465 allowedxerror = -1;
2464 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2466 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2465 2467
… …
2470 if (image == NULL) 2472 if (image == NULL)
2471 { 2473 {
2472 if (am_transparent && am_pixmap_trans) 2474 if (am_transparent && am_pixmap_trans)
2473 { 2475 {
2474 pchanged = 1; 2476 pchanged = 1;
2475 if (TermWin.pixmap != None) 2477 if (pixmap != None)
2476 { 2478 {
2477 XFreePixmap (disp, TermWin.pixmap); 2479 XFreePixmap (disp, pixmap);
2478 TermWin.pixmap = None; 2480 pixmap = None;
2479 } 2481 }
2480 } 2482 }
2481 2483
2482 am_pixmap_trans = 0; 2484 am_pixmap_trans = 0;
2483 } 2485 }
2484 else 2486 else
2485 { 2487 {
2486 if (TermWin.pixmap != None) 2488 if (pixmap != None)
2487 XFreePixmap (disp, TermWin.pixmap); 2489 XFreePixmap (disp, pixmap);
2488 2490
2489#if TINTING 2491#if TINTING
2490 if (ISSET_PIXCOLOR (Color_tint)) 2492 if (ISSET_PIXCOLOR (Color_tint))
2491 { 2493 {
2492 unsigned short rm, gm, bm; 2494 unsigned short rm, gm, bm;
… …
2496 2498
2497 ShadeXImage (display, image, shade, rm, gm, bm); 2499 ShadeXImage (display, image, shade, rm, gm, bm);
2498 } 2500 }
2499#endif 2501#endif
2500 2502
2501 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2503 pixmap = XCreatePixmap (disp, vt,
2502 szHint.width, szHint.height, image->depth); 2504 szHint.width, szHint.height, image->depth);
2503 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2505 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2504 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2506 XPutImage (disp, pixmap, gc, image, 0, 0,
2505 nx, ny, image->width, image->height); 2507 nx, ny, image->width, image->height);
2506 XFreeGC (disp, gc); 2508 XFreeGC (disp, gc);
2507 XDestroyImage (image); 2509 XDestroyImage (image);
2508 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2510 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2509 XClearWindow (disp, TermWin.parent[0]); 2511 XClearWindow (disp, parent[0]);
2510 2512
2511 if (!am_transparent || !am_pixmap_trans) 2513 if (!am_transparent || !am_pixmap_trans)
2512 pchanged = 1; 2514 pchanged = 1;
2513 2515
2514 am_transparent = am_pixmap_trans = 1; 2516 am_transparent = am_pixmap_trans = 1;
2515 } 2517 }
2516 } 2518 }
2517 2519
2518 if (am_pixmap_trans) 2520 if (am_pixmap_trans)
2519 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2521 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2520 else 2522 else
2521 { 2523 {
2522 unsigned int n; 2524 unsigned int n;
2523 /* 2525 /*
2524 * InheritPixmap transparency 2526 * InheritPixmap transparency
2525 */ 2527 */
2526 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2528 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2527 { 2529 {
2528 oldp = TermWin.parent[i]; 2530 oldp = parent[i];
2529 XQueryTree (disp, TermWin.parent[i - 1], &root, 2531 XQueryTree (disp, parent[i - 1], &root,
2530 &TermWin.parent[i], &list, &n); 2532 &parent[i], &list, &n);
2531 XFree (list); 2533 XFree (list);
2532 2534
2533 if (TermWin.parent[i] == display->root) 2535 if (parent[i] == display->root)
2534 { 2536 {
2535 if (oldp != None) 2537 if (oldp != None)
2536 pchanged = 1; 2538 pchanged = 1;
2537 2539
2538 break; 2540 break;
2539 } 2541 }
2540 2542
2541 if (oldp != TermWin.parent[i]) 2543 if (oldp != parent[i])
2542 pchanged = 1; 2544 pchanged = 1;
2543 } 2545 }
2544 2546
2545 n = 0; 2547 n = 0;
2546 2548
2547 if (pchanged) 2549 if (pchanged)
2548 { 2550 {
2549 for (; n < (unsigned int)i; n++) 2551 for (; n < (unsigned int)i; n++)
2550 { 2552 {
2551 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2553 XGetWindowAttributes (disp, parent[n], &wattr);
2552 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2554 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2553 { 2555 {
2554 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2556 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2555 break; 2557 break;
2556 } 2558 }
2557 } 2559 }
2558 } 2560 }
2559 2561
2560 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2562 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2561 { 2563 {
2562 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2564 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2563 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2565 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2564 am_transparent = 0; 2566 am_transparent = 0;
2565 /* XXX: also turn off Opt_transparent? */ 2567 /* XXX: also turn off Opt_transparent? */
2566 } 2568 }
2567 else 2569 else
2568 { 2570 {
… …
2571 * needed for fvwm2.2.2 (and before?) */ 2573 * needed for fvwm2.2.2 (and before?) */
2572 sleep (1); 2574 sleep (1);
2573#endif 2575#endif
2574 for (n = 0; n < (unsigned int)i; n++) 2576 for (n = 0; n < (unsigned int)i; n++)
2575 { 2577 {
2576 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2578 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2577 XClearWindow (disp, TermWin.parent[n]); 2579 XClearWindow (disp, parent[n]);
2578 } 2580 }
2579 2581
2580 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2581 am_transparent = 1; 2583 am_transparent = 1;
2582 } 2584 }
2583 2585
2584 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2586 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2585 TermWin.parent[i] = None; 2587 parent[i] = None;
2586 } 2588 }
2587 2589
2588 if (scrollBar.win) 2590 if (scrollBar.win)
2589 { 2591 {
2590 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2592 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2642 /* Read a text string from the input buffer */ 2644 /* Read a text string from the input buffer */
2643 unicode_t buf[UBUFSIZ]; 2645 unicode_t buf[UBUFSIZ];
2644 bool refreshnow = false; 2646 bool refreshnow = false;
2645 int nlines = 0; 2647 int nlines = 0;
2646 unicode_t *str = buf; 2648 unicode_t *str = buf;
2649 unicode_t *eol = str + min (ncol, UBUFSIZ);
2647 2650
2648 for (;;) 2651 for (;;)
2649 { 2652 {
2650 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2653 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2651 break; 2654 break;
2652 2655
2653 *str++ = ch; 2656 *str++ = ch;
2654 2657
2655 if (ch == C0_LF) 2658 if (ch == C0_LF || str >= eol)
2656 { 2659 {
2660 if (ch == C0_LF)
2657 nlines++; 2661 nlines++;
2662
2658 refresh_count++; 2663 refresh_count++;
2659 2664
2660 if (!(options & Opt_jumpScroll) 2665 if (!(options & Opt_jumpScroll)
2661 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2666 || (refresh_count >= refresh_limit * (nrow - 1)))
2662 { 2667 {
2663 refreshnow = true; 2668 refreshnow = true;
2664 ch = NOCHAR; 2669 ch = NOCHAR;
2665 break; 2670 break;
2666 } 2671 }
2667 2672
2668 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2673 // scr_add_lines only works for nlines <= nrow - 1.
2669 if (nlines >= TermWin.nrow - 1) 2674 if (nlines >= nrow - 1)
2670 { 2675 {
2671 scr_add_lines (buf, nlines, str - buf); 2676 scr_add_lines (buf, nlines, str - buf);
2672 nlines = 0; 2677 nlines = 0;
2673 str = buf; 2678 str = buf;
2679 eol = str + min (ncol, UBUFSIZ);
2674 } 2680 }
2675 }
2676 2681
2677 if (str >= buf + UBUFSIZ) 2682 if (str >= eol)
2678 { 2683 {
2684 if (eol >= buf + UBUFSIZ)
2685 {
2679 ch = NOCHAR; 2686 ch = NOCHAR;
2680 break; 2687 break;
2688 }
2689 else
2690 eol = min (eol + ncol, buf + UBUFSIZ);
2691 }
2692
2681 } 2693 }
2682 2694
2683 seq_begin = cmdbuf_ptr; 2695 seq_begin = cmdbuf_ptr;
2684 ch = next_char (); 2696 ch = next_char ();
2685 } 2697 }
… …
3344 3356
3345 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3357 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3346 arg[0] = -arg[0]; 3358 arg[0] = -arg[0];
3347 /* FALLTHROUGH */ 3359 /* FALLTHROUGH */
3348 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3360 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3349 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3361 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3350 break; 3362 break;
3351 3363
3352 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3364 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3353 tt_write ((const unsigned char *)VT100_ANS, 3365 tt_write ((const unsigned char *)VT100_ANS,
3354 (unsigned int) (sizeof (VT100_ANS) - 1)); 3366 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3479 { 3491 {
3480 /* 3492 /*
3481 * commands 3493 * commands
3482 */ 3494 */
3483 case 1: /* deiconify window */ 3495 case 1: /* deiconify window */
3484 XMapWindow (disp, TermWin.parent[0]); 3496 XMapWindow (disp, parent[0]);
3485 break; 3497 break;
3486 case 2: /* iconify window */ 3498 case 2: /* iconify window */
3487 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3499 XIconifyWindow (disp, parent[0], display->screen);
3488 break; 3500 break;
3489 case 3: /* set position (pixels) */ 3501 case 3: /* set position (pixels) */
3490 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3502 XMoveWindow (disp, parent[0], args[1], args[2]);
3491 break; 3503 break;
3492 case 4: /* set size (pixels) */ 3504 case 4: /* set size (pixels) */
3493 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3505 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3494 break; 3506 break;
3495 case 5: /* raise window */ 3507 case 5: /* raise window */
3496 XRaiseWindow (disp, TermWin.parent[0]); 3508 XRaiseWindow (disp, parent[0]);
3497 break; 3509 break;
3498 case 6: /* lower window */ 3510 case 6: /* lower window */
3499 XLowerWindow (disp, TermWin.parent[0]); 3511 XLowerWindow (disp, parent[0]);
3500 break; 3512 break;
3501 case 7: /* refresh window */ 3513 case 7: /* refresh window */
3502 scr_touch (true); 3514 scr_touch (true);
3503 break; 3515 break;
3504 case 8: /* set size (chars) */ 3516 case 8: /* set size (chars) */
3505 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3517 set_widthheight ((unsigned int) (args[2] * fwidth),
3506 (unsigned int) (args[1] * TermWin.fheight)); 3518 (unsigned int) (args[1] * fheight));
3507 break; 3519 break;
3508 3520
3509 //case 9: NYI, TODO, restore maximized window or maximize window 3521 //case 9: NYI, TODO, restore maximized window or maximize window
3510 default: 3522 default:
3511 if (args[0] >= 24) /* set height (chars) */ 3523 if (args[0] >= 24) /* set height (chars) */
3512 set_widthheight ((unsigned int)TermWin.width, 3524 set_widthheight ((unsigned int)width,
3513 (unsigned int) (args[1] * TermWin.fheight)); 3525 (unsigned int) (args[1] * fheight));
3514 break; 3526 break;
3515 3527
3516 3528
3517 /* 3529 /*
3518 * reports - some output format copied from XTerm 3530 * reports - some output format copied from XTerm
3519 */ 3531 */
3520 case 11: /* report window state */ 3532 case 11: /* report window state */
3521 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3533 XGetWindowAttributes (disp, parent[0], &wattr);
3522 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3534 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3523 break; 3535 break;
3524 case 13: /* report window position */ 3536 case 13: /* report window position */
3525 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3537 XGetWindowAttributes (disp, parent[0], &wattr);
3526 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3538 XTranslateCoordinates (disp, parent[0], wattr.root,
3527 -wattr.border_width, -wattr.border_width, 3539 -wattr.border_width, -wattr.border_width,
3528 &x, &y, &wdummy); 3540 &x, &y, &wdummy);
3529 tt_printf ("\033[3;%d;%dt", x, y); 3541 tt_printf ("\033[3;%d;%dt", x, y);
3530 break; 3542 break;
3531 case 14: /* report window size (pixels) */ 3543 case 14: /* report window size (pixels) */
3532 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3544 XGetWindowAttributes (disp, parent[0], &wattr);
3533 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3545 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3534 break; 3546 break;
3535 case 18: /* report text area size (chars) */ 3547 case 18: /* report text area size (chars) */
3536 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3548 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3537 break; 3549 break;
3538 case 19: /* report window size (chars) */ 3550 case 19: /* report window size (chars) */
3539 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3551 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3540 break; 3552 break;
3541 case 20: /* report icon label */ 3553 case 20: /* report icon label */
3542 { 3554 {
3543 char *s; 3555 char *s;
3544 XGetIconName (disp, TermWin.parent[0], &s); 3556 XGetIconName (disp, parent[0], &s);
3545 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3557 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3546 XFree (s); 3558 XFree (s);
3547 } 3559 }
3548 break; 3560 break;
3549 case 21: /* report window title */ 3561 case 21: /* report window title */
3550 { 3562 {
3551 char *s; 3563 char *s;
3552 XFetchName (disp, TermWin.parent[0], &s); 3564 XFetchName (disp, parent[0], &s);
3553 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3565 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3554 XFree (s); 3566 XFree (s);
3555 } 3567 }
3556 break; 3568 break;
3557 } 3569 }
… …
3703 unsigned long bytes_after; 3715 unsigned long bytes_after;
3704 unsigned char *value = 0; 3716 unsigned char *value = 0;
3705 const char *str = ""; 3717 const char *str = "";
3706 3718
3707 if (prop 3719 if (prop
3708 && XGetWindowProperty (disp, TermWin.parent[0], 3720 && XGetWindowProperty (disp, parent[0],
3709 prop, 0, 1<<16, 0, AnyPropertyType, 3721 prop, 0, 1<<16, 0, AnyPropertyType,
3710 &actual_type, &actual_format, 3722 &actual_type, &actual_format,
3711 &nitems, &bytes_after, &value) == Success 3723 &nitems, &bytes_after, &value) == Success
3712 && actual_type != None 3724 && actual_type != None
3713 && actual_format == 8) 3725 && actual_format == 8)
… …
3725 { 3737 {
3726 *eq = 0; 3738 *eq = 0;
3727 set_utf8_property (display->atom (str), eq + 1); 3739 set_utf8_property (display->atom (str), eq + 1);
3728 } 3740 }
3729 else 3741 else
3730 XDeleteProperty (disp, TermWin.parent[0], 3742 XDeleteProperty (disp, parent[0],
3731 display->atom (str)); 3743 display->atom (str));
3732 } 3744 }
3733 break; 3745 break;
3734 3746
3735 case XTerm_Color: 3747 case XTerm_Color:
… …
3860 case URxvt_italicFont: 3872 case URxvt_italicFont:
3861 case URxvt_boldItalicFont: 3873 case URxvt_boldItalicFont:
3862#endif 3874#endif
3863 if (query) 3875 if (query)
3864 tt_printf ("\33]%d;%-.250s%c", saveop, 3876 tt_printf ("\33]%d;%-.250s%c", saveop,
3865 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3877 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3866 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3878 ? fontset[op - URxvt_font]->fontdesc : "",
3867 resp); 3879 resp);
3868 else 3880 else
3869 { 3881 {
3870 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3882 const char *&res = rs[Rs_font + (op - URxvt_font)];
3871 3883
… …
4038 */ 4050 */
4039 PrivMode (1, PrivMode_vt52); 4051 PrivMode (1, PrivMode_vt52);
4040 break; 4052 break;
4041 case 3: /* 80/132 */ 4053 case 3: /* 80/132 */
4042 if (priv_modes & PrivMode_132OK) 4054 if (priv_modes & PrivMode_132OK)
4043 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4055 set_widthheight (((state ? 132 : 80) * fwidth), height);
4044 break; 4056 break;
4045 case 4: /* smooth scrolling */ 4057 case 4: /* smooth scrolling */
4046 if (state) 4058 if (state)
4047 options &= ~Opt_jumpScroll; 4059 options &= ~Opt_jumpScroll;
4048 else 4060 else
… …
4365 } 4377 }
4366 4378
4367 memmove (v_buffer, v_buffer + written, v_buflen); 4379 memmove (v_buffer, v_buffer + written, v_buflen);
4368 } 4380 }
4369 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4381 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4370 // original code just ignores this... 4382 pty_ev.set (EVENT_READ);
4371 destroy ();
4372} 4383}
4373 4384
4374/*----------------------- end-of-file (C source) -----------------------*/ 4385/*----------------------- end-of-file (C source) -----------------------*/
4375 4386

Diff Legend

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