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.209 by root, Tue Dec 20 19:30:59 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
1335 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS] 1342 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1343 {
1336 && ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1344 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1337 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 }
1338#if ENABLE_XEMBED 1353#if ENABLE_XEMBED
1339 else if (ev.xclient.format == 32 1354 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1340 && ev.xclient.message_type == xa[XA_XEMBED])
1341 { 1355 {
1342 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) 1356 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1343 focus_in (); 1357 focus_in ();
1344 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1358 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1345 focus_out (); 1359 focus_out ();
… …
1409 case FocusOut: 1423 case FocusOut:
1410 focus_out (); 1424 focus_out ();
1411 break; 1425 break;
1412 1426
1413 case ConfigureNotify: 1427 case ConfigureNotify:
1414 if (ev.xconfigure.window == TermWin.parent[0]) 1428 if (ev.xconfigure.window == parent[0])
1415 { 1429 {
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)); 1430 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ;
1425 1432
1426 if (szHint.width != width || szHint.height != height) 1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1427 { 1434 {
1428 seen_resize = 1; 1435 seen_resize = 1;
1429 resize_all_windows (width, height, 1); 1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1430 } 1437 }
1431 1438
1432#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1433 if (options & Opt_transparent) 1440 if (options & Opt_transparent)
1434 check_our_parents (); 1441 check_our_parents ();
… …
1455 case SelectionRequest: 1462 case SelectionRequest:
1456 selection_send (ev.xselectionrequest); 1463 selection_send (ev.xselectionrequest);
1457 break; 1464 break;
1458 1465
1459 case UnmapNotify: 1466 case UnmapNotify:
1460 TermWin.mapped = 0; 1467 mapped = 0;
1461#ifdef TEXT_BLINK 1468#ifdef TEXT_BLINK
1462 text_blink_ev.stop (); 1469 text_blink_ev.stop ();
1463#endif 1470#endif
1464 break; 1471 break;
1465 1472
1466 case MapNotify: 1473 case MapNotify:
1467 TermWin.mapped = 1; 1474 mapped = 1;
1468#ifdef TEXT_BLINK 1475#ifdef TEXT_BLINK
1469 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1476 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1470#endif 1477#endif
1471 break; 1478 break;
1472 1479
… …
1476 break; 1483 break;
1477#endif /* TRANSPARENT */ 1484#endif /* TRANSPARENT */
1478 1485
1479 case GraphicsExpose: 1486 case GraphicsExpose:
1480 case Expose: 1487 case Expose:
1481 if (ev.xany.window == TermWin.vt) 1488 if (ev.xany.window == vt)
1482 { 1489 {
1483 do 1490 do
1484 scr_expose (ev.xexpose.x, ev.xexpose.y, 1491 scr_expose (ev.xexpose.x, ev.xexpose.y,
1485 ev.xexpose.width, ev.xexpose.height, False); 1492 ev.xexpose.width, ev.xexpose.height, False);
1486 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1493 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1487 1494
1488 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1495 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1489 1496
1490 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1497 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1491 scr_expose (ev.xexpose.x, ev.xexpose.y, 1498 scr_expose (ev.xexpose.x, ev.xexpose.y,
1492 ev.xexpose.width, ev.xexpose.height, False); 1499 ev.xexpose.width, ev.xexpose.height, False);
1493 1500
1494 scr_refresh (refresh_type); 1501 scr_refresh (refresh_type);
1495 } 1502 }
… …
1511 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1518 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1512 menubar_expose (); 1519 menubar_expose ();
1513#endif 1520#endif
1514 1521
1515#ifdef TRANSPARENT 1522#ifdef TRANSPARENT
1516 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1523 if (am_transparent && ev.xany.window == parent[0])
1517 XClearWindow (disp, ev.xany.window); 1524 XClearWindow (disp, ev.xany.window);
1518#endif 1525#endif
1519 } 1526 }
1520 break; 1527 break;
1521 1528
… …
1532 } 1539 }
1533#endif 1540#endif
1534 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1535 break; 1542 break;
1536 1543
1537 if (ev.xany.window == TermWin.vt) 1544 if (ev.xany.window == vt)
1538 { 1545 {
1539 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1546 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1540 { 1547 {
1541 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1548 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1542 ; 1549 ;
1543 1550
1544 XQueryPointer (disp, TermWin.vt, 1551 XQueryPointer (disp, vt,
1545 &unused_root, &unused_child, 1552 &unused_root, &unused_child,
1546 &unused_root_x, &unused_root_y, 1553 &unused_root_x, &unused_root_y,
1547 &ev.xbutton.x, &ev.xbutton.y, 1554 &ev.xbutton.x, &ev.xbutton.y,
1548 &ev.xbutton.state); 1555 &ev.xbutton.state);
1549#ifdef MOUSE_THRESHOLD 1556#ifdef MOUSE_THRESHOLD
… …
1561#endif 1568#endif
1562 selection_extend (ev.xbutton.x, ev.xbutton.y, 1569 selection_extend (ev.xbutton.x, ev.xbutton.y,
1563 ev.xbutton.state & Button3Mask ? 2 : 0); 1570 ev.xbutton.state & Button3Mask ? 2 : 0);
1564 1571
1565#ifdef SELECTION_SCROLLING 1572#ifdef SELECTION_SCROLLING
1566 if (ev.xbutton.y < TermWin.int_bwidth 1573 if (ev.xbutton.y < int_bwidth
1567 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1574 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1568 { 1575 {
1569 int dist; 1576 int dist;
1570 1577
1571 /* don't clobber the current delay if we are 1578 /* don't clobber the current delay if we are
1572 * already in the middle of scrolling. 1579 * already in the middle of scrolling.
… …
1580 selection_save_x = ev.xbutton.x; 1587 selection_save_x = ev.xbutton.x;
1581 selection_save_y = ev.xbutton.y; 1588 selection_save_y = ev.xbutton.y;
1582 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1589 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1583 1590
1584 /* calc number of lines to scroll */ 1591 /* calc number of lines to scroll */
1585 if (ev.xbutton.y < TermWin.int_bwidth) 1592 if (ev.xbutton.y < int_bwidth)
1586 { 1593 {
1587 scroll_selection_dir = UP; 1594 scroll_selection_dir = UP;
1588 dist = TermWin.int_bwidth - ev.xbutton.y; 1595 dist = int_bwidth - ev.xbutton.y;
1589 } 1596 }
1590 else 1597 else
1591 { 1598 {
1592 scroll_selection_dir = DN; 1599 scroll_selection_dir = DN;
1593 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1600 dist = ev.xbutton.y - (int_bwidth + height);
1594 } 1601 }
1595 1602
1596 scroll_selection_lines = Pixel2Height (dist) 1603 scroll_selection_lines = Pixel2Height (dist)
1597 / SELECTION_SCROLL_LINE_SPEEDUP 1604 / SELECTION_SCROLL_LINE_SPEEDUP
1598 + 1; 1605 + 1;
… …
1635} 1642}
1636 1643
1637void 1644void
1638rxvt_term::focus_in () 1645rxvt_term::focus_in ()
1639{ 1646{
1640 if (!TermWin.focus) 1647 if (!focus)
1641 { 1648 {
1642 TermWin.focus = 1; 1649 focus = 1;
1643 want_refresh = 1; 1650 want_refresh = 1;
1644#ifdef USE_XIM 1651#if USE_XIM
1645 if (Input_Context != NULL) 1652 if (Input_Context != NULL)
1646 { 1653 {
1647 IMSetStatusPosition (); 1654 IMSetStatusPosition ();
1648 XSetICFocus (Input_Context); 1655 XSetICFocus (Input_Context);
1649 } 1656 }
1650#endif 1657#endif
1651#ifdef CURSOR_BLINK 1658#if CURSOR_BLINK
1652 if (options & Opt_cursorBlink) 1659 if (options & Opt_cursorBlink)
1653 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1660 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1654#endif 1661#endif
1655#ifdef OFF_FOCUS_FADING 1662#if OFF_FOCUS_FADING
1656 if (rs[Rs_fade]) 1663 if (rs[Rs_fade])
1657 { 1664 {
1658 pix_colors = pix_colors_focused; 1665 pix_colors = pix_colors_focused;
1659 scr_recolour (); 1666 scr_recolour ();
1660 } 1667 }
… …
1663} 1670}
1664 1671
1665void 1672void
1666rxvt_term::focus_out () 1673rxvt_term::focus_out ()
1667{ 1674{
1668 if (TermWin.focus) 1675 if (focus)
1669 { 1676 {
1670 TermWin.focus = 0; 1677 focus = 0;
1671 want_refresh = 1; 1678 want_refresh = 1;
1672 1679
1673#if ENABLE_FRILLS || ISO_14755 1680#if ENABLE_FRILLS || ISO_14755
1674 iso14755buf = 0; 1681 iso14755buf = 0;
1675#endif 1682#endif
1676#if ENABLE_OVERLAY 1683#if ENABLE_OVERLAY
1677 scr_overlay_off (); 1684 scr_overlay_off ();
1678#endif 1685#endif
1679#ifdef USE_XIM 1686#if USE_XIM
1680 if (Input_Context != NULL) 1687 if (Input_Context != NULL)
1681 XUnsetICFocus (Input_Context); 1688 XUnsetICFocus (Input_Context);
1682#endif 1689#endif
1683#ifdef CURSOR_BLINK 1690#if CURSOR_BLINK
1684 if (options & Opt_cursorBlink) 1691 if (options & Opt_cursorBlink)
1685 cursor_blink_ev.stop (); 1692 cursor_blink_ev.stop ();
1686 hidden_cursor = 0; 1693 hidden_cursor = 0;
1687#endif 1694#endif
1688#ifdef OFF_FOCUS_FADING 1695#if OFF_FOCUS_FADING
1689 if (rs[Rs_fade]) 1696 if (rs[Rs_fade])
1690 { 1697 {
1691 pix_colors = pix_colors_unfocused; 1698 pix_colors = pix_colors_unfocused;
1692 scr_recolour (); 1699 scr_recolour ();
1693 } 1700 }
… …
1732 reportmode = !! (priv_modes & PrivMode_mouse_report); 1739 reportmode = !! (priv_modes & PrivMode_mouse_report);
1733 1740
1734 /* 1741 /*
1735 * VT window processing of button press 1742 * VT window processing of button press
1736 */ 1743 */
1737 if (ev.window == TermWin.vt) 1744 if (ev.window == vt)
1738 { 1745 {
1739#if ISO_14755 1746#if ISO_14755
1740 // 5.4 1747 // 5.4
1741 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1748 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1742 { 1749 {
… …
1947 case Button3: 1954 case Button3:
1948 if (scrollBar.style != R_SB_XTERM) 1955 if (scrollBar.style != R_SB_XTERM)
1949 { 1956 {
1950 if (scrollbar_above_slider (ev.y)) 1957 if (scrollbar_above_slider (ev.y))
1951# ifdef RXVT_SCROLL_FULL 1958# ifdef RXVT_SCROLL_FULL
1952 scr_page (UP, TermWin.nrow - 1); 1959 scr_page (UP, nrow - 1);
1953# else 1960# else
1954 scr_page (UP, TermWin.nrow / 4); 1961 scr_page (UP, nrow / 4);
1955# endif 1962# endif
1956 else if (scrollbar_below_slider (ev.y)) 1963 else if (scrollbar_below_slider (ev.y))
1957# ifdef RXVT_SCROLL_FULL 1964# ifdef RXVT_SCROLL_FULL
1958 scr_page (DN, TermWin.nrow - 1); 1965 scr_page (DN, nrow - 1);
1959# else 1966# else
1960 scr_page (DN, TermWin.nrow / 4); 1967 scr_page (DN, nrow / 4);
1961# endif 1968# endif
1962 else 1969 else
1963 scrollBar.setMotion (); 1970 scrollBar.setMotion ();
1964 } 1971 }
1965 else 1972 else
1966 { 1973 {
1967 scr_page ((ev.button == Button1 ? DN : UP), 1974 scr_page ((ev.button == Button1 ? DN : UP),
1968 (TermWin.nrow 1975 (nrow
1969 * scrollbar_position (ev.y) 1976 * scrollbar_position (ev.y)
1970 / scrollbar_size ())); 1977 / scrollbar_size ()));
1971 } 1978 }
1972 1979
1973 break; 1980 break;
… …
2005#ifdef SELECTION_SCROLLING 2012#ifdef SELECTION_SCROLLING
2006 if (sel_scroll_ev.active) 2013 if (sel_scroll_ev.active)
2007 sel_scroll_ev.stop(); 2014 sel_scroll_ev.stop();
2008#endif 2015#endif
2009 2016
2010 if (ev.window == TermWin.vt) 2017 if (ev.window == vt)
2011 { 2018 {
2012#if ISO_14755 2019#if ISO_14755
2013 // 5.4 2020 // 5.4
2014 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2021 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2015 return; 2022 return;
… …
2066 v = ev.button == Button4 ? UP : DN; 2073 v = ev.button == Button4 ? UP : DN;
2067 2074
2068 if (ev.state & ShiftMask) 2075 if (ev.state & ShiftMask)
2069 i = 1; 2076 i = 1;
2070 else if (options & Opt_mouseWheelScrollPage) 2077 else if (options & Opt_mouseWheelScrollPage)
2071 i = TermWin.nrow - 1; 2078 i = nrow - 1;
2072 else 2079 else
2073 i = 5; 2080 i = 5;
2074 2081
2075# ifdef MOUSE_SLIP_WHEELING 2082# ifdef MOUSE_SLIP_WHEELING
2076 if (ev.state & ControlMask) 2083 if (ev.state & ControlMask)
2077 { 2084 {
2078 mouse_slip_wheel_speed += v ? -1 : 1; 2085 mouse_slip_wheel_speed += v ? -1 : 1;
2079 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;
2080 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;
2081 2088
2082 if (slip_wheel_ev.at < NOW) 2089 if (slip_wheel_ev.at < NOW)
2083 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2090 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2084 2091
2085 slip_wheel_ev.start (); 2092 slip_wheel_ev.start ();
… …
2367 return pchanged; /* Don't try any more */ 2374 return pchanged; /* Don't try any more */
2368 2375
2369 XGetWindowAttributes (disp, display->root, &wrootattr); 2376 XGetWindowAttributes (disp, display->root, &wrootattr);
2370 rootdepth = wrootattr.depth; 2377 rootdepth = wrootattr.depth;
2371 2378
2372 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2379 XGetWindowAttributes (disp, parent[0], &wattr);
2373 2380
2374 if (rootdepth != wattr.depth) 2381 if (rootdepth != wattr.depth)
2375 { 2382 {
2376 if (am_transparent) 2383 if (am_transparent)
2377 { 2384 {
2378 pchanged = 1; 2385 pchanged = 1;
2379 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2386 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2380 am_transparent = am_pixmap_trans = 0; 2387 am_transparent = am_pixmap_trans = 0;
2381 } 2388 }
2382 2389
2383 return pchanged; /* Don't try any more */ 2390 return pchanged; /* Don't try any more */
2384 } 2391 }
… …
2425 Window cr; 2432 Window cr;
2426 XImage *image; 2433 XImage *image;
2427 GC gc; 2434 GC gc;
2428 XGCValues gcvalue; 2435 XGCValues gcvalue;
2429 2436
2430 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2437 XTranslateCoordinates (disp, parent[0], display->root,
2431 0, 0, &sx, &sy, &cr); 2438 0, 0, &sx, &sy, &cr);
2432 nw = (unsigned int)szHint.width; 2439 nw = (unsigned int)szHint.width;
2433 nh = (unsigned int)szHint.height; 2440 nh = (unsigned int)szHint.height;
2434 nx = ny = 0; 2441 nx = ny = 0;
2435 2442
… …
2461 if (image == NULL) 2468 if (image == NULL)
2462 { 2469 {
2463 if (am_transparent && am_pixmap_trans) 2470 if (am_transparent && am_pixmap_trans)
2464 { 2471 {
2465 pchanged = 1; 2472 pchanged = 1;
2466 if (TermWin.pixmap != None) 2473 if (pixmap != None)
2467 { 2474 {
2468 XFreePixmap (disp, TermWin.pixmap); 2475 XFreePixmap (disp, pixmap);
2469 TermWin.pixmap = None; 2476 pixmap = None;
2470 } 2477 }
2471 } 2478 }
2472 2479
2473 am_pixmap_trans = 0; 2480 am_pixmap_trans = 0;
2474 } 2481 }
2475 else 2482 else
2476 { 2483 {
2477 if (TermWin.pixmap != None) 2484 if (pixmap != None)
2478 XFreePixmap (disp, TermWin.pixmap); 2485 XFreePixmap (disp, pixmap);
2479 2486
2480#if TINTING 2487#if TINTING
2481 if (ISSET_PIXCOLOR (Color_tint)) 2488 if (ISSET_PIXCOLOR (Color_tint))
2482 { 2489 {
2483 unsigned short rm, gm, bm; 2490 unsigned short rm, gm, bm;
… …
2487 2494
2488 ShadeXImage (display, image, shade, rm, gm, bm); 2495 ShadeXImage (display, image, shade, rm, gm, bm);
2489 } 2496 }
2490#endif 2497#endif
2491 2498
2492 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2499 pixmap = XCreatePixmap (disp, vt,
2493 szHint.width, szHint.height, image->depth); 2500 szHint.width, szHint.height, image->depth);
2494 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2501 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2495 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2502 XPutImage (disp, pixmap, gc, image, 0, 0,
2496 nx, ny, image->width, image->height); 2503 nx, ny, image->width, image->height);
2497 XFreeGC (disp, gc); 2504 XFreeGC (disp, gc);
2498 XDestroyImage (image); 2505 XDestroyImage (image);
2499 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2506 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2500 XClearWindow (disp, TermWin.parent[0]); 2507 XClearWindow (disp, parent[0]);
2501 2508
2502 if (!am_transparent || !am_pixmap_trans) 2509 if (!am_transparent || !am_pixmap_trans)
2503 pchanged = 1; 2510 pchanged = 1;
2504 2511
2505 am_transparent = am_pixmap_trans = 1; 2512 am_transparent = am_pixmap_trans = 1;
2506 } 2513 }
2507 } 2514 }
2508 2515
2509 if (am_pixmap_trans) 2516 if (am_pixmap_trans)
2510 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2517 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2511 else 2518 else
2512 { 2519 {
2513 unsigned int n; 2520 unsigned int n;
2514 /* 2521 /*
2515 * InheritPixmap transparency 2522 * InheritPixmap transparency
2516 */ 2523 */
2517 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2524 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2518 { 2525 {
2519 oldp = TermWin.parent[i]; 2526 oldp = parent[i];
2520 XQueryTree (disp, TermWin.parent[i - 1], &root, 2527 XQueryTree (disp, parent[i - 1], &root,
2521 &TermWin.parent[i], &list, &n); 2528 &parent[i], &list, &n);
2522 XFree (list); 2529 XFree (list);
2523 2530
2524 if (TermWin.parent[i] == display->root) 2531 if (parent[i] == display->root)
2525 { 2532 {
2526 if (oldp != None) 2533 if (oldp != None)
2527 pchanged = 1; 2534 pchanged = 1;
2528 2535
2529 break; 2536 break;
2530 } 2537 }
2531 2538
2532 if (oldp != TermWin.parent[i]) 2539 if (oldp != parent[i])
2533 pchanged = 1; 2540 pchanged = 1;
2534 } 2541 }
2535 2542
2536 n = 0; 2543 n = 0;
2537 2544
2538 if (pchanged) 2545 if (pchanged)
2539 { 2546 {
2540 for (; n < (unsigned int)i; n++) 2547 for (; n < (unsigned int)i; n++)
2541 { 2548 {
2542 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2549 XGetWindowAttributes (disp, parent[n], &wattr);
2543 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2550 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2544 { 2551 {
2545 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2552 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2546 break; 2553 break;
2547 } 2554 }
2548 } 2555 }
2549 } 2556 }
2550 2557
2551 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2558 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2552 { 2559 {
2553 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2560 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2554 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2561 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2555 am_transparent = 0; 2562 am_transparent = 0;
2556 /* XXX: also turn off Opt_transparent? */ 2563 /* XXX: also turn off Opt_transparent? */
2557 } 2564 }
2558 else 2565 else
2559 { 2566 {
… …
2562 * needed for fvwm2.2.2 (and before?) */ 2569 * needed for fvwm2.2.2 (and before?) */
2563 sleep (1); 2570 sleep (1);
2564#endif 2571#endif
2565 for (n = 0; n < (unsigned int)i; n++) 2572 for (n = 0; n < (unsigned int)i; n++)
2566 { 2573 {
2567 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2574 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2568 XClearWindow (disp, TermWin.parent[n]); 2575 XClearWindow (disp, parent[n]);
2569 } 2576 }
2570 2577
2571 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2578 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2572 am_transparent = 1; 2579 am_transparent = 1;
2573 } 2580 }
2574 2581
2575 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2582 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2576 TermWin.parent[i] = None; 2583 parent[i] = None;
2577 } 2584 }
2578 2585
2579 if (scrollBar.win) 2586 if (scrollBar.win)
2580 { 2587 {
2581 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2588 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2633 /* Read a text string from the input buffer */ 2640 /* Read a text string from the input buffer */
2634 unicode_t buf[UBUFSIZ]; 2641 unicode_t buf[UBUFSIZ];
2635 bool refreshnow = false; 2642 bool refreshnow = false;
2636 int nlines = 0; 2643 int nlines = 0;
2637 unicode_t *str = buf; 2644 unicode_t *str = buf;
2645 unicode_t *eol = str + min (ncol, UBUFSIZ);
2638 2646
2639 for (;;) 2647 for (;;)
2640 { 2648 {
2641 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))
2642 break; 2650 break;
2643 2651
2644 *str++ = ch; 2652 *str++ = ch;
2645 2653
2646 if (ch == C0_LF) 2654 if (ch == C0_LF || str >= eol)
2647 { 2655 {
2656 if (ch == C0_LF)
2648 nlines++; 2657 nlines++;
2658
2649 refresh_count++; 2659 refresh_count++;
2650 2660
2651 if (!(options & Opt_jumpScroll) 2661 if (!(options & Opt_jumpScroll)
2652 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2662 || (refresh_count >= refresh_limit * (nrow - 1)))
2653 { 2663 {
2654 refreshnow = true; 2664 refreshnow = true;
2655 ch = NOCHAR; 2665 ch = NOCHAR;
2656 break; 2666 break;
2657 } 2667 }
2658 2668
2659 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2669 // scr_add_lines only works for nlines <= nrow - 1.
2660 if (nlines >= TermWin.nrow - 1) 2670 if (nlines >= nrow - 1)
2661 { 2671 {
2662 scr_add_lines (buf, nlines, str - buf); 2672 scr_add_lines (buf, nlines, str - buf);
2663 nlines = 0; 2673 nlines = 0;
2664 str = buf; 2674 str = buf;
2675 eol = str + min (ncol, UBUFSIZ);
2665 } 2676 }
2666 }
2667 2677
2668 if (str >= buf + UBUFSIZ) 2678 if (str >= eol)
2669 { 2679 {
2680 if (eol >= buf + UBUFSIZ)
2681 {
2670 ch = NOCHAR; 2682 ch = NOCHAR;
2671 break; 2683 break;
2684 }
2685 else
2686 eol = min (eol + ncol, buf + UBUFSIZ);
2687 }
2688
2672 } 2689 }
2673 2690
2674 seq_begin = cmdbuf_ptr; 2691 seq_begin = cmdbuf_ptr;
2675 ch = next_char (); 2692 ch = next_char ();
2676 } 2693 }
… …
3470 { 3487 {
3471 /* 3488 /*
3472 * commands 3489 * commands
3473 */ 3490 */
3474 case 1: /* deiconify window */ 3491 case 1: /* deiconify window */
3475 XMapWindow (disp, TermWin.parent[0]); 3492 XMapWindow (disp, parent[0]);
3476 break; 3493 break;
3477 case 2: /* iconify window */ 3494 case 2: /* iconify window */
3478 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3495 XIconifyWindow (disp, parent[0], display->screen);
3479 break; 3496 break;
3480 case 3: /* set position (pixels) */ 3497 case 3: /* set position (pixels) */
3481 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3498 XMoveWindow (disp, parent[0], args[1], args[2]);
3482 break; 3499 break;
3483 case 4: /* set size (pixels) */ 3500 case 4: /* set size (pixels) */
3484 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3501 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3485 break; 3502 break;
3486 case 5: /* raise window */ 3503 case 5: /* raise window */
3487 XRaiseWindow (disp, TermWin.parent[0]); 3504 XRaiseWindow (disp, parent[0]);
3488 break; 3505 break;
3489 case 6: /* lower window */ 3506 case 6: /* lower window */
3490 XLowerWindow (disp, TermWin.parent[0]); 3507 XLowerWindow (disp, parent[0]);
3491 break; 3508 break;
3492 case 7: /* refresh window */ 3509 case 7: /* refresh window */
3493 scr_touch (true); 3510 scr_touch (true);
3494 break; 3511 break;
3495 case 8: /* set size (chars) */ 3512 case 8: /* set size (chars) */
3496 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3513 set_widthheight ((unsigned int) (args[2] * fwidth),
3497 (unsigned int) (args[1] * TermWin.fheight)); 3514 (unsigned int) (args[1] * fheight));
3498 break; 3515 break;
3499 3516
3500 //case 9: NYI, TODO, restore maximized window or maximize window 3517 //case 9: NYI, TODO, restore maximized window or maximize window
3501 default: 3518 default:
3502 if (args[0] >= 24) /* set height (chars) */ 3519 if (args[0] >= 24) /* set height (chars) */
3503 set_widthheight ((unsigned int)TermWin.width, 3520 set_widthheight ((unsigned int)width,
3504 (unsigned int) (args[1] * TermWin.fheight)); 3521 (unsigned int) (args[1] * fheight));
3505 break; 3522 break;
3506 3523
3507 3524
3508 /* 3525 /*
3509 * reports - some output format copied from XTerm 3526 * reports - some output format copied from XTerm
3510 */ 3527 */
3511 case 11: /* report window state */ 3528 case 11: /* report window state */
3512 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3529 XGetWindowAttributes (disp, parent[0], &wattr);
3513 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3530 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3514 break; 3531 break;
3515 case 13: /* report window position */ 3532 case 13: /* report window position */
3516 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3533 XGetWindowAttributes (disp, parent[0], &wattr);
3517 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3534 XTranslateCoordinates (disp, parent[0], wattr.root,
3518 -wattr.border_width, -wattr.border_width, 3535 -wattr.border_width, -wattr.border_width,
3519 &x, &y, &wdummy); 3536 &x, &y, &wdummy);
3520 tt_printf ("\033[3;%d;%dt", x, y); 3537 tt_printf ("\033[3;%d;%dt", x, y);
3521 break; 3538 break;
3522 case 14: /* report window size (pixels) */ 3539 case 14: /* report window size (pixels) */
3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3540 XGetWindowAttributes (disp, parent[0], &wattr);
3524 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3541 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3525 break; 3542 break;
3526 case 18: /* report text area size (chars) */ 3543 case 18: /* report text area size (chars) */
3527 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3544 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3528 break; 3545 break;
3529 case 19: /* report window size (chars) */ 3546 case 19: /* report window size (chars) */
3530 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3547 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3531 break; 3548 break;
3532 case 20: /* report icon label */ 3549 case 20: /* report icon label */
3533 { 3550 {
3534 char *s; 3551 char *s;
3535 XGetIconName (disp, TermWin.parent[0], &s); 3552 XGetIconName (disp, parent[0], &s);
3536 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 */
3537 XFree (s); 3554 XFree (s);
3538 } 3555 }
3539 break; 3556 break;
3540 case 21: /* report window title */ 3557 case 21: /* report window title */
3541 { 3558 {
3542 char *s; 3559 char *s;
3543 XFetchName (disp, TermWin.parent[0], &s); 3560 XFetchName (disp, parent[0], &s);
3544 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 */
3545 XFree (s); 3562 XFree (s);
3546 } 3563 }
3547 break; 3564 break;
3548 } 3565 }
… …
3581 else if (ch < 0x20) 3598 else if (ch < 0x20)
3582 return NULL; /* other control character - exit */ 3599 return NULL; /* other control character - exit */
3583 3600
3584 seen_esc = false; 3601 seen_esc = false;
3585 3602
3586 if (n >= sizeof (string) - 1) 3603 if (n >= STRING_MAX - 1)
3587 // stop at some sane length 3604 // stop at some sane length
3588 return NULL; 3605 return NULL;
3589 3606
3590 if (ch == C0_SYN) 3607 if (ch == C0_SYN)
3591 string[n++] = cmd_get8 (); 3608 string[n++] = cmd_get8 ();
… …
3659 set_window_color (color, str); 3676 set_window_color (color, str);
3660} 3677}
3661 3678
3662/* 3679/*
3663 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3680 * 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 */ 3681 */
3687void 3682void
3688rxvt_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)
3689{ 3684{
3690 int changed = 0; 3685 int changed = 0;
… …
3716 unsigned long bytes_after; 3711 unsigned long bytes_after;
3717 unsigned char *value = 0; 3712 unsigned char *value = 0;
3718 const char *str = ""; 3713 const char *str = "";
3719 3714
3720 if (prop 3715 if (prop
3721 && XGetWindowProperty (disp, TermWin.parent[0], 3716 && XGetWindowProperty (disp, parent[0],
3722 prop, 0, 1<<16, 0, AnyPropertyType, 3717 prop, 0, 1<<16, 0, AnyPropertyType,
3723 &actual_type, &actual_format, 3718 &actual_type, &actual_format,
3724 &nitems, &bytes_after, &value) == Success 3719 &nitems, &bytes_after, &value) == Success
3725 && actual_type != None 3720 && actual_type != None
3726 && actual_format == 8) 3721 && actual_format == 8)
… …
3738 { 3733 {
3739 *eq = 0; 3734 *eq = 0;
3740 set_utf8_property (display->atom (str), eq + 1); 3735 set_utf8_property (display->atom (str), eq + 1);
3741 } 3736 }
3742 else 3737 else
3743 XDeleteProperty (disp, TermWin.parent[0], 3738 XDeleteProperty (disp, parent[0],
3744 display->atom (str)); 3739 display->atom (str));
3745 } 3740 }
3746 break; 3741 break;
3747 3742
3748 case XTerm_Color: 3743 case XTerm_Color:
… …
3789 break; 3784 break;
3790#ifndef NO_BOLD_UNDERLINE_REVERSE 3785#ifndef NO_BOLD_UNDERLINE_REVERSE
3791 case XTerm_Color_BD: 3786 case XTerm_Color_BD:
3792 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3787 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3793 break; 3788 break;
3794 case XTerm_Color_IT:
3795 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3796 break;
3797 case XTerm_Color_UL: 3789 case XTerm_Color_UL:
3798 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3790 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3799 break; 3791 break;
3800 case XTerm_Color_RV: 3792 case XTerm_Color_RV:
3801 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3793 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3802 break; 3794 break;
3795 case URxvt_Color_IT:
3796 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3797 break;
3803#endif 3798#endif
3804#if TRANSPARENT && TINTING 3799#if TRANSPARENT && TINTING
3805 case XTerm_Color_tint: 3800 case URxvt_Color_tint:
3806 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3801 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3807 check_our_parents (); 3802 check_our_parents ();
3808 if (am_transparent) 3803 if (am_transparent)
3809 want_full_refresh = want_refresh = 1; 3804 want_full_refresh = want_refresh = 1;
3810 break; 3805 break;
3811#endif 3806#endif
… …
3845 3840
3846 case XTerm_logfile: 3841 case XTerm_logfile:
3847 // TODO, when secure mode? 3842 // TODO, when secure mode?
3848 break; 3843 break;
3849 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
3850 case XTerm_font: 3863 case XTerm_font:
3851 op = URxvt_font; 3864 op = URxvt_font;
3852 case URxvt_font: 3865 case URxvt_font:
3853#if ENABLE_STYLES 3866#if ENABLE_STYLES
3854 case URxvt_boldFont: 3867 case URxvt_boldFont:
3855 case URxvt_italicFont: 3868 case URxvt_italicFont:
3856 case URxvt_boldItalicFont: 3869 case URxvt_boldItalicFont:
3857#endif 3870#endif
3858 if (query) 3871 if (query)
3859 tt_printf ("\33]%d;%-.250s%c", saveop, 3872 tt_printf ("\33]%d;%-.250s%c", saveop,
3860 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3873 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3861 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3874 ? fontset[op - URxvt_font]->fontdesc : "",
3862 resp); 3875 resp);
3863 else 3876 else
3864 { 3877 {
3865 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3878 const char *&res = rs[Rs_font + (op - URxvt_font)];
3866 3879
… …
3869 set_fonts (); 3882 set_fonts ();
3870 } 3883 }
3871 break; 3884 break;
3872 3885
3873#if ENABLE_FRILLS 3886#if ENABLE_FRILLS
3874 case XTerm_locale: 3887 case URxvt_locale:
3875 if (query) 3888 if (query)
3876 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);
3877 else 3890 else
3878 { 3891 {
3879 set_locale (str); 3892 set_locale (str);
3880 pty.set_utf8_mode (enc_utf8); 3893 pty.set_utf8_mode (enc_utf8);
3881# ifdef USE_XIM
3882 im_cb (); 3894 init_xlocale ();
3883# endif
3884 } 3895 }
3885 break; 3896 break;
3886#endif
3887 3897
3888#ifdef MENUBAR 3898 case URxvt_view_up:
3889 case XTerm_Menu: 3899 case URxvt_view_down:
3890 if (options & Opt_insecure) 3900 int lines = atoi (str);
3891 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3901
3892 break; 3902 if (lines)
3893#endif 3903 scr_page (op == URxvt_view_up ? UP : DN, lines);
3894#if 0
3895 case XTerm_dumpscreen: /* no error notices */
3896 { 3904 else
3897 int fd;
3898 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3899 { 3905 {
3900 scr_dump (fd); 3906 scr_erase_savelines ();
3901 close (fd);
3902 } 3907 }
3903 } 3908
3904 break; 3909 break;
3905#endif 3910#endif
3906 } 3911 }
3907} 3912}
3908/*----------------------------------------------------------------------*/ 3913/*----------------------------------------------------------------------*/
… …
4041 */ 4046 */
4042 PrivMode (1, PrivMode_vt52); 4047 PrivMode (1, PrivMode_vt52);
4043 break; 4048 break;
4044 case 3: /* 80/132 */ 4049 case 3: /* 80/132 */
4045 if (priv_modes & PrivMode_132OK) 4050 if (priv_modes & PrivMode_132OK)
4046 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4051 set_widthheight (((state ? 132 : 80) * fwidth), height);
4047 break; 4052 break;
4048 case 4: /* smooth scrolling */ 4053 case 4: /* smooth scrolling */
4049 if (state) 4054 if (state)
4050 options &= ~Opt_jumpScroll; 4055 options &= ~Opt_jumpScroll;
4051 else 4056 else

Diff Legend

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