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.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; 168 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 169 int len;
170 170
171 fname = rxvt_utf8towcs (f->name);
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);
175 alloc = chr = new wchar_t[len]; 177 alloc = chr = new wchar_t[len];
176 rxvt_composite.expand (ch, chr); 178 rxvt_composite.expand (ch, chr);
177 } 179 }
178 else 180 else
179#endif 181# endif
180 { 182 {
181 ch2 = ch; 183 ch2 = ch;
182 184
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
190 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 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
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);
191 214
192 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193 216
194 for (int y = 0; y < len; y++) 217 for (int y = 0; y < len; y++)
195 { 218 {
… …
198 ch = *chr++; 221 ch = *chr++;
199 222
200 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
201 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
202 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
203#if !UNICODE3 226# if !UNICODE3
204 if (ch >= 0x10000) 227 if (ch >= 0x10000)
205 ch = 0xfffd; 228 ch = 0xfffd;
206#endif 229# endif
207 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
208 scr_overlay_set (12, y, NOCHAR, r); 231 scr_overlay_set (12, y, NOCHAR, r);
209 } 232 }
210 233
234 scr_overlay_set (0, len , attr);
211 scr_overlay_set (0, len, f->name); 235 scr_overlay_set (0, len + 1, fname);
212 236
237 free (fname);
238
213#if ENABLE_COMBINING 239# if ENABLE_COMBINING
214 if (alloc) 240 if (alloc)
215 delete [] alloc; 241 delete [] alloc;
216#endif 242# endif
217}
218#endif 243#endif
244}
219 245
220void 246void
221rxvt_term::commit_iso14755 () 247rxvt_term::commit_iso14755 ()
222{ 248{
223 wchar_t ch[2]; 249 wchar_t ch[2];
… …
362#ifdef KEYSYM_RESOURCE 388#ifdef KEYSYM_RESOURCE
363 if (keyboard->dispatch (this, keysym, ev.state)) 389 if (keyboard->dispatch (this, keysym, ev.state))
364 return; 390 return;
365#endif 391#endif
366 392
367 if (TermWin.saveLines) 393 if (saveLines)
368 { 394 {
369#ifdef UNSHIFTED_SCROLLKEYS 395#ifdef UNSHIFTED_SCROLLKEYS
370 if (!ctrl && !meta) 396 if (!ctrl && !meta)
371#else 397#else
372 if (IS_SCROLL_MOD) 398 if (IS_SCROLL_MOD)
373#endif 399#endif
374 { 400 {
375 int lnsppg; 401 int lnsppg;
376 402
377#ifdef PAGING_CONTEXT_LINES 403#ifdef PAGING_CONTEXT_LINES
378 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 404 lnsppg = nrow - PAGING_CONTEXT_LINES;
379#else 405#else
380 lnsppg = TermWin.nrow * 4 / 5; 406 lnsppg = nrow * 4 / 5;
381#endif 407#endif
382 if (keysym == XK_Prior) 408 if (keysym == XK_Prior)
383 { 409 {
384 scr_page (UP, lnsppg); 410 scr_page (UP, lnsppg);
385 return; 411 return;
… …
841 867
842 if (len <= 0) 868 if (len <= 0)
843 return; /* not mapped */ 869 return; /* not mapped */
844 870
845 if (options & Opt_scrollTtyKeypress) 871 if (options & Opt_scrollTtyKeypress)
846 if (TermWin.view_start) 872 if (view_start)
847 { 873 {
848 TermWin.view_start = 0; 874 view_start = 0;
849 want_refresh = 1; 875 want_refresh = 1;
850 } 876 }
851 877
852 /* 878 /*
853 * these modifications only affect the static keybuffer 879 * these modifications only affect the static keybuffer
… …
1030{ 1056{
1031 if (mouse_slip_wheel_speed == 0 1057 if (mouse_slip_wheel_speed == 0
1032 || 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)
1033 : scr_page (UP, mouse_slip_wheel_speed)) 1059 : scr_page (UP, mouse_slip_wheel_speed))
1034 { 1060 {
1035 if (TermWin.view_start == TermWin.nscrolled || 1061 if (view_start == nsaved ||
1036 TermWin.view_start == 0) 1062 view_start == 0)
1037 mouse_slip_wheel_speed = 0; 1063 mouse_slip_wheel_speed = 0;
1038 1064
1039 refresh_type |= SMOOTH_REFRESH; 1065 refresh_type |= SMOOTH_REFRESH;
1040 want_refresh = 1; 1066 want_refresh = 1;
1041 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1067 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1063 if (n > 0) 1089 if (n > 0)
1064 { 1090 {
1065 cmdbuf_endp += n; 1091 cmdbuf_endp += n;
1066 return true; 1092 return true;
1067 } 1093 }
1068 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))
1069 destroy (); 1099 destroy ();
1100 }
1070 1101
1071 return false; 1102 return false;
1072} 1103}
1073 1104
1074void 1105void
… …
1088} 1119}
1089 1120
1090void 1121void
1091rxvt_term::pointer_unblank () 1122rxvt_term::pointer_unblank ()
1092{ 1123{
1093 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1124 XDefineCursor (display->display, vt, TermWin_cursor);
1094 recolour_cursor (); 1125 recolour_cursor ();
1095 1126
1096#ifdef POINTER_BLANK 1127#ifdef POINTER_BLANK
1097 hidden_pointer = 0; 1128 hidden_pointer = 0;
1098 1129
… …
1106rxvt_term::pointer_blank () 1137rxvt_term::pointer_blank ()
1107{ 1138{
1108 if (! (options & Opt_pointerBlank)) 1139 if (! (options & Opt_pointerBlank))
1109 return; 1140 return;
1110 1141
1111 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1142 XDefineCursor (display->display, vt, display->blank_cursor);
1112 XFlush (display->display); 1143 XFlush (display->display);
1113 1144
1114 hidden_pointer = 1; 1145 hidden_pointer = 1;
1115} 1146}
1116 1147
… …
1418 case FocusOut: 1449 case FocusOut:
1419 focus_out (); 1450 focus_out ();
1420 break; 1451 break;
1421 1452
1422 case ConfigureNotify: 1453 case ConfigureNotify:
1423 if (ev.xconfigure.window == TermWin.parent[0]) 1454 if (ev.xconfigure.window == parent[0])
1424 { 1455 {
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)); 1456 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1457 ;
1434 1458
1435 if (szHint.width != width || szHint.height != height) 1459 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1436 { 1460 {
1437 seen_resize = 1; 1461 seen_resize = 1;
1438 resize_all_windows (width, height, 1); 1462 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1439 } 1463 }
1440 1464
1441#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1465#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1442 if (options & Opt_transparent) 1466 if (options & Opt_transparent)
1443 check_our_parents (); 1467 check_our_parents ();
… …
1464 case SelectionRequest: 1488 case SelectionRequest:
1465 selection_send (ev.xselectionrequest); 1489 selection_send (ev.xselectionrequest);
1466 break; 1490 break;
1467 1491
1468 case UnmapNotify: 1492 case UnmapNotify:
1469 TermWin.mapped = 0; 1493 mapped = 0;
1470#ifdef TEXT_BLINK 1494#ifdef TEXT_BLINK
1471 text_blink_ev.stop (); 1495 text_blink_ev.stop ();
1472#endif 1496#endif
1473 break; 1497 break;
1474 1498
1475 case MapNotify: 1499 case MapNotify:
1476 TermWin.mapped = 1; 1500 mapped = 1;
1477#ifdef TEXT_BLINK 1501#ifdef TEXT_BLINK
1478 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1502 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1479#endif 1503#endif
1480 break; 1504 break;
1481 1505
… …
1485 break; 1509 break;
1486#endif /* TRANSPARENT */ 1510#endif /* TRANSPARENT */
1487 1511
1488 case GraphicsExpose: 1512 case GraphicsExpose:
1489 case Expose: 1513 case Expose:
1490 if (ev.xany.window == TermWin.vt) 1514 if (ev.xany.window == vt)
1491 { 1515 {
1492 do 1516 do
1493 scr_expose (ev.xexpose.x, ev.xexpose.y, 1517 scr_expose (ev.xexpose.x, ev.xexpose.y,
1494 ev.xexpose.width, ev.xexpose.height, False); 1518 ev.xexpose.width, ev.xexpose.height, False);
1495 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1519 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1496 1520
1497 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1498 1522
1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1523 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1500 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1501 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1502 1526
1503 scr_refresh (refresh_type); 1527 scr_refresh (refresh_type);
1504 } 1528 }
… …
1520 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1544 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1521 menubar_expose (); 1545 menubar_expose ();
1522#endif 1546#endif
1523 1547
1524#ifdef TRANSPARENT 1548#ifdef TRANSPARENT
1525 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1549 if (am_transparent && ev.xany.window == parent[0])
1526 XClearWindow (disp, ev.xany.window); 1550 XClearWindow (disp, ev.xany.window);
1527#endif 1551#endif
1528 } 1552 }
1529 break; 1553 break;
1530 1554
… …
1541 } 1565 }
1542#endif 1566#endif
1543 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1544 break; 1568 break;
1545 1569
1546 if (ev.xany.window == TermWin.vt) 1570 if (ev.xany.window == vt)
1547 { 1571 {
1548 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1572 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1549 { 1573 {
1550 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1574 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1551 ; 1575 ;
1552 1576
1553 XQueryPointer (disp, TermWin.vt, 1577 XQueryPointer (disp, vt,
1554 &unused_root, &unused_child, 1578 &unused_root, &unused_child,
1555 &unused_root_x, &unused_root_y, 1579 &unused_root_x, &unused_root_y,
1556 &ev.xbutton.x, &ev.xbutton.y, 1580 &ev.xbutton.x, &ev.xbutton.y,
1557 &ev.xbutton.state); 1581 &ev.xbutton.state);
1558#ifdef MOUSE_THRESHOLD 1582#ifdef MOUSE_THRESHOLD
… …
1570#endif 1594#endif
1571 selection_extend (ev.xbutton.x, ev.xbutton.y, 1595 selection_extend (ev.xbutton.x, ev.xbutton.y,
1572 ev.xbutton.state & Button3Mask ? 2 : 0); 1596 ev.xbutton.state & Button3Mask ? 2 : 0);
1573 1597
1574#ifdef SELECTION_SCROLLING 1598#ifdef SELECTION_SCROLLING
1575 if (ev.xbutton.y < TermWin.int_bwidth 1599 if (ev.xbutton.y < int_bwidth
1576 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1600 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1577 { 1601 {
1578 int dist; 1602 int dist;
1579 1603
1580 /* don't clobber the current delay if we are 1604 /* don't clobber the current delay if we are
1581 * already in the middle of scrolling. 1605 * already in the middle of scrolling.
… …
1589 selection_save_x = ev.xbutton.x; 1613 selection_save_x = ev.xbutton.x;
1590 selection_save_y = ev.xbutton.y; 1614 selection_save_y = ev.xbutton.y;
1591 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1615 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1592 1616
1593 /* calc number of lines to scroll */ 1617 /* calc number of lines to scroll */
1594 if (ev.xbutton.y < TermWin.int_bwidth) 1618 if (ev.xbutton.y < int_bwidth)
1595 { 1619 {
1596 scroll_selection_dir = UP; 1620 scroll_selection_dir = UP;
1597 dist = TermWin.int_bwidth - ev.xbutton.y; 1621 dist = int_bwidth - ev.xbutton.y;
1598 } 1622 }
1599 else 1623 else
1600 { 1624 {
1601 scroll_selection_dir = DN; 1625 scroll_selection_dir = DN;
1602 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1626 dist = ev.xbutton.y - (int_bwidth + height);
1603 } 1627 }
1604 1628
1605 scroll_selection_lines = Pixel2Height (dist) 1629 scroll_selection_lines = Pixel2Height (dist)
1606 / SELECTION_SCROLL_LINE_SPEEDUP 1630 / SELECTION_SCROLL_LINE_SPEEDUP
1607 + 1; 1631 + 1;
1608 MIN_IT (scroll_selection_lines, 1632 min_it (scroll_selection_lines,
1609 SELECTION_SCROLL_MAX_LINES); 1633 SELECTION_SCROLL_MAX_LINES);
1610 } 1634 }
1611 else 1635 else
1612 { 1636 {
1613 /* we are within the text window, so we 1637 /* we are within the text window, so we
… …
1644} 1668}
1645 1669
1646void 1670void
1647rxvt_term::focus_in () 1671rxvt_term::focus_in ()
1648{ 1672{
1649 if (!TermWin.focus) 1673 if (!focus)
1650 { 1674 {
1651 TermWin.focus = 1; 1675 focus = 1;
1652 want_refresh = 1; 1676 want_refresh = 1;
1653#ifdef USE_XIM 1677#if USE_XIM
1654 if (Input_Context != NULL) 1678 if (Input_Context != NULL)
1655 { 1679 {
1656 IMSetStatusPosition (); 1680 IMSetStatusPosition ();
1657 XSetICFocus (Input_Context); 1681 XSetICFocus (Input_Context);
1658 } 1682 }
1659#endif 1683#endif
1660#ifdef CURSOR_BLINK 1684#if CURSOR_BLINK
1661 if (options & Opt_cursorBlink) 1685 if (options & Opt_cursorBlink)
1662 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1686 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1663#endif 1687#endif
1664#ifdef OFF_FOCUS_FADING 1688#if OFF_FOCUS_FADING
1665 if (rs[Rs_fade]) 1689 if (rs[Rs_fade])
1666 { 1690 {
1667 pix_colors = pix_colors_focused; 1691 pix_colors = pix_colors_focused;
1668 scr_recolour (); 1692 scr_recolour ();
1669 } 1693 }
… …
1672} 1696}
1673 1697
1674void 1698void
1675rxvt_term::focus_out () 1699rxvt_term::focus_out ()
1676{ 1700{
1677 if (TermWin.focus) 1701 if (focus)
1678 { 1702 {
1679 TermWin.focus = 0; 1703 focus = 0;
1680 want_refresh = 1; 1704 want_refresh = 1;
1681 1705
1682#if ENABLE_FRILLS || ISO_14755 1706#if ENABLE_FRILLS || ISO_14755
1683 iso14755buf = 0; 1707 iso14755buf = 0;
1684#endif 1708#endif
1685#if ENABLE_OVERLAY 1709#if ENABLE_OVERLAY
1686 scr_overlay_off (); 1710 scr_overlay_off ();
1687#endif 1711#endif
1688#ifdef USE_XIM 1712#if USE_XIM
1689 if (Input_Context != NULL) 1713 if (Input_Context != NULL)
1690 XUnsetICFocus (Input_Context); 1714 XUnsetICFocus (Input_Context);
1691#endif 1715#endif
1692#ifdef CURSOR_BLINK 1716#if CURSOR_BLINK
1693 if (options & Opt_cursorBlink) 1717 if (options & Opt_cursorBlink)
1694 cursor_blink_ev.stop (); 1718 cursor_blink_ev.stop ();
1695 hidden_cursor = 0; 1719 hidden_cursor = 0;
1696#endif 1720#endif
1697#ifdef OFF_FOCUS_FADING 1721#if OFF_FOCUS_FADING
1698 if (rs[Rs_fade]) 1722 if (rs[Rs_fade])
1699 { 1723 {
1700 pix_colors = pix_colors_unfocused; 1724 pix_colors = pix_colors_unfocused;
1701 scr_recolour (); 1725 scr_recolour ();
1702 } 1726 }
… …
1741 reportmode = !! (priv_modes & PrivMode_mouse_report); 1765 reportmode = !! (priv_modes & PrivMode_mouse_report);
1742 1766
1743 /* 1767 /*
1744 * VT window processing of button press 1768 * VT window processing of button press
1745 */ 1769 */
1746 if (ev.window == TermWin.vt) 1770 if (ev.window == vt)
1747 { 1771 {
1748#if ISO_14755 1772#if ISO_14755
1749 // 5.4 1773 // 5.4
1750 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1774 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1751 { 1775 {
… …
1956 case Button3: 1980 case Button3:
1957 if (scrollBar.style != R_SB_XTERM) 1981 if (scrollBar.style != R_SB_XTERM)
1958 { 1982 {
1959 if (scrollbar_above_slider (ev.y)) 1983 if (scrollbar_above_slider (ev.y))
1960# ifdef RXVT_SCROLL_FULL 1984# ifdef RXVT_SCROLL_FULL
1961 scr_page (UP, TermWin.nrow - 1); 1985 scr_page (UP, nrow - 1);
1962# else 1986# else
1963 scr_page (UP, TermWin.nrow / 4); 1987 scr_page (UP, nrow / 4);
1964# endif 1988# endif
1965 else if (scrollbar_below_slider (ev.y)) 1989 else if (scrollbar_below_slider (ev.y))
1966# ifdef RXVT_SCROLL_FULL 1990# ifdef RXVT_SCROLL_FULL
1967 scr_page (DN, TermWin.nrow - 1); 1991 scr_page (DN, nrow - 1);
1968# else 1992# else
1969 scr_page (DN, TermWin.nrow / 4); 1993 scr_page (DN, nrow / 4);
1970# endif 1994# endif
1971 else 1995 else
1972 scrollBar.setMotion (); 1996 scrollBar.setMotion ();
1973 } 1997 }
1974 else 1998 else
1975 { 1999 {
1976 scr_page ((ev.button == Button1 ? DN : UP), 2000 scr_page ((ev.button == Button1 ? DN : UP),
1977 (TermWin.nrow 2001 (nrow
1978 * scrollbar_position (ev.y) 2002 * scrollbar_position (ev.y)
1979 / scrollbar_size ())); 2003 / scrollbar_size ()));
1980 } 2004 }
1981 2005
1982 break; 2006 break;
… …
2014#ifdef SELECTION_SCROLLING 2038#ifdef SELECTION_SCROLLING
2015 if (sel_scroll_ev.active) 2039 if (sel_scroll_ev.active)
2016 sel_scroll_ev.stop(); 2040 sel_scroll_ev.stop();
2017#endif 2041#endif
2018 2042
2019 if (ev.window == TermWin.vt) 2043 if (ev.window == vt)
2020 { 2044 {
2021#if ISO_14755 2045#if ISO_14755
2022 // 5.4 2046 // 5.4
2023 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2047 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2024 return; 2048 return;
… …
2075 v = ev.button == Button4 ? UP : DN; 2099 v = ev.button == Button4 ? UP : DN;
2076 2100
2077 if (ev.state & ShiftMask) 2101 if (ev.state & ShiftMask)
2078 i = 1; 2102 i = 1;
2079 else if (options & Opt_mouseWheelScrollPage) 2103 else if (options & Opt_mouseWheelScrollPage)
2080 i = TermWin.nrow - 1; 2104 i = nrow - 1;
2081 else 2105 else
2082 i = 5; 2106 i = 5;
2083 2107
2084# ifdef MOUSE_SLIP_WHEELING 2108# ifdef MOUSE_SLIP_WHEELING
2085 if (ev.state & ControlMask) 2109 if (ev.state & ControlMask)
2086 { 2110 {
2087 mouse_slip_wheel_speed += v ? -1 : 1; 2111 mouse_slip_wheel_speed += v ? -1 : 1;
2088 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;
2089 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;
2090 2114
2091 if (slip_wheel_ev.at < NOW) 2115 if (slip_wheel_ev.at < NOW)
2092 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2116 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2093 2117
2094 slip_wheel_ev.start (); 2118 slip_wheel_ev.start ();
… …
2376 return pchanged; /* Don't try any more */ 2400 return pchanged; /* Don't try any more */
2377 2401
2378 XGetWindowAttributes (disp, display->root, &wrootattr); 2402 XGetWindowAttributes (disp, display->root, &wrootattr);
2379 rootdepth = wrootattr.depth; 2403 rootdepth = wrootattr.depth;
2380 2404
2381 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2405 XGetWindowAttributes (disp, parent[0], &wattr);
2382 2406
2383 if (rootdepth != wattr.depth) 2407 if (rootdepth != wattr.depth)
2384 { 2408 {
2385 if (am_transparent) 2409 if (am_transparent)
2386 { 2410 {
2387 pchanged = 1; 2411 pchanged = 1;
2388 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2412 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2389 am_transparent = am_pixmap_trans = 0; 2413 am_transparent = am_pixmap_trans = 0;
2390 } 2414 }
2391 2415
2392 return pchanged; /* Don't try any more */ 2416 return pchanged; /* Don't try any more */
2393 } 2417 }
… …
2434 Window cr; 2458 Window cr;
2435 XImage *image; 2459 XImage *image;
2436 GC gc; 2460 GC gc;
2437 XGCValues gcvalue; 2461 XGCValues gcvalue;
2438 2462
2439 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2463 XTranslateCoordinates (disp, parent[0], display->root,
2440 0, 0, &sx, &sy, &cr); 2464 0, 0, &sx, &sy, &cr);
2441 nw = (unsigned int)szHint.width; 2465 nw = (unsigned int)szHint.width;
2442 nh = (unsigned int)szHint.height; 2466 nh = (unsigned int)szHint.height;
2443 nx = ny = 0; 2467 nx = ny = 0;
2444 2468
… …
2454 nh += sy; 2478 nh += sy;
2455 ny = -sy; 2479 ny = -sy;
2456 sy = 0; 2480 sy = 0;
2457 } 2481 }
2458 2482
2459 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2483 min_it (nw, (unsigned int) (wrootattr.width - sx));
2460 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2484 min_it (nh, (unsigned int) (wrootattr.height - sy));
2461 2485
2462 XSync (disp, False); 2486 XSync (disp, False);
2463 allowedxerror = -1; 2487 allowedxerror = -1;
2464 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2488 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2465 2489
… …
2470 if (image == NULL) 2494 if (image == NULL)
2471 { 2495 {
2472 if (am_transparent && am_pixmap_trans) 2496 if (am_transparent && am_pixmap_trans)
2473 { 2497 {
2474 pchanged = 1; 2498 pchanged = 1;
2475 if (TermWin.pixmap != None) 2499 if (pixmap != None)
2476 { 2500 {
2477 XFreePixmap (disp, TermWin.pixmap); 2501 XFreePixmap (disp, pixmap);
2478 TermWin.pixmap = None; 2502 pixmap = None;
2479 } 2503 }
2480 } 2504 }
2481 2505
2482 am_pixmap_trans = 0; 2506 am_pixmap_trans = 0;
2483 } 2507 }
2484 else 2508 else
2485 { 2509 {
2486 if (TermWin.pixmap != None) 2510 if (pixmap != None)
2487 XFreePixmap (disp, TermWin.pixmap); 2511 XFreePixmap (disp, pixmap);
2488 2512
2489#if TINTING 2513#if TINTING
2490 if (ISSET_PIXCOLOR (Color_tint)) 2514 if (ISSET_PIXCOLOR (Color_tint))
2491 { 2515 {
2492 unsigned short rm, gm, bm; 2516 unsigned short rm, gm, bm;
… …
2496 2520
2497 ShadeXImage (display, image, shade, rm, gm, bm); 2521 ShadeXImage (display, image, shade, rm, gm, bm);
2498 } 2522 }
2499#endif 2523#endif
2500 2524
2501 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2525 pixmap = XCreatePixmap (disp, vt,
2502 szHint.width, szHint.height, image->depth); 2526 szHint.width, szHint.height, image->depth);
2503 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2527 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2504 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2528 XPutImage (disp, pixmap, gc, image, 0, 0,
2505 nx, ny, image->width, image->height); 2529 nx, ny, image->width, image->height);
2506 XFreeGC (disp, gc); 2530 XFreeGC (disp, gc);
2507 XDestroyImage (image); 2531 XDestroyImage (image);
2508 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2532 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2509 XClearWindow (disp, TermWin.parent[0]); 2533 XClearWindow (disp, parent[0]);
2510 2534
2511 if (!am_transparent || !am_pixmap_trans) 2535 if (!am_transparent || !am_pixmap_trans)
2512 pchanged = 1; 2536 pchanged = 1;
2513 2537
2514 am_transparent = am_pixmap_trans = 1; 2538 am_transparent = am_pixmap_trans = 1;
2515 } 2539 }
2516 } 2540 }
2517 2541
2518 if (am_pixmap_trans) 2542 if (am_pixmap_trans)
2519 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2543 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2520 else 2544 else
2521 { 2545 {
2522 unsigned int n; 2546 unsigned int n;
2523 /* 2547 /*
2524 * InheritPixmap transparency 2548 * InheritPixmap transparency
2525 */ 2549 */
2526 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2550 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2527 { 2551 {
2528 oldp = TermWin.parent[i]; 2552 oldp = parent[i];
2529 XQueryTree (disp, TermWin.parent[i - 1], &root, 2553 XQueryTree (disp, parent[i - 1], &root,
2530 &TermWin.parent[i], &list, &n); 2554 &parent[i], &list, &n);
2531 XFree (list); 2555 XFree (list);
2532 2556
2533 if (TermWin.parent[i] == display->root) 2557 if (parent[i] == display->root)
2534 { 2558 {
2535 if (oldp != None) 2559 if (oldp != None)
2536 pchanged = 1; 2560 pchanged = 1;
2537 2561
2538 break; 2562 break;
2539 } 2563 }
2540 2564
2541 if (oldp != TermWin.parent[i]) 2565 if (oldp != parent[i])
2542 pchanged = 1; 2566 pchanged = 1;
2543 } 2567 }
2544 2568
2545 n = 0; 2569 n = 0;
2546 2570
2547 if (pchanged) 2571 if (pchanged)
2548 { 2572 {
2549 for (; n < (unsigned int)i; n++) 2573 for (; n < (unsigned int)i; n++)
2550 { 2574 {
2551 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2575 XGetWindowAttributes (disp, parent[n], &wattr);
2552 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2576 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2553 { 2577 {
2554 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2578 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2555 break; 2579 break;
2556 } 2580 }
2557 } 2581 }
2558 } 2582 }
2559 2583
2560 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2584 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2561 { 2585 {
2562 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2586 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2563 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2587 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2564 am_transparent = 0; 2588 am_transparent = 0;
2565 /* XXX: also turn off Opt_transparent? */ 2589 /* XXX: also turn off Opt_transparent? */
2566 } 2590 }
2567 else 2591 else
2568 { 2592 {
… …
2571 * needed for fvwm2.2.2 (and before?) */ 2595 * needed for fvwm2.2.2 (and before?) */
2572 sleep (1); 2596 sleep (1);
2573#endif 2597#endif
2574 for (n = 0; n < (unsigned int)i; n++) 2598 for (n = 0; n < (unsigned int)i; n++)
2575 { 2599 {
2576 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2600 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2577 XClearWindow (disp, TermWin.parent[n]); 2601 XClearWindow (disp, parent[n]);
2578 } 2602 }
2579 2603
2580 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2604 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2581 am_transparent = 1; 2605 am_transparent = 1;
2582 } 2606 }
2583 2607
2584 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2608 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2585 TermWin.parent[i] = None; 2609 parent[i] = None;
2586 } 2610 }
2587 2611
2588 if (scrollBar.win) 2612 if (scrollBar.win)
2589 { 2613 {
2590 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2614 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2642 /* Read a text string from the input buffer */ 2666 /* Read a text string from the input buffer */
2643 unicode_t buf[UBUFSIZ]; 2667 unicode_t buf[UBUFSIZ];
2644 bool refreshnow = false; 2668 bool refreshnow = false;
2645 int nlines = 0; 2669 int nlines = 0;
2646 unicode_t *str = buf; 2670 unicode_t *str = buf;
2671 unicode_t *eol = str + min (ncol, UBUFSIZ);
2647 2672
2648 for (;;) 2673 for (;;)
2649 { 2674 {
2650 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))
2651 break; 2676 break;
2652 2677
2653 *str++ = ch; 2678 *str++ = ch;
2654 2679
2655 if (ch == C0_LF) 2680 if (ch == C0_LF || str >= eol)
2656 { 2681 {
2682 if (ch == C0_LF)
2657 nlines++; 2683 nlines++;
2684
2658 refresh_count++; 2685 refresh_count++;
2659 2686
2660 if (!(options & Opt_jumpScroll) 2687 if (!(options & Opt_jumpScroll)
2661 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2688 || (refresh_count >= refresh_limit * (nrow - 1)))
2662 { 2689 {
2663 refreshnow = true; 2690 refreshnow = true;
2664 ch = NOCHAR; 2691 ch = NOCHAR;
2665 break; 2692 break;
2666 } 2693 }
2667 2694
2668 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2695 // scr_add_lines only works for nlines <= nrow - 1.
2669 if (nlines >= TermWin.nrow - 1) 2696 if (nlines >= nrow - 1)
2670 { 2697 {
2671 scr_add_lines (buf, nlines, str - buf); 2698 scr_add_lines (buf, nlines, str - buf);
2672 nlines = 0; 2699 nlines = 0;
2673 str = buf; 2700 str = buf;
2701 eol = str + min (ncol, UBUFSIZ);
2674 } 2702 }
2675 }
2676 2703
2677 if (str >= buf + UBUFSIZ) 2704 if (str >= eol)
2678 { 2705 {
2706 if (eol >= buf + UBUFSIZ)
2707 {
2679 ch = NOCHAR; 2708 ch = NOCHAR;
2680 break; 2709 break;
2710 }
2711 else
2712 eol = min (eol + ncol, buf + UBUFSIZ);
2713 }
2714
2681 } 2715 }
2682 2716
2683 seq_begin = cmdbuf_ptr; 2717 seq_begin = cmdbuf_ptr;
2684 ch = next_char (); 2718 ch = next_char ();
2685 } 2719 }
… …
3344 3378
3345 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3379 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3346 arg[0] = -arg[0]; 3380 arg[0] = -arg[0];
3347 /* FALLTHROUGH */ 3381 /* FALLTHROUGH */
3348 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3382 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3349 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3383 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3350 break; 3384 break;
3351 3385
3352 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3386 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3353 tt_write ((const unsigned char *)VT100_ANS, 3387 tt_write ((const unsigned char *)VT100_ANS,
3354 (unsigned int) (sizeof (VT100_ANS) - 1)); 3388 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3479 { 3513 {
3480 /* 3514 /*
3481 * commands 3515 * commands
3482 */ 3516 */
3483 case 1: /* deiconify window */ 3517 case 1: /* deiconify window */
3484 XMapWindow (disp, TermWin.parent[0]); 3518 XMapWindow (disp, parent[0]);
3485 break; 3519 break;
3486 case 2: /* iconify window */ 3520 case 2: /* iconify window */
3487 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3521 XIconifyWindow (disp, parent[0], display->screen);
3488 break; 3522 break;
3489 case 3: /* set position (pixels) */ 3523 case 3: /* set position (pixels) */
3490 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3524 XMoveWindow (disp, parent[0], args[1], args[2]);
3491 break; 3525 break;
3492 case 4: /* set size (pixels) */ 3526 case 4: /* set size (pixels) */
3493 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3527 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3494 break; 3528 break;
3495 case 5: /* raise window */ 3529 case 5: /* raise window */
3496 XRaiseWindow (disp, TermWin.parent[0]); 3530 XRaiseWindow (disp, parent[0]);
3497 break; 3531 break;
3498 case 6: /* lower window */ 3532 case 6: /* lower window */
3499 XLowerWindow (disp, TermWin.parent[0]); 3533 XLowerWindow (disp, parent[0]);
3500 break; 3534 break;
3501 case 7: /* refresh window */ 3535 case 7: /* refresh window */
3502 scr_touch (true); 3536 scr_touch (true);
3503 break; 3537 break;
3504 case 8: /* set size (chars) */ 3538 case 8: /* set size (chars) */
3505 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3539 set_widthheight ((unsigned int) (args[2] * fwidth),
3506 (unsigned int) (args[1] * TermWin.fheight)); 3540 (unsigned int) (args[1] * fheight));
3507 break; 3541 break;
3508 3542
3509 //case 9: NYI, TODO, restore maximized window or maximize window 3543 //case 9: NYI, TODO, restore maximized window or maximize window
3510 default: 3544 default:
3511 if (args[0] >= 24) /* set height (chars) */ 3545 if (args[0] >= 24) /* set height (chars) */
3512 set_widthheight ((unsigned int)TermWin.width, 3546 set_widthheight ((unsigned int)width,
3513 (unsigned int) (args[1] * TermWin.fheight)); 3547 (unsigned int) (args[1] * fheight));
3514 break; 3548 break;
3515 3549
3516 3550
3517 /* 3551 /*
3518 * reports - some output format copied from XTerm 3552 * reports - some output format copied from XTerm
3519 */ 3553 */
3520 case 11: /* report window state */ 3554 case 11: /* report window state */
3521 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3555 XGetWindowAttributes (disp, parent[0], &wattr);
3522 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3556 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3523 break; 3557 break;
3524 case 13: /* report window position */ 3558 case 13: /* report window position */
3525 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3559 XGetWindowAttributes (disp, parent[0], &wattr);
3526 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3560 XTranslateCoordinates (disp, parent[0], wattr.root,
3527 -wattr.border_width, -wattr.border_width, 3561 -wattr.border_width, -wattr.border_width,
3528 &x, &y, &wdummy); 3562 &x, &y, &wdummy);
3529 tt_printf ("\033[3;%d;%dt", x, y); 3563 tt_printf ("\033[3;%d;%dt", x, y);
3530 break; 3564 break;
3531 case 14: /* report window size (pixels) */ 3565 case 14: /* report window size (pixels) */
3532 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3566 XGetWindowAttributes (disp, parent[0], &wattr);
3533 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3567 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3534 break; 3568 break;
3535 case 18: /* report text area size (chars) */ 3569 case 18: /* report text area size (chars) */
3536 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3570 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3537 break; 3571 break;
3538 case 19: /* report window size (chars) */ 3572 case 19: /* report window size (chars) */
3539 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3573 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3540 break; 3574 break;
3541 case 20: /* report icon label */ 3575 case 20: /* report icon label */
3542 { 3576 {
3543 char *s; 3577 char *s;
3544 XGetIconName (disp, TermWin.parent[0], &s); 3578 XGetIconName (disp, parent[0], &s);
3545 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 */
3546 XFree (s); 3580 XFree (s);
3547 } 3581 }
3548 break; 3582 break;
3549 case 21: /* report window title */ 3583 case 21: /* report window title */
3550 { 3584 {
3551 char *s; 3585 char *s;
3552 XFetchName (disp, TermWin.parent[0], &s); 3586 XFetchName (disp, parent[0], &s);
3553 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 */
3554 XFree (s); 3588 XFree (s);
3555 } 3589 }
3556 break; 3590 break;
3557 } 3591 }
… …
3703 unsigned long bytes_after; 3737 unsigned long bytes_after;
3704 unsigned char *value = 0; 3738 unsigned char *value = 0;
3705 const char *str = ""; 3739 const char *str = "";
3706 3740
3707 if (prop 3741 if (prop
3708 && XGetWindowProperty (disp, TermWin.parent[0], 3742 && XGetWindowProperty (disp, parent[0],
3709 prop, 0, 1<<16, 0, AnyPropertyType, 3743 prop, 0, 1<<16, 0, AnyPropertyType,
3710 &actual_type, &actual_format, 3744 &actual_type, &actual_format,
3711 &nitems, &bytes_after, &value) == Success 3745 &nitems, &bytes_after, &value) == Success
3712 && actual_type != None 3746 && actual_type != None
3713 && actual_format == 8) 3747 && actual_format == 8)
… …
3725 { 3759 {
3726 *eq = 0; 3760 *eq = 0;
3727 set_utf8_property (display->atom (str), eq + 1); 3761 set_utf8_property (display->atom (str), eq + 1);
3728 } 3762 }
3729 else 3763 else
3730 XDeleteProperty (disp, TermWin.parent[0], 3764 XDeleteProperty (disp, parent[0],
3731 display->atom (str)); 3765 display->atom (str));
3732 } 3766 }
3733 break; 3767 break;
3734 3768
3735 case XTerm_Color: 3769 case XTerm_Color:
… …
3860 case URxvt_italicFont: 3894 case URxvt_italicFont:
3861 case URxvt_boldItalicFont: 3895 case URxvt_boldItalicFont:
3862#endif 3896#endif
3863 if (query) 3897 if (query)
3864 tt_printf ("\33]%d;%-.250s%c", saveop, 3898 tt_printf ("\33]%d;%-.250s%c", saveop,
3865 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3899 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3866 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3900 ? fontset[op - URxvt_font]->fontdesc : "",
3867 resp); 3901 resp);
3868 else 3902 else
3869 { 3903 {
3870 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3904 const char *&res = rs[Rs_font + (op - URxvt_font)];
3871 3905
… …
4038 */ 4072 */
4039 PrivMode (1, PrivMode_vt52); 4073 PrivMode (1, PrivMode_vt52);
4040 break; 4074 break;
4041 case 3: /* 80/132 */ 4075 case 3: /* 80/132 */
4042 if (priv_modes & PrivMode_132OK) 4076 if (priv_modes & PrivMode_132OK)
4043 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4077 set_widthheight (((state ? 132 : 80) * fwidth), height);
4044 break; 4078 break;
4045 case 4: /* smooth scrolling */ 4079 case 4: /* smooth scrolling */
4046 if (state) 4080 if (state)
4047 options &= ~Opt_jumpScroll; 4081 options &= ~Opt_jumpScroll;
4048 else 4082 else
… …
4365 } 4399 }
4366 4400
4367 memmove (v_buffer, v_buffer + written, v_buflen); 4401 memmove (v_buffer, v_buffer + written, v_buflen);
4368 } 4402 }
4369 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4403 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4370 // original code just ignores this... 4404 pty_ev.set (EVENT_READ);
4371 destroy ();
4372} 4405}
4373 4406
4374/*----------------------- end-of-file (C source) -----------------------*/ 4407/*----------------------- end-of-file (C source) -----------------------*/
4375 4408

Diff Legend

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