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.288 by root, Sat Jan 28 20:33:31 2006 UTC vs.
Revision 1.314 by root, Thu Jul 6 23:48:11 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 }
… …
1450 break; 1468 break;
1451 1469
1452 case ConfigureNotify: 1470 case ConfigureNotify:
1453 if (ev.xconfigure.window == parent[0]) 1471 if (ev.xconfigure.window == parent[0])
1454 { 1472 {
1455 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1456 ; 1474 ;
1457 1475
1458 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1459 { 1477 {
1460 seen_resize = 1; 1478 seen_resize = 1;
… …
1518 if (ev.xany.window == vt) 1536 if (ev.xany.window == vt)
1519 { 1537 {
1520 do 1538 do
1521 scr_expose (ev.xexpose.x, ev.xexpose.y, 1539 scr_expose (ev.xexpose.x, ev.xexpose.y,
1522 ev.xexpose.width, ev.xexpose.height, False); 1540 ev.xexpose.width, ev.xexpose.height, False);
1523 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1524 1542
1525 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1526 1544
1527 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1530 1548
1531 want_refresh = 1; 1549 want_refresh = 1;
1532 } 1550 }
1533 else 1551 else
1534 { 1552 {
1535 XEvent unused_event; 1553 XEvent unused_event;
1536 1554
1537 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1538 ; 1556 ;
1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1540 ; 1558 ;
1541 1559
1542 if (isScrollbarWindow (ev.xany.window)) 1560 if (isScrollbarWindow (ev.xany.window))
1543 { 1561 {
1544 scrollBar.setIdle (); 1562 scrollBar.setIdle ();
1545 scrollbar_show (0); 1563 scrollbar_show (0);
1546 } 1564 }
1547 1565
1548#ifdef TRANSPARENT 1566#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == parent[0]) 1567 if (am_transparent && ev.xany.window == parent[0])
1550 XClearWindow (xdisp, ev.xany.window); 1568 XClearWindow (dpy, ev.xany.window);
1551#endif 1569#endif
1552 } 1570 }
1553 break; 1571 break;
1554 1572
1555 case MotionNotify: 1573 case MotionNotify:
… …
1565 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1583 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1566 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1584 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1567 ; // nop 1585 ; // nop
1568 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1586 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1569 { 1587 {
1570 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1588 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1571 ; 1589 ;
1572 1590
1573 XQueryPointer (xdisp, vt, 1591 XQueryPointer (dpy, vt,
1574 &unused_root, &unused_child, 1592 &unused_root, &unused_child,
1575 &unused_root_x, &unused_root_y, 1593 &unused_root_x, &unused_root_y,
1576 &ev.xbutton.x, &ev.xbutton.y, 1594 &ev.xbutton.x, &ev.xbutton.y,
1577 &ev.xbutton.state); 1595 &ev.xbutton.state);
1578#ifdef MOUSE_THRESHOLD 1596#ifdef MOUSE_THRESHOLD
… …
1642#endif 1660#endif
1643 } 1661 }
1644 } 1662 }
1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1646 { 1664 {
1647 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1648 MotionNotify, &ev)) 1666 MotionNotify, &ev))
1649 ; 1667 ;
1650 1668
1651 XQueryPointer (xdisp, scrollBar.win, 1669 XQueryPointer (dpy, scrollBar.win,
1652 &unused_root, &unused_child, 1670 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1671 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1672 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1673 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1660 scrollbar_show (1); 1678 scrollbar_show (1);
1661 } 1679 }
1662 break; 1680 break;
1663 } 1681 }
1664 1682
1665skip_switch: ;
1666
1667#if defined(CURSOR_BLINK) 1683#if defined(CURSOR_BLINK)
1668 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1669 { 1685 {
1670 if (hidden_cursor) 1686 if (hidden_cursor)
1671 { 1687 {
… …
1698 if (!focus) 1714 if (!focus)
1699 { 1715 {
1700 focus = 1; 1716 focus = 1;
1701 want_refresh = 1; 1717 want_refresh = 1;
1702 1718
1703 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1719 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1704 1720
1705#if USE_XIM 1721#if USE_XIM
1706 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1707 { 1723 {
1708 IMSetStatusPosition (); 1724 IMSetPosition ();
1709 XSetICFocus (Input_Context); 1725 XSetICFocus (Input_Context);
1710 } 1726 }
1711#endif 1727#endif
1712#if CURSOR_BLINK 1728#if CURSOR_BLINK
1713 if (OPTION (Opt_cursorBlink)) 1729 if (OPTION (Opt_cursorBlink))
… …
1759 } 1775 }
1760#endif 1776#endif
1761 } 1777 }
1762} 1778}
1763 1779
1764#if TRANSPARENT 1780void
1781rxvt_term::update_fade_color (unsigned int idx)
1782{
1783#if OFF_FOCUS_FADING
1784 if (rs[Rs_fade])
1785 {
1786 rgba c;
1787 pix_colors [Color_fade].get (c);
1788 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1789 }
1790#endif
1791}
1792
1793#if TRANSPARENT || ENABLE_PERL
1765void 1794void
1766rxvt_term::rootwin_cb (XEvent &ev) 1795rxvt_term::rootwin_cb (XEvent &ev)
1767{ 1796{
1768 make_current (); 1797 make_current ();
1769 1798
1799 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1800 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1801 return;
1802
1803# if TRANSPARENT
1770 switch (ev.type) 1804 switch (ev.type)
1771 { 1805 {
1772 case PropertyNotify: 1806 case PropertyNotify:
1773 /* 1807 /*
1774 * if user used some Esetroot compatible prog to set the root bg, 1808 * if user used some Esetroot compatible prog to set the root bg,
… …
1782 case ReparentNotify: 1816 case ReparentNotify:
1783 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1817 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1784 want_refresh = want_full_refresh = 1; 1818 want_refresh = want_full_refresh = 1;
1785 break; 1819 break;
1786 } 1820 }
1821# endif
1787} 1822}
1788#endif 1823#endif
1789 1824
1790void 1825void
1791rxvt_term::button_press (XButtonEvent &ev) 1826rxvt_term::button_press (XButtonEvent &ev)
… …
2417 pchanged = 0; 2452 pchanged = 0;
2418 2453
2419 if (!OPTION (Opt_transparent)) 2454 if (!OPTION (Opt_transparent))
2420 return pchanged; /* Don't try any more */ 2455 return pchanged; /* Don't try any more */
2421 2456
2422 XGetWindowAttributes (xdisp, display->root, &wrootattr); 2457 XGetWindowAttributes (dpy, display->root, &wrootattr);
2423 rootdepth = wrootattr.depth; 2458 rootdepth = wrootattr.depth;
2424 2459
2425 XGetWindowAttributes (xdisp, parent[0], &wattr); 2460 XGetWindowAttributes (dpy, parent[0], &wattr);
2426 2461
2427 if (rootdepth != wattr.depth) 2462 if (rootdepth != wattr.depth)
2428 { 2463 {
2429 if (am_transparent) 2464 if (am_transparent)
2430 { 2465 {
2431 pchanged = 1; 2466 pchanged = 1;
2432 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2467 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2433 am_transparent = am_pixmap_trans = 0; 2468 am_transparent = am_pixmap_trans = 0;
2434 } 2469 }
2435 2470
2436 return pchanged; /* Don't try any more */ 2471 return pchanged; /* Don't try any more */
2437 } 2472 }
2438 2473
2439 /* Get all X ops out of the queue so that our information is up-to-date. */ 2474 /* Get all X ops out of the queue so that our information is up-to-date. */
2440 XSync (xdisp, False); 2475 XSync (dpy, False);
2441 2476
2442 /* 2477 /*
2443 * Make the frame window set by the window manager have 2478 * Make the frame window set by the window manager have
2444 * the root background. Some window managers put multiple nested frame 2479 * the root background. Some window managers put multiple nested frame
2445 * windows for each client, so we have to take care about that. 2480 * windows for each client, so we have to take care about that.
2446 */ 2481 */
2447 i = (xa[XA_XROOTPMAP_ID] 2482 i = (xa[XA_XROOTPMAP_ID]
2448 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID], 2483 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2449 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2450 &nitems, &bytes_after, &prop) == Success); 2485 &nitems, &bytes_after, &prop) == Success);
2451 2486
2452 if (!i || prop == NULL) 2487 if (!i || prop == NULL)
2453 i = (xa[XA_ESETROOT_PMAP_ID] 2488 i = (xa[XA_ESETROOT_PMAP_ID]
2454 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID], 2489 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2455 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2456 &nitems, &bytes_after, &prop) == Success); 2491 &nitems, &bytes_after, &prop) == Success);
2457 2492
2458 if (!i || prop == NULL 2493 if (!i || prop == NULL
2459#if TINTING 2494#if TINTING
2460 || !rs[Rs_color + Color_tint] 2495 || !ISSET_PIXCOLOR (Color_tint)
2461#endif 2496#endif
2462 ) 2497 )
2463 have_pixmap = 0; 2498 have_pixmap = 0;
2464 else 2499 else
2465 { 2500 {
… …
2478 Window cr; 2513 Window cr;
2479 XImage *image; 2514 XImage *image;
2480 GC gc; 2515 GC gc;
2481 XGCValues gcvalue; 2516 XGCValues gcvalue;
2482 2517
2483 XTranslateCoordinates (xdisp, parent[0], display->root, 2518 XTranslateCoordinates (dpy, parent[0], display->root,
2484 0, 0, &sx, &sy, &cr); 2519 0, 0, &sx, &sy, &cr);
2485 nw = (unsigned int)szHint.width; 2520 nw = (unsigned int)szHint.width;
2486 nh = (unsigned int)szHint.height; 2521 nh = (unsigned int)szHint.height;
2487 nx = ny = 0; 2522 nx = ny = 0;
2488 2523
… …
2501 } 2536 }
2502 2537
2503 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2538 min_it (nw, (unsigned int) (wrootattr.width - sx));
2504 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2539 min_it (nh, (unsigned int) (wrootattr.height - sy));
2505 2540
2506 XSync (xdisp, False); 2541 XSync (dpy, False);
2507 allowedxerror = -1; 2542 allowedxerror = -1;
2508 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2543 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2509 2544
2510 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2545 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2511 /* XXX: may need a delay here? */ 2546 /* XXX: may need a delay here? */
2512 allowedxerror = 0; 2547 allowedxerror = 0;
2513 2548
… …
2516 if (am_transparent && am_pixmap_trans) 2551 if (am_transparent && am_pixmap_trans)
2517 { 2552 {
2518 pchanged = 1; 2553 pchanged = 1;
2519 if (pixmap != None) 2554 if (pixmap != None)
2520 { 2555 {
2521 XFreePixmap (xdisp, pixmap); 2556 XFreePixmap (dpy, pixmap);
2522 pixmap = None; 2557 pixmap = None;
2523 } 2558 }
2524 } 2559 }
2525 2560
2526 am_pixmap_trans = 0; 2561 am_pixmap_trans = 0;
2527 } 2562 }
2528 else 2563 else
2529 { 2564 {
2530 if (pixmap != None) 2565 if (pixmap != None)
2531 XFreePixmap (xdisp, pixmap); 2566 XFreePixmap (dpy, pixmap);
2532 2567
2533#if TINTING 2568#if TINTING
2534 if (ISSET_PIXCOLOR (Color_tint)) 2569 if (ISSET_PIXCOLOR (Color_tint))
2535 { 2570 {
2536 unsigned short rm, gm, bm;
2537 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2571 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2538 2572
2573 rgba c;
2539 pix_colors_focused[Color_tint].get (this, rm, gm, bm); 2574 pix_colors_focused [Color_tint].get (c);
2540 2575
2541 ShadeXImage (this, image, shade, rm, gm, bm); 2576 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2542 } 2577 }
2543#endif 2578#endif
2544 2579
2545 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth); 2580 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2546 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue); 2581 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2547 XPutImage (xdisp, pixmap, gc, image, 0, 0, 2582 XPutImage (dpy, pixmap, gc, image, 0, 0,
2548 nx, ny, image->width, image->height); 2583 nx, ny, image->width, image->height);
2549 XFreeGC (xdisp, gc); 2584 XFreeGC (dpy, gc);
2550 XDestroyImage (image); 2585 XDestroyImage (image);
2551 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap); 2586 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2552 XClearWindow (xdisp, parent[0]); 2587 XClearWindow (dpy, parent[0]);
2553 2588
2554 if (!am_transparent || !am_pixmap_trans) 2589 if (!am_transparent || !am_pixmap_trans)
2555 pchanged = 1; 2590 pchanged = 1;
2556 2591
2557 am_transparent = am_pixmap_trans = 1; 2592 am_transparent = am_pixmap_trans = 1;
2558 } 2593 }
2559 } 2594 }
2560 2595
2561 if (am_pixmap_trans) 2596 if (am_pixmap_trans)
2562 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2597 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2563 else 2598 else
2564 { 2599 {
2565 unsigned int n; 2600 unsigned int n;
2566 /* 2601 /*
2567 * InheritPixmap transparency 2602 * InheritPixmap transparency
2568 */ 2603 */
2569 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2604 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2570 { 2605 {
2571 oldp = parent[i]; 2606 oldp = parent[i];
2572 XQueryTree (xdisp, parent[i - 1], &root, 2607 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2573 &parent[i], &list, &n);
2574 XFree (list); 2608 XFree (list);
2575 2609
2576 if (parent[i] == display->root) 2610 if (parent[i] == display->root)
2577 { 2611 {
2578 if (oldp != None) 2612 if (oldp != None)
… …
2586 } 2620 }
2587 2621
2588 n = 0; 2622 n = 0;
2589 2623
2590 if (pchanged) 2624 if (pchanged)
2591 {
2592 for (; n < (unsigned int)i; n++) 2625 for (; n < (unsigned int)i; n++)
2593 { 2626 {
2594 XGetWindowAttributes (xdisp, parent[n], &wattr); 2627 XGetWindowAttributes (dpy, parent[n], &wattr);
2628
2595 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2629 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2596 { 2630 {
2597 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2631 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2598 break; 2632 break;
2599 } 2633 }
2600 } 2634 }
2601 }
2602 2635
2603 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2636 if (n > (sizeof (parent) / sizeof (parent[0])))
2604 { 2637 {
2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); 2638 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2639 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2607 am_transparent = 0; 2640 am_transparent = 0;
2608 /* XXX: also turn off Opt_transparent? */ 2641 /* XXX: also turn off Opt_transparent? */
2609 } 2642 }
2610 else 2643 else
2611 { 2644 {
2612 for (n = 0; n < (unsigned int)i; n++) 2645 for (n = 0; n < (unsigned int)i; n++)
2613 { 2646 {
2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative); 2647 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2615 XClearWindow (xdisp, parent[n]); 2648 XClearWindow (dpy, parent[n]);
2616 } 2649 }
2617 2650
2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2651 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2619 am_transparent = 1; 2652 am_transparent = 1;
2620 } 2653 }
2621 2654
2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2655 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2623 parent[i] = None; 2656 parent[i] = None;
2624 } 2657 }
2625 2658
2626 if (scrollBar.win) 2659 if (scrollBar.win)
2627 { 2660 {
2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative); 2661 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2629 scrollBar.setIdle (); 2662 scrollBar.setIdle ();
2630 scrollbar_show (0); 2663 scrollbar_show (0);
2631 } 2664 }
2632 2665
2633 if (am_transparent) 2666 if (am_transparent)
… …
2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2784 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2752 refresh_limit++; 2785 refresh_limit++;
2753 else 2786 else
2754 { 2787 {
2755 flag = true; 2788 flag = true;
2789 //TODO: due to popular request, implement "skipscroll" option here
2756 scr_refresh (); 2790 scr_refresh ();
2757 want_refresh = 1; 2791 want_refresh = 1;
2758 } 2792 }
2759 } 2793 }
2760 2794
… …
3084 scr_charset_set (2, (unsigned int)cmd_getc ()); 3118 scr_charset_set (2, (unsigned int)cmd_getc ());
3085 break; 3119 break;
3086 case '+': 3120 case '+':
3087 scr_charset_set (3, (unsigned int)cmd_getc ()); 3121 scr_charset_set (3, (unsigned int)cmd_getc ());
3088 break; 3122 break;
3089#if ENABLE_FRILLS 3123#if !ENABLE_MINIMAL
3090 case '6': 3124 case '6':
3091 scr_backindex (); 3125 scr_backindex ();
3092 break; 3126 break;
3093#endif 3127#endif
3094 case '7': 3128 case '7':
3095 scr_cursor (SAVE); 3129 scr_cursor (SAVE);
3096 break; 3130 break;
3097 case '8': 3131 case '8':
3098 scr_cursor (RESTORE); 3132 scr_cursor (RESTORE);
3099 break; 3133 break;
3100#if ENABLE_FRILLS 3134#if !ENABLE_MINIMAL
3101 case '9': 3135 case '9':
3102 scr_forwardindex (); 3136 scr_forwardindex ();
3103 break; 3137 break;
3104#endif 3138#endif
3105 case '=': 3139 case '=':
… …
3278 { 3312 {
3279 case '>': 3313 case '>':
3280 if (ch == CSI_DA) /* secondary device attributes */ 3314 if (ch == CSI_DA) /* secondary device attributes */
3281 { 3315 {
3282 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 3316 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3283 // 'U' for rxvt-unicode <= 7.2. 3317 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3284 // 3318 //
3285 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 3319 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3286 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 3320 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3287 // that we do not support xterm mouse reporting (should be 95 when we do). 3321 // that we do not support xterm mouse reporting (should be 95 when we do).
3288 // 3322 //
3289 tt_printf ("\033[>0;94;0c"); 3323 tt_printf ("\033[>%d;94;0c", 'U');
3290 } 3324 }
3291 break; 3325 break;
3292 case '?': 3326 case '?':
3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3327 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3294 process_terminal_mode (ch, priv, nargs, arg); 3328 process_terminal_mode (ch, priv, nargs, arg);
… …
3498 break; 3532 break;
3499 case CSI_75: 3533 case CSI_75:
3500 scr_cursor (RESTORE); 3534 scr_cursor (RESTORE);
3501 break; 3535 break;
3502 3536
3503#if ENABLE_FRILLS 3537#if !ENABLE_MINIMAL
3504 case CSI_74: 3538 case CSI_74:
3505 process_window_ops (arg, nargs); 3539 process_window_ops (arg, nargs);
3506 break; 3540 break;
3507#endif 3541#endif
3508 3542
… …
3515 break; 3549 break;
3516 } 3550 }
3517} 3551}
3518/*}}} */ 3552/*}}} */
3519 3553
3520#if ENABLE_FRILLS 3554#if !ENABLE_MINIMAL
3521/* ARGSUSED */ 3555/* ARGSUSED */
3522void 3556void
3523rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3557rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3524{ 3558{
3525 int x, y; 3559 int x, y;
3526 XWindowAttributes wattr; 3560 XWindowAttributes wattr;
3527 Window wdummy; 3561 Window wdummy;
3528 3562
3529 dLocal (Display *, xdisp); 3563 dLocal (Display *, dpy);
3530 3564
3531 if (nargs == 0) 3565 if (nargs == 0)
3532 return; 3566 return;
3533 3567
3534 switch (args[0]) 3568 switch (args[0])
3535 { 3569 {
3536 /* 3570 /*
3537 * commands 3571 * commands
3538 */ 3572 */
3539 case 1: /* deiconify window */ 3573 case 1: /* deiconify window */
3540 XMapWindow (xdisp, parent[0]); 3574 XMapWindow (dpy, parent[0]);
3541 break; 3575 break;
3542 case 2: /* iconify window */ 3576 case 2: /* iconify window */
3543 XIconifyWindow (xdisp, parent[0], display->screen); 3577 XIconifyWindow (dpy, parent[0], display->screen);
3544 break; 3578 break;
3545 case 3: /* set position (pixels) */ 3579 case 3: /* set position (pixels) */
3546 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3580 XMoveWindow (dpy, parent[0], args[1], args[2]);
3547 break; 3581 break;
3548 case 4: /* set size (pixels) */ 3582 case 4: /* set size (pixels) */
3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3583 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3550 break; 3584 break;
3551 case 5: /* raise window */ 3585 case 5: /* raise window */
3552 XRaiseWindow (xdisp, parent[0]); 3586 XRaiseWindow (dpy, parent[0]);
3553 break; 3587 break;
3554 case 6: /* lower window */ 3588 case 6: /* lower window */
3555 XLowerWindow (xdisp, parent[0]); 3589 XLowerWindow (dpy, parent[0]);
3556 break; 3590 break;
3557 case 7: /* refresh window */ 3591 case 7: /* refresh window */
3558 scr_touch (true); 3592 scr_touch (true);
3559 break; 3593 break;
3560 case 8: /* set size (chars) */ 3594 case 8: /* set size (chars) */
… …
3567 if (args[0] >= 24) /* set height (chars) */ 3601 if (args[0] >= 24) /* set height (chars) */
3568 set_widthheight ((unsigned int)width, 3602 set_widthheight ((unsigned int)width,
3569 (unsigned int) (args[1] * fheight)); 3603 (unsigned int) (args[1] * fheight));
3570 break; 3604 break;
3571 3605
3572
3573 /* 3606 /*
3574 * reports - some output format copied from XTerm 3607 * reports - some output format copied from XTerm
3575 */ 3608 */
3576 case 11: /* report window state */ 3609 case 11: /* report window state */
3577 XGetWindowAttributes (xdisp, parent[0], &wattr); 3610 XGetWindowAttributes (dpy, parent[0], &wattr);
3578 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3611 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3579 break; 3612 break;
3580 case 13: /* report window position */ 3613 case 13: /* report window position */
3581 XGetWindowAttributes (xdisp, parent[0], &wattr); 3614 XGetWindowAttributes (dpy, parent[0], &wattr);
3582 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3615 XTranslateCoordinates (dpy, parent[0], wattr.root,
3583 -wattr.border_width, -wattr.border_width, 3616 -wattr.border_width, -wattr.border_width,
3584 &x, &y, &wdummy); 3617 &x, &y, &wdummy);
3585 tt_printf ("\033[3;%d;%dt", x, y); 3618 tt_printf ("\033[3;%d;%dt", x, y);
3586 break; 3619 break;
3587 case 14: /* report window size (pixels) */ 3620 case 14: /* report window size (pixels) */
3588 XGetWindowAttributes (xdisp, parent[0], &wattr); 3621 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3622 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3590 break; 3623 break;
3591 case 18: /* report text area size (chars) */ 3624 case 18: /* report text area size (chars) */
3592 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3625 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3593 break; 3626 break;
… …
3595 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3628 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3596 break; 3629 break;
3597 case 20: /* report icon label */ 3630 case 20: /* report icon label */
3598 { 3631 {
3599 char *s; 3632 char *s;
3600 XGetIconName (xdisp, parent[0], &s); 3633 XGetIconName (dpy, parent[0], &s);
3601 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3634 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3602 XFree (s); 3635 XFree (s);
3603 } 3636 }
3604 break; 3637 break;
3605 case 21: /* report window title */ 3638 case 21: /* report window title */
3606 { 3639 {
3607 char *s; 3640 char *s;
3608 XFetchName (xdisp, parent[0], &s); 3641 XFetchName (dpy, parent[0], &s);
3609 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3642 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3610 XFree (s); 3643 XFree (s);
3611 } 3644 }
3612 break; 3645 break;
3613 } 3646 }
… …
3714void 3747void
3715rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3748rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3716{ 3749{
3717 if (str[0] == '?' && !str[1]) 3750 if (str[0] == '?' && !str[1])
3718 { 3751 {
3719 unsigned short r, g, b; 3752 rgba c;
3720 pix_colors_focused[color].get (this, r, g, b); 3753 pix_colors_focused[color].get (c);
3754
3755#if XFT
3756 if (c.a != rgba::MAX_CC)
3757 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3758 else
3759#endif
3721 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3760 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3722 } 3761 }
3723 else 3762 else
3724 set_window_color (color, str); 3763 set_window_color (color, str);
3725} 3764}
3726 3765
… …
3733 int color; 3772 int color;
3734 char *buf, *name; 3773 char *buf, *name;
3735 bool query = str[0] == '?' && !str[1]; 3774 bool query = str[0] == '?' && !str[1];
3736 int saveop = op; 3775 int saveop = op;
3737 3776
3738 dLocal (Display *, xdisp); 3777 dLocal (Display *, dpy);
3739 3778
3740 assert (str != NULL); 3779 assert (str != NULL);
3780
3781 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3782 return;
3783
3741 switch (op) 3784 switch (op)
3742 { 3785 {
3743 case XTerm_name: 3786 case XTerm_name:
3744 set_title (str); 3787 set_title (str);
3745 /* FALLTHROUGH */ 3788 /* FALLTHROUGH */
… …
3759 unsigned long bytes_after; 3802 unsigned long bytes_after;
3760 unsigned char *value = 0; 3803 unsigned char *value = 0;
3761 const char *str = ""; 3804 const char *str = "";
3762 3805
3763 if (prop 3806 if (prop
3764 && XGetWindowProperty (xdisp, parent[0], 3807 && XGetWindowProperty (dpy, parent[0],
3765 prop, 0, 1<<16, 0, AnyPropertyType, 3808 prop, 0, 1<<16, 0, AnyPropertyType,
3766 &actual_type, &actual_format, 3809 &actual_type, &actual_format,
3767 &nitems, &bytes_after, &value) == Success 3810 &nitems, &bytes_after, &value) == Success
3768 && actual_type != None 3811 && actual_type != None
3769 && actual_format == 8) 3812 && actual_format == 8)
3770 str = (const char *)(value); 3813 str = (const char *)(value);
3771 3814
3772 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3815 tt_printf ("\033]%d;%s%c", op, str, resp);
3773 3816
3774 XFree (value); 3817 XFree (value);
3775 } 3818 }
3776 else 3819 else
3777 { 3820 {
… …
3781 { 3824 {
3782 *eq = 0; 3825 *eq = 0;
3783 set_utf8_property (display->atom (str), eq + 1); 3826 set_utf8_property (display->atom (str), eq + 1);
3784 } 3827 }
3785 else 3828 else
3786 XDeleteProperty (xdisp, parent[0], 3829 XDeleteProperty (dpy, parent[0],
3787 display->atom (str)); 3830 display->atom (str));
3788 } 3831 }
3789 break; 3832 break;
3790 3833
3791 case XTerm_Color: 3834 case XTerm_Color:
… …
3801 break; 3844 break;
3802 3845
3803 if ((buf = strchr (name, ';')) != NULL) 3846 if ((buf = strchr (name, ';')) != NULL)
3804 *buf++ = '\0'; 3847 *buf++ = '\0';
3805 3848
3806 if (name[0] == '?' && !name[1]) 3849 process_color_seq (op, color, name, resp);
3807 {
3808 unsigned short r, g, b;
3809 pix_colors_focused[color].get (this, 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 } 3850 }
3815 break; 3851 break;
3816 case XTerm_Color00: 3852 case XTerm_Color00:
3817 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3853 process_color_seq (op, Color_fg, str, resp);
3818 break; 3854 break;
3819 case XTerm_Color01: 3855 case XTerm_Color01:
3820 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3856 process_color_seq (op, Color_bg, str, resp);
3821 break; 3857 break;
3822#ifndef NO_CURSORCOLOR 3858#ifndef NO_CURSORCOLOR
3823 case XTerm_Color_cursor: 3859 case XTerm_Color_cursor:
3824 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3860 process_color_seq (op, Color_cursor, str, resp);
3825 break; 3861 break;
3826#endif 3862#endif
3827 case XTerm_Color_pointer_fg: 3863 case XTerm_Color_pointer_fg:
3828 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3864 process_color_seq (op, Color_pointer_fg, str, resp);
3829 break; 3865 break;
3830 case XTerm_Color_pointer_bg: 3866 case XTerm_Color_pointer_bg:
3831 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3867 process_color_seq (op, Color_pointer_bg, str, resp);
3832 break; 3868 break;
3833#ifndef NO_BOLD_UNDERLINE_REVERSE 3869#ifndef NO_BOLD_UNDERLINE_REVERSE
3834 case XTerm_Color_RV: 3870 case XTerm_Color_RV:
3835 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3871 process_color_seq (op, Color_RV, str, resp);
3836 break; 3872 break;
3837 case Rxvt_Color_BD: 3873 case Rxvt_Color_BD:
3838 case URxvt_Color_BD: 3874 case URxvt_Color_BD:
3839 process_color_seq (op, Color_BD, str, resp); 3875 process_color_seq (op, Color_BD, str, resp);
3840 break; 3876 break;
3841 case Rxvt_Color_UL: 3877 case Rxvt_Color_UL:
3842 case URxvt_Color_UL: 3878 case URxvt_Color_UL:
3843 process_color_seq (op, Color_UL, str, resp); 3879 process_color_seq (op, Color_UL, str, resp);
3844 break; 3880 break;
3845 case URxvt_Color_IT: 3881 case URxvt_Color_IT:
3846 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3882 process_color_seq (op, Color_IT, str, resp);
3847 break; 3883 break;
3848#endif 3884#endif
3849#if TRANSPARENT && TINTING 3885#if TRANSPARENT && TINTING
3850 case URxvt_Color_tint: 3886 case URxvt_Color_tint:
3851 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3887 process_color_seq (op, Color_tint, str, resp);
3888
3852 check_our_parents (); 3889 check_our_parents ();
3890
3853 if (am_transparent) 3891 if (am_transparent)
3854 want_full_refresh = want_refresh = 1; 3892 want_full_refresh = want_refresh = 1;
3893
3855 break; 3894 break;
3856#endif 3895#endif
3857 3896
3858 case Rxvt_Pixmap: 3897 case Rxvt_Pixmap:
3859 { 3898 {
… …
3933 break; 3972 break;
3934 3973
3935 case URxvt_version: 3974 case URxvt_version:
3936 if (query) 3975 if (query)
3937 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3976 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3938 URxvt_version, 3977 op,
3939 rs[Rs_name],
3940 VERSION[0], VERSION[2], 3978 rs[Rs_name], VERSION[0], VERSION[2],
3941 resp); 3979 resp);
3942 break; 3980 break;
3943 3981
3944#if ENABLE_FRILLS 3982#if !ENABLE_MINIMAL
3945 case URxvt_locale: 3983 case URxvt_locale:
3946 if (query) 3984 if (query)
3947 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3985 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3948 else 3986 else
3949 { 3987 {
3950 set_locale (str); 3988 set_locale (str);
3951 pty->set_utf8_mode (enc_utf8); 3989 pty->set_utf8_mode (enc_utf8);
3952 init_xlocale (); 3990 init_xlocale ();
… …
3967 break; 4005 break;
3968#endif 4006#endif
3969 4007
3970#if ENABLE_PERL 4008#if ENABLE_PERL
3971 case URxvt_perl: 4009 case URxvt_perl:
3972 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4010 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3973 ; // no responses yet 4011 ; // no responses yet
3974 break; 4012 break;
3975#endif 4013#endif
3976 } 4014 }
3977} 4015}
… …
4313 scr_color (Color_bg, Color_bg); 4351 scr_color (Color_bg, Color_bg);
4314 break; 4352 break;
4315 4353
4316 //case 50: // not variable spacing 4354 //case 50: // not variable spacing
4317 4355
4318#if ENABLE_FRILLS 4356#if !ENABLE_MINIMAL
4319 case 90: 4357 case 90:
4320 case 91: /* set bright fg color */ 4358 case 91: /* set bright fg color */
4321 case 92: 4359 case 92:
4322 case 93: 4360 case 93:
4323 case 94: 4361 case 94:

Diff Legend

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