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.206 by root, Thu Aug 11 02:05:07 2005 UTC vs.
Revision 1.217 by root, Sat Dec 31 16:30:42 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], x, y);
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
162void
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
164{
162#if ENABLE_OVERLAY 165#if ENABLE_OVERLAY
163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
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, *fname; 168 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 169 int len;
170 170
171 fname = rxvt_utf8towcs (f->name); 171 fname = rxvt_utf8towcs (f->name);
172 172
173#if ENABLE_COMBINING 173# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
175 { 175 {
176 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 177 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 178 rxvt_composite.expand (ch, chr);
179 } 179 }
180 else 180 else
181#endif 181# endif
182 { 182 {
183 ch2 = ch; 183 ch2 = ch;
184 184
185 alloc = 0; 185 alloc = 0;
186 chr = &ch2; 186 chr = &ch2;
187 len = 1; 187 len = 1;
188 } 188 }
189 189
190 char attr[80]; // plenty
191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 GET_FGCOLOR (r), GET_BGCOLOR (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
190 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
191 203
192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr));
206
207 if (y >= 0)
208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0;
211 }
212
213 scr_overlay_new (x, y, width, len + 2);
193 214
194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
195 216
196 for (int y = 0; y < len; y++) 217 for (int y = 0; y < len; y++)
197 { 218 {
… …
200 ch = *chr++; 221 ch = *chr++;
201 222
202 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
203 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
204 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
205#if !UNICODE3 226# if !UNICODE3
206 if (ch >= 0x10000) 227 if (ch >= 0x10000)
207 ch = 0xfffd; 228 ch = 0xfffd;
208#endif 229# endif
209 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
210 scr_overlay_set (12, y, NOCHAR, r); 231 scr_overlay_set (12, y, NOCHAR, r);
211 } 232 }
212 233
234 scr_overlay_set (0, len , attr);
213 scr_overlay_set (0, len, fname); 235 scr_overlay_set (0, len + 1, fname);
214 236
215 free (fname); 237 free (fname);
216 238
217#if ENABLE_COMBINING 239# if ENABLE_COMBINING
218 if (alloc) 240 if (alloc)
219 delete [] alloc; 241 delete [] alloc;
220#endif 242# endif
221}
222#endif 243#endif
244}
223 245
224void 246void
225rxvt_term::commit_iso14755 () 247rxvt_term::commit_iso14755 ()
226{ 248{
227 wchar_t ch[2]; 249 wchar_t ch[2];
… …
366#ifdef KEYSYM_RESOURCE 388#ifdef KEYSYM_RESOURCE
367 if (keyboard->dispatch (this, keysym, ev.state)) 389 if (keyboard->dispatch (this, keysym, ev.state))
368 return; 390 return;
369#endif 391#endif
370 392
371 if (TermWin.saveLines) 393 if (saveLines)
372 { 394 {
373#ifdef UNSHIFTED_SCROLLKEYS 395#ifdef UNSHIFTED_SCROLLKEYS
374 if (!ctrl && !meta) 396 if (!ctrl && !meta)
375#else 397#else
376 if (IS_SCROLL_MOD) 398 if (IS_SCROLL_MOD)
377#endif 399#endif
378 { 400 {
379 int lnsppg; 401 int lnsppg;
380 402
381#ifdef PAGING_CONTEXT_LINES 403#ifdef PAGING_CONTEXT_LINES
382 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 404 lnsppg = nrow - PAGING_CONTEXT_LINES;
383#else 405#else
384 lnsppg = TermWin.nrow * 4 / 5; 406 lnsppg = nrow * 4 / 5;
385#endif 407#endif
386 if (keysym == XK_Prior) 408 if (keysym == XK_Prior)
387 { 409 {
388 scr_page (UP, lnsppg); 410 scr_page (UP, lnsppg);
389 return; 411 return;
… …
845 867
846 if (len <= 0) 868 if (len <= 0)
847 return; /* not mapped */ 869 return; /* not mapped */
848 870
849 if (options & Opt_scrollTtyKeypress) 871 if (options & Opt_scrollTtyKeypress)
850 if (TermWin.view_start) 872 if (view_start)
851 { 873 {
852 TermWin.view_start = 0; 874 view_start = 0;
853 want_refresh = 1; 875 want_refresh = 1;
854 } 876 }
855 877
856 /* 878 /*
857 * these modifications only affect the static keybuffer 879 * these modifications only affect the static keybuffer
… …
1034{ 1056{
1035 if (mouse_slip_wheel_speed == 0 1057 if (mouse_slip_wheel_speed == 0
1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1058 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1037 : scr_page (UP, mouse_slip_wheel_speed)) 1059 : scr_page (UP, mouse_slip_wheel_speed))
1038 { 1060 {
1039 if (TermWin.view_start == TermWin.nscrolled || 1061 if (view_start == nsaved ||
1040 TermWin.view_start == 0) 1062 view_start == 0)
1041 mouse_slip_wheel_speed = 0; 1063 mouse_slip_wheel_speed = 0;
1042 1064
1043 refresh_type |= SMOOTH_REFRESH; 1065 refresh_type |= SMOOTH_REFRESH;
1044 want_refresh = 1; 1066 want_refresh = 1;
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1067 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1067 if (n > 0) 1089 if (n > 0)
1068 { 1090 {
1069 cmdbuf_endp += n; 1091 cmdbuf_endp += n;
1070 return true; 1092 return true;
1071 } 1093 }
1072 else if (n < 0 && errno != EAGAIN) 1094 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
1095 {
1096 pty_ev.stop ();
1097
1098 if (!(options & Opt_hold))
1073 destroy (); 1099 destroy ();
1100 }
1074 1101
1075 return false; 1102 return false;
1076} 1103}
1077 1104
1078void 1105void
… …
1092} 1119}
1093 1120
1094void 1121void
1095rxvt_term::pointer_unblank () 1122rxvt_term::pointer_unblank ()
1096{ 1123{
1097 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1124 XDefineCursor (display->display, vt, TermWin_cursor);
1098 recolour_cursor (); 1125 recolour_cursor ();
1099 1126
1100#ifdef POINTER_BLANK 1127#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1128 hidden_pointer = 0;
1102 1129
… …
1110rxvt_term::pointer_blank () 1137rxvt_term::pointer_blank ()
1111{ 1138{
1112 if (! (options & Opt_pointerBlank)) 1139 if (! (options & Opt_pointerBlank))
1113 return; 1140 return;
1114 1141
1115 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1142 XDefineCursor (display->display, vt, display->blank_cursor);
1116 XFlush (display->display); 1143 XFlush (display->display);
1117 1144
1118 hidden_pointer = 1; 1145 hidden_pointer = 1;
1119} 1146}
1120 1147
… …
1422 case FocusOut: 1449 case FocusOut:
1423 focus_out (); 1450 focus_out ();
1424 break; 1451 break;
1425 1452
1426 case ConfigureNotify: 1453 case ConfigureNotify:
1427 if (ev.xconfigure.window == TermWin.parent[0]) 1454 if (ev.xconfigure.window == parent[0])
1428 { 1455 {
1429 int height, width;
1430
1431 do
1432 { /* Wrap lots of configures into one */
1433 width = ev.xconfigure.width;
1434 height = ev.xconfigure.height;
1435 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1436 }
1437 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1456 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1457 ;
1438 1458
1439 if (szHint.width != width || szHint.height != height) 1459 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1440 { 1460 {
1441 seen_resize = 1; 1461 seen_resize = 1;
1442 resize_all_windows (width, height, 1); 1462 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1443 } 1463 }
1444 1464
1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1465#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1446 if (options & Opt_transparent) 1466 if (options & Opt_transparent)
1447 check_our_parents (); 1467 check_our_parents ();
… …
1468 case SelectionRequest: 1488 case SelectionRequest:
1469 selection_send (ev.xselectionrequest); 1489 selection_send (ev.xselectionrequest);
1470 break; 1490 break;
1471 1491
1472 case UnmapNotify: 1492 case UnmapNotify:
1473 TermWin.mapped = 0; 1493 mapped = 0;
1474#ifdef TEXT_BLINK 1494#ifdef TEXT_BLINK
1475 text_blink_ev.stop (); 1495 text_blink_ev.stop ();
1476#endif 1496#endif
1477 break; 1497 break;
1478 1498
1479 case MapNotify: 1499 case MapNotify:
1480 TermWin.mapped = 1; 1500 mapped = 1;
1481#ifdef TEXT_BLINK 1501#ifdef TEXT_BLINK
1482 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1502 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1483#endif 1503#endif
1484 break; 1504 break;
1485 1505
… …
1489 break; 1509 break;
1490#endif /* TRANSPARENT */ 1510#endif /* TRANSPARENT */
1491 1511
1492 case GraphicsExpose: 1512 case GraphicsExpose:
1493 case Expose: 1513 case Expose:
1494 if (ev.xany.window == TermWin.vt) 1514 if (ev.xany.window == vt)
1495 { 1515 {
1496 do 1516 do
1497 scr_expose (ev.xexpose.x, ev.xexpose.y, 1517 scr_expose (ev.xexpose.x, ev.xexpose.y,
1498 ev.xexpose.width, ev.xexpose.height, False); 1518 ev.xexpose.width, ev.xexpose.height, False);
1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1519 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1500 1520
1501 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1502 1522
1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1523 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1504 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1505 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1506 1526
1507 scr_refresh (refresh_type); 1527 scr_refresh (refresh_type);
1508 } 1528 }
… …
1524 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1544 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1525 menubar_expose (); 1545 menubar_expose ();
1526#endif 1546#endif
1527 1547
1528#ifdef TRANSPARENT 1548#ifdef TRANSPARENT
1529 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1549 if (am_transparent && ev.xany.window == parent[0])
1530 XClearWindow (disp, ev.xany.window); 1550 XClearWindow (disp, ev.xany.window);
1531#endif 1551#endif
1532 } 1552 }
1533 break; 1553 break;
1534 1554
… …
1545 } 1565 }
1546#endif 1566#endif
1547 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1548 break; 1568 break;
1549 1569
1550 if (ev.xany.window == TermWin.vt) 1570 if (ev.xany.window == vt)
1551 { 1571 {
1552 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1572 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1573 {
1554 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1574 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1555 ; 1575 ;
1556 1576
1557 XQueryPointer (disp, TermWin.vt, 1577 XQueryPointer (disp, vt,
1558 &unused_root, &unused_child, 1578 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1579 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1580 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1581 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1582#ifdef MOUSE_THRESHOLD
… …
1574#endif 1594#endif
1575 selection_extend (ev.xbutton.x, ev.xbutton.y, 1595 selection_extend (ev.xbutton.x, ev.xbutton.y,
1576 ev.xbutton.state & Button3Mask ? 2 : 0); 1596 ev.xbutton.state & Button3Mask ? 2 : 0);
1577 1597
1578#ifdef SELECTION_SCROLLING 1598#ifdef SELECTION_SCROLLING
1579 if (ev.xbutton.y < TermWin.int_bwidth 1599 if (ev.xbutton.y < int_bwidth
1580 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1600 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1581 { 1601 {
1582 int dist; 1602 int dist;
1583 1603
1584 /* don't clobber the current delay if we are 1604 /* don't clobber the current delay if we are
1585 * already in the middle of scrolling. 1605 * already in the middle of scrolling.
… …
1593 selection_save_x = ev.xbutton.x; 1613 selection_save_x = ev.xbutton.x;
1594 selection_save_y = ev.xbutton.y; 1614 selection_save_y = ev.xbutton.y;
1595 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1615 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1596 1616
1597 /* calc number of lines to scroll */ 1617 /* calc number of lines to scroll */
1598 if (ev.xbutton.y < TermWin.int_bwidth) 1618 if (ev.xbutton.y < int_bwidth)
1599 { 1619 {
1600 scroll_selection_dir = UP; 1620 scroll_selection_dir = UP;
1601 dist = TermWin.int_bwidth - ev.xbutton.y; 1621 dist = int_bwidth - ev.xbutton.y;
1602 } 1622 }
1603 else 1623 else
1604 { 1624 {
1605 scroll_selection_dir = DN; 1625 scroll_selection_dir = DN;
1606 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1626 dist = ev.xbutton.y - (int_bwidth + height);
1607 } 1627 }
1608 1628
1609 scroll_selection_lines = Pixel2Height (dist) 1629 scroll_selection_lines = Pixel2Height (dist)
1610 / SELECTION_SCROLL_LINE_SPEEDUP 1630 / SELECTION_SCROLL_LINE_SPEEDUP
1611 + 1; 1631 + 1;
1612 MIN_IT (scroll_selection_lines, 1632 min_it (scroll_selection_lines,
1613 SELECTION_SCROLL_MAX_LINES); 1633 SELECTION_SCROLL_MAX_LINES);
1614 } 1634 }
1615 else 1635 else
1616 { 1636 {
1617 /* we are within the text window, so we 1637 /* we are within the text window, so we
… …
1648} 1668}
1649 1669
1650void 1670void
1651rxvt_term::focus_in () 1671rxvt_term::focus_in ()
1652{ 1672{
1653 if (!TermWin.focus) 1673 if (!focus)
1654 { 1674 {
1655 TermWin.focus = 1; 1675 focus = 1;
1656 want_refresh = 1; 1676 want_refresh = 1;
1657#if USE_XIM 1677#if USE_XIM
1658 if (Input_Context != NULL) 1678 if (Input_Context != NULL)
1659 { 1679 {
1660 IMSetStatusPosition (); 1680 IMSetStatusPosition ();
… …
1676} 1696}
1677 1697
1678void 1698void
1679rxvt_term::focus_out () 1699rxvt_term::focus_out ()
1680{ 1700{
1681 if (TermWin.focus) 1701 if (focus)
1682 { 1702 {
1683 TermWin.focus = 0; 1703 focus = 0;
1684 want_refresh = 1; 1704 want_refresh = 1;
1685 1705
1686#if ENABLE_FRILLS || ISO_14755 1706#if ENABLE_FRILLS || ISO_14755
1687 iso14755buf = 0; 1707 iso14755buf = 0;
1688#endif 1708#endif
… …
1745 reportmode = !! (priv_modes & PrivMode_mouse_report); 1765 reportmode = !! (priv_modes & PrivMode_mouse_report);
1746 1766
1747 /* 1767 /*
1748 * VT window processing of button press 1768 * VT window processing of button press
1749 */ 1769 */
1750 if (ev.window == TermWin.vt) 1770 if (ev.window == vt)
1751 { 1771 {
1752#if ISO_14755 1772#if ISO_14755
1753 // 5.4 1773 // 5.4
1754 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1774 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1755 { 1775 {
… …
1960 case Button3: 1980 case Button3:
1961 if (scrollBar.style != R_SB_XTERM) 1981 if (scrollBar.style != R_SB_XTERM)
1962 { 1982 {
1963 if (scrollbar_above_slider (ev.y)) 1983 if (scrollbar_above_slider (ev.y))
1964# ifdef RXVT_SCROLL_FULL 1984# ifdef RXVT_SCROLL_FULL
1965 scr_page (UP, TermWin.nrow - 1); 1985 scr_page (UP, nrow - 1);
1966# else 1986# else
1967 scr_page (UP, TermWin.nrow / 4); 1987 scr_page (UP, nrow / 4);
1968# endif 1988# endif
1969 else if (scrollbar_below_slider (ev.y)) 1989 else if (scrollbar_below_slider (ev.y))
1970# ifdef RXVT_SCROLL_FULL 1990# ifdef RXVT_SCROLL_FULL
1971 scr_page (DN, TermWin.nrow - 1); 1991 scr_page (DN, nrow - 1);
1972# else 1992# else
1973 scr_page (DN, TermWin.nrow / 4); 1993 scr_page (DN, nrow / 4);
1974# endif 1994# endif
1975 else 1995 else
1976 scrollBar.setMotion (); 1996 scrollBar.setMotion ();
1977 } 1997 }
1978 else 1998 else
1979 { 1999 {
1980 scr_page ((ev.button == Button1 ? DN : UP), 2000 scr_page ((ev.button == Button1 ? DN : UP),
1981 (TermWin.nrow 2001 (nrow
1982 * scrollbar_position (ev.y) 2002 * scrollbar_position (ev.y)
1983 / scrollbar_size ())); 2003 / scrollbar_size ()));
1984 } 2004 }
1985 2005
1986 break; 2006 break;
… …
2018#ifdef SELECTION_SCROLLING 2038#ifdef SELECTION_SCROLLING
2019 if (sel_scroll_ev.active) 2039 if (sel_scroll_ev.active)
2020 sel_scroll_ev.stop(); 2040 sel_scroll_ev.stop();
2021#endif 2041#endif
2022 2042
2023 if (ev.window == TermWin.vt) 2043 if (ev.window == vt)
2024 { 2044 {
2025#if ISO_14755 2045#if ISO_14755
2026 // 5.4 2046 // 5.4
2027 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2047 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2028 return; 2048 return;
… …
2079 v = ev.button == Button4 ? UP : DN; 2099 v = ev.button == Button4 ? UP : DN;
2080 2100
2081 if (ev.state & ShiftMask) 2101 if (ev.state & ShiftMask)
2082 i = 1; 2102 i = 1;
2083 else if (options & Opt_mouseWheelScrollPage) 2103 else if (options & Opt_mouseWheelScrollPage)
2084 i = TermWin.nrow - 1; 2104 i = nrow - 1;
2085 else 2105 else
2086 i = 5; 2106 i = 5;
2087 2107
2088# ifdef MOUSE_SLIP_WHEELING 2108# ifdef MOUSE_SLIP_WHEELING
2089 if (ev.state & ControlMask) 2109 if (ev.state & ControlMask)
2090 { 2110 {
2091 mouse_slip_wheel_speed += v ? -1 : 1; 2111 mouse_slip_wheel_speed += v ? -1 : 1;
2092 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2112 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2093 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2113 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2094 2114
2095 if (slip_wheel_ev.at < NOW) 2115 if (slip_wheel_ev.at < NOW)
2096 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2116 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2097 2117
2098 slip_wheel_ev.start (); 2118 slip_wheel_ev.start ();
… …
2380 return pchanged; /* Don't try any more */ 2400 return pchanged; /* Don't try any more */
2381 2401
2382 XGetWindowAttributes (disp, display->root, &wrootattr); 2402 XGetWindowAttributes (disp, display->root, &wrootattr);
2383 rootdepth = wrootattr.depth; 2403 rootdepth = wrootattr.depth;
2384 2404
2385 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2405 XGetWindowAttributes (disp, parent[0], &wattr);
2386 2406
2387 if (rootdepth != wattr.depth) 2407 if (rootdepth != wattr.depth)
2388 { 2408 {
2389 if (am_transparent) 2409 if (am_transparent)
2390 { 2410 {
2391 pchanged = 1; 2411 pchanged = 1;
2392 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2412 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2393 am_transparent = am_pixmap_trans = 0; 2413 am_transparent = am_pixmap_trans = 0;
2394 } 2414 }
2395 2415
2396 return pchanged; /* Don't try any more */ 2416 return pchanged; /* Don't try any more */
2397 } 2417 }
… …
2438 Window cr; 2458 Window cr;
2439 XImage *image; 2459 XImage *image;
2440 GC gc; 2460 GC gc;
2441 XGCValues gcvalue; 2461 XGCValues gcvalue;
2442 2462
2443 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2463 XTranslateCoordinates (disp, parent[0], display->root,
2444 0, 0, &sx, &sy, &cr); 2464 0, 0, &sx, &sy, &cr);
2445 nw = (unsigned int)szHint.width; 2465 nw = (unsigned int)szHint.width;
2446 nh = (unsigned int)szHint.height; 2466 nh = (unsigned int)szHint.height;
2447 nx = ny = 0; 2467 nx = ny = 0;
2448 2468
… …
2458 nh += sy; 2478 nh += sy;
2459 ny = -sy; 2479 ny = -sy;
2460 sy = 0; 2480 sy = 0;
2461 } 2481 }
2462 2482
2463 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2483 min_it (nw, (unsigned int) (wrootattr.width - sx));
2464 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2484 min_it (nh, (unsigned int) (wrootattr.height - sy));
2465 2485
2466 XSync (disp, False); 2486 XSync (disp, False);
2467 allowedxerror = -1; 2487 allowedxerror = -1;
2468 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2488 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2469 2489
… …
2474 if (image == NULL) 2494 if (image == NULL)
2475 { 2495 {
2476 if (am_transparent && am_pixmap_trans) 2496 if (am_transparent && am_pixmap_trans)
2477 { 2497 {
2478 pchanged = 1; 2498 pchanged = 1;
2479 if (TermWin.pixmap != None) 2499 if (pixmap != None)
2480 { 2500 {
2481 XFreePixmap (disp, TermWin.pixmap); 2501 XFreePixmap (disp, pixmap);
2482 TermWin.pixmap = None; 2502 pixmap = None;
2483 } 2503 }
2484 } 2504 }
2485 2505
2486 am_pixmap_trans = 0; 2506 am_pixmap_trans = 0;
2487 } 2507 }
2488 else 2508 else
2489 { 2509 {
2490 if (TermWin.pixmap != None) 2510 if (pixmap != None)
2491 XFreePixmap (disp, TermWin.pixmap); 2511 XFreePixmap (disp, pixmap);
2492 2512
2493#if TINTING 2513#if TINTING
2494 if (ISSET_PIXCOLOR (Color_tint)) 2514 if (ISSET_PIXCOLOR (Color_tint))
2495 { 2515 {
2496 unsigned short rm, gm, bm; 2516 unsigned short rm, gm, bm;
… …
2500 2520
2501 ShadeXImage (display, image, shade, rm, gm, bm); 2521 ShadeXImage (display, image, shade, rm, gm, bm);
2502 } 2522 }
2503#endif 2523#endif
2504 2524
2505 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2525 pixmap = XCreatePixmap (disp, vt,
2506 szHint.width, szHint.height, image->depth); 2526 szHint.width, szHint.height, image->depth);
2507 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2527 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2508 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2528 XPutImage (disp, pixmap, gc, image, 0, 0,
2509 nx, ny, image->width, image->height); 2529 nx, ny, image->width, image->height);
2510 XFreeGC (disp, gc); 2530 XFreeGC (disp, gc);
2511 XDestroyImage (image); 2531 XDestroyImage (image);
2512 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2532 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2513 XClearWindow (disp, TermWin.parent[0]); 2533 XClearWindow (disp, parent[0]);
2514 2534
2515 if (!am_transparent || !am_pixmap_trans) 2535 if (!am_transparent || !am_pixmap_trans)
2516 pchanged = 1; 2536 pchanged = 1;
2517 2537
2518 am_transparent = am_pixmap_trans = 1; 2538 am_transparent = am_pixmap_trans = 1;
2519 } 2539 }
2520 } 2540 }
2521 2541
2522 if (am_pixmap_trans) 2542 if (am_pixmap_trans)
2523 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2543 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2524 else 2544 else
2525 { 2545 {
2526 unsigned int n; 2546 unsigned int n;
2527 /* 2547 /*
2528 * InheritPixmap transparency 2548 * InheritPixmap transparency
2529 */ 2549 */
2530 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2550 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2531 { 2551 {
2532 oldp = TermWin.parent[i]; 2552 oldp = parent[i];
2533 XQueryTree (disp, TermWin.parent[i - 1], &root, 2553 XQueryTree (disp, parent[i - 1], &root,
2534 &TermWin.parent[i], &list, &n); 2554 &parent[i], &list, &n);
2535 XFree (list); 2555 XFree (list);
2536 2556
2537 if (TermWin.parent[i] == display->root) 2557 if (parent[i] == display->root)
2538 { 2558 {
2539 if (oldp != None) 2559 if (oldp != None)
2540 pchanged = 1; 2560 pchanged = 1;
2541 2561
2542 break; 2562 break;
2543 } 2563 }
2544 2564
2545 if (oldp != TermWin.parent[i]) 2565 if (oldp != parent[i])
2546 pchanged = 1; 2566 pchanged = 1;
2547 } 2567 }
2548 2568
2549 n = 0; 2569 n = 0;
2550 2570
2551 if (pchanged) 2571 if (pchanged)
2552 { 2572 {
2553 for (; n < (unsigned int)i; n++) 2573 for (; n < (unsigned int)i; n++)
2554 { 2574 {
2555 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2575 XGetWindowAttributes (disp, parent[n], &wattr);
2556 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2576 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2557 { 2577 {
2558 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2578 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2559 break; 2579 break;
2560 } 2580 }
2561 } 2581 }
2562 } 2582 }
2563 2583
2564 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2584 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2565 { 2585 {
2566 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2586 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2567 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2587 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2568 am_transparent = 0; 2588 am_transparent = 0;
2569 /* XXX: also turn off Opt_transparent? */ 2589 /* XXX: also turn off Opt_transparent? */
2570 } 2590 }
2571 else 2591 else
2572 { 2592 {
… …
2575 * needed for fvwm2.2.2 (and before?) */ 2595 * needed for fvwm2.2.2 (and before?) */
2576 sleep (1); 2596 sleep (1);
2577#endif 2597#endif
2578 for (n = 0; n < (unsigned int)i; n++) 2598 for (n = 0; n < (unsigned int)i; n++)
2579 { 2599 {
2580 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2600 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2581 XClearWindow (disp, TermWin.parent[n]); 2601 XClearWindow (disp, parent[n]);
2582 } 2602 }
2583 2603
2584 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2604 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2585 am_transparent = 1; 2605 am_transparent = 1;
2586 } 2606 }
2587 2607
2588 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2608 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2589 TermWin.parent[i] = None; 2609 parent[i] = None;
2590 } 2610 }
2591 2611
2592 if (scrollBar.win) 2612 if (scrollBar.win)
2593 { 2613 {
2594 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2614 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2646 /* Read a text string from the input buffer */ 2666 /* Read a text string from the input buffer */
2647 unicode_t buf[UBUFSIZ]; 2667 unicode_t buf[UBUFSIZ];
2648 bool refreshnow = false; 2668 bool refreshnow = false;
2649 int nlines = 0; 2669 int nlines = 0;
2650 unicode_t *str = buf; 2670 unicode_t *str = buf;
2651 unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ); 2671 unicode_t *eol = str + min (ncol, UBUFSIZ);
2652 2672
2653 for (;;) 2673 for (;;)
2654 { 2674 {
2655 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2675 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2656 break; 2676 break;
… …
2663 nlines++; 2683 nlines++;
2664 2684
2665 refresh_count++; 2685 refresh_count++;
2666 2686
2667 if (!(options & Opt_jumpScroll) 2687 if (!(options & Opt_jumpScroll)
2668 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2688 || (refresh_count >= refresh_limit * (nrow - 1)))
2669 { 2689 {
2670 refreshnow = true; 2690 refreshnow = true;
2671 ch = NOCHAR; 2691 ch = NOCHAR;
2672 break; 2692 break;
2673 } 2693 }
2674 2694
2675 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2695 // scr_add_lines only works for nlines <= nrow - 1.
2676 if (nlines >= TermWin.nrow - 1) 2696 if (nlines >= nrow - 1)
2677 { 2697 {
2678 scr_add_lines (buf, nlines, str - buf); 2698 scr_add_lines (buf, nlines, str - buf);
2679 nlines = 0; 2699 nlines = 0;
2680 str = buf; 2700 str = buf;
2681 eol = str + min (TermWin.ncol, UBUFSIZ); 2701 eol = str + min (ncol, UBUFSIZ);
2682 } 2702 }
2683 2703
2684 if (str >= eol) 2704 if (str >= eol)
2685 { 2705 {
2686 if (eol >= buf + UBUFSIZ) 2706 if (eol >= buf + UBUFSIZ)
2687 { 2707 {
2688 ch = NOCHAR; 2708 ch = NOCHAR;
2689 break; 2709 break;
2690 } 2710 }
2691 else 2711 else
2692 eol = min (eol + TermWin.ncol, buf + UBUFSIZ); 2712 eol = min (eol + ncol, buf + UBUFSIZ);
2693 } 2713 }
2694 2714
2695 } 2715 }
2696 2716
2697 seq_begin = cmdbuf_ptr; 2717 seq_begin = cmdbuf_ptr;
… …
3358 3378
3359 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3379 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3360 arg[0] = -arg[0]; 3380 arg[0] = -arg[0];
3361 /* FALLTHROUGH */ 3381 /* FALLTHROUGH */
3362 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3382 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3363 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3383 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3364 break; 3384 break;
3365 3385
3366 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3386 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3367 tt_write ((const unsigned char *)VT100_ANS, 3387 tt_write ((const unsigned char *)VT100_ANS,
3368 (unsigned int) (sizeof (VT100_ANS) - 1)); 3388 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3493 { 3513 {
3494 /* 3514 /*
3495 * commands 3515 * commands
3496 */ 3516 */
3497 case 1: /* deiconify window */ 3517 case 1: /* deiconify window */
3498 XMapWindow (disp, TermWin.parent[0]); 3518 XMapWindow (disp, parent[0]);
3499 break; 3519 break;
3500 case 2: /* iconify window */ 3520 case 2: /* iconify window */
3501 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3521 XIconifyWindow (disp, parent[0], display->screen);
3502 break; 3522 break;
3503 case 3: /* set position (pixels) */ 3523 case 3: /* set position (pixels) */
3504 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3524 XMoveWindow (disp, parent[0], args[1], args[2]);
3505 break; 3525 break;
3506 case 4: /* set size (pixels) */ 3526 case 4: /* set size (pixels) */
3507 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3527 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3508 break; 3528 break;
3509 case 5: /* raise window */ 3529 case 5: /* raise window */
3510 XRaiseWindow (disp, TermWin.parent[0]); 3530 XRaiseWindow (disp, parent[0]);
3511 break; 3531 break;
3512 case 6: /* lower window */ 3532 case 6: /* lower window */
3513 XLowerWindow (disp, TermWin.parent[0]); 3533 XLowerWindow (disp, parent[0]);
3514 break; 3534 break;
3515 case 7: /* refresh window */ 3535 case 7: /* refresh window */
3516 scr_touch (true); 3536 scr_touch (true);
3517 break; 3537 break;
3518 case 8: /* set size (chars) */ 3538 case 8: /* set size (chars) */
3519 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3539 set_widthheight ((unsigned int) (args[2] * fwidth),
3520 (unsigned int) (args[1] * TermWin.fheight)); 3540 (unsigned int) (args[1] * fheight));
3521 break; 3541 break;
3522 3542
3523 //case 9: NYI, TODO, restore maximized window or maximize window 3543 //case 9: NYI, TODO, restore maximized window or maximize window
3524 default: 3544 default:
3525 if (args[0] >= 24) /* set height (chars) */ 3545 if (args[0] >= 24) /* set height (chars) */
3526 set_widthheight ((unsigned int)TermWin.width, 3546 set_widthheight ((unsigned int)width,
3527 (unsigned int) (args[1] * TermWin.fheight)); 3547 (unsigned int) (args[1] * fheight));
3528 break; 3548 break;
3529 3549
3530 3550
3531 /* 3551 /*
3532 * reports - some output format copied from XTerm 3552 * reports - some output format copied from XTerm
3533 */ 3553 */
3534 case 11: /* report window state */ 3554 case 11: /* report window state */
3535 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3555 XGetWindowAttributes (disp, parent[0], &wattr);
3536 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3556 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3537 break; 3557 break;
3538 case 13: /* report window position */ 3558 case 13: /* report window position */
3539 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3559 XGetWindowAttributes (disp, parent[0], &wattr);
3540 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3560 XTranslateCoordinates (disp, parent[0], wattr.root,
3541 -wattr.border_width, -wattr.border_width, 3561 -wattr.border_width, -wattr.border_width,
3542 &x, &y, &wdummy); 3562 &x, &y, &wdummy);
3543 tt_printf ("\033[3;%d;%dt", x, y); 3563 tt_printf ("\033[3;%d;%dt", x, y);
3544 break; 3564 break;
3545 case 14: /* report window size (pixels) */ 3565 case 14: /* report window size (pixels) */
3546 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3566 XGetWindowAttributes (disp, parent[0], &wattr);
3547 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3567 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3548 break; 3568 break;
3549 case 18: /* report text area size (chars) */ 3569 case 18: /* report text area size (chars) */
3550 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3570 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3551 break; 3571 break;
3552 case 19: /* report window size (chars) */ 3572 case 19: /* report window size (chars) */
3553 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3573 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3554 break; 3574 break;
3555 case 20: /* report icon label */ 3575 case 20: /* report icon label */
3556 { 3576 {
3557 char *s; 3577 char *s;
3558 XGetIconName (disp, TermWin.parent[0], &s); 3578 XGetIconName (disp, parent[0], &s);
3559 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3579 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3560 XFree (s); 3580 XFree (s);
3561 } 3581 }
3562 break; 3582 break;
3563 case 21: /* report window title */ 3583 case 21: /* report window title */
3564 { 3584 {
3565 char *s; 3585 char *s;
3566 XFetchName (disp, TermWin.parent[0], &s); 3586 XFetchName (disp, parent[0], &s);
3567 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3587 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3568 XFree (s); 3588 XFree (s);
3569 } 3589 }
3570 break; 3590 break;
3571 } 3591 }
… …
3717 unsigned long bytes_after; 3737 unsigned long bytes_after;
3718 unsigned char *value = 0; 3738 unsigned char *value = 0;
3719 const char *str = ""; 3739 const char *str = "";
3720 3740
3721 if (prop 3741 if (prop
3722 && XGetWindowProperty (disp, TermWin.parent[0], 3742 && XGetWindowProperty (disp, parent[0],
3723 prop, 0, 1<<16, 0, AnyPropertyType, 3743 prop, 0, 1<<16, 0, AnyPropertyType,
3724 &actual_type, &actual_format, 3744 &actual_type, &actual_format,
3725 &nitems, &bytes_after, &value) == Success 3745 &nitems, &bytes_after, &value) == Success
3726 && actual_type != None 3746 && actual_type != None
3727 && actual_format == 8) 3747 && actual_format == 8)
… …
3739 { 3759 {
3740 *eq = 0; 3760 *eq = 0;
3741 set_utf8_property (display->atom (str), eq + 1); 3761 set_utf8_property (display->atom (str), eq + 1);
3742 } 3762 }
3743 else 3763 else
3744 XDeleteProperty (disp, TermWin.parent[0], 3764 XDeleteProperty (disp, parent[0],
3745 display->atom (str)); 3765 display->atom (str));
3746 } 3766 }
3747 break; 3767 break;
3748 3768
3749 case XTerm_Color: 3769 case XTerm_Color:
… …
3874 case URxvt_italicFont: 3894 case URxvt_italicFont:
3875 case URxvt_boldItalicFont: 3895 case URxvt_boldItalicFont:
3876#endif 3896#endif
3877 if (query) 3897 if (query)
3878 tt_printf ("\33]%d;%-.250s%c", saveop, 3898 tt_printf ("\33]%d;%-.250s%c", saveop,
3879 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3899 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3880 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3900 ? fontset[op - URxvt_font]->fontdesc : "",
3881 resp); 3901 resp);
3882 else 3902 else
3883 { 3903 {
3884 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3904 const char *&res = rs[Rs_font + (op - URxvt_font)];
3885 3905
… …
4052 */ 4072 */
4053 PrivMode (1, PrivMode_vt52); 4073 PrivMode (1, PrivMode_vt52);
4054 break; 4074 break;
4055 case 3: /* 80/132 */ 4075 case 3: /* 80/132 */
4056 if (priv_modes & PrivMode_132OK) 4076 if (priv_modes & PrivMode_132OK)
4057 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4077 set_widthheight (((state ? 132 : 80) * fwidth), height);
4058 break; 4078 break;
4059 case 4: /* smooth scrolling */ 4079 case 4: /* smooth scrolling */
4060 if (state) 4080 if (state)
4061 options &= ~Opt_jumpScroll; 4081 options &= ~Opt_jumpScroll;
4062 else 4082 else
… …
4379 } 4399 }
4380 4400
4381 memmove (v_buffer, v_buffer + written, v_buflen); 4401 memmove (v_buffer, v_buffer + written, v_buflen);
4382 } 4402 }
4383 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4403 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4384 // original code just ignores this... 4404 pty_ev.set (EVENT_READ);
4385 destroy ();
4386} 4405}
4387 4406
4388/*----------------------- end-of-file (C source) -----------------------*/ 4407/*----------------------- end-of-file (C source) -----------------------*/
4389 4408

Diff Legend

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