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.281 by root, Tue Jan 24 17:28:06 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#ifdef DEBUG_CMD
305 static int debug_key = 1; /* accessible by a debugger only */
306#endif
307 int valid_keysym; 309 int valid_keysym;
308 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
309 316
310 /* 317 /*
311 * 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
312 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
313 * 320 *
… …
490 { 497 {
491 commit_iso14755 (); 498 commit_iso14755 ();
492 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
493# if ISO_14755 500# if ISO_14755
494 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);
495# endif 510# endif
496 return; 511 return;
497 } 512 }
498 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
499 { 514 {
… …
870 return; 885 return;
871 886
872 if (len <= 0) 887 if (len <= 0)
873 return; /* not mapped */ 888 return; /* not mapped */
874 889
875 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
876 if (view_start) 891 if (view_start)
877 { 892 {
878 view_start = 0; 893 view_start = 0;
879 want_refresh = 1; 894 want_refresh = 1;
880 } 895 }
… …
902 { 917 {
903 const char ch = C0_ESC; 918 const char ch = C0_ESC;
904 tt_write (&ch, 1); 919 tt_write (&ch, 1);
905 } 920 }
906 921
907#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */
909 unsigned char *p;
910 int i;
911
912 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913 for (i = 0, p = kbuf; i < len; i++, p++)
914 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915 fprintf (stderr, "'\n");
916#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
918} 923}
919/*}}} */ 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}
920 1001
921#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
922unsigned int 1003unsigned int
923rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
924{ 1005{
… …
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1102 } 1183 }
1103} 1184}
1104#endif 1185#endif
1105 1186
1106#if HAVE_SCHED_YIELD 1187#if LINUX_YIELD_HACK
1107static struct event_handler 1188static struct event_handler
1108{ 1189{
1109 check_watcher cw_yield; 1190 check_watcher yield_ev;
1110 1191
1111 void yield (check_watcher &w) 1192 void yield_cb (check_watcher &w)
1112 { 1193 {
1113 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
1114 w.stop (); 1202 w.stop ();
1115 } 1203 }
1116 1204
1117 event_handler () 1205 event_handler ()
1118 : cw_yield (this, &event_handler::yield) 1206 : yield_ev (this, &event_handler::yield_cb)
1119 { 1207 {
1120 } 1208 }
1121} event_handler; 1209} event_handler;
1122#endif 1210#endif
1123 1211
… …
1143 cmdbuf_endp += r; 1231 cmdbuf_endp += r;
1144 return true; 1232 return true;
1145 } 1233 }
1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 { 1235 {
1148#if HAVE_SCHED_YIELD 1236#if LINUX_YIELD_HACK
1149 if (display->is_local) 1237 if (display->is_local)
1150 event_handler.cw_yield.start (); 1238 event_handler.yield_ev.start ();
1151#endif 1239#endif
1152 } 1240 }
1153 else 1241 else
1154 { 1242 {
1155 pty_ev.stop (); 1243 pty_ev.stop ();
1156 1244
1157 if (!OPTION (Opt_hold)) 1245 if (!option (Opt_hold))
1158 destroy (); 1246 destroy ();
1159 } 1247 }
1160 1248
1161 return false; 1249 return false;
1162} 1250}
… …
1177} 1265}
1178 1266
1179void 1267void
1180rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1181{ 1269{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1271 recolour_cursor ();
1184 1272
1185#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1274 hidden_pointer = 0;
1187 1275
1188 if (OPTION (Opt_pointerBlank)) 1276 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1190#endif 1278#endif
1191} 1279}
1192 1280
1193#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1194void 1282void
1195rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1196{ 1284{
1197 if (!OPTION (Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1198 return; 1286 return;
1199 1287
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (display->display); 1289 XFlush (dpy);
1202 1290
1203 hidden_pointer = 1; 1291 hidden_pointer = 1;
1204} 1292}
1205 1293
1206void 1294void
… …
1279 (32 + button_number + key_state), 1367 (32 + button_number + key_state),
1280 (32 + x + 1), 1368 (32 + x + 1),
1281 (32 + y + 1)); 1369 (32 + y + 1));
1282} 1370}
1283 1371
1284#ifdef USING_W11LIB
1285void
1286rxvt_W11_process_x_event (XEvent *ev)
1287{
1288 rxvt_t *r = rxvt_get_r ();
1289
1290 x_cb (*ev);
1291}
1292#endif
1293
1294/*{{{ process an X event */ 1372/*{{{ process an X event */
1295void 1373void
1296rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1297{ 1375{
1298 make_current (); 1376 make_current ();
1299 1377
1300 dDisp; 1378 dLocal (Display *, dpy);
1301 1379
1302 if (ev.xany.window == vt 1380 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1383 return;
… …
1310 unsigned int unused_mask; 1388 unsigned int unused_mask;
1311 1389
1312 switch (ev.type) 1390 switch (ev.type)
1313 { 1391 {
1314 case KeyPress: 1392 case KeyPress:
1315#if ISO_14755 1393 key_press (ev.xkey);
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
1318 lookup_key (ev.xkey);
1319
1320 break; 1394 break;
1321 1395
1322 case KeyRelease: 1396 case KeyRelease:
1323 { 1397 key_release (ev.xkey);
1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1325 KeySym keysym;
1326
1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1328#endif
1329
1330#if ENABLE_FRILLS || ISO_14755
1331 // ISO 14755 support
1332 if (iso14755buf)
1333 if (iso14755buf & ISO_14755_52)
1334 {
1335# if ENABLE_OVERLAY
1336 scr_overlay_off ();
1337# endif
1338# if ISO_14755
1339 // iso14755 part 5.2 handling: release time
1340 // first: controls
1341 if ((ev.xkey.state & ControlMask)
1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1344 {
1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1346 commit_iso14755 ();
1347 goto skip_switch;
1348 }
1349
1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1351 if (i[0] == keysym)
1352 {
1353 iso14755buf = ISO_14755_51 | i[1];
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 scr_bell ();
1359# endif
1360 iso14755buf = 0;
1361 break;
1362 }
1363 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1364 {
1365# if ENABLE_OVERLAY
1366 scr_overlay_off ();
1367# endif
1368 if (iso14755buf & ISO_14755_51)
1369 commit_iso14755 ();
1370#if ISO_14755
1371 else if (iso14755buf & ISO_14755_STARTED)
1372 {
1373 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1374
1375 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1376 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1377 }
1378# endif
1379 else
1380 iso14755buf = 0;
1381 }
1382#endif
1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386 break;
1387
1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1389 if (!(ev.xkey.state & ControlMask))
1390 slip_wheel_ev.stop ();
1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1392 mouse_slip_wheel_speed = 0;
1393#endif
1394 break; 1398 break;
1395 }
1396 1399
1397 case ButtonPress: 1400 case ButtonPress:
1398 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1399 break; 1402 break;
1400 1403
… …
1415 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)))
1416 destroy (); 1419 destroy ();
1417 } 1420 }
1418#if ENABLE_EWMH 1421#if ENABLE_EWMH
1419 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])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1425 &ev);
1423#endif 1426#endif
1424 } 1427 }
1425 } 1428 }
… …
1463 break; 1466 break;
1464 } 1467 }
1465 break; 1468 break;
1466 1469
1467 case FocusIn: 1470 case FocusIn:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1468 focus_in (); 1474 focus_in ();
1469 break; 1475 break;
1470 1476
1471 case FocusOut: 1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1472 focus_out (); 1481 focus_out ();
1473 break; 1482 break;
1474 1483
1475 case ConfigureNotify: 1484 case ConfigureNotify:
1476 if (ev.xconfigure.window == parent[0]) 1485 if (ev.xconfigure.window == parent[0])
1477 { 1486 {
1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ; 1488 ;
1480 1489
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 { 1491 {
1483 seen_resize = 1; 1492 seen_resize = 1;
1484 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
1485 } 1501 }
1486 1502
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488 1504
1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1505#ifdef TRANSPARENT
1490 if (OPTION (Opt_transparent)) 1506 if (option (Opt_transparent))
1491 check_our_parents (); 1507 check_our_parents ();
1492#endif 1508#endif
1493 } 1509 }
1494 break; 1510 break;
1495 1511
… …
1541 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1542 { 1558 {
1543 do 1559 do
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1547 1563
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549 1565
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1553 1569
1554 want_refresh = 1; 1570 want_refresh = 1;
1555 } 1571 }
1556 else 1572 else
1557 { 1573 {
1558 XEvent unused_event; 1574 XEvent unused_event;
1559 1575
1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1561 ; 1577 ;
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1579 ;
1564 1580
1565 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1566 { 1582 {
1567 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1568 scrollbar_show (0); 1584 scrollbar_show (0);
1569 } 1585 }
1570 1586
1571#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1572 if (am_transparent && ev.xany.window == parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1573 XClearWindow (disp, ev.xany.window); 1589 XClearWindow (dpy, ev.xany.window);
1574#endif 1590#endif
1575 } 1591 }
1576 break; 1592 break;
1577 1593
1578 case MotionNotify: 1594 case MotionNotify:
… …
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop 1606 ; // nop
1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1592 { 1608 {
1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1594 ; 1610 ;
1595 1611
1596 XQueryPointer (disp, vt, 1612 XQueryPointer (dpy, vt,
1597 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1598 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1599 &ev.xbutton.x, &ev.xbutton.y, 1615 &ev.xbutton.x, &ev.xbutton.y,
1600 &ev.xbutton.state); 1616 &ev.xbutton.state);
1601#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
… …
1665#endif 1681#endif
1666 } 1682 }
1667 } 1683 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1669 { 1685 {
1670 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1687 MotionNotify, &ev))
1672 ; 1688 ;
1673 1689
1674 XQueryPointer (disp, scrollBar.win, 1690 XQueryPointer (dpy, scrollBar.win,
1675 &unused_root, &unused_child, 1691 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1693 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1694 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1683 scrollbar_show (1); 1699 scrollbar_show (1);
1684 } 1700 }
1685 break; 1701 break;
1686 } 1702 }
1687 1703
1688skip_switch: ;
1689
1690#if defined(CURSOR_BLINK) 1704#if defined(CURSOR_BLINK)
1691 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1705 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1692 { 1706 {
1693 if (hidden_cursor) 1707 if (hidden_cursor)
1694 { 1708 {
1695 hidden_cursor = 0; 1709 hidden_cursor = 0;
1696 want_refresh = 1; 1710 want_refresh = 1;
… …
1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1700 } 1714 }
1701#endif 1715#endif
1702 1716
1703#if defined(POINTER_BLANK) 1717#if defined(POINTER_BLANK)
1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1705 { 1719 {
1706 if (ev.type == MotionNotify 1720 if (ev.type == MotionNotify
1707 || ev.type == ButtonPress 1721 || ev.type == ButtonPress
1708 || ev.type == ButtonRelease) 1722 || ev.type == ButtonRelease)
1709 if (hidden_pointer) 1723 if (hidden_pointer)
… …
1721 if (!focus) 1735 if (!focus)
1722 { 1736 {
1723 focus = 1; 1737 focus = 1;
1724 want_refresh = 1; 1738 want_refresh = 1;
1725 1739
1726 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1727 1741
1728#if USE_XIM 1742#if USE_XIM
1729 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1730 { 1744 {
1731 IMSetStatusPosition (); 1745 IMSetPosition ();
1732 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1733 } 1747 }
1734#endif 1748#endif
1735#if CURSOR_BLINK 1749#if CURSOR_BLINK
1736 if (OPTION (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1738#endif 1752#endif
1739#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1740 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1741 { 1755 {
1742 pix_colors = pix_colors_focused; 1756 pix_colors = pix_colors_focused;
1743 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 }
1744 } 1771 }
1745#endif 1772#endif
1746 } 1773 }
1747} 1774}
1748 1775
… …
1768#if USE_XIM 1795#if USE_XIM
1769 if (Input_Context != NULL) 1796 if (Input_Context != NULL)
1770 XUnsetICFocus (Input_Context); 1797 XUnsetICFocus (Input_Context);
1771#endif 1798#endif
1772#if CURSOR_BLINK 1799#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink)) 1800 if (option (Opt_cursorBlink))
1774 cursor_blink_ev.stop (); 1801 cursor_blink_ev.stop ();
1775 hidden_cursor = 0; 1802 hidden_cursor = 0;
1776#endif 1803#endif
1777#if OFF_FOCUS_FADING 1804#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade]) 1805 if (rs[Rs_fade])
… …
1782 } 1809 }
1783#endif 1810#endif
1784 } 1811 }
1785} 1812}
1786 1813
1787#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
1788void 1828void
1789rxvt_term::rootwin_cb (XEvent &ev) 1829rxvt_term::rootwin_cb (XEvent &ev)
1790{ 1830{
1791 make_current (); 1831 make_current ();
1792 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
1793 switch (ev.type) 1838 switch (ev.type)
1794 { 1839 {
1795 case PropertyNotify: 1840 case PropertyNotify:
1796 /* 1841 /*
1797 * 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,
… …
1801 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1802 return; 1847 return;
1803 1848
1804 /* FALLTHROUGH */ 1849 /* FALLTHROUGH */
1805 case ReparentNotify: 1850 case ReparentNotify:
1806 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1851 if (option (Opt_transparent))
1807 want_refresh = want_full_refresh = 1; 1852 check_our_parents ();
1808 break; 1853 break;
1809 } 1854 }
1855# endif
1810} 1856}
1811#endif 1857#endif
1812 1858
1813void 1859void
1814rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
… …
2142 selection_make (ev.time); 2188 selection_make (ev.time);
2143 break; 2189 break;
2144 2190
2145 case Button2: 2191 case Button2:
2146 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?
2147 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2148 break; 2194 break;
2149 2195
2150#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2151 case Button4: 2197 case Button4:
2152 case Button5: 2198 case Button5:
… …
2156 2202
2157 v = ev.button == Button4 ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2158 2204
2159 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2160 i = 1; 2206 i = 1;
2161 else if (OPTION (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2162 i = nrow - 1; 2208 i = nrow - 1;
2163 else 2209 else
2164 i = 5; 2210 i = 5;
2165 2211
2166# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
… …
2189 } 2235 }
2190 } 2236 }
2191} 2237}
2192 2238
2193#ifdef TRANSPARENT 2239#ifdef TRANSPARENT
2194#if TINTING 2240#if TINTING && !defined(HAVE_AFTERIMAGE)
2195/* taken from aterm-0.4.2 */ 2241/* taken from aterm-0.4.2 */
2196 2242
2197typedef uint32_t RUINT32T; 2243typedef uint32_t RUINT32T;
2198 2244
2199void 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)
2200{ 2246{
2201 int sh_r, sh_g, sh_b; 2247 int sh_r, sh_g, sh_b;
2202 RUINT32T mask_r, mask_g, mask_b; 2248 RUINT32T mask_r, mask_g, mask_b;
2203 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2249 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2204 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2250 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2205 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2251 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2206 int i; 2252 int i;
2207 2253
2208 Visual *visual = display->visual; 2254 Visual *visual = term->visual;
2209 2255
2210 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2256 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2211 2257
2212 /* for convenience */ 2258 /* for convenience */
2213 mask_r = visual->red_mask; 2259 mask_r = visual->red_mask;
… …
2427 * Do transparency updates if required 2473 * Do transparency updates if required
2428 */ 2474 */
2429int 2475int
2430rxvt_term::check_our_parents () 2476rxvt_term::check_our_parents ()
2431{ 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{
2432 int i, pchanged, aformat, have_pixmap, rootdepth; 2486 int i, pchanged, aformat, have_pixmap, rootdepth;
2433 unsigned long nitems, bytes_after; 2487 unsigned long nitems, bytes_after;
2434 Atom atype; 2488 Atom atype;
2435 unsigned char *prop = NULL; 2489 unsigned char *prop = NULL;
2436 Window root, oldp, *list; 2490 Window root, oldp, *list;
2437 Pixmap rootpixmap = None; 2491 Pixmap rootpixmap = None;
2438 XWindowAttributes wattr, wrootattr; 2492 XWindowAttributes wattr, wrootattr;
2439 dDisp; 2493 int sx, sy;
2494 Window cr;
2440 2495
2441 pchanged = 0; 2496 pchanged = 0;
2442 2497
2443 if (!OPTION (Opt_transparent)) 2498 if (!option (Opt_transparent))
2444 return pchanged; /* Don't try any more */ 2499 return /*pchanged*/; /* Don't try any more */
2445 2500
2446 XGetWindowAttributes (disp, display->root, &wrootattr); 2501 XGetWindowAttributes (dpy, display->root, &wrootattr);
2447 rootdepth = wrootattr.depth; 2502 rootdepth = wrootattr.depth;
2448 2503
2449 XGetWindowAttributes (disp, parent[0], &wattr); 2504 XGetWindowAttributes (dpy, parent[0], &wattr);
2450 2505
2451 if (rootdepth != wattr.depth) 2506 if (rootdepth != wattr.depth)
2452 { 2507 {
2453 if (am_transparent) 2508 if (am_transparent)
2454 { 2509 {
2455 pchanged = 1; 2510 pchanged = 1;
2456 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2511 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2457 am_transparent = am_pixmap_trans = 0; 2512 am_transparent = am_pixmap_trans = 0;
2458 } 2513 }
2459 2514
2460 return pchanged; /* Don't try any more */ 2515 return /*pchanged*/; /* Don't try any more */
2461 } 2516 }
2462 2517
2463 /* 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. */
2464 XSync (disp, False); 2519 XSync (dpy, False);
2465 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 */ ;
2466 /* 2528 /*
2467 * Make the frame window set by the window manager have 2529 * Make the frame window set by the window manager have
2468 * the root background. Some window managers put multiple nested frame 2530 * the root background. Some window managers put multiple nested frame
2469 * 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.
2470 */ 2532 */
2471 i = (xa[XA_XROOTPMAP_ID] 2533 i = (xa[XA_XROOTPMAP_ID]
2472 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2534 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2473 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2535 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2474 &nitems, &bytes_after, &prop) == Success); 2536 &nitems, &bytes_after, &prop) == Success);
2475 2537
2476 if (!i || prop == NULL) 2538 if (!i || prop == NULL)
2477 i = (xa[XA_ESETROOT_PMAP_ID] 2539 i = (xa[XA_ESETROOT_PMAP_ID]
2478 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2540 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2479 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2541 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2480 &nitems, &bytes_after, &prop) == Success); 2542 &nitems, &bytes_after, &prop) == Success);
2481 2543
2482 if (!i || prop == NULL 2544 if (!i || prop == NULL
2483#if TINTING 2545#if TINTING
2484 || !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 )
2485#endif 2551#endif
2486 ) 2552 )
2487 have_pixmap = 0; 2553 have_pixmap = 0;
2488 else 2554 else
2489 { 2555 {
… …
2492 XFree (prop); 2558 XFree (prop);
2493 } 2559 }
2494 2560
2495 if (have_pixmap) 2561 if (have_pixmap)
2496 { 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 {
2497 /* 2685 /*
2498 * Copy display->root pixmap transparency 2686 * Copy display->root pixmap transparency
2499 */ 2687 */
2500 int sx, sy, nx, ny; 2688 int nx, ny;
2501 unsigned int nw, nh; 2689 unsigned int nw, nh;
2502 Window cr;
2503 XImage *image; 2690 XImage *image;
2504 GC gc;
2505 XGCValues gcvalue;
2506 2691
2507 XTranslateCoordinates (disp, parent[0], display->root,
2508 0, 0, &sx, &sy, &cr);
2509 nw = (unsigned int)szHint.width; 2692 nw = (unsigned int)szHint.width;
2510 nh = (unsigned int)szHint.height; 2693 nh = (unsigned int)szHint.height;
2511 nx = ny = 0; 2694 nx = ny = 0;
2512 2695
2513 if (sx < 0) 2696 if (sx < 0)
2514 { 2697 {
2515 nw += sx; 2698 nw += sx;
2516 nx = -sx; 2699 nx = -sx;
2517 sx = 0; 2700 sx = 0;
2518 } 2701 }
2519 2702
2520 if (sy < 0) 2703 if (sy < 0)
2521 { 2704 {
2522 nh += sy; 2705 nh += sy;
2523 ny = -sy; 2706 ny = -sy;
2524 sy = 0; 2707 sy = 0;
2525 } 2708 }
2526 2709
2527 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2710 min_it (nw, (unsigned int) (wrootattr.width - sx));
2528 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2711 min_it (nh, (unsigned int) (wrootattr.height - sy));
2529 2712
2530 XSync (disp, False); 2713 XSync (dpy, False);
2531 allowedxerror = -1; 2714 allowedxerror = -1;
2532 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2715 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2533 2716
2534 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2717 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2535 /* XXX: may need a delay here? */ 2718 /* XXX: may need a delay here? */
2536 allowedxerror = 0; 2719 allowedxerror = 0;
2537
2538 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)
2539 { 2749 {
2540 if (am_transparent && am_pixmap_trans) 2750 if (am_transparent && am_pixmap_trans)
2541 { 2751 {
2542 pchanged = 1; 2752 pchanged = 1;
2543 if (pixmap != None) 2753 if (pixmap != None)
2544 { 2754 {
2545 XFreePixmap (disp, pixmap); 2755 XFreePixmap (dpy, pixmap);
2546 pixmap = None; 2756 pixmap = None;
2547 } 2757 }
2548 } 2758 }
2549 2759
2550 am_pixmap_trans = 0; 2760 am_pixmap_trans = 0;
2551 } 2761 }
2552 else 2762 else
2553 { 2763 {
2554 if (pixmap != None)
2555 XFreePixmap (disp, pixmap);
2556
2557#if TINTING
2558 if (ISSET_PIXCOLOR (Color_tint))
2559 {
2560 unsigned short rm, gm, bm;
2561 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2562
2563 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2564
2565 ShadeXImage (display, image, shade, rm, gm, bm);
2566 }
2567#endif
2568
2569 pixmap = XCreatePixmap (disp, vt,
2570 szHint.width, szHint.height, image->depth);
2571 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2572 XPutImage (disp, pixmap, gc, image, 0, 0,
2573 nx, ny, image->width, image->height);
2574 XFreeGC (disp, gc);
2575 XDestroyImage (image);
2576 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2764 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2577 XClearWindow (disp, parent[0]); 2765 XClearWindow (dpy, parent[0]);
2578 2766
2579 if (!am_transparent || !am_pixmap_trans) 2767 if (!am_transparent || !am_pixmap_trans)
2580 pchanged = 1; 2768 pchanged = 1;
2581 2769
2582 am_transparent = am_pixmap_trans = 1; 2770 am_transparent = am_pixmap_trans = 1;
2583 } 2771 }
2584 } 2772 }
2585 2773
2586 if (am_pixmap_trans) 2774 if (am_pixmap_trans)
2587 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2775 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2588 else 2776 else
2589 { 2777 {
2590 unsigned int n; 2778 unsigned int n;
2591 /* 2779 /*
2592 * InheritPixmap transparency 2780 * InheritPixmap transparency
2593 */ 2781 */
2594 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2782 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2595 { 2783 {
2596 oldp = parent[i]; 2784 oldp = parent[i];
2597 XQueryTree (disp, parent[i - 1], &root, 2785 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2598 &parent[i], &list, &n);
2599 XFree (list); 2786 XFree (list);
2600 2787
2601 if (parent[i] == display->root) 2788 if (parent[i] == display->root)
2602 { 2789 {
2603 if (oldp != None) 2790 if (oldp != None)
… …
2611 } 2798 }
2612 2799
2613 n = 0; 2800 n = 0;
2614 2801
2615 if (pchanged) 2802 if (pchanged)
2616 {
2617 for (; n < (unsigned int)i; n++) 2803 for (; n < (unsigned int)i; n++)
2618 { 2804 {
2619 XGetWindowAttributes (disp, parent[n], &wattr); 2805 XGetWindowAttributes (dpy, parent[n], &wattr);
2806
2620 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2807 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2621 { 2808 {
2622 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2809 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2623 break; 2810 break;
2624 } 2811 }
2625 } 2812 }
2626 }
2627 2813
2628 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2814 if (n > (sizeof (parent) / sizeof (parent[0])))
2629 { 2815 {
2630 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2816 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2631 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2817 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2632 am_transparent = 0; 2818 am_transparent = 0;
2633 /* XXX: also turn off Opt_transparent? */ 2819 /* XXX: also turn off Opt_transparent? */
2634 } 2820 }
2635 else 2821 else
2636 { 2822 {
2637 for (n = 0; n < (unsigned int)i; n++) 2823 for (n = 0; n < (unsigned int)i; n++)
2638 { 2824 {
2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2825 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2640 XClearWindow (disp, parent[n]); 2826 XClearWindow (dpy, parent[n]);
2641 } 2827 }
2642 2828
2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2829 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2644 am_transparent = 1; 2830 am_transparent = 1;
2645 } 2831 }
2646 2832
2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2833 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2648 parent[i] = None; 2834 parent[i] = None;
2649 } 2835 }
2650 2836
2651 if (scrollBar.win) 2837 if (scrollBar.win)
2652 { 2838 {
2653 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2839 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2654 scrollBar.setIdle (); 2840 scrollBar.setIdle ();
2655 scrollbar_show (0); 2841 scrollbar_show (0);
2656 } 2842 }
2657 2843
2658 if (am_transparent) 2844 if (am_transparent)
… …
2660 want_refresh = want_full_refresh = 1; 2846 want_refresh = want_full_refresh = 1;
2661 if (am_pixmap_trans) 2847 if (am_pixmap_trans)
2662 flush (); 2848 flush ();
2663 } 2849 }
2664 2850
2665 return pchanged; 2851// return pchanged;
2666} 2852}
2667#endif 2853#endif
2668 2854
2669/*}}} */ 2855/*}}} */
2670 2856
… …
2721 if (ch == C0_LF) 2907 if (ch == C0_LF)
2722 nlines++; 2908 nlines++;
2723 2909
2724 refresh_count++; 2910 refresh_count++;
2725 2911
2726 if (!OPTION (Opt_jumpScroll) 2912 if (!option (Opt_jumpScroll)
2727 || (refresh_count >= refresh_limit * (nrow - 1))) 2913 || (refresh_count >= refresh_limit * (nrow - 1)))
2728 { 2914 {
2729 refreshnow = true; 2915 refreshnow = true;
2730 refresh_count = 0; 2916 refresh_count = 0;
2731 ch = NOCHAR; 2917 ch = NOCHAR;
… …
2771 * the number of pages between refreshes is refresh_limit, which 2957 * the number of pages between refreshes is refresh_limit, which
2772 * is incremented here because we must be doing flat-out scrolling. 2958 * is incremented here because we must be doing flat-out scrolling.
2773 */ 2959 */
2774 if (refreshnow) 2960 if (refreshnow)
2775 { 2961 {
2776 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2962 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2777 refresh_limit++; 2963 refresh_limit++;
2778 else 2964 else
2779 { 2965 {
2780 flag = true; 2966 flag = true;
2967 //TODO: due to popular request, implement "skipscroll" option here
2781 scr_refresh (); 2968 scr_refresh ();
2782 want_refresh = 1; 2969 want_refresh = 1;
2783 } 2970 }
2784 } 2971 }
2785 2972
… …
3109 scr_charset_set (2, (unsigned int)cmd_getc ()); 3296 scr_charset_set (2, (unsigned int)cmd_getc ());
3110 break; 3297 break;
3111 case '+': 3298 case '+':
3112 scr_charset_set (3, (unsigned int)cmd_getc ()); 3299 scr_charset_set (3, (unsigned int)cmd_getc ());
3113 break; 3300 break;
3114#if ENABLE_FRILLS 3301#if !ENABLE_MINIMAL
3115 case '6': 3302 case '6':
3116 scr_backindex (); 3303 scr_backindex ();
3117 break; 3304 break;
3118#endif 3305#endif
3119 case '7': 3306 case '7':
3120 scr_cursor (SAVE); 3307 scr_cursor (SAVE);
3121 break; 3308 break;
3122 case '8': 3309 case '8':
3123 scr_cursor (RESTORE); 3310 scr_cursor (RESTORE);
3124 break; 3311 break;
3125#if ENABLE_FRILLS 3312#if !ENABLE_MINIMAL
3126 case '9': 3313 case '9':
3127 scr_forwardindex (); 3314 scr_forwardindex ();
3128 break; 3315 break;
3129#endif 3316#endif
3130 case '=': 3317 case '=':
… …
3292 ndef = get_byte_array_bit (csi_defaults, i); 3479 ndef = get_byte_array_bit (csi_defaults, i);
3293 for (p = 0; p < nargs; p++) 3480 for (p = 0; p < nargs; p++)
3294 if (arg[p] == -1) 3481 if (arg[p] == -1)
3295 arg[p] = ndef; 3482 arg[p] = ndef;
3296 3483
3297#ifdef DEBUG_CMD
3298 fprintf (stderr, "CSI ");
3299 for (p = 0; p < nargs; p++)
3300 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3301 fprintf (stderr, "%c\n", ch);
3302#endif
3303
3304 /* 3484 /*
3305 * private mode handling 3485 * private mode handling
3306 */ 3486 */
3307 if (priv) 3487 if (priv)
3308 { 3488 {
3309 switch (priv) 3489 switch (priv)
3310 { 3490 {
3311 case '>': 3491 case '>':
3312 if (ch == CSI_DA) /* secondary device attributes */ 3492 if (ch == CSI_DA) /* secondary device attributes */
3313 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3493 {
3494 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3495 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3496 //
3497 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3498 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3499 // that we do not support xterm mouse reporting (should be 95 when we do).
3500 //
3501 tt_printf ("\033[>%d;94;0c", 'U');
3502 }
3314 break; 3503 break;
3315 case '?': 3504 case '?':
3316 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3505 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3317 process_terminal_mode (ch, priv, nargs, arg); 3506 process_terminal_mode (ch, priv, nargs, arg);
3318 break; 3507 break;
… …
3444 break; 3633 break;
3445 case 6: /* CPR requested */ 3634 case 6: /* CPR requested */
3446 scr_report_position (); 3635 scr_report_position ();
3447 break; 3636 break;
3448 case 7: /* unofficial extension */ 3637 case 7: /* unofficial extension */
3449 if (OPTION (Opt_insecure)) 3638 if (option (Opt_insecure))
3450 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3639 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3451 break; 3640 break;
3452 case 8: /* unofficial extension */ 3641 case 8: /* unofficial extension */
3453 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3642 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3454 break; 3643 break;
… …
3521 break; 3710 break;
3522 case CSI_75: 3711 case CSI_75:
3523 scr_cursor (RESTORE); 3712 scr_cursor (RESTORE);
3524 break; 3713 break;
3525 3714
3526#if ENABLE_FRILLS 3715#if !ENABLE_MINIMAL
3527 case CSI_74: 3716 case CSI_74:
3528 process_window_ops (arg, nargs); 3717 process_window_ops (arg, nargs);
3529 break; 3718 break;
3530#endif 3719#endif
3531 3720
… …
3538 break; 3727 break;
3539 } 3728 }
3540} 3729}
3541/*}}} */ 3730/*}}} */
3542 3731
3543#if ENABLE_FRILLS 3732#if !ENABLE_MINIMAL
3544/* ARGSUSED */ 3733/* ARGSUSED */
3545void 3734void
3546rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3735rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3547{ 3736{
3548 int x, y; 3737 int x, y;
3549 XWindowAttributes wattr; 3738 XWindowAttributes wattr;
3550 Window wdummy; 3739 Window wdummy;
3551 dDisp; 3740
3741 dLocal (Display *, dpy);
3552 3742
3553 if (nargs == 0) 3743 if (nargs == 0)
3554 return; 3744 return;
3555 3745
3556 switch (args[0]) 3746 switch (args[0])
3557 { 3747 {
3558 /* 3748 /*
3559 * commands 3749 * commands
3560 */ 3750 */
3561 case 1: /* deiconify window */ 3751 case 1: /* deiconify window */
3562 XMapWindow (disp, parent[0]); 3752 XMapWindow (dpy, parent[0]);
3563 break; 3753 break;
3564 case 2: /* iconify window */ 3754 case 2: /* iconify window */
3565 XIconifyWindow (disp, parent[0], display->screen); 3755 XIconifyWindow (dpy, parent[0], display->screen);
3566 break; 3756 break;
3567 case 3: /* set position (pixels) */ 3757 case 3: /* set position (pixels) */
3568 XMoveWindow (disp, parent[0], args[1], args[2]); 3758 XMoveWindow (dpy, parent[0], args[1], args[2]);
3569 break; 3759 break;
3570 case 4: /* set size (pixels) */ 3760 case 4: /* set size (pixels) */
3571 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3761 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3572 break; 3762 break;
3573 case 5: /* raise window */ 3763 case 5: /* raise window */
3574 XRaiseWindow (disp, parent[0]); 3764 XRaiseWindow (dpy, parent[0]);
3575 break; 3765 break;
3576 case 6: /* lower window */ 3766 case 6: /* lower window */
3577 XLowerWindow (disp, parent[0]); 3767 XLowerWindow (dpy, parent[0]);
3578 break; 3768 break;
3579 case 7: /* refresh window */ 3769 case 7: /* refresh window */
3580 scr_touch (true); 3770 scr_touch (true);
3581 break; 3771 break;
3582 case 8: /* set size (chars) */ 3772 case 8: /* set size (chars) */
… …
3589 if (args[0] >= 24) /* set height (chars) */ 3779 if (args[0] >= 24) /* set height (chars) */
3590 set_widthheight ((unsigned int)width, 3780 set_widthheight ((unsigned int)width,
3591 (unsigned int) (args[1] * fheight)); 3781 (unsigned int) (args[1] * fheight));
3592 break; 3782 break;
3593 3783
3594
3595 /* 3784 /*
3596 * reports - some output format copied from XTerm 3785 * reports - some output format copied from XTerm
3597 */ 3786 */
3598 case 11: /* report window state */ 3787 case 11: /* report window state */
3599 XGetWindowAttributes (disp, parent[0], &wattr); 3788 XGetWindowAttributes (dpy, parent[0], &wattr);
3600 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3789 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3601 break; 3790 break;
3602 case 13: /* report window position */ 3791 case 13: /* report window position */
3603 XGetWindowAttributes (disp, parent[0], &wattr); 3792 XGetWindowAttributes (dpy, parent[0], &wattr);
3604 XTranslateCoordinates (disp, parent[0], wattr.root, 3793 XTranslateCoordinates (dpy, parent[0], wattr.root,
3605 -wattr.border_width, -wattr.border_width, 3794 -wattr.border_width, -wattr.border_width,
3606 &x, &y, &wdummy); 3795 &x, &y, &wdummy);
3607 tt_printf ("\033[3;%d;%dt", x, y); 3796 tt_printf ("\033[3;%d;%dt", x, y);
3608 break; 3797 break;
3609 case 14: /* report window size (pixels) */ 3798 case 14: /* report window size (pixels) */
3610 XGetWindowAttributes (disp, parent[0], &wattr); 3799 XGetWindowAttributes (dpy, parent[0], &wattr);
3611 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3800 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3612 break; 3801 break;
3613 case 18: /* report text area size (chars) */ 3802 case 18: /* report text area size (chars) */
3614 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3803 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3615 break; 3804 break;
… …
3617 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3806 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3618 break; 3807 break;
3619 case 20: /* report icon label */ 3808 case 20: /* report icon label */
3620 { 3809 {
3621 char *s; 3810 char *s;
3622 XGetIconName (disp, parent[0], &s); 3811 XGetIconName (dpy, parent[0], &s);
3623 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 */
3624 XFree (s); 3813 XFree (s);
3625 } 3814 }
3626 break; 3815 break;
3627 case 21: /* report window title */ 3816 case 21: /* report window title */
3628 { 3817 {
3629 char *s; 3818 char *s;
3630 XFetchName (disp, parent[0], &s); 3819 XFetchName (dpy, parent[0], &s);
3631 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 */
3632 XFree (s); 3821 XFree (s);
3633 } 3822 }
3634 break; 3823 break;
3635 } 3824 }
3636} 3825}
… …
3663 seen_esc = true; 3852 seen_esc = true;
3664 continue; 3853 continue;
3665 } 3854 }
3666 else if (ch == C0_BEL || ch == CHAR_ST) 3855 else if (ch == C0_BEL || ch == CHAR_ST)
3667 break; 3856 break;
3857 else if (ch == C0_SYN)
3858 ch = cmd_get8 ();
3668 else if (ch < 0x20) 3859 else if (ch < 0x20)
3669 return NULL; /* other control character - exit */ 3860 return NULL; /* other control character - exit */
3670 3861
3671 seen_esc = false; 3862 seen_esc = false;
3672 3863
3673 if (n >= STRING_MAX - 1) 3864 if (n >= STRING_MAX - 1)
3674 // stop at some sane length 3865 // stop at some sane length
3675 return NULL; 3866 return NULL;
3676 3867
3677 if (ch == C0_SYN)
3678 string[n++] = cmd_get8 ();
3679 else
3680 string[n++] = ch; 3868 string[n++] = ch;
3681 } 3869 }
3682 3870
3683 string[n++] = '\0'; 3871 string[n++] = '\0';
3684 3872
3685 ends_how = (ch == 0x5c ? C0_ESC : ch); 3873 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3736void 3924void
3737rxvt_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)
3738{ 3926{
3739 if (str[0] == '?' && !str[1]) 3927 if (str[0] == '?' && !str[1])
3740 { 3928 {
3741 unsigned short r, g, b; 3929 rgba c;
3742 pix_colors_focused[color].get (display, 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
3743 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);
3744 } 3938 }
3745 else 3939 else
3746 set_window_color (color, str); 3940 set_window_color (color, str);
3747} 3941}
3748 3942
… …
3754{ 3948{
3755 int color; 3949 int color;
3756 char *buf, *name; 3950 char *buf, *name;
3757 bool query = str[0] == '?' && !str[1]; 3951 bool query = str[0] == '?' && !str[1];
3758 int saveop = op; 3952 int saveop = op;
3759 dDisp; 3953
3954 dLocal (Display *, dpy);
3760 3955
3761 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
3762 switch (op) 3961 switch (op)
3763 { 3962 {
3764 case XTerm_name: 3963 case XTerm_name:
3765 set_title (str); 3964 set_title (str);
3766 /* FALLTHROUGH */ 3965 /* FALLTHROUGH */
… …
3780 unsigned long bytes_after; 3979 unsigned long bytes_after;
3781 unsigned char *value = 0; 3980 unsigned char *value = 0;
3782 const char *str = ""; 3981 const char *str = "";
3783 3982
3784 if (prop 3983 if (prop
3785 && XGetWindowProperty (disp, parent[0], 3984 && XGetWindowProperty (dpy, parent[0],
3786 prop, 0, 1<<16, 0, AnyPropertyType, 3985 prop, 0, 1<<16, 0, AnyPropertyType,
3787 &actual_type, &actual_format, 3986 &actual_type, &actual_format,
3788 &nitems, &bytes_after, &value) == Success 3987 &nitems, &bytes_after, &value) == Success
3789 && actual_type != None 3988 && actual_type != None
3790 && actual_format == 8) 3989 && actual_format == 8)
3791 str = (const char *)(value); 3990 str = (const char *)(value);
3792 3991
3793 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3992 tt_printf ("\033]%d;%s%c", op, str, resp);
3794 3993
3795 XFree (value); 3994 XFree (value);
3796 } 3995 }
3797 else 3996 else
3798 { 3997 {
… …
3802 { 4001 {
3803 *eq = 0; 4002 *eq = 0;
3804 set_utf8_property (display->atom (str), eq + 1); 4003 set_utf8_property (display->atom (str), eq + 1);
3805 } 4004 }
3806 else 4005 else
3807 XDeleteProperty (disp, parent[0], 4006 XDeleteProperty (dpy, parent[0],
3808 display->atom (str)); 4007 display->atom (str));
3809 } 4008 }
3810 break; 4009 break;
3811 4010
3812 case XTerm_Color: 4011 case XTerm_Color:
… …
3822 break; 4021 break;
3823 4022
3824 if ((buf = strchr (name, ';')) != NULL) 4023 if ((buf = strchr (name, ';')) != NULL)
3825 *buf++ = '\0'; 4024 *buf++ = '\0';
3826 4025
3827 if (name[0] == '?' && !name[1]) 4026 process_color_seq (op, color, name, resp);
3828 {
3829 unsigned short r, g, b;
3830 pix_colors_focused[color].get (display, r, g, b);
3831 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3832 }
3833 else
3834 set_window_color (color, name);
3835 } 4027 }
3836 break; 4028 break;
3837 case XTerm_Color00: 4029 case XTerm_Color00:
3838 process_color_seq (XTerm_Color00, Color_fg, str, resp); 4030 process_color_seq (op, Color_fg, str, resp);
3839 break; 4031 break;
3840 case XTerm_Color01: 4032 case XTerm_Color01:
3841 process_color_seq (XTerm_Color01, Color_bg, str, resp); 4033 process_color_seq (op, Color_bg, str, resp);
3842 break; 4034 break;
3843#ifndef NO_CURSORCOLOR 4035#ifndef NO_CURSORCOLOR
3844 case XTerm_Color_cursor: 4036 case XTerm_Color_cursor:
3845 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 4037 process_color_seq (op, Color_cursor, str, resp);
3846 break; 4038 break;
3847#endif 4039#endif
3848 case XTerm_Color_pointer_fg: 4040 case XTerm_Color_pointer_fg:
3849 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 4041 process_color_seq (op, Color_pointer_fg, str, resp);
3850 break; 4042 break;
3851 case XTerm_Color_pointer_bg: 4043 case XTerm_Color_pointer_bg:
3852 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 4044 process_color_seq (op, Color_pointer_bg, str, resp);
3853 break; 4045 break;
3854#ifndef NO_BOLD_UNDERLINE_REVERSE 4046#ifndef NO_BOLD_UNDERLINE_REVERSE
3855 case XTerm_Color_RV: 4047 case XTerm_Color_RV:
3856 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 4048 process_color_seq (op, Color_RV, str, resp);
3857 break; 4049 break;
3858 case Rxvt_Color_BD: 4050 case Rxvt_Color_BD:
3859 case URxvt_Color_BD: 4051 case URxvt_Color_BD:
3860 process_color_seq (op, Color_BD, str, resp); 4052 process_color_seq (op, Color_BD, str, resp);
3861 break; 4053 break;
3862 case Rxvt_Color_UL: 4054 case Rxvt_Color_UL:
3863 case URxvt_Color_UL: 4055 case URxvt_Color_UL:
3864 process_color_seq (op, Color_UL, str, resp); 4056 process_color_seq (op, Color_UL, str, resp);
3865 break; 4057 break;
3866 case URxvt_Color_IT: 4058 case URxvt_Color_IT:
3867 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 4059 process_color_seq (op, Color_IT, str, resp);
3868 break; 4060 break;
3869#endif 4061#endif
3870#if TRANSPARENT && TINTING 4062#if TRANSPARENT && TINTING
3871 case URxvt_Color_tint: 4063 case URxvt_Color_tint:
3872 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 4064 process_color_seq (op, Color_tint, str, resp);
4065
3873 check_our_parents (); 4066 check_our_parents ();
4067
3874 if (am_transparent) 4068 if (am_transparent)
3875 want_full_refresh = want_refresh = 1; 4069 want_full_refresh = want_refresh = 1;
4070
3876 break; 4071 break;
3877#endif 4072#endif
3878 4073
3879 case Rxvt_Pixmap: 4074 case Rxvt_Pixmap:
3880 { 4075 {
… …
3902#ifdef XPM_BACKGROUND 4097#ifdef XPM_BACKGROUND
3903 resize_pixmap (); 4098 resize_pixmap ();
3904 scr_touch (true); 4099 scr_touch (true);
3905#endif 4100#endif
3906 } 4101 }
4102#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
4103 if (option(Opt_transparent))
4104 check_our_parents ();
4105#endif
4106
3907 } 4107 }
3908 break; 4108 break;
3909 4109
3910 case Rxvt_restoreFG: 4110 case Rxvt_restoreFG:
3911 set_window_color (Color_fg, str); 4111 set_window_color (Color_fg, str);
… …
3938 case URxvt_italicFont: 4138 case URxvt_italicFont:
3939 case URxvt_boldItalicFont: 4139 case URxvt_boldItalicFont:
3940#endif 4140#endif
3941 if (query) 4141 if (query)
3942 tt_printf ("\33]%d;%-.250s%c", saveop, 4142 tt_printf ("\33]%d;%-.250s%c", saveop,
3943 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 4143 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3944 ? fontset[op - URxvt_font]->fontdesc : "", 4144 ? fontset[op - URxvt_font]->fontdesc : "",
3945 resp); 4145 resp);
3946 else 4146 else
3947 { 4147 {
3948 const char *&res = rs[Rs_font + (op - URxvt_font)]; 4148 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3951 allocated.push_back ((void *)res); 4151 allocated.push_back ((void *)res);
3952 set_fonts (); 4152 set_fonts ();
3953 } 4153 }
3954 break; 4154 break;
3955 4155
3956#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
3957 case URxvt_locale: 4165 case URxvt_locale:
3958 if (query) 4166 if (query)
3959 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);
3960 else 4168 else
3961 { 4169 {
3962 set_locale (str); 4170 set_locale (str);
3963 pty->set_utf8_mode (enc_utf8); 4171 pty->set_utf8_mode (enc_utf8);
3964 init_xlocale (); 4172 init_xlocale ();
… …
3979 break; 4187 break;
3980#endif 4188#endif
3981 4189
3982#if ENABLE_PERL 4190#if ENABLE_PERL
3983 case URxvt_perl: 4191 case URxvt_perl:
3984 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)))
3985 ; // no responses yet 4193 ; // no responses yet
3986 break; 4194 break;
3987#endif 4195#endif
3988 } 4196 }
3989} 4197}
… …
4105 scr_touch (true); 4313 scr_touch (true);
4106 break; 4314 break;
4107#endif 4315#endif
4108 case 1048: /* alternative cursor save */ 4316 case 1048: /* alternative cursor save */
4109 case 1049: 4317 case 1049:
4110 if (OPTION (Opt_secondaryScreen)) 4318 if (option (Opt_secondaryScreen))
4111 if (mode == 0) 4319 if (mode == 0)
4112 scr_cursor (RESTORE); 4320 scr_cursor (RESTORE);
4113 else if (mode == 1) 4321 else if (mode == 1)
4114 scr_cursor (SAVE); 4322 scr_cursor (SAVE);
4115 break; 4323 break;
… …
4180 break; 4388 break;
4181 case 1011: /* scroll to bottom on key press */ 4389 case 1011: /* scroll to bottom on key press */
4182 set_option (Opt_scrollTtyKeypress, state); 4390 set_option (Opt_scrollTtyKeypress, state);
4183 break; 4391 break;
4184 case 1047: /* secondary screen w/ clearing last */ 4392 case 1047: /* secondary screen w/ clearing last */
4185 if (OPTION (Opt_secondaryScreen)) 4393 if (option (Opt_secondaryScreen))
4186 if (current_screen != PRIMARY) 4394 if (current_screen != PRIMARY)
4187 scr_erase_screen (2); 4395 scr_erase_screen (2);
4188 scr_change_screen (state); 4396 scr_change_screen (state);
4189 break; 4397 break;
4190 case 1049: /* secondary screen w/ clearing first */ 4398 case 1049: /* secondary screen w/ clearing first */
4191 scr_change_screen (state); 4399 scr_change_screen (state);
4192 if (OPTION (Opt_secondaryScreen)) 4400 if (option (Opt_secondaryScreen))
4193 if (current_screen != PRIMARY) 4401 if (current_screen != PRIMARY)
4194 scr_erase_screen (2); 4402 scr_erase_screen (2);
4195 break; 4403 break;
4196 default: 4404 default:
4197 break; 4405 break;
… …
4325 scr_color (Color_bg, Color_bg); 4533 scr_color (Color_bg, Color_bg);
4326 break; 4534 break;
4327 4535
4328 //case 50: // not variable spacing 4536 //case 50: // not variable spacing
4329 4537
4330#if ENABLE_FRILLS 4538#if !ENABLE_MINIMAL
4331 case 90: 4539 case 90:
4332 case 91: /* set bright fg color */ 4540 case 91: /* set bright fg color */
4333 case 92: 4541 case 92:
4334 case 93: 4542 case 93:
4335 case 94: 4543 case 94:

Diff Legend

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