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.287 by root, Sat Jan 28 20:08:05 2006 UTC vs.
Revision 1.309 by root, Mon Feb 20 22:42:00 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))
… …
2417 pchanged = 0; 2433 pchanged = 0;
2418 2434
2419 if (!OPTION (Opt_transparent)) 2435 if (!OPTION (Opt_transparent))
2420 return pchanged; /* Don't try any more */ 2436 return pchanged; /* Don't try any more */
2421 2437
2422 XGetWindowAttributes (xdisp, display->root, &wrootattr); 2438 XGetWindowAttributes (dpy, display->root, &wrootattr);
2423 rootdepth = wrootattr.depth; 2439 rootdepth = wrootattr.depth;
2424 2440
2425 XGetWindowAttributes (xdisp, parent[0], &wattr); 2441 XGetWindowAttributes (dpy, parent[0], &wattr);
2426 2442
2427 if (rootdepth != wattr.depth) 2443 if (rootdepth != wattr.depth)
2428 { 2444 {
2429 if (am_transparent) 2445 if (am_transparent)
2430 { 2446 {
2431 pchanged = 1; 2447 pchanged = 1;
2432 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2448 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2433 am_transparent = am_pixmap_trans = 0; 2449 am_transparent = am_pixmap_trans = 0;
2434 } 2450 }
2435 2451
2436 return pchanged; /* Don't try any more */ 2452 return pchanged; /* Don't try any more */
2437 } 2453 }
2438 2454
2439 /* Get all X ops out of the queue so that our information is up-to-date. */ 2455 /* Get all X ops out of the queue so that our information is up-to-date. */
2440 XSync (xdisp, False); 2456 XSync (dpy, False);
2441 2457
2442 /* 2458 /*
2443 * Make the frame window set by the window manager have 2459 * Make the frame window set by the window manager have
2444 * the root background. Some window managers put multiple nested frame 2460 * the root background. Some window managers put multiple nested frame
2445 * windows for each client, so we have to take care about that. 2461 * windows for each client, so we have to take care about that.
2446 */ 2462 */
2447 i = (xa[XA_XROOTPMAP_ID] 2463 i = (xa[XA_XROOTPMAP_ID]
2448 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID], 2464 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2449 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2450 &nitems, &bytes_after, &prop) == Success); 2466 &nitems, &bytes_after, &prop) == Success);
2451 2467
2452 if (!i || prop == NULL) 2468 if (!i || prop == NULL)
2453 i = (xa[XA_ESETROOT_PMAP_ID] 2469 i = (xa[XA_ESETROOT_PMAP_ID]
2454 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID], 2470 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2455 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2456 &nitems, &bytes_after, &prop) == Success); 2472 &nitems, &bytes_after, &prop) == Success);
2457 2473
2458 if (!i || prop == NULL 2474 if (!i || prop == NULL
2459#if TINTING 2475#if TINTING
2460 || !rs[Rs_color + Color_tint] 2476 || !ISSET_PIXCOLOR (Color_tint)
2461#endif 2477#endif
2462 ) 2478 )
2463 have_pixmap = 0; 2479 have_pixmap = 0;
2464 else 2480 else
2465 { 2481 {
… …
2478 Window cr; 2494 Window cr;
2479 XImage *image; 2495 XImage *image;
2480 GC gc; 2496 GC gc;
2481 XGCValues gcvalue; 2497 XGCValues gcvalue;
2482 2498
2483 XTranslateCoordinates (xdisp, parent[0], display->root, 2499 XTranslateCoordinates (dpy, parent[0], display->root,
2484 0, 0, &sx, &sy, &cr); 2500 0, 0, &sx, &sy, &cr);
2485 nw = (unsigned int)szHint.width; 2501 nw = (unsigned int)szHint.width;
2486 nh = (unsigned int)szHint.height; 2502 nh = (unsigned int)szHint.height;
2487 nx = ny = 0; 2503 nx = ny = 0;
2488 2504
… …
2501 } 2517 }
2502 2518
2503 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2504 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2505 2521
2506 XSync (xdisp, False); 2522 XSync (dpy, False);
2507 allowedxerror = -1; 2523 allowedxerror = -1;
2508 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2524 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2509 2525
2510 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2511 /* XXX: may need a delay here? */ 2527 /* XXX: may need a delay here? */
2512 allowedxerror = 0; 2528 allowedxerror = 0;
2513 2529
… …
2516 if (am_transparent && am_pixmap_trans) 2532 if (am_transparent && am_pixmap_trans)
2517 { 2533 {
2518 pchanged = 1; 2534 pchanged = 1;
2519 if (pixmap != None) 2535 if (pixmap != None)
2520 { 2536 {
2521 XFreePixmap (xdisp, pixmap); 2537 XFreePixmap (dpy, pixmap);
2522 pixmap = None; 2538 pixmap = None;
2523 } 2539 }
2524 } 2540 }
2525 2541
2526 am_pixmap_trans = 0; 2542 am_pixmap_trans = 0;
2527 } 2543 }
2528 else 2544 else
2529 { 2545 {
2530 if (pixmap != None) 2546 if (pixmap != None)
2531 XFreePixmap (xdisp, pixmap); 2547 XFreePixmap (dpy, pixmap);
2532 2548
2533#if TINTING 2549#if TINTING
2534 if (ISSET_PIXCOLOR (Color_tint)) 2550 if (ISSET_PIXCOLOR (Color_tint))
2535 { 2551 {
2536 unsigned short rm, gm, bm;
2537 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2552 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2538 2553
2554 rgba c;
2539 pix_colors_focused[Color_tint].get (this, rm, gm, bm); 2555 pix_colors_focused [Color_tint].get (c);
2540 2556
2541 ShadeXImage (this, image, shade, rm, gm, bm); 2557 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2542 } 2558 }
2543#endif 2559#endif
2544 2560
2545 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth); 2561 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2546 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue); 2562 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2547 XPutImage (xdisp, pixmap, gc, image, 0, 0, 2563 XPutImage (dpy, pixmap, gc, image, 0, 0,
2548 nx, ny, image->width, image->height); 2564 nx, ny, image->width, image->height);
2549 XFreeGC (xdisp, gc); 2565 XFreeGC (dpy, gc);
2550 XDestroyImage (image); 2566 XDestroyImage (image);
2551 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap); 2567 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2552 XClearWindow (xdisp, parent[0]); 2568 XClearWindow (dpy, parent[0]);
2553 2569
2554 if (!am_transparent || !am_pixmap_trans) 2570 if (!am_transparent || !am_pixmap_trans)
2555 pchanged = 1; 2571 pchanged = 1;
2556 2572
2557 am_transparent = am_pixmap_trans = 1; 2573 am_transparent = am_pixmap_trans = 1;
2558 } 2574 }
2559 } 2575 }
2560 2576
2561 if (am_pixmap_trans) 2577 if (am_pixmap_trans)
2562 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2578 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2563 else 2579 else
2564 { 2580 {
2565 unsigned int n; 2581 unsigned int n;
2566 /* 2582 /*
2567 * InheritPixmap transparency 2583 * InheritPixmap transparency
2568 */ 2584 */
2569 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2570 { 2586 {
2571 oldp = parent[i]; 2587 oldp = parent[i];
2572 XQueryTree (xdisp, parent[i - 1], &root, 2588 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2573 &parent[i], &list, &n);
2574 XFree (list); 2589 XFree (list);
2575 2590
2576 if (parent[i] == display->root) 2591 if (parent[i] == display->root)
2577 { 2592 {
2578 if (oldp != None) 2593 if (oldp != None)
… …
2586 } 2601 }
2587 2602
2588 n = 0; 2603 n = 0;
2589 2604
2590 if (pchanged) 2605 if (pchanged)
2591 {
2592 for (; n < (unsigned int)i; n++) 2606 for (; n < (unsigned int)i; n++)
2593 { 2607 {
2594 XGetWindowAttributes (xdisp, parent[n], &wattr); 2608 XGetWindowAttributes (dpy, parent[n], &wattr);
2609
2595 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2610 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2596 { 2611 {
2597 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2612 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2598 break; 2613 break;
2599 } 2614 }
2600 } 2615 }
2601 }
2602 2616
2603 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2617 if (n > (sizeof (parent) / sizeof (parent[0])))
2604 { 2618 {
2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); 2619 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2620 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2607 am_transparent = 0; 2621 am_transparent = 0;
2608 /* XXX: also turn off Opt_transparent? */ 2622 /* XXX: also turn off Opt_transparent? */
2609 } 2623 }
2610 else 2624 else
2611 { 2625 {
2612 for (n = 0; n < (unsigned int)i; n++) 2626 for (n = 0; n < (unsigned int)i; n++)
2613 { 2627 {
2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative); 2628 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2615 XClearWindow (xdisp, parent[n]); 2629 XClearWindow (dpy, parent[n]);
2616 } 2630 }
2617 2631
2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2632 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2619 am_transparent = 1; 2633 am_transparent = 1;
2620 } 2634 }
2621 2635
2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2636 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2623 parent[i] = None; 2637 parent[i] = None;
2624 } 2638 }
2625 2639
2626 if (scrollBar.win) 2640 if (scrollBar.win)
2627 { 2641 {
2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative); 2642 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2629 scrollBar.setIdle (); 2643 scrollBar.setIdle ();
2630 scrollbar_show (0); 2644 scrollbar_show (0);
2631 } 2645 }
2632 2646
2633 if (am_transparent) 2647 if (am_transparent)
… …
3084 scr_charset_set (2, (unsigned int)cmd_getc ()); 3098 scr_charset_set (2, (unsigned int)cmd_getc ());
3085 break; 3099 break;
3086 case '+': 3100 case '+':
3087 scr_charset_set (3, (unsigned int)cmd_getc ()); 3101 scr_charset_set (3, (unsigned int)cmd_getc ());
3088 break; 3102 break;
3089#if ENABLE_FRILLS 3103#if !ENABLE_MINIMAL
3090 case '6': 3104 case '6':
3091 scr_backindex (); 3105 scr_backindex ();
3092 break; 3106 break;
3093#endif 3107#endif
3094 case '7': 3108 case '7':
3095 scr_cursor (SAVE); 3109 scr_cursor (SAVE);
3096 break; 3110 break;
3097 case '8': 3111 case '8':
3098 scr_cursor (RESTORE); 3112 scr_cursor (RESTORE);
3099 break; 3113 break;
3100#if ENABLE_FRILLS 3114#if !ENABLE_MINIMAL
3101 case '9': 3115 case '9':
3102 scr_forwardindex (); 3116 scr_forwardindex ();
3103 break; 3117 break;
3104#endif 3118#endif
3105 case '=': 3119 case '=':
… …
3278 { 3292 {
3279 case '>': 3293 case '>':
3280 if (ch == CSI_DA) /* secondary device attributes */ 3294 if (ch == CSI_DA) /* secondary device attributes */
3281 { 3295 {
3282 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 3296 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3283 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions. 3297 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3284 // 3298 //
3285 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 3299 // 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 3300 // 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). 3301 // that we do not support xterm mouse reporting (should be 95 when we do).
3288 // 3302 //
3289 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[2]); 3303 tt_printf ("\033[>%d;94;0c", 'U');
3290 } 3304 }
3291 break; 3305 break;
3292 case '?': 3306 case '?':
3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3307 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3294 process_terminal_mode (ch, priv, nargs, arg); 3308 process_terminal_mode (ch, priv, nargs, arg);
… …
3498 break; 3512 break;
3499 case CSI_75: 3513 case CSI_75:
3500 scr_cursor (RESTORE); 3514 scr_cursor (RESTORE);
3501 break; 3515 break;
3502 3516
3503#if ENABLE_FRILLS 3517#if !ENABLE_MINIMAL
3504 case CSI_74: 3518 case CSI_74:
3505 process_window_ops (arg, nargs); 3519 process_window_ops (arg, nargs);
3506 break; 3520 break;
3507#endif 3521#endif
3508 3522
… …
3515 break; 3529 break;
3516 } 3530 }
3517} 3531}
3518/*}}} */ 3532/*}}} */
3519 3533
3520#if ENABLE_FRILLS 3534#if !ENABLE_MINIMAL
3521/* ARGSUSED */ 3535/* ARGSUSED */
3522void 3536void
3523rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3537rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3524{ 3538{
3525 int x, y; 3539 int x, y;
3526 XWindowAttributes wattr; 3540 XWindowAttributes wattr;
3527 Window wdummy; 3541 Window wdummy;
3528 3542
3529 dLocal (Display *, xdisp); 3543 dLocal (Display *, dpy);
3530 3544
3531 if (nargs == 0) 3545 if (nargs == 0)
3532 return; 3546 return;
3533 3547
3534 switch (args[0]) 3548 switch (args[0])
3535 { 3549 {
3536 /* 3550 /*
3537 * commands 3551 * commands
3538 */ 3552 */
3539 case 1: /* deiconify window */ 3553 case 1: /* deiconify window */
3540 XMapWindow (xdisp, parent[0]); 3554 XMapWindow (dpy, parent[0]);
3541 break; 3555 break;
3542 case 2: /* iconify window */ 3556 case 2: /* iconify window */
3543 XIconifyWindow (xdisp, parent[0], display->screen); 3557 XIconifyWindow (dpy, parent[0], display->screen);
3544 break; 3558 break;
3545 case 3: /* set position (pixels) */ 3559 case 3: /* set position (pixels) */
3546 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3560 XMoveWindow (dpy, parent[0], args[1], args[2]);
3547 break; 3561 break;
3548 case 4: /* set size (pixels) */ 3562 case 4: /* set size (pixels) */
3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3563 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3550 break; 3564 break;
3551 case 5: /* raise window */ 3565 case 5: /* raise window */
3552 XRaiseWindow (xdisp, parent[0]); 3566 XRaiseWindow (dpy, parent[0]);
3553 break; 3567 break;
3554 case 6: /* lower window */ 3568 case 6: /* lower window */
3555 XLowerWindow (xdisp, parent[0]); 3569 XLowerWindow (dpy, parent[0]);
3556 break; 3570 break;
3557 case 7: /* refresh window */ 3571 case 7: /* refresh window */
3558 scr_touch (true); 3572 scr_touch (true);
3559 break; 3573 break;
3560 case 8: /* set size (chars) */ 3574 case 8: /* set size (chars) */
… …
3567 if (args[0] >= 24) /* set height (chars) */ 3581 if (args[0] >= 24) /* set height (chars) */
3568 set_widthheight ((unsigned int)width, 3582 set_widthheight ((unsigned int)width,
3569 (unsigned int) (args[1] * fheight)); 3583 (unsigned int) (args[1] * fheight));
3570 break; 3584 break;
3571 3585
3572
3573 /* 3586 /*
3574 * reports - some output format copied from XTerm 3587 * reports - some output format copied from XTerm
3575 */ 3588 */
3576 case 11: /* report window state */ 3589 case 11: /* report window state */
3577 XGetWindowAttributes (xdisp, parent[0], &wattr); 3590 XGetWindowAttributes (dpy, parent[0], &wattr);
3578 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3591 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3579 break; 3592 break;
3580 case 13: /* report window position */ 3593 case 13: /* report window position */
3581 XGetWindowAttributes (xdisp, parent[0], &wattr); 3594 XGetWindowAttributes (dpy, parent[0], &wattr);
3582 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3595 XTranslateCoordinates (dpy, parent[0], wattr.root,
3583 -wattr.border_width, -wattr.border_width, 3596 -wattr.border_width, -wattr.border_width,
3584 &x, &y, &wdummy); 3597 &x, &y, &wdummy);
3585 tt_printf ("\033[3;%d;%dt", x, y); 3598 tt_printf ("\033[3;%d;%dt", x, y);
3586 break; 3599 break;
3587 case 14: /* report window size (pixels) */ 3600 case 14: /* report window size (pixels) */
3588 XGetWindowAttributes (xdisp, parent[0], &wattr); 3601 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3602 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3590 break; 3603 break;
3591 case 18: /* report text area size (chars) */ 3604 case 18: /* report text area size (chars) */
3592 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3605 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3593 break; 3606 break;
… …
3595 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3608 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3596 break; 3609 break;
3597 case 20: /* report icon label */ 3610 case 20: /* report icon label */
3598 { 3611 {
3599 char *s; 3612 char *s;
3600 XGetIconName (xdisp, parent[0], &s); 3613 XGetIconName (dpy, parent[0], &s);
3601 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3614 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3602 XFree (s); 3615 XFree (s);
3603 } 3616 }
3604 break; 3617 break;
3605 case 21: /* report window title */ 3618 case 21: /* report window title */
3606 { 3619 {
3607 char *s; 3620 char *s;
3608 XFetchName (xdisp, parent[0], &s); 3621 XFetchName (dpy, parent[0], &s);
3609 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3622 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3610 XFree (s); 3623 XFree (s);
3611 } 3624 }
3612 break; 3625 break;
3613 } 3626 }
… …
3714void 3727void
3715rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3728rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3716{ 3729{
3717 if (str[0] == '?' && !str[1]) 3730 if (str[0] == '?' && !str[1])
3718 { 3731 {
3719 unsigned short r, g, b; 3732 rgba c;
3720 pix_colors_focused[color].get (this, r, g, b); 3733 pix_colors_focused[color].get (c);
3734
3735#if XFT
3736 if (c.a != rgba::MAX_CC)
3737 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3738 else
3739#endif
3721 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3740 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3722 } 3741 }
3723 else 3742 else
3724 set_window_color (color, str); 3743 set_window_color (color, str);
3725} 3744}
3726 3745
… …
3733 int color; 3752 int color;
3734 char *buf, *name; 3753 char *buf, *name;
3735 bool query = str[0] == '?' && !str[1]; 3754 bool query = str[0] == '?' && !str[1];
3736 int saveop = op; 3755 int saveop = op;
3737 3756
3738 dLocal (Display *, xdisp); 3757 dLocal (Display *, dpy);
3739 3758
3740 assert (str != NULL); 3759 assert (str != NULL);
3741 switch (op) 3760 switch (op)
3742 { 3761 {
3743 case XTerm_name: 3762 case XTerm_name:
… …
3759 unsigned long bytes_after; 3778 unsigned long bytes_after;
3760 unsigned char *value = 0; 3779 unsigned char *value = 0;
3761 const char *str = ""; 3780 const char *str = "";
3762 3781
3763 if (prop 3782 if (prop
3764 && XGetWindowProperty (xdisp, parent[0], 3783 && XGetWindowProperty (dpy, parent[0],
3765 prop, 0, 1<<16, 0, AnyPropertyType, 3784 prop, 0, 1<<16, 0, AnyPropertyType,
3766 &actual_type, &actual_format, 3785 &actual_type, &actual_format,
3767 &nitems, &bytes_after, &value) == Success 3786 &nitems, &bytes_after, &value) == Success
3768 && actual_type != None 3787 && actual_type != None
3769 && actual_format == 8) 3788 && actual_format == 8)
3770 str = (const char *)(value); 3789 str = (const char *)(value);
3771 3790
3772 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3791 tt_printf ("\033]%d;%s%c", op, str, resp);
3773 3792
3774 XFree (value); 3793 XFree (value);
3775 } 3794 }
3776 else 3795 else
3777 { 3796 {
… …
3781 { 3800 {
3782 *eq = 0; 3801 *eq = 0;
3783 set_utf8_property (display->atom (str), eq + 1); 3802 set_utf8_property (display->atom (str), eq + 1);
3784 } 3803 }
3785 else 3804 else
3786 XDeleteProperty (xdisp, parent[0], 3805 XDeleteProperty (dpy, parent[0],
3787 display->atom (str)); 3806 display->atom (str));
3788 } 3807 }
3789 break; 3808 break;
3790 3809
3791 case XTerm_Color: 3810 case XTerm_Color:
… …
3801 break; 3820 break;
3802 3821
3803 if ((buf = strchr (name, ';')) != NULL) 3822 if ((buf = strchr (name, ';')) != NULL)
3804 *buf++ = '\0'; 3823 *buf++ = '\0';
3805 3824
3806 if (name[0] == '?' && !name[1]) 3825 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 } 3826 }
3815 break; 3827 break;
3816 case XTerm_Color00: 3828 case XTerm_Color00:
3817 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3829 process_color_seq (op, Color_fg, str, resp);
3818 break; 3830 break;
3819 case XTerm_Color01: 3831 case XTerm_Color01:
3820 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3832 process_color_seq (op, Color_bg, str, resp);
3821 break; 3833 break;
3822#ifndef NO_CURSORCOLOR 3834#ifndef NO_CURSORCOLOR
3823 case XTerm_Color_cursor: 3835 case XTerm_Color_cursor:
3824 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3836 process_color_seq (op, Color_cursor, str, resp);
3825 break; 3837 break;
3826#endif 3838#endif
3827 case XTerm_Color_pointer_fg: 3839 case XTerm_Color_pointer_fg:
3828 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3840 process_color_seq (op, Color_pointer_fg, str, resp);
3829 break; 3841 break;
3830 case XTerm_Color_pointer_bg: 3842 case XTerm_Color_pointer_bg:
3831 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3843 process_color_seq (op, Color_pointer_bg, str, resp);
3832 break; 3844 break;
3833#ifndef NO_BOLD_UNDERLINE_REVERSE 3845#ifndef NO_BOLD_UNDERLINE_REVERSE
3834 case XTerm_Color_RV: 3846 case XTerm_Color_RV:
3835 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3847 process_color_seq (op, Color_RV, str, resp);
3836 break; 3848 break;
3837 case Rxvt_Color_BD: 3849 case Rxvt_Color_BD:
3838 case URxvt_Color_BD: 3850 case URxvt_Color_BD:
3839 process_color_seq (op, Color_BD, str, resp); 3851 process_color_seq (op, Color_BD, str, resp);
3840 break; 3852 break;
3841 case Rxvt_Color_UL: 3853 case Rxvt_Color_UL:
3842 case URxvt_Color_UL: 3854 case URxvt_Color_UL:
3843 process_color_seq (op, Color_UL, str, resp); 3855 process_color_seq (op, Color_UL, str, resp);
3844 break; 3856 break;
3845 case URxvt_Color_IT: 3857 case URxvt_Color_IT:
3846 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3858 process_color_seq (op, Color_IT, str, resp);
3847 break; 3859 break;
3848#endif 3860#endif
3849#if TRANSPARENT && TINTING 3861#if TRANSPARENT && TINTING
3850 case URxvt_Color_tint: 3862 case URxvt_Color_tint:
3851 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3863 process_color_seq (op, Color_tint, str, resp);
3864
3852 check_our_parents (); 3865 check_our_parents ();
3866
3853 if (am_transparent) 3867 if (am_transparent)
3854 want_full_refresh = want_refresh = 1; 3868 want_full_refresh = want_refresh = 1;
3869
3855 break; 3870 break;
3856#endif 3871#endif
3857 3872
3858 case Rxvt_Pixmap: 3873 case Rxvt_Pixmap:
3859 { 3874 {
… …
3930 allocated.push_back ((void *)res); 3945 allocated.push_back ((void *)res);
3931 set_fonts (); 3946 set_fonts ();
3932 } 3947 }
3933 break; 3948 break;
3934 3949
3935#if ENABLE_FRILLS 3950 case URxvt_version:
3951 if (query)
3952 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3953 op,
3954 rs[Rs_name], VERSION[0], VERSION[2],
3955 resp);
3956 break;
3957
3958#if !ENABLE_MINIMAL
3936 case URxvt_locale: 3959 case URxvt_locale:
3937 if (query) 3960 if (query)
3938 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3961 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3939 else 3962 else
3940 { 3963 {
3941 set_locale (str); 3964 set_locale (str);
3942 pty->set_utf8_mode (enc_utf8); 3965 pty->set_utf8_mode (enc_utf8);
3943 init_xlocale (); 3966 init_xlocale ();
… …
4304 scr_color (Color_bg, Color_bg); 4327 scr_color (Color_bg, Color_bg);
4305 break; 4328 break;
4306 4329
4307 //case 50: // not variable spacing 4330 //case 50: // not variable spacing
4308 4331
4309#if ENABLE_FRILLS 4332#if !ENABLE_MINIMAL
4310 case 90: 4333 case 90:
4311 case 91: /* set bright fg color */ 4334 case 91: /* set bright fg color */
4312 case 92: 4335 case 92:
4313 case 93: 4336 case 93:
4314 case 94: 4337 case 94:

Diff Legend

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