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.216 by root, Tue Dec 27 01:25:42 2005 UTC

… …
135rxvt_term::iso14755_54 (int x, int y) 135rxvt_term::iso14755_54 (int x, int y)
136{ 136{
137 x = Pixel2Col (x); 137 x = Pixel2Col (x);
138 y = Pixel2Row (y); 138 y = Pixel2Row (y);
139 139
140 if (x < 0 || x >= TermWin.ncol 140 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= TermWin.nrow) 141 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 142 return;
143 143
144 for (;;) 144 for (;;)
145 { 145 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 146 const line_t &l = ROW(y - view_start);
147
148 text_t t = l.t[x];
147 149
148 if (t != NOCHAR || !x) 150 if (t != NOCHAR || !x)
149 { 151 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 152 iso14755_51 (l.t[x], l.r[x]);
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 char attr[80]; // plenty
189 191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 GET_FGCOLOR (r), GET_BGCOLOR (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
202 int width = wcswidth (fname, wcslen (fname));
203
204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr));
206
190 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 207 scr_overlay_new (0, -1, width, len + 2);
191 208
192 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 209 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193 210
194 for (int y = 0; y < len; y++) 211 for (int y = 0; y < len; y++)
195 { 212 {
… …
206#endif 223#endif
207 scr_overlay_set (11, y, ch, r); 224 scr_overlay_set (11, y, ch, r);
208 scr_overlay_set (12, y, NOCHAR, r); 225 scr_overlay_set (12, y, NOCHAR, r);
209 } 226 }
210 227
228 scr_overlay_set (0, len , attr);
211 scr_overlay_set (0, len, f->name); 229 scr_overlay_set (0, len + 1, fname);
230
231 free (fname);
212 232
213#if ENABLE_COMBINING 233#if ENABLE_COMBINING
214 if (alloc) 234 if (alloc)
215 delete [] alloc; 235 delete [] alloc;
216#endif 236#endif
… …
316 336
317 // the XOpenIM manpage lies about hardcoding the locale 337 // the XOpenIM manpage lies about hardcoding the locale
318 // at the point of XOpenIM, so temporarily switch locales 338 // at the point of XOpenIM, so temporarily switch locales
319 if (rs[Rs_imLocale]) 339 if (rs[Rs_imLocale])
320 SET_LOCALE (rs[Rs_imLocale]); 340 SET_LOCALE (rs[Rs_imLocale]);
341
321 // assume wchar_t == unicode or better 342 // assume wchar_t == unicode or better
322 len = XwcLookupString (Input_Context, &ev, wkbuf, 343 len = XwcLookupString (Input_Context, &ev, wkbuf,
323 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
345
324 if (rs[Rs_imLocale]) 346 if (rs[Rs_imLocale])
325 SET_LOCALE (locale); 347 SET_LOCALE (locale);
326 348
327 if (status_return == XLookupChars 349 if (status_return == XLookupChars
328 || status_return == XLookupBoth) 350 || status_return == XLookupBoth)
… …
360#ifdef KEYSYM_RESOURCE 382#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state)) 383 if (keyboard->dispatch (this, keysym, ev.state))
362 return; 384 return;
363#endif 385#endif
364 386
365 if (TermWin.saveLines) 387 if (saveLines)
366 { 388 {
367#ifdef UNSHIFTED_SCROLLKEYS 389#ifdef UNSHIFTED_SCROLLKEYS
368 if (!ctrl && !meta) 390 if (!ctrl && !meta)
369#else 391#else
370 if (IS_SCROLL_MOD) 392 if (IS_SCROLL_MOD)
371#endif 393#endif
372 { 394 {
373 int lnsppg; 395 int lnsppg;
374 396
375#ifdef PAGING_CONTEXT_LINES 397#ifdef PAGING_CONTEXT_LINES
376 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 398 lnsppg = nrow - PAGING_CONTEXT_LINES;
377#else 399#else
378 lnsppg = TermWin.nrow * 4 / 5; 400 lnsppg = nrow * 4 / 5;
379#endif 401#endif
380 if (keysym == XK_Prior) 402 if (keysym == XK_Prior)
381 { 403 {
382 scr_page (UP, lnsppg); 404 scr_page (UP, lnsppg);
383 return; 405 return;
… …
839 861
840 if (len <= 0) 862 if (len <= 0)
841 return; /* not mapped */ 863 return; /* not mapped */
842 864
843 if (options & Opt_scrollTtyKeypress) 865 if (options & Opt_scrollTtyKeypress)
844 if (TermWin.view_start) 866 if (view_start)
845 { 867 {
846 TermWin.view_start = 0; 868 view_start = 0;
847 want_refresh = 1; 869 want_refresh = 1;
848 } 870 }
849 871
850 /* 872 /*
851 * these modifications only affect the static keybuffer 873 * these modifications only affect the static keybuffer
… …
1028{ 1050{
1029 if (mouse_slip_wheel_speed == 0 1051 if (mouse_slip_wheel_speed == 0
1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1052 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1031 : scr_page (UP, mouse_slip_wheel_speed)) 1053 : scr_page (UP, mouse_slip_wheel_speed))
1032 { 1054 {
1033 if (TermWin.view_start == TermWin.nscrolled || 1055 if (view_start == nsaved ||
1034 TermWin.view_start == 0) 1056 view_start == 0)
1035 mouse_slip_wheel_speed = 0; 1057 mouse_slip_wheel_speed = 0;
1036 1058
1037 refresh_type |= SMOOTH_REFRESH; 1059 refresh_type |= SMOOTH_REFRESH;
1038 want_refresh = 1; 1060 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1061 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1061 if (n > 0) 1083 if (n > 0)
1062 { 1084 {
1063 cmdbuf_endp += n; 1085 cmdbuf_endp += n;
1064 return true; 1086 return true;
1065 } 1087 }
1066 else if (n < 0 && errno != EAGAIN) 1088 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
1089 {
1090 pty_ev.stop ();
1091
1092 if (!(options & Opt_hold))
1067 destroy (); 1093 destroy ();
1094 }
1068 1095
1069 return false; 1096 return false;
1070} 1097}
1071 1098
1072void 1099void
… …
1086} 1113}
1087 1114
1088void 1115void
1089rxvt_term::pointer_unblank () 1116rxvt_term::pointer_unblank ()
1090{ 1117{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1118 XDefineCursor (display->display, vt, TermWin_cursor);
1092 recolour_cursor (); 1119 recolour_cursor ();
1093 1120
1094#ifdef POINTER_BLANK 1121#ifdef POINTER_BLANK
1095 hidden_pointer = 0; 1122 hidden_pointer = 0;
1096 1123
… …
1104rxvt_term::pointer_blank () 1131rxvt_term::pointer_blank ()
1105{ 1132{
1106 if (! (options & Opt_pointerBlank)) 1133 if (! (options & Opt_pointerBlank))
1107 return; 1134 return;
1108 1135
1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1136 XDefineCursor (display->display, vt, display->blank_cursor);
1110 XFlush (display->display); 1137 XFlush (display->display);
1111 1138
1112 hidden_pointer = 1; 1139 hidden_pointer = 1;
1113} 1140}
1114 1141
… …
1330 button_release (ev.xbutton); 1357 button_release (ev.xbutton);
1331 break; 1358 break;
1332 1359
1333 case ClientMessage: 1360 case ClientMessage:
1334 if (ev.xclient.format == 32 1361 if (ev.xclient.format == 32
1362 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1363 {
1335 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1364 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1336 destroy (); 1365 destroy ();
1366#if ENABLE_EWMH
1367 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1368 XSendEvent (disp, ev.xclient.window = display->root,
1369 False, SubstructureRedirectMask | SubstructureNotifyMask,
1370 &ev);
1371#endif
1372 }
1373#if ENABLE_XEMBED
1374 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1375 {
1376 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1377 focus_in ();
1378 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1379 focus_out ();
1380 }
1381#endif
1337#ifdef OFFIX_DND 1382#ifdef OFFIX_DND
1338 /* OffiX Dnd (drag 'n' drop) protocol */ 1383 /* OffiX Dnd (drag 'n' drop) protocol */
1339 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1384 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1340 && (ev.xclient.data.l[0] == DndFile 1385 && (ev.xclient.data.l[0] == DndFile
1341 || ev.xclient.data.l[0] == DndDir 1386 || ev.xclient.data.l[0] == DndDir
1342 || ev.xclient.data.l[0] == DndLink)) 1387 || ev.xclient.data.l[0] == DndLink))
1343 { 1388 {
1344 /* Get Dnd data */ 1389 /* Get Dnd data */
1345 Atom ActualType; 1390 Atom ActualType;
1346 int ActualFormat; 1391 int ActualFormat;
1347 unsigned char *data; 1392 unsigned char *data;
… …
1390 break; 1435 break;
1391 } 1436 }
1392 break; 1437 break;
1393 1438
1394 case FocusIn: 1439 case FocusIn:
1395 if (!TermWin.focus) 1440 focus_in ();
1441 break;
1442
1443 case FocusOut:
1444 focus_out ();
1445 break;
1446
1447 case ConfigureNotify:
1448 if (ev.xconfigure.window == parent[0])
1396 { 1449 {
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)); 1450 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1451 ;
1464 1452
1465 if (szHint.width != width || szHint.height != height) 1453 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1466 { 1454 {
1467 seen_resize = 1; 1455 seen_resize = 1;
1468 resize_all_windows (width, height, 1); 1456 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1469 } 1457 }
1470 1458
1471#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1459#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1472 if (options & Opt_transparent) 1460 if (options & Opt_transparent)
1473 check_our_parents (); 1461 check_our_parents ();
… …
1494 case SelectionRequest: 1482 case SelectionRequest:
1495 selection_send (ev.xselectionrequest); 1483 selection_send (ev.xselectionrequest);
1496 break; 1484 break;
1497 1485
1498 case UnmapNotify: 1486 case UnmapNotify:
1499 TermWin.mapped = 0; 1487 mapped = 0;
1500#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1501 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1502#endif 1490#endif
1503 break; 1491 break;
1504 1492
1505 case MapNotify: 1493 case MapNotify:
1506 TermWin.mapped = 1; 1494 mapped = 1;
1507#ifdef TEXT_BLINK 1495#ifdef TEXT_BLINK
1508 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1496 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1509#endif 1497#endif
1510 break; 1498 break;
1511 1499
… …
1515 break; 1503 break;
1516#endif /* TRANSPARENT */ 1504#endif /* TRANSPARENT */
1517 1505
1518 case GraphicsExpose: 1506 case GraphicsExpose:
1519 case Expose: 1507 case Expose:
1520 if (ev.xany.window == TermWin.vt) 1508 if (ev.xany.window == vt)
1521 { 1509 {
1522 do 1510 do
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1511 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1512 ev.xexpose.width, ev.xexpose.height, False);
1525 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1513 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1526 1514
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1515 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528 1516
1529 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1517 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1518 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1519 ev.xexpose.width, ev.xexpose.height, False);
1532 1520
1533 scr_refresh (refresh_type); 1521 scr_refresh (refresh_type);
1534 } 1522 }
… …
1550 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1538 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1551 menubar_expose (); 1539 menubar_expose ();
1552#endif 1540#endif
1553 1541
1554#ifdef TRANSPARENT 1542#ifdef TRANSPARENT
1555 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1543 if (am_transparent && ev.xany.window == parent[0])
1556 XClearWindow (disp, ev.xany.window); 1544 XClearWindow (disp, ev.xany.window);
1557#endif 1545#endif
1558 } 1546 }
1559 break; 1547 break;
1560 1548
… …
1571 } 1559 }
1572#endif 1560#endif
1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1561 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1574 break; 1562 break;
1575 1563
1576 if (ev.xany.window == TermWin.vt) 1564 if (ev.xany.window == vt)
1577 { 1565 {
1578 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1566 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1579 { 1567 {
1580 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1568 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1581 ; 1569 ;
1582 1570
1583 XQueryPointer (disp, TermWin.vt, 1571 XQueryPointer (disp, vt,
1584 &unused_root, &unused_child, 1572 &unused_root, &unused_child,
1585 &unused_root_x, &unused_root_y, 1573 &unused_root_x, &unused_root_y,
1586 &ev.xbutton.x, &ev.xbutton.y, 1574 &ev.xbutton.x, &ev.xbutton.y,
1587 &ev.xbutton.state); 1575 &ev.xbutton.state);
1588#ifdef MOUSE_THRESHOLD 1576#ifdef MOUSE_THRESHOLD
… …
1600#endif 1588#endif
1601 selection_extend (ev.xbutton.x, ev.xbutton.y, 1589 selection_extend (ev.xbutton.x, ev.xbutton.y,
1602 ev.xbutton.state & Button3Mask ? 2 : 0); 1590 ev.xbutton.state & Button3Mask ? 2 : 0);
1603 1591
1604#ifdef SELECTION_SCROLLING 1592#ifdef SELECTION_SCROLLING
1605 if (ev.xbutton.y < TermWin.int_bwidth 1593 if (ev.xbutton.y < int_bwidth
1606 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1594 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1607 { 1595 {
1608 int dist; 1596 int dist;
1609 1597
1610 /* don't clobber the current delay if we are 1598 /* don't clobber the current delay if we are
1611 * already in the middle of scrolling. 1599 * already in the middle of scrolling.
… …
1619 selection_save_x = ev.xbutton.x; 1607 selection_save_x = ev.xbutton.x;
1620 selection_save_y = ev.xbutton.y; 1608 selection_save_y = ev.xbutton.y;
1621 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1609 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1622 1610
1623 /* calc number of lines to scroll */ 1611 /* calc number of lines to scroll */
1624 if (ev.xbutton.y < TermWin.int_bwidth) 1612 if (ev.xbutton.y < int_bwidth)
1625 { 1613 {
1626 scroll_selection_dir = UP; 1614 scroll_selection_dir = UP;
1627 dist = TermWin.int_bwidth - ev.xbutton.y; 1615 dist = int_bwidth - ev.xbutton.y;
1628 } 1616 }
1629 else 1617 else
1630 { 1618 {
1631 scroll_selection_dir = DN; 1619 scroll_selection_dir = DN;
1632 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1620 dist = ev.xbutton.y - (int_bwidth + height);
1633 } 1621 }
1634 1622
1635 scroll_selection_lines = Pixel2Height (dist) 1623 scroll_selection_lines = Pixel2Height (dist)
1636 / SELECTION_SCROLL_LINE_SPEEDUP 1624 / SELECTION_SCROLL_LINE_SPEEDUP
1637 + 1; 1625 + 1;
1638 MIN_IT (scroll_selection_lines, 1626 min_it (scroll_selection_lines,
1639 SELECTION_SCROLL_MAX_LINES); 1627 SELECTION_SCROLL_MAX_LINES);
1640 } 1628 }
1641 else 1629 else
1642 { 1630 {
1643 /* we are within the text window, so we 1631 /* we are within the text window, so we
… …
1671 } 1659 }
1672 break; 1660 break;
1673 } 1661 }
1674} 1662}
1675 1663
1664void
1665rxvt_term::focus_in ()
1666{
1667 if (!focus)
1668 {
1669 focus = 1;
1670 want_refresh = 1;
1671#if USE_XIM
1672 if (Input_Context != NULL)
1673 {
1674 IMSetStatusPosition ();
1675 XSetICFocus (Input_Context);
1676 }
1677#endif
1678#if CURSOR_BLINK
1679 if (options & Opt_cursorBlink)
1680 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1681#endif
1682#if OFF_FOCUS_FADING
1683 if (rs[Rs_fade])
1684 {
1685 pix_colors = pix_colors_focused;
1686 scr_recolour ();
1687 }
1688#endif
1689 }
1690}
1691
1692void
1693rxvt_term::focus_out ()
1694{
1695 if (focus)
1696 {
1697 focus = 0;
1698 want_refresh = 1;
1699
1700#if ENABLE_FRILLS || ISO_14755
1701 iso14755buf = 0;
1702#endif
1703#if ENABLE_OVERLAY
1704 scr_overlay_off ();
1705#endif
1706#if USE_XIM
1707 if (Input_Context != NULL)
1708 XUnsetICFocus (Input_Context);
1709#endif
1710#if CURSOR_BLINK
1711 if (options & Opt_cursorBlink)
1712 cursor_blink_ev.stop ();
1713 hidden_cursor = 0;
1714#endif
1715#if OFF_FOCUS_FADING
1716 if (rs[Rs_fade])
1717 {
1718 pix_colors = pix_colors_unfocused;
1719 scr_recolour ();
1720 }
1721#endif
1722 }
1723}
1724
1676#if TRANSPARENT 1725#if TRANSPARENT
1677void 1726void
1678rxvt_term::rootwin_cb (XEvent &ev) 1727rxvt_term::rootwin_cb (XEvent &ev)
1679{ 1728{
1680 SET_R (this); 1729 SET_R (this);
… …
1710 reportmode = !! (priv_modes & PrivMode_mouse_report); 1759 reportmode = !! (priv_modes & PrivMode_mouse_report);
1711 1760
1712 /* 1761 /*
1713 * VT window processing of button press 1762 * VT window processing of button press
1714 */ 1763 */
1715 if (ev.window == TermWin.vt) 1764 if (ev.window == vt)
1716 { 1765 {
1717#if ISO_14755 1766#if ISO_14755
1718 // 5.4 1767 // 5.4
1719 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1768 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1720 { 1769 {
… …
1925 case Button3: 1974 case Button3:
1926 if (scrollBar.style != R_SB_XTERM) 1975 if (scrollBar.style != R_SB_XTERM)
1927 { 1976 {
1928 if (scrollbar_above_slider (ev.y)) 1977 if (scrollbar_above_slider (ev.y))
1929# ifdef RXVT_SCROLL_FULL 1978# ifdef RXVT_SCROLL_FULL
1930 scr_page (UP, TermWin.nrow - 1); 1979 scr_page (UP, nrow - 1);
1931# else 1980# else
1932 scr_page (UP, TermWin.nrow / 4); 1981 scr_page (UP, nrow / 4);
1933# endif 1982# endif
1934 else if (scrollbar_below_slider (ev.y)) 1983 else if (scrollbar_below_slider (ev.y))
1935# ifdef RXVT_SCROLL_FULL 1984# ifdef RXVT_SCROLL_FULL
1936 scr_page (DN, TermWin.nrow - 1); 1985 scr_page (DN, nrow - 1);
1937# else 1986# else
1938 scr_page (DN, TermWin.nrow / 4); 1987 scr_page (DN, nrow / 4);
1939# endif 1988# endif
1940 else 1989 else
1941 scrollBar.setMotion (); 1990 scrollBar.setMotion ();
1942 } 1991 }
1943 else 1992 else
1944 { 1993 {
1945 scr_page ((ev.button == Button1 ? DN : UP), 1994 scr_page ((ev.button == Button1 ? DN : UP),
1946 (TermWin.nrow 1995 (nrow
1947 * scrollbar_position (ev.y) 1996 * scrollbar_position (ev.y)
1948 / scrollbar_size ())); 1997 / scrollbar_size ()));
1949 } 1998 }
1950 1999
1951 break; 2000 break;
… …
1983#ifdef SELECTION_SCROLLING 2032#ifdef SELECTION_SCROLLING
1984 if (sel_scroll_ev.active) 2033 if (sel_scroll_ev.active)
1985 sel_scroll_ev.stop(); 2034 sel_scroll_ev.stop();
1986#endif 2035#endif
1987 2036
1988 if (ev.window == TermWin.vt) 2037 if (ev.window == vt)
1989 { 2038 {
1990#if ISO_14755 2039#if ISO_14755
1991 // 5.4 2040 // 5.4
1992 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2041 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1993 return; 2042 return;
… …
2044 v = ev.button == Button4 ? UP : DN; 2093 v = ev.button == Button4 ? UP : DN;
2045 2094
2046 if (ev.state & ShiftMask) 2095 if (ev.state & ShiftMask)
2047 i = 1; 2096 i = 1;
2048 else if (options & Opt_mouseWheelScrollPage) 2097 else if (options & Opt_mouseWheelScrollPage)
2049 i = TermWin.nrow - 1; 2098 i = nrow - 1;
2050 else 2099 else
2051 i = 5; 2100 i = 5;
2052 2101
2053# ifdef MOUSE_SLIP_WHEELING 2102# ifdef MOUSE_SLIP_WHEELING
2054 if (ev.state & ControlMask) 2103 if (ev.state & ControlMask)
2055 { 2104 {
2056 mouse_slip_wheel_speed += v ? -1 : 1; 2105 mouse_slip_wheel_speed += v ? -1 : 1;
2057 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2106 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; 2107 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2059 2108
2060 if (slip_wheel_ev.at < NOW) 2109 if (slip_wheel_ev.at < NOW)
2061 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2110 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2062 2111
2063 slip_wheel_ev.start (); 2112 slip_wheel_ev.start ();
… …
2345 return pchanged; /* Don't try any more */ 2394 return pchanged; /* Don't try any more */
2346 2395
2347 XGetWindowAttributes (disp, display->root, &wrootattr); 2396 XGetWindowAttributes (disp, display->root, &wrootattr);
2348 rootdepth = wrootattr.depth; 2397 rootdepth = wrootattr.depth;
2349 2398
2350 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2399 XGetWindowAttributes (disp, parent[0], &wattr);
2351 2400
2352 if (rootdepth != wattr.depth) 2401 if (rootdepth != wattr.depth)
2353 { 2402 {
2354 if (am_transparent) 2403 if (am_transparent)
2355 { 2404 {
2356 pchanged = 1; 2405 pchanged = 1;
2357 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2406 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2358 am_transparent = am_pixmap_trans = 0; 2407 am_transparent = am_pixmap_trans = 0;
2359 } 2408 }
2360 2409
2361 return pchanged; /* Don't try any more */ 2410 return pchanged; /* Don't try any more */
2362 } 2411 }
… …
2403 Window cr; 2452 Window cr;
2404 XImage *image; 2453 XImage *image;
2405 GC gc; 2454 GC gc;
2406 XGCValues gcvalue; 2455 XGCValues gcvalue;
2407 2456
2408 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2457 XTranslateCoordinates (disp, parent[0], display->root,
2409 0, 0, &sx, &sy, &cr); 2458 0, 0, &sx, &sy, &cr);
2410 nw = (unsigned int)szHint.width; 2459 nw = (unsigned int)szHint.width;
2411 nh = (unsigned int)szHint.height; 2460 nh = (unsigned int)szHint.height;
2412 nx = ny = 0; 2461 nx = ny = 0;
2413 2462
… …
2423 nh += sy; 2472 nh += sy;
2424 ny = -sy; 2473 ny = -sy;
2425 sy = 0; 2474 sy = 0;
2426 } 2475 }
2427 2476
2428 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2477 min_it (nw, (unsigned int) (wrootattr.width - sx));
2429 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2478 min_it (nh, (unsigned int) (wrootattr.height - sy));
2430 2479
2431 XSync (disp, False); 2480 XSync (disp, False);
2432 allowedxerror = -1; 2481 allowedxerror = -1;
2433 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2482 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2434 2483
… …
2439 if (image == NULL) 2488 if (image == NULL)
2440 { 2489 {
2441 if (am_transparent && am_pixmap_trans) 2490 if (am_transparent && am_pixmap_trans)
2442 { 2491 {
2443 pchanged = 1; 2492 pchanged = 1;
2444 if (TermWin.pixmap != None) 2493 if (pixmap != None)
2445 { 2494 {
2446 XFreePixmap (disp, TermWin.pixmap); 2495 XFreePixmap (disp, pixmap);
2447 TermWin.pixmap = None; 2496 pixmap = None;
2448 } 2497 }
2449 } 2498 }
2450 2499
2451 am_pixmap_trans = 0; 2500 am_pixmap_trans = 0;
2452 } 2501 }
2453 else 2502 else
2454 { 2503 {
2455 if (TermWin.pixmap != None) 2504 if (pixmap != None)
2456 XFreePixmap (disp, TermWin.pixmap); 2505 XFreePixmap (disp, pixmap);
2457 2506
2458#if TINTING 2507#if TINTING
2459 if (ISSET_PIXCOLOR (Color_tint)) 2508 if (ISSET_PIXCOLOR (Color_tint))
2460 { 2509 {
2461 unsigned short rm, gm, bm; 2510 unsigned short rm, gm, bm;
… …
2465 2514
2466 ShadeXImage (display, image, shade, rm, gm, bm); 2515 ShadeXImage (display, image, shade, rm, gm, bm);
2467 } 2516 }
2468#endif 2517#endif
2469 2518
2470 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2519 pixmap = XCreatePixmap (disp, vt,
2471 szHint.width, szHint.height, image->depth); 2520 szHint.width, szHint.height, image->depth);
2472 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2521 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2473 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2522 XPutImage (disp, pixmap, gc, image, 0, 0,
2474 nx, ny, image->width, image->height); 2523 nx, ny, image->width, image->height);
2475 XFreeGC (disp, gc); 2524 XFreeGC (disp, gc);
2476 XDestroyImage (image); 2525 XDestroyImage (image);
2477 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2526 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2478 XClearWindow (disp, TermWin.parent[0]); 2527 XClearWindow (disp, parent[0]);
2479 2528
2480 if (!am_transparent || !am_pixmap_trans) 2529 if (!am_transparent || !am_pixmap_trans)
2481 pchanged = 1; 2530 pchanged = 1;
2482 2531
2483 am_transparent = am_pixmap_trans = 1; 2532 am_transparent = am_pixmap_trans = 1;
2484 } 2533 }
2485 } 2534 }
2486 2535
2487 if (am_pixmap_trans) 2536 if (am_pixmap_trans)
2488 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2537 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2489 else 2538 else
2490 { 2539 {
2491 unsigned int n; 2540 unsigned int n;
2492 /* 2541 /*
2493 * InheritPixmap transparency 2542 * InheritPixmap transparency
2494 */ 2543 */
2495 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2544 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2496 { 2545 {
2497 oldp = TermWin.parent[i]; 2546 oldp = parent[i];
2498 XQueryTree (disp, TermWin.parent[i - 1], &root, 2547 XQueryTree (disp, parent[i - 1], &root,
2499 &TermWin.parent[i], &list, &n); 2548 &parent[i], &list, &n);
2500 XFree (list); 2549 XFree (list);
2501 2550
2502 if (TermWin.parent[i] == display->root) 2551 if (parent[i] == display->root)
2503 { 2552 {
2504 if (oldp != None) 2553 if (oldp != None)
2505 pchanged = 1; 2554 pchanged = 1;
2506 2555
2507 break; 2556 break;
2508 } 2557 }
2509 2558
2510 if (oldp != TermWin.parent[i]) 2559 if (oldp != parent[i])
2511 pchanged = 1; 2560 pchanged = 1;
2512 } 2561 }
2513 2562
2514 n = 0; 2563 n = 0;
2515 2564
2516 if (pchanged) 2565 if (pchanged)
2517 { 2566 {
2518 for (; n < (unsigned int)i; n++) 2567 for (; n < (unsigned int)i; n++)
2519 { 2568 {
2520 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2569 XGetWindowAttributes (disp, parent[n], &wattr);
2521 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2570 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2522 { 2571 {
2523 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2572 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2524 break; 2573 break;
2525 } 2574 }
2526 } 2575 }
2527 } 2576 }
2528 2577
2529 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2578 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2530 { 2579 {
2531 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2580 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2532 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2581 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2533 am_transparent = 0; 2582 am_transparent = 0;
2534 /* XXX: also turn off Opt_transparent? */ 2583 /* XXX: also turn off Opt_transparent? */
2535 } 2584 }
2536 else 2585 else
2537 { 2586 {
… …
2540 * needed for fvwm2.2.2 (and before?) */ 2589 * needed for fvwm2.2.2 (and before?) */
2541 sleep (1); 2590 sleep (1);
2542#endif 2591#endif
2543 for (n = 0; n < (unsigned int)i; n++) 2592 for (n = 0; n < (unsigned int)i; n++)
2544 { 2593 {
2545 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2594 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2546 XClearWindow (disp, TermWin.parent[n]); 2595 XClearWindow (disp, parent[n]);
2547 } 2596 }
2548 2597
2549 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2598 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2550 am_transparent = 1; 2599 am_transparent = 1;
2551 } 2600 }
2552 2601
2553 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2602 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2554 TermWin.parent[i] = None; 2603 parent[i] = None;
2555 } 2604 }
2556 2605
2557 if (scrollBar.win) 2606 if (scrollBar.win)
2558 { 2607 {
2559 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2608 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2602 // some window managers resize the window early, and these programs 2651 // some window managers resize the window early, and these programs
2603 // then sometimes get the size wrong. 2652 // then sometimes get the size wrong.
2604 // unfortunately other programs are even more buggy and dislike 2653 // unfortunately other programs are even more buggy and dislike
2605 // being sent SIGWINCH, so only do it when we were in fact being 2654 // being sent SIGWINCH, so only do it when we were in fact being
2606 // resized. 2655 // resized.
2607 if (seen_resize) 2656 if (seen_resize && cmd_pid)
2608 kill (-cmd_pid, SIGWINCH); 2657 kill (-cmd_pid, SIGWINCH);
2609 } 2658 }
2610 2659
2611 /* Read a text string from the input buffer */ 2660 /* Read a text string from the input buffer */
2612 unicode_t buf[UBUFSIZ]; 2661 unicode_t buf[UBUFSIZ];
2613 bool refreshnow = false; 2662 bool refreshnow = false;
2614 int nlines = 0; 2663 int nlines = 0;
2615 unicode_t *str = buf; 2664 unicode_t *str = buf;
2665 unicode_t *eol = str + min (ncol, UBUFSIZ);
2616 2666
2617 for (;;) 2667 for (;;)
2618 { 2668 {
2619 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2669 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2620 break; 2670 break;
2621 2671
2622 *str++ = ch; 2672 *str++ = ch;
2623 2673
2624 if (ch == C0_LF) 2674 if (ch == C0_LF || str >= eol)
2625 { 2675 {
2676 if (ch == C0_LF)
2626 nlines++; 2677 nlines++;
2678
2627 refresh_count++; 2679 refresh_count++;
2628 2680
2629 if (!(options & Opt_jumpScroll) 2681 if (!(options & Opt_jumpScroll)
2630 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2682 || (refresh_count >= refresh_limit * (nrow - 1)))
2631 { 2683 {
2632 refreshnow = true; 2684 refreshnow = true;
2633 ch = NOCHAR; 2685 ch = NOCHAR;
2634 break; 2686 break;
2635 } 2687 }
2636 2688
2637 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2689 // scr_add_lines only works for nlines <= nrow - 1.
2638 if (nlines >= TermWin.nrow - 1) 2690 if (nlines >= nrow - 1)
2639 { 2691 {
2640 scr_add_lines (buf, nlines, str - buf); 2692 scr_add_lines (buf, nlines, str - buf);
2641 nlines = 0; 2693 nlines = 0;
2642 str = buf; 2694 str = buf;
2695 eol = str + min (ncol, UBUFSIZ);
2643 } 2696 }
2644 }
2645 2697
2646 if (str >= buf + UBUFSIZ) 2698 if (str >= eol)
2647 { 2699 {
2700 if (eol >= buf + UBUFSIZ)
2701 {
2648 ch = NOCHAR; 2702 ch = NOCHAR;
2649 break; 2703 break;
2704 }
2705 else
2706 eol = min (eol + ncol, buf + UBUFSIZ);
2707 }
2708
2650 } 2709 }
2651 2710
2652 seq_begin = cmdbuf_ptr; 2711 seq_begin = cmdbuf_ptr;
2653 ch = next_char (); 2712 ch = next_char ();
2654 } 2713 }
… …
3313 3372
3314 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3373 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3315 arg[0] = -arg[0]; 3374 arg[0] = -arg[0];
3316 /* FALLTHROUGH */ 3375 /* FALLTHROUGH */
3317 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3376 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3318 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3377 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3319 break; 3378 break;
3320 3379
3321 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3380 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3322 tt_write ((const unsigned char *)VT100_ANS, 3381 tt_write ((const unsigned char *)VT100_ANS,
3323 (unsigned int) (sizeof (VT100_ANS) - 1)); 3382 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3448 { 3507 {
3449 /* 3508 /*
3450 * commands 3509 * commands
3451 */ 3510 */
3452 case 1: /* deiconify window */ 3511 case 1: /* deiconify window */
3453 XMapWindow (disp, TermWin.parent[0]); 3512 XMapWindow (disp, parent[0]);
3454 break; 3513 break;
3455 case 2: /* iconify window */ 3514 case 2: /* iconify window */
3456 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3515 XIconifyWindow (disp, parent[0], display->screen);
3457 break; 3516 break;
3458 case 3: /* set position (pixels) */ 3517 case 3: /* set position (pixels) */
3459 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3518 XMoveWindow (disp, parent[0], args[1], args[2]);
3460 break; 3519 break;
3461 case 4: /* set size (pixels) */ 3520 case 4: /* set size (pixels) */
3462 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3521 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3463 break; 3522 break;
3464 case 5: /* raise window */ 3523 case 5: /* raise window */
3465 XRaiseWindow (disp, TermWin.parent[0]); 3524 XRaiseWindow (disp, parent[0]);
3466 break; 3525 break;
3467 case 6: /* lower window */ 3526 case 6: /* lower window */
3468 XLowerWindow (disp, TermWin.parent[0]); 3527 XLowerWindow (disp, parent[0]);
3469 break; 3528 break;
3470 case 7: /* refresh window */ 3529 case 7: /* refresh window */
3471 scr_touch (true); 3530 scr_touch (true);
3472 break; 3531 break;
3473 case 8: /* set size (chars) */ 3532 case 8: /* set size (chars) */
3474 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3533 set_widthheight ((unsigned int) (args[2] * fwidth),
3475 (unsigned int) (args[1] * TermWin.fheight)); 3534 (unsigned int) (args[1] * fheight));
3476 break; 3535 break;
3477 3536
3478 //case 9: NYI, TODO, restore maximized window or maximize window 3537 //case 9: NYI, TODO, restore maximized window or maximize window
3479 default: 3538 default:
3480 if (args[0] >= 24) /* set height (chars) */ 3539 if (args[0] >= 24) /* set height (chars) */
3481 set_widthheight ((unsigned int)TermWin.width, 3540 set_widthheight ((unsigned int)width,
3482 (unsigned int) (args[1] * TermWin.fheight)); 3541 (unsigned int) (args[1] * fheight));
3483 break; 3542 break;
3484 3543
3485 3544
3486 /* 3545 /*
3487 * reports - some output format copied from XTerm 3546 * reports - some output format copied from XTerm
3488 */ 3547 */
3489 case 11: /* report window state */ 3548 case 11: /* report window state */
3490 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3549 XGetWindowAttributes (disp, parent[0], &wattr);
3491 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3550 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3492 break; 3551 break;
3493 case 13: /* report window position */ 3552 case 13: /* report window position */
3494 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3553 XGetWindowAttributes (disp, parent[0], &wattr);
3495 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3554 XTranslateCoordinates (disp, parent[0], wattr.root,
3496 -wattr.border_width, -wattr.border_width, 3555 -wattr.border_width, -wattr.border_width,
3497 &x, &y, &wdummy); 3556 &x, &y, &wdummy);
3498 tt_printf ("\033[3;%d;%dt", x, y); 3557 tt_printf ("\033[3;%d;%dt", x, y);
3499 break; 3558 break;
3500 case 14: /* report window size (pixels) */ 3559 case 14: /* report window size (pixels) */
3501 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3560 XGetWindowAttributes (disp, parent[0], &wattr);
3502 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3561 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3503 break; 3562 break;
3504 case 18: /* report text area size (chars) */ 3563 case 18: /* report text area size (chars) */
3505 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3564 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3506 break; 3565 break;
3507 case 19: /* report window size (chars) */ 3566 case 19: /* report window size (chars) */
3508 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3567 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3509 break; 3568 break;
3510 case 20: /* report icon label */ 3569 case 20: /* report icon label */
3511 { 3570 {
3512 char *s; 3571 char *s;
3513 XGetIconName (disp, TermWin.parent[0], &s); 3572 XGetIconName (disp, parent[0], &s);
3514 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3573 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3515 XFree (s); 3574 XFree (s);
3516 } 3575 }
3517 break; 3576 break;
3518 case 21: /* report window title */ 3577 case 21: /* report window title */
3519 { 3578 {
3520 char *s; 3579 char *s;
3521 XFetchName (disp, TermWin.parent[0], &s); 3580 XFetchName (disp, parent[0], &s);
3522 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3581 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3523 XFree (s); 3582 XFree (s);
3524 } 3583 }
3525 break; 3584 break;
3526 } 3585 }
… …
3559 else if (ch < 0x20) 3618 else if (ch < 0x20)
3560 return NULL; /* other control character - exit */ 3619 return NULL; /* other control character - exit */
3561 3620
3562 seen_esc = false; 3621 seen_esc = false;
3563 3622
3564 if (n >= sizeof (string) - 1) 3623 if (n >= STRING_MAX - 1)
3565 // stop at some sane length 3624 // stop at some sane length
3566 return NULL; 3625 return NULL;
3567 3626
3568 if (ch == C0_SYN) 3627 if (ch == C0_SYN)
3569 string[n++] = cmd_get8 (); 3628 string[n++] = cmd_get8 ();
… …
3637 set_window_color (color, str); 3696 set_window_color (color, str);
3638} 3697}
3639 3698
3640/* 3699/*
3641 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3700 * 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 */ 3701 */
3665void 3702void
3666rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3703rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3667{ 3704{
3668 int changed = 0; 3705 int changed = 0;
… …
3694 unsigned long bytes_after; 3731 unsigned long bytes_after;
3695 unsigned char *value = 0; 3732 unsigned char *value = 0;
3696 const char *str = ""; 3733 const char *str = "";
3697 3734
3698 if (prop 3735 if (prop
3699 && XGetWindowProperty (disp, TermWin.parent[0], 3736 && XGetWindowProperty (disp, parent[0],
3700 prop, 0, 1<<16, 0, AnyPropertyType, 3737 prop, 0, 1<<16, 0, AnyPropertyType,
3701 &actual_type, &actual_format, 3738 &actual_type, &actual_format,
3702 &nitems, &bytes_after, &value) == Success 3739 &nitems, &bytes_after, &value) == Success
3703 && actual_type != None 3740 && actual_type != None
3704 && actual_format == 8) 3741 && actual_format == 8)
… …
3716 { 3753 {
3717 *eq = 0; 3754 *eq = 0;
3718 set_utf8_property (display->atom (str), eq + 1); 3755 set_utf8_property (display->atom (str), eq + 1);
3719 } 3756 }
3720 else 3757 else
3721 XDeleteProperty (disp, TermWin.parent[0], 3758 XDeleteProperty (disp, parent[0],
3722 display->atom (str)); 3759 display->atom (str));
3723 } 3760 }
3724 break; 3761 break;
3725 3762
3726 case XTerm_Color: 3763 case XTerm_Color:
… …
3767 break; 3804 break;
3768#ifndef NO_BOLD_UNDERLINE_REVERSE 3805#ifndef NO_BOLD_UNDERLINE_REVERSE
3769 case XTerm_Color_BD: 3806 case XTerm_Color_BD:
3770 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3807 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3771 break; 3808 break;
3772 case XTerm_Color_IT:
3773 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3774 break;
3775 case XTerm_Color_UL: 3809 case XTerm_Color_UL:
3776 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3810 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3777 break; 3811 break;
3778 case XTerm_Color_RV: 3812 case XTerm_Color_RV:
3779 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3813 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3780 break; 3814 break;
3815 case URxvt_Color_IT:
3816 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3817 break;
3781#endif 3818#endif
3782#if TRANSPARENT && TINTING 3819#if TRANSPARENT && TINTING
3783 case XTerm_Color_tint: 3820 case URxvt_Color_tint:
3784 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3821 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3785 check_our_parents (); 3822 check_our_parents ();
3786 if (am_transparent) 3823 if (am_transparent)
3787 want_full_refresh = want_refresh = 1; 3824 want_full_refresh = want_refresh = 1;
3788 break; 3825 break;
3789#endif 3826#endif
… …
3823 3860
3824 case XTerm_logfile: 3861 case XTerm_logfile:
3825 // TODO, when secure mode? 3862 // TODO, when secure mode?
3826 break; 3863 break;
3827 3864
3865#ifdef MENUBAR
3866 case URxvt_Menu:
3867 if (options & Opt_insecure)
3868 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3869 break;
3870#endif
3871#if 0
3872 case XTerm_dumpscreen: /* no error notices */
3873 {
3874 int fd;
3875 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3876 {
3877 scr_dump (fd);
3878 close (fd);
3879 }
3880 }
3881 break;
3882#endif
3828 case XTerm_font: 3883 case XTerm_font:
3829 op = URxvt_font; 3884 op = URxvt_font;
3830 case URxvt_font: 3885 case URxvt_font:
3831#if ENABLE_STYLES 3886#if ENABLE_STYLES
3832 case URxvt_boldFont: 3887 case URxvt_boldFont:
3833 case URxvt_italicFont: 3888 case URxvt_italicFont:
3834 case URxvt_boldItalicFont: 3889 case URxvt_boldItalicFont:
3835#endif 3890#endif
3836 if (query) 3891 if (query)
3837 tt_printf ("\33]%d;%-.250s%c", saveop, 3892 tt_printf ("\33]%d;%-.250s%c", saveop,
3838 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3893 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3839 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3894 ? fontset[op - URxvt_font]->fontdesc : "",
3840 resp); 3895 resp);
3841 else 3896 else
3842 { 3897 {
3843 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3898 const char *&res = rs[Rs_font + (op - URxvt_font)];
3844 3899
… …
3847 set_fonts (); 3902 set_fonts ();
3848 } 3903 }
3849 break; 3904 break;
3850 3905
3851#if ENABLE_FRILLS 3906#if ENABLE_FRILLS
3852 case XTerm_locale: 3907 case URxvt_locale:
3853 if (query) 3908 if (query)
3854 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3909 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3855 else 3910 else
3856 { 3911 {
3857 set_locale (str); 3912 set_locale (str);
3858 pty.set_utf8_mode (enc_utf8); 3913 pty.set_utf8_mode (enc_utf8);
3859# ifdef USE_XIM
3860 im_cb (); 3914 init_xlocale ();
3861# endif
3862 } 3915 }
3863 break; 3916 break;
3864#endif
3865 3917
3866#ifdef MENUBAR 3918 case URxvt_view_up:
3867 case XTerm_Menu: 3919 case URxvt_view_down:
3868 if (options & Opt_insecure) 3920 int lines = atoi (str);
3869 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3921
3870 break; 3922 if (lines)
3871#endif 3923 scr_page (op == URxvt_view_up ? UP : DN, lines);
3872#if 0
3873 case XTerm_dumpscreen: /* no error notices */
3874 { 3924 else
3875 int fd;
3876 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3877 { 3925 {
3878 scr_dump (fd); 3926 scr_erase_savelines ();
3879 close (fd);
3880 } 3927 }
3881 } 3928
3882 break; 3929 break;
3883#endif 3930#endif
3884 } 3931 }
3885} 3932}
3886/*----------------------------------------------------------------------*/ 3933/*----------------------------------------------------------------------*/
… …
4019 */ 4066 */
4020 PrivMode (1, PrivMode_vt52); 4067 PrivMode (1, PrivMode_vt52);
4021 break; 4068 break;
4022 case 3: /* 80/132 */ 4069 case 3: /* 80/132 */
4023 if (priv_modes & PrivMode_132OK) 4070 if (priv_modes & PrivMode_132OK)
4024 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4071 set_widthheight (((state ? 132 : 80) * fwidth), height);
4025 break; 4072 break;
4026 case 4: /* smooth scrolling */ 4073 case 4: /* smooth scrolling */
4027 if (state) 4074 if (state)
4028 options &= ~Opt_jumpScroll; 4075 options &= ~Opt_jumpScroll;
4029 else 4076 else
… …
4346 } 4393 }
4347 4394
4348 memmove (v_buffer, v_buffer + written, v_buflen); 4395 memmove (v_buffer, v_buffer + written, v_buflen);
4349 } 4396 }
4350 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4397 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4351 // original code just ignores this... 4398 pty_ev.set (EVENT_READ);
4352 destroy ();
4353} 4399}
4354 4400
4355/*----------------------- end-of-file (C source) -----------------------*/ 4401/*----------------------- end-of-file (C source) -----------------------*/
4356 4402

Diff Legend

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