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.275 by root, Fri Jan 20 10:35:25 2006 UTC vs.
Revision 1.313 by root, Wed Jul 5 22:46:14 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
64 63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 67
… …
227# if !UNICODE3 226# if !UNICODE3
228 if (ch >= 0x10000) 227 if (ch >= 0x10000)
229 ch = 0xfffd; 228 ch = 0xfffd;
230# endif 229# endif
231 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
233 } 234 }
234 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
235 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
237 243
238 free (fname); 244 free (fname);
239 245
… …
292 298
293 return -1; 299 return -1;
294} 300}
295#endif 301#endif
296 302
297/*{{{ Convert the keypress event into a string */
298void 303void
299rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
300{ 305{
301 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
302 unsigned int newlen; 307 unsigned int newlen;
303 KeySym keysym; 308 KeySym keysym;
304#ifdef DEBUG_CMD
305 static int debug_key = 1; /* accessible by a debugger only */
306#endif
307 int valid_keysym; 309 int valid_keysym;
308 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
309 316
310 /* 317 /*
311 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
312 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
313 * 320 *
… …
902 { 909 {
903 const char ch = C0_ESC; 910 const char ch = C0_ESC;
904 tt_write (&ch, 1); 911 tt_write (&ch, 1);
905 } 912 }
906 913
907#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */
909 unsigned char *p;
910 int i;
911
912 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913 for (i = 0, p = kbuf; i < len; i++, p++)
914 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915 fprintf (stderr, "'\n");
916#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 914 tt_write (kbuf, (unsigned int)len);
918} 915}
919/*}}} */ 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}
920 993
921#if defined (KEYSYM_RESOURCE) 994#if defined (KEYSYM_RESOURCE)
922unsigned int 995unsigned int
923rxvt_term::cmd_write (const char *str, unsigned int count) 996rxvt_term::cmd_write (const char *str, unsigned int count)
924{ 997{
… …
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1102 } 1175 }
1103} 1176}
1104#endif 1177#endif
1105 1178
1106#if HAVE_SCHED_YIELD 1179#if LINUX_YIELD_HACK
1107static struct event_handler 1180static struct event_handler
1108{ 1181{
1109 check_watcher cw_yield; 1182 check_watcher yield_ev;
1110 1183
1111 void yield (check_watcher &w) 1184 void yield_cb (check_watcher &w)
1112 { 1185 {
1113 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
1114 w.stop (); 1194 w.stop ();
1115 } 1195 }
1116 1196
1117 event_handler () 1197 event_handler ()
1118 : cw_yield (this, &event_handler::yield) 1198 : yield_ev (this, &event_handler::yield_cb)
1119 { 1199 {
1120 } 1200 }
1121} event_handler; 1201} event_handler;
1122#endif 1202#endif
1123 1203
… …
1143 cmdbuf_endp += r; 1223 cmdbuf_endp += r;
1144 return true; 1224 return true;
1145 } 1225 }
1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 { 1227 {
1148#if HAVE_SCHED_YIELD 1228#if LINUX_YIELD_HACK
1149 if (display->is_local) 1229 if (display->is_local)
1150 event_handler.cw_yield.start (); 1230 event_handler.yield_ev.start ();
1151#endif 1231#endif
1152 } 1232 }
1153 else 1233 else
1154 { 1234 {
1155 pty_ev.stop (); 1235 pty_ev.stop ();
… …
1177} 1257}
1178 1258
1179void 1259void
1180rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1181{ 1261{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1263 recolour_cursor ();
1184 1264
1185#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1266 hidden_pointer = 0;
1187 1267
… …
1195rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1196{ 1276{
1197 if (!OPTION (Opt_pointerBlank)) 1277 if (!OPTION (Opt_pointerBlank))
1198 return; 1278 return;
1199 1279
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (display->display); 1281 XFlush (dpy);
1202 1282
1203 hidden_pointer = 1; 1283 hidden_pointer = 1;
1204} 1284}
1205 1285
1206void 1286void
… …
1279 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
1280 (32 + x + 1), 1360 (32 + x + 1),
1281 (32 + y + 1)); 1361 (32 + y + 1));
1282} 1362}
1283 1363
1284#ifdef USING_W11LIB
1285void
1286rxvt_W11_process_x_event (XEvent *ev)
1287{
1288 rxvt_t *r = rxvt_get_r ();
1289
1290 x_cb (*ev);
1291}
1292#endif
1293
1294/*{{{ process an X event */ 1364/*{{{ process an X event */
1295void 1365void
1296rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1297{ 1367{
1298 make_current (); 1368 make_current ();
1299 1369
1300 dDisp; 1370 dLocal (Display *, dpy);
1301 1371
1302 if (ev.xany.window == vt 1372 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1375 return;
… …
1310 unsigned int unused_mask; 1380 unsigned int unused_mask;
1311 1381
1312 switch (ev.type) 1382 switch (ev.type)
1313 { 1383 {
1314 case KeyPress: 1384 case KeyPress:
1315#if ISO_14755 1385 key_press (ev.xkey);
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
1318 lookup_key (ev.xkey);
1319
1320 break; 1386 break;
1321 1387
1322 case KeyRelease: 1388 case KeyRelease:
1323 { 1389 key_release (ev.xkey);
1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1325 KeySym keysym;
1326
1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1328#endif
1329
1330#if ENABLE_FRILLS || ISO_14755
1331 // ISO 14755 support
1332 if (iso14755buf)
1333 if (iso14755buf & ISO_14755_52)
1334 {
1335# if ENABLE_OVERLAY
1336 scr_overlay_off ();
1337# endif
1338# if ISO_14755
1339 // iso14755 part 5.2 handling: release time
1340 // first: controls
1341 if ((ev.xkey.state & ControlMask)
1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1344 {
1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1346 commit_iso14755 ();
1347 goto skip_switch;
1348 }
1349
1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1351 if (i[0] == keysym)
1352 {
1353 iso14755buf = ISO_14755_51 | i[1];
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 scr_bell ();
1359# endif
1360 iso14755buf = 0;
1361 break;
1362 }
1363 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1364 {
1365# if ENABLE_OVERLAY
1366 scr_overlay_off ();
1367# endif
1368 if (iso14755buf & ISO_14755_51)
1369 commit_iso14755 ();
1370#if ISO_14755
1371 else if (iso14755buf & ISO_14755_STARTED)
1372 {
1373 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1374
1375 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1376 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1377 }
1378# endif
1379 else
1380 iso14755buf = 0;
1381 }
1382#endif
1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386 break;
1387
1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1389 if (!(ev.xkey.state & ControlMask))
1390 slip_wheel_ev.stop ();
1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1392 mouse_slip_wheel_speed = 0;
1393#endif
1394 break; 1390 break;
1395 }
1396 1391
1397 case ButtonPress: 1392 case ButtonPress:
1398 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1399 break; 1394 break;
1400 1395
… …
1402 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1403 break; 1398 break;
1404 1399
1405 case ClientMessage: 1400 case ClientMessage:
1406 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1407 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1408 { 1403 {
1404 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1405 {
1406 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1407 {
1409 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1408 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1409 {
1410 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1410 destroy (); 1411 destroy ();
1412 }
1411#if ENABLE_EWMH 1413#if ENABLE_EWMH
1412 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])
1413 XSendEvent (disp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1414 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1415 &ev); 1417 &ev);
1418#endif
1419 }
1420 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1416#endif 1429#endif
1417 } 1430 }
1418#if ENABLE_XEMBED
1419 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1420 {
1421 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1422 focus_in ();
1423 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1424 focus_out ();
1425 }
1426#endif
1427#ifdef OFFIX_DND
1428 /* OffiX Dnd (drag 'n' drop) protocol */
1429 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1430 && (ev.xclient.data.l[0] == DndFile
1431 || ev.xclient.data.l[0] == DndDir
1432 || ev.xclient.data.l[0] == DndLink))
1433 {
1434 /* Get Dnd data */
1435 Atom ActualType;
1436 int ActualFormat;
1437 unsigned char *data;
1438 unsigned long Size, RemainingBytes;
1439
1440 XGetWindowProperty (disp, display->root,
1441 xa[XA_DNDSELECTION],
1442 0L, 1000000L,
1443 False, AnyPropertyType,
1444 &ActualType, &ActualFormat,
1445 &Size, &RemainingBytes,
1446 &data);
1447 set_string_property (XA_CUT_BUFFER0, data);
1448 XFree (data);
1449 selection_paste (display->root, XA_CUT_BUFFER0, true);
1450 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1451 }
1452#endif /* OFFIX_DND */
1453 break; 1431 break;
1454 1432
1455 case MappingNotify: 1433 case MappingNotify:
1456 XRefreshKeyboardMapping (&ev.xmapping); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1457 break; 1435 break;
… …
1490 break; 1468 break;
1491 1469
1492 case ConfigureNotify: 1470 case ConfigureNotify:
1493 if (ev.xconfigure.window == parent[0]) 1471 if (ev.xconfigure.window == parent[0])
1494 { 1472 {
1495 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1496 ; 1474 ;
1497 1475
1498 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1499 { 1477 {
1500 seen_resize = 1; 1478 seen_resize = 1;
… …
1509#endif 1487#endif
1510 } 1488 }
1511 break; 1489 break;
1512 1490
1513 case PropertyNotify: 1491 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1493 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1515 && ev.xproperty.state == PropertyNewValue) 1494 && ev.xproperty.state == PropertyNewValue)
1516 selection_property (ev.xproperty.window, ev.xproperty.atom); 1495 selection_property (ev.xproperty.window, ev.xproperty.atom);
1517 1496
1518 break; 1497 break;
1519 1498
1520 case SelectionClear: 1499 case SelectionClear:
1521 selection_clear (); 1500 selection_clear ();
… …
1557 if (ev.xany.window == vt) 1536 if (ev.xany.window == vt)
1558 { 1537 {
1559 do 1538 do
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1539 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1540 ev.xexpose.width, ev.xexpose.height, False);
1562 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1563 1542
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565 1544
1566 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1569 1548
1570 want_refresh = 1; 1549 want_refresh = 1;
1571 } 1550 }
1572 else 1551 else
1573 { 1552 {
1574 XEvent unused_event; 1553 XEvent unused_event;
1575 1554
1576 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1577 ; 1556 ;
1578 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1579 ; 1558 ;
1580 1559
1581 if (isScrollbarWindow (ev.xany.window)) 1560 if (isScrollbarWindow (ev.xany.window))
1582 { 1561 {
1583 scrollBar.setIdle (); 1562 scrollBar.setIdle ();
1584 scrollbar_show (0); 1563 scrollbar_show (0);
1585 } 1564 }
1586 1565
1587#ifdef TRANSPARENT 1566#ifdef TRANSPARENT
1588 if (am_transparent && ev.xany.window == parent[0]) 1567 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (disp, ev.xany.window); 1568 XClearWindow (dpy, ev.xany.window);
1590#endif 1569#endif
1591 } 1570 }
1592 break; 1571 break;
1593 1572
1594 case MotionNotify: 1573 case MotionNotify:
… …
1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1583 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1584 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1606 ; // nop 1585 ; // nop
1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1586 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1608 { 1587 {
1609 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1588 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1610 ; 1589 ;
1611 1590
1612 XQueryPointer (disp, vt, 1591 XQueryPointer (dpy, vt,
1613 &unused_root, &unused_child, 1592 &unused_root, &unused_child,
1614 &unused_root_x, &unused_root_y, 1593 &unused_root_x, &unused_root_y,
1615 &ev.xbutton.x, &ev.xbutton.y, 1594 &ev.xbutton.x, &ev.xbutton.y,
1616 &ev.xbutton.state); 1595 &ev.xbutton.state);
1617#ifdef MOUSE_THRESHOLD 1596#ifdef MOUSE_THRESHOLD
… …
1681#endif 1660#endif
1682 } 1661 }
1683 } 1662 }
1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1685 { 1664 {
1686 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1687 MotionNotify, &ev)) 1666 MotionNotify, &ev))
1688 ; 1667 ;
1689 1668
1690 XQueryPointer (disp, scrollBar.win, 1669 XQueryPointer (dpy, scrollBar.win,
1691 &unused_root, &unused_child, 1670 &unused_root, &unused_child,
1692 &unused_root_x, &unused_root_y, 1671 &unused_root_x, &unused_root_y,
1693 &ev.xbutton.x, &ev.xbutton.y, 1672 &ev.xbutton.x, &ev.xbutton.y,
1694 &unused_mask); 1673 &unused_mask);
1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1699 scrollbar_show (1); 1678 scrollbar_show (1);
1700 } 1679 }
1701 break; 1680 break;
1702 } 1681 }
1703 1682
1704skip_switch: ;
1705
1706#if defined(CURSOR_BLINK) 1683#if defined(CURSOR_BLINK)
1707 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1708 { 1685 {
1709 if (hidden_cursor) 1686 if (hidden_cursor)
1710 { 1687 {
… …
1737 if (!focus) 1714 if (!focus)
1738 { 1715 {
1739 focus = 1; 1716 focus = 1;
1740 want_refresh = 1; 1717 want_refresh = 1;
1741 1718
1742 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1719 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1743 1720
1744#if USE_XIM 1721#if USE_XIM
1745 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1746 { 1723 {
1747 IMSetStatusPosition (); 1724 IMSetPosition ();
1748 XSetICFocus (Input_Context); 1725 XSetICFocus (Input_Context);
1749 } 1726 }
1750#endif 1727#endif
1751#if CURSOR_BLINK 1728#if CURSOR_BLINK
1752 if (OPTION (Opt_cursorBlink)) 1729 if (OPTION (Opt_cursorBlink))
… …
1796 pix_colors = pix_colors_unfocused; 1773 pix_colors = pix_colors_unfocused;
1797 scr_recolour (); 1774 scr_recolour ();
1798 } 1775 }
1799#endif 1776#endif
1800 } 1777 }
1778}
1779
1780void
1781rxvt_term::update_fade_color (unsigned int idx)
1782{
1783#if OFF_FOCUS_FADING
1784 if (rs[Rs_fade])
1785 {
1786 rgba c;
1787 pix_colors [Color_fade].get (c);
1788 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1789 }
1790#endif
1801} 1791}
1802 1792
1803#if TRANSPARENT 1793#if TRANSPARENT
1804void 1794void
1805rxvt_term::rootwin_cb (XEvent &ev) 1795rxvt_term::rootwin_cb (XEvent &ev)
… …
1839 /* 1829 /*
1840 * VT window processing of button press 1830 * VT window processing of button press
1841 */ 1831 */
1842 if (ev.window == vt) 1832 if (ev.window == vt)
1843 { 1833 {
1834 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1835 return;
1836
1844#if ISO_14755 1837#if ISO_14755
1845 // 5.4 1838 // 5.4
1846 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1839 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1847 { 1840 {
1848 iso14755_54 (ev.x, ev.y); 1841 iso14755_54 (ev.x, ev.y);
… …
1890 else 1883 else
1891 { 1884 {
1892 if (ev.button != MEvent.button) 1885 if (ev.button != MEvent.button)
1893 MEvent.clicks = 0; 1886 MEvent.clicks = 0;
1894 1887
1895 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1896 switch (ev.button) 1888 switch (ev.button)
1897 { 1889 {
1898 case Button1: 1890 case Button1:
1899 /* allow meta + click to select rectangular areas */ 1891 /* allow meta + click to select rectangular areas */
1900 /* should be done in screen.C */ 1892 /* should be done in screen.C */
1901#if ENABLE_FRILLS 1893#if ENABLE_FRILLS
1902 selection.rect = !!(ev.state & ModMetaMask); 1894 selection.rect = !!(ev.state & ModMetaMask);
1903#else 1895#else
1904 selection.rect = false; 1896 selection.rect = false;
1905#endif 1897#endif
1906 1898
1907 /* allow shift+left click to extend selection */ 1899 /* allow shift+left click to extend selection */
1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1900 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1909 { 1901 {
1910 if (MEvent.button == Button1 && clickintime) 1902 if (MEvent.button == Button1 && clickintime)
1911 selection_rotate (ev.x, ev.y); 1903 selection_rotate (ev.x, ev.y);
1912 else 1904 else
1913 selection_extend (ev.x, ev.y, 1); 1905 selection_extend (ev.x, ev.y, 1);
1914 } 1906 }
1915 else 1907 else
1916 { 1908 {
1917 if (MEvent.button == Button1 && clickintime) 1909 if (MEvent.button == Button1 && clickintime)
1918 MEvent.clicks++; 1910 MEvent.clicks++;
1919 else 1911 else
1920 MEvent.clicks = 1; 1912 MEvent.clicks = 1;
1921 1913
1922 selection_click (MEvent.clicks, ev.x, ev.y); 1914 selection_click (MEvent.clicks, ev.x, ev.y);
1923 } 1915 }
1924 1916
1925 MEvent.button = Button1; 1917 MEvent.button = Button1;
1926 break; 1918 break;
1927 1919
1928 case Button3: 1920 case Button3:
1929 if (MEvent.button == Button3 && clickintime) 1921 if (MEvent.button == Button3 && clickintime)
1930 selection_rotate (ev.x, ev.y); 1922 selection_rotate (ev.x, ev.y);
1931 else 1923 else
1932 selection_extend (ev.x, ev.y, 1); 1924 selection_extend (ev.x, ev.y, 1);
1933 1925
1934 MEvent.button = Button3; 1926 MEvent.button = Button3;
1935 break; 1927 break;
1936 } 1928 }
1937 } 1929 }
1938 1930
1939 MEvent.time = ev.time; 1931 MEvent.time = ev.time;
1940 return; 1932 return;
1941 } 1933 }
1942 1934
… …
2105 sel_scroll_ev.stop(); 2097 sel_scroll_ev.stop();
2106#endif 2098#endif
2107 2099
2108 if (ev.window == vt) 2100 if (ev.window == vt)
2109 { 2101 {
2102 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2103 return;
2104
2110#if ISO_14755 2105#if ISO_14755
2111 // 5.4 2106 // 5.4
2112 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2107 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2113 return; 2108 return;
2114#endif 2109#endif
2110
2115 if (reportmode) 2111 if (reportmode)
2116 { 2112 {
2117 /* mouse report from vt window */ 2113 /* mouse report from vt window */
2118 /* don't report release of wheel "buttons" */ 2114 /* don't report release of wheel "buttons" */
2119 if (ev.button >= 4) 2115 if (ev.button >= 4)
… …
2143 if (priv_modes & PrivMode_mouse_report 2139 if (priv_modes & PrivMode_mouse_report
2144 && bypass_keystate 2140 && bypass_keystate
2145 && ev.button == Button1 && MEvent.clicks <= 1) 2141 && ev.button == Button1 && MEvent.clicks <= 1)
2146 selection_extend (ev.x, ev.y, 0); 2142 selection_extend (ev.x, ev.y, 0);
2147 2143
2148 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2149 return;
2150
2151 switch (ev.button) 2144 switch (ev.button)
2152 { 2145 {
2153 case Button1: 2146 case Button1:
2154 case Button3: 2147 case Button3:
2155 selection_make (ev.time); 2148 selection_make (ev.time);
2156 break; 2149 break;
2157 2150
2158 case Button2: 2151 case Button2:
2159 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2152 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2160 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); 2153 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2161 break; 2154 break;
2162 2155
2163#ifdef MOUSE_WHEEL 2156#ifdef MOUSE_WHEEL
2164 case Button4: 2157 case Button4:
2165 case Button5: 2158 case Button5:
… …
2207#if TINTING 2200#if TINTING
2208/* taken from aterm-0.4.2 */ 2201/* taken from aterm-0.4.2 */
2209 2202
2210typedef uint32_t RUINT32T; 2203typedef uint32_t RUINT32T;
2211 2204
2212void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2205void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2213{ 2206{
2214 int sh_r, sh_g, sh_b; 2207 int sh_r, sh_g, sh_b;
2215 RUINT32T mask_r, mask_g, mask_b; 2208 RUINT32T mask_r, mask_g, mask_b;
2216 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2209 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2217 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2210 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2218 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2211 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2219 int i; 2212 int i;
2220 2213
2221 Visual *visual = display->visual; 2214 Visual *visual = term->visual;
2222 2215
2223 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2216 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2224 2217
2225 /* for convenience */ 2218 /* for convenience */
2226 mask_r = visual->red_mask; 2219 mask_r = visual->red_mask;
… …
2447 Atom atype; 2440 Atom atype;
2448 unsigned char *prop = NULL; 2441 unsigned char *prop = NULL;
2449 Window root, oldp, *list; 2442 Window root, oldp, *list;
2450 Pixmap rootpixmap = None; 2443 Pixmap rootpixmap = None;
2451 XWindowAttributes wattr, wrootattr; 2444 XWindowAttributes wattr, wrootattr;
2452 dDisp;
2453 2445
2454 pchanged = 0; 2446 pchanged = 0;
2455 2447
2456 if (!OPTION (Opt_transparent)) 2448 if (!OPTION (Opt_transparent))
2457 return pchanged; /* Don't try any more */ 2449 return pchanged; /* Don't try any more */
2458 2450
2459 XGetWindowAttributes (disp, display->root, &wrootattr); 2451 XGetWindowAttributes (dpy, display->root, &wrootattr);
2460 rootdepth = wrootattr.depth; 2452 rootdepth = wrootattr.depth;
2461 2453
2462 XGetWindowAttributes (disp, parent[0], &wattr); 2454 XGetWindowAttributes (dpy, parent[0], &wattr);
2463 2455
2464 if (rootdepth != wattr.depth) 2456 if (rootdepth != wattr.depth)
2465 { 2457 {
2466 if (am_transparent) 2458 if (am_transparent)
2467 { 2459 {
2468 pchanged = 1; 2460 pchanged = 1;
2469 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2461 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2470 am_transparent = am_pixmap_trans = 0; 2462 am_transparent = am_pixmap_trans = 0;
2471 } 2463 }
2472 2464
2473 return pchanged; /* Don't try any more */ 2465 return pchanged; /* Don't try any more */
2474 } 2466 }
2475 2467
2476 /* Get all X ops out of the queue so that our information is up-to-date. */ 2468 /* Get all X ops out of the queue so that our information is up-to-date. */
2477 XSync (disp, False); 2469 XSync (dpy, False);
2478 2470
2479 /* 2471 /*
2480 * Make the frame window set by the window manager have 2472 * Make the frame window set by the window manager have
2481 * the root background. Some window managers put multiple nested frame 2473 * the root background. Some window managers put multiple nested frame
2482 * windows for each client, so we have to take care about that. 2474 * windows for each client, so we have to take care about that.
2483 */ 2475 */
2484 i = (xa[XA_XROOTPMAP_ID] 2476 i = (xa[XA_XROOTPMAP_ID]
2485 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2477 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2478 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2487 &nitems, &bytes_after, &prop) == Success); 2479 &nitems, &bytes_after, &prop) == Success);
2488 2480
2489 if (!i || prop == NULL) 2481 if (!i || prop == NULL)
2490 i = (xa[XA_ESETROOT_PMAP_ID] 2482 i = (xa[XA_ESETROOT_PMAP_ID]
2491 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2483 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493 &nitems, &bytes_after, &prop) == Success); 2485 &nitems, &bytes_after, &prop) == Success);
2494 2486
2495 if (!i || prop == NULL 2487 if (!i || prop == NULL
2496#if TINTING 2488#if TINTING
2497 || !rs[Rs_color + Color_tint] 2489 || !ISSET_PIXCOLOR (Color_tint)
2498#endif 2490#endif
2499 ) 2491 )
2500 have_pixmap = 0; 2492 have_pixmap = 0;
2501 else 2493 else
2502 { 2494 {
… …
2515 Window cr; 2507 Window cr;
2516 XImage *image; 2508 XImage *image;
2517 GC gc; 2509 GC gc;
2518 XGCValues gcvalue; 2510 XGCValues gcvalue;
2519 2511
2520 XTranslateCoordinates (disp, parent[0], display->root, 2512 XTranslateCoordinates (dpy, parent[0], display->root,
2521 0, 0, &sx, &sy, &cr); 2513 0, 0, &sx, &sy, &cr);
2522 nw = (unsigned int)szHint.width; 2514 nw = (unsigned int)szHint.width;
2523 nh = (unsigned int)szHint.height; 2515 nh = (unsigned int)szHint.height;
2524 nx = ny = 0; 2516 nx = ny = 0;
2525 2517
… …
2538 } 2530 }
2539 2531
2540 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2532 min_it (nw, (unsigned int) (wrootattr.width - sx));
2541 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2533 min_it (nh, (unsigned int) (wrootattr.height - sy));
2542 2534
2543 XSync (disp, False); 2535 XSync (dpy, False);
2544 allowedxerror = -1; 2536 allowedxerror = -1;
2545 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2537 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2546 2538
2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2539 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2548 /* XXX: may need a delay here? */ 2540 /* XXX: may need a delay here? */
2549 allowedxerror = 0; 2541 allowedxerror = 0;
2550 2542
… …
2553 if (am_transparent && am_pixmap_trans) 2545 if (am_transparent && am_pixmap_trans)
2554 { 2546 {
2555 pchanged = 1; 2547 pchanged = 1;
2556 if (pixmap != None) 2548 if (pixmap != None)
2557 { 2549 {
2558 XFreePixmap (disp, pixmap); 2550 XFreePixmap (dpy, pixmap);
2559 pixmap = None; 2551 pixmap = None;
2560 } 2552 }
2561 } 2553 }
2562 2554
2563 am_pixmap_trans = 0; 2555 am_pixmap_trans = 0;
2564 } 2556 }
2565 else 2557 else
2566 { 2558 {
2567 if (pixmap != None) 2559 if (pixmap != None)
2568 XFreePixmap (disp, pixmap); 2560 XFreePixmap (dpy, pixmap);
2569 2561
2570#if TINTING 2562#if TINTING
2571 if (ISSET_PIXCOLOR (Color_tint)) 2563 if (ISSET_PIXCOLOR (Color_tint))
2572 { 2564 {
2573 unsigned short rm, gm, bm;
2574 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2565 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2575 2566
2567 rgba c;
2576 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2568 pix_colors_focused [Color_tint].get (c);
2577 2569
2578 ShadeXImage (display, image, shade, rm, gm, bm); 2570 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2579 } 2571 }
2580#endif 2572#endif
2581 2573
2582 pixmap = XCreatePixmap (disp, vt, 2574 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2583 szHint.width, szHint.height, image->depth);
2584 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2575 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2585 XPutImage (disp, pixmap, gc, image, 0, 0, 2576 XPutImage (dpy, pixmap, gc, image, 0, 0,
2586 nx, ny, image->width, image->height); 2577 nx, ny, image->width, image->height);
2587 XFreeGC (disp, gc); 2578 XFreeGC (dpy, gc);
2588 XDestroyImage (image); 2579 XDestroyImage (image);
2589 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2580 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2590 XClearWindow (disp, parent[0]); 2581 XClearWindow (dpy, parent[0]);
2591 2582
2592 if (!am_transparent || !am_pixmap_trans) 2583 if (!am_transparent || !am_pixmap_trans)
2593 pchanged = 1; 2584 pchanged = 1;
2594 2585
2595 am_transparent = am_pixmap_trans = 1; 2586 am_transparent = am_pixmap_trans = 1;
2596 } 2587 }
2597 } 2588 }
2598 2589
2599 if (am_pixmap_trans) 2590 if (am_pixmap_trans)
2600 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2591 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2601 else 2592 else
2602 { 2593 {
2603 unsigned int n; 2594 unsigned int n;
2604 /* 2595 /*
2605 * InheritPixmap transparency 2596 * InheritPixmap transparency
2606 */ 2597 */
2607 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2598 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2608 { 2599 {
2609 oldp = parent[i]; 2600 oldp = parent[i];
2610 XQueryTree (disp, parent[i - 1], &root, 2601 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2611 &parent[i], &list, &n);
2612 XFree (list); 2602 XFree (list);
2613 2603
2614 if (parent[i] == display->root) 2604 if (parent[i] == display->root)
2615 { 2605 {
2616 if (oldp != None) 2606 if (oldp != None)
… …
2624 } 2614 }
2625 2615
2626 n = 0; 2616 n = 0;
2627 2617
2628 if (pchanged) 2618 if (pchanged)
2629 {
2630 for (; n < (unsigned int)i; n++) 2619 for (; n < (unsigned int)i; n++)
2631 { 2620 {
2632 XGetWindowAttributes (disp, parent[n], &wattr); 2621 XGetWindowAttributes (dpy, parent[n], &wattr);
2622
2633 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2623 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2634 { 2624 {
2635 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2625 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2636 break; 2626 break;
2637 } 2627 }
2638 } 2628 }
2639 }
2640 2629
2641 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2630 if (n > (sizeof (parent) / sizeof (parent[0])))
2642 { 2631 {
2643 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2632 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2644 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2633 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2645 am_transparent = 0; 2634 am_transparent = 0;
2646 /* XXX: also turn off Opt_transparent? */ 2635 /* XXX: also turn off Opt_transparent? */
2647 } 2636 }
2648 else 2637 else
2649 { 2638 {
2650#if WAIT_FOR_WM
2651 /* wait (an arbitrary period) for the WM to do its thing
2652 * needed for fvwm2.2.2 (and before?) */
2653 sleep (1);
2654#endif
2655 for (n = 0; n < (unsigned int)i; n++) 2639 for (n = 0; n < (unsigned int)i; n++)
2656 { 2640 {
2657 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2641 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2658 XClearWindow (disp, parent[n]); 2642 XClearWindow (dpy, parent[n]);
2659 } 2643 }
2660 2644
2661 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2645 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2662 am_transparent = 1; 2646 am_transparent = 1;
2663 } 2647 }
2664 2648
2665 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2649 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2666 parent[i] = None; 2650 parent[i] = None;
2667 } 2651 }
2668 2652
2669 if (scrollBar.win) 2653 if (scrollBar.win)
2670 { 2654 {
2671 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2655 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2672 scrollBar.setIdle (); 2656 scrollBar.setIdle ();
2673 scrollbar_show (0); 2657 scrollbar_show (0);
2674 } 2658 }
2675 2659
2676 if (am_transparent) 2660 if (am_transparent)
… …
2794 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2778 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2795 refresh_limit++; 2779 refresh_limit++;
2796 else 2780 else
2797 { 2781 {
2798 flag = true; 2782 flag = true;
2783 //TODO: due to popular request, implement "skipscroll" option here
2799 scr_refresh (); 2784 scr_refresh ();
2800 want_refresh = 1; 2785 want_refresh = 1;
2801 } 2786 }
2802 } 2787 }
2803 2788
… …
3127 scr_charset_set (2, (unsigned int)cmd_getc ()); 3112 scr_charset_set (2, (unsigned int)cmd_getc ());
3128 break; 3113 break;
3129 case '+': 3114 case '+':
3130 scr_charset_set (3, (unsigned int)cmd_getc ()); 3115 scr_charset_set (3, (unsigned int)cmd_getc ());
3131 break; 3116 break;
3132#if ENABLE_FRILLS 3117#if !ENABLE_MINIMAL
3133 case '6': 3118 case '6':
3134 scr_backindex (); 3119 scr_backindex ();
3135 break; 3120 break;
3136#endif 3121#endif
3137 case '7': 3122 case '7':
3138 scr_cursor (SAVE); 3123 scr_cursor (SAVE);
3139 break; 3124 break;
3140 case '8': 3125 case '8':
3141 scr_cursor (RESTORE); 3126 scr_cursor (RESTORE);
3142 break; 3127 break;
3143#if ENABLE_FRILLS 3128#if !ENABLE_MINIMAL
3144 case '9': 3129 case '9':
3145 scr_forwardindex (); 3130 scr_forwardindex ();
3146 break; 3131 break;
3147#endif 3132#endif
3148 case '=': 3133 case '=':
… …
3310 ndef = get_byte_array_bit (csi_defaults, i); 3295 ndef = get_byte_array_bit (csi_defaults, i);
3311 for (p = 0; p < nargs; p++) 3296 for (p = 0; p < nargs; p++)
3312 if (arg[p] == -1) 3297 if (arg[p] == -1)
3313 arg[p] = ndef; 3298 arg[p] = ndef;
3314 3299
3315#ifdef DEBUG_CMD
3316 fprintf (stderr, "CSI ");
3317 for (p = 0; p < nargs; p++)
3318 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3319 fprintf (stderr, "%c\n", ch);
3320#endif
3321
3322 /* 3300 /*
3323 * private mode handling 3301 * private mode handling
3324 */ 3302 */
3325 if (priv) 3303 if (priv)
3326 { 3304 {
3327 switch (priv) 3305 switch (priv)
3328 { 3306 {
3329 case '>': 3307 case '>':
3330 if (ch == CSI_DA) /* secondary device attributes */ 3308 if (ch == CSI_DA) /* secondary device attributes */
3331 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3309 {
3310 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3311 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3312 //
3313 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3314 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3315 // that we do not support xterm mouse reporting (should be 95 when we do).
3316 //
3317 tt_printf ("\033[>%d;94;0c", 'U');
3318 }
3332 break; 3319 break;
3333 case '?': 3320 case '?':
3334 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3321 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3335 process_terminal_mode (ch, priv, nargs, arg); 3322 process_terminal_mode (ch, priv, nargs, arg);
3336 break; 3323 break;
… …
3539 break; 3526 break;
3540 case CSI_75: 3527 case CSI_75:
3541 scr_cursor (RESTORE); 3528 scr_cursor (RESTORE);
3542 break; 3529 break;
3543 3530
3544#if ENABLE_FRILLS 3531#if !ENABLE_MINIMAL
3545 case CSI_74: 3532 case CSI_74:
3546 process_window_ops (arg, nargs); 3533 process_window_ops (arg, nargs);
3547 break; 3534 break;
3548#endif 3535#endif
3549 3536
… …
3556 break; 3543 break;
3557 } 3544 }
3558} 3545}
3559/*}}} */ 3546/*}}} */
3560 3547
3561#if ENABLE_FRILLS 3548#if !ENABLE_MINIMAL
3562/* ARGSUSED */ 3549/* ARGSUSED */
3563void 3550void
3564rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3551rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3565{ 3552{
3566 int x, y; 3553 int x, y;
3567 XWindowAttributes wattr; 3554 XWindowAttributes wattr;
3568 Window wdummy; 3555 Window wdummy;
3569 dDisp; 3556
3557 dLocal (Display *, dpy);
3570 3558
3571 if (nargs == 0) 3559 if (nargs == 0)
3572 return; 3560 return;
3573 3561
3574 switch (args[0]) 3562 switch (args[0])
3575 { 3563 {
3576 /* 3564 /*
3577 * commands 3565 * commands
3578 */ 3566 */
3579 case 1: /* deiconify window */ 3567 case 1: /* deiconify window */
3580 XMapWindow (disp, parent[0]); 3568 XMapWindow (dpy, parent[0]);
3581 break; 3569 break;
3582 case 2: /* iconify window */ 3570 case 2: /* iconify window */
3583 XIconifyWindow (disp, parent[0], display->screen); 3571 XIconifyWindow (dpy, parent[0], display->screen);
3584 break; 3572 break;
3585 case 3: /* set position (pixels) */ 3573 case 3: /* set position (pixels) */
3586 XMoveWindow (disp, parent[0], args[1], args[2]); 3574 XMoveWindow (dpy, parent[0], args[1], args[2]);
3587 break; 3575 break;
3588 case 4: /* set size (pixels) */ 3576 case 4: /* set size (pixels) */
3589 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3577 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3590 break; 3578 break;
3591 case 5: /* raise window */ 3579 case 5: /* raise window */
3592 XRaiseWindow (disp, parent[0]); 3580 XRaiseWindow (dpy, parent[0]);
3593 break; 3581 break;
3594 case 6: /* lower window */ 3582 case 6: /* lower window */
3595 XLowerWindow (disp, parent[0]); 3583 XLowerWindow (dpy, parent[0]);
3596 break; 3584 break;
3597 case 7: /* refresh window */ 3585 case 7: /* refresh window */
3598 scr_touch (true); 3586 scr_touch (true);
3599 break; 3587 break;
3600 case 8: /* set size (chars) */ 3588 case 8: /* set size (chars) */
… …
3607 if (args[0] >= 24) /* set height (chars) */ 3595 if (args[0] >= 24) /* set height (chars) */
3608 set_widthheight ((unsigned int)width, 3596 set_widthheight ((unsigned int)width,
3609 (unsigned int) (args[1] * fheight)); 3597 (unsigned int) (args[1] * fheight));
3610 break; 3598 break;
3611 3599
3612
3613 /* 3600 /*
3614 * reports - some output format copied from XTerm 3601 * reports - some output format copied from XTerm
3615 */ 3602 */
3616 case 11: /* report window state */ 3603 case 11: /* report window state */
3617 XGetWindowAttributes (disp, parent[0], &wattr); 3604 XGetWindowAttributes (dpy, parent[0], &wattr);
3618 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3605 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3619 break; 3606 break;
3620 case 13: /* report window position */ 3607 case 13: /* report window position */
3621 XGetWindowAttributes (disp, parent[0], &wattr); 3608 XGetWindowAttributes (dpy, parent[0], &wattr);
3622 XTranslateCoordinates (disp, parent[0], wattr.root, 3609 XTranslateCoordinates (dpy, parent[0], wattr.root,
3623 -wattr.border_width, -wattr.border_width, 3610 -wattr.border_width, -wattr.border_width,
3624 &x, &y, &wdummy); 3611 &x, &y, &wdummy);
3625 tt_printf ("\033[3;%d;%dt", x, y); 3612 tt_printf ("\033[3;%d;%dt", x, y);
3626 break; 3613 break;
3627 case 14: /* report window size (pixels) */ 3614 case 14: /* report window size (pixels) */
3628 XGetWindowAttributes (disp, parent[0], &wattr); 3615 XGetWindowAttributes (dpy, parent[0], &wattr);
3629 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3616 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3630 break; 3617 break;
3631 case 18: /* report text area size (chars) */ 3618 case 18: /* report text area size (chars) */
3632 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3619 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3633 break; 3620 break;
… …
3635 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3622 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3636 break; 3623 break;
3637 case 20: /* report icon label */ 3624 case 20: /* report icon label */
3638 { 3625 {
3639 char *s; 3626 char *s;
3640 XGetIconName (disp, parent[0], &s); 3627 XGetIconName (dpy, parent[0], &s);
3641 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3628 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3642 XFree (s); 3629 XFree (s);
3643 } 3630 }
3644 break; 3631 break;
3645 case 21: /* report window title */ 3632 case 21: /* report window title */
3646 { 3633 {
3647 char *s; 3634 char *s;
3648 XFetchName (disp, parent[0], &s); 3635 XFetchName (dpy, parent[0], &s);
3649 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3636 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3650 XFree (s); 3637 XFree (s);
3651 } 3638 }
3652 break; 3639 break;
3653 } 3640 }
… …
3754void 3741void
3755rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3742rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3756{ 3743{
3757 if (str[0] == '?' && !str[1]) 3744 if (str[0] == '?' && !str[1])
3758 { 3745 {
3759 unsigned short r, g, b; 3746 rgba c;
3760 pix_colors_focused[color].get (display, r, g, b); 3747 pix_colors_focused[color].get (c);
3748
3749#if XFT
3750 if (c.a != rgba::MAX_CC)
3751 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3752 else
3753#endif
3761 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3754 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3762 } 3755 }
3763 else 3756 else
3764 set_window_color (color, str); 3757 set_window_color (color, str);
3765} 3758}
3766 3759
… …
3772{ 3765{
3773 int color; 3766 int color;
3774 char *buf, *name; 3767 char *buf, *name;
3775 bool query = str[0] == '?' && !str[1]; 3768 bool query = str[0] == '?' && !str[1];
3776 int saveop = op; 3769 int saveop = op;
3777 dDisp; 3770
3771 dLocal (Display *, dpy);
3778 3772
3779 assert (str != NULL); 3773 assert (str != NULL);
3774
3775 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3776 return;
3777
3780 switch (op) 3778 switch (op)
3781 { 3779 {
3782 case XTerm_name: 3780 case XTerm_name:
3783 set_title (str); 3781 set_title (str);
3784 /* FALLTHROUGH */ 3782 /* FALLTHROUGH */
… …
3798 unsigned long bytes_after; 3796 unsigned long bytes_after;
3799 unsigned char *value = 0; 3797 unsigned char *value = 0;
3800 const char *str = ""; 3798 const char *str = "";
3801 3799
3802 if (prop 3800 if (prop
3803 && XGetWindowProperty (disp, parent[0], 3801 && XGetWindowProperty (dpy, parent[0],
3804 prop, 0, 1<<16, 0, AnyPropertyType, 3802 prop, 0, 1<<16, 0, AnyPropertyType,
3805 &actual_type, &actual_format, 3803 &actual_type, &actual_format,
3806 &nitems, &bytes_after, &value) == Success 3804 &nitems, &bytes_after, &value) == Success
3807 && actual_type != None 3805 && actual_type != None
3808 && actual_format == 8) 3806 && actual_format == 8)
3809 str = (const char *)(value); 3807 str = (const char *)(value);
3810 3808
3811 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3809 tt_printf ("\033]%d;%s%c", op, str, resp);
3812 3810
3813 XFree (value); 3811 XFree (value);
3814 } 3812 }
3815 else 3813 else
3816 { 3814 {
… …
3820 { 3818 {
3821 *eq = 0; 3819 *eq = 0;
3822 set_utf8_property (display->atom (str), eq + 1); 3820 set_utf8_property (display->atom (str), eq + 1);
3823 } 3821 }
3824 else 3822 else
3825 XDeleteProperty (disp, parent[0], 3823 XDeleteProperty (dpy, parent[0],
3826 display->atom (str)); 3824 display->atom (str));
3827 } 3825 }
3828 break; 3826 break;
3829 3827
3830 case XTerm_Color: 3828 case XTerm_Color:
… …
3840 break; 3838 break;
3841 3839
3842 if ((buf = strchr (name, ';')) != NULL) 3840 if ((buf = strchr (name, ';')) != NULL)
3843 *buf++ = '\0'; 3841 *buf++ = '\0';
3844 3842
3845 if (name[0] == '?' && !name[1]) 3843 process_color_seq (op, color, name, resp);
3846 {
3847 unsigned short r, g, b;
3848 pix_colors_focused[color].get (display, r, g, b);
3849 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3850 }
3851 else
3852 set_window_color (color, name);
3853 } 3844 }
3854 break; 3845 break;
3855 case XTerm_Color00: 3846 case XTerm_Color00:
3856 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3847 process_color_seq (op, Color_fg, str, resp);
3857 break; 3848 break;
3858 case XTerm_Color01: 3849 case XTerm_Color01:
3859 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3850 process_color_seq (op, Color_bg, str, resp);
3860 break; 3851 break;
3861#ifndef NO_CURSORCOLOR 3852#ifndef NO_CURSORCOLOR
3862 case XTerm_Color_cursor: 3853 case XTerm_Color_cursor:
3863 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3854 process_color_seq (op, Color_cursor, str, resp);
3864 break; 3855 break;
3865#endif 3856#endif
3866 case XTerm_Color_pointer_fg: 3857 case XTerm_Color_pointer_fg:
3867 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3858 process_color_seq (op, Color_pointer_fg, str, resp);
3868 break; 3859 break;
3869 case XTerm_Color_pointer_bg: 3860 case XTerm_Color_pointer_bg:
3870 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3861 process_color_seq (op, Color_pointer_bg, str, resp);
3871 break; 3862 break;
3872#ifndef NO_BOLD_UNDERLINE_REVERSE 3863#ifndef NO_BOLD_UNDERLINE_REVERSE
3873 case XTerm_Color_RV: 3864 case XTerm_Color_RV:
3874 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3865 process_color_seq (op, Color_RV, str, resp);
3875 break; 3866 break;
3876 case Rxvt_Color_BD: 3867 case Rxvt_Color_BD:
3877 case URxvt_Color_BD: 3868 case URxvt_Color_BD:
3878 process_color_seq (op, Color_BD, str, resp); 3869 process_color_seq (op, Color_BD, str, resp);
3879 break; 3870 break;
3880 case Rxvt_Color_UL: 3871 case Rxvt_Color_UL:
3881 case URxvt_Color_UL: 3872 case URxvt_Color_UL:
3882 process_color_seq (op, Color_UL, str, resp); 3873 process_color_seq (op, Color_UL, str, resp);
3883 break; 3874 break;
3884 case URxvt_Color_IT: 3875 case URxvt_Color_IT:
3885 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3876 process_color_seq (op, Color_IT, str, resp);
3886 break; 3877 break;
3887#endif 3878#endif
3888#if TRANSPARENT && TINTING 3879#if TRANSPARENT && TINTING
3889 case URxvt_Color_tint: 3880 case URxvt_Color_tint:
3890 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3881 process_color_seq (op, Color_tint, str, resp);
3882
3891 check_our_parents (); 3883 check_our_parents ();
3884
3892 if (am_transparent) 3885 if (am_transparent)
3893 want_full_refresh = want_refresh = 1; 3886 want_full_refresh = want_refresh = 1;
3887
3894 break; 3888 break;
3895#endif 3889#endif
3896 3890
3897 case Rxvt_Pixmap: 3891 case Rxvt_Pixmap:
3898 { 3892 {
… …
3969 allocated.push_back ((void *)res); 3963 allocated.push_back ((void *)res);
3970 set_fonts (); 3964 set_fonts ();
3971 } 3965 }
3972 break; 3966 break;
3973 3967
3974#if ENABLE_FRILLS 3968 case URxvt_version:
3969 if (query)
3970 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3971 op,
3972 rs[Rs_name], VERSION[0], VERSION[2],
3973 resp);
3974 break;
3975
3976#if !ENABLE_MINIMAL
3975 case URxvt_locale: 3977 case URxvt_locale:
3976 if (query) 3978 if (query)
3977 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3979 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3978 else 3980 else
3979 { 3981 {
3980 set_locale (str); 3982 set_locale (str);
3981 pty->set_utf8_mode (enc_utf8); 3983 pty->set_utf8_mode (enc_utf8);
3982 init_xlocale (); 3984 init_xlocale ();
… …
3997 break; 3999 break;
3998#endif 4000#endif
3999 4001
4000#if ENABLE_PERL 4002#if ENABLE_PERL
4001 case URxvt_perl: 4003 case URxvt_perl:
4002 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4004 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4003 ; // no responses yet 4005 ; // no responses yet
4004 break; 4006 break;
4005#endif 4007#endif
4006 } 4008 }
4007} 4009}
… …
4343 scr_color (Color_bg, Color_bg); 4345 scr_color (Color_bg, Color_bg);
4344 break; 4346 break;
4345 4347
4346 //case 50: // not variable spacing 4348 //case 50: // not variable spacing
4347 4349
4348#if ENABLE_FRILLS 4350#if !ENABLE_MINIMAL
4349 case 90: 4351 case 90:
4350 case 91: /* set bright fg color */ 4352 case 91: /* set bright fg color */
4351 case 92: 4353 case 92:
4352 case 93: 4354 case 93:
4353 case 94: 4355 case 94:

Diff Legend

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