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.286 by root, Wed Jan 25 21:09:21 2006 UTC vs.
Revision 1.328 by ayin, Mon Jun 11 17:40:15 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
64 63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 67
227# if !UNICODE3 226# if !UNICODE3
228 if (ch >= 0x10000) 227 if (ch >= 0x10000)
229 ch = 0xfffd; 228 ch = 0xfffd;
230# endif 229# endif
231 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
233 } 234 }
234 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
235 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
237 243
238 free (fname); 244 free (fname);
239 245
292 298
293 return -1; 299 return -1;
294} 300}
295#endif 301#endif
296 302
297/*{{{ Convert the keypress event into a string */
298void 303void
299rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
300{ 305{
301 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
302 unsigned int newlen; 307 unsigned int newlen;
303 KeySym keysym; 308 KeySym keysym;
304 int valid_keysym; 309 int valid_keysym;
305 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
306 316
307 /* 317 /*
308 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
309 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
310 * 320 *
487 { 497 {
488 commit_iso14755 (); 498 commit_iso14755 ();
489 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
490# if ISO_14755 500# if ISO_14755
491 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
492# endif 510# endif
493 return; 511 return;
494 } 512 }
495 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
496 { 514 {
867 return; 885 return;
868 886
869 if (len <= 0) 887 if (len <= 0)
870 return; /* not mapped */ 888 return; /* not mapped */
871 889
872 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
873 if (view_start) 891 if (view_start)
874 { 892 {
875 view_start = 0; 893 view_start = 0;
876 want_refresh = 1; 894 want_refresh = 1;
877 } 895 }
901 tt_write (&ch, 1); 919 tt_write (&ch, 1);
902 } 920 }
903 921
904 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
905} 923}
906/*}}} */ 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ENABLE_OVERLAY
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ENABLE_OVERLAY
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
907 1001
908#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
909unsigned int 1003unsigned int
910rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
911{ 1005{
1088 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1089 } 1183 }
1090} 1184}
1091#endif 1185#endif
1092 1186
1093#if HAVE_SCHED_YIELD 1187#if LINUX_YIELD_HACK
1094static struct event_handler 1188static struct event_handler
1095{ 1189{
1096 check_watcher cw_yield; 1190 check_watcher yield_ev;
1097 1191
1098 void yield (check_watcher &w) 1192 void yield_cb (check_watcher &w)
1099 { 1193 {
1100 sched_yield (); 1194 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS.
1198
1199 struct timespec ts = { 0, 0 };
1200 nanosleep (&ts, 0);
1201
1101 w.stop (); 1202 w.stop ();
1102 } 1203 }
1103 1204
1104 event_handler () 1205 event_handler ()
1105 : cw_yield (this, &event_handler::yield) 1206 : yield_ev (this, &event_handler::yield_cb)
1106 { 1207 {
1107 } 1208 }
1108} event_handler; 1209} event_handler;
1109#endif 1210#endif
1110 1211
1130 cmdbuf_endp += r; 1231 cmdbuf_endp += r;
1131 return true; 1232 return true;
1132 } 1233 }
1133 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134 { 1235 {
1135#if HAVE_SCHED_YIELD 1236#if LINUX_YIELD_HACK
1136 if (display->is_local) 1237 if (display->is_local)
1137 event_handler.cw_yield.start (); 1238 event_handler.yield_ev.start ();
1138#endif 1239#endif
1139 } 1240 }
1140 else 1241 else
1141 { 1242 {
1142 pty_ev.stop (); 1243 pty_ev.stop ();
1143 1244
1144 if (!OPTION (Opt_hold)) 1245 if (!option (Opt_hold))
1145 destroy (); 1246 destroy ();
1146 } 1247 }
1147 1248
1148 return false; 1249 return false;
1149} 1250}
1164} 1265}
1165 1266
1166void 1267void
1167rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1168{ 1269{
1169 XDefineCursor (xdisp, vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1170 recolour_cursor (); 1271 recolour_cursor ();
1171 1272
1172#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1173 hidden_pointer = 0; 1274 hidden_pointer = 0;
1174 1275
1175 if (OPTION (Opt_pointerBlank)) 1276 if (option (Opt_pointerBlank))
1176 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1177#endif 1278#endif
1178} 1279}
1179 1280
1180#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1181void 1282void
1182rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1183{ 1284{
1184 if (!OPTION (Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1185 return; 1286 return;
1186 1287
1187 XDefineCursor (xdisp, vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1188 XFlush (xdisp); 1289 XFlush (dpy);
1189 1290
1190 hidden_pointer = 1; 1291 hidden_pointer = 1;
1191} 1292}
1192 1293
1193void 1294void
1272void 1373void
1273rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1274{ 1375{
1275 make_current (); 1376 make_current ();
1276 1377
1277 dLocal (Display *, xdisp); 1378 dLocal (Display *, dpy);
1278 1379
1279 if (ev.xany.window == vt 1380 if (ev.xany.window == vt
1280 && SHOULD_INVOKE (HOOK_X_EVENT) 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1281 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1282 return; 1383 return;
1287 unsigned int unused_mask; 1388 unsigned int unused_mask;
1288 1389
1289 switch (ev.type) 1390 switch (ev.type)
1290 { 1391 {
1291 case KeyPress: 1392 case KeyPress:
1292#if ISO_14755 1393 key_press (ev.xkey);
1293 if (!(iso14755buf & ISO_14755_52))
1294#endif
1295 lookup_key (ev.xkey);
1296
1297 break; 1394 break;
1298 1395
1299 case KeyRelease: 1396 case KeyRelease:
1300 { 1397 key_release (ev.xkey);
1301#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1302 KeySym keysym;
1303
1304 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1305#endif
1306
1307#if ENABLE_FRILLS || ISO_14755
1308 // ISO 14755 support
1309 if (iso14755buf)
1310 if (iso14755buf & ISO_14755_52)
1311 {
1312# if ENABLE_OVERLAY
1313 scr_overlay_off ();
1314# endif
1315# if ISO_14755
1316 // iso14755 part 5.2 handling: release time
1317 // first: controls
1318 if ((ev.xkey.state & ControlMask)
1319 && ((keysym >= 0x40 && keysym <= 0x5f)
1320 || (keysym >= 0x61 && keysym <= 0x7f)))
1321 {
1322 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1323 commit_iso14755 ();
1324 goto skip_switch;
1325 }
1326
1327 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1328 if (i[0] == keysym)
1329 {
1330 iso14755buf = ISO_14755_51 | i[1];
1331 commit_iso14755 ();
1332 goto skip_switch;
1333 }
1334
1335 scr_bell ();
1336# endif
1337 iso14755buf = 0;
1338 break;
1339 }
1340 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1341 {
1342# if ENABLE_OVERLAY
1343 scr_overlay_off ();
1344# endif
1345 if (iso14755buf & ISO_14755_51)
1346 commit_iso14755 ();
1347#if ISO_14755
1348 else if (iso14755buf & ISO_14755_STARTED)
1349 {
1350 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1351
1352 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1353 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1354 }
1355# endif
1356 else
1357 iso14755buf = 0;
1358 }
1359#endif
1360
1361 if (ev.xany.window == vt
1362 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1363 break;
1364
1365#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1366 if (!(ev.xkey.state & ControlMask))
1367 slip_wheel_ev.stop ();
1368 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1369 mouse_slip_wheel_speed = 0;
1370#endif
1371 break; 1398 break;
1372 }
1373 1399
1374 case ButtonPress: 1400 case ButtonPress:
1375 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1376 break; 1402 break;
1377 1403
1392 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1418 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1393 destroy (); 1419 destroy ();
1394 } 1420 }
1395#if ENABLE_EWMH 1421#if ENABLE_EWMH
1396 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1397 XSendEvent (xdisp, ev.xclient.window = display->root, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1398 False, SubstructureRedirectMask | SubstructureNotifyMask, 1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1399 &ev); 1425 &ev);
1400#endif 1426#endif
1401 } 1427 }
1402 } 1428 }
1440 break; 1466 break;
1441 } 1467 }
1442 break; 1468 break;
1443 1469
1444 case FocusIn: 1470 case FocusIn:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1445 focus_in (); 1474 focus_in ();
1446 break; 1475 break;
1447 1476
1448 case FocusOut: 1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1449 focus_out (); 1481 focus_out ();
1450 break; 1482 break;
1451 1483
1452 case ConfigureNotify: 1484 case ConfigureNotify:
1453 if (ev.xconfigure.window == parent[0]) 1485 if (ev.xconfigure.window == parent[0])
1454 { 1486 {
1455 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1456 ; 1488 ;
1457 1489
1458 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1459 { 1491 {
1460 seen_resize = 1; 1492 seen_resize = 1;
1461 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND
1495 if (!option(Opt_transparent) && bgPixmap.auto_resize)
1496 {
1497 resize_pixmap ();
1498 scr_touch (true);
1499 }
1500#endif
1462 } 1501 }
1463 1502
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1465 1504
1466#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1505#ifdef TRANSPARENT
1467 if (OPTION (Opt_transparent)) 1506 if (option (Opt_transparent))
1468 check_our_parents (); 1507 check_our_parents ();
1469#endif 1508#endif
1470 } 1509 }
1471 break; 1510 break;
1472 1511
1518 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1519 { 1558 {
1520 do 1559 do
1521 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1522 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1523 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1524 1563
1525 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1526 1565
1527 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1530 1569
1531 want_refresh = 1; 1570 want_refresh = 1;
1532 } 1571 }
1533 else 1572 else
1534 { 1573 {
1535 XEvent unused_event; 1574 XEvent unused_event;
1536 1575
1537 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1538 ; 1577 ;
1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1540 ; 1579 ;
1541 1580
1542 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1543 { 1582 {
1544 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1545 scrollbar_show (0); 1584 scrollbar_show (0);
1546 } 1585 }
1547 1586
1548#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1550 XClearWindow (xdisp, ev.xany.window); 1589 XClearWindow (dpy, ev.xany.window);
1551#endif 1590#endif
1552 } 1591 }
1553 break; 1592 break;
1554 1593
1555 case MotionNotify: 1594 case MotionNotify:
1565 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1566 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1567 ; // nop 1606 ; // nop
1568 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1569 { 1608 {
1570 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1571 ; 1610 ;
1572 1611
1573 XQueryPointer (xdisp, vt, 1612 XQueryPointer (dpy, vt,
1574 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1575 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1576 &ev.xbutton.x, &ev.xbutton.y, 1615 &ev.xbutton.x, &ev.xbutton.y,
1577 &ev.xbutton.state); 1616 &ev.xbutton.state);
1578#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
1642#endif 1681#endif
1643 } 1682 }
1644 } 1683 }
1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1646 { 1685 {
1647 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1648 MotionNotify, &ev)) 1687 MotionNotify, &ev))
1649 ; 1688 ;
1650 1689
1651 XQueryPointer (xdisp, scrollBar.win, 1690 XQueryPointer (dpy, scrollBar.win,
1652 &unused_root, &unused_child, 1691 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1693 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1694 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1660 scrollbar_show (1); 1699 scrollbar_show (1);
1661 } 1700 }
1662 break; 1701 break;
1663 } 1702 }
1664 1703
1665skip_switch: ;
1666
1667#if defined(CURSOR_BLINK) 1704#if defined(CURSOR_BLINK)
1668 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1705 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1669 { 1706 {
1670 if (hidden_cursor) 1707 if (hidden_cursor)
1671 { 1708 {
1672 hidden_cursor = 0; 1709 hidden_cursor = 0;
1673 want_refresh = 1; 1710 want_refresh = 1;
1676 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1677 } 1714 }
1678#endif 1715#endif
1679 1716
1680#if defined(POINTER_BLANK) 1717#if defined(POINTER_BLANK)
1681 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1682 { 1719 {
1683 if (ev.type == MotionNotify 1720 if (ev.type == MotionNotify
1684 || ev.type == ButtonPress 1721 || ev.type == ButtonPress
1685 || ev.type == ButtonRelease) 1722 || ev.type == ButtonRelease)
1686 if (hidden_pointer) 1723 if (hidden_pointer)
1698 if (!focus) 1735 if (!focus)
1699 { 1736 {
1700 focus = 1; 1737 focus = 1;
1701 want_refresh = 1; 1738 want_refresh = 1;
1702 1739
1703 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1704 1741
1705#if USE_XIM 1742#if USE_XIM
1706 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1707 { 1744 {
1708 IMSetStatusPosition (); 1745 IMSetPosition ();
1709 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1710 } 1747 }
1711#endif 1748#endif
1712#if CURSOR_BLINK 1749#if CURSOR_BLINK
1713 if (OPTION (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
1714 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1715#endif 1752#endif
1716#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1717 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1718 { 1755 {
1719 pix_colors = pix_colors_focused; 1756 pix_colors = pix_colors_focused;
1720 scr_recolour (); 1757 scr_recolour ();
1758 }
1759#endif
1760#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell))
1762 {
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]);
1766 if (h != NULL)
1767 {
1768 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h);
1770 }
1721 } 1771 }
1722#endif 1772#endif
1723 } 1773 }
1724} 1774}
1725 1775
1745#if USE_XIM 1795#if USE_XIM
1746 if (Input_Context != NULL) 1796 if (Input_Context != NULL)
1747 XUnsetICFocus (Input_Context); 1797 XUnsetICFocus (Input_Context);
1748#endif 1798#endif
1749#if CURSOR_BLINK 1799#if CURSOR_BLINK
1750 if (OPTION (Opt_cursorBlink)) 1800 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.stop (); 1801 cursor_blink_ev.stop ();
1752 hidden_cursor = 0; 1802 hidden_cursor = 0;
1753#endif 1803#endif
1754#if OFF_FOCUS_FADING 1804#if OFF_FOCUS_FADING
1755 if (rs[Rs_fade]) 1805 if (rs[Rs_fade])
1759 } 1809 }
1760#endif 1810#endif
1761 } 1811 }
1762} 1812}
1763 1813
1764#if TRANSPARENT 1814void
1815rxvt_term::update_fade_color (unsigned int idx)
1816{
1817#if OFF_FOCUS_FADING
1818 if (rs[Rs_fade])
1819 {
1820 rgba c;
1821 pix_colors [Color_fade].get (c);
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 }
1824#endif
1825}
1826
1827#if TRANSPARENT || ENABLE_PERL
1765void 1828void
1766rxvt_term::rootwin_cb (XEvent &ev) 1829rxvt_term::rootwin_cb (XEvent &ev)
1767{ 1830{
1768 make_current (); 1831 make_current ();
1769 1832
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return;
1836
1837# if TRANSPARENT
1770 switch (ev.type) 1838 switch (ev.type)
1771 { 1839 {
1772 case PropertyNotify: 1840 case PropertyNotify:
1773 /* 1841 /*
1774 * if user used some Esetroot compatible prog to set the root bg, 1842 * if user used some Esetroot compatible prog to set the root bg,
1778 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1779 return; 1847 return;
1780 1848
1781 /* FALLTHROUGH */ 1849 /* FALLTHROUGH */
1782 case ReparentNotify: 1850 case ReparentNotify:
1783 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1851 if (option (Opt_transparent))
1784 want_refresh = want_full_refresh = 1; 1852 check_our_parents ();
1785 break; 1853 break;
1786 } 1854 }
1855# endif
1787} 1856}
1788#endif 1857#endif
1789 1858
1790void 1859void
1791rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
2119 selection_make (ev.time); 2188 selection_make (ev.time);
2120 break; 2189 break;
2121 2190
2122 case Button2: 2191 case Button2:
2123 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2192 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2124 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2125 break; 2194 break;
2126 2195
2127#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2128 case Button4: 2197 case Button4:
2129 case Button5: 2198 case Button5:
2133 2202
2134 v = ev.button == Button4 ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2135 2204
2136 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2137 i = 1; 2206 i = 1;
2138 else if (OPTION (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2139 i = nrow - 1; 2208 i = nrow - 1;
2140 else 2209 else
2141 i = 5; 2210 i = 5;
2142 2211
2143# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
2164 break; 2233 break;
2165#endif 2234#endif
2166 } 2235 }
2167 } 2236 }
2168} 2237}
2169
2170#ifdef TRANSPARENT
2171#if TINTING
2172/* taken from aterm-0.4.2 */
2173
2174typedef uint32_t RUINT32T;
2175
2176void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2177{
2178 int sh_r, sh_g, sh_b;
2179 RUINT32T mask_r, mask_g, mask_b;
2180 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2181 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2182 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2183 int i;
2184
2185 Visual *visual = term->visual;
2186
2187 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2188
2189 /* for convenience */
2190 mask_r = visual->red_mask;
2191 mask_g = visual->green_mask;
2192 mask_b = visual->blue_mask;
2193
2194 /* boring lookup table pre-initialization */
2195 switch (srcImage->bits_per_pixel) {
2196 case 15:
2197 if ((mask_r != 0x7c00) ||
2198 (mask_g != 0x03e0) ||
2199 (mask_b != 0x001f))
2200 return;
2201 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2202 lookup_r = lookup;
2203 lookup_g = lookup+32;
2204 lookup_b = lookup+32+32;
2205 sh_r = 10;
2206 sh_g = 5;
2207 sh_b = 0;
2208 break;
2209 case 16:
2210 if ((mask_r != 0xf800) ||
2211 (mask_g != 0x07e0) ||
2212 (mask_b != 0x001f))
2213 return;
2214 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2215 lookup_r = lookup;
2216 lookup_g = lookup+32;
2217 lookup_b = lookup+32+64;
2218 sh_r = 11;
2219 sh_g = 5;
2220 sh_b = 0;
2221 break;
2222 case 24:
2223 if ((mask_r != 0xff0000) ||
2224 (mask_g != 0x00ff00) ||
2225 (mask_b != 0x0000ff))
2226 return;
2227 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2228 lookup_r = lookup;
2229 lookup_g = lookup+256;
2230 lookup_b = lookup+256+256;
2231 sh_r = 16;
2232 sh_g = 8;
2233 sh_b = 0;
2234 break;
2235 case 32:
2236 if ((mask_r != 0xff0000) ||
2237 (mask_g != 0x00ff00) ||
2238 (mask_b != 0x0000ff))
2239 return;
2240 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2241 lookup_r = lookup;
2242 lookup_g = lookup+256;
2243 lookup_b = lookup+256+256;
2244 sh_r = 16;
2245 sh_g = 8;
2246 sh_b = 0;
2247 break;
2248 default:
2249 return; /* we do not support this color depth */
2250 }
2251
2252 /* prepare limits for color transformation (each channel is handled separately) */
2253 if (shade < 0) {
2254 shade = -shade;
2255 if (shade < 0) shade = 0;
2256 if (shade > 100) shade = 100;
2257
2258 lower_lim_r = 65535-rm;
2259 lower_lim_g = 65535-gm;
2260 lower_lim_b = 65535-bm;
2261
2262 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2263 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2264 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2265
2266 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2267 } else {
2268 if (shade < 0) shade = 0;
2269 if (shade > 100) shade = 100;
2270
2271 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2272
2273 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2274 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2275 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2276 }
2277
2278 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2279 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2280 {
2281 unsigned int tmp;
2282
2283 tmp = lower_lim_r;
2284 lower_lim_r = lower_lim_b;
2285 lower_lim_b = tmp;
2286
2287 tmp = upper_lim_r;
2288 upper_lim_r = upper_lim_b;
2289 upper_lim_b = tmp;
2290 }
2291
2292 /* fill our lookup tables */
2293 for (i = 0; i <= mask_r>>sh_r; i++)
2294 {
2295 RUINT32T tmp;
2296 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2297 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2298 lookup_r[i] = (tmp/65535)<<sh_r;
2299 }
2300 for (i = 0; i <= mask_g>>sh_g; i++)
2301 {
2302 RUINT32T tmp;
2303 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2304 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2305 lookup_g[i] = (tmp/65535)<<sh_g;
2306 }
2307 for (i = 0; i <= mask_b>>sh_b; i++)
2308 {
2309 RUINT32T tmp;
2310 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2311 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2312 lookup_b[i] = (tmp/65535)<<sh_b;
2313 }
2314
2315 /* apply table to input image (replacing colors by newly calculated ones) */
2316 switch (srcImage->bits_per_pixel)
2317 {
2318 case 15:
2319 {
2320 unsigned short *p1, *pf, *p, *pl;
2321 p1 = (unsigned short *) srcImage->data;
2322 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2323 while (p1 < pf)
2324 {
2325 p = p1;
2326 pl = p1 + srcImage->width;
2327 for (; p < pl; p++)
2328 {
2329 *p = lookup_r[(*p & 0x7c00)>>10] |
2330 lookup_g[(*p & 0x03e0)>> 5] |
2331 lookup_b[(*p & 0x001f)];
2332 }
2333 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2334 }
2335 break;
2336 }
2337 case 16:
2338 {
2339 unsigned short *p1, *pf, *p, *pl;
2340 p1 = (unsigned short *) srcImage->data;
2341 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2342 while (p1 < pf)
2343 {
2344 p = p1;
2345 pl = p1 + srcImage->width;
2346 for (; p < pl; p++)
2347 {
2348 *p = lookup_r[(*p & 0xf800)>>11] |
2349 lookup_g[(*p & 0x07e0)>> 5] |
2350 lookup_b[(*p & 0x001f)];
2351 }
2352 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2353 }
2354 break;
2355 }
2356 case 24:
2357 {
2358 unsigned char *p1, *pf, *p, *pl;
2359 p1 = (unsigned char *) srcImage->data;
2360 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2361 while (p1 < pf)
2362 {
2363 p = p1;
2364 pl = p1 + srcImage->width * 3;
2365 for (; p < pl; p += 3)
2366 {
2367 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2368 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2369 p[2] = lookup_r[(p[2] & 0x0000ff)];
2370 }
2371 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2372 }
2373 break;
2374 }
2375 case 32:
2376 {
2377 RUINT32T *p1, *pf, *p, *pl;
2378 p1 = (RUINT32T *) srcImage->data;
2379 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2380
2381 while (p1 < pf)
2382 {
2383 p = p1;
2384 pl = p1 + srcImage->width;
2385 for (; p < pl; p++)
2386 {
2387 *p = lookup_r[(*p & 0xff0000)>>16] |
2388 lookup_g[(*p & 0x00ff00)>> 8] |
2389 lookup_b[(*p & 0x0000ff)] |
2390 (*p & ~0xffffff);
2391 }
2392 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2393 }
2394 break;
2395 }
2396 }
2397
2398 free (lookup);
2399}
2400#endif
2401
2402/*
2403 * Check our parents are still who we think they are.
2404 * Do transparency updates if required
2405 */
2406int
2407rxvt_term::check_our_parents ()
2408{
2409 int i, pchanged, aformat, have_pixmap, rootdepth;
2410 unsigned long nitems, bytes_after;
2411 Atom atype;
2412 unsigned char *prop = NULL;
2413 Window root, oldp, *list;
2414 Pixmap rootpixmap = None;
2415 XWindowAttributes wattr, wrootattr;
2416
2417 pchanged = 0;
2418
2419 if (!OPTION (Opt_transparent))
2420 return pchanged; /* Don't try any more */
2421
2422 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2423 rootdepth = wrootattr.depth;
2424
2425 XGetWindowAttributes (xdisp, parent[0], &wattr);
2426
2427 if (rootdepth != wattr.depth)
2428 {
2429 if (am_transparent)
2430 {
2431 pchanged = 1;
2432 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2433 am_transparent = am_pixmap_trans = 0;
2434 }
2435
2436 return pchanged; /* Don't try any more */
2437 }
2438
2439 /* Get all X ops out of the queue so that our information is up-to-date. */
2440 XSync (xdisp, False);
2441
2442 /*
2443 * Make the frame window set by the window manager have
2444 * the root background. Some window managers put multiple nested frame
2445 * windows for each client, so we have to take care about that.
2446 */
2447 i = (xa[XA_XROOTPMAP_ID]
2448 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2449 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2450 &nitems, &bytes_after, &prop) == Success);
2451
2452 if (!i || prop == NULL)
2453 i = (xa[XA_ESETROOT_PMAP_ID]
2454 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2455 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2456 &nitems, &bytes_after, &prop) == Success);
2457
2458 if (!i || prop == NULL
2459#if TINTING
2460 || !rs[Rs_color + Color_tint]
2461#endif
2462 )
2463 have_pixmap = 0;
2464 else
2465 {
2466 have_pixmap = 1;
2467 rootpixmap = *(Pixmap *)prop;
2468 XFree (prop);
2469 }
2470
2471 if (have_pixmap)
2472 {
2473 /*
2474 * Copy display->root pixmap transparency
2475 */
2476 int sx, sy, nx, ny;
2477 unsigned int nw, nh;
2478 Window cr;
2479 XImage *image;
2480 GC gc;
2481 XGCValues gcvalue;
2482
2483 XTranslateCoordinates (xdisp, parent[0], display->root,
2484 0, 0, &sx, &sy, &cr);
2485 nw = (unsigned int)szHint.width;
2486 nh = (unsigned int)szHint.height;
2487 nx = ny = 0;
2488
2489 if (sx < 0)
2490 {
2491 nw += sx;
2492 nx = -sx;
2493 sx = 0;
2494 }
2495
2496 if (sy < 0)
2497 {
2498 nh += sy;
2499 ny = -sy;
2500 sy = 0;
2501 }
2502
2503 min_it (nw, (unsigned int) (wrootattr.width - sx));
2504 min_it (nh, (unsigned int) (wrootattr.height - sy));
2505
2506 XSync (xdisp, False);
2507 allowedxerror = -1;
2508 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2509
2510 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2511 /* XXX: may need a delay here? */
2512 allowedxerror = 0;
2513
2514 if (image == NULL)
2515 {
2516 if (am_transparent && am_pixmap_trans)
2517 {
2518 pchanged = 1;
2519 if (pixmap != None)
2520 {
2521 XFreePixmap (xdisp, pixmap);
2522 pixmap = None;
2523 }
2524 }
2525
2526 am_pixmap_trans = 0;
2527 }
2528 else
2529 {
2530 if (pixmap != None)
2531 XFreePixmap (xdisp, pixmap);
2532
2533#if TINTING
2534 if (ISSET_PIXCOLOR (Color_tint))
2535 {
2536 unsigned short rm, gm, bm;
2537 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2538
2539 pix_colors_focused[Color_tint].get (this, rm, gm, bm);
2540
2541 ShadeXImage (this, image, shade, rm, gm, bm);
2542 }
2543#endif
2544
2545 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2546 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2547 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2548 nx, ny, image->width, image->height);
2549 XFreeGC (xdisp, gc);
2550 XDestroyImage (image);
2551 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2552 XClearWindow (xdisp, parent[0]);
2553
2554 if (!am_transparent || !am_pixmap_trans)
2555 pchanged = 1;
2556
2557 am_transparent = am_pixmap_trans = 1;
2558 }
2559 }
2560
2561 if (am_pixmap_trans)
2562 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2563 else
2564 {
2565 unsigned int n;
2566 /*
2567 * InheritPixmap transparency
2568 */
2569 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2570 {
2571 oldp = parent[i];
2572 XQueryTree (xdisp, parent[i - 1], &root,
2573 &parent[i], &list, &n);
2574 XFree (list);
2575
2576 if (parent[i] == display->root)
2577 {
2578 if (oldp != None)
2579 pchanged = 1;
2580
2581 break;
2582 }
2583
2584 if (oldp != parent[i])
2585 pchanged = 1;
2586 }
2587
2588 n = 0;
2589
2590 if (pchanged)
2591 {
2592 for (; n < (unsigned int)i; n++)
2593 {
2594 XGetWindowAttributes (xdisp, parent[n], &wattr);
2595 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2596 {
2597 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2598 break;
2599 }
2600 }
2601 }
2602
2603 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2604 {
2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2607 am_transparent = 0;
2608 /* XXX: also turn off Opt_transparent? */
2609 }
2610 else
2611 {
2612 for (n = 0; n < (unsigned int)i; n++)
2613 {
2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2615 XClearWindow (xdisp, parent[n]);
2616 }
2617
2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2619 am_transparent = 1;
2620 }
2621
2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2623 parent[i] = None;
2624 }
2625
2626 if (scrollBar.win)
2627 {
2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2629 scrollBar.setIdle ();
2630 scrollbar_show (0);
2631 }
2632
2633 if (am_transparent)
2634 {
2635 want_refresh = want_full_refresh = 1;
2636 if (am_pixmap_trans)
2637 flush ();
2638 }
2639
2640 return pchanged;
2641}
2642#endif
2643 2238
2644/*}}} */ 2239/*}}} */
2645 2240
2646bool 2241bool
2647rxvt_term::cmd_parse () 2242rxvt_term::cmd_parse ()
2696 if (ch == C0_LF) 2291 if (ch == C0_LF)
2697 nlines++; 2292 nlines++;
2698 2293
2699 refresh_count++; 2294 refresh_count++;
2700 2295
2701 if (!OPTION (Opt_jumpScroll) 2296 if (!option (Opt_jumpScroll)
2702 || (refresh_count >= refresh_limit * (nrow - 1))) 2297 || (refresh_count >= refresh_limit * (nrow - 1)))
2703 { 2298 {
2704 refreshnow = true; 2299 refreshnow = true;
2705 refresh_count = 0; 2300 refresh_count = 0;
2706 ch = NOCHAR; 2301 ch = NOCHAR;
2746 * the number of pages between refreshes is refresh_limit, which 2341 * the number of pages between refreshes is refresh_limit, which
2747 * is incremented here because we must be doing flat-out scrolling. 2342 * is incremented here because we must be doing flat-out scrolling.
2748 */ 2343 */
2749 if (refreshnow) 2344 if (refreshnow)
2750 { 2345 {
2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2346 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2752 refresh_limit++; 2347 refresh_limit++;
2753 else 2348 else
2754 { 2349 {
2755 flag = true; 2350 flag = true;
2351 //TODO: due to popular request, implement "skipscroll" option here
2756 scr_refresh (); 2352 scr_refresh ();
2757 want_refresh = 1; 2353 want_refresh = 1;
2758 } 2354 }
2759 } 2355 }
2760 2356
3084 scr_charset_set (2, (unsigned int)cmd_getc ()); 2680 scr_charset_set (2, (unsigned int)cmd_getc ());
3085 break; 2681 break;
3086 case '+': 2682 case '+':
3087 scr_charset_set (3, (unsigned int)cmd_getc ()); 2683 scr_charset_set (3, (unsigned int)cmd_getc ());
3088 break; 2684 break;
3089#if ENABLE_FRILLS 2685#if !ENABLE_MINIMAL
3090 case '6': 2686 case '6':
3091 scr_backindex (); 2687 scr_backindex ();
3092 break; 2688 break;
3093#endif 2689#endif
3094 case '7': 2690 case '7':
3095 scr_cursor (SAVE); 2691 scr_cursor (SAVE);
3096 break; 2692 break;
3097 case '8': 2693 case '8':
3098 scr_cursor (RESTORE); 2694 scr_cursor (RESTORE);
3099 break; 2695 break;
3100#if ENABLE_FRILLS 2696#if !ENABLE_MINIMAL
3101 case '9': 2697 case '9':
3102 scr_forwardindex (); 2698 scr_forwardindex ();
3103 break; 2699 break;
3104#endif 2700#endif
3105 case '=': 2701 case '=':
3278 { 2874 {
3279 case '>': 2875 case '>':
3280 if (ch == CSI_DA) /* secondary device attributes */ 2876 if (ch == CSI_DA) /* secondary device attributes */
3281 { 2877 {
3282 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2878 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3283 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions. 2879 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3284 // 2880 //
3285 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2881 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3286 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2882 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3287 // that we do not support xterm mouse reporting (should be 95 when we do). 2883 // that we do not support xterm mouse reporting (should be 95 when we do).
3288 // 2884 //
3289 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); 2885 tt_printf ("\033[>%d;94;0c", 'U');
3290 } 2886 }
3291 break; 2887 break;
3292 case '?': 2888 case '?':
3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2889 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3294 process_terminal_mode (ch, priv, nargs, arg); 2890 process_terminal_mode (ch, priv, nargs, arg);
3421 break; 3017 break;
3422 case 6: /* CPR requested */ 3018 case 6: /* CPR requested */
3423 scr_report_position (); 3019 scr_report_position ();
3424 break; 3020 break;
3425 case 7: /* unofficial extension */ 3021 case 7: /* unofficial extension */
3426 if (OPTION (Opt_insecure)) 3022 if (option (Opt_insecure))
3427 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3023 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3428 break; 3024 break;
3429 case 8: /* unofficial extension */ 3025 case 8: /* unofficial extension */
3430 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3026 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3431 break; 3027 break;
3498 break; 3094 break;
3499 case CSI_75: 3095 case CSI_75:
3500 scr_cursor (RESTORE); 3096 scr_cursor (RESTORE);
3501 break; 3097 break;
3502 3098
3503#if ENABLE_FRILLS 3099#if !ENABLE_MINIMAL
3504 case CSI_74: 3100 case CSI_74:
3505 process_window_ops (arg, nargs); 3101 process_window_ops (arg, nargs);
3506 break; 3102 break;
3507#endif 3103#endif
3508 3104
3515 break; 3111 break;
3516 } 3112 }
3517} 3113}
3518/*}}} */ 3114/*}}} */
3519 3115
3520#if ENABLE_FRILLS 3116#if !ENABLE_MINIMAL
3521/* ARGSUSED */ 3117/* ARGSUSED */
3522void 3118void
3523rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3119rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3524{ 3120{
3525 int x, y; 3121 int x, y;
3526 XWindowAttributes wattr; 3122 XWindowAttributes wattr;
3527 Window wdummy; 3123 Window wdummy;
3528 3124
3529 dLocal (Display *, xdisp); 3125 dLocal (Display *, dpy);
3530 3126
3531 if (nargs == 0) 3127 if (nargs == 0)
3532 return; 3128 return;
3533 3129
3534 switch (args[0]) 3130 switch (args[0])
3535 { 3131 {
3536 /* 3132 /*
3537 * commands 3133 * commands
3538 */ 3134 */
3539 case 1: /* deiconify window */ 3135 case 1: /* deiconify window */
3540 XMapWindow (xdisp, parent[0]); 3136 XMapWindow (dpy, parent[0]);
3541 break; 3137 break;
3542 case 2: /* iconify window */ 3138 case 2: /* iconify window */
3543 XIconifyWindow (xdisp, parent[0], display->screen); 3139 XIconifyWindow (dpy, parent[0], display->screen);
3544 break; 3140 break;
3545 case 3: /* set position (pixels) */ 3141 case 3: /* set position (pixels) */
3546 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3142 XMoveWindow (dpy, parent[0], args[1], args[2]);
3547 break; 3143 break;
3548 case 4: /* set size (pixels) */ 3144 case 4: /* set size (pixels) */
3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3145 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3550 break; 3146 break;
3551 case 5: /* raise window */ 3147 case 5: /* raise window */
3552 XRaiseWindow (xdisp, parent[0]); 3148 XRaiseWindow (dpy, parent[0]);
3553 break; 3149 break;
3554 case 6: /* lower window */ 3150 case 6: /* lower window */
3555 XLowerWindow (xdisp, parent[0]); 3151 XLowerWindow (dpy, parent[0]);
3556 break; 3152 break;
3557 case 7: /* refresh window */ 3153 case 7: /* refresh window */
3558 scr_touch (true); 3154 scr_touch (true);
3559 break; 3155 break;
3560 case 8: /* set size (chars) */ 3156 case 8: /* set size (chars) */
3567 if (args[0] >= 24) /* set height (chars) */ 3163 if (args[0] >= 24) /* set height (chars) */
3568 set_widthheight ((unsigned int)width, 3164 set_widthheight ((unsigned int)width,
3569 (unsigned int) (args[1] * fheight)); 3165 (unsigned int) (args[1] * fheight));
3570 break; 3166 break;
3571 3167
3572
3573 /* 3168 /*
3574 * reports - some output format copied from XTerm 3169 * reports - some output format copied from XTerm
3575 */ 3170 */
3576 case 11: /* report window state */ 3171 case 11: /* report window state */
3577 XGetWindowAttributes (xdisp, parent[0], &wattr); 3172 XGetWindowAttributes (dpy, parent[0], &wattr);
3578 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3173 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3579 break; 3174 break;
3580 case 13: /* report window position */ 3175 case 13: /* report window position */
3581 XGetWindowAttributes (xdisp, parent[0], &wattr); 3176 XGetWindowAttributes (dpy, parent[0], &wattr);
3582 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3177 XTranslateCoordinates (dpy, parent[0], wattr.root,
3583 -wattr.border_width, -wattr.border_width, 3178 -wattr.border_width, -wattr.border_width,
3584 &x, &y, &wdummy); 3179 &x, &y, &wdummy);
3585 tt_printf ("\033[3;%d;%dt", x, y); 3180 tt_printf ("\033[3;%d;%dt", x, y);
3586 break; 3181 break;
3587 case 14: /* report window size (pixels) */ 3182 case 14: /* report window size (pixels) */
3588 XGetWindowAttributes (xdisp, parent[0], &wattr); 3183 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3184 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3590 break; 3185 break;
3591 case 18: /* report text area size (chars) */ 3186 case 18: /* report text area size (chars) */
3592 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3187 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3593 break; 3188 break;
3595 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3190 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3596 break; 3191 break;
3597 case 20: /* report icon label */ 3192 case 20: /* report icon label */
3598 { 3193 {
3599 char *s; 3194 char *s;
3600 XGetIconName (xdisp, parent[0], &s); 3195 XGetIconName (dpy, parent[0], &s);
3601 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3196 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3602 XFree (s); 3197 XFree (s);
3603 } 3198 }
3604 break; 3199 break;
3605 case 21: /* report window title */ 3200 case 21: /* report window title */
3606 { 3201 {
3607 char *s; 3202 char *s;
3608 XFetchName (xdisp, parent[0], &s); 3203 XFetchName (dpy, parent[0], &s);
3609 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3204 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3610 XFree (s); 3205 XFree (s);
3611 } 3206 }
3612 break; 3207 break;
3613 } 3208 }
3614} 3209}
3641 seen_esc = true; 3236 seen_esc = true;
3642 continue; 3237 continue;
3643 } 3238 }
3644 else if (ch == C0_BEL || ch == CHAR_ST) 3239 else if (ch == C0_BEL || ch == CHAR_ST)
3645 break; 3240 break;
3241 else if (ch == C0_SYN)
3242 ch = cmd_get8 ();
3646 else if (ch < 0x20) 3243 else if (ch < 0x20)
3647 return NULL; /* other control character - exit */ 3244 return NULL; /* other control character - exit */
3648 3245
3649 seen_esc = false; 3246 seen_esc = false;
3650 3247
3651 if (n >= STRING_MAX - 1) 3248 if (n >= STRING_MAX - 1)
3652 // stop at some sane length 3249 // stop at some sane length
3653 return NULL; 3250 return NULL;
3654 3251
3655 if (ch == C0_SYN)
3656 string[n++] = cmd_get8 ();
3657 else
3658 string[n++] = ch; 3252 string[n++] = ch;
3659 } 3253 }
3660 3254
3661 string[n++] = '\0'; 3255 string[n++] = '\0';
3662 3256
3663 ends_how = (ch == 0x5c ? C0_ESC : ch); 3257 ends_how = (ch == 0x5c ? C0_ESC : ch);
3714void 3308void
3715rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3309rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3716{ 3310{
3717 if (str[0] == '?' && !str[1]) 3311 if (str[0] == '?' && !str[1])
3718 { 3312 {
3719 unsigned short r, g, b; 3313 rgba c;
3720 pix_colors_focused[color].get (this, r, g, b); 3314 pix_colors_focused[color].get (c);
3315
3316#if XFT
3317 if (c.a != rgba::MAX_CC)
3318 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3319 else
3320#endif
3721 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3321 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3722 } 3322 }
3723 else 3323 else
3724 set_window_color (color, str); 3324 set_window_color (color, str);
3725} 3325}
3726 3326
3733 int color; 3333 int color;
3734 char *buf, *name; 3334 char *buf, *name;
3735 bool query = str[0] == '?' && !str[1]; 3335 bool query = str[0] == '?' && !str[1];
3736 int saveop = op; 3336 int saveop = op;
3737 3337
3738 dLocal (Display *, xdisp); 3338 dLocal (Display *, dpy);
3739 3339
3740 assert (str != NULL); 3340 assert (str != NULL);
3341
3342 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3343 return;
3344
3741 switch (op) 3345 switch (op)
3742 { 3346 {
3743 case XTerm_name: 3347 case XTerm_name:
3744 set_title (str); 3348 set_title (str);
3745 /* FALLTHROUGH */ 3349 /* FALLTHROUGH */
3759 unsigned long bytes_after; 3363 unsigned long bytes_after;
3760 unsigned char *value = 0; 3364 unsigned char *value = 0;
3761 const char *str = ""; 3365 const char *str = "";
3762 3366
3763 if (prop 3367 if (prop
3764 && XGetWindowProperty (xdisp, parent[0], 3368 && XGetWindowProperty (dpy, parent[0],
3765 prop, 0, 1<<16, 0, AnyPropertyType, 3369 prop, 0, 1<<16, 0, AnyPropertyType,
3766 &actual_type, &actual_format, 3370 &actual_type, &actual_format,
3767 &nitems, &bytes_after, &value) == Success 3371 &nitems, &bytes_after, &value) == Success
3768 && actual_type != None 3372 && actual_type != None
3769 && actual_format == 8) 3373 && actual_format == 8)
3770 str = (const char *)(value); 3374 str = (const char *)(value);
3771 3375
3772 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3376 tt_printf ("\033]%d;%s%c", op, str, resp);
3773 3377
3774 XFree (value); 3378 XFree (value);
3775 } 3379 }
3776 else 3380 else
3777 { 3381 {
3781 { 3385 {
3782 *eq = 0; 3386 *eq = 0;
3783 set_utf8_property (display->atom (str), eq + 1); 3387 set_utf8_property (display->atom (str), eq + 1);
3784 } 3388 }
3785 else 3389 else
3786 XDeleteProperty (xdisp, parent[0], 3390 XDeleteProperty (dpy, parent[0],
3787 display->atom (str)); 3391 display->atom (str));
3788 } 3392 }
3789 break; 3393 break;
3790 3394
3791 case XTerm_Color: 3395 case XTerm_Color:
3801 break; 3405 break;
3802 3406
3803 if ((buf = strchr (name, ';')) != NULL) 3407 if ((buf = strchr (name, ';')) != NULL)
3804 *buf++ = '\0'; 3408 *buf++ = '\0';
3805 3409
3806 if (name[0] == '?' && !name[1]) 3410 process_color_seq (op, color, name, resp);
3807 {
3808 unsigned short r, g, b;
3809 pix_colors_focused[color].get (this, r, g, b);
3810 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3811 }
3812 else
3813 set_window_color (color, name);
3814 } 3411 }
3815 break; 3412 break;
3816 case XTerm_Color00: 3413 case XTerm_Color00:
3817 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3414 process_color_seq (op, Color_fg, str, resp);
3818 break; 3415 break;
3819 case XTerm_Color01: 3416 case XTerm_Color01:
3820 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3417 process_color_seq (op, Color_bg, str, resp);
3821 break; 3418 break;
3822#ifndef NO_CURSORCOLOR 3419#ifndef NO_CURSORCOLOR
3823 case XTerm_Color_cursor: 3420 case XTerm_Color_cursor:
3824 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3421 process_color_seq (op, Color_cursor, str, resp);
3825 break; 3422 break;
3826#endif 3423#endif
3827 case XTerm_Color_pointer_fg: 3424 case XTerm_Color_pointer_fg:
3828 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3425 process_color_seq (op, Color_pointer_fg, str, resp);
3829 break; 3426 break;
3830 case XTerm_Color_pointer_bg: 3427 case XTerm_Color_pointer_bg:
3831 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3428 process_color_seq (op, Color_pointer_bg, str, resp);
3832 break; 3429 break;
3833#ifndef NO_BOLD_UNDERLINE_REVERSE 3430#ifndef NO_BOLD_UNDERLINE_REVERSE
3834 case XTerm_Color_RV: 3431 case XTerm_Color_RV:
3835 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3432 process_color_seq (op, Color_RV, str, resp);
3836 break; 3433 break;
3837 case Rxvt_Color_BD: 3434 case Rxvt_Color_BD:
3838 case URxvt_Color_BD: 3435 case URxvt_Color_BD:
3839 process_color_seq (op, Color_BD, str, resp); 3436 process_color_seq (op, Color_BD, str, resp);
3840 break; 3437 break;
3841 case Rxvt_Color_UL: 3438 case Rxvt_Color_UL:
3842 case URxvt_Color_UL: 3439 case URxvt_Color_UL:
3843 process_color_seq (op, Color_UL, str, resp); 3440 process_color_seq (op, Color_UL, str, resp);
3844 break; 3441 break;
3845 case URxvt_Color_IT: 3442 case URxvt_Color_IT:
3846 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3443 process_color_seq (op, Color_IT, str, resp);
3847 break; 3444 break;
3848#endif 3445#endif
3849#if TRANSPARENT && TINTING 3446#if TRANSPARENT && TINTING
3850 case URxvt_Color_tint: 3447 case URxvt_Color_tint:
3851 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3448 process_color_seq (op, Color_tint, str, resp);
3449
3852 check_our_parents (); 3450 check_our_parents ();
3451
3853 if (am_transparent) 3452 if (am_transparent)
3854 want_full_refresh = want_refresh = 1; 3453 want_full_refresh = want_refresh = 1;
3454
3855 break; 3455 break;
3856#endif 3456#endif
3857 3457
3858 case Rxvt_Pixmap: 3458 case Rxvt_Pixmap:
3859 { 3459 {
3881#ifdef XPM_BACKGROUND 3481#ifdef XPM_BACKGROUND
3882 resize_pixmap (); 3482 resize_pixmap ();
3883 scr_touch (true); 3483 scr_touch (true);
3884#endif 3484#endif
3885 } 3485 }
3486#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
3487 if (option(Opt_transparent))
3488 check_our_parents ();
3489#endif
3490
3886 } 3491 }
3887 break; 3492 break;
3888 3493
3889 case Rxvt_restoreFG: 3494 case Rxvt_restoreFG:
3890 set_window_color (Color_fg, str); 3495 set_window_color (Color_fg, str);
3917 case URxvt_italicFont: 3522 case URxvt_italicFont:
3918 case URxvt_boldItalicFont: 3523 case URxvt_boldItalicFont:
3919#endif 3524#endif
3920 if (query) 3525 if (query)
3921 tt_printf ("\33]%d;%-.250s%c", saveop, 3526 tt_printf ("\33]%d;%-.250s%c", saveop,
3922 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3527 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3923 ? fontset[op - URxvt_font]->fontdesc : "", 3528 ? fontset[op - URxvt_font]->fontdesc : "",
3924 resp); 3529 resp);
3925 else 3530 else
3926 { 3531 {
3927 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3532 const char *&res = rs[Rs_font + (op - URxvt_font)];
3930 allocated.push_back ((void *)res); 3535 allocated.push_back ((void *)res);
3931 set_fonts (); 3536 set_fonts ();
3932 } 3537 }
3933 break; 3538 break;
3934 3539
3935#if ENABLE_FRILLS 3540 case URxvt_version:
3541 if (query)
3542 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3543 op,
3544 rs[Rs_name], VERSION[0], VERSION[2],
3545 resp);
3546 break;
3547
3548#if !ENABLE_MINIMAL
3936 case URxvt_locale: 3549 case URxvt_locale:
3937 if (query) 3550 if (query)
3938 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3551 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3939 else 3552 else
3940 { 3553 {
3941 set_locale (str); 3554 set_locale (str);
3942 pty->set_utf8_mode (enc_utf8); 3555 pty->set_utf8_mode (enc_utf8);
3943 init_xlocale (); 3556 init_xlocale ();
3958 break; 3571 break;
3959#endif 3572#endif
3960 3573
3961#if ENABLE_PERL 3574#if ENABLE_PERL
3962 case URxvt_perl: 3575 case URxvt_perl:
3963 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3576 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3964 ; // no responses yet 3577 ; // no responses yet
3965 break; 3578 break;
3966#endif 3579#endif
3967 } 3580 }
3968} 3581}
4084 scr_touch (true); 3697 scr_touch (true);
4085 break; 3698 break;
4086#endif 3699#endif
4087 case 1048: /* alternative cursor save */ 3700 case 1048: /* alternative cursor save */
4088 case 1049: 3701 case 1049:
4089 if (OPTION (Opt_secondaryScreen)) 3702 if (option (Opt_secondaryScreen))
4090 if (mode == 0) 3703 if (mode == 0)
4091 scr_cursor (RESTORE); 3704 scr_cursor (RESTORE);
4092 else if (mode == 1) 3705 else if (mode == 1)
4093 scr_cursor (SAVE); 3706 scr_cursor (SAVE);
4094 break; 3707 break;
4159 break; 3772 break;
4160 case 1011: /* scroll to bottom on key press */ 3773 case 1011: /* scroll to bottom on key press */
4161 set_option (Opt_scrollTtyKeypress, state); 3774 set_option (Opt_scrollTtyKeypress, state);
4162 break; 3775 break;
4163 case 1047: /* secondary screen w/ clearing last */ 3776 case 1047: /* secondary screen w/ clearing last */
4164 if (OPTION (Opt_secondaryScreen)) 3777 if (option (Opt_secondaryScreen))
4165 if (current_screen != PRIMARY) 3778 if (current_screen != PRIMARY)
4166 scr_erase_screen (2); 3779 scr_erase_screen (2);
4167 scr_change_screen (state); 3780 scr_change_screen (state);
4168 break; 3781 break;
4169 case 1049: /* secondary screen w/ clearing first */ 3782 case 1049: /* secondary screen w/ clearing first */
4170 scr_change_screen (state); 3783 scr_change_screen (state);
4171 if (OPTION (Opt_secondaryScreen)) 3784 if (option (Opt_secondaryScreen))
4172 if (current_screen != PRIMARY) 3785 if (current_screen != PRIMARY)
4173 scr_erase_screen (2); 3786 scr_erase_screen (2);
4174 break; 3787 break;
4175 default: 3788 default:
4176 break; 3789 break;
4304 scr_color (Color_bg, Color_bg); 3917 scr_color (Color_bg, Color_bg);
4305 break; 3918 break;
4306 3919
4307 //case 50: // not variable spacing 3920 //case 50: // not variable spacing
4308 3921
4309#if ENABLE_FRILLS 3922#if !ENABLE_MINIMAL
4310 case 90: 3923 case 90:
4311 case 91: /* set bright fg color */ 3924 case 91: /* set bright fg color */
4312 case 92: 3925 case 92:
4313 case 93: 3926 case 93:
4314 case 94: 3927 case 94:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines