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.216 by root, Tue Dec 27 01:25: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]);
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 char attr[80]; // plenty
189 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
202 int width = wcswidth (fname, wcslen (fname));
203
204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr));
206
190 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 207 scr_overlay_new (0, -1, width, len + 2);
191 208
192 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 209 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193 210
194 for (int y = 0; y < len; y++) 211 for (int y = 0; y < len; y++)
195 { 212 {
… …
206#endif 223#endif
207 scr_overlay_set (11, y, ch, r); 224 scr_overlay_set (11, y, ch, r);
208 scr_overlay_set (12, y, NOCHAR, r); 225 scr_overlay_set (12, y, NOCHAR, r);
209 } 226 }
210 227
228 scr_overlay_set (0, len , attr);
211 scr_overlay_set (0, len, f->name); 229 scr_overlay_set (0, len + 1, fname);
230
231 free (fname);
212 232
213#if ENABLE_COMBINING 233#if ENABLE_COMBINING
214 if (alloc) 234 if (alloc)
215 delete [] alloc; 235 delete [] alloc;
216#endif 236#endif
… …
316 336
317 // the XOpenIM manpage lies about hardcoding the locale 337 // the XOpenIM manpage lies about hardcoding the locale
318 // at the point of XOpenIM, so temporarily switch locales 338 // at the point of XOpenIM, so temporarily switch locales
319 if (rs[Rs_imLocale]) 339 if (rs[Rs_imLocale])
320 SET_LOCALE (rs[Rs_imLocale]); 340 SET_LOCALE (rs[Rs_imLocale]);
341
321 // assume wchar_t == unicode or better 342 // assume wchar_t == unicode or better
322 len = XwcLookupString (Input_Context, &ev, wkbuf, 343 len = XwcLookupString (Input_Context, &ev, wkbuf,
323 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
345
324 if (rs[Rs_imLocale]) 346 if (rs[Rs_imLocale])
325 SET_LOCALE (locale); 347 SET_LOCALE (locale);
326 348
327 if (status_return == XLookupChars 349 if (status_return == XLookupChars
328 || status_return == XLookupBoth) 350 || status_return == XLookupBoth)
… …
360#ifdef KEYSYM_RESOURCE 382#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state)) 383 if (keyboard->dispatch (this, keysym, ev.state))
362 return; 384 return;
363#endif 385#endif
364 386
365 if (TermWin.saveLines) 387 if (saveLines)
366 { 388 {
367#ifdef UNSHIFTED_SCROLLKEYS 389#ifdef UNSHIFTED_SCROLLKEYS
368 if (!ctrl && !meta) 390 if (!ctrl && !meta)
369#else 391#else
370 if (IS_SCROLL_MOD) 392 if (IS_SCROLL_MOD)
371#endif 393#endif
372 { 394 {
373 int lnsppg; 395 int lnsppg;
374 396
375#ifdef PAGING_CONTEXT_LINES 397#ifdef PAGING_CONTEXT_LINES
376 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 398 lnsppg = nrow - PAGING_CONTEXT_LINES;
377#else 399#else
378 lnsppg = TermWin.nrow * 4 / 5; 400 lnsppg = nrow * 4 / 5;
379#endif 401#endif
380 if (keysym == XK_Prior) 402 if (keysym == XK_Prior)
381 { 403 {
382 scr_page (UP, lnsppg); 404 scr_page (UP, lnsppg);
383 return; 405 return;
… …
839 861
840 if (len <= 0) 862 if (len <= 0)
841 return; /* not mapped */ 863 return; /* not mapped */
842 864
843 if (options & Opt_scrollTtyKeypress) 865 if (options & Opt_scrollTtyKeypress)
844 if (TermWin.view_start) 866 if (view_start)
845 { 867 {
846 TermWin.view_start = 0; 868 view_start = 0;
847 want_refresh = 1; 869 want_refresh = 1;
848 } 870 }
849 871
850 /* 872 /*
851 * these modifications only affect the static keybuffer 873 * these modifications only affect the static keybuffer
… …
1028{ 1050{
1029 if (mouse_slip_wheel_speed == 0 1051 if (mouse_slip_wheel_speed == 0
1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1052 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1031 : scr_page (UP, mouse_slip_wheel_speed)) 1053 : scr_page (UP, mouse_slip_wheel_speed))
1032 { 1054 {
1033 if (TermWin.view_start == TermWin.nscrolled || 1055 if (view_start == nsaved ||
1034 TermWin.view_start == 0) 1056 view_start == 0)
1035 mouse_slip_wheel_speed = 0; 1057 mouse_slip_wheel_speed = 0;
1036 1058
1037 refresh_type |= SMOOTH_REFRESH; 1059 refresh_type |= SMOOTH_REFRESH;
1038 want_refresh = 1; 1060 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1061 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1061 if (n > 0) 1083 if (n > 0)
1062 { 1084 {
1063 cmdbuf_endp += n; 1085 cmdbuf_endp += n;
1064 return true; 1086 return true;
1065 } 1087 }
1066 else if (n < 0 && errno != EAGAIN) 1088 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
1089 {
1090 pty_ev.stop ();
1091
1092 if (!(options & Opt_hold))
1067 destroy (); 1093 destroy ();
1094 }
1068 1095
1069 return false; 1096 return false;
1070} 1097}
1071 1098
1072void 1099void
… …
1086} 1113}
1087 1114
1088void 1115void
1089rxvt_term::pointer_unblank () 1116rxvt_term::pointer_unblank ()
1090{ 1117{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1118 XDefineCursor (display->display, vt, TermWin_cursor);
1092 recolour_cursor (); 1119 recolour_cursor ();
1093 1120
1094#ifdef POINTER_BLANK 1121#ifdef POINTER_BLANK
1095 hidden_pointer = 0; 1122 hidden_pointer = 0;
1096 1123
… …
1104rxvt_term::pointer_blank () 1131rxvt_term::pointer_blank ()
1105{ 1132{
1106 if (! (options & Opt_pointerBlank)) 1133 if (! (options & Opt_pointerBlank))
1107 return; 1134 return;
1108 1135
1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1136 XDefineCursor (display->display, vt, display->blank_cursor);
1110 XFlush (display->display); 1137 XFlush (display->display);
1111 1138
1112 hidden_pointer = 1; 1139 hidden_pointer = 1;
1113} 1140}
1114 1141
… …
1416 case FocusOut: 1443 case FocusOut:
1417 focus_out (); 1444 focus_out ();
1418 break; 1445 break;
1419 1446
1420 case ConfigureNotify: 1447 case ConfigureNotify:
1421 if (ev.xconfigure.window == TermWin.parent[0]) 1448 if (ev.xconfigure.window == parent[0])
1422 { 1449 {
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)); 1450 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1451 ;
1432 1452
1433 if (szHint.width != width || szHint.height != height) 1453 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1454 {
1435 seen_resize = 1; 1455 seen_resize = 1;
1436 resize_all_windows (width, height, 1); 1456 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1457 }
1438 1458
1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1459#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1440 if (options & Opt_transparent) 1460 if (options & Opt_transparent)
1441 check_our_parents (); 1461 check_our_parents ();
… …
1462 case SelectionRequest: 1482 case SelectionRequest:
1463 selection_send (ev.xselectionrequest); 1483 selection_send (ev.xselectionrequest);
1464 break; 1484 break;
1465 1485
1466 case UnmapNotify: 1486 case UnmapNotify:
1467 TermWin.mapped = 0; 1487 mapped = 0;
1468#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1469 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1470#endif 1490#endif
1471 break; 1491 break;
1472 1492
1473 case MapNotify: 1493 case MapNotify:
1474 TermWin.mapped = 1; 1494 mapped = 1;
1475#ifdef TEXT_BLINK 1495#ifdef TEXT_BLINK
1476 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1496 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1477#endif 1497#endif
1478 break; 1498 break;
1479 1499
… …
1483 break; 1503 break;
1484#endif /* TRANSPARENT */ 1504#endif /* TRANSPARENT */
1485 1505
1486 case GraphicsExpose: 1506 case GraphicsExpose:
1487 case Expose: 1507 case Expose:
1488 if (ev.xany.window == TermWin.vt) 1508 if (ev.xany.window == vt)
1489 { 1509 {
1490 do 1510 do
1491 scr_expose (ev.xexpose.x, ev.xexpose.y, 1511 scr_expose (ev.xexpose.x, ev.xexpose.y,
1492 ev.xexpose.width, ev.xexpose.height, False); 1512 ev.xexpose.width, ev.xexpose.height, False);
1493 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1513 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1494 1514
1495 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1515 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1496 1516
1497 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1517 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1498 scr_expose (ev.xexpose.x, ev.xexpose.y, 1518 scr_expose (ev.xexpose.x, ev.xexpose.y,
1499 ev.xexpose.width, ev.xexpose.height, False); 1519 ev.xexpose.width, ev.xexpose.height, False);
1500 1520
1501 scr_refresh (refresh_type); 1521 scr_refresh (refresh_type);
1502 } 1522 }
… …
1518 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1538 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1519 menubar_expose (); 1539 menubar_expose ();
1520#endif 1540#endif
1521 1541
1522#ifdef TRANSPARENT 1542#ifdef TRANSPARENT
1523 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1543 if (am_transparent && ev.xany.window == parent[0])
1524 XClearWindow (disp, ev.xany.window); 1544 XClearWindow (disp, ev.xany.window);
1525#endif 1545#endif
1526 } 1546 }
1527 break; 1547 break;
1528 1548
… …
1539 } 1559 }
1540#endif 1560#endif
1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1561 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1542 break; 1562 break;
1543 1563
1544 if (ev.xany.window == TermWin.vt) 1564 if (ev.xany.window == vt)
1545 { 1565 {
1546 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1566 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1547 { 1567 {
1548 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1568 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1549 ; 1569 ;
1550 1570
1551 XQueryPointer (disp, TermWin.vt, 1571 XQueryPointer (disp, vt,
1552 &unused_root, &unused_child, 1572 &unused_root, &unused_child,
1553 &unused_root_x, &unused_root_y, 1573 &unused_root_x, &unused_root_y,
1554 &ev.xbutton.x, &ev.xbutton.y, 1574 &ev.xbutton.x, &ev.xbutton.y,
1555 &ev.xbutton.state); 1575 &ev.xbutton.state);
1556#ifdef MOUSE_THRESHOLD 1576#ifdef MOUSE_THRESHOLD
… …
1568#endif 1588#endif
1569 selection_extend (ev.xbutton.x, ev.xbutton.y, 1589 selection_extend (ev.xbutton.x, ev.xbutton.y,
1570 ev.xbutton.state & Button3Mask ? 2 : 0); 1590 ev.xbutton.state & Button3Mask ? 2 : 0);
1571 1591
1572#ifdef SELECTION_SCROLLING 1592#ifdef SELECTION_SCROLLING
1573 if (ev.xbutton.y < TermWin.int_bwidth 1593 if (ev.xbutton.y < int_bwidth
1574 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1594 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1575 { 1595 {
1576 int dist; 1596 int dist;
1577 1597
1578 /* don't clobber the current delay if we are 1598 /* don't clobber the current delay if we are
1579 * already in the middle of scrolling. 1599 * already in the middle of scrolling.
… …
1587 selection_save_x = ev.xbutton.x; 1607 selection_save_x = ev.xbutton.x;
1588 selection_save_y = ev.xbutton.y; 1608 selection_save_y = ev.xbutton.y;
1589 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1609 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1590 1610
1591 /* calc number of lines to scroll */ 1611 /* calc number of lines to scroll */
1592 if (ev.xbutton.y < TermWin.int_bwidth) 1612 if (ev.xbutton.y < int_bwidth)
1593 { 1613 {
1594 scroll_selection_dir = UP; 1614 scroll_selection_dir = UP;
1595 dist = TermWin.int_bwidth - ev.xbutton.y; 1615 dist = int_bwidth - ev.xbutton.y;
1596 } 1616 }
1597 else 1617 else
1598 { 1618 {
1599 scroll_selection_dir = DN; 1619 scroll_selection_dir = DN;
1600 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1620 dist = ev.xbutton.y - (int_bwidth + height);
1601 } 1621 }
1602 1622
1603 scroll_selection_lines = Pixel2Height (dist) 1623 scroll_selection_lines = Pixel2Height (dist)
1604 / SELECTION_SCROLL_LINE_SPEEDUP 1624 / SELECTION_SCROLL_LINE_SPEEDUP
1605 + 1; 1625 + 1;
1606 MIN_IT (scroll_selection_lines, 1626 min_it (scroll_selection_lines,
1607 SELECTION_SCROLL_MAX_LINES); 1627 SELECTION_SCROLL_MAX_LINES);
1608 } 1628 }
1609 else 1629 else
1610 { 1630 {
1611 /* we are within the text window, so we 1631 /* we are within the text window, so we
… …
1642} 1662}
1643 1663
1644void 1664void
1645rxvt_term::focus_in () 1665rxvt_term::focus_in ()
1646{ 1666{
1647 if (!TermWin.focus) 1667 if (!focus)
1648 { 1668 {
1649 TermWin.focus = 1; 1669 focus = 1;
1650 want_refresh = 1; 1670 want_refresh = 1;
1651#ifdef USE_XIM 1671#if USE_XIM
1652 if (Input_Context != NULL) 1672 if (Input_Context != NULL)
1653 { 1673 {
1654 IMSetStatusPosition (); 1674 IMSetStatusPosition ();
1655 XSetICFocus (Input_Context); 1675 XSetICFocus (Input_Context);
1656 } 1676 }
1657#endif 1677#endif
1658#ifdef CURSOR_BLINK 1678#if CURSOR_BLINK
1659 if (options & Opt_cursorBlink) 1679 if (options & Opt_cursorBlink)
1660 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1680 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1661#endif 1681#endif
1662#ifdef OFF_FOCUS_FADING 1682#if OFF_FOCUS_FADING
1663 if (rs[Rs_fade]) 1683 if (rs[Rs_fade])
1664 { 1684 {
1665 pix_colors = pix_colors_focused; 1685 pix_colors = pix_colors_focused;
1666 scr_recolour (); 1686 scr_recolour ();
1667 } 1687 }
… …
1670} 1690}
1671 1691
1672void 1692void
1673rxvt_term::focus_out () 1693rxvt_term::focus_out ()
1674{ 1694{
1675 if (TermWin.focus) 1695 if (focus)
1676 { 1696 {
1677 TermWin.focus = 0; 1697 focus = 0;
1678 want_refresh = 1; 1698 want_refresh = 1;
1679 1699
1680#if ENABLE_FRILLS || ISO_14755 1700#if ENABLE_FRILLS || ISO_14755
1681 iso14755buf = 0; 1701 iso14755buf = 0;
1682#endif 1702#endif
1683#if ENABLE_OVERLAY 1703#if ENABLE_OVERLAY
1684 scr_overlay_off (); 1704 scr_overlay_off ();
1685#endif 1705#endif
1686#ifdef USE_XIM 1706#if USE_XIM
1687 if (Input_Context != NULL) 1707 if (Input_Context != NULL)
1688 XUnsetICFocus (Input_Context); 1708 XUnsetICFocus (Input_Context);
1689#endif 1709#endif
1690#ifdef CURSOR_BLINK 1710#if CURSOR_BLINK
1691 if (options & Opt_cursorBlink) 1711 if (options & Opt_cursorBlink)
1692 cursor_blink_ev.stop (); 1712 cursor_blink_ev.stop ();
1693 hidden_cursor = 0; 1713 hidden_cursor = 0;
1694#endif 1714#endif
1695#ifdef OFF_FOCUS_FADING 1715#if OFF_FOCUS_FADING
1696 if (rs[Rs_fade]) 1716 if (rs[Rs_fade])
1697 { 1717 {
1698 pix_colors = pix_colors_unfocused; 1718 pix_colors = pix_colors_unfocused;
1699 scr_recolour (); 1719 scr_recolour ();
1700 } 1720 }
… …
1739 reportmode = !! (priv_modes & PrivMode_mouse_report); 1759 reportmode = !! (priv_modes & PrivMode_mouse_report);
1740 1760
1741 /* 1761 /*
1742 * VT window processing of button press 1762 * VT window processing of button press
1743 */ 1763 */
1744 if (ev.window == TermWin.vt) 1764 if (ev.window == vt)
1745 { 1765 {
1746#if ISO_14755 1766#if ISO_14755
1747 // 5.4 1767 // 5.4
1748 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1768 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1749 { 1769 {
… …
1954 case Button3: 1974 case Button3:
1955 if (scrollBar.style != R_SB_XTERM) 1975 if (scrollBar.style != R_SB_XTERM)
1956 { 1976 {
1957 if (scrollbar_above_slider (ev.y)) 1977 if (scrollbar_above_slider (ev.y))
1958# ifdef RXVT_SCROLL_FULL 1978# ifdef RXVT_SCROLL_FULL
1959 scr_page (UP, TermWin.nrow - 1); 1979 scr_page (UP, nrow - 1);
1960# else 1980# else
1961 scr_page (UP, TermWin.nrow / 4); 1981 scr_page (UP, nrow / 4);
1962# endif 1982# endif
1963 else if (scrollbar_below_slider (ev.y)) 1983 else if (scrollbar_below_slider (ev.y))
1964# ifdef RXVT_SCROLL_FULL 1984# ifdef RXVT_SCROLL_FULL
1965 scr_page (DN, TermWin.nrow - 1); 1985 scr_page (DN, nrow - 1);
1966# else 1986# else
1967 scr_page (DN, TermWin.nrow / 4); 1987 scr_page (DN, nrow / 4);
1968# endif 1988# endif
1969 else 1989 else
1970 scrollBar.setMotion (); 1990 scrollBar.setMotion ();
1971 } 1991 }
1972 else 1992 else
1973 { 1993 {
1974 scr_page ((ev.button == Button1 ? DN : UP), 1994 scr_page ((ev.button == Button1 ? DN : UP),
1975 (TermWin.nrow 1995 (nrow
1976 * scrollbar_position (ev.y) 1996 * scrollbar_position (ev.y)
1977 / scrollbar_size ())); 1997 / scrollbar_size ()));
1978 } 1998 }
1979 1999
1980 break; 2000 break;
… …
2012#ifdef SELECTION_SCROLLING 2032#ifdef SELECTION_SCROLLING
2013 if (sel_scroll_ev.active) 2033 if (sel_scroll_ev.active)
2014 sel_scroll_ev.stop(); 2034 sel_scroll_ev.stop();
2015#endif 2035#endif
2016 2036
2017 if (ev.window == TermWin.vt) 2037 if (ev.window == vt)
2018 { 2038 {
2019#if ISO_14755 2039#if ISO_14755
2020 // 5.4 2040 // 5.4
2021 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2041 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2022 return; 2042 return;
… …
2073 v = ev.button == Button4 ? UP : DN; 2093 v = ev.button == Button4 ? UP : DN;
2074 2094
2075 if (ev.state & ShiftMask) 2095 if (ev.state & ShiftMask)
2076 i = 1; 2096 i = 1;
2077 else if (options & Opt_mouseWheelScrollPage) 2097 else if (options & Opt_mouseWheelScrollPage)
2078 i = TermWin.nrow - 1; 2098 i = nrow - 1;
2079 else 2099 else
2080 i = 5; 2100 i = 5;
2081 2101
2082# ifdef MOUSE_SLIP_WHEELING 2102# ifdef MOUSE_SLIP_WHEELING
2083 if (ev.state & ControlMask) 2103 if (ev.state & ControlMask)
2084 { 2104 {
2085 mouse_slip_wheel_speed += v ? -1 : 1; 2105 mouse_slip_wheel_speed += v ? -1 : 1;
2086 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2106 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; 2107 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2088 2108
2089 if (slip_wheel_ev.at < NOW) 2109 if (slip_wheel_ev.at < NOW)
2090 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2110 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2091 2111
2092 slip_wheel_ev.start (); 2112 slip_wheel_ev.start ();
… …
2374 return pchanged; /* Don't try any more */ 2394 return pchanged; /* Don't try any more */
2375 2395
2376 XGetWindowAttributes (disp, display->root, &wrootattr); 2396 XGetWindowAttributes (disp, display->root, &wrootattr);
2377 rootdepth = wrootattr.depth; 2397 rootdepth = wrootattr.depth;
2378 2398
2379 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2399 XGetWindowAttributes (disp, parent[0], &wattr);
2380 2400
2381 if (rootdepth != wattr.depth) 2401 if (rootdepth != wattr.depth)
2382 { 2402 {
2383 if (am_transparent) 2403 if (am_transparent)
2384 { 2404 {
2385 pchanged = 1; 2405 pchanged = 1;
2386 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2406 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2387 am_transparent = am_pixmap_trans = 0; 2407 am_transparent = am_pixmap_trans = 0;
2388 } 2408 }
2389 2409
2390 return pchanged; /* Don't try any more */ 2410 return pchanged; /* Don't try any more */
2391 } 2411 }
… …
2432 Window cr; 2452 Window cr;
2433 XImage *image; 2453 XImage *image;
2434 GC gc; 2454 GC gc;
2435 XGCValues gcvalue; 2455 XGCValues gcvalue;
2436 2456
2437 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2457 XTranslateCoordinates (disp, parent[0], display->root,
2438 0, 0, &sx, &sy, &cr); 2458 0, 0, &sx, &sy, &cr);
2439 nw = (unsigned int)szHint.width; 2459 nw = (unsigned int)szHint.width;
2440 nh = (unsigned int)szHint.height; 2460 nh = (unsigned int)szHint.height;
2441 nx = ny = 0; 2461 nx = ny = 0;
2442 2462
… …
2452 nh += sy; 2472 nh += sy;
2453 ny = -sy; 2473 ny = -sy;
2454 sy = 0; 2474 sy = 0;
2455 } 2475 }
2456 2476
2457 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2477 min_it (nw, (unsigned int) (wrootattr.width - sx));
2458 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2478 min_it (nh, (unsigned int) (wrootattr.height - sy));
2459 2479
2460 XSync (disp, False); 2480 XSync (disp, False);
2461 allowedxerror = -1; 2481 allowedxerror = -1;
2462 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2482 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2463 2483
… …
2468 if (image == NULL) 2488 if (image == NULL)
2469 { 2489 {
2470 if (am_transparent && am_pixmap_trans) 2490 if (am_transparent && am_pixmap_trans)
2471 { 2491 {
2472 pchanged = 1; 2492 pchanged = 1;
2473 if (TermWin.pixmap != None) 2493 if (pixmap != None)
2474 { 2494 {
2475 XFreePixmap (disp, TermWin.pixmap); 2495 XFreePixmap (disp, pixmap);
2476 TermWin.pixmap = None; 2496 pixmap = None;
2477 } 2497 }
2478 } 2498 }
2479 2499
2480 am_pixmap_trans = 0; 2500 am_pixmap_trans = 0;
2481 } 2501 }
2482 else 2502 else
2483 { 2503 {
2484 if (TermWin.pixmap != None) 2504 if (pixmap != None)
2485 XFreePixmap (disp, TermWin.pixmap); 2505 XFreePixmap (disp, pixmap);
2486 2506
2487#if TINTING 2507#if TINTING
2488 if (ISSET_PIXCOLOR (Color_tint)) 2508 if (ISSET_PIXCOLOR (Color_tint))
2489 { 2509 {
2490 unsigned short rm, gm, bm; 2510 unsigned short rm, gm, bm;
… …
2494 2514
2495 ShadeXImage (display, image, shade, rm, gm, bm); 2515 ShadeXImage (display, image, shade, rm, gm, bm);
2496 } 2516 }
2497#endif 2517#endif
2498 2518
2499 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2519 pixmap = XCreatePixmap (disp, vt,
2500 szHint.width, szHint.height, image->depth); 2520 szHint.width, szHint.height, image->depth);
2501 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2521 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2502 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2522 XPutImage (disp, pixmap, gc, image, 0, 0,
2503 nx, ny, image->width, image->height); 2523 nx, ny, image->width, image->height);
2504 XFreeGC (disp, gc); 2524 XFreeGC (disp, gc);
2505 XDestroyImage (image); 2525 XDestroyImage (image);
2506 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2526 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2507 XClearWindow (disp, TermWin.parent[0]); 2527 XClearWindow (disp, parent[0]);
2508 2528
2509 if (!am_transparent || !am_pixmap_trans) 2529 if (!am_transparent || !am_pixmap_trans)
2510 pchanged = 1; 2530 pchanged = 1;
2511 2531
2512 am_transparent = am_pixmap_trans = 1; 2532 am_transparent = am_pixmap_trans = 1;
2513 } 2533 }
2514 } 2534 }
2515 2535
2516 if (am_pixmap_trans) 2536 if (am_pixmap_trans)
2517 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2537 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2518 else 2538 else
2519 { 2539 {
2520 unsigned int n; 2540 unsigned int n;
2521 /* 2541 /*
2522 * InheritPixmap transparency 2542 * InheritPixmap transparency
2523 */ 2543 */
2524 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2544 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2525 { 2545 {
2526 oldp = TermWin.parent[i]; 2546 oldp = parent[i];
2527 XQueryTree (disp, TermWin.parent[i - 1], &root, 2547 XQueryTree (disp, parent[i - 1], &root,
2528 &TermWin.parent[i], &list, &n); 2548 &parent[i], &list, &n);
2529 XFree (list); 2549 XFree (list);
2530 2550
2531 if (TermWin.parent[i] == display->root) 2551 if (parent[i] == display->root)
2532 { 2552 {
2533 if (oldp != None) 2553 if (oldp != None)
2534 pchanged = 1; 2554 pchanged = 1;
2535 2555
2536 break; 2556 break;
2537 } 2557 }
2538 2558
2539 if (oldp != TermWin.parent[i]) 2559 if (oldp != parent[i])
2540 pchanged = 1; 2560 pchanged = 1;
2541 } 2561 }
2542 2562
2543 n = 0; 2563 n = 0;
2544 2564
2545 if (pchanged) 2565 if (pchanged)
2546 { 2566 {
2547 for (; n < (unsigned int)i; n++) 2567 for (; n < (unsigned int)i; n++)
2548 { 2568 {
2549 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2569 XGetWindowAttributes (disp, parent[n], &wattr);
2550 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2570 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2551 { 2571 {
2552 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2572 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2553 break; 2573 break;
2554 } 2574 }
2555 } 2575 }
2556 } 2576 }
2557 2577
2558 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2578 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2559 { 2579 {
2560 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2580 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2561 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2581 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2562 am_transparent = 0; 2582 am_transparent = 0;
2563 /* XXX: also turn off Opt_transparent? */ 2583 /* XXX: also turn off Opt_transparent? */
2564 } 2584 }
2565 else 2585 else
2566 { 2586 {
… …
2569 * needed for fvwm2.2.2 (and before?) */ 2589 * needed for fvwm2.2.2 (and before?) */
2570 sleep (1); 2590 sleep (1);
2571#endif 2591#endif
2572 for (n = 0; n < (unsigned int)i; n++) 2592 for (n = 0; n < (unsigned int)i; n++)
2573 { 2593 {
2574 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2594 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2575 XClearWindow (disp, TermWin.parent[n]); 2595 XClearWindow (disp, parent[n]);
2576 } 2596 }
2577 2597
2578 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2598 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2579 am_transparent = 1; 2599 am_transparent = 1;
2580 } 2600 }
2581 2601
2582 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2602 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2583 TermWin.parent[i] = None; 2603 parent[i] = None;
2584 } 2604 }
2585 2605
2586 if (scrollBar.win) 2606 if (scrollBar.win)
2587 { 2607 {
2588 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2608 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2640 /* Read a text string from the input buffer */ 2660 /* Read a text string from the input buffer */
2641 unicode_t buf[UBUFSIZ]; 2661 unicode_t buf[UBUFSIZ];
2642 bool refreshnow = false; 2662 bool refreshnow = false;
2643 int nlines = 0; 2663 int nlines = 0;
2644 unicode_t *str = buf; 2664 unicode_t *str = buf;
2665 unicode_t *eol = str + min (ncol, UBUFSIZ);
2645 2666
2646 for (;;) 2667 for (;;)
2647 { 2668 {
2648 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2669 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2649 break; 2670 break;
2650 2671
2651 *str++ = ch; 2672 *str++ = ch;
2652 2673
2653 if (ch == C0_LF) 2674 if (ch == C0_LF || str >= eol)
2654 { 2675 {
2676 if (ch == C0_LF)
2655 nlines++; 2677 nlines++;
2678
2656 refresh_count++; 2679 refresh_count++;
2657 2680
2658 if (!(options & Opt_jumpScroll) 2681 if (!(options & Opt_jumpScroll)
2659 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2682 || (refresh_count >= refresh_limit * (nrow - 1)))
2660 { 2683 {
2661 refreshnow = true; 2684 refreshnow = true;
2662 ch = NOCHAR; 2685 ch = NOCHAR;
2663 break; 2686 break;
2664 } 2687 }
2665 2688
2666 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2689 // scr_add_lines only works for nlines <= nrow - 1.
2667 if (nlines >= TermWin.nrow - 1) 2690 if (nlines >= nrow - 1)
2668 { 2691 {
2669 scr_add_lines (buf, nlines, str - buf); 2692 scr_add_lines (buf, nlines, str - buf);
2670 nlines = 0; 2693 nlines = 0;
2671 str = buf; 2694 str = buf;
2695 eol = str + min (ncol, UBUFSIZ);
2672 } 2696 }
2673 }
2674 2697
2675 if (str >= buf + UBUFSIZ) 2698 if (str >= eol)
2676 { 2699 {
2700 if (eol >= buf + UBUFSIZ)
2701 {
2677 ch = NOCHAR; 2702 ch = NOCHAR;
2678 break; 2703 break;
2704 }
2705 else
2706 eol = min (eol + ncol, buf + UBUFSIZ);
2707 }
2708
2679 } 2709 }
2680 2710
2681 seq_begin = cmdbuf_ptr; 2711 seq_begin = cmdbuf_ptr;
2682 ch = next_char (); 2712 ch = next_char ();
2683 } 2713 }
… …
3342 3372
3343 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3373 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3344 arg[0] = -arg[0]; 3374 arg[0] = -arg[0];
3345 /* FALLTHROUGH */ 3375 /* FALLTHROUGH */
3346 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3376 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3347 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3377 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3348 break; 3378 break;
3349 3379
3350 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3380 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3351 tt_write ((const unsigned char *)VT100_ANS, 3381 tt_write ((const unsigned char *)VT100_ANS,
3352 (unsigned int) (sizeof (VT100_ANS) - 1)); 3382 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3477 { 3507 {
3478 /* 3508 /*
3479 * commands 3509 * commands
3480 */ 3510 */
3481 case 1: /* deiconify window */ 3511 case 1: /* deiconify window */
3482 XMapWindow (disp, TermWin.parent[0]); 3512 XMapWindow (disp, parent[0]);
3483 break; 3513 break;
3484 case 2: /* iconify window */ 3514 case 2: /* iconify window */
3485 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3515 XIconifyWindow (disp, parent[0], display->screen);
3486 break; 3516 break;
3487 case 3: /* set position (pixels) */ 3517 case 3: /* set position (pixels) */
3488 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3518 XMoveWindow (disp, parent[0], args[1], args[2]);
3489 break; 3519 break;
3490 case 4: /* set size (pixels) */ 3520 case 4: /* set size (pixels) */
3491 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3521 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3492 break; 3522 break;
3493 case 5: /* raise window */ 3523 case 5: /* raise window */
3494 XRaiseWindow (disp, TermWin.parent[0]); 3524 XRaiseWindow (disp, parent[0]);
3495 break; 3525 break;
3496 case 6: /* lower window */ 3526 case 6: /* lower window */
3497 XLowerWindow (disp, TermWin.parent[0]); 3527 XLowerWindow (disp, parent[0]);
3498 break; 3528 break;
3499 case 7: /* refresh window */ 3529 case 7: /* refresh window */
3500 scr_touch (true); 3530 scr_touch (true);
3501 break; 3531 break;
3502 case 8: /* set size (chars) */ 3532 case 8: /* set size (chars) */
3503 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3533 set_widthheight ((unsigned int) (args[2] * fwidth),
3504 (unsigned int) (args[1] * TermWin.fheight)); 3534 (unsigned int) (args[1] * fheight));
3505 break; 3535 break;
3506 3536
3507 //case 9: NYI, TODO, restore maximized window or maximize window 3537 //case 9: NYI, TODO, restore maximized window or maximize window
3508 default: 3538 default:
3509 if (args[0] >= 24) /* set height (chars) */ 3539 if (args[0] >= 24) /* set height (chars) */
3510 set_widthheight ((unsigned int)TermWin.width, 3540 set_widthheight ((unsigned int)width,
3511 (unsigned int) (args[1] * TermWin.fheight)); 3541 (unsigned int) (args[1] * fheight));
3512 break; 3542 break;
3513 3543
3514 3544
3515 /* 3545 /*
3516 * reports - some output format copied from XTerm 3546 * reports - some output format copied from XTerm
3517 */ 3547 */
3518 case 11: /* report window state */ 3548 case 11: /* report window state */
3519 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3549 XGetWindowAttributes (disp, parent[0], &wattr);
3520 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3550 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3521 break; 3551 break;
3522 case 13: /* report window position */ 3552 case 13: /* report window position */
3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3553 XGetWindowAttributes (disp, parent[0], &wattr);
3524 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3554 XTranslateCoordinates (disp, parent[0], wattr.root,
3525 -wattr.border_width, -wattr.border_width, 3555 -wattr.border_width, -wattr.border_width,
3526 &x, &y, &wdummy); 3556 &x, &y, &wdummy);
3527 tt_printf ("\033[3;%d;%dt", x, y); 3557 tt_printf ("\033[3;%d;%dt", x, y);
3528 break; 3558 break;
3529 case 14: /* report window size (pixels) */ 3559 case 14: /* report window size (pixels) */
3530 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3560 XGetWindowAttributes (disp, parent[0], &wattr);
3531 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3561 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3532 break; 3562 break;
3533 case 18: /* report text area size (chars) */ 3563 case 18: /* report text area size (chars) */
3534 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3564 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3535 break; 3565 break;
3536 case 19: /* report window size (chars) */ 3566 case 19: /* report window size (chars) */
3537 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3567 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3538 break; 3568 break;
3539 case 20: /* report icon label */ 3569 case 20: /* report icon label */
3540 { 3570 {
3541 char *s; 3571 char *s;
3542 XGetIconName (disp, TermWin.parent[0], &s); 3572 XGetIconName (disp, parent[0], &s);
3543 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3573 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3544 XFree (s); 3574 XFree (s);
3545 } 3575 }
3546 break; 3576 break;
3547 case 21: /* report window title */ 3577 case 21: /* report window title */
3548 { 3578 {
3549 char *s; 3579 char *s;
3550 XFetchName (disp, TermWin.parent[0], &s); 3580 XFetchName (disp, parent[0], &s);
3551 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3581 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3552 XFree (s); 3582 XFree (s);
3553 } 3583 }
3554 break; 3584 break;
3555 } 3585 }
… …
3588 else if (ch < 0x20) 3618 else if (ch < 0x20)
3589 return NULL; /* other control character - exit */ 3619 return NULL; /* other control character - exit */
3590 3620
3591 seen_esc = false; 3621 seen_esc = false;
3592 3622
3593 if (n >= sizeof (string) - 1) 3623 if (n >= STRING_MAX - 1)
3594 // stop at some sane length 3624 // stop at some sane length
3595 return NULL; 3625 return NULL;
3596 3626
3597 if (ch == C0_SYN) 3627 if (ch == C0_SYN)
3598 string[n++] = cmd_get8 (); 3628 string[n++] = cmd_get8 ();
… …
3701 unsigned long bytes_after; 3731 unsigned long bytes_after;
3702 unsigned char *value = 0; 3732 unsigned char *value = 0;
3703 const char *str = ""; 3733 const char *str = "";
3704 3734
3705 if (prop 3735 if (prop
3706 && XGetWindowProperty (disp, TermWin.parent[0], 3736 && XGetWindowProperty (disp, parent[0],
3707 prop, 0, 1<<16, 0, AnyPropertyType, 3737 prop, 0, 1<<16, 0, AnyPropertyType,
3708 &actual_type, &actual_format, 3738 &actual_type, &actual_format,
3709 &nitems, &bytes_after, &value) == Success 3739 &nitems, &bytes_after, &value) == Success
3710 && actual_type != None 3740 && actual_type != None
3711 && actual_format == 8) 3741 && actual_format == 8)
… …
3723 { 3753 {
3724 *eq = 0; 3754 *eq = 0;
3725 set_utf8_property (display->atom (str), eq + 1); 3755 set_utf8_property (display->atom (str), eq + 1);
3726 } 3756 }
3727 else 3757 else
3728 XDeleteProperty (disp, TermWin.parent[0], 3758 XDeleteProperty (disp, parent[0],
3729 display->atom (str)); 3759 display->atom (str));
3730 } 3760 }
3731 break; 3761 break;
3732 3762
3733 case XTerm_Color: 3763 case XTerm_Color:
… …
3858 case URxvt_italicFont: 3888 case URxvt_italicFont:
3859 case URxvt_boldItalicFont: 3889 case URxvt_boldItalicFont:
3860#endif 3890#endif
3861 if (query) 3891 if (query)
3862 tt_printf ("\33]%d;%-.250s%c", saveop, 3892 tt_printf ("\33]%d;%-.250s%c", saveop,
3863 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3893 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3864 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3894 ? fontset[op - URxvt_font]->fontdesc : "",
3865 resp); 3895 resp);
3866 else 3896 else
3867 { 3897 {
3868 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3898 const char *&res = rs[Rs_font + (op - URxvt_font)];
3869 3899
… …
4036 */ 4066 */
4037 PrivMode (1, PrivMode_vt52); 4067 PrivMode (1, PrivMode_vt52);
4038 break; 4068 break;
4039 case 3: /* 80/132 */ 4069 case 3: /* 80/132 */
4040 if (priv_modes & PrivMode_132OK) 4070 if (priv_modes & PrivMode_132OK)
4041 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4071 set_widthheight (((state ? 132 : 80) * fwidth), height);
4042 break; 4072 break;
4043 case 4: /* smooth scrolling */ 4073 case 4: /* smooth scrolling */
4044 if (state) 4074 if (state)
4045 options &= ~Opt_jumpScroll; 4075 options &= ~Opt_jumpScroll;
4046 else 4076 else
… …
4363 } 4393 }
4364 4394
4365 memmove (v_buffer, v_buffer + written, v_buflen); 4395 memmove (v_buffer, v_buffer + written, v_buflen);
4366 } 4396 }
4367 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4397 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4368 // original code just ignores this... 4398 pty_ev.set (EVENT_READ);
4369 destroy ();
4370} 4399}
4371 4400
4372/*----------------------- end-of-file (C source) -----------------------*/ 4401/*----------------------- end-of-file (C source) -----------------------*/
4373 4402

Diff Legend

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