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.196 by root, Thu Feb 17 12:23:39 2005 UTC vs.
Revision 1.210 by root, Tue Dec 20 20:58:31 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 (x < 0 || x >= ncol
141 || y < 0 || y >= TermWin.nrow) 141 || y < 0 || y >= 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 = save[y + saveLines - 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--;
… …
163void 164void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 165rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
165{ 166{
166 rxvt_fontset *fs = FONTSET (r); 167 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 168 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2; 169 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 170 int len;
171
172 fname = rxvt_utf8towcs (f->name);
170 173
171#if ENABLE_COMBINING 174#if ENABLE_COMBINING
172 if (IS_COMPOSE (ch)) 175 if (IS_COMPOSE (ch))
173 { 176 {
174 len = rxvt_composite.expand (ch, 0); 177 len = rxvt_composite.expand (ch, 0);
… …
183 alloc = 0; 186 alloc = 0;
184 chr = &ch2; 187 chr = &ch2;
185 len = 1; 188 len = 1;
186 } 189 }
187 190
188 int width = strlen (f->name); 191 int width = wcswidth (fname, wcslen (fname));
189 192
190 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 193 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
191 194
192 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 195 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193 196
… …
206#endif 209#endif
207 scr_overlay_set (11, y, ch, r); 210 scr_overlay_set (11, y, ch, r);
208 scr_overlay_set (12, y, NOCHAR, r); 211 scr_overlay_set (12, y, NOCHAR, r);
209 } 212 }
210 213
211 scr_overlay_set (0, len, f->name); 214 scr_overlay_set (0, len, fname);
215
216 free (fname);
212 217
213#if ENABLE_COMBINING 218#if ENABLE_COMBINING
214 if (alloc) 219 if (alloc)
215 delete [] alloc; 220 delete [] alloc;
216#endif 221#endif
… …
316 321
317 // the XOpenIM manpage lies about hardcoding the locale 322 // the XOpenIM manpage lies about hardcoding the locale
318 // at the point of XOpenIM, so temporarily switch locales 323 // at the point of XOpenIM, so temporarily switch locales
319 if (rs[Rs_imLocale]) 324 if (rs[Rs_imLocale])
320 SET_LOCALE (rs[Rs_imLocale]); 325 SET_LOCALE (rs[Rs_imLocale]);
326
321 // assume wchar_t == unicode or better 327 // assume wchar_t == unicode or better
322 len = XwcLookupString (Input_Context, &ev, wkbuf, 328 len = XwcLookupString (Input_Context, &ev, wkbuf,
323 KBUFSZ, &keysym, &status_return); 329 KBUFSZ, &keysym, &status_return);
330
324 if (rs[Rs_imLocale]) 331 if (rs[Rs_imLocale])
325 SET_LOCALE (locale); 332 SET_LOCALE (locale);
326 333
327 if (status_return == XLookupChars 334 if (status_return == XLookupChars
328 || status_return == XLookupBoth) 335 || status_return == XLookupBoth)
… …
360#ifdef KEYSYM_RESOURCE 367#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state)) 368 if (keyboard->dispatch (this, keysym, ev.state))
362 return; 369 return;
363#endif 370#endif
364 371
365 if (TermWin.saveLines) 372 if (saveLines)
366 { 373 {
367#ifdef UNSHIFTED_SCROLLKEYS 374#ifdef UNSHIFTED_SCROLLKEYS
368 if (!ctrl && !meta) 375 if (!ctrl && !meta)
369#else 376#else
370 if (IS_SCROLL_MOD) 377 if (IS_SCROLL_MOD)
371#endif 378#endif
372 { 379 {
373 int lnsppg; 380 int lnsppg;
374 381
375#ifdef PAGING_CONTEXT_LINES 382#ifdef PAGING_CONTEXT_LINES
376 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 383 lnsppg = nrow - PAGING_CONTEXT_LINES;
377#else 384#else
378 lnsppg = TermWin.nrow * 4 / 5; 385 lnsppg = nrow * 4 / 5;
379#endif 386#endif
380 if (keysym == XK_Prior) 387 if (keysym == XK_Prior)
381 { 388 {
382 scr_page (UP, lnsppg); 389 scr_page (UP, lnsppg);
383 return; 390 return;
… …
839 846
840 if (len <= 0) 847 if (len <= 0)
841 return; /* not mapped */ 848 return; /* not mapped */
842 849
843 if (options & Opt_scrollTtyKeypress) 850 if (options & Opt_scrollTtyKeypress)
844 if (TermWin.view_start) 851 if (view_start)
845 { 852 {
846 TermWin.view_start = 0; 853 view_start = 0;
847 want_refresh = 1; 854 want_refresh = 1;
848 } 855 }
849 856
850 /* 857 /*
851 * these modifications only affect the static keybuffer 858 * these modifications only affect the static keybuffer
… …
1028{ 1035{
1029 if (mouse_slip_wheel_speed == 0 1036 if (mouse_slip_wheel_speed == 0
1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1037 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1031 : scr_page (UP, mouse_slip_wheel_speed)) 1038 : scr_page (UP, mouse_slip_wheel_speed))
1032 { 1039 {
1033 if (TermWin.view_start == TermWin.nscrolled || 1040 if (view_start == nsaved ||
1034 TermWin.view_start == 0) 1041 view_start == 0)
1035 mouse_slip_wheel_speed = 0; 1042 mouse_slip_wheel_speed = 0;
1036 1043
1037 refresh_type |= SMOOTH_REFRESH; 1044 refresh_type |= SMOOTH_REFRESH;
1038 want_refresh = 1; 1045 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1046 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1086} 1093}
1087 1094
1088void 1095void
1089rxvt_term::pointer_unblank () 1096rxvt_term::pointer_unblank ()
1090{ 1097{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1098 XDefineCursor (display->display, vt, TermWin_cursor);
1092 recolour_cursor (); 1099 recolour_cursor ();
1093 1100
1094#ifdef POINTER_BLANK 1101#ifdef POINTER_BLANK
1095 hidden_pointer = 0; 1102 hidden_pointer = 0;
1096 1103
… …
1104rxvt_term::pointer_blank () 1111rxvt_term::pointer_blank ()
1105{ 1112{
1106 if (! (options & Opt_pointerBlank)) 1113 if (! (options & Opt_pointerBlank))
1107 return; 1114 return;
1108 1115
1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1116 XDefineCursor (display->display, vt, display->blank_cursor);
1110 XFlush (display->display); 1117 XFlush (display->display);
1111 1118
1112 hidden_pointer = 1; 1119 hidden_pointer = 1;
1113} 1120}
1114 1121
… …
1330 button_release (ev.xbutton); 1337 button_release (ev.xbutton);
1331 break; 1338 break;
1332 1339
1333 case ClientMessage: 1340 case ClientMessage:
1334 if (ev.xclient.format == 32 1341 if (ev.xclient.format == 32
1342 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1343 {
1335 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1344 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1336 destroy (); 1345 destroy ();
1346#if ENABLE_EWMH
1347 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1348 XSendEvent (disp, ev.xclient.window = display->root,
1349 False, SubstructureRedirectMask | SubstructureNotifyMask,
1350 &ev);
1351#endif
1352 }
1353#if ENABLE_XEMBED
1354 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1355 {
1356 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1357 focus_in ();
1358 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1359 focus_out ();
1360 }
1361#endif
1337#ifdef OFFIX_DND 1362#ifdef OFFIX_DND
1338 /* OffiX Dnd (drag 'n' drop) protocol */ 1363 /* OffiX Dnd (drag 'n' drop) protocol */
1339 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1364 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1340 && (ev.xclient.data.l[0] == DndFile 1365 && (ev.xclient.data.l[0] == DndFile
1341 || ev.xclient.data.l[0] == DndDir 1366 || ev.xclient.data.l[0] == DndDir
1342 || ev.xclient.data.l[0] == DndLink)) 1367 || ev.xclient.data.l[0] == DndLink))
1343 { 1368 {
1344 /* Get Dnd data */ 1369 /* Get Dnd data */
1345 Atom ActualType; 1370 Atom ActualType;
1346 int ActualFormat; 1371 int ActualFormat;
1347 unsigned char *data; 1372 unsigned char *data;
… …
1390 break; 1415 break;
1391 } 1416 }
1392 break; 1417 break;
1393 1418
1394 case FocusIn: 1419 case FocusIn:
1395 if (!TermWin.focus) 1420 focus_in ();
1421 break;
1422
1423 case FocusOut:
1424 focus_out ();
1425 break;
1426
1427 case ConfigureNotify:
1428 if (ev.xconfigure.window == parent[0])
1396 { 1429 {
1397 TermWin.focus = 1;
1398 want_refresh = 1;
1399#ifdef USE_XIM
1400 if (Input_Context != NULL)
1401 {
1402 IMSetStatusPosition ();
1403 XSetICFocus (Input_Context);
1404 }
1405#endif
1406#ifdef CURSOR_BLINK
1407 if (options & Opt_cursorBlink)
1408 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1409#endif
1410#ifdef OFF_FOCUS_FADING
1411 if (rs[Rs_fade])
1412 {
1413 pix_colors = pix_colors_focused;
1414 scr_recolour ();
1415 }
1416#endif
1417
1418 }
1419 break;
1420
1421 case FocusOut:
1422 if (TermWin.focus)
1423 {
1424 TermWin.focus = 0;
1425 want_refresh = 1;
1426
1427#if ENABLE_FRILLS || ISO_14755
1428 iso14755buf = 0;
1429#endif
1430#if ENABLE_OVERLAY
1431 scr_overlay_off ();
1432#endif
1433#ifdef USE_XIM
1434 if (Input_Context != NULL)
1435 XUnsetICFocus (Input_Context);
1436#endif
1437#ifdef CURSOR_BLINK
1438 if (options & Opt_cursorBlink)
1439 cursor_blink_ev.stop ();
1440 hidden_cursor = 0;
1441#endif
1442#ifdef OFF_FOCUS_FADING
1443 if (rs[Rs_fade])
1444 {
1445 pix_colors = pix_colors_unfocused;
1446 scr_recolour ();
1447 }
1448#endif
1449 }
1450 break;
1451
1452 case ConfigureNotify:
1453 if (ev.xconfigure.window == TermWin.parent[0])
1454 {
1455 int height, width;
1456
1457 do
1458 { /* Wrap lots of configures into one */
1459 width = ev.xconfigure.width;
1460 height = ev.xconfigure.height;
1461 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1462 }
1463 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1430 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ;
1464 1432
1465 if (szHint.width != width || szHint.height != height) 1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1466 { 1434 {
1467 seen_resize = 1; 1435 seen_resize = 1;
1468 resize_all_windows (width, height, 1); 1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1469 } 1437 }
1470 1438
1471#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1472 if (options & Opt_transparent) 1440 if (options & Opt_transparent)
1473 check_our_parents (); 1441 check_our_parents ();
… …
1494 case SelectionRequest: 1462 case SelectionRequest:
1495 selection_send (ev.xselectionrequest); 1463 selection_send (ev.xselectionrequest);
1496 break; 1464 break;
1497 1465
1498 case UnmapNotify: 1466 case UnmapNotify:
1499 TermWin.mapped = 0; 1467 mapped = 0;
1500#ifdef TEXT_BLINK 1468#ifdef TEXT_BLINK
1501 text_blink_ev.stop (); 1469 text_blink_ev.stop ();
1502#endif 1470#endif
1503 break; 1471 break;
1504 1472
1505 case MapNotify: 1473 case MapNotify:
1506 TermWin.mapped = 1; 1474 mapped = 1;
1507#ifdef TEXT_BLINK 1475#ifdef TEXT_BLINK
1508 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1476 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1509#endif 1477#endif
1510 break; 1478 break;
1511 1479
… …
1515 break; 1483 break;
1516#endif /* TRANSPARENT */ 1484#endif /* TRANSPARENT */
1517 1485
1518 case GraphicsExpose: 1486 case GraphicsExpose:
1519 case Expose: 1487 case Expose:
1520 if (ev.xany.window == TermWin.vt) 1488 if (ev.xany.window == vt)
1521 { 1489 {
1522 do 1490 do
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1491 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1492 ev.xexpose.width, ev.xexpose.height, False);
1525 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1493 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1526 1494
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1495 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528 1496
1529 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1497 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1498 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1499 ev.xexpose.width, ev.xexpose.height, False);
1532 1500
1533 scr_refresh (refresh_type); 1501 scr_refresh (refresh_type);
1534 } 1502 }
… …
1550 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1518 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1551 menubar_expose (); 1519 menubar_expose ();
1552#endif 1520#endif
1553 1521
1554#ifdef TRANSPARENT 1522#ifdef TRANSPARENT
1555 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1523 if (am_transparent && ev.xany.window == parent[0])
1556 XClearWindow (disp, ev.xany.window); 1524 XClearWindow (disp, ev.xany.window);
1557#endif 1525#endif
1558 } 1526 }
1559 break; 1527 break;
1560 1528
… …
1571 } 1539 }
1572#endif 1540#endif
1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1574 break; 1542 break;
1575 1543
1576 if (ev.xany.window == TermWin.vt) 1544 if (ev.xany.window == vt)
1577 { 1545 {
1578 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1546 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1579 { 1547 {
1580 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1548 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1581 ; 1549 ;
1582 1550
1583 XQueryPointer (disp, TermWin.vt, 1551 XQueryPointer (disp, vt,
1584 &unused_root, &unused_child, 1552 &unused_root, &unused_child,
1585 &unused_root_x, &unused_root_y, 1553 &unused_root_x, &unused_root_y,
1586 &ev.xbutton.x, &ev.xbutton.y, 1554 &ev.xbutton.x, &ev.xbutton.y,
1587 &ev.xbutton.state); 1555 &ev.xbutton.state);
1588#ifdef MOUSE_THRESHOLD 1556#ifdef MOUSE_THRESHOLD
… …
1600#endif 1568#endif
1601 selection_extend (ev.xbutton.x, ev.xbutton.y, 1569 selection_extend (ev.xbutton.x, ev.xbutton.y,
1602 ev.xbutton.state & Button3Mask ? 2 : 0); 1570 ev.xbutton.state & Button3Mask ? 2 : 0);
1603 1571
1604#ifdef SELECTION_SCROLLING 1572#ifdef SELECTION_SCROLLING
1605 if (ev.xbutton.y < TermWin.int_bwidth 1573 if (ev.xbutton.y < int_bwidth
1606 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1574 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1607 { 1575 {
1608 int dist; 1576 int dist;
1609 1577
1610 /* don't clobber the current delay if we are 1578 /* don't clobber the current delay if we are
1611 * already in the middle of scrolling. 1579 * already in the middle of scrolling.
… …
1619 selection_save_x = ev.xbutton.x; 1587 selection_save_x = ev.xbutton.x;
1620 selection_save_y = ev.xbutton.y; 1588 selection_save_y = ev.xbutton.y;
1621 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1589 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1622 1590
1623 /* calc number of lines to scroll */ 1591 /* calc number of lines to scroll */
1624 if (ev.xbutton.y < TermWin.int_bwidth) 1592 if (ev.xbutton.y < int_bwidth)
1625 { 1593 {
1626 scroll_selection_dir = UP; 1594 scroll_selection_dir = UP;
1627 dist = TermWin.int_bwidth - ev.xbutton.y; 1595 dist = int_bwidth - ev.xbutton.y;
1628 } 1596 }
1629 else 1597 else
1630 { 1598 {
1631 scroll_selection_dir = DN; 1599 scroll_selection_dir = DN;
1632 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1600 dist = ev.xbutton.y - (int_bwidth + height);
1633 } 1601 }
1634 1602
1635 scroll_selection_lines = Pixel2Height (dist) 1603 scroll_selection_lines = Pixel2Height (dist)
1636 / SELECTION_SCROLL_LINE_SPEEDUP 1604 / SELECTION_SCROLL_LINE_SPEEDUP
1637 + 1; 1605 + 1;
… …
1671 } 1639 }
1672 break; 1640 break;
1673 } 1641 }
1674} 1642}
1675 1643
1644void
1645rxvt_term::focus_in ()
1646{
1647 if (!focus)
1648 {
1649 focus = 1;
1650 want_refresh = 1;
1651#if USE_XIM
1652 if (Input_Context != NULL)
1653 {
1654 IMSetStatusPosition ();
1655 XSetICFocus (Input_Context);
1656 }
1657#endif
1658#if CURSOR_BLINK
1659 if (options & Opt_cursorBlink)
1660 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1661#endif
1662#if OFF_FOCUS_FADING
1663 if (rs[Rs_fade])
1664 {
1665 pix_colors = pix_colors_focused;
1666 scr_recolour ();
1667 }
1668#endif
1669 }
1670}
1671
1672void
1673rxvt_term::focus_out ()
1674{
1675 if (focus)
1676 {
1677 focus = 0;
1678 want_refresh = 1;
1679
1680#if ENABLE_FRILLS || ISO_14755
1681 iso14755buf = 0;
1682#endif
1683#if ENABLE_OVERLAY
1684 scr_overlay_off ();
1685#endif
1686#if USE_XIM
1687 if (Input_Context != NULL)
1688 XUnsetICFocus (Input_Context);
1689#endif
1690#if CURSOR_BLINK
1691 if (options & Opt_cursorBlink)
1692 cursor_blink_ev.stop ();
1693 hidden_cursor = 0;
1694#endif
1695#if OFF_FOCUS_FADING
1696 if (rs[Rs_fade])
1697 {
1698 pix_colors = pix_colors_unfocused;
1699 scr_recolour ();
1700 }
1701#endif
1702 }
1703}
1704
1676#if TRANSPARENT 1705#if TRANSPARENT
1677void 1706void
1678rxvt_term::rootwin_cb (XEvent &ev) 1707rxvt_term::rootwin_cb (XEvent &ev)
1679{ 1708{
1680 SET_R (this); 1709 SET_R (this);
… …
1710 reportmode = !! (priv_modes & PrivMode_mouse_report); 1739 reportmode = !! (priv_modes & PrivMode_mouse_report);
1711 1740
1712 /* 1741 /*
1713 * VT window processing of button press 1742 * VT window processing of button press
1714 */ 1743 */
1715 if (ev.window == TermWin.vt) 1744 if (ev.window == vt)
1716 { 1745 {
1717#if ISO_14755 1746#if ISO_14755
1718 // 5.4 1747 // 5.4
1719 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1748 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1720 { 1749 {
… …
1925 case Button3: 1954 case Button3:
1926 if (scrollBar.style != R_SB_XTERM) 1955 if (scrollBar.style != R_SB_XTERM)
1927 { 1956 {
1928 if (scrollbar_above_slider (ev.y)) 1957 if (scrollbar_above_slider (ev.y))
1929# ifdef RXVT_SCROLL_FULL 1958# ifdef RXVT_SCROLL_FULL
1930 scr_page (UP, TermWin.nrow - 1); 1959 scr_page (UP, nrow - 1);
1931# else 1960# else
1932 scr_page (UP, TermWin.nrow / 4); 1961 scr_page (UP, nrow / 4);
1933# endif 1962# endif
1934 else if (scrollbar_below_slider (ev.y)) 1963 else if (scrollbar_below_slider (ev.y))
1935# ifdef RXVT_SCROLL_FULL 1964# ifdef RXVT_SCROLL_FULL
1936 scr_page (DN, TermWin.nrow - 1); 1965 scr_page (DN, nrow - 1);
1937# else 1966# else
1938 scr_page (DN, TermWin.nrow / 4); 1967 scr_page (DN, nrow / 4);
1939# endif 1968# endif
1940 else 1969 else
1941 scrollBar.setMotion (); 1970 scrollBar.setMotion ();
1942 } 1971 }
1943 else 1972 else
1944 { 1973 {
1945 scr_page ((ev.button == Button1 ? DN : UP), 1974 scr_page ((ev.button == Button1 ? DN : UP),
1946 (TermWin.nrow 1975 (nrow
1947 * scrollbar_position (ev.y) 1976 * scrollbar_position (ev.y)
1948 / scrollbar_size ())); 1977 / scrollbar_size ()));
1949 } 1978 }
1950 1979
1951 break; 1980 break;
… …
1983#ifdef SELECTION_SCROLLING 2012#ifdef SELECTION_SCROLLING
1984 if (sel_scroll_ev.active) 2013 if (sel_scroll_ev.active)
1985 sel_scroll_ev.stop(); 2014 sel_scroll_ev.stop();
1986#endif 2015#endif
1987 2016
1988 if (ev.window == TermWin.vt) 2017 if (ev.window == vt)
1989 { 2018 {
1990#if ISO_14755 2019#if ISO_14755
1991 // 5.4 2020 // 5.4
1992 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2021 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1993 return; 2022 return;
… …
2044 v = ev.button == Button4 ? UP : DN; 2073 v = ev.button == Button4 ? UP : DN;
2045 2074
2046 if (ev.state & ShiftMask) 2075 if (ev.state & ShiftMask)
2047 i = 1; 2076 i = 1;
2048 else if (options & Opt_mouseWheelScrollPage) 2077 else if (options & Opt_mouseWheelScrollPage)
2049 i = TermWin.nrow - 1; 2078 i = nrow - 1;
2050 else 2079 else
2051 i = 5; 2080 i = 5;
2052 2081
2053# ifdef MOUSE_SLIP_WHEELING 2082# ifdef MOUSE_SLIP_WHEELING
2054 if (ev.state & ControlMask) 2083 if (ev.state & ControlMask)
2055 { 2084 {
2056 mouse_slip_wheel_speed += v ? -1 : 1; 2085 mouse_slip_wheel_speed += v ? -1 : 1;
2057 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2086 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2058 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2087 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2059 2088
2060 if (slip_wheel_ev.at < NOW) 2089 if (slip_wheel_ev.at < NOW)
2061 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2090 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2062 2091
2063 slip_wheel_ev.start (); 2092 slip_wheel_ev.start ();
… …
2345 return pchanged; /* Don't try any more */ 2374 return pchanged; /* Don't try any more */
2346 2375
2347 XGetWindowAttributes (disp, display->root, &wrootattr); 2376 XGetWindowAttributes (disp, display->root, &wrootattr);
2348 rootdepth = wrootattr.depth; 2377 rootdepth = wrootattr.depth;
2349 2378
2350 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2379 XGetWindowAttributes (disp, parent[0], &wattr);
2351 2380
2352 if (rootdepth != wattr.depth) 2381 if (rootdepth != wattr.depth)
2353 { 2382 {
2354 if (am_transparent) 2383 if (am_transparent)
2355 { 2384 {
2356 pchanged = 1; 2385 pchanged = 1;
2357 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2386 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2358 am_transparent = am_pixmap_trans = 0; 2387 am_transparent = am_pixmap_trans = 0;
2359 } 2388 }
2360 2389
2361 return pchanged; /* Don't try any more */ 2390 return pchanged; /* Don't try any more */
2362 } 2391 }
… …
2403 Window cr; 2432 Window cr;
2404 XImage *image; 2433 XImage *image;
2405 GC gc; 2434 GC gc;
2406 XGCValues gcvalue; 2435 XGCValues gcvalue;
2407 2436
2408 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2437 XTranslateCoordinates (disp, parent[0], display->root,
2409 0, 0, &sx, &sy, &cr); 2438 0, 0, &sx, &sy, &cr);
2410 nw = (unsigned int)szHint.width; 2439 nw = (unsigned int)szHint.width;
2411 nh = (unsigned int)szHint.height; 2440 nh = (unsigned int)szHint.height;
2412 nx = ny = 0; 2441 nx = ny = 0;
2413 2442
… …
2439 if (image == NULL) 2468 if (image == NULL)
2440 { 2469 {
2441 if (am_transparent && am_pixmap_trans) 2470 if (am_transparent && am_pixmap_trans)
2442 { 2471 {
2443 pchanged = 1; 2472 pchanged = 1;
2444 if (TermWin.pixmap != None) 2473 if (pixmap != None)
2445 { 2474 {
2446 XFreePixmap (disp, TermWin.pixmap); 2475 XFreePixmap (disp, pixmap);
2447 TermWin.pixmap = None; 2476 pixmap = None;
2448 } 2477 }
2449 } 2478 }
2450 2479
2451 am_pixmap_trans = 0; 2480 am_pixmap_trans = 0;
2452 } 2481 }
2453 else 2482 else
2454 { 2483 {
2455 if (TermWin.pixmap != None) 2484 if (pixmap != None)
2456 XFreePixmap (disp, TermWin.pixmap); 2485 XFreePixmap (disp, pixmap);
2457 2486
2458#if TINTING 2487#if TINTING
2459 if (ISSET_PIXCOLOR (Color_tint)) 2488 if (ISSET_PIXCOLOR (Color_tint))
2460 { 2489 {
2461 unsigned short rm, gm, bm; 2490 unsigned short rm, gm, bm;
… …
2465 2494
2466 ShadeXImage (display, image, shade, rm, gm, bm); 2495 ShadeXImage (display, image, shade, rm, gm, bm);
2467 } 2496 }
2468#endif 2497#endif
2469 2498
2470 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2499 pixmap = XCreatePixmap (disp, vt,
2471 szHint.width, szHint.height, image->depth); 2500 szHint.width, szHint.height, image->depth);
2472 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2501 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2473 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2502 XPutImage (disp, pixmap, gc, image, 0, 0,
2474 nx, ny, image->width, image->height); 2503 nx, ny, image->width, image->height);
2475 XFreeGC (disp, gc); 2504 XFreeGC (disp, gc);
2476 XDestroyImage (image); 2505 XDestroyImage (image);
2477 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2506 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2478 XClearWindow (disp, TermWin.parent[0]); 2507 XClearWindow (disp, parent[0]);
2479 2508
2480 if (!am_transparent || !am_pixmap_trans) 2509 if (!am_transparent || !am_pixmap_trans)
2481 pchanged = 1; 2510 pchanged = 1;
2482 2511
2483 am_transparent = am_pixmap_trans = 1; 2512 am_transparent = am_pixmap_trans = 1;
2484 } 2513 }
2485 } 2514 }
2486 2515
2487 if (am_pixmap_trans) 2516 if (am_pixmap_trans)
2488 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2517 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2489 else 2518 else
2490 { 2519 {
2491 unsigned int n; 2520 unsigned int n;
2492 /* 2521 /*
2493 * InheritPixmap transparency 2522 * InheritPixmap transparency
2494 */ 2523 */
2495 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2524 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2496 { 2525 {
2497 oldp = TermWin.parent[i]; 2526 oldp = parent[i];
2498 XQueryTree (disp, TermWin.parent[i - 1], &root, 2527 XQueryTree (disp, parent[i - 1], &root,
2499 &TermWin.parent[i], &list, &n); 2528 &parent[i], &list, &n);
2500 XFree (list); 2529 XFree (list);
2501 2530
2502 if (TermWin.parent[i] == display->root) 2531 if (parent[i] == display->root)
2503 { 2532 {
2504 if (oldp != None) 2533 if (oldp != None)
2505 pchanged = 1; 2534 pchanged = 1;
2506 2535
2507 break; 2536 break;
2508 } 2537 }
2509 2538
2510 if (oldp != TermWin.parent[i]) 2539 if (oldp != parent[i])
2511 pchanged = 1; 2540 pchanged = 1;
2512 } 2541 }
2513 2542
2514 n = 0; 2543 n = 0;
2515 2544
2516 if (pchanged) 2545 if (pchanged)
2517 { 2546 {
2518 for (; n < (unsigned int)i; n++) 2547 for (; n < (unsigned int)i; n++)
2519 { 2548 {
2520 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2549 XGetWindowAttributes (disp, parent[n], &wattr);
2521 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2550 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2522 { 2551 {
2523 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2552 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2524 break; 2553 break;
2525 } 2554 }
2526 } 2555 }
2527 } 2556 }
2528 2557
2529 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2558 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2530 { 2559 {
2531 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2560 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2532 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2561 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2533 am_transparent = 0; 2562 am_transparent = 0;
2534 /* XXX: also turn off Opt_transparent? */ 2563 /* XXX: also turn off Opt_transparent? */
2535 } 2564 }
2536 else 2565 else
2537 { 2566 {
… …
2540 * needed for fvwm2.2.2 (and before?) */ 2569 * needed for fvwm2.2.2 (and before?) */
2541 sleep (1); 2570 sleep (1);
2542#endif 2571#endif
2543 for (n = 0; n < (unsigned int)i; n++) 2572 for (n = 0; n < (unsigned int)i; n++)
2544 { 2573 {
2545 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2574 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2546 XClearWindow (disp, TermWin.parent[n]); 2575 XClearWindow (disp, parent[n]);
2547 } 2576 }
2548 2577
2549 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2578 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2550 am_transparent = 1; 2579 am_transparent = 1;
2551 } 2580 }
2552 2581
2553 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2582 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2554 TermWin.parent[i] = None; 2583 parent[i] = None;
2555 } 2584 }
2556 2585
2557 if (scrollBar.win) 2586 if (scrollBar.win)
2558 { 2587 {
2559 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2588 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2602 // some window managers resize the window early, and these programs 2631 // some window managers resize the window early, and these programs
2603 // then sometimes get the size wrong. 2632 // then sometimes get the size wrong.
2604 // unfortunately other programs are even more buggy and dislike 2633 // unfortunately other programs are even more buggy and dislike
2605 // being sent SIGWINCH, so only do it when we were in fact being 2634 // being sent SIGWINCH, so only do it when we were in fact being
2606 // resized. 2635 // resized.
2607 if (seen_resize) 2636 if (seen_resize && cmd_pid)
2608 kill (-cmd_pid, SIGWINCH); 2637 kill (-cmd_pid, SIGWINCH);
2609 } 2638 }
2610 2639
2611 /* Read a text string from the input buffer */ 2640 /* Read a text string from the input buffer */
2612 unicode_t buf[UBUFSIZ]; 2641 unicode_t buf[UBUFSIZ];
2613 bool refreshnow = false; 2642 bool refreshnow = false;
2614 int nlines = 0; 2643 int nlines = 0;
2615 unicode_t *str = buf; 2644 unicode_t *str = buf;
2645 unicode_t *eol = str + min (ncol, UBUFSIZ);
2616 2646
2617 for (;;) 2647 for (;;)
2618 { 2648 {
2619 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2649 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2620 break; 2650 break;
2621 2651
2622 *str++ = ch; 2652 *str++ = ch;
2623 2653
2624 if (ch == C0_LF) 2654 if (ch == C0_LF || str >= eol)
2625 { 2655 {
2656 if (ch == C0_LF)
2626 nlines++; 2657 nlines++;
2658
2627 refresh_count++; 2659 refresh_count++;
2628 2660
2629 if (!(options & Opt_jumpScroll) 2661 if (!(options & Opt_jumpScroll)
2630 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2662 || (refresh_count >= refresh_limit * (nrow - 1)))
2631 { 2663 {
2632 refreshnow = true; 2664 refreshnow = true;
2633 ch = NOCHAR; 2665 ch = NOCHAR;
2634 break; 2666 break;
2635 } 2667 }
2636 2668
2637 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2669 // scr_add_lines only works for nlines <= nrow - 1.
2638 if (nlines >= TermWin.nrow - 1) 2670 if (nlines >= nrow - 1)
2639 { 2671 {
2640 scr_add_lines (buf, nlines, str - buf); 2672 scr_add_lines (buf, nlines, str - buf);
2641 nlines = 0; 2673 nlines = 0;
2642 str = buf; 2674 str = buf;
2675 eol = str + min (ncol, UBUFSIZ);
2643 } 2676 }
2644 }
2645 2677
2646 if (str >= buf + UBUFSIZ) 2678 if (str >= eol)
2647 { 2679 {
2680 if (eol >= buf + UBUFSIZ)
2681 {
2648 ch = NOCHAR; 2682 ch = NOCHAR;
2649 break; 2683 break;
2684 }
2685 else
2686 eol = min (eol + ncol, buf + UBUFSIZ);
2687 }
2688
2650 } 2689 }
2651 2690
2652 seq_begin = cmdbuf_ptr; 2691 seq_begin = cmdbuf_ptr;
2653 ch = next_char (); 2692 ch = next_char ();
2654 } 2693 }
… …
3313 3352
3314 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3353 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3315 arg[0] = -arg[0]; 3354 arg[0] = -arg[0];
3316 /* FALLTHROUGH */ 3355 /* FALLTHROUGH */
3317 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3356 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3318 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3357 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3319 break; 3358 break;
3320 3359
3321 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3360 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3322 tt_write ((const unsigned char *)VT100_ANS, 3361 tt_write ((const unsigned char *)VT100_ANS,
3323 (unsigned int) (sizeof (VT100_ANS) - 1)); 3362 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3448 { 3487 {
3449 /* 3488 /*
3450 * commands 3489 * commands
3451 */ 3490 */
3452 case 1: /* deiconify window */ 3491 case 1: /* deiconify window */
3453 XMapWindow (disp, TermWin.parent[0]); 3492 XMapWindow (disp, parent[0]);
3454 break; 3493 break;
3455 case 2: /* iconify window */ 3494 case 2: /* iconify window */
3456 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3495 XIconifyWindow (disp, parent[0], display->screen);
3457 break; 3496 break;
3458 case 3: /* set position (pixels) */ 3497 case 3: /* set position (pixels) */
3459 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3498 XMoveWindow (disp, parent[0], args[1], args[2]);
3460 break; 3499 break;
3461 case 4: /* set size (pixels) */ 3500 case 4: /* set size (pixels) */
3462 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3501 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3463 break; 3502 break;
3464 case 5: /* raise window */ 3503 case 5: /* raise window */
3465 XRaiseWindow (disp, TermWin.parent[0]); 3504 XRaiseWindow (disp, parent[0]);
3466 break; 3505 break;
3467 case 6: /* lower window */ 3506 case 6: /* lower window */
3468 XLowerWindow (disp, TermWin.parent[0]); 3507 XLowerWindow (disp, parent[0]);
3469 break; 3508 break;
3470 case 7: /* refresh window */ 3509 case 7: /* refresh window */
3471 scr_touch (true); 3510 scr_touch (true);
3472 break; 3511 break;
3473 case 8: /* set size (chars) */ 3512 case 8: /* set size (chars) */
3474 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3513 set_widthheight ((unsigned int) (args[2] * fwidth),
3475 (unsigned int) (args[1] * TermWin.fheight)); 3514 (unsigned int) (args[1] * fheight));
3476 break; 3515 break;
3477 3516
3478 //case 9: NYI, TODO, restore maximized window or maximize window 3517 //case 9: NYI, TODO, restore maximized window or maximize window
3479 default: 3518 default:
3480 if (args[0] >= 24) /* set height (chars) */ 3519 if (args[0] >= 24) /* set height (chars) */
3481 set_widthheight ((unsigned int)TermWin.width, 3520 set_widthheight ((unsigned int)width,
3482 (unsigned int) (args[1] * TermWin.fheight)); 3521 (unsigned int) (args[1] * fheight));
3483 break; 3522 break;
3484 3523
3485 3524
3486 /* 3525 /*
3487 * reports - some output format copied from XTerm 3526 * reports - some output format copied from XTerm
3488 */ 3527 */
3489 case 11: /* report window state */ 3528 case 11: /* report window state */
3490 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3529 XGetWindowAttributes (disp, parent[0], &wattr);
3491 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3530 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3492 break; 3531 break;
3493 case 13: /* report window position */ 3532 case 13: /* report window position */
3494 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3533 XGetWindowAttributes (disp, parent[0], &wattr);
3495 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3534 XTranslateCoordinates (disp, parent[0], wattr.root,
3496 -wattr.border_width, -wattr.border_width, 3535 -wattr.border_width, -wattr.border_width,
3497 &x, &y, &wdummy); 3536 &x, &y, &wdummy);
3498 tt_printf ("\033[3;%d;%dt", x, y); 3537 tt_printf ("\033[3;%d;%dt", x, y);
3499 break; 3538 break;
3500 case 14: /* report window size (pixels) */ 3539 case 14: /* report window size (pixels) */
3501 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3540 XGetWindowAttributes (disp, parent[0], &wattr);
3502 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3541 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3503 break; 3542 break;
3504 case 18: /* report text area size (chars) */ 3543 case 18: /* report text area size (chars) */
3505 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3544 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3506 break; 3545 break;
3507 case 19: /* report window size (chars) */ 3546 case 19: /* report window size (chars) */
3508 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3547 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3509 break; 3548 break;
3510 case 20: /* report icon label */ 3549 case 20: /* report icon label */
3511 { 3550 {
3512 char *s; 3551 char *s;
3513 XGetIconName (disp, TermWin.parent[0], &s); 3552 XGetIconName (disp, parent[0], &s);
3514 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3553 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3515 XFree (s); 3554 XFree (s);
3516 } 3555 }
3517 break; 3556 break;
3518 case 21: /* report window title */ 3557 case 21: /* report window title */
3519 { 3558 {
3520 char *s; 3559 char *s;
3521 XFetchName (disp, TermWin.parent[0], &s); 3560 XFetchName (disp, parent[0], &s);
3522 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3561 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3523 XFree (s); 3562 XFree (s);
3524 } 3563 }
3525 break; 3564 break;
3526 } 3565 }
… …
3559 else if (ch < 0x20) 3598 else if (ch < 0x20)
3560 return NULL; /* other control character - exit */ 3599 return NULL; /* other control character - exit */
3561 3600
3562 seen_esc = false; 3601 seen_esc = false;
3563 3602
3564 if (n >= sizeof (string) - 1) 3603 if (n >= STRING_MAX - 1)
3565 // stop at some sane length 3604 // stop at some sane length
3566 return NULL; 3605 return NULL;
3567 3606
3568 if (ch == C0_SYN) 3607 if (ch == C0_SYN)
3569 string[n++] = cmd_get8 (); 3608 string[n++] = cmd_get8 ();
… …
3637 set_window_color (color, str); 3676 set_window_color (color, str);
3638} 3677}
3639 3678
3640/* 3679/*
3641 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3680 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3642 * 0 = change iconName/title
3643 * 1 = change iconName
3644 * 2 = change title
3645 * 4 = change color
3646 * 10 = change fg color
3647 * 11 = change bg color
3648 * 12 = change text color
3649 * 13 = change mouse foreground color
3650 * 17 = change highlight character colour
3651 * 18 = change bold character color
3652 * 19 = change underlined character color
3653 * 46 = change logfile (not implemented)
3654 * 50 = change font
3655 *
3656 * rxvt extensions:
3657 * 20 = bg pixmap
3658 * 39 = change default fg color
3659 * 49 = change default bg color
3660 * 55 = dump scrollback buffer and all of screen
3661 * 701 = change locale
3662 * 702 = find font
3663 * 703 = menu
3664 */ 3681 */
3665void 3682void
3666rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3683rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3667{ 3684{
3668 int changed = 0; 3685 int changed = 0;
… …
3694 unsigned long bytes_after; 3711 unsigned long bytes_after;
3695 unsigned char *value = 0; 3712 unsigned char *value = 0;
3696 const char *str = ""; 3713 const char *str = "";
3697 3714
3698 if (prop 3715 if (prop
3699 && XGetWindowProperty (disp, TermWin.parent[0], 3716 && XGetWindowProperty (disp, parent[0],
3700 prop, 0, 1<<16, 0, AnyPropertyType, 3717 prop, 0, 1<<16, 0, AnyPropertyType,
3701 &actual_type, &actual_format, 3718 &actual_type, &actual_format,
3702 &nitems, &bytes_after, &value) == Success 3719 &nitems, &bytes_after, &value) == Success
3703 && actual_type != None 3720 && actual_type != None
3704 && actual_format == 8) 3721 && actual_format == 8)
… …
3716 { 3733 {
3717 *eq = 0; 3734 *eq = 0;
3718 set_utf8_property (display->atom (str), eq + 1); 3735 set_utf8_property (display->atom (str), eq + 1);
3719 } 3736 }
3720 else 3737 else
3721 XDeleteProperty (disp, TermWin.parent[0], 3738 XDeleteProperty (disp, parent[0],
3722 display->atom (str)); 3739 display->atom (str));
3723 } 3740 }
3724 break; 3741 break;
3725 3742
3726 case XTerm_Color: 3743 case XTerm_Color:
… …
3767 break; 3784 break;
3768#ifndef NO_BOLD_UNDERLINE_REVERSE 3785#ifndef NO_BOLD_UNDERLINE_REVERSE
3769 case XTerm_Color_BD: 3786 case XTerm_Color_BD:
3770 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3787 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3771 break; 3788 break;
3772 case XTerm_Color_IT:
3773 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3774 break;
3775 case XTerm_Color_UL: 3789 case XTerm_Color_UL:
3776 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3790 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3777 break; 3791 break;
3778 case XTerm_Color_RV: 3792 case XTerm_Color_RV:
3779 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3793 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3780 break; 3794 break;
3795 case URxvt_Color_IT:
3796 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3797 break;
3781#endif 3798#endif
3782#if TRANSPARENT && TINTING 3799#if TRANSPARENT && TINTING
3783 case XTerm_Color_tint: 3800 case URxvt_Color_tint:
3784 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3801 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3785 check_our_parents (); 3802 check_our_parents ();
3786 if (am_transparent) 3803 if (am_transparent)
3787 want_full_refresh = want_refresh = 1; 3804 want_full_refresh = want_refresh = 1;
3788 break; 3805 break;
3789#endif 3806#endif
… …
3823 3840
3824 case XTerm_logfile: 3841 case XTerm_logfile:
3825 // TODO, when secure mode? 3842 // TODO, when secure mode?
3826 break; 3843 break;
3827 3844
3845#ifdef MENUBAR
3846 case URxvt_Menu:
3847 if (options & Opt_insecure)
3848 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3849 break;
3850#endif
3851#if 0
3852 case XTerm_dumpscreen: /* no error notices */
3853 {
3854 int fd;
3855 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3856 {
3857 scr_dump (fd);
3858 close (fd);
3859 }
3860 }
3861 break;
3862#endif
3828 case XTerm_font: 3863 case XTerm_font:
3829 op = URxvt_font; 3864 op = URxvt_font;
3830 case URxvt_font: 3865 case URxvt_font:
3831#if ENABLE_STYLES 3866#if ENABLE_STYLES
3832 case URxvt_boldFont: 3867 case URxvt_boldFont:
3833 case URxvt_italicFont: 3868 case URxvt_italicFont:
3834 case URxvt_boldItalicFont: 3869 case URxvt_boldItalicFont:
3835#endif 3870#endif
3836 if (query) 3871 if (query)
3837 tt_printf ("\33]%d;%-.250s%c", saveop, 3872 tt_printf ("\33]%d;%-.250s%c", saveop,
3838 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3873 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3839 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3874 ? fontset[op - URxvt_font]->fontdesc : "",
3840 resp); 3875 resp);
3841 else 3876 else
3842 { 3877 {
3843 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3878 const char *&res = rs[Rs_font + (op - URxvt_font)];
3844 3879
… …
3847 set_fonts (); 3882 set_fonts ();
3848 } 3883 }
3849 break; 3884 break;
3850 3885
3851#if ENABLE_FRILLS 3886#if ENABLE_FRILLS
3852 case XTerm_locale: 3887 case URxvt_locale:
3853 if (query) 3888 if (query)
3854 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3889 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3855 else 3890 else
3856 { 3891 {
3857 set_locale (str); 3892 set_locale (str);
3858 pty.set_utf8_mode (enc_utf8); 3893 pty.set_utf8_mode (enc_utf8);
3859# ifdef USE_XIM
3860 im_cb (); 3894 init_xlocale ();
3861# endif
3862 } 3895 }
3863 break; 3896 break;
3864#endif
3865 3897
3866#ifdef MENUBAR 3898 case URxvt_view_up:
3867 case XTerm_Menu: 3899 case URxvt_view_down:
3868 if (options & Opt_insecure) 3900 int lines = atoi (str);
3869 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3901
3870 break; 3902 if (lines)
3871#endif 3903 scr_page (op == URxvt_view_up ? UP : DN, lines);
3872#if 0
3873 case XTerm_dumpscreen: /* no error notices */
3874 { 3904 else
3875 int fd;
3876 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3877 { 3905 {
3878 scr_dump (fd); 3906 scr_erase_savelines ();
3879 close (fd);
3880 } 3907 }
3881 } 3908
3882 break; 3909 break;
3883#endif 3910#endif
3884 } 3911 }
3885} 3912}
3886/*----------------------------------------------------------------------*/ 3913/*----------------------------------------------------------------------*/
… …
4019 */ 4046 */
4020 PrivMode (1, PrivMode_vt52); 4047 PrivMode (1, PrivMode_vt52);
4021 break; 4048 break;
4022 case 3: /* 80/132 */ 4049 case 3: /* 80/132 */
4023 if (priv_modes & PrivMode_132OK) 4050 if (priv_modes & PrivMode_132OK)
4024 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4051 set_widthheight (((state ? 132 : 80) * fwidth), height);
4025 break; 4052 break;
4026 case 4: /* smooth scrolling */ 4053 case 4: /* smooth scrolling */
4027 if (state) 4054 if (state)
4028 options &= ~Opt_jumpScroll; 4055 options &= ~Opt_jumpScroll;
4029 else 4056 else

Diff Legend

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