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.291 by root, Sun Jan 29 20:51:27 2006 UTC vs.
Revision 1.316 by root, Thu Dec 7 20:59:59 2006 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 (xdisp, 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 (xdisp, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1188 XFlush (xdisp); 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 dLocal (Display *, xdisp); 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 (xdisp, 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 && ev.xfocus.detail != NotifyPointer)
1445 focus_in (); 1464 focus_in ();
1446 break; 1465 break;
1447 1466
1448 case FocusOut: 1467 case FocusOut:
1468 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)
1449 focus_out (); 1469 focus_out ();
1450 break; 1470 break;
1451 1471
1452 case ConfigureNotify: 1472 case ConfigureNotify:
1453 if (ev.xconfigure.window == parent[0]) 1473 if (ev.xconfigure.window == parent[0])
1454 { 1474 {
1455 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1475 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1456 ; 1476 ;
1457 1477
1458 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1478 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1459 { 1479 {
1460 seen_resize = 1; 1480 seen_resize = 1;
… …
1518 if (ev.xany.window == vt) 1538 if (ev.xany.window == vt)
1519 { 1539 {
1520 do 1540 do
1521 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1522 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1523 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1524 1544
1525 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1545 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1526 1546
1527 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1548 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1549 ev.xexpose.width, ev.xexpose.height, False);
1530 1550
1531 want_refresh = 1; 1551 want_refresh = 1;
1532 } 1552 }
1533 else 1553 else
1534 { 1554 {
1535 XEvent unused_event; 1555 XEvent unused_event;
1536 1556
1537 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1538 ; 1558 ;
1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1559 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1540 ; 1560 ;
1541 1561
1542 if (isScrollbarWindow (ev.xany.window)) 1562 if (isScrollbarWindow (ev.xany.window))
1543 { 1563 {
1544 scrollBar.setIdle (); 1564 scrollBar.setIdle ();
1545 scrollbar_show (0); 1565 scrollbar_show (0);
1546 } 1566 }
1547 1567
1548#ifdef TRANSPARENT 1568#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == parent[0]) 1569 if (am_transparent && ev.xany.window == parent[0])
1550 XClearWindow (xdisp, ev.xany.window); 1570 XClearWindow (dpy, ev.xany.window);
1551#endif 1571#endif
1552 } 1572 }
1553 break; 1573 break;
1554 1574
1555 case MotionNotify: 1575 case MotionNotify:
… …
1565 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1585 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1566 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1586 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1567 ; // nop 1587 ; // nop
1568 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1588 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1569 { 1589 {
1570 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1590 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1571 ; 1591 ;
1572 1592
1573 XQueryPointer (xdisp, vt, 1593 XQueryPointer (dpy, vt,
1574 &unused_root, &unused_child, 1594 &unused_root, &unused_child,
1575 &unused_root_x, &unused_root_y, 1595 &unused_root_x, &unused_root_y,
1576 &ev.xbutton.x, &ev.xbutton.y, 1596 &ev.xbutton.x, &ev.xbutton.y,
1577 &ev.xbutton.state); 1597 &ev.xbutton.state);
1578#ifdef MOUSE_THRESHOLD 1598#ifdef MOUSE_THRESHOLD
… …
1642#endif 1662#endif
1643 } 1663 }
1644 } 1664 }
1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1665 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1646 { 1666 {
1647 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1648 MotionNotify, &ev)) 1668 MotionNotify, &ev))
1649 ; 1669 ;
1650 1670
1651 XQueryPointer (xdisp, scrollBar.win, 1671 XQueryPointer (dpy, scrollBar.win,
1652 &unused_root, &unused_child, 1672 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1673 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1674 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1675 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1660 scrollbar_show (1); 1680 scrollbar_show (1);
1661 } 1681 }
1662 break; 1682 break;
1663 } 1683 }
1664 1684
1665skip_switch: ;
1666
1667#if defined(CURSOR_BLINK) 1685#if defined(CURSOR_BLINK)
1668 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1686 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1669 { 1687 {
1670 if (hidden_cursor) 1688 if (hidden_cursor)
1671 { 1689 {
… …
1698 if (!focus) 1716 if (!focus)
1699 { 1717 {
1700 focus = 1; 1718 focus = 1;
1701 want_refresh = 1; 1719 want_refresh = 1;
1702 1720
1703 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1721 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1704 1722
1705#if USE_XIM 1723#if USE_XIM
1706 if (Input_Context != NULL) 1724 if (Input_Context != NULL)
1707 { 1725 {
1708 IMSetStatusPosition (); 1726 IMSetPosition ();
1709 XSetICFocus (Input_Context); 1727 XSetICFocus (Input_Context);
1710 } 1728 }
1711#endif 1729#endif
1712#if CURSOR_BLINK 1730#if CURSOR_BLINK
1713 if (OPTION (Opt_cursorBlink)) 1731 if (OPTION (Opt_cursorBlink))
… …
1759 } 1777 }
1760#endif 1778#endif
1761 } 1779 }
1762} 1780}
1763 1781
1764#if TRANSPARENT 1782void
1783rxvt_term::update_fade_color (unsigned int idx)
1784{
1785#if OFF_FOCUS_FADING
1786 if (rs[Rs_fade])
1787 {
1788 rgba c;
1789 pix_colors [Color_fade].get (c);
1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791 }
1792#endif
1793}
1794
1795#if TRANSPARENT || ENABLE_PERL
1765void 1796void
1766rxvt_term::rootwin_cb (XEvent &ev) 1797rxvt_term::rootwin_cb (XEvent &ev)
1767{ 1798{
1768 make_current (); 1799 make_current ();
1769 1800
1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803 return;
1804
1805# if TRANSPARENT
1770 switch (ev.type) 1806 switch (ev.type)
1771 { 1807 {
1772 case PropertyNotify: 1808 case PropertyNotify:
1773 /* 1809 /*
1774 * if user used some Esetroot compatible prog to set the root bg, 1810 * if user used some Esetroot compatible prog to set the root bg,
… …
1782 case ReparentNotify: 1818 case ReparentNotify:
1783 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1819 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1784 want_refresh = want_full_refresh = 1; 1820 want_refresh = want_full_refresh = 1;
1785 break; 1821 break;
1786 } 1822 }
1823# endif
1787} 1824}
1788#endif 1825#endif
1789 1826
1790void 1827void
1791rxvt_term::button_press (XButtonEvent &ev) 1828rxvt_term::button_press (XButtonEvent &ev)
… …
2417 pchanged = 0; 2454 pchanged = 0;
2418 2455
2419 if (!OPTION (Opt_transparent)) 2456 if (!OPTION (Opt_transparent))
2420 return pchanged; /* Don't try any more */ 2457 return pchanged; /* Don't try any more */
2421 2458
2422 XGetWindowAttributes (xdisp, display->root, &wrootattr); 2459 XGetWindowAttributes (dpy, display->root, &wrootattr);
2423 rootdepth = wrootattr.depth; 2460 rootdepth = wrootattr.depth;
2424 2461
2425 XGetWindowAttributes (xdisp, parent[0], &wattr); 2462 XGetWindowAttributes (dpy, parent[0], &wattr);
2426 2463
2427 if (rootdepth != wattr.depth) 2464 if (rootdepth != wattr.depth)
2428 { 2465 {
2429 if (am_transparent) 2466 if (am_transparent)
2430 { 2467 {
2431 pchanged = 1; 2468 pchanged = 1;
2432 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2469 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2433 am_transparent = am_pixmap_trans = 0; 2470 am_transparent = am_pixmap_trans = 0;
2434 } 2471 }
2435 2472
2436 return pchanged; /* Don't try any more */ 2473 return pchanged; /* Don't try any more */
2437 } 2474 }
2438 2475
2439 /* Get all X ops out of the queue so that our information is up-to-date. */ 2476 /* Get all X ops out of the queue so that our information is up-to-date. */
2440 XSync (xdisp, False); 2477 XSync (dpy, False);
2441 2478
2442 /* 2479 /*
2443 * Make the frame window set by the window manager have 2480 * Make the frame window set by the window manager have
2444 * the root background. Some window managers put multiple nested frame 2481 * the root background. Some window managers put multiple nested frame
2445 * windows for each client, so we have to take care about that. 2482 * windows for each client, so we have to take care about that.
2446 */ 2483 */
2447 i = (xa[XA_XROOTPMAP_ID] 2484 i = (xa[XA_XROOTPMAP_ID]
2448 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID], 2485 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2449 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2450 &nitems, &bytes_after, &prop) == Success); 2487 &nitems, &bytes_after, &prop) == Success);
2451 2488
2452 if (!i || prop == NULL) 2489 if (!i || prop == NULL)
2453 i = (xa[XA_ESETROOT_PMAP_ID] 2490 i = (xa[XA_ESETROOT_PMAP_ID]
2454 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID], 2491 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2455 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2456 &nitems, &bytes_after, &prop) == Success); 2493 &nitems, &bytes_after, &prop) == Success);
2457 2494
2458 if (!i || prop == NULL 2495 if (!i || prop == NULL
2459#if TINTING 2496#if TINTING
2460 || !rs[Rs_color + Color_tint] 2497 || !ISSET_PIXCOLOR (Color_tint)
2461#endif 2498#endif
2462 ) 2499 )
2463 have_pixmap = 0; 2500 have_pixmap = 0;
2464 else 2501 else
2465 { 2502 {
… …
2478 Window cr; 2515 Window cr;
2479 XImage *image; 2516 XImage *image;
2480 GC gc; 2517 GC gc;
2481 XGCValues gcvalue; 2518 XGCValues gcvalue;
2482 2519
2483 XTranslateCoordinates (xdisp, parent[0], display->root, 2520 XTranslateCoordinates (dpy, parent[0], display->root,
2484 0, 0, &sx, &sy, &cr); 2521 0, 0, &sx, &sy, &cr);
2485 nw = (unsigned int)szHint.width; 2522 nw = (unsigned int)szHint.width;
2486 nh = (unsigned int)szHint.height; 2523 nh = (unsigned int)szHint.height;
2487 nx = ny = 0; 2524 nx = ny = 0;
2488 2525
… …
2501 } 2538 }
2502 2539
2503 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
2504 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2505 2542
2506 XSync (xdisp, False); 2543 XSync (dpy, False);
2507 allowedxerror = -1; 2544 allowedxerror = -1;
2508 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2545 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2509 2546
2510 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2511 /* XXX: may need a delay here? */ 2548 /* XXX: may need a delay here? */
2512 allowedxerror = 0; 2549 allowedxerror = 0;
2513 2550
… …
2516 if (am_transparent && am_pixmap_trans) 2553 if (am_transparent && am_pixmap_trans)
2517 { 2554 {
2518 pchanged = 1; 2555 pchanged = 1;
2519 if (pixmap != None) 2556 if (pixmap != None)
2520 { 2557 {
2521 XFreePixmap (xdisp, pixmap); 2558 XFreePixmap (dpy, pixmap);
2522 pixmap = None; 2559 pixmap = None;
2523 } 2560 }
2524 } 2561 }
2525 2562
2526 am_pixmap_trans = 0; 2563 am_pixmap_trans = 0;
2527 } 2564 }
2528 else 2565 else
2529 { 2566 {
2530 if (pixmap != None) 2567 if (pixmap != None)
2531 XFreePixmap (xdisp, pixmap); 2568 XFreePixmap (dpy, pixmap);
2532 2569
2533#if TINTING 2570#if TINTING
2534 if (ISSET_PIXCOLOR (Color_tint)) 2571 if (ISSET_PIXCOLOR (Color_tint))
2535 { 2572 {
2536 rxvt_rgba c;
2537 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2573 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2538 2574
2575 rgba c;
2539 pix_colors_focused[Color_tint].get (this, c); 2576 pix_colors_focused [Color_tint].get (c);
2540 2577
2541 ShadeXImage (this, image, shade, c.r, c.g, c.b); 2578 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2542 } 2579 }
2543#endif 2580#endif
2544 2581
2545 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth); 2582 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2546 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue); 2583 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2547 XPutImage (xdisp, pixmap, gc, image, 0, 0, 2584 XPutImage (dpy, pixmap, gc, image, 0, 0,
2548 nx, ny, image->width, image->height); 2585 nx, ny, image->width, image->height);
2549 XFreeGC (xdisp, gc); 2586 XFreeGC (dpy, gc);
2550 XDestroyImage (image); 2587 XDestroyImage (image);
2551 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap); 2588 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2552 XClearWindow (xdisp, parent[0]); 2589 XClearWindow (dpy, parent[0]);
2553 2590
2554 if (!am_transparent || !am_pixmap_trans) 2591 if (!am_transparent || !am_pixmap_trans)
2555 pchanged = 1; 2592 pchanged = 1;
2556 2593
2557 am_transparent = am_pixmap_trans = 1; 2594 am_transparent = am_pixmap_trans = 1;
2558 } 2595 }
2559 } 2596 }
2560 2597
2561 if (am_pixmap_trans) 2598 if (am_pixmap_trans)
2562 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2599 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2563 else 2600 else
2564 { 2601 {
2565 unsigned int n; 2602 unsigned int n;
2566 /* 2603 /*
2567 * InheritPixmap transparency 2604 * InheritPixmap transparency
2568 */ 2605 */
2569 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2606 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2570 { 2607 {
2571 oldp = parent[i]; 2608 oldp = parent[i];
2572 XQueryTree (xdisp, parent[i - 1], &root, 2609 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2573 &parent[i], &list, &n);
2574 XFree (list); 2610 XFree (list);
2575 2611
2576 if (parent[i] == display->root) 2612 if (parent[i] == display->root)
2577 { 2613 {
2578 if (oldp != None) 2614 if (oldp != None)
… …
2586 } 2622 }
2587 2623
2588 n = 0; 2624 n = 0;
2589 2625
2590 if (pchanged) 2626 if (pchanged)
2591 {
2592 for (; n < (unsigned int)i; n++) 2627 for (; n < (unsigned int)i; n++)
2593 { 2628 {
2594 XGetWindowAttributes (xdisp, parent[n], &wattr); 2629 XGetWindowAttributes (dpy, parent[n], &wattr);
2630
2595 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2631 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2596 { 2632 {
2597 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2633 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2598 break; 2634 break;
2599 } 2635 }
2600 } 2636 }
2601 }
2602 2637
2603 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2638 if (n > (sizeof (parent) / sizeof (parent[0])))
2604 { 2639 {
2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); 2640 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2641 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2607 am_transparent = 0; 2642 am_transparent = 0;
2608 /* XXX: also turn off Opt_transparent? */ 2643 /* XXX: also turn off Opt_transparent? */
2609 } 2644 }
2610 else 2645 else
2611 { 2646 {
2612 for (n = 0; n < (unsigned int)i; n++) 2647 for (n = 0; n < (unsigned int)i; n++)
2613 { 2648 {
2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative); 2649 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2615 XClearWindow (xdisp, parent[n]); 2650 XClearWindow (dpy, parent[n]);
2616 } 2651 }
2617 2652
2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2653 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2619 am_transparent = 1; 2654 am_transparent = 1;
2620 } 2655 }
2621 2656
2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2657 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2623 parent[i] = None; 2658 parent[i] = None;
2624 } 2659 }
2625 2660
2626 if (scrollBar.win) 2661 if (scrollBar.win)
2627 { 2662 {
2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative); 2663 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2629 scrollBar.setIdle (); 2664 scrollBar.setIdle ();
2630 scrollbar_show (0); 2665 scrollbar_show (0);
2631 } 2666 }
2632 2667
2633 if (am_transparent) 2668 if (am_transparent)
… …
2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2786 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2752 refresh_limit++; 2787 refresh_limit++;
2753 else 2788 else
2754 { 2789 {
2755 flag = true; 2790 flag = true;
2791 //TODO: due to popular request, implement "skipscroll" option here
2756 scr_refresh (); 2792 scr_refresh ();
2757 want_refresh = 1; 2793 want_refresh = 1;
2758 } 2794 }
2759 } 2795 }
2760 2796
… …
3084 scr_charset_set (2, (unsigned int)cmd_getc ()); 3120 scr_charset_set (2, (unsigned int)cmd_getc ());
3085 break; 3121 break;
3086 case '+': 3122 case '+':
3087 scr_charset_set (3, (unsigned int)cmd_getc ()); 3123 scr_charset_set (3, (unsigned int)cmd_getc ());
3088 break; 3124 break;
3089#if ENABLE_FRILLS 3125#if !ENABLE_MINIMAL
3090 case '6': 3126 case '6':
3091 scr_backindex (); 3127 scr_backindex ();
3092 break; 3128 break;
3093#endif 3129#endif
3094 case '7': 3130 case '7':
3095 scr_cursor (SAVE); 3131 scr_cursor (SAVE);
3096 break; 3132 break;
3097 case '8': 3133 case '8':
3098 scr_cursor (RESTORE); 3134 scr_cursor (RESTORE);
3099 break; 3135 break;
3100#if ENABLE_FRILLS 3136#if !ENABLE_MINIMAL
3101 case '9': 3137 case '9':
3102 scr_forwardindex (); 3138 scr_forwardindex ();
3103 break; 3139 break;
3104#endif 3140#endif
3105 case '=': 3141 case '=':
… …
3498 break; 3534 break;
3499 case CSI_75: 3535 case CSI_75:
3500 scr_cursor (RESTORE); 3536 scr_cursor (RESTORE);
3501 break; 3537 break;
3502 3538
3503#if ENABLE_FRILLS 3539#if !ENABLE_MINIMAL
3504 case CSI_74: 3540 case CSI_74:
3505 process_window_ops (arg, nargs); 3541 process_window_ops (arg, nargs);
3506 break; 3542 break;
3507#endif 3543#endif
3508 3544
… …
3515 break; 3551 break;
3516 } 3552 }
3517} 3553}
3518/*}}} */ 3554/*}}} */
3519 3555
3520#if ENABLE_FRILLS 3556#if !ENABLE_MINIMAL
3521/* ARGSUSED */ 3557/* ARGSUSED */
3522void 3558void
3523rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3559rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3524{ 3560{
3525 int x, y; 3561 int x, y;
3526 XWindowAttributes wattr; 3562 XWindowAttributes wattr;
3527 Window wdummy; 3563 Window wdummy;
3528 3564
3529 dLocal (Display *, xdisp); 3565 dLocal (Display *, dpy);
3530 3566
3531 if (nargs == 0) 3567 if (nargs == 0)
3532 return; 3568 return;
3533 3569
3534 switch (args[0]) 3570 switch (args[0])
3535 { 3571 {
3536 /* 3572 /*
3537 * commands 3573 * commands
3538 */ 3574 */
3539 case 1: /* deiconify window */ 3575 case 1: /* deiconify window */
3540 XMapWindow (xdisp, parent[0]); 3576 XMapWindow (dpy, parent[0]);
3541 break; 3577 break;
3542 case 2: /* iconify window */ 3578 case 2: /* iconify window */
3543 XIconifyWindow (xdisp, parent[0], display->screen); 3579 XIconifyWindow (dpy, parent[0], display->screen);
3544 break; 3580 break;
3545 case 3: /* set position (pixels) */ 3581 case 3: /* set position (pixels) */
3546 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3582 XMoveWindow (dpy, parent[0], args[1], args[2]);
3547 break; 3583 break;
3548 case 4: /* set size (pixels) */ 3584 case 4: /* set size (pixels) */
3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3585 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3550 break; 3586 break;
3551 case 5: /* raise window */ 3587 case 5: /* raise window */
3552 XRaiseWindow (xdisp, parent[0]); 3588 XRaiseWindow (dpy, parent[0]);
3553 break; 3589 break;
3554 case 6: /* lower window */ 3590 case 6: /* lower window */
3555 XLowerWindow (xdisp, parent[0]); 3591 XLowerWindow (dpy, parent[0]);
3556 break; 3592 break;
3557 case 7: /* refresh window */ 3593 case 7: /* refresh window */
3558 scr_touch (true); 3594 scr_touch (true);
3559 break; 3595 break;
3560 case 8: /* set size (chars) */ 3596 case 8: /* set size (chars) */
… …
3567 if (args[0] >= 24) /* set height (chars) */ 3603 if (args[0] >= 24) /* set height (chars) */
3568 set_widthheight ((unsigned int)width, 3604 set_widthheight ((unsigned int)width,
3569 (unsigned int) (args[1] * fheight)); 3605 (unsigned int) (args[1] * fheight));
3570 break; 3606 break;
3571 3607
3572
3573 /* 3608 /*
3574 * reports - some output format copied from XTerm 3609 * reports - some output format copied from XTerm
3575 */ 3610 */
3576 case 11: /* report window state */ 3611 case 11: /* report window state */
3577 XGetWindowAttributes (xdisp, parent[0], &wattr); 3612 XGetWindowAttributes (dpy, parent[0], &wattr);
3578 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3613 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3579 break; 3614 break;
3580 case 13: /* report window position */ 3615 case 13: /* report window position */
3581 XGetWindowAttributes (xdisp, parent[0], &wattr); 3616 XGetWindowAttributes (dpy, parent[0], &wattr);
3582 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3617 XTranslateCoordinates (dpy, parent[0], wattr.root,
3583 -wattr.border_width, -wattr.border_width, 3618 -wattr.border_width, -wattr.border_width,
3584 &x, &y, &wdummy); 3619 &x, &y, &wdummy);
3585 tt_printf ("\033[3;%d;%dt", x, y); 3620 tt_printf ("\033[3;%d;%dt", x, y);
3586 break; 3621 break;
3587 case 14: /* report window size (pixels) */ 3622 case 14: /* report window size (pixels) */
3588 XGetWindowAttributes (xdisp, parent[0], &wattr); 3623 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3624 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3590 break; 3625 break;
3591 case 18: /* report text area size (chars) */ 3626 case 18: /* report text area size (chars) */
3592 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3627 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3593 break; 3628 break;
… …
3595 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3630 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3596 break; 3631 break;
3597 case 20: /* report icon label */ 3632 case 20: /* report icon label */
3598 { 3633 {
3599 char *s; 3634 char *s;
3600 XGetIconName (xdisp, parent[0], &s); 3635 XGetIconName (dpy, parent[0], &s);
3601 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3636 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3602 XFree (s); 3637 XFree (s);
3603 } 3638 }
3604 break; 3639 break;
3605 case 21: /* report window title */ 3640 case 21: /* report window title */
3606 { 3641 {
3607 char *s; 3642 char *s;
3608 XFetchName (xdisp, parent[0], &s); 3643 XFetchName (dpy, parent[0], &s);
3609 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3644 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3610 XFree (s); 3645 XFree (s);
3611 } 3646 }
3612 break; 3647 break;
3613 } 3648 }
… …
3641 seen_esc = true; 3676 seen_esc = true;
3642 continue; 3677 continue;
3643 } 3678 }
3644 else if (ch == C0_BEL || ch == CHAR_ST) 3679 else if (ch == C0_BEL || ch == CHAR_ST)
3645 break; 3680 break;
3681 else if (ch == C0_SYN)
3682 ch = cmd_get8 ();
3646 else if (ch < 0x20) 3683 else if (ch < 0x20)
3647 return NULL; /* other control character - exit */ 3684 return NULL; /* other control character - exit */
3648 3685
3649 seen_esc = false; 3686 seen_esc = false;
3650 3687
3651 if (n >= STRING_MAX - 1) 3688 if (n >= STRING_MAX - 1)
3652 // stop at some sane length 3689 // stop at some sane length
3653 return NULL; 3690 return NULL;
3654 3691
3655 if (ch == C0_SYN)
3656 string[n++] = cmd_get8 ();
3657 else
3658 string[n++] = ch; 3692 string[n++] = ch;
3659 } 3693 }
3660 3694
3661 string[n++] = '\0'; 3695 string[n++] = '\0';
3662 3696
3663 ends_how = (ch == 0x5c ? C0_ESC : ch); 3697 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3714void 3748void
3715rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3749rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3716{ 3750{
3717 if (str[0] == '?' && !str[1]) 3751 if (str[0] == '?' && !str[1])
3718 { 3752 {
3719 rxvt_rgba c; 3753 rgba c;
3720 pix_colors_focused[color].get (this, c); 3754 pix_colors_focused[color].get (c);
3721 3755
3722#if XFT 3756#if XFT
3723 if (c.a != rxvt_rgba::MAX_CC) 3757 if (c.a != rgba::MAX_CC)
3724 tt_printf ("\033]%d;#%04x%04x%04x%04x%c", report, c.a, c.r, c.g, c.b, resp); 3758 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3725 else 3759 else
3726#endif 3760#endif
3727 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3761 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3728 } 3762 }
3729 else 3763 else
… …
3739 int color; 3773 int color;
3740 char *buf, *name; 3774 char *buf, *name;
3741 bool query = str[0] == '?' && !str[1]; 3775 bool query = str[0] == '?' && !str[1];
3742 int saveop = op; 3776 int saveop = op;
3743 3777
3744 dLocal (Display *, xdisp); 3778 dLocal (Display *, dpy);
3745 3779
3746 assert (str != NULL); 3780 assert (str != NULL);
3781
3782 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3783 return;
3784
3747 switch (op) 3785 switch (op)
3748 { 3786 {
3749 case XTerm_name: 3787 case XTerm_name:
3750 set_title (str); 3788 set_title (str);
3751 /* FALLTHROUGH */ 3789 /* FALLTHROUGH */
… …
3765 unsigned long bytes_after; 3803 unsigned long bytes_after;
3766 unsigned char *value = 0; 3804 unsigned char *value = 0;
3767 const char *str = ""; 3805 const char *str = "";
3768 3806
3769 if (prop 3807 if (prop
3770 && XGetWindowProperty (xdisp, parent[0], 3808 && XGetWindowProperty (dpy, parent[0],
3771 prop, 0, 1<<16, 0, AnyPropertyType, 3809 prop, 0, 1<<16, 0, AnyPropertyType,
3772 &actual_type, &actual_format, 3810 &actual_type, &actual_format,
3773 &nitems, &bytes_after, &value) == Success 3811 &nitems, &bytes_after, &value) == Success
3774 && actual_type != None 3812 && actual_type != None
3775 && actual_format == 8) 3813 && actual_format == 8)
… …
3787 { 3825 {
3788 *eq = 0; 3826 *eq = 0;
3789 set_utf8_property (display->atom (str), eq + 1); 3827 set_utf8_property (display->atom (str), eq + 1);
3790 } 3828 }
3791 else 3829 else
3792 XDeleteProperty (xdisp, parent[0], 3830 XDeleteProperty (dpy, parent[0],
3793 display->atom (str)); 3831 display->atom (str));
3794 } 3832 }
3795 break; 3833 break;
3796 3834
3797 case XTerm_Color: 3835 case XTerm_Color:
… …
3846 break; 3884 break;
3847#endif 3885#endif
3848#if TRANSPARENT && TINTING 3886#if TRANSPARENT && TINTING
3849 case URxvt_Color_tint: 3887 case URxvt_Color_tint:
3850 process_color_seq (op, Color_tint, str, resp); 3888 process_color_seq (op, Color_tint, str, resp);
3889
3851 check_our_parents (); 3890 check_our_parents ();
3891
3852 if (am_transparent) 3892 if (am_transparent)
3853 want_full_refresh = want_refresh = 1; 3893 want_full_refresh = want_refresh = 1;
3894
3854 break; 3895 break;
3855#endif 3896#endif
3856 3897
3857 case Rxvt_Pixmap: 3898 case Rxvt_Pixmap:
3858 { 3899 {
… …
3937 op, 3978 op,
3938 rs[Rs_name], VERSION[0], VERSION[2], 3979 rs[Rs_name], VERSION[0], VERSION[2],
3939 resp); 3980 resp);
3940 break; 3981 break;
3941 3982
3942#if ENABLE_FRILLS 3983#if !ENABLE_MINIMAL
3943 case URxvt_locale: 3984 case URxvt_locale:
3944 if (query) 3985 if (query)
3945 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3986 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3946 else 3987 else
3947 { 3988 {
… …
3965 break; 4006 break;
3966#endif 4007#endif
3967 4008
3968#if ENABLE_PERL 4009#if ENABLE_PERL
3969 case URxvt_perl: 4010 case URxvt_perl:
3970 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4011 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3971 ; // no responses yet 4012 ; // no responses yet
3972 break; 4013 break;
3973#endif 4014#endif
3974 } 4015 }
3975} 4016}
… …
4311 scr_color (Color_bg, Color_bg); 4352 scr_color (Color_bg, Color_bg);
4312 break; 4353 break;
4313 4354
4314 //case 50: // not variable spacing 4355 //case 50: // not variable spacing
4315 4356
4316#if ENABLE_FRILLS 4357#if !ENABLE_MINIMAL
4317 case 90: 4358 case 90:
4318 case 91: /* set bright fg color */ 4359 case 91: /* set bright fg color */
4319 case 92: 4360 case 92:
4320 case 93: 4361 case 93:
4321 case 94: 4362 case 94:

Diff Legend

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