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.283 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.324 by sasha, Fri Jun 8 20:04:12 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 (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 (display->display, 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 (display->display, vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1188 XFlush (display->display); 1289 XFlush (dpy);
1189 1290
1190 hidden_pointer = 1; 1291 hidden_pointer = 1;
1191} 1292}
1192 1293
1193void 1294void
… …
1266 (32 + button_number + key_state), 1367 (32 + button_number + key_state),
1267 (32 + x + 1), 1368 (32 + x + 1),
1268 (32 + y + 1)); 1369 (32 + y + 1));
1269} 1370}
1270 1371
1271#ifdef USING_W11LIB
1272void
1273rxvt_W11_process_x_event (XEvent *ev)
1274{
1275 rxvt_t *r = rxvt_get_r ();
1276
1277 x_cb (*ev);
1278}
1279#endif
1280
1281/*{{{ process an X event */ 1372/*{{{ process an X event */
1282void 1373void
1283rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1284{ 1375{
1285 make_current (); 1376 make_current ();
1286 1377
1287 dDisp; 1378 dLocal (Display *, dpy);
1288 1379
1289 if (ev.xany.window == vt 1380 if (ev.xany.window == vt
1290 && SHOULD_INVOKE (HOOK_X_EVENT) 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1291 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1292 return; 1383 return;
… …
1297 unsigned int unused_mask; 1388 unsigned int unused_mask;
1298 1389
1299 switch (ev.type) 1390 switch (ev.type)
1300 { 1391 {
1301 case KeyPress: 1392 case KeyPress:
1302#if ISO_14755 1393 key_press (ev.xkey);
1303 if (!(iso14755buf & ISO_14755_52))
1304#endif
1305 lookup_key (ev.xkey);
1306
1307 break; 1394 break;
1308 1395
1309 case KeyRelease: 1396 case KeyRelease:
1310 { 1397 key_release (ev.xkey);
1311#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1312 KeySym keysym;
1313
1314 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1315#endif
1316
1317#if ENABLE_FRILLS || ISO_14755
1318 // ISO 14755 support
1319 if (iso14755buf)
1320 if (iso14755buf & ISO_14755_52)
1321 {
1322# if ENABLE_OVERLAY
1323 scr_overlay_off ();
1324# endif
1325# if ISO_14755
1326 // iso14755 part 5.2 handling: release time
1327 // first: controls
1328 if ((ev.xkey.state & ControlMask)
1329 && ((keysym >= 0x40 && keysym <= 0x5f)
1330 || (keysym >= 0x61 && keysym <= 0x7f)))
1331 {
1332 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1333 commit_iso14755 ();
1334 goto skip_switch;
1335 }
1336
1337 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1338 if (i[0] == keysym)
1339 {
1340 iso14755buf = ISO_14755_51 | i[1];
1341 commit_iso14755 ();
1342 goto skip_switch;
1343 }
1344
1345 scr_bell ();
1346# endif
1347 iso14755buf = 0;
1348 break;
1349 }
1350 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1351 {
1352# if ENABLE_OVERLAY
1353 scr_overlay_off ();
1354# endif
1355 if (iso14755buf & ISO_14755_51)
1356 commit_iso14755 ();
1357#if ISO_14755
1358 else if (iso14755buf & ISO_14755_STARTED)
1359 {
1360 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1361
1362 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1363 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1364 }
1365# endif
1366 else
1367 iso14755buf = 0;
1368 }
1369#endif
1370
1371 if (ev.xany.window == vt
1372 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1373 break;
1374
1375#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1376 if (!(ev.xkey.state & ControlMask))
1377 slip_wheel_ev.stop ();
1378 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1379 mouse_slip_wheel_speed = 0;
1380#endif
1381 break; 1398 break;
1382 }
1383 1399
1384 case ButtonPress: 1400 case ButtonPress:
1385 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1386 break; 1402 break;
1387 1403
… …
1402 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)))
1403 destroy (); 1419 destroy ();
1404 } 1420 }
1405#if ENABLE_EWMH 1421#if ENABLE_EWMH
1406 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])
1407 XSendEvent (disp, ev.xclient.window = display->root, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1408 False, SubstructureRedirectMask | SubstructureNotifyMask, 1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1409 &ev); 1425 &ev);
1410#endif 1426#endif
1411 } 1427 }
1412 } 1428 }
… …
1450 break; 1466 break;
1451 } 1467 }
1452 break; 1468 break;
1453 1469
1454 case FocusIn: 1470 case FocusIn:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1455 focus_in (); 1474 focus_in ();
1456 break; 1475 break;
1457 1476
1458 case FocusOut: 1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1459 focus_out (); 1481 focus_out ();
1460 break; 1482 break;
1461 1483
1462 case ConfigureNotify: 1484 case ConfigureNotify:
1463 if (ev.xconfigure.window == parent[0]) 1485 if (ev.xconfigure.window == parent[0])
1464 { 1486 {
1465 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1466 ; 1488 ;
1467 1489
1468 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1469 { 1491 {
1470 seen_resize = 1; 1492 seen_resize = 1;
1471 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
1472 } 1501 }
1473 1502
1474 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1475 1504
1476#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1505#ifdef TRANSPARENT
1477 if (OPTION (Opt_transparent)) 1506 if (option (Opt_transparent))
1478 check_our_parents (); 1507 check_our_parents ();
1479#endif 1508#endif
1480 } 1509 }
1481 break; 1510 break;
1482 1511
… …
1528 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1529 { 1558 {
1530 do 1559 do
1531 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1532 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1533 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1534 1563
1535 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1536 1565
1537 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1538 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1539 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1540 1569
1541 want_refresh = 1; 1570 want_refresh = 1;
1542 } 1571 }
1543 else 1572 else
1544 { 1573 {
1545 XEvent unused_event; 1574 XEvent unused_event;
1546 1575
1547 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1548 ; 1577 ;
1549 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1550 ; 1579 ;
1551 1580
1552 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1553 { 1582 {
1554 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1555 scrollbar_show (0); 1584 scrollbar_show (0);
1556 } 1585 }
1557 1586
1558#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1559 if (am_transparent && ev.xany.window == parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1560 XClearWindow (disp, ev.xany.window); 1589 XClearWindow (dpy, ev.xany.window);
1561#endif 1590#endif
1562 } 1591 }
1563 break; 1592 break;
1564 1593
1565 case MotionNotify: 1594 case MotionNotify:
… …
1575 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1576 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1577 ; // nop 1606 ; // nop
1578 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1579 { 1608 {
1580 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1581 ; 1610 ;
1582 1611
1583 XQueryPointer (disp, vt, 1612 XQueryPointer (dpy, vt,
1584 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1585 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1586 &ev.xbutton.x, &ev.xbutton.y, 1615 &ev.xbutton.x, &ev.xbutton.y,
1587 &ev.xbutton.state); 1616 &ev.xbutton.state);
1588#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
… …
1652#endif 1681#endif
1653 } 1682 }
1654 } 1683 }
1655 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1656 { 1685 {
1657 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1658 MotionNotify, &ev)) 1687 MotionNotify, &ev))
1659 ; 1688 ;
1660 1689
1661 XQueryPointer (disp, scrollBar.win, 1690 XQueryPointer (dpy, scrollBar.win,
1662 &unused_root, &unused_child, 1691 &unused_root, &unused_child,
1663 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1664 &ev.xbutton.x, &ev.xbutton.y, 1693 &ev.xbutton.x, &ev.xbutton.y,
1665 &unused_mask); 1694 &unused_mask);
1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1670 scrollbar_show (1); 1699 scrollbar_show (1);
1671 } 1700 }
1672 break; 1701 break;
1673 } 1702 }
1674 1703
1675skip_switch: ;
1676
1677#if defined(CURSOR_BLINK) 1704#if defined(CURSOR_BLINK)
1678 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1705 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1679 { 1706 {
1680 if (hidden_cursor) 1707 if (hidden_cursor)
1681 { 1708 {
1682 hidden_cursor = 0; 1709 hidden_cursor = 0;
1683 want_refresh = 1; 1710 want_refresh = 1;
… …
1686 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1687 } 1714 }
1688#endif 1715#endif
1689 1716
1690#if defined(POINTER_BLANK) 1717#if defined(POINTER_BLANK)
1691 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1692 { 1719 {
1693 if (ev.type == MotionNotify 1720 if (ev.type == MotionNotify
1694 || ev.type == ButtonPress 1721 || ev.type == ButtonPress
1695 || ev.type == ButtonRelease) 1722 || ev.type == ButtonRelease)
1696 if (hidden_pointer) 1723 if (hidden_pointer)
… …
1708 if (!focus) 1735 if (!focus)
1709 { 1736 {
1710 focus = 1; 1737 focus = 1;
1711 want_refresh = 1; 1738 want_refresh = 1;
1712 1739
1713 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1714 1741
1715#if USE_XIM 1742#if USE_XIM
1716 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1717 { 1744 {
1718 IMSetStatusPosition (); 1745 IMSetPosition ();
1719 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1720 } 1747 }
1721#endif 1748#endif
1722#if CURSOR_BLINK 1749#if CURSOR_BLINK
1723 if (OPTION (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
1724 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1725#endif 1752#endif
1726#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1727 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1728 { 1755 {
1729 pix_colors = pix_colors_focused; 1756 pix_colors = pix_colors_focused;
1730 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 }
1731 } 1771 }
1732#endif 1772#endif
1733 } 1773 }
1734} 1774}
1735 1775
… …
1755#if USE_XIM 1795#if USE_XIM
1756 if (Input_Context != NULL) 1796 if (Input_Context != NULL)
1757 XUnsetICFocus (Input_Context); 1797 XUnsetICFocus (Input_Context);
1758#endif 1798#endif
1759#if CURSOR_BLINK 1799#if CURSOR_BLINK
1760 if (OPTION (Opt_cursorBlink)) 1800 if (option (Opt_cursorBlink))
1761 cursor_blink_ev.stop (); 1801 cursor_blink_ev.stop ();
1762 hidden_cursor = 0; 1802 hidden_cursor = 0;
1763#endif 1803#endif
1764#if OFF_FOCUS_FADING 1804#if OFF_FOCUS_FADING
1765 if (rs[Rs_fade]) 1805 if (rs[Rs_fade])
… …
1769 } 1809 }
1770#endif 1810#endif
1771 } 1811 }
1772} 1812}
1773 1813
1774#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
1775void 1828void
1776rxvt_term::rootwin_cb (XEvent &ev) 1829rxvt_term::rootwin_cb (XEvent &ev)
1777{ 1830{
1778 make_current (); 1831 make_current ();
1779 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
1780 switch (ev.type) 1838 switch (ev.type)
1781 { 1839 {
1782 case PropertyNotify: 1840 case PropertyNotify:
1783 /* 1841 /*
1784 * 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,
… …
1788 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1789 return; 1847 return;
1790 1848
1791 /* FALLTHROUGH */ 1849 /* FALLTHROUGH */
1792 case ReparentNotify: 1850 case ReparentNotify:
1793 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1851 if (option (Opt_transparent))
1794 want_refresh = want_full_refresh = 1; 1852 check_our_parents ();
1795 break; 1853 break;
1796 } 1854 }
1855# endif
1797} 1856}
1798#endif 1857#endif
1799 1858
1800void 1859void
1801rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
… …
2129 selection_make (ev.time); 2188 selection_make (ev.time);
2130 break; 2189 break;
2131 2190
2132 case Button2: 2191 case Button2:
2133 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?
2134 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2135 break; 2194 break;
2136 2195
2137#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2138 case Button4: 2197 case Button4:
2139 case Button5: 2198 case Button5:
… …
2143 2202
2144 v = ev.button == Button4 ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2145 2204
2146 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2147 i = 1; 2206 i = 1;
2148 else if (OPTION (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2149 i = nrow - 1; 2208 i = nrow - 1;
2150 else 2209 else
2151 i = 5; 2210 i = 5;
2152 2211
2153# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
… …
2176 } 2235 }
2177 } 2236 }
2178} 2237}
2179 2238
2180#ifdef TRANSPARENT 2239#ifdef TRANSPARENT
2181#if TINTING 2240#if TINTING && !defined(HAVE_AFTERIMAGE)
2182/* taken from aterm-0.4.2 */ 2241/* taken from aterm-0.4.2 */
2183 2242
2184typedef uint32_t RUINT32T; 2243typedef uint32_t RUINT32T;
2185 2244
2186void ShadeXImage(rxvt_display *display, 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)
2187{ 2246{
2188 int sh_r, sh_g, sh_b; 2247 int sh_r, sh_g, sh_b;
2189 RUINT32T mask_r, mask_g, mask_b; 2248 RUINT32T mask_r, mask_g, mask_b;
2190 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2249 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2191 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2250 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2192 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2251 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2193 int i; 2252 int i;
2194 2253
2195 Visual *visual = display->visual; 2254 Visual *visual = term->visual;
2196 2255
2197 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2256 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2198 2257
2199 /* for convenience */ 2258 /* for convenience */
2200 mask_r = visual->red_mask; 2259 mask_r = visual->red_mask;
… …
2414 * Do transparency updates if required 2473 * Do transparency updates if required
2415 */ 2474 */
2416int 2475int
2417rxvt_term::check_our_parents () 2476rxvt_term::check_our_parents ()
2418{ 2477{
2478#if TRANSPARENT || ENABLE_PERL
2479 check_our_aprents_ev.stop();
2480 check_our_aprents_ev.start(NOW + 1./3.);
2481#endif
2482 return 0;
2483}
2484
2485void
2486rxvt_term::check_our_parents_cb (time_watcher &w)
2487{
2419 int i, pchanged, aformat, have_pixmap, rootdepth; 2488 int i, pchanged, aformat, have_pixmap, rootdepth;
2420 unsigned long nitems, bytes_after; 2489 unsigned long nitems, bytes_after;
2421 Atom atype; 2490 Atom atype;
2422 unsigned char *prop = NULL; 2491 unsigned char *prop = NULL;
2423 Window root, oldp, *list; 2492 Window root, oldp, *list;
2424 Pixmap rootpixmap = None; 2493 Pixmap rootpixmap = None;
2425 XWindowAttributes wattr, wrootattr; 2494 XWindowAttributes wattr, wrootattr;
2426 dDisp; 2495 int sx, sy;
2496 Window cr;
2427 2497
2428 pchanged = 0; 2498 pchanged = 0;
2429 2499
2430 if (!OPTION (Opt_transparent)) 2500 if (!option (Opt_transparent))
2431 return pchanged; /* Don't try any more */ 2501 return /*pchanged*/; /* Don't try any more */
2432 2502
2433 XGetWindowAttributes (disp, display->root, &wrootattr); 2503 XGetWindowAttributes (dpy, display->root, &wrootattr);
2434 rootdepth = wrootattr.depth; 2504 rootdepth = wrootattr.depth;
2435 2505
2436 XGetWindowAttributes (disp, parent[0], &wattr); 2506 XGetWindowAttributes (dpy, parent[0], &wattr);
2437 2507
2438 if (rootdepth != wattr.depth) 2508 if (rootdepth != wattr.depth)
2439 { 2509 {
2440 if (am_transparent) 2510 if (am_transparent)
2441 { 2511 {
2442 pchanged = 1; 2512 pchanged = 1;
2443 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2513 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2444 am_transparent = am_pixmap_trans = 0; 2514 am_transparent = am_pixmap_trans = 0;
2445 } 2515 }
2446 2516
2447 return pchanged; /* Don't try any more */ 2517 return /*pchanged*/; /* Don't try any more */
2448 } 2518 }
2449 2519
2450 /* Get all X ops out of the queue so that our information is up-to-date. */ 2520 /* Get all X ops out of the queue so that our information is up-to-date. */
2451 XSync (disp, False); 2521 XSync (dpy, False);
2452 2522
2523 XTranslateCoordinates (dpy, parent[0], display->root,
2524 0, 0, &sx, &sy, &cr);
2525
2526 /* check if we are outside of the visible part of the virtual screen : */
2527 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
2528 || sx >= wrootattr.width || sy >= wrootattr.height )
2529 return /* 0 */ ;
2453 /* 2530 /*
2454 * Make the frame window set by the window manager have 2531 * Make the frame window set by the window manager have
2455 * the root background. Some window managers put multiple nested frame 2532 * the root background. Some window managers put multiple nested frame
2456 * windows for each client, so we have to take care about that. 2533 * windows for each client, so we have to take care about that.
2457 */ 2534 */
2458 i = (xa[XA_XROOTPMAP_ID] 2535 i = (xa[XA_XROOTPMAP_ID]
2459 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2536 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2460 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2537 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2461 &nitems, &bytes_after, &prop) == Success); 2538 &nitems, &bytes_after, &prop) == Success);
2462 2539
2463 if (!i || prop == NULL) 2540 if (!i || prop == NULL)
2464 i = (xa[XA_ESETROOT_PMAP_ID] 2541 i = (xa[XA_ESETROOT_PMAP_ID]
2465 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2542 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2466 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2543 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2467 &nitems, &bytes_after, &prop) == Success); 2544 &nitems, &bytes_after, &prop) == Success);
2468 2545
2469 if (!i || prop == NULL 2546 if (!i || prop == NULL
2470#if TINTING 2547#if TINTING
2471 || !rs[Rs_color + Color_tint] 2548 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
2549#ifdef HAVE_AFTERIMAGE
2550 && original_asim == NULL && rs[Rs_blurradius] == NULL
2551#endif
2552 )
2472#endif 2553#endif
2473 ) 2554 )
2474 have_pixmap = 0; 2555 have_pixmap = 0;
2475 else 2556 else
2476 { 2557 {
… …
2479 XFree (prop); 2560 XFree (prop);
2480 } 2561 }
2481 2562
2482 if (have_pixmap) 2563 if (have_pixmap)
2483 { 2564 {
2565 Bool success = False ;
2566 GC gc;
2567 XGCValues gcvalue;
2568#ifdef HAVE_AFTERIMAGE
2569 {
2570 Pixmap tmp_pmap = None ;
2571 ShadingInfo shade;
2572 ARGB32 tint ;
2573 unsigned int pmap_w = 0, pmap_h = 0;
2574
2575 if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h ))
2576 {
2577 int root_x = 0, root_y = 0;
2578
2579 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2580 if (ISSET_PIXCOLOR (Color_tint))
2581 {
2582 rgba c;
2583 pix_colors_focused [Color_tint].get (c);
2584 shade.tintColor.red = c.r;
2585 shade.tintColor.green = c.g;
2586 shade.tintColor.blue = c.b;
2587 }
2588 else
2589 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF;
2590 tint = shading2tint32( &shade );
2591 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2592 if (GetWinPosition (parent[0], &root_x, &root_y) )
2593 {
2594 ASImageLayer *layers = create_image_layers( 2 );
2595 ASImage *merged_im = NULL;
2596 int back_x, back_y, back_w, back_h;
2597 /* merge_layers does good job at tiling background appropriately,
2598 so all we need is to cut out smallest possible piece : */
2599#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
2600 do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
2601 back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \
2602 if( pmap_##wh >= back_##xy + szHint.widthheight ) \
2603 back_##wh = szHint.widthheight;/* background is large - limit it by our size */ \
2604 else \
2605 { /* small background - need the whole of it for successfull tiling :*/ \
2606 back_##xy = 0; \
2607 back_##wh = pmap_##wh; \
2608 }}while(0)
2609
2610 MAKE_ROOTPMAP_GEOM(x,w,width);
2611 MAKE_ROOTPMAP_GEOM(y,h,height);
2612
2613 layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100);
2614 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
2615 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
2616 layers[0].clip_width = szHint.width;
2617 layers[0].clip_height = szHint.height;
2618 layers[0].tint = tint;
2619 if (rs[Rs_blurradius] && layers[0].im)
2620 {
2621 double r = atof(rs[Rs_blurradius]);
2622 ASImage* tmp = blur_asimage_gauss(display->asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT );
2623 if( tmp )
2624 {
2625 destroy_asimage( &layers[0].im );
2626 layers[0].im = tmp;
2627 }
2628 }
2629 if (original_asim != NULL)
2630 {
2631 int fore_w, fore_h;
2632 layers[1].im = original_asim;
2633 if( bgPixmap.auto_resize )
2634 {
2635 fore_w = szHint.width;
2636 fore_h = szHint.height;
2637 }
2638 else
2639 {
2640 fore_w = bgPixmap.w;
2641 fore_h = bgPixmap.h;
2642 }
2643 if (fore_w != original_asim->width
2644 || fore_h != original_asim->height)
2645 {
2646 layers[1].im = scale_asimage( display->asv,
2647 original_asim,
2648 fore_w, fore_h,
2649 ASA_ASImage, 100,
2650 ASIMAGE_QUALITY_DEFAULT );
2651 }
2652
2653 layers[1].clip_width = szHint.width;
2654 layers[1].clip_height = szHint.height;
2655
2656 if (rs[Rs_blendtype])
2657 {
2658 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]);
2659 if( layers[1].merge_scanlines == NULL )
2660 layers[1].merge_scanlines = alphablend_scanlines;
2661 }
2662 }
2663 merged_im = merge_layers( display->asv, layers, layers[1].im?2:1,
2664 szHint.width, szHint.height,
2665 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT );
2666 if (layers[1].im != original_asim)
2667 destroy_asimage( &(layers[1].im) );
2668 destroy_asimage( &(layers[0].im) );
2669 if (merged_im != NULL)
2670 {
2671 tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True );
2672 destroy_asimage( &merged_im );
2673 }
2674 free( layers );
2675 }
2676 }
2677 if (tmp_pmap != None)
2678 {
2679 success = True;
2680 if (pixmap != None)
2681 XFreePixmap (dpy, pixmap);
2682 pixmap = tmp_pmap;
2683 }
2684 }
2685#else /* HAVE_AFTERIMAGE */
2686 {
2484 /* 2687 /*
2485 * Copy display->root pixmap transparency 2688 * Copy display->root pixmap transparency
2486 */ 2689 */
2487 int sx, sy, nx, ny; 2690 int nx, ny;
2488 unsigned int nw, nh; 2691 unsigned int nw, nh;
2489 Window cr;
2490 XImage *image; 2692 XImage *image;
2491 GC gc;
2492 XGCValues gcvalue;
2493 2693
2494 XTranslateCoordinates (disp, parent[0], display->root,
2495 0, 0, &sx, &sy, &cr);
2496 nw = (unsigned int)szHint.width; 2694 nw = (unsigned int)szHint.width;
2497 nh = (unsigned int)szHint.height; 2695 nh = (unsigned int)szHint.height;
2498 nx = ny = 0; 2696 nx = ny = 0;
2499 2697
2500 if (sx < 0) 2698 if (sx < 0)
2501 { 2699 {
2502 nw += sx; 2700 nw += sx;
2503 nx = -sx; 2701 nx = -sx;
2504 sx = 0; 2702 sx = 0;
2505 } 2703 }
2506 2704
2507 if (sy < 0) 2705 if (sy < 0)
2508 { 2706 {
2509 nh += sy; 2707 nh += sy;
2510 ny = -sy; 2708 ny = -sy;
2511 sy = 0; 2709 sy = 0;
2512 } 2710 }
2513 2711
2514 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2712 min_it (nw, (unsigned int) (wrootattr.width - sx));
2515 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2713 min_it (nh, (unsigned int) (wrootattr.height - sy));
2516 2714
2517 XSync (disp, False); 2715 XSync (dpy, False);
2518 allowedxerror = -1; 2716 allowedxerror = -1;
2519 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2717 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2520 2718
2521 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2719 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2522 /* XXX: may need a delay here? */ 2720 /* XXX: may need a delay here? */
2523 allowedxerror = 0; 2721 allowedxerror = 0;
2524
2525 if (image == NULL) 2722 if (image != NULL)
2723 {
2724 if (pixmap != None)
2725 XFreePixmap (dpy, pixmap);
2726
2727#if TINTING
2728 if (ISSET_PIXCOLOR (Color_tint))
2729 {
2730 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2731
2732 rgba c;
2733 pix_colors_focused [Color_tint].get (c);
2734 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2735 }
2736#endif
2737
2738 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2739 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2740 XPutImage (dpy, pixmap, gc, image, 0, 0,
2741 nx, ny, image->width, image->height);
2742 XDestroyImage (image);
2743 success = True ;
2744 }
2745 }
2746#endif /* HAVE_AFTERIMAGE */
2747 if (gc != NULL)
2748 XFreeGC (dpy, gc);
2749
2750 if (!success)
2526 { 2751 {
2527 if (am_transparent && am_pixmap_trans) 2752 if (am_transparent && am_pixmap_trans)
2528 { 2753 {
2529 pchanged = 1; 2754 pchanged = 1;
2530 if (pixmap != None) 2755 if (pixmap != None)
2531 { 2756 {
2532 XFreePixmap (disp, pixmap); 2757 XFreePixmap (dpy, pixmap);
2533 pixmap = None; 2758 pixmap = None;
2534 } 2759 }
2535 } 2760 }
2536 2761
2537 am_pixmap_trans = 0; 2762 am_pixmap_trans = 0;
2538 } 2763 }
2539 else 2764 else
2540 { 2765 {
2541 if (pixmap != None)
2542 XFreePixmap (disp, pixmap);
2543
2544#if TINTING
2545 if (ISSET_PIXCOLOR (Color_tint))
2546 {
2547 unsigned short rm, gm, bm;
2548 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2549
2550 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2551
2552 ShadeXImage (display, image, shade, rm, gm, bm);
2553 }
2554#endif
2555
2556 pixmap = XCreatePixmap (disp, vt,
2557 szHint.width, szHint.height, image->depth);
2558 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2559 XPutImage (disp, pixmap, gc, image, 0, 0,
2560 nx, ny, image->width, image->height);
2561 XFreeGC (disp, gc);
2562 XDestroyImage (image);
2563 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2766 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2564 XClearWindow (disp, parent[0]); 2767 XClearWindow (dpy, parent[0]);
2565 2768
2566 if (!am_transparent || !am_pixmap_trans) 2769 if (!am_transparent || !am_pixmap_trans)
2567 pchanged = 1; 2770 pchanged = 1;
2568 2771
2569 am_transparent = am_pixmap_trans = 1; 2772 am_transparent = am_pixmap_trans = 1;
2570 } 2773 }
2571 } 2774 }
2572 2775
2573 if (am_pixmap_trans) 2776 if (am_pixmap_trans)
2574 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2777 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2575 else 2778 else
2576 { 2779 {
2577 unsigned int n; 2780 unsigned int n;
2578 /* 2781 /*
2579 * InheritPixmap transparency 2782 * InheritPixmap transparency
2580 */ 2783 */
2581 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2784 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 { 2785 {
2583 oldp = parent[i]; 2786 oldp = parent[i];
2584 XQueryTree (disp, parent[i - 1], &root, 2787 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2585 &parent[i], &list, &n);
2586 XFree (list); 2788 XFree (list);
2587 2789
2588 if (parent[i] == display->root) 2790 if (parent[i] == display->root)
2589 { 2791 {
2590 if (oldp != None) 2792 if (oldp != None)
… …
2598 } 2800 }
2599 2801
2600 n = 0; 2802 n = 0;
2601 2803
2602 if (pchanged) 2804 if (pchanged)
2603 {
2604 for (; n < (unsigned int)i; n++) 2805 for (; n < (unsigned int)i; n++)
2605 { 2806 {
2606 XGetWindowAttributes (disp, parent[n], &wattr); 2807 XGetWindowAttributes (dpy, parent[n], &wattr);
2808
2607 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2809 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2608 { 2810 {
2609 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2811 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2610 break; 2812 break;
2611 } 2813 }
2612 } 2814 }
2613 }
2614 2815
2615 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2816 if (n > (sizeof (parent) / sizeof (parent[0])))
2616 { 2817 {
2617 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2818 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2618 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2819 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2619 am_transparent = 0; 2820 am_transparent = 0;
2620 /* XXX: also turn off Opt_transparent? */ 2821 /* XXX: also turn off Opt_transparent? */
2621 } 2822 }
2622 else 2823 else
2623 { 2824 {
2624 for (n = 0; n < (unsigned int)i; n++) 2825 for (n = 0; n < (unsigned int)i; n++)
2625 { 2826 {
2626 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2827 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2627 XClearWindow (disp, parent[n]); 2828 XClearWindow (dpy, parent[n]);
2628 } 2829 }
2629 2830
2630 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2831 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2631 am_transparent = 1; 2832 am_transparent = 1;
2632 } 2833 }
2633 2834
2634 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2835 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2635 parent[i] = None; 2836 parent[i] = None;
2636 } 2837 }
2637 2838
2638 if (scrollBar.win) 2839 if (scrollBar.win)
2639 { 2840 {
2640 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2841 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2641 scrollBar.setIdle (); 2842 scrollBar.setIdle ();
2642 scrollbar_show (0); 2843 scrollbar_show (0);
2643 } 2844 }
2644 2845
2645 if (am_transparent) 2846 if (am_transparent)
… …
2647 want_refresh = want_full_refresh = 1; 2848 want_refresh = want_full_refresh = 1;
2648 if (am_pixmap_trans) 2849 if (am_pixmap_trans)
2649 flush (); 2850 flush ();
2650 } 2851 }
2651 2852
2652 return pchanged; 2853// return pchanged;
2653} 2854}
2654#endif 2855#endif
2655 2856
2656/*}}} */ 2857/*}}} */
2657 2858
… …
2708 if (ch == C0_LF) 2909 if (ch == C0_LF)
2709 nlines++; 2910 nlines++;
2710 2911
2711 refresh_count++; 2912 refresh_count++;
2712 2913
2713 if (!OPTION (Opt_jumpScroll) 2914 if (!option (Opt_jumpScroll)
2714 || (refresh_count >= refresh_limit * (nrow - 1))) 2915 || (refresh_count >= refresh_limit * (nrow - 1)))
2715 { 2916 {
2716 refreshnow = true; 2917 refreshnow = true;
2717 refresh_count = 0; 2918 refresh_count = 0;
2718 ch = NOCHAR; 2919 ch = NOCHAR;
… …
2758 * the number of pages between refreshes is refresh_limit, which 2959 * the number of pages between refreshes is refresh_limit, which
2759 * is incremented here because we must be doing flat-out scrolling. 2960 * is incremented here because we must be doing flat-out scrolling.
2760 */ 2961 */
2761 if (refreshnow) 2962 if (refreshnow)
2762 { 2963 {
2763 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2964 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2764 refresh_limit++; 2965 refresh_limit++;
2765 else 2966 else
2766 { 2967 {
2767 flag = true; 2968 flag = true;
2969 //TODO: due to popular request, implement "skipscroll" option here
2768 scr_refresh (); 2970 scr_refresh ();
2769 want_refresh = 1; 2971 want_refresh = 1;
2770 } 2972 }
2771 } 2973 }
2772 2974
… …
3096 scr_charset_set (2, (unsigned int)cmd_getc ()); 3298 scr_charset_set (2, (unsigned int)cmd_getc ());
3097 break; 3299 break;
3098 case '+': 3300 case '+':
3099 scr_charset_set (3, (unsigned int)cmd_getc ()); 3301 scr_charset_set (3, (unsigned int)cmd_getc ());
3100 break; 3302 break;
3101#if ENABLE_FRILLS 3303#if !ENABLE_MINIMAL
3102 case '6': 3304 case '6':
3103 scr_backindex (); 3305 scr_backindex ();
3104 break; 3306 break;
3105#endif 3307#endif
3106 case '7': 3308 case '7':
3107 scr_cursor (SAVE); 3309 scr_cursor (SAVE);
3108 break; 3310 break;
3109 case '8': 3311 case '8':
3110 scr_cursor (RESTORE); 3312 scr_cursor (RESTORE);
3111 break; 3313 break;
3112#if ENABLE_FRILLS 3314#if !ENABLE_MINIMAL
3113 case '9': 3315 case '9':
3114 scr_forwardindex (); 3316 scr_forwardindex ();
3115 break; 3317 break;
3116#endif 3318#endif
3117 case '=': 3319 case '=':
… …
3290 { 3492 {
3291 case '>': 3493 case '>':
3292 if (ch == CSI_DA) /* secondary device attributes */ 3494 if (ch == CSI_DA) /* secondary device attributes */
3293 { 3495 {
3294 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 3496 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3295 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions. 3497 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3296 // 3498 //
3297 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 3499 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3298 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 3500 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3299 // that we do not support xterm mouse reporting (should be 95 when we do). 3501 // that we do not support xterm mouse reporting (should be 95 when we do).
3300 // 3502 //
3301 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); 3503 tt_printf ("\033[>%d;94;0c", 'U');
3302 } 3504 }
3303 break; 3505 break;
3304 case '?': 3506 case '?':
3305 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3507 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3306 process_terminal_mode (ch, priv, nargs, arg); 3508 process_terminal_mode (ch, priv, nargs, arg);
… …
3433 break; 3635 break;
3434 case 6: /* CPR requested */ 3636 case 6: /* CPR requested */
3435 scr_report_position (); 3637 scr_report_position ();
3436 break; 3638 break;
3437 case 7: /* unofficial extension */ 3639 case 7: /* unofficial extension */
3438 if (OPTION (Opt_insecure)) 3640 if (option (Opt_insecure))
3439 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3641 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3440 break; 3642 break;
3441 case 8: /* unofficial extension */ 3643 case 8: /* unofficial extension */
3442 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3644 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3443 break; 3645 break;
… …
3510 break; 3712 break;
3511 case CSI_75: 3713 case CSI_75:
3512 scr_cursor (RESTORE); 3714 scr_cursor (RESTORE);
3513 break; 3715 break;
3514 3716
3515#if ENABLE_FRILLS 3717#if !ENABLE_MINIMAL
3516 case CSI_74: 3718 case CSI_74:
3517 process_window_ops (arg, nargs); 3719 process_window_ops (arg, nargs);
3518 break; 3720 break;
3519#endif 3721#endif
3520 3722
… …
3527 break; 3729 break;
3528 } 3730 }
3529} 3731}
3530/*}}} */ 3732/*}}} */
3531 3733
3532#if ENABLE_FRILLS 3734#if !ENABLE_MINIMAL
3533/* ARGSUSED */ 3735/* ARGSUSED */
3534void 3736void
3535rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3737rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3536{ 3738{
3537 int x, y; 3739 int x, y;
3538 XWindowAttributes wattr; 3740 XWindowAttributes wattr;
3539 Window wdummy; 3741 Window wdummy;
3540 dDisp; 3742
3743 dLocal (Display *, dpy);
3541 3744
3542 if (nargs == 0) 3745 if (nargs == 0)
3543 return; 3746 return;
3544 3747
3545 switch (args[0]) 3748 switch (args[0])
3546 { 3749 {
3547 /* 3750 /*
3548 * commands 3751 * commands
3549 */ 3752 */
3550 case 1: /* deiconify window */ 3753 case 1: /* deiconify window */
3551 XMapWindow (disp, parent[0]); 3754 XMapWindow (dpy, parent[0]);
3552 break; 3755 break;
3553 case 2: /* iconify window */ 3756 case 2: /* iconify window */
3554 XIconifyWindow (disp, parent[0], display->screen); 3757 XIconifyWindow (dpy, parent[0], display->screen);
3555 break; 3758 break;
3556 case 3: /* set position (pixels) */ 3759 case 3: /* set position (pixels) */
3557 XMoveWindow (disp, parent[0], args[1], args[2]); 3760 XMoveWindow (dpy, parent[0], args[1], args[2]);
3558 break; 3761 break;
3559 case 4: /* set size (pixels) */ 3762 case 4: /* set size (pixels) */
3560 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3763 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3561 break; 3764 break;
3562 case 5: /* raise window */ 3765 case 5: /* raise window */
3563 XRaiseWindow (disp, parent[0]); 3766 XRaiseWindow (dpy, parent[0]);
3564 break; 3767 break;
3565 case 6: /* lower window */ 3768 case 6: /* lower window */
3566 XLowerWindow (disp, parent[0]); 3769 XLowerWindow (dpy, parent[0]);
3567 break; 3770 break;
3568 case 7: /* refresh window */ 3771 case 7: /* refresh window */
3569 scr_touch (true); 3772 scr_touch (true);
3570 break; 3773 break;
3571 case 8: /* set size (chars) */ 3774 case 8: /* set size (chars) */
… …
3578 if (args[0] >= 24) /* set height (chars) */ 3781 if (args[0] >= 24) /* set height (chars) */
3579 set_widthheight ((unsigned int)width, 3782 set_widthheight ((unsigned int)width,
3580 (unsigned int) (args[1] * fheight)); 3783 (unsigned int) (args[1] * fheight));
3581 break; 3784 break;
3582 3785
3583
3584 /* 3786 /*
3585 * reports - some output format copied from XTerm 3787 * reports - some output format copied from XTerm
3586 */ 3788 */
3587 case 11: /* report window state */ 3789 case 11: /* report window state */
3588 XGetWindowAttributes (disp, parent[0], &wattr); 3790 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3791 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3590 break; 3792 break;
3591 case 13: /* report window position */ 3793 case 13: /* report window position */
3592 XGetWindowAttributes (disp, parent[0], &wattr); 3794 XGetWindowAttributes (dpy, parent[0], &wattr);
3593 XTranslateCoordinates (disp, parent[0], wattr.root, 3795 XTranslateCoordinates (dpy, parent[0], wattr.root,
3594 -wattr.border_width, -wattr.border_width, 3796 -wattr.border_width, -wattr.border_width,
3595 &x, &y, &wdummy); 3797 &x, &y, &wdummy);
3596 tt_printf ("\033[3;%d;%dt", x, y); 3798 tt_printf ("\033[3;%d;%dt", x, y);
3597 break; 3799 break;
3598 case 14: /* report window size (pixels) */ 3800 case 14: /* report window size (pixels) */
3599 XGetWindowAttributes (disp, parent[0], &wattr); 3801 XGetWindowAttributes (dpy, parent[0], &wattr);
3600 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3802 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3601 break; 3803 break;
3602 case 18: /* report text area size (chars) */ 3804 case 18: /* report text area size (chars) */
3603 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3805 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3604 break; 3806 break;
… …
3606 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3808 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3607 break; 3809 break;
3608 case 20: /* report icon label */ 3810 case 20: /* report icon label */
3609 { 3811 {
3610 char *s; 3812 char *s;
3611 XGetIconName (disp, parent[0], &s); 3813 XGetIconName (dpy, parent[0], &s);
3612 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3814 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3613 XFree (s); 3815 XFree (s);
3614 } 3816 }
3615 break; 3817 break;
3616 case 21: /* report window title */ 3818 case 21: /* report window title */
3617 { 3819 {
3618 char *s; 3820 char *s;
3619 XFetchName (disp, parent[0], &s); 3821 XFetchName (dpy, parent[0], &s);
3620 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3822 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3621 XFree (s); 3823 XFree (s);
3622 } 3824 }
3623 break; 3825 break;
3624 } 3826 }
3625} 3827}
… …
3652 seen_esc = true; 3854 seen_esc = true;
3653 continue; 3855 continue;
3654 } 3856 }
3655 else if (ch == C0_BEL || ch == CHAR_ST) 3857 else if (ch == C0_BEL || ch == CHAR_ST)
3656 break; 3858 break;
3859 else if (ch == C0_SYN)
3860 ch = cmd_get8 ();
3657 else if (ch < 0x20) 3861 else if (ch < 0x20)
3658 return NULL; /* other control character - exit */ 3862 return NULL; /* other control character - exit */
3659 3863
3660 seen_esc = false; 3864 seen_esc = false;
3661 3865
3662 if (n >= STRING_MAX - 1) 3866 if (n >= STRING_MAX - 1)
3663 // stop at some sane length 3867 // stop at some sane length
3664 return NULL; 3868 return NULL;
3665 3869
3666 if (ch == C0_SYN)
3667 string[n++] = cmd_get8 ();
3668 else
3669 string[n++] = ch; 3870 string[n++] = ch;
3670 } 3871 }
3671 3872
3672 string[n++] = '\0'; 3873 string[n++] = '\0';
3673 3874
3674 ends_how = (ch == 0x5c ? C0_ESC : ch); 3875 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3725void 3926void
3726rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3927rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3727{ 3928{
3728 if (str[0] == '?' && !str[1]) 3929 if (str[0] == '?' && !str[1])
3729 { 3930 {
3730 unsigned short r, g, b; 3931 rgba c;
3731 pix_colors_focused[color].get (display, r, g, b); 3932 pix_colors_focused[color].get (c);
3933
3934#if XFT
3935 if (c.a != rgba::MAX_CC)
3936 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3937 else
3938#endif
3732 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3939 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3733 } 3940 }
3734 else 3941 else
3735 set_window_color (color, str); 3942 set_window_color (color, str);
3736} 3943}
3737 3944
… …
3743{ 3950{
3744 int color; 3951 int color;
3745 char *buf, *name; 3952 char *buf, *name;
3746 bool query = str[0] == '?' && !str[1]; 3953 bool query = str[0] == '?' && !str[1];
3747 int saveop = op; 3954 int saveop = op;
3748 dDisp; 3955
3956 dLocal (Display *, dpy);
3749 3957
3750 assert (str != NULL); 3958 assert (str != NULL);
3959
3960 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3961 return;
3962
3751 switch (op) 3963 switch (op)
3752 { 3964 {
3753 case XTerm_name: 3965 case XTerm_name:
3754 set_title (str); 3966 set_title (str);
3755 /* FALLTHROUGH */ 3967 /* FALLTHROUGH */
… …
3769 unsigned long bytes_after; 3981 unsigned long bytes_after;
3770 unsigned char *value = 0; 3982 unsigned char *value = 0;
3771 const char *str = ""; 3983 const char *str = "";
3772 3984
3773 if (prop 3985 if (prop
3774 && XGetWindowProperty (disp, parent[0], 3986 && XGetWindowProperty (dpy, parent[0],
3775 prop, 0, 1<<16, 0, AnyPropertyType, 3987 prop, 0, 1<<16, 0, AnyPropertyType,
3776 &actual_type, &actual_format, 3988 &actual_type, &actual_format,
3777 &nitems, &bytes_after, &value) == Success 3989 &nitems, &bytes_after, &value) == Success
3778 && actual_type != None 3990 && actual_type != None
3779 && actual_format == 8) 3991 && actual_format == 8)
3780 str = (const char *)(value); 3992 str = (const char *)(value);
3781 3993
3782 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3994 tt_printf ("\033]%d;%s%c", op, str, resp);
3783 3995
3784 XFree (value); 3996 XFree (value);
3785 } 3997 }
3786 else 3998 else
3787 { 3999 {
… …
3791 { 4003 {
3792 *eq = 0; 4004 *eq = 0;
3793 set_utf8_property (display->atom (str), eq + 1); 4005 set_utf8_property (display->atom (str), eq + 1);
3794 } 4006 }
3795 else 4007 else
3796 XDeleteProperty (disp, parent[0], 4008 XDeleteProperty (dpy, parent[0],
3797 display->atom (str)); 4009 display->atom (str));
3798 } 4010 }
3799 break; 4011 break;
3800 4012
3801 case XTerm_Color: 4013 case XTerm_Color:
… …
3811 break; 4023 break;
3812 4024
3813 if ((buf = strchr (name, ';')) != NULL) 4025 if ((buf = strchr (name, ';')) != NULL)
3814 *buf++ = '\0'; 4026 *buf++ = '\0';
3815 4027
3816 if (name[0] == '?' && !name[1]) 4028 process_color_seq (op, color, name, resp);
3817 {
3818 unsigned short r, g, b;
3819 pix_colors_focused[color].get (display, r, g, b);
3820 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3821 }
3822 else
3823 set_window_color (color, name);
3824 } 4029 }
3825 break; 4030 break;
3826 case XTerm_Color00: 4031 case XTerm_Color00:
3827 process_color_seq (XTerm_Color00, Color_fg, str, resp); 4032 process_color_seq (op, Color_fg, str, resp);
3828 break; 4033 break;
3829 case XTerm_Color01: 4034 case XTerm_Color01:
3830 process_color_seq (XTerm_Color01, Color_bg, str, resp); 4035 process_color_seq (op, Color_bg, str, resp);
3831 break; 4036 break;
3832#ifndef NO_CURSORCOLOR 4037#ifndef NO_CURSORCOLOR
3833 case XTerm_Color_cursor: 4038 case XTerm_Color_cursor:
3834 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 4039 process_color_seq (op, Color_cursor, str, resp);
3835 break; 4040 break;
3836#endif 4041#endif
3837 case XTerm_Color_pointer_fg: 4042 case XTerm_Color_pointer_fg:
3838 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 4043 process_color_seq (op, Color_pointer_fg, str, resp);
3839 break; 4044 break;
3840 case XTerm_Color_pointer_bg: 4045 case XTerm_Color_pointer_bg:
3841 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 4046 process_color_seq (op, Color_pointer_bg, str, resp);
3842 break; 4047 break;
3843#ifndef NO_BOLD_UNDERLINE_REVERSE 4048#ifndef NO_BOLD_UNDERLINE_REVERSE
3844 case XTerm_Color_RV: 4049 case XTerm_Color_RV:
3845 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 4050 process_color_seq (op, Color_RV, str, resp);
3846 break; 4051 break;
3847 case Rxvt_Color_BD: 4052 case Rxvt_Color_BD:
3848 case URxvt_Color_BD: 4053 case URxvt_Color_BD:
3849 process_color_seq (op, Color_BD, str, resp); 4054 process_color_seq (op, Color_BD, str, resp);
3850 break; 4055 break;
3851 case Rxvt_Color_UL: 4056 case Rxvt_Color_UL:
3852 case URxvt_Color_UL: 4057 case URxvt_Color_UL:
3853 process_color_seq (op, Color_UL, str, resp); 4058 process_color_seq (op, Color_UL, str, resp);
3854 break; 4059 break;
3855 case URxvt_Color_IT: 4060 case URxvt_Color_IT:
3856 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 4061 process_color_seq (op, Color_IT, str, resp);
3857 break; 4062 break;
3858#endif 4063#endif
3859#if TRANSPARENT && TINTING 4064#if TRANSPARENT && TINTING
3860 case URxvt_Color_tint: 4065 case URxvt_Color_tint:
3861 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 4066 process_color_seq (op, Color_tint, str, resp);
4067
3862 check_our_parents (); 4068 check_our_parents ();
4069
3863 if (am_transparent) 4070 if (am_transparent)
3864 want_full_refresh = want_refresh = 1; 4071 want_full_refresh = want_refresh = 1;
4072
3865 break; 4073 break;
3866#endif 4074#endif
3867 4075
3868 case Rxvt_Pixmap: 4076 case Rxvt_Pixmap:
3869 { 4077 {
… …
3891#ifdef XPM_BACKGROUND 4099#ifdef XPM_BACKGROUND
3892 resize_pixmap (); 4100 resize_pixmap ();
3893 scr_touch (true); 4101 scr_touch (true);
3894#endif 4102#endif
3895 } 4103 }
4104#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
4105 if (option(Opt_transparent))
4106 check_our_parents ();
4107#endif
4108
3896 } 4109 }
3897 break; 4110 break;
3898 4111
3899 case Rxvt_restoreFG: 4112 case Rxvt_restoreFG:
3900 set_window_color (Color_fg, str); 4113 set_window_color (Color_fg, str);
… …
3927 case URxvt_italicFont: 4140 case URxvt_italicFont:
3928 case URxvt_boldItalicFont: 4141 case URxvt_boldItalicFont:
3929#endif 4142#endif
3930 if (query) 4143 if (query)
3931 tt_printf ("\33]%d;%-.250s%c", saveop, 4144 tt_printf ("\33]%d;%-.250s%c", saveop,
3932 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 4145 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3933 ? fontset[op - URxvt_font]->fontdesc : "", 4146 ? fontset[op - URxvt_font]->fontdesc : "",
3934 resp); 4147 resp);
3935 else 4148 else
3936 { 4149 {
3937 const char *&res = rs[Rs_font + (op - URxvt_font)]; 4150 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3940 allocated.push_back ((void *)res); 4153 allocated.push_back ((void *)res);
3941 set_fonts (); 4154 set_fonts ();
3942 } 4155 }
3943 break; 4156 break;
3944 4157
3945#if ENABLE_FRILLS 4158 case URxvt_version:
4159 if (query)
4160 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
4161 op,
4162 rs[Rs_name], VERSION[0], VERSION[2],
4163 resp);
4164 break;
4165
4166#if !ENABLE_MINIMAL
3946 case URxvt_locale: 4167 case URxvt_locale:
3947 if (query) 4168 if (query)
3948 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 4169 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3949 else 4170 else
3950 { 4171 {
3951 set_locale (str); 4172 set_locale (str);
3952 pty->set_utf8_mode (enc_utf8); 4173 pty->set_utf8_mode (enc_utf8);
3953 init_xlocale (); 4174 init_xlocale ();
… …
3968 break; 4189 break;
3969#endif 4190#endif
3970 4191
3971#if ENABLE_PERL 4192#if ENABLE_PERL
3972 case URxvt_perl: 4193 case URxvt_perl:
3973 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4194 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3974 ; // no responses yet 4195 ; // no responses yet
3975 break; 4196 break;
3976#endif 4197#endif
3977 } 4198 }
3978} 4199}
… …
4094 scr_touch (true); 4315 scr_touch (true);
4095 break; 4316 break;
4096#endif 4317#endif
4097 case 1048: /* alternative cursor save */ 4318 case 1048: /* alternative cursor save */
4098 case 1049: 4319 case 1049:
4099 if (OPTION (Opt_secondaryScreen)) 4320 if (option (Opt_secondaryScreen))
4100 if (mode == 0) 4321 if (mode == 0)
4101 scr_cursor (RESTORE); 4322 scr_cursor (RESTORE);
4102 else if (mode == 1) 4323 else if (mode == 1)
4103 scr_cursor (SAVE); 4324 scr_cursor (SAVE);
4104 break; 4325 break;
… …
4169 break; 4390 break;
4170 case 1011: /* scroll to bottom on key press */ 4391 case 1011: /* scroll to bottom on key press */
4171 set_option (Opt_scrollTtyKeypress, state); 4392 set_option (Opt_scrollTtyKeypress, state);
4172 break; 4393 break;
4173 case 1047: /* secondary screen w/ clearing last */ 4394 case 1047: /* secondary screen w/ clearing last */
4174 if (OPTION (Opt_secondaryScreen)) 4395 if (option (Opt_secondaryScreen))
4175 if (current_screen != PRIMARY) 4396 if (current_screen != PRIMARY)
4176 scr_erase_screen (2); 4397 scr_erase_screen (2);
4177 scr_change_screen (state); 4398 scr_change_screen (state);
4178 break; 4399 break;
4179 case 1049: /* secondary screen w/ clearing first */ 4400 case 1049: /* secondary screen w/ clearing first */
4180 scr_change_screen (state); 4401 scr_change_screen (state);
4181 if (OPTION (Opt_secondaryScreen)) 4402 if (option (Opt_secondaryScreen))
4182 if (current_screen != PRIMARY) 4403 if (current_screen != PRIMARY)
4183 scr_erase_screen (2); 4404 scr_erase_screen (2);
4184 break; 4405 break;
4185 default: 4406 default:
4186 break; 4407 break;
… …
4314 scr_color (Color_bg, Color_bg); 4535 scr_color (Color_bg, Color_bg);
4315 break; 4536 break;
4316 4537
4317 //case 50: // not variable spacing 4538 //case 50: // not variable spacing
4318 4539
4319#if ENABLE_FRILLS 4540#if !ENABLE_MINIMAL
4320 case 90: 4541 case 90:
4321 case 91: /* set bright fg color */ 4542 case 91: /* set bright fg color */
4322 case 92: 4543 case 92:
4323 case 93: 4544 case 93:
4324 case 94: 4545 case 94:

Diff Legend

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