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.269 by root, Tue Jan 17 12:22:59 2006 UTC vs.
Revision 1.301 by root, Tue Jan 31 21:23:13 2006 UTC

… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
64 59
65/*----------------------------------------------------------------------*/ 60/*----------------------------------------------------------------------*/
66 61
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 63
72#if ENABLE_FRILLS || ISO_14755 64#if ENABLE_FRILLS || ISO_14755
73 65
74#define ISO_14755_STARTED 0x80000000UL 66#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 67#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
230# if !UNICODE3 222# if !UNICODE3
231 if (ch >= 0x10000) 223 if (ch >= 0x10000)
232 ch = 0xfffd; 224 ch = 0xfffd;
233# endif 225# endif
234 scr_overlay_set (11, y, ch, r); 226 scr_overlay_set (11, y, ch, r);
227
228 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 229 scr_overlay_set (12, y, NOCHAR, r);
236 } 230 }
237 231
232// {
233// char buf[4+4+3+1];
234// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
235// scr_overlay_set (0, 0, buf);
236// }
238 scr_overlay_set (0, len , attr); 237 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 238 scr_overlay_set (0, len + 1, fname);
240 239
241 free (fname); 240 free (fname);
242 241
… …
302rxvt_term::lookup_key (XKeyEvent &ev) 301rxvt_term::lookup_key (XKeyEvent &ev)
303{ 302{
304 int ctrl, meta, shft, len; 303 int ctrl, meta, shft, len;
305 unsigned int newlen; 304 unsigned int newlen;
306 KeySym keysym; 305 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 306 int valid_keysym;
311 char kbuf[KBUFSZ]; 307 char kbuf[KBUFSZ];
312 308
313 /* 309 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 310 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
… …
464 { 460 {
465 switch (keysym) 461 switch (keysym)
466 { 462 {
467 /* normal XTerm key bindings */ 463 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 464 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 465 selection_request (ev.time);
470 return; 466 return;
471#if TODO 467#if TODO
472 /* rxvt extras */ 468 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 469 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 470 change_font (FONT_UP);
… …
905 { 901 {
906 const char ch = C0_ESC; 902 const char ch = C0_ESC;
907 tt_write (&ch, 1); 903 tt_write (&ch, 1);
908 } 904 }
909 905
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 906 tt_write (kbuf, (unsigned int)len);
921} 907}
922/*}}} */ 908/*}}} */
923 909
924#if defined (KEYSYM_RESOURCE) 910#if defined (KEYSYM_RESOURCE)
… …
1044rxvt_term::cursor_blink_cb (time_watcher &w) 1030rxvt_term::cursor_blink_cb (time_watcher &w)
1045{ 1031{
1046 hidden_cursor = !hidden_cursor; 1032 hidden_cursor = !hidden_cursor;
1047 want_refresh = 1; 1033 want_refresh = 1;
1048 1034
1049 w.start (w.at + BLINK_INTERVAL); 1035 w.start (w.at + CURSOR_BLINK_INTERVAL);
1050} 1036}
1051#endif 1037#endif
1052 1038
1053#ifdef TEXT_BLINK 1039#ifdef TEXT_BLINK
1054void 1040void
… …
1102 1088
1103 want_refresh = 1; 1089 want_refresh = 1;
1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1105 } 1091 }
1106} 1092}
1107#endif
1108
1109#if HAVE_SCHED_YIELD
1110static struct event_handler
1111{
1112 check_watcher cw_yield;
1113
1114 void yield (check_watcher &w)
1115 {
1116 sched_yield ();
1117 w.stop ();
1118 }
1119
1120 event_handler ()
1121 : cw_yield (this, &event_handler::yield)
1122 {
1123 }
1124} event_handler;
1125#endif 1093#endif
1126 1094
1127bool 1095bool
1128rxvt_term::pty_fill () 1096rxvt_term::pty_fill ()
1129{ 1097{
… …
1180} 1148}
1181 1149
1182void 1150void
1183rxvt_term::pointer_unblank () 1151rxvt_term::pointer_unblank ()
1184{ 1152{
1185 XDefineCursor (display->display, vt, TermWin_cursor); 1153 XDefineCursor (xdisp, vt, TermWin_cursor);
1186 recolour_cursor (); 1154 recolour_cursor ();
1187 1155
1188#ifdef POINTER_BLANK 1156#ifdef POINTER_BLANK
1189 hidden_pointer = 0; 1157 hidden_pointer = 0;
1190 1158
… …
1198rxvt_term::pointer_blank () 1166rxvt_term::pointer_blank ()
1199{ 1167{
1200 if (!OPTION (Opt_pointerBlank)) 1168 if (!OPTION (Opt_pointerBlank))
1201 return; 1169 return;
1202 1170
1203 XDefineCursor (display->display, vt, display->blank_cursor); 1171 XDefineCursor (xdisp, vt, display->blank_cursor);
1204 XFlush (display->display); 1172 XFlush (xdisp);
1205 1173
1206 hidden_pointer = 1; 1174 hidden_pointer = 1;
1207} 1175}
1208 1176
1209void 1177void
… …
1282 (32 + button_number + key_state), 1250 (32 + button_number + key_state),
1283 (32 + x + 1), 1251 (32 + x + 1),
1284 (32 + y + 1)); 1252 (32 + y + 1));
1285} 1253}
1286 1254
1287#ifdef USING_W11LIB
1288void
1289rxvt_W11_process_x_event (XEvent *ev)
1290{
1291 rxvt_t *r = rxvt_get_r ();
1292
1293 x_cb (*ev);
1294}
1295#endif
1296
1297/*{{{ process an X event */ 1255/*{{{ process an X event */
1298void 1256void
1299rxvt_term::x_cb (XEvent &ev) 1257rxvt_term::x_cb (XEvent &ev)
1300{ 1258{
1301 make_current (); 1259 make_current ();
1302 1260
1303 dDisp; 1261 dLocal (Display *, xdisp);
1304 1262
1305 if (ev.xany.window == vt 1263 if (ev.xany.window == vt
1306 && SHOULD_INVOKE (HOOK_X_EVENT) 1264 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1265 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return; 1266 return;
… …
1405 button_release (ev.xbutton); 1363 button_release (ev.xbutton);
1406 break; 1364 break;
1407 1365
1408 case ClientMessage: 1366 case ClientMessage:
1409 if (ev.xclient.format == 32 1367 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1368 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411 { 1369 {
1370 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1371 {
1372 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1373 {
1412 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1374 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1375 {
1376 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413 destroy (); 1377 destroy ();
1378 }
1414#if ENABLE_EWMH 1379#if ENABLE_EWMH
1415 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1380 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1416 XSendEvent (disp, ev.xclient.window = display->root, 1381 XSendEvent (xdisp, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask, 1382 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &ev); 1383 &ev);
1384#endif
1385 }
1386 }
1387#if ENABLE_XEMBED
1388 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1389 {
1390 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1391 focus_in ();
1392 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1393 focus_out ();
1394 }
1419#endif 1395#endif
1420 } 1396 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1429#endif
1430#ifdef OFFIX_DND
1431 /* OffiX Dnd (drag 'n' drop) protocol */
1432 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1433 && (ev.xclient.data.l[0] == DndFile
1434 || ev.xclient.data.l[0] == DndDir
1435 || ev.xclient.data.l[0] == DndLink))
1436 {
1437 /* Get Dnd data */
1438 Atom ActualType;
1439 int ActualFormat;
1440 unsigned char *data;
1441 unsigned long Size, RemainingBytes;
1442
1443 XGetWindowProperty (disp, display->root,
1444 xa[XA_DNDSELECTION],
1445 0L, 1000000L,
1446 False, AnyPropertyType,
1447 &ActualType, &ActualFormat,
1448 &Size, &RemainingBytes,
1449 &data);
1450 set_string_property (XA_CUT_BUFFER0, data);
1451 XFree (data);
1452 selection_paste (display->root, XA_CUT_BUFFER0, true);
1453 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1454 }
1455#endif /* OFFIX_DND */
1456 break; 1397 break;
1457 1398
1458 case MappingNotify: 1399 case MappingNotify:
1459 XRefreshKeyboardMapping (&ev.xmapping); 1400 XRefreshKeyboardMapping (&ev.xmapping);
1460 break; 1401 break;
… …
1493 break; 1434 break;
1494 1435
1495 case ConfigureNotify: 1436 case ConfigureNotify:
1496 if (ev.xconfigure.window == parent[0]) 1437 if (ev.xconfigure.window == parent[0])
1497 { 1438 {
1498 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1439 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1499 ; 1440 ;
1500 1441
1501 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1442 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1502 { 1443 {
1503 seen_resize = 1; 1444 seen_resize = 1;
1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1445 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1505 } 1446 }
1506 1447
1448 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1449
1507#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1450#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1508 if (OPTION (Opt_transparent)) 1451 if (OPTION (Opt_transparent))
1509 check_our_parents (); 1452 check_our_parents ();
1510#endif 1453#endif
1511 } 1454 }
1512 break; 1455 break;
1513 1456
1514 case PropertyNotify: 1457 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1515 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1516 && ev.xproperty.state == PropertyNewValue) 1460 && ev.xproperty.state == PropertyNewValue)
1517 selection_property (ev.xproperty.window, ev.xproperty.atom); 1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1518 1462
1519 break; 1463 break;
1520 1464
1521 case SelectionClear: 1465 case SelectionClear:
1522 selection_clear (); 1466 selection_clear ();
… …
1558 if (ev.xany.window == vt) 1502 if (ev.xany.window == vt)
1559 { 1503 {
1560 do 1504 do
1561 scr_expose (ev.xexpose.x, ev.xexpose.y, 1505 scr_expose (ev.xexpose.x, ev.xexpose.y,
1562 ev.xexpose.width, ev.xexpose.height, False); 1506 ev.xexpose.width, ev.xexpose.height, False);
1563 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1507 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1564 1508
1565 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1566 1510
1567 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1511 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1568 scr_expose (ev.xexpose.x, ev.xexpose.y, 1512 scr_expose (ev.xexpose.x, ev.xexpose.y,
1569 ev.xexpose.width, ev.xexpose.height, False); 1513 ev.xexpose.width, ev.xexpose.height, False);
1570 1514
1571 want_refresh = 1; 1515 want_refresh = 1;
1572 } 1516 }
1573 else 1517 else
1574 { 1518 {
1575 XEvent unused_event; 1519 XEvent unused_event;
1576 1520
1577 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1521 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1578 ; 1522 ;
1579 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1523 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1580 ; 1524 ;
1581 1525
1582 if (isScrollbarWindow (ev.xany.window)) 1526 if (isScrollbarWindow (ev.xany.window))
1583 { 1527 {
1584 scrollBar.setIdle (); 1528 scrollBar.setIdle ();
1585 scrollbar_show (0); 1529 scrollbar_show (0);
1586 } 1530 }
1587 1531
1588#ifdef TRANSPARENT 1532#ifdef TRANSPARENT
1589 if (am_transparent && ev.xany.window == parent[0]) 1533 if (am_transparent && ev.xany.window == parent[0])
1590 XClearWindow (disp, ev.xany.window); 1534 XClearWindow (xdisp, ev.xany.window);
1591#endif 1535#endif
1592 } 1536 }
1593 break; 1537 break;
1594 1538
1595 case MotionNotify: 1539 case MotionNotify:
… …
1605 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1549 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1606 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1550 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1607 ; // nop 1551 ; // nop
1608 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1552 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1609 { 1553 {
1610 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1554 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1611 ; 1555 ;
1612 1556
1613 XQueryPointer (disp, vt, 1557 XQueryPointer (xdisp, vt,
1614 &unused_root, &unused_child, 1558 &unused_root, &unused_child,
1615 &unused_root_x, &unused_root_y, 1559 &unused_root_x, &unused_root_y,
1616 &ev.xbutton.x, &ev.xbutton.y, 1560 &ev.xbutton.x, &ev.xbutton.y,
1617 &ev.xbutton.state); 1561 &ev.xbutton.state);
1618#ifdef MOUSE_THRESHOLD 1562#ifdef MOUSE_THRESHOLD
… …
1682#endif 1626#endif
1683 } 1627 }
1684 } 1628 }
1685 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1686 { 1630 {
1687 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1631 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1688 MotionNotify, &ev)) 1632 MotionNotify, &ev))
1689 ; 1633 ;
1690 1634
1691 XQueryPointer (disp, scrollBar.win, 1635 XQueryPointer (xdisp, scrollBar.win,
1692 &unused_root, &unused_child, 1636 &unused_root, &unused_child,
1693 &unused_root_x, &unused_root_y, 1637 &unused_root_x, &unused_root_y,
1694 &ev.xbutton.x, &ev.xbutton.y, 1638 &ev.xbutton.x, &ev.xbutton.y,
1695 &unused_mask); 1639 &unused_mask);
1696 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1711 { 1655 {
1712 hidden_cursor = 0; 1656 hidden_cursor = 0;
1713 want_refresh = 1; 1657 want_refresh = 1;
1714 } 1658 }
1715 1659
1716 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1660 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1717 } 1661 }
1718#endif 1662#endif
1719 1663
1720#if defined(POINTER_BLANK) 1664#if defined(POINTER_BLANK)
1721 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1665 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1749 XSetICFocus (Input_Context); 1693 XSetICFocus (Input_Context);
1750 } 1694 }
1751#endif 1695#endif
1752#if CURSOR_BLINK 1696#if CURSOR_BLINK
1753 if (OPTION (Opt_cursorBlink)) 1697 if (OPTION (Opt_cursorBlink))
1754 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1755#endif 1699#endif
1756#if OFF_FOCUS_FADING 1700#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade]) 1701 if (rs[Rs_fade])
1758 { 1702 {
1759 pix_colors = pix_colors_focused; 1703 pix_colors = pix_colors_focused;
… …
1840 /* 1784 /*
1841 * VT window processing of button press 1785 * VT window processing of button press
1842 */ 1786 */
1843 if (ev.window == vt) 1787 if (ev.window == vt)
1844 { 1788 {
1789 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1790 return;
1791
1845#if ISO_14755 1792#if ISO_14755
1846 // 5.4 1793 // 5.4
1847 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1794 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1848 { 1795 {
1849 iso14755_54 (ev.x, ev.y); 1796 iso14755_54 (ev.x, ev.y);
… …
1891 else 1838 else
1892 { 1839 {
1893 if (ev.button != MEvent.button) 1840 if (ev.button != MEvent.button)
1894 MEvent.clicks = 0; 1841 MEvent.clicks = 0;
1895 1842
1896 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1897 switch (ev.button) 1843 switch (ev.button)
1898 { 1844 {
1899 case Button1: 1845 case Button1:
1900 /* allow meta + click to select rectangular areas */ 1846 /* allow meta + click to select rectangular areas */
1901 /* should be done in screen.C */ 1847 /* should be done in screen.C */
1902#if ENABLE_FRILLS 1848#if ENABLE_FRILLS
1903 selection.rect = !!(ev.state & ModMetaMask); 1849 selection.rect = !!(ev.state & ModMetaMask);
1904#else 1850#else
1905 selection.rect = false; 1851 selection.rect = false;
1906#endif 1852#endif
1907 1853
1908 /* allow shift+left click to extend selection */ 1854 /* allow shift+left click to extend selection */
1909 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1855 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1910 { 1856 {
1911 if (MEvent.button == Button1 && clickintime) 1857 if (MEvent.button == Button1 && clickintime)
1912 selection_rotate (ev.x, ev.y); 1858 selection_rotate (ev.x, ev.y);
1913 else 1859 else
1914 selection_extend (ev.x, ev.y, 1); 1860 selection_extend (ev.x, ev.y, 1);
1915 } 1861 }
1916 else 1862 else
1917 { 1863 {
1918 if (MEvent.button == Button1 && clickintime) 1864 if (MEvent.button == Button1 && clickintime)
1919 MEvent.clicks++; 1865 MEvent.clicks++;
1920 else 1866 else
1921 MEvent.clicks = 1; 1867 MEvent.clicks = 1;
1922 1868
1923 selection_click (MEvent.clicks, ev.x, ev.y); 1869 selection_click (MEvent.clicks, ev.x, ev.y);
1924 } 1870 }
1925 1871
1926 MEvent.button = Button1; 1872 MEvent.button = Button1;
1927 break; 1873 break;
1928 1874
1929 case Button3: 1875 case Button3:
1930 if (MEvent.button == Button3 && clickintime) 1876 if (MEvent.button == Button3 && clickintime)
1931 selection_rotate (ev.x, ev.y); 1877 selection_rotate (ev.x, ev.y);
1932 else 1878 else
1933 selection_extend (ev.x, ev.y, 1); 1879 selection_extend (ev.x, ev.y, 1);
1934 1880
1935 MEvent.button = Button3; 1881 MEvent.button = Button3;
1936 break; 1882 break;
1937 } 1883 }
1938 } 1884 }
1939 1885
1940 MEvent.time = ev.time; 1886 MEvent.time = ev.time;
1941 return; 1887 return;
1942 } 1888 }
1943 1889
… …
2106 sel_scroll_ev.stop(); 2052 sel_scroll_ev.stop();
2107#endif 2053#endif
2108 2054
2109 if (ev.window == vt) 2055 if (ev.window == vt)
2110 { 2056 {
2057 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2058 return;
2059
2111#if ISO_14755 2060#if ISO_14755
2112 // 5.4 2061 // 5.4
2113 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2062 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2114 return; 2063 return;
2115#endif 2064#endif
2065
2116 if (reportmode) 2066 if (reportmode)
2117 { 2067 {
2118 /* mouse report from vt window */ 2068 /* mouse report from vt window */
2119 /* don't report release of wheel "buttons" */ 2069 /* don't report release of wheel "buttons" */
2120 if (ev.button >= 4) 2070 if (ev.button >= 4)
… …
2144 if (priv_modes & PrivMode_mouse_report 2094 if (priv_modes & PrivMode_mouse_report
2145 && bypass_keystate 2095 && bypass_keystate
2146 && ev.button == Button1 && MEvent.clicks <= 1) 2096 && ev.button == Button1 && MEvent.clicks <= 1)
2147 selection_extend (ev.x, ev.y, 0); 2097 selection_extend (ev.x, ev.y, 0);
2148 2098
2149 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2150 return;
2151
2152 switch (ev.button) 2099 switch (ev.button)
2153 { 2100 {
2154 case Button1: 2101 case Button1:
2155 case Button3: 2102 case Button3:
2156 selection_make (ev.time); 2103 selection_make (ev.time);
2157 break; 2104 break;
2105
2158 case Button2: 2106 case Button2:
2159 selection_request (ev.time, ev.x, ev.y); 2107 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2108 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2160 break; 2109 break;
2110
2161#ifdef MOUSE_WHEEL 2111#ifdef MOUSE_WHEEL
2162 case Button4: 2112 case Button4:
2163 case Button5: 2113 case Button5:
2164 { 2114 {
2165 int i; 2115 int i;
… …
2205#if TINTING 2155#if TINTING
2206/* taken from aterm-0.4.2 */ 2156/* taken from aterm-0.4.2 */
2207 2157
2208typedef uint32_t RUINT32T; 2158typedef uint32_t RUINT32T;
2209 2159
2210void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2160void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2211{ 2161{
2212 int sh_r, sh_g, sh_b; 2162 int sh_r, sh_g, sh_b;
2213 RUINT32T mask_r, mask_g, mask_b; 2163 RUINT32T mask_r, mask_g, mask_b;
2214 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2164 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2215 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2165 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2216 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2166 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2217 int i; 2167 int i;
2218 2168
2219 Visual *visual = display->visual; 2169 Visual *visual = term->visual;
2220 2170
2221 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2171 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2222 2172
2223 /* for convenience */ 2173 /* for convenience */
2224 mask_r = visual->red_mask; 2174 mask_r = visual->red_mask;
… …
2445 Atom atype; 2395 Atom atype;
2446 unsigned char *prop = NULL; 2396 unsigned char *prop = NULL;
2447 Window root, oldp, *list; 2397 Window root, oldp, *list;
2448 Pixmap rootpixmap = None; 2398 Pixmap rootpixmap = None;
2449 XWindowAttributes wattr, wrootattr; 2399 XWindowAttributes wattr, wrootattr;
2450 dDisp;
2451 2400
2452 pchanged = 0; 2401 pchanged = 0;
2453 2402
2454 if (!OPTION (Opt_transparent)) 2403 if (!OPTION (Opt_transparent))
2455 return pchanged; /* Don't try any more */ 2404 return pchanged; /* Don't try any more */
2456 2405
2457 XGetWindowAttributes (disp, display->root, &wrootattr); 2406 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2458 rootdepth = wrootattr.depth; 2407 rootdepth = wrootattr.depth;
2459 2408
2460 XGetWindowAttributes (disp, parent[0], &wattr); 2409 XGetWindowAttributes (xdisp, parent[0], &wattr);
2461 2410
2462 if (rootdepth != wattr.depth) 2411 if (rootdepth != wattr.depth)
2463 { 2412 {
2464 if (am_transparent) 2413 if (am_transparent)
2465 { 2414 {
2466 pchanged = 1; 2415 pchanged = 1;
2467 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2416 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2468 am_transparent = am_pixmap_trans = 0; 2417 am_transparent = am_pixmap_trans = 0;
2469 } 2418 }
2470 2419
2471 return pchanged; /* Don't try any more */ 2420 return pchanged; /* Don't try any more */
2472 } 2421 }
2473 2422
2474 /* Get all X ops out of the queue so that our information is up-to-date. */ 2423 /* Get all X ops out of the queue so that our information is up-to-date. */
2475 XSync (disp, False); 2424 XSync (xdisp, False);
2476 2425
2477 /* 2426 /*
2478 * Make the frame window set by the window manager have 2427 * Make the frame window set by the window manager have
2479 * the root background. Some window managers put multiple nested frame 2428 * the root background. Some window managers put multiple nested frame
2480 * windows for each client, so we have to take care about that. 2429 * windows for each client, so we have to take care about that.
2481 */ 2430 */
2482 i = (xa[XA_XROOTPMAP_ID] 2431 i = (xa[XA_XROOTPMAP_ID]
2483 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2432 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2485 &nitems, &bytes_after, &prop) == Success); 2434 &nitems, &bytes_after, &prop) == Success);
2486 2435
2487 if (!i || prop == NULL) 2436 if (!i || prop == NULL)
2488 i = (xa[XA_ESETROOT_PMAP_ID] 2437 i = (xa[XA_ESETROOT_PMAP_ID]
2489 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2438 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2439 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491 &nitems, &bytes_after, &prop) == Success); 2440 &nitems, &bytes_after, &prop) == Success);
2492 2441
2493 if (!i || prop == NULL 2442 if (!i || prop == NULL
2494#if TINTING 2443#if TINTING
2495 || !rs[Rs_color + Color_tint] 2444 || !ISSET_PIXCOLOR (Color_tint)
2496#endif 2445#endif
2497 ) 2446 )
2498 have_pixmap = 0; 2447 have_pixmap = 0;
2499 else 2448 else
2500 { 2449 {
… …
2513 Window cr; 2462 Window cr;
2514 XImage *image; 2463 XImage *image;
2515 GC gc; 2464 GC gc;
2516 XGCValues gcvalue; 2465 XGCValues gcvalue;
2517 2466
2518 XTranslateCoordinates (disp, parent[0], display->root, 2467 XTranslateCoordinates (xdisp, parent[0], display->root,
2519 0, 0, &sx, &sy, &cr); 2468 0, 0, &sx, &sy, &cr);
2520 nw = (unsigned int)szHint.width; 2469 nw = (unsigned int)szHint.width;
2521 nh = (unsigned int)szHint.height; 2470 nh = (unsigned int)szHint.height;
2522 nx = ny = 0; 2471 nx = ny = 0;
2523 2472
… …
2536 } 2485 }
2537 2486
2538 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2487 min_it (nw, (unsigned int) (wrootattr.width - sx));
2539 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2488 min_it (nh, (unsigned int) (wrootattr.height - sy));
2540 2489
2541 XSync (disp, False); 2490 XSync (xdisp, False);
2542 allowedxerror = -1; 2491 allowedxerror = -1;
2543 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2492 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2544 2493
2545 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2494 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2546 /* XXX: may need a delay here? */ 2495 /* XXX: may need a delay here? */
2547 allowedxerror = 0; 2496 allowedxerror = 0;
2548 2497
… …
2551 if (am_transparent && am_pixmap_trans) 2500 if (am_transparent && am_pixmap_trans)
2552 { 2501 {
2553 pchanged = 1; 2502 pchanged = 1;
2554 if (pixmap != None) 2503 if (pixmap != None)
2555 { 2504 {
2556 XFreePixmap (disp, pixmap); 2505 XFreePixmap (xdisp, pixmap);
2557 pixmap = None; 2506 pixmap = None;
2558 } 2507 }
2559 } 2508 }
2560 2509
2561 am_pixmap_trans = 0; 2510 am_pixmap_trans = 0;
2562 } 2511 }
2563 else 2512 else
2564 { 2513 {
2565 if (pixmap != None) 2514 if (pixmap != None)
2566 XFreePixmap (disp, pixmap); 2515 XFreePixmap (xdisp, pixmap);
2567 2516
2568#if TINTING 2517#if TINTING
2569 if (ISSET_PIXCOLOR (Color_tint)) 2518 if (ISSET_PIXCOLOR (Color_tint))
2570 { 2519 {
2571 unsigned short rm, gm, bm;
2572 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2520 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2573 2521
2522 rgba c;
2574 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2523 pix_colors_focused [Color_tint].get (c);
2575 2524
2576 ShadeXImage (display, image, shade, rm, gm, bm); 2525 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2577 } 2526 }
2578#endif 2527#endif
2579 2528
2580 pixmap = XCreatePixmap (disp, vt, 2529 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2581 szHint.width, szHint.height, image->depth);
2582 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2530 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2583 XPutImage (disp, pixmap, gc, image, 0, 0, 2531 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2584 nx, ny, image->width, image->height); 2532 nx, ny, image->width, image->height);
2585 XFreeGC (disp, gc); 2533 XFreeGC (xdisp, gc);
2586 XDestroyImage (image); 2534 XDestroyImage (image);
2587 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2535 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2588 XClearWindow (disp, parent[0]); 2536 XClearWindow (xdisp, parent[0]);
2589 2537
2590 if (!am_transparent || !am_pixmap_trans) 2538 if (!am_transparent || !am_pixmap_trans)
2591 pchanged = 1; 2539 pchanged = 1;
2592 2540
2593 am_transparent = am_pixmap_trans = 1; 2541 am_transparent = am_pixmap_trans = 1;
2594 } 2542 }
2595 } 2543 }
2596 2544
2597 if (am_pixmap_trans) 2545 if (am_pixmap_trans)
2598 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2546 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2599 else 2547 else
2600 { 2548 {
2601 unsigned int n; 2549 unsigned int n;
2602 /* 2550 /*
2603 * InheritPixmap transparency 2551 * InheritPixmap transparency
2604 */ 2552 */
2605 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2553 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2606 { 2554 {
2607 oldp = parent[i]; 2555 oldp = parent[i];
2608 XQueryTree (disp, parent[i - 1], &root, 2556 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2609 &parent[i], &list, &n);
2610 XFree (list); 2557 XFree (list);
2611 2558
2612 if (parent[i] == display->root) 2559 if (parent[i] == display->root)
2613 { 2560 {
2614 if (oldp != None) 2561 if (oldp != None)
… …
2622 } 2569 }
2623 2570
2624 n = 0; 2571 n = 0;
2625 2572
2626 if (pchanged) 2573 if (pchanged)
2627 {
2628 for (; n < (unsigned int)i; n++) 2574 for (; n < (unsigned int)i; n++)
2629 { 2575 {
2630 XGetWindowAttributes (disp, parent[n], &wattr); 2576 XGetWindowAttributes (xdisp, parent[n], &wattr);
2577
2631 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2578 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2632 { 2579 {
2633 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2580 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2634 break; 2581 break;
2635 } 2582 }
2636 } 2583 }
2637 }
2638 2584
2639 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2585 if (n > (sizeof (parent) / sizeof (parent[0])))
2640 { 2586 {
2641 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2587 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2642 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2588 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2643 am_transparent = 0; 2589 am_transparent = 0;
2644 /* XXX: also turn off Opt_transparent? */ 2590 /* XXX: also turn off Opt_transparent? */
2645 } 2591 }
2646 else 2592 else
2647 { 2593 {
2648#if WAIT_FOR_WM
2649 /* wait (an arbitrary period) for the WM to do its thing
2650 * needed for fvwm2.2.2 (and before?) */
2651 sleep (1);
2652#endif
2653 for (n = 0; n < (unsigned int)i; n++) 2594 for (n = 0; n < (unsigned int)i; n++)
2654 { 2595 {
2655 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2596 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2656 XClearWindow (disp, parent[n]); 2597 XClearWindow (xdisp, parent[n]);
2657 } 2598 }
2658 2599
2659 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2600 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2660 am_transparent = 1; 2601 am_transparent = 1;
2661 } 2602 }
2662 2603
2663 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2604 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2664 parent[i] = None; 2605 parent[i] = None;
2665 } 2606 }
2666 2607
2667 if (scrollBar.win) 2608 if (scrollBar.win)
2668 { 2609 {
2669 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2610 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2670 scrollBar.setIdle (); 2611 scrollBar.setIdle ();
2671 scrollbar_show (0); 2612 scrollbar_show (0);
2672 } 2613 }
2673 2614
2674 if (am_transparent) 2615 if (am_transparent)
… …
2820 return flag; 2761 return flag;
2821} 2762}
2822 2763
2823// read the next character 2764// read the next character
2824wchar_t 2765wchar_t
2825rxvt_term::next_char () 2766rxvt_term::next_char () NOTHROW
2826{ 2767{
2827 while (cmdbuf_ptr < cmdbuf_endp) 2768 while (cmdbuf_ptr < cmdbuf_endp)
2828 { 2769 {
2829 // assume 7-bit to be ascii ALWAYS 2770 // assume 7-bit to be ascii ALWAYS
2830 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2771 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2851 return NOCHAR; 2792 return NOCHAR;
2852} 2793}
2853 2794
2854// read the next octet 2795// read the next octet
2855uint32_t 2796uint32_t
2856rxvt_term::next_octet () 2797rxvt_term::next_octet () NOTHROW
2857{ 2798{
2858 return cmdbuf_ptr < cmdbuf_endp 2799 return cmdbuf_ptr < cmdbuf_endp
2859 ? (unsigned char)*cmdbuf_ptr++ 2800 ? (unsigned char)*cmdbuf_ptr++
2860 : NOCHAR; 2801 : NOCHAR;
2861} 2802}
2803
2804static class out_of_input out_of_input;
2862 2805
2863/* rxvt_cmd_getc () - Return next input character */ 2806/* rxvt_cmd_getc () - Return next input character */
2864/* 2807/*
2865 * Return the next input character after first passing any keyboard input 2808 * Return the next input character after first passing any keyboard input
2866 * to the command. 2809 * to the command.
2867 */ 2810 */
2868wchar_t 2811wchar_t
2869rxvt_term::cmd_getc () 2812rxvt_term::cmd_getc () THROW ((class out_of_input))
2870{ 2813{
2871 wchar_t c = next_char (); 2814 wchar_t c = next_char ();
2872 2815
2873 if (c == NOCHAR) 2816 if (c == NOCHAR)
2874 throw out_of_input; 2817 throw out_of_input;
2875 2818
2876 return c; 2819 return c;
2877} 2820}
2878 2821
2879uint32_t 2822uint32_t
2880rxvt_term::cmd_get8 () 2823rxvt_term::cmd_get8 () THROW ((class out_of_input))
2881{ 2824{
2882 uint32_t c = next_octet (); 2825 uint32_t c = next_octet ();
2883 2826
2884 if (c == NOCHAR) 2827 if (c == NOCHAR)
2885 throw out_of_input; 2828 throw out_of_input;
… …
3123 scr_charset_set (2, (unsigned int)cmd_getc ()); 3066 scr_charset_set (2, (unsigned int)cmd_getc ());
3124 break; 3067 break;
3125 case '+': 3068 case '+':
3126 scr_charset_set (3, (unsigned int)cmd_getc ()); 3069 scr_charset_set (3, (unsigned int)cmd_getc ());
3127 break; 3070 break;
3128#if ENABLE_FRILLS 3071#if !ENABLE_MINIMAL
3129 case '6': 3072 case '6':
3130 scr_backindex (); 3073 scr_backindex ();
3131 break; 3074 break;
3132#endif 3075#endif
3133 case '7': 3076 case '7':
3134 scr_cursor (SAVE); 3077 scr_cursor (SAVE);
3135 break; 3078 break;
3136 case '8': 3079 case '8':
3137 scr_cursor (RESTORE); 3080 scr_cursor (RESTORE);
3138 break; 3081 break;
3139#if ENABLE_FRILLS 3082#if !ENABLE_MINIMAL
3140 case '9': 3083 case '9':
3141 scr_forwardindex (); 3084 scr_forwardindex ();
3142 break; 3085 break;
3143#endif 3086#endif
3144 case '=': 3087 case '=':
… …
3306 ndef = get_byte_array_bit (csi_defaults, i); 3249 ndef = get_byte_array_bit (csi_defaults, i);
3307 for (p = 0; p < nargs; p++) 3250 for (p = 0; p < nargs; p++)
3308 if (arg[p] == -1) 3251 if (arg[p] == -1)
3309 arg[p] = ndef; 3252 arg[p] = ndef;
3310 3253
3311#ifdef DEBUG_CMD
3312 fprintf (stderr, "CSI ");
3313 for (p = 0; p < nargs; p++)
3314 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3315 fprintf (stderr, "%c\n", ch);
3316#endif
3317
3318 /* 3254 /*
3319 * private mode handling 3255 * private mode handling
3320 */ 3256 */
3321 if (priv) 3257 if (priv)
3322 { 3258 {
3323 switch (priv) 3259 switch (priv)
3324 { 3260 {
3325 case '>': 3261 case '>':
3326 if (ch == CSI_DA) /* secondary device attributes */ 3262 if (ch == CSI_DA) /* secondary device attributes */
3327 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3263 {
3264 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3265 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3266 //
3267 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3268 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3269 // that we do not support xterm mouse reporting (should be 95 when we do).
3270 //
3271 tt_printf ("\033[>%d;94;0c", 'U');
3272 }
3328 break; 3273 break;
3329 case '?': 3274 case '?':
3330 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3275 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3331 process_terminal_mode (ch, priv, nargs, arg); 3276 process_terminal_mode (ch, priv, nargs, arg);
3332 break; 3277 break;
… …
3535 break; 3480 break;
3536 case CSI_75: 3481 case CSI_75:
3537 scr_cursor (RESTORE); 3482 scr_cursor (RESTORE);
3538 break; 3483 break;
3539 3484
3540#if ENABLE_FRILLS 3485#if !ENABLE_MINIMAL
3541 case CSI_74: 3486 case CSI_74:
3542 process_window_ops (arg, nargs); 3487 process_window_ops (arg, nargs);
3543 break; 3488 break;
3544#endif 3489#endif
3545 3490
… …
3552 break; 3497 break;
3553 } 3498 }
3554} 3499}
3555/*}}} */ 3500/*}}} */
3556 3501
3557#if ENABLE_FRILLS 3502#if !ENABLE_MINIMAL
3558/* ARGSUSED */ 3503/* ARGSUSED */
3559void 3504void
3560rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3505rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3561{ 3506{
3562 int x, y; 3507 int x, y;
3563 XWindowAttributes wattr; 3508 XWindowAttributes wattr;
3564 Window wdummy; 3509 Window wdummy;
3565 dDisp; 3510
3511 dLocal (Display *, xdisp);
3566 3512
3567 if (nargs == 0) 3513 if (nargs == 0)
3568 return; 3514 return;
3569 3515
3570 switch (args[0]) 3516 switch (args[0])
3571 { 3517 {
3572 /* 3518 /*
3573 * commands 3519 * commands
3574 */ 3520 */
3575 case 1: /* deiconify window */ 3521 case 1: /* deiconify window */
3576 XMapWindow (disp, parent[0]); 3522 XMapWindow (xdisp, parent[0]);
3577 break; 3523 break;
3578 case 2: /* iconify window */ 3524 case 2: /* iconify window */
3579 XIconifyWindow (disp, parent[0], display->screen); 3525 XIconifyWindow (xdisp, parent[0], display->screen);
3580 break; 3526 break;
3581 case 3: /* set position (pixels) */ 3527 case 3: /* set position (pixels) */
3582 XMoveWindow (disp, parent[0], args[1], args[2]); 3528 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3583 break; 3529 break;
3584 case 4: /* set size (pixels) */ 3530 case 4: /* set size (pixels) */
3585 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3531 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3586 break; 3532 break;
3587 case 5: /* raise window */ 3533 case 5: /* raise window */
3588 XRaiseWindow (disp, parent[0]); 3534 XRaiseWindow (xdisp, parent[0]);
3589 break; 3535 break;
3590 case 6: /* lower window */ 3536 case 6: /* lower window */
3591 XLowerWindow (disp, parent[0]); 3537 XLowerWindow (xdisp, parent[0]);
3592 break; 3538 break;
3593 case 7: /* refresh window */ 3539 case 7: /* refresh window */
3594 scr_touch (true); 3540 scr_touch (true);
3595 break; 3541 break;
3596 case 8: /* set size (chars) */ 3542 case 8: /* set size (chars) */
… …
3603 if (args[0] >= 24) /* set height (chars) */ 3549 if (args[0] >= 24) /* set height (chars) */
3604 set_widthheight ((unsigned int)width, 3550 set_widthheight ((unsigned int)width,
3605 (unsigned int) (args[1] * fheight)); 3551 (unsigned int) (args[1] * fheight));
3606 break; 3552 break;
3607 3553
3608
3609 /* 3554 /*
3610 * reports - some output format copied from XTerm 3555 * reports - some output format copied from XTerm
3611 */ 3556 */
3612 case 11: /* report window state */ 3557 case 11: /* report window state */
3613 XGetWindowAttributes (disp, parent[0], &wattr); 3558 XGetWindowAttributes (xdisp, parent[0], &wattr);
3614 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3559 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3615 break; 3560 break;
3616 case 13: /* report window position */ 3561 case 13: /* report window position */
3617 XGetWindowAttributes (disp, parent[0], &wattr); 3562 XGetWindowAttributes (xdisp, parent[0], &wattr);
3618 XTranslateCoordinates (disp, parent[0], wattr.root, 3563 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3619 -wattr.border_width, -wattr.border_width, 3564 -wattr.border_width, -wattr.border_width,
3620 &x, &y, &wdummy); 3565 &x, &y, &wdummy);
3621 tt_printf ("\033[3;%d;%dt", x, y); 3566 tt_printf ("\033[3;%d;%dt", x, y);
3622 break; 3567 break;
3623 case 14: /* report window size (pixels) */ 3568 case 14: /* report window size (pixels) */
3624 XGetWindowAttributes (disp, parent[0], &wattr); 3569 XGetWindowAttributes (xdisp, parent[0], &wattr);
3625 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3570 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3626 break; 3571 break;
3627 case 18: /* report text area size (chars) */ 3572 case 18: /* report text area size (chars) */
3628 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3573 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3629 break; 3574 break;
… …
3631 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3576 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3632 break; 3577 break;
3633 case 20: /* report icon label */ 3578 case 20: /* report icon label */
3634 { 3579 {
3635 char *s; 3580 char *s;
3636 XGetIconName (disp, parent[0], &s); 3581 XGetIconName (xdisp, parent[0], &s);
3637 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3582 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3638 XFree (s); 3583 XFree (s);
3639 } 3584 }
3640 break; 3585 break;
3641 case 21: /* report window title */ 3586 case 21: /* report window title */
3642 { 3587 {
3643 char *s; 3588 char *s;
3644 XFetchName (disp, parent[0], &s); 3589 XFetchName (xdisp, parent[0], &s);
3645 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3590 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3646 XFree (s); 3591 XFree (s);
3647 } 3592 }
3648 break; 3593 break;
3649 } 3594 }
… …
3750void 3695void
3751rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3696rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3752{ 3697{
3753 if (str[0] == '?' && !str[1]) 3698 if (str[0] == '?' && !str[1])
3754 { 3699 {
3755 unsigned short r, g, b; 3700 rgba c;
3756 pix_colors_focused[color].get (display, r, g, b); 3701 pix_colors_focused[color].get (c);
3702
3703#if XFT
3704 if (c.a != rgba::MAX_CC)
3705 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3706 else
3707#endif
3757 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3708 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3758 } 3709 }
3759 else 3710 else
3760 set_window_color (color, str); 3711 set_window_color (color, str);
3761} 3712}
3762 3713
… …
3764 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3715 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3765 */ 3716 */
3766void 3717void
3767rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3718rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3768{ 3719{
3769 int changed = 0;
3770 int color; 3720 int color;
3771 char *buf, *name; 3721 char *buf, *name;
3772 bool query = str[0] == '?' && !str[1]; 3722 bool query = str[0] == '?' && !str[1];
3773 int saveop = op; 3723 int saveop = op;
3774 dDisp; 3724
3725 dLocal (Display *, xdisp);
3775 3726
3776 assert (str != NULL); 3727 assert (str != NULL);
3777 switch (op) 3728 switch (op)
3778 { 3729 {
3779 case XTerm_name: 3730 case XTerm_name:
… …
3795 unsigned long bytes_after; 3746 unsigned long bytes_after;
3796 unsigned char *value = 0; 3747 unsigned char *value = 0;
3797 const char *str = ""; 3748 const char *str = "";
3798 3749
3799 if (prop 3750 if (prop
3800 && XGetWindowProperty (disp, parent[0], 3751 && XGetWindowProperty (xdisp, parent[0],
3801 prop, 0, 1<<16, 0, AnyPropertyType, 3752 prop, 0, 1<<16, 0, AnyPropertyType,
3802 &actual_type, &actual_format, 3753 &actual_type, &actual_format,
3803 &nitems, &bytes_after, &value) == Success 3754 &nitems, &bytes_after, &value) == Success
3804 && actual_type != None 3755 && actual_type != None
3805 && actual_format == 8) 3756 && actual_format == 8)
3806 str = (const char *)(value); 3757 str = (const char *)(value);
3807 3758
3808 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3759 tt_printf ("\033]%d;%s%c", op, str, resp);
3809 3760
3810 XFree (value); 3761 XFree (value);
3811 } 3762 }
3812 else 3763 else
3813 { 3764 {
… …
3817 { 3768 {
3818 *eq = 0; 3769 *eq = 0;
3819 set_utf8_property (display->atom (str), eq + 1); 3770 set_utf8_property (display->atom (str), eq + 1);
3820 } 3771 }
3821 else 3772 else
3822 XDeleteProperty (disp, parent[0], 3773 XDeleteProperty (xdisp, parent[0],
3823 display->atom (str)); 3774 display->atom (str));
3824 } 3775 }
3825 break; 3776 break;
3826 3777
3827 case XTerm_Color: 3778 case XTerm_Color:
… …
3837 break; 3788 break;
3838 3789
3839 if ((buf = strchr (name, ';')) != NULL) 3790 if ((buf = strchr (name, ';')) != NULL)
3840 *buf++ = '\0'; 3791 *buf++ = '\0';
3841 3792
3842 if (name[0] == '?' && !name[1]) 3793 process_color_seq (op, color, name, resp);
3843 {
3844 unsigned short r, g, b;
3845 pix_colors_focused[color].get (display, r, g, b);
3846 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3847 }
3848 else
3849 set_window_color (color, name);
3850 } 3794 }
3851 break; 3795 break;
3852 case XTerm_Color00: 3796 case XTerm_Color00:
3853 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3797 process_color_seq (op, Color_fg, str, resp);
3854 break; 3798 break;
3855 case XTerm_Color01: 3799 case XTerm_Color01:
3856 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3800 process_color_seq (op, Color_bg, str, resp);
3857 break; 3801 break;
3858#ifndef NO_CURSORCOLOR 3802#ifndef NO_CURSORCOLOR
3859 case XTerm_Color_cursor: 3803 case XTerm_Color_cursor:
3860 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3804 process_color_seq (op, Color_cursor, str, resp);
3861 break; 3805 break;
3862#endif 3806#endif
3863 case XTerm_Color_pointer_fg: 3807 case XTerm_Color_pointer_fg:
3864 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3808 process_color_seq (op, Color_pointer_fg, str, resp);
3865 break; 3809 break;
3866 case XTerm_Color_pointer_bg: 3810 case XTerm_Color_pointer_bg:
3867 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3811 process_color_seq (op, Color_pointer_bg, str, resp);
3868 break; 3812 break;
3869#ifndef NO_BOLD_UNDERLINE_REVERSE 3813#ifndef NO_BOLD_UNDERLINE_REVERSE
3870 case XTerm_Color_RV: 3814 case XTerm_Color_RV:
3871 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3815 process_color_seq (op, Color_RV, str, resp);
3872 break; 3816 break;
3873 case Rxvt_Color_BD: 3817 case Rxvt_Color_BD:
3874 case URxvt_Color_BD: 3818 case URxvt_Color_BD:
3875 process_color_seq (op, Color_BD, str, resp); 3819 process_color_seq (op, Color_BD, str, resp);
3876 break; 3820 break;
3877 case Rxvt_Color_UL: 3821 case Rxvt_Color_UL:
3878 case URxvt_Color_UL: 3822 case URxvt_Color_UL:
3879 process_color_seq (op, Color_UL, str, resp); 3823 process_color_seq (op, Color_UL, str, resp);
3880 break; 3824 break;
3881 case URxvt_Color_IT: 3825 case URxvt_Color_IT:
3882 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3826 process_color_seq (op, Color_IT, str, resp);
3883 break; 3827 break;
3884#endif 3828#endif
3885#if TRANSPARENT && TINTING 3829#if TRANSPARENT && TINTING
3886 case URxvt_Color_tint: 3830 case URxvt_Color_tint:
3887 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3831 process_color_seq (op, Color_tint, str, resp);
3832
3888 check_our_parents (); 3833 check_our_parents ();
3834
3889 if (am_transparent) 3835 if (am_transparent)
3890 want_full_refresh = want_refresh = 1; 3836 want_full_refresh = want_refresh = 1;
3837
3891 break; 3838 break;
3892#endif 3839#endif
3893 3840
3894 case Rxvt_Pixmap: 3841 case Rxvt_Pixmap:
3842 {
3895 if (*str != ';') 3843 if (*str != ';')
3896 { 3844 {
3897#if XPM_BACKGROUND 3845#if XPM_BACKGROUND
3898 scale_pixmap (""); /* reset to default scaling */ 3846 scale_pixmap (""); /* reset to default scaling */
3899 set_bgPixmap (str); /* change pixmap */ 3847 set_bgPixmap (str); /* change pixmap */
3900 scr_touch (true); 3848 scr_touch (true);
3901#endif 3849#endif
3902 } 3850 }
3903 3851
3852 int changed = 0;
3853
3904 while ((str = strchr (str, ';')) != NULL) 3854 while ((str = strchr (str, ';')) != NULL)
3905 { 3855 {
3906 str++; 3856 str++;
3907#if XPM_BACKGROUND 3857#if XPM_BACKGROUND
3908 changed += scale_pixmap (str); 3858 changed += scale_pixmap (str);
3909#endif 3859#endif
3910 } 3860 }
3911 3861
3912 if (changed) 3862 if (changed)
3913 { 3863 {
3914#ifdef XPM_BACKGROUND 3864#ifdef XPM_BACKGROUND
3915 resize_pixmap (); 3865 resize_pixmap ();
3916 scr_touch (true); 3866 scr_touch (true);
3917#endif 3867#endif
3918 } 3868 }
3869 }
3919 break; 3870 break;
3920 3871
3921 case Rxvt_restoreFG: 3872 case Rxvt_restoreFG:
3922 set_window_color (Color_fg, str); 3873 set_window_color (Color_fg, str);
3923 break; 3874 break;
… …
3962 allocated.push_back ((void *)res); 3913 allocated.push_back ((void *)res);
3963 set_fonts (); 3914 set_fonts ();
3964 } 3915 }
3965 break; 3916 break;
3966 3917
3967#if ENABLE_FRILLS 3918 case URxvt_version:
3919 if (query)
3920 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3921 op,
3922 rs[Rs_name], VERSION[0], VERSION[2],
3923 resp);
3924 break;
3925
3926#if !ENABLE_MINIMAL
3968 case URxvt_locale: 3927 case URxvt_locale:
3969 if (query) 3928 if (query)
3970 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3929 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3971 else 3930 else
3972 { 3931 {
3973 set_locale (str); 3932 set_locale (str);
3974 pty->set_utf8_mode (enc_utf8); 3933 pty->set_utf8_mode (enc_utf8);
3975 init_xlocale (); 3934 init_xlocale ();
… …
4032 return state; 3991 return state;
4033} 3992}
4034 3993
4035/* we're not using priv _yet_ */ 3994/* we're not using priv _yet_ */
4036void 3995void
4037rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3996rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4038{ 3997{
4039 unsigned int i, j; 3998 unsigned int i, j;
4040 int state; 3999 int state;
4041 4000
4042 static const struct 4001 static const struct
… …
4336 scr_color (Color_bg, Color_bg); 4295 scr_color (Color_bg, Color_bg);
4337 break; 4296 break;
4338 4297
4339 //case 50: // not variable spacing 4298 //case 50: // not variable spacing
4340 4299
4341#if ENABLE_FRILLS 4300#if !ENABLE_MINIMAL
4342 case 90: 4301 case 90:
4343 case 91: /* set bright fg color */ 4302 case 91: /* set bright fg color */
4344 case 92: 4303 case 92:
4345 case 93: 4304 case 93:
4346 case 94: 4305 case 94:

Diff Legend

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