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.284 by root, Wed Jan 25 02:42:06 2006 UTC vs.
Revision 1.320 by root, Mon Apr 30 15:07:09 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
64 63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 67
… …
227# if !UNICODE3 226# if !UNICODE3
228 if (ch >= 0x10000) 227 if (ch >= 0x10000)
229 ch = 0xfffd; 228 ch = 0xfffd;
230# endif 229# endif
231 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
233 } 234 }
234 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
235 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
237 243
238 free (fname); 244 free (fname);
239 245
… …
292 298
293 return -1; 299 return -1;
294} 300}
295#endif 301#endif
296 302
297/*{{{ Convert the keypress event into a string */
298void 303void
299rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
300{ 305{
301 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
302 unsigned int newlen; 307 unsigned int newlen;
303 KeySym keysym; 308 KeySym keysym;
304 int valid_keysym; 309 int valid_keysym;
305 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
306 316
307 /* 317 /*
308 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
309 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
310 * 320 *
… …
901 tt_write (&ch, 1); 911 tt_write (&ch, 1);
902 } 912 }
903 913
904 tt_write (kbuf, (unsigned int)len); 914 tt_write (kbuf, (unsigned int)len);
905} 915}
906/*}}} */ 916
917void
918rxvt_term::key_release (XKeyEvent &ev)
919{
920#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
921 KeySym keysym;
922
923 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
924#endif
925
926#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support
928 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52)
930 {
931# if ENABLE_OVERLAY
932 scr_overlay_off ();
933# endif
934# if ISO_14755
935 // iso14755 part 5.2 handling: release time
936 // first: controls
937 if ((ev.state & ControlMask)
938 && ((keysym >= 0x40 && keysym <= 0x5f)
939 || (keysym >= 0x61 && keysym <= 0x7f)))
940 {
941 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
942 commit_iso14755 ();
943
944 return;
945 }
946
947 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
948 if (i[0] == keysym)
949 {
950 iso14755buf = ISO_14755_51 | i[1];
951 commit_iso14755 ();
952
953 return;
954 }
955
956 scr_bell ();
957# endif
958 iso14755buf = 0;
959
960 return;
961 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 {
964# if ENABLE_OVERLAY
965 scr_overlay_off ();
966# endif
967 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 ();
969#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED)
971 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
976 }
977# endif
978 else
979 iso14755buf = 0;
980 }
981#endif
982
983 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
984 return;
985
986#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
987 if (!(ev.state & ControlMask))
988 slip_wheel_ev.stop ();
989 else if (keysym == XK_Control_L || keysym == XK_Control_R)
990 mouse_slip_wheel_speed = 0;
991#endif
992}
907 993
908#if defined (KEYSYM_RESOURCE) 994#if defined (KEYSYM_RESOURCE)
909unsigned int 995unsigned int
910rxvt_term::cmd_write (const char *str, unsigned int count) 996rxvt_term::cmd_write (const char *str, unsigned int count)
911{ 997{
… …
1088 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1089 } 1175 }
1090} 1176}
1091#endif 1177#endif
1092 1178
1093#if HAVE_SCHED_YIELD 1179#if LINUX_YIELD_HACK
1094static struct event_handler 1180static struct event_handler
1095{ 1181{
1096 check_watcher cw_yield; 1182 check_watcher yield_ev;
1097 1183
1098 void yield (check_watcher &w) 1184 void yield_cb (check_watcher &w)
1099 { 1185 {
1100 sched_yield (); 1186 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS.
1190
1191 struct timespec ts = { 0, 0 };
1192 nanosleep (&ts, 0);
1193
1101 w.stop (); 1194 w.stop ();
1102 } 1195 }
1103 1196
1104 event_handler () 1197 event_handler ()
1105 : cw_yield (this, &event_handler::yield) 1198 : yield_ev (this, &event_handler::yield_cb)
1106 { 1199 {
1107 } 1200 }
1108} event_handler; 1201} event_handler;
1109#endif 1202#endif
1110 1203
… …
1130 cmdbuf_endp += r; 1223 cmdbuf_endp += r;
1131 return true; 1224 return true;
1132 } 1225 }
1133 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134 { 1227 {
1135#if HAVE_SCHED_YIELD 1228#if LINUX_YIELD_HACK
1136 if (display->is_local) 1229 if (display->is_local)
1137 event_handler.cw_yield.start (); 1230 event_handler.yield_ev.start ();
1138#endif 1231#endif
1139 } 1232 }
1140 else 1233 else
1141 { 1234 {
1142 pty_ev.stop (); 1235 pty_ev.stop ();
… …
1164} 1257}
1165 1258
1166void 1259void
1167rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1168{ 1261{
1169 XDefineCursor (display->display, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1170 recolour_cursor (); 1263 recolour_cursor ();
1171 1264
1172#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1173 hidden_pointer = 0; 1266 hidden_pointer = 0;
1174 1267
… …
1182rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1183{ 1276{
1184 if (!OPTION (Opt_pointerBlank)) 1277 if (!OPTION (Opt_pointerBlank))
1185 return; 1278 return;
1186 1279
1187 XDefineCursor (display->display, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1188 XFlush (display->display); 1281 XFlush (dpy);
1189 1282
1190 hidden_pointer = 1; 1283 hidden_pointer = 1;
1191} 1284}
1192 1285
1193void 1286void
… …
1272void 1365void
1273rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1274{ 1367{
1275 make_current (); 1368 make_current ();
1276 1369
1277 dDisp; 1370 dLocal (Display *, dpy);
1278 1371
1279 if (ev.xany.window == vt 1372 if (ev.xany.window == vt
1280 && SHOULD_INVOKE (HOOK_X_EVENT) 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1281 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1282 return; 1375 return;
… …
1287 unsigned int unused_mask; 1380 unsigned int unused_mask;
1288 1381
1289 switch (ev.type) 1382 switch (ev.type)
1290 { 1383 {
1291 case KeyPress: 1384 case KeyPress:
1292#if ISO_14755 1385 key_press (ev.xkey);
1293 if (!(iso14755buf & ISO_14755_52))
1294#endif
1295 lookup_key (ev.xkey);
1296
1297 break; 1386 break;
1298 1387
1299 case KeyRelease: 1388 case KeyRelease:
1300 { 1389 key_release (ev.xkey);
1301#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1302 KeySym keysym;
1303
1304 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1305#endif
1306
1307#if ENABLE_FRILLS || ISO_14755
1308 // ISO 14755 support
1309 if (iso14755buf)
1310 if (iso14755buf & ISO_14755_52)
1311 {
1312# if ENABLE_OVERLAY
1313 scr_overlay_off ();
1314# endif
1315# if ISO_14755
1316 // iso14755 part 5.2 handling: release time
1317 // first: controls
1318 if ((ev.xkey.state & ControlMask)
1319 && ((keysym >= 0x40 && keysym <= 0x5f)
1320 || (keysym >= 0x61 && keysym <= 0x7f)))
1321 {
1322 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1323 commit_iso14755 ();
1324 goto skip_switch;
1325 }
1326
1327 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1328 if (i[0] == keysym)
1329 {
1330 iso14755buf = ISO_14755_51 | i[1];
1331 commit_iso14755 ();
1332 goto skip_switch;
1333 }
1334
1335 scr_bell ();
1336# endif
1337 iso14755buf = 0;
1338 break;
1339 }
1340 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1341 {
1342# if ENABLE_OVERLAY
1343 scr_overlay_off ();
1344# endif
1345 if (iso14755buf & ISO_14755_51)
1346 commit_iso14755 ();
1347#if ISO_14755
1348 else if (iso14755buf & ISO_14755_STARTED)
1349 {
1350 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1351
1352 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1353 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1354 }
1355# endif
1356 else
1357 iso14755buf = 0;
1358 }
1359#endif
1360
1361 if (ev.xany.window == vt
1362 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1363 break;
1364
1365#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1366 if (!(ev.xkey.state & ControlMask))
1367 slip_wheel_ev.stop ();
1368 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1369 mouse_slip_wheel_speed = 0;
1370#endif
1371 break; 1390 break;
1372 }
1373 1391
1374 case ButtonPress: 1392 case ButtonPress:
1375 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1376 break; 1394 break;
1377 1395
… …
1392 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1410 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1393 destroy (); 1411 destroy ();
1394 } 1412 }
1395#if ENABLE_EWMH 1413#if ENABLE_EWMH
1396 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1414 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1397 XSendEvent (disp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1398 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1399 &ev); 1417 &ev);
1400#endif 1418#endif
1401 } 1419 }
1402 } 1420 }
… …
1440 break; 1458 break;
1441 } 1459 }
1442 break; 1460 break;
1443 1461
1444 case FocusIn: 1462 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior
1464 && ev.xfocus.detail != NotifyPointer
1465 && ev.xfocus.mode != NotifyGrab)
1445 focus_in (); 1466 focus_in ();
1446 break; 1467 break;
1447 1468
1448 case FocusOut: 1469 case FocusOut:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1449 focus_out (); 1473 focus_out ();
1450 break; 1474 break;
1451 1475
1452 case ConfigureNotify: 1476 case ConfigureNotify:
1453 if (ev.xconfigure.window == parent[0]) 1477 if (ev.xconfigure.window == parent[0])
1454 { 1478 {
1455 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1456 ; 1480 ;
1457 1481
1458 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1482 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1459 { 1483 {
1460 seen_resize = 1; 1484 seen_resize = 1;
1461 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1485 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1462 } 1486 }
1463 1487
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1488 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1465 1489
1466#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1490#ifdef TRANSPARENT
1467 if (OPTION (Opt_transparent)) 1491 if (OPTION (Opt_transparent))
1468 check_our_parents (); 1492 check_our_parents ();
1469#endif 1493#endif
1470 } 1494 }
1471 break; 1495 break;
… …
1518 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1519 { 1543 {
1520 do 1544 do
1521 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1522 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1523 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1524 1548
1525 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1526 1550
1527 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1530 1554
1531 want_refresh = 1; 1555 want_refresh = 1;
1532 } 1556 }
1533 else 1557 else
1534 { 1558 {
1535 XEvent unused_event; 1559 XEvent unused_event;
1536 1560
1537 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1561 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1538 ; 1562 ;
1539 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1540 ; 1564 ;
1541 1565
1542 if (isScrollbarWindow (ev.xany.window)) 1566 if (isScrollbarWindow (ev.xany.window))
1543 { 1567 {
1544 scrollBar.setIdle (); 1568 scrollBar.setIdle ();
1545 scrollbar_show (0); 1569 scrollbar_show (0);
1546 } 1570 }
1547 1571
1548#ifdef TRANSPARENT 1572#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == parent[0]) 1573 if (am_transparent && ev.xany.window == parent[0])
1550 XClearWindow (disp, ev.xany.window); 1574 XClearWindow (dpy, ev.xany.window);
1551#endif 1575#endif
1552 } 1576 }
1553 break; 1577 break;
1554 1578
1555 case MotionNotify: 1579 case MotionNotify:
… …
1565 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1589 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1566 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1590 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1567 ; // nop 1591 ; // nop
1568 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1592 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1569 { 1593 {
1570 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1594 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1571 ; 1595 ;
1572 1596
1573 XQueryPointer (disp, vt, 1597 XQueryPointer (dpy, vt,
1574 &unused_root, &unused_child, 1598 &unused_root, &unused_child,
1575 &unused_root_x, &unused_root_y, 1599 &unused_root_x, &unused_root_y,
1576 &ev.xbutton.x, &ev.xbutton.y, 1600 &ev.xbutton.x, &ev.xbutton.y,
1577 &ev.xbutton.state); 1601 &ev.xbutton.state);
1578#ifdef MOUSE_THRESHOLD 1602#ifdef MOUSE_THRESHOLD
… …
1642#endif 1666#endif
1643 } 1667 }
1644 } 1668 }
1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1669 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1646 { 1670 {
1647 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1671 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1648 MotionNotify, &ev)) 1672 MotionNotify, &ev))
1649 ; 1673 ;
1650 1674
1651 XQueryPointer (disp, scrollBar.win, 1675 XQueryPointer (dpy, scrollBar.win,
1652 &unused_root, &unused_child, 1676 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1677 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1678 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1679 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1680 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1660 scrollbar_show (1); 1684 scrollbar_show (1);
1661 } 1685 }
1662 break; 1686 break;
1663 } 1687 }
1664 1688
1665skip_switch: ;
1666
1667#if defined(CURSOR_BLINK) 1689#if defined(CURSOR_BLINK)
1668 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1690 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1669 { 1691 {
1670 if (hidden_cursor) 1692 if (hidden_cursor)
1671 { 1693 {
… …
1698 if (!focus) 1720 if (!focus)
1699 { 1721 {
1700 focus = 1; 1722 focus = 1;
1701 want_refresh = 1; 1723 want_refresh = 1;
1702 1724
1703 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1704 1726
1705#if USE_XIM 1727#if USE_XIM
1706 if (Input_Context != NULL) 1728 if (Input_Context != NULL)
1707 { 1729 {
1708 IMSetStatusPosition (); 1730 IMSetPosition ();
1709 XSetICFocus (Input_Context); 1731 XSetICFocus (Input_Context);
1710 } 1732 }
1711#endif 1733#endif
1712#if CURSOR_BLINK 1734#if CURSOR_BLINK
1713 if (OPTION (Opt_cursorBlink)) 1735 if (OPTION (Opt_cursorBlink))
… …
1759 } 1781 }
1760#endif 1782#endif
1761 } 1783 }
1762} 1784}
1763 1785
1764#if TRANSPARENT 1786void
1787rxvt_term::update_fade_color (unsigned int idx)
1788{
1789#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade])
1791 {
1792 rgba c;
1793 pix_colors [Color_fade].get (c);
1794 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1795 }
1796#endif
1797}
1798
1799#if TRANSPARENT || ENABLE_PERL
1765void 1800void
1766rxvt_term::rootwin_cb (XEvent &ev) 1801rxvt_term::rootwin_cb (XEvent &ev)
1767{ 1802{
1768 make_current (); 1803 make_current ();
1769 1804
1805 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1806 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1807 return;
1808
1809# if TRANSPARENT
1770 switch (ev.type) 1810 switch (ev.type)
1771 { 1811 {
1772 case PropertyNotify: 1812 case PropertyNotify:
1773 /* 1813 /*
1774 * if user used some Esetroot compatible prog to set the root bg, 1814 * if user used some Esetroot compatible prog to set the root bg,
… …
1782 case ReparentNotify: 1822 case ReparentNotify:
1783 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1823 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1784 want_refresh = want_full_refresh = 1; 1824 want_refresh = want_full_refresh = 1;
1785 break; 1825 break;
1786 } 1826 }
1827# endif
1787} 1828}
1788#endif 1829#endif
1789 1830
1790void 1831void
1791rxvt_term::button_press (XButtonEvent &ev) 1832rxvt_term::button_press (XButtonEvent &ev)
… …
2119 selection_make (ev.time); 2160 selection_make (ev.time);
2120 break; 2161 break;
2121 2162
2122 case Button2: 2163 case Button2:
2123 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2164 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2124 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2165 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2125 break; 2166 break;
2126 2167
2127#ifdef MOUSE_WHEEL 2168#ifdef MOUSE_WHEEL
2128 case Button4: 2169 case Button4:
2129 case Button5: 2170 case Button5:
… …
2171#if TINTING 2212#if TINTING
2172/* taken from aterm-0.4.2 */ 2213/* taken from aterm-0.4.2 */
2173 2214
2174typedef uint32_t RUINT32T; 2215typedef uint32_t RUINT32T;
2175 2216
2176void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2217void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2177{ 2218{
2178 int sh_r, sh_g, sh_b; 2219 int sh_r, sh_g, sh_b;
2179 RUINT32T mask_r, mask_g, mask_b; 2220 RUINT32T mask_r, mask_g, mask_b;
2180 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2221 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2181 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2222 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2182 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2223 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2183 int i; 2224 int i;
2184 2225
2185 Visual *visual = display->visual; 2226 Visual *visual = term->visual;
2186 2227
2187 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2228 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2188 2229
2189 /* for convenience */ 2230 /* for convenience */
2190 mask_r = visual->red_mask; 2231 mask_r = visual->red_mask;
… …
2411 Atom atype; 2452 Atom atype;
2412 unsigned char *prop = NULL; 2453 unsigned char *prop = NULL;
2413 Window root, oldp, *list; 2454 Window root, oldp, *list;
2414 Pixmap rootpixmap = None; 2455 Pixmap rootpixmap = None;
2415 XWindowAttributes wattr, wrootattr; 2456 XWindowAttributes wattr, wrootattr;
2416 dDisp;
2417 2457
2418 pchanged = 0; 2458 pchanged = 0;
2419 2459
2420 if (!OPTION (Opt_transparent)) 2460 if (!OPTION (Opt_transparent))
2421 return pchanged; /* Don't try any more */ 2461 return pchanged; /* Don't try any more */
2422 2462
2423 XGetWindowAttributes (disp, display->root, &wrootattr); 2463 XGetWindowAttributes (dpy, display->root, &wrootattr);
2424 rootdepth = wrootattr.depth; 2464 rootdepth = wrootattr.depth;
2425 2465
2426 XGetWindowAttributes (disp, parent[0], &wattr); 2466 XGetWindowAttributes (dpy, parent[0], &wattr);
2427 2467
2428 if (rootdepth != wattr.depth) 2468 if (rootdepth != wattr.depth)
2429 { 2469 {
2430 if (am_transparent) 2470 if (am_transparent)
2431 { 2471 {
2432 pchanged = 1; 2472 pchanged = 1;
2433 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2473 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2434 am_transparent = am_pixmap_trans = 0; 2474 am_transparent = am_pixmap_trans = 0;
2435 } 2475 }
2436 2476
2437 return pchanged; /* Don't try any more */ 2477 return pchanged; /* Don't try any more */
2438 } 2478 }
2439 2479
2440 /* Get all X ops out of the queue so that our information is up-to-date. */ 2480 /* Get all X ops out of the queue so that our information is up-to-date. */
2441 XSync (disp, False); 2481 XSync (dpy, False);
2442 2482
2443 /* 2483 /*
2444 * Make the frame window set by the window manager have 2484 * Make the frame window set by the window manager have
2445 * the root background. Some window managers put multiple nested frame 2485 * the root background. Some window managers put multiple nested frame
2446 * windows for each client, so we have to take care about that. 2486 * windows for each client, so we have to take care about that.
2447 */ 2487 */
2448 i = (xa[XA_XROOTPMAP_ID] 2488 i = (xa[XA_XROOTPMAP_ID]
2449 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2489 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2450 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2451 &nitems, &bytes_after, &prop) == Success); 2491 &nitems, &bytes_after, &prop) == Success);
2452 2492
2453 if (!i || prop == NULL) 2493 if (!i || prop == NULL)
2454 i = (xa[XA_ESETROOT_PMAP_ID] 2494 i = (xa[XA_ESETROOT_PMAP_ID]
2455 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2495 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2456 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2496 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2457 &nitems, &bytes_after, &prop) == Success); 2497 &nitems, &bytes_after, &prop) == Success);
2458 2498
2459 if (!i || prop == NULL 2499 if (!i || prop == NULL
2460#if TINTING 2500#if TINTING
2461 || !rs[Rs_color + Color_tint] 2501 || !ISSET_PIXCOLOR (Color_tint)
2462#endif 2502#endif
2463 ) 2503 )
2464 have_pixmap = 0; 2504 have_pixmap = 0;
2465 else 2505 else
2466 { 2506 {
… …
2479 Window cr; 2519 Window cr;
2480 XImage *image; 2520 XImage *image;
2481 GC gc; 2521 GC gc;
2482 XGCValues gcvalue; 2522 XGCValues gcvalue;
2483 2523
2484 XTranslateCoordinates (disp, parent[0], display->root, 2524 XTranslateCoordinates (dpy, parent[0], display->root,
2485 0, 0, &sx, &sy, &cr); 2525 0, 0, &sx, &sy, &cr);
2486 nw = (unsigned int)szHint.width; 2526 nw = (unsigned int)szHint.width;
2487 nh = (unsigned int)szHint.height; 2527 nh = (unsigned int)szHint.height;
2488 nx = ny = 0; 2528 nx = ny = 0;
2489 2529
… …
2502 } 2542 }
2503 2543
2504 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2544 min_it (nw, (unsigned int) (wrootattr.width - sx));
2505 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2545 min_it (nh, (unsigned int) (wrootattr.height - sy));
2506 2546
2507 XSync (disp, False); 2547 XSync (dpy, False);
2508 allowedxerror = -1; 2548 allowedxerror = -1;
2509 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2549 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2510 2550
2511 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2551 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2512 /* XXX: may need a delay here? */ 2552 /* XXX: may need a delay here? */
2513 allowedxerror = 0; 2553 allowedxerror = 0;
2514 2554
… …
2517 if (am_transparent && am_pixmap_trans) 2557 if (am_transparent && am_pixmap_trans)
2518 { 2558 {
2519 pchanged = 1; 2559 pchanged = 1;
2520 if (pixmap != None) 2560 if (pixmap != None)
2521 { 2561 {
2522 XFreePixmap (disp, pixmap); 2562 XFreePixmap (dpy, pixmap);
2523 pixmap = None; 2563 pixmap = None;
2524 } 2564 }
2525 } 2565 }
2526 2566
2527 am_pixmap_trans = 0; 2567 am_pixmap_trans = 0;
2528 } 2568 }
2529 else 2569 else
2530 { 2570 {
2531 if (pixmap != None) 2571 if (pixmap != None)
2532 XFreePixmap (disp, pixmap); 2572 XFreePixmap (dpy, pixmap);
2533 2573
2534#if TINTING 2574#if TINTING
2535 if (ISSET_PIXCOLOR (Color_tint)) 2575 if (ISSET_PIXCOLOR (Color_tint))
2536 { 2576 {
2537 unsigned short rm, gm, bm;
2538 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2577 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2539 2578
2579 rgba c;
2540 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2580 pix_colors_focused [Color_tint].get (c);
2541 2581
2542 ShadeXImage (display, image, shade, rm, gm, bm); 2582 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2543 } 2583 }
2544#endif 2584#endif
2545 2585
2546 pixmap = XCreatePixmap (disp, vt, 2586 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2547 szHint.width, szHint.height, image->depth);
2548 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2587 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2549 XPutImage (disp, pixmap, gc, image, 0, 0, 2588 XPutImage (dpy, pixmap, gc, image, 0, 0,
2550 nx, ny, image->width, image->height); 2589 nx, ny, image->width, image->height);
2551 XFreeGC (disp, gc); 2590 XFreeGC (dpy, gc);
2552 XDestroyImage (image); 2591 XDestroyImage (image);
2553 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2592 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2554 XClearWindow (disp, parent[0]); 2593 XClearWindow (dpy, parent[0]);
2555 2594
2556 if (!am_transparent || !am_pixmap_trans) 2595 if (!am_transparent || !am_pixmap_trans)
2557 pchanged = 1; 2596 pchanged = 1;
2558 2597
2559 am_transparent = am_pixmap_trans = 1; 2598 am_transparent = am_pixmap_trans = 1;
2560 } 2599 }
2561 } 2600 }
2562 2601
2563 if (am_pixmap_trans) 2602 if (am_pixmap_trans)
2564 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2603 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2565 else 2604 else
2566 { 2605 {
2567 unsigned int n; 2606 unsigned int n;
2568 /* 2607 /*
2569 * InheritPixmap transparency 2608 * InheritPixmap transparency
2570 */ 2609 */
2571 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2610 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2572 { 2611 {
2573 oldp = parent[i]; 2612 oldp = parent[i];
2574 XQueryTree (disp, parent[i - 1], &root, 2613 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2575 &parent[i], &list, &n);
2576 XFree (list); 2614 XFree (list);
2577 2615
2578 if (parent[i] == display->root) 2616 if (parent[i] == display->root)
2579 { 2617 {
2580 if (oldp != None) 2618 if (oldp != None)
… …
2588 } 2626 }
2589 2627
2590 n = 0; 2628 n = 0;
2591 2629
2592 if (pchanged) 2630 if (pchanged)
2593 {
2594 for (; n < (unsigned int)i; n++) 2631 for (; n < (unsigned int)i; n++)
2595 { 2632 {
2596 XGetWindowAttributes (disp, parent[n], &wattr); 2633 XGetWindowAttributes (dpy, parent[n], &wattr);
2634
2597 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2635 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2598 { 2636 {
2599 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2637 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2600 break; 2638 break;
2601 } 2639 }
2602 } 2640 }
2603 }
2604 2641
2605 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2642 if (n > (sizeof (parent) / sizeof (parent[0])))
2606 { 2643 {
2607 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2644 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2608 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2645 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2609 am_transparent = 0; 2646 am_transparent = 0;
2610 /* XXX: also turn off Opt_transparent? */ 2647 /* XXX: also turn off Opt_transparent? */
2611 } 2648 }
2612 else 2649 else
2613 { 2650 {
2614 for (n = 0; n < (unsigned int)i; n++) 2651 for (n = 0; n < (unsigned int)i; n++)
2615 { 2652 {
2616 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2653 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2617 XClearWindow (disp, parent[n]); 2654 XClearWindow (dpy, parent[n]);
2618 } 2655 }
2619 2656
2620 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2657 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2621 am_transparent = 1; 2658 am_transparent = 1;
2622 } 2659 }
2623 2660
2624 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2661 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2625 parent[i] = None; 2662 parent[i] = None;
2626 } 2663 }
2627 2664
2628 if (scrollBar.win) 2665 if (scrollBar.win)
2629 { 2666 {
2630 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2667 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2631 scrollBar.setIdle (); 2668 scrollBar.setIdle ();
2632 scrollbar_show (0); 2669 scrollbar_show (0);
2633 } 2670 }
2634 2671
2635 if (am_transparent) 2672 if (am_transparent)
… …
2753 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2790 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2754 refresh_limit++; 2791 refresh_limit++;
2755 else 2792 else
2756 { 2793 {
2757 flag = true; 2794 flag = true;
2795 //TODO: due to popular request, implement "skipscroll" option here
2758 scr_refresh (); 2796 scr_refresh ();
2759 want_refresh = 1; 2797 want_refresh = 1;
2760 } 2798 }
2761 } 2799 }
2762 2800
… …
3086 scr_charset_set (2, (unsigned int)cmd_getc ()); 3124 scr_charset_set (2, (unsigned int)cmd_getc ());
3087 break; 3125 break;
3088 case '+': 3126 case '+':
3089 scr_charset_set (3, (unsigned int)cmd_getc ()); 3127 scr_charset_set (3, (unsigned int)cmd_getc ());
3090 break; 3128 break;
3091#if ENABLE_FRILLS 3129#if !ENABLE_MINIMAL
3092 case '6': 3130 case '6':
3093 scr_backindex (); 3131 scr_backindex ();
3094 break; 3132 break;
3095#endif 3133#endif
3096 case '7': 3134 case '7':
3097 scr_cursor (SAVE); 3135 scr_cursor (SAVE);
3098 break; 3136 break;
3099 case '8': 3137 case '8':
3100 scr_cursor (RESTORE); 3138 scr_cursor (RESTORE);
3101 break; 3139 break;
3102#if ENABLE_FRILLS 3140#if !ENABLE_MINIMAL
3103 case '9': 3141 case '9':
3104 scr_forwardindex (); 3142 scr_forwardindex ();
3105 break; 3143 break;
3106#endif 3144#endif
3107 case '=': 3145 case '=':
… …
3280 { 3318 {
3281 case '>': 3319 case '>':
3282 if (ch == CSI_DA) /* secondary device attributes */ 3320 if (ch == CSI_DA) /* secondary device attributes */
3283 { 3321 {
3284 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 3322 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3285 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions. 3323 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3286 // 3324 //
3287 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 3325 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3288 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 3326 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3289 // that we do not support xterm mouse reporting (should be 95 when we do). 3327 // that we do not support xterm mouse reporting (should be 95 when we do).
3290 // 3328 //
3291 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); 3329 tt_printf ("\033[>%d;94;0c", 'U');
3292 } 3330 }
3293 break; 3331 break;
3294 case '?': 3332 case '?':
3295 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3333 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3296 process_terminal_mode (ch, priv, nargs, arg); 3334 process_terminal_mode (ch, priv, nargs, arg);
… …
3500 break; 3538 break;
3501 case CSI_75: 3539 case CSI_75:
3502 scr_cursor (RESTORE); 3540 scr_cursor (RESTORE);
3503 break; 3541 break;
3504 3542
3505#if ENABLE_FRILLS 3543#if !ENABLE_MINIMAL
3506 case CSI_74: 3544 case CSI_74:
3507 process_window_ops (arg, nargs); 3545 process_window_ops (arg, nargs);
3508 break; 3546 break;
3509#endif 3547#endif
3510 3548
… …
3517 break; 3555 break;
3518 } 3556 }
3519} 3557}
3520/*}}} */ 3558/*}}} */
3521 3559
3522#if ENABLE_FRILLS 3560#if !ENABLE_MINIMAL
3523/* ARGSUSED */ 3561/* ARGSUSED */
3524void 3562void
3525rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3563rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3526{ 3564{
3527 int x, y; 3565 int x, y;
3528 XWindowAttributes wattr; 3566 XWindowAttributes wattr;
3529 Window wdummy; 3567 Window wdummy;
3530 dDisp; 3568
3569 dLocal (Display *, dpy);
3531 3570
3532 if (nargs == 0) 3571 if (nargs == 0)
3533 return; 3572 return;
3534 3573
3535 switch (args[0]) 3574 switch (args[0])
3536 { 3575 {
3537 /* 3576 /*
3538 * commands 3577 * commands
3539 */ 3578 */
3540 case 1: /* deiconify window */ 3579 case 1: /* deiconify window */
3541 XMapWindow (disp, parent[0]); 3580 XMapWindow (dpy, parent[0]);
3542 break; 3581 break;
3543 case 2: /* iconify window */ 3582 case 2: /* iconify window */
3544 XIconifyWindow (disp, parent[0], display->screen); 3583 XIconifyWindow (dpy, parent[0], display->screen);
3545 break; 3584 break;
3546 case 3: /* set position (pixels) */ 3585 case 3: /* set position (pixels) */
3547 XMoveWindow (disp, parent[0], args[1], args[2]); 3586 XMoveWindow (dpy, parent[0], args[1], args[2]);
3548 break; 3587 break;
3549 case 4: /* set size (pixels) */ 3588 case 4: /* set size (pixels) */
3550 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3589 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3551 break; 3590 break;
3552 case 5: /* raise window */ 3591 case 5: /* raise window */
3553 XRaiseWindow (disp, parent[0]); 3592 XRaiseWindow (dpy, parent[0]);
3554 break; 3593 break;
3555 case 6: /* lower window */ 3594 case 6: /* lower window */
3556 XLowerWindow (disp, parent[0]); 3595 XLowerWindow (dpy, parent[0]);
3557 break; 3596 break;
3558 case 7: /* refresh window */ 3597 case 7: /* refresh window */
3559 scr_touch (true); 3598 scr_touch (true);
3560 break; 3599 break;
3561 case 8: /* set size (chars) */ 3600 case 8: /* set size (chars) */
… …
3568 if (args[0] >= 24) /* set height (chars) */ 3607 if (args[0] >= 24) /* set height (chars) */
3569 set_widthheight ((unsigned int)width, 3608 set_widthheight ((unsigned int)width,
3570 (unsigned int) (args[1] * fheight)); 3609 (unsigned int) (args[1] * fheight));
3571 break; 3610 break;
3572 3611
3573
3574 /* 3612 /*
3575 * reports - some output format copied from XTerm 3613 * reports - some output format copied from XTerm
3576 */ 3614 */
3577 case 11: /* report window state */ 3615 case 11: /* report window state */
3578 XGetWindowAttributes (disp, parent[0], &wattr); 3616 XGetWindowAttributes (dpy, parent[0], &wattr);
3579 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3617 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3580 break; 3618 break;
3581 case 13: /* report window position */ 3619 case 13: /* report window position */
3582 XGetWindowAttributes (disp, parent[0], &wattr); 3620 XGetWindowAttributes (dpy, parent[0], &wattr);
3583 XTranslateCoordinates (disp, parent[0], wattr.root, 3621 XTranslateCoordinates (dpy, parent[0], wattr.root,
3584 -wattr.border_width, -wattr.border_width, 3622 -wattr.border_width, -wattr.border_width,
3585 &x, &y, &wdummy); 3623 &x, &y, &wdummy);
3586 tt_printf ("\033[3;%d;%dt", x, y); 3624 tt_printf ("\033[3;%d;%dt", x, y);
3587 break; 3625 break;
3588 case 14: /* report window size (pixels) */ 3626 case 14: /* report window size (pixels) */
3589 XGetWindowAttributes (disp, parent[0], &wattr); 3627 XGetWindowAttributes (dpy, parent[0], &wattr);
3590 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3628 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3591 break; 3629 break;
3592 case 18: /* report text area size (chars) */ 3630 case 18: /* report text area size (chars) */
3593 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3631 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3594 break; 3632 break;
… …
3596 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3634 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3597 break; 3635 break;
3598 case 20: /* report icon label */ 3636 case 20: /* report icon label */
3599 { 3637 {
3600 char *s; 3638 char *s;
3601 XGetIconName (disp, parent[0], &s); 3639 XGetIconName (dpy, parent[0], &s);
3602 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3640 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3603 XFree (s); 3641 XFree (s);
3604 } 3642 }
3605 break; 3643 break;
3606 case 21: /* report window title */ 3644 case 21: /* report window title */
3607 { 3645 {
3608 char *s; 3646 char *s;
3609 XFetchName (disp, parent[0], &s); 3647 XFetchName (dpy, parent[0], &s);
3610 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3648 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3611 XFree (s); 3649 XFree (s);
3612 } 3650 }
3613 break; 3651 break;
3614 } 3652 }
… …
3642 seen_esc = true; 3680 seen_esc = true;
3643 continue; 3681 continue;
3644 } 3682 }
3645 else if (ch == C0_BEL || ch == CHAR_ST) 3683 else if (ch == C0_BEL || ch == CHAR_ST)
3646 break; 3684 break;
3685 else if (ch == C0_SYN)
3686 ch = cmd_get8 ();
3647 else if (ch < 0x20) 3687 else if (ch < 0x20)
3648 return NULL; /* other control character - exit */ 3688 return NULL; /* other control character - exit */
3649 3689
3650 seen_esc = false; 3690 seen_esc = false;
3651 3691
3652 if (n >= STRING_MAX - 1) 3692 if (n >= STRING_MAX - 1)
3653 // stop at some sane length 3693 // stop at some sane length
3654 return NULL; 3694 return NULL;
3655 3695
3656 if (ch == C0_SYN)
3657 string[n++] = cmd_get8 ();
3658 else
3659 string[n++] = ch; 3696 string[n++] = ch;
3660 } 3697 }
3661 3698
3662 string[n++] = '\0'; 3699 string[n++] = '\0';
3663 3700
3664 ends_how = (ch == 0x5c ? C0_ESC : ch); 3701 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3715void 3752void
3716rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3753rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3717{ 3754{
3718 if (str[0] == '?' && !str[1]) 3755 if (str[0] == '?' && !str[1])
3719 { 3756 {
3720 unsigned short r, g, b; 3757 rgba c;
3721 pix_colors_focused[color].get (display, r, g, b); 3758 pix_colors_focused[color].get (c);
3759
3760#if XFT
3761 if (c.a != rgba::MAX_CC)
3762 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3763 else
3764#endif
3722 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3765 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3723 } 3766 }
3724 else 3767 else
3725 set_window_color (color, str); 3768 set_window_color (color, str);
3726} 3769}
3727 3770
… …
3733{ 3776{
3734 int color; 3777 int color;
3735 char *buf, *name; 3778 char *buf, *name;
3736 bool query = str[0] == '?' && !str[1]; 3779 bool query = str[0] == '?' && !str[1];
3737 int saveop = op; 3780 int saveop = op;
3738 dDisp; 3781
3782 dLocal (Display *, dpy);
3739 3783
3740 assert (str != NULL); 3784 assert (str != NULL);
3785
3786 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3787 return;
3788
3741 switch (op) 3789 switch (op)
3742 { 3790 {
3743 case XTerm_name: 3791 case XTerm_name:
3744 set_title (str); 3792 set_title (str);
3745 /* FALLTHROUGH */ 3793 /* FALLTHROUGH */
… …
3759 unsigned long bytes_after; 3807 unsigned long bytes_after;
3760 unsigned char *value = 0; 3808 unsigned char *value = 0;
3761 const char *str = ""; 3809 const char *str = "";
3762 3810
3763 if (prop 3811 if (prop
3764 && XGetWindowProperty (disp, parent[0], 3812 && XGetWindowProperty (dpy, parent[0],
3765 prop, 0, 1<<16, 0, AnyPropertyType, 3813 prop, 0, 1<<16, 0, AnyPropertyType,
3766 &actual_type, &actual_format, 3814 &actual_type, &actual_format,
3767 &nitems, &bytes_after, &value) == Success 3815 &nitems, &bytes_after, &value) == Success
3768 && actual_type != None 3816 && actual_type != None
3769 && actual_format == 8) 3817 && actual_format == 8)
3770 str = (const char *)(value); 3818 str = (const char *)(value);
3771 3819
3772 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3820 tt_printf ("\033]%d;%s%c", op, str, resp);
3773 3821
3774 XFree (value); 3822 XFree (value);
3775 } 3823 }
3776 else 3824 else
3777 { 3825 {
… …
3781 { 3829 {
3782 *eq = 0; 3830 *eq = 0;
3783 set_utf8_property (display->atom (str), eq + 1); 3831 set_utf8_property (display->atom (str), eq + 1);
3784 } 3832 }
3785 else 3833 else
3786 XDeleteProperty (disp, parent[0], 3834 XDeleteProperty (dpy, parent[0],
3787 display->atom (str)); 3835 display->atom (str));
3788 } 3836 }
3789 break; 3837 break;
3790 3838
3791 case XTerm_Color: 3839 case XTerm_Color:
… …
3801 break; 3849 break;
3802 3850
3803 if ((buf = strchr (name, ';')) != NULL) 3851 if ((buf = strchr (name, ';')) != NULL)
3804 *buf++ = '\0'; 3852 *buf++ = '\0';
3805 3853
3806 if (name[0] == '?' && !name[1]) 3854 process_color_seq (op, color, name, resp);
3807 {
3808 unsigned short r, g, b;
3809 pix_colors_focused[color].get (display, r, g, b);
3810 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3811 }
3812 else
3813 set_window_color (color, name);
3814 } 3855 }
3815 break; 3856 break;
3816 case XTerm_Color00: 3857 case XTerm_Color00:
3817 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3858 process_color_seq (op, Color_fg, str, resp);
3818 break; 3859 break;
3819 case XTerm_Color01: 3860 case XTerm_Color01:
3820 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3861 process_color_seq (op, Color_bg, str, resp);
3821 break; 3862 break;
3822#ifndef NO_CURSORCOLOR 3863#ifndef NO_CURSORCOLOR
3823 case XTerm_Color_cursor: 3864 case XTerm_Color_cursor:
3824 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3865 process_color_seq (op, Color_cursor, str, resp);
3825 break; 3866 break;
3826#endif 3867#endif
3827 case XTerm_Color_pointer_fg: 3868 case XTerm_Color_pointer_fg:
3828 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3869 process_color_seq (op, Color_pointer_fg, str, resp);
3829 break; 3870 break;
3830 case XTerm_Color_pointer_bg: 3871 case XTerm_Color_pointer_bg:
3831 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3872 process_color_seq (op, Color_pointer_bg, str, resp);
3832 break; 3873 break;
3833#ifndef NO_BOLD_UNDERLINE_REVERSE 3874#ifndef NO_BOLD_UNDERLINE_REVERSE
3834 case XTerm_Color_RV: 3875 case XTerm_Color_RV:
3835 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3876 process_color_seq (op, Color_RV, str, resp);
3836 break; 3877 break;
3837 case Rxvt_Color_BD: 3878 case Rxvt_Color_BD:
3838 case URxvt_Color_BD: 3879 case URxvt_Color_BD:
3839 process_color_seq (op, Color_BD, str, resp); 3880 process_color_seq (op, Color_BD, str, resp);
3840 break; 3881 break;
3841 case Rxvt_Color_UL: 3882 case Rxvt_Color_UL:
3842 case URxvt_Color_UL: 3883 case URxvt_Color_UL:
3843 process_color_seq (op, Color_UL, str, resp); 3884 process_color_seq (op, Color_UL, str, resp);
3844 break; 3885 break;
3845 case URxvt_Color_IT: 3886 case URxvt_Color_IT:
3846 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3887 process_color_seq (op, Color_IT, str, resp);
3847 break; 3888 break;
3848#endif 3889#endif
3849#if TRANSPARENT && TINTING 3890#if TRANSPARENT && TINTING
3850 case URxvt_Color_tint: 3891 case URxvt_Color_tint:
3851 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3892 process_color_seq (op, Color_tint, str, resp);
3893
3852 check_our_parents (); 3894 check_our_parents ();
3895
3853 if (am_transparent) 3896 if (am_transparent)
3854 want_full_refresh = want_refresh = 1; 3897 want_full_refresh = want_refresh = 1;
3898
3855 break; 3899 break;
3856#endif 3900#endif
3857 3901
3858 case Rxvt_Pixmap: 3902 case Rxvt_Pixmap:
3859 { 3903 {
… …
3930 allocated.push_back ((void *)res); 3974 allocated.push_back ((void *)res);
3931 set_fonts (); 3975 set_fonts ();
3932 } 3976 }
3933 break; 3977 break;
3934 3978
3935#if ENABLE_FRILLS 3979 case URxvt_version:
3980 if (query)
3981 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3982 op,
3983 rs[Rs_name], VERSION[0], VERSION[2],
3984 resp);
3985 break;
3986
3987#if !ENABLE_MINIMAL
3936 case URxvt_locale: 3988 case URxvt_locale:
3937 if (query) 3989 if (query)
3938 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3990 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3939 else 3991 else
3940 { 3992 {
3941 set_locale (str); 3993 set_locale (str);
3942 pty->set_utf8_mode (enc_utf8); 3994 pty->set_utf8_mode (enc_utf8);
3943 init_xlocale (); 3995 init_xlocale ();
… …
3958 break; 4010 break;
3959#endif 4011#endif
3960 4012
3961#if ENABLE_PERL 4013#if ENABLE_PERL
3962 case URxvt_perl: 4014 case URxvt_perl:
3963 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4015 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3964 ; // no responses yet 4016 ; // no responses yet
3965 break; 4017 break;
3966#endif 4018#endif
3967 } 4019 }
3968} 4020}
… …
4304 scr_color (Color_bg, Color_bg); 4356 scr_color (Color_bg, Color_bg);
4305 break; 4357 break;
4306 4358
4307 //case 50: // not variable spacing 4359 //case 50: // not variable spacing
4308 4360
4309#if ENABLE_FRILLS 4361#if !ENABLE_MINIMAL
4310 case 90: 4362 case 90:
4311 case 91: /* set bright fg color */ 4363 case 91: /* set bright fg color */
4312 case 92: 4364 case 92:
4313 case 93: 4365 case 93:
4314 case 94: 4366 case 94:

Diff Legend

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