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

Diff Legend

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