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.327 by ayin, Mon Jun 11 13:33:34 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
64 63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 67
… …
227# if !UNICODE3 226# if !UNICODE3
228 if (ch >= 0x10000) 227 if (ch >= 0x10000)
229 ch = 0xfffd; 228 ch = 0xfffd;
230# endif 229# endif
231 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
233 } 234 }
234 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
235 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
237 243
238 free (fname); 244 free (fname);
239 245
… …
292 298
293 return -1; 299 return -1;
294} 300}
295#endif 301#endif
296 302
297/*{{{ Convert the keypress event into a string */
298void 303void
299rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
300{ 305{
301 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
302 unsigned int newlen; 307 unsigned int newlen;
303 KeySym keysym; 308 KeySym keysym;
304 int valid_keysym; 309 int valid_keysym;
305 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
306 316
307 /* 317 /*
308 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
309 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
310 * 320 *
… …
487 { 497 {
488 commit_iso14755 (); 498 commit_iso14755 ();
489 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
490# if ISO_14755 500# if ISO_14755
491 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
492# endif 510# endif
493 return; 511 return;
494 } 512 }
495 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
496 { 514 {
… …
867 return; 885 return;
868 886
869 if (len <= 0) 887 if (len <= 0)
870 return; /* not mapped */ 888 return; /* not mapped */
871 889
872 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
873 if (view_start) 891 if (view_start)
874 { 892 {
875 view_start = 0; 893 view_start = 0;
876 want_refresh = 1; 894 want_refresh = 1;
877 } 895 }
… …
901 tt_write (&ch, 1); 919 tt_write (&ch, 1);
902 } 920 }
903 921
904 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
905} 923}
906/*}}} */ 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ENABLE_OVERLAY
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ENABLE_OVERLAY
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
907 1001
908#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
909unsigned int 1003unsigned int
910rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
911{ 1005{
… …
1088 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1089 } 1183 }
1090} 1184}
1091#endif 1185#endif
1092 1186
1093#if HAVE_SCHED_YIELD 1187#if LINUX_YIELD_HACK
1094static struct event_handler 1188static struct event_handler
1095{ 1189{
1096 check_watcher cw_yield; 1190 check_watcher yield_ev;
1097 1191
1098 void yield (check_watcher &w) 1192 void yield_cb (check_watcher &w)
1099 { 1193 {
1100 sched_yield (); 1194 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS.
1198
1199 struct timespec ts = { 0, 0 };
1200 nanosleep (&ts, 0);
1201
1101 w.stop (); 1202 w.stop ();
1102 } 1203 }
1103 1204
1104 event_handler () 1205 event_handler ()
1105 : cw_yield (this, &event_handler::yield) 1206 : yield_ev (this, &event_handler::yield_cb)
1106 { 1207 {
1107 } 1208 }
1108} event_handler; 1209} event_handler;
1109#endif 1210#endif
1110 1211
… …
1130 cmdbuf_endp += r; 1231 cmdbuf_endp += r;
1131 return true; 1232 return true;
1132 } 1233 }
1133 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134 { 1235 {
1135#if HAVE_SCHED_YIELD 1236#if LINUX_YIELD_HACK
1136 if (display->is_local) 1237 if (display->is_local)
1137 event_handler.cw_yield.start (); 1238 event_handler.yield_ev.start ();
1138#endif 1239#endif
1139 } 1240 }
1140 else 1241 else
1141 { 1242 {
1142 pty_ev.stop (); 1243 pty_ev.stop ();
1143 1244
1144 if (!OPTION (Opt_hold)) 1245 if (!option (Opt_hold))
1145 destroy (); 1246 destroy ();
1146 } 1247 }
1147 1248
1148 return false; 1249 return false;
1149} 1250}
… …
1164} 1265}
1165 1266
1166void 1267void
1167rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1168{ 1269{
1169 XDefineCursor (xdisp, vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1170 recolour_cursor (); 1271 recolour_cursor ();
1171 1272
1172#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1173 hidden_pointer = 0; 1274 hidden_pointer = 0;
1174 1275
1175 if (OPTION (Opt_pointerBlank)) 1276 if (option (Opt_pointerBlank))
1176 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1177#endif 1278#endif
1178} 1279}
1179 1280
1180#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1181void 1282void
1182rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1183{ 1284{
1184 if (!OPTION (Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1185 return; 1286 return;
1186 1287
1187 XDefineCursor (xdisp, vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1188 XFlush (xdisp); 1289 XFlush (dpy);
1189 1290
1190 hidden_pointer = 1; 1291 hidden_pointer = 1;
1191} 1292}
1192 1293
1193void 1294void
… …
1272void 1373void
1273rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1274{ 1375{
1275 make_current (); 1376 make_current ();
1276 1377
1277 dLocal (Display *, xdisp); 1378 dLocal (Display *, dpy);
1278 1379
1279 if (ev.xany.window == vt 1380 if (ev.xany.window == vt
1280 && SHOULD_INVOKE (HOOK_X_EVENT) 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1281 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1282 return; 1383 return;
… …
1287 unsigned int unused_mask; 1388 unsigned int unused_mask;
1288 1389
1289 switch (ev.type) 1390 switch (ev.type)
1290 { 1391 {
1291 case KeyPress: 1392 case KeyPress:
1292#if ISO_14755 1393 key_press (ev.xkey);
1293 if (!(iso14755buf & ISO_14755_52))
1294#endif
1295 lookup_key (ev.xkey);
1296
1297 break; 1394 break;
1298 1395
1299 case KeyRelease: 1396 case KeyRelease:
1300 { 1397 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; 1398 break;
1372 }
1373 1399
1374 case ButtonPress: 1400 case ButtonPress:
1375 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1376 break; 1402 break;
1377 1403
… …
1392 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1418 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1393 destroy (); 1419 destroy ();
1394 } 1420 }
1395#if ENABLE_EWMH 1421#if ENABLE_EWMH
1396 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1397 XSendEvent (xdisp, ev.xclient.window = display->root, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1398 False, SubstructureRedirectMask | SubstructureNotifyMask, 1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1399 &ev); 1425 &ev);
1400#endif 1426#endif
1401 } 1427 }
1402 } 1428 }
… …
1440 break; 1466 break;
1441 } 1467 }
1442 break; 1468 break;
1443 1469
1444 case FocusIn: 1470 case FocusIn:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1445 focus_in (); 1474 focus_in ();
1446 break; 1475 break;
1447 1476
1448 case FocusOut: 1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1449 focus_out (); 1481 focus_out ();
1450 break; 1482 break;
1451 1483
1452 case ConfigureNotify: 1484 case ConfigureNotify:
1453 if (ev.xconfigure.window == parent[0]) 1485 if (ev.xconfigure.window == parent[0])
1454 { 1486 {
1455 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1456 ; 1488 ;
1457 1489
1458 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1459 { 1491 {
1460 seen_resize = 1; 1492 seen_resize = 1;
1461 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND
1495 if (!option(Opt_transparent) && bgPixmap.auto_resize)
1496 {
1497 resize_pixmap ();
1498 scr_touch (true);
1499 }
1500#endif
1462 } 1501 }
1463 1502
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1465 1504
1466#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1505#ifdef TRANSPARENT
1467 if (OPTION (Opt_transparent)) 1506 if (option (Opt_transparent))
1468 check_our_parents (); 1507 check_our_parents ();
1469#endif 1508#endif
1470 } 1509 }
1471 break; 1510 break;
1472 1511
… …
1518 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1519 { 1558 {
1520 do 1559 do
1521 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1522 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1523 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1524 1563
1525 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1526 1565
1527 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1530 1569
1531 want_refresh = 1; 1570 want_refresh = 1;
1532 } 1571 }
1533 else 1572 else
1534 { 1573 {
1535 XEvent unused_event; 1574 XEvent unused_event;
1536 1575
1537 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1538 ; 1577 ;
1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1540 ; 1579 ;
1541 1580
1542 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1543 { 1582 {
1544 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1545 scrollbar_show (0); 1584 scrollbar_show (0);
1546 } 1585 }
1547 1586
1548#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1550 XClearWindow (xdisp, ev.xany.window); 1589 XClearWindow (dpy, ev.xany.window);
1551#endif 1590#endif
1552 } 1591 }
1553 break; 1592 break;
1554 1593
1555 case MotionNotify: 1594 case MotionNotify:
… …
1565 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1566 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1567 ; // nop 1606 ; // nop
1568 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1569 { 1608 {
1570 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1571 ; 1610 ;
1572 1611
1573 XQueryPointer (xdisp, vt, 1612 XQueryPointer (dpy, vt,
1574 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1575 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1576 &ev.xbutton.x, &ev.xbutton.y, 1615 &ev.xbutton.x, &ev.xbutton.y,
1577 &ev.xbutton.state); 1616 &ev.xbutton.state);
1578#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
… …
1642#endif 1681#endif
1643 } 1682 }
1644 } 1683 }
1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1646 { 1685 {
1647 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1648 MotionNotify, &ev)) 1687 MotionNotify, &ev))
1649 ; 1688 ;
1650 1689
1651 XQueryPointer (xdisp, scrollBar.win, 1690 XQueryPointer (dpy, scrollBar.win,
1652 &unused_root, &unused_child, 1691 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1693 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1694 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1660 scrollbar_show (1); 1699 scrollbar_show (1);
1661 } 1700 }
1662 break; 1701 break;
1663 } 1702 }
1664 1703
1665skip_switch: ;
1666
1667#if defined(CURSOR_BLINK) 1704#if defined(CURSOR_BLINK)
1668 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1705 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1669 { 1706 {
1670 if (hidden_cursor) 1707 if (hidden_cursor)
1671 { 1708 {
1672 hidden_cursor = 0; 1709 hidden_cursor = 0;
1673 want_refresh = 1; 1710 want_refresh = 1;
… …
1676 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1677 } 1714 }
1678#endif 1715#endif
1679 1716
1680#if defined(POINTER_BLANK) 1717#if defined(POINTER_BLANK)
1681 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1682 { 1719 {
1683 if (ev.type == MotionNotify 1720 if (ev.type == MotionNotify
1684 || ev.type == ButtonPress 1721 || ev.type == ButtonPress
1685 || ev.type == ButtonRelease) 1722 || ev.type == ButtonRelease)
1686 if (hidden_pointer) 1723 if (hidden_pointer)
… …
1698 if (!focus) 1735 if (!focus)
1699 { 1736 {
1700 focus = 1; 1737 focus = 1;
1701 want_refresh = 1; 1738 want_refresh = 1;
1702 1739
1703 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1704 1741
1705#if USE_XIM 1742#if USE_XIM
1706 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1707 { 1744 {
1708 IMSetStatusPosition (); 1745 IMSetPosition ();
1709 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1710 } 1747 }
1711#endif 1748#endif
1712#if CURSOR_BLINK 1749#if CURSOR_BLINK
1713 if (OPTION (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
1714 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1715#endif 1752#endif
1716#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1717 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1718 { 1755 {
1719 pix_colors = pix_colors_focused; 1756 pix_colors = pix_colors_focused;
1720 scr_recolour (); 1757 scr_recolour ();
1758 }
1759#endif
1760#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell))
1762 {
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]);
1766 if (h != NULL)
1767 {
1768 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h);
1770 }
1721 } 1771 }
1722#endif 1772#endif
1723 } 1773 }
1724} 1774}
1725 1775
… …
1745#if USE_XIM 1795#if USE_XIM
1746 if (Input_Context != NULL) 1796 if (Input_Context != NULL)
1747 XUnsetICFocus (Input_Context); 1797 XUnsetICFocus (Input_Context);
1748#endif 1798#endif
1749#if CURSOR_BLINK 1799#if CURSOR_BLINK
1750 if (OPTION (Opt_cursorBlink)) 1800 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.stop (); 1801 cursor_blink_ev.stop ();
1752 hidden_cursor = 0; 1802 hidden_cursor = 0;
1753#endif 1803#endif
1754#if OFF_FOCUS_FADING 1804#if OFF_FOCUS_FADING
1755 if (rs[Rs_fade]) 1805 if (rs[Rs_fade])
… …
1759 } 1809 }
1760#endif 1810#endif
1761 } 1811 }
1762} 1812}
1763 1813
1764#if TRANSPARENT 1814void
1815rxvt_term::update_fade_color (unsigned int idx)
1816{
1817#if OFF_FOCUS_FADING
1818 if (rs[Rs_fade])
1819 {
1820 rgba c;
1821 pix_colors [Color_fade].get (c);
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 }
1824#endif
1825}
1826
1827#if TRANSPARENT || ENABLE_PERL
1765void 1828void
1766rxvt_term::rootwin_cb (XEvent &ev) 1829rxvt_term::rootwin_cb (XEvent &ev)
1767{ 1830{
1768 make_current (); 1831 make_current ();
1769 1832
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return;
1836
1837# if TRANSPARENT
1770 switch (ev.type) 1838 switch (ev.type)
1771 { 1839 {
1772 case PropertyNotify: 1840 case PropertyNotify:
1773 /* 1841 /*
1774 * if user used some Esetroot compatible prog to set the root bg, 1842 * if user used some Esetroot compatible prog to set the root bg,
… …
1778 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1779 return; 1847 return;
1780 1848
1781 /* FALLTHROUGH */ 1849 /* FALLTHROUGH */
1782 case ReparentNotify: 1850 case ReparentNotify:
1783 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1851 if (option (Opt_transparent))
1784 want_refresh = want_full_refresh = 1; 1852 check_our_parents ();
1785 break; 1853 break;
1786 } 1854 }
1855# endif
1787} 1856}
1788#endif 1857#endif
1789 1858
1790void 1859void
1791rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
… …
2119 selection_make (ev.time); 2188 selection_make (ev.time);
2120 break; 2189 break;
2121 2190
2122 case Button2: 2191 case Button2:
2123 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2192 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2124 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2125 break; 2194 break;
2126 2195
2127#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2128 case Button4: 2197 case Button4:
2129 case Button5: 2198 case Button5:
… …
2133 2202
2134 v = ev.button == Button4 ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2135 2204
2136 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2137 i = 1; 2206 i = 1;
2138 else if (OPTION (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2139 i = nrow - 1; 2208 i = nrow - 1;
2140 else 2209 else
2141 i = 5; 2210 i = 5;
2142 2211
2143# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
… …
2166 } 2235 }
2167 } 2236 }
2168} 2237}
2169 2238
2170#ifdef TRANSPARENT 2239#ifdef TRANSPARENT
2171#if TINTING 2240#if TINTING && !defined(HAVE_AFTERIMAGE)
2172/* taken from aterm-0.4.2 */ 2241/* taken from aterm-0.4.2 */
2173 2242
2174typedef uint32_t RUINT32T; 2243typedef uint32_t RUINT32T;
2175 2244
2176void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 2245void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
… …
2404 * Do transparency updates if required 2473 * Do transparency updates if required
2405 */ 2474 */
2406int 2475int
2407rxvt_term::check_our_parents () 2476rxvt_term::check_our_parents ()
2408{ 2477{
2478 check_our_parents_ev.stop ();
2479 check_our_parents_ev.start (NOW + .1);
2480 return 0;
2481}
2482
2483void
2484rxvt_term::check_our_parents_cb (time_watcher &w)
2485{
2409 int i, pchanged, aformat, have_pixmap, rootdepth; 2486 int i, pchanged, aformat, have_pixmap, rootdepth;
2410 unsigned long nitems, bytes_after; 2487 unsigned long nitems, bytes_after;
2411 Atom atype; 2488 Atom atype;
2412 unsigned char *prop = NULL; 2489 unsigned char *prop = NULL;
2413 Window root, oldp, *list; 2490 Window root, oldp, *list;
2414 Pixmap rootpixmap = None; 2491 Pixmap rootpixmap = None;
2415 XWindowAttributes wattr, wrootattr; 2492 XWindowAttributes wattr, wrootattr;
2493 int sx, sy;
2494 Window cr;
2416 2495
2417 pchanged = 0; 2496 pchanged = 0;
2418 2497
2419 if (!OPTION (Opt_transparent)) 2498 if (!option (Opt_transparent))
2420 return pchanged; /* Don't try any more */ 2499 return /*pchanged*/; /* Don't try any more */
2421 2500
2422 XGetWindowAttributes (xdisp, display->root, &wrootattr); 2501 XGetWindowAttributes (dpy, display->root, &wrootattr);
2423 rootdepth = wrootattr.depth; 2502 rootdepth = wrootattr.depth;
2424 2503
2425 XGetWindowAttributes (xdisp, parent[0], &wattr); 2504 XGetWindowAttributes (dpy, parent[0], &wattr);
2426 2505
2427 if (rootdepth != wattr.depth) 2506 if (rootdepth != wattr.depth)
2428 { 2507 {
2429 if (am_transparent) 2508 if (am_transparent)
2430 { 2509 {
2431 pchanged = 1; 2510 pchanged = 1;
2432 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2511 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2433 am_transparent = am_pixmap_trans = 0; 2512 am_transparent = am_pixmap_trans = 0;
2434 } 2513 }
2435 2514
2436 return pchanged; /* Don't try any more */ 2515 return /*pchanged*/; /* Don't try any more */
2437 } 2516 }
2438 2517
2439 /* Get all X ops out of the queue so that our information is up-to-date. */ 2518 /* Get all X ops out of the queue so that our information is up-to-date. */
2440 XSync (xdisp, False); 2519 XSync (dpy, False);
2441 2520
2521 XTranslateCoordinates (dpy, parent[0], display->root,
2522 0, 0, &sx, &sy, &cr);
2523
2524 /* check if we are outside of the visible part of the virtual screen : */
2525 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
2526 || sx >= wrootattr.width || sy >= wrootattr.height )
2527 return /* 0 */ ;
2442 /* 2528 /*
2443 * Make the frame window set by the window manager have 2529 * Make the frame window set by the window manager have
2444 * the root background. Some window managers put multiple nested frame 2530 * the root background. Some window managers put multiple nested frame
2445 * windows for each client, so we have to take care about that. 2531 * windows for each client, so we have to take care about that.
2446 */ 2532 */
2447 i = (xa[XA_XROOTPMAP_ID] 2533 i = (xa[XA_XROOTPMAP_ID]
2448 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID], 2534 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2449 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2535 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2450 &nitems, &bytes_after, &prop) == Success); 2536 &nitems, &bytes_after, &prop) == Success);
2451 2537
2452 if (!i || prop == NULL) 2538 if (!i || prop == NULL)
2453 i = (xa[XA_ESETROOT_PMAP_ID] 2539 i = (xa[XA_ESETROOT_PMAP_ID]
2454 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID], 2540 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2455 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2541 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2456 &nitems, &bytes_after, &prop) == Success); 2542 &nitems, &bytes_after, &prop) == Success);
2457 2543
2458 if (!i || prop == NULL 2544 if (!i || prop == NULL
2459#if TINTING 2545#if TINTING
2460 || !rs[Rs_color + Color_tint] 2546 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
2547#ifdef HAVE_AFTERIMAGE
2548 && original_asim == NULL && rs[Rs_blurradius] == NULL
2549#endif
2550 )
2461#endif 2551#endif
2462 ) 2552 )
2463 have_pixmap = 0; 2553 have_pixmap = 0;
2464 else 2554 else
2465 { 2555 {
… …
2468 XFree (prop); 2558 XFree (prop);
2469 } 2559 }
2470 2560
2471 if (have_pixmap) 2561 if (have_pixmap)
2472 { 2562 {
2563 Bool success = False ;
2564 GC gc;
2565 XGCValues gcvalue;
2566#ifdef HAVE_AFTERIMAGE
2567 {
2568 Pixmap tmp_pmap = None ;
2569 ShadingInfo shade;
2570 ARGB32 tint ;
2571 unsigned int pmap_w = 0, pmap_h = 0;
2572
2573 if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h ))
2574 {
2575 int root_x = 0, root_y = 0;
2576
2577 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2578 if (ISSET_PIXCOLOR (Color_tint))
2579 {
2580 rgba c;
2581 pix_colors_focused [Color_tint].get (c);
2582 shade.tintColor.red = c.r;
2583 shade.tintColor.green = c.g;
2584 shade.tintColor.blue = c.b;
2585 }
2586 else
2587 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF;
2588 tint = shading2tint32( &shade );
2589 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2590 if (GetWinPosition (parent[0], &root_x, &root_y) )
2591 {
2592 ASImageLayer *layers = create_image_layers( 2 );
2593 ASImage *merged_im = NULL;
2594 int back_x, back_y, back_w, back_h;
2595 /* merge_layers does good job at tiling background appropriately,
2596 so all we need is to cut out smallest possible piece : */
2597#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
2598 do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
2599 back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \
2600 if( pmap_##wh >= back_##xy + szHint.widthheight ) \
2601 back_##wh = szHint.widthheight;/* background is large - limit it by our size */ \
2602 else \
2603 { /* small background - need the whole of it for successfull tiling :*/ \
2604 back_##xy = 0; \
2605 back_##wh = pmap_##wh; \
2606 }}while(0)
2607
2608 MAKE_ROOTPMAP_GEOM(x,w,width);
2609 MAKE_ROOTPMAP_GEOM(y,h,height);
2610
2611 layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100);
2612 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
2613 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
2614 layers[0].clip_width = szHint.width;
2615 layers[0].clip_height = szHint.height;
2616 layers[0].tint = tint;
2617 if (rs[Rs_blurradius] && layers[0].im)
2618 {
2619 double r = atof(rs[Rs_blurradius]);
2620 ASImage* tmp = blur_asimage_gauss(display->asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT );
2621 if( tmp )
2622 {
2623 destroy_asimage( &layers[0].im );
2624 layers[0].im = tmp;
2625 }
2626 }
2627 if (original_asim != NULL)
2628 {
2629 int fore_w, fore_h;
2630 layers[1].im = original_asim;
2631 if( bgPixmap.auto_resize )
2632 {
2633 fore_w = szHint.width;
2634 fore_h = szHint.height;
2635 }
2636 else
2637 {
2638 fore_w = bgPixmap.w;
2639 fore_h = bgPixmap.h;
2640 }
2641 if (fore_w != original_asim->width
2642 || fore_h != original_asim->height)
2643 {
2644 layers[1].im = scale_asimage( display->asv,
2645 original_asim,
2646 fore_w, fore_h,
2647 ASA_ASImage, 100,
2648 ASIMAGE_QUALITY_DEFAULT );
2649 }
2650
2651 layers[1].clip_width = szHint.width;
2652 layers[1].clip_height = szHint.height;
2653
2654 if (rs[Rs_blendtype])
2655 {
2656 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]);
2657 if( layers[1].merge_scanlines == NULL )
2658 layers[1].merge_scanlines = alphablend_scanlines;
2659 }
2660 }
2661 merged_im = merge_layers( display->asv, layers, layers[1].im?2:1,
2662 szHint.width, szHint.height,
2663 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT );
2664 if (layers[1].im != original_asim)
2665 destroy_asimage( &(layers[1].im) );
2666 destroy_asimage( &(layers[0].im) );
2667 if (merged_im != NULL)
2668 {
2669 tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True );
2670 destroy_asimage( &merged_im );
2671 }
2672 free( layers );
2673 }
2674 }
2675 if (tmp_pmap != None)
2676 {
2677 success = True;
2678 if (pixmap != None)
2679 XFreePixmap (dpy, pixmap);
2680 pixmap = tmp_pmap;
2681 }
2682 }
2683#else /* HAVE_AFTERIMAGE */
2684 {
2473 /* 2685 /*
2474 * Copy display->root pixmap transparency 2686 * Copy display->root pixmap transparency
2475 */ 2687 */
2476 int sx, sy, nx, ny; 2688 int nx, ny;
2477 unsigned int nw, nh; 2689 unsigned int nw, nh;
2478 Window cr;
2479 XImage *image; 2690 XImage *image;
2480 GC gc;
2481 XGCValues gcvalue;
2482 2691
2483 XTranslateCoordinates (xdisp, parent[0], display->root,
2484 0, 0, &sx, &sy, &cr);
2485 nw = (unsigned int)szHint.width; 2692 nw = (unsigned int)szHint.width;
2486 nh = (unsigned int)szHint.height; 2693 nh = (unsigned int)szHint.height;
2487 nx = ny = 0; 2694 nx = ny = 0;
2488 2695
2489 if (sx < 0) 2696 if (sx < 0)
2490 { 2697 {
2491 nw += sx; 2698 nw += sx;
2492 nx = -sx; 2699 nx = -sx;
2493 sx = 0; 2700 sx = 0;
2494 } 2701 }
2495 2702
2496 if (sy < 0) 2703 if (sy < 0)
2497 { 2704 {
2498 nh += sy; 2705 nh += sy;
2499 ny = -sy; 2706 ny = -sy;
2500 sy = 0; 2707 sy = 0;
2501 } 2708 }
2502 2709
2503 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2710 min_it (nw, (unsigned int) (wrootattr.width - sx));
2504 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2711 min_it (nh, (unsigned int) (wrootattr.height - sy));
2505 2712
2506 XSync (xdisp, False); 2713 XSync (dpy, False);
2507 allowedxerror = -1; 2714 allowedxerror = -1;
2508 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2715 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2509 2716
2510 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2717 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2511 /* XXX: may need a delay here? */ 2718 /* XXX: may need a delay here? */
2512 allowedxerror = 0; 2719 allowedxerror = 0;
2513
2514 if (image == NULL) 2720 if (image != NULL)
2721 {
2722 if (pixmap != None)
2723 XFreePixmap (dpy, pixmap);
2724
2725#if TINTING
2726 if (ISSET_PIXCOLOR (Color_tint))
2727 {
2728 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2729
2730 rgba c;
2731 pix_colors_focused [Color_tint].get (c);
2732 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2733 }
2734#endif
2735
2736 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2737 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2738 XPutImage (dpy, pixmap, gc, image, 0, 0,
2739 nx, ny, image->width, image->height);
2740 XDestroyImage (image);
2741 success = True ;
2742 }
2743 }
2744#endif /* HAVE_AFTERIMAGE */
2745 if (gc != NULL)
2746 XFreeGC (dpy, gc);
2747
2748 if (!success)
2515 { 2749 {
2516 if (am_transparent && am_pixmap_trans) 2750 if (am_transparent && am_pixmap_trans)
2517 { 2751 {
2518 pchanged = 1; 2752 pchanged = 1;
2519 if (pixmap != None) 2753 if (pixmap != None)
2520 { 2754 {
2521 XFreePixmap (xdisp, pixmap); 2755 XFreePixmap (dpy, pixmap);
2522 pixmap = None; 2756 pixmap = None;
2523 } 2757 }
2524 } 2758 }
2525 2759
2526 am_pixmap_trans = 0; 2760 am_pixmap_trans = 0;
2527 } 2761 }
2528 else 2762 else
2529 { 2763 {
2530 if (pixmap != None)
2531 XFreePixmap (xdisp, pixmap);
2532
2533#if TINTING
2534 if (ISSET_PIXCOLOR (Color_tint))
2535 {
2536 unsigned short rm, gm, bm;
2537 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2538
2539 pix_colors_focused[Color_tint].get (this, rm, gm, bm);
2540
2541 ShadeXImage (this, image, shade, rm, gm, bm);
2542 }
2543#endif
2544
2545 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2546 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2547 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2548 nx, ny, image->width, image->height);
2549 XFreeGC (xdisp, gc);
2550 XDestroyImage (image);
2551 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap); 2764 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2552 XClearWindow (xdisp, parent[0]); 2765 XClearWindow (dpy, parent[0]);
2553 2766
2554 if (!am_transparent || !am_pixmap_trans) 2767 if (!am_transparent || !am_pixmap_trans)
2555 pchanged = 1; 2768 pchanged = 1;
2556 2769
2557 am_transparent = am_pixmap_trans = 1; 2770 am_transparent = am_pixmap_trans = 1;
2558 } 2771 }
2559 } 2772 }
2560 2773
2561 if (am_pixmap_trans) 2774 if (am_pixmap_trans)
2562 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2775 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2563 else 2776 else
2564 { 2777 {
2565 unsigned int n; 2778 unsigned int n;
2566 /* 2779 /*
2567 * InheritPixmap transparency 2780 * InheritPixmap transparency
2568 */ 2781 */
2569 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2782 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2570 { 2783 {
2571 oldp = parent[i]; 2784 oldp = parent[i];
2572 XQueryTree (xdisp, parent[i - 1], &root, 2785 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2573 &parent[i], &list, &n);
2574 XFree (list); 2786 XFree (list);
2575 2787
2576 if (parent[i] == display->root) 2788 if (parent[i] == display->root)
2577 { 2789 {
2578 if (oldp != None) 2790 if (oldp != None)
… …
2586 } 2798 }
2587 2799
2588 n = 0; 2800 n = 0;
2589 2801
2590 if (pchanged) 2802 if (pchanged)
2591 {
2592 for (; n < (unsigned int)i; n++) 2803 for (; n < (unsigned int)i; n++)
2593 { 2804 {
2594 XGetWindowAttributes (xdisp, parent[n], &wattr); 2805 XGetWindowAttributes (dpy, parent[n], &wattr);
2806
2595 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2807 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2596 { 2808 {
2597 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2809 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2598 break; 2810 break;
2599 } 2811 }
2600 } 2812 }
2601 }
2602 2813
2603 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2814 if (n > (sizeof (parent) / sizeof (parent[0])))
2604 { 2815 {
2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); 2816 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2817 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2607 am_transparent = 0; 2818 am_transparent = 0;
2608 /* XXX: also turn off Opt_transparent? */ 2819 /* XXX: also turn off Opt_transparent? */
2609 } 2820 }
2610 else 2821 else
2611 { 2822 {
2612 for (n = 0; n < (unsigned int)i; n++) 2823 for (n = 0; n < (unsigned int)i; n++)
2613 { 2824 {
2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative); 2825 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2615 XClearWindow (xdisp, parent[n]); 2826 XClearWindow (dpy, parent[n]);
2616 } 2827 }
2617 2828
2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2829 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2619 am_transparent = 1; 2830 am_transparent = 1;
2620 } 2831 }
2621 2832
2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2833 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2623 parent[i] = None; 2834 parent[i] = None;
2624 } 2835 }
2625 2836
2626 if (scrollBar.win) 2837 if (scrollBar.win)
2627 { 2838 {
2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative); 2839 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2629 scrollBar.setIdle (); 2840 scrollBar.setIdle ();
2630 scrollbar_show (0); 2841 scrollbar_show (0);
2631 } 2842 }
2632 2843
2633 if (am_transparent) 2844 if (am_transparent)
… …
2635 want_refresh = want_full_refresh = 1; 2846 want_refresh = want_full_refresh = 1;
2636 if (am_pixmap_trans) 2847 if (am_pixmap_trans)
2637 flush (); 2848 flush ();
2638 } 2849 }
2639 2850
2640 return pchanged; 2851// return pchanged;
2641} 2852}
2642#endif 2853#endif
2643 2854
2644/*}}} */ 2855/*}}} */
2645 2856
… …
2696 if (ch == C0_LF) 2907 if (ch == C0_LF)
2697 nlines++; 2908 nlines++;
2698 2909
2699 refresh_count++; 2910 refresh_count++;
2700 2911
2701 if (!OPTION (Opt_jumpScroll) 2912 if (!option (Opt_jumpScroll)
2702 || (refresh_count >= refresh_limit * (nrow - 1))) 2913 || (refresh_count >= refresh_limit * (nrow - 1)))
2703 { 2914 {
2704 refreshnow = true; 2915 refreshnow = true;
2705 refresh_count = 0; 2916 refresh_count = 0;
2706 ch = NOCHAR; 2917 ch = NOCHAR;
… …
2746 * the number of pages between refreshes is refresh_limit, which 2957 * the number of pages between refreshes is refresh_limit, which
2747 * is incremented here because we must be doing flat-out scrolling. 2958 * is incremented here because we must be doing flat-out scrolling.
2748 */ 2959 */
2749 if (refreshnow) 2960 if (refreshnow)
2750 { 2961 {
2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2962 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2752 refresh_limit++; 2963 refresh_limit++;
2753 else 2964 else
2754 { 2965 {
2755 flag = true; 2966 flag = true;
2967 //TODO: due to popular request, implement "skipscroll" option here
2756 scr_refresh (); 2968 scr_refresh ();
2757 want_refresh = 1; 2969 want_refresh = 1;
2758 } 2970 }
2759 } 2971 }
2760 2972
… …
3084 scr_charset_set (2, (unsigned int)cmd_getc ()); 3296 scr_charset_set (2, (unsigned int)cmd_getc ());
3085 break; 3297 break;
3086 case '+': 3298 case '+':
3087 scr_charset_set (3, (unsigned int)cmd_getc ()); 3299 scr_charset_set (3, (unsigned int)cmd_getc ());
3088 break; 3300 break;
3089#if ENABLE_FRILLS 3301#if !ENABLE_MINIMAL
3090 case '6': 3302 case '6':
3091 scr_backindex (); 3303 scr_backindex ();
3092 break; 3304 break;
3093#endif 3305#endif
3094 case '7': 3306 case '7':
3095 scr_cursor (SAVE); 3307 scr_cursor (SAVE);
3096 break; 3308 break;
3097 case '8': 3309 case '8':
3098 scr_cursor (RESTORE); 3310 scr_cursor (RESTORE);
3099 break; 3311 break;
3100#if ENABLE_FRILLS 3312#if !ENABLE_MINIMAL
3101 case '9': 3313 case '9':
3102 scr_forwardindex (); 3314 scr_forwardindex ();
3103 break; 3315 break;
3104#endif 3316#endif
3105 case '=': 3317 case '=':
… …
3278 { 3490 {
3279 case '>': 3491 case '>':
3280 if (ch == CSI_DA) /* secondary device attributes */ 3492 if (ch == CSI_DA) /* secondary device attributes */
3281 { 3493 {
3282 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 3494 // 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. 3495 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3284 // 3496 //
3285 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 3497 // 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 3498 // 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). 3499 // that we do not support xterm mouse reporting (should be 95 when we do).
3288 // 3500 //
3289 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[2]); 3501 tt_printf ("\033[>%d;94;0c", 'U');
3290 } 3502 }
3291 break; 3503 break;
3292 case '?': 3504 case '?':
3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3505 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3294 process_terminal_mode (ch, priv, nargs, arg); 3506 process_terminal_mode (ch, priv, nargs, arg);
… …
3421 break; 3633 break;
3422 case 6: /* CPR requested */ 3634 case 6: /* CPR requested */
3423 scr_report_position (); 3635 scr_report_position ();
3424 break; 3636 break;
3425 case 7: /* unofficial extension */ 3637 case 7: /* unofficial extension */
3426 if (OPTION (Opt_insecure)) 3638 if (option (Opt_insecure))
3427 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3639 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3428 break; 3640 break;
3429 case 8: /* unofficial extension */ 3641 case 8: /* unofficial extension */
3430 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3642 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3431 break; 3643 break;
… …
3498 break; 3710 break;
3499 case CSI_75: 3711 case CSI_75:
3500 scr_cursor (RESTORE); 3712 scr_cursor (RESTORE);
3501 break; 3713 break;
3502 3714
3503#if ENABLE_FRILLS 3715#if !ENABLE_MINIMAL
3504 case CSI_74: 3716 case CSI_74:
3505 process_window_ops (arg, nargs); 3717 process_window_ops (arg, nargs);
3506 break; 3718 break;
3507#endif 3719#endif
3508 3720
… …
3515 break; 3727 break;
3516 } 3728 }
3517} 3729}
3518/*}}} */ 3730/*}}} */
3519 3731
3520#if ENABLE_FRILLS 3732#if !ENABLE_MINIMAL
3521/* ARGSUSED */ 3733/* ARGSUSED */
3522void 3734void
3523rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3735rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3524{ 3736{
3525 int x, y; 3737 int x, y;
3526 XWindowAttributes wattr; 3738 XWindowAttributes wattr;
3527 Window wdummy; 3739 Window wdummy;
3528 3740
3529 dLocal (Display *, xdisp); 3741 dLocal (Display *, dpy);
3530 3742
3531 if (nargs == 0) 3743 if (nargs == 0)
3532 return; 3744 return;
3533 3745
3534 switch (args[0]) 3746 switch (args[0])
3535 { 3747 {
3536 /* 3748 /*
3537 * commands 3749 * commands
3538 */ 3750 */
3539 case 1: /* deiconify window */ 3751 case 1: /* deiconify window */
3540 XMapWindow (xdisp, parent[0]); 3752 XMapWindow (dpy, parent[0]);
3541 break; 3753 break;
3542 case 2: /* iconify window */ 3754 case 2: /* iconify window */
3543 XIconifyWindow (xdisp, parent[0], display->screen); 3755 XIconifyWindow (dpy, parent[0], display->screen);
3544 break; 3756 break;
3545 case 3: /* set position (pixels) */ 3757 case 3: /* set position (pixels) */
3546 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3758 XMoveWindow (dpy, parent[0], args[1], args[2]);
3547 break; 3759 break;
3548 case 4: /* set size (pixels) */ 3760 case 4: /* set size (pixels) */
3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3761 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3550 break; 3762 break;
3551 case 5: /* raise window */ 3763 case 5: /* raise window */
3552 XRaiseWindow (xdisp, parent[0]); 3764 XRaiseWindow (dpy, parent[0]);
3553 break; 3765 break;
3554 case 6: /* lower window */ 3766 case 6: /* lower window */
3555 XLowerWindow (xdisp, parent[0]); 3767 XLowerWindow (dpy, parent[0]);
3556 break; 3768 break;
3557 case 7: /* refresh window */ 3769 case 7: /* refresh window */
3558 scr_touch (true); 3770 scr_touch (true);
3559 break; 3771 break;
3560 case 8: /* set size (chars) */ 3772 case 8: /* set size (chars) */
… …
3567 if (args[0] >= 24) /* set height (chars) */ 3779 if (args[0] >= 24) /* set height (chars) */
3568 set_widthheight ((unsigned int)width, 3780 set_widthheight ((unsigned int)width,
3569 (unsigned int) (args[1] * fheight)); 3781 (unsigned int) (args[1] * fheight));
3570 break; 3782 break;
3571 3783
3572
3573 /* 3784 /*
3574 * reports - some output format copied from XTerm 3785 * reports - some output format copied from XTerm
3575 */ 3786 */
3576 case 11: /* report window state */ 3787 case 11: /* report window state */
3577 XGetWindowAttributes (xdisp, parent[0], &wattr); 3788 XGetWindowAttributes (dpy, parent[0], &wattr);
3578 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3789 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3579 break; 3790 break;
3580 case 13: /* report window position */ 3791 case 13: /* report window position */
3581 XGetWindowAttributes (xdisp, parent[0], &wattr); 3792 XGetWindowAttributes (dpy, parent[0], &wattr);
3582 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3793 XTranslateCoordinates (dpy, parent[0], wattr.root,
3583 -wattr.border_width, -wattr.border_width, 3794 -wattr.border_width, -wattr.border_width,
3584 &x, &y, &wdummy); 3795 &x, &y, &wdummy);
3585 tt_printf ("\033[3;%d;%dt", x, y); 3796 tt_printf ("\033[3;%d;%dt", x, y);
3586 break; 3797 break;
3587 case 14: /* report window size (pixels) */ 3798 case 14: /* report window size (pixels) */
3588 XGetWindowAttributes (xdisp, parent[0], &wattr); 3799 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3800 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3590 break; 3801 break;
3591 case 18: /* report text area size (chars) */ 3802 case 18: /* report text area size (chars) */
3592 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3803 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3593 break; 3804 break;
… …
3595 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3806 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3596 break; 3807 break;
3597 case 20: /* report icon label */ 3808 case 20: /* report icon label */
3598 { 3809 {
3599 char *s; 3810 char *s;
3600 XGetIconName (xdisp, parent[0], &s); 3811 XGetIconName (dpy, parent[0], &s);
3601 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3812 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3602 XFree (s); 3813 XFree (s);
3603 } 3814 }
3604 break; 3815 break;
3605 case 21: /* report window title */ 3816 case 21: /* report window title */
3606 { 3817 {
3607 char *s; 3818 char *s;
3608 XFetchName (xdisp, parent[0], &s); 3819 XFetchName (dpy, parent[0], &s);
3609 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3820 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3610 XFree (s); 3821 XFree (s);
3611 } 3822 }
3612 break; 3823 break;
3613 } 3824 }
3614} 3825}
… …
3641 seen_esc = true; 3852 seen_esc = true;
3642 continue; 3853 continue;
3643 } 3854 }
3644 else if (ch == C0_BEL || ch == CHAR_ST) 3855 else if (ch == C0_BEL || ch == CHAR_ST)
3645 break; 3856 break;
3857 else if (ch == C0_SYN)
3858 ch = cmd_get8 ();
3646 else if (ch < 0x20) 3859 else if (ch < 0x20)
3647 return NULL; /* other control character - exit */ 3860 return NULL; /* other control character - exit */
3648 3861
3649 seen_esc = false; 3862 seen_esc = false;
3650 3863
3651 if (n >= STRING_MAX - 1) 3864 if (n >= STRING_MAX - 1)
3652 // stop at some sane length 3865 // stop at some sane length
3653 return NULL; 3866 return NULL;
3654 3867
3655 if (ch == C0_SYN)
3656 string[n++] = cmd_get8 ();
3657 else
3658 string[n++] = ch; 3868 string[n++] = ch;
3659 } 3869 }
3660 3870
3661 string[n++] = '\0'; 3871 string[n++] = '\0';
3662 3872
3663 ends_how = (ch == 0x5c ? C0_ESC : ch); 3873 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3714void 3924void
3715rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3925rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3716{ 3926{
3717 if (str[0] == '?' && !str[1]) 3927 if (str[0] == '?' && !str[1])
3718 { 3928 {
3719 unsigned short r, g, b; 3929 rgba c;
3720 pix_colors_focused[color].get (this, r, g, b); 3930 pix_colors_focused[color].get (c);
3931
3932#if XFT
3933 if (c.a != rgba::MAX_CC)
3934 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3935 else
3936#endif
3721 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3937 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3722 } 3938 }
3723 else 3939 else
3724 set_window_color (color, str); 3940 set_window_color (color, str);
3725} 3941}
3726 3942
… …
3733 int color; 3949 int color;
3734 char *buf, *name; 3950 char *buf, *name;
3735 bool query = str[0] == '?' && !str[1]; 3951 bool query = str[0] == '?' && !str[1];
3736 int saveop = op; 3952 int saveop = op;
3737 3953
3738 dLocal (Display *, xdisp); 3954 dLocal (Display *, dpy);
3739 3955
3740 assert (str != NULL); 3956 assert (str != NULL);
3957
3958 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3959 return;
3960
3741 switch (op) 3961 switch (op)
3742 { 3962 {
3743 case XTerm_name: 3963 case XTerm_name:
3744 set_title (str); 3964 set_title (str);
3745 /* FALLTHROUGH */ 3965 /* FALLTHROUGH */
… …
3759 unsigned long bytes_after; 3979 unsigned long bytes_after;
3760 unsigned char *value = 0; 3980 unsigned char *value = 0;
3761 const char *str = ""; 3981 const char *str = "";
3762 3982
3763 if (prop 3983 if (prop
3764 && XGetWindowProperty (xdisp, parent[0], 3984 && XGetWindowProperty (dpy, parent[0],
3765 prop, 0, 1<<16, 0, AnyPropertyType, 3985 prop, 0, 1<<16, 0, AnyPropertyType,
3766 &actual_type, &actual_format, 3986 &actual_type, &actual_format,
3767 &nitems, &bytes_after, &value) == Success 3987 &nitems, &bytes_after, &value) == Success
3768 && actual_type != None 3988 && actual_type != None
3769 && actual_format == 8) 3989 && actual_format == 8)
3770 str = (const char *)(value); 3990 str = (const char *)(value);
3771 3991
3772 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3992 tt_printf ("\033]%d;%s%c", op, str, resp);
3773 3993
3774 XFree (value); 3994 XFree (value);
3775 } 3995 }
3776 else 3996 else
3777 { 3997 {
… …
3781 { 4001 {
3782 *eq = 0; 4002 *eq = 0;
3783 set_utf8_property (display->atom (str), eq + 1); 4003 set_utf8_property (display->atom (str), eq + 1);
3784 } 4004 }
3785 else 4005 else
3786 XDeleteProperty (xdisp, parent[0], 4006 XDeleteProperty (dpy, parent[0],
3787 display->atom (str)); 4007 display->atom (str));
3788 } 4008 }
3789 break; 4009 break;
3790 4010
3791 case XTerm_Color: 4011 case XTerm_Color:
… …
3801 break; 4021 break;
3802 4022
3803 if ((buf = strchr (name, ';')) != NULL) 4023 if ((buf = strchr (name, ';')) != NULL)
3804 *buf++ = '\0'; 4024 *buf++ = '\0';
3805 4025
3806 if (name[0] == '?' && !name[1]) 4026 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 } 4027 }
3815 break; 4028 break;
3816 case XTerm_Color00: 4029 case XTerm_Color00:
3817 process_color_seq (XTerm_Color00, Color_fg, str, resp); 4030 process_color_seq (op, Color_fg, str, resp);
3818 break; 4031 break;
3819 case XTerm_Color01: 4032 case XTerm_Color01:
3820 process_color_seq (XTerm_Color01, Color_bg, str, resp); 4033 process_color_seq (op, Color_bg, str, resp);
3821 break; 4034 break;
3822#ifndef NO_CURSORCOLOR 4035#ifndef NO_CURSORCOLOR
3823 case XTerm_Color_cursor: 4036 case XTerm_Color_cursor:
3824 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 4037 process_color_seq (op, Color_cursor, str, resp);
3825 break; 4038 break;
3826#endif 4039#endif
3827 case XTerm_Color_pointer_fg: 4040 case XTerm_Color_pointer_fg:
3828 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 4041 process_color_seq (op, Color_pointer_fg, str, resp);
3829 break; 4042 break;
3830 case XTerm_Color_pointer_bg: 4043 case XTerm_Color_pointer_bg:
3831 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 4044 process_color_seq (op, Color_pointer_bg, str, resp);
3832 break; 4045 break;
3833#ifndef NO_BOLD_UNDERLINE_REVERSE 4046#ifndef NO_BOLD_UNDERLINE_REVERSE
3834 case XTerm_Color_RV: 4047 case XTerm_Color_RV:
3835 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 4048 process_color_seq (op, Color_RV, str, resp);
3836 break; 4049 break;
3837 case Rxvt_Color_BD: 4050 case Rxvt_Color_BD:
3838 case URxvt_Color_BD: 4051 case URxvt_Color_BD:
3839 process_color_seq (op, Color_BD, str, resp); 4052 process_color_seq (op, Color_BD, str, resp);
3840 break; 4053 break;
3841 case Rxvt_Color_UL: 4054 case Rxvt_Color_UL:
3842 case URxvt_Color_UL: 4055 case URxvt_Color_UL:
3843 process_color_seq (op, Color_UL, str, resp); 4056 process_color_seq (op, Color_UL, str, resp);
3844 break; 4057 break;
3845 case URxvt_Color_IT: 4058 case URxvt_Color_IT:
3846 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 4059 process_color_seq (op, Color_IT, str, resp);
3847 break; 4060 break;
3848#endif 4061#endif
3849#if TRANSPARENT && TINTING 4062#if TRANSPARENT && TINTING
3850 case URxvt_Color_tint: 4063 case URxvt_Color_tint:
3851 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 4064 process_color_seq (op, Color_tint, str, resp);
4065
3852 check_our_parents (); 4066 check_our_parents ();
4067
3853 if (am_transparent) 4068 if (am_transparent)
3854 want_full_refresh = want_refresh = 1; 4069 want_full_refresh = want_refresh = 1;
4070
3855 break; 4071 break;
3856#endif 4072#endif
3857 4073
3858 case Rxvt_Pixmap: 4074 case Rxvt_Pixmap:
3859 { 4075 {
… …
3881#ifdef XPM_BACKGROUND 4097#ifdef XPM_BACKGROUND
3882 resize_pixmap (); 4098 resize_pixmap ();
3883 scr_touch (true); 4099 scr_touch (true);
3884#endif 4100#endif
3885 } 4101 }
4102#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
4103 if (option(Opt_transparent))
4104 check_our_parents ();
4105#endif
4106
3886 } 4107 }
3887 break; 4108 break;
3888 4109
3889 case Rxvt_restoreFG: 4110 case Rxvt_restoreFG:
3890 set_window_color (Color_fg, str); 4111 set_window_color (Color_fg, str);
… …
3917 case URxvt_italicFont: 4138 case URxvt_italicFont:
3918 case URxvt_boldItalicFont: 4139 case URxvt_boldItalicFont:
3919#endif 4140#endif
3920 if (query) 4141 if (query)
3921 tt_printf ("\33]%d;%-.250s%c", saveop, 4142 tt_printf ("\33]%d;%-.250s%c", saveop,
3922 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 4143 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3923 ? fontset[op - URxvt_font]->fontdesc : "", 4144 ? fontset[op - URxvt_font]->fontdesc : "",
3924 resp); 4145 resp);
3925 else 4146 else
3926 { 4147 {
3927 const char *&res = rs[Rs_font + (op - URxvt_font)]; 4148 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3930 allocated.push_back ((void *)res); 4151 allocated.push_back ((void *)res);
3931 set_fonts (); 4152 set_fonts ();
3932 } 4153 }
3933 break; 4154 break;
3934 4155
3935#if ENABLE_FRILLS 4156 case URxvt_version:
4157 if (query)
4158 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
4159 op,
4160 rs[Rs_name], VERSION[0], VERSION[2],
4161 resp);
4162 break;
4163
4164#if !ENABLE_MINIMAL
3936 case URxvt_locale: 4165 case URxvt_locale:
3937 if (query) 4166 if (query)
3938 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 4167 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3939 else 4168 else
3940 { 4169 {
3941 set_locale (str); 4170 set_locale (str);
3942 pty->set_utf8_mode (enc_utf8); 4171 pty->set_utf8_mode (enc_utf8);
3943 init_xlocale (); 4172 init_xlocale ();
… …
3958 break; 4187 break;
3959#endif 4188#endif
3960 4189
3961#if ENABLE_PERL 4190#if ENABLE_PERL
3962 case URxvt_perl: 4191 case URxvt_perl:
3963 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4192 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3964 ; // no responses yet 4193 ; // no responses yet
3965 break; 4194 break;
3966#endif 4195#endif
3967 } 4196 }
3968} 4197}
… …
4084 scr_touch (true); 4313 scr_touch (true);
4085 break; 4314 break;
4086#endif 4315#endif
4087 case 1048: /* alternative cursor save */ 4316 case 1048: /* alternative cursor save */
4088 case 1049: 4317 case 1049:
4089 if (OPTION (Opt_secondaryScreen)) 4318 if (option (Opt_secondaryScreen))
4090 if (mode == 0) 4319 if (mode == 0)
4091 scr_cursor (RESTORE); 4320 scr_cursor (RESTORE);
4092 else if (mode == 1) 4321 else if (mode == 1)
4093 scr_cursor (SAVE); 4322 scr_cursor (SAVE);
4094 break; 4323 break;
… …
4159 break; 4388 break;
4160 case 1011: /* scroll to bottom on key press */ 4389 case 1011: /* scroll to bottom on key press */
4161 set_option (Opt_scrollTtyKeypress, state); 4390 set_option (Opt_scrollTtyKeypress, state);
4162 break; 4391 break;
4163 case 1047: /* secondary screen w/ clearing last */ 4392 case 1047: /* secondary screen w/ clearing last */
4164 if (OPTION (Opt_secondaryScreen)) 4393 if (option (Opt_secondaryScreen))
4165 if (current_screen != PRIMARY) 4394 if (current_screen != PRIMARY)
4166 scr_erase_screen (2); 4395 scr_erase_screen (2);
4167 scr_change_screen (state); 4396 scr_change_screen (state);
4168 break; 4397 break;
4169 case 1049: /* secondary screen w/ clearing first */ 4398 case 1049: /* secondary screen w/ clearing first */
4170 scr_change_screen (state); 4399 scr_change_screen (state);
4171 if (OPTION (Opt_secondaryScreen)) 4400 if (option (Opt_secondaryScreen))
4172 if (current_screen != PRIMARY) 4401 if (current_screen != PRIMARY)
4173 scr_erase_screen (2); 4402 scr_erase_screen (2);
4174 break; 4403 break;
4175 default: 4404 default:
4176 break; 4405 break;
… …
4304 scr_color (Color_bg, Color_bg); 4533 scr_color (Color_bg, Color_bg);
4305 break; 4534 break;
4306 4535
4307 //case 50: // not variable spacing 4536 //case 50: // not variable spacing
4308 4537
4309#if ENABLE_FRILLS 4538#if !ENABLE_MINIMAL
4310 case 90: 4539 case 90:
4311 case 91: /* set bright fg color */ 4540 case 91: /* set bright fg color */
4312 case 92: 4541 case 92:
4313 case 93: 4542 case 93:
4314 case 94: 4543 case 94:

Diff Legend

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