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.292 by root, Sun Jan 29 21:45:47 2006 UTC vs.
Revision 1.322 by ayin, Wed May 2 23:06:32 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 *
… …
867 return; 877 return;
868 878
869 if (len <= 0) 879 if (len <= 0)
870 return; /* not mapped */ 880 return; /* not mapped */
871 881
872 if (OPTION (Opt_scrollTtyKeypress)) 882 if (option (Opt_scrollTtyKeypress))
873 if (view_start) 883 if (view_start)
874 { 884 {
875 view_start = 0; 885 view_start = 0;
876 want_refresh = 1; 886 want_refresh = 1;
877 } 887 }
… …
901 tt_write (&ch, 1); 911 tt_write (&ch, 1);
902 } 912 }
903 913
904 tt_write (kbuf, (unsigned int)len); 914 tt_write (kbuf, (unsigned int)len);
905} 915}
906/*}}} */ 916
917void
918rxvt_term::key_release (XKeyEvent &ev)
919{
920#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
921 KeySym keysym;
922
923 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
924#endif
925
926#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support
928 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52)
930 {
931# if ENABLE_OVERLAY
932 scr_overlay_off ();
933# endif
934# if ISO_14755
935 // iso14755 part 5.2 handling: release time
936 // first: controls
937 if ((ev.state & ControlMask)
938 && ((keysym >= 0x40 && keysym <= 0x5f)
939 || (keysym >= 0x61 && keysym <= 0x7f)))
940 {
941 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
942 commit_iso14755 ();
943
944 return;
945 }
946
947 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
948 if (i[0] == keysym)
949 {
950 iso14755buf = ISO_14755_51 | i[1];
951 commit_iso14755 ();
952
953 return;
954 }
955
956 scr_bell ();
957# endif
958 iso14755buf = 0;
959
960 return;
961 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 {
964# if ENABLE_OVERLAY
965 scr_overlay_off ();
966# endif
967 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 ();
969#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED)
971 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
976 }
977# endif
978 else
979 iso14755buf = 0;
980 }
981#endif
982
983 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
984 return;
985
986#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
987 if (!(ev.state & ControlMask))
988 slip_wheel_ev.stop ();
989 else if (keysym == XK_Control_L || keysym == XK_Control_R)
990 mouse_slip_wheel_speed = 0;
991#endif
992}
907 993
908#if defined (KEYSYM_RESOURCE) 994#if defined (KEYSYM_RESOURCE)
909unsigned int 995unsigned int
910rxvt_term::cmd_write (const char *str, unsigned int count) 996rxvt_term::cmd_write (const char *str, unsigned int count)
911{ 997{
… …
1088 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1089 } 1175 }
1090} 1176}
1091#endif 1177#endif
1092 1178
1093#if HAVE_SCHED_YIELD 1179#if LINUX_YIELD_HACK
1094static struct event_handler 1180static struct event_handler
1095{ 1181{
1096 check_watcher cw_yield; 1182 check_watcher yield_ev;
1097 1183
1098 void yield (check_watcher &w) 1184 void yield_cb (check_watcher &w)
1099 { 1185 {
1100 sched_yield (); 1186 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS.
1190
1191 struct timespec ts = { 0, 0 };
1192 nanosleep (&ts, 0);
1193
1101 w.stop (); 1194 w.stop ();
1102 } 1195 }
1103 1196
1104 event_handler () 1197 event_handler ()
1105 : cw_yield (this, &event_handler::yield) 1198 : yield_ev (this, &event_handler::yield_cb)
1106 { 1199 {
1107 } 1200 }
1108} event_handler; 1201} event_handler;
1109#endif 1202#endif
1110 1203
… …
1130 cmdbuf_endp += r; 1223 cmdbuf_endp += r;
1131 return true; 1224 return true;
1132 } 1225 }
1133 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134 { 1227 {
1135#if HAVE_SCHED_YIELD 1228#if LINUX_YIELD_HACK
1136 if (display->is_local) 1229 if (display->is_local)
1137 event_handler.cw_yield.start (); 1230 event_handler.yield_ev.start ();
1138#endif 1231#endif
1139 } 1232 }
1140 else 1233 else
1141 { 1234 {
1142 pty_ev.stop (); 1235 pty_ev.stop ();
1143 1236
1144 if (!OPTION (Opt_hold)) 1237 if (!option (Opt_hold))
1145 destroy (); 1238 destroy ();
1146 } 1239 }
1147 1240
1148 return false; 1241 return false;
1149} 1242}
… …
1164} 1257}
1165 1258
1166void 1259void
1167rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1168{ 1261{
1169 XDefineCursor (xdisp, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1170 recolour_cursor (); 1263 recolour_cursor ();
1171 1264
1172#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1173 hidden_pointer = 0; 1266 hidden_pointer = 0;
1174 1267
1175 if (OPTION (Opt_pointerBlank)) 1268 if (option (Opt_pointerBlank))
1176 pointer_ev.start (NOW + pointerBlankDelay); 1269 pointer_ev.start (NOW + pointerBlankDelay);
1177#endif 1270#endif
1178} 1271}
1179 1272
1180#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1181void 1274void
1182rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1183{ 1276{
1184 if (!OPTION (Opt_pointerBlank)) 1277 if (!option (Opt_pointerBlank))
1185 return; 1278 return;
1186 1279
1187 XDefineCursor (xdisp, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1188 XFlush (xdisp); 1281 XFlush (dpy);
1189 1282
1190 hidden_pointer = 1; 1283 hidden_pointer = 1;
1191} 1284}
1192 1285
1193void 1286void
… …
1272void 1365void
1273rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1274{ 1367{
1275 make_current (); 1368 make_current ();
1276 1369
1277 dLocal (Display *, xdisp); 1370 dLocal (Display *, dpy);
1278 1371
1279 if (ev.xany.window == vt 1372 if (ev.xany.window == vt
1280 && SHOULD_INVOKE (HOOK_X_EVENT) 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1281 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1282 return; 1375 return;
… …
1287 unsigned int unused_mask; 1380 unsigned int unused_mask;
1288 1381
1289 switch (ev.type) 1382 switch (ev.type)
1290 { 1383 {
1291 case KeyPress: 1384 case KeyPress:
1292#if ISO_14755 1385 key_press (ev.xkey);
1293 if (!(iso14755buf & ISO_14755_52))
1294#endif
1295 lookup_key (ev.xkey);
1296
1297 break; 1386 break;
1298 1387
1299 case KeyRelease: 1388 case KeyRelease:
1300 { 1389 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; 1390 break;
1372 }
1373 1391
1374 case ButtonPress: 1392 case ButtonPress:
1375 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1376 break; 1394 break;
1377 1395
… …
1392 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1410 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1393 destroy (); 1411 destroy ();
1394 } 1412 }
1395#if ENABLE_EWMH 1413#if ENABLE_EWMH
1396 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1414 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1397 XSendEvent (xdisp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1398 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1399 &ev); 1417 &ev);
1400#endif 1418#endif
1401 } 1419 }
1402 } 1420 }
… …
1440 break; 1458 break;
1441 } 1459 }
1442 break; 1460 break;
1443 1461
1444 case FocusIn: 1462 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior
1464 && ev.xfocus.detail != NotifyPointer
1465 && ev.xfocus.mode != NotifyGrab)
1445 focus_in (); 1466 focus_in ();
1446 break; 1467 break;
1447 1468
1448 case FocusOut: 1469 case FocusOut:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1449 focus_out (); 1473 focus_out ();
1450 break; 1474 break;
1451 1475
1452 case ConfigureNotify: 1476 case ConfigureNotify:
1453 if (ev.xconfigure.window == parent[0]) 1477 if (ev.xconfigure.window == parent[0])
1454 { 1478 {
1455 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1456 ; 1480 ;
1457 1481
1458 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1482 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1459 { 1483 {
1460 seen_resize = 1; 1484 seen_resize = 1;
1461 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1485 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1462 } 1486 }
1463 1487
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1488 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1465 1489
1466#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1490#ifdef TRANSPARENT
1467 if (OPTION (Opt_transparent)) 1491 if (option (Opt_transparent))
1468 check_our_parents (); 1492 check_our_parents ();
1469#endif 1493#endif
1470 } 1494 }
1471 break; 1495 break;
1472 1496
… …
1518 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1519 { 1543 {
1520 do 1544 do
1521 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1522 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1523 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1524 1548
1525 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1526 1550
1527 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1530 1554
1531 want_refresh = 1; 1555 want_refresh = 1;
1532 } 1556 }
1533 else 1557 else
1534 { 1558 {
1535 XEvent unused_event; 1559 XEvent unused_event;
1536 1560
1537 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1561 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1538 ; 1562 ;
1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1540 ; 1564 ;
1541 1565
1542 if (isScrollbarWindow (ev.xany.window)) 1566 if (isScrollbarWindow (ev.xany.window))
1543 { 1567 {
1544 scrollBar.setIdle (); 1568 scrollBar.setIdle ();
1545 scrollbar_show (0); 1569 scrollbar_show (0);
1546 } 1570 }
1547 1571
1548#ifdef TRANSPARENT 1572#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == parent[0]) 1573 if (am_transparent && ev.xany.window == parent[0])
1550 XClearWindow (xdisp, ev.xany.window); 1574 XClearWindow (dpy, ev.xany.window);
1551#endif 1575#endif
1552 } 1576 }
1553 break; 1577 break;
1554 1578
1555 case MotionNotify: 1579 case MotionNotify:
… …
1565 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1589 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1566 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1590 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1567 ; // nop 1591 ; // nop
1568 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1592 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1569 { 1593 {
1570 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1594 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1571 ; 1595 ;
1572 1596
1573 XQueryPointer (xdisp, vt, 1597 XQueryPointer (dpy, vt,
1574 &unused_root, &unused_child, 1598 &unused_root, &unused_child,
1575 &unused_root_x, &unused_root_y, 1599 &unused_root_x, &unused_root_y,
1576 &ev.xbutton.x, &ev.xbutton.y, 1600 &ev.xbutton.x, &ev.xbutton.y,
1577 &ev.xbutton.state); 1601 &ev.xbutton.state);
1578#ifdef MOUSE_THRESHOLD 1602#ifdef MOUSE_THRESHOLD
… …
1642#endif 1666#endif
1643 } 1667 }
1644 } 1668 }
1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1669 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1646 { 1670 {
1647 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1671 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1648 MotionNotify, &ev)) 1672 MotionNotify, &ev))
1649 ; 1673 ;
1650 1674
1651 XQueryPointer (xdisp, scrollBar.win, 1675 XQueryPointer (dpy, scrollBar.win,
1652 &unused_root, &unused_child, 1676 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1677 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1678 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1679 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1680 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1660 scrollbar_show (1); 1684 scrollbar_show (1);
1661 } 1685 }
1662 break; 1686 break;
1663 } 1687 }
1664 1688
1665skip_switch: ;
1666
1667#if defined(CURSOR_BLINK) 1689#if defined(CURSOR_BLINK)
1668 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1690 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1669 { 1691 {
1670 if (hidden_cursor) 1692 if (hidden_cursor)
1671 { 1693 {
1672 hidden_cursor = 0; 1694 hidden_cursor = 0;
1673 want_refresh = 1; 1695 want_refresh = 1;
… …
1676 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1677 } 1699 }
1678#endif 1700#endif
1679 1701
1680#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1681 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1682 { 1704 {
1683 if (ev.type == MotionNotify 1705 if (ev.type == MotionNotify
1684 || ev.type == ButtonPress 1706 || ev.type == ButtonPress
1685 || ev.type == ButtonRelease) 1707 || ev.type == ButtonRelease)
1686 if (hidden_pointer) 1708 if (hidden_pointer)
… …
1698 if (!focus) 1720 if (!focus)
1699 { 1721 {
1700 focus = 1; 1722 focus = 1;
1701 want_refresh = 1; 1723 want_refresh = 1;
1702 1724
1703 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1704 1726
1705#if USE_XIM 1727#if USE_XIM
1706 if (Input_Context != NULL) 1728 if (Input_Context != NULL)
1707 { 1729 {
1708 IMSetStatusPosition (); 1730 IMSetPosition ();
1709 XSetICFocus (Input_Context); 1731 XSetICFocus (Input_Context);
1710 } 1732 }
1711#endif 1733#endif
1712#if CURSOR_BLINK 1734#if CURSOR_BLINK
1713 if (OPTION (Opt_cursorBlink)) 1735 if (option (Opt_cursorBlink))
1714 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1715#endif 1737#endif
1716#if OFF_FOCUS_FADING 1738#if OFF_FOCUS_FADING
1717 if (rs[Rs_fade]) 1739 if (rs[Rs_fade])
1718 { 1740 {
1719 pix_colors = pix_colors_focused; 1741 pix_colors = pix_colors_focused;
1720 scr_recolour (); 1742 scr_recolour ();
1743 }
1744#endif
1745#if ENABLE_FRILLS
1746 if (option (Opt_urgentOnBell))
1747 {
1748 XWMHints *h;
1749
1750 h = XGetWMHints(dpy, parent[0]);
1751 if (h != NULL)
1752 {
1753 h->flags &= ~XUrgencyHint;
1754 XSetWMHints(dpy, parent[0], h);
1755 }
1721 } 1756 }
1722#endif 1757#endif
1723 } 1758 }
1724} 1759}
1725 1760
… …
1745#if USE_XIM 1780#if USE_XIM
1746 if (Input_Context != NULL) 1781 if (Input_Context != NULL)
1747 XUnsetICFocus (Input_Context); 1782 XUnsetICFocus (Input_Context);
1748#endif 1783#endif
1749#if CURSOR_BLINK 1784#if CURSOR_BLINK
1750 if (OPTION (Opt_cursorBlink)) 1785 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.stop (); 1786 cursor_blink_ev.stop ();
1752 hidden_cursor = 0; 1787 hidden_cursor = 0;
1753#endif 1788#endif
1754#if OFF_FOCUS_FADING 1789#if OFF_FOCUS_FADING
1755 if (rs[Rs_fade]) 1790 if (rs[Rs_fade])
… …
1759 } 1794 }
1760#endif 1795#endif
1761 } 1796 }
1762} 1797}
1763 1798
1764#if TRANSPARENT 1799void
1800rxvt_term::update_fade_color (unsigned int idx)
1801{
1802#if OFF_FOCUS_FADING
1803 if (rs[Rs_fade])
1804 {
1805 rgba c;
1806 pix_colors [Color_fade].get (c);
1807 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1808 }
1809#endif
1810}
1811
1812#if TRANSPARENT || ENABLE_PERL
1765void 1813void
1766rxvt_term::rootwin_cb (XEvent &ev) 1814rxvt_term::rootwin_cb (XEvent &ev)
1767{ 1815{
1768 make_current (); 1816 make_current ();
1769 1817
1818 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1819 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1820 return;
1821
1822# if TRANSPARENT
1770 switch (ev.type) 1823 switch (ev.type)
1771 { 1824 {
1772 case PropertyNotify: 1825 case PropertyNotify:
1773 /* 1826 /*
1774 * if user used some Esetroot compatible prog to set the root bg, 1827 * if user used some Esetroot compatible prog to set the root bg,
… …
1778 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1831 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1779 return; 1832 return;
1780 1833
1781 /* FALLTHROUGH */ 1834 /* FALLTHROUGH */
1782 case ReparentNotify: 1835 case ReparentNotify:
1783 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1836 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1784 want_refresh = want_full_refresh = 1; 1837 want_refresh = want_full_refresh = 1;
1785 break; 1838 break;
1786 } 1839 }
1840# endif
1787} 1841}
1788#endif 1842#endif
1789 1843
1790void 1844void
1791rxvt_term::button_press (XButtonEvent &ev) 1845rxvt_term::button_press (XButtonEvent &ev)
… …
2119 selection_make (ev.time); 2173 selection_make (ev.time);
2120 break; 2174 break;
2121 2175
2122 case Button2: 2176 case Button2:
2123 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2177 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); 2178 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2125 break; 2179 break;
2126 2180
2127#ifdef MOUSE_WHEEL 2181#ifdef MOUSE_WHEEL
2128 case Button4: 2182 case Button4:
2129 case Button5: 2183 case Button5:
… …
2133 2187
2134 v = ev.button == Button4 ? UP : DN; 2188 v = ev.button == Button4 ? UP : DN;
2135 2189
2136 if (ev.state & ShiftMask) 2190 if (ev.state & ShiftMask)
2137 i = 1; 2191 i = 1;
2138 else if (OPTION (Opt_mouseWheelScrollPage)) 2192 else if (option (Opt_mouseWheelScrollPage))
2139 i = nrow - 1; 2193 i = nrow - 1;
2140 else 2194 else
2141 i = 5; 2195 i = 5;
2142 2196
2143# ifdef MOUSE_SLIP_WHEELING 2197# ifdef MOUSE_SLIP_WHEELING
… …
2414 Pixmap rootpixmap = None; 2468 Pixmap rootpixmap = None;
2415 XWindowAttributes wattr, wrootattr; 2469 XWindowAttributes wattr, wrootattr;
2416 2470
2417 pchanged = 0; 2471 pchanged = 0;
2418 2472
2419 if (!OPTION (Opt_transparent)) 2473 if (!option (Opt_transparent))
2420 return pchanged; /* Don't try any more */ 2474 return pchanged; /* Don't try any more */
2421 2475
2422 XGetWindowAttributes (xdisp, display->root, &wrootattr); 2476 XGetWindowAttributes (dpy, display->root, &wrootattr);
2423 rootdepth = wrootattr.depth; 2477 rootdepth = wrootattr.depth;
2424 2478
2425 XGetWindowAttributes (xdisp, parent[0], &wattr); 2479 XGetWindowAttributes (dpy, parent[0], &wattr);
2426 2480
2427 if (rootdepth != wattr.depth) 2481 if (rootdepth != wattr.depth)
2428 { 2482 {
2429 if (am_transparent) 2483 if (am_transparent)
2430 { 2484 {
2431 pchanged = 1; 2485 pchanged = 1;
2432 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2486 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2433 am_transparent = am_pixmap_trans = 0; 2487 am_transparent = am_pixmap_trans = 0;
2434 } 2488 }
2435 2489
2436 return pchanged; /* Don't try any more */ 2490 return pchanged; /* Don't try any more */
2437 } 2491 }
2438 2492
2439 /* Get all X ops out of the queue so that our information is up-to-date. */ 2493 /* Get all X ops out of the queue so that our information is up-to-date. */
2440 XSync (xdisp, False); 2494 XSync (dpy, False);
2441 2495
2442 /* 2496 /*
2443 * Make the frame window set by the window manager have 2497 * Make the frame window set by the window manager have
2444 * the root background. Some window managers put multiple nested frame 2498 * the root background. Some window managers put multiple nested frame
2445 * windows for each client, so we have to take care about that. 2499 * windows for each client, so we have to take care about that.
2446 */ 2500 */
2447 i = (xa[XA_XROOTPMAP_ID] 2501 i = (xa[XA_XROOTPMAP_ID]
2448 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID], 2502 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2449 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2503 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2450 &nitems, &bytes_after, &prop) == Success); 2504 &nitems, &bytes_after, &prop) == Success);
2451 2505
2452 if (!i || prop == NULL) 2506 if (!i || prop == NULL)
2453 i = (xa[XA_ESETROOT_PMAP_ID] 2507 i = (xa[XA_ESETROOT_PMAP_ID]
2454 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID], 2508 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2455 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2509 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2456 &nitems, &bytes_after, &prop) == Success); 2510 &nitems, &bytes_after, &prop) == Success);
2457 2511
2458 if (!i || prop == NULL 2512 if (!i || prop == NULL
2459#if TINTING 2513#if TINTING
2460 || !rs[Rs_color + Color_tint] 2514 || !ISSET_PIXCOLOR (Color_tint)
2461#endif 2515#endif
2462 ) 2516 )
2463 have_pixmap = 0; 2517 have_pixmap = 0;
2464 else 2518 else
2465 { 2519 {
… …
2478 Window cr; 2532 Window cr;
2479 XImage *image; 2533 XImage *image;
2480 GC gc; 2534 GC gc;
2481 XGCValues gcvalue; 2535 XGCValues gcvalue;
2482 2536
2483 XTranslateCoordinates (xdisp, parent[0], display->root, 2537 XTranslateCoordinates (dpy, parent[0], display->root,
2484 0, 0, &sx, &sy, &cr); 2538 0, 0, &sx, &sy, &cr);
2485 nw = (unsigned int)szHint.width; 2539 nw = (unsigned int)szHint.width;
2486 nh = (unsigned int)szHint.height; 2540 nh = (unsigned int)szHint.height;
2487 nx = ny = 0; 2541 nx = ny = 0;
2488 2542
… …
2501 } 2555 }
2502 2556
2503 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2557 min_it (nw, (unsigned int) (wrootattr.width - sx));
2504 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2558 min_it (nh, (unsigned int) (wrootattr.height - sy));
2505 2559
2506 XSync (xdisp, False); 2560 XSync (dpy, False);
2507 allowedxerror = -1; 2561 allowedxerror = -1;
2508 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2562 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2509 2563
2510 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2564 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2511 /* XXX: may need a delay here? */ 2565 /* XXX: may need a delay here? */
2512 allowedxerror = 0; 2566 allowedxerror = 0;
2513 2567
… …
2516 if (am_transparent && am_pixmap_trans) 2570 if (am_transparent && am_pixmap_trans)
2517 { 2571 {
2518 pchanged = 1; 2572 pchanged = 1;
2519 if (pixmap != None) 2573 if (pixmap != None)
2520 { 2574 {
2521 XFreePixmap (xdisp, pixmap); 2575 XFreePixmap (dpy, pixmap);
2522 pixmap = None; 2576 pixmap = None;
2523 } 2577 }
2524 } 2578 }
2525 2579
2526 am_pixmap_trans = 0; 2580 am_pixmap_trans = 0;
2527 } 2581 }
2528 else 2582 else
2529 { 2583 {
2530 if (pixmap != None) 2584 if (pixmap != None)
2531 XFreePixmap (xdisp, pixmap); 2585 XFreePixmap (dpy, pixmap);
2532 2586
2533#if TINTING 2587#if TINTING
2534 if (ISSET_PIXCOLOR (Color_tint)) 2588 if (ISSET_PIXCOLOR (Color_tint))
2535 { 2589 {
2536 rxvt_rgba c;
2537 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2590 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2538 2591
2592 rgba c;
2539 pix_colors_focused[Color_tint].get (this, c); 2593 pix_colors_focused [Color_tint].get (c);
2540 2594
2541 ShadeXImage (this, image, shade, c.r, c.g, c.b); 2595 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2542 } 2596 }
2543#endif 2597#endif
2544 2598
2545 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth); 2599 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2546 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue); 2600 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2547 XPutImage (xdisp, pixmap, gc, image, 0, 0, 2601 XPutImage (dpy, pixmap, gc, image, 0, 0,
2548 nx, ny, image->width, image->height); 2602 nx, ny, image->width, image->height);
2549 XFreeGC (xdisp, gc); 2603 XFreeGC (dpy, gc);
2550 XDestroyImage (image); 2604 XDestroyImage (image);
2551 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap); 2605 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2552 XClearWindow (xdisp, parent[0]); 2606 XClearWindow (dpy, parent[0]);
2553 2607
2554 if (!am_transparent || !am_pixmap_trans) 2608 if (!am_transparent || !am_pixmap_trans)
2555 pchanged = 1; 2609 pchanged = 1;
2556 2610
2557 am_transparent = am_pixmap_trans = 1; 2611 am_transparent = am_pixmap_trans = 1;
2558 } 2612 }
2559 } 2613 }
2560 2614
2561 if (am_pixmap_trans) 2615 if (am_pixmap_trans)
2562 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2616 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2563 else 2617 else
2564 { 2618 {
2565 unsigned int n; 2619 unsigned int n;
2566 /* 2620 /*
2567 * InheritPixmap transparency 2621 * InheritPixmap transparency
2568 */ 2622 */
2569 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2623 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2570 { 2624 {
2571 oldp = parent[i]; 2625 oldp = parent[i];
2572 XQueryTree (xdisp, parent[i - 1], &root, 2626 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2573 &parent[i], &list, &n);
2574 XFree (list); 2627 XFree (list);
2575 2628
2576 if (parent[i] == display->root) 2629 if (parent[i] == display->root)
2577 { 2630 {
2578 if (oldp != None) 2631 if (oldp != None)
… …
2586 } 2639 }
2587 2640
2588 n = 0; 2641 n = 0;
2589 2642
2590 if (pchanged) 2643 if (pchanged)
2591 {
2592 for (; n < (unsigned int)i; n++) 2644 for (; n < (unsigned int)i; n++)
2593 { 2645 {
2594 XGetWindowAttributes (xdisp, parent[n], &wattr); 2646 XGetWindowAttributes (dpy, parent[n], &wattr);
2647
2595 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2648 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2596 { 2649 {
2597 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2650 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2598 break; 2651 break;
2599 } 2652 }
2600 } 2653 }
2601 }
2602 2654
2603 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2655 if (n > (sizeof (parent) / sizeof (parent[0])))
2604 { 2656 {
2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); 2657 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); 2658 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2607 am_transparent = 0; 2659 am_transparent = 0;
2608 /* XXX: also turn off Opt_transparent? */ 2660 /* XXX: also turn off Opt_transparent? */
2609 } 2661 }
2610 else 2662 else
2611 { 2663 {
2612 for (n = 0; n < (unsigned int)i; n++) 2664 for (n = 0; n < (unsigned int)i; n++)
2613 { 2665 {
2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative); 2666 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2615 XClearWindow (xdisp, parent[n]); 2667 XClearWindow (dpy, parent[n]);
2616 } 2668 }
2617 2669
2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); 2670 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2619 am_transparent = 1; 2671 am_transparent = 1;
2620 } 2672 }
2621 2673
2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2674 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2623 parent[i] = None; 2675 parent[i] = None;
2624 } 2676 }
2625 2677
2626 if (scrollBar.win) 2678 if (scrollBar.win)
2627 { 2679 {
2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative); 2680 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2629 scrollBar.setIdle (); 2681 scrollBar.setIdle ();
2630 scrollbar_show (0); 2682 scrollbar_show (0);
2631 } 2683 }
2632 2684
2633 if (am_transparent) 2685 if (am_transparent)
… …
2696 if (ch == C0_LF) 2748 if (ch == C0_LF)
2697 nlines++; 2749 nlines++;
2698 2750
2699 refresh_count++; 2751 refresh_count++;
2700 2752
2701 if (!OPTION (Opt_jumpScroll) 2753 if (!option (Opt_jumpScroll)
2702 || (refresh_count >= refresh_limit * (nrow - 1))) 2754 || (refresh_count >= refresh_limit * (nrow - 1)))
2703 { 2755 {
2704 refreshnow = true; 2756 refreshnow = true;
2705 refresh_count = 0; 2757 refresh_count = 0;
2706 ch = NOCHAR; 2758 ch = NOCHAR;
… …
2746 * the number of pages between refreshes is refresh_limit, which 2798 * the number of pages between refreshes is refresh_limit, which
2747 * is incremented here because we must be doing flat-out scrolling. 2799 * is incremented here because we must be doing flat-out scrolling.
2748 */ 2800 */
2749 if (refreshnow) 2801 if (refreshnow)
2750 { 2802 {
2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2803 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2752 refresh_limit++; 2804 refresh_limit++;
2753 else 2805 else
2754 { 2806 {
2755 flag = true; 2807 flag = true;
2808 //TODO: due to popular request, implement "skipscroll" option here
2756 scr_refresh (); 2809 scr_refresh ();
2757 want_refresh = 1; 2810 want_refresh = 1;
2758 } 2811 }
2759 } 2812 }
2760 2813
… …
3084 scr_charset_set (2, (unsigned int)cmd_getc ()); 3137 scr_charset_set (2, (unsigned int)cmd_getc ());
3085 break; 3138 break;
3086 case '+': 3139 case '+':
3087 scr_charset_set (3, (unsigned int)cmd_getc ()); 3140 scr_charset_set (3, (unsigned int)cmd_getc ());
3088 break; 3141 break;
3089#if ENABLE_FRILLS 3142#if !ENABLE_MINIMAL
3090 case '6': 3143 case '6':
3091 scr_backindex (); 3144 scr_backindex ();
3092 break; 3145 break;
3093#endif 3146#endif
3094 case '7': 3147 case '7':
3095 scr_cursor (SAVE); 3148 scr_cursor (SAVE);
3096 break; 3149 break;
3097 case '8': 3150 case '8':
3098 scr_cursor (RESTORE); 3151 scr_cursor (RESTORE);
3099 break; 3152 break;
3100#if ENABLE_FRILLS 3153#if !ENABLE_MINIMAL
3101 case '9': 3154 case '9':
3102 scr_forwardindex (); 3155 scr_forwardindex ();
3103 break; 3156 break;
3104#endif 3157#endif
3105 case '=': 3158 case '=':
… …
3421 break; 3474 break;
3422 case 6: /* CPR requested */ 3475 case 6: /* CPR requested */
3423 scr_report_position (); 3476 scr_report_position ();
3424 break; 3477 break;
3425 case 7: /* unofficial extension */ 3478 case 7: /* unofficial extension */
3426 if (OPTION (Opt_insecure)) 3479 if (option (Opt_insecure))
3427 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3480 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3428 break; 3481 break;
3429 case 8: /* unofficial extension */ 3482 case 8: /* unofficial extension */
3430 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3483 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3431 break; 3484 break;
… …
3498 break; 3551 break;
3499 case CSI_75: 3552 case CSI_75:
3500 scr_cursor (RESTORE); 3553 scr_cursor (RESTORE);
3501 break; 3554 break;
3502 3555
3503#if ENABLE_FRILLS 3556#if !ENABLE_MINIMAL
3504 case CSI_74: 3557 case CSI_74:
3505 process_window_ops (arg, nargs); 3558 process_window_ops (arg, nargs);
3506 break; 3559 break;
3507#endif 3560#endif
3508 3561
… …
3515 break; 3568 break;
3516 } 3569 }
3517} 3570}
3518/*}}} */ 3571/*}}} */
3519 3572
3520#if ENABLE_FRILLS 3573#if !ENABLE_MINIMAL
3521/* ARGSUSED */ 3574/* ARGSUSED */
3522void 3575void
3523rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3576rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3524{ 3577{
3525 int x, y; 3578 int x, y;
3526 XWindowAttributes wattr; 3579 XWindowAttributes wattr;
3527 Window wdummy; 3580 Window wdummy;
3528 3581
3529 dLocal (Display *, xdisp); 3582 dLocal (Display *, dpy);
3530 3583
3531 if (nargs == 0) 3584 if (nargs == 0)
3532 return; 3585 return;
3533 3586
3534 switch (args[0]) 3587 switch (args[0])
3535 { 3588 {
3536 /* 3589 /*
3537 * commands 3590 * commands
3538 */ 3591 */
3539 case 1: /* deiconify window */ 3592 case 1: /* deiconify window */
3540 XMapWindow (xdisp, parent[0]); 3593 XMapWindow (dpy, parent[0]);
3541 break; 3594 break;
3542 case 2: /* iconify window */ 3595 case 2: /* iconify window */
3543 XIconifyWindow (xdisp, parent[0], display->screen); 3596 XIconifyWindow (dpy, parent[0], display->screen);
3544 break; 3597 break;
3545 case 3: /* set position (pixels) */ 3598 case 3: /* set position (pixels) */
3546 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3599 XMoveWindow (dpy, parent[0], args[1], args[2]);
3547 break; 3600 break;
3548 case 4: /* set size (pixels) */ 3601 case 4: /* set size (pixels) */
3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3602 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3550 break; 3603 break;
3551 case 5: /* raise window */ 3604 case 5: /* raise window */
3552 XRaiseWindow (xdisp, parent[0]); 3605 XRaiseWindow (dpy, parent[0]);
3553 break; 3606 break;
3554 case 6: /* lower window */ 3607 case 6: /* lower window */
3555 XLowerWindow (xdisp, parent[0]); 3608 XLowerWindow (dpy, parent[0]);
3556 break; 3609 break;
3557 case 7: /* refresh window */ 3610 case 7: /* refresh window */
3558 scr_touch (true); 3611 scr_touch (true);
3559 break; 3612 break;
3560 case 8: /* set size (chars) */ 3613 case 8: /* set size (chars) */
… …
3567 if (args[0] >= 24) /* set height (chars) */ 3620 if (args[0] >= 24) /* set height (chars) */
3568 set_widthheight ((unsigned int)width, 3621 set_widthheight ((unsigned int)width,
3569 (unsigned int) (args[1] * fheight)); 3622 (unsigned int) (args[1] * fheight));
3570 break; 3623 break;
3571 3624
3572
3573 /* 3625 /*
3574 * reports - some output format copied from XTerm 3626 * reports - some output format copied from XTerm
3575 */ 3627 */
3576 case 11: /* report window state */ 3628 case 11: /* report window state */
3577 XGetWindowAttributes (xdisp, parent[0], &wattr); 3629 XGetWindowAttributes (dpy, parent[0], &wattr);
3578 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3630 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3579 break; 3631 break;
3580 case 13: /* report window position */ 3632 case 13: /* report window position */
3581 XGetWindowAttributes (xdisp, parent[0], &wattr); 3633 XGetWindowAttributes (dpy, parent[0], &wattr);
3582 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3634 XTranslateCoordinates (dpy, parent[0], wattr.root,
3583 -wattr.border_width, -wattr.border_width, 3635 -wattr.border_width, -wattr.border_width,
3584 &x, &y, &wdummy); 3636 &x, &y, &wdummy);
3585 tt_printf ("\033[3;%d;%dt", x, y); 3637 tt_printf ("\033[3;%d;%dt", x, y);
3586 break; 3638 break;
3587 case 14: /* report window size (pixels) */ 3639 case 14: /* report window size (pixels) */
3588 XGetWindowAttributes (xdisp, parent[0], &wattr); 3640 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3641 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3590 break; 3642 break;
3591 case 18: /* report text area size (chars) */ 3643 case 18: /* report text area size (chars) */
3592 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3644 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3593 break; 3645 break;
… …
3595 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3647 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3596 break; 3648 break;
3597 case 20: /* report icon label */ 3649 case 20: /* report icon label */
3598 { 3650 {
3599 char *s; 3651 char *s;
3600 XGetIconName (xdisp, parent[0], &s); 3652 XGetIconName (dpy, parent[0], &s);
3601 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3653 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3602 XFree (s); 3654 XFree (s);
3603 } 3655 }
3604 break; 3656 break;
3605 case 21: /* report window title */ 3657 case 21: /* report window title */
3606 { 3658 {
3607 char *s; 3659 char *s;
3608 XFetchName (xdisp, parent[0], &s); 3660 XFetchName (dpy, parent[0], &s);
3609 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 */
3610 XFree (s); 3662 XFree (s);
3611 } 3663 }
3612 break; 3664 break;
3613 } 3665 }
3614} 3666}
… …
3641 seen_esc = true; 3693 seen_esc = true;
3642 continue; 3694 continue;
3643 } 3695 }
3644 else if (ch == C0_BEL || ch == CHAR_ST) 3696 else if (ch == C0_BEL || ch == CHAR_ST)
3645 break; 3697 break;
3698 else if (ch == C0_SYN)
3699 ch = cmd_get8 ();
3646 else if (ch < 0x20) 3700 else if (ch < 0x20)
3647 return NULL; /* other control character - exit */ 3701 return NULL; /* other control character - exit */
3648 3702
3649 seen_esc = false; 3703 seen_esc = false;
3650 3704
3651 if (n >= STRING_MAX - 1) 3705 if (n >= STRING_MAX - 1)
3652 // stop at some sane length 3706 // stop at some sane length
3653 return NULL; 3707 return NULL;
3654 3708
3655 if (ch == C0_SYN)
3656 string[n++] = cmd_get8 ();
3657 else
3658 string[n++] = ch; 3709 string[n++] = ch;
3659 } 3710 }
3660 3711
3661 string[n++] = '\0'; 3712 string[n++] = '\0';
3662 3713
3663 ends_how = (ch == 0x5c ? C0_ESC : ch); 3714 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3714void 3765void
3715rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3766rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3716{ 3767{
3717 if (str[0] == '?' && !str[1]) 3768 if (str[0] == '?' && !str[1])
3718 { 3769 {
3719 rxvt_rgba c; 3770 rgba c;
3720 pix_colors_focused[color].get (this, c); 3771 pix_colors_focused[color].get (c);
3721 3772
3722#if XFT 3773#if XFT
3723 if (c.a != rxvt_rgba::MAX_CC) 3774 if (c.a != rgba::MAX_CC)
3724 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3775 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3725 else 3776 else
3726#endif 3777#endif
3727 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3778 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3728 } 3779 }
… …
3739 int color; 3790 int color;
3740 char *buf, *name; 3791 char *buf, *name;
3741 bool query = str[0] == '?' && !str[1]; 3792 bool query = str[0] == '?' && !str[1];
3742 int saveop = op; 3793 int saveop = op;
3743 3794
3744 dLocal (Display *, xdisp); 3795 dLocal (Display *, dpy);
3745 3796
3746 assert (str != NULL); 3797 assert (str != NULL);
3798
3799 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3800 return;
3801
3747 switch (op) 3802 switch (op)
3748 { 3803 {
3749 case XTerm_name: 3804 case XTerm_name:
3750 set_title (str); 3805 set_title (str);
3751 /* FALLTHROUGH */ 3806 /* FALLTHROUGH */
… …
3765 unsigned long bytes_after; 3820 unsigned long bytes_after;
3766 unsigned char *value = 0; 3821 unsigned char *value = 0;
3767 const char *str = ""; 3822 const char *str = "";
3768 3823
3769 if (prop 3824 if (prop
3770 && XGetWindowProperty (xdisp, parent[0], 3825 && XGetWindowProperty (dpy, parent[0],
3771 prop, 0, 1<<16, 0, AnyPropertyType, 3826 prop, 0, 1<<16, 0, AnyPropertyType,
3772 &actual_type, &actual_format, 3827 &actual_type, &actual_format,
3773 &nitems, &bytes_after, &value) == Success 3828 &nitems, &bytes_after, &value) == Success
3774 && actual_type != None 3829 && actual_type != None
3775 && actual_format == 8) 3830 && actual_format == 8)
… …
3787 { 3842 {
3788 *eq = 0; 3843 *eq = 0;
3789 set_utf8_property (display->atom (str), eq + 1); 3844 set_utf8_property (display->atom (str), eq + 1);
3790 } 3845 }
3791 else 3846 else
3792 XDeleteProperty (xdisp, parent[0], 3847 XDeleteProperty (dpy, parent[0],
3793 display->atom (str)); 3848 display->atom (str));
3794 } 3849 }
3795 break; 3850 break;
3796 3851
3797 case XTerm_Color: 3852 case XTerm_Color:
… …
3846 break; 3901 break;
3847#endif 3902#endif
3848#if TRANSPARENT && TINTING 3903#if TRANSPARENT && TINTING
3849 case URxvt_Color_tint: 3904 case URxvt_Color_tint:
3850 process_color_seq (op, Color_tint, str, resp); 3905 process_color_seq (op, Color_tint, str, resp);
3906
3851 check_our_parents (); 3907 check_our_parents ();
3908
3852 if (am_transparent) 3909 if (am_transparent)
3853 want_full_refresh = want_refresh = 1; 3910 want_full_refresh = want_refresh = 1;
3911
3854 break; 3912 break;
3855#endif 3913#endif
3856 3914
3857 case Rxvt_Pixmap: 3915 case Rxvt_Pixmap:
3858 { 3916 {
… …
3916 case URxvt_italicFont: 3974 case URxvt_italicFont:
3917 case URxvt_boldItalicFont: 3975 case URxvt_boldItalicFont:
3918#endif 3976#endif
3919 if (query) 3977 if (query)
3920 tt_printf ("\33]%d;%-.250s%c", saveop, 3978 tt_printf ("\33]%d;%-.250s%c", saveop,
3921 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3979 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3922 ? fontset[op - URxvt_font]->fontdesc : "", 3980 ? fontset[op - URxvt_font]->fontdesc : "",
3923 resp); 3981 resp);
3924 else 3982 else
3925 { 3983 {
3926 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3984 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3937 op, 3995 op,
3938 rs[Rs_name], VERSION[0], VERSION[2], 3996 rs[Rs_name], VERSION[0], VERSION[2],
3939 resp); 3997 resp);
3940 break; 3998 break;
3941 3999
3942#if ENABLE_FRILLS 4000#if !ENABLE_MINIMAL
3943 case URxvt_locale: 4001 case URxvt_locale:
3944 if (query) 4002 if (query)
3945 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 4003 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3946 else 4004 else
3947 { 4005 {
3948 set_locale (str); 4006 set_locale (str);
3949 pty->set_utf8_mode (enc_utf8); 4007 pty->set_utf8_mode (enc_utf8);
3950 init_xlocale (); 4008 init_xlocale ();
… …
3965 break; 4023 break;
3966#endif 4024#endif
3967 4025
3968#if ENABLE_PERL 4026#if ENABLE_PERL
3969 case URxvt_perl: 4027 case URxvt_perl:
3970 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4028 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3971 ; // no responses yet 4029 ; // no responses yet
3972 break; 4030 break;
3973#endif 4031#endif
3974 } 4032 }
3975} 4033}
… …
4091 scr_touch (true); 4149 scr_touch (true);
4092 break; 4150 break;
4093#endif 4151#endif
4094 case 1048: /* alternative cursor save */ 4152 case 1048: /* alternative cursor save */
4095 case 1049: 4153 case 1049:
4096 if (OPTION (Opt_secondaryScreen)) 4154 if (option (Opt_secondaryScreen))
4097 if (mode == 0) 4155 if (mode == 0)
4098 scr_cursor (RESTORE); 4156 scr_cursor (RESTORE);
4099 else if (mode == 1) 4157 else if (mode == 1)
4100 scr_cursor (SAVE); 4158 scr_cursor (SAVE);
4101 break; 4159 break;
… …
4166 break; 4224 break;
4167 case 1011: /* scroll to bottom on key press */ 4225 case 1011: /* scroll to bottom on key press */
4168 set_option (Opt_scrollTtyKeypress, state); 4226 set_option (Opt_scrollTtyKeypress, state);
4169 break; 4227 break;
4170 case 1047: /* secondary screen w/ clearing last */ 4228 case 1047: /* secondary screen w/ clearing last */
4171 if (OPTION (Opt_secondaryScreen)) 4229 if (option (Opt_secondaryScreen))
4172 if (current_screen != PRIMARY) 4230 if (current_screen != PRIMARY)
4173 scr_erase_screen (2); 4231 scr_erase_screen (2);
4174 scr_change_screen (state); 4232 scr_change_screen (state);
4175 break; 4233 break;
4176 case 1049: /* secondary screen w/ clearing first */ 4234 case 1049: /* secondary screen w/ clearing first */
4177 scr_change_screen (state); 4235 scr_change_screen (state);
4178 if (OPTION (Opt_secondaryScreen)) 4236 if (option (Opt_secondaryScreen))
4179 if (current_screen != PRIMARY) 4237 if (current_screen != PRIMARY)
4180 scr_erase_screen (2); 4238 scr_erase_screen (2);
4181 break; 4239 break;
4182 default: 4240 default:
4183 break; 4241 break;
… …
4311 scr_color (Color_bg, Color_bg); 4369 scr_color (Color_bg, Color_bg);
4312 break; 4370 break;
4313 4371
4314 //case 50: // not variable spacing 4372 //case 50: // not variable spacing
4315 4373
4316#if ENABLE_FRILLS 4374#if !ENABLE_MINIMAL
4317 case 90: 4375 case 90:
4318 case 91: /* set bright fg color */ 4376 case 91: /* set bright fg color */
4319 case 92: 4377 case 92:
4320 case 93: 4378 case 93:
4321 case 94: 4379 case 94:

Diff Legend

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