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.197 by root, Thu Feb 17 15:07:48 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
1346 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1347 {
1335 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1348 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1336 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 }
1357#if ENABLE_XEMBED
1358 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1359 {
1360 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1361 focus_in ();
1362 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1363 focus_out ();
1364 }
1365#endif
1337#ifdef OFFIX_DND 1366#ifdef OFFIX_DND
1338 /* OffiX Dnd (drag 'n' drop) protocol */ 1367 /* OffiX Dnd (drag 'n' drop) protocol */
1339 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1368 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1340 && (ev.xclient.data.l[0] == DndFile 1369 && (ev.xclient.data.l[0] == DndFile
1341 || ev.xclient.data.l[0] == DndDir 1370 || ev.xclient.data.l[0] == DndDir
1342 || ev.xclient.data.l[0] == DndLink)) 1371 || ev.xclient.data.l[0] == DndLink))
1343 { 1372 {
1344 /* Get Dnd data */ 1373 /* Get Dnd data */
1345 Atom ActualType; 1374 Atom ActualType;
1346 int ActualFormat; 1375 int ActualFormat;
1347 unsigned char *data; 1376 unsigned char *data;
… …
1390 break; 1419 break;
1391 } 1420 }
1392 break; 1421 break;
1393 1422
1394 case FocusIn: 1423 case FocusIn:
1395 if (!TermWin.focus) 1424 focus_in ();
1425 break;
1426
1427 case FocusOut:
1428 focus_out ();
1429 break;
1430
1431 case ConfigureNotify:
1432 if (ev.xconfigure.window == parent[0])
1396 { 1433 {
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)); 1434 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1435 ;
1464 1436
1465 if (szHint.width != width || szHint.height != height) 1437 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1466 { 1438 {
1467 seen_resize = 1; 1439 seen_resize = 1;
1468 resize_all_windows (width, height, 1); 1440 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1469 } 1441 }
1470 1442
1471#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1443#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1472 if (options & Opt_transparent) 1444 if (options & Opt_transparent)
1473 check_our_parents (); 1445 check_our_parents ();
… …
1494 case SelectionRequest: 1466 case SelectionRequest:
1495 selection_send (ev.xselectionrequest); 1467 selection_send (ev.xselectionrequest);
1496 break; 1468 break;
1497 1469
1498 case UnmapNotify: 1470 case UnmapNotify:
1499 TermWin.mapped = 0; 1471 mapped = 0;
1500#ifdef TEXT_BLINK 1472#ifdef TEXT_BLINK
1501 text_blink_ev.stop (); 1473 text_blink_ev.stop ();
1502#endif 1474#endif
1503 break; 1475 break;
1504 1476
1505 case MapNotify: 1477 case MapNotify:
1506 TermWin.mapped = 1; 1478 mapped = 1;
1507#ifdef TEXT_BLINK 1479#ifdef TEXT_BLINK
1508 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1480 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1509#endif 1481#endif
1510 break; 1482 break;
1511 1483
… …
1515 break; 1487 break;
1516#endif /* TRANSPARENT */ 1488#endif /* TRANSPARENT */
1517 1489
1518 case GraphicsExpose: 1490 case GraphicsExpose:
1519 case Expose: 1491 case Expose:
1520 if (ev.xany.window == TermWin.vt) 1492 if (ev.xany.window == vt)
1521 { 1493 {
1522 do 1494 do
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1495 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1496 ev.xexpose.width, ev.xexpose.height, False);
1525 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1497 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1526 1498
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1499 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528 1500
1529 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1501 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1532 1504
1533 scr_refresh (refresh_type); 1505 scr_refresh (refresh_type);
1534 } 1506 }
… …
1550 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1522 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1551 menubar_expose (); 1523 menubar_expose ();
1552#endif 1524#endif
1553 1525
1554#ifdef TRANSPARENT 1526#ifdef TRANSPARENT
1555 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1527 if (am_transparent && ev.xany.window == parent[0])
1556 XClearWindow (disp, ev.xany.window); 1528 XClearWindow (disp, ev.xany.window);
1557#endif 1529#endif
1558 } 1530 }
1559 break; 1531 break;
1560 1532
… …
1571 } 1543 }
1572#endif 1544#endif
1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1545 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1574 break; 1546 break;
1575 1547
1576 if (ev.xany.window == TermWin.vt) 1548 if (ev.xany.window == vt)
1577 { 1549 {
1578 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1550 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1579 { 1551 {
1580 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1552 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1581 ; 1553 ;
1582 1554
1583 XQueryPointer (disp, TermWin.vt, 1555 XQueryPointer (disp, vt,
1584 &unused_root, &unused_child, 1556 &unused_root, &unused_child,
1585 &unused_root_x, &unused_root_y, 1557 &unused_root_x, &unused_root_y,
1586 &ev.xbutton.x, &ev.xbutton.y, 1558 &ev.xbutton.x, &ev.xbutton.y,
1587 &ev.xbutton.state); 1559 &ev.xbutton.state);
1588#ifdef MOUSE_THRESHOLD 1560#ifdef MOUSE_THRESHOLD
… …
1600#endif 1572#endif
1601 selection_extend (ev.xbutton.x, ev.xbutton.y, 1573 selection_extend (ev.xbutton.x, ev.xbutton.y,
1602 ev.xbutton.state & Button3Mask ? 2 : 0); 1574 ev.xbutton.state & Button3Mask ? 2 : 0);
1603 1575
1604#ifdef SELECTION_SCROLLING 1576#ifdef SELECTION_SCROLLING
1605 if (ev.xbutton.y < TermWin.int_bwidth 1577 if (ev.xbutton.y < int_bwidth
1606 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1578 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1607 { 1579 {
1608 int dist; 1580 int dist;
1609 1581
1610 /* don't clobber the current delay if we are 1582 /* don't clobber the current delay if we are
1611 * already in the middle of scrolling. 1583 * already in the middle of scrolling.
… …
1619 selection_save_x = ev.xbutton.x; 1591 selection_save_x = ev.xbutton.x;
1620 selection_save_y = ev.xbutton.y; 1592 selection_save_y = ev.xbutton.y;
1621 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1593 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1622 1594
1623 /* calc number of lines to scroll */ 1595 /* calc number of lines to scroll */
1624 if (ev.xbutton.y < TermWin.int_bwidth) 1596 if (ev.xbutton.y < int_bwidth)
1625 { 1597 {
1626 scroll_selection_dir = UP; 1598 scroll_selection_dir = UP;
1627 dist = TermWin.int_bwidth - ev.xbutton.y; 1599 dist = int_bwidth - ev.xbutton.y;
1628 } 1600 }
1629 else 1601 else
1630 { 1602 {
1631 scroll_selection_dir = DN; 1603 scroll_selection_dir = DN;
1632 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1604 dist = ev.xbutton.y - (int_bwidth + height);
1633 } 1605 }
1634 1606
1635 scroll_selection_lines = Pixel2Height (dist) 1607 scroll_selection_lines = Pixel2Height (dist)
1636 / SELECTION_SCROLL_LINE_SPEEDUP 1608 / SELECTION_SCROLL_LINE_SPEEDUP
1637 + 1; 1609 + 1;
1638 MIN_IT (scroll_selection_lines, 1610 min_it (scroll_selection_lines,
1639 SELECTION_SCROLL_MAX_LINES); 1611 SELECTION_SCROLL_MAX_LINES);
1640 } 1612 }
1641 else 1613 else
1642 { 1614 {
1643 /* we are within the text window, so we 1615 /* we are within the text window, so we
… …
1671 } 1643 }
1672 break; 1644 break;
1673 } 1645 }
1674} 1646}
1675 1647
1648void
1649rxvt_term::focus_in ()
1650{
1651 if (!focus)
1652 {
1653 focus = 1;
1654 want_refresh = 1;
1655#if USE_XIM
1656 if (Input_Context != NULL)
1657 {
1658 IMSetStatusPosition ();
1659 XSetICFocus (Input_Context);
1660 }
1661#endif
1662#if CURSOR_BLINK
1663 if (options & Opt_cursorBlink)
1664 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1665#endif
1666#if OFF_FOCUS_FADING
1667 if (rs[Rs_fade])
1668 {
1669 pix_colors = pix_colors_focused;
1670 scr_recolour ();
1671 }
1672#endif
1673 }
1674}
1675
1676void
1677rxvt_term::focus_out ()
1678{
1679 if (focus)
1680 {
1681 focus = 0;
1682 want_refresh = 1;
1683
1684#if ENABLE_FRILLS || ISO_14755
1685 iso14755buf = 0;
1686#endif
1687#if ENABLE_OVERLAY
1688 scr_overlay_off ();
1689#endif
1690#if USE_XIM
1691 if (Input_Context != NULL)
1692 XUnsetICFocus (Input_Context);
1693#endif
1694#if CURSOR_BLINK
1695 if (options & Opt_cursorBlink)
1696 cursor_blink_ev.stop ();
1697 hidden_cursor = 0;
1698#endif
1699#if OFF_FOCUS_FADING
1700 if (rs[Rs_fade])
1701 {
1702 pix_colors = pix_colors_unfocused;
1703 scr_recolour ();
1704 }
1705#endif
1706 }
1707}
1708
1676#if TRANSPARENT 1709#if TRANSPARENT
1677void 1710void
1678rxvt_term::rootwin_cb (XEvent &ev) 1711rxvt_term::rootwin_cb (XEvent &ev)
1679{ 1712{
1680 SET_R (this); 1713 SET_R (this);
… …
1710 reportmode = !! (priv_modes & PrivMode_mouse_report); 1743 reportmode = !! (priv_modes & PrivMode_mouse_report);
1711 1744
1712 /* 1745 /*
1713 * VT window processing of button press 1746 * VT window processing of button press
1714 */ 1747 */
1715 if (ev.window == TermWin.vt) 1748 if (ev.window == vt)
1716 { 1749 {
1717#if ISO_14755 1750#if ISO_14755
1718 // 5.4 1751 // 5.4
1719 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1752 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1720 { 1753 {
… …
1925 case Button3: 1958 case Button3:
1926 if (scrollBar.style != R_SB_XTERM) 1959 if (scrollBar.style != R_SB_XTERM)
1927 { 1960 {
1928 if (scrollbar_above_slider (ev.y)) 1961 if (scrollbar_above_slider (ev.y))
1929# ifdef RXVT_SCROLL_FULL 1962# ifdef RXVT_SCROLL_FULL
1930 scr_page (UP, TermWin.nrow - 1); 1963 scr_page (UP, nrow - 1);
1931# else 1964# else
1932 scr_page (UP, TermWin.nrow / 4); 1965 scr_page (UP, nrow / 4);
1933# endif 1966# endif
1934 else if (scrollbar_below_slider (ev.y)) 1967 else if (scrollbar_below_slider (ev.y))
1935# ifdef RXVT_SCROLL_FULL 1968# ifdef RXVT_SCROLL_FULL
1936 scr_page (DN, TermWin.nrow - 1); 1969 scr_page (DN, nrow - 1);
1937# else 1970# else
1938 scr_page (DN, TermWin.nrow / 4); 1971 scr_page (DN, nrow / 4);
1939# endif 1972# endif
1940 else 1973 else
1941 scrollBar.setMotion (); 1974 scrollBar.setMotion ();
1942 } 1975 }
1943 else 1976 else
1944 { 1977 {
1945 scr_page ((ev.button == Button1 ? DN : UP), 1978 scr_page ((ev.button == Button1 ? DN : UP),
1946 (TermWin.nrow 1979 (nrow
1947 * scrollbar_position (ev.y) 1980 * scrollbar_position (ev.y)
1948 / scrollbar_size ())); 1981 / scrollbar_size ()));
1949 } 1982 }
1950 1983
1951 break; 1984 break;
… …
1983#ifdef SELECTION_SCROLLING 2016#ifdef SELECTION_SCROLLING
1984 if (sel_scroll_ev.active) 2017 if (sel_scroll_ev.active)
1985 sel_scroll_ev.stop(); 2018 sel_scroll_ev.stop();
1986#endif 2019#endif
1987 2020
1988 if (ev.window == TermWin.vt) 2021 if (ev.window == vt)
1989 { 2022 {
1990#if ISO_14755 2023#if ISO_14755
1991 // 5.4 2024 // 5.4
1992 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2025 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1993 return; 2026 return;
… …
2044 v = ev.button == Button4 ? UP : DN; 2077 v = ev.button == Button4 ? UP : DN;
2045 2078
2046 if (ev.state & ShiftMask) 2079 if (ev.state & ShiftMask)
2047 i = 1; 2080 i = 1;
2048 else if (options & Opt_mouseWheelScrollPage) 2081 else if (options & Opt_mouseWheelScrollPage)
2049 i = TermWin.nrow - 1; 2082 i = nrow - 1;
2050 else 2083 else
2051 i = 5; 2084 i = 5;
2052 2085
2053# ifdef MOUSE_SLIP_WHEELING 2086# ifdef MOUSE_SLIP_WHEELING
2054 if (ev.state & ControlMask) 2087 if (ev.state & ControlMask)
2055 { 2088 {
2056 mouse_slip_wheel_speed += v ? -1 : 1; 2089 mouse_slip_wheel_speed += v ? -1 : 1;
2057 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;
2058 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;
2059 2092
2060 if (slip_wheel_ev.at < NOW) 2093 if (slip_wheel_ev.at < NOW)
2061 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2094 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2062 2095
2063 slip_wheel_ev.start (); 2096 slip_wheel_ev.start ();
… …
2345 return pchanged; /* Don't try any more */ 2378 return pchanged; /* Don't try any more */
2346 2379
2347 XGetWindowAttributes (disp, display->root, &wrootattr); 2380 XGetWindowAttributes (disp, display->root, &wrootattr);
2348 rootdepth = wrootattr.depth; 2381 rootdepth = wrootattr.depth;
2349 2382
2350 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2383 XGetWindowAttributes (disp, parent[0], &wattr);
2351 2384
2352 if (rootdepth != wattr.depth) 2385 if (rootdepth != wattr.depth)
2353 { 2386 {
2354 if (am_transparent) 2387 if (am_transparent)
2355 { 2388 {
2356 pchanged = 1; 2389 pchanged = 1;
2357 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2390 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2358 am_transparent = am_pixmap_trans = 0; 2391 am_transparent = am_pixmap_trans = 0;
2359 } 2392 }
2360 2393
2361 return pchanged; /* Don't try any more */ 2394 return pchanged; /* Don't try any more */
2362 } 2395 }
… …
2403 Window cr; 2436 Window cr;
2404 XImage *image; 2437 XImage *image;
2405 GC gc; 2438 GC gc;
2406 XGCValues gcvalue; 2439 XGCValues gcvalue;
2407 2440
2408 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2441 XTranslateCoordinates (disp, parent[0], display->root,
2409 0, 0, &sx, &sy, &cr); 2442 0, 0, &sx, &sy, &cr);
2410 nw = (unsigned int)szHint.width; 2443 nw = (unsigned int)szHint.width;
2411 nh = (unsigned int)szHint.height; 2444 nh = (unsigned int)szHint.height;
2412 nx = ny = 0; 2445 nx = ny = 0;
2413 2446
… …
2423 nh += sy; 2456 nh += sy;
2424 ny = -sy; 2457 ny = -sy;
2425 sy = 0; 2458 sy = 0;
2426 } 2459 }
2427 2460
2428 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2461 min_it (nw, (unsigned int) (wrootattr.width - sx));
2429 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2462 min_it (nh, (unsigned int) (wrootattr.height - sy));
2430 2463
2431 XSync (disp, False); 2464 XSync (disp, False);
2432 allowedxerror = -1; 2465 allowedxerror = -1;
2433 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2466 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2434 2467
… …
2439 if (image == NULL) 2472 if (image == NULL)
2440 { 2473 {
2441 if (am_transparent && am_pixmap_trans) 2474 if (am_transparent && am_pixmap_trans)
2442 { 2475 {
2443 pchanged = 1; 2476 pchanged = 1;
2444 if (TermWin.pixmap != None) 2477 if (pixmap != None)
2445 { 2478 {
2446 XFreePixmap (disp, TermWin.pixmap); 2479 XFreePixmap (disp, pixmap);
2447 TermWin.pixmap = None; 2480 pixmap = None;
2448 } 2481 }
2449 } 2482 }
2450 2483
2451 am_pixmap_trans = 0; 2484 am_pixmap_trans = 0;
2452 } 2485 }
2453 else 2486 else
2454 { 2487 {
2455 if (TermWin.pixmap != None) 2488 if (pixmap != None)
2456 XFreePixmap (disp, TermWin.pixmap); 2489 XFreePixmap (disp, pixmap);
2457 2490
2458#if TINTING 2491#if TINTING
2459 if (ISSET_PIXCOLOR (Color_tint)) 2492 if (ISSET_PIXCOLOR (Color_tint))
2460 { 2493 {
2461 unsigned short rm, gm, bm; 2494 unsigned short rm, gm, bm;
… …
2465 2498
2466 ShadeXImage (display, image, shade, rm, gm, bm); 2499 ShadeXImage (display, image, shade, rm, gm, bm);
2467 } 2500 }
2468#endif 2501#endif
2469 2502
2470 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2503 pixmap = XCreatePixmap (disp, vt,
2471 szHint.width, szHint.height, image->depth); 2504 szHint.width, szHint.height, image->depth);
2472 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2505 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2473 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2506 XPutImage (disp, pixmap, gc, image, 0, 0,
2474 nx, ny, image->width, image->height); 2507 nx, ny, image->width, image->height);
2475 XFreeGC (disp, gc); 2508 XFreeGC (disp, gc);
2476 XDestroyImage (image); 2509 XDestroyImage (image);
2477 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2510 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2478 XClearWindow (disp, TermWin.parent[0]); 2511 XClearWindow (disp, parent[0]);
2479 2512
2480 if (!am_transparent || !am_pixmap_trans) 2513 if (!am_transparent || !am_pixmap_trans)
2481 pchanged = 1; 2514 pchanged = 1;
2482 2515
2483 am_transparent = am_pixmap_trans = 1; 2516 am_transparent = am_pixmap_trans = 1;
2484 } 2517 }
2485 } 2518 }
2486 2519
2487 if (am_pixmap_trans) 2520 if (am_pixmap_trans)
2488 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2521 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2489 else 2522 else
2490 { 2523 {
2491 unsigned int n; 2524 unsigned int n;
2492 /* 2525 /*
2493 * InheritPixmap transparency 2526 * InheritPixmap transparency
2494 */ 2527 */
2495 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2528 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2496 { 2529 {
2497 oldp = TermWin.parent[i]; 2530 oldp = parent[i];
2498 XQueryTree (disp, TermWin.parent[i - 1], &root, 2531 XQueryTree (disp, parent[i - 1], &root,
2499 &TermWin.parent[i], &list, &n); 2532 &parent[i], &list, &n);
2500 XFree (list); 2533 XFree (list);
2501 2534
2502 if (TermWin.parent[i] == display->root) 2535 if (parent[i] == display->root)
2503 { 2536 {
2504 if (oldp != None) 2537 if (oldp != None)
2505 pchanged = 1; 2538 pchanged = 1;
2506 2539
2507 break; 2540 break;
2508 } 2541 }
2509 2542
2510 if (oldp != TermWin.parent[i]) 2543 if (oldp != parent[i])
2511 pchanged = 1; 2544 pchanged = 1;
2512 } 2545 }
2513 2546
2514 n = 0; 2547 n = 0;
2515 2548
2516 if (pchanged) 2549 if (pchanged)
2517 { 2550 {
2518 for (; n < (unsigned int)i; n++) 2551 for (; n < (unsigned int)i; n++)
2519 { 2552 {
2520 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2553 XGetWindowAttributes (disp, parent[n], &wattr);
2521 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2554 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2522 { 2555 {
2523 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2556 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2524 break; 2557 break;
2525 } 2558 }
2526 } 2559 }
2527 } 2560 }
2528 2561
2529 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2562 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2530 { 2563 {
2531 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2564 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2532 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2565 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2533 am_transparent = 0; 2566 am_transparent = 0;
2534 /* XXX: also turn off Opt_transparent? */ 2567 /* XXX: also turn off Opt_transparent? */
2535 } 2568 }
2536 else 2569 else
2537 { 2570 {
… …
2540 * needed for fvwm2.2.2 (and before?) */ 2573 * needed for fvwm2.2.2 (and before?) */
2541 sleep (1); 2574 sleep (1);
2542#endif 2575#endif
2543 for (n = 0; n < (unsigned int)i; n++) 2576 for (n = 0; n < (unsigned int)i; n++)
2544 { 2577 {
2545 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2578 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2546 XClearWindow (disp, TermWin.parent[n]); 2579 XClearWindow (disp, parent[n]);
2547 } 2580 }
2548 2581
2549 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2550 am_transparent = 1; 2583 am_transparent = 1;
2551 } 2584 }
2552 2585
2553 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2586 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2554 TermWin.parent[i] = None; 2587 parent[i] = None;
2555 } 2588 }
2556 2589
2557 if (scrollBar.win) 2590 if (scrollBar.win)
2558 { 2591 {
2559 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2592 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2611 /* Read a text string from the input buffer */ 2644 /* Read a text string from the input buffer */
2612 unicode_t buf[UBUFSIZ]; 2645 unicode_t buf[UBUFSIZ];
2613 bool refreshnow = false; 2646 bool refreshnow = false;
2614 int nlines = 0; 2647 int nlines = 0;
2615 unicode_t *str = buf; 2648 unicode_t *str = buf;
2649 unicode_t *eol = str + min (ncol, UBUFSIZ);
2616 2650
2617 for (;;) 2651 for (;;)
2618 { 2652 {
2619 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))
2620 break; 2654 break;
2621 2655
2622 *str++ = ch; 2656 *str++ = ch;
2623 2657
2624 if (ch == C0_LF) 2658 if (ch == C0_LF || str >= eol)
2625 { 2659 {
2660 if (ch == C0_LF)
2626 nlines++; 2661 nlines++;
2662
2627 refresh_count++; 2663 refresh_count++;
2628 2664
2629 if (!(options & Opt_jumpScroll) 2665 if (!(options & Opt_jumpScroll)
2630 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2666 || (refresh_count >= refresh_limit * (nrow - 1)))
2631 { 2667 {
2632 refreshnow = true; 2668 refreshnow = true;
2633 ch = NOCHAR; 2669 ch = NOCHAR;
2634 break; 2670 break;
2635 } 2671 }
2636 2672
2637 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2673 // scr_add_lines only works for nlines <= nrow - 1.
2638 if (nlines >= TermWin.nrow - 1) 2674 if (nlines >= nrow - 1)
2639 { 2675 {
2640 scr_add_lines (buf, nlines, str - buf); 2676 scr_add_lines (buf, nlines, str - buf);
2641 nlines = 0; 2677 nlines = 0;
2642 str = buf; 2678 str = buf;
2679 eol = str + min (ncol, UBUFSIZ);
2643 } 2680 }
2644 }
2645 2681
2646 if (str >= buf + UBUFSIZ) 2682 if (str >= eol)
2647 { 2683 {
2684 if (eol >= buf + UBUFSIZ)
2685 {
2648 ch = NOCHAR; 2686 ch = NOCHAR;
2649 break; 2687 break;
2688 }
2689 else
2690 eol = min (eol + ncol, buf + UBUFSIZ);
2691 }
2692
2650 } 2693 }
2651 2694
2652 seq_begin = cmdbuf_ptr; 2695 seq_begin = cmdbuf_ptr;
2653 ch = next_char (); 2696 ch = next_char ();
2654 } 2697 }
… …
3313 3356
3314 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3357 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3315 arg[0] = -arg[0]; 3358 arg[0] = -arg[0];
3316 /* FALLTHROUGH */ 3359 /* FALLTHROUGH */
3317 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3360 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3318 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3361 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3319 break; 3362 break;
3320 3363
3321 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3364 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3322 tt_write ((const unsigned char *)VT100_ANS, 3365 tt_write ((const unsigned char *)VT100_ANS,
3323 (unsigned int) (sizeof (VT100_ANS) - 1)); 3366 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3448 { 3491 {
3449 /* 3492 /*
3450 * commands 3493 * commands
3451 */ 3494 */
3452 case 1: /* deiconify window */ 3495 case 1: /* deiconify window */
3453 XMapWindow (disp, TermWin.parent[0]); 3496 XMapWindow (disp, parent[0]);
3454 break; 3497 break;
3455 case 2: /* iconify window */ 3498 case 2: /* iconify window */
3456 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3499 XIconifyWindow (disp, parent[0], display->screen);
3457 break; 3500 break;
3458 case 3: /* set position (pixels) */ 3501 case 3: /* set position (pixels) */
3459 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3502 XMoveWindow (disp, parent[0], args[1], args[2]);
3460 break; 3503 break;
3461 case 4: /* set size (pixels) */ 3504 case 4: /* set size (pixels) */
3462 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3505 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3463 break; 3506 break;
3464 case 5: /* raise window */ 3507 case 5: /* raise window */
3465 XRaiseWindow (disp, TermWin.parent[0]); 3508 XRaiseWindow (disp, parent[0]);
3466 break; 3509 break;
3467 case 6: /* lower window */ 3510 case 6: /* lower window */
3468 XLowerWindow (disp, TermWin.parent[0]); 3511 XLowerWindow (disp, parent[0]);
3469 break; 3512 break;
3470 case 7: /* refresh window */ 3513 case 7: /* refresh window */
3471 scr_touch (true); 3514 scr_touch (true);
3472 break; 3515 break;
3473 case 8: /* set size (chars) */ 3516 case 8: /* set size (chars) */
3474 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3517 set_widthheight ((unsigned int) (args[2] * fwidth),
3475 (unsigned int) (args[1] * TermWin.fheight)); 3518 (unsigned int) (args[1] * fheight));
3476 break; 3519 break;
3477 3520
3478 //case 9: NYI, TODO, restore maximized window or maximize window 3521 //case 9: NYI, TODO, restore maximized window or maximize window
3479 default: 3522 default:
3480 if (args[0] >= 24) /* set height (chars) */ 3523 if (args[0] >= 24) /* set height (chars) */
3481 set_widthheight ((unsigned int)TermWin.width, 3524 set_widthheight ((unsigned int)width,
3482 (unsigned int) (args[1] * TermWin.fheight)); 3525 (unsigned int) (args[1] * fheight));
3483 break; 3526 break;
3484 3527
3485 3528
3486 /* 3529 /*
3487 * reports - some output format copied from XTerm 3530 * reports - some output format copied from XTerm
3488 */ 3531 */
3489 case 11: /* report window state */ 3532 case 11: /* report window state */
3490 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3533 XGetWindowAttributes (disp, parent[0], &wattr);
3491 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3534 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3492 break; 3535 break;
3493 case 13: /* report window position */ 3536 case 13: /* report window position */
3494 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3537 XGetWindowAttributes (disp, parent[0], &wattr);
3495 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3538 XTranslateCoordinates (disp, parent[0], wattr.root,
3496 -wattr.border_width, -wattr.border_width, 3539 -wattr.border_width, -wattr.border_width,
3497 &x, &y, &wdummy); 3540 &x, &y, &wdummy);
3498 tt_printf ("\033[3;%d;%dt", x, y); 3541 tt_printf ("\033[3;%d;%dt", x, y);
3499 break; 3542 break;
3500 case 14: /* report window size (pixels) */ 3543 case 14: /* report window size (pixels) */
3501 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3544 XGetWindowAttributes (disp, parent[0], &wattr);
3502 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3545 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3503 break; 3546 break;
3504 case 18: /* report text area size (chars) */ 3547 case 18: /* report text area size (chars) */
3505 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3548 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3506 break; 3549 break;
3507 case 19: /* report window size (chars) */ 3550 case 19: /* report window size (chars) */
3508 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3551 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3509 break; 3552 break;
3510 case 20: /* report icon label */ 3553 case 20: /* report icon label */
3511 { 3554 {
3512 char *s; 3555 char *s;
3513 XGetIconName (disp, TermWin.parent[0], &s); 3556 XGetIconName (disp, parent[0], &s);
3514 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 */
3515 XFree (s); 3558 XFree (s);
3516 } 3559 }
3517 break; 3560 break;
3518 case 21: /* report window title */ 3561 case 21: /* report window title */
3519 { 3562 {
3520 char *s; 3563 char *s;
3521 XFetchName (disp, TermWin.parent[0], &s); 3564 XFetchName (disp, parent[0], &s);
3522 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 */
3523 XFree (s); 3566 XFree (s);
3524 } 3567 }
3525 break; 3568 break;
3526 } 3569 }
… …
3559 else if (ch < 0x20) 3602 else if (ch < 0x20)
3560 return NULL; /* other control character - exit */ 3603 return NULL; /* other control character - exit */
3561 3604
3562 seen_esc = false; 3605 seen_esc = false;
3563 3606
3564 if (n >= sizeof (string) - 1) 3607 if (n >= STRING_MAX - 1)
3565 // stop at some sane length 3608 // stop at some sane length
3566 return NULL; 3609 return NULL;
3567 3610
3568 if (ch == C0_SYN) 3611 if (ch == C0_SYN)
3569 string[n++] = cmd_get8 (); 3612 string[n++] = cmd_get8 ();
… …
3637 set_window_color (color, str); 3680 set_window_color (color, str);
3638} 3681}
3639 3682
3640/* 3683/*
3641 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3684 * 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 */ 3685 */
3665void 3686void
3666rxvt_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)
3667{ 3688{
3668 int changed = 0; 3689 int changed = 0;
… …
3694 unsigned long bytes_after; 3715 unsigned long bytes_after;
3695 unsigned char *value = 0; 3716 unsigned char *value = 0;
3696 const char *str = ""; 3717 const char *str = "";
3697 3718
3698 if (prop 3719 if (prop
3699 && XGetWindowProperty (disp, TermWin.parent[0], 3720 && XGetWindowProperty (disp, parent[0],
3700 prop, 0, 1<<16, 0, AnyPropertyType, 3721 prop, 0, 1<<16, 0, AnyPropertyType,
3701 &actual_type, &actual_format, 3722 &actual_type, &actual_format,
3702 &nitems, &bytes_after, &value) == Success 3723 &nitems, &bytes_after, &value) == Success
3703 && actual_type != None 3724 && actual_type != None
3704 && actual_format == 8) 3725 && actual_format == 8)
… …
3716 { 3737 {
3717 *eq = 0; 3738 *eq = 0;
3718 set_utf8_property (display->atom (str), eq + 1); 3739 set_utf8_property (display->atom (str), eq + 1);
3719 } 3740 }
3720 else 3741 else
3721 XDeleteProperty (disp, TermWin.parent[0], 3742 XDeleteProperty (disp, parent[0],
3722 display->atom (str)); 3743 display->atom (str));
3723 } 3744 }
3724 break; 3745 break;
3725 3746
3726 case XTerm_Color: 3747 case XTerm_Color:
… …
3767 break; 3788 break;
3768#ifndef NO_BOLD_UNDERLINE_REVERSE 3789#ifndef NO_BOLD_UNDERLINE_REVERSE
3769 case XTerm_Color_BD: 3790 case XTerm_Color_BD:
3770 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3791 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3771 break; 3792 break;
3772 case XTerm_Color_IT:
3773 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3774 break;
3775 case XTerm_Color_UL: 3793 case XTerm_Color_UL:
3776 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3794 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3777 break; 3795 break;
3778 case XTerm_Color_RV: 3796 case XTerm_Color_RV:
3779 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3797 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3780 break; 3798 break;
3799 case URxvt_Color_IT:
3800 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3801 break;
3781#endif 3802#endif
3782#if TRANSPARENT && TINTING 3803#if TRANSPARENT && TINTING
3783 case XTerm_Color_tint: 3804 case URxvt_Color_tint:
3784 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3805 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3785 check_our_parents (); 3806 check_our_parents ();
3786 if (am_transparent) 3807 if (am_transparent)
3787 want_full_refresh = want_refresh = 1; 3808 want_full_refresh = want_refresh = 1;
3788 break; 3809 break;
3789#endif 3810#endif
… …
3823 3844
3824 case XTerm_logfile: 3845 case XTerm_logfile:
3825 // TODO, when secure mode? 3846 // TODO, when secure mode?
3826 break; 3847 break;
3827 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
3828 case XTerm_font: 3867 case XTerm_font:
3829 op = URxvt_font; 3868 op = URxvt_font;
3830 case URxvt_font: 3869 case URxvt_font:
3831#if ENABLE_STYLES 3870#if ENABLE_STYLES
3832 case URxvt_boldFont: 3871 case URxvt_boldFont:
3833 case URxvt_italicFont: 3872 case URxvt_italicFont:
3834 case URxvt_boldItalicFont: 3873 case URxvt_boldItalicFont:
3835#endif 3874#endif
3836 if (query) 3875 if (query)
3837 tt_printf ("\33]%d;%-.250s%c", saveop, 3876 tt_printf ("\33]%d;%-.250s%c", saveop,
3838 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3877 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3839 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3878 ? fontset[op - URxvt_font]->fontdesc : "",
3840 resp); 3879 resp);
3841 else 3880 else
3842 { 3881 {
3843 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3882 const char *&res = rs[Rs_font + (op - URxvt_font)];
3844 3883
… …
3847 set_fonts (); 3886 set_fonts ();
3848 } 3887 }
3849 break; 3888 break;
3850 3889
3851#if ENABLE_FRILLS 3890#if ENABLE_FRILLS
3852 case XTerm_locale: 3891 case URxvt_locale:
3853 if (query) 3892 if (query)
3854 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);
3855 else 3894 else
3856 { 3895 {
3857 set_locale (str); 3896 set_locale (str);
3858 pty.set_utf8_mode (enc_utf8); 3897 pty.set_utf8_mode (enc_utf8);
3859# ifdef USE_XIM
3860 im_cb (); 3898 init_xlocale ();
3861# endif
3862 } 3899 }
3863 break; 3900 break;
3864#endif
3865 3901
3866#ifdef MENUBAR 3902 case URxvt_view_up:
3867 case XTerm_Menu: 3903 case URxvt_view_down:
3868 if (options & Opt_insecure) 3904 int lines = atoi (str);
3869 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3905
3870 break; 3906 if (lines)
3871#endif 3907 scr_page (op == URxvt_view_up ? UP : DN, lines);
3872#if 0
3873 case XTerm_dumpscreen: /* no error notices */
3874 { 3908 else
3875 int fd;
3876 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3877 { 3909 {
3878 scr_dump (fd); 3910 scr_erase_savelines ();
3879 close (fd);
3880 } 3911 }
3881 } 3912
3882 break; 3913 break;
3883#endif 3914#endif
3884 } 3915 }
3885} 3916}
3886/*----------------------------------------------------------------------*/ 3917/*----------------------------------------------------------------------*/
… …
4019 */ 4050 */
4020 PrivMode (1, PrivMode_vt52); 4051 PrivMode (1, PrivMode_vt52);
4021 break; 4052 break;
4022 case 3: /* 80/132 */ 4053 case 3: /* 80/132 */
4023 if (priv_modes & PrivMode_132OK) 4054 if (priv_modes & PrivMode_132OK)
4024 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4055 set_widthheight (((state ? 132 : 80) * fwidth), height);
4025 break; 4056 break;
4026 case 4: /* smooth scrolling */ 4057 case 4: /* smooth scrolling */
4027 if (state) 4058 if (state)
4028 options &= ~Opt_jumpScroll; 4059 options &= ~Opt_jumpScroll;
4029 else 4060 else
… …
4346 } 4377 }
4347 4378
4348 memmove (v_buffer, v_buffer + written, v_buflen); 4379 memmove (v_buffer, v_buffer + written, v_buflen);
4349 } 4380 }
4350 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4381 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4351 // original code just ignores this... 4382 pty_ev.set (EVENT_READ);
4352 destroy ();
4353} 4383}
4354 4384
4355/*----------------------- end-of-file (C source) -----------------------*/ 4385/*----------------------- end-of-file (C source) -----------------------*/
4356 4386

Diff Legend

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