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.198 by root, Sat Feb 19 01:07:58 2005 UTC vs.
Revision 1.215 by root, Fri Dec 23 14:46:34 2005 UTC

… …
135rxvt_term::iso14755_54 (int x, int y) 135rxvt_term::iso14755_54 (int x, int y)
136{ 136{
137 x = Pixel2Col (x); 137 x = Pixel2Col (x);
138 y = Pixel2Row (y); 138 y = Pixel2Row (y);
139 139
140 if (x < 0 || x >= TermWin.ncol 140 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= TermWin.nrow) 141 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 142 return;
143 143
144 for (;;) 144 for (;;)
145 { 145 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 146 const line_t &l = ROW(y - view_start);
147
148 text_t t = l.t[x];
147 149
148 if (t != NOCHAR || !x) 150 if (t != NOCHAR || !x)
149 { 151 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 152 iso14755_51 (l.t[x], l.r[x]);
151 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
152 iso14755buf = ISO_14755_54; 153 iso14755buf = ISO_14755_54;
153 break; 154 break;
154 } 155 }
155 156
156 x--; 157 x--;
157 } 158 }
158
159} 159}
160#endif 160#endif
161 161
162#if ENABLE_OVERLAY 162#if ENABLE_OVERLAY
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2; 168 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 169 int len;
170
171 fname = rxvt_utf8towcs (f->name);
170 172
171#if ENABLE_COMBINING 173#if ENABLE_COMBINING
172 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
173 { 175 {
174 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
… …
183 alloc = 0; 185 alloc = 0;
184 chr = &ch2; 186 chr = &ch2;
185 len = 1; 187 len = 1;
186 } 188 }
187 189
188 int width = strlen (f->name); 190 int width = wcswidth (fname, wcslen (fname));
189 191
190 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
191 193
192 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193 195
… …
206#endif 208#endif
207 scr_overlay_set (11, y, ch, r); 209 scr_overlay_set (11, y, ch, r);
208 scr_overlay_set (12, y, NOCHAR, r); 210 scr_overlay_set (12, y, NOCHAR, r);
209 } 211 }
210 212
211 scr_overlay_set (0, len, f->name); 213 scr_overlay_set (0, len, fname);
214
215 free (fname);
212 216
213#if ENABLE_COMBINING 217#if ENABLE_COMBINING
214 if (alloc) 218 if (alloc)
215 delete [] alloc; 219 delete [] alloc;
216#endif 220#endif
… …
316 320
317 // the XOpenIM manpage lies about hardcoding the locale 321 // the XOpenIM manpage lies about hardcoding the locale
318 // at the point of XOpenIM, so temporarily switch locales 322 // at the point of XOpenIM, so temporarily switch locales
319 if (rs[Rs_imLocale]) 323 if (rs[Rs_imLocale])
320 SET_LOCALE (rs[Rs_imLocale]); 324 SET_LOCALE (rs[Rs_imLocale]);
325
321 // assume wchar_t == unicode or better 326 // assume wchar_t == unicode or better
322 len = XwcLookupString (Input_Context, &ev, wkbuf, 327 len = XwcLookupString (Input_Context, &ev, wkbuf,
323 KBUFSZ, &keysym, &status_return); 328 KBUFSZ, &keysym, &status_return);
329
324 if (rs[Rs_imLocale]) 330 if (rs[Rs_imLocale])
325 SET_LOCALE (locale); 331 SET_LOCALE (locale);
326 332
327 if (status_return == XLookupChars 333 if (status_return == XLookupChars
328 || status_return == XLookupBoth) 334 || status_return == XLookupBoth)
… …
360#ifdef KEYSYM_RESOURCE 366#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state)) 367 if (keyboard->dispatch (this, keysym, ev.state))
362 return; 368 return;
363#endif 369#endif
364 370
365 if (TermWin.saveLines) 371 if (saveLines)
366 { 372 {
367#ifdef UNSHIFTED_SCROLLKEYS 373#ifdef UNSHIFTED_SCROLLKEYS
368 if (!ctrl && !meta) 374 if (!ctrl && !meta)
369#else 375#else
370 if (IS_SCROLL_MOD) 376 if (IS_SCROLL_MOD)
371#endif 377#endif
372 { 378 {
373 int lnsppg; 379 int lnsppg;
374 380
375#ifdef PAGING_CONTEXT_LINES 381#ifdef PAGING_CONTEXT_LINES
376 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 382 lnsppg = nrow - PAGING_CONTEXT_LINES;
377#else 383#else
378 lnsppg = TermWin.nrow * 4 / 5; 384 lnsppg = nrow * 4 / 5;
379#endif 385#endif
380 if (keysym == XK_Prior) 386 if (keysym == XK_Prior)
381 { 387 {
382 scr_page (UP, lnsppg); 388 scr_page (UP, lnsppg);
383 return; 389 return;
… …
839 845
840 if (len <= 0) 846 if (len <= 0)
841 return; /* not mapped */ 847 return; /* not mapped */
842 848
843 if (options & Opt_scrollTtyKeypress) 849 if (options & Opt_scrollTtyKeypress)
844 if (TermWin.view_start) 850 if (view_start)
845 { 851 {
846 TermWin.view_start = 0; 852 view_start = 0;
847 want_refresh = 1; 853 want_refresh = 1;
848 } 854 }
849 855
850 /* 856 /*
851 * these modifications only affect the static keybuffer 857 * these modifications only affect the static keybuffer
… …
1028{ 1034{
1029 if (mouse_slip_wheel_speed == 0 1035 if (mouse_slip_wheel_speed == 0
1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1031 : scr_page (UP, mouse_slip_wheel_speed)) 1037 : scr_page (UP, mouse_slip_wheel_speed))
1032 { 1038 {
1033 if (TermWin.view_start == TermWin.nscrolled || 1039 if (view_start == nsaved ||
1034 TermWin.view_start == 0) 1040 view_start == 0)
1035 mouse_slip_wheel_speed = 0; 1041 mouse_slip_wheel_speed = 0;
1036 1042
1037 refresh_type |= SMOOTH_REFRESH; 1043 refresh_type |= SMOOTH_REFRESH;
1038 want_refresh = 1; 1044 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1061 if (n > 0) 1067 if (n > 0)
1062 { 1068 {
1063 cmdbuf_endp += n; 1069 cmdbuf_endp += n;
1064 return true; 1070 return true;
1065 } 1071 }
1066 else if (n < 0 && errno != EAGAIN) 1072 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
1073 {
1074 pty_ev.stop ();
1075
1076 if (!(options & Opt_hold))
1067 destroy (); 1077 destroy ();
1078 }
1068 1079
1069 return false; 1080 return false;
1070} 1081}
1071 1082
1072void 1083void
… …
1086} 1097}
1087 1098
1088void 1099void
1089rxvt_term::pointer_unblank () 1100rxvt_term::pointer_unblank ()
1090{ 1101{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1102 XDefineCursor (display->display, vt, TermWin_cursor);
1092 recolour_cursor (); 1103 recolour_cursor ();
1093 1104
1094#ifdef POINTER_BLANK 1105#ifdef POINTER_BLANK
1095 hidden_pointer = 0; 1106 hidden_pointer = 0;
1096 1107
… …
1104rxvt_term::pointer_blank () 1115rxvt_term::pointer_blank ()
1105{ 1116{
1106 if (! (options & Opt_pointerBlank)) 1117 if (! (options & Opt_pointerBlank))
1107 return; 1118 return;
1108 1119
1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1120 XDefineCursor (display->display, vt, display->blank_cursor);
1110 XFlush (display->display); 1121 XFlush (display->display);
1111 1122
1112 hidden_pointer = 1; 1123 hidden_pointer = 1;
1113} 1124}
1114 1125
… …
1330 button_release (ev.xbutton); 1341 button_release (ev.xbutton);
1331 break; 1342 break;
1332 1343
1333 case ClientMessage: 1344 case ClientMessage:
1334 if (ev.xclient.format == 32 1345 if (ev.xclient.format == 32
1335 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS] 1346 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1347 {
1336 && ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1348 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1337 destroy (); 1349 destroy ();
1350#if ENABLE_EWMH
1351 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1352 XSendEvent (disp, ev.xclient.window = display->root,
1353 False, SubstructureRedirectMask | SubstructureNotifyMask,
1354 &ev);
1355#endif
1356 }
1338#if ENABLE_XEMBED 1357#if ENABLE_XEMBED
1339 else if (ev.xclient.format == 32 1358 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1340 && ev.xclient.message_type == xa[XA_XEMBED])
1341 { 1359 {
1342 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) 1360 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1343 focus_in (); 1361 focus_in ();
1344 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1362 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1345 focus_out (); 1363 focus_out ();
… …
1409 case FocusOut: 1427 case FocusOut:
1410 focus_out (); 1428 focus_out ();
1411 break; 1429 break;
1412 1430
1413 case ConfigureNotify: 1431 case ConfigureNotify:
1414 if (ev.xconfigure.window == TermWin.parent[0]) 1432 if (ev.xconfigure.window == parent[0])
1415 { 1433 {
1416 int height, width;
1417
1418 do
1419 { /* Wrap lots of configures into one */
1420 width = ev.xconfigure.width;
1421 height = ev.xconfigure.height;
1422 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1423 }
1424 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1434 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1435 ;
1425 1436
1426 if (szHint.width != width || szHint.height != height) 1437 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1427 { 1438 {
1428 seen_resize = 1; 1439 seen_resize = 1;
1429 resize_all_windows (width, height, 1); 1440 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1430 } 1441 }
1431 1442
1432#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1443#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1433 if (options & Opt_transparent) 1444 if (options & Opt_transparent)
1434 check_our_parents (); 1445 check_our_parents ();
… …
1455 case SelectionRequest: 1466 case SelectionRequest:
1456 selection_send (ev.xselectionrequest); 1467 selection_send (ev.xselectionrequest);
1457 break; 1468 break;
1458 1469
1459 case UnmapNotify: 1470 case UnmapNotify:
1460 TermWin.mapped = 0; 1471 mapped = 0;
1461#ifdef TEXT_BLINK 1472#ifdef TEXT_BLINK
1462 text_blink_ev.stop (); 1473 text_blink_ev.stop ();
1463#endif 1474#endif
1464 break; 1475 break;
1465 1476
1466 case MapNotify: 1477 case MapNotify:
1467 TermWin.mapped = 1; 1478 mapped = 1;
1468#ifdef TEXT_BLINK 1479#ifdef TEXT_BLINK
1469 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1480 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1470#endif 1481#endif
1471 break; 1482 break;
1472 1483
… …
1476 break; 1487 break;
1477#endif /* TRANSPARENT */ 1488#endif /* TRANSPARENT */
1478 1489
1479 case GraphicsExpose: 1490 case GraphicsExpose:
1480 case Expose: 1491 case Expose:
1481 if (ev.xany.window == TermWin.vt) 1492 if (ev.xany.window == vt)
1482 { 1493 {
1483 do 1494 do
1484 scr_expose (ev.xexpose.x, ev.xexpose.y, 1495 scr_expose (ev.xexpose.x, ev.xexpose.y,
1485 ev.xexpose.width, ev.xexpose.height, False); 1496 ev.xexpose.width, ev.xexpose.height, False);
1486 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1497 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1487 1498
1488 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1499 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1489 1500
1490 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1501 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1491 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1492 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1493 1504
1494 scr_refresh (refresh_type); 1505 scr_refresh (refresh_type);
1495 } 1506 }
… …
1511 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1522 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1512 menubar_expose (); 1523 menubar_expose ();
1513#endif 1524#endif
1514 1525
1515#ifdef TRANSPARENT 1526#ifdef TRANSPARENT
1516 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1527 if (am_transparent && ev.xany.window == parent[0])
1517 XClearWindow (disp, ev.xany.window); 1528 XClearWindow (disp, ev.xany.window);
1518#endif 1529#endif
1519 } 1530 }
1520 break; 1531 break;
1521 1532
… …
1532 } 1543 }
1533#endif 1544#endif
1534 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1545 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1535 break; 1546 break;
1536 1547
1537 if (ev.xany.window == TermWin.vt) 1548 if (ev.xany.window == vt)
1538 { 1549 {
1539 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1550 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1540 { 1551 {
1541 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1552 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1542 ; 1553 ;
1543 1554
1544 XQueryPointer (disp, TermWin.vt, 1555 XQueryPointer (disp, vt,
1545 &unused_root, &unused_child, 1556 &unused_root, &unused_child,
1546 &unused_root_x, &unused_root_y, 1557 &unused_root_x, &unused_root_y,
1547 &ev.xbutton.x, &ev.xbutton.y, 1558 &ev.xbutton.x, &ev.xbutton.y,
1548 &ev.xbutton.state); 1559 &ev.xbutton.state);
1549#ifdef MOUSE_THRESHOLD 1560#ifdef MOUSE_THRESHOLD
… …
1561#endif 1572#endif
1562 selection_extend (ev.xbutton.x, ev.xbutton.y, 1573 selection_extend (ev.xbutton.x, ev.xbutton.y,
1563 ev.xbutton.state & Button3Mask ? 2 : 0); 1574 ev.xbutton.state & Button3Mask ? 2 : 0);
1564 1575
1565#ifdef SELECTION_SCROLLING 1576#ifdef SELECTION_SCROLLING
1566 if (ev.xbutton.y < TermWin.int_bwidth 1577 if (ev.xbutton.y < int_bwidth
1567 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1578 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1568 { 1579 {
1569 int dist; 1580 int dist;
1570 1581
1571 /* don't clobber the current delay if we are 1582 /* don't clobber the current delay if we are
1572 * already in the middle of scrolling. 1583 * already in the middle of scrolling.
… …
1580 selection_save_x = ev.xbutton.x; 1591 selection_save_x = ev.xbutton.x;
1581 selection_save_y = ev.xbutton.y; 1592 selection_save_y = ev.xbutton.y;
1582 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1593 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1583 1594
1584 /* calc number of lines to scroll */ 1595 /* calc number of lines to scroll */
1585 if (ev.xbutton.y < TermWin.int_bwidth) 1596 if (ev.xbutton.y < int_bwidth)
1586 { 1597 {
1587 scroll_selection_dir = UP; 1598 scroll_selection_dir = UP;
1588 dist = TermWin.int_bwidth - ev.xbutton.y; 1599 dist = int_bwidth - ev.xbutton.y;
1589 } 1600 }
1590 else 1601 else
1591 { 1602 {
1592 scroll_selection_dir = DN; 1603 scroll_selection_dir = DN;
1593 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1604 dist = ev.xbutton.y - (int_bwidth + height);
1594 } 1605 }
1595 1606
1596 scroll_selection_lines = Pixel2Height (dist) 1607 scroll_selection_lines = Pixel2Height (dist)
1597 / SELECTION_SCROLL_LINE_SPEEDUP 1608 / SELECTION_SCROLL_LINE_SPEEDUP
1598 + 1; 1609 + 1;
1599 MIN_IT (scroll_selection_lines, 1610 min_it (scroll_selection_lines,
1600 SELECTION_SCROLL_MAX_LINES); 1611 SELECTION_SCROLL_MAX_LINES);
1601 } 1612 }
1602 else 1613 else
1603 { 1614 {
1604 /* we are within the text window, so we 1615 /* we are within the text window, so we
… …
1635} 1646}
1636 1647
1637void 1648void
1638rxvt_term::focus_in () 1649rxvt_term::focus_in ()
1639{ 1650{
1640 if (!TermWin.focus) 1651 if (!focus)
1641 { 1652 {
1642 TermWin.focus = 1; 1653 focus = 1;
1643 want_refresh = 1; 1654 want_refresh = 1;
1644#ifdef USE_XIM 1655#if USE_XIM
1645 if (Input_Context != NULL) 1656 if (Input_Context != NULL)
1646 { 1657 {
1647 IMSetStatusPosition (); 1658 IMSetStatusPosition ();
1648 XSetICFocus (Input_Context); 1659 XSetICFocus (Input_Context);
1649 } 1660 }
1650#endif 1661#endif
1651#ifdef CURSOR_BLINK 1662#if CURSOR_BLINK
1652 if (options & Opt_cursorBlink) 1663 if (options & Opt_cursorBlink)
1653 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1664 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1654#endif 1665#endif
1655#ifdef OFF_FOCUS_FADING 1666#if OFF_FOCUS_FADING
1656 if (rs[Rs_fade]) 1667 if (rs[Rs_fade])
1657 { 1668 {
1658 pix_colors = pix_colors_focused; 1669 pix_colors = pix_colors_focused;
1659 scr_recolour (); 1670 scr_recolour ();
1660 } 1671 }
… …
1663} 1674}
1664 1675
1665void 1676void
1666rxvt_term::focus_out () 1677rxvt_term::focus_out ()
1667{ 1678{
1668 if (TermWin.focus) 1679 if (focus)
1669 { 1680 {
1670 TermWin.focus = 0; 1681 focus = 0;
1671 want_refresh = 1; 1682 want_refresh = 1;
1672 1683
1673#if ENABLE_FRILLS || ISO_14755 1684#if ENABLE_FRILLS || ISO_14755
1674 iso14755buf = 0; 1685 iso14755buf = 0;
1675#endif 1686#endif
1676#if ENABLE_OVERLAY 1687#if ENABLE_OVERLAY
1677 scr_overlay_off (); 1688 scr_overlay_off ();
1678#endif 1689#endif
1679#ifdef USE_XIM 1690#if USE_XIM
1680 if (Input_Context != NULL) 1691 if (Input_Context != NULL)
1681 XUnsetICFocus (Input_Context); 1692 XUnsetICFocus (Input_Context);
1682#endif 1693#endif
1683#ifdef CURSOR_BLINK 1694#if CURSOR_BLINK
1684 if (options & Opt_cursorBlink) 1695 if (options & Opt_cursorBlink)
1685 cursor_blink_ev.stop (); 1696 cursor_blink_ev.stop ();
1686 hidden_cursor = 0; 1697 hidden_cursor = 0;
1687#endif 1698#endif
1688#ifdef OFF_FOCUS_FADING 1699#if OFF_FOCUS_FADING
1689 if (rs[Rs_fade]) 1700 if (rs[Rs_fade])
1690 { 1701 {
1691 pix_colors = pix_colors_unfocused; 1702 pix_colors = pix_colors_unfocused;
1692 scr_recolour (); 1703 scr_recolour ();
1693 } 1704 }
… …
1732 reportmode = !! (priv_modes & PrivMode_mouse_report); 1743 reportmode = !! (priv_modes & PrivMode_mouse_report);
1733 1744
1734 /* 1745 /*
1735 * VT window processing of button press 1746 * VT window processing of button press
1736 */ 1747 */
1737 if (ev.window == TermWin.vt) 1748 if (ev.window == vt)
1738 { 1749 {
1739#if ISO_14755 1750#if ISO_14755
1740 // 5.4 1751 // 5.4
1741 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1752 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1742 { 1753 {
… …
1947 case Button3: 1958 case Button3:
1948 if (scrollBar.style != R_SB_XTERM) 1959 if (scrollBar.style != R_SB_XTERM)
1949 { 1960 {
1950 if (scrollbar_above_slider (ev.y)) 1961 if (scrollbar_above_slider (ev.y))
1951# ifdef RXVT_SCROLL_FULL 1962# ifdef RXVT_SCROLL_FULL
1952 scr_page (UP, TermWin.nrow - 1); 1963 scr_page (UP, nrow - 1);
1953# else 1964# else
1954 scr_page (UP, TermWin.nrow / 4); 1965 scr_page (UP, nrow / 4);
1955# endif 1966# endif
1956 else if (scrollbar_below_slider (ev.y)) 1967 else if (scrollbar_below_slider (ev.y))
1957# ifdef RXVT_SCROLL_FULL 1968# ifdef RXVT_SCROLL_FULL
1958 scr_page (DN, TermWin.nrow - 1); 1969 scr_page (DN, nrow - 1);
1959# else 1970# else
1960 scr_page (DN, TermWin.nrow / 4); 1971 scr_page (DN, nrow / 4);
1961# endif 1972# endif
1962 else 1973 else
1963 scrollBar.setMotion (); 1974 scrollBar.setMotion ();
1964 } 1975 }
1965 else 1976 else
1966 { 1977 {
1967 scr_page ((ev.button == Button1 ? DN : UP), 1978 scr_page ((ev.button == Button1 ? DN : UP),
1968 (TermWin.nrow 1979 (nrow
1969 * scrollbar_position (ev.y) 1980 * scrollbar_position (ev.y)
1970 / scrollbar_size ())); 1981 / scrollbar_size ()));
1971 } 1982 }
1972 1983
1973 break; 1984 break;
… …
2005#ifdef SELECTION_SCROLLING 2016#ifdef SELECTION_SCROLLING
2006 if (sel_scroll_ev.active) 2017 if (sel_scroll_ev.active)
2007 sel_scroll_ev.stop(); 2018 sel_scroll_ev.stop();
2008#endif 2019#endif
2009 2020
2010 if (ev.window == TermWin.vt) 2021 if (ev.window == vt)
2011 { 2022 {
2012#if ISO_14755 2023#if ISO_14755
2013 // 5.4 2024 // 5.4
2014 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2025 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2015 return; 2026 return;
… …
2066 v = ev.button == Button4 ? UP : DN; 2077 v = ev.button == Button4 ? UP : DN;
2067 2078
2068 if (ev.state & ShiftMask) 2079 if (ev.state & ShiftMask)
2069 i = 1; 2080 i = 1;
2070 else if (options & Opt_mouseWheelScrollPage) 2081 else if (options & Opt_mouseWheelScrollPage)
2071 i = TermWin.nrow - 1; 2082 i = nrow - 1;
2072 else 2083 else
2073 i = 5; 2084 i = 5;
2074 2085
2075# ifdef MOUSE_SLIP_WHEELING 2086# ifdef MOUSE_SLIP_WHEELING
2076 if (ev.state & ControlMask) 2087 if (ev.state & ControlMask)
2077 { 2088 {
2078 mouse_slip_wheel_speed += v ? -1 : 1; 2089 mouse_slip_wheel_speed += v ? -1 : 1;
2079 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2090 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2080 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2091 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2081 2092
2082 if (slip_wheel_ev.at < NOW) 2093 if (slip_wheel_ev.at < NOW)
2083 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2094 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2084 2095
2085 slip_wheel_ev.start (); 2096 slip_wheel_ev.start ();
… …
2367 return pchanged; /* Don't try any more */ 2378 return pchanged; /* Don't try any more */
2368 2379
2369 XGetWindowAttributes (disp, display->root, &wrootattr); 2380 XGetWindowAttributes (disp, display->root, &wrootattr);
2370 rootdepth = wrootattr.depth; 2381 rootdepth = wrootattr.depth;
2371 2382
2372 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2383 XGetWindowAttributes (disp, parent[0], &wattr);
2373 2384
2374 if (rootdepth != wattr.depth) 2385 if (rootdepth != wattr.depth)
2375 { 2386 {
2376 if (am_transparent) 2387 if (am_transparent)
2377 { 2388 {
2378 pchanged = 1; 2389 pchanged = 1;
2379 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2390 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2380 am_transparent = am_pixmap_trans = 0; 2391 am_transparent = am_pixmap_trans = 0;
2381 } 2392 }
2382 2393
2383 return pchanged; /* Don't try any more */ 2394 return pchanged; /* Don't try any more */
2384 } 2395 }
… …
2425 Window cr; 2436 Window cr;
2426 XImage *image; 2437 XImage *image;
2427 GC gc; 2438 GC gc;
2428 XGCValues gcvalue; 2439 XGCValues gcvalue;
2429 2440
2430 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2441 XTranslateCoordinates (disp, parent[0], display->root,
2431 0, 0, &sx, &sy, &cr); 2442 0, 0, &sx, &sy, &cr);
2432 nw = (unsigned int)szHint.width; 2443 nw = (unsigned int)szHint.width;
2433 nh = (unsigned int)szHint.height; 2444 nh = (unsigned int)szHint.height;
2434 nx = ny = 0; 2445 nx = ny = 0;
2435 2446
… …
2445 nh += sy; 2456 nh += sy;
2446 ny = -sy; 2457 ny = -sy;
2447 sy = 0; 2458 sy = 0;
2448 } 2459 }
2449 2460
2450 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2461 min_it (nw, (unsigned int) (wrootattr.width - sx));
2451 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2462 min_it (nh, (unsigned int) (wrootattr.height - sy));
2452 2463
2453 XSync (disp, False); 2464 XSync (disp, False);
2454 allowedxerror = -1; 2465 allowedxerror = -1;
2455 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2466 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2456 2467
… …
2461 if (image == NULL) 2472 if (image == NULL)
2462 { 2473 {
2463 if (am_transparent && am_pixmap_trans) 2474 if (am_transparent && am_pixmap_trans)
2464 { 2475 {
2465 pchanged = 1; 2476 pchanged = 1;
2466 if (TermWin.pixmap != None) 2477 if (pixmap != None)
2467 { 2478 {
2468 XFreePixmap (disp, TermWin.pixmap); 2479 XFreePixmap (disp, pixmap);
2469 TermWin.pixmap = None; 2480 pixmap = None;
2470 } 2481 }
2471 } 2482 }
2472 2483
2473 am_pixmap_trans = 0; 2484 am_pixmap_trans = 0;
2474 } 2485 }
2475 else 2486 else
2476 { 2487 {
2477 if (TermWin.pixmap != None) 2488 if (pixmap != None)
2478 XFreePixmap (disp, TermWin.pixmap); 2489 XFreePixmap (disp, pixmap);
2479 2490
2480#if TINTING 2491#if TINTING
2481 if (ISSET_PIXCOLOR (Color_tint)) 2492 if (ISSET_PIXCOLOR (Color_tint))
2482 { 2493 {
2483 unsigned short rm, gm, bm; 2494 unsigned short rm, gm, bm;
… …
2487 2498
2488 ShadeXImage (display, image, shade, rm, gm, bm); 2499 ShadeXImage (display, image, shade, rm, gm, bm);
2489 } 2500 }
2490#endif 2501#endif
2491 2502
2492 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2503 pixmap = XCreatePixmap (disp, vt,
2493 szHint.width, szHint.height, image->depth); 2504 szHint.width, szHint.height, image->depth);
2494 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2505 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2495 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2506 XPutImage (disp, pixmap, gc, image, 0, 0,
2496 nx, ny, image->width, image->height); 2507 nx, ny, image->width, image->height);
2497 XFreeGC (disp, gc); 2508 XFreeGC (disp, gc);
2498 XDestroyImage (image); 2509 XDestroyImage (image);
2499 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2510 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2500 XClearWindow (disp, TermWin.parent[0]); 2511 XClearWindow (disp, parent[0]);
2501 2512
2502 if (!am_transparent || !am_pixmap_trans) 2513 if (!am_transparent || !am_pixmap_trans)
2503 pchanged = 1; 2514 pchanged = 1;
2504 2515
2505 am_transparent = am_pixmap_trans = 1; 2516 am_transparent = am_pixmap_trans = 1;
2506 } 2517 }
2507 } 2518 }
2508 2519
2509 if (am_pixmap_trans) 2520 if (am_pixmap_trans)
2510 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2521 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2511 else 2522 else
2512 { 2523 {
2513 unsigned int n; 2524 unsigned int n;
2514 /* 2525 /*
2515 * InheritPixmap transparency 2526 * InheritPixmap transparency
2516 */ 2527 */
2517 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2528 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2518 { 2529 {
2519 oldp = TermWin.parent[i]; 2530 oldp = parent[i];
2520 XQueryTree (disp, TermWin.parent[i - 1], &root, 2531 XQueryTree (disp, parent[i - 1], &root,
2521 &TermWin.parent[i], &list, &n); 2532 &parent[i], &list, &n);
2522 XFree (list); 2533 XFree (list);
2523 2534
2524 if (TermWin.parent[i] == display->root) 2535 if (parent[i] == display->root)
2525 { 2536 {
2526 if (oldp != None) 2537 if (oldp != None)
2527 pchanged = 1; 2538 pchanged = 1;
2528 2539
2529 break; 2540 break;
2530 } 2541 }
2531 2542
2532 if (oldp != TermWin.parent[i]) 2543 if (oldp != parent[i])
2533 pchanged = 1; 2544 pchanged = 1;
2534 } 2545 }
2535 2546
2536 n = 0; 2547 n = 0;
2537 2548
2538 if (pchanged) 2549 if (pchanged)
2539 { 2550 {
2540 for (; n < (unsigned int)i; n++) 2551 for (; n < (unsigned int)i; n++)
2541 { 2552 {
2542 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2553 XGetWindowAttributes (disp, parent[n], &wattr);
2543 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2554 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2544 { 2555 {
2545 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2556 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2546 break; 2557 break;
2547 } 2558 }
2548 } 2559 }
2549 } 2560 }
2550 2561
2551 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2562 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2552 { 2563 {
2553 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2564 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2554 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2565 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2555 am_transparent = 0; 2566 am_transparent = 0;
2556 /* XXX: also turn off Opt_transparent? */ 2567 /* XXX: also turn off Opt_transparent? */
2557 } 2568 }
2558 else 2569 else
2559 { 2570 {
… …
2562 * needed for fvwm2.2.2 (and before?) */ 2573 * needed for fvwm2.2.2 (and before?) */
2563 sleep (1); 2574 sleep (1);
2564#endif 2575#endif
2565 for (n = 0; n < (unsigned int)i; n++) 2576 for (n = 0; n < (unsigned int)i; n++)
2566 { 2577 {
2567 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2578 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2568 XClearWindow (disp, TermWin.parent[n]); 2579 XClearWindow (disp, parent[n]);
2569 } 2580 }
2570 2581
2571 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2572 am_transparent = 1; 2583 am_transparent = 1;
2573 } 2584 }
2574 2585
2575 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2586 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2576 TermWin.parent[i] = None; 2587 parent[i] = None;
2577 } 2588 }
2578 2589
2579 if (scrollBar.win) 2590 if (scrollBar.win)
2580 { 2591 {
2581 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2592 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2633 /* Read a text string from the input buffer */ 2644 /* Read a text string from the input buffer */
2634 unicode_t buf[UBUFSIZ]; 2645 unicode_t buf[UBUFSIZ];
2635 bool refreshnow = false; 2646 bool refreshnow = false;
2636 int nlines = 0; 2647 int nlines = 0;
2637 unicode_t *str = buf; 2648 unicode_t *str = buf;
2649 unicode_t *eol = str + min (ncol, UBUFSIZ);
2638 2650
2639 for (;;) 2651 for (;;)
2640 { 2652 {
2641 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2653 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2642 break; 2654 break;
2643 2655
2644 *str++ = ch; 2656 *str++ = ch;
2645 2657
2646 if (ch == C0_LF) 2658 if (ch == C0_LF || str >= eol)
2647 { 2659 {
2660 if (ch == C0_LF)
2648 nlines++; 2661 nlines++;
2662
2649 refresh_count++; 2663 refresh_count++;
2650 2664
2651 if (!(options & Opt_jumpScroll) 2665 if (!(options & Opt_jumpScroll)
2652 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2666 || (refresh_count >= refresh_limit * (nrow - 1)))
2653 { 2667 {
2654 refreshnow = true; 2668 refreshnow = true;
2655 ch = NOCHAR; 2669 ch = NOCHAR;
2656 break; 2670 break;
2657 } 2671 }
2658 2672
2659 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2673 // scr_add_lines only works for nlines <= nrow - 1.
2660 if (nlines >= TermWin.nrow - 1) 2674 if (nlines >= nrow - 1)
2661 { 2675 {
2662 scr_add_lines (buf, nlines, str - buf); 2676 scr_add_lines (buf, nlines, str - buf);
2663 nlines = 0; 2677 nlines = 0;
2664 str = buf; 2678 str = buf;
2679 eol = str + min (ncol, UBUFSIZ);
2665 } 2680 }
2666 }
2667 2681
2668 if (str >= buf + UBUFSIZ) 2682 if (str >= eol)
2669 { 2683 {
2684 if (eol >= buf + UBUFSIZ)
2685 {
2670 ch = NOCHAR; 2686 ch = NOCHAR;
2671 break; 2687 break;
2688 }
2689 else
2690 eol = min (eol + ncol, buf + UBUFSIZ);
2691 }
2692
2672 } 2693 }
2673 2694
2674 seq_begin = cmdbuf_ptr; 2695 seq_begin = cmdbuf_ptr;
2675 ch = next_char (); 2696 ch = next_char ();
2676 } 2697 }
… …
3335 3356
3336 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3357 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3337 arg[0] = -arg[0]; 3358 arg[0] = -arg[0];
3338 /* FALLTHROUGH */ 3359 /* FALLTHROUGH */
3339 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3360 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3340 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3361 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3341 break; 3362 break;
3342 3363
3343 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3364 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3344 tt_write ((const unsigned char *)VT100_ANS, 3365 tt_write ((const unsigned char *)VT100_ANS,
3345 (unsigned int) (sizeof (VT100_ANS) - 1)); 3366 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3470 { 3491 {
3471 /* 3492 /*
3472 * commands 3493 * commands
3473 */ 3494 */
3474 case 1: /* deiconify window */ 3495 case 1: /* deiconify window */
3475 XMapWindow (disp, TermWin.parent[0]); 3496 XMapWindow (disp, parent[0]);
3476 break; 3497 break;
3477 case 2: /* iconify window */ 3498 case 2: /* iconify window */
3478 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3499 XIconifyWindow (disp, parent[0], display->screen);
3479 break; 3500 break;
3480 case 3: /* set position (pixels) */ 3501 case 3: /* set position (pixels) */
3481 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3502 XMoveWindow (disp, parent[0], args[1], args[2]);
3482 break; 3503 break;
3483 case 4: /* set size (pixels) */ 3504 case 4: /* set size (pixels) */
3484 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3505 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3485 break; 3506 break;
3486 case 5: /* raise window */ 3507 case 5: /* raise window */
3487 XRaiseWindow (disp, TermWin.parent[0]); 3508 XRaiseWindow (disp, parent[0]);
3488 break; 3509 break;
3489 case 6: /* lower window */ 3510 case 6: /* lower window */
3490 XLowerWindow (disp, TermWin.parent[0]); 3511 XLowerWindow (disp, parent[0]);
3491 break; 3512 break;
3492 case 7: /* refresh window */ 3513 case 7: /* refresh window */
3493 scr_touch (true); 3514 scr_touch (true);
3494 break; 3515 break;
3495 case 8: /* set size (chars) */ 3516 case 8: /* set size (chars) */
3496 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3517 set_widthheight ((unsigned int) (args[2] * fwidth),
3497 (unsigned int) (args[1] * TermWin.fheight)); 3518 (unsigned int) (args[1] * fheight));
3498 break; 3519 break;
3499 3520
3500 //case 9: NYI, TODO, restore maximized window or maximize window 3521 //case 9: NYI, TODO, restore maximized window or maximize window
3501 default: 3522 default:
3502 if (args[0] >= 24) /* set height (chars) */ 3523 if (args[0] >= 24) /* set height (chars) */
3503 set_widthheight ((unsigned int)TermWin.width, 3524 set_widthheight ((unsigned int)width,
3504 (unsigned int) (args[1] * TermWin.fheight)); 3525 (unsigned int) (args[1] * fheight));
3505 break; 3526 break;
3506 3527
3507 3528
3508 /* 3529 /*
3509 * reports - some output format copied from XTerm 3530 * reports - some output format copied from XTerm
3510 */ 3531 */
3511 case 11: /* report window state */ 3532 case 11: /* report window state */
3512 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3533 XGetWindowAttributes (disp, parent[0], &wattr);
3513 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3534 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3514 break; 3535 break;
3515 case 13: /* report window position */ 3536 case 13: /* report window position */
3516 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3537 XGetWindowAttributes (disp, parent[0], &wattr);
3517 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3538 XTranslateCoordinates (disp, parent[0], wattr.root,
3518 -wattr.border_width, -wattr.border_width, 3539 -wattr.border_width, -wattr.border_width,
3519 &x, &y, &wdummy); 3540 &x, &y, &wdummy);
3520 tt_printf ("\033[3;%d;%dt", x, y); 3541 tt_printf ("\033[3;%d;%dt", x, y);
3521 break; 3542 break;
3522 case 14: /* report window size (pixels) */ 3543 case 14: /* report window size (pixels) */
3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3544 XGetWindowAttributes (disp, parent[0], &wattr);
3524 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3545 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3525 break; 3546 break;
3526 case 18: /* report text area size (chars) */ 3547 case 18: /* report text area size (chars) */
3527 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3548 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3528 break; 3549 break;
3529 case 19: /* report window size (chars) */ 3550 case 19: /* report window size (chars) */
3530 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3551 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3531 break; 3552 break;
3532 case 20: /* report icon label */ 3553 case 20: /* report icon label */
3533 { 3554 {
3534 char *s; 3555 char *s;
3535 XGetIconName (disp, TermWin.parent[0], &s); 3556 XGetIconName (disp, parent[0], &s);
3536 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3557 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3537 XFree (s); 3558 XFree (s);
3538 } 3559 }
3539 break; 3560 break;
3540 case 21: /* report window title */ 3561 case 21: /* report window title */
3541 { 3562 {
3542 char *s; 3563 char *s;
3543 XFetchName (disp, TermWin.parent[0], &s); 3564 XFetchName (disp, parent[0], &s);
3544 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3565 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3545 XFree (s); 3566 XFree (s);
3546 } 3567 }
3547 break; 3568 break;
3548 } 3569 }
… …
3581 else if (ch < 0x20) 3602 else if (ch < 0x20)
3582 return NULL; /* other control character - exit */ 3603 return NULL; /* other control character - exit */
3583 3604
3584 seen_esc = false; 3605 seen_esc = false;
3585 3606
3586 if (n >= sizeof (string) - 1) 3607 if (n >= STRING_MAX - 1)
3587 // stop at some sane length 3608 // stop at some sane length
3588 return NULL; 3609 return NULL;
3589 3610
3590 if (ch == C0_SYN) 3611 if (ch == C0_SYN)
3591 string[n++] = cmd_get8 (); 3612 string[n++] = cmd_get8 ();
… …
3659 set_window_color (color, str); 3680 set_window_color (color, str);
3660} 3681}
3661 3682
3662/* 3683/*
3663 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3684 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3664 * 0 = change iconName/title
3665 * 1 = change iconName
3666 * 2 = change title
3667 * 4 = change color
3668 * 10 = change fg color
3669 * 11 = change bg color
3670 * 12 = change text color
3671 * 13 = change mouse foreground color
3672 * 17 = change highlight character colour
3673 * 18 = change bold character color
3674 * 19 = change underlined character color
3675 * 46 = change logfile (not implemented)
3676 * 50 = change font
3677 *
3678 * rxvt extensions:
3679 * 20 = bg pixmap
3680 * 39 = change default fg color
3681 * 49 = change default bg color
3682 * 55 = dump scrollback buffer and all of screen
3683 * 701 = change locale
3684 * 702 = find font
3685 * 703 = menu
3686 */ 3685 */
3687void 3686void
3688rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3687rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3689{ 3688{
3690 int changed = 0; 3689 int changed = 0;
… …
3716 unsigned long bytes_after; 3715 unsigned long bytes_after;
3717 unsigned char *value = 0; 3716 unsigned char *value = 0;
3718 const char *str = ""; 3717 const char *str = "";
3719 3718
3720 if (prop 3719 if (prop
3721 && XGetWindowProperty (disp, TermWin.parent[0], 3720 && XGetWindowProperty (disp, parent[0],
3722 prop, 0, 1<<16, 0, AnyPropertyType, 3721 prop, 0, 1<<16, 0, AnyPropertyType,
3723 &actual_type, &actual_format, 3722 &actual_type, &actual_format,
3724 &nitems, &bytes_after, &value) == Success 3723 &nitems, &bytes_after, &value) == Success
3725 && actual_type != None 3724 && actual_type != None
3726 && actual_format == 8) 3725 && actual_format == 8)
… …
3738 { 3737 {
3739 *eq = 0; 3738 *eq = 0;
3740 set_utf8_property (display->atom (str), eq + 1); 3739 set_utf8_property (display->atom (str), eq + 1);
3741 } 3740 }
3742 else 3741 else
3743 XDeleteProperty (disp, TermWin.parent[0], 3742 XDeleteProperty (disp, parent[0],
3744 display->atom (str)); 3743 display->atom (str));
3745 } 3744 }
3746 break; 3745 break;
3747 3746
3748 case XTerm_Color: 3747 case XTerm_Color:
… …
3789 break; 3788 break;
3790#ifndef NO_BOLD_UNDERLINE_REVERSE 3789#ifndef NO_BOLD_UNDERLINE_REVERSE
3791 case XTerm_Color_BD: 3790 case XTerm_Color_BD:
3792 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3791 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3793 break; 3792 break;
3794 case XTerm_Color_IT:
3795 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3796 break;
3797 case XTerm_Color_UL: 3793 case XTerm_Color_UL:
3798 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3794 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3799 break; 3795 break;
3800 case XTerm_Color_RV: 3796 case XTerm_Color_RV:
3801 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3797 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3802 break; 3798 break;
3799 case URxvt_Color_IT:
3800 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3801 break;
3803#endif 3802#endif
3804#if TRANSPARENT && TINTING 3803#if TRANSPARENT && TINTING
3805 case XTerm_Color_tint: 3804 case URxvt_Color_tint:
3806 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3805 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3807 check_our_parents (); 3806 check_our_parents ();
3808 if (am_transparent) 3807 if (am_transparent)
3809 want_full_refresh = want_refresh = 1; 3808 want_full_refresh = want_refresh = 1;
3810 break; 3809 break;
3811#endif 3810#endif
… …
3845 3844
3846 case XTerm_logfile: 3845 case XTerm_logfile:
3847 // TODO, when secure mode? 3846 // TODO, when secure mode?
3848 break; 3847 break;
3849 3848
3849#ifdef MENUBAR
3850 case URxvt_Menu:
3851 if (options & Opt_insecure)
3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3853 break;
3854#endif
3855#if 0
3856 case XTerm_dumpscreen: /* no error notices */
3857 {
3858 int fd;
3859 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3860 {
3861 scr_dump (fd);
3862 close (fd);
3863 }
3864 }
3865 break;
3866#endif
3850 case XTerm_font: 3867 case XTerm_font:
3851 op = URxvt_font; 3868 op = URxvt_font;
3852 case URxvt_font: 3869 case URxvt_font:
3853#if ENABLE_STYLES 3870#if ENABLE_STYLES
3854 case URxvt_boldFont: 3871 case URxvt_boldFont:
3855 case URxvt_italicFont: 3872 case URxvt_italicFont:
3856 case URxvt_boldItalicFont: 3873 case URxvt_boldItalicFont:
3857#endif 3874#endif
3858 if (query) 3875 if (query)
3859 tt_printf ("\33]%d;%-.250s%c", saveop, 3876 tt_printf ("\33]%d;%-.250s%c", saveop,
3860 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3877 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3861 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3878 ? fontset[op - URxvt_font]->fontdesc : "",
3862 resp); 3879 resp);
3863 else 3880 else
3864 { 3881 {
3865 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3882 const char *&res = rs[Rs_font + (op - URxvt_font)];
3866 3883
… …
3869 set_fonts (); 3886 set_fonts ();
3870 } 3887 }
3871 break; 3888 break;
3872 3889
3873#if ENABLE_FRILLS 3890#if ENABLE_FRILLS
3874 case XTerm_locale: 3891 case URxvt_locale:
3875 if (query) 3892 if (query)
3876 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3893 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3877 else 3894 else
3878 { 3895 {
3879 set_locale (str); 3896 set_locale (str);
3880 pty.set_utf8_mode (enc_utf8); 3897 pty.set_utf8_mode (enc_utf8);
3881# ifdef USE_XIM
3882 im_cb (); 3898 init_xlocale ();
3883# endif
3884 } 3899 }
3885 break; 3900 break;
3886#endif
3887 3901
3888#ifdef MENUBAR 3902 case URxvt_view_up:
3889 case XTerm_Menu: 3903 case URxvt_view_down:
3890 if (options & Opt_insecure) 3904 int lines = atoi (str);
3891 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3905
3892 break; 3906 if (lines)
3893#endif 3907 scr_page (op == URxvt_view_up ? UP : DN, lines);
3894#if 0
3895 case XTerm_dumpscreen: /* no error notices */
3896 { 3908 else
3897 int fd;
3898 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3899 { 3909 {
3900 scr_dump (fd); 3910 scr_erase_savelines ();
3901 close (fd);
3902 } 3911 }
3903 } 3912
3904 break; 3913 break;
3905#endif 3914#endif
3906 } 3915 }
3907} 3916}
3908/*----------------------------------------------------------------------*/ 3917/*----------------------------------------------------------------------*/
… …
4041 */ 4050 */
4042 PrivMode (1, PrivMode_vt52); 4051 PrivMode (1, PrivMode_vt52);
4043 break; 4052 break;
4044 case 3: /* 80/132 */ 4053 case 3: /* 80/132 */
4045 if (priv_modes & PrivMode_132OK) 4054 if (priv_modes & PrivMode_132OK)
4046 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4055 set_widthheight (((state ? 132 : 80) * fwidth), height);
4047 break; 4056 break;
4048 case 4: /* smooth scrolling */ 4057 case 4: /* smooth scrolling */
4049 if (state) 4058 if (state)
4050 options &= ~Opt_jumpScroll; 4059 options &= ~Opt_jumpScroll;
4051 else 4060 else
… …
4368 } 4377 }
4369 4378
4370 memmove (v_buffer, v_buffer + written, v_buflen); 4379 memmove (v_buffer, v_buffer + written, v_buflen);
4371 } 4380 }
4372 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4381 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4373 // original code just ignores this... 4382 pty_ev.set (EVENT_READ);
4374 destroy ();
4375} 4383}
4376 4384
4377/*----------------------- end-of-file (C source) -----------------------*/ 4385/*----------------------- end-of-file (C source) -----------------------*/
4378 4386

Diff Legend

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