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.291 by root, Sun Jan 29 20:51:27 2006 UTC vs.
Revision 1.323 by ayin, Mon May 28 18:38:03 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
64 63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 67
… …
227# if !UNICODE3 226# if !UNICODE3
228 if (ch >= 0x10000) 227 if (ch >= 0x10000)
229 ch = 0xfffd; 228 ch = 0xfffd;
230# endif 229# endif
231 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
233 } 234 }
234 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
235 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
237 243
238 free (fname); 244 free (fname);
239 245
… …
292 298
293 return -1; 299 return -1;
294} 300}
295#endif 301#endif
296 302
297/*{{{ Convert the keypress event into a string */
298void 303void
299rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
300{ 305{
301 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
302 unsigned int newlen; 307 unsigned int newlen;
303 KeySym keysym; 308 KeySym keysym;
304 int valid_keysym; 309 int valid_keysym;
305 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
306 316
307 /* 317 /*
308 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
309 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
310 * 320 *
… …
487 { 497 {
488 commit_iso14755 (); 498 commit_iso14755 ();
489 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
490# if ISO_14755 500# if ISO_14755
491 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
492# endif 510# endif
493 return; 511 return;
494 } 512 }
495 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
496 { 514 {
… …
867 return; 885 return;
868 886
869 if (len <= 0) 887 if (len <= 0)
870 return; /* not mapped */ 888 return; /* not mapped */
871 889
872 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
873 if (view_start) 891 if (view_start)
874 { 892 {
875 view_start = 0; 893 view_start = 0;
876 want_refresh = 1; 894 want_refresh = 1;
877 } 895 }
… …
901 tt_write (&ch, 1); 919 tt_write (&ch, 1);
902 } 920 }
903 921
904 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
905} 923}
906/*}}} */ 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ENABLE_OVERLAY
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ENABLE_OVERLAY
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
907 1001
908#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
909unsigned int 1003unsigned int
910rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
911{ 1005{
… …
1088 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1089 } 1183 }
1090} 1184}
1091#endif 1185#endif
1092 1186
1093#if HAVE_SCHED_YIELD 1187#if LINUX_YIELD_HACK
1094static struct event_handler 1188static struct event_handler
1095{ 1189{
1096 check_watcher cw_yield; 1190 check_watcher yield_ev;
1097 1191
1098 void yield (check_watcher &w) 1192 void yield_cb (check_watcher &w)
1099 { 1193 {
1100 sched_yield (); 1194 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS.
1198
1199 struct timespec ts = { 0, 0 };
1200 nanosleep (&ts, 0);
1201
1101 w.stop (); 1202 w.stop ();
1102 } 1203 }
1103 1204
1104 event_handler () 1205 event_handler ()
1105 : cw_yield (this, &event_handler::yield) 1206 : yield_ev (this, &event_handler::yield_cb)
1106 { 1207 {
1107 } 1208 }
1108} event_handler; 1209} event_handler;
1109#endif 1210#endif
1110 1211
… …
1130 cmdbuf_endp += r; 1231 cmdbuf_endp += r;
1131 return true; 1232 return true;
1132 } 1233 }
1133 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134 { 1235 {
1135#if HAVE_SCHED_YIELD 1236#if LINUX_YIELD_HACK
1136 if (display->is_local) 1237 if (display->is_local)
1137 event_handler.cw_yield.start (); 1238 event_handler.yield_ev.start ();
1138#endif 1239#endif
1139 } 1240 }
1140 else 1241 else
1141 { 1242 {
1142 pty_ev.stop (); 1243 pty_ev.stop ();
1143 1244
1144 if (!OPTION (Opt_hold)) 1245 if (!option (Opt_hold))
1145 destroy (); 1246 destroy ();
1146 } 1247 }
1147 1248
1148 return false; 1249 return false;
1149} 1250}
… …
1164} 1265}
1165 1266
1166void 1267void
1167rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1168{ 1269{
1169 XDefineCursor (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);
1462 } 1494 }
1463 1495
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1496 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1465 1497
1466#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1498#ifdef TRANSPARENT
1467 if (OPTION (Opt_transparent)) 1499 if (option (Opt_transparent))
1468 check_our_parents (); 1500 check_our_parents ();
1469#endif 1501#endif
1470 } 1502 }
1471 break; 1503 break;
1472 1504
… …
1518 if (ev.xany.window == vt) 1550 if (ev.xany.window == vt)
1519 { 1551 {
1520 do 1552 do
1521 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1522 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1523 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1524 1556
1525 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1526 1558
1527 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1530 1562
1531 want_refresh = 1; 1563 want_refresh = 1;
1532 } 1564 }
1533 else 1565 else
1534 { 1566 {
1535 XEvent unused_event; 1567 XEvent unused_event;
1536 1568
1537 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1538 ; 1570 ;
1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1540 ; 1572 ;
1541 1573
1542 if (isScrollbarWindow (ev.xany.window)) 1574 if (isScrollbarWindow (ev.xany.window))
1543 { 1575 {
1544 scrollBar.setIdle (); 1576 scrollBar.setIdle ();
1545 scrollbar_show (0); 1577 scrollbar_show (0);
1546 } 1578 }
1547 1579
1548#ifdef TRANSPARENT 1580#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == parent[0]) 1581 if (am_transparent && ev.xany.window == parent[0])
1550 XClearWindow (xdisp, ev.xany.window); 1582 XClearWindow (dpy, ev.xany.window);
1551#endif 1583#endif
1552 } 1584 }
1553 break; 1585 break;
1554 1586
1555 case MotionNotify: 1587 case MotionNotify:
… …
1565 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1597 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1566 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1598 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1567 ; // nop 1599 ; // nop
1568 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1600 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1569 { 1601 {
1570 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1571 ; 1603 ;
1572 1604
1573 XQueryPointer (xdisp, vt, 1605 XQueryPointer (dpy, vt,
1574 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1575 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1576 &ev.xbutton.x, &ev.xbutton.y, 1608 &ev.xbutton.x, &ev.xbutton.y,
1577 &ev.xbutton.state); 1609 &ev.xbutton.state);
1578#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
… …
1642#endif 1674#endif
1643 } 1675 }
1644 } 1676 }
1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1646 { 1678 {
1647 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1679 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1648 MotionNotify, &ev)) 1680 MotionNotify, &ev))
1649 ; 1681 ;
1650 1682
1651 XQueryPointer (xdisp, scrollBar.win, 1683 XQueryPointer (dpy, scrollBar.win,
1652 &unused_root, &unused_child, 1684 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1685 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1686 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1687 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1660 scrollbar_show (1); 1692 scrollbar_show (1);
1661 } 1693 }
1662 break; 1694 break;
1663 } 1695 }
1664 1696
1665skip_switch: ;
1666
1667#if defined(CURSOR_BLINK) 1697#if defined(CURSOR_BLINK)
1668 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1698 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1669 { 1699 {
1670 if (hidden_cursor) 1700 if (hidden_cursor)
1671 { 1701 {
1672 hidden_cursor = 0; 1702 hidden_cursor = 0;
1673 want_refresh = 1; 1703 want_refresh = 1;
… …
1676 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1706 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1677 } 1707 }
1678#endif 1708#endif
1679 1709
1680#if defined(POINTER_BLANK) 1710#if defined(POINTER_BLANK)
1681 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1711 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1682 { 1712 {
1683 if (ev.type == MotionNotify 1713 if (ev.type == MotionNotify
1684 || ev.type == ButtonPress 1714 || ev.type == ButtonPress
1685 || ev.type == ButtonRelease) 1715 || ev.type == ButtonRelease)
1686 if (hidden_pointer) 1716 if (hidden_pointer)
… …
1698 if (!focus) 1728 if (!focus)
1699 { 1729 {
1700 focus = 1; 1730 focus = 1;
1701 want_refresh = 1; 1731 want_refresh = 1;
1702 1732
1703 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1733 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1704 1734
1705#if USE_XIM 1735#if USE_XIM
1706 if (Input_Context != NULL) 1736 if (Input_Context != NULL)
1707 { 1737 {
1708 IMSetStatusPosition (); 1738 IMSetPosition ();
1709 XSetICFocus (Input_Context); 1739 XSetICFocus (Input_Context);
1710 } 1740 }
1711#endif 1741#endif
1712#if CURSOR_BLINK 1742#if CURSOR_BLINK
1713 if (OPTION (Opt_cursorBlink)) 1743 if (option (Opt_cursorBlink))
1714 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1744 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1715#endif 1745#endif
1716#if OFF_FOCUS_FADING 1746#if OFF_FOCUS_FADING
1717 if (rs[Rs_fade]) 1747 if (rs[Rs_fade])
1718 { 1748 {
1719 pix_colors = pix_colors_focused; 1749 pix_colors = pix_colors_focused;
1720 scr_recolour (); 1750 scr_recolour ();
1751 }
1752#endif
1753#if ENABLE_FRILLS
1754 if (option (Opt_urgentOnBell))
1755 {
1756 XWMHints *h;
1757
1758 h = XGetWMHints(dpy, parent[0]);
1759 if (h != NULL)
1760 {
1761 h->flags &= ~XUrgencyHint;
1762 XSetWMHints(dpy, parent[0], h);
1763 }
1721 } 1764 }
1722#endif 1765#endif
1723 } 1766 }
1724} 1767}
1725 1768
… …
1745#if USE_XIM 1788#if USE_XIM
1746 if (Input_Context != NULL) 1789 if (Input_Context != NULL)
1747 XUnsetICFocus (Input_Context); 1790 XUnsetICFocus (Input_Context);
1748#endif 1791#endif
1749#if CURSOR_BLINK 1792#if CURSOR_BLINK
1750 if (OPTION (Opt_cursorBlink)) 1793 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.stop (); 1794 cursor_blink_ev.stop ();
1752 hidden_cursor = 0; 1795 hidden_cursor = 0;
1753#endif 1796#endif
1754#if OFF_FOCUS_FADING 1797#if OFF_FOCUS_FADING
1755 if (rs[Rs_fade]) 1798 if (rs[Rs_fade])
… …
1759 } 1802 }
1760#endif 1803#endif
1761 } 1804 }
1762} 1805}
1763 1806
1764#if TRANSPARENT 1807void
1808rxvt_term::update_fade_color (unsigned int idx)
1809{
1810#if OFF_FOCUS_FADING
1811 if (rs[Rs_fade])
1812 {
1813 rgba c;
1814 pix_colors [Color_fade].get (c);
1815 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1816 }
1817#endif
1818}
1819
1820#if TRANSPARENT || ENABLE_PERL
1765void 1821void
1766rxvt_term::rootwin_cb (XEvent &ev) 1822rxvt_term::rootwin_cb (XEvent &ev)
1767{ 1823{
1768 make_current (); 1824 make_current ();
1769 1825
1826 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1827 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1828 return;
1829
1830# if TRANSPARENT
1770 switch (ev.type) 1831 switch (ev.type)
1771 { 1832 {
1772 case PropertyNotify: 1833 case PropertyNotify:
1773 /* 1834 /*
1774 * if user used some Esetroot compatible prog to set the root bg, 1835 * if user used some Esetroot compatible prog to set the root bg,
… …
1778 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1779 return; 1840 return;
1780 1841
1781 /* FALLTHROUGH */ 1842 /* FALLTHROUGH */
1782 case ReparentNotify: 1843 case ReparentNotify:
1783 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1844 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1784 want_refresh = want_full_refresh = 1; 1845 want_refresh = want_full_refresh = 1;
1785 break; 1846 break;
1786 } 1847 }
1848# endif
1787} 1849}
1788#endif 1850#endif
1789 1851
1790void 1852void
1791rxvt_term::button_press (XButtonEvent &ev) 1853rxvt_term::button_press (XButtonEvent &ev)
… …
2119 selection_make (ev.time); 2181 selection_make (ev.time);
2120 break; 2182 break;
2121 2183
2122 case Button2: 2184 case Button2:
2123 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2185 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); 2186 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2125 break; 2187 break;
2126 2188
2127#ifdef MOUSE_WHEEL 2189#ifdef MOUSE_WHEEL
2128 case Button4: 2190 case Button4:
2129 case Button5: 2191 case Button5:
… …
2133 2195
2134 v = ev.button == Button4 ? UP : DN; 2196 v = ev.button == Button4 ? UP : DN;
2135 2197
2136 if (ev.state & ShiftMask) 2198 if (ev.state & ShiftMask)
2137 i = 1; 2199 i = 1;
2138 else if (OPTION (Opt_mouseWheelScrollPage)) 2200 else if (option (Opt_mouseWheelScrollPage))
2139 i = nrow - 1; 2201 i = nrow - 1;
2140 else 2202 else
2141 i = 5; 2203 i = 5;
2142 2204
2143# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
… …
2414 Pixmap rootpixmap = None; 2476 Pixmap rootpixmap = None;
2415 XWindowAttributes wattr, wrootattr; 2477 XWindowAttributes wattr, wrootattr;
2416 2478
2417 pchanged = 0; 2479 pchanged = 0;
2418 2480
2419 if (!OPTION (Opt_transparent)) 2481 if (!option (Opt_transparent))
2420 return pchanged; /* Don't try any more */ 2482 return pchanged; /* Don't try any more */
2421 2483
2422 XGetWindowAttributes (xdisp, display->root, &wrootattr); 2484 XGetWindowAttributes (dpy, display->root, &wrootattr);
2423 rootdepth = wrootattr.depth; 2485 rootdepth = wrootattr.depth;
2424 2486
2425 XGetWindowAttributes (xdisp, parent[0], &wattr); 2487 XGetWindowAttributes (dpy, parent[0], &wattr);
2426 2488
2427 if (rootdepth != wattr.depth) 2489 if (rootdepth != wattr.depth)
2428 { 2490 {
2429 if (am_transparent) 2491 if (am_transparent)
2430 { 2492 {
2431 pchanged = 1; 2493 pchanged = 1;
2432 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2494 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2433 am_transparent = am_pixmap_trans = 0; 2495 am_transparent = am_pixmap_trans = 0;
2434 } 2496 }
2435 2497
2436 return pchanged; /* Don't try any more */ 2498 return pchanged; /* Don't try any more */
2437 } 2499 }
2438 2500
2439 /* Get all X ops out of the queue so that our information is up-to-date. */ 2501 /* Get all X ops out of the queue so that our information is up-to-date. */
2440 XSync (xdisp, False); 2502 XSync (dpy, False);
2441 2503
2442 /* 2504 /*
2443 * Make the frame window set by the window manager have 2505 * Make the frame window set by the window manager have
2444 * the root background. Some window managers put multiple nested frame 2506 * the root background. Some window managers put multiple nested frame
2445 * windows for each client, so we have to take care about that. 2507 * windows for each client, so we have to take care about that.
2446 */ 2508 */
2447 i = (xa[XA_XROOTPMAP_ID] 2509 i = (xa[XA_XROOTPMAP_ID]
2448 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID], 2510 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2449 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2511 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2450 &nitems, &bytes_after, &prop) == Success); 2512 &nitems, &bytes_after, &prop) == Success);
2451 2513
2452 if (!i || prop == NULL) 2514 if (!i || prop == NULL)
2453 i = (xa[XA_ESETROOT_PMAP_ID] 2515 i = (xa[XA_ESETROOT_PMAP_ID]
2454 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID], 2516 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2455 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2517 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2456 &nitems, &bytes_after, &prop) == Success); 2518 &nitems, &bytes_after, &prop) == Success);
2457 2519
2458 if (!i || prop == NULL 2520 if (!i || prop == NULL
2459#if TINTING 2521#if TINTING
2460 || !rs[Rs_color + Color_tint] 2522 || !ISSET_PIXCOLOR (Color_tint)
2461#endif 2523#endif
2462 ) 2524 )
2463 have_pixmap = 0; 2525 have_pixmap = 0;
2464 else 2526 else
2465 { 2527 {
… …
2478 Window cr; 2540 Window cr;
2479 XImage *image; 2541 XImage *image;
2480 GC gc; 2542 GC gc;
2481 XGCValues gcvalue; 2543 XGCValues gcvalue;
2482 2544
2483 XTranslateCoordinates (xdisp, parent[0], display->root, 2545 XTranslateCoordinates (dpy, parent[0], display->root,
2484 0, 0, &sx, &sy, &cr); 2546 0, 0, &sx, &sy, &cr);
2485 nw = (unsigned int)szHint.width; 2547 nw = (unsigned int)szHint.width;
2486 nh = (unsigned int)szHint.height; 2548 nh = (unsigned int)szHint.height;
2487 nx = ny = 0; 2549 nx = ny = 0;
2488 2550
… …
2501 } 2563 }
2502 2564
2503 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2565 min_it (nw, (unsigned int) (wrootattr.width - sx));
2504 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2566 min_it (nh, (unsigned int) (wrootattr.height - sy));
2505 2567
2506 XSync (xdisp, False); 2568 XSync (dpy, False);
2507 allowedxerror = -1; 2569 allowedxerror = -1;
2508 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2570 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2509 2571
2510 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2572 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2511 /* XXX: may need a delay here? */ 2573 /* XXX: may need a delay here? */
2512 allowedxerror = 0; 2574 allowedxerror = 0;
2513 2575
… …
2516 if (am_transparent && am_pixmap_trans) 2578 if (am_transparent && am_pixmap_trans)
2517 { 2579 {
2518 pchanged = 1; 2580 pchanged = 1;
2519 if (pixmap != None) 2581 if (pixmap != None)
2520 { 2582 {
2521 XFreePixmap (xdisp, pixmap); 2583 XFreePixmap (dpy, pixmap);
2522 pixmap = None; 2584 pixmap = None;
2523 } 2585 }
2524 } 2586 }
2525 2587
2526 am_pixmap_trans = 0; 2588 am_pixmap_trans = 0;
2527 } 2589 }
2528 else 2590 else
2529 { 2591 {
2530 if (pixmap != None) 2592 if (pixmap != None)
2531 XFreePixmap (xdisp, pixmap); 2593 XFreePixmap (dpy, pixmap);
2532 2594
2533#if TINTING 2595#if TINTING
2534 if (ISSET_PIXCOLOR (Color_tint)) 2596 if (ISSET_PIXCOLOR (Color_tint))
2535 { 2597 {
2536 rxvt_rgba c;
2537 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2598 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2538 2599
2600 rgba c;
2539 pix_colors_focused[Color_tint].get (this, c); 2601 pix_colors_focused [Color_tint].get (c);
2540 2602
2541 ShadeXImage (this, image, shade, c.r, c.g, c.b); 2603 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2542 } 2604 }
2543#endif 2605#endif
2544 2606
2545 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth); 2607 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2546 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue); 2608 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2547 XPutImage (xdisp, pixmap, gc, image, 0, 0, 2609 XPutImage (dpy, pixmap, gc, image, 0, 0,
2548 nx, ny, image->width, image->height); 2610 nx, ny, image->width, image->height);
2549 XFreeGC (xdisp, gc); 2611 XFreeGC (dpy, gc);
2550 XDestroyImage (image); 2612 XDestroyImage (image);
2551 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap); 2613 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2552 XClearWindow (xdisp, parent[0]); 2614 XClearWindow (dpy, parent[0]);
2553 2615
2554 if (!am_transparent || !am_pixmap_trans) 2616 if (!am_transparent || !am_pixmap_trans)
2555 pchanged = 1; 2617 pchanged = 1;
2556 2618
2557 am_transparent = am_pixmap_trans = 1; 2619 am_transparent = am_pixmap_trans = 1;
2558 } 2620 }
2559 } 2621 }
2560 2622
2561 if (am_pixmap_trans) 2623 if (am_pixmap_trans)
2562 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2624 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2563 else 2625 else
2564 { 2626 {
2565 unsigned int n; 2627 unsigned int n;
2566 /* 2628 /*
2567 * InheritPixmap transparency 2629 * InheritPixmap transparency
2568 */ 2630 */
2569 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2631 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2570 { 2632 {
2571 oldp = parent[i]; 2633 oldp = parent[i];
2572 XQueryTree (xdisp, parent[i - 1], &root, 2634 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2573 &parent[i], &list, &n);
2574 XFree (list); 2635 XFree (list);
2575 2636
2576 if (parent[i] == display->root) 2637 if (parent[i] == display->root)
2577 { 2638 {
2578 if (oldp != None) 2639 if (oldp != None)
… …
2586 } 2647 }
2587 2648
2588 n = 0; 2649 n = 0;
2589 2650
2590 if (pchanged) 2651 if (pchanged)
2591 {
2592 for (; n < (unsigned int)i; n++) 2652 for (; n < (unsigned int)i; n++)
2593 { 2653 {
2594 XGetWindowAttributes (xdisp, parent[n], &wattr); 2654 XGetWindowAttributes (dpy, parent[n], &wattr);
2655
2595 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2656 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2596 { 2657 {
2597 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2658 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2598 break; 2659 break;
2599 } 2660 }
2600 } 2661 }
2601 }
2602 2662
2603 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2663 if (n > (sizeof (parent) / sizeof (parent[0])))
2604 { 2664 {
2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); 2665 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2666 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2607 am_transparent = 0; 2667 am_transparent = 0;
2608 /* XXX: also turn off Opt_transparent? */ 2668 /* XXX: also turn off Opt_transparent? */
2609 } 2669 }
2610 else 2670 else
2611 { 2671 {
2612 for (n = 0; n < (unsigned int)i; n++) 2672 for (n = 0; n < (unsigned int)i; n++)
2613 { 2673 {
2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative); 2674 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2615 XClearWindow (xdisp, parent[n]); 2675 XClearWindow (dpy, parent[n]);
2616 } 2676 }
2617 2677
2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2678 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2619 am_transparent = 1; 2679 am_transparent = 1;
2620 } 2680 }
2621 2681
2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2682 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2623 parent[i] = None; 2683 parent[i] = None;
2624 } 2684 }
2625 2685
2626 if (scrollBar.win) 2686 if (scrollBar.win)
2627 { 2687 {
2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative); 2688 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2629 scrollBar.setIdle (); 2689 scrollBar.setIdle ();
2630 scrollbar_show (0); 2690 scrollbar_show (0);
2631 } 2691 }
2632 2692
2633 if (am_transparent) 2693 if (am_transparent)
… …
2696 if (ch == C0_LF) 2756 if (ch == C0_LF)
2697 nlines++; 2757 nlines++;
2698 2758
2699 refresh_count++; 2759 refresh_count++;
2700 2760
2701 if (!OPTION (Opt_jumpScroll) 2761 if (!option (Opt_jumpScroll)
2702 || (refresh_count >= refresh_limit * (nrow - 1))) 2762 || (refresh_count >= refresh_limit * (nrow - 1)))
2703 { 2763 {
2704 refreshnow = true; 2764 refreshnow = true;
2705 refresh_count = 0; 2765 refresh_count = 0;
2706 ch = NOCHAR; 2766 ch = NOCHAR;
… …
2746 * the number of pages between refreshes is refresh_limit, which 2806 * the number of pages between refreshes is refresh_limit, which
2747 * is incremented here because we must be doing flat-out scrolling. 2807 * is incremented here because we must be doing flat-out scrolling.
2748 */ 2808 */
2749 if (refreshnow) 2809 if (refreshnow)
2750 { 2810 {
2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2811 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2752 refresh_limit++; 2812 refresh_limit++;
2753 else 2813 else
2754 { 2814 {
2755 flag = true; 2815 flag = true;
2816 //TODO: due to popular request, implement "skipscroll" option here
2756 scr_refresh (); 2817 scr_refresh ();
2757 want_refresh = 1; 2818 want_refresh = 1;
2758 } 2819 }
2759 } 2820 }
2760 2821
… …
3084 scr_charset_set (2, (unsigned int)cmd_getc ()); 3145 scr_charset_set (2, (unsigned int)cmd_getc ());
3085 break; 3146 break;
3086 case '+': 3147 case '+':
3087 scr_charset_set (3, (unsigned int)cmd_getc ()); 3148 scr_charset_set (3, (unsigned int)cmd_getc ());
3088 break; 3149 break;
3089#if ENABLE_FRILLS 3150#if !ENABLE_MINIMAL
3090 case '6': 3151 case '6':
3091 scr_backindex (); 3152 scr_backindex ();
3092 break; 3153 break;
3093#endif 3154#endif
3094 case '7': 3155 case '7':
3095 scr_cursor (SAVE); 3156 scr_cursor (SAVE);
3096 break; 3157 break;
3097 case '8': 3158 case '8':
3098 scr_cursor (RESTORE); 3159 scr_cursor (RESTORE);
3099 break; 3160 break;
3100#if ENABLE_FRILLS 3161#if !ENABLE_MINIMAL
3101 case '9': 3162 case '9':
3102 scr_forwardindex (); 3163 scr_forwardindex ();
3103 break; 3164 break;
3104#endif 3165#endif
3105 case '=': 3166 case '=':
… …
3421 break; 3482 break;
3422 case 6: /* CPR requested */ 3483 case 6: /* CPR requested */
3423 scr_report_position (); 3484 scr_report_position ();
3424 break; 3485 break;
3425 case 7: /* unofficial extension */ 3486 case 7: /* unofficial extension */
3426 if (OPTION (Opt_insecure)) 3487 if (option (Opt_insecure))
3427 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3488 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3428 break; 3489 break;
3429 case 8: /* unofficial extension */ 3490 case 8: /* unofficial extension */
3430 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3491 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3431 break; 3492 break;
… …
3498 break; 3559 break;
3499 case CSI_75: 3560 case CSI_75:
3500 scr_cursor (RESTORE); 3561 scr_cursor (RESTORE);
3501 break; 3562 break;
3502 3563
3503#if ENABLE_FRILLS 3564#if !ENABLE_MINIMAL
3504 case CSI_74: 3565 case CSI_74:
3505 process_window_ops (arg, nargs); 3566 process_window_ops (arg, nargs);
3506 break; 3567 break;
3507#endif 3568#endif
3508 3569
… …
3515 break; 3576 break;
3516 } 3577 }
3517} 3578}
3518/*}}} */ 3579/*}}} */
3519 3580
3520#if ENABLE_FRILLS 3581#if !ENABLE_MINIMAL
3521/* ARGSUSED */ 3582/* ARGSUSED */
3522void 3583void
3523rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3584rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3524{ 3585{
3525 int x, y; 3586 int x, y;
3526 XWindowAttributes wattr; 3587 XWindowAttributes wattr;
3527 Window wdummy; 3588 Window wdummy;
3528 3589
3529 dLocal (Display *, xdisp); 3590 dLocal (Display *, dpy);
3530 3591
3531 if (nargs == 0) 3592 if (nargs == 0)
3532 return; 3593 return;
3533 3594
3534 switch (args[0]) 3595 switch (args[0])
3535 { 3596 {
3536 /* 3597 /*
3537 * commands 3598 * commands
3538 */ 3599 */
3539 case 1: /* deiconify window */ 3600 case 1: /* deiconify window */
3540 XMapWindow (xdisp, parent[0]); 3601 XMapWindow (dpy, parent[0]);
3541 break; 3602 break;
3542 case 2: /* iconify window */ 3603 case 2: /* iconify window */
3543 XIconifyWindow (xdisp, parent[0], display->screen); 3604 XIconifyWindow (dpy, parent[0], display->screen);
3544 break; 3605 break;
3545 case 3: /* set position (pixels) */ 3606 case 3: /* set position (pixels) */
3546 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3607 XMoveWindow (dpy, parent[0], args[1], args[2]);
3547 break; 3608 break;
3548 case 4: /* set size (pixels) */ 3609 case 4: /* set size (pixels) */
3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3610 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3550 break; 3611 break;
3551 case 5: /* raise window */ 3612 case 5: /* raise window */
3552 XRaiseWindow (xdisp, parent[0]); 3613 XRaiseWindow (dpy, parent[0]);
3553 break; 3614 break;
3554 case 6: /* lower window */ 3615 case 6: /* lower window */
3555 XLowerWindow (xdisp, parent[0]); 3616 XLowerWindow (dpy, parent[0]);
3556 break; 3617 break;
3557 case 7: /* refresh window */ 3618 case 7: /* refresh window */
3558 scr_touch (true); 3619 scr_touch (true);
3559 break; 3620 break;
3560 case 8: /* set size (chars) */ 3621 case 8: /* set size (chars) */
… …
3567 if (args[0] >= 24) /* set height (chars) */ 3628 if (args[0] >= 24) /* set height (chars) */
3568 set_widthheight ((unsigned int)width, 3629 set_widthheight ((unsigned int)width,
3569 (unsigned int) (args[1] * fheight)); 3630 (unsigned int) (args[1] * fheight));
3570 break; 3631 break;
3571 3632
3572
3573 /* 3633 /*
3574 * reports - some output format copied from XTerm 3634 * reports - some output format copied from XTerm
3575 */ 3635 */
3576 case 11: /* report window state */ 3636 case 11: /* report window state */
3577 XGetWindowAttributes (xdisp, parent[0], &wattr); 3637 XGetWindowAttributes (dpy, parent[0], &wattr);
3578 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3638 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3579 break; 3639 break;
3580 case 13: /* report window position */ 3640 case 13: /* report window position */
3581 XGetWindowAttributes (xdisp, parent[0], &wattr); 3641 XGetWindowAttributes (dpy, parent[0], &wattr);
3582 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3642 XTranslateCoordinates (dpy, parent[0], wattr.root,
3583 -wattr.border_width, -wattr.border_width, 3643 -wattr.border_width, -wattr.border_width,
3584 &x, &y, &wdummy); 3644 &x, &y, &wdummy);
3585 tt_printf ("\033[3;%d;%dt", x, y); 3645 tt_printf ("\033[3;%d;%dt", x, y);
3586 break; 3646 break;
3587 case 14: /* report window size (pixels) */ 3647 case 14: /* report window size (pixels) */
3588 XGetWindowAttributes (xdisp, parent[0], &wattr); 3648 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3649 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3590 break; 3650 break;
3591 case 18: /* report text area size (chars) */ 3651 case 18: /* report text area size (chars) */
3592 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3652 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3593 break; 3653 break;
… …
3595 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3655 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3596 break; 3656 break;
3597 case 20: /* report icon label */ 3657 case 20: /* report icon label */
3598 { 3658 {
3599 char *s; 3659 char *s;
3600 XGetIconName (xdisp, parent[0], &s); 3660 XGetIconName (dpy, parent[0], &s);
3601 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3661 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3602 XFree (s); 3662 XFree (s);
3603 } 3663 }
3604 break; 3664 break;
3605 case 21: /* report window title */ 3665 case 21: /* report window title */
3606 { 3666 {
3607 char *s; 3667 char *s;
3608 XFetchName (xdisp, parent[0], &s); 3668 XFetchName (dpy, parent[0], &s);
3609 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3669 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3610 XFree (s); 3670 XFree (s);
3611 } 3671 }
3612 break; 3672 break;
3613 } 3673 }
3614} 3674}
… …
3641 seen_esc = true; 3701 seen_esc = true;
3642 continue; 3702 continue;
3643 } 3703 }
3644 else if (ch == C0_BEL || ch == CHAR_ST) 3704 else if (ch == C0_BEL || ch == CHAR_ST)
3645 break; 3705 break;
3706 else if (ch == C0_SYN)
3707 ch = cmd_get8 ();
3646 else if (ch < 0x20) 3708 else if (ch < 0x20)
3647 return NULL; /* other control character - exit */ 3709 return NULL; /* other control character - exit */
3648 3710
3649 seen_esc = false; 3711 seen_esc = false;
3650 3712
3651 if (n >= STRING_MAX - 1) 3713 if (n >= STRING_MAX - 1)
3652 // stop at some sane length 3714 // stop at some sane length
3653 return NULL; 3715 return NULL;
3654 3716
3655 if (ch == C0_SYN)
3656 string[n++] = cmd_get8 ();
3657 else
3658 string[n++] = ch; 3717 string[n++] = ch;
3659 } 3718 }
3660 3719
3661 string[n++] = '\0'; 3720 string[n++] = '\0';
3662 3721
3663 ends_how = (ch == 0x5c ? C0_ESC : ch); 3722 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3714void 3773void
3715rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3774rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3716{ 3775{
3717 if (str[0] == '?' && !str[1]) 3776 if (str[0] == '?' && !str[1])
3718 { 3777 {
3719 rxvt_rgba c; 3778 rgba c;
3720 pix_colors_focused[color].get (this, c); 3779 pix_colors_focused[color].get (c);
3721 3780
3722#if XFT 3781#if XFT
3723 if (c.a != rxvt_rgba::MAX_CC) 3782 if (c.a != rgba::MAX_CC)
3724 tt_printf ("\033]%d;#%04x%04x%04x%04x%c", report, c.a, c.r, c.g, c.b, resp); 3783 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3725 else 3784 else
3726#endif 3785#endif
3727 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3786 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3728 } 3787 }
3729 else 3788 else
… …
3739 int color; 3798 int color;
3740 char *buf, *name; 3799 char *buf, *name;
3741 bool query = str[0] == '?' && !str[1]; 3800 bool query = str[0] == '?' && !str[1];
3742 int saveop = op; 3801 int saveop = op;
3743 3802
3744 dLocal (Display *, xdisp); 3803 dLocal (Display *, dpy);
3745 3804
3746 assert (str != NULL); 3805 assert (str != NULL);
3806
3807 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3808 return;
3809
3747 switch (op) 3810 switch (op)
3748 { 3811 {
3749 case XTerm_name: 3812 case XTerm_name:
3750 set_title (str); 3813 set_title (str);
3751 /* FALLTHROUGH */ 3814 /* FALLTHROUGH */
… …
3765 unsigned long bytes_after; 3828 unsigned long bytes_after;
3766 unsigned char *value = 0; 3829 unsigned char *value = 0;
3767 const char *str = ""; 3830 const char *str = "";
3768 3831
3769 if (prop 3832 if (prop
3770 && XGetWindowProperty (xdisp, parent[0], 3833 && XGetWindowProperty (dpy, parent[0],
3771 prop, 0, 1<<16, 0, AnyPropertyType, 3834 prop, 0, 1<<16, 0, AnyPropertyType,
3772 &actual_type, &actual_format, 3835 &actual_type, &actual_format,
3773 &nitems, &bytes_after, &value) == Success 3836 &nitems, &bytes_after, &value) == Success
3774 && actual_type != None 3837 && actual_type != None
3775 && actual_format == 8) 3838 && actual_format == 8)
… …
3787 { 3850 {
3788 *eq = 0; 3851 *eq = 0;
3789 set_utf8_property (display->atom (str), eq + 1); 3852 set_utf8_property (display->atom (str), eq + 1);
3790 } 3853 }
3791 else 3854 else
3792 XDeleteProperty (xdisp, parent[0], 3855 XDeleteProperty (dpy, parent[0],
3793 display->atom (str)); 3856 display->atom (str));
3794 } 3857 }
3795 break; 3858 break;
3796 3859
3797 case XTerm_Color: 3860 case XTerm_Color:
… …
3846 break; 3909 break;
3847#endif 3910#endif
3848#if TRANSPARENT && TINTING 3911#if TRANSPARENT && TINTING
3849 case URxvt_Color_tint: 3912 case URxvt_Color_tint:
3850 process_color_seq (op, Color_tint, str, resp); 3913 process_color_seq (op, Color_tint, str, resp);
3914
3851 check_our_parents (); 3915 check_our_parents ();
3916
3852 if (am_transparent) 3917 if (am_transparent)
3853 want_full_refresh = want_refresh = 1; 3918 want_full_refresh = want_refresh = 1;
3919
3854 break; 3920 break;
3855#endif 3921#endif
3856 3922
3857 case Rxvt_Pixmap: 3923 case Rxvt_Pixmap:
3858 { 3924 {
… …
3916 case URxvt_italicFont: 3982 case URxvt_italicFont:
3917 case URxvt_boldItalicFont: 3983 case URxvt_boldItalicFont:
3918#endif 3984#endif
3919 if (query) 3985 if (query)
3920 tt_printf ("\33]%d;%-.250s%c", saveop, 3986 tt_printf ("\33]%d;%-.250s%c", saveop,
3921 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3987 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3922 ? fontset[op - URxvt_font]->fontdesc : "", 3988 ? fontset[op - URxvt_font]->fontdesc : "",
3923 resp); 3989 resp);
3924 else 3990 else
3925 { 3991 {
3926 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3992 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3937 op, 4003 op,
3938 rs[Rs_name], VERSION[0], VERSION[2], 4004 rs[Rs_name], VERSION[0], VERSION[2],
3939 resp); 4005 resp);
3940 break; 4006 break;
3941 4007
3942#if ENABLE_FRILLS 4008#if !ENABLE_MINIMAL
3943 case URxvt_locale: 4009 case URxvt_locale:
3944 if (query) 4010 if (query)
3945 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 4011 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3946 else 4012 else
3947 { 4013 {
3948 set_locale (str); 4014 set_locale (str);
3949 pty->set_utf8_mode (enc_utf8); 4015 pty->set_utf8_mode (enc_utf8);
3950 init_xlocale (); 4016 init_xlocale ();
… …
3965 break; 4031 break;
3966#endif 4032#endif
3967 4033
3968#if ENABLE_PERL 4034#if ENABLE_PERL
3969 case URxvt_perl: 4035 case URxvt_perl:
3970 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3971 ; // no responses yet 4037 ; // no responses yet
3972 break; 4038 break;
3973#endif 4039#endif
3974 } 4040 }
3975} 4041}
… …
4091 scr_touch (true); 4157 scr_touch (true);
4092 break; 4158 break;
4093#endif 4159#endif
4094 case 1048: /* alternative cursor save */ 4160 case 1048: /* alternative cursor save */
4095 case 1049: 4161 case 1049:
4096 if (OPTION (Opt_secondaryScreen)) 4162 if (option (Opt_secondaryScreen))
4097 if (mode == 0) 4163 if (mode == 0)
4098 scr_cursor (RESTORE); 4164 scr_cursor (RESTORE);
4099 else if (mode == 1) 4165 else if (mode == 1)
4100 scr_cursor (SAVE); 4166 scr_cursor (SAVE);
4101 break; 4167 break;
… …
4166 break; 4232 break;
4167 case 1011: /* scroll to bottom on key press */ 4233 case 1011: /* scroll to bottom on key press */
4168 set_option (Opt_scrollTtyKeypress, state); 4234 set_option (Opt_scrollTtyKeypress, state);
4169 break; 4235 break;
4170 case 1047: /* secondary screen w/ clearing last */ 4236 case 1047: /* secondary screen w/ clearing last */
4171 if (OPTION (Opt_secondaryScreen)) 4237 if (option (Opt_secondaryScreen))
4172 if (current_screen != PRIMARY) 4238 if (current_screen != PRIMARY)
4173 scr_erase_screen (2); 4239 scr_erase_screen (2);
4174 scr_change_screen (state); 4240 scr_change_screen (state);
4175 break; 4241 break;
4176 case 1049: /* secondary screen w/ clearing first */ 4242 case 1049: /* secondary screen w/ clearing first */
4177 scr_change_screen (state); 4243 scr_change_screen (state);
4178 if (OPTION (Opt_secondaryScreen)) 4244 if (option (Opt_secondaryScreen))
4179 if (current_screen != PRIMARY) 4245 if (current_screen != PRIMARY)
4180 scr_erase_screen (2); 4246 scr_erase_screen (2);
4181 break; 4247 break;
4182 default: 4248 default:
4183 break; 4249 break;
… …
4311 scr_color (Color_bg, Color_bg); 4377 scr_color (Color_bg, Color_bg);
4312 break; 4378 break;
4313 4379
4314 //case 50: // not variable spacing 4380 //case 50: // not variable spacing
4315 4381
4316#if ENABLE_FRILLS 4382#if !ENABLE_MINIMAL
4317 case 90: 4383 case 90:
4318 case 91: /* set bright fg color */ 4384 case 91: /* set bright fg color */
4319 case 92: 4385 case 92:
4320 case 93: 4386 case 93:
4321 case 94: 4387 case 94:

Diff Legend

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